<!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>[204988] tags/Safari-603.1.3</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/204988">204988</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-08-25 14:59:54 -0700 (Thu, 25 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/204986">r204986</a>. rdar://problem/28015060</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari60313LayoutTestsChangeLog">tags/Safari-603.1.3/LayoutTests/ChangeLog</a></li>
<li><a href="#tagsSafari60313LayoutTestsfastdomWindowgetComputedStylemissingparameterexpectedtxt">tags/Safari-603.1.3/LayoutTests/fast/dom/Window/getComputedStyle-missing-parameter-expected.txt</a></li>
<li><a href="#tagsSafari60313LayoutTestsfastdomWindowgetComputedStylemissingparameterhtml">tags/Safari-603.1.3/LayoutTests/fast/dom/Window/getComputedStyle-missing-parameter.html</a></li>
<li><a href="#tagsSafari60313SourceWebCoreChangeLog">tags/Safari-603.1.3/Source/WebCore/ChangeLog</a></li>
<li><a href="#tagsSafari60313SourceWebCorepageDOMWindowcpp">tags/Safari-603.1.3/Source/WebCore/page/DOMWindow.cpp</a></li>
<li><a href="#tagsSafari60313SourceWebCorepageDOMWindowh">tags/Safari-603.1.3/Source/WebCore/page/DOMWindow.h</a></li>
<li><a href="#tagsSafari60313SourceWebCorepageDOMWindowidl">tags/Safari-603.1.3/Source/WebCore/page/DOMWindow.idl</a></li>
<li><a href="#tagsSafari60313SourceWebCoreplatformRuntimeApplicationChecksh">tags/Safari-603.1.3/Source/WebCore/platform/RuntimeApplicationChecks.h</a></li>
<li><a href="#tagsSafari60313SourceWebCoreplatformRuntimeApplicationChecksmm">tags/Safari-603.1.3/Source/WebCore/platform/RuntimeApplicationChecks.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari60313LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-603.1.3/LayoutTests/ChangeLog (204987 => 204988)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-603.1.3/LayoutTests/ChangeLog 2016-08-25 21:57:13 UTC (rev 204987)
+++ tags/Safari-603.1.3/LayoutTests/ChangeLog 2016-08-25 21:59:54 UTC (rev 204988)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-08-25 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r204986.
+
+ 2016-08-25 Chris Dumez <cdumez@apple.com>
+
+ Regression(r203623): Breaks App Store application
+ https://bugs.webkit.org/show_bug.cgi?id=161206
+ <rdar://problem/28015060>
+
+ Reviewed by Ryosuke Niwa.
+
+ Rebaseline existing test as the exception message is slightly different.
+
+ * fast/dom/Window/getComputedStyle-missing-parameter-expected.txt:
+ * fast/dom/Window/getComputedStyle-missing-parameter.html:
+
</ins><span class="cx"> 2016-08-23 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> fast/canvas/canvas-alphaImageData-behavior.html doesn't appear to be flakey any
</span></span></pre></div>
<a id="tagsSafari60313LayoutTestsfastdomWindowgetComputedStylemissingparameterexpectedtxt"></a>
<div class="modfile"><h4>Modified: tags/Safari-603.1.3/LayoutTests/fast/dom/Window/getComputedStyle-missing-parameter-expected.txt (204987 => 204988)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-603.1.3/LayoutTests/fast/dom/Window/getComputedStyle-missing-parameter-expected.txt 2016-08-25 21:57:13 UTC (rev 204987)
+++ tags/Safari-603.1.3/LayoutTests/fast/dom/Window/getComputedStyle-missing-parameter-expected.txt 2016-08-25 21:59:54 UTC (rev 204988)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> PASS window.getComputedStyle() threw exception TypeError: Not enough arguments.
</span><del>-PASS window.getComputedStyle(null) threw exception TypeError: Argument 1 ('element') to Window.getComputedStyle must be an instance of Element.
</del><ins>+PASS window.getComputedStyle(null) threw exception TypeError: Type error.
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="tagsSafari60313LayoutTestsfastdomWindowgetComputedStylemissingparameterhtml"></a>
<div class="modfile"><h4>Modified: tags/Safari-603.1.3/LayoutTests/fast/dom/Window/getComputedStyle-missing-parameter.html (204987 => 204988)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-603.1.3/LayoutTests/fast/dom/Window/getComputedStyle-missing-parameter.html 2016-08-25 21:57:13 UTC (rev 204987)
+++ tags/Safari-603.1.3/LayoutTests/fast/dom/Window/getComputedStyle-missing-parameter.html 2016-08-25 21:59:54 UTC (rev 204988)
</span><span class="lines">@@ -5,8 +5,8 @@
</span><span class="cx"> <script>
</span><span class="cx"> description("Test that the first parameter to Window.getComputedStyle() is mandatory and not nullable.");
</span><span class="cx">
</span><del>-shouldThrow("window.getComputedStyle()", "'TypeError: Not enough arguments'");
-shouldThrow("window.getComputedStyle(null)", "'TypeError: Argument 1 (\\'element\\') to Window.getComputedStyle must be an instance of Element'");
</del><ins>+shouldThrowErrorName("window.getComputedStyle()", "TypeError");
+shouldThrowErrorName("window.getComputedStyle(null)", "TypeError");
</ins><span class="cx"> </script>
</span><span class="cx"> <script src="../../../resources/js-test-post.js"></script>
</span><span class="cx"> </body>
</span></span></pre></div>
<a id="tagsSafari60313SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-603.1.3/Source/WebCore/ChangeLog (204987 => 204988)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-603.1.3/Source/WebCore/ChangeLog 2016-08-25 21:57:13 UTC (rev 204987)
+++ tags/Safari-603.1.3/Source/WebCore/ChangeLog 2016-08-25 21:59:54 UTC (rev 204988)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2016-08-25 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r204986.
+
+ 2016-08-25 Chris Dumez <cdumez@apple.com>
+
+ Regression(r203623): Breaks App Store application
+ https://bugs.webkit.org/show_bug.cgi?id=161206
+ <rdar://problem/28015060>
+
+ Reviewed by Ryosuke Niwa.
+
+ Add quirks for the App Store application so that we log an error message
+ when passing a Document node to Window.getComputedStyle() instead of
+ throwing an exception.
+
+ * page/DOMWindow.cpp:
+ (WebCore::DOMWindow::getComputedStyle):
+ * page/DOMWindow.h:
+ * page/DOMWindow.idl:
+ * platform/RuntimeApplicationChecks.h:
+ * platform/RuntimeApplicationChecks.mm:
+ (WebCore::MacApplication::isAppStore):
+
</ins><span class="cx"> 2016-08-23 Said Abou-Hallawa <sabouhallawa@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION: SVG clip-path doesn't work on root <svg>
</span></span></pre></div>
<a id="tagsSafari60313SourceWebCorepageDOMWindowcpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-603.1.3/Source/WebCore/page/DOMWindow.cpp (204987 => 204988)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-603.1.3/Source/WebCore/page/DOMWindow.cpp 2016-08-25 21:57:13 UTC (rev 204987)
+++ tags/Safari-603.1.3/Source/WebCore/page/DOMWindow.cpp 2016-08-25 21:59:54 UTC (rev 204988)
</span><span class="lines">@@ -81,6 +81,7 @@
</span><span class="cx"> #include "PageTransitionEvent.h"
</span><span class="cx"> #include "Performance.h"
</span><span class="cx"> #include "ResourceLoadInfo.h"
</span><ins>+#include "RuntimeApplicationChecks.h"
</ins><span class="cx"> #include "RuntimeEnabledFeatures.h"
</span><span class="cx"> #include "ScheduledAction.h"
</span><span class="cx"> #include "Screen.h"
</span><span class="lines">@@ -1405,6 +1406,19 @@
</span><span class="cx"> return CSSComputedStyleDeclaration::create(element, false, pseudoElt);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// FIXME: Drop this overload once <rdar://problem/28016778> has been fixed.
+RefPtr<CSSStyleDeclaration> DOMWindow::getComputedStyle(Document&, const String&, ExceptionCode& ec)
+{
+#if PLATFORM(MAC)
+ if (MacApplication::isAppStore()) {
+ printErrorMessage(ASCIILiteral("Passing a non-Element as first parameter to window.getComputedStyle() is invalid and always returns null"));
+ return nullptr;
+ }
+#endif
+ ec = TypeError;
+ return nullptr;
+}
+
</ins><span class="cx"> RefPtr<CSSRuleList> DOMWindow::getMatchedCSSRules(Element* element, const String& pseudoElement, bool authorOnly) const
</span><span class="cx"> {
</span><span class="cx"> if (!isCurrentlyDisplayedInFrame())
</span></span></pre></div>
<a id="tagsSafari60313SourceWebCorepageDOMWindowh"></a>
<div class="modfile"><h4>Modified: tags/Safari-603.1.3/Source/WebCore/page/DOMWindow.h (204987 => 204988)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-603.1.3/Source/WebCore/page/DOMWindow.h 2016-08-25 21:57:13 UTC (rev 204987)
+++ tags/Safari-603.1.3/Source/WebCore/page/DOMWindow.h 2016-08-25 21:59:54 UTC (rev 204988)
</span><span class="lines">@@ -229,6 +229,7 @@
</span><span class="cx"> // DOM Level 2 Style Interface
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT RefPtr<CSSStyleDeclaration> getComputedStyle(Element&, const String& pseudoElt) const;
</span><ins>+ RefPtr<CSSStyleDeclaration> getComputedStyle(Document&, const String& pseudoElt, ExceptionCode&);
</ins><span class="cx">
</span><span class="cx"> // WebKit extensions
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari60313SourceWebCorepageDOMWindowidl"></a>
<div class="modfile"><h4>Modified: tags/Safari-603.1.3/Source/WebCore/page/DOMWindow.idl (204987 => 204988)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-603.1.3/Source/WebCore/page/DOMWindow.idl 2016-08-25 21:57:13 UTC (rev 204987)
+++ tags/Safari-603.1.3/Source/WebCore/page/DOMWindow.idl 2016-08-25 21:59:54 UTC (rev 204988)
</span><span class="lines">@@ -147,6 +147,8 @@
</span><span class="cx">
</span><span class="cx"> // DOM Level 2 Style Interface
</span><span class="cx"> [NewObject] CSSStyleDeclaration getComputedStyle(Element element, optional DOMString? pseudoElement = null);
</span><ins>+ // FIXME: Drop this overload once <rdar://problem/28016778> has been fixed.
+ [NewObject, RaisesException] CSSStyleDeclaration getComputedStyle(Document document, optional DOMString? pseudoElement = null);
</ins><span class="cx">
</span><span class="cx"> // WebKit extensions
</span><span class="cx"> #if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
</span></span></pre></div>
<a id="tagsSafari60313SourceWebCoreplatformRuntimeApplicationChecksh"></a>
<div class="modfile"><h4>Modified: tags/Safari-603.1.3/Source/WebCore/platform/RuntimeApplicationChecks.h (204987 => 204988)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-603.1.3/Source/WebCore/platform/RuntimeApplicationChecks.h 2016-08-25 21:57:13 UTC (rev 204987)
+++ tags/Safari-603.1.3/Source/WebCore/platform/RuntimeApplicationChecks.h 2016-08-25 21:59:54 UTC (rev 204988)
</span><span class="lines">@@ -51,6 +51,7 @@
</span><span class="cx"> bool isSolidStateNetworksDownloader();
</span><span class="cx"> WEBCORE_EXPORT bool isVersions();
</span><span class="cx"> WEBCORE_EXPORT bool isHRBlock();
</span><ins>+WEBCORE_EXPORT bool isAppStore();
</ins><span class="cx">
</span><span class="cx"> } // MacApplication
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari60313SourceWebCoreplatformRuntimeApplicationChecksmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-603.1.3/Source/WebCore/platform/RuntimeApplicationChecks.mm (204987 => 204988)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-603.1.3/Source/WebCore/platform/RuntimeApplicationChecks.mm 2016-08-25 21:57:13 UTC (rev 204987)
+++ tags/Safari-603.1.3/Source/WebCore/platform/RuntimeApplicationChecks.mm 2016-08-25 21:59:54 UTC (rev 204988)
</span><span class="lines">@@ -154,6 +154,12 @@
</span><span class="cx"> return isSolidStateNetworksDownloader;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool MacApplication::isAppStore()
+{
+ static bool isAppStore = applicationBundleIsEqualTo("com.apple.appstore");
+ return isAppStore;
+}
+
</ins><span class="cx"> #endif // PLATFORM(MAC)
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span></span></pre>
</div>
</div>
</body>
</html>