Diff
Modified: branches/safari-613.1.8-branch/LayoutTests/ChangeLog (285475 => 285476)
--- 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)
@@ -1,3 +1,33 @@
+2021-11-08 Russell Epstein <[email protected]>
+
+ 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 <[email protected]>
+
+ 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
+
2021-11-05 Lauro Moura <[email protected]>
[GLIB] Gardening more timeouts
Modified: branches/safari-613.1.8-branch/LayoutTests/TestExpectations (285475 => 285476)
--- 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)
@@ -627,6 +627,8 @@
imported/w3c/web-platform-tests/html/browsers/sandboxing/sandbox-disallow-scripts-via-unsandboxed-popup.tentative.html [ Skip ]
imported/w3c/web-platform-tests/html/canvas/element/fill-and-stroke-styles/2d.pattern.transform.infinity.html [ Skip ]
imported/w3c/web-platform-tests/html/rendering/replaced-elements/svg-inline-sizing/svg-inline.html [ Skip ]
+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 ]
imported/w3c/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe_navigate_ancestor-1.sub.html [ Skip ]
imported/w3c/web-platform-tests/html/semantics/forms/historical-search-event.html [ Skip ]
imported/w3c/web-platform-tests/html/semantics/interactive-elements/the-summary-element/anchor-with-inline-element.html [ Skip ]
Modified: branches/safari-613.1.8-branch/LayoutTests/imported/w3c/ChangeLog (285475 => 285476)
--- 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)
@@ -1,3 +1,33 @@
+2021-11-08 Russell Epstein <[email protected]>
+
+ 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 <[email protected]>
+
+ 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
+
2021-11-05 Chris Dumez <[email protected]>
Resync web-platform-tests/html from upstream
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)
--- 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)
@@ -1,3 +1,5 @@
-PASS Check if the <link>'s error event fires for each stylesheet it fails to load
+Harness Error (TIMEOUT), message = null
+TIMEOUT Check if the <link>'s error event fires for each stylesheet it fails to load Test timed out
+
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)
--- 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)
@@ -1,3 +1,5 @@
-PASS Check if the <link>'s load event fires for each stylesheet it loads
+Harness Error (TIMEOUT), message = null
+TIMEOUT Check if the <link>'s load event fires for each stylesheet it loads Test timed out
+
Modified: branches/safari-613.1.8-branch/Source/WebCore/ChangeLog (285475 => 285476)
--- 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)
@@ -1,3 +1,33 @@
+2021-11-08 Russell Epstein <[email protected]>
+
+ 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 <[email protected]>
+
+ 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
+
2021-11-05 Patrick Griffis <[email protected]>
[GLIB] Be more careful about calling LowPowerModeNotifier's callback
Modified: branches/safari-613.1.8-branch/Source/WebCore/html/HTMLLinkElement.cpp (285475 => 285476)
--- 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)
@@ -92,6 +92,7 @@
, m_disabledState(Unset)
, m_loading(false)
, m_createdByParser(createdByParser)
+ , m_firedLoad(false)
, m_loadedResource(false)
, m_isHandlingBeforeLoad(false)
, m_allowPrefetchLoadAndErrorForTesting(false)
@@ -563,8 +564,11 @@
void HTMLLinkElement::notifyLoadedSheetAndAllCriticalSubresources(bool errorOccurred)
{
+ if (m_firedLoad)
+ return;
m_loadedResource = !errorOccurred;
linkLoadEventSender().dispatchEventSoon(*this);
+ m_firedLoad = true;
}
void HTMLLinkElement::startLoadingDynamicSheet()
Modified: branches/safari-613.1.8-branch/Source/WebCore/html/HTMLLinkElement.h (285475 => 285476)
--- 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)
@@ -148,6 +148,7 @@
LinkRelAttribute m_relAttribute;
bool m_loading : 1;
bool m_createdByParser : 1;
+ bool m_firedLoad : 1;
bool m_loadedResource : 1;
bool m_isHandlingBeforeLoad : 1;
bool m_allowPrefetchLoadAndErrorForTesting : 1;
