From 45e221ad80c1e62dfd4862da412ab37491517fa9 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Mon, 20 Dec 2010 13:13:53 +0000 Subject: Only download the same poster URL once. WebKit r64884 introduced code that calls setPoster multiple times. On Android this causes the Java side to attempt to download the poster many times which for a long video results in OOM. So if the poster hasn't changed, don't try to download it again. Bug:3277303 Change-Id: Ia401b78cf250af2c1fe0e600dea6d1da0971912a --- WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp b/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp index bdae711..d3e9f9a 100644 --- a/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp +++ b/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp @@ -186,6 +186,9 @@ public: } bool canLoadPoster() const { return true; } void setPoster(const String& url) { + if (m_posterUrl == url) + return; + m_posterUrl = url; JNIEnv* env = JSC::Bindings::getJNIEnv(); if (!env || !m_glue->m_javaProxy || !m_posterUrl.length()) -- cgit v1.1