| Index: Source/core/frame/FrameView.cpp
|
| diff --git a/Source/core/frame/FrameView.cpp b/Source/core/frame/FrameView.cpp
|
| index aa145563f8de56b976758b8823ddee1cd60010d3..07a5ca8c15640b678e6aa2542b63d4c599dac680 100644
|
| --- a/Source/core/frame/FrameView.cpp
|
| +++ b/Source/core/frame/FrameView.cpp
|
| @@ -1096,11 +1096,13 @@ void FrameView::gatherDebugLayoutRects(RenderObject* layoutRoot)
|
| TRACE_EVENT_CATEGORY_GROUP_ENABLED(TRACE_DISABLED_BY_DEFAULT("blink.debug.layout"), &isTracing);
|
| if (!isTracing)
|
| return;
|
| - if (!layoutRoot->enclosingLayer()->hasCompositedLayerMapping())
|
| +
|
| + CompositedLayerMapping* compositedLayerMapping = layoutRoot->enclosingLayer()->compositedLayerMapping();
|
| + if (!compositedLayerMapping)
|
| return;
|
| // For access to compositedLayerMapping().
|
| DisableCompositingQueryAsserts disabler;
|
| - GraphicsLayer* graphicsLayer = layoutRoot->enclosingLayer()->compositedLayerMapping()->mainGraphicsLayer();
|
| + GraphicsLayer* graphicsLayer = compositedLayerMapping->mainGraphicsLayer();
|
| if (!graphicsLayer)
|
| return;
|
|
|
| @@ -1925,8 +1927,12 @@ void FrameView::setTransparent(bool isTransparent)
|
| {
|
| m_isTransparent = isTransparent;
|
| DisableCompositingQueryAsserts disabler;
|
| - if (renderView() && renderView()->layer()->hasCompositedLayerMapping())
|
| - renderView()->layer()->compositedLayerMapping()->updateContentsOpaque();
|
| +
|
| + if (!renderView())
|
| + return;
|
| +
|
| + if (CompositedLayerMapping* compositedLayerMapping = renderView()->layer()->compositedLayerMapping())
|
| + compositedLayerMapping->updateContentsOpaque();
|
| }
|
|
|
| bool FrameView::hasOpaqueBackground() const
|
| @@ -1943,11 +1949,12 @@ void FrameView::setBaseBackgroundColor(const Color& backgroundColor)
|
| {
|
| m_baseBackgroundColor = backgroundColor;
|
|
|
| - if (renderView() && renderView()->layer()->hasCompositedLayerMapping()) {
|
| - CompositedLayerMapping* compositedLayerMapping = renderView()->layer()->compositedLayerMapping();
|
| - compositedLayerMapping->updateContentsOpaque();
|
| - if (compositedLayerMapping->mainGraphicsLayer())
|
| - compositedLayerMapping->mainGraphicsLayer()->setNeedsDisplay();
|
| + if (renderView()) {
|
| + if (CompositedLayerMapping* compositedLayerMapping = renderView()->layer()->compositedLayerMapping()) {
|
| + compositedLayerMapping->updateContentsOpaque();
|
| + if (compositedLayerMapping->mainGraphicsLayer())
|
| + compositedLayerMapping->mainGraphicsLayer()->setNeedsDisplay();
|
| + }
|
| }
|
| recalculateScrollbarOverlayStyle();
|
| }
|
|
|