[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[dglazkov at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit da51f77174c3f79812a943a080d0c714a3b5de31
Author: dglazkov at chromium.org <dglazkov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 30 23:54:25 2009 +0000

    2009-12-30  Dimitri Glazkov  <dglazkov at chromium.org>
    
            Reviewed by Adam Barth.
    
            Remove unused code from V8DOMWrapper.
    
            * bindings/v8/V8DOMWrapper.cpp: Removed code that I added but it's no longer used.
            * bindings/v8/V8DOMWrapper.h: Ditto.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52675 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9834153..9d410fb 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,15 @@
 
         Reviewed by Adam Barth.
 
+        Remove unused code from V8DOMWrapper.
+
+        * bindings/v8/V8DOMWrapper.cpp: Removed code that I added but it's no longer used.
+        * bindings/v8/V8DOMWrapper.h: Ditto.
+
+2009-12-30  Dimitri Glazkov  <dglazkov at chromium.org>
+
+        Reviewed by Adam Barth.
+
         [V8] Generate configuring undetectable collection.
         https://bugs.webkit.org/show_bug.cgi?id=33063
 
diff --git a/WebCore/bindings/v8/V8DOMWrapper.cpp b/WebCore/bindings/v8/V8DOMWrapper.cpp
index 2ef986b..6b0f818 100644
--- a/WebCore/bindings/v8/V8DOMWrapper.cpp
+++ b/WebCore/bindings/v8/V8DOMWrapper.cpp
@@ -193,25 +193,6 @@ void V8DOMWrapper::setIndexedPropertiesToExternalArray(v8::Handle<v8::Object> wr
 }
 #endif
 
-bool V8DOMWrapper::domObjectHasJSWrapper(void* object)
-{
-    return getDOMObjectMap().contains(object) || getActiveDOMObjectMap().contains(object);
-}
-
-v8::Persistent<v8::Object> V8DOMWrapper::jsWrapperForDOMObject(void* object)
-{
-    v8::Persistent<v8::Object> wrapper = getDOMObjectMap().get(object);
-    ASSERT(!wrapper.IsEmpty());
-    return wrapper;
-}
-
-v8::Persistent<v8::Object> V8DOMWrapper::jsWrapperForActiveDOMObject(void* object)
-{
-    v8::Persistent<v8::Object> wrapper = getActiveDOMObjectMap().get(object);
-    ASSERT(!wrapper.IsEmpty());
-    return wrapper;
-}
-
 // The caller must have increased obj's ref count.
 void V8DOMWrapper::setJSWrapperForDOMObject(void* object, v8::Persistent<v8::Object> wrapper)
 {
diff --git a/WebCore/bindings/v8/V8DOMWrapper.h b/WebCore/bindings/v8/V8DOMWrapper.h
index ce550cd..3a9fed9 100644
--- a/WebCore/bindings/v8/V8DOMWrapper.h
+++ b/WebCore/bindings/v8/V8DOMWrapper.h
@@ -273,12 +273,6 @@ namespace WebCore {
         static v8::Local<v8::Function> getConstructor(V8ClassIndex::V8WrapperType, DOMWindow*);
         static v8::Local<v8::Function> getConstructor(V8ClassIndex::V8WrapperType, WorkerContext*);
 
-        // Checks whether a DOM object has a JS wrapper.
-        static bool domObjectHasJSWrapper(void*);
-        // Get JS wrapper of an existing DOM object, assuming that the wrapper
-        // exists.
-        static v8::Persistent<v8::Object> jsWrapperForDOMObject(void*);
-        static v8::Persistent<v8::Object> jsWrapperForActiveDOMObject(void*);
         // Set JS wrapper of a DOM object, the caller in charge of increase ref.
         static void setJSWrapperForDOMObject(void*, v8::Persistent<v8::Object>);
         static void setJSWrapperForActiveDOMObject(void*, v8::Persistent<v8::Object>);

-- 
WebKit Debian packaging