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

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

Issue 1516003003: Merge LayoutInline::mapLocalToAncestor() into LayoutObject. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review constness + bonus constness Created 4 years, 10 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
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/layout/LayoutInline.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 LayoutUnit offsetHeight() const final { return LayoutUnit(linesBoundingBox() .height()); } 236 LayoutUnit offsetHeight() const final { return LayoutUnit(linesBoundingBox() .height()); }
237 237
238 LayoutRect absoluteClippedOverflowRect() const override; 238 LayoutRect absoluteClippedOverflowRect() const override;
239 LayoutRect clippedOverflowRectForPaintInvalidation(const LayoutBoxModelObjec t* paintInvalidationContainer, const PaintInvalidationState* = nullptr) const ov erride; 239 LayoutRect clippedOverflowRectForPaintInvalidation(const LayoutBoxModelObjec t* paintInvalidationContainer, const PaintInvalidationState* = nullptr) const ov erride;
240 void mapToVisibleRectInAncestorSpace(const LayoutBoxModelObject* ancestor, L ayoutRect&, const PaintInvalidationState*) const final; 240 void mapToVisibleRectInAncestorSpace(const LayoutBoxModelObject* ancestor, L ayoutRect&, const PaintInvalidationState*) const final;
241 241
242 // This method differs from clippedOverflowRectForPaintInvalidation in that it includes 242 // This method differs from clippedOverflowRectForPaintInvalidation in that it includes
243 // the rects for culled inline boxes, which aren't necessary for paint inval idation. 243 // the rects for culled inline boxes, which aren't necessary for paint inval idation.
244 LayoutRect clippedOverflowRect(const LayoutBoxModelObject*, const PaintInval idationState* = nullptr) const; 244 LayoutRect clippedOverflowRect(const LayoutBoxModelObject*, const PaintInval idationState* = nullptr) const;
245 245
246 void mapLocalToAncestor(const LayoutBoxModelObject* ancestor, TransformState &, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = 0, const PaintInva lidationState* = nullptr) const override;
247
248 PositionWithAffinity positionForPoint(const LayoutPoint&) final; 246 PositionWithAffinity positionForPoint(const LayoutPoint&) final;
249 247
250 IntRect borderBoundingBox() const final 248 IntRect borderBoundingBox() const final
251 { 249 {
252 IntRect boundingBox = linesBoundingBox(); 250 IntRect boundingBox = linesBoundingBox();
253 return IntRect(0, 0, boundingBox.width(), boundingBox.height()); 251 return IntRect(0, 0, boundingBox.width(), boundingBox.height());
254 } 252 }
255 253
256 virtual InlineFlowBox* createInlineFlowBox(); // Subclassed by SVG and Ruby 254 virtual InlineFlowBox* createInlineFlowBox(); // Subclassed by SVG and Ruby
257 255
(...skipping 19 matching lines...) Expand all
277 275
278 LayoutObjectChildList m_children; 276 LayoutObjectChildList m_children;
279 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.
280 }; 278 };
281 279
282 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutInline, isLayoutInline()); 280 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutInline, isLayoutInline());
283 281
284 } // namespace blink 282 } // namespace blink
285 283
286 #endif // LayoutInline_h 284 #endif // LayoutInline_h
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/layout/LayoutInline.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698