diff options
| author | Ben Murdoch <benm@google.com> | 2010-06-15 19:36:43 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-06-16 14:52:28 +0100 |
| commit | 545e470e52f0ac6a3a072bf559c796b42c6066b6 (patch) | |
| tree | c0c14763654d84d37577dde512c3d3b4699a9e86 /WebCore/rendering/RenderLayerCompositor.cpp | |
| parent | 719298a66237d38ea5c05f1547123ad8aacbc237 (diff) | |
| download | external_webkit-545e470e52f0ac6a3a072bf559c796b42c6066b6.zip external_webkit-545e470e52f0ac6a3a072bf559c796b42c6066b6.tar.gz external_webkit-545e470e52f0ac6a3a072bf559c796b42c6066b6.tar.bz2 | |
Merge webkit.org at r61121: Initial merge by git.
Change-Id: Icd6db395c62285be384d137164d95d7466c98760
Diffstat (limited to 'WebCore/rendering/RenderLayerCompositor.cpp')
| -rw-r--r-- | WebCore/rendering/RenderLayerCompositor.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/WebCore/rendering/RenderLayerCompositor.cpp b/WebCore/rendering/RenderLayerCompositor.cpp index ff6e3b2..f68623b 100644 --- a/WebCore/rendering/RenderLayerCompositor.cpp +++ b/WebCore/rendering/RenderLayerCompositor.cpp @@ -29,19 +29,16 @@ #include "RenderLayerCompositor.h" #include "AnimationController.h" +#include "CSSPropertyNames.h" #include "Chrome.h" #include "ChromeClient.h" -#include "CSSPropertyNames.h" #include "Frame.h" #include "FrameView.h" #include "GraphicsLayer.h" -#include "HitTestResult.h" #include "HTMLCanvasElement.h" #include "HTMLIFrameElement.h" -#if ENABLE(PLUGIN_PROXY_FOR_VIDEO) -#include "HTMLMediaElement.h" #include "HTMLNames.h" -#endif +#include "HitTestResult.h" #include "NodeList.h" #include "Page.h" #include "RenderEmbeddedObject.h" @@ -52,6 +49,10 @@ #include "RenderView.h" #include "Settings.h" +#if ENABLE(PLUGIN_PROXY_FOR_VIDEO) +#include "HTMLMediaElement.h" +#endif + #if PROFILE_LAYER_REBUILD #include <wtf/CurrentTime.h> #endif @@ -1439,7 +1440,8 @@ void RenderLayerCompositor::detachRootPlatformLayer() else m_rootPlatformLayer->removeFromParent(); - m_renderView->document()->ownerElement()->setNeedsStyleRecalc(SyntheticStyleChange); + if (Element* ownerElement = m_renderView->document()->ownerElement()) + ownerElement->setNeedsStyleRecalc(SyntheticStyleChange); break; } case RootLayerAttachedViaChromeClient: { |