| Index: third_party/WebKit/Source/platform/graphics/ContentLayerDelegate.cpp
|
| diff --git a/third_party/WebKit/Source/platform/graphics/ContentLayerDelegate.cpp b/third_party/WebKit/Source/platform/graphics/ContentLayerDelegate.cpp
|
| index 2481727fe647d2ffd5bc104164df3f649abfceae..b5864e3e57b2841ad1c46deb3b0b26cb1dddf4bb 100644
|
| --- a/third_party/WebKit/Source/platform/graphics/ContentLayerDelegate.cpp
|
| +++ b/third_party/WebKit/Source/platform/graphics/ContentLayerDelegate.cpp
|
| @@ -93,8 +93,14 @@ void ContentLayerDelegate::paintContents(
|
| || paintingControl == WebContentLayerClient::DisplayListConstructionDisabled)
|
| disabledMode = GraphicsContext::FullyDisabled;
|
|
|
| - m_graphicsLayer->paint(nullptr, disabledMode);
|
| + // Anything other than PaintDefaultBehavior is for testing. In non-testing scenarios,
|
| + // it is an error to call GraphicsLayer::paint. Actual painting occurs in FrameView::synchronizedPaint;
|
| + // this method merely copies the painted output to the WebDisplayItemList.
|
| + if (paintingControl != PaintDefaultBehavior)
|
| + m_graphicsLayer->paint(nullptr, disabledMode);
|
| +
|
| paintArtifactToWebDisplayItemList(webDisplayItemList, m_graphicsLayer, paintController.paintArtifact(), paintableRegion());
|
| +
|
| paintController.setDisplayItemConstructionIsDisabled(false);
|
| paintController.setSubsequenceCachingIsDisabled(false);
|
| }
|
|
|