Changeset 207248 in webkit

Timestamp:

Oct 12, 2016 4:01:32 PM (8 years ago)

Author:

matthew_hanson@apple.com

Message:

Merge r203522. rdar://problem/28476959

Location:

branches/safari-602.2.14.0-branch

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/ios-simulator/TestExpectations (modified) (1 diff)
• LayoutTests/platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-expected.txt (modified) (1 diff)
• LayoutTests/platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-no-height-or-width-expected.txt (modified) (1 diff)
• LayoutTests/platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-no-height-or-width.html (modified) (2 diffs)
• LayoutTests/platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe.html (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/shadow/YouTubeEmbedShadowElement.cpp (modified) (3 diffs)
• Source/WebCore/html/shadow/YouTubeEmbedShadowElement.h (modified) (1 diff)

branches/safari-602.2.14.0-branch/LayoutTests/ChangeLog

@@ +1 @@
+2016-10-11  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r203522. rdar://problem/28476959
+
+    2016-07-21  Daniel Bates  <dabates@apple.com>
+
+            REGRESSION: Plugin replaced YouTube Flash videos always have the same width
+            https://bugs.webkit.org/show_bug.cgi?id=159998
+            <rdar://problem/27462285>
+
+            Reviewed by Simon Fraser.
+
+            Unskip existing iOS layout tests, update tests and expected results.
+
+            * platform/ios-simulator/TestExpectations:
+            * platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-expected.txt: Updated expected result based on the
+            changes to test youtube-flash-plugin-iframe.html.
+            * platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-no-height-or-width-expected.txt: Updated expected result
+            based on the changes to test youtube-flash-plugin-iframe-no-height-or-width.html.
+            * platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-no-height-or-width.html: Modified to check the
+            width of each embedded YouTube video to ensure that we respect it (if specified).
+            * platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe.html: Substitute pseudo id -webkit-plugin-replacement
+            for -apple-youtube-shadow-iframe as the later was renamed to the former in <https://trac.webkit.org/changeset/168442>.
+            Fix misspelling of the word "embed" in a comment.
+
 2016-10-11  Matthew Hanson  <matthew_hanson@apple.com>
 

branches/safari-602.2.14.0-branch/LayoutTests/platform/ios-simulator/TestExpectations

@@ -2556 +2556 @@
 # iOS tests that assert:
 platform/ios-simulator/ios/fast/text/combining-enclosing-keycap.html
-platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-no-height-or-width.html
-platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe.html
 
 # Kerning, Ligatures, and Printer Fonts caused these tests to fail.

branches/safari-602.2.14.0-branch/LayoutTests/platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-expected.txt

@@ -17 +17 @@
 PASS objectNoEmbed.tagName is "OBJECT"
 PASS document.querySelectorAll("iframe").length is 1
-PASS internals.shadowPseudoId(normalEmbedShadowRoot.firstChild) is "-apple-youtube-shadow-iframe"
+PASS internals.shadowPseudoId(normalEmbedShadowRoot.firstChild) is "-webkit-plugin-replacement"
 PASS normalEmbedShadowRoot.firstChild.firstChild.tagName is "IFRAME"
-PASS internals.shadowPseudoId(objectEmbedShadowRoot.firstChild) is "-apple-youtube-shadow-iframe"
+PASS internals.shadowPseudoId(objectEmbedShadowRoot.firstChild) is "-webkit-plugin-replacement"
 PASS objectEmbedShadowRoot.firstChild.firstChild.tagName is "IFRAME"
-PASS internals.shadowPseudoId(objectNoEmbedShadowRoot.firstChild) is "-apple-youtube-shadow-iframe"
+PASS internals.shadowPseudoId(objectNoEmbedShadowRoot.firstChild) is "-webkit-plugin-replacement"
 PASS objectNoEmbedShadowRoot.firstChild.firstChild.tagName is "IFRAME"
 Normal Embed:

branches/safari-602.2.14.0-branch/LayoutTests/platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-no-height-or-width-expected.txt

@@ -13 +13 @@
 
 TEST COMPLETE
+PASS getComputedStyle(embedNoHeight).width is "425px"
 PASS getComputedStyle(embedNoHeight).height is "150px"
 PASS getComputedStyle(embedNoWidth).width is "300px"
+PASS getComputedStyle(embedNoWidth).height is "350px"
 PASS getComputedStyle(embedNoWidthHeight).width is "300px"
 PASS getComputedStyle(embedNoWidthHeight).height is "150px"
+PASS getComputedStyle(objectNoHeight).width is "425px"
 PASS getComputedStyle(objectNoHeight).height is "150px"
 PASS getComputedStyle(objectNoWidth).width is "300px"
+PASS getComputedStyle(objectNoWidth).height is "350px"
 PASS getComputedStyle(objectNoWidthHeight).width is "300px"
 PASS getComputedStyle(objectNoWidthHeight).height is "150px"

branches/safari-602.2.14.0-branch/LayoutTests/platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-no-height-or-width.html

@@ -17 +17 @@
     setTimeout(function() {
         embedNoHeight = document.getElementById('embed-no-height');
-        shouldBe('getComputedStyle(embedNoHeight).height', '"150px"')
+        shouldBe('getComputedStyle(embedNoHeight).width', '"425px"');
+        shouldBe('getComputedStyle(embedNoHeight).height', '"150px"');
 
         embedNoWidth = document.getElementById('embed-no-width');
-        shouldBe('getComputedStyle(embedNoWidth).width', '"300px"')
+        shouldBe('getComputedStyle(embedNoWidth).width', '"300px"');
+        shouldBe('getComputedStyle(embedNoWidth).height', '"350px"');
 
         embedNoWidthHeight = document.getElementById('embed-no-width-or-height');
@@ -27 +29 @@
 
         objectNoHeight = document.getElementById('object-no-height');
-        shouldBe('getComputedStyle(objectNoHeight).height', '"150px"')
+        shouldBe('getComputedStyle(objectNoHeight).width', '"425px"');
+        shouldBe('getComputedStyle(objectNoHeight).height', '"150px"');
 
         objectNoWidth = document.getElementById('object-no-width');
-        shouldBe('getComputedStyle(objectNoWidth).width', '"300px"')
+        shouldBe('getComputedStyle(objectNoWidth).width', '"300px"');
+        shouldBe('getComputedStyle(objectNoWidth).height', '"350px"');
 
         objectNoWidthHeight = document.getElementById('object-no-width-or-height');

branches/safari-602.2.14.0-branch/LayoutTests/platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe.html

@@ -21 +21 @@
         objectNoEmbed = document.getElementById('object-no-embed');
 
-        // Test we don't change any embe/object tag to iframe.
+        // Test we don't change any embed/object tag to iframe.
         shouldBe('normalEmbed.tagName', '"EMBED"');
         shouldBe('elinkEmbed.tagName', '"EMBED"');
@@ -32 +32 @@
         // Test we have the shadow root and the iframe player.
         normalEmbedShadowRoot = internals.shadowRoot(normalEmbed);
-        shouldBe('internals.shadowPseudoId(normalEmbedShadowRoot.firstChild)', '"-apple-youtube-shadow-iframe"');
+        shouldBe('internals.shadowPseudoId(normalEmbedShadowRoot.firstChild)', '"-webkit-plugin-replacement"');
         shouldBe('normalEmbedShadowRoot.firstChild.firstChild.tagName', '"IFRAME"');
 
         objectEmbedShadowRoot = internals.shadowRoot(objectEmbed);
-        shouldBe('internals.shadowPseudoId(objectEmbedShadowRoot.firstChild)', '"-apple-youtube-shadow-iframe"');
+        shouldBe('internals.shadowPseudoId(objectEmbedShadowRoot.firstChild)', '"-webkit-plugin-replacement"');
         shouldBe('objectEmbedShadowRoot.firstChild.firstChild.tagName', '"IFRAME"');
 
         objectNoEmbedShadowRoot = internals.shadowRoot(objectNoEmbed);
-        shouldBe('internals.shadowPseudoId(objectNoEmbedShadowRoot.firstChild)', '"-apple-youtube-shadow-iframe"');
+        shouldBe('internals.shadowPseudoId(objectNoEmbedShadowRoot.firstChild)', '"-webkit-plugin-replacement"');
         shouldBe('objectNoEmbedShadowRoot.firstChild.firstChild.tagName', '"IFRAME"');
 

branches/safari-602.2.14.0-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-11  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r203522. rdar://problem/28476959
+
+    2016-07-21  Daniel Bates  <dabates@apple.com>
+
+            REGRESSION: Plugin replaced YouTube Flash videos always have the same width
+            https://bugs.webkit.org/show_bug.cgi?id=159998
+            <rdar://problem/27462285>
+
+            Reviewed by Simon Fraser.
+
+            Fixes an issue where the width of a plugin replaced YouTube video loaded via an HTML embed
+            element would always have the same width regardless of value of the width attribute.
+
+            For YouTube Flash videos the YouTube plugin replacement substitutes a shadow DOM subtree
+            for the default renderer of an HTML embed element. The root of this shadow DOM subtree
+            is an HTML div element. Currently we set inline styles on this <div> when it is instantiated.
+            In particular, we set inline display and position to "inline-block" and "relative", respectively,
+            and set an invalid height and width (we specify a font weight value instead of a CSS length value
+            - this causes an ASSERT_NOT_REACHED() assertion failure in StyleBuilderConverter::convertLengthSizing()
+            in a debug build). These styles never worked as intended and we ultimately created an inline
+            renderer (ignoring display "inline-block") that had auto width and height. Instead it is sufficient
+            to remove all these inline styles and create a RenderBlockFlow renderer for this <div> so that it
+            renders as a block, non-replaced element to achieve the intended illusion that the <embed> is a
+            single element.
+
+            * html/shadow/YouTubeEmbedShadowElement.cpp: Remove unused header HTMLEmbedElement.h and include
+            header RenderBlockFlow.h. Also update copyright in license block.
+            (WebCore::YouTubeEmbedShadowElement::YouTubeEmbedShadowElement): Remove inline styles as these
+            never worked as intended.
+            (WebCore::YouTubeEmbedShadowElement::createElementRenderer): Override; create a block-flow
+            renderer for us so that we layout as a block, non-replaced element.
+            * html/shadow/YouTubeEmbedShadowElement.h:
+
 2016-10-11  Matthew Hanson  <matthew_hanson@apple.com>
 

branches/safari-602.2.14.0-branch/Source/WebCore/html/shadow/YouTubeEmbedShadowElement.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2012, 2014 Apple Inc. All rights reserved.
+ * Copyright (C) 2012-2016 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -27 +27 @@
 #include "YouTubeEmbedShadowElement.h"
 
-#include "HTMLEmbedElement.h"
+#include "RenderBlockFlow.h"
 
 namespace WebCore {
@@ -40 +40 @@
 {
     setPseudo(AtomicString("-webkit-plugin-replacement", AtomicString::ConstructFromLiteral));
+}
 
-    setInlineStyleProperty(CSSPropertyDisplay, CSSValueInlineBlock);
-    setInlineStyleProperty(CSSPropertyPosition, CSSValueRelative);
-    setInlineStyleProperty(CSSPropertyWidth, CSSValue100);
-    setInlineStyleProperty(CSSPropertyHeight, CSSValue100);
+RenderPtr<RenderElement> YouTubeEmbedShadowElement::createElementRenderer(RenderStyle&& style, const RenderTreePosition&)
+{
+    return createRenderer<RenderBlockFlow>(*this, WTFMove(style));
 }
 

branches/safari-602.2.14.0-branch/Source/WebCore/html/shadow/YouTubeEmbedShadowElement.h

@@ -36 +36 @@
     static Ref<YouTubeEmbedShadowElement> create(Document&);
 
+    RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) final;
+
 private:
     YouTubeEmbedShadowElement(Document&);