[prev in list] [next in list] [prev in thread] [next in thread]
List: webkit-changes
Subject: [webkit-changes] [239543] trunk
From: wenson_hsieh () apple ! com
Date: 2018-12-23 6:38:24
Message-ID: 20181223063824.D58A510051CD () svn ! webkit ! org
[Download RAW message or body]
[Attachment #2 (text/html)]
<!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>[239543] trunk</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/239543">239543</a></dd> \
<dt>Author</dt> <dd>wenson_hsieh@apple.com</dd> <dt>Date</dt> <dd>2018-12-22 22:38:24 \
-0800 (Sat, 22 Dec 2018)</dd> </dl>
<h3>Log Message</h3>
<pre>[iOS] Suppress native selection behaviors when focusing a very small editable \
element https://bugs.webkit.org/show_bug.cgi?id=193005
<rdar://problem/46583527>
Reviewed by Tim Horton.
Source/WebKit:
In <a href="http://trac.webkit.org/projects/webkit/changeset/238146">r238146</a>, I \
added a mechanism to detect when the selection is hidden within transparent editable \
elements, and used this to suppress native selection on iOS (such as selection \
handles, highlight, callout bar, etc.) to avoid conflicts between the page's editing \
UI and the platform.
However, one additional technique observed on some websites involves hiding the \
selection by moving it into a tiny (1x1) editable element. Here, we currently still \
present a callout bar with editing actions, as well as show a selection caret or \
handles on iOS. To fix this, we extend the mechanism added in <a \
href="http://trac.webkit.org/projects/webkit/changeset/238146">r238146</a> by also \
suppressing the selection assistant in the case where the editable element's area is \
beneath a tiny minimum threshold.
Test: editing/selection/ios/hide-selection-in-tiny-contenteditable.html
* Shared/EditorState.cpp:
(WebKit::EditorState::PostLayoutData::encode const):
(WebKit::EditorState::PostLayoutData::decode):
(WebKit::operator<<):
* Shared/EditorState.h:
Rename selectionClipRect to focusedElementRect. We currently propagate the bounds of \
the focused element to the UI process through EditorState updates, but only for the \
purpose of returning it in the computed selection clip rect; instead, rename this \
member to something more general-purpose, so we can also use it when determining \
whether to suppress the selection assistant.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _candidateRect]):
* UIProcess/Cocoa/WebViewImpl.mm:
(WebKit::WebViewImpl::handleRequestedCandidates):
* UIProcess/ios/WKContentViewInteraction.h:
Add a new SuppressSelectionAssistantReason that corresponds to focusing tiny editable \
elements.
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView _zoomToRevealFocusedElement]):
(-[WKContentView _selectionClipRect]):
(-[WKContentView _elementDidFocus:userIsInteracting:blurPreviousNode:changingActivityState:userObject:]):
(-[WKContentView _updateChangedSelection:]):
Check the size of the focused element, and begin or stop suppressing the selection \
assistant accordingly.
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::platformEditorState const):
* WebProcess/WebPage/mac/WebPageMac.mm:
(WebKit::WebPage::platformEditorState const):
LayoutTests:
Add a new layout test to verify that native selection UI is suppressed when focusing \
a tiny (1px by 1px) editable element.
* editing/selection/ios/hide-selection-in-tiny-contenteditable-expected.txt: Added.
* editing/selection/ios/hide-selection-in-tiny-contenteditable.html: Added.
* resources/ui-helper.js:
(window.UIHelper.zoomToScale):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsresourcesuihelperjs">trunk/LayoutTests/resources/ui-helper.js</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitSharedEditorStatecpp">trunk/Source/WebKit/Shared/EditorState.cpp</a></li>
<li><a href="#trunkSourceWebKitSharedEditorStateh">trunk/Source/WebKit/Shared/EditorState.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKitUIProcessCocoaWebViewImplmm">trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm</a></li>
<li><a href="#trunkSourceWebKitUIProcessiosWKContentViewInteractionh">trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessiosWKContentViewInteractionmm">trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm</a></li>
<li><a href="#trunkSourceWebKitWebProcessWebPageiosWebPageIOSmm">trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
<li><a href="#trunkSourceWebKitWebProcessWebPagemacWebPageMacmm">trunk/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestseditingselectionioshideselectionintinycontenteditableexp \
ectedtxt">trunk/LayoutTests/editing/selection/ios/hide-selection-in-tiny-contenteditable-expected.txt</a></li>
<li><a href="#trunkLayoutTestseditingselectionioshideselectionintinycontenteditableht \
ml">trunk/LayoutTests/editing/selection/ios/hide-selection-in-tiny-contenteditable.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (239542 => \
239543)</h4> <pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2018-12-23 01:09:21 UTC (rev \
239542)
+++ trunk/LayoutTests/ChangeLog 2018-12-23 06:38:24 UTC (rev 239543)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2018-12-22 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ [iOS] Suppress native selection behaviors when focusing a very small \
editable element + https://bugs.webkit.org/show_bug.cgi?id=193005
+ <rdar://problem/46583527>
+
+ Reviewed by Tim Horton.
+
+ Add a new layout test to verify that native selection UI is suppressed when \
focusing a tiny (1px by 1px) + editable element.
+
+ * editing/selection/ios/hide-selection-in-tiny-contenteditable-expected.txt: \
Added. + * editing/selection/ios/hide-selection-in-tiny-contenteditable.html: \
Added. + * resources/ui-helper.js:
+ (window.UIHelper.zoomToScale):
+
</ins><span class="cx"> 2018-12-20 Yusuke Suzuki <yusukesuzuki@slowstart.org>
</span><span class="cx">
</span><span class="cx"> [JSC] Implement "well-formed \
JSON.stringify" proposal </span></span></pre></div>
<a id="trunkLayoutTestseditingselectionioshideselectionintinycontenteditableexpectedtxt"></a>
<div class="addfile"><h4>Added: \
trunk/LayoutTests/editing/selection/ios/hide-selection-in-tiny-contenteditable-expected.txt \
(0 => 239543)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/LayoutTests/editing/selection/ios/hide-selection-in-tiny-contenteditable-expected.txt \
(rev 0)
+++ trunk/LayoutTests/editing/selection/ios/hide-selection-in-tiny-contenteditable-expected.txt 2018-12-23 \
06:38:24 UTC (rev 239543) </span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+Focus the editor
+abcdefg
+Verifies that selection UI is suppressed when the editable root is extremely small. \
To manually test, tap on the button above and verify that (1) the editable element is \
focused, and (2) selection handles are not shown. +
+On success, you will see a series of "PASS" messages, followed by \
"TEST COMPLETE". +
+After focus, the caret rect is empty
+After zooming in, the caret rect is empty
+After making editor large, the caret rect is empty
+After making editor opaque, the caret rect is (left=21, top=100, width=2, height=19)
+After making editor tiny again, the caret rect is empty
+After making editor transparent again, the caret rect is empty
+After making editor large again, the caret rect is empty
+After making editor opaque again, the caret rect is (left=50, top=100, width=2, \
height=19) +PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestseditingselectionioshideselectionintinycontenteditablehtml"></a>
<div class="addfile"><h4>Added: \
trunk/LayoutTests/editing/selection/ios/hide-selection-in-tiny-contenteditable.html \
(0 => 239543)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/LayoutTests/editing/selection/ios/hide-selection-in-tiny-contenteditable.html \
(rev 0)
+++ trunk/LayoutTests/editing/selection/ios/hide-selection-in-tiny-contenteditable.html 2018-12-23 \
06:38:24 UTC (rev 239543) </span><span class="lines">@@ -0,0 +1,93 @@
</span><ins>+<!DOCTYPE html> <!-- webkit-test-runner [ \
useFlexibleViewport=true ] --> +<html>
+<head>
+<meta name="viewport" content="width=device-width, \
initial-scale=1"> +<script \
src="../../../resources/ui-helper.js"></script> +<script \
src="../../../resources/js-test.js"></script> +<style>
+body, html {
+ width: 100%;
+ height: 100%;
+ margin: 0;
+}
+
+#editor {
+ width: 1px;
+ height: 1px;
+ outline: none;
+ overflow: hidden;
+ opacity: 0;
+}
+
+button {
+ width: 320px;
+ height: 100px;
+}
+</style>
+</head>
+<body>
+<button onclick="editor.focus()">Focus the editor</button>
+<div id="editor" contenteditable autocorrect="off" \
autocapitalize="off" spellcheck="false"></div> +<div \
id="description"></div> +<div \
id="console"></div> +<script>
+jsTestIsAsync = true;
+
+function caretRectToString(rect) {
+ if (!rect.width && !rect.height)
+ return "empty";
+ return `(left=${rect.left}, top=${rect.top}, width=${rect.width}, \
height=${rect.height})`; +}
+
+async function checkCaretRect(description)
+{
+ await UIHelper.ensurePresentationUpdate();
+ const rect = await UIHelper.getUICaretViewRect();
+ debug(`${description}, the caret rect is ${caretRectToString(rect)}`);
+}
+
+(async () => {
+ description("Verifies that selection UI is suppressed when the editable \
root is extremely small. To manually test, " + + "tap on the button \
above and verify that (1) the editable element is focused, and (2) selection handles \
are " + + "not shown.");
+
+ await UIHelper.activateAndWaitForInputSessionAt(160, 50);
+ await checkCaretRect("After focus");
+
+ await UIHelper.zoomToScale(3);
+ await UIHelper.typeCharacter("a");
+ await checkCaretRect("After zooming in");
+ await UIHelper.zoomToScale(1);
+
+ editor.style.width = "100px";
+ editor.style.height = "100px";
+ await UIHelper.typeCharacter("b");
+ await checkCaretRect("After making editor large");
+
+ editor.style.opacity = 1;
+ await UIHelper.typeCharacter("c");
+ await checkCaretRect("After making editor opaque");
+
+ editor.style.width = "1px";
+ editor.style.height = "1px";
+ await UIHelper.typeCharacter("d");
+ await checkCaretRect("After making editor tiny again");
+
+ editor.style.opacity = 0;
+ await UIHelper.typeCharacter("e");
+ await checkCaretRect("After making editor transparent again");
+
+ editor.style.width = "100px";
+ editor.style.height = "100px";
+ await UIHelper.typeCharacter("f");
+ await checkCaretRect("After making editor large again");
+
+ editor.style.opacity = 1;
+ await UIHelper.typeCharacter("g");
+ await checkCaretRect("After making editor opaque again");
+
+ finishJSTest();
+})();
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsresourcesuihelperjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/resources/ui-helper.js (239542 \
=> 239543)</h4> <pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/resources/ui-helper.js 2018-12-23 01:09:21 \
UTC (rev 239542)
+++ trunk/LayoutTests/resources/ui-helper.js 2018-12-23 06:38:24 UTC (rev 239543)
</span><span class="lines">@@ -346,6 +346,12 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ static zoomToScale(scale)
+ {
+ const uiScript = `uiController.zoomToScale(${scale}, () => \
uiController.uiScriptComplete())`; + return new Promise(resolve => \
testRunner.runUIScript(uiScript, resolve)); + }
+
</ins><span class="cx"> static typeCharacter(characterString)
</span><span class="cx"> {
</span><span class="cx"> if (!this.isWebKit2() || !this.isIOS()) {
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (239542 => \
239543)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2018-12-23 01:09:21 UTC (rev \
239542)
+++ trunk/Source/WebKit/ChangeLog 2018-12-23 06:38:24 UTC (rev 239543)
</span><span class="lines">@@ -1,3 +1,55 @@
</span><ins>+2018-12-22 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ [iOS] Suppress native selection behaviors when focusing a very small \
editable element + https://bugs.webkit.org/show_bug.cgi?id=193005
+ <rdar://problem/46583527>
+
+ Reviewed by Tim Horton.
+
+ In r238146, I added a mechanism to detect when the selection is hidden \
within transparent editable elements, and + used this to suppress native \
selection on iOS (such as selection handles, highlight, callout bar, etc.) to avoid + \
conflicts between the page's editing UI and the platform. +
+ However, one additional technique observed on some websites involves hiding \
the selection by moving it into a + tiny (1x1) editable element. Here, we \
currently still present a callout bar with editing actions, as well as + show \
a selection caret or handles on iOS. To fix this, we extend the mechanism added in \
r238146 by also + suppressing the selection assistant in the case where the \
editable element's area is beneath a tiny minimum + threshold.
+
+ Test: editing/selection/ios/hide-selection-in-tiny-contenteditable.html
+
+ * Shared/EditorState.cpp:
+ (WebKit::EditorState::PostLayoutData::encode const):
+ (WebKit::EditorState::PostLayoutData::decode):
+ (WebKit::operator<<):
+ * Shared/EditorState.h:
+
+ Rename selectionClipRect to focusedElementRect. We currently propagate the \
bounds of the focused element to the + UI process through EditorState updates, \
but only for the purpose of returning it in the computed selection clip + \
rect; instead, rename this member to something more general-purpose, so we can also \
use it when determining + whether to suppress the selection assistant.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _candidateRect]):
+ * UIProcess/Cocoa/WebViewImpl.mm:
+ (WebKit::WebViewImpl::handleRequestedCandidates):
+ * UIProcess/ios/WKContentViewInteraction.h:
+
+ Add a new SuppressSelectionAssistantReason that corresponds to focusing tiny \
editable elements. +
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _zoomToRevealFocusedElement]):
+ (-[WKContentView _selectionClipRect]):
+ (-[WKContentView \
_elementDidFocus:userIsInteracting:blurPreviousNode:changingActivityState:userObject:]):
+ (-[WKContentView _updateChangedSelection:]):
+
+ Check the size of the focused element, and begin or stop suppressing the \
selection assistant accordingly. +
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::platformEditorState const):
+ * WebProcess/WebPage/mac/WebPageMac.mm:
+ (WebKit::WebPage::platformEditorState const):
+
</ins><span class="cx"> 2018-12-20 Yusuke Suzuki <yusukesuzuki@slowstart.org>
</span><span class="cx">
</span><span class="cx"> Use Ref<> as much as possible
</span></span></pre></div>
<a id="trunkSourceWebKitSharedEditorStatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Shared/EditorState.cpp (239542 \
=> 239543)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Shared/EditorState.cpp 2018-12-23 01:09:21 \
UTC (rev 239542)
+++ trunk/Source/WebKit/Shared/EditorState.cpp 2018-12-23 06:38:24 UTC (rev 239543)
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx"> encoder << caretRectAtStart;
</span><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(IOS_FAMILY) || PLATFORM(MAC)
</span><del>- encoder << selectionClipRect;
</del><ins>+ encoder << focusedElementRect;
</ins><span class="cx"> encoder << selectedTextLength;
</span><span class="cx"> encoder << textAlignment;
</span><span class="cx"> encoder << textColor;
</span><span class="lines">@@ -153,7 +153,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(IOS_FAMILY) || PLATFORM(MAC)
</span><del>- if (!decoder.decode(result.selectionClipRect))
</del><ins>+ if (!decoder.decode(result.focusedElementRect))
</ins><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(result.selectedTextLength))
</span><span class="cx"> return false;
</span><span class="lines">@@ -262,8 +262,8 @@
</span><span class="cx"> ts.dumpProperty("caretRectAtStart", \
editorState.postLayoutData().caretRectAtStart); </span><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(IOS_FAMILY) || PLATFORM(MAC)
</span><del>- if (editorState.postLayoutData().selectionClipRect != IntRect())
- ts.dumpProperty("selectionClipRect", \
editorState.postLayoutData().selectionClipRect); </del><ins>+ if \
(editorState.postLayoutData().focusedElementRect != IntRect()) + \
ts.dumpProperty("focusedElementRect", \
editorState.postLayoutData().focusedElementRect); </ins><span class="cx"> if \
(editorState.postLayoutData().selectedTextLength) </span><span class="cx"> \
ts.dumpProperty("selectedTextLength", \
editorState.postLayoutData().selectedTextLength); </span><span class="cx"> if \
(editorState.postLayoutData().textAlignment != NoAlignment) \
</span></span></pre></div> <a id="trunkSourceWebKitSharedEditorStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Shared/EditorState.h (239542 \
=> 239543)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Shared/EditorState.h 2018-12-23 01:09:21 \
UTC (rev 239542)
+++ trunk/Source/WebKit/Shared/EditorState.h 2018-12-23 06:38:24 UTC (rev 239543)
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> WebCore::IntRect caretRectAtStart;
</span><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(IOS_FAMILY) || PLATFORM(MAC)
</span><del>- WebCore::IntRect selectionClipRect;
</del><ins>+ WebCore::IntRect focusedElementRect;
</ins><span class="cx"> uint64_t selectedTextLength { 0 };
</span><span class="cx"> uint32_t textAlignment { NoAlignment };
</span><span class="cx"> WebCore::Color textColor { WebCore::Color::black };
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm (239542 => 239543)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2018-12-23 01:09:21 UTC (rev \
239542)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2018-12-23 06:38:24 UTC (rev \
239543) </span><span class="lines">@@ -6739,7 +6739,7 @@
</span><span class="cx">
</span><span class="cx"> - (NSRect)_candidateRect
</span><span class="cx"> {
</span><del>- return _page->editorState().postLayoutData().selectionClipRect;
</del><ins>+ return _page->editorState().postLayoutData().focusedElementRect;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BOOL)_useSystemAppearance
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessCocoaWebViewImplmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm \
(239542 => 239543)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm 2018-12-23 \
01:09:21 UTC (rev 239542)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm 2018-12-23 06:38:24 UTC (rev \
239543) </span><span class="lines">@@ -3297,7 +3297,7 @@
</span><span class="cx">
</span><span class="cx"> #if HAVE(TOUCH_BAR)
</span><span class="cx"> NSRange selectedRange = \
NSMakeRange(postLayoutData.candidateRequestStartPosition, \
postLayoutData.selectedTextLength); </span><del>- WebCore::IntRect \
offsetSelectionRect = postLayoutData.selectionClipRect; </del><ins>+ \
WebCore::IntRect offsetSelectionRect = postLayoutData.focusedElementRect; </ins><span \
class="cx"> offsetSelectionRect.move(0, offsetSelectionRect.height()); \
</span><span class="cx"> </span><span class="cx"> [candidateListTouchBarItem() \
setCandidates:candidates forSelectedRange:selectedRange \
inString:postLayoutData.paragraphContextForCandidateRequest rect:offsetSelectionRect \
view:m_view.getAutoreleased() completionHandler:nil]; </span></span></pre></div>
<a id="trunkSourceWebKitUIProcessiosWKContentViewInteractionh"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h (239542 => 239543)</h4> \
<pre class="diff"><span> <span class="info">--- \
trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h 2018-12-23 01:09:21 UTC \
(rev 239542)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h 2018-12-23 06:38:24 \
UTC (rev 239543) </span><span class="lines">@@ -163,7 +163,8 @@
</span><span class="cx">
</span><span class="cx"> enum SuppressSelectionAssistantReason : uint8_t {
</span><span class="cx"> FocusedElementIsTransparent = 1 << 0,
</span><del>- DropAnimationIsRunning = 1 << 1
</del><ins>+ FocusedElementIsTooSmall = 1 << 1,
+ DropAnimationIsRunning = 1 << 2
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> struct WKSelectionDrawingInfo {
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (239542 => 239543)</h4> \
<pre class="diff"><span> <span class="info">--- \
trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2018-12-23 01:09:21 UTC \
(rev 239542)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2018-12-23 06:38:24 \
UTC (rev 239543) </span><span class="lines">@@ -1398,7 +1398,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)_zoomToRevealFocusedElement
</span><span class="cx"> {
</span><del>- if (_suppressSelectionAssistantReasons.contains(WebKit::FocusedElementIsTransparent))
</del><ins>+ if (_suppressSelectionAssistantReasons.contains(WebKit::FocusedElementIsTransparent) \
|| _suppressSelectionAssistantReasons.contains(WebKit::FocusedElementIsTooSmall)) \
</ins><span class="cx"> return; </span><span class="cx">
</span><span class="cx"> SetForScope<BOOL> \
isZoomingToRevealFocusedElementForScope { _isZoomingToRevealFocusedElement, YES }; \
</span><span class="lines">@@ -1465,7 +1465,7 @@ </span><span class="cx"> {
</span><span class="cx"> if (!hasFocusedElement(_focusedElementInformation))
</span><span class="cx"> return CGRectNull;
</span><del>- return _page->editorState().postLayoutData().selectionClipRect;
</del><ins>+ return _page->editorState().postLayoutData().focusedElementRect;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BOOL)gestureRecognizer:(UIGestureRecognizer \
*)preventingGestureRecognizer canPreventGestureRecognizer:(UIGestureRecognizer \
*)preventedGestureRecognizer </span><span class="lines">@@ -4446,6 +4446,8 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static const double \
minimumFocusedElementAreaForSuppressingSelectionAssistant = 4; +
</ins><span class="cx"> - (void)_elementDidFocus:(const \
WebKit::FocusedElementInformation&)information \
userIsInteracting:(BOOL)userIsInteracting blurPreviousNode:(BOOL)blurPreviousNode \
changingActivityState:(BOOL)changingActivityState userObject:(NSObject \
<NSSecureCoding> *)userObject </span><span class="cx"> {
</span><span class="cx"> SetForScope<BOOL> isChangingFocusForScope { \
_isChangingFocus, hasFocusedElement(_focusedElementInformation) }; </span><span \
class="lines">@@ -4474,6 +4476,11 @@ </span><span class="cx"> else
</span><span class="cx"> [self \
_stopSuppressingSelectionAssistantForReason:WebKit::FocusedElementIsTransparent]; \
</span><span class="cx"> </span><ins>+ if (information.elementRect.area() < \
minimumFocusedElementAreaForSuppressingSelectionAssistant) + [self \
_beginSuppressingSelectionAssistantForReason:WebKit::FocusedElementIsTooSmall]; + \
else + [self _stopSuppressingSelectionAssistantForReason:WebKit::FocusedElementIsTooSmall];
+
</ins><span class="cx"> switch (startInputSessionPolicy) {
</span><span class="cx"> case _WKFocusStartsInputSessionPolicyAuto:
</span><span class="cx"> // The default behavior is to allow node assistance \
if the user is interacting. </span><span class="lines">@@ -5000,11 +5007,16 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> auto& postLayoutData = state.postLayoutData();
</span><del>- if (hasFocusedElement(_focusedElementInformation)) {
</del><ins>+ if (!state.selectionIsNone && \
hasFocusedElement(_focusedElementInformation)) { </ins><span class="cx"> if \
(postLayoutData.elementIsTransparent) </span><span class="cx"> [self \
_beginSuppressingSelectionAssistantForReason:WebKit::FocusedElementIsTransparent]; \
</span><span class="cx"> else </span><span class="cx"> [self \
_stopSuppressingSelectionAssistantForReason:WebKit::FocusedElementIsTransparent]; \
</span><ins>+ + if (postLayoutData.focusedElementRect.area() < \
minimumFocusedElementAreaForSuppressingSelectionAssistant) + [self \
_beginSuppressingSelectionAssistantForReason:WebKit::FocusedElementIsTooSmall]; + \
else + [self \
_stopSuppressingSelectionAssistantForReason:WebKit::FocusedElementIsTooSmall]; \
</ins><span class="cx"> } </span><span class="cx">
</span><span class="cx"> WebKit::WKSelectionDrawingInfo \
selectionDrawingInfo(_page->editorState()); </span></span></pre></div>
<a id="trunkSourceWebKitWebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm (239542 => 239543)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm 2018-12-23 01:09:21 UTC (rev \
239542)
+++ trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm 2018-12-23 06:38:24 UTC \
(rev 239543) </span><span class="lines">@@ -241,7 +241,7 @@
</span><span class="cx"> postLayoutData.insideFixedPosition = \
startNodeIsInsideFixedPosition || endNodeIsInsideFixedPosition; </span><span \
class="cx"> if (!selection.isNone()) { </span><span class="cx"> if \
(m_focusedElement && m_focusedElement->renderer()) { </span><del>- \
postLayoutData.selectionClipRect = \
view->contentsToRootView(m_focusedElement->renderer()->absoluteBoundingBoxRect());
</del><ins>+ postLayoutData.focusedElementRect = \
view->contentsToRootView(m_focusedElement->renderer()->absoluteBoundingBoxRect());
</ins><span class="cx"> postLayoutData.caretColor = \
m_focusedElement->renderer()->style().caretColor(); </span><span class="cx"> \
postLayoutData.elementIsTransparent = \
m_focusedElement->renderer()->isTransparentRespectingParentFrames(); \
</span><span class="cx"> } </span></span></pre></div>
<a id="trunkSourceWebKitWebProcessWebPagemacWebPageMacmm"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm (239542 => 239543)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm 2018-12-23 01:09:21 UTC (rev \
239542)
+++ trunk/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm 2018-12-23 06:38:24 UTC \
(rev 239543) </span><span class="lines">@@ -151,11 +151,11 @@
</span><span class="cx"> Vector<FloatQuad> quads;
</span><span class="cx"> selectedRange->absoluteTextQuads(quads);
</span><span class="cx"> if (!quads.isEmpty())
</span><del>- postLayoutData.selectionClipRect = \
frame.view()->contentsToWindow(quads[0].enclosingBoundingBox()); </del><ins>+ \
postLayoutData.focusedElementRect = \
frame.view()->contentsToWindow(quads[0].enclosingBoundingBox()); </ins><span \
class="cx"> else { </span><span class="cx"> // Range::absoluteTextQuads() \
will be empty at the start of a paragraph. </span><span class="cx"> if \
(selection.isCaret()) </span><del>- postLayoutData.selectionClipRect = \
frame.view()->contentsToWindow(frame.selection().absoluteCaretBounds()); \
</del><ins>+ postLayoutData.focusedElementRect = \
frame.view()->contentsToWindow(frame.selection().absoluteCaretBounds()); \
</ins><span class="cx"> } </span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic