Title: [178993] branches/safari-600.5-branch/Source/WebKit/mac
- Revision
- 178993
- Author
- bshaf...@apple.com
- Date
- 2015-01-23 01:18:43 -0800 (Fri, 23 Jan 2015)
Log Message
Merged r178680. rdar://problem/19489593
Modified Paths
Diff
Modified: branches/safari-600.5-branch/Source/WebKit/mac/ChangeLog (178992 => 178993)
--- branches/safari-600.5-branch/Source/WebKit/mac/ChangeLog 2015-01-23 09:17:30 UTC (rev 178992)
+++ branches/safari-600.5-branch/Source/WebKit/mac/ChangeLog 2015-01-23 09:18:43 UTC (rev 178993)
@@ -1,5 +1,16 @@
2015-01-23 Babak Shafiei <bshaf...@apple.com>
+ Merge r178680. rdar://problem/19489593
+
+ 2015-01-19 Beth Dakin <bda...@apple.com>
+
+ Speculative build fix.
+
+ * WebView/WebView.mm:
+ (-[WebView _convertRectFromRootView:]):
+
+2015-01-23 Babak Shafiei <bshaf...@apple.com>
+
Merge r178676. rdar://problem/19489593
2015-01-19 Beth Dakin <bda...@apple.com>
Modified: branches/safari-600.5-branch/Source/WebKit/mac/WebView/WebView.mm (178992 => 178993)
--- branches/safari-600.5-branch/Source/WebKit/mac/WebView/WebView.mm 2015-01-23 09:17:30 UTC (rev 178992)
+++ branches/safari-600.5-branch/Source/WebKit/mac/WebView/WebView.mm 2015-01-23 09:18:43 UTC (rev 178993)
@@ -8578,8 +8578,10 @@
- (NSRect)_convertRectFromRootView:(NSRect)rect
{
+#if PLATFORM(MAC)
if (self.isFlipped)
return rect;
+#endif
return NSMakeRect(rect.origin.x, [self bounds].size.height - rect.origin.y - rect.size.height, rect.size.width, rect.size.height);
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
