[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[ddkilzer at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 195fb9040a9c71f7474e6c1b6442a9f38a1adeac
Author: ddkilzer at apple.com <ddkilzer at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 19 21:08:24 2009 +0000

    Documentation fix for -[NSObject(WebResourceLoadDelegate) webView:resource:willSendRequest:redirectResponse:fromDataSource:]
    
    Reviewed by Dan Bernstein.
    
    * WebView/WebResourceLoadDelegate.h: Prepended "webView:" to the
    @method declaration of
    -webView:resource:willSendRequest:redirectResponse:fromDataSource:
    which was absent before r3953 and was missed during the great
    documentation clean up of r4269.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49808 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 7856323..8772695 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,15 @@
+2009-10-19  David Kilzer  <ddkilzer at apple.com>
+
+        Documentation fix for -[NSObject(WebResourceLoadDelegate) webView:resource:willSendRequest:redirectResponse:fromDataSource:]
+
+        Reviewed by Dan Bernstein.
+
+        * WebView/WebResourceLoadDelegate.h: Prepended "webView:" to the
+        @method declaration of
+        -webView:resource:willSendRequest:redirectResponse:fromDataSource:
+        which was absent before r3953 and was missed during the great
+        documentation clean up of r4269.
+
 2009-10-19  Anders Carlsson  <andersca at apple.com>
 
         Fix build.
diff --git a/WebKit/mac/WebView/WebResourceLoadDelegate.h b/WebKit/mac/WebView/WebResourceLoadDelegate.h
index f92466b..77d84ad 100644
--- a/WebKit/mac/WebView/WebResourceLoadDelegate.h
+++ b/WebKit/mac/WebView/WebResourceLoadDelegate.h
@@ -67,7 +67,7 @@
 - (id)webView:(WebView *)sender identifierForInitialRequest:(NSURLRequest *)request fromDataSource:(WebDataSource *)dataSource;
 
 /*!
-    @method resource:willSendRequest:redirectResponse:fromDataSource:
+    @method webView:resource:willSendRequest:redirectResponse:fromDataSource:
     @discussion This message is sent before a load is initiated.  The request may be modified
     as necessary by the receiver.
     @param webView The WebView sending the message.

-- 
WebKit Debian packaging