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

[darin]

The following commit has been merged in the debian/unstable branch:
commit 357e27eae0cdc2a0de8a60a8076d3bd11478a891
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Aug 17 03:04:21 2002 +0000

    	Oops. Forgot to save in Project Builder before committing.
    
            * Plugins.subproj/WebPluginStream.m:
            * WebView.subproj/WebDataSource.m:
            * WebView.subproj/WebDataSourcePrivate.h:
            * WebView.subproj/WebDataSourcePrivate.m:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1856 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index f7265e1..60c17c6 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,14 @@
 2002-08-16  Darin Adler  <darin at apple.com>
 
+	Oops. Forgot to save in Project Builder before committing.
+
+        * Plugins.subproj/WebPluginStream.m:
+        * WebView.subproj/WebDataSource.m:
+        * WebView.subproj/WebDataSourcePrivate.h:
+        * WebView.subproj/WebDataSourcePrivate.m:
+
+2002-08-16  Darin Adler  <darin at apple.com>
+
 	Update for change to the WebResourceHandle API where the client is
 	passed in at init time.
 
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index f7265e1..60c17c6 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,14 @@
 2002-08-16  Darin Adler  <darin at apple.com>
 
+	Oops. Forgot to save in Project Builder before committing.
+
+        * Plugins.subproj/WebPluginStream.m:
+        * WebView.subproj/WebDataSource.m:
+        * WebView.subproj/WebDataSourcePrivate.h:
+        * WebView.subproj/WebDataSourcePrivate.m:
+
+2002-08-16  Darin Adler  <darin at apple.com>
+
 	Update for change to the WebResourceHandle API where the client is
 	passed in at init time.
 
diff --git a/WebKit/Plugins.subproj/WebPluginStream.m b/WebKit/Plugins.subproj/WebPluginStream.m
index d310a17..74b49e4 100644
--- a/WebKit/Plugins.subproj/WebPluginStream.m
+++ b/WebKit/Plugins.subproj/WebPluginStream.m
@@ -232,12 +232,8 @@
     [self finishedLoadingWithData:[dataSource data]];
 }
 
- at end
-
 #pragma mark WebResourceHandle
 
- at implementation WebPluginStream (WebResourceClient)
-
 - (void)WebResourceHandleDidBeginLoading:(WebResourceHandle *)handle
 {
     [[view webController] _didStartLoading:URL];
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index 0cff48a..09e357d 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -43,8 +43,8 @@
     _private->inputURL = [URL retain];
     _private->flags = theFlags;
     _private->attributes = [theAttributes retain];
-    _private->mainResourceHandleClient = [[WebMainResourceClient alloc] initWithDataSource: self];
-    _private->mainHandle = [[WebResourceHandle alloc] initWithClient:_private->mainResourceHandleClient URL:_private->inputURL attributes:theAttributes flags:theFlags];
+    _private->mainHandleClient = [[WebMainResourceClient alloc] initWithDataSource: self];
+    _private->mainHandle = [[WebResourceHandle alloc] initWithClient:_private->mainHandleClient URL:_private->inputURL attributes:theAttributes flags:theFlags];
     
     ++WebDataSourceCount;
     
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.h b/WebKit/WebView.subproj/WebDataSourcePrivate.h
index 8efe18f..2b0466c 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.h
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.h
@@ -41,7 +41,7 @@
 
     // The handle client for the main document associated with the
     // datasource.
-    WebMainResourceClient *mainResourceHandleClient;
+    WebMainResourceClient *mainHandleClient;
     
     // Active WebResourceHandles for resources associated with the
     // datasource.
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 93cd83c..00cf28e 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -72,7 +72,7 @@
     [finalURL release];
     [frames release];
     [mainHandle release];
-    [mainResourceHandleClient release];
+    [mainHandleClient release];
     [resourceHandles release];
     [pageTitle release];
     [encoding release];
@@ -155,8 +155,8 @@
 	// there's no callback for that.
         [self _loadIcon];
 
-        [_private->mainResourceHandleClient release];
-        _private->mainResourceHandleClient = 0; 
+        [_private->mainHandleClient release];
+        _private->mainHandleClient = 0; 
         [_private->mainHandle release];
         _private->mainHandle = 0;
         [self _updateLoading];
@@ -210,7 +210,7 @@
 
     // Stop download here because we can't rely on WebResourceHandleDidCancelLoading
     // as it isn't sent when the app quits.
-    [[_private->mainResourceHandleClient downloadHandler] cancel];
+    [[_private->mainHandleClient downloadHandler] cancel];
 
     if (!_private->loading) {
 	return;

-- 
WebKit Debian packaging