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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 5f41eb834fa4c58390057aa74d7644f7a2e46855
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jul 19 09:13:29 2002 +0000

            Fix a regression caused by a previous commit that broke frames.
    
    	* WebCoreSupport.subproj/WebBridge.m:
            (-[WebBridge receivedData:withDataSource:]): Instead setting the data source
    	implicitly here, and doing other special first-time init, simply assert that
    	we have a data source.
            (-[WebBridge setDataSource:]): Do the extra work when setting the data
    	source here instead.
            * WebView.subproj/WebDataSourcePrivate.m:
            (-[WebDataSource _commitIfReady]): After making the
    	representation, set the data source, because we no longer pass the
    	first data chunk _before_ transitioning to committed, instead we
    	do it right after, so the logic in WebBridge to do it implicitly
    	was not going to cut it.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1595 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 1dfdf6e..c317973 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,20 @@
+2002-07-19  Maciej Stachowiak  <mjs at apple.com>
+
+        Fix a regression caused by a previous commit that broke frames.
+
+	* WebCoreSupport.subproj/WebBridge.m:
+        (-[WebBridge receivedData:withDataSource:]): Instead setting the data source
+	implicitly here, and doing other special first-time init, simply assert that
+	we have a data source.
+        (-[WebBridge setDataSource:]): Do the extra work when setting the data
+	source here instead.
+        * WebView.subproj/WebDataSourcePrivate.m:
+        (-[WebDataSource _commitIfReady]): After making the
+	representation, set the data source, because we no longer pass the
+	first data chunk _before_ transitioning to committed, instead we
+	do it right after, so the logic in WebBridge to do it implicitly
+	was not going to cut it.
+
 2002-07-18  Maciej Stachowiak  <mjs at apple.com>
 
 	More refactoring: Simplify a bit more by moving more logic into
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 1dfdf6e..c317973 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,20 @@
+2002-07-19  Maciej Stachowiak  <mjs at apple.com>
+
+        Fix a regression caused by a previous commit that broke frames.
+
+	* WebCoreSupport.subproj/WebBridge.m:
+        (-[WebBridge receivedData:withDataSource:]): Instead setting the data source
+	implicitly here, and doing other special first-time init, simply assert that
+	we have a data source.
+        (-[WebBridge setDataSource:]): Do the extra work when setting the data
+	source here instead.
+        * WebView.subproj/WebDataSourcePrivate.m:
+        (-[WebDataSource _commitIfReady]): After making the
+	representation, set the data source, because we no longer pass the
+	first data chunk _before_ transitioning to committed, instead we
+	do it right after, so the logic in WebBridge to do it implicitly
+	was not going to cut it.
+
 2002-07-18  Maciej Stachowiak  <mjs at apple.com>
 
 	More refactoring: Simplify a bit more by moving more logic into
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index a08ee0b..0031d56 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -157,16 +157,8 @@
 
 - (void)receivedData:(NSData *)data withDataSource:(WebDataSource *)withDataSource
 {
-    if (dataSource == nil) {
-        [self setDataSource:withDataSource];
-        [self openURL:[dataSource inputURL]];
-        if ([dataSource redirectedURL]) {
-            [self setURL:[dataSource redirectedURL]];
-        }
-    } else {
-        WEBKIT_ASSERT(dataSource == withDataSource);
-    }
-    
+    WEBKIT_ASSERT(dataSource != nil);
+
     [self addData:data withEncoding:[dataSource encoding]];
 }
 
@@ -189,8 +181,17 @@
 
 - (void)setDataSource: (WebDataSource *)ds
 {
-    // FIXME: non-retained because data source owns representation owns bridge
-    dataSource = ds;
+    if (dataSource == nil) {
+	// FIXME: non-retained because data source owns representation owns bridge
+	dataSource = ds;
+        [self openURL:[dataSource inputURL]];
+        if ([dataSource redirectedURL]) {
+            [self setURL:[dataSource redirectedURL]];
+        }
+    } else {
+        WEBKIT_ASSERT(dataSource == ds);
+    }
+
 }
 
 - (BOOL)openedByScript
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index c98e965..a05d0f1 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -418,6 +418,7 @@
         WEBKITDEBUGLEVEL (WEBKIT_LOG_LOADING, "committed resource = %s\n", [[[self inputURL] absoluteString] cString]);
 	_private->committed = TRUE;
 	[self _makeRepresentation];
+	[[self _bridge] setDataSource:self];
         [[self webFrame] _transitionToCommitted];
     }
 }

-- 
WebKit Debian packaging