<!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>[210075] trunk/Source</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/210075">210075</a></dd>
<dt>Author</dt> <dd>bdakin@apple.com</dd>
<dt>Date</dt> <dd>2016-12-21 13:30:30 -0800 (Wed, 21 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Holding down on candidates in the TouchBar should show panel on screen
https://bugs.webkit.org/show_bug.cgi?id=166367
-and corresponding-
<rdar://problem/28479236>
Reviewed by Tim Horton.
Source/WebCore:
Expose the version of setCandidates: that takes a rect.
* platform/spi/cocoa/NSTouchBarSPI.h:
Source/WebKit/mac:
Stray whitespace.
* WebCoreSupport/WebEditorClient.mm:
(WebEditorClient::handleRequestedCandidates):
Call the version of setCandidates: that takes a rect. We need to keep the helper
function in WK1 (unlike WK2) since we also use it for testing.
* WebView/WebView.mm:
(-[WebView showCandidates:forString:inRect:forSelectedRange:view:completionHandler:]):
Source/WebKit2:
The showCandidates() helper function is not needed. We can call the AppKit method
directly at the one call site.
* UIProcess/Cocoa/WebViewImpl.h:
* UIProcess/Cocoa/WebViewImpl.mm:
The panel should appear under the selection, so offset the selection rect.
(WebKit::WebViewImpl::handleRequestedCandidates):
No more showCandidates() since we can call it directly.
(WebKit::WebViewImpl::showCandidates): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformspicocoaNSTouchBarSPIh">trunk/Source/WebCore/platform/spi/cocoa/NSTouchBarSPI.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebEditorClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebViewImplh">trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebViewImplmm">trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (210074 => 210075)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-21 21:24:17 UTC (rev 210074)
+++ trunk/Source/WebCore/ChangeLog 2016-12-21 21:30:30 UTC (rev 210075)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-12-21 Beth Dakin <bdakin@apple.com>
+
+ Holding down on candidates in the TouchBar should show panel on screen
+ https://bugs.webkit.org/show_bug.cgi?id=166367
+ -and corresponding-
+ <rdar://problem/28479236>
+
+ Reviewed by Tim Horton.
+
+ Expose the version of setCandidates: that takes a rect.
+ * platform/spi/cocoa/NSTouchBarSPI.h:
+
</ins><span class="cx"> 2016-12-21 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> Extensions3DOpenGL[ES] constructor should not be explicit
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicocoaNSTouchBarSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/cocoa/NSTouchBarSPI.h (210074 => 210075)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cocoa/NSTouchBarSPI.h 2016-12-21 21:24:17 UTC (rev 210074)
+++ trunk/Source/WebCore/platform/spi/cocoa/NSTouchBarSPI.h 2016-12-21 21:30:30 UTC (rev 210075)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx">
</span><span class="cx"> #if USE(APPLE_INTERNAL_SDK)
</span><span class="cx">
</span><ins>+#import <AppKit/NSCandidateListTouchBarItem_Private.h>
</ins><span class="cx"> #import <AppKit/NSFunctionBar_Private.h>
</span><span class="cx"> #import <AppKit/NSTextTouchBarItemController_WebKitSPI.h>
</span><span class="cx"> #import <AppKit/NSTouchBar_Private.h>
</span><span class="lines">@@ -54,6 +55,10 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><ins>+@interface NSCandidateListTouchBarItem ()
+- (void)setCandidates:(NSArray *)candidates forSelectedRange:(NSRange)selectedRange inString:(nullable NSString *)string rect:(NSRect)rect view:(nullable NSView *)view completionHandler:(nullable void (^)(id acceptedCandidate))completionBlock;
+@end
+
</ins><span class="cx"> #endif // !USE(APPLE_INTERNAL_SDK)
</span><span class="cx">
</span><span class="cx"> APPKIT_EXTERN NSNotificationName const NSTouchBarWillEnterCustomization API_AVAILABLE(macosx(10.12.2));
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (210074 => 210075)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-12-21 21:24:17 UTC (rev 210074)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-12-21 21:30:30 UTC (rev 210075)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-12-21 Beth Dakin <bdakin@apple.com>
+
+ Holding down on candidates in the TouchBar should show panel on screen
+ https://bugs.webkit.org/show_bug.cgi?id=166367
+ -and corresponding-
+ <rdar://problem/28479236>
+
+ Reviewed by Tim Horton.
+
+ Stray whitespace.
+ * WebCoreSupport/WebEditorClient.mm:
+ (WebEditorClient::handleRequestedCandidates):
+
+ Call the version of setCandidates: that takes a rect. We need to keep the helper
+ function in WK1 (unlike WK2) since we also use it for testing.
+ * WebView/WebView.mm:
+ (-[WebView showCandidates:forString:inRect:forSelectedRange:view:completionHandler:]):
+
</ins><span class="cx"> 2016-12-20 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove INDIE_UI
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebEditorClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm (210074 => 210075)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm 2016-12-21 21:24:17 UTC (rev 210074)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm 2016-12-21 21:30:30 UTC (rev 210075)
</span><span class="lines">@@ -1248,7 +1248,6 @@
</span><span class="cx"> rectForSelectionCandidates = frame->view()->contentsToWindow(quads[0].enclosingBoundingBox());
</span><span class="cx">
</span><span class="cx"> [m_webView showCandidates:candidates forString:m_paragraphContextForCandidateRequest.get() inRect:rectForSelectionCandidates forSelectedRange:m_rangeForCandidates view:m_webView completionHandler:nil];
</span><del>-
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebEditorClient::handleAcceptedCandidateWithSoftSpaces(TextCheckingResult acceptedCandidate)
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (210074 => 210075)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2016-12-21 21:24:17 UTC (rev 210074)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2016-12-21 21:30:30 UTC (rev 210075)
</span><span class="lines">@@ -5025,7 +5025,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)showCandidates:(NSArray<NSTextCheckingResult *> *)candidates forString:(NSString *)string inRect:(NSRect)rectOfTypedString forSelectedRange:(NSRange)range view:(NSView *)view completionHandler:(void (^)(NSTextCheckingResult *acceptedCandidate))completionBlock
</span><span class="cx"> {
</span><del>- [self.candidateList setCandidates:candidates forSelectedRange:range inString:string];
</del><ins>+ [self.candidateList setCandidates:candidates forSelectedRange:range inString:string rect:rectOfTypedString view:view completionHandler:completionBlock];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BOOL)shouldRequestCandidates
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (210074 => 210075)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-12-21 21:24:17 UTC (rev 210074)
+++ trunk/Source/WebKit2/ChangeLog 2016-12-21 21:30:30 UTC (rev 210075)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-12-21 Beth Dakin <bdakin@apple.com>
+
+ Holding down on candidates in the TouchBar should show panel on screen
+ https://bugs.webkit.org/show_bug.cgi?id=166367
+ -and corresponding-
+ <rdar://problem/28479236>
+
+ Reviewed by Tim Horton.
+
+ The showCandidates() helper function is not needed. We can call the AppKit method
+ directly at the one call site.
+ * UIProcess/Cocoa/WebViewImpl.h:
+ * UIProcess/Cocoa/WebViewImpl.mm:
+
+ The panel should appear under the selection, so offset the selection rect.
+ (WebKit::WebViewImpl::handleRequestedCandidates):
+
+ No more showCandidates() since we can call it directly.
+ (WebKit::WebViewImpl::showCandidates): Deleted.
+
</ins><span class="cx"> 2016-12-20 Taras Tsugrii <ttsugrii@fb.com>
</span><span class="cx">
</span><span class="cx"> Fix undefined behavior caused by macro expansion producing 'defined'
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebViewImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h (210074 => 210075)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h 2016-12-21 21:24:17 UTC (rev 210074)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h 2016-12-21 21:30:30 UTC (rev 210075)
</span><span class="lines">@@ -493,7 +493,6 @@
</span><span class="cx">
</span><span class="cx"> void forceRequestCandidatesForTesting();
</span><span class="cx"> bool shouldRequestCandidates() const;
</span><del>- void showCandidates(NSArray *candidates, NSString *, NSRect rectOfTypedString, NSRange selectedRange, NSView *, void (^completionHandler)(NSTextCheckingResult *acceptedCandidate));
</del><span class="cx">
</span><span class="cx"> bool windowIsFrontWindowUnderMouse(NSEvent *);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebViewImplmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm (210074 => 210075)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2016-12-21 21:24:17 UTC (rev 210074)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2016-12-21 21:30:30 UTC (rev 210075)
</span><span class="lines">@@ -1183,11 +1183,6 @@
</span><span class="cx"> return !m_page->editorState().isInPasswordField && candidateListTouchBarItem().candidateListVisible;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebViewImpl::showCandidates(NSArray *candidates, NSString *string, NSRect rectOfTypedString, NSRange selectedRange, NSView *view, void (^completionHandler)(NSTextCheckingResult *acceptedCandidate))
-{
- [candidateListTouchBarItem() setCandidates:candidates forSelectedRange:selectedRange inString:string];
-}
-
</del><span class="cx"> void WebViewImpl::setEditableElementIsFocused(bool editableElementIsFocused)
</span><span class="cx"> {
</span><span class="cx"> m_editableElementIsFocused = editableElementIsFocused;
</span><span class="lines">@@ -1212,10 +1207,6 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebViewImpl::showCandidates(NSArray *candidates, NSString *string, NSRect rectOfTypedString, NSRange selectedRange, NSView *view, void (^completionHandler)(NSTextCheckingResult *acceptedCandidate))
-{
-}
-
</del><span class="cx"> void WebViewImpl::setEditableElementIsFocused(bool editableElementIsFocused)
</span><span class="cx"> {
</span><span class="cx"> m_editableElementIsFocused = editableElementIsFocused;
</span><span class="lines">@@ -2994,13 +2985,10 @@
</span><span class="cx">
</span><span class="cx"> NSRange selectedRange = NSMakeRange(postLayoutData.candidateRequestStartPosition, postLayoutData.selectedTextLength);
</span><span class="cx"> auto weakThis = createWeakPtr();
</span><del>- showCandidates(candidates, postLayoutData.paragraphContextForCandidateRequest, postLayoutData.selectionClipRect, selectedRange, m_view, [weakThis](NSTextCheckingResult *acceptedCandidate) {
- dispatch_async(dispatch_get_main_queue(), ^{
- if (!weakThis)
- return;
- weakThis->handleAcceptedCandidate(acceptedCandidate);
- });
- });
</del><ins>+ WebCore::IntRect offsetSelectionRect = postLayoutData.selectionClipRect;
+ offsetSelectionRect.move(0, offsetSelectionRect.height());
+
+ [candidateListTouchBarItem() setCandidates:candidates forSelectedRange:selectedRange inString:postLayoutData.paragraphContextForCandidateRequest rect:offsetSelectionRect view:m_view completionHandler:nil];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static WebCore::TextCheckingResult textCheckingResultFromNSTextCheckingResult(NSTextCheckingResult *nsResult)
</span></span></pre>
</div>
</div>
</body>
</html>