Changeset 270300 in webkit

Timestamp:

Dec 1, 2020 9:14:28 AM (20 months ago)

Author:

commit-queue@webkit.org

Message:

Lazy loaded iframe should not lazy load when scripting is disabled
​https://bugs.webkit.org/show_bug.cgi?id=217315

Patch by Rob Buis <​rbuis@igalia.com> on 2020-12-01
Reviewed by Darin Adler.

LayoutTests/imported/w3c:

Update improved test expectation.

• web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-in-script-disabled-iframe-expected.txt:

Source/WebCore:

Lazy loaded iframe should not lazy load when scripting is disabled [1].

Test: imported/w3c/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-in-script-disabled-iframe.html

[1] ​https://html.spec.whatwg.org/#will-lazy-load-element-steps

This matches Chrome and Firefox.

• html/HTMLIFrameElement.cpp:

(WebCore::isFrameLazyLoadable):
(WebCore::HTMLIFrameElement::shouldLoadFrameLazily):

• html/HTMLImageElement.cpp:

(WebCore::HTMLImageElement::isLazyLoadable const):

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-in-script-disabled-iframe-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLIFrameElement.cpp (modified) (2 diffs)
• Source/WebCore/html/HTMLImageElement.cpp (modified) (1 diff)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2020-12-01  Rob Buis  <rbuis@igalia.com>
+
+        Lazy loaded iframe should not lazy load when scripting is disabled
+        https://bugs.webkit.org/show_bug.cgi?id=217315
+
+        Reviewed by Darin Adler.
+
+        Update improved test expectation.
+
+        * web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-in-script-disabled-iframe-expected.txt:
+
 2020-12-01  Youenn Fablet  <youenn@apple.com>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-in-script-disabled-iframe-expected.txt

@@ -1 +1 @@
 
 
-FAIL Iframes with loading='lazy' in script disabled iframe are not handled
-       as 'lazy' promise_test: Unhandled rejection with value: object "TypeError: null is not an object (evaluating 'inner_iframe.contentDocument.body')"
+PASS Iframes with loading='lazy' in script disabled iframe are not handled
+       as 'lazy'
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-12-01  Rob Buis  <rbuis@igalia.com>
+
+        Lazy loaded iframe should not lazy load when scripting is disabled
+        https://bugs.webkit.org/show_bug.cgi?id=217315
+
+        Reviewed by Darin Adler.
+
+        Lazy loaded iframe should not lazy load when scripting is disabled [1].
+
+        Test: imported/w3c/web-platform-tests/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-in-script-disabled-iframe.html
+
+        [1] https://html.spec.whatwg.org/#will-lazy-load-element-steps
+
+        This matches Chrome and Firefox.
+
+        * html/HTMLIFrameElement.cpp:
+        (WebCore::isFrameLazyLoadable):
+        (WebCore::HTMLIFrameElement::shouldLoadFrameLazily):
+        * html/HTMLImageElement.cpp:
+        (WebCore::HTMLImageElement::isLazyLoadable const):
+
 2020-12-01  Tetsuharu Ohzeki  <tetsuharu.ohzeki@gmail.com>
 

trunk/Source/WebCore/html/HTMLIFrameElement.cpp

@@ -165 +165 @@
 }
 
-static bool isFrameLazyLoadable(const URL& completeURL, const AtomString& loadingAttributeValue)
+static bool isFrameLazyLoadable(const Document& document, const URL& completeURL, const AtomString& loadingAttributeValue)
 {
     if (!completeURL.protocolIsInHTTPFamily())
         return false;
 
+    if (!document.frame() || !document.frame()->script().canExecuteScripts(NotAboutToExecuteScript))
+        return false;
+
     return equalLettersIgnoringASCIICase(loadingAttributeValue, "lazy");
 }
@@ -177 +180 @@
     if (!m_lazyLoadFrameObserver && document().settings().lazyIframeLoadingEnabled()) {
         URL completeURL = document().completeURL(frameURL());
-        if (isFrameLazyLoadable(completeURL, attributeWithoutSynchronization(HTMLNames::loadingAttr))) {
+        if (isFrameLazyLoadable(document(), completeURL, attributeWithoutSynchronization(HTMLNames::loadingAttr))) {
             auto currentReferrerPolicy = referrerPolicy();
             lazyLoadFrameObserver().observe(completeURL.string(), currentReferrerPolicy);

trunk/Source/WebCore/html/HTMLImageElement.cpp

@@ -871 +871 @@
 bool HTMLImageElement::isLazyLoadable() const
 {
-    if (document().frame() && !document().frame()->script().canExecuteScripts(NotAboutToExecuteScript))
+    if (!document().frame() || !document().frame()->script().canExecuteScripts(NotAboutToExecuteScript))
         return false;
     return hasLazyLoadableAttributeValue(attributeWithoutSynchronization(HTMLNames::loadingAttr));