[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75
laszlo.1.gombos at nokia.com
laszlo.1.gombos at nokia.com
Thu Oct 29 20:43:59 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit 5686ad7d12ba43fd80e7fd0945ab655424d844af
Author: laszlo.1.gombos at nokia.com <laszlo.1.gombos at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Oct 13 22:17:32 2009 +0000
2009-10-13 Laszlo Gombos <laszlo.1.gombos at nokia.com>
Reviewed by Simon Hausmann.
Refactor ENABLE_PLUGIN_PACKAGE_SIMPLE_HASH
https://bugs.webkit.org/show_bug.cgi?id=30278
Move the definition of ENABLE_PLUGIN_PACKAGE_SIMPLE_HASH
from the make system into common code.
Enable ENABLE_PLUGIN_PACKAGE_SIMPLE_HASH if NETSCAPE_PLUGIN_API
support is not enabled.
Remove notImplemented() from PluginPackageNone.cpp and
PluginDataNone.cpp make them just empty functions.
* GNUmakefile.am:
* WebCore.pro:
* plugins/PluginDataNone.cpp:
(WebCore::PluginData::initPlugins):
(WebCore::PluginData::refresh):
* plugins/PluginPackageNone.cpp:
(WebCore::PluginPackage::determineQuirks):
(WebCore::PluginPackage::fetchInfo):
(WebCore::PluginPackage::load):
2009-10-13 Laszlo Gombos <laszlo.1.gombos at nokia.com>
Reviewed by Simon Hausmann.
Refactor ENABLE_PLUGIN_PACKAGE_SIMPLE_HASH
https://bugs.webkit.org/show_bug.cgi?id=30278
Move the definition of ENABLE_PLUGIN_PACKAGE_SIMPLE_HASH
from the make system into common code.
* wtf/Platform.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49515 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 24ba8ae..6b70d10 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,5 +1,17 @@
2009-10-13 Laszlo Gombos <laszlo.1.gombos at nokia.com>
+ Reviewed by Simon Hausmann.
+
+ Refactor ENABLE_PLUGIN_PACKAGE_SIMPLE_HASH
+ https://bugs.webkit.org/show_bug.cgi?id=30278
+
+ Move the definition of ENABLE_PLUGIN_PACKAGE_SIMPLE_HASH
+ from the make system into common code.
+
+ * wtf/Platform.h:
+
+2009-10-13 Laszlo Gombos <laszlo.1.gombos at nokia.com>
+
Reviewed by Darin Adler.
ARM compiler does not understand reinterpret_cast<void*>
diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h
index bb4f863..9039ee2 100644
--- a/JavaScriptCore/wtf/Platform.h
+++ b/JavaScriptCore/wtf/Platform.h
@@ -859,6 +859,10 @@ on MinGW. See https://bugs.webkit.org/show_bug.cgi?id=29268 */
#define WARN_UNUSED_RETURN
#endif
+#if !ENABLE(NETSCAPE_PLUGIN_API) || (ENABLE(NETSCAPE_PLUGIN_API) && ((PLATFORM(UNIX) && PLATFORM(QT)) || PLATFORM(GTK)))
+#define ENABLE_PLUGIN_PACKAGE_SIMPLE_HASH 1
+#endif
+
/* Set up a define for a common error that is intended to cause a build error -- thus the space after Error. */
#define WTF_PLATFORM_CFNETWORK Error USE_macro_should_be_used_with_CFNETWORK
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ad80f87..8eecefb 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,29 @@
+2009-10-13 Laszlo Gombos <laszlo.1.gombos at nokia.com>
+
+ Reviewed by Simon Hausmann.
+
+ Refactor ENABLE_PLUGIN_PACKAGE_SIMPLE_HASH
+ https://bugs.webkit.org/show_bug.cgi?id=30278
+
+ Move the definition of ENABLE_PLUGIN_PACKAGE_SIMPLE_HASH
+ from the make system into common code.
+
+ Enable ENABLE_PLUGIN_PACKAGE_SIMPLE_HASH if NETSCAPE_PLUGIN_API
+ support is not enabled.
+
+ Remove notImplemented() from PluginPackageNone.cpp and
+ PluginDataNone.cpp make them just empty functions.
+
+ * GNUmakefile.am:
+ * WebCore.pro:
+ * plugins/PluginDataNone.cpp:
+ (WebCore::PluginData::initPlugins):
+ (WebCore::PluginData::refresh):
+ * plugins/PluginPackageNone.cpp:
+ (WebCore::PluginPackage::determineQuirks):
+ (WebCore::PluginPackage::fetchInfo):
+ (WebCore::PluginPackage::load):
+
2009-10-13 Alexey Proskuryakov <ap at apple.com>
Reviewed by Dan Bernstein.
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index 53c5e11..3480754 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -54,7 +54,6 @@ webcore_cppflags += \
webcoregtk_cppflags += \
-DWTF_USE_SOUP=1 \
- -DENABLE_PLUGIN_PACKAGE_SIMPLE_HASH=1 \
-I$(srcdir)/WebCore/accessibility/gtk \
-I$(srcdir)/WebCore/loader/gtk \
-I$(srcdir)/WebCore/page/gtk \
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 0b5448e..87218f0 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -2458,8 +2458,6 @@ contains(DEFINES, ENABLE_NETSCAPE_PLUGIN_API=1) {
SOURCES += plugins/npapi.cpp
unix {
- DEFINES += ENABLE_PLUGIN_PACKAGE_SIMPLE_HASH=1
-
mac {
SOURCES += \
plugins/mac/PluginPackageMac.cpp \
diff --git a/WebCore/plugins/PluginDataNone.cpp b/WebCore/plugins/PluginDataNone.cpp
index 28e3967..3b98383 100644
--- a/WebCore/plugins/PluginDataNone.cpp
+++ b/WebCore/plugins/PluginDataNone.cpp
@@ -27,18 +27,14 @@
#include "config.h"
#include "PluginData.h"
-#include "NotImplemented.h"
-
namespace WebCore {
void PluginData::initPlugins()
{
- notImplemented();
}
void PluginData::refresh()
{
- notImplemented();
}
};
diff --git a/WebCore/plugins/PluginPackageNone.cpp b/WebCore/plugins/PluginPackageNone.cpp
index 487450a..b943d88 100644
--- a/WebCore/plugins/PluginPackageNone.cpp
+++ b/WebCore/plugins/PluginPackageNone.cpp
@@ -26,52 +26,20 @@
#include "config.h"
#include "PluginPackage.h"
-#include "CString.h"
-#include "MIMETypeRegistry.h"
-#include "NotImplemented.h"
-#include "npruntime_impl.h"
-#include "PluginDatabase.h"
-#include "PluginDebug.h"
-
namespace WebCore {
void PluginPackage::determineQuirks(const String&)
{
- notImplemented();
}
bool PluginPackage::fetchInfo()
{
- notImplemented();
return false;
}
bool PluginPackage::load()
{
- notImplemented();
- return false;
-}
-
-#if !ENABLE(PLUGIN_PACKAGE_SIMPLE_HASH)
-unsigned PluginPackage::hash() const
-{
- notImplemented();
-
- return 0;
-}
-
-bool PluginPackage::equal(const PluginPackage&, const PluginPackage&)
-{
- notImplemented();
return false;
}
-int PluginPackage::compareFileVersion(const PlatformModuleVersion&) const
-{
- notImplemented();
- return 0;
-}
-
-#endif
-
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list