Commit ac50457e authored by commit-queue@webkit.org's avatar commit-queue@webkit.org
Browse files

[BlackBerry] HTML5 media does not handle SSL certificate failures

https://bugs.webkit.org/show_bug.cgi?id=93324

Patch by Jonathan Dong <jonathan.dong@torchmobile.com.cn> on 2012-09-21
Reviewed by Eric Carlson.

RIM PR: 116205
Passed FrameLoaderClientBlackBerry's playerId to MMRPlayer::load()
because MMRPlayer::load() added playerId as a new parameter, which
is required to initiate a MediaSSLHandlerStream to deal with
certificate failure when loading a "https" media url.

Internally reviewed by Joe Mason <jmason@rim.com>.

No new tests since there's no functional change.

* platform/graphics/blackberry/MediaPlayerPrivateBlackBerry.cpp:
(WebCore::MediaPlayerPrivate::load):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@129244 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent faef3c50
2012-09-21 Jonathan Dong <jonathan.dong@torchmobile.com.cn>
[BlackBerry] HTML5 media does not handle SSL certificate failures
https://bugs.webkit.org/show_bug.cgi?id=93324
Reviewed by Eric Carlson.
RIM PR: 116205
Passed FrameLoaderClientBlackBerry's playerId to MMRPlayer::load()
because MMRPlayer::load() added playerId as a new parameter, which
is required to initiate a MediaSSLHandlerStream to deal with
certificate failure when loading a "https" media url.
Internally reviewed by Joe Mason <jmason@rim.com>.
No new tests since there's no functional change.
* platform/graphics/blackberry/MediaPlayerPrivateBlackBerry.cpp:
(WebCore::MediaPlayerPrivate::load):
2012-09-21 Evan Wallace <evan.exe@gmail.com>
 
[WebSocket] Receiving a large message is really slow
......@@ -151,6 +151,7 @@ void MediaPlayerPrivate::load(const String& url)
}
void* tabId = m_webCorePlayer->mediaPlayerClient()->mediaPlayerHostWindow()->platformPageClient();
int playerID = m_webCorePlayer->mediaPlayerClient()->mediaPlayerHostWindow()->platformPageClient()->playerID();
deleteGuardedObject(m_platformPlayer);
#if USE(ACCELERATED_COMPOSITING)
......@@ -163,9 +164,9 @@ void MediaPlayerPrivate::load(const String& url)
if (!url.isEmpty())
cookiePairs = cookieManager().getCookie(KURL(ParsedURLString, url.utf8().data()), WithHttpOnlyCookies);
if (!cookiePairs.isEmpty() && cookiePairs.utf8().data())
m_platformPlayer->load(modifiedUrl.utf8().data(), m_webCorePlayer->userAgent().utf8().data(), cookiePairs.utf8().data());
m_platformPlayer->load(playerID, modifiedUrl.utf8().data(), m_webCorePlayer->userAgent().utf8().data(), cookiePairs.utf8().data());
else
m_platformPlayer->load(modifiedUrl.utf8().data(), m_webCorePlayer->userAgent().utf8().data(), 0);
m_platformPlayer->load(playerID, modifiedUrl.utf8().data(), m_webCorePlayer->userAgent().utf8().data(), 0);
}
void MediaPlayerPrivate::cancelLoad()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment