Title: [178992] branches/safari-600.5-branch/Source/WebKit/mac
- Revision
- 178992
- Author
- bshaf...@apple.com
- Date
- 2015-01-23 01:17:30 -0800 (Fri, 23 Jan 2015)
Log Message
Merged r178676. rdar://problem/19489593
Modified Paths
Diff
Modified: branches/safari-600.5-branch/Source/WebKit/mac/ChangeLog (178991 => 178992)
--- branches/safari-600.5-branch/Source/WebKit/mac/ChangeLog 2015-01-23 09:16:11 UTC (rev 178991)
+++ branches/safari-600.5-branch/Source/WebKit/mac/ChangeLog 2015-01-23 09:17:30 UTC (rev 178992)
@@ -1,5 +1,25 @@
2015-01-23 Babak Shafiei <bshaf...@apple.com>
+ Merge r178676. rdar://problem/19489593
+
+ 2015-01-19 Beth Dakin <bda...@apple.com>
+
+ REGRESSION (r178290): Yellow highlight from context menu Lookup in Dictionary is
+ offset by flipped-ness
+ https://bugs.webkit.org/show_bug.cgi?id=140643
+ -and corresponding-
+ rdar://problem/19489593
+
+ Reviewed by Tim Horton.
+
+ We universally flipped because we assumed that the root view was flipped and the
+ WebView was not. However, in Dictionary, the WebView is flipped! So this patch
+ fixes that assumption by checking the WebView’s flipped-ness.
+ * WebView/WebView.mm:
+ (-[WebView _convertRectFromRootView:]):
+
+2015-01-23 Babak Shafiei <bshaf...@apple.com>
+
Merge r178605. rdar://problem/19490114
2015-01-16 Beth Dakin <bda...@apple.com>
Modified: branches/safari-600.5-branch/Source/WebKit/mac/WebView/WebView.mm (178991 => 178992)
--- branches/safari-600.5-branch/Source/WebKit/mac/WebView/WebView.mm 2015-01-23 09:16:11 UTC (rev 178991)
+++ branches/safari-600.5-branch/Source/WebKit/mac/WebView/WebView.mm 2015-01-23 09:17:30 UTC (rev 178992)
@@ -8578,6 +8578,8 @@
- (NSRect)_convertRectFromRootView:(NSRect)rect
{
+ if (self.isFlipped)
+ return rect;
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
