summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/dom
diff options
context:
space:
mode:
authorTeng-Hui Zhu <ztenghui@google.com>2011-11-08 13:34:17 -0800
committerTeng-Hui Zhu <ztenghui@google.com>2011-11-08 13:59:03 -0800
commite3d77c52e8f23ab60ffe00b4c99dc8457540b39e (patch)
treef2eb82ec849101a20a8357c848df8fd2a1b3089a /Source/WebCore/dom
parent8852b0905b1a50ca045eb4bd19b2589aad663b5c (diff)
downloadexternal_webkit-e3d77c52e8f23ab60ffe00b4c99dc8457540b39e.zip
external_webkit-e3d77c52e8f23ab60ffe00b4c99dc8457540b39e.tar.gz
external_webkit-e3d77c52e8f23ab60ffe00b4c99dc8457540b39e.tar.bz2
Add necessary null pointer check to avoid crash on youtube video
bug:5562347 Change-Id: I9b53a58137d70955bde5334c7c8b581343a8c2ce
Diffstat (limited to 'Source/WebCore/dom')
-rw-r--r--Source/WebCore/dom/Document.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
index d85a949..6e21dc3 100644
--- a/Source/WebCore/dom/Document.cpp
+++ b/Source/WebCore/dom/Document.cpp
@@ -4902,6 +4902,10 @@ void Document::webkitWillEnterFullScreenForElement(Element* element)
m_fullScreenRenderer->setAnimating(true);
#if USE(ACCELERATED_COMPOSITING)
view()->updateCompositingLayers();
+#if PLATFORM(ANDROID)
+ if (!m_fullScreenRenderer->layer())
+ return;
+#endif
if (m_fullScreenRenderer->layer()->isComposited())
page()->chrome()->client()->setRootFullScreenLayer(m_fullScreenRenderer->layer()->backing()->graphicsLayer());
#endif