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

Unified Diff: third_party/WebKit/Source/core/paint/FramePainter.cpp

Issue 2322073006: Turn off the old compositing path for SPv2. (Closed)
Patch Set: none Created 4 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/paint/FramePainter.cpp
diff --git a/third_party/WebKit/Source/core/paint/FramePainter.cpp b/third_party/WebKit/Source/core/paint/FramePainter.cpp
index 436dd0fb75d1da83426222ef76a93a4de1d2c16c..54124d2cd77f5f69725f715643354994784664de 100644
--- a/third_party/WebKit/Source/core/paint/FramePainter.cpp
+++ b/third_party/WebKit/Source/core/paint/FramePainter.cpp
@@ -49,8 +49,13 @@ void FramePainter::paint(GraphicsContext& context, const GlobalPaintFlags global
TransformPaintPropertyNode* transform = m_frameView->scrollTranslation() ? m_frameView->scrollTranslation() : m_frameView->preTranslation();
ClipPaintPropertyNode* clip = m_frameView->contentClip();
ScrollPaintPropertyNode* scroll = m_frameView->scroll();
+ PaintChunkProperties properties(context.getPaintController().currentPaintChunkProperties());
+ if (frameView().frame().isLocalRoot()) {
pdr. 2016/09/21 20:56:31 Why was this needed?
chrishtr 2016/09/21 21:08:50 Without this, it could be that painting occurred o
+ properties.transform = frameView().rootTransform();
+ properties.clip = frameView().rootClip();
+ properties.effect = frameView().rootEffect();
+ }
if (transform || clip || scroll) {
- PaintChunkProperties properties(context.getPaintController().currentPaintChunkProperties());
if (transform)
properties.transform = transform;
if (scroll)
@@ -113,7 +118,7 @@ void FramePainter::paintContents(GraphicsContext& context, const GlobalPaintFlag
// TODO(wangxianzhu): The following check should be stricter, but currently this is blocked
// by the svg root issue (crbug.com/442939).
- ASSERT(document->lifecycle().state() >= DocumentLifecycle::CompositingClean);
+ DCHECK(document->lifecycle().state() >= DocumentLifecycle::CompositingClean);
TRACE_EVENT1("devtools.timeline,rail", "Paint", "data", InspectorPaintEvent::data(layoutView, LayoutRect(rect), 0));

Powered by Google App Engine
This is Rietveld 408576698