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

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

Issue 585743003: Move paint code from RenderInline into InlinePainter. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Merged. 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/paint/InlinePainter.cpp ('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 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 InlineBox* lastLineBoxIncludingCulling() const { return alwaysCreateLineBoxe s() ? lastLineBox() : culledInlineLastLineBox(); } 79 InlineBox* lastLineBoxIncludingCulling() const { return alwaysCreateLineBoxe s() ? lastLineBox() : culledInlineLastLineBox(); }
80 80
81 virtual RenderBoxModelObject* virtualContinuation() const OVERRIDE FINAL { r eturn continuation(); } 81 virtual RenderBoxModelObject* virtualContinuation() const OVERRIDE FINAL { r eturn continuation(); }
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<LayoutRect>&, const LayoutPoint& addit ionalOffset, const RenderLayerModelObject* paintContainer) const OVERRIDE FINAL; 88 virtual void addFocusRingRects(Vector<LayoutRect>&, const LayoutPoint& addit ionalOffset, const RenderLayerModelObject* paintContainer) const OVERRIDE FINAL;
89 void paintOutline(PaintInfo&, const LayoutPoint&);
90 89
91 using RenderBoxModelObject::continuation; 90 using RenderBoxModelObject::continuation;
92 using RenderBoxModelObject::setContinuation; 91 using RenderBoxModelObject::setContinuation;
93 92
94 bool alwaysCreateLineBoxes() const { return alwaysCreateLineBoxesForRenderIn line(); } 93 bool alwaysCreateLineBoxes() const { return alwaysCreateLineBoxesForRenderIn line(); }
95 void setAlwaysCreateLineBoxes(bool alwaysCreateLineBoxes = true) { setAlways CreateLineBoxesForRenderInline(alwaysCreateLineBoxes); } 94 void setAlwaysCreateLineBoxes(bool alwaysCreateLineBoxes = true) { setAlways CreateLineBoxesForRenderInline(alwaysCreateLineBoxes); }
96 void updateAlwaysCreateLineBoxes(bool fullLayout); 95 void updateAlwaysCreateLineBoxes(bool fullLayout);
97 96
98 virtual LayoutRect localCaretRect(InlineBox*, int, LayoutUnit* extraWidthToE ndOfLine) OVERRIDE FINAL; 97 virtual LayoutRect localCaretRect(InlineBox*, int, LayoutUnit* extraWidthToE ndOfLine) OVERRIDE FINAL;
99 98
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 virtual void updateHitTestResult(HitTestResult&, const LayoutPoint&) OVERRID E FINAL; 171 virtual void updateHitTestResult(HitTestResult&, const LayoutPoint&) OVERRID E FINAL;
173 172
174 virtual void imageChanged(WrappedImagePtr, const IntRect* = 0) OVERRIDE FINA L; 173 virtual void imageChanged(WrappedImagePtr, const IntRect* = 0) OVERRIDE FINA L;
175 174
176 virtual void addAnnotatedRegions(Vector<AnnotatedRegionValue>&) OVERRIDE FIN AL; 175 virtual void addAnnotatedRegions(Vector<AnnotatedRegionValue>&) OVERRIDE FIN AL;
177 176
178 virtual void updateFromStyle() OVERRIDE FINAL; 177 virtual void updateFromStyle() OVERRIDE FINAL;
179 178
180 RenderInline* clone() const; 179 RenderInline* clone() const;
181 180
182 void paintOutlineForLine(GraphicsContext*, const LayoutPoint&, const LayoutR ect& prevLine, const LayoutRect& thisLine,
183 const LayoutRect& nextLine, const Color);
184 RenderBoxModelObject* continuationBefore(RenderObject* beforeChild); 181 RenderBoxModelObject* continuationBefore(RenderObject* beforeChild);
185 182
186 RenderObjectChildList m_children; 183 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. 184 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 }; 185 };
189 186
190 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderInline, isRenderInline()); 187 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderInline, isRenderInline());
191 188
192 } // namespace blink 189 } // namespace blink
193 190
194 #endif // RenderInline_h 191 #endif // RenderInline_h
OLDNEW
« no previous file with comments | « Source/core/paint/InlinePainter.cpp ('k') | Source/core/rendering/RenderInline.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698