[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-142-g786665c

[andersca at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 18f9d6bfdd913cf00b539b47221b6b76a6bae602
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 21 21:28:31 2010 +0000

    Fix Snow Leopard build.
    
    * WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:
    (WebKit::NPN_GetValue):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74425 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 272a1ac..72a26d3 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,12 @@
 2010-12-21  Anders Carlsson  <andersca at apple.com>
 
+        Fix Snow Leopard build.
+
+        * WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:
+        (WebKit::NPN_GetValue):
+
+2010-12-21  Anders Carlsson  <andersca at apple.com>
+
         Reviewed by Dan Bernstein.
 
         Fix crash when a Carbon plug-in fails to initialize correctly
diff --git a/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp b/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp
index c09f779..ef186ee 100644
--- a/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp
+++ b/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp
@@ -415,11 +415,6 @@ static NPError NPN_GetValue(NPP npp, NPNVariable variable, void *value)
             break;
         }
 #if PLATFORM(MAC)
-        case NPNVsupportsQuickDrawBool:
-            // We don't support the QuickDraw drawing model.
-            *(NPBool*)value = false;
-            break;
-
         case NPNVsupportsCoreGraphicsBool:
             // Always claim to support the Core Graphics drawing model.
             *(NPBool*)value = true;
@@ -437,6 +432,12 @@ static NPError NPN_GetValue(NPP npp, NPNVariable variable, void *value)
             *(NPBool*)value = true;
             break;
 
+#ifndef NP_NO_QUICKDRAW
+        case NPNVsupportsQuickDrawBool:
+            // We don't support the QuickDraw drawing model.
+            *(NPBool*)value = false;
+            break;
+#endif
 #ifndef NP_NO_CARBON
        case NPNVsupportsCarbonBool:
             // FIXME: We should support the Carbon event model.

-- 
WebKit Debian packaging