[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[weinig at apple.com]

The following commit has been merged in the debian/experimental branch:
commit bc886f0588c297a942996b262406bcbf795a068e
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Aug 7 22:32:57 2010 +0000

    Another fix for the windows build.
    
    * WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
    (WebKit::NetscapePlugin::isAcceleratedCompositingEnabled):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64924 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 5ca8d49..e3e4a0d 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,12 @@
 2010-08-07  Sam Weinig  <sam at webkit.org>
 
+        Another fix for the windows build.
+
+        * WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
+        (WebKit::NetscapePlugin::isAcceleratedCompositingEnabled):
+
+2010-08-07  Sam Weinig  <sam at webkit.org>
+
         Fix windows build.
 
         * WebProcess/Plugins/PluginView.cpp:
diff --git a/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp b/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp
index 6e7adc1..a89f936 100644
--- a/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp
+++ b/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp
@@ -196,7 +196,11 @@ void NetscapePlugin::removePluginStream(NetscapePluginStream* pluginStream)
 
 bool NetscapePlugin::isAcceleratedCompositingEnabled()
 {
+#if USE(ACCELERATED_COMPOSITING)
     return m_pluginController->isAcceleratedCompositingEnabled();
+#else
+    return false;
+#endif
 }
 
 NPError NetscapePlugin::NPP_New(NPMIMEType pluginType, uint16_t mode, int16_t argc, char* argn[], char* argv[], NPSavedData* savedData)

-- 
WebKit Debian packaging