[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[slewis at apple.com]

The following commit has been merged in the webkit-1.3 branch:
commit 157f0282a3a3002ef433f2467f95a0aec3cfa293
Author: slewis at apple.com <slewis at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 28 22:26:06 2011 +0000

    <rdar://problem/8857651> Implement unregisterWorld for WebKit2
    Rename unregisterWorld to clearWrappers.  Clearing the wrappers reduces the
    memory use of isolated worlds.
    
    Reviewed by Geoff Garen.
    
    * WebProcess/InjectedBundle/API/c/WKBundleScriptWorld.cpp:
    (WKBundleScriptWorldClearWrappers):
    * WebProcess/InjectedBundle/API/c/WKBundleScriptWorld.h:
    * WebProcess/InjectedBundle/InjectedBundleScriptWorld.cpp:
    (WebKit::InjectedBundleScriptWorld::clearWrappers):
    * WebProcess/InjectedBundle/InjectedBundleScriptWorld.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76989 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index bbab997..64c4f39 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,18 @@
+2011-01-28  Stephanie Lewis  <slewis at apple.com>
+
+        Reviewed by Geoff Garen.
+
+        <rdar://problem/8857651> Implement unregisterWorld for WebKit2
+        Rename unregisterWorld to clearWrappers.  Clearing the wrappers reduces the 
+        memory use of isolated worlds.
+
+        * WebProcess/InjectedBundle/API/c/WKBundleScriptWorld.cpp:
+        (WKBundleScriptWorldClearWrappers):
+        * WebProcess/InjectedBundle/API/c/WKBundleScriptWorld.h:
+        * WebProcess/InjectedBundle/InjectedBundleScriptWorld.cpp:
+        (WebKit::InjectedBundleScriptWorld::clearWrappers):
+        * WebProcess/InjectedBundle/InjectedBundleScriptWorld.h:
+
 2011-01-28  Dan Bernstein  <mitz at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleScriptWorld.cpp b/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleScriptWorld.cpp
index 2c90dc8..1133e3e 100644
--- a/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleScriptWorld.cpp
+++ b/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleScriptWorld.cpp
@@ -47,3 +47,8 @@ WKBundleScriptWorldRef WKBundleScriptWorldNormalWorld()
 {
     return toAPI(InjectedBundleScriptWorld::normalWorld());
 }
+
+void WKBundleScriptWorldClearWrappers(WKBundleScriptWorldRef scriptWorldRef)
+{
+    toImpl(scriptWorldRef)->clearWrappers();
+}
diff --git a/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleScriptWorld.h b/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleScriptWorld.h
index 0763efa..013cdc9 100644
--- a/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleScriptWorld.h
+++ b/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleScriptWorld.h
@@ -36,6 +36,7 @@ WK_EXPORT WKTypeID WKBundleScriptWorldGetTypeID();
 
 WK_EXPORT WKBundleScriptWorldRef WKBundleScriptWorldCreateWorld();
 WK_EXPORT WKBundleScriptWorldRef WKBundleScriptWorldNormalWorld();
+WK_EXPORT void WKBundleScriptWorldClearWrappers(WKBundleScriptWorldRef scriptWorld);
 
 #ifdef __cplusplus
 }
diff --git a/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleScriptWorld.cpp b/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleScriptWorld.cpp
index fcdef94..2f40fd3 100644
--- a/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleScriptWorld.cpp
+++ b/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleScriptWorld.cpp
@@ -81,5 +81,10 @@ DOMWrapperWorld* InjectedBundleScriptWorld::coreWorld() const
 {
     return m_world.get();
 }
+    
+void InjectedBundleScriptWorld::clearWrappers()
+{
+    m_world->clearWrappers();
+}
 
 } // namespace WebKit
diff --git a/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleScriptWorld.h b/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleScriptWorld.h
index 00dd14a..7562a6f 100644
--- a/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleScriptWorld.h
+++ b/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleScriptWorld.h
@@ -47,6 +47,8 @@ public:
     virtual ~InjectedBundleScriptWorld();
 
     WebCore::DOMWrapperWorld* coreWorld() const;
+    
+    void clearWrappers();
 
 private:
     InjectedBundleScriptWorld(PassRefPtr<WebCore::DOMWrapperWorld>);

-- 
WebKit Debian packaging