[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 9e280113c7e12e88781fab6ecc1f3ecfb42237fa
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 11 23:10:08 2002 +0000

    	Combined provisionalDataSourceChanged: and
    	provisionalDataSourceCommitted: methods into a single
    	setDataSource:, since they are always called one immediately after
    	the other.
    
            * Plugins.subproj/WebPluginView.m:
            (-[WebNetscapePluginView setDataSource:]):
            (-[WebNetscapePluginView loadRequest:inTarget:withNotifyData:]):
            * WebView.subproj/WebDocument.h:
            * WebView.subproj/WebHTMLView.m:
            (-[WebHTMLView setDataSource:]):
            * WebView.subproj/WebImageView.m:
            (-[WebImageView setDataSource:]):
            * WebView.subproj/WebTextView.m:
            (-[WebTextView setDataSource:]):
            * WebView.subproj/WebViewPrivate.m:
            (-[WebView _makeDocumentViewForDataSource:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2040 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index b205bcc..c74b986 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,23 @@
+2002-09-11  Maciej Stachowiak  <mjs at apple.com>
+
+	Combined provisionalDataSourceChanged: and
+	provisionalDataSourceCommitted: methods into a single
+	setDataSource:, since they are always called one immediately after
+	the other.
+	
+        * Plugins.subproj/WebPluginView.m:
+        (-[WebNetscapePluginView setDataSource:]):
+        (-[WebNetscapePluginView loadRequest:inTarget:withNotifyData:]):
+        * WebView.subproj/WebDocument.h:
+        * WebView.subproj/WebHTMLView.m:
+        (-[WebHTMLView setDataSource:]):
+        * WebView.subproj/WebImageView.m:
+        (-[WebImageView setDataSource:]):
+        * WebView.subproj/WebTextView.m:
+        (-[WebTextView setDataSource:]):
+        * WebView.subproj/WebViewPrivate.m:
+        (-[WebView _makeDocumentViewForDataSource:]):
+
 2002-09-11  Richard Williamson  <rjw at apple.com>
 
         Better fix for previous problem.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index b205bcc..c74b986 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,23 @@
+2002-09-11  Maciej Stachowiak  <mjs at apple.com>
+
+	Combined provisionalDataSourceChanged: and
+	provisionalDataSourceCommitted: methods into a single
+	setDataSource:, since they are always called one immediately after
+	the other.
+	
+        * Plugins.subproj/WebPluginView.m:
+        (-[WebNetscapePluginView setDataSource:]):
+        (-[WebNetscapePluginView loadRequest:inTarget:withNotifyData:]):
+        * WebView.subproj/WebDocument.h:
+        * WebView.subproj/WebHTMLView.m:
+        (-[WebHTMLView setDataSource:]):
+        * WebView.subproj/WebImageView.m:
+        (-[WebImageView setDataSource:]):
+        * WebView.subproj/WebTextView.m:
+        (-[WebTextView setDataSource:]):
+        * WebView.subproj/WebViewPrivate.m:
+        (-[WebView _makeDocumentViewForDataSource:]):
+
 2002-09-11  Richard Williamson  <rjw at apple.com>
 
         Better fix for previous problem.
diff --git a/WebKit/Plugins.subproj/WebPluginView.m b/WebKit/Plugins.subproj/WebPluginView.m
index b881e30..e786ca1 100644
--- a/WebKit/Plugins.subproj/WebPluginView.m
+++ b/WebKit/Plugins.subproj/WebPluginView.m
@@ -653,7 +653,7 @@
     return self;
 }
 
-- (void)provisionalDataSourceChanged:(WebDataSource *)dataSource
+- (void)setDataSource:(WebDataSource *)dataSource
 {
     WebNetscapePlugin *plugin;
     
@@ -681,10 +681,6 @@
     [self start];
 }
 
-- (void)provisionalDataSourceCommitted:(WebDataSource *)dataSource
-{
-}
-
 - (void)dataSourceUpdated:(WebDataSource *)dataSource
 {
 }
@@ -864,6 +860,9 @@
     
     URL = [request URL];
     
+    if(!URL)
+        return NPERR_INVALID_URL;
+    
     if(!target){
         stream = [[WebNetscapePluginStream alloc] initWithURL:URL pluginPointer:instance notifyData:notifyData];
         if(stream){
diff --git a/WebKit/WebView.subproj/WebDocument.h b/WebKit/WebView.subproj/WebDocument.h
index 38137c6..6dcb0c0 100644
--- a/WebKit/WebView.subproj/WebDocument.h
+++ b/WebKit/WebView.subproj/WebDocument.h
@@ -9,8 +9,7 @@
 @class WebError;
 
 @protocol WebDocumentView <NSObject>
-- (void)provisionalDataSourceChanged: (WebDataSource *)dataSource;
-- (void)provisionalDataSourceCommitted: (WebDataSource *)dataSource;
+- (void)setDataSource: (WebDataSource *)dataSource;
 - (void)dataSourceUpdated: (WebDataSource *)dataSource;
 - (void)layout;
 @end
diff --git a/WebKit/WebView.subproj/WebFrameViewPrivate.m b/WebKit/WebView.subproj/WebFrameViewPrivate.m
index 93f739f..28b43fe 100644
--- a/WebKit/WebView.subproj/WebFrameViewPrivate.m
+++ b/WebKit/WebView.subproj/WebFrameViewPrivate.m
@@ -73,8 +73,7 @@
     [self _setDocumentView:(id<WebDocumentView>)documentView];
     [documentView release];
 
-    [[self documentView] provisionalDataSourceChanged:dataSource];
-    [[self documentView] provisionalDataSourceCommitted:dataSource];
+    [[self documentView] setDataSource:dataSource];
 }
 
 - (void)_setController: (WebController *)controller
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index 4fe1aae..ca3038e 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -700,17 +700,12 @@
 //------------------------------------------------------------------------------------
 // WebDocumentView protocol
 //------------------------------------------------------------------------------------
-- (void)provisionalDataSourceChanged:(WebDataSource *)dataSource 
+- (void)setDataSource:(WebDataSource *)dataSource 
 {
     [[dataSource _bridge]
         createKHTMLViewWithNSView:self
         marginWidth:[[[dataSource webFrame] webView] _marginWidth]
         marginHeight:[[[dataSource webFrame] webView] _marginHeight]];
-}
-
-
-- (void)provisionalDataSourceCommitted:(WebDataSource *)dataSource 
-{
     [[self _bridge] installInFrame:[[self _web_parentWebView] frameScrollView]];
 }
 
diff --git a/WebKit/WebView.subproj/WebImageView.m b/WebKit/WebView.subproj/WebImageView.m
index 190a40c..e2eea9d 100644
--- a/WebKit/WebView.subproj/WebImageView.m
+++ b/WebKit/WebView.subproj/WebImageView.m
@@ -40,11 +40,7 @@
     [[representation image] beginAnimationInRect:[self frame] fromRect:[self frame]];
 }
 
-- (void)provisionalDataSourceChanged:(WebDataSource *)dataSource
-{
-}
-
-- (void)provisionalDataSourceCommitted:(WebDataSource *)dataSource
+- (void)setDataSource:(WebDataSource *)dataSource
 {
     representation = [[dataSource representation] retain];
 }
diff --git a/WebKit/WebView.subproj/WebTextView.m b/WebKit/WebView.subproj/WebTextView.m
index 862e37c..1d45e43 100644
--- a/WebKit/WebView.subproj/WebTextView.m
+++ b/WebKit/WebView.subproj/WebTextView.m
@@ -41,11 +41,7 @@
     [self setFont:font];
 }
 
-- (void)provisionalDataSourceChanged:(WebDataSource *)dataSource
-{
-}
-
-- (void)provisionalDataSourceCommitted:(WebDataSource *)dataSource
+- (void)setDataSource:(WebDataSource *)dataSource
 {
 }
 

-- 
WebKit Debian packaging