Title: [110228] trunk/Source
Revision
110228
Author
[email protected]
Date
2012-03-08 16:13:54 -0800 (Thu, 08 Mar 2012)

Log Message

Unreviewed Snow Leopard build fix.

On Leopard and Snow Leopard, provide an implementation for -[NSWindow convertRectToScreen:].

Source/WebKit/mac:

* WebView/WebFullScreenController.mm:
(-[NSWindow convertRectToScreen:]):

Source/WebKit2:

* UIProcess/mac/WKFullScreenWindowController.mm:
(-[NSWindow convertRectToScreen:]):

Modified Paths

Diff

Modified: trunk/Source/WebKit/mac/ChangeLog (110227 => 110228)


--- trunk/Source/WebKit/mac/ChangeLog	2012-03-08 23:52:56 UTC (rev 110227)
+++ trunk/Source/WebKit/mac/ChangeLog	2012-03-09 00:13:54 UTC (rev 110228)
@@ -1,3 +1,12 @@
+2012-03-08  Jer Noble  <[email protected]>
+
+        Unreviewed Snow Leopard build fix.
+
+        On Leopard and Snow Leopard, provide an implementation for -[NSWindow convertRectToScreen:].
+
+        * WebView/WebFullScreenController.mm:
+        (-[NSWindow convertRectToScreen:]):
+
 2012-03-07  Jon Lee  <[email protected]>
 
         Add support for ENABLE(LEGACY_NOTIFICATIONS)

Modified: trunk/Source/WebKit/mac/WebView/WebFullScreenController.mm (110227 => 110228)


--- trunk/Source/WebKit/mac/WebView/WebFullScreenController.mm	2012-03-08 23:52:56 UTC (rev 110227)
+++ trunk/Source/WebKit/mac/WebView/WebFullScreenController.mm	2012-03-09 00:13:54 UTC (rev 110228)
@@ -70,6 +70,22 @@
 - (void)_startExitFullScreenAnimationWithDuration:(NSTimeInterval)duration;
 @end
 
+#if defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD)
+@interface NSWindow(convertRectToScreenForLeopardAndSnowLeopard)
+- (NSRect)convertRectToScreen:(NSRect)aRect;
+@end
+
+@implementation NSWindow(convertRectToScreenForLeopardAndSnowLeopard)
+- (NSRect)convertRectToScreen:(NSRect)rect
+{
+    NSRect frame = [self frame];
+    rect.origin.x += frame.origin.x;
+    rect.origin.y += frame.origin.y;
+    return rect;
+}
+@end
+#endif
+
 @interface NSWindow(IsOnActiveSpaceAdditionForTigerAndLeopard)
 - (BOOL)isOnActiveSpace;
 @end

Modified: trunk/Source/WebKit2/ChangeLog (110227 => 110228)


--- trunk/Source/WebKit2/ChangeLog	2012-03-08 23:52:56 UTC (rev 110227)
+++ trunk/Source/WebKit2/ChangeLog	2012-03-09 00:13:54 UTC (rev 110228)
@@ -1,5 +1,14 @@
 2012-03-08  Jer Noble  <[email protected]>
 
+        Unreviewed Snow Leopard build fix.
+
+        On Leopard and Snow Leopard, provide an implementation for -[NSWindow convertRectToScreen:].
+
+        * UIProcess/mac/WKFullScreenWindowController.mm:
+        (-[NSWindow convertRectToScreen:]):
+
+2012-03-08  Jer Noble  <[email protected]>
+
         Further unreviewed build fix.
 
         Add in the WebCore namespace, so that IntRect is pulled in.

Modified: trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm (110227 => 110228)


--- trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm	2012-03-08 23:52:56 UTC (rev 110227)
+++ trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm	2012-03-09 00:13:54 UTC (rev 110228)
@@ -61,6 +61,22 @@
 - (void)_startExitFullScreenAnimationWithDuration:(NSTimeInterval)duration;
 @end
 
+#if defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD)
+@interface NSWindow(convertRectToScreenForLeopardAndSnowLeopard)
+- (NSRect)convertRectToScreen:(NSRect)aRect;
+@end
+
+@implementation NSWindow(convertRectToScreenForLeopardAndSnowLeopard)
+- (NSRect)convertRectToScreen:(NSRect)rect
+{
+    NSRect frame = [self frame];
+    rect.origin.x += frame.origin.x;
+    rect.origin.y += frame.origin.y;
+    return rect;
+}
+@end
+#endif
+
 @interface NSWindow(IsOnActiveSpaceAdditionForTigerAndLeopard)
 - (BOOL)isOnActiveSpace;
 @end
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to