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

[mrowe at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 11f89fb87d7190b1f9381760c4aca0bd05b37527
Author: mrowe at apple.com <mrowe at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 12 12:29:02 2010 +0000

    Fix the 32-bit WebKit2 build.
    
    WebKit2:
    
    * UIProcess/cf/WebBackForwardListCF.cpp:
    (WebKit::WebBackForwardList::restoreFromCFDictionaryRepresentation): Change currentIndex to be of
    type CFIndex and specify kCFNumberCFIndexType when calling CFNumberGetValue. This avoids a warning
    when comparing currentIndex with another variable of type CFIndex later in the function.
    
    WebKitTools:
    
    * MiniBrowser/mac/BrowserWindowController.m:
    (getWindowFrame): Use NSRect rather than CGRect since that's what -frame returns.
    (setWindowFrame): Use NSMakeRect rather than CGRectMake since that's what -setFrame:display: expects.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69575 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 41adfb4..5629f03 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,14 @@
 2010-10-12  Mark Rowe  <mrowe at apple.com>
 
+        Fix the 32-bit WebKit2 build.
+
+        * UIProcess/cf/WebBackForwardListCF.cpp:
+        (WebKit::WebBackForwardList::restoreFromCFDictionaryRepresentation): Change currentIndex to be of
+        type CFIndex and specify kCFNumberCFIndexType when calling CFNumberGetValue. This avoids a warning
+        when comparing currentIndex with another variable of type CFIndex later in the function.
+
+2010-10-12  Mark Rowe  <mrowe at apple.com>
+
         Fix class vs struct forward declaration issues in WebKit2 observed when using clang.
 
         * Scripts/webkit2/messages.py: Add WebCore::ViewportArguments to the set of structs.
diff --git a/WebKit2/UIProcess/cf/WebBackForwardListCF.cpp b/WebKit2/UIProcess/cf/WebBackForwardListCF.cpp
index e6ddea9..ad03e85 100644
--- a/WebKit2/UIProcess/cf/WebBackForwardListCF.cpp
+++ b/WebKit2/UIProcess/cf/WebBackForwardListCF.cpp
@@ -70,19 +70,19 @@ bool WebBackForwardList::restoreFromCFDictionaryRepresentation(CFDictionaryRef d
         LOG(SessionState, "WebBackForwardList dictionary representation does not have a valid current index");
         return false;
     }
-    
-    unsigned currentIndex;
-    if (!CFNumberGetValue(cfIndex, kCFNumberIntType, &currentIndex)) {
+
+    CFIndex currentIndex;
+    if (!CFNumberGetValue(cfIndex, kCFNumberCFIndexType, &currentIndex)) {
         LOG(SessionState, "WebBackForwardList dictionary representation does not have a valid integer current index");
         return false;
     }
-    
+
     CFArrayRef cfEntries = (CFArrayRef)CFDictionaryGetValue(dictionary, SessionHistoryEntriesKey());
     if (!cfEntries || CFGetTypeID(cfEntries) != CFArrayGetTypeID()) {
         LOG(SessionState, "WebBackForwardList dictionary representation does not have a valid list of entries");
         return false;
     }
-    
+
     CFIndex size = CFArrayGetCount(cfEntries);
     for (CFIndex i = 0; i < size; ++i) {
         CFDictionaryRef entryDictionary = (CFDictionaryRef)CFArrayGetValueAtIndex(cfEntries, i);
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 3ffa178..14a6c9f 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,11 @@
+2010-10-12  Mark Rowe  <mrowe at apple.com>
+
+        Fix the 32-bit WebKit2 build.
+
+        * MiniBrowser/mac/BrowserWindowController.m:
+        (getWindowFrame): Use NSRect rather than CGRect since that's what -frame returns.
+        (setWindowFrame): Use NSMakeRect rather than CGRectMake since that's what -setFrame:display: expects.
+
 2010-10-11  Tony Chang  <tony at chromium.org>
 
         Reviewed by Adam Barth.
diff --git a/WebKitTools/MiniBrowser/mac/BrowserWindowController.m b/WebKitTools/MiniBrowser/mac/BrowserWindowController.m
index 2df04ff..2cba660 100644
--- a/WebKitTools/MiniBrowser/mac/BrowserWindowController.m
+++ b/WebKitTools/MiniBrowser/mac/BrowserWindowController.m
@@ -486,7 +486,7 @@ static void contentsSizeChanged(WKPageRef page, int width, int height, WKFrameRe
 
 static WKRect getWindowFrame(WKPageRef page, const void* clientInfo)
 {
-    CGRect rect = [[(BrowserWindowController *)clientInfo window] frame];
+    NSRect rect = [[(BrowserWindowController *)clientInfo window] frame];
     WKRect wkRect;
     wkRect.origin.x = rect.origin.x;
     wkRect.origin.y = rect.origin.y;
@@ -497,7 +497,7 @@ static WKRect getWindowFrame(WKPageRef page, const void* clientInfo)
 
 static void setWindowFrame(WKPageRef page, WKRect rect, const void* clientInfo)
 {
-    [[(BrowserWindowController *)clientInfo window] setFrame:CGRectMake(rect.origin.x, rect.origin.y, rect.size.width, rect.size.height) display:YES];
+    [[(BrowserWindowController *)clientInfo window] setFrame:NSMakeRect(rect.origin.x, rect.origin.y, rect.size.width, rect.size.height) display:YES];
 }
 
 static bool runBeforeUnloadConfirmPanel(WKPageRef page, WKStringRef message, WKFrameRef frame, const void* clientInfo)

-- 
WebKit Debian packaging