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

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

Issue 1280543005: Refactor LayoutInline::addOutlineRects to avoid tricky logic to avoid dups (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rephrase comments Created 5 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/layout/LayoutBoxModelObject.cpp ('k') | 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 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 InlineBox* lastLineBoxIncludingCulling() const { return alwaysCreateLineBoxe s() ? lastLineBox() : culledInlineLastLineBox(); } 80 InlineBox* lastLineBoxIncludingCulling() const { return alwaysCreateLineBoxe s() ? lastLineBox() : culledInlineLastLineBox(); }
81 81
82 LayoutBoxModelObject* virtualContinuation() const final { return continuatio n(); } 82 LayoutBoxModelObject* virtualContinuation() const final { return continuatio n(); }
83 LayoutInline* inlineElementContinuation() const; 83 LayoutInline* inlineElementContinuation() const;
84 84
85 void updateDragState(bool dragOn) final; 85 void updateDragState(bool dragOn) final;
86 86
87 LayoutSize offsetForInFlowPositionedInline(const LayoutBox& child) const; 87 LayoutSize offsetForInFlowPositionedInline(const LayoutBox& child) const;
88 88
89 void addOutlineRects(Vector<LayoutRect>&, const LayoutPoint& additionalOffse t) const final; 89 void addOutlineRects(Vector<LayoutRect>&, const LayoutPoint& additionalOffse t) const final;
90 // The following methods are called from the container if it has already add ed outline rects for line boxes
91 // and/or children of this LayoutInline.
92 void addOutlineRectsForChildrenAndContinuations(Vector<LayoutRect>&, const L ayoutPoint& additionalOffset) const;
93 void addOutlineRectsForContinuations(Vector<LayoutRect>&, const LayoutPoint& additionalOffset) const;
90 94
91 using LayoutBoxModelObject::continuation; 95 using LayoutBoxModelObject::continuation;
92 using LayoutBoxModelObject::setContinuation; 96 using LayoutBoxModelObject::setContinuation;
93 97
94 bool alwaysCreateLineBoxes() const { return alwaysCreateLineBoxesForLayoutIn line(); } 98 bool alwaysCreateLineBoxes() const { return alwaysCreateLineBoxesForLayoutIn line(); }
95 void setAlwaysCreateLineBoxes(bool alwaysCreateLineBoxes = true) { setAlways CreateLineBoxesForLayoutInline(alwaysCreateLineBoxes); } 99 void setAlwaysCreateLineBoxes(bool alwaysCreateLineBoxes = true) { setAlways CreateLineBoxesForLayoutInline(alwaysCreateLineBoxes); }
96 void updateAlwaysCreateLineBoxes(bool fullLayout); 100 void updateAlwaysCreateLineBoxes(bool fullLayout);
97 101
98 LayoutRect localCaretRect(InlineBox*, int, LayoutUnit* extraWidthToEndOfLine ) final; 102 LayoutRect localCaretRect(InlineBox*, int, LayoutUnit* extraWidthToEndOfLine ) final;
99 103
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 196
193 LayoutObjectChildList m_children; 197 LayoutObjectChildList m_children;
194 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. 198 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.
195 }; 199 };
196 200
197 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutInline, isLayoutInline()); 201 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutInline, isLayoutInline());
198 202
199 } // namespace blink 203 } // namespace blink
200 204
201 #endif // LayoutInline_h 205 #endif // LayoutInline_h
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutBoxModelObject.cpp ('k') | Source/core/layout/LayoutInline.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698