[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 de68abb9210f05e812859c0839c72f1d2b2fb276
Author: dglazkov at chromium.org <dglazkov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 14 17:20:36 2009 +0000

    2009-12-14  Dimitri Glazkov  <dglazkov at chromium.org>
    
            Unreviewed, build fix.
    
            [Chromium] Guard all of JSC's wrapper cache-related members on Document.
    
            * dom/Document.cpp:
            (WebCore::Document::createWrapperCache): Widened the guards to the whole method.
            * dom/Document.h: Added JSC guards to wrapper cache-related members.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52096 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c2e818e..562fa6a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2009-12-14  Dimitri Glazkov  <dglazkov at chromium.org>
+
+        Unreviewed, build fix.
+
+        [Chromium] Guard all of JSC's wrapper cache-related members on Document.
+
+        * dom/Document.cpp:
+        (WebCore::Document::createWrapperCache): Widened the guards to the whole method.
+        * dom/Document.h: Added JSC guards to wrapper cache-related members.
+
 2009-12-14  Chris Fleizach  <cfleizach at apple.com>
 
         Reviewed by Adele Peterson.
diff --git a/WebCore/dom/Document.cpp b/WebCore/dom/Document.cpp
index 9d6af06..e00f403 100644
--- a/WebCore/dom/Document.cpp
+++ b/WebCore/dom/Document.cpp
@@ -507,15 +507,15 @@ Document::~Document()
         m_styleSheets->documentDestroyed();
 }
 
+#if USE(JSC)
 Document::JSWrapperCache* Document::createWrapperCache(DOMWrapperWorld* world)
 {
     JSWrapperCache* wrapperCache = new JSWrapperCache();
     m_wrapperCacheMap.set(world, wrapperCache);
-#if USE(JSC)
     world->rememberDocument(this);
-#endif
     return wrapperCache;
 }
+#endif
 
 void Document::resetLinkColor()
 {
diff --git a/WebCore/dom/Document.h b/WebCore/dom/Document.h
index 7e8c5bd..96089de 100644
--- a/WebCore/dom/Document.h
+++ b/WebCore/dom/Document.h
@@ -35,7 +35,9 @@
 #include "DocumentMarker.h"
 #include "ScriptExecutionContext.h"
 #include "Timer.h"
+#if USE(JSC)
 #include <runtime/WeakGCMap.h>
+#endif
 #include <wtf/HashCountedSet.h>
 #include <wtf/OwnPtr.h>
 #include <wtf/PassOwnPtr.h>
@@ -830,6 +832,7 @@ public:
     virtual void scriptImported(unsigned long, const String&);
     virtual void postTask(PassOwnPtr<Task>); // Executes the task on context's thread asynchronously.
 
+#if USE(JSC)
     typedef JSC::WeakGCMap<WebCore::Node*, JSNode*> JSWrapperCache;
     typedef HashMap<DOMWrapperWorld*, JSWrapperCache*> JSWrapperCacheMap;
     JSWrapperCacheMap& wrapperCacheMap() { return m_wrapperCacheMap; }
@@ -840,6 +843,7 @@ public:
         return createWrapperCache(world);
     }
     JSWrapperCache* createWrapperCache(DOMWrapperWorld*);
+#endif
 
     virtual void finishedParsing();
 
@@ -1166,7 +1170,9 @@ private:
 
     unsigned m_numNodeListCaches;
 
+#if USE(JSC)
     JSWrapperCacheMap m_wrapperCacheMap;
+#endif
 
 #if ENABLE(DATABASE)
     RefPtr<DatabaseThread> m_databaseThread;

-- 
WebKit Debian packaging