<!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>[285476] branches/safari-613.1.8-branch</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/285476">285476</a></dd>
<dt>Author</dt> <dd>alancoon@apple.com</dd>
<dt>Date</dt> <dd>2021-11-08 17:39:12 -0800 (Mon, 08 Nov 2021)</dd>
</dl>

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

    Unreviewed, reverting <a href="http://trac.webkit.org/projects/webkit/changeset/284883">r284883</a>.

    Caused high energy use on wsj.com <rdar://85156874>

    Reverted changeset:

    "<link> elements should be able to fire more than one load /
    error event"
    https://bugs.webkit.org/show_bug.cgi?id=232309
    https://commits.webkit.org/<a href="http://trac.webkit.org/projects/webkit/changeset/284883">r284883</a>

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

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari61318branchLayoutTestsChangeLog">branches/safari-613.1.8-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari61318branchLayoutTestsTestExpectations">branches/safari-613.1.8-branch/LayoutTests/TestExpectations</a></li>
<li><a href="#branchessafari61318branchLayoutTestsimportedw3cChangeLog">branches/safari-613.1.8-branch/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#branchessafari61318branchLayoutTestsimportedw3cwebplatformtestshtmlsemanticsdocumentmetadatathelinkelementlinkmultipleerroreventsexpectedtxt">branches/safari-613.1.8-branch/LayoutTests/imported/w3c/web-platform-tests/html/semantics/document-metadata/the-link-element/link-multiple-error-events-expected.txt</a></li>
<li><a href="#branchessafari61318branchLayoutTestsimportedw3cwebplatformtestshtmlsemanticsdocumentmetadatathelinkelementlinkmultipleloadeventsexpectedtxt">branches/safari-613.1.8-branch/LayoutTests/imported/w3c/web-platform-tests/html/semantics/document-metadata/the-link-element/link-multiple-load-events-expected.txt</a></li>
<li><a href="#branchessafari61318branchSourceWebCoreChangeLog">branches/safari-613.1.8-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari61318branchSourceWebCorehtmlHTMLLinkElementcpp">branches/safari-613.1.8-branch/Source/WebCore/html/HTMLLinkElement.cpp</a></li>
<li><a href="#branchessafari61318branchSourceWebCorehtmlHTMLLinkElementh">branches/safari-613.1.8-branch/Source/WebCore/html/HTMLLinkElement.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari61318branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-613.1.8-branch/LayoutTests/ChangeLog (285475 => 285476)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-613.1.8-branch/LayoutTests/ChangeLog     2021-11-09 01:37:58 UTC (rev 285475)
+++ branches/safari-613.1.8-branch/LayoutTests/ChangeLog        2021-11-09 01:39:12 UTC (rev 285476)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2021-11-08  Russell Epstein  <repstein@apple.com>
+
+        Cherry-pick r285417. rdar://problem/85181578
+
+    Unreviewed, reverting r284883.
+    
+    Caused high energy use on wsj.com <rdar://85156874>
+    
+    Reverted changeset:
+    
+    "<link> elements should be able to fire more than one load /
+    error event"
+    https://bugs.webkit.org/show_bug.cgi?id=232309
+    https://commits.webkit.org/r284883
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@285417 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-11-08  Chris Dumez  <cdumez@apple.com>
+
+            Unreviewed, reverting r284883.
+
+            Caused high energy use on wsj.com <rdar://85156874>
+
+            Reverted changeset:
+
+            "<link> elements should be able to fire more than one load /
+            error event"
+            https://bugs.webkit.org/show_bug.cgi?id=232309
+            https://commits.webkit.org/r284883
+
</ins><span class="cx"> 2021-11-05  Lauro Moura  <lmoura@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [GLIB] Gardening more timeouts
</span></span></pre></div>
<a id="branchessafari61318branchLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: branches/safari-613.1.8-branch/LayoutTests/TestExpectations (285475 => 285476)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-613.1.8-branch/LayoutTests/TestExpectations      2021-11-09 01:37:58 UTC (rev 285475)
+++ branches/safari-613.1.8-branch/LayoutTests/TestExpectations 2021-11-09 01:39:12 UTC (rev 285476)
</span><span class="lines">@@ -627,6 +627,8 @@
</span><span class="cx"> imported/w3c/web-platform-tests/html/browsers/sandboxing/sandbox-disallow-scripts-via-unsandboxed-popup.tentative.html [ Skip ]
</span><span class="cx"> imported/w3c/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.transform.infinity.html [ Skip ]
</span><span class="cx"> imported/w3c/web-platform-tests/html/rendering/replaced-elements/svg-inline-sizing/svg-inline.html [ Skip ]
</span><ins>+imported/w3c/web-platform-tests/html/semantics/document-metadata/the-link-element/link-multiple-error-events.html [ Skip ]
+imported/w3c/web-platform-tests/html/semantics/document-metadata/the-link-element/link-multiple-load-events.html [ Skip ]
</ins><span class="cx"> imported/w3c/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_navigate_ancestor-1.sub.html [ Skip ]
</span><span class="cx"> imported/w3c/web-platform-tests/html/semantics/forms/historical-search-event.html [ Skip ]
</span><span class="cx"> imported/w3c/web-platform-tests/html/semantics/interactive-elements/the-summary-element/anchor-with-inline-element.html [ Skip ]
</span></span></pre></div>
<a id="branchessafari61318branchLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-613.1.8-branch/LayoutTests/imported/w3c/ChangeLog (285475 => 285476)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-613.1.8-branch/LayoutTests/imported/w3c/ChangeLog        2021-11-09 01:37:58 UTC (rev 285475)
+++ branches/safari-613.1.8-branch/LayoutTests/imported/w3c/ChangeLog   2021-11-09 01:39:12 UTC (rev 285476)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2021-11-08  Russell Epstein  <repstein@apple.com>
+
+        Cherry-pick r285417. rdar://problem/85181578
+
+    Unreviewed, reverting r284883.
+    
+    Caused high energy use on wsj.com <rdar://85156874>
+    
+    Reverted changeset:
+    
+    "<link> elements should be able to fire more than one load /
+    error event"
+    https://bugs.webkit.org/show_bug.cgi?id=232309
+    https://commits.webkit.org/r284883
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@285417 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-11-08  Chris Dumez  <cdumez@apple.com>
+
+            Unreviewed, reverting r284883.
+
+            Caused high energy use on wsj.com <rdar://85156874>
+
+            Reverted changeset:
+
+            "<link> elements should be able to fire more than one load /
+            error event"
+            https://bugs.webkit.org/show_bug.cgi?id=232309
+            https://commits.webkit.org/r284883
+
</ins><span class="cx"> 2021-11-05  Chris Dumez  <cdumez@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Resync web-platform-tests/html from upstream
</span></span></pre></div>
<a id="branchessafari61318branchLayoutTestsimportedw3cwebplatformtestshtmlsemanticsdocumentmetadatathelinkelementlinkmultipleerroreventsexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-613.1.8-branch/LayoutTests/imported/w3c/web-platform-tests/html/semantics/document-metadata/the-link-element/link-multiple-error-events-expected.txt (285475 => 285476)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-613.1.8-branch/LayoutTests/imported/w3c/web-platform-tests/html/semantics/document-metadata/the-link-element/link-multiple-error-events-expected.txt     2021-11-09 01:37:58 UTC (rev 285475)
+++ branches/safari-613.1.8-branch/LayoutTests/imported/w3c/web-platform-tests/html/semantics/document-metadata/the-link-element/link-multiple-error-events-expected.txt        2021-11-09 01:39:12 UTC (rev 285476)
</span><span class="lines">@@ -1,3 +1,5 @@
</span><span class="cx"> 
</span><del>-PASS Check if the <link>'s error event fires for each stylesheet it fails to load
</del><ins>+Harness Error (TIMEOUT), message = null
</ins><span class="cx"> 
</span><ins>+TIMEOUT Check if the <link>'s error event fires for each stylesheet it fails to load Test timed out
+
</ins></span></pre></div>
<a id="branchessafari61318branchLayoutTestsimportedw3cwebplatformtestshtmlsemanticsdocumentmetadatathelinkelementlinkmultipleloadeventsexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-613.1.8-branch/LayoutTests/imported/w3c/web-platform-tests/html/semantics/document-metadata/the-link-element/link-multiple-load-events-expected.txt (285475 => 285476)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-613.1.8-branch/LayoutTests/imported/w3c/web-platform-tests/html/semantics/document-metadata/the-link-element/link-multiple-load-events-expected.txt      2021-11-09 01:37:58 UTC (rev 285475)
+++ branches/safari-613.1.8-branch/LayoutTests/imported/w3c/web-platform-tests/html/semantics/document-metadata/the-link-element/link-multiple-load-events-expected.txt 2021-11-09 01:39:12 UTC (rev 285476)
</span><span class="lines">@@ -1,3 +1,5 @@
</span><span class="cx"> 
</span><del>-PASS Check if the <link>'s load event fires for each stylesheet it loads
</del><ins>+Harness Error (TIMEOUT), message = null
</ins><span class="cx"> 
</span><ins>+TIMEOUT Check if the <link>'s load event fires for each stylesheet it loads Test timed out
+
</ins></span></pre></div>
<a id="branchessafari61318branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-613.1.8-branch/Source/WebCore/ChangeLog (285475 => 285476)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-613.1.8-branch/Source/WebCore/ChangeLog  2021-11-09 01:37:58 UTC (rev 285475)
+++ branches/safari-613.1.8-branch/Source/WebCore/ChangeLog     2021-11-09 01:39:12 UTC (rev 285476)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2021-11-08  Russell Epstein  <repstein@apple.com>
+
+        Cherry-pick r285417. rdar://problem/85181578
+
+    Unreviewed, reverting r284883.
+    
+    Caused high energy use on wsj.com <rdar://85156874>
+    
+    Reverted changeset:
+    
+    "<link> elements should be able to fire more than one load /
+    error event"
+    https://bugs.webkit.org/show_bug.cgi?id=232309
+    https://commits.webkit.org/r284883
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@285417 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-11-08  Chris Dumez  <cdumez@apple.com>
+
+            Unreviewed, reverting r284883.
+
+            Caused high energy use on wsj.com <rdar://85156874>
+
+            Reverted changeset:
+
+            "<link> elements should be able to fire more than one load /
+            error event"
+            https://bugs.webkit.org/show_bug.cgi?id=232309
+            https://commits.webkit.org/r284883
+
</ins><span class="cx"> 2021-11-05  Patrick Griffis  <pgriffis@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [GLIB] Be more careful about calling LowPowerModeNotifier's callback
</span></span></pre></div>
<a id="branchessafari61318branchSourceWebCorehtmlHTMLLinkElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-613.1.8-branch/Source/WebCore/html/HTMLLinkElement.cpp (285475 => 285476)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-613.1.8-branch/Source/WebCore/html/HTMLLinkElement.cpp   2021-11-09 01:37:58 UTC (rev 285475)
+++ branches/safari-613.1.8-branch/Source/WebCore/html/HTMLLinkElement.cpp      2021-11-09 01:39:12 UTC (rev 285476)
</span><span class="lines">@@ -92,6 +92,7 @@
</span><span class="cx">     , m_disabledState(Unset)
</span><span class="cx">     , m_loading(false)
</span><span class="cx">     , m_createdByParser(createdByParser)
</span><ins>+    , m_firedLoad(false)
</ins><span class="cx">     , m_loadedResource(false)
</span><span class="cx">     , m_isHandlingBeforeLoad(false)
</span><span class="cx">     , m_allowPrefetchLoadAndErrorForTesting(false)
</span><span class="lines">@@ -563,8 +564,11 @@
</span><span class="cx"> 
</span><span class="cx"> void HTMLLinkElement::notifyLoadedSheetAndAllCriticalSubresources(bool errorOccurred)
</span><span class="cx"> {
</span><ins>+    if (m_firedLoad)
+        return;
</ins><span class="cx">     m_loadedResource = !errorOccurred;
</span><span class="cx">     linkLoadEventSender().dispatchEventSoon(*this);
</span><ins>+    m_firedLoad = true;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void HTMLLinkElement::startLoadingDynamicSheet()
</span></span></pre></div>
<a id="branchessafari61318branchSourceWebCorehtmlHTMLLinkElementh"></a>
<div class="modfile"><h4>Modified: branches/safari-613.1.8-branch/Source/WebCore/html/HTMLLinkElement.h (285475 => 285476)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-613.1.8-branch/Source/WebCore/html/HTMLLinkElement.h     2021-11-09 01:37:58 UTC (rev 285475)
+++ branches/safari-613.1.8-branch/Source/WebCore/html/HTMLLinkElement.h        2021-11-09 01:39:12 UTC (rev 285476)
</span><span class="lines">@@ -148,6 +148,7 @@
</span><span class="cx">     LinkRelAttribute m_relAttribute;
</span><span class="cx">     bool m_loading : 1;
</span><span class="cx">     bool m_createdByParser : 1;
</span><ins>+    bool m_firedLoad : 1;
</ins><span class="cx">     bool m_loadedResource : 1;
</span><span class="cx">     bool m_isHandlingBeforeLoad : 1;
</span><span class="cx">     bool m_allowPrefetchLoadAndErrorForTesting : 1;
</span></span></pre>
</div>
</div>

</body>
</html>