[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[jshin at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit c4080edcf20e01e6c207d34c03edb08fff01f2ed
Author: jshin at chromium.org <jshin at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 15 02:42:16 2010 +0000

    2010-01-14  Jungshik Shin  <jshin at chromium.org>
    
            Unreviewed, attempted build fix on chromium.
    
            Fix a Chromium build failure due to an unused variable in V8 binding.(part 2)
    
            * bindings/v8/V8Collection.h:
            (WebCore::getNamedPropertyOfCollection):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53313 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f91ca88..cef6de2 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,15 @@
 
         Unreviewed, attempted build fix on chromium.
 
+        Fix a Chromium build failure due to an unused variable in V8 binding.(part 2)
+
+        * bindings/v8/V8Collection.h:
+        (WebCore::getNamedPropertyOfCollection):
+
+2010-01-14  Jungshik Shin  <jshin at chromium.org>
+
+        Unreviewed, attempted build fix on chromium.
+
         Fix a Chromium build failure due to an unused variable in V8 binding. 
 
         * bindings/v8/V8Collection.h:
diff --git a/WebCore/bindings/v8/V8Collection.h b/WebCore/bindings/v8/V8Collection.h
index 1dbb1a2..84150d8 100644
--- a/WebCore/bindings/v8/V8Collection.h
+++ b/WebCore/bindings/v8/V8Collection.h
@@ -67,8 +67,7 @@ namespace WebCore {
     {
         // FIXME: assert object is a collection type
         ASSERT(V8DOMWrapper::maybeDOMWrapper(object));
-        V8ClassIndex::V8WrapperType wrapperType = V8DOMWrapper::domWrapperType(object);
-        ASSERT(wrapperType != V8ClassIndex::NODE);
+        ASSERT(V8DOMWrapper::domWrapperType(object) != V8ClassIndex::NODE);
         Collection* collection = toNativeCollection<Collection>(object);
         AtomicString propertyName = toAtomicWebCoreStringWithNullCheck(name);
         return getV8Object<ItemType>(collection->namedItem(propertyName), implementationType);

-- 
WebKit Debian packaging