Title: [149812] trunk/Source/WebCore
- Revision
- 149812
- Author
- [email protected]
- Date
- 2013-05-09 08:44:12 -0700 (Thu, 09 May 2013)
Log Message
PluginDatabase: add plugin directory for the BlackBerry port.
https://bugs.webkit.org/show_bug.cgi?id=114943
Patch by Alberto Garcia <[email protected]> on 2013-05-09
Reviewed by Rob Buis.
XP_UNIX is defined for the BlackBerry port, but we don't want to
share the same code here.
* plugins/PluginDatabase.cpp:
(WebCore::PluginDatabase::defaultPluginDirectories):
(WebCore::PluginDatabase::isPreferredPluginDirectory):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (149811 => 149812)
--- trunk/Source/WebCore/ChangeLog 2013-05-09 15:43:21 UTC (rev 149811)
+++ trunk/Source/WebCore/ChangeLog 2013-05-09 15:44:12 UTC (rev 149812)
@@ -1,3 +1,17 @@
+2013-05-09 Alberto Garcia <[email protected]>
+
+ PluginDatabase: add plugin directory for the BlackBerry port.
+ https://bugs.webkit.org/show_bug.cgi?id=114943
+
+ Reviewed by Rob Buis.
+
+ XP_UNIX is defined for the BlackBerry port, but we don't want to
+ share the same code here.
+
+ * plugins/PluginDatabase.cpp:
+ (WebCore::PluginDatabase::defaultPluginDirectories):
+ (WebCore::PluginDatabase::isPreferredPluginDirectory):
+
2013-05-09 Seokju Kwon <[email protected]>
Web Inspector: Remove Memory Distribution and Memory Snapshots Panels
Modified: trunk/Source/WebCore/plugins/PluginDatabase.cpp (149811 => 149812)
--- trunk/Source/WebCore/plugins/PluginDatabase.cpp 2013-05-09 15:43:21 UTC (rev 149811)
+++ trunk/Source/WebCore/plugins/PluginDatabase.cpp 2013-05-09 15:44:12 UTC (rev 149812)
@@ -393,7 +393,7 @@
Vector<String> paths;
// Add paths specific to each platform
-#if defined(XP_UNIX)
+#if defined(XP_UNIX) && !PLATFORM(BLACKBERRY)
String userPluginPath = homeDirectoryPath();
userPluginPath.append(String("/.mozilla/plugins"));
paths.append(userPluginPath);
@@ -429,6 +429,8 @@
String mozPath(getenv("MOZ_PLUGIN_PATH"));
mozPath.split(UChar(':'), /* allowEmptyEntries */ false, mozPaths);
paths.appendVector(mozPaths);
+#elif PLATFORM(BLACKBERRY)
+ paths.append(BlackBerry::Platform::Settings::instance()->applicationPluginDirectory().c_str());
#elif defined(XP_MACOSX)
String userPluginPath = homeDirectoryPath();
userPluginPath.append(String("/Library/Internet Plug-Ins"));
@@ -455,10 +457,10 @@
{
String preferredPath = homeDirectoryPath();
-#if PLATFORM(BLACKBERRY)
+#if defined(XP_UNIX) && !PLATFORM(BLACKBERRY)
+ preferredPath.append(String("/.mozilla/plugins"));
+#elif PLATFORM(BLACKBERRY)
preferredPath = BlackBerry::Platform::Settings::instance()->applicationPluginDirectory().c_str();
-#elif defined(XP_UNIX)
- preferredPath.append(String("/.mozilla/plugins"));
#elif defined(XP_MACOSX)
preferredPath.append(String("/Library/Internet Plug-Ins"));
#elif defined(XP_WIN)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
