[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
ddkilzer at apple.com
ddkilzer at apple.com
Wed Dec 22 12:21:24 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 826c0281ce185be2dba689d5b203c3bca0333ff2
Author: ddkilzer at apple.com <ddkilzer at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Aug 19 21:25:37 2010 +0000
BUILD FIX: <http://webkit.org/b/44285> Fix compilation with NETSCAPE_PLUGIN_API disabled
Reviewed by Joseph Pecoraro.
* plugins/PluginView.cpp: Added #if ENABLE(NETSCAPE_PLUGIN_API)
and #endif macros around the source to fix the Qt Linux Release
Minimal build.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65707 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a0875a8..4b71ba3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-19 David Kilzer <ddkilzer at apple.com>
+
+ BUILD FIX: <http://webkit.org/b/44285> Fix compilation with NETSCAPE_PLUGIN_API disabled
+
+ Reviewed by Joseph Pecoraro.
+
+ * plugins/PluginView.cpp: Added #if ENABLE(NETSCAPE_PLUGIN_API)
+ and #endif macros around the source to fix the Qt Linux Release
+ Minimal build.
+
2010-08-19 Stephen White <senorblanco at chromium.org>
Reviewed by Kenneth Russell.
diff --git a/WebCore/plugins/PluginView.cpp b/WebCore/plugins/PluginView.cpp
index ca222d5..bee8dcd 100644
--- a/WebCore/plugins/PluginView.cpp
+++ b/WebCore/plugins/PluginView.cpp
@@ -81,6 +81,8 @@ using JSC::JSValue;
using JSC::UString;
#endif
+#if ENABLE(NETSCAPE_PLUGIN_API)
+
using std::min;
using namespace WTF;
@@ -1393,3 +1395,5 @@ void PluginView::privateBrowsingStateChanged(bool privateBrowsingEnabled)
}
} // namespace WebCore
+
+#endif // ENABLE(NETSCAPE_PLUGIN_API)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list