[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

timothy at apple.com timothy at apple.com
Thu Oct 29 20:48:25 UTC 2009


The following commit has been merged in the webkit-1.1 branch:
commit ea34ba860c2405476409e55e687c34877342fa2c
Author: timothy at apple.com <timothy at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 20 02:59:23 2009 +0000

    Small changes to fully invalidate and update the JavaScriptCallFrame.
    
    Patch by Oliver Hunt <oliver at apple.com> on 2009-10-19
    <rdar://problem/7020755> JSDebugger crashes after reloading from a breakpoint
    https://bugs.webkit.org/show_bug.cgi?id=27146
    
    Reviewed by Timothy Hatcher.
    
    * inspector/JavaScriptCallFrame.h:
    (WebCore::JavaScriptCallFrame::invalidate):
    (WebCore::JavaScriptCallFrame::update):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49832 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7c84b88..ecca95e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2009-10-19  Oliver Hunt  <oliver at apple.com>
+
+        Small changes to fully invalidate and update the JavaScriptCallFrame.
+
+        <rdar://problem/7020755> JSDebugger crashes after reloading from a breakpoint
+        https://bugs.webkit.org/show_bug.cgi?id=27146
+
+        Reviewed by Timothy Hatcher.
+
+        * inspector/JavaScriptCallFrame.h:
+        (WebCore::JavaScriptCallFrame::invalidate):
+        (WebCore::JavaScriptCallFrame::update):
+
 2009-10-19  Jeremy Orlow  <jorlow at chromium.org>
 
         Reviewed by Dmitri Titov.
diff --git a/WebCore/inspector/JavaScriptCallFrame.h b/WebCore/inspector/JavaScriptCallFrame.h
index e86b0eb..47cdac2 100644
--- a/WebCore/inspector/JavaScriptCallFrame.h
+++ b/WebCore/inspector/JavaScriptCallFrame.h
@@ -44,7 +44,12 @@ namespace WebCore {
             return adoptRef(new JavaScriptCallFrame(debuggerCallFrame, caller, sourceID, line));
         }
 
-        void invalidate() { m_isValid = false; }
+        void invalidate()
+        {
+            m_isValid = false;
+            m_debuggerCallFrame = 0;
+        }
+
         bool isValid() const { return m_isValid; }
 
         JavaScriptCallFrame* caller();
@@ -56,6 +61,7 @@ namespace WebCore {
             m_debuggerCallFrame = debuggerCallFrame;
             m_line = line;
             m_sourceID = sourceID;
+            m_isValid = true;
         }
 
         String functionName() const;

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list