| Index: third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp
|
| diff --git a/third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp b/third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp
|
| index 31bbc5ce6686a189fee7642cab51021b4cf8b961..4eea6f78262c52d2b8c3e944b6c5f97396298389 100644
|
| --- a/third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp
|
| +++ b/third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp
|
| @@ -4,6 +4,7 @@
|
|
|
| #include "core/paint/PaintLayerPainter.h"
|
|
|
| +#include "core/frame/FrameView.h"
|
| #include "core/frame/Settings.h"
|
| #include "core/layout/ClipPathOperation.h"
|
| #include "core/layout/LayoutBlock.h"
|
| @@ -80,8 +81,7 @@ PaintLayerPainter::PaintResult PaintLayerPainter::paintLayer(GraphicsContext& co
|
| if (shouldSuppressPaintingLayer(&m_paintLayer))
|
| return FullyPainted;
|
|
|
| - // TODO(skyostil): Unify this early-out logic with subsequence caching.
|
| - if (m_paintLayer.layoutObject()->isLayoutPart() && toLayoutPart(m_paintLayer.layoutObject())->isThrottledFrameView())
|
| + if (m_paintLayer.layoutObject()->isLayoutView() && toLayoutView(m_paintLayer.layoutObject())->frameView()->shouldThrottleRendering())
|
| return FullyPainted;
|
|
|
| // If this layer is totally invisible then there is nothing to paint.
|
| @@ -270,9 +270,8 @@ PaintLayerPainter::PaintResult PaintLayerPainter::paintLayerContents(GraphicsCon
|
| if (paintFlags & PaintLayerPaintingRootBackgroundOnly && !m_paintLayer.layoutObject()->isLayoutView() && !m_paintLayer.layoutObject()->isDocumentElement())
|
| return result;
|
|
|
| - // TODO(skyostil): Unify this early-out logic with subsequence caching.
|
| - if (m_paintLayer.layoutObject()->isLayoutPart() && toLayoutPart(m_paintLayer.layoutObject())->isThrottledFrameView())
|
| - return FullyPainted;
|
| + if (m_paintLayer.layoutObject()->isLayoutView() && toLayoutView(m_paintLayer.layoutObject())->frameView()->shouldThrottleRendering())
|
| + return result;
|
|
|
| // Ensure our lists are up-to-date.
|
| m_paintLayer.stackingNode()->updateLayerListsIfNeeded();
|
|
|