Title: [114848] trunk/Source/WebCore
- Revision
- 114848
- Author
- [email protected]
- Date
- 2012-04-21 15:40:25 -0700 (Sat, 21 Apr 2012)
Log Message
Support loading the same plugin in multiple locations in the Blackberry port.
https://bugs.webkit.org/show_bug.cgi?id=84537
The hash for the plugin is only based upon the plugin meta information
which will be the same for the same plugin in the system and user's
plugin folders.
It looks like this code was copied/based on the windows port
which doesn't allow the same plugin to be loaded more than once.
Because we want to support multiple copies of the same plugin
in the blackberry port we want to incorperate the path of the plugin
into the hash.
PR 150404
Patch by Benjamin C Meyer <[email protected]> on 2012-04-21
Reviewed by Adam Treat.
* plugins/blackberry/PluginPackageBlackBerry.cpp:
(WebCore::PluginPackage::hash):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (114847 => 114848)
--- trunk/Source/WebCore/ChangeLog 2012-04-21 22:02:07 UTC (rev 114847)
+++ trunk/Source/WebCore/ChangeLog 2012-04-21 22:40:25 UTC (rev 114848)
@@ -1,5 +1,28 @@
2012-04-21 Benjamin C Meyer <[email protected]>
+ Support loading the same plugin in multiple locations in the Blackberry port.
+ https://bugs.webkit.org/show_bug.cgi?id=84537
+
+ The hash for the plugin is only based upon the plugin meta information
+ which will be the same for the same plugin in the system and user's
+ plugin folders.
+
+ It looks like this code was copied/based on the windows port
+ which doesn't allow the same plugin to be loaded more than once.
+
+ Because we want to support multiple copies of the same plugin
+ in the blackberry port we want to incorperate the path of the plugin
+ into the hash.
+
+ PR 150404
+
+ Reviewed by Adam Treat.
+
+ * plugins/blackberry/PluginPackageBlackBerry.cpp:
+ (WebCore::PluginPackage::hash):
+
+2012-04-21 Benjamin C Meyer <[email protected]>
+
System plugins are preferred over application plugins
https://bugs.webkit.org/show_bug.cgi?id=84538
Modified: trunk/Source/WebCore/plugins/blackberry/PluginPackageBlackBerry.cpp (114847 => 114848)
--- trunk/Source/WebCore/plugins/blackberry/PluginPackageBlackBerry.cpp 2012-04-21 22:02:07 UTC (rev 114847)
+++ trunk/Source/WebCore/plugins/blackberry/PluginPackageBlackBerry.cpp 2012-04-21 22:40:25 UTC (rev 114848)
@@ -192,7 +192,8 @@
const unsigned hashCodes[] = {
m_name.impl()->hash(),
m_description.impl()->hash(),
- m_mimeToExtensions.size()
+ m_mimeToExtensions.size(),
+ m_path.impl()->hash()
};
return StringHasher::computeHash(reinterpret_cast<const UChar*>(hashCodes), sizeof(hashCodes) / sizeof(UChar));
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
