Title: [137210] trunk/Source/WebKit/blackberry
- Revision
- 137210
- Author
- [email protected]
- Date
- 2012-12-10 14:57:42 -0800 (Mon, 10 Dec 2012)
Log Message
[BlackBerry] Flash content is being rendered as garbled characters when Flashplayer is disabled
https://bugs.webkit.org/show_bug.cgi?id=104505
Patch by Max Feil <[email protected]> on 2012-12-10
Reviewed by Antonio Gomes.
The check to allow video and audio as the source of embed and
object elements is causing a problem when the Flashplayer plugin
is disabled. We have to take Flash content into account in this
check otherwise the swf contents will be rendered as garbled
text characters where there should just be blank space.
* WebCoreSupport/FrameLoaderClientBlackBerry.cpp:
(WebCore::FrameLoaderClientBlackBerry::createPlugin):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/ChangeLog (137209 => 137210)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-12-10 22:53:45 UTC (rev 137209)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-12-10 22:57:42 UTC (rev 137210)
@@ -1,3 +1,19 @@
+2012-12-10 Max Feil <[email protected]>
+
+ [BlackBerry] Flash content is being rendered as garbled characters when Flashplayer is disabled
+ https://bugs.webkit.org/show_bug.cgi?id=104505
+
+ Reviewed by Antonio Gomes.
+
+ The check to allow video and audio as the source of embed and
+ object elements is causing a problem when the Flashplayer plugin
+ is disabled. We have to take Flash content into account in this
+ check otherwise the swf contents will be rendered as garbled
+ text characters where there should just be blank space.
+
+ * WebCoreSupport/FrameLoaderClientBlackBerry.cpp:
+ (WebCore::FrameLoaderClientBlackBerry::createPlugin):
+
2012-12-10 Parth Patel <[email protected]>
[BlackBerry] Make hiddenPageDomTimerInterval a setting
Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp (137209 => 137210)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp 2012-12-10 22:53:45 UTC (rev 137209)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp 2012-12-10 22:57:42 UTC (rev 137210)
@@ -344,8 +344,14 @@
if (PluginDatabase::installedPlugins()->isMIMETypeRegistered(mimeType))
return PluginView::create(m_frame, pluginSize, element, url, paramNames, paramValues, mimeType, loadManually);
- // If it's not the plugin type we support, try load directly from browser.
- if (m_frame->loader() && m_frame->loader()->subframeLoader() && !url.isNull())
+ // This is not a plugin type that is currently supported or enabled. Try
+ // to load the url directly. This check is performed to allow video and
+ // audio to be referenced as the source of embed or object elements.
+ // For media of this kind the mime type passed into this function
+ // will generally be a valid media mime type, or it may be null. We
+ // explicitly check for Flash content so it does not get rendered as
+ // text at this point, producing garbled characters.
+ if (mimeType != "application/x-shockwave-flash" && m_frame->loader() && m_frame->loader()->subframeLoader() && !url.isNull())
m_frame->loader()->subframeLoader()->requestFrame(element, url, String());
return 0;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
