[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

mitz at apple.com mitz at apple.com
Wed Dec 22 15:13:31 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 34d6178d4983366c77fc43fb092696b88c0ad530
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 29 04:19:10 2010 +0000

    LLVM compiler build fix
    
    WebKit/mac:
    
    Reviewed by Mark Rowe.
    
    * Misc/WebDownload.mm:
    (-[WebDownload initWithRequest:delegate:]): Changed the delegate type from id to
    id<NSURLDownloadDelegate> to match the method signature in NSURLDownload.
    
    WebKit2:
    
    * WebProcess/Downloads/mac/DownloadMac.mm:
    (-[WKDownloadAsDelegate download:didReceiveResponse:]): Removed a stray semicolon.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70838 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index ee46d53..facfd54 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-28  Dan Bernstein  <mitz at apple.com>
+
+        Reviewed by Mark Rowe.
+
+        LLVM compiler build fix
+
+        * Misc/WebDownload.mm:
+        (-[WebDownload initWithRequest:delegate:]): Changed the delegate type from id to
+        id<NSURLDownloadDelegate> to match the method signature in NSURLDownload.
+
 2010-10-28  Ivan Krstić  <ike at apple.com>
 
         Reviewed by Mark Rowe.
diff --git a/WebKit/mac/Misc/WebDownload.mm b/WebKit/mac/Misc/WebDownload.mm
index 82c1259..a4d919a 100644
--- a/WebKit/mac/Misc/WebDownload.mm
+++ b/WebKit/mac/Misc/WebDownload.mm
@@ -219,7 +219,7 @@ using namespace WebCore;
     [super dealloc];
 }
 
-- (id)initWithRequest:(NSURLRequest *)request delegate:(id)delegate
+- (id)initWithRequest:(NSURLRequest *)request delegate:(id<NSURLDownloadDelegate>)delegate
 {
     [self _setRealDelegate:delegate];
     return [super initWithRequest:request delegate:_webInternal];
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 1384457..1c8a53d 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,10 @@
+2010-10-28  Dan Bernstein  <mitz at apple.com>
+
+        LLVM compiler build fix
+
+        * WebProcess/Downloads/mac/DownloadMac.mm:
+        (-[WKDownloadAsDelegate download:didReceiveResponse:]): Removed a stray semicolon.
+
 2010-10-28  Adam Roben  <aroben at apple.com>
 
         Move some function definitions from WebEvent.h into new .cpp files
diff --git a/WebKit2/WebProcess/Downloads/mac/DownloadMac.mm b/WebKit2/WebProcess/Downloads/mac/DownloadMac.mm
index 1936319..107bee9 100644
--- a/WebKit2/WebProcess/Downloads/mac/DownloadMac.mm
+++ b/WebKit2/WebProcess/Downloads/mac/DownloadMac.mm
@@ -114,7 +114,7 @@ void Download::platformInvalidate()
     return YES;
 }
 
-- (void)download:(NSURLDownload *)download didReceiveResponse:(NSURLResponse *)response;
+- (void)download:(NSURLDownload *)download didReceiveResponse:(NSURLResponse *)response
 {
     // FIXME: Implement.
     notImplemented();

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list