diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2012-05-25 14:42:28 -0700 |
|---|---|---|
| committer | Teng-Hui Zhu <ztenghui@google.com> | 2012-05-25 14:46:38 -0700 |
| commit | 7ccd39ae7686965308d0920517865ec5f8d0ee21 (patch) | |
| tree | 9c04f20324231193611c85d6a7448ad6135080da /Source/WebKit/android/WebCoreSupport | |
| parent | e5d2bf33ff91f1c00fb2ecd73879ba8d3a8298a7 (diff) | |
| download | external_webkit-7ccd39ae7686965308d0920517865ec5f8d0ee21.zip external_webkit-7ccd39ae7686965308d0920517865ec5f8d0ee21.tar.gz external_webkit-7ccd39ae7686965308d0920517865ec5f8d0ee21.tar.bz2 | |
Fix a browser crash related to HTML5 video.
This is in fact take out the previous change based on the assumption that we
only support fullscreen.
https://android-git.corp.google.com/g/#/c/91062/
The reason we don't need this early return is we use user gesture to block the
play() call which is not from user interaction.
bug:6555273
Change-Id: I7012a81138d03a4d95fa976bac12cce833996def
Diffstat (limited to 'Source/WebKit/android/WebCoreSupport')
| -rw-r--r-- | Source/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/Source/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp b/Source/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp index 52aeb23..a0e5c01 100644 --- a/Source/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp +++ b/Source/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp @@ -29,10 +29,6 @@ #if ENABLE(VIDEO) #include "BaseLayerAndroid.h" -#include "DocumentLoader.h" -#include "Frame.h" -#include "FrameLoader.h" -#include "FrameView.h" #include "GraphicsContext.h" #include "SkiaUtils.h" #include "TilesManager.h" @@ -219,11 +215,6 @@ public: if (!env || !m_url.length() || !m_glue->m_javaProxy) return; - // We only play video fullscreen on Android, so stop sites playing fullscreen video in the onload handler. - Frame* frame = m_player->frameView()->frame(); - if (frame && !frame->loader()->documentLoader()->wasOnloadHandled()) - return; - m_paused = false; m_player->playbackStateChanged(); |