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

Side by Side Diff: Source/core/rendering/RenderInline.h

Issue 538213002: Cleanup RenderInline style propagation to continuations (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: For landing Created 6 years, 3 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 | « Source/core/rendering/RenderBoxModelObject.h ('k') | Source/core/rendering/RenderInline.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 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 RenderInline* inlineElementContinuation() const; 82 RenderInline* inlineElementContinuation() const;
83 83
84 virtual void updateDragState(bool dragOn) OVERRIDE FINAL; 84 virtual void updateDragState(bool dragOn) OVERRIDE FINAL;
85 85
86 LayoutSize offsetForInFlowPositionedInline(const RenderBox& child) const; 86 LayoutSize offsetForInFlowPositionedInline(const RenderBox& child) const;
87 87
88 virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint& addition alOffset, const RenderLayerModelObject* paintContainer = 0) const OVERRIDE FINAL ; 88 virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint& addition alOffset, const RenderLayerModelObject* paintContainer = 0) const OVERRIDE FINAL ;
89 void paintOutline(PaintInfo&, const LayoutPoint&); 89 void paintOutline(PaintInfo&, const LayoutPoint&);
90 90
91 using RenderBoxModelObject::continuation; 91 using RenderBoxModelObject::continuation;
92 virtual void setContinuation(RenderBoxModelObject*) OVERRIDE FINAL; 92 using RenderBoxModelObject::setContinuation;
93 93
94 bool alwaysCreateLineBoxes() const { return alwaysCreateLineBoxesForRenderIn line(); } 94 bool alwaysCreateLineBoxes() const { return alwaysCreateLineBoxesForRenderIn line(); }
95 void setAlwaysCreateLineBoxes(bool alwaysCreateLineBoxes = true) { setAlways CreateLineBoxesForRenderInline(alwaysCreateLineBoxes); } 95 void setAlwaysCreateLineBoxes(bool alwaysCreateLineBoxes = true) { setAlways CreateLineBoxesForRenderInline(alwaysCreateLineBoxes); }
96 void updateAlwaysCreateLineBoxes(bool fullLayout); 96 void updateAlwaysCreateLineBoxes(bool fullLayout);
97 97
98 virtual LayoutRect localCaretRect(InlineBox*, int, LayoutUnit* extraWidthToE ndOfLine) OVERRIDE FINAL; 98 virtual LayoutRect localCaretRect(InlineBox*, int, LayoutUnit* extraWidthToE ndOfLine) OVERRIDE FINAL;
99 99
100 bool hitTestCulledInline(const HitTestRequest&, HitTestResult&, const HitTes tLocation& locationInContainer, const LayoutPoint& accumulatedOffset); 100 bool hitTestCulledInline(const HitTestRequest&, HitTestResult&, const HitTes tLocation& locationInContainer, const LayoutPoint& accumulatedOffset);
101 101
102 protected: 102 protected:
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 185
186 RenderObjectChildList m_children; 186 RenderObjectChildList m_children;
187 RenderLineBoxList m_lineBoxes; // All of the line boxes created for this i nline flow. For example, <i>Hello<br>world.</i> will have two <i> line boxes. 187 RenderLineBoxList m_lineBoxes; // All of the line boxes created for this i nline flow. For example, <i>Hello<br>world.</i> will have two <i> line boxes.
188 }; 188 };
189 189
190 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderInline, isRenderInline()); 190 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderInline, isRenderInline());
191 191
192 } // namespace blink 192 } // namespace blink
193 193
194 #endif // RenderInline_h 194 #endif // RenderInline_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderBoxModelObject.h ('k') | Source/core/rendering/RenderInline.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698