Title: [114849] trunk/Source/WebKit/blackberry
- Revision
- 114849
- Author
- [email protected]
- Date
- 2012-04-21 16:19:00 -0700 (Sat, 21 Apr 2012)
Log Message
Don't hard code the plugins that blackberry supports.
https://bugs.webkit.org/show_bug.cgi?id=84535
Use the existing PluginDatabase to query for the plugins we can handle.
The original implemention of FrameLoaderClientBlackBerry::createPlugin
was a partial copy from another port. In the Qt port there is some
workarounds for flash which is why this exists there. Sadly the bits
that were copied made it so only flash worked, but as flash was the only
plugin on the system this issue was not noticed until QNX tried to get
jnext working. Tracing it down to this bit of code rather then
correcting it they hardcoded the jnext into the same block as flash was.
The blackberry port isn't specifically suppose to only allow jnext and
flash, but was an accident due to the way this code was developed.
Patch by Benjamin C Meyer <[email protected]> on 2012-04-21
Reviewed by Adam Treat.
* WebCoreSupport/FrameLoaderClientBlackBerry.cpp:
(WebCore::FrameLoaderClientBlackBerry::createPlugin):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/ChangeLog (114848 => 114849)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-04-21 22:40:25 UTC (rev 114848)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-04-21 23:19:00 UTC (rev 114849)
@@ -1,3 +1,26 @@
+2012-04-21 Benjamin C Meyer <[email protected]>
+
+ Don't hard code the plugins that blackberry supports.
+ https://bugs.webkit.org/show_bug.cgi?id=84535
+
+ Use the existing PluginDatabase to query for the plugins we can handle.
+
+ The original implemention of FrameLoaderClientBlackBerry::createPlugin
+ was a partial copy from another port. In the Qt port there is some
+ workarounds for flash which is why this exists there. Sadly the bits
+ that were copied made it so only flash worked, but as flash was the only
+ plugin on the system this issue was not noticed until QNX tried to get
+ jnext working. Tracing it down to this bit of code rather then
+ correcting it they hardcoded the jnext into the same block as flash was.
+
+ The blackberry port isn't specifically suppose to only allow jnext and
+ flash, but was an accident due to the way this code was developed.
+
+ Reviewed by Adam Treat.
+
+ * WebCoreSupport/FrameLoaderClientBlackBerry.cpp:
+ (WebCore::FrameLoaderClientBlackBerry::createPlugin):
+
2012-04-20 Brady Eidson <[email protected]>
https://bugs.webkit.org/show_bug.cgi?id=84512
Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp (114848 => 114849)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp 2012-04-21 22:40:25 UTC (rev 114848)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp 2012-04-21 23:19:00 UTC (rev 114849)
@@ -51,6 +51,7 @@
#include "NetworkManager.h"
#include "NodeList.h"
#include "Page.h"
+#include "PluginDatabase.h"
#include "PluginView.h"
#include "ProgressTracker.h"
#include "ProtectionSpace.h"
@@ -327,7 +328,7 @@
mimeType = mimeTypeIn;
}
- if (mimeType == "application/x-shockwave-flash" || mimeType == "application/jnext-scriptable-plugin")
+ 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.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
