Fix the 32-bit build.

Source/WebKit/mac:

* Carbon/CarbonWindowAdapter.mm:
(-[CarbonWindowAdapter initWithCarbonWindowRef:takingOwnership:disableOrdering:carbon:]): Use a more appropriate format specifier.
(-[CarbonWindowAdapter _carbonWindowClass]): Ditto.

Source/WebKit2:

This involves hacking around some HIToolbox headers that do things of dubious correctness,
and fixing the usual CGRect vs NSRect issues.

* UIProcess/mac/WKFullScreenWindowController.mm:
(-[WKFullScreenWindowController enterFullScreen:]): NSRect is not CGRect.
* WebProcess/FullScreen/mac/WebFullScreenManagerMac.mm:
(WebKit::WebFullScreenManagerMac::beginExitFullScreenAnimation): Ditto.

git-svn-id: svn://svn.chromium.org/blink/trunk@80946 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/WebKit/mac/Carbon/CarbonWindowAdapter.mm

@@ -179,7 +179,7 @@ static OSStatus NSCarbonWindowHandleEvent(EventHandlerCallRef inEventHandlerCall
 
     osStatus = GetWindowModality(_windowRef, &windowModality, NULL);
     if (osStatus != noErr) {
-        NSLog(@"Couldn't get window modality: error=%d", osStatus);
+        NSLog(@"Couldn't get window modality: error=%ld", osStatus);
         return nil;
     }
     
@@ -334,7 +334,7 @@ static OSStatus NSCarbonWindowHandleEvent(EventHandlerCallRef inEventHandlerCall
     if ([self _hasWindowRef]) {
         osStatus = GetWindowClass([self windowRef], &windowClass);
         if (osStatus != noErr) {
-            NSLog(@"Couldn't get window class: error=%d", osStatus);
+            NSLog(@"Couldn't get window class: error=%ld", osStatus);
         }
     }
     return windowClass; 

third_party/WebKit/Source/WebKit/mac/ChangeLog

+2011-03-12  Mark Rowe  <mrowe@apple.com>
+
+        Fix the 32-bit build.
+
+        * Carbon/CarbonWindowAdapter.mm:
+        (-[CarbonWindowAdapter initWithCarbonWindowRef:takingOwnership:disableOrdering:carbon:]): Use a more appropriate format specifier.
+        (-[CarbonWindowAdapter _carbonWindowClass]): Ditto.
+
 2011-03-11  Brady Eidson  <beidson@apple.com>
 
         Reviewed by Anders Carlsson

third_party/WebKit/Source/WebKit2/ChangeLog

+2011-03-12  Mark Rowe  <mrowe@apple.com>
+
+        Fix the 32-bit build.
+
+        This involves hacking around some HIToolbox headers that do things of dubious correctness,
+        and fixing the usual CGRect vs NSRect issues.
+        
+        * UIProcess/mac/WKFullScreenWindowController.mm:
+        (-[WKFullScreenWindowController enterFullScreen:]): NSRect is not CGRect.
+        * WebProcess/FullScreen/mac/WebFullScreenManagerMac.mm:
+        (WebKit::WebFullScreenManagerMac::beginExitFullScreenAnimation): Ditto.
+
 2011-03-12  Anders Carlsson  <andersca@apple.com>
 
         Reviewed by Sam Weinig.

third_party/WebKit/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h

@@ -27,6 +27,10 @@
 #import <WebCore/Editor.h>
 #import <WebCore/KeyboardEvent.h>
 
+namespace CoreIPC {
+    class DataReference;
+}
+
 namespace WebKit {
     class DrawingAreaProxy;
     class FindIndicator;

third_party/WebKit/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm

@@ -30,15 +30,15 @@
 #import "WKFullScreenWindowController.h"
 
 #import "LayerTreeContext.h"
-#import "WebPageProxy.h"
-#import "WebFullScreenManagerProxy.h"
 #import "WKAPICast.h"
 #import "WKViewInternal.h"
-#import <IOKit/pwr_mgt/IOPMLib.h> // For IOPMAssertionCreate()
+#import "WebFullScreenManagerProxy.h"
+#import "WebPageProxy.h"
 #import <HIToolbox/MacApplication.h> // For SetSystemUIMode()
+#import <IOKit/pwr_mgt/IOPMLib.h> // For IOPMAssertionCreate()
 #import <QuartzCore/QuartzCore.h>
-#import <WebCore/IntRect.h>
 #import <WebCore/FloatRect.h>
+#import <WebCore/IntRect.h>
 #import <WebKitSystemInterface.h>
 
 static const NSTimeInterval tickleTimerInterval = 1.0;
@@ -199,7 +199,7 @@ using namespace WebCore;
     
     [CATransaction begin];
     [CATransaction setDisableActions:YES];
-    [backgroundLayer setFrame:backgroundFrame];
+    [backgroundLayer setFrame:NSRectToCGRect(backgroundFrame)];
     [CATransaction commit];
 
     CFTimeInterval duration = [self _animationDuration];

third_party/WebKit/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

@@ -741,7 +741,7 @@
 		CD73BA47131ACC9A00EEDED2 /* WebFullScreenManagerProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD73BA45131ACC8800EEDED2 /* WebFullScreenManagerProxyMessageReceiver.cpp */; };
 		CD73BA4E131ACDB700EEDED2 /* WebFullScreenManagerMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD73BA48131ACD8E00EEDED2 /* WebFullScreenManagerMessageReceiver.cpp */; };
 		CD73BA53131B645B00EEDED2 /* WebFullScreenManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD73BA37131A29FE00EEDED2 /* WebFullScreenManager.cpp */; };
-		CDCA85C8132ABA4E00E961DF /* WKFullScreenWindowController.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDCA85C6132ABA4E00E961DF /* WKFullScreenWindowController.mm */; };
+		CDCA85C8132ABA4E00E961DF /* WKFullScreenWindowController.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDCA85C6132ABA4E00E961DF /* WKFullScreenWindowController.mm */; settings = {COMPILER_FLAGS = "-Wno-undef"; }; };
 		CDCA85C9132ABA4E00E961DF /* WKFullScreenWindowController.h in Headers */ = {isa = PBXBuildFile; fileRef = CDCA85C7132ABA4E00E961DF /* WKFullScreenWindowController.h */; };
 		CDCA85D5132AC2B300E961DF /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CDCA85D4132AC2B300E961DF /* IOKit.framework */; };
 		CDCA85EE132AD70100E961DF /* WebFullScreenManagerProxyMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDCA85DE132AD05300E961DF /* WebFullScreenManagerProxyMac.mm */; };

third_party/WebKit/Source/WebKit2/WebProcess/FullScreen/mac/WebFullScreenManagerMac.mm

@@ -230,7 +230,7 @@ void WebFullScreenManagerMac::beginExitFullScreenAnimation(float duration)
     // the fullscreen element appears to move from its starting position and size to its
     // final one.
     CGPoint destinationPosition = [(CALayer*)[caLayer presentationLayer] position];
-    CGRect destinationBounds = [[caLayer presentationLayer] bounds];
+    CGRect destinationBounds = NSRectToCGRect([[caLayer presentationLayer] bounds]);
     CGPoint layerAnchor = [caLayer anchorPoint];
     CGPoint initialPosition = CGPointMake(
         m_initialFrame.x() + m_initialFrame.width() * layerAnchor.x,