[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[darin at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit e8afa47923a137df8474b46c598c3511d0f2d27f
Author: darin at apple.com <darin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 15 07:04:30 2010 +0000

    2010-03-14  Darin Adler  <darin at apple.com>
    
            Reviewed by Mark Rowe.
    
            Remove unneeded dependency on non-string identifier for an NSTableColumn
            https://bugs.webkit.org/show_bug.cgi?id=36106
    
            * WebView/WebTextCompletionController.mm:
            (-[WebTextCompletionController _buildUI]): Use init instead of initWithIdentifier:
            because the table has only one column and that column does not need an identifier.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55985 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 1c5f0b4..b85d373 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,14 @@
+2010-03-14  Darin Adler  <darin at apple.com>
+
+        Reviewed by Mark Rowe.
+
+        Remove unneeded dependency on non-string identifier for an NSTableColumn
+        https://bugs.webkit.org/show_bug.cgi?id=36106
+
+        * WebView/WebTextCompletionController.mm:
+        (-[WebTextCompletionController _buildUI]): Use init instead of initWithIdentifier:
+        because the table has only one column and that column does not need an identifier.
+
 2010-03-12  Beth Dakin  <bdakin at apple.com>
 
         Reviewed by Simon Fraser.
diff --git a/WebKit/mac/WebView/WebTextCompletionController.mm b/WebKit/mac/WebView/WebTextCompletionController.mm
index 4f8e6e0..2421fd7 100644
--- a/WebKit/mac/WebView/WebTextCompletionController.mm
+++ b/WebKit/mac/WebView/WebTextCompletionController.mm
@@ -84,8 +84,7 @@ using namespace std;
     NSRect scrollFrame = NSMakeRect(0, 0, 100, 100);
     NSRect tableFrame = NSZeroRect;    
     tableFrame.size = [NSScrollView contentSizeForFrameSize:scrollFrame.size hasHorizontalScroller:NO hasVerticalScroller:YES borderType:NSNoBorder];
-    // Added cast to work around problem with multiple Foundation initWithIdentifier: methods with different parameter types.
-    NSTableColumn *column = [(NSTableColumn *)[NSTableColumn alloc] initWithIdentifier:[NSNumber numberWithInt:0]];
+    NSTableColumn *column = [[NSTableColumn alloc] init];
     [column setWidth:tableFrame.size.width];
     [column setEditable:NO];
     

-- 
WebKit Debian packaging