Title: [191373] trunk/Source/WebKit/mac
- Revision
- 191373
- Author
- [email protected]
- Date
- 2015-10-20 22:09:17 -0700 (Tue, 20 Oct 2015)
Log Message
Unreviewed, rolling out r191370.
https://bugs.webkit.org/show_bug.cgi?id=150384
Broke iOS 9 build (Requested by ap on #webkit).
Reverted changeset:
"Fix build for clang-700.0.59.5 by replacing deprecated calls
to convertScreenToBase: with convertRectFromScreen:."
https://bugs.webkit.org/show_bug.cgi?id=150379
http://trac.webkit.org/changeset/191370
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (191372 => 191373)
--- trunk/Source/WebKit/mac/ChangeLog 2015-10-21 04:51:27 UTC (rev 191372)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-10-21 05:09:17 UTC (rev 191373)
@@ -1,3 +1,17 @@
+2015-10-20 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r191370.
+ https://bugs.webkit.org/show_bug.cgi?id=150384
+
+ Broke iOS 9 build (Requested by ap on #webkit).
+
+ Reverted changeset:
+
+ "Fix build for clang-700.0.59.5 by replacing deprecated calls
+ to convertScreenToBase: with convertRectFromScreen:."
+ https://bugs.webkit.org/show_bug.cgi?id=150379
+ http://trac.webkit.org/changeset/191370
+
2015-10-20 Gordon Sheridan <[email protected]>
Fix build for clang-700.0.59.5 by replacing deprecated calls to convertScreenToBase: with convertRectFromScreen:.
Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (191372 => 191373)
--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2015-10-21 04:51:27 UTC (rev 191372)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2015-10-21 05:09:17 UTC (rev 191373)
@@ -6108,10 +6108,8 @@
NSWindow *window = [self window];
WebFrame *frame = [self _frame];
- if (window) {
- NSRect screenRect = { thePoint, NSZeroSize };
- thePoint = [window convertRectFromScreen:screenRect].origin;
- }
+ if (window)
+ thePoint = [window convertScreenToBase:thePoint];
thePoint = [self convertPoint:thePoint fromView:nil];
DOMRange *range = [frame _characterRangeAtPoint:thePoint];
@@ -6151,7 +6149,7 @@
NSWindow *window = [self window];
if (window)
- resultRect = [window convertRectToScreen:resultRect];
+ resultRect.origin = [window convertBaseToScreen:resultRect.origin];
LOG(TextInput, "firstRectForCharacterRange:(%u, %u) -> (%f, %f, %f, %f)", theRange.location, theRange.length, resultRect.origin.x, resultRect.origin.y, resultRect.size.width, resultRect.size.height);
return resultRect;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
