Reviewed by Beth Dakin.
authorggaren <ggaren@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 1 Jun 2007 07:25:38 +0000 (07:25 +0000)
committerggaren <ggaren@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 1 Jun 2007 07:25:38 +0000 (07:25 +0000)
        Fixed <rdar://problem/5238177> Continuing after hitting breakpoint doesn't
        execute the next step.

        No test because the only code affected is the debugger, and none of the
        relevant API is exported.

        Reverted an accidental change in 21324 that caused originRootObject for
        the window object always to be 0. We could probably just remove the debugger's
        dependency on originRootObject, but I wanted to be safe.

        * page/mac/FrameMac.mm:
        (WebCore::Frame::windowScriptObject):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@21933 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/WebCore.xcodeproj/project.pbxproj
WebCore/page/mac/FrameMac.mm

index 1dbbe3e9deebc1c5ba1c3ef9899858ab808ad983..642e51d061c587592cef5e8176742fd0d9d91308 100644 (file)
@@ -1,3 +1,20 @@
+2007-05-31  Geoffrey Garen  <ggaren@apple.com>
+
+        Reviewed by Beth Dakin.
+
+        Fixed <rdar://problem/5238177> Continuing after hitting breakpoint doesn't 
+        execute the next step.
+        
+        No test because the only code affected is the debugger, and none of the
+        relevant API is exported.
+        
+        Reverted an accidental change in 21324 that caused originRootObject for
+        the window object always to be 0. We could probably just remove the debugger's
+        dependency on originRootObject, but I wanted to be safe.
+
+        * page/mac/FrameMac.mm:
+        (WebCore::Frame::windowScriptObject):
+
 2007-05-31  David Hyatt  <hyatt@apple.com>
 
         Fix for 11768, Flash plugin does not respect clips set via CSS.
index 22a4808ece84a11c3299683997c8c8835d42824a..7d36f4763dce8393d18557e193b70d799b5fa30d 100644 (file)
                0867D690FE84028FC02AAC07 /* Project object */ = {
                        isa = PBXProject;
                        buildConfigurationList = 149C284308902B11008A9EFC /* Build configuration list for PBXProject "WebCore" */;
+                       compatibilityVersion = "Xcode 2.4";
                        hasScannedForEncodings = 1;
                        knownRegions = (
                                English,
index eef4e5c5fdd71195ce839dc58427493af0857896..7e379cd6502caf6d40866d591ad2bd44c1775ee3 100644 (file)
@@ -719,7 +719,7 @@ WebScriptObject* Frame::windowScriptObject()
         KJS::JSLock lock;
         KJS::JSObject* win = KJS::Window::retrieveWindow(this);
         KJS::Bindings::RootObject *root = bindingRootObject();
-        d->m_windowScriptObject = HardRetain([WebScriptObject scriptObjectForJSObject:toRef(win) originRootObject:0 rootObject:root]);
+        d->m_windowScriptObject = HardRetain([WebScriptObject scriptObjectForJSObject:toRef(win) originRootObject:root rootObject:root]);
     }
 
     return d->m_windowScriptObject;