<!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>[211654] 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/211654">211654</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2017-02-03 14:40:28 -0800 (Fri, 03 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Drop Mac App Store workaround for window.getComputedStyle()
https://bugs.webkit.org/show_bug.cgi?id=166891
<rdar://problem/28282452>
Reviewed by Sam Weinig.
Drop Mac App Store workaround for window.getComputedStyle() now that
<rdar://problem/28020681> has been fixed.
* page/DOMWindow.cpp:
* page/DOMWindow.h:
* page/DOMWindow.idl:
* platform/RuntimeApplicationChecks.h:
* platform/RuntimeApplicationChecks.mm:
(WebCore::MacApplication::isAppStore): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastdomWindowgetComputedStylemissingparameterexpectedtxt">trunk/LayoutTests/fast/dom/Window/getComputedStyle-missing-parameter-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageDOMWindowcpp">trunk/Source/WebCore/page/DOMWindow.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDOMWindowh">trunk/Source/WebCore/page/DOMWindow.h</a></li>
<li><a href="#trunkSourceWebCorepageDOMWindowidl">trunk/Source/WebCore/page/DOMWindow.idl</a></li>
<li><a href="#trunkSourceWebCoreplatformRuntimeApplicationChecksh">trunk/Source/WebCore/platform/RuntimeApplicationChecks.h</a></li>
<li><a href="#trunkSourceWebCoreplatformRuntimeApplicationChecksmm">trunk/Source/WebCore/platform/RuntimeApplicationChecks.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsfastdomWindowgetComputedStylemissingparameterexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/Window/getComputedStyle-missing-parameter-expected.txt (211653 => 211654)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/Window/getComputedStyle-missing-parameter-expected.txt 2017-02-03 22:18:19 UTC (rev 211653)
+++ trunk/LayoutTests/fast/dom/Window/getComputedStyle-missing-parameter-expected.txt 2017-02-03 22:40:28 UTC (rev 211654)
</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: Type error.
</del><ins>+PASS window.getComputedStyle(null) threw exception TypeError: Argument 1 ('element') to Window.getComputedStyle must be an instance of Element.
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (211653 => 211654)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-03 22:18:19 UTC (rev 211653)
+++ trunk/Source/WebCore/ChangeLog 2017-02-03 22:40:28 UTC (rev 211654)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2017-02-03 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Drop Mac App Store workaround for window.getComputedStyle()
+ https://bugs.webkit.org/show_bug.cgi?id=166891
+ <rdar://problem/28282452>
+
+ Reviewed by Sam Weinig.
+
+ Drop Mac App Store workaround for window.getComputedStyle() now that
+ <rdar://problem/28020681> has been fixed.
+
+ * page/DOMWindow.cpp:
+ * page/DOMWindow.h:
+ * page/DOMWindow.idl:
+ * platform/RuntimeApplicationChecks.h:
+ * platform/RuntimeApplicationChecks.mm:
+ (WebCore::MacApplication::isAppStore): Deleted.
+
+2017-02-03 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Dismiss HTML form validation popover when pressing Escape key
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=167716
</span><span class="cx"> <rdar://problem/29872943>
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMWindowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMWindow.cpp (211653 => 211654)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMWindow.cpp 2017-02-03 22:18:19 UTC (rev 211653)
+++ trunk/Source/WebCore/page/DOMWindow.cpp 2017-02-03 22:40:28 UTC (rev 211654)
</span><span class="lines">@@ -1457,18 +1457,6 @@
</span><span class="cx"> return CSSComputedStyleDeclaration::create(element, false, pseudoElt);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// FIXME: Drop this overload once <rdar://problem/28016778> has been fixed.
-ExceptionOr<RefPtr<CSSStyleDeclaration>> DOMWindow::getComputedStyle(Document&, const String&)
-{
-#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
- return Exception { TypeError };
-}
-
</del><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="trunkSourceWebCorepageDOMWindowh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMWindow.h (211653 => 211654)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMWindow.h 2017-02-03 22:18:19 UTC (rev 211653)
+++ trunk/Source/WebCore/page/DOMWindow.h 2017-02-03 22:40:28 UTC (rev 211654)
</span><span class="lines">@@ -205,7 +205,6 @@
</span><span class="cx"> // DOM Level 2 Style Interface
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT Ref<CSSStyleDeclaration> getComputedStyle(Element&, const String& pseudoElt) const;
</span><del>- ExceptionOr<RefPtr<CSSStyleDeclaration>> getComputedStyle(Document&, const String& pseudoElt);
</del><span class="cx">
</span><span class="cx"> // WebKit extensions
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMWindowidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMWindow.idl (211653 => 211654)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMWindow.idl 2017-02-03 22:18:19 UTC (rev 211653)
+++ trunk/Source/WebCore/page/DOMWindow.idl 2017-02-03 22:40:28 UTC (rev 211654)
</span><span class="lines">@@ -137,9 +137,6 @@
</span><span class="cx">
</span><span class="cx"> [NewObject] CSSStyleDeclaration getComputedStyle(Element element, optional DOMString? pseudoElement = null);
</span><span class="cx">
</span><del>- // FIXME: Drop the following overload of getComputedStyle once <rdar://problem/28020681> has been fixed.
- [NewObject, MayThrowException] CSSStyleDeclaration? getComputedStyle(Document document, optional DOMString? pseudoElement = null);
-
</del><span class="cx"> CSSRuleList getMatchedCSSRules(optional Element? element = null, optional DOMString? pseudoElement = null);
</span><span class="cx">
</span><span class="cx"> [Replaceable] readonly attribute unrestricted double devicePixelRatio;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformRuntimeApplicationChecksh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/RuntimeApplicationChecks.h (211653 => 211654)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/RuntimeApplicationChecks.h 2017-02-03 22:18:19 UTC (rev 211653)
+++ trunk/Source/WebCore/platform/RuntimeApplicationChecks.h 2017-02-03 22:40:28 UTC (rev 211654)
</span><span class="lines">@@ -52,7 +52,6 @@
</span><span class="cx"> bool isSolidStateNetworksDownloader();
</span><span class="cx"> WEBCORE_EXPORT bool isVersions();
</span><span class="cx"> WEBCORE_EXPORT bool isHRBlock();
</span><del>-WEBCORE_EXPORT bool isAppStore();
</del><span class="cx">
</span><span class="cx"> } // MacApplication
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformRuntimeApplicationChecksmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/RuntimeApplicationChecks.mm (211653 => 211654)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/RuntimeApplicationChecks.mm 2017-02-03 22:18:19 UTC (rev 211653)
+++ trunk/Source/WebCore/platform/RuntimeApplicationChecks.mm 2017-02-03 22:40:28 UTC (rev 211654)
</span><span class="lines">@@ -154,12 +154,6 @@
</span><span class="cx"> return isSolidStateNetworksDownloader;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool MacApplication::isAppStore()
-{
- static bool isAppStore = applicationBundleIsEqualTo("com.apple.appstore");
- return isAppStore;
-}
-
</del><span class="cx"> #endif // PLATFORM(MAC)
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span></span></pre>
</div>
</div>
</body>
</html>