Index: third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp |
diff --git a/third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp b/third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp |
index baf3d27720456b3f719e72ce4b3c3e22aa3c312f..afe1f47d2806ad0f2cfc5ec473d4156833d8c7d5 100644 |
--- a/third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp |
+++ b/third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp |
@@ -205,7 +205,7 @@ void PaintLayerCompositor::updateIfNeededRecursive() |
// It's possible for trusted Pepper plugins to force hit testing in situations where |
// the frame tree is in an inconsistent state, such as in the middle of frame detach. |
// TODO(bbudge) Remove this check when trusted Pepper plugins are gone. |
- if (localFrame->document()->isActive()) |
+ if (localFrame->document()->isActive() && localFrame->contentLayoutObject()) |
localFrame->contentLayoutObject()->compositor()->updateIfNeededRecursive(); |
} |