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

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

Issue 352903002: Simplify InlineFlowBox::paintBoxDecorations. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 6 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 | « no previous file | Source/core/rendering/InlineFlowBox.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) 2003, 2004, 2005, 2006, 2007 Apple Inc. All rights reserved. 2 * Copyright (C) 2003, 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 virtual void adjustPosition(float dx, float dy) OVERRIDE; 105 virtual void adjustPosition(float dx, float dy) OVERRIDE;
106 106
107 virtual void extractLineBoxFromRenderObject(); 107 virtual void extractLineBoxFromRenderObject();
108 virtual void attachLineBoxToRenderObject(); 108 virtual void attachLineBoxToRenderObject();
109 virtual void removeLineBoxFromRenderObject(); 109 virtual void removeLineBoxFromRenderObject();
110 110
111 virtual void clearTruncation() OVERRIDE; 111 virtual void clearTruncation() OVERRIDE;
112 112
113 IntRect roundedFrameRect() const; 113 IntRect roundedFrameRect() const;
114 114
115 void paintBoxDecorations(PaintInfo&, const LayoutPoint&);
116 void paintMask(PaintInfo&, const LayoutPoint&);
117 void paintFillLayers(const PaintInfo&, const Color&, const FillLayer*, const LayoutRect&, CompositeOperator = CompositeSourceOver);
118 void paintFillLayer(const PaintInfo&, const Color&, const FillLayer*, const LayoutRect&, CompositeOperator = CompositeSourceOver);
119 void paintBoxShadow(const PaintInfo&, RenderStyle*, ShadowStyle, const Layou tRect&);
120 virtual void paint(PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, Layou tUnit lineBottom) OVERRIDE; 115 virtual void paint(PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, Layou tUnit lineBottom) OVERRIDE;
121 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTes tLocation& locationInContainer, const LayoutPoint& accumulatedOffset, LayoutUnit lineTop, LayoutUnit lineBottom) OVERRIDE; 116 virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTes tLocation& locationInContainer, const LayoutPoint& accumulatedOffset, LayoutUnit lineTop, LayoutUnit lineBottom) OVERRIDE;
122 117
123 bool boxShadowCanBeAppliedToBackground(const FillLayer&) const; 118 bool boxShadowCanBeAppliedToBackground(const FillLayer&) const;
124 119
125 virtual RenderLineBoxList* rendererLineBoxes() const; 120 virtual RenderLineBoxList* rendererLineBoxes() const;
126 121
127 // logicalLeft = left in a horizontal line and top in a vertical line. 122 // logicalLeft = left in a horizontal line and top in a vertical line.
128 LayoutUnit marginBorderPaddingLogicalLeft() const { return marginLogicalLeft () + borderLogicalLeft() + paddingLogicalLeft(); } 123 LayoutUnit marginBorderPaddingLogicalLeft() const { return marginLogicalLeft () + borderLogicalLeft() + paddingLogicalLeft(); }
129 LayoutUnit marginBorderPaddingLogicalRight() const { return marginLogicalRig ht() + borderLogicalRight() + paddingLogicalRight(); } 124 LayoutUnit marginBorderPaddingLogicalRight() const { return marginLogicalRig ht() + borderLogicalRight() + paddingLogicalRight(); }
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 289
295 bool descendantsHaveSameLineHeightAndBaseline() const { return m_descendants HaveSameLineHeightAndBaseline; } 290 bool descendantsHaveSameLineHeightAndBaseline() const { return m_descendants HaveSameLineHeightAndBaseline; }
296 void clearDescendantsHaveSameLineHeightAndBaseline() 291 void clearDescendantsHaveSameLineHeightAndBaseline()
297 { 292 {
298 m_descendantsHaveSameLineHeightAndBaseline = false; 293 m_descendantsHaveSameLineHeightAndBaseline = false;
299 if (parent() && parent()->descendantsHaveSameLineHeightAndBaseline()) 294 if (parent() && parent()->descendantsHaveSameLineHeightAndBaseline())
300 parent()->clearDescendantsHaveSameLineHeightAndBaseline(); 295 parent()->clearDescendantsHaveSameLineHeightAndBaseline();
301 } 296 }
302 297
303 private: 298 private:
299 void paintBoxDecorations(PaintInfo&, const LayoutPoint&);
300 void paintMask(PaintInfo&, const LayoutPoint&);
301 void paintFillLayers(const PaintInfo&, const Color&, const FillLayer*, const LayoutRect&, CompositeOperator = CompositeSourceOver);
302 void paintFillLayer(const PaintInfo&, const Color&, const FillLayer*, const LayoutRect&, CompositeOperator = CompositeSourceOver);
303 void paintBoxShadow(const PaintInfo&, RenderStyle*, ShadowStyle, const Layou tRect&);
304
304 void addBoxShadowVisualOverflow(LayoutRect& logicalVisualOverflow); 305 void addBoxShadowVisualOverflow(LayoutRect& logicalVisualOverflow);
305 void addBorderOutsetVisualOverflow(LayoutRect& logicalVisualOverflow); 306 void addBorderOutsetVisualOverflow(LayoutRect& logicalVisualOverflow);
306 void addOutlineVisualOverflow(LayoutRect& logicalVisualOverflow); 307 void addOutlineVisualOverflow(LayoutRect& logicalVisualOverflow);
307 void addTextBoxVisualOverflow(InlineTextBox*, GlyphOverflowAndFallbackFontsM ap&, LayoutRect& logicalVisualOverflow); 308 void addTextBoxVisualOverflow(InlineTextBox*, GlyphOverflowAndFallbackFontsM ap&, LayoutRect& logicalVisualOverflow);
308 void addReplacedChildOverflow(const InlineBox*, LayoutRect& logicalLayoutOve rflow, LayoutRect& logicalVisualOverflow); 309 void addReplacedChildOverflow(const InlineBox*, LayoutRect& logicalLayoutOve rflow, LayoutRect& logicalVisualOverflow);
309 void constrainToLineTopAndBottomIfNeeded(LayoutRect&) const; 310 void constrainToLineTopAndBottomIfNeeded(LayoutRect&) const;
310 311
311 void setLayoutOverflow(const LayoutRect&, const LayoutRect&); 312 void setLayoutOverflow(const LayoutRect&, const LayoutRect&);
312 void setVisualOverflow(const LayoutRect&, const LayoutRect&); 313 void setVisualOverflow(const LayoutRect&, const LayoutRect&);
313 314
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
371 } 372 }
372 373
373 } // namespace WebCore 374 } // namespace WebCore
374 375
375 #ifndef NDEBUG 376 #ifndef NDEBUG
376 // Outside the WebCore namespace for ease of invocation from gdb. 377 // Outside the WebCore namespace for ease of invocation from gdb.
377 void showTree(const WebCore::InlineFlowBox*); 378 void showTree(const WebCore::InlineFlowBox*);
378 #endif 379 #endif
379 380
380 #endif // InlineFlowBox_h 381 #endif // InlineFlowBox_h
OLDNEW
« no previous file with comments | « no previous file | Source/core/rendering/InlineFlowBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698