| 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 a6eb08c90026831a612b1702c4efbbc3e121d360..ba89543cfd6662f783791330608f90e54858877f 100644
|
| --- a/third_party/WebKit/Source/core/paint/FramePainter.cpp
|
| +++ b/third_party/WebKit/Source/core/paint/FramePainter.cpp
|
| @@ -111,8 +111,10 @@ void FramePainter::paintContents(GraphicsContext& context, const GlobalPaintFlag
|
| return;
|
| }
|
|
|
| - RELEASE_ASSERT(!frameView().needsLayout());
|
| - ASSERT(document->lifecycle().state() >= DocumentLifecycle::CompositingClean);
|
| + if (!frameView().shouldThrottleRendering()) {
|
| + RELEASE_ASSERT(!frameView().needsLayout());
|
| + ASSERT(document->lifecycle().state() >= DocumentLifecycle::CompositingClean);
|
| + }
|
|
|
| TRACE_EVENT1("devtools.timeline", "Paint", "data", InspectorPaintEvent::data(layoutView, LayoutRect(rect), 0));
|
|
|
| @@ -133,7 +135,8 @@ void FramePainter::paintContents(GraphicsContext& context, const GlobalPaintFlag
|
| PaintLayer* rootLayer = layoutView->layer();
|
|
|
| #if ENABLE(ASSERT)
|
| - layoutView->assertSubtreeIsLaidOut();
|
| + if (!frameView().shouldThrottleRendering())
|
| + layoutView->assertSubtreeIsLaidOut();
|
| LayoutObject::SetLayoutNeededForbiddenScope forbidSetNeedsLayout(*rootLayer->layoutObject());
|
| #endif
|
|
|
|
|