<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[265503] branches/safari-610.1.25.10-branch</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/265503">265503</a></dd>
<dt>Author</dt> <dd>repstein@apple.com</dd>
<dt>Date</dt> <dd>2020-08-11 10:30:48 -0700 (Tue, 11 Aug 2020)</dd>
</dl>

<h3>Log Message</h3>
<pre>Cherry-pick <a href="http://trac.webkit.org/projects/webkit/changeset/265209">r265209</a>. rdar://problem/66802585

    should be able to request an editing context for a given region of a given input
    https://bugs.webkit.org/show_bug.cgi?id=215042
    <rdar://problem/65561491>

    Reviewed by Wenson Hsieh.

    Source/WebKit:

    Right now, it's only possible to request an editing context for either an entire input
    element or a particular rect of the page.  It should be possible to request an editing
    context for a particular rect within a given input element as well (e.g. get one paragraph
    or the currently selected text in a `<textarea>` instead of the entire thing).

    * WebProcess/WebPage/ios/WebPageIOS.mm:
    (WebKit::WebPage::requestDocumentEditingContext):

    Tools:

    * TestWebKitAPI/Tests/WebKitCocoa/DocumentEditingContext.mm:
    (TEST.DocumentEditingContext.SpatialRequest_RectEncompassingInput): Added.
    (TEST.DocumentEditingContext.SpatialRequest_RectBeforeInput): Added.
    (TEST.DocumentEditingContext.SpatialRequest_RectInsideInput): Added.
    (TEST.DocumentEditingContext.SpatialRequest_RectAfterInput): Added.
    (TEST.DocumentEditingContext.SpatialAndCurrentSelectionRequest_RectEncompassingInputWithSelection): Added.
    (TEST.DocumentEditingContext.SpatialAndCurrentSelectionRequest_RectBeforeInputWithSelection): Added.
    (TEST.DocumentEditingContext.SpatialAndCurrentSelectionRequest_RectBeforeSelectionInInput): Added.
    (TEST.DocumentEditingContext.SpatialAndCurrentSelectionRequest_RectAfterSelectionInInput): Added.
    (TEST.DocumentEditingContext.SpatialAndCurrentSelectionRequest_RectAfterInputWithSelection): Added.

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@265209 268f45cc-cd09-0410-ab3c-d52691b4dbfc</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari61012510branchSourceWebKitChangeLog">branches/safari-610.1.25.10-branch/Source/WebKit/ChangeLog</a></li>
<li><a href="#branchessafari61012510branchSourceWebKitWebProcessWebPageiosWebPageIOSmm">branches/safari-610.1.25.10-branch/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
<li><a href="#branchessafari61012510branchToolsChangeLog">branches/safari-610.1.25.10-branch/Tools/ChangeLog</a></li>
<li><a href="#branchessafari61012510branchToolsTestWebKitAPITestsWebKitCocoaDocumentEditingContextmm">branches/safari-610.1.25.10-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/DocumentEditingContext.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari61012510branchSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-610.1.25.10-branch/Source/WebKit/ChangeLog (265502 => 265503)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-610.1.25.10-branch/Source/WebKit/ChangeLog       2020-08-11 17:29:55 UTC (rev 265502)
+++ branches/safari-610.1.25.10-branch/Source/WebKit/ChangeLog  2020-08-11 17:30:48 UTC (rev 265503)
</span><span class="lines">@@ -1,3 +1,55 @@
</span><ins>+2020-08-11  Russell Epstein  <repstein@apple.com>
+
+        Cherry-pick r265209. rdar://problem/66802585
+
+    should be able to request an editing context for a given region of a given input
+    https://bugs.webkit.org/show_bug.cgi?id=215042
+    <rdar://problem/65561491>
+    
+    Reviewed by Wenson Hsieh.
+    
+    Source/WebKit:
+    
+    Right now, it's only possible to request an editing context for either an entire input
+    element or a particular rect of the page.  It should be possible to request an editing
+    context for a particular rect within a given input element as well (e.g. get one paragraph
+    or the currently selected text in a `<textarea>` instead of the entire thing).
+    
+    * WebProcess/WebPage/ios/WebPageIOS.mm:
+    (WebKit::WebPage::requestDocumentEditingContext):
+    
+    Tools:
+    
+    * TestWebKitAPI/Tests/WebKitCocoa/DocumentEditingContext.mm:
+    (TEST.DocumentEditingContext.SpatialRequest_RectEncompassingInput): Added.
+    (TEST.DocumentEditingContext.SpatialRequest_RectBeforeInput): Added.
+    (TEST.DocumentEditingContext.SpatialRequest_RectInsideInput): Added.
+    (TEST.DocumentEditingContext.SpatialRequest_RectAfterInput): Added.
+    (TEST.DocumentEditingContext.SpatialAndCurrentSelectionRequest_RectEncompassingInputWithSelection): Added.
+    (TEST.DocumentEditingContext.SpatialAndCurrentSelectionRequest_RectBeforeInputWithSelection): Added.
+    (TEST.DocumentEditingContext.SpatialAndCurrentSelectionRequest_RectBeforeSelectionInInput): Added.
+    (TEST.DocumentEditingContext.SpatialAndCurrentSelectionRequest_RectAfterSelectionInInput): Added.
+    (TEST.DocumentEditingContext.SpatialAndCurrentSelectionRequest_RectAfterInputWithSelection): Added.
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@265209 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-08-03  Devin Rousso  <drousso@apple.com>
+
+            should be able to request an editing context for a given region of a given input
+            https://bugs.webkit.org/show_bug.cgi?id=215042
+            <rdar://problem/65561491>
+
+            Reviewed by Wenson Hsieh.
+
+            Right now, it's only possible to request an editing context for either an entire input
+            element or a particular rect of the page.  It should be possible to request an editing
+            context for a particular rect within a given input element as well (e.g. get one paragraph
+            or the currently selected text in a `<textarea>` instead of the entire thing).
+
+            * WebProcess/WebPage/ios/WebPageIOS.mm:
+            (WebKit::WebPage::requestDocumentEditingContext):
+
</ins><span class="cx"> 2020-08-10  Alan Coon  <alancoon@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Cherry-pick r265303. rdar://problem/66644025
</span></span></pre></div>
<a id="branchessafari61012510branchSourceWebKitWebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: branches/safari-610.1.25.10-branch/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm (265502 => 265503)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-610.1.25.10-branch/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm    2020-08-11 17:29:55 UTC (rev 265502)
+++ branches/safari-610.1.25.10-branch/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm       2020-08-11 17:30:48 UTC (rev 265503)
</span><span class="lines">@@ -4133,7 +4133,11 @@
</span><span class="cx">             completionHandler({ });
</span><span class="cx">             return;
</span><span class="cx">         }
</span><del>-        if (is<HTMLTextFormControlElement>(element)) {
</del><ins>+
+        if (!request.rect.isEmpty()) {
+            rangeOfInterestStart = closestEditablePositionInElementForAbsolutePoint(*element, roundedIntPoint(request.rect.minXMinYCorner()));
+            rangeOfInterestEnd = closestEditablePositionInElementForAbsolutePoint(*element, roundedIntPoint(request.rect.maxXMaxYCorner()));
+        } else if (is<HTMLTextFormControlElement>(element)) {
</ins><span class="cx">             auto& textFormControlElement = downcast<HTMLTextFormControlElement>(*element);
</span><span class="cx">             rangeOfInterestStart = textFormControlElement.visiblePositionForIndex(0);
</span><span class="cx">             rangeOfInterestEnd = textFormControlElement.visiblePositionForIndex(textFormControlElement.value().length());
</span><span class="lines">@@ -4145,19 +4149,21 @@
</span><span class="cx">         // FIXME: We might need to be a bit more careful that we get something useful (test the other corners?).
</span><span class="cx">         rangeOfInterestStart = visiblePositionForPointInRootViewCoordinates(frame.get(), request.rect.minXMinYCorner());
</span><span class="cx">         rangeOfInterestEnd = visiblePositionForPointInRootViewCoordinates(frame.get(), request.rect.maxXMaxYCorner());
</span><del>-        if (rangeOfInterestEnd < rangeOfInterestStart)
-            std::exchange(rangeOfInterestStart, rangeOfInterestEnd);
-        if (request.options.contains(DocumentEditingContextRequest::Options::SpatialAndCurrentSelection)) {
-            if (selectionStart < rangeOfInterestStart)
-                rangeOfInterestStart = selectionStart;
-            if (selectionEnd > rangeOfInterestEnd)
-                rangeOfInterestEnd = selectionEnd;
-        }
</del><span class="cx">     } else if (!selection.isNone()) {
</span><span class="cx">         rangeOfInterestStart = selectionStart;
</span><span class="cx">         rangeOfInterestEnd = selectionEnd;
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    if (rangeOfInterestEnd < rangeOfInterestStart)
+        std::exchange(rangeOfInterestStart, rangeOfInterestEnd);
+
+    if (request.options.contains(DocumentEditingContextRequest::Options::SpatialAndCurrentSelection)) {
+        if (selectionStart < rangeOfInterestStart)
+            rangeOfInterestStart = selectionStart;
+        if (selectionEnd > rangeOfInterestEnd)
+            rangeOfInterestEnd = selectionEnd;
+    }
+
</ins><span class="cx">     if (rangeOfInterestStart.isNull() || rangeOfInterestStart.isOrphan() || rangeOfInterestEnd.isNull() || rangeOfInterestEnd.isOrphan()) {
</span><span class="cx">         completionHandler({ });
</span><span class="cx">         return;
</span></span></pre></div>
<a id="branchessafari61012510branchToolsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-610.1.25.10-branch/Tools/ChangeLog (265502 => 265503)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-610.1.25.10-branch/Tools/ChangeLog       2020-08-11 17:29:55 UTC (rev 265502)
+++ branches/safari-610.1.25.10-branch/Tools/ChangeLog  2020-08-11 17:30:48 UTC (rev 265503)
</span><span class="lines">@@ -1,3 +1,58 @@
</span><ins>+2020-08-11  Russell Epstein  <repstein@apple.com>
+
+        Cherry-pick r265209. rdar://problem/66802585
+
+    should be able to request an editing context for a given region of a given input
+    https://bugs.webkit.org/show_bug.cgi?id=215042
+    <rdar://problem/65561491>
+    
+    Reviewed by Wenson Hsieh.
+    
+    Source/WebKit:
+    
+    Right now, it's only possible to request an editing context for either an entire input
+    element or a particular rect of the page.  It should be possible to request an editing
+    context for a particular rect within a given input element as well (e.g. get one paragraph
+    or the currently selected text in a `<textarea>` instead of the entire thing).
+    
+    * WebProcess/WebPage/ios/WebPageIOS.mm:
+    (WebKit::WebPage::requestDocumentEditingContext):
+    
+    Tools:
+    
+    * TestWebKitAPI/Tests/WebKitCocoa/DocumentEditingContext.mm:
+    (TEST.DocumentEditingContext.SpatialRequest_RectEncompassingInput): Added.
+    (TEST.DocumentEditingContext.SpatialRequest_RectBeforeInput): Added.
+    (TEST.DocumentEditingContext.SpatialRequest_RectInsideInput): Added.
+    (TEST.DocumentEditingContext.SpatialRequest_RectAfterInput): Added.
+    (TEST.DocumentEditingContext.SpatialAndCurrentSelectionRequest_RectEncompassingInputWithSelection): Added.
+    (TEST.DocumentEditingContext.SpatialAndCurrentSelectionRequest_RectBeforeInputWithSelection): Added.
+    (TEST.DocumentEditingContext.SpatialAndCurrentSelectionRequest_RectBeforeSelectionInInput): Added.
+    (TEST.DocumentEditingContext.SpatialAndCurrentSelectionRequest_RectAfterSelectionInInput): Added.
+    (TEST.DocumentEditingContext.SpatialAndCurrentSelectionRequest_RectAfterInputWithSelection): Added.
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@265209 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-08-03  Devin Rousso  <drousso@apple.com>
+
+            should be able to request an editing context for a given region of a given input
+            https://bugs.webkit.org/show_bug.cgi?id=215042
+            <rdar://problem/65561491>
+
+            Reviewed by Wenson Hsieh.
+
+            * TestWebKitAPI/Tests/WebKitCocoa/DocumentEditingContext.mm:
+            (TEST.DocumentEditingContext.SpatialRequest_RectEncompassingInput): Added.
+            (TEST.DocumentEditingContext.SpatialRequest_RectBeforeInput): Added.
+            (TEST.DocumentEditingContext.SpatialRequest_RectInsideInput): Added.
+            (TEST.DocumentEditingContext.SpatialRequest_RectAfterInput): Added.
+            (TEST.DocumentEditingContext.SpatialAndCurrentSelectionRequest_RectEncompassingInputWithSelection): Added.
+            (TEST.DocumentEditingContext.SpatialAndCurrentSelectionRequest_RectBeforeInputWithSelection): Added.
+            (TEST.DocumentEditingContext.SpatialAndCurrentSelectionRequest_RectBeforeSelectionInInput): Added.
+            (TEST.DocumentEditingContext.SpatialAndCurrentSelectionRequest_RectAfterSelectionInInput): Added.
+            (TEST.DocumentEditingContext.SpatialAndCurrentSelectionRequest_RectAfterInputWithSelection): Added.
+
</ins><span class="cx"> 2020-08-10  Alan Coon  <alancoon@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Cherry-pick r265264. rdar://problem/66644041
</span></span></pre></div>
<a id="branchessafari61012510branchToolsTestWebKitAPITestsWebKitCocoaDocumentEditingContextmm"></a>
<div class="modfile"><h4>Modified: branches/safari-610.1.25.10-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/DocumentEditingContext.mm (265502 => 265503)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-610.1.25.10-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/DocumentEditingContext.mm       2020-08-11 17:29:55 UTC (rev 265502)
+++ branches/safari-610.1.25.10-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/DocumentEditingContext.mm  2020-08-11 17:30:48 UTC (rev 265503)
</span><span class="lines">@@ -487,6 +487,88 @@
</span><span class="cx">     return CGRectMake([domRect[@"left"] floatValue], [domRect[@"top"] floatValue], [domRect[@"width"] floatValue], [domRect[@"height"] floatValue]);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+TEST(DocumentEditingContext, SpatialRequest_RectEncompassingInput)
+{
+    auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 980, 600)]);
+
+    // Use "padding: 0" as the default user-agent stylesheet can effect text wrapping.
+    [webView synchronouslyLoadHTMLString:applyAhemStyle(@"before <textarea id='test' style='width: 26em; margin: 200px 0 0 200px; padding: 0;'>The quick brown fox jumps over the lazy dog.</textarea> after")]; // Word wraps "over" onto next line
+
+    NSArray<_WKTextInputContext *> *textInputContexts = [webView synchronouslyRequestTextInputContextsInRect:[webView frame]];
+    EXPECT_EQ(1UL, textInputContexts.count);
+
+    UIWKDocumentContext *context = [webView synchronouslyRequestDocumentContext:makeRequest(UIWKDocumentRequestText | UIWKDocumentRequestSpatial, UITextGranularityWord, 200, [webView frame], textInputContexts[0])];
+    EXPECT_NSSTRING_EQ("The quick brown fox ", context.contextBefore);
+    EXPECT_NULL(context.selectedText);
+    EXPECT_NSSTRING_EQ("jumps over the lazy dog.", context.contextAfter);
+}
+
+TEST(DocumentEditingContext, SpatialRequest_RectBeforeInput)
+{
+    auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 980, 600)]);
+
+    // Use "padding: 0" as the default user-agent stylesheet can effect text wrapping.
+    [webView synchronouslyLoadHTMLString:applyAhemStyle(@"before <textarea id='test' style='width: 26em; margin: 200px 0 0 200px; padding: 0;'>The quick brown fox jumps over the lazy dog.</textarea> after")]; // Word wraps "over" onto next line
+
+    NSArray<_WKTextInputContext *> *textInputContexts = [webView synchronouslyRequestTextInputContextsInRect:[webView frame]];
+    EXPECT_EQ(1UL, textInputContexts.count);
+
+    auto documentRect = CGRectFromJSONEncodedDOMRectJSValue([webView objectByEvaluatingJavaScript:@"test.getBoundingClientRect().toJSON()"]);
+    documentRect.origin.x -= glyphWidth * 2;
+    documentRect.origin.y -= glyphWidth * 2;
+    documentRect.size.width = glyphWidth;
+    documentRect.size.height = glyphWidth;
+
+    UIWKDocumentContext *context = [webView synchronouslyRequestDocumentContext:makeRequest(UIWKDocumentRequestText | UIWKDocumentRequestSpatial, UITextGranularityWord, 200, documentRect, textInputContexts[0])];
+    EXPECT_NULL(context.contextBefore);
+    EXPECT_NULL(context.selectedText);
+    EXPECT_NSSTRING_EQ("The quick brown fox jumps over the lazy dog.", context.contextAfter);
+}
+
+TEST(DocumentEditingContext, SpatialRequest_RectInsideInput)
+{
+    auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 980, 600)]);
+
+    // Use "padding: 0" as the default user-agent stylesheet can effect text wrapping.
+    [webView synchronouslyLoadHTMLString:applyAhemStyle(@"before <textarea id='test' style='width: 26em; margin: 200px 0 0 200px; padding: 0;'>The quick brown fox jumps over the lazy dog.</textarea> after")]; // Word wraps "over" onto next line
+
+    NSArray<_WKTextInputContext *> *textInputContexts = [webView synchronouslyRequestTextInputContextsInRect:[webView frame]];
+    EXPECT_EQ(1UL, textInputContexts.count);
+
+    auto documentRect = CGRectFromJSONEncodedDOMRectJSValue([webView objectByEvaluatingJavaScript:@"test.getBoundingClientRect().toJSON()"]);
+    documentRect.origin.x += (documentRect.size.width / 2) - (glyphWidth * 2);
+    documentRect.origin.y += (documentRect.size.height / 2) - (glyphWidth * 2);
+    documentRect.size.width = glyphWidth;
+    documentRect.size.height = glyphWidth;
+
+    UIWKDocumentContext *context = [webView synchronouslyRequestDocumentContext:makeRequest(UIWKDocumentRequestText | UIWKDocumentRequestSpatial, UITextGranularityWord, 200, documentRect, textInputContexts[0])];
+    EXPECT_NSSTRING_EQ("The quick b", context.contextBefore);
+    EXPECT_NULL(context.selectedText);
+    EXPECT_NSSTRING_EQ("rown fox jumps over the lazy dog.", context.contextAfter);
+}
+
+TEST(DocumentEditingContext, SpatialRequest_RectAfterInput)
+{
+    auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 980, 600)]);
+
+    // Use "padding: 0" as the default user-agent stylesheet can effect text wrapping.
+    [webView synchronouslyLoadHTMLString:applyAhemStyle(@"before <textarea id='test' style='width: 26em; margin: 200px 0 0 200px; padding: 0;'>The quick brown fox jumps over the lazy dog.</textarea> after")]; // Word wraps "over" onto next line
+
+    NSArray<_WKTextInputContext *> *textInputContexts = [webView synchronouslyRequestTextInputContextsInRect:[webView frame]];
+    EXPECT_EQ(1UL, textInputContexts.count);
+
+    auto documentRect = CGRectFromJSONEncodedDOMRectJSValue([webView objectByEvaluatingJavaScript:@"test.getBoundingClientRect().toJSON()"]);
+    documentRect.origin.x += documentRect.size.width + glyphWidth;
+    documentRect.origin.y += documentRect.size.height + glyphWidth;
+    documentRect.size.width = glyphWidth;
+    documentRect.size.height = glyphWidth;
+
+    UIWKDocumentContext *context = [webView synchronouslyRequestDocumentContext:makeRequest(UIWKDocumentRequestText | UIWKDocumentRequestSpatial, UITextGranularityWord, 200, documentRect, textInputContexts[0])];
+    EXPECT_NSSTRING_EQ("The quick brown fox jumps over the lazy dog.", context.contextBefore);
+    EXPECT_NULL(context.selectedText);
+    EXPECT_NULL(context.contextAfter);
+}
+
</ins><span class="cx"> TEST(DocumentEditingContext, SpatialAndCurrentSelectionRequest_RectBeforeRangeSelection)
</span><span class="cx"> {
</span><span class="cx">     auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 980, 600)]);
</span><span class="lines">@@ -601,6 +683,119 @@
</span><span class="cx">     EXPECT_NSSTRING_EQ("jumps over the", context.contextAfter);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+TEST(DocumentEditingContext, SpatialAndCurrentSelectionRequest_RectEncompassingInputWithSelection)
+{
+    auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 980, 600)]);
+
+    // Use "padding: 0" as the default user-agent stylesheet can effect text wrapping.
+    [webView synchronouslyLoadHTMLString:applyAhemStyle(@"before <span contenteditable id='test' style='display: inline-block; width: 26em; margin: 200px 0 0 200px;'>The quick brown <span id='fox_jumps_over'>fox jumps over</span> the lazy dog.</span> after")]; // Word wraps "over" onto next line
+    [webView stringByEvaluatingJavaScript:@"getSelection().setBaseAndExtent(fox_jumps_over, 0, fox_jumps_over, 1)"];
+
+    NSArray<_WKTextInputContext *> *textInputContexts = [webView synchronouslyRequestTextInputContextsInRect:[webView frame]];
+    EXPECT_EQ(1UL, textInputContexts.count);
+
+    UIWKDocumentContext *context = [webView synchronouslyRequestDocumentContext:makeRequest(UIWKDocumentRequestText | UIWKDocumentRequestSpatialAndCurrentSelection, UITextGranularityWord, 200, [webView frame], textInputContexts[0])];
+    EXPECT_NSSTRING_EQ("The quick brown ", context.contextBefore);
+    EXPECT_NSSTRING_EQ("fox jumps over", context.selectedText);
+    EXPECT_NSSTRING_EQ(" the lazy dog.", context.contextAfter);
+}
+
+TEST(DocumentEditingContext, SpatialAndCurrentSelectionRequest_RectBeforeInputWithSelection)
+{
+    auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 980, 600)]);
+
+    // Use "padding: 0" as the default user-agent stylesheet can effect text wrapping.
+    [webView synchronouslyLoadHTMLString:applyAhemStyle(@"before <span contenteditable id='test' style='display: inline-block; width: 26em; margin: 200px 0 0 200px;'>The quick brown <span id='fox_jumps_over'>fox jumps over</span> the lazy dog.</span> after")]; // Word wraps "over" onto next line
+    [webView stringByEvaluatingJavaScript:@"getSelection().setBaseAndExtent(fox_jumps_over, 0, fox_jumps_over, 1)"];
+
+    NSArray<_WKTextInputContext *> *textInputContexts = [webView synchronouslyRequestTextInputContextsInRect:[webView frame]];
+    EXPECT_EQ(1UL, textInputContexts.count);
+
+    auto documentRect = CGRectFromJSONEncodedDOMRectJSValue([webView objectByEvaluatingJavaScript:@"test.getBoundingClientRect().toJSON()"]);
+    documentRect.origin.x -= glyphWidth * 2;
+    documentRect.origin.y -= glyphWidth * 2;
+    documentRect.size.width = glyphWidth;
+    documentRect.size.height = glyphWidth;
+
+    UIWKDocumentContext *context = [webView synchronouslyRequestDocumentContext:makeRequest(UIWKDocumentRequestText | UIWKDocumentRequestSpatialAndCurrentSelection, UITextGranularityWord, 200, documentRect, textInputContexts[0])];
+    EXPECT_NSSTRING_EQ("The quick brown ", context.contextBefore);
+    EXPECT_NSSTRING_EQ("fox jumps over", context.selectedText);
+    EXPECT_NSSTRING_EQ(" the lazy dog.", context.contextAfter);
+}
+
+TEST(DocumentEditingContext, SpatialAndCurrentSelectionRequest_RectBeforeSelectionInInput)
+{
+    auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 980, 600)]);
+
+    // Use "padding: 0" as the default user-agent stylesheet can effect text wrapping.
+    [webView synchronouslyLoadHTMLString:applyAhemStyle(@"before <span contenteditable id='test' style='display: inline-block; width: 26em; margin: 200px 0 0 200px;'>The quick brown <span id='fox_jumps_over'>fox jumps over</span> the lazy dog.</span> after")]; // Word wraps "over" onto next line
+    [webView stringByEvaluatingJavaScript:@"getSelection().setBaseAndExtent(fox_jumps_over, 0, fox_jumps_over, 1)"];
+
+    NSArray<_WKTextInputContext *> *textInputContexts = [webView synchronouslyRequestTextInputContextsInRect:[webView frame]];
+    EXPECT_EQ(1UL, textInputContexts.count);
+
+    auto selectionBoxRect = CGRectFromJSONEncodedDOMRectJSValue([webView objectByEvaluatingJavaScript:@"fox_jumps_over.getBoundingClientRect().toJSON()"]);
+
+    auto documentRect = CGRectFromJSONEncodedDOMRectJSValue([webView objectByEvaluatingJavaScript:@"test.getBoundingClientRect().toJSON()"]);
+    documentRect.origin.x = ((documentRect.origin.x + selectionBoxRect.origin.x) / 2) - (glyphWidth * 2);
+    documentRect.origin.y = ((documentRect.origin.y + selectionBoxRect.origin.y) / 2) - (glyphWidth * 2);
+    documentRect.size.width = glyphWidth;
+    documentRect.size.height = glyphWidth;
+
+    UIWKDocumentContext *context = [webView synchronouslyRequestDocumentContext:makeRequest(UIWKDocumentRequestText | UIWKDocumentRequestSpatialAndCurrentSelection, UITextGranularityWord, 200, documentRect, textInputContexts[0])];
+    EXPECT_NSSTRING_EQ("The quick brown ", context.contextBefore);
+    EXPECT_NSSTRING_EQ("fox jumps over", context.selectedText);
+    EXPECT_NSSTRING_EQ(" the lazy dog.", context.contextAfter);
+}
+
+TEST(DocumentEditingContext, SpatialAndCurrentSelectionRequest_RectAfterSelectionInInput)
+{
+    auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 980, 600)]);
+
+    // Use "padding: 0" as the default user-agent stylesheet can effect text wrapping.
+    [webView synchronouslyLoadHTMLString:applyAhemStyle(@"before <span contenteditable id='test' style='display: inline-block; width: 26em; margin: 200px 0 0 200px;'>The quick brown <span id='fox_jumps_over'>fox jumps over</span> the lazy dog.</span> after")]; // Word wraps "over" onto next line
+    [webView stringByEvaluatingJavaScript:@"getSelection().setBaseAndExtent(fox_jumps_over, 0, fox_jumps_over, 1)"];
+
+    NSArray<_WKTextInputContext *> *textInputContexts = [webView synchronouslyRequestTextInputContextsInRect:[webView frame]];
+    EXPECT_EQ(1UL, textInputContexts.count);
+
+    auto selectionBoxRect = CGRectFromJSONEncodedDOMRectJSValue([webView objectByEvaluatingJavaScript:@"fox_jumps_over.getBoundingClientRect().toJSON()"]);
+
+    auto documentRect = CGRectFromJSONEncodedDOMRectJSValue([webView objectByEvaluatingJavaScript:@"test.getBoundingClientRect().toJSON()"]);
+    documentRect.origin.x = ((documentRect.origin.x + documentRect.size.width + selectionBoxRect.origin.x + selectionBoxRect.size.width) / 2) + glyphWidth;
+    documentRect.origin.y = ((documentRect.origin.y + documentRect.size.height + selectionBoxRect.origin.y + selectionBoxRect.size.height) / 2) + glyphWidth;
+    documentRect.size.width = glyphWidth;
+    documentRect.size.height = glyphWidth;
+
+    UIWKDocumentContext *context = [webView synchronouslyRequestDocumentContext:makeRequest(UIWKDocumentRequestText | UIWKDocumentRequestSpatialAndCurrentSelection, UITextGranularityWord, 200, documentRect, textInputContexts[0])];
+    EXPECT_NSSTRING_EQ("The quick brown ", context.contextBefore);
+    EXPECT_NSSTRING_EQ("fox jumps over", context.selectedText);
+    EXPECT_NSSTRING_EQ(" the lazy dog.", context.contextAfter);
+}
+
+TEST(DocumentEditingContext, SpatialAndCurrentSelectionRequest_RectAfterInputWithSelection)
+{
+    auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 980, 600)]);
+
+    // Use "padding: 0" as the default user-agent stylesheet can effect text wrapping.
+    [webView synchronouslyLoadHTMLString:applyAhemStyle(@"before <span contenteditable id='test' style='display: inline-block; width: 26em; margin: 200px 0 0 200px;'>The quick brown <span id='fox_jumps_over'>fox jumps over</span> the lazy dog.</span> after")]; // Word wraps "over" onto next line
+    [webView stringByEvaluatingJavaScript:@"getSelection().setBaseAndExtent(fox_jumps_over, 0, fox_jumps_over, 1)"];
+
+    NSArray<_WKTextInputContext *> *textInputContexts = [webView synchronouslyRequestTextInputContextsInRect:[webView frame]];
+    EXPECT_EQ(1UL, textInputContexts.count);
+
+    auto documentRect = CGRectFromJSONEncodedDOMRectJSValue([webView objectByEvaluatingJavaScript:@"test.getBoundingClientRect().toJSON()"]);
+    documentRect.origin.x += documentRect.size.width + (glyphWidth * 2);
+    documentRect.origin.y += documentRect.size.height + (glyphWidth * 2);
+    documentRect.size.width = glyphWidth;
+    documentRect.size.height = glyphWidth;
+
+    UIWKDocumentContext *context = [webView synchronouslyRequestDocumentContext:makeRequest(UIWKDocumentRequestText | UIWKDocumentRequestSpatialAndCurrentSelection, UITextGranularityWord, 200, documentRect, textInputContexts[0])];
+    EXPECT_NSSTRING_EQ("The quick brown ", context.contextBefore);
+    EXPECT_NSSTRING_EQ("fox jumps over", context.selectedText);
+    EXPECT_NSSTRING_EQ(" the lazy dog.", context.contextAfter);
+}
+
</ins><span class="cx"> TEST(DocumentEditingContext, RequestRectsInTextAreaAcrossWordWrappedLine)
</span><span class="cx"> {
</span><span class="cx">     auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
</span></span></pre>
</div>
</div>

</body>
</html>