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

abarth at webkit.org abarth at webkit.org
Thu Apr 8 00:58:36 UTC 2010


The following commit has been merged in the webkit-1.2 branch:
commit 851b730dc83217803a51ce85ebb88a534177bdb8
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 8 18:54:42 2010 +0000

    2010-01-08  Matt Perry  <mpcomplete at chromium.org>
    
            Reviewed by Adam Barth.
    
            Fix a regression that removed a call to
            FrameLoaderClient::didDestroyScriptContextForFrame.
            https://bugs.webkit.org/show_bug.cgi?id=33347
    
            * bindings/v8/V8DOMWindowShell.cpp:
            (WebCore::V8DOMWindowShell::disposeContextHandles):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52996 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index eb7a4c3..1619601 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-01-08  Matt Perry  <mpcomplete at chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Fix a regression that removed a call to
+        FrameLoaderClient::didDestroyScriptContextForFrame.
+        https://bugs.webkit.org/show_bug.cgi?id=33347
+
+        * bindings/v8/V8DOMWindowShell.cpp:
+        (WebCore::V8DOMWindowShell::disposeContextHandles):
+
 2010-01-08  Brent Fulgham  <bfulgham at webkit.org>
 
         Reviewed by Adam Roben.
diff --git a/WebCore/bindings/v8/V8DOMWindowShell.cpp b/WebCore/bindings/v8/V8DOMWindowShell.cpp
index 42f2c05..cc8b7dc 100644
--- a/WebCore/bindings/v8/V8DOMWindowShell.cpp
+++ b/WebCore/bindings/v8/V8DOMWindowShell.cpp
@@ -144,6 +144,7 @@ bool V8DOMWindowShell::isContextInitialized()
 void V8DOMWindowShell::disposeContextHandles()
 {
     if (!m_context.IsEmpty()) {
+        m_frame->loader()->client()->didDestroyScriptContextForFrame();
         m_context.Dispose();
         m_context.Clear();
     }

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list