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

Side by Side Diff: Source/core/rendering/RenderReplaced.cpp

Issue 559733005: Move painting code from RenderBoxModelObject into BoxPainter. (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/rendering/RenderObject.h ('k') | Source/core/rendering/RenderWidget.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 * Copyright (C) 2000 Dirk Mueller (mueller@kde.org) 3 * Copyright (C) 2000 Dirk Mueller (mueller@kde.org)
4 * Copyright (C) 2004, 2006, 2007 Apple Inc. All rights reserved. 4 * Copyright (C) 2004, 2006, 2007 Apple Inc. All rights reserved.
5 * Copyright (C) Research In Motion Limited 2011-2012. All rights reserved. 5 * Copyright (C) Research In Motion Limited 2011-2012. All rights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
11 * 11 *
12 * This library is distributed in the hope that it will be useful, 12 * This library is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15 * Library General Public License for more details. 15 * Library General Public License for more details.
16 * 16 *
17 * You should have received a copy of the GNU Library General Public License 17 * You should have received a copy of the GNU Library General Public License
18 * along with this library; see the file COPYING.LIB. If not, write to 18 * along with this library; see the file COPYING.LIB. If not, write to
19 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 19 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
20 * Boston, MA 02110-1301, USA. 20 * Boston, MA 02110-1301, USA.
21 * 21 *
22 */ 22 */
23 23
24 #include "config.h" 24 #include "config.h"
25 #include "core/rendering/RenderReplaced.h" 25 #include "core/rendering/RenderReplaced.h"
26 26
27 #include "core/editing/PositionWithAffinity.h" 27 #include "core/editing/PositionWithAffinity.h"
28 #include "core/paint/BoxPainter.h"
28 #include "core/rendering/GraphicsContextAnnotator.h" 29 #include "core/rendering/GraphicsContextAnnotator.h"
29 #include "core/rendering/RenderBlock.h" 30 #include "core/rendering/RenderBlock.h"
30 #include "core/rendering/RenderImage.h" 31 #include "core/rendering/RenderImage.h"
31 #include "core/rendering/RenderLayer.h" 32 #include "core/rendering/RenderLayer.h"
32 #include "core/rendering/RenderView.h" 33 #include "core/rendering/RenderView.h"
33 #include "platform/LengthFunctions.h" 34 #include "platform/LengthFunctions.h"
34 #include "platform/RuntimeEnabledFeatures.h" 35 #include "platform/RuntimeEnabledFeatures.h"
35 #include "platform/graphics/GraphicsContext.h" 36 #include "platform/graphics/GraphicsContext.h"
36 37
37 namespace blink { 38 namespace blink {
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 if (style()->hasBorderRadius()) { 142 if (style()->hasBorderRadius()) {
142 LayoutRect borderRect = LayoutRect(adjustedPaintOffset, size()); 143 LayoutRect borderRect = LayoutRect(adjustedPaintOffset, size());
143 144
144 if (borderRect.isEmpty()) 145 if (borderRect.isEmpty())
145 completelyClippedOut = true; 146 completelyClippedOut = true;
146 else { 147 else {
147 // Push a clip if we have a border radius, since we want to round th e foreground content that gets painted. 148 // Push a clip if we have a border radius, since we want to round th e foreground content that gets painted.
148 paintInfo.context->save(); 149 paintInfo.context->save();
149 RoundedRect roundedInnerRect = style()->getRoundedInnerBorderFor(pai ntRect, 150 RoundedRect roundedInnerRect = style()->getRoundedInnerBorderFor(pai ntRect,
150 paddingTop() + borderTop(), paddingBottom() + borderBottom(), pa ddingLeft() + borderLeft(), paddingRight() + borderRight(), true, true); 151 paddingTop() + borderTop(), paddingBottom() + borderBottom(), pa ddingLeft() + borderLeft(), paddingRight() + borderRight(), true, true);
151 clipRoundedInnerRect(paintInfo.context, paintRect, roundedInnerRect) ; 152 BoxPainter::clipRoundedInnerRect(paintInfo.context, paintRect, round edInnerRect);
152 } 153 }
153 } 154 }
154 155
155 if (!completelyClippedOut) { 156 if (!completelyClippedOut) {
156 if (paintInfo.phase == PaintPhaseClippingMask) { 157 if (paintInfo.phase == PaintPhaseClippingMask) {
157 paintClippingMask(paintInfo, adjustedPaintOffset); 158 paintClippingMask(paintInfo, adjustedPaintOffset);
158 } else { 159 } else {
159 paintReplaced(paintInfo, adjustedPaintOffset); 160 paintReplaced(paintInfo, adjustedPaintOffset);
160 } 161 }
161 162
(...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after
569 return LayoutRect(); 570 return LayoutRect();
570 571
571 // The selectionRect can project outside of the overflowRect, so take their union 572 // The selectionRect can project outside of the overflowRect, so take their union
572 // for paint invalidation to avoid selection painting glitches. 573 // for paint invalidation to avoid selection painting glitches.
573 LayoutRect r = isSelected() ? localSelectionRect() : visualOverflowRect(); 574 LayoutRect r = isSelected() ? localSelectionRect() : visualOverflowRect();
574 mapRectToPaintInvalidationBacking(paintInvalidationContainer, r, paintInvali dationState); 575 mapRectToPaintInvalidationBacking(paintInvalidationContainer, r, paintInvali dationState);
575 return r; 576 return r;
576 } 577 }
577 578
578 } 579 }
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderObject.h ('k') | Source/core/rendering/RenderWidget.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698