diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2012-05-25 16:00:49 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-25 16:00:49 -0700 |
| commit | 346a98b94013732b09cdcfa70bc86608c1ba1195 (patch) | |
| tree | 1bf8577bc02ab256f0987a12c8d58c33c360117c | |
| parent | 4907256ca6f46380d8f2143cd6c644ce13c69838 (diff) | |
| parent | 05506155eaa4e4528ea3d2b05e6953677c6d3205 (diff) | |
| download | external_webkit-346a98b94013732b09cdcfa70bc86608c1ba1195.zip external_webkit-346a98b94013732b09cdcfa70bc86608c1ba1195.tar.gz external_webkit-346a98b94013732b09cdcfa70bc86608c1ba1195.tar.bz2 | |
am 05506155: am 5ac11a7e: Merge "Fix a browser crash related to HTML5 video." into jb-dev
* commit '05506155eaa4e4528ea3d2b05e6953677c6d3205':
Fix a browser crash related to HTML5 video.
| -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 155b841..1607b0e 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" @@ -224,11 +220,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(); |