| Index: third_party/WebKit/Source/core/layout/LayoutInline.h
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutInline.h b/third_party/WebKit/Source/core/layout/LayoutInline.h
|
| index 4a01e82b775b34e09ace8a228a018373baeedf2c..18e266af62fcdf36b8df9a594e5c5ba24b5601f5 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutInline.h
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutInline.h
|
| @@ -1,7 +1,8 @@
|
| /*
|
| * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
|
| * (C) 1999 Antti Koivisto (koivisto@kde.org)
|
| - * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
|
| + * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc.
|
| + * All rights reserved.
|
| *
|
| * This library is free software; you can redistribute it and/or
|
| * modify it under the terms of the GNU Library General Public
|
| @@ -182,8 +183,8 @@ class CORE_EXPORT LayoutInline : public LayoutBoxModelObject {
|
| void addOutlineRects(Vector<LayoutRect>&,
|
| const LayoutPoint& additionalOffset,
|
| IncludeBlockVisualOverflowOrNot) const final;
|
| - // The following methods are called from the container if it has already added outline rects for line boxes
|
| - // and/or children of this LayoutInline.
|
| + // The following methods are called from the container if it has already added
|
| + // outline rects for line boxes and/or children of this LayoutInline.
|
| void addOutlineRectsForChildrenAndContinuations(
|
| Vector<LayoutRect>&,
|
| const LayoutPoint& additionalOffset,
|
| @@ -239,7 +240,8 @@ class CORE_EXPORT LayoutInline : public LayoutBoxModelObject {
|
| InlineBox* culledInlineFirstLineBox() const;
|
| InlineBox* culledInlineLastLineBox() const;
|
|
|
| - // For visualOverflowRect() only, to get bounding box of visual overflow of line boxes.
|
| + // For visualOverflowRect() only, to get bounding box of visual overflow of
|
| + // line boxes.
|
| LayoutRect linesVisualOverflowBoundingBox() const;
|
|
|
| template <typename GeneratorContext>
|
| @@ -284,8 +286,9 @@ class CORE_EXPORT LayoutInline : public LayoutBoxModelObject {
|
|
|
| LayoutRect absoluteClippedOverflowRect() const override;
|
|
|
| - // This method differs from visualOverflowRect in that it doesn't include the rects
|
| - // for culled inline boxes, which aren't necessary for paint invalidation.
|
| + // This method differs from visualOverflowRect in that it doesn't include the
|
| + // rects for culled inline boxes, which aren't necessary for paint
|
| + // invalidation.
|
| LayoutRect localOverflowRectForPaintInvalidation() const override;
|
|
|
| bool mapToVisualRectInAncestorSpace(
|
| @@ -310,7 +313,8 @@ class CORE_EXPORT LayoutInline : public LayoutBoxModelObject {
|
| markingBehaviour == MarkContainerChain);
|
| }
|
|
|
| - // TODO(leviw): This should probably be an int. We don't snap equivalent lines to different heights.
|
| + // TODO(leviw): This should probably be an int. We don't snap equivalent lines
|
| + // to different heights.
|
| LayoutUnit lineHeight(
|
| bool firstLine,
|
| LineDirectionMode,
|
| @@ -335,8 +339,9 @@ class CORE_EXPORT LayoutInline : public LayoutBoxModelObject {
|
| LayoutBoxModelObject* continuationBefore(LayoutObject* beforeChild);
|
|
|
| LayoutObjectChildList m_children;
|
| - LineBoxList
|
| - m_lineBoxes; // All of the line boxes created for this inline flow. For example, <i>Hello<br>world.</i> will have two <i> line boxes.
|
| + // All of the line boxes created for this inline flow. For example,
|
| + // <i>Hello<br>world.</i> will have two <i> line boxes.
|
| + LineBoxList m_lineBoxes;
|
| };
|
|
|
| DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutInline, isLayoutInline());
|
|
|