[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
andersca at apple.com
andersca at apple.com
Wed Dec 22 18:38:19 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 52889cf5765a0b12e76e592738e1bde8eba501e9
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Dec 15 00:52:18 2010 +0000
Add a NetscapePluginModuleX11 and move the Qt implementation of PluginInfoStore::getPluginInfo there
https://bugs.webkit.org/show_bug.cgi?id=51066
Reviewed by Sam Weinig.
* Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp: Copied from WebKit2/UIProcess/Plugins/qt/PluginInfoStoreQt.cpp.
(WebKit::NetscapePluginModule::getPluginInfo):
* UIProcess/Plugins/qt/PluginInfoStoreQt.cpp:
(WebKit::PluginInfoStore::getPluginInfo):
* WebKit2.pro:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74075 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 14f8cb5..8286fb8 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,18 @@
2010-12-14 Anders Carlsson <andersca at apple.com>
+ Reviewed by Sam Weinig.
+
+ Add a NetscapePluginModuleX11 and move the Qt implementation of PluginInfoStore::getPluginInfo there
+ https://bugs.webkit.org/show_bug.cgi?id=51066
+
+ * Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp: Copied from WebKit2/UIProcess/Plugins/qt/PluginInfoStoreQt.cpp.
+ (WebKit::NetscapePluginModule::getPluginInfo):
+ * UIProcess/Plugins/qt/PluginInfoStoreQt.cpp:
+ (WebKit::PluginInfoStore::getPluginInfo):
+ * WebKit2.pro:
+
+2010-12-14 Anders Carlsson <andersca at apple.com>
+
Reviewed by Dan Bernstein.
Move Windows version of getPluginInfo to NetscapePluginModule
diff --git a/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp b/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp
new file mode 100644
index 0000000..20357ae
--- /dev/null
+++ b/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "NetscapePluginModule.h"
+
+#include "PluginDatabase.h"
+#include "PluginPackage.h"
+
+using namespace WebCore;
+
+namespace WebKit {
+
+bool NetscapePluginModule::getPluginInfo(const String& pluginPath, PluginInfoStore::Plugin& plugin)
+{
+ // We are loading the plugin here since it does not seem to be a standardized way to
+ // get the needed informations from a UNIX plugin without loading it.
+
+ RefPtr<PluginPackage> package = PluginPackage::createPackage(pluginPath, 0 /*lastModified*/);
+ if (!package)
+ return false;
+
+ plugin.path = pluginPath;
+ plugin.info.desc = package->description();
+ plugin.info.file = package->fileName();
+
+ const MIMEToDescriptionsMap& descriptions = package->mimeToDescriptions();
+ const MIMEToExtensionsMap& extensions = package->mimeToExtensions();
+ MIMEToDescriptionsMap::const_iterator descEnd = descriptions.end();
+ plugin.info.mimes.reserveCapacity(descriptions.size());
+ unsigned i = 0;
+ for (MIMEToDescriptionsMap::const_iterator it = descriptions.begin(); it != descEnd; ++it) {
+ plugin.info.mimes.uncheckedAppend(MimeClassInfo());
+ MimeClassInfo& mime = plugin.info.mimes[i++];
+ mime.type = it->first;
+ mime.desc = it->second;
+ MIMEToExtensionsMap::const_iterator extensionIt = extensions.find(it->first);
+ ASSERT(extensionIt != extensions.end());
+ mime.extensions = extensionIt->second;
+ }
+
+ package->unload();
+ return true;
+}
+
+} // namespace WebKit
diff --git a/WebKit2/UIProcess/Plugins/qt/PluginInfoStoreQt.cpp b/WebKit2/UIProcess/Plugins/qt/PluginInfoStoreQt.cpp
index b2c503c..fc77663 100644
--- a/WebKit2/UIProcess/Plugins/qt/PluginInfoStoreQt.cpp
+++ b/WebKit2/UIProcess/Plugins/qt/PluginInfoStoreQt.cpp
@@ -27,6 +27,7 @@
#include "PluginInfoStore.h"
+#include "NetscapePluginModule.h"
#include "PluginDatabase.h"
#include "PluginPackage.h"
@@ -59,34 +60,7 @@ Vector<String> PluginInfoStore::individualPluginPaths()
bool PluginInfoStore::getPluginInfo(const String& pluginPath, Plugin& plugin)
{
- // We are loading the plugin here since it does not seem to be a standardized way to
- // get the needed informations from a UNIX plugin without loading it.
-
- RefPtr<PluginPackage> package = PluginPackage::createPackage(pluginPath, 0 /*lastModified*/);
- if (!package)
- return false;
-
- plugin.path = pluginPath;
- plugin.info.desc = package->description();
- plugin.info.file = package->fileName();
-
- const MIMEToDescriptionsMap& descriptions = package->mimeToDescriptions();
- const MIMEToExtensionsMap& extensions = package->mimeToExtensions();
- MIMEToDescriptionsMap::const_iterator descEnd = descriptions.end();
- plugin.info.mimes.reserveCapacity(descriptions.size());
- unsigned i = 0;
- for (MIMEToDescriptionsMap::const_iterator it = descriptions.begin(); it != descEnd; ++it) {
- plugin.info.mimes.uncheckedAppend(MimeClassInfo());
- MimeClassInfo& mime = plugin.info.mimes[i++];
- mime.type = it->first;
- mime.desc = it->second;
- MIMEToExtensionsMap::const_iterator extensionIt = extensions.find(it->first);
- ASSERT(extensionIt != extensions.end());
- mime.extensions = extensionIt->second;
- }
-
- package->unload();
- return true;
+ return NetscapePluginModule::getPluginInfo(pluginPath, plugin);
}
bool PluginInfoStore::shouldUsePlugin(const Plugin& plugin)
diff --git a/WebKit2/WebKit2.pro b/WebKit2/WebKit2.pro
index 4010c81..02f22da 100644
--- a/WebKit2/WebKit2.pro
+++ b/WebKit2/WebKit2.pro
@@ -441,6 +441,7 @@ SOURCES += \
Shared/API/c/WKURLResponse.cpp \
Shared/API/c/WKUserContentURLPattern.cpp \
Shared/Plugins/Netscape/NetscapePluginModule.cpp \
+ Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp \
Shared/BackingStore.cpp \
Shared/ChildProcess.cpp \
Shared/ImmutableArray.cpp \
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list