<!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>[283994] branches/safari-613.1.4-branch/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/283994">283994</a></dd>
<dt>Author</dt> <dd>repstein@apple.com</dd>
<dt>Date</dt> <dd>2021-10-12 11:36:51 -0700 (Tue, 12 Oct 2021)</dd>
</dl>

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

    Disable SystemPreview in WKContentProviderRegistry
    https://bugs.webkit.org/show_bug.cgi?id=231538
    rdar://84110761

    Reviewed by Tim Horton.

    Source/WebKit:

    Disable the WebViewContentProvider for System Previews
    if UIKIT_WEBKIT_INTERNALS is true.

    * UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm:
    (-[WKWebViewContentProviderRegistry initWithConfiguration:]):
    * UIProcess/ios/WKSystemPreviewView.h:
    * UIProcess/ios/WKSystemPreviewView.mm:

    Source/WTF:

    Revert the change in <a href="http://trac.webkit.org/projects/webkit/changeset/283811">r283811</a>.

    * wtf/PlatformUse.h:

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

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari61314branchSourceWTFChangeLog">branches/safari-613.1.4-branch/Source/WTF/ChangeLog</a></li>
<li><a href="#branchessafari61314branchSourceWTFwtfPlatformUseh">branches/safari-613.1.4-branch/Source/WTF/wtf/PlatformUse.h</a></li>
<li><a href="#branchessafari61314branchSourceWebKitChangeLog">branches/safari-613.1.4-branch/Source/WebKit/ChangeLog</a></li>
<li><a href="#branchessafari61314branchSourceWebKitUIProcessCocoaWKWebViewContentProviderRegistrymm">branches/safari-613.1.4-branch/Source/WebKit/UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm</a></li>
<li><a href="#branchessafari61314branchSourceWebKitUIProcessiosWKSystemPreviewViewh">branches/safari-613.1.4-branch/Source/WebKit/UIProcess/ios/WKSystemPreviewView.h</a></li>
<li><a href="#branchessafari61314branchSourceWebKitUIProcessiosWKSystemPreviewViewmm">branches/safari-613.1.4-branch/Source/WebKit/UIProcess/ios/WKSystemPreviewView.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari61314branchSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-613.1.4-branch/Source/WTF/ChangeLog (283993 => 283994)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-613.1.4-branch/Source/WTF/ChangeLog      2021-10-12 18:35:18 UTC (rev 283993)
+++ branches/safari-613.1.4-branch/Source/WTF/ChangeLog 2021-10-12 18:36:51 UTC (rev 283994)
</span><span class="lines">@@ -1,3 +1,43 @@
</span><ins>+2021-10-12  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r283940. rdar://problem/84110761
+
+    Disable SystemPreview in WKContentProviderRegistry
+    https://bugs.webkit.org/show_bug.cgi?id=231538
+    rdar://84110761
+    
+    Reviewed by Tim Horton.
+    
+    Source/WebKit:
+    
+    Disable the WebViewContentProvider for System Previews
+    if UIKIT_WEBKIT_INTERNALS is true.
+    
+    * UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm:
+    (-[WKWebViewContentProviderRegistry initWithConfiguration:]):
+    * UIProcess/ios/WKSystemPreviewView.h:
+    * UIProcess/ios/WKSystemPreviewView.mm:
+    
+    Source/WTF:
+    
+    Revert the change in r283811.
+    
+    * wtf/PlatformUse.h:
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@283940 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-10-11  Dean Jackson  <dino@apple.com>
+
+            Disable SystemPreview in WKContentProviderRegistry
+            https://bugs.webkit.org/show_bug.cgi?id=231538
+            rdar://84110761
+
+            Reviewed by Tim Horton.
+
+            Revert the change in r283811.
+
+            * wtf/PlatformUse.h:
+
</ins><span class="cx"> 2021-10-08  Alan Coon  <alancoon@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Cherry-pick r283811. rdar://problem/84037770
</span></span></pre></div>
<a id="branchessafari61314branchSourceWTFwtfPlatformUseh"></a>
<div class="modfile"><h4>Modified: branches/safari-613.1.4-branch/Source/WTF/wtf/PlatformUse.h (283993 => 283994)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-613.1.4-branch/Source/WTF/wtf/PlatformUse.h      2021-10-12 18:35:18 UTC (rev 283993)
+++ branches/safari-613.1.4-branch/Source/WTF/wtf/PlatformUse.h 2021-10-12 18:36:51 UTC (rev 283994)
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> #define USE_QUICK_LOOK 1
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#if PLATFORM(IOS) && !HAVE(UIKIT_WEBKIT_INTERNALS)
</del><ins>+#if PLATFORM(IOS)
</ins><span class="cx"> #define USE_SYSTEM_PREVIEW 1
</span><span class="cx"> #endif
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari61314branchSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-613.1.4-branch/Source/WebKit/ChangeLog (283993 => 283994)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-613.1.4-branch/Source/WebKit/ChangeLog   2021-10-12 18:35:18 UTC (rev 283993)
+++ branches/safari-613.1.4-branch/Source/WebKit/ChangeLog      2021-10-12 18:36:51 UTC (rev 283994)
</span><span class="lines">@@ -1,3 +1,47 @@
</span><ins>+2021-10-12  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r283940. rdar://problem/84110761
+
+    Disable SystemPreview in WKContentProviderRegistry
+    https://bugs.webkit.org/show_bug.cgi?id=231538
+    rdar://84110761
+    
+    Reviewed by Tim Horton.
+    
+    Source/WebKit:
+    
+    Disable the WebViewContentProvider for System Previews
+    if UIKIT_WEBKIT_INTERNALS is true.
+    
+    * UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm:
+    (-[WKWebViewContentProviderRegistry initWithConfiguration:]):
+    * UIProcess/ios/WKSystemPreviewView.h:
+    * UIProcess/ios/WKSystemPreviewView.mm:
+    
+    Source/WTF:
+    
+    Revert the change in r283811.
+    
+    * wtf/PlatformUse.h:
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@283940 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-10-11  Dean Jackson  <dino@apple.com>
+
+            Disable SystemPreview in WKContentProviderRegistry
+            https://bugs.webkit.org/show_bug.cgi?id=231538
+            rdar://84110761
+
+            Reviewed by Tim Horton.
+
+            Disable the WebViewContentProvider for System Previews
+            if UIKIT_WEBKIT_INTERNALS is true.
+
+            * UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm:
+            (-[WKWebViewContentProviderRegistry initWithConfiguration:]):
+            * UIProcess/ios/WKSystemPreviewView.h:
+            * UIProcess/ios/WKSystemPreviewView.mm:
+
</ins><span class="cx"> 2021-10-11  Alan Coon  <alancoon@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Cherry-pick r283925. rdar://problem/84111635
</span></span></pre></div>
<a id="branchessafari61314branchSourceWebKitUIProcessCocoaWKWebViewContentProviderRegistrymm"></a>
<div class="modfile"><h4>Modified: branches/safari-613.1.4-branch/Source/WebKit/UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm (283993 => 283994)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-613.1.4-branch/Source/WebKit/UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm 2021-10-12 18:35:18 UTC (rev 283993)
+++ branches/safari-613.1.4-branch/Source/WebKit/UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm    2021-10-12 18:36:51 UTC (rev 283994)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx">         [self registerProvider:[WKPDFView class] forMIMEType:@(type)];
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#if USE(SYSTEM_PREVIEW)
</del><ins>+#if USE(SYSTEM_PREVIEW) && !HAVE(UIKIT_WEBKIT_INTERNALS)
</ins><span class="cx">     if (configuration._systemPreviewEnabled) {
</span><span class="cx">         for (auto& type : WebCore::MIMETypeRegistry::systemPreviewMIMETypes())
</span><span class="cx">             [self registerProvider:[WKSystemPreviewView class] forMIMEType:@(type)];
</span></span></pre></div>
<a id="branchessafari61314branchSourceWebKitUIProcessiosWKSystemPreviewViewh"></a>
<div class="modfile"><h4>Modified: branches/safari-613.1.4-branch/Source/WebKit/UIProcess/ios/WKSystemPreviewView.h (283993 => 283994)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-613.1.4-branch/Source/WebKit/UIProcess/ios/WKSystemPreviewView.h 2021-10-12 18:35:18 UTC (rev 283993)
+++ branches/safari-613.1.4-branch/Source/WebKit/UIProcess/ios/WKSystemPreviewView.h    2021-10-12 18:36:51 UTC (rev 283994)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx">  * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">  */
</span><span class="cx"> 
</span><del>-#if USE(SYSTEM_PREVIEW)
</del><ins>+#if USE(SYSTEM_PREVIEW) && !HAVE(UIKIT_WEBKIT_INTERNALS)
</ins><span class="cx"> 
</span><span class="cx"> #import "WKApplicationStateTrackingView.h"
</span><span class="cx"> #import "WKWebViewContentProvider.h"
</span></span></pre></div>
<a id="branchessafari61314branchSourceWebKitUIProcessiosWKSystemPreviewViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-613.1.4-branch/Source/WebKit/UIProcess/ios/WKSystemPreviewView.mm (283993 => 283994)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-613.1.4-branch/Source/WebKit/UIProcess/ios/WKSystemPreviewView.mm        2021-10-12 18:35:18 UTC (rev 283993)
+++ branches/safari-613.1.4-branch/Source/WebKit/UIProcess/ios/WKSystemPreviewView.mm   2021-10-12 18:36:51 UTC (rev 283994)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "WKSystemPreviewView.h"
</span><span class="cx"> 
</span><del>-#if USE(SYSTEM_PREVIEW)
</del><ins>+#if USE(SYSTEM_PREVIEW) && !HAVE(UIKIT_WEBKIT_INTERNALS)
</ins><span class="cx"> 
</span><span class="cx"> #import "APIFindClient.h"
</span><span class="cx"> #import "APIUIClient.h"
</span></span></pre>
</div>
</div>

</body>
</html>