<!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>[190156] 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/190156">190156</a></dd>
<dt>Author</dt> <dd>aestes@apple.com</dd>
<dt>Date</dt> <dd>2015-09-23 00:33:05 -0700 (Wed, 23 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Disable QuickLook on tvOS
https://bugs.webkit.org/show_bug.cgi?id=149492
<rdar://problem/22741586>
Reviewed by Dan Bernstein.
Source/WebKit/mac:
We can't use USE(QUICK_LOOK) in a Private header, and postprocess-headers.sh doesn't know how to strip things
that aren't feature flags. So, if QuickLook is disabled, we'll just always define WebQuickLookFileNameKey and
WebQuickLookUTIKey, and we'll also define -quickLookContentForURL: but have it return nil.
* WebView/WebView.mm:
(-[WebView quickLookContentForURL:]):
Source/WTF:
* wtf/Platform.h: Stopped enabling QuickLook on tvOS.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfPlatformh">trunk/Source/WTF/wtf/Platform.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (190155 => 190156)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-09-23 07:24:42 UTC (rev 190155)
+++ trunk/Source/WTF/ChangeLog 2015-09-23 07:33:05 UTC (rev 190156)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-09-22 Andy Estes <aestes@apple.com>
+
+ Disable QuickLook on tvOS
+ https://bugs.webkit.org/show_bug.cgi?id=149492
+ <rdar://problem/22741586>
+
+ Reviewed by Dan Bernstein.
+
+ * wtf/Platform.h: Stopped enabling QuickLook on tvOS.
+
</ins><span class="cx"> 2015-09-22 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Get rid of ENABLE(PARALLEL_GC)
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Platform.h (190155 => 190156)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Platform.h 2015-09-23 07:24:42 UTC (rev 190155)
+++ trunk/Source/WTF/wtf/Platform.h 2015-09-23 07:33:05 UTC (rev 190156)
</span><span class="lines">@@ -550,7 +550,10 @@
</span><span class="cx"> #endif
</span><span class="cx"> #define USE_UIKIT_EDITING 1
</span><span class="cx"> #define USE_WEB_THREAD 1
</span><ins>+
+#if !PLATFORM(APPLETV)
</ins><span class="cx"> #define USE_QUICK_LOOK 1
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> #if defined(TARGET_OS_IOS) && TARGET_OS_IOS && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
</span><span class="cx"> #define HAVE_APP_LINKS 1
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (190155 => 190156)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-09-23 07:24:42 UTC (rev 190155)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-09-23 07:33:05 UTC (rev 190156)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-09-22 Andy Estes <aestes@apple.com>
+
+ Disable QuickLook on tvOS
+ https://bugs.webkit.org/show_bug.cgi?id=149492
+ <rdar://problem/22741586>
+
+ Reviewed by Dan Bernstein.
+
+ We can't use USE(QUICK_LOOK) in a Private header, and postprocess-headers.sh doesn't know how to strip things
+ that aren't feature flags. So, if QuickLook is disabled, we'll just always define WebQuickLookFileNameKey and
+ WebQuickLookUTIKey, and we'll also define -quickLookContentForURL: but have it return nil.
+
+ * WebView/WebView.mm:
+ (-[WebView quickLookContentForURL:]):
+
</ins><span class="cx"> 2015-09-22 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Make it more obvious when using an unaccelerated image buffer, and fix a few callers who do
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (190155 => 190156)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2015-09-23 07:24:42 UTC (rev 190155)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2015-09-23 07:33:05 UTC (rev 190156)
</span><span class="lines">@@ -611,7 +611,7 @@
</span><span class="cx"> NSString *_WebMainFrameDocumentKey = @"mainFrameDocument";
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(QUICK_LOOK)
</del><ins>+#if PLATFORM(IOS)
</ins><span class="cx"> NSString *WebQuickLookFileNameKey = @"WebQuickLookFileNameKey";
</span><span class="cx"> NSString *WebQuickLookUTIKey = @"WebQuickLookUTIKey";
</span><span class="cx"> #endif
</span><span class="lines">@@ -3570,9 +3570,10 @@
</span><span class="cx"> return _private->page->setDefersLoading(defer);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if TARGET_OS_IPHONE && USE(QUICK_LOOK)
</del><ins>+#if PLATFORM(IOS)
</ins><span class="cx"> - (NSDictionary *)quickLookContentForURL:(NSURL *)url
</span><span class="cx"> {
</span><ins>+#if USE(QUICK_LOOK)
</ins><span class="cx"> NSString *uti = qlPreviewConverterUTIForURL(url);
</span><span class="cx"> if (!uti)
</span><span class="cx"> return nil;
</span><span class="lines">@@ -3582,10 +3583,11 @@
</span><span class="cx"> return nil;
</span><span class="cx">
</span><span class="cx"> return [NSDictionary dictionaryWithObjectsAndKeys: fileName, WebQuickLookFileNameKey, uti, WebQuickLookUTIKey, nil];
</span><ins>+#else
+ return nil;
+#endif
</ins><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><del>-#if PLATFORM(IOS)
</del><span class="cx"> - (BOOL)_isStopping
</span><span class="cx"> {
</span><span class="cx"> return _private->isStopping;
</span></span></pre>
</div>
</div>
</body>
</html>