Attachment 342958 Details for Bug 186783 – ROLLOUT of r232935

[patch] ROLLOUT of r232935

bug-186783-20180618145803.patch (text/plain), 2.49 KB, created by WebKit Commit Bot on 2018-06-18 11:58:04 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: WebKit Commit Bot

Created: 2018-06-18 11:58:04 PDT

Size: 2.49 KB

patch

obsolete

>Subversion Revision: 232937
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 1cc95b39aafa3806e768e02aa2e9afd22deb2f42..2e8eb6fc725647cc6406dfc654fcb78abdb8c82c 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,18 @@
>+2018-06-18  Commit Queue  <commit-queue@webkit.org>
>+
>+        Unreviewed, rolling out r232935.
>+        https://bugs.webkit.org/show_bug.cgi?id=186783
>+
>+        This patch broke macOS 32-bit build (Requested by n_wang on
>+        #webkit).
>+
>+        Reverted changeset:
>+
>+        "AX: [macOS] When zoom is enabled, focus doesn't follow text
>+        cursor"
>+        https://bugs.webkit.org/show_bug.cgi?id=186697
>+        https://trac.webkit.org/changeset/232935
>+
> 2018-06-18  Nan Wang  <n_wang@apple.com>
> 
>         AX: [macOS] When zoom is enabled, focus doesn't follow text cursor
>diff --git a/Source/WebCore/editing/mac/FrameSelectionMac.mm b/Source/WebCore/editing/mac/FrameSelectionMac.mm
>index dbc21fba00b8f53cce39bf14d6ca32a2225c02d5..69eb299dfe435173a05308d4636b96b3752c4dd9 100644
>--- a/Source/WebCore/editing/mac/FrameSelectionMac.mm
>+++ b/Source/WebCore/editing/mac/FrameSelectionMac.mm
>@@ -32,6 +32,21 @@
> 
> namespace WebCore {
> 
>+#if !PLATFORM(IOS)
>+static CGRect accessibilityConvertScreenRect(CGRect bounds)
>+{
>+    NSArray *screens = [NSScreen screens];
>+    if ([screens count]) {
>+        CGFloat screenHeight = NSHeight([(NSScreen *)[screens objectAtIndex:0] frame]);
>+        bounds.origin.y = (screenHeight - (bounds.origin.y + bounds.size.height));
>+    } else
>+        bounds = CGRectZero;    
>+    
>+    return bounds;
>+}
>+#endif // !PLATFORM(IOS)
>+    
>+    
> void FrameSelection::notifyAccessibilityForSelectionChange(const AXTextStateChangeIntent& intent)
> {
>     Document* document = m_frame->document();
>@@ -60,8 +75,8 @@ void FrameSelection::notifyAccessibilityForSelectionChange(const AXTextStateChan
>     viewRect = frameView->contentsToScreen(viewRect);
>     CGRect cgCaretRect = CGRectMake(selectionRect.x(), selectionRect.y(), selectionRect.width(), selectionRect.height());
>     CGRect cgViewRect = CGRectMake(viewRect.x(), viewRect.y(), viewRect.width(), viewRect.height());
>-    cgCaretRect = toUserSpaceForPrimaryScreen(cgCaretRect);
>-    cgViewRect = toUserSpaceForPrimaryScreen(cgViewRect);
>+    cgCaretRect = accessibilityConvertScreenRect(cgCaretRect);
>+    cgViewRect = accessibilityConvertScreenRect(cgViewRect);
> 
>     UAZoomChangeFocus(&cgViewRect, &cgCaretRect, kUAZoomFocusTypeInsertionPoint);
> #endif // !PLATFORM(IOS)

Actions: View | Formatted Diff | Diff

Attachments on bug 186783: 342958