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

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

Issue 1422493003: Change Widget subclasses to use a CullRect instead of an IntRect for painting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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
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/LayoutObjectDrawingRecorder.h" 10 #include "core/paint/LayoutObjectDrawingRecorder.h"
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 LayoutPoint adjustedPaintOffset = paintOffset + m_layoutPart.location(); 100 LayoutPoint adjustedPaintOffset = paintOffset + m_layoutPart.location();
101 101
102 Widget* widget = m_layoutPart.widget(); 102 Widget* widget = m_layoutPart.widget();
103 RELEASE_ASSERT(widget); 103 RELEASE_ASSERT(widget);
104 104
105 // Tell the widget to paint now. This is the only time the widget is allowed 105 // Tell the widget to paint now. This is the only time the widget is allowed
106 // to paint itself. That way it will composite properly with z-indexed layer s. 106 // to paint itself. That way it will composite properly with z-indexed layer s.
107 IntPoint widgetLocation = widget->frameRect().location(); 107 IntPoint widgetLocation = widget->frameRect().location();
108 IntPoint paintLocation(roundToInt(adjustedPaintOffset.x() + m_layoutPart.bor derLeft() + m_layoutPart.paddingLeft()), 108 IntPoint paintLocation(roundToInt(adjustedPaintOffset.x() + m_layoutPart.bor derLeft() + m_layoutPart.paddingLeft()),
109 roundToInt(adjustedPaintOffset.y() + m_layoutPart.borderTop() + m_layout Part.paddingTop())); 109 roundToInt(adjustedPaintOffset.y() + m_layoutPart.borderTop() + m_layout Part.paddingTop()));
110 IntRect paintRect = paintInfo.cullRect().m_rect;
111 110
112 IntSize widgetPaintOffset = paintLocation - widgetLocation; 111 IntSize widgetPaintOffset = paintLocation - widgetLocation;
113 // When painting widgets into compositing layers, tx and ty are relative to the enclosing compositing layer, 112 // When painting widgets into compositing layers, tx and ty are relative to the enclosing compositing layer,
114 // not the root. In this case, shift the CTM and adjust the paintRect to be root-relative to fix plugin drawing. 113 // not the root. In this case, shift the CTM and adjust the CullRect to be r oot-relative to fix plugin drawing.
115 TransformRecorder transform(*paintInfo.context, m_layoutPart, 114 TransformRecorder transform(*paintInfo.context, m_layoutPart,
116 AffineTransform::translation(widgetPaintOffset.width(), widgetPaintOffse t.height())); 115 AffineTransform::translation(widgetPaintOffset.width(), widgetPaintOffse t.height()));
117 paintRect.move(-widgetPaintOffset); 116
118 widget->paint(paintInfo.context, paintRect); 117 CullRect adjustedCullRect(paintInfo.cullRect(), -widgetPaintOffset);
118 widget->paint(paintInfo.context, adjustedCullRect);
119 } 119 }
120 120
121 } // namespace blink 121 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/paint/PaintInfo.cpp ('k') | third_party/WebKit/Source/core/paint/ScrollableAreaPainter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698