<!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>[195421] 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/195421">195421</a></dd>
<dt>Author</dt> <dd>bdakin@apple.com</dd>
<dt>Date</dt> <dd>2016-01-21 13:51:39 -0800 (Thu, 21 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add the ability to update WebKitAdditions to WK2
https://bugs.webkit.org/show_bug.cgi?id=153320
-and corresponding-
rdar://problem/23639629
Reviewed by Anders Carlsson.
Source/WebCore:
This SPI is un-used now.
* platform/spi/mac/NSSpellCheckerSPI.h:
Source/WebKit2:
* UIProcess/API/Cocoa/WKWebView.mm:
* UIProcess/API/mac/WKView.mm:
* UIProcess/Cocoa/WebViewImpl.h:
(WebKit::WebViewImpl::createWeakPtr):
* UIProcess/Cocoa/WebViewImpl.mm:
(WebKit::WebViewImpl::updateWebViewImplAdditions):
(WebKit::WebViewImpl::showCandidates):
(WebKit::WebViewImpl::webViewImplAdditionsWillDestroyView):
(WebKit::trackingAreaOptions):
(WebKit::WebViewImpl::~WebViewImpl):
(WebKit::WebViewImpl::becomeFirstResponder):
(WebKit::WebViewImpl::selectionDidChange):
(WebKit::WebViewImpl::handleRequestedCandidates):
(WebKit::textCheckingResultFromNSTextCheckingResult):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformspimacNSSpellCheckerSPIh">trunk/Source/WebCore/platform/spi/mac/NSSpellCheckerSPI.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPImacWKViewmm">trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm</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 (195420 => 195421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-21 21:37:56 UTC (rev 195420)
+++ trunk/Source/WebCore/ChangeLog 2016-01-21 21:51:39 UTC (rev 195421)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-01-21 Beth Dakin <bdakin@apple.com>
+
+ Add the ability to update WebKitAdditions to WK2
+ https://bugs.webkit.org/show_bug.cgi?id=153320
+ -and corresponding-
+ rdar://problem/23639629
+
+ Reviewed by Anders Carlsson.
+
+ This SPI is un-used now.
+ * platform/spi/mac/NSSpellCheckerSPI.h:
+
</ins><span class="cx"> 2016-01-21 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> GraphicsContext: low quality drawImage and drawImageBuffer should use InterpolationLow
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspimacNSSpellCheckerSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/mac/NSSpellCheckerSPI.h (195420 => 195421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/mac/NSSpellCheckerSPI.h 2016-01-21 21:37:56 UTC (rev 195420)
+++ trunk/Source/WebCore/platform/spi/mac/NSSpellCheckerSPI.h 2016-01-21 21:51:39 UTC (rev 195421)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx">
</span><span class="cx"> @interface NSSpellChecker ()
</span><span class="cx"> - (NSInteger)requestCandidatesForSelectedRange:(NSRange)selectedRange inString:(NSString *)stringToCheck types:(NSTextCheckingTypes)checkingTypes options:(NSDictionary<NSString *, id> *)options inSpellDocumentWithTag:(NSInteger)tag completionHandler:(void (^)(NSInteger sequenceNumber, NSArray<NSTextCheckingResult *> *candidates))completionHandler;
</span><del>-- (void)showCandidates:(NSArray<NSTextCheckingResult *> *)candidates forString:(NSString *)string inRect:(NSRect)rectOfTypedString view:(NSView *)view completionHandler:(void (^)(NSTextCheckingResult *acceptedCandidate))completionBlock;
</del><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif // PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 102000
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (195420 => 195421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-01-21 21:37:56 UTC (rev 195420)
+++ trunk/Source/WebKit2/ChangeLog 2016-01-21 21:51:39 UTC (rev 195421)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2016-01-21 Beth Dakin <bdakin@apple.com>
+
+ Add the ability to update WebKitAdditions to WK2
+ https://bugs.webkit.org/show_bug.cgi?id=153320
+ -and corresponding-
+ rdar://problem/23639629
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ * UIProcess/API/mac/WKView.mm:
+ * UIProcess/Cocoa/WebViewImpl.h:
+ (WebKit::WebViewImpl::createWeakPtr):
+ * UIProcess/Cocoa/WebViewImpl.mm:
+ (WebKit::WebViewImpl::updateWebViewImplAdditions):
+ (WebKit::WebViewImpl::showCandidates):
+ (WebKit::WebViewImpl::webViewImplAdditionsWillDestroyView):
+ (WebKit::trackingAreaOptions):
+ (WebKit::WebViewImpl::~WebViewImpl):
+ (WebKit::WebViewImpl::becomeFirstResponder):
+ (WebKit::WebViewImpl::selectionDidChange):
+ (WebKit::WebViewImpl::handleRequestedCandidates):
+ (WebKit::textCheckingResultFromNSTextCheckingResult):
+
</ins><span class="cx"> 2016-01-19 Ada Chan <adachan@apple.com>
</span><span class="cx">
</span><span class="cx"> Make it possible to enable VIDEO_PRESENTATION_MODE on other Cocoa platforms.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (195420 => 195421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-01-21 21:37:56 UTC (rev 195420)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-01-21 21:51:39 UTC (rev 195421)
</span><span class="lines">@@ -4347,4 +4347,8 @@
</span><span class="cx"> #import <WebKitAdditions/WKWebViewAdditions.mm>
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200 && USE(APPLE_INTERNAL_SDK)
+#import <WebKitAdditions/WKWebViewAdditionsMac.mm>
+#endif
+
</ins><span class="cx"> #endif // WK_API_ENABLED
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (195420 => 195421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2016-01-21 21:37:56 UTC (rev 195420)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2016-01-21 21:51:39 UTC (rev 195421)
</span><span class="lines">@@ -1447,4 +1447,8 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><ins>+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200 && USE(APPLE_INTERNAL_SDK)
+#import <WebKitAdditions/WKViewAdditions.mm>
+#endif
+
</ins><span class="cx"> #endif // PLATFORM(MAC)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebViewImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h (195420 => 195421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h 2016-01-21 21:37:56 UTC (rev 195420)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h 2016-01-21 21:51:39 UTC (rev 195421)
</span><span class="lines">@@ -50,6 +50,10 @@
</span><span class="cx"> OBJC_CLASS WKWindowVisibilityObserver;
</span><span class="cx"> OBJC_CLASS _WKThumbnailView;
</span><span class="cx">
</span><ins>+#if USE(APPLE_INTERNAL_SDK) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
+#import <WebKitAdditions/WebViewImplAdditionsDeclarations.h>
+#endif
+
</ins><span class="cx"> @protocol WebViewImplDelegate
</span><span class="cx">
</span><span class="cx"> - (NSTextInputContext *)_web_superInputContext;
</span><span class="lines">@@ -470,6 +474,14 @@
</span><span class="cx"> void rightMouseDragged(NSEvent *);
</span><span class="cx"> void rightMouseUp(NSEvent *);
</span><span class="cx">
</span><ins>+ void updateWebViewImplAdditions();
+ void showCandidates(NSArray *candidates, NSString *, NSRect rectOfTypedString, NSView *, void (^completionHandler)(NSTextCheckingResult *acceptedCandidate));
+ void webViewImplAdditionsWillDestroyView();
+
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200 && USE(APPLE_INTERNAL_SDK)
+#import <WebKitAdditions/WebViewImplAdditions.h>
+#endif
+
</ins><span class="cx"> private:
</span><span class="cx"> WeakPtr<WebViewImpl> createWeakPtr() { return m_weakPtrFactory.createWeakPtr(); }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebViewImplmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm (195420 => 195421)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2016-01-21 21:37:56 UTC (rev 195420)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2016-01-21 21:51:39 UTC (rev 195421)
</span><span class="lines">@@ -419,8 +419,28 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><ins>+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200 && USE(APPLE_INTERNAL_SDK)
+#import <WebKitAdditions/WebViewImplAdditions.mm>
+#else
</ins><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><ins>+void WebViewImpl::updateWebViewImplAdditions()
+{
+}
+
+void WebViewImpl::showCandidates(NSArray *candidates, NSString *string, NSRect rectOfTypedString, NSView *view, void (^completionHandler)(NSTextCheckingResult *acceptedCandidate))
+{
+}
+
+void WebViewImpl::webViewImplAdditionsWillDestroyView()
+{
+}
+
+} // namespace WebKit
+#endif // __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200 && USE(APPLE_INTERNAL_SDK)
+
+namespace WebKit {
+
</ins><span class="cx"> static NSTrackingAreaOptions trackingAreaOptions()
</span><span class="cx"> {
</span><span class="cx"> // Legacy style scrollbars have design details that rely on tracking the mouse all the time.
</span><span class="lines">@@ -493,6 +513,7 @@
</span><span class="cx"> [m_layoutStrategy invalidate];
</span><span class="cx">
</span><span class="cx"> [m_immediateActionController willDestroyView:m_view];
</span><ins>+ webViewImplAdditionsWillDestroyView();
</ins><span class="cx">
</span><span class="cx"> m_page->close();
</span><span class="cx">
</span><span class="lines">@@ -567,6 +588,8 @@
</span><span class="cx">
</span><span class="cx"> m_inBecomeFirstResponder = false;
</span><span class="cx">
</span><ins>+ updateWebViewImplAdditions();
+
</ins><span class="cx"> if (direction != NSDirectSelection) {
</span><span class="cx"> NSEvent *event = [NSApp currentEvent];
</span><span class="cx"> NSEvent *keyboardEvent = nil;
</span><span class="lines">@@ -1725,6 +1748,7 @@
</span><span class="cx"> {
</span><span class="cx"> updateFontPanelIfNeeded();
</span><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
</span><ins>+ updateWebViewImplAdditions();
</ins><span class="cx"> if (!m_page->editorState().isMissingPostLayoutData)
</span><span class="cx"> requestCandidatesForSelectionIfNeeded();
</span><span class="cx"> #endif
</span><span class="lines">@@ -2134,13 +2158,13 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> auto weakThis = createWeakPtr();
</span><del>- [[NSSpellChecker sharedSpellChecker] showCandidates:candidates forString:postLayoutData.stringForCandidateRequest inRect:postLayoutData.selectionClipRect view:m_view completionHandler:[weakThis](NSTextCheckingResult *acceptedCandidate) {
</del><ins>+ showCandidates(candidates, postLayoutData.stringForCandidateRequest, postLayoutData.selectionClipRect, m_view, [weakThis](NSTextCheckingResult *acceptedCandidate) {
</ins><span class="cx"> dispatch_async(dispatch_get_main_queue(), ^{
</span><span class="cx"> if (!weakThis)
</span><span class="cx"> return;
</span><span class="cx"> weakThis->handleAcceptedCandidate(acceptedCandidate);
</span><span class="cx"> });
</span><del>- }];
</del><ins>+ });
</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>