Title: [129244] trunk/Source/WebCore
- Revision
- 129244
- Author
- [email protected]
- Date
- 2012-09-21 12:24:04 -0700 (Fri, 21 Sep 2012)
Log Message
[BlackBerry] HTML5 media does not handle SSL certificate failures
https://bugs.webkit.org/show_bug.cgi?id=93324
Patch by Jonathan Dong <[email protected]> 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 <[email protected]>.
No new tests since there's no functional change.
* platform/graphics/blackberry/MediaPlayerPrivateBlackBerry.cpp:
(WebCore::MediaPlayerPrivate::load):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (129243 => 129244)
--- trunk/Source/WebCore/ChangeLog 2012-09-21 18:47:16 UTC (rev 129243)
+++ trunk/Source/WebCore/ChangeLog 2012-09-21 19:24:04 UTC (rev 129244)
@@ -1,3 +1,23 @@
+2012-09-21 Jonathan Dong <[email protected]>
+
+ [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 <[email protected]>.
+
+ No new tests since there's no functional change.
+
+ * platform/graphics/blackberry/MediaPlayerPrivateBlackBerry.cpp:
+ (WebCore::MediaPlayerPrivate::load):
+
2012-09-21 Evan Wallace <[email protected]>
[WebSocket] Receiving a large message is really slow
Modified: trunk/Source/WebCore/platform/graphics/blackberry/MediaPlayerPrivateBlackBerry.cpp (129243 => 129244)
--- trunk/Source/WebCore/platform/graphics/blackberry/MediaPlayerPrivateBlackBerry.cpp 2012-09-21 18:47:16 UTC (rev 129243)
+++ trunk/Source/WebCore/platform/graphics/blackberry/MediaPlayerPrivateBlackBerry.cpp 2012-09-21 19:24:04 UTC (rev 129244)
@@ -151,6 +151,7 @@
}
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 @@
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()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
