summaryrefslogtreecommitdiffstats
path: root/WebKit
diff options
context:
space:
mode:
authorNicolas Roard <nicolas@android.com>2010-10-18 10:27:00 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-18 10:27:00 -0700
commitc79cedac9aa9e2d06331d855d654d63fc5165019 (patch)
tree497718b06bab9b9e5e60f160faf633b6f563397b /WebKit
parente4f471f5ba8f8131ef446dc75407155081b22308 (diff)
parent7d095dd5f96c8f68593ba0e848e5e26bb3785e5d (diff)
downloadexternal_webkit-c79cedac9aa9e2d06331d855d654d63fc5165019.zip
external_webkit-c79cedac9aa9e2d06331d855d654d63fc5165019.tar.gz
external_webkit-c79cedac9aa9e2d06331d855d654d63fc5165019.tar.bz2
am 7d095dd5: fix the pause() problem...
Merge commit '7d095dd5f96c8f68593ba0e848e5e26bb3785e5d' into gingerbread-plus-aosp * commit '7d095dd5f96c8f68593ba0e848e5e26bb3785e5d': fix the pause() problem...
Diffstat (limited to 'WebKit')
-rw-r--r--WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp b/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp
index b066511..f3937bf 100644
--- a/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp
+++ b/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp
@@ -332,6 +332,7 @@ public:
if (!m_glue->m_javaProxy)
return;
+ m_paused = false;
env->CallVoidMethod(m_glue->m_javaProxy, m_glue->m_play);
checkException(env);
}