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

[ddkilzer at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 1acbb50ce1f7e7e5f37476538e931adfb632512e
Author: ddkilzer at apple.com <ddkilzer at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Jul 18 21:38:21 2010 +0000

    <http://webkit.org/b/42522> Add missing (id) return type to Obj-C methods
    
    Reviewed by Dan Bernstein.
    
    * Carbon/CarbonWindowAdapter.mm:
    (-[NSWindow(HIWebFrameView) _initContent:styleMask:backing:defer:contentView:]):
    (-[CarbonWindowAdapter _destroyRealWindow:]):
    (-[CarbonWindowAdapter _clearModalWindowLevel]):
    * Misc/WebIconDatabase.mm:
    (-[WebIconDatabase init]):
    * Misc/WebNSPasteboardExtras.mm:
    (-[NSFilePromiseDragSource initWithSource:]):
    * WebView/WebHTMLRepresentation.mm:
    (-[WebHTMLRepresentation init]):
    * WebView/WebPreferences.mm:
    (-[WebPreferences init]):
    * WebView/WebView.mm:
    (-[WebView UIDelegate]):
    (-[WebView resourceLoadDelegate]):
    (-[WebView downloadDelegate]):
    (-[WebView policyDelegate]):
    (-[WebView frameLoadDelegate]):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63632 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/Carbon/CarbonWindowAdapter.mm b/WebKit/mac/Carbon/CarbonWindowAdapter.mm
index c57bc37..9747350 100644
--- a/WebKit/mac/Carbon/CarbonWindowAdapter.mm
+++ b/WebKit/mac/Carbon/CarbonWindowAdapter.mm
@@ -81,7 +81,7 @@
 #import "WebTypesInternal.h"
 
 @interface NSWindow(HIWebFrameView)
-- _initContent:(const NSRect *)contentRect styleMask:(unsigned int)aStyle backing:(NSBackingStoreType)bufferingType defer:(BOOL)flag contentView:aView;
+- (id)_initContent:(const NSRect *)contentRect styleMask:(unsigned int)aStyle backing:(NSBackingStoreType)bufferingType defer:(BOOL)flag contentView:aView;
 - (void)_oldPlaceWindow:(NSRect)frameRect;
 - (void)_windowMovedToRect:(NSRect)actualFrame;
 - (void)_setWindowNumber:(NSInteger)nativeWindow;
@@ -517,7 +517,7 @@ static OSStatus NSCarbonWindowHandleEvent(EventHandlerCallRef inEventHandlerCall
 
 
 // Do the right thing for a Carbon window.
-- _destroyRealWindow:(BOOL)orderingOut {
+- (id)_destroyRealWindow:(BOOL)orderingOut {
 
     // Complain, because this should never be called.  We don't support one-shot NSCarbonWindows.
     NSLog(@"-[NSCarbonWindow _destroyRealWindow:] is not implemented.");
@@ -804,7 +804,7 @@ static OSStatus NSCarbonWindowHandleEvent(EventHandlerCallRef inEventHandlerCall
     return;
 }
 
-- _clearModalWindowLevel {
+- (id)_clearModalWindowLevel {
     return nil;
 }
 
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 8d5b1bc..7468076 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,28 @@
+2010-07-18  David Kilzer  <ddkilzer at apple.com>
+
+        <http://webkit.org/b/42522> Add missing (id) return type to Obj-C methods
+
+        Reviewed by Dan Bernstein.
+
+        * Carbon/CarbonWindowAdapter.mm:
+        (-[NSWindow(HIWebFrameView) _initContent:styleMask:backing:defer:contentView:]):
+        (-[CarbonWindowAdapter _destroyRealWindow:]):
+        (-[CarbonWindowAdapter _clearModalWindowLevel]):
+        * Misc/WebIconDatabase.mm:
+        (-[WebIconDatabase init]):
+        * Misc/WebNSPasteboardExtras.mm:
+        (-[NSFilePromiseDragSource initWithSource:]):
+        * WebView/WebHTMLRepresentation.mm:
+        (-[WebHTMLRepresentation init]):
+        * WebView/WebPreferences.mm:
+        (-[WebPreferences init]):
+        * WebView/WebView.mm:
+        (-[WebView UIDelegate]):
+        (-[WebView resourceLoadDelegate]):
+        (-[WebView downloadDelegate]):
+        (-[WebView policyDelegate]):
+        (-[WebView frameLoadDelegate]):
+
 2010-07-16  Zhe Su  <suzhe at chromium.org>
 
         Reviewed by Darin Adler.
diff --git a/WebKit/mac/Misc/WebIconDatabase.mm b/WebKit/mac/Misc/WebIconDatabase.mm
index f53bffa..7d0a350 100644
--- a/WebKit/mac/Misc/WebIconDatabase.mm
+++ b/WebKit/mac/Misc/WebIconDatabase.mm
@@ -104,7 +104,7 @@ static WebIconDatabaseClient* defaultClient()
     return database;
 }
 
-- init
+- (id)init
 {
     [super init];
     WebCoreThreadViolationCheckRoundOne();
diff --git a/WebKit/mac/Misc/WebNSPasteboardExtras.mm b/WebKit/mac/Misc/WebNSPasteboardExtras.mm
index ab3baf7..7caa47a 100644
--- a/WebKit/mac/Misc/WebNSPasteboardExtras.mm
+++ b/WebKit/mac/Misc/WebNSPasteboardExtras.mm
@@ -48,7 +48,7 @@
 #import <wtf/StdLibExtras.h>
 
 @interface NSFilePromiseDragSource : NSObject
-- initWithSource:(id)draggingSource;
+- (id)initWithSource:(id)draggingSource;
 - (void)setTypes:(NSArray *)types onPasteboard:(NSPasteboard *)pboard;
 @end
 
diff --git a/WebKit/mac/WebView/WebHTMLRepresentation.mm b/WebKit/mac/WebView/WebHTMLRepresentation.mm
index c009f4a..7843c9a 100644
--- a/WebKit/mac/WebView/WebHTMLRepresentation.mm
+++ b/WebKit/mac/WebView/WebHTMLRepresentation.mm
@@ -113,7 +113,7 @@ static NSArray *concatenateArrays(NSArray *first, NSArray *second)
     return staticSupportedImageMIMETypes.get();
 }
 
-- init
+- (id)init
 {
     self = [super init];
     if (!self)
diff --git a/WebKit/mac/WebView/WebPreferences.mm b/WebKit/mac/WebView/WebPreferences.mm
index 6f6230b..63915dc 100644
--- a/WebKit/mac/WebView/WebPreferences.mm
+++ b/WebKit/mac/WebView/WebPreferences.mm
@@ -176,7 +176,7 @@ static WebCacheModel cacheModelForMainBundle(void)
 
 @implementation WebPreferences
 
-- init
+- (id)init
 {
     // Create fake identifier
     static int instanceCount = 1;
diff --git a/WebKit/mac/WebView/WebView.mm b/WebKit/mac/WebView/WebView.mm
index 25a990a..a715aad 100644
--- a/WebKit/mac/WebView/WebView.mm
+++ b/WebKit/mac/WebView/WebView.mm
@@ -3086,7 +3086,7 @@ static bool needsWebViewInitThreadWorkaround()
     _private->UIDelegateForwarder = nil;
 }
 
-- UIDelegate
+- (id)UIDelegate
 {
     return _private->UIDelegate;
 }
@@ -3097,7 +3097,7 @@ static bool needsWebViewInitThreadWorkaround()
     [self _cacheResourceLoadDelegateImplementations];
 }
 
-- resourceLoadDelegate
+- (id)resourceLoadDelegate
 {
     return _private->resourceProgressDelegate;
 }
@@ -3108,7 +3108,7 @@ static bool needsWebViewInitThreadWorkaround()
 }
 
 
-- downloadDelegate
+- (id)downloadDelegate
 {
     return _private->downloadDelegate;
 }
@@ -3120,7 +3120,7 @@ static bool needsWebViewInitThreadWorkaround()
     _private->policyDelegateForwarder = nil;
 }
 
-- policyDelegate
+- (id)policyDelegate
 {
     return _private->policyDelegate;
 }
@@ -3146,7 +3146,7 @@ static bool needsWebViewInitThreadWorkaround()
 #endif
 }
 
-- frameLoadDelegate
+- (id)frameLoadDelegate
 {
     return _private->frameLoadDelegate;
 }

-- 
WebKit Debian packaging