Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(69)

Side by Side Diff: third_party/WebKit/Source/core/layout/shapes/RasterShape.h

Issue 2748103015: Replace ASSERT with DCHECK in core/layout/<sub dirs> (Closed)
Patch Set: Rebase with latest Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. 2 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above 8 * 1. Redistributions of source code must retain the above
9 * copyright notice, this list of conditions and the following 9 * copyright notice, this list of conditions and the following
10 * disclaimer. 10 * disclaimer.
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 public: 45 public:
46 RasterShapeIntervals(unsigned size, int offset = 0) : m_offset(offset) { 46 RasterShapeIntervals(unsigned size, int offset = 0) : m_offset(offset) {
47 m_intervals.resize(clampTo<int>(size)); 47 m_intervals.resize(clampTo<int>(size));
48 } 48 }
49 49
50 void initializeBounds(); 50 void initializeBounds();
51 const IntRect& bounds() const { return m_bounds; } 51 const IntRect& bounds() const { return m_bounds; }
52 bool isEmpty() const { return m_bounds.isEmpty(); } 52 bool isEmpty() const { return m_bounds.isEmpty(); }
53 53
54 IntShapeInterval& intervalAt(int y) { 54 IntShapeInterval& intervalAt(int y) {
55 ASSERT(y + m_offset >= 0 && 55 DCHECK_GE(y + m_offset, 0);
56 static_cast<unsigned>(y + m_offset) < m_intervals.size()); 56 DCHECK_LT(static_cast<unsigned>(y + m_offset), m_intervals.size());
57 return m_intervals[y + m_offset]; 57 return m_intervals[y + m_offset];
58 } 58 }
59 59
60 const IntShapeInterval& intervalAt(int y) const { 60 const IntShapeInterval& intervalAt(int y) const {
61 ASSERT(y + m_offset >= 0 && 61 DCHECK_GE(y + m_offset, 0);
62 static_cast<unsigned>(y + m_offset) < m_intervals.size()); 62 DCHECK_LT(static_cast<unsigned>(y + m_offset), m_intervals.size());
63 return m_intervals[y + m_offset]; 63 return m_intervals[y + m_offset];
64 } 64 }
65 65
66 std::unique_ptr<RasterShapeIntervals> computeShapeMarginIntervals( 66 std::unique_ptr<RasterShapeIntervals> computeShapeMarginIntervals(
67 int shapeMargin) const; 67 int shapeMargin) const;
68 68
69 void buildBoundsPath(Path&) const; 69 void buildBoundsPath(Path&) const;
70 70
71 private: 71 private:
72 int size() const { return m_intervals.size(); } 72 int size() const { return m_intervals.size(); }
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 const RasterShapeIntervals& marginIntervals() const; 105 const RasterShapeIntervals& marginIntervals() const;
106 106
107 std::unique_ptr<RasterShapeIntervals> m_intervals; 107 std::unique_ptr<RasterShapeIntervals> m_intervals;
108 mutable std::unique_ptr<RasterShapeIntervals> m_marginIntervals; 108 mutable std::unique_ptr<RasterShapeIntervals> m_marginIntervals;
109 IntSize m_marginRectSize; 109 IntSize m_marginRectSize;
110 }; 110 };
111 111
112 } // namespace blink 112 } // namespace blink
113 113
114 #endif // RasterShape_h 114 #endif // RasterShape_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698