<!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>[193774] tags/Safari-602.1.13.2/Source/WebKit/mac</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/193774">193774</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-12-08 13:00:53 -0800 (Tue, 08 Dec 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/193661">r193661</a>.  rdar://problem/23639610</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari6021132SourceWebKitmacChangeLog">tags/Safari-602.1.13.2/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#tagsSafari6021132SourceWebKitmacWebCoreSupportWebEditorClientmm">tags/Safari-602.1.13.2/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm</a></li>
<li><a href="#tagsSafari6021132SourceWebKitmacWebViewWebViewmm">tags/Safari-602.1.13.2/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#tagsSafari6021132SourceWebKitmacWebViewWebViewDatah">tags/Safari-602.1.13.2/Source/WebKit/mac/WebView/WebViewData.h</a></li>
<li><a href="#tagsSafari6021132SourceWebKitmacWebViewWebViewInternalh">tags/Safari-602.1.13.2/Source/WebKit/mac/WebView/WebViewInternal.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari6021132SourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.13.2/Source/WebKit/mac/ChangeLog (193773 => 193774)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.13.2/Source/WebKit/mac/ChangeLog        2015-12-08 20:44:51 UTC (rev 193773)
+++ tags/Safari-602.1.13.2/Source/WebKit/mac/ChangeLog        2015-12-08 21:00:53 UTC (rev 193774)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-12-08  Babak Shafiei  &lt;bshafiei@apple.com&gt;
+
+        Merge r193661.
+
+    2015-12-07  Beth Dakin  &lt;bdakin@apple.com&gt;
+
+            Add support for WebViewAdditions
+            https://bugs.webkit.org/show_bug.cgi?id=151967
+
+            Reviewed by Sam Weinig.
+
+            * WebCoreSupport/WebEditorClient.mm:
+            (WebEditorClient::respondToChangedSelection):
+            * WebView/WebView.mm:
+            (-[WebView _commonInitializationWithFrameName:groupName:]):
+            (-[WebView updateWebViewAdditions]):
+            * WebView/WebViewData.h:
+            * WebView/WebViewInternal.h:
+
</ins><span class="cx"> 2015-12-01  Commit Queue  &lt;commit-queue@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Unreviewed, rolling out r192914.
</span></span></pre></div>
<a id="tagsSafari6021132SourceWebKitmacWebCoreSupportWebEditorClientmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.13.2/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm (193773 => 193774)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.13.2/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm        2015-12-08 20:44:51 UTC (rev 193773)
+++ tags/Safari-602.1.13.2/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm        2015-12-08 21:00:53 UTC (rev 193774)
</span><span class="lines">@@ -348,8 +348,10 @@
</span><span class="cx"> void WebEditorClient::respondToChangedSelection(Frame* frame)
</span><span class="cx"> {
</span><span class="cx">     NSView&lt;WebDocumentView&gt; *documentView = [[kit(frame) frameView] documentView];
</span><del>-    if ([documentView isKindOfClass:[WebHTMLView class]])
</del><ins>+    if ([documentView isKindOfClass:[WebHTMLView class]]) {
</ins><span class="cx">         [(WebHTMLView *)documentView _selectionChanged];
</span><ins>+        [m_webView updateWebViewAdditions];
+    }
</ins><span class="cx"> 
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx">     // FIXME: This quirk is needed due to &lt;rdar://problem/5009625&gt; - We can phase it out once Aperture can adopt the new behavior on their end
</span></span></pre></div>
<a id="tagsSafari6021132SourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.13.2/Source/WebKit/mac/WebView/WebView.mm (193773 => 193774)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.13.2/Source/WebKit/mac/WebView/WebView.mm        2015-12-08 20:44:51 UTC (rev 193773)
+++ tags/Safari-602.1.13.2/Source/WebKit/mac/WebView/WebView.mm        2015-12-08 21:00:53 UTC (rev 193774)
</span><span class="lines">@@ -911,6 +911,8 @@
</span><span class="cx">     }
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+    [self updateWebViewAdditions];
+
</ins><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx">     static bool didOneTimeInitialization = false;
</span><span class="cx"> #endif
</span><span class="lines">@@ -6604,6 +6606,18 @@
</span><span class="cx"> 
</span><span class="cx"> @end
</span><span class="cx"> 
</span><ins>+#if PLATFORM(MAC) &amp;&amp; __MAC_OS_X_VERSION_MIN_REQUIRED &gt;= 101200 &amp;&amp; USE(APPLE_INTERNAL_SDK)
+#import &lt;WebKitAdditions/WebViewAdditions.mm&gt;
+#else
+@implementation WebView (UpdateWebViewAdditions)
+
+- (void)updateWebViewAdditions
+{
+}
+
+@end
+#endif // PLATFORM(MAC) &amp;&amp; __MAC_OS_X_VERSION_MIN_REQUIRED &gt;= 101200 &amp;&amp; USE(APPLE_INTERNAL_SDK)
+
</ins><span class="cx"> @implementation WebView (WebPendingPublic)
</span><span class="cx"> 
</span><span class="cx"> #if !PLATFORM(IOS)
</span></span></pre></div>
<a id="tagsSafari6021132SourceWebKitmacWebViewWebViewDatah"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.13.2/Source/WebKit/mac/WebView/WebViewData.h (193773 => 193774)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.13.2/Source/WebKit/mac/WebView/WebViewData.h        2015-12-08 20:44:51 UTC (rev 193773)
+++ tags/Safari-602.1.13.2/Source/WebKit/mac/WebView/WebViewData.h        2015-12-08 21:00:53 UTC (rev 193774)
</span><span class="lines">@@ -171,6 +171,11 @@
</span><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED &gt;= 101000
</span><span class="cx">     WebImmediateActionController *immediateActionController;
</span><span class="cx"> #endif // __MAC_OS_X_VERSION_MIN_REQUIRED &gt;= 101000
</span><ins>+
+#if PLATFORM(MAC) &amp;&amp; __MAC_OS_X_VERSION_MIN_REQUIRED &gt;= 101200 &amp;&amp; USE(APPLE_INTERNAL_SDK)
+#import &lt;WebKitAdditions/WebViewDataAdditions.h&gt;
+#endif
+
</ins><span class="cx">     std::unique_ptr&lt;WebCore::TextIndicatorWindow&gt; textIndicatorWindow;
</span><span class="cx">     BOOL hasInitializedLookupObserver;
</span><span class="cx">     RetainPtr&lt;WebWindowVisibilityObserver&gt; windowVisibilityObserver;
</span></span></pre></div>
<a id="tagsSafari6021132SourceWebKitmacWebViewWebViewInternalh"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.13.2/Source/WebKit/mac/WebView/WebViewInternal.h (193773 => 193774)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.13.2/Source/WebKit/mac/WebView/WebViewInternal.h        2015-12-08 20:44:51 UTC (rev 193773)
+++ tags/Safari-602.1.13.2/Source/WebKit/mac/WebView/WebViewInternal.h        2015-12-08 21:00:53 UTC (rev 193774)
</span><span class="lines">@@ -290,3 +290,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> @end
</span><ins>+
+@interface WebView (UpdateWebViewAdditions)
+- (void)updateWebViewAdditions;
+@end
</ins></span></pre>
</div>
</div>

</body>
</html>