diff options
| -rw-r--r-- | WebCore/Android.derived.v8bindings.mk | 3 | ||||
| -rw-r--r-- | WebCore/html/HTMLMediaElement.cpp | 2 | ||||
| -rw-r--r-- | WebCore/platform/android/FileSystemAndroid.cpp | 14 | ||||
| -rw-r--r-- | WebCore/platform/posix/FileSystemPOSIX.cpp | 2 | ||||
| -rw-r--r-- | WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp | 1 |
5 files changed, 4 insertions, 18 deletions
diff --git a/WebCore/Android.derived.v8bindings.mk b/WebCore/Android.derived.v8bindings.mk index 8d99043..efc4ebf 100644 --- a/WebCore/Android.derived.v8bindings.mk +++ b/WebCore/Android.derived.v8bindings.mk @@ -31,7 +31,8 @@ js_binding_scripts := \ $(LOCAL_PATH)/bindings/scripts/generate-bindings.pl # Add ACCELERATED_COMPOSITING=1 and ENABLE_3D_RENDERING=1 for layers support -FEATURE_DEFINES := ENABLE_ORIENTATION_EVENTS=1 ENABLE_TOUCH_EVENTS=1 V8_BINDING ENABLE_DATABASE=1 ENABLE_OFFLINE_WEB_APPLICATIONS=1 ENABLE_DOM_STORAGE=1 ENABLE_VIDEO=1 ENABLE_GEOLOCATION=1 ENABLE_CONNECTION=1 ENABLE_APPLICATION_INSTALLED=1 ENABLE_XPATH=1 ENABLE_XSLT=1 +FEATURE_DEFINES := ENABLE_ORIENTATION_EVENTS=1 ENABLE_TOUCH_EVENTS=1 ENABLE_DATABASE=1 ENABLE_OFFLINE_WEB_APPLICATIONS=1 ENABLE_DOM_STORAGE=1 ENABLE_VIDEO=1 ENABLE_GEOLOCATION=1 ENABLE_CONNECTION=1 ENABLE_APPLICATION_INSTALLED=1 ENABLE_XPATH=1 ENABLE_XSLT=1 +FEATURE_DEFINES += V8_BINDING # CSS GEN := \ diff --git a/WebCore/html/HTMLMediaElement.cpp b/WebCore/html/HTMLMediaElement.cpp index 20fa7f8..e8ab4e6 100644 --- a/WebCore/html/HTMLMediaElement.cpp +++ b/WebCore/html/HTMLMediaElement.cpp @@ -628,13 +628,13 @@ void HTMLMediaElement::loadResource(const KURL& initialURL, ContentType& content m_player->setPreservesPitch(m_webkitPreservesPitch); updateVolume(); - m_player->load(m_currentSrc, contentType); #if PLATFORM(ANDROID) if (isVideo()) m_player->setMediaElementType(MediaPlayer::Video); else m_player->setMediaElementType(MediaPlayer::Audio); #endif + m_player->load(m_currentSrc, contentType); if (isVideo() && m_player->canLoadPoster()) { KURL posterUrl = poster(); diff --git a/WebCore/platform/android/FileSystemAndroid.cpp b/WebCore/platform/android/FileSystemAndroid.cpp index 8a9777d..3d841d7 100644 --- a/WebCore/platform/android/FileSystemAndroid.cpp +++ b/WebCore/platform/android/FileSystemAndroid.cpp @@ -75,20 +75,6 @@ bool unloadModule(PlatformModule module) return !dlclose(module); } -int writeToFile(PlatformFileHandle handle, const char* data, int length) -{ - int totalBytesWritten = 0; - while (totalBytesWritten < length) { - int bytesWritten = write(handle, data, (size_t)(length - totalBytesWritten)); - if (bytesWritten < 0 && errno != EINTR) - return -1; - if (bytesWritten > 0) - totalBytesWritten += bytesWritten; - } - - return totalBytesWritten; -} - String homeDirectoryPath() { return sPluginPath; diff --git a/WebCore/platform/posix/FileSystemPOSIX.cpp b/WebCore/platform/posix/FileSystemPOSIX.cpp index ba17d39..ac8c7fa 100644 --- a/WebCore/platform/posix/FileSystemPOSIX.cpp +++ b/WebCore/platform/posix/FileSystemPOSIX.cpp @@ -116,7 +116,6 @@ bool truncateFile(PlatformFileHandle handle, long long offset) return !ftruncate(handle, offset); } -#if !PLATFORM(ANDROID) int writeToFile(PlatformFileHandle handle, const char* data, int length) { do { @@ -126,7 +125,6 @@ int writeToFile(PlatformFileHandle handle, const char* data, int length) } while (errno == EINTR); return -1; } -#endif int readFromFile(PlatformFileHandle handle, char* data, int length) { diff --git a/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp b/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp index 7c0bb24..6224707 100644 --- a/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp +++ b/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp @@ -325,6 +325,7 @@ public: if (!m_glue->m_javaProxy) return; + m_paused = false; env->CallVoidMethod(m_glue->m_javaProxy, m_glue->m_play); checkException(env); } |