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

Side by Side Diff: Source/core/paint/PartPainter.cpp

Issue 1316163002: Make the LayoutRect->FloatRect constructor explicit. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "core/paint/PartPainter.h" 6 #include "core/paint/PartPainter.h"
7 7
8 #include "core/layout/LayoutPart.h" 8 #include "core/layout/LayoutPart.h"
9 #include "core/paint/BoxPainter.h" 9 #include "core/paint/BoxPainter.h"
10 #include "core/paint/DeprecatedPaintLayer.h" 10 #include "core/paint/DeprecatedPaintLayer.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 60
61 if (m_layoutPart.widget()) 61 if (m_layoutPart.widget())
62 m_layoutPart.paintContents(paintInfo, paintOffset); 62 m_layoutPart.paintContents(paintInfo, paintOffset);
63 } 63 }
64 64
65 // Paint a partially transparent wash over selected widgets. 65 // Paint a partially transparent wash over selected widgets.
66 if (m_layoutPart.isSelected() && !paintInfo.isPrinting() && !LayoutObjectDra wingRecorder::useCachedDrawingIfPossible(*paintInfo.context, m_layoutPart, paint Info.phase)) { 66 if (m_layoutPart.isSelected() && !paintInfo.isPrinting() && !LayoutObjectDra wingRecorder::useCachedDrawingIfPossible(*paintInfo.context, m_layoutPart, paint Info.phase)) {
67 LayoutRect rect = m_layoutPart.localSelectionRect(); 67 LayoutRect rect = m_layoutPart.localSelectionRect();
68 rect.moveBy(adjustedPaintOffset); 68 rect.moveBy(adjustedPaintOffset);
69 IntRect selectionRect = pixelSnappedIntRect(rect); 69 IntRect selectionRect = pixelSnappedIntRect(rect);
70 LayoutObjectDrawingRecorder drawingRecorder(*paintInfo.context, m_layout Part, paintInfo.phase, selectionRect); 70 LayoutObjectDrawingRecorder drawingRecorder(*paintInfo.context, m_layout Part, paintInfo.phase, LayoutRect(selectionRect));
jbroman 2015/08/26 21:45:08 ditto
chrishtr 2015/08/26 22:32:21 Done.
71 paintInfo.context->fillRect(selectionRect, m_layoutPart.selectionBackgro undColor()); 71 paintInfo.context->fillRect(selectionRect, m_layoutPart.selectionBackgro undColor());
72 } 72 }
73 73
74 if (m_layoutPart.canResize()) 74 if (m_layoutPart.canResize())
75 ScrollableAreaPainter(*m_layoutPart.layer()->scrollableArea()).paintResi zer(paintInfo.context, roundedIntPoint(adjustedPaintOffset), paintInfo.rect); 75 ScrollableAreaPainter(*m_layoutPart.layer()->scrollableArea()).paintResi zer(paintInfo.context, roundedIntPoint(adjustedPaintOffset), paintInfo.rect);
76 } 76 }
77 77
78 void PartPainter::paintContents(const PaintInfo& paintInfo, const LayoutPoint& p aintOffset) 78 void PartPainter::paintContents(const PaintInfo& paintInfo, const LayoutPoint& p aintOffset)
79 { 79 {
80 LayoutPoint adjustedPaintOffset = paintOffset + m_layoutPart.location(); 80 LayoutPoint adjustedPaintOffset = paintOffset + m_layoutPart.location();
(...skipping 11 matching lines...) Expand all
92 IntSize widgetPaintOffset = paintLocation - widgetLocation; 92 IntSize widgetPaintOffset = paintLocation - widgetLocation;
93 // When painting widgets into compositing layers, tx and ty are relative to the enclosing compositing layer, 93 // When painting widgets into compositing layers, tx and ty are relative to the enclosing compositing layer,
94 // not the root. In this case, shift the CTM and adjust the paintRect to be root-relative to fix plugin drawing. 94 // not the root. In this case, shift the CTM and adjust the paintRect to be root-relative to fix plugin drawing.
95 TransformRecorder transform(*paintInfo.context, m_layoutPart, 95 TransformRecorder transform(*paintInfo.context, m_layoutPart,
96 AffineTransform::translation(widgetPaintOffset.width(), widgetPaintOffse t.height())); 96 AffineTransform::translation(widgetPaintOffset.width(), widgetPaintOffse t.height()));
97 paintRect.move(-widgetPaintOffset); 97 paintRect.move(-widgetPaintOffset);
98 widget->paint(paintInfo.context, paintRect); 98 widget->paint(paintInfo.context, paintRect);
99 } 99 }
100 100
101 } // namespace blink 101 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698