<!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>[179955] trunk</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/179955">179955</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2015-02-11 13:36:22 -0800 (Wed, 11 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (iOS 8): PDFs embedded in <object>/<embed> tag don't load at all
https://bugs.webkit.org/show_bug.cgi?id=141457
<rdar://problem/18221851>
Reviewed by Alexey Proskuryakov.
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::objectContentType):
On iOS, if we don't know what to do with a PDF-in-object, treat it as an image.
* TestExpectations:
* fast/replaced/pdf-as-object-and-embed-expected.html: Added.
* fast/replaced/pdf-as-object-and-embed.html: Added.
* platform/ios-simulator-wk2/TestExpectations:
Add a test that ensures that WebKit2 on iOS treats <object>, <embed>,
and <img> the same when rendering a PDF.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsTestExpectations">trunk/LayoutTests/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorwk2TestExpectations">trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastreplacedpdfasobjectandembedexpectedhtml">trunk/LayoutTests/fast/replaced/pdf-as-object-and-embed-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastreplacedpdfasobjectandembedhtml">trunk/LayoutTests/fast/replaced/pdf-as-object-and-embed.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (179954 => 179955)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-02-11 21:33:31 UTC (rev 179954)
+++ trunk/LayoutTests/ChangeLog 2015-02-11 21:36:22 UTC (rev 179955)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-02-11 Tim Horton <timothy_horton@apple.com>
+
+ REGRESSION (iOS 8): PDFs embedded in <object>/<embed> tag don't load at all
+ https://bugs.webkit.org/show_bug.cgi?id=141457
+ <rdar://problem/18221851>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * TestExpectations:
+ * fast/replaced/pdf-as-object-and-embed-expected.html: Added.
+ * fast/replaced/pdf-as-object-and-embed.html: Added.
+ * platform/ios-simulator-wk2/TestExpectations:
+ Add a test that ensures that WebKit2 on iOS treats <object>, <embed>,
+ and <img> the same when rendering a PDF.
+
</ins><span class="cx"> 2015-02-11 ChangSeok Oh <changseok.oh@collabora.com>
</span><span class="cx">
</span><span class="cx"> Div having contentEditable and display:flex cannot be edited if it is empty.
</span></span></pre></div>
<a id="trunkLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/TestExpectations (179954 => 179955)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/TestExpectations 2015-02-11 21:33:31 UTC (rev 179954)
+++ trunk/LayoutTests/TestExpectations 2015-02-11 21:36:22 UTC (rev 179955)
</span><span class="lines">@@ -477,3 +477,6 @@
</span><span class="cx"> webkit.org/b/87633 http/tests/appcache/abort-cache-ondownloading-resource-404.html [ Pass Failure ]
</span><span class="cx">
</span><span class="cx"> webkit.org/b/141370 http/tests/security/appcache-in-private-browsing.html [ Pass Failure ]
</span><ins>+
+# The current expectations for this test only make sense for WebKit on iOS; other platforms can have very different behaviors.
+webkit.org/b/141488 fast/replaced/pdf-as-object-and-embed.html [ Skip ]
</ins></span></pre></div>
<a id="trunkLayoutTestsfastreplacedpdfasobjectandembedexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/replaced/pdf-as-object-and-embed-expected.html (0 => 179955)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/replaced/pdf-as-object-and-embed-expected.html (rev 0)
+++ trunk/LayoutTests/fast/replaced/pdf-as-object-and-embed-expected.html 2015-02-11 21:36:22 UTC (rev 179955)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+<html>
+<body style='margin: 0px'>
+<div>
+ <div><img src='resources/image.pdf'></div>
+ <div><img src='resources/image.pdf'></div>
+</div>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsfastreplacedpdfasobjectandembedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/replaced/pdf-as-object-and-embed.html (0 => 179955)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/replaced/pdf-as-object-and-embed.html (rev 0)
+++ trunk/LayoutTests/fast/replaced/pdf-as-object-and-embed.html 2015-02-11 21:36:22 UTC (rev 179955)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+<html>
+<body style='margin: 0px'>
+<div>
+ <div><object data="resources/image.pdf"></object></div>
+ <div><embed src="resources/image.pdf" type="application/pdf"></embed></div>
+</div>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorwk2TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations (179954 => 179955)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations 2015-02-11 21:33:31 UTC (rev 179954)
+++ trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations 2015-02-11 21:36:22 UTC (rev 179955)
</span><span class="lines">@@ -2262,3 +2262,6 @@
</span><span class="cx">
</span><span class="cx"> # Crashes when running all tests, but not by itself.
</span><span class="cx"> webkit.org/b/141436 fast/loader/subframe-navigate-during-main-frame-load.html [ Crash Pass ]
</span><ins>+
+# Unskip otherwise globally-skipped test
+fast/replaced/pdf-as-object-and-embed.html [ Pass ]
</ins></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (179954 => 179955)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-02-11 21:33:31 UTC (rev 179954)
+++ trunk/Source/WebKit2/ChangeLog 2015-02-11 21:36:22 UTC (rev 179955)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-02-11 Tim Horton <timothy_horton@apple.com>
+
+ REGRESSION (iOS 8): PDFs embedded in <object>/<embed> tag don't load at all
+ https://bugs.webkit.org/show_bug.cgi?id=141457
+ <rdar://problem/18221851>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::objectContentType):
+ On iOS, if we don't know what to do with a PDF-in-object, treat it as an image.
+
</ins><span class="cx"> 2015-02-11 ChangSeok Oh <changseok.oh@collabora.com>
</span><span class="cx">
</span><span class="cx"> Activate ReliefLogger of a memory pressure handler for linux system.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (179954 => 179955)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2015-02-11 21:33:31 UTC (rev 179954)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2015-02-11 21:36:22 UTC (rev 179955)
</span><span class="lines">@@ -1501,6 +1501,12 @@
</span><span class="cx"> if (MIMETypeRegistry::isSupportedNonImageMIMEType(mimeType))
</span><span class="cx"> return ObjectContentFrame;
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+ // iOS can render PDF in <object>/<embed> via PDFDocumentImage.
+ if (MIMETypeRegistry::isPDFOrPostScriptMIMEType(mimeType))
+ return ObjectContentImage;
+#endif
+
</ins><span class="cx"> return ObjectContentNone;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>