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

[cblu]

The following commit has been merged in the debian/unstable branch:
commit 209f1d6e267805e213243289212efc4839c1cd30
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jul 3 03:52:16 2002 +0000

            Can't call startLoading on a frame if setProvisionalDataSource
    returned NO.
    
            * Plugins.subproj/IFPluginView.mm:
            (-[IFPluginView
    loadURL:inTarget:withNotifyData:andHandleAttributes:]):
            * WebCoreSupport.subproj/IFWebCoreFrame.m:
            (-[IFWebCoreFrame loadURL:attributes:flags:withParent:]):
            * WebView.subproj/IFWebView.mm:
            (-[IFWebView performDragOperation:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1499 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index a769079..135ce4e 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,17 @@
 2002-07-02  Chris Blumenberg  <cblu at apple.com>
 
+	Can't call startLoading on a frame if setProvisionalDataSource 
+returned NO.
+
+        * Plugins.subproj/IFPluginView.mm:
+        (-[IFPluginView loadURL:inTarget:withNotifyData:andHandleAttributes:]):
+        * WebCoreSupport.subproj/IFWebCoreFrame.m:
+        (-[IFWebCoreFrame loadURL:attributes:flags:withParent:]):
+        * WebView.subproj/IFWebView.mm:
+        (-[IFWebView performDragOperation:]):
+
+2002-07-02  Chris Blumenberg  <cblu at apple.com>
+
 	Fixed asseration failure caused by an iframe not having a correct mime type.
 	We now assume that local files without extensions are html files. 
 
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index a769079..135ce4e 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,17 @@
 2002-07-02  Chris Blumenberg  <cblu at apple.com>
 
+	Can't call startLoading on a frame if setProvisionalDataSource 
+returned NO.
+
+        * Plugins.subproj/IFPluginView.mm:
+        (-[IFPluginView loadURL:inTarget:withNotifyData:andHandleAttributes:]):
+        * WebCoreSupport.subproj/IFWebCoreFrame.m:
+        (-[IFWebCoreFrame loadURL:attributes:flags:withParent:]):
+        * WebView.subproj/IFWebView.mm:
+        (-[IFWebView performDragOperation:]):
+
+2002-07-02  Chris Blumenberg  <cblu at apple.com>
+
 	Fixed asseration failure caused by an iframe not having a correct mime type.
 	We now assume that local files without extensions are html files. 
 
diff --git a/WebKit/Plugins.subproj/IFPluginView.mm b/WebKit/Plugins.subproj/IFPluginView.mm
index bb6a295..b8d3985 100644
--- a/WebKit/Plugins.subproj/IFPluginView.mm
+++ b/WebKit/Plugins.subproj/IFPluginView.mm
@@ -725,8 +725,8 @@ static char *newCString(NSString *string)
                 // so we have to allow this as well. Needed for iTools.
             }
             dataSource = [[[IFWebDataSource alloc] initWithURL:url attributes:attributes] autorelease];
-            [frame setProvisionalDataSource:dataSource];
-            [frame startLoading];
+            if([frame setProvisionalDataSource:dataSource])
+                [frame startLoading];
         }
     }
     return NPERR_NO_ERROR;
diff --git a/WebKit/Plugins.subproj/WebPluginView.m b/WebKit/Plugins.subproj/WebPluginView.m
index bb6a295..b8d3985 100644
--- a/WebKit/Plugins.subproj/WebPluginView.m
+++ b/WebKit/Plugins.subproj/WebPluginView.m
@@ -725,8 +725,8 @@ static char *newCString(NSString *string)
                 // so we have to allow this as well. Needed for iTools.
             }
             dataSource = [[[IFWebDataSource alloc] initWithURL:url attributes:attributes] autorelease];
-            [frame setProvisionalDataSource:dataSource];
-            [frame startLoading];
+            if([frame setProvisionalDataSource:dataSource])
+                [frame startLoading];
         }
     }
     return NPERR_NO_ERROR;
diff --git a/WebKit/WebCoreSupport.subproj/IFWebCoreFrame.m b/WebKit/WebCoreSupport.subproj/IFWebCoreFrame.m
index 53dd2d6..e786f9d 100644
--- a/WebKit/WebCoreSupport.subproj/IFWebCoreFrame.m
+++ b/WebKit/WebCoreSupport.subproj/IFWebCoreFrame.m
@@ -59,9 +59,9 @@
 {
     IFWebDataSource *newDataSource = [[IFWebDataSource alloc] initWithURL:URL attributes:attributes flags:flags];
     [newDataSource _setParent:parent];
-    [frame setProvisionalDataSource:newDataSource];
+    if([frame setProvisionalDataSource:newDataSource])
+        [frame startLoading];
     [newDataSource release];
-    [frame startLoading];
 }
 
 - (void)loadURL:(NSURL *)URL
diff --git a/WebKit/WebCoreSupport.subproj/WebFrameBridge.m b/WebKit/WebCoreSupport.subproj/WebFrameBridge.m
index 53dd2d6..e786f9d 100644
--- a/WebKit/WebCoreSupport.subproj/WebFrameBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebFrameBridge.m
@@ -59,9 +59,9 @@
 {
     IFWebDataSource *newDataSource = [[IFWebDataSource alloc] initWithURL:URL attributes:attributes flags:flags];
     [newDataSource _setParent:parent];
-    [frame setProvisionalDataSource:newDataSource];
+    if([frame setProvisionalDataSource:newDataSource])
+        [frame startLoading];
     [newDataSource release];
-    [frame startLoading];
 }
 
 - (void)loadURL:(NSURL *)URL
diff --git a/WebKit/WebView.subproj/IFWebView.mm b/WebKit/WebView.subproj/IFWebView.mm
index a5314f1..1416e15 100644
--- a/WebKit/WebView.subproj/IFWebView.mm
+++ b/WebKit/WebView.subproj/IFWebView.mm
@@ -164,8 +164,8 @@
     dataSource = [[[IFWebDataSource alloc] initWithURL:URL] autorelease];
     frame = nil;
     frame = [[self controller] mainFrame];
-    [frame setProvisionalDataSource:dataSource];
-    [frame startLoading];
+    if([frame setProvisionalDataSource:dataSource])
+        [frame startLoading];
     
     return YES;
 }
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index a5314f1..1416e15 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -164,8 +164,8 @@
     dataSource = [[[IFWebDataSource alloc] initWithURL:URL] autorelease];
     frame = nil;
     frame = [[self controller] mainFrame];
-    [frame setProvisionalDataSource:dataSource];
-    [frame startLoading];
+    if([frame setProvisionalDataSource:dataSource])
+        [frame startLoading];
     
     return YES;
 }

-- 
WebKit Debian packaging