diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2011-11-08 16:20:56 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-08 16:20:56 -0800 |
| commit | c97291b2e7a966abf8dbad5cf2e0e8b033c3cd90 (patch) | |
| tree | 4262383a85face6851e5475839436b1478924b72 | |
| parent | b15d3e9d4201362f2617955b89fbd88ecbeb06c4 (diff) | |
| parent | e3d77c52e8f23ab60ffe00b4c99dc8457540b39e (diff) | |
| download | external_webkit-c97291b2e7a966abf8dbad5cf2e0e8b033c3cd90.zip external_webkit-c97291b2e7a966abf8dbad5cf2e0e8b033c3cd90.tar.gz external_webkit-c97291b2e7a966abf8dbad5cf2e0e8b033c3cd90.tar.bz2 | |
Merge "Add necessary null pointer check to avoid crash on youtube video" into ics-mr1
| -rw-r--r-- | Source/WebCore/dom/Document.cpp | 4 |
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 |