[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
andreas.kling at nokia.com
andreas.kling at nokia.com
Wed Dec 22 13:38:57 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 453b53c6941e6a6e4827f7213ee2ec28f61b3e03
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Sep 22 14:17:55 2010 +0000
2010-09-22 Balazs Kelemen <kb at inf.u-szeged.hu>
Reviewed by Kenneth Rohde Christiansen.
PluginStrategy should satisfy the needs of Qt
https://bugs.webkit.org/show_bug.cgi?id=45857
No new functionality so no new tests.
* WebCoreSupport/WebPlatformStrategies.cpp:
(WebPlatformStrategies::getPluginInfo):
* WebCoreSupport/WebPlatformStrategies.h:
2010-09-22 Balazs Kelemen <kb at inf.u-szeged.hu>
Reviewed by Kenneth Rohde Christiansen.
PluginStrategy should satisfy the needs of Qt
https://bugs.webkit.org/show_bug.cgi?id=45857
No new functionality so no new tests.
* WebCoreSupport/WebPlatformStrategies.h:
* WebCoreSupport/WebPlatformStrategies.mm:
(WebPlatformStrategies::getPluginInfo):
2010-09-22 Balazs Kelemen <kb at inf.u-szeged.hu>
Reviewed by Kenneth Rohde Christiansen.
PluginStrategy should satisfy the needs of Qt
https://bugs.webkit.org/show_bug.cgi?id=45857
No new functionality so no new tests.
* plugins/PluginData.cpp:
(WebCore::PluginData::initPlugins):
* plugins/PluginStrategy.h: Added a |const Page*| argument to getPluginInfo.
2010-09-22 Balazs Kelemen <kb at inf.u-szeged.hu>
Reviewed by Kenneth Rohde Christiansen.
PluginStrategy should satisfy the needs of Qt
https://bugs.webkit.org/show_bug.cgi?id=45857
No new functionality so no new tests.
* WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
(WebKit::WebPlatformStrategies::getPluginInfo):
* WebProcess/WebCoreSupport/WebPlatformStrategies.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68038 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 842d5d6..8e8c2da 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-22 Balazs Kelemen <kb at inf.u-szeged.hu>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ PluginStrategy should satisfy the needs of Qt
+ https://bugs.webkit.org/show_bug.cgi?id=45857
+ No new functionality so no new tests.
+
+ * plugins/PluginData.cpp:
+ (WebCore::PluginData::initPlugins):
+ * plugins/PluginStrategy.h: Added a |const Page*| argument to getPluginInfo.
+
2010-09-22 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Yury Semikhatsky.
diff --git a/WebCore/plugins/PluginData.cpp b/WebCore/plugins/PluginData.cpp
index ff90747..d24d234 100644
--- a/WebCore/plugins/PluginData.cpp
+++ b/WebCore/plugins/PluginData.cpp
@@ -75,7 +75,7 @@ void PluginData::initPlugins()
{
ASSERT(m_plugins.isEmpty());
- platformStrategies()->pluginStrategy()->getPluginInfo(m_plugins);
+ platformStrategies()->pluginStrategy()->getPluginInfo(m_page, m_plugins);
}
#endif
diff --git a/WebCore/plugins/PluginStrategy.h b/WebCore/plugins/PluginStrategy.h
index 7e92196..9d8a7b5 100644
--- a/WebCore/plugins/PluginStrategy.h
+++ b/WebCore/plugins/PluginStrategy.h
@@ -32,10 +32,12 @@
namespace WebCore {
+class Page;
+
class PluginStrategy {
public:
virtual void refreshPlugins() = 0;
- virtual void getPluginInfo(Vector<PluginInfo>&) = 0;
+ virtual void getPluginInfo(const Page*, Vector<PluginInfo>&) = 0;
protected:
virtual ~PluginStrategy() { }
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index eeea910..3f0bb82 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-22 Balazs Kelemen <kb at inf.u-szeged.hu>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ PluginStrategy should satisfy the needs of Qt
+ https://bugs.webkit.org/show_bug.cgi?id=45857
+ No new functionality so no new tests.
+
+ * WebCoreSupport/WebPlatformStrategies.h:
+ * WebCoreSupport/WebPlatformStrategies.mm:
+ (WebPlatformStrategies::getPluginInfo):
+
2010-09-22 Paul Knight <pknight at apple.com>
Reviewed by Simon Fraser.
diff --git a/WebKit/mac/WebCoreSupport/WebPlatformStrategies.h b/WebKit/mac/WebCoreSupport/WebPlatformStrategies.h
index a1e0317..fab7eee 100644
--- a/WebKit/mac/WebCoreSupport/WebPlatformStrategies.h
+++ b/WebKit/mac/WebCoreSupport/WebPlatformStrategies.h
@@ -45,7 +45,7 @@ private:
// WebCore::PluginStrategy
virtual void refreshPlugins();
- virtual void getPluginInfo(Vector<WebCore::PluginInfo>&);
+ virtual void getPluginInfo(const WebCore::Page*, Vector<WebCore::PluginInfo>&);
// WebCore::LocalizationStrategy
virtual WTF::String inputElementAltText();
diff --git a/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm b/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm
index 18e8a61..9d8fd11 100644
--- a/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm
+++ b/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm
@@ -72,7 +72,7 @@ void WebPlatformStrategies::refreshPlugins()
[[WebPluginDatabase sharedDatabase] refresh];
}
-void WebPlatformStrategies::getPluginInfo(Vector<WebCore::PluginInfo>& plugins)
+void WebPlatformStrategies::getPluginInfo(const WebCore::Page*, Vector<WebCore::PluginInfo>& plugins)
{
BEGIN_BLOCK_OBJC_EXCEPTIONS;
diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index a8aa424..90190aa 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-22 Balazs Kelemen <kb at inf.u-szeged.hu>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ PluginStrategy should satisfy the needs of Qt
+ https://bugs.webkit.org/show_bug.cgi?id=45857
+ No new functionality so no new tests.
+
+ * WebCoreSupport/WebPlatformStrategies.cpp:
+ (WebPlatformStrategies::getPluginInfo):
+ * WebCoreSupport/WebPlatformStrategies.h:
+
2010-09-20 Philippe Normand <pnormand at igalia.com>
Reviewed by Eric Carlson.
diff --git a/WebKit/win/WebCoreSupport/WebPlatformStrategies.cpp b/WebKit/win/WebCoreSupport/WebPlatformStrategies.cpp
index 7d8bd0c..fe35877 100644
--- a/WebKit/win/WebCoreSupport/WebPlatformStrategies.cpp
+++ b/WebKit/win/WebCoreSupport/WebPlatformStrategies.cpp
@@ -68,7 +68,7 @@ void WebPlatformStrategies::refreshPlugins()
PluginDatabase::installedPlugins()->refresh();
}
-void WebPlatformStrategies::getPluginInfo(Vector<WebCore::PluginInfo>& outPlugins)
+void WebPlatformStrategies::getPluginInfo(const WebCore::Page*, Vector<WebCore::PluginInfo>& outPlugins)
{
const Vector<PluginPackage*>& plugins = PluginDatabase::installedPlugins()->plugins();
diff --git a/WebKit/win/WebCoreSupport/WebPlatformStrategies.h b/WebKit/win/WebCoreSupport/WebPlatformStrategies.h
index 3a5626d..48c2b46 100644
--- a/WebKit/win/WebCoreSupport/WebPlatformStrategies.h
+++ b/WebKit/win/WebCoreSupport/WebPlatformStrategies.h
@@ -45,7 +45,7 @@ private:
// WebCore::PluginStrategy
virtual void refreshPlugins();
- virtual void getPluginInfo(Vector<WebCore::PluginInfo>&);
+ virtual void getPluginInfo(const WebCore::Page*, Vector<WebCore::PluginInfo>&);
// WebCore::LocalizationStrategy
virtual WTF::String inputElementAltText();
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 764c98a..64d0f86 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-22 Balazs Kelemen <kb at inf.u-szeged.hu>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ PluginStrategy should satisfy the needs of Qt
+ https://bugs.webkit.org/show_bug.cgi?id=45857
+ No new functionality so no new tests.
+
+ * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
+ (WebKit::WebPlatformStrategies::getPluginInfo):
+ * WebProcess/WebCoreSupport/WebPlatformStrategies.h:
+
2010-09-21 Steve Falkenburg <sfalken at apple.com>
Rubber stamped by Simon Fraser.
diff --git a/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp b/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp
index b9d2cf8..4c204cd 100644
--- a/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp
+++ b/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp
@@ -102,7 +102,7 @@ void WebPlatformStrategies::refreshPlugins()
populatePluginCache();
}
-void WebPlatformStrategies::getPluginInfo(Vector<WebCore::PluginInfo>& plugins)
+void WebPlatformStrategies::getPluginInfo(const WebCore::Page*, Vector<WebCore::PluginInfo>& plugins)
{
populatePluginCache();
plugins = m_cachedPlugins;
diff --git a/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h b/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h
index d22dcbf..aada9e0 100644
--- a/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h
+++ b/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h
@@ -49,7 +49,7 @@ private:
// WebCore::PluginStrategy
virtual void refreshPlugins();
- virtual void getPluginInfo(Vector<WebCore::PluginInfo>&);
+ virtual void getPluginInfo(const WebCore::Page*, Vector<WebCore::PluginInfo>&);
// WebCore::LocalizationStrategy
virtual String inputElementAltText();
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list