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

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

Issue 2748103015: Replace ASSERT with DCHECK in core/layout/<sub dirs> (Closed)
Patch Set: Rebase with latest Created 3 years, 8 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) 2012 Adobe Systems Incorporated. All rights reserved. 2 * Copyright (C) 2012 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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 m_lineOverlapsShape(lineOverlapsShape), 61 m_lineOverlapsShape(lineOverlapsShape),
62 m_isValid(true) {} 62 m_isValid(true) {}
63 63
64 bool isForLine(LayoutUnit borderBoxLineTop, LayoutUnit lineHeight) { 64 bool isForLine(LayoutUnit borderBoxLineTop, LayoutUnit lineHeight) {
65 return m_isValid && m_borderBoxLineTop == borderBoxLineTop && 65 return m_isValid && m_borderBoxLineTop == borderBoxLineTop &&
66 m_lineHeight == lineHeight; 66 m_lineHeight == lineHeight;
67 } 67 }
68 68
69 bool isValid() { return m_isValid; } 69 bool isValid() { return m_isValid; }
70 LayoutUnit leftMarginBoxDelta() { 70 LayoutUnit leftMarginBoxDelta() {
71 ASSERT(m_isValid); 71 DCHECK(m_isValid);
72 return m_leftMarginBoxDelta; 72 return m_leftMarginBoxDelta;
73 } 73 }
74 LayoutUnit rightMarginBoxDelta() { 74 LayoutUnit rightMarginBoxDelta() {
75 ASSERT(m_isValid); 75 DCHECK(m_isValid);
76 return m_rightMarginBoxDelta; 76 return m_rightMarginBoxDelta;
77 } 77 }
78 bool lineOverlapsShape() { 78 bool lineOverlapsShape() {
79 ASSERT(m_isValid); 79 DCHECK(m_isValid);
80 return m_lineOverlapsShape; 80 return m_lineOverlapsShape;
81 } 81 }
82 82
83 private: 83 private:
84 LayoutUnit m_leftMarginBoxDelta; 84 LayoutUnit m_leftMarginBoxDelta;
85 LayoutUnit m_rightMarginBoxDelta; 85 LayoutUnit m_rightMarginBoxDelta;
86 LayoutUnit m_borderBoxLineTop; 86 LayoutUnit m_borderBoxLineTop;
87 LayoutUnit m_lineHeight; 87 LayoutUnit m_lineHeight;
88 bool m_lineOverlapsShape : 1; 88 bool m_lineOverlapsShape : 1;
89 bool m_isValid : 1; 89 bool m_isValid : 1;
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 174
175 const LayoutBox& m_layoutBox; 175 const LayoutBox& m_layoutBox;
176 mutable std::unique_ptr<Shape> m_shape; 176 mutable std::unique_ptr<Shape> m_shape;
177 LayoutSize m_referenceBoxLogicalSize; 177 LayoutSize m_referenceBoxLogicalSize;
178 ShapeOutsideDeltas m_shapeOutsideDeltas; 178 ShapeOutsideDeltas m_shapeOutsideDeltas;
179 mutable bool m_isComputingShape; 179 mutable bool m_isComputingShape;
180 }; 180 };
181 181
182 } // namespace blink 182 } // namespace blink
183 #endif 183 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698