Title: [114846] trunk/Source/WebCore
- Revision
- 114846
- Author
- [email protected]
- Date
- 2012-04-21 13:11:22 -0700 (Sat, 21 Apr 2012)
Log Message
System plugins are preferred over application plugins
https://bugs.webkit.org/show_bug.cgi?id=84538
Set the preferred paths for plugins so that plugins that reside
inside of the bar will be preferred over plugins that are in the
system folder.
PR 150404
Patch by Benjamin C Meyer <[email protected]> on 2012-04-21
Reviewed by Adam Treat.
* plugins/PluginDatabase.cpp:
(WebCore::PluginDatabase::isPreferredPluginDirectory):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (114845 => 114846)
--- trunk/Source/WebCore/ChangeLog 2012-04-21 20:03:13 UTC (rev 114845)
+++ trunk/Source/WebCore/ChangeLog 2012-04-21 20:11:22 UTC (rev 114846)
@@ -1,3 +1,19 @@
+2012-04-21 Benjamin C Meyer <[email protected]>
+
+ System plugins are preferred over application plugins
+ https://bugs.webkit.org/show_bug.cgi?id=84538
+
+ Set the preferred paths for plugins so that plugins that reside
+ inside of the bar will be preferred over plugins that are in the
+ system folder.
+
+ PR 150404
+
+ Reviewed by Adam Treat.
+
+ * plugins/PluginDatabase.cpp:
+ (WebCore::PluginDatabase::isPreferredPluginDirectory):
+
2012-04-21 Darin Adler <[email protected]>
Improve performance of removing user and password from URLs
Modified: trunk/Source/WebCore/plugins/PluginDatabase.cpp (114845 => 114846)
--- trunk/Source/WebCore/plugins/PluginDatabase.cpp 2012-04-21 20:03:13 UTC (rev 114845)
+++ trunk/Source/WebCore/plugins/PluginDatabase.cpp 2012-04-21 20:11:22 UTC (rev 114846)
@@ -428,7 +428,9 @@
{
String preferredPath = homeDirectoryPath();
-#if defined(XP_UNIX)
+#if PLATFORM(BLACKBERRY)
+ preferredPath = BlackBerry::Platform::Client::get()->getApplicationPluginDirectory().c_str();
+#elif defined(XP_UNIX)
preferredPath.append(String("/.mozilla/plugins"));
#elif defined(XP_MACOSX)
preferredPath.append(String("/Library/Internet Plug-Ins"));
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
