<!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>[207195] branches/safari-602-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/207195">207195</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2016-10-12 01:40:49 -0700 (Wed, 12 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/203522">r203522</a>. rdar://problem/28476959</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602branchLayoutTestsChangeLog">branches/safari-602-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari602branchLayoutTestsplatformiossimulatorTestExpectations">branches/safari-602-branch/LayoutTests/platform/ios-simulator/TestExpectations</a></li>
<li><a href="#branchessafari602branchLayoutTestsplatformiossimulatoriospluginyoutubeflashpluginiframeexpectedtxt">branches/safari-602-branch/LayoutTests/platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-expected.txt</a></li>
<li><a href="#branchessafari602branchLayoutTestsplatformiossimulatoriospluginyoutubeflashpluginiframenoheightorwidthexpectedtxt">branches/safari-602-branch/LayoutTests/platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-no-height-or-width-expected.txt</a></li>
<li><a href="#branchessafari602branchLayoutTestsplatformiossimulatoriospluginyoutubeflashpluginiframenoheightorwidthhtml">branches/safari-602-branch/LayoutTests/platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-no-height-or-width.html</a></li>
<li><a href="#branchessafari602branchLayoutTestsplatformiossimulatoriospluginyoutubeflashpluginiframehtml">branches/safari-602-branch/LayoutTests/platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe.html</a></li>
<li><a href="#branchessafari602branchSourceWebCoreChangeLog">branches/safari-602-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebCorehtmlshadowYouTubeEmbedShadowElementcpp">branches/safari-602-branch/Source/WebCore/html/shadow/YouTubeEmbedShadowElement.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebCorehtmlshadowYouTubeEmbedShadowElementh">branches/safari-602-branch/Source/WebCore/html/shadow/YouTubeEmbedShadowElement.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/ChangeLog (207194 => 207195)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/ChangeLog 2016-10-12 08:40:43 UTC (rev 207194)
+++ branches/safari-602-branch/LayoutTests/ChangeLog 2016-10-12 08:40:49 UTC (rev 207195)
</span><span class="lines">@@ -1,5 +1,30 @@
</span><span class="cx"> 2016-10-11 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ 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>
+
</ins><span class="cx"> Merge r203383. rdar://problem/28216264
</span><span class="cx">
</span><span class="cx"> 2016-07-18 Brent Fulgham <bfulgham@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchLayoutTestsplatformiossimulatorTestExpectations"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/platform/ios-simulator/TestExpectations (207194 => 207195)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/platform/ios-simulator/TestExpectations 2016-10-12 08:40:43 UTC (rev 207194)
+++ branches/safari-602-branch/LayoutTests/platform/ios-simulator/TestExpectations 2016-10-12 08:40:49 UTC (rev 207195)
</span><span class="lines">@@ -2555,8 +2555,6 @@
</span><span class="cx">
</span><span class="cx"> # iOS tests that assert:
</span><span class="cx"> platform/ios-simulator/ios/fast/text/combining-enclosing-keycap.html
</span><del>-platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-no-height-or-width.html
-platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe.html
</del><span class="cx">
</span><span class="cx"> # Kerning, Ligatures, and Printer Fonts caused these tests to fail.
</span><span class="cx"> # The following tests are reftests (and also fail on Mac):
</span></span></pre></div>
<a id="branchessafari602branchLayoutTestsplatformiossimulatoriospluginyoutubeflashpluginiframeexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-expected.txt (207194 => 207195)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-expected.txt 2016-10-12 08:40:43 UTC (rev 207194)
+++ branches/safari-602-branch/LayoutTests/platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-expected.txt 2016-10-12 08:40:49 UTC (rev 207195)
</span><span class="lines">@@ -16,11 +16,11 @@
</span><span class="cx"> PASS objectEmbed.tagName is "EMBED"
</span><span class="cx"> PASS objectNoEmbed.tagName is "OBJECT"
</span><span class="cx"> PASS document.querySelectorAll("iframe").length is 1
</span><del>-PASS internals.shadowPseudoId(normalEmbedShadowRoot.firstChild) is "-apple-youtube-shadow-iframe"
</del><ins>+PASS internals.shadowPseudoId(normalEmbedShadowRoot.firstChild) is "-webkit-plugin-replacement"
</ins><span class="cx"> PASS normalEmbedShadowRoot.firstChild.firstChild.tagName is "IFRAME"
</span><del>-PASS internals.shadowPseudoId(objectEmbedShadowRoot.firstChild) is "-apple-youtube-shadow-iframe"
</del><ins>+PASS internals.shadowPseudoId(objectEmbedShadowRoot.firstChild) is "-webkit-plugin-replacement"
</ins><span class="cx"> PASS objectEmbedShadowRoot.firstChild.firstChild.tagName is "IFRAME"
</span><del>-PASS internals.shadowPseudoId(objectNoEmbedShadowRoot.firstChild) is "-apple-youtube-shadow-iframe"
</del><ins>+PASS internals.shadowPseudoId(objectNoEmbedShadowRoot.firstChild) is "-webkit-plugin-replacement"
</ins><span class="cx"> PASS objectNoEmbedShadowRoot.firstChild.firstChild.tagName is "IFRAME"
</span><span class="cx"> Normal Embed:
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari602branchLayoutTestsplatformiossimulatoriospluginyoutubeflashpluginiframenoheightorwidthexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-no-height-or-width-expected.txt (207194 => 207195)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-no-height-or-width-expected.txt 2016-10-12 08:40:43 UTC (rev 207194)
+++ branches/safari-602-branch/LayoutTests/platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-no-height-or-width-expected.txt 2016-10-12 08:40:49 UTC (rev 207195)
</span><span class="lines">@@ -12,12 +12,16 @@
</span><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span><ins>+PASS getComputedStyle(embedNoHeight).width is "425px"
</ins><span class="cx"> PASS getComputedStyle(embedNoHeight).height is "150px"
</span><span class="cx"> PASS getComputedStyle(embedNoWidth).width is "300px"
</span><ins>+PASS getComputedStyle(embedNoWidth).height is "350px"
</ins><span class="cx"> PASS getComputedStyle(embedNoWidthHeight).width is "300px"
</span><span class="cx"> PASS getComputedStyle(embedNoWidthHeight).height is "150px"
</span><ins>+PASS getComputedStyle(objectNoHeight).width is "425px"
</ins><span class="cx"> PASS getComputedStyle(objectNoHeight).height is "150px"
</span><span class="cx"> PASS getComputedStyle(objectNoWidth).width is "300px"
</span><ins>+PASS getComputedStyle(objectNoWidth).height is "350px"
</ins><span class="cx"> PASS getComputedStyle(objectNoWidthHeight).width is "300px"
</span><span class="cx"> PASS getComputedStyle(objectNoWidthHeight).height is "150px"
</span><span class="cx"> Embed without height:
</span></span></pre></div>
<a id="branchessafari602branchLayoutTestsplatformiossimulatoriospluginyoutubeflashpluginiframenoheightorwidthhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-no-height-or-width.html (207194 => 207195)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-no-height-or-width.html 2016-10-12 08:40:43 UTC (rev 207194)
+++ branches/safari-602-branch/LayoutTests/platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe-no-height-or-width.html 2016-10-12 08:40:49 UTC (rev 207195)
</span><span class="lines">@@ -16,10 +16,12 @@
</span><span class="cx"> {
</span><span class="cx"> setTimeout(function() {
</span><span class="cx"> embedNoHeight = document.getElementById('embed-no-height');
</span><del>- shouldBe('getComputedStyle(embedNoHeight).height', '"150px"')
</del><ins>+ shouldBe('getComputedStyle(embedNoHeight).width', '"425px"');
+ shouldBe('getComputedStyle(embedNoHeight).height', '"150px"');
</ins><span class="cx">
</span><span class="cx"> embedNoWidth = document.getElementById('embed-no-width');
</span><del>- shouldBe('getComputedStyle(embedNoWidth).width', '"300px"')
</del><ins>+ shouldBe('getComputedStyle(embedNoWidth).width', '"300px"');
+ shouldBe('getComputedStyle(embedNoWidth).height', '"350px"');
</ins><span class="cx">
</span><span class="cx"> embedNoWidthHeight = document.getElementById('embed-no-width-or-height');
</span><span class="cx"> shouldBe('getComputedStyle(embedNoWidthHeight).width', '"300px"');
</span><span class="lines">@@ -26,10 +28,12 @@
</span><span class="cx"> shouldBe('getComputedStyle(embedNoWidthHeight).height', '"150px"');
</span><span class="cx">
</span><span class="cx"> objectNoHeight = document.getElementById('object-no-height');
</span><del>- shouldBe('getComputedStyle(objectNoHeight).height', '"150px"')
</del><ins>+ shouldBe('getComputedStyle(objectNoHeight).width', '"425px"');
+ shouldBe('getComputedStyle(objectNoHeight).height', '"150px"');
</ins><span class="cx">
</span><span class="cx"> objectNoWidth = document.getElementById('object-no-width');
</span><del>- shouldBe('getComputedStyle(objectNoWidth).width', '"300px"')
</del><ins>+ shouldBe('getComputedStyle(objectNoWidth).width', '"300px"');
+ shouldBe('getComputedStyle(objectNoWidth).height', '"350px"');
</ins><span class="cx">
</span><span class="cx"> objectNoWidthHeight = document.getElementById('object-no-width-or-height');
</span><span class="cx"> shouldBe('getComputedStyle(objectNoWidthHeight).width', '"300px"');
</span></span></pre></div>
<a id="branchessafari602branchLayoutTestsplatformiossimulatoriospluginyoutubeflashpluginiframehtml"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe.html (207194 => 207195)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe.html 2016-10-12 08:40:43 UTC (rev 207194)
+++ branches/safari-602-branch/LayoutTests/platform/ios-simulator/ios/plugin/youtube-flash-plugin-iframe.html 2016-10-12 08:40:49 UTC (rev 207195)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> objectEmbed = document.getElementById('object-embed');
</span><span class="cx"> objectNoEmbed = document.getElementById('object-no-embed');
</span><span class="cx">
</span><del>- // Test we don't change any embe/object tag to iframe.
</del><ins>+ // Test we don't change any embed/object tag to iframe.
</ins><span class="cx"> shouldBe('normalEmbed.tagName', '"EMBED"');
</span><span class="cx"> shouldBe('elinkEmbed.tagName', '"EMBED"');
</span><span class="cx"> shouldBe('objectEmbed.tagName', '"EMBED"');
</span><span class="lines">@@ -31,15 +31,15 @@
</span><span class="cx">
</span><span class="cx"> // Test we have the shadow root and the iframe player.
</span><span class="cx"> normalEmbedShadowRoot = internals.shadowRoot(normalEmbed);
</span><del>- shouldBe('internals.shadowPseudoId(normalEmbedShadowRoot.firstChild)', '"-apple-youtube-shadow-iframe"');
</del><ins>+ shouldBe('internals.shadowPseudoId(normalEmbedShadowRoot.firstChild)', '"-webkit-plugin-replacement"');
</ins><span class="cx"> shouldBe('normalEmbedShadowRoot.firstChild.firstChild.tagName', '"IFRAME"');
</span><span class="cx">
</span><span class="cx"> objectEmbedShadowRoot = internals.shadowRoot(objectEmbed);
</span><del>- shouldBe('internals.shadowPseudoId(objectEmbedShadowRoot.firstChild)', '"-apple-youtube-shadow-iframe"');
</del><ins>+ shouldBe('internals.shadowPseudoId(objectEmbedShadowRoot.firstChild)', '"-webkit-plugin-replacement"');
</ins><span class="cx"> shouldBe('objectEmbedShadowRoot.firstChild.firstChild.tagName', '"IFRAME"');
</span><span class="cx">
</span><span class="cx"> objectNoEmbedShadowRoot = internals.shadowRoot(objectNoEmbed);
</span><del>- shouldBe('internals.shadowPseudoId(objectNoEmbedShadowRoot.firstChild)', '"-apple-youtube-shadow-iframe"');
</del><ins>+ shouldBe('internals.shadowPseudoId(objectNoEmbedShadowRoot.firstChild)', '"-webkit-plugin-replacement"');
</ins><span class="cx"> shouldBe('objectNoEmbedShadowRoot.firstChild.firstChild.tagName', '"IFRAME"');
</span><span class="cx">
</span><span class="cx"> var successfullyParsed = true;
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (207194 => 207195)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-10-12 08:40:43 UTC (rev 207194)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-10-12 08:40:49 UTC (rev 207195)
</span><span class="lines">@@ -1,5 +1,40 @@
</span><span class="cx"> 2016-10-11 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ 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>
+
</ins><span class="cx"> Merge r203383. rdar://problem/28216264
</span><span class="cx">
</span><span class="cx"> 2016-07-18 Brent Fulgham <bfulgham@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCorehtmlshadowYouTubeEmbedShadowElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/html/shadow/YouTubeEmbedShadowElement.cpp (207194 => 207195)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/html/shadow/YouTubeEmbedShadowElement.cpp 2016-10-12 08:40:43 UTC (rev 207194)
+++ branches/safari-602-branch/Source/WebCore/html/shadow/YouTubeEmbedShadowElement.cpp 2016-10-12 08:40:49 UTC (rev 207195)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2012, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2012-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "YouTubeEmbedShadowElement.h"
</span><span class="cx">
</span><del>-#include "HTMLEmbedElement.h"
</del><ins>+#include "RenderBlockFlow.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -39,11 +39,11 @@
</span><span class="cx"> : HTMLDivElement(HTMLNames::divTag, document)
</span><span class="cx"> {
</span><span class="cx"> setPseudo(AtomicString("-webkit-plugin-replacement", AtomicString::ConstructFromLiteral));
</span><ins>+}
</ins><span class="cx">
</span><del>- setInlineStyleProperty(CSSPropertyDisplay, CSSValueInlineBlock);
- setInlineStyleProperty(CSSPropertyPosition, CSSValueRelative);
- setInlineStyleProperty(CSSPropertyWidth, CSSValue100);
- setInlineStyleProperty(CSSPropertyHeight, CSSValue100);
</del><ins>+RenderPtr<RenderElement> YouTubeEmbedShadowElement::createElementRenderer(RenderStyle&& style, const RenderTreePosition&)
+{
+ return createRenderer<RenderBlockFlow>(*this, WTFMove(style));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCorehtmlshadowYouTubeEmbedShadowElementh"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/html/shadow/YouTubeEmbedShadowElement.h (207194 => 207195)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/html/shadow/YouTubeEmbedShadowElement.h 2016-10-12 08:40:43 UTC (rev 207194)
+++ branches/safari-602-branch/Source/WebCore/html/shadow/YouTubeEmbedShadowElement.h 2016-10-12 08:40:49 UTC (rev 207195)
</span><span class="lines">@@ -35,6 +35,8 @@
</span><span class="cx"> public:
</span><span class="cx"> static Ref<YouTubeEmbedShadowElement> create(Document&);
</span><span class="cx">
</span><ins>+ RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) final;
+
</ins><span class="cx"> private:
</span><span class="cx"> YouTubeEmbedShadowElement(Document&);
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>