diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2011-11-10 00:04:04 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-10 00:04:04 +0000 |
| commit | 0b1dc3bbf36065e9b949578f61787c62a52cee00 (patch) | |
| tree | 73fc3b674e92d7f1f9f8ef3ad0236542c8e5d757 /Source/WebCore/dom | |
| parent | 44bed85f240ccdf65de028e6fe2832b390676d47 (diff) | |
| parent | c97291b2e7a966abf8dbad5cf2e0e8b033c3cd90 (diff) | |
| download | external_webkit-0b1dc3bbf36065e9b949578f61787c62a52cee00.zip external_webkit-0b1dc3bbf36065e9b949578f61787c62a52cee00.tar.gz external_webkit-0b1dc3bbf36065e9b949578f61787c62a52cee00.tar.bz2 | |
am c97291b2: Merge "Add necessary null pointer check to avoid crash on youtube video" into ics-mr1
* commit 'c97291b2e7a966abf8dbad5cf2e0e8b033c3cd90':
Add necessary null pointer check to avoid crash on youtube video
Diffstat (limited to 'Source/WebCore/dom')
| -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 |