diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2012-05-25 15:53:43 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-25 15:53:43 -0700 |
| commit | 5ac11a7ed87ada91c7930bb6aa7b32007acb3d47 (patch) | |
| tree | 60a1b0c70c4064d87ceb27ecb27a4e96d17a5054 /Source/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp | |
| parent | 9f135757e8b023aebf41ae81221f66abc1461fb4 (diff) | |
| parent | 7ccd39ae7686965308d0920517865ec5f8d0ee21 (diff) | |
| download | external_webkit-5ac11a7ed87ada91c7930bb6aa7b32007acb3d47.zip external_webkit-5ac11a7ed87ada91c7930bb6aa7b32007acb3d47.tar.gz external_webkit-5ac11a7ed87ada91c7930bb6aa7b32007acb3d47.tar.bz2 | |
Merge "Fix a browser crash related to HTML5 video." into jb-dev
Diffstat (limited to 'Source/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp')
| -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(); |