[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 8892414266548d1e3d3e66697a93fa7a0157d7d0
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 18 08:46:24 2002 +0000

    	Yet still more refactoring in preparation for the KHTMLPart
    	change. This is preparing things to change the commit rule to
    	require receiving at least one byte of data, and having the
    	content policy set to Show.
    
            * WebView.subproj/WebController.m:
            (-[WebController haveContentPolicy:andPath:forDataSource:]): Remove
    	more code since makeRepresentation now does most of the work.
            * WebView.subproj/WebDataSource.m:
            (-[WebDataSource makeRepresentation]): Tell the WebView (if any) to create
    	the documentView now too.
            * WebView.subproj/WebView.h:
            * WebView.subproj/WebView.m:
            (-[WebView makeDocumentViewForDataSource:]): Hook document view up to data
    	source.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1586 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index f5858aa..1919b92 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,23 @@
 2002-07-18  Maciej Stachowiak  <mjs at apple.com>
 
+	Yet still more refactoring in preparation for the KHTMLPart
+	change. This is preparing things to change the commit rule to
+	require receiving at least one byte of data, and having the
+	content policy set to Show.
+
+        * WebView.subproj/WebController.m:
+        (-[WebController haveContentPolicy:andPath:forDataSource:]): Remove
+	more code since makeRepresentation now does most of the work.
+        * WebView.subproj/WebDataSource.m:
+        (-[WebDataSource makeRepresentation]): Tell the WebView (if any) to create
+	the documentView now too.
+        * WebView.subproj/WebView.h:
+        * WebView.subproj/WebView.m:
+        (-[WebView makeDocumentViewForDataSource:]): Hook document view up to data
+	source.
+
+2002-07-18  Maciej Stachowiak  <mjs at apple.com>
+
 	Some refactoring in preparation for the KHTMLPart change.
 	
         * WebView.subproj/WebDataSourcePrivate.h,
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index f5858aa..1919b92 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,23 @@
 2002-07-18  Maciej Stachowiak  <mjs at apple.com>
 
+	Yet still more refactoring in preparation for the KHTMLPart
+	change. This is preparing things to change the commit rule to
+	require receiving at least one byte of data, and having the
+	content policy set to Show.
+
+        * WebView.subproj/WebController.m:
+        (-[WebController haveContentPolicy:andPath:forDataSource:]): Remove
+	more code since makeRepresentation now does most of the work.
+        * WebView.subproj/WebDataSource.m:
+        (-[WebDataSource makeRepresentation]): Tell the WebView (if any) to create
+	the documentView now too.
+        * WebView.subproj/WebView.h:
+        * WebView.subproj/WebView.m:
+        (-[WebView makeDocumentViewForDataSource:]): Hook document view up to data
+	source.
+
+2002-07-18  Maciej Stachowiak  <mjs at apple.com>
+
 	Some refactoring in preparation for the KHTMLPart change.
 	
         * WebView.subproj/WebDataSourcePrivate.h,
diff --git a/WebKit/WebView.subproj/WebController.m b/WebKit/WebView.subproj/WebController.m
index c6923e8..5f072ea 100644
--- a/WebKit/WebView.subproj/WebController.m
+++ b/WebKit/WebView.subproj/WebController.m
@@ -240,12 +240,7 @@
         
     if (policy == WebContentPolicyShow){
 	if ([[self class] canShowMIMEType:[dataSource contentType]]){
-	    WebView *webView = [[dataSource webFrame] webView];
 	    [dataSource makeRepresentation];
-	    [webView makeDocumentViewForMIMEType:[dataSource contentType]];
-	    // FIXME: this ought to be part of makeDocumentView but I need to figure out
-	    // the provisional / committed situation
-	    [[webView documentView] provisionalDataSourceChanged:dataSource];
 	} else {
 	    WebError *error = [[WebError alloc] initWithErrorCode:WebErrorCannotShowMIMEType 
 			           inDomain:WebErrorDomainWebKit failingURL: [dataSource inputURL]];
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index 5de16ee..3ed0c6a 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -12,6 +12,7 @@
 #import <WebKit/WebDataSourcePrivate.h>
 #import <WebKit/WebController.h>
 #import <WebKit/WebFramePrivate.h>
+#import <WebKit/WebView.h>
 #import <WebKit/WebKitDebug.h>
 
 #import <WebFoundation/WebFoundation.h>
@@ -353,6 +354,8 @@
     if (![[self representation] isKindOfClass:repClass]) {
 	[self _setRepresentation:repClass != nil ? [[repClass alloc] init] : nil];
     }
+
+    [[[self webFrame] webView] makeDocumentViewForDataSource:self];
 }
 
 @end
diff --git a/WebKit/WebView.subproj/WebFrameView.h b/WebKit/WebView.subproj/WebFrameView.h
index 3e89021..751f921 100644
--- a/WebKit/WebView.subproj/WebFrameView.h
+++ b/WebKit/WebView.subproj/WebFrameView.h
@@ -40,6 +40,6 @@
 // The view must conform to the WebDocumentLoading protocol
 + (void)registerViewClass:(Class)viewClass forMIMEType:(NSString *)MIMEType;
 
--(void)makeDocumentViewForMIMEType:(NSString *)MIMEType;
+-(void)makeDocumentViewForDataSource:(WebDataSource *)dataSource;
 
 @end
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index ce6e3eb..8d5bcf8 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -4,6 +4,7 @@
 
 #import <WebKit/WebView.h>
 
+#import <WebKit/WebDocument.h>
 #import <WebKit/WebDynamicScrollBarsView.h>
 #import <WebKit/WebHTMLView.h>
 #import <WebKit/WebImageView.h>
@@ -199,10 +200,12 @@ enum {
     [[self _viewTypes] setObject:viewClass forKey:MIMEType];
 }
 
--(void)makeDocumentViewForMIMEType:(NSString *)MIMEType
+-(void)makeDocumentViewForDataSource:(WebDataSource *)dataSource
 {
-    Class viewClass = [[[self class] _viewTypes] _web_objectForMIMEType:MIMEType];
+    Class viewClass = [[[self class] _viewTypes] _web_objectForMIMEType:[dataSource contentType]];
     [self _setDocumentView: (id<WebDocumentLoading>)(viewClass ? [[[viewClass alloc] init] autorelease] : nil)];
+
+    [[self documentView] provisionalDataSourceChanged:dataSource];
 }
 
 -(BOOL)acceptsFirstResponder
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index c6923e8..5f072ea 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -240,12 +240,7 @@
         
     if (policy == WebContentPolicyShow){
 	if ([[self class] canShowMIMEType:[dataSource contentType]]){
-	    WebView *webView = [[dataSource webFrame] webView];
 	    [dataSource makeRepresentation];
-	    [webView makeDocumentViewForMIMEType:[dataSource contentType]];
-	    // FIXME: this ought to be part of makeDocumentView but I need to figure out
-	    // the provisional / committed situation
-	    [[webView documentView] provisionalDataSourceChanged:dataSource];
 	} else {
 	    WebError *error = [[WebError alloc] initWithErrorCode:WebErrorCannotShowMIMEType 
 			           inDomain:WebErrorDomainWebKit failingURL: [dataSource inputURL]];

-- 
WebKit Debian packaging