Check if an <embed> can transition to an "Active" state from "potenti…

…ally-active" state when the src attribute on an <embed> is set. * plugins/embed-attributes-setting.html Updating src attribute should trigger content loading. So This CL removes the code to update src attribute. * AUTHORS Adding George Joseph. BUG=543905 Review-Url: https://codereview.chromium.org/2347553002 Cr-Commit-Position: refs/heads/master@{#428661}
cbchan · Oct 31, 2016 · 72ea580 · 72ea580
1 parent 1ab21eb
commit 72ea580
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 3 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -219,6 +219,7 @@ Gajendra N <gajendra.n@samsung.com>
 Gajendra Singh <wxjg68@motorola.com>
 Gao Chun <chun.gao@intel.com>
 Gao Chun <gaochun.dev@gmail.com>
+George Joseph <kottackal.george@gmail.com>
 George Liaskos <geo.liaskos@gmail.com>
 Georgy Buranov <gburanov@gmail.com>
 Gergely Nagy <ngg@ngg.hu>

diff --git a/third_party/WebKit/LayoutTests/plugins/embed-attributes-active.html b/third_party/WebKit/LayoutTests/plugins/embed-attributes-active.html
@@ -0,0 +1,16 @@
+<html>
+<script src="../resources/testharness.js"></script>
+<script src="../resources/testharnessreport.js"></script>
+<body>
+<embed style="visibility: hidden" type="image/svg+xml" id='embed'></embed>
+<script>
+var testobject = async_test("crbug.com/543905 : check that an embed does get loaded when setting properties type and src respectively");
+var embed = document.getElementById('embed');
+embed.addEventListener("load", testobject.step_func(() => {
+    testobject.done();
+}));
+embed.type = "image/svg+xml"; // setting the type attribute should not effect the plugin once loaded
+embed.src = "resources/410.svg"; // setting the source attribute should not effect the plugin once loaded
+</script>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/plugins/embed-attributes-setting-expected.txt b/third_party/WebKit/LayoutTests/plugins/embed-attributes-setting-expected.txt
@@ -6,7 +6,6 @@ PASS: embed.getAttribute('height') should be 1 and is.
 PASS: embed.getAttribute('name') should be 1 and is.
 PASS: embed.getAttribute('width') should be 1 and is.
 PASS: embed.getAttribute('type') should be 1 and is.
-PASS: embed.getAttribute('src') should be 1 and is.
 PASS: typeof embed.postMessage should be function and is.
 ----------
 [Embed is dynamically created element with only type specified]

diff --git a/third_party/WebKit/LayoutTests/plugins/embed-attributes-setting.html b/third_party/WebKit/LayoutTests/plugins/embed-attributes-setting.html
@@ -40,14 +40,12 @@
     embed.name = 1;
     embed.width = 1;
     embed.type = 1; // setting the type attribute should not effect the plugin once loaded
-    embed.src = 1; // setting the source attribute should not effect the plugin once loaded
 
     shouldBe("embed.getAttribute('align')", 1);
     shouldBe("embed.getAttribute('height')", 1);
     shouldBe("embed.getAttribute('name')", 1);
     shouldBe("embed.getAttribute('width')", 1);
     shouldBe("embed.getAttribute('type')", 1);
-    shouldBe("embed.getAttribute('src')", 1);
     shouldBe("typeof embed.postMessage", "function");
 
     print("----------");

diff --git a/third_party/WebKit/LayoutTests/plugins/resources/410.svg b/third_party/WebKit/LayoutTests/plugins/resources/410.svg
diff --git a/third_party/WebKit/Source/core/html/HTMLEmbedElement.cpp b/third_party/WebKit/Source/core/html/HTMLEmbedElement.cpp
@@ -117,6 +117,14 @@ void HTMLEmbedElement::parseAttribute(const QualifiedName& name,
       if (!m_imageLoader)
         m_imageLoader = HTMLImageLoader::create(this);
       m_imageLoader->updateFromElement(ImageLoader::UpdateIgnorePreviousError);
+    } else if (layoutObject()) {
+      // Check if this Embed can transition from potentially-active to active
+      if (fastHasAttribute(typeAttr)) {
+        setNeedsWidgetUpdate(true);
+        lazyReattachIfNeeded();
+      }
+    } else {
+      requestPluginCreationWithoutLayoutObjectIfPossible();
     }
   } else {
     HTMLPlugInElement::parseAttribute(name, oldValue, value);