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

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

Issue 1922223003: Change linesBoundingBox to return LayoutRect (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 LayoutUnit marginStart(const ComputedStyle* otherStyle = nullptr) const fina l; 135 LayoutUnit marginStart(const ComputedStyle* otherStyle = nullptr) const fina l;
136 LayoutUnit marginEnd(const ComputedStyle* otherStyle = nullptr) const final; 136 LayoutUnit marginEnd(const ComputedStyle* otherStyle = nullptr) const final;
137 LayoutUnit marginOver() const final; 137 LayoutUnit marginOver() const final;
138 LayoutUnit marginUnder() const final; 138 LayoutUnit marginUnder() const final;
139 139
140 void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedOffset) c onst final; 140 void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedOffset) c onst final;
141 void absoluteQuads(Vector<FloatQuad>&) const override; 141 void absoluteQuads(Vector<FloatQuad>&) const override;
142 142
143 LayoutSize offsetFromContainer(const LayoutObject*) const final; 143 LayoutSize offsetFromContainer(const LayoutObject*) const final;
144 144
145 IntRect linesBoundingBox() const; 145 LayoutRect linesBoundingBox() const;
146 LayoutRect visualOverflowRect() const final; 146 LayoutRect visualOverflowRect() const final;
147 147
148 InlineFlowBox* createAndAppendInlineFlowBox(); 148 InlineFlowBox* createAndAppendInlineFlowBox();
149 149
150 void dirtyLineBoxes(bool fullLayout); 150 void dirtyLineBoxes(bool fullLayout);
151 151
152 LineBoxList* lineBoxes() { return &m_lineBoxes; } 152 LineBoxList* lineBoxes() { return &m_lineBoxes; }
153 const LineBoxList* lineBoxes() const { return &m_lineBoxes; } 153 const LineBoxList* lineBoxes() const { return &m_lineBoxes; }
154 154
155 InlineFlowBox* firstLineBox() const { return m_lineBoxes.firstLineBox(); } 155 InlineFlowBox* firstLineBox() const { return m_lineBoxes.firstLineBox(); }
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 void layout() final { ASSERT_NOT_REACHED(); } // Do nothing for layout() 225 void layout() final { ASSERT_NOT_REACHED(); } // Do nothing for layout()
226 226
227 void paint(const PaintInfo&, const LayoutPoint&) const final; 227 void paint(const PaintInfo&, const LayoutPoint&) const final;
228 228
229 bool nodeAtPoint(HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) final; 229 bool nodeAtPoint(HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) final;
230 230
231 PaintLayerType layerTypeRequired() const override; 231 PaintLayerType layerTypeRequired() const override;
232 232
233 LayoutUnit offsetLeft() const final; 233 LayoutUnit offsetLeft() const final;
234 LayoutUnit offsetTop() const final; 234 LayoutUnit offsetTop() const final;
235 LayoutUnit offsetWidth() const final { return LayoutUnit(linesBoundingBox(). width()); } 235 LayoutUnit offsetWidth() const final { return linesBoundingBox().width(); }
236 LayoutUnit offsetHeight() const final { return LayoutUnit(linesBoundingBox() .height()); } 236 LayoutUnit offsetHeight() const final { return linesBoundingBox().height(); }
237 237
238 LayoutRect absoluteClippedOverflowRect() const override; 238 LayoutRect absoluteClippedOverflowRect() const override;
239 239
240 // This method differs from visualOverflowRect in that it doesn't include th e rects 240 // This method differs from visualOverflowRect in that it doesn't include th e rects
241 // for culled inline boxes, which aren't necessary for paint invalidation. 241 // for culled inline boxes, which aren't necessary for paint invalidation.
242 LayoutRect localOverflowRectForPaintInvalidation() const override; 242 LayoutRect localOverflowRectForPaintInvalidation() const override;
243 243
244 bool mapToVisualRectInAncestorSpace(const LayoutBoxModelObject* ancestor, La youtRect&, VisualRectFlags = DefaultVisualRectFlags) const final; 244 bool mapToVisualRectInAncestorSpace(const LayoutBoxModelObject* ancestor, La youtRect&, VisualRectFlags = DefaultVisualRectFlags) const final;
245 245
246 PositionWithAffinity positionForPoint(const LayoutPoint&) final; 246 PositionWithAffinity positionForPoint(const LayoutPoint&) final;
247 247
248 IntRect borderBoundingBox() const final 248 IntRect borderBoundingBox() const final
249 { 249 {
250 IntRect boundingBox = linesBoundingBox(); 250 IntRect boundingBox = enclosingIntRect(linesBoundingBox());
251 return IntRect(0, 0, boundingBox.width(), boundingBox.height()); 251 return IntRect(0, 0, boundingBox.width(), boundingBox.height());
252 } 252 }
253 253
254 virtual InlineFlowBox* createInlineFlowBox(); // Subclassed by SVG and Ruby 254 virtual InlineFlowBox* createInlineFlowBox(); // Subclassed by SVG and Ruby
255 255
256 void dirtyLinesFromChangedChild(LayoutObject* child) final { m_lineBoxes.dir tyLinesFromChangedChild(LineLayoutItem(this), LineLayoutItem(child)); } 256 void dirtyLinesFromChangedChild(LayoutObject* child) final { m_lineBoxes.dir tyLinesFromChangedChild(LineLayoutItem(this), LineLayoutItem(child)); }
257 257
258 // TODO(leviw): This should probably be an int. We don't snap equivalent lin es to different heights. 258 // TODO(leviw): This should probably be an int. We don't snap equivalent lin es to different heights.
259 LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const final; 259 LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const final;
260 int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePo sitionMode = PositionOnContainingLine) const final; 260 int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePo sitionMode = PositionOnContainingLine) const final;
(...skipping 14 matching lines...) Expand all
275 275
276 LayoutObjectChildList m_children; 276 LayoutObjectChildList m_children;
277 LineBoxList m_lineBoxes; // All of the line boxes created for this inline fl ow. For example, <i>Hello<br>world.</i> will have two <i> line boxes. 277 LineBoxList m_lineBoxes; // All of the line boxes created for this inline fl ow. For example, <i>Hello<br>world.</i> will have two <i> line boxes.
278 }; 278 };
279 279
280 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutInline, isLayoutInline()); 280 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutInline, isLayoutInline());
281 281
282 } // namespace blink 282 } // namespace blink
283 283
284 #endif // LayoutInline_h 284 #endif // LayoutInline_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/editing/VisibleUnits.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutInline.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698