[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

mjs mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:30:29 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit d220e58d6304d328792f60542bfc8f3d85bfa817
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 9 05:32:28 2002 +0000

    	Fix to get onLoad to fire, so the iBench test works.
    
            * WebCoreSupport.subproj/WebBridge.m:
            (-[WebBridge createChildFrameNamed:withURL:renderPart:allowsScrolling:marginWidth:marginHeight:]): Return the bridge for the new child frame.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1782 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index f29d4b1..ecab3e0 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,10 @@
+2002-08-08  Maciej Stachowiak  <mjs at apple.com>
+
+	Fix to get onLoad to fire, so the iBench test works.
+
+        * WebCoreSupport.subproj/WebBridge.m:
+        (-[WebBridge createChildFrameNamed:withURL:renderPart:allowsScrolling:marginWidth:marginHeight:]): Return the bridge for the new child frame.
+
 2002-08-08  Darin Adler  <darin at apple.com>
 
         * WebKit.pbproj/project.pbxproj: Change the group name back to Debug.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index f29d4b1..ecab3e0 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-08-08  Maciej Stachowiak  <mjs at apple.com>
+
+	Fix to get onLoad to fire, so the iBench test works.
+
+        * WebCoreSupport.subproj/WebBridge.m:
+        (-[WebBridge createChildFrameNamed:withURL:renderPart:allowsScrolling:marginWidth:marginHeight:]): Return the bridge for the new child frame.
+
 2002-08-08  Darin Adler  <darin at apple.com>
 
         * WebKit.pbproj/project.pbxproj: Change the group name back to Debug.
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index ac64be5..c1beff3 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -61,14 +61,14 @@
     return [[frame frameNamed:name] _bridge];
 }
 
-- (BOOL)createChildFrameNamed:(NSString *)frameName
+- (WebCoreBridge *)createChildFrameNamed:(NSString *)frameName
     withURL:(NSURL *)URL renderPart:(KHTMLRenderPart *)childRenderPart
     allowsScrolling:(BOOL)allowsScrolling marginWidth:(int)width marginHeight:(int)height
 {
     WEBKIT_ASSERT(frame != nil);
     WebFrame *newFrame = [[frame controller] createFrameNamed:frameName for:nil inParent:[self dataSource] allowsScrolling:allowsScrolling];
     if (newFrame == nil) {
-        return NO;
+        return nil;
     }
     
     [[newFrame _bridge] setRenderPart:childRenderPart];
@@ -82,7 +82,7 @@
     // forward list.
     [newFrame _setLoadType:WebFrameLoadTypeInternal];
 
-    return YES;
+    return [newFrame _bridge];
 }
 
 - (WebCoreBridge *)openNewWindowWithURL:(NSURL *)URL

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list