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

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

Issue 1656743002: Removing more implicit LayoutUnit construction (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
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 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 IntRect borderBoundingBox() const final 250 IntRect borderBoundingBox() const final
251 { 251 {
252 IntRect boundingBox = linesBoundingBox(); 252 IntRect boundingBox = linesBoundingBox();
253 return IntRect(0, 0, boundingBox.width(), boundingBox.height()); 253 return IntRect(0, 0, boundingBox.width(), boundingBox.height());
254 } 254 }
255 255
256 virtual InlineFlowBox* createInlineFlowBox(); // Subclassed by SVG and Ruby 256 virtual InlineFlowBox* createInlineFlowBox(); // Subclassed by SVG and Ruby
257 257
258 void dirtyLinesFromChangedChild(LayoutObject* child) final { m_lineBoxes.dir tyLinesFromChangedChild(LineLayoutItem(this), LineLayoutItem(child)); } 258 void dirtyLinesFromChangedChild(LayoutObject* child) final { m_lineBoxes.dir tyLinesFromChangedChild(LineLayoutItem(this), LineLayoutItem(child)); }
259 259
260 // TODO(leviw): This should probably be an int. We don't snap equivalent lin es to different heights.
eae 2016/02/01 06:42:37 We eventually want to move to fractional support f
260 LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const final; 261 LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const final;
261 int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePo sitionMode = PositionOnContainingLine) const final; 262 int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePo sitionMode = PositionOnContainingLine) const final;
262 263
263 void childBecameNonInline(LayoutObject* child) final; 264 void childBecameNonInline(LayoutObject* child) final;
264 265
265 void updateHitTestResult(HitTestResult&, const LayoutPoint&) final; 266 void updateHitTestResult(HitTestResult&, const LayoutPoint&) final;
266 267
267 void imageChanged(WrappedImagePtr, const IntRect* = nullptr) final; 268 void imageChanged(WrappedImagePtr, const IntRect* = nullptr) final;
268 269
269 void addAnnotatedRegions(Vector<AnnotatedRegionValue>&) final; 270 void addAnnotatedRegions(Vector<AnnotatedRegionValue>&) final;
270 271
271 void updateFromStyle() final; 272 void updateFromStyle() final;
272 273
273 LayoutInline* clone() const; 274 LayoutInline* clone() const;
274 275
275 LayoutBoxModelObject* continuationBefore(LayoutObject* beforeChild); 276 LayoutBoxModelObject* continuationBefore(LayoutObject* beforeChild);
276 277
277 LayoutObjectChildList m_children; 278 LayoutObjectChildList m_children;
278 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. 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.
279 }; 280 };
280 281
281 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutInline, isLayoutInline()); 282 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutInline, isLayoutInline());
282 283
283 } // namespace blink 284 } // namespace blink
284 285
285 #endif // LayoutInline_h 286 #endif // LayoutInline_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutGrid.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