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

andersca at apple.com andersca at apple.com
Wed Dec 22 11:31:24 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 50d801a8a0b7bd82d7b476ba03f7f79c44a8d0cd
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jul 28 00:00:16 2010 +0000

    Fix Windows build.
    
    * WebProcess/Plugins/JSNPObject.cpp:
    (WebKit::JSNPObject::propertyGetter):
    Remove unreachable code.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64181 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 19515a1..90f74e6 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,13 @@
 2010-07-27  Anders Carlsson  <andersca at apple.com>
 
+        Fix Windows build.
+
+        * WebProcess/Plugins/JSNPObject.cpp:
+        (WebKit::JSNPObject::propertyGetter):
+        Remove unreachable code.
+
+2010-07-27  Anders Carlsson  <andersca at apple.com>
+
         Reviewed by Sam Weinig.
 
         Implement JSNPObject::propertyGetter
diff --git a/WebKit2/WebProcess/Plugins/JSNPObject.cpp b/WebKit2/WebProcess/Plugins/JSNPObject.cpp
index 2f0fe69..a82fab8 100644
--- a/WebKit2/WebProcess/Plugins/JSNPObject.cpp
+++ b/WebKit2/WebProcess/Plugins/JSNPObject.cpp
@@ -100,8 +100,6 @@ JSValue JSNPObject::propertyGetter(ExecState* exec, JSValue slotBase, const Iden
         return jsUndefined();
 
     return thisObj->m_objectMap->convertNPVariantToValue(exec, property);
-    // FIXME: Implement.
-    return jsUndefined();
 }
 
 JSObject* JSNPObject::throwInvalidAccessError(ExecState* exec)

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list