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

aroben at apple.com aroben at apple.com
Wed Dec 22 11:42:50 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit efeb9006db6111d580d9310afab6318b4ba9ee05
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 4 19:57:30 2010 +0000

    Windows build fix
    
    * WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:
    (WebKit::NPN_SetValue): Removed unreachable code.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64669 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 0329a0c..b12932b 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -3,6 +3,13 @@
         Windows build fix
 
         * WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:
+        (WebKit::NPN_SetValue): Removed unreachable code.
+
+2010-08-04  Adam Roben  <aroben at apple.com>
+
+        Windows build fix
+
+        * WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:
         (WebKit::NPN_SetValue): Added some case statements that are compiled
         on Windows to avoid a warning about having default but not cases.
 
diff --git a/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp b/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp
index f60f6c5..187fbae 100644
--- a/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp
+++ b/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp
@@ -468,8 +468,6 @@ static NPError NPN_SetValue(NPP npp, NPPVariable variable, void *value)
             notImplemented();
             return NPERR_GENERIC_ERROR;
     }
-    
-    return NPERR_NO_ERROR;
 }
 
 static void NPN_InvalidateRect(NPP npp, NPRect* invalidRect)

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list