<!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>[207280] trunk</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/207280">207280</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2016-10-13 02:22:38 -0700 (Thu, 13 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Support scoped style for user agent shadow trees
https://bugs.webkit.org/show_bug.cgi?id=163212
<rdar://problem/28715318>
Reviewed by Ryosuke Niwa and Andreas Kling.
Source/WebCore:
This patch adds support for user agent shadow trees that have scoped style. This means
that the shadows can be styled via <style> elements contained in the tree instead of
using pseudo elements on the global UA sheet. Since the style is scoped it can use
normal id and class selectors.
Elements in the shadow tree can still be exposed for author styling if needed by giving
them pseudo ids
The patch also uses the new mechanism for the <meter> element.
The mechanism is not optimized yet, each shadow tree gets its own copy of style-related data
structures. This can be improved later.
* CMakeLists.txt:
* DerivedSources.make:
* WebCore.xcodeproj/project.pbxproj:
* css/ElementRuleCollector.cpp:
(WebCore::MatchRequest::MatchRequest):
(WebCore::ElementRuleCollector::addMatchedRule):
(WebCore::ElementRuleCollector::matchAuthorShadowPseudoElementRules):
Make treeContextOrdinal an int so we can use negative ordinals. This is used to allow author pseudo
elements from earlier tree context to win over the shadow tree (matching CSS scoping spec language).
* css/ElementRuleCollector.h:
* css/StyleResolver.cpp:
(WebCore::StyleResolver::MatchResult::addMatchedProperties):
(WebCore::StyleResolver::CascadedProperties::addImportantMatches):
* css/StyleResolver.h:
* css/html.css:
(meter::-webkit-meter-inner-element): Deleted.
(meter::-webkit-meter-bar): Deleted.
(meter::-webkit-meter-optimum-value): Deleted.
(meter::-webkit-meter-suboptimum-value): Deleted.
(meter::-webkit-meter-even-less-good-value): Deleted.
Remove meter pseudo elements from the UA sheet.
* html/HTMLMeterElement.cpp:
(WebCore::HTMLMeterElement::childShouldCreateRenderer):
Don't create shadow renderers when we have appearance (are using RenderMeter).
(WebCore::setValueClass):
Move this logic here from MeterShadowElement.cpp.
Set both class and pseudo id. The latter is needed to keep author styling working.
(WebCore::HTMLMeterElement::didElementStateChange):
(WebCore::HTMLMeterElement::renderMeter):
RenderMeter is now only instantiated when appearance is enabled.
(WebCore::HTMLMeterElement::didAddUserAgentShadowRoot):
Build the shadow tree out of <div>s instead of special shadow elements.
* html/HTMLMeterElement.h:
* html/shadow/MeterShadowElement.cpp: Removed.
* html/shadow/MeterShadowElement.h: Removed.
Not needed anymore.
* html/shadow/meterElementShadow.css: Added.
(div#inner):
(div#bar):
(div#value):
(div#value.optimum):
(div#value.suboptimum):
(div#value.even-less-good):
Stylesheet for meter element shadow tree using normal id and class selectors.
* style/StyleScope.cpp:
(WebCore::Style::Scope::shouldUseSharedUserAgentShadowTreeStyleResolver):
Switch to per-scope style resolver for UA shadow trees if there is stylesheets in the tree.
(WebCore::Style::Scope::resolver):
(WebCore::Style::Scope::resolverIfExists):
* style/StyleScope.h:
LayoutTests:
* fast/dom/HTMLMeterElement/meter-clone-expected.txt:
* fast/dom/HTMLMeterElement/meter-clone.html:
* fast/dom/HTMLMeterElement/meter-element-markup-expected.txt:
* platform/mac/fast/dom/HTMLMeterElement/meter-element-repaint-on-update-value-expected.txt:
* platform/mac/fast/dom/HTMLMeterElement/meter-styles-changing-pseudo-expected.txt:
* platform/mac/fast/dom/HTMLMeterElement/meter-styles-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastdomHTMLMeterElementmetercloneexpectedtxt">trunk/LayoutTests/fast/dom/HTMLMeterElement/meter-clone-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomHTMLMeterElementmeterclonehtml">trunk/LayoutTests/fast/dom/HTMLMeterElement/meter-clone.html</a></li>
<li><a href="#trunkLayoutTestsfastdomHTMLMeterElementmeterelementmarkupexpectedtxt">trunk/LayoutTests/fast/dom/HTMLMeterElement/meter-element-markup-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorfastdomHTMLMeterElementmeterappearancescapacityexpectedtxt">trunk/LayoutTests/platform/ios-simulator/fast/dom/HTMLMeterElement/meter-appearances-capacity-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorfastdomHTMLMeterElementmeterappearancesratingrelevancyexpectedtxt">trunk/LayoutTests/platform/ios-simulator/fast/dom/HTMLMeterElement/meter-appearances-rating-relevancy-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorfastdomHTMLMeterElementmeterboundaryvaluesexpectedtxt">trunk/LayoutTests/platform/ios-simulator/fast/dom/HTMLMeterElement/meter-boundary-values-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorfastdomHTMLMeterElementmeterelementrepaintonupdatevalueexpectedtxt">trunk/LayoutTests/platform/ios-simulator/fast/dom/HTMLMeterElement/meter-element-repaint-on-update-value-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorfastdomHTMLMeterElementmeteroptimumsexpectedtxt">trunk/LayoutTests/platform/ios-simulator/fast/dom/HTMLMeterElement/meter-optimums-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorfastdomHTMLMeterElementmeterstyleschangingpseudoexpectedtxt">trunk/LayoutTests/platform/ios-simulator/fast/dom/HTMLMeterElement/meter-styles-changing-pseudo-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorfastdomHTMLMeterElementmeterstylesexpectedtxt">trunk/LayoutTests/platform/ios-simulator/fast/dom/HTMLMeterElement/meter-styles-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastdomHTMLMeterElementmeterelementrepaintonupdatevalueexpectedtxt">trunk/LayoutTests/platform/mac/fast/dom/HTMLMeterElement/meter-element-repaint-on-update-value-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastdomHTMLMeterElementmeterstyleschangingpseudoexpectedtxt">trunk/LayoutTests/platform/mac/fast/dom/HTMLMeterElement/meter-styles-changing-pseudo-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastdomHTMLMeterElementmeterstylesexpectedtxt">trunk/LayoutTests/platform/mac/fast/dom/HTMLMeterElement/meter-styles-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreDerivedSourcesmake">trunk/Source/WebCore/DerivedSources.make</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorecssElementRuleCollectorcpp">trunk/Source/WebCore/css/ElementRuleCollector.cpp</a></li>
<li><a href="#trunkSourceWebCorecssElementRuleCollectorh">trunk/Source/WebCore/css/ElementRuleCollector.h</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolverh">trunk/Source/WebCore/css/StyleResolver.h</a></li>
<li><a href="#trunkSourceWebCorecsshtmlcss">trunk/Source/WebCore/css/html.css</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMeterElementcpp">trunk/Source/WebCore/html/HTMLMeterElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMeterElementh">trunk/Source/WebCore/html/HTMLMeterElement.h</a></li>
<li><a href="#trunkSourceWebCorestyleStyleScopecpp">trunk/Source/WebCore/style/StyleScope.cpp</a></li>
<li><a href="#trunkSourceWebCorestyleStyleScopeh">trunk/Source/WebCore/style/StyleScope.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsplatformiossimulatorfastdomHTMLMeterElementmeterelementexpectedtxt">trunk/LayoutTests/platform/ios-simulator/fast/dom/HTMLMeterElement/meter-element-expected.txt</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowmeterElementShadowcss">trunk/Source/WebCore/html/shadow/meterElementShadow.css</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastdomHTMLMeterElementmeterelementexpectedtxt">trunk/LayoutTests/fast/dom/HTMLMeterElement/meter-element-expected.txt</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowMeterShadowElementcpp">trunk/Source/WebCore/html/shadow/MeterShadowElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowMeterShadowElementh">trunk/Source/WebCore/html/shadow/MeterShadowElement.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (207279 => 207280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-10-13 05:23:53 UTC (rev 207279)
+++ trunk/LayoutTests/ChangeLog 2016-10-13 09:22:38 UTC (rev 207280)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-10-13 Antti Koivisto <antti@apple.com>
+
+ Support scoped style for user agent shadow trees
+ https://bugs.webkit.org/show_bug.cgi?id=163212
+ <rdar://problem/28715318>
+
+ Reviewed by Ryosuke Niwa and Andreas Kling.
+
+ * fast/dom/HTMLMeterElement/meter-clone-expected.txt:
+ * fast/dom/HTMLMeterElement/meter-clone.html:
+ * fast/dom/HTMLMeterElement/meter-element-markup-expected.txt:
+ * platform/mac/fast/dom/HTMLMeterElement/meter-element-repaint-on-update-value-expected.txt:
+ * platform/mac/fast/dom/HTMLMeterElement/meter-styles-changing-pseudo-expected.txt:
+ * platform/mac/fast/dom/HTMLMeterElement/meter-styles-expected.txt:
+
</ins><span class="cx"> 2016-10-12 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Update WebKitMediaKeyMessageEvent / WebKitMediaKeyNeededEvent to stop using legacy [ConstructorTemplate=Event]
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomHTMLMeterElementmetercloneexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/HTMLMeterElement/meter-clone-expected.txt (207279 => 207280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/HTMLMeterElement/meter-clone-expected.txt 2016-10-13 05:23:53 UTC (rev 207279)
+++ trunk/LayoutTests/fast/dom/HTMLMeterElement/meter-clone-expected.txt 2016-10-13 09:22:38 UTC (rev 207280)
</span><span class="lines">@@ -1,9 +1,9 @@
</span><span class="cx"> PASS cloned.value is target.value
</span><del>-PASS internals.shadowPseudoId(clonedShadowRoot.firstChild) is internals.shadowPseudoId(targetShadowRoot.firstChild)
-PASS internals.shadowPseudoId(clonedShadowRoot.firstChild.firstChild) is internals.shadowPseudoId(targetShadowRoot.firstChild.firstChild)
-PASS internals.shadowPseudoId(clonedShadowRoot.firstChild.firstChild.firstChild) is internals.shadowPseudoId(targetShadowRoot.firstChild.firstChild.firstChild)
-PASS clonedShadowRoot.firstChild.firstChild.firstChild.style.width is "70%"
-PASS targetShadowRoot.firstChild.firstChild.firstChild.style.width is "50%"
</del><ins>+PASS internals.shadowPseudoId(clonedInnerElement) is internals.shadowPseudoId(targetInnerElement)
+PASS internals.shadowPseudoId(clonedInnerElement.firstChild) is internals.shadowPseudoId(targetInnerElement.firstChild)
+PASS internals.shadowPseudoId(clonedInnerElement.firstChild.firstChild) is internals.shadowPseudoId(targetInnerElement.firstChild.firstChild)
+PASS clonedInnerElement.firstChild.firstChild.style.width is "70%"
+PASS targetInnerElement.firstChild.firstChild.style.width is "50%"
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomHTMLMeterElementmeterclonehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/HTMLMeterElement/meter-clone.html (207279 => 207280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/HTMLMeterElement/meter-clone.html 2016-10-13 05:23:53 UTC (rev 207279)
+++ trunk/LayoutTests/fast/dom/HTMLMeterElement/meter-clone.html 2016-10-13 09:22:38 UTC (rev 207280)
</span><span class="lines">@@ -17,15 +17,17 @@
</span><span class="cx">
</span><span class="cx"> targetShadowRoot = internals.shadowRoot(target);
</span><span class="cx"> clonedShadowRoot = internals.shadowRoot(cloned);
</span><del>-
</del><ins>+ targetInnerElement = targetShadowRoot.querySelector("#inner");
+ clonedInnerElement = clonedShadowRoot.querySelector("#inner");
+
</ins><span class="cx"> shouldBe("cloned.value", "target.value");
</span><del>- shouldBe("internals.shadowPseudoId(clonedShadowRoot.firstChild)", "internals.shadowPseudoId(targetShadowRoot.firstChild)");
- shouldBe("internals.shadowPseudoId(clonedShadowRoot.firstChild.firstChild)", "internals.shadowPseudoId(targetShadowRoot.firstChild.firstChild)");
- shouldBe("internals.shadowPseudoId(clonedShadowRoot.firstChild.firstChild.firstChild)", "internals.shadowPseudoId(targetShadowRoot.firstChild.firstChild.firstChild)");
</del><ins>+ shouldBe("internals.shadowPseudoId(clonedInnerElement)", "internals.shadowPseudoId(targetInnerElement)");
+ shouldBe("internals.shadowPseudoId(clonedInnerElement.firstChild)", "internals.shadowPseudoId(targetInnerElement.firstChild)");
+ shouldBe("internals.shadowPseudoId(clonedInnerElement.firstChild.firstChild)", "internals.shadowPseudoId(targetInnerElement.firstChild.firstChild)");
</ins><span class="cx">
</span><span class="cx"> cloned.value = 70;
</span><del>- shouldBe("clonedShadowRoot.firstChild.firstChild.firstChild.style.width", '"70%"');
- shouldBe("targetShadowRoot.firstChild.firstChild.firstChild.style.width", '"50%"');
</del><ins>+ shouldBe("clonedInnerElement.firstChild.firstChild.style.width", '"70%"');
+ shouldBe("targetInnerElement.firstChild.firstChild.style.width", '"50%"');
</ins><span class="cx"> })();
</span><span class="cx"> </script>
</span><span class="cx"> <script src="../../../resources/js-test-post.js"></script>
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomHTMLMeterElementmeterelementexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/dom/HTMLMeterElement/meter-element-expected.txt (207279 => 207280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/HTMLMeterElement/meter-element-expected.txt 2016-10-13 05:23:53 UTC (rev 207279)
+++ trunk/LayoutTests/fast/dom/HTMLMeterElement/meter-element-expected.txt 2016-10-13 09:22:38 UTC (rev 207280)
</span><span class="lines">@@ -1,14 +0,0 @@
</span><del>-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {METER} at (0,43) size 80x17
- RenderMeter {DIV} at (0,0) size 80x16
- RenderBlock {DIV} at (0,0) size 80x16
- RenderBlock {DIV} at (0,0) size 18x16
- RenderBlock {METER} at (80,-1) size 10x61
- RenderMeter {DIV} at (0,0) size 10x60
- RenderBlock {DIV} at (0,0) size 10x60
- RenderBlock {DIV} at (0,0) size 7x60
- RenderText {#text} at (0,0) size 0x0
</del></span></pre></div>
<a id="trunkLayoutTestsfastdomHTMLMeterElementmeterelementmarkupexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/HTMLMeterElement/meter-element-markup-expected.txt (207279 => 207280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/HTMLMeterElement/meter-element-markup-expected.txt 2016-10-13 05:23:53 UTC (rev 207279)
+++ trunk/LayoutTests/fast/dom/HTMLMeterElement/meter-element-markup-expected.txt 2016-10-13 09:22:38 UTC (rev 207280)
</span><span class="lines">@@ -6,13 +6,19 @@
</span><span class="cx"> | max="100"
</span><span class="cx"> | value="70"
</span><span class="cx"> | <shadow:root>
</span><ins>+| <style>
+| "div#inner { -webkit-appearance: inherit; box-sizing: inherit; height: 100%; width: 100%; } div#bar { background: -webkit-gradient(linear, left top, left bottom, from(#ddd), to(#ddd), color-stop(0.20, #eee), color-stop(0.45, #ccc), color-stop(0.55, #ccc)); height: 100%; width: 100%; box-sizing: border-box; } div#value { height: 100%; box-sizing: border-box; } div#value.optimum { background: -webkit-gradient(linear, left top, left bottom, from(#ad7), to(#ad7), color-stop(0.20, #cea), color-stop(0.45, #7a3), color-stop(0.55, #7a3)); } div#value.suboptimum { background: -webkit-gradient(linear, left top, left bottom, from(#fe7), to(#fe7), color-stop(0.20, #ffc), color-stop(0.45, #db3), color-stop(0.55, #db3)); height: 100%; box-sizing: border-box; } div#value.even-less-good { background: -webkit-gradient(linear, left top, left bottom, from(#f77), to(#f77), color-stop(0.20, #fcc), color-stop(0.45, #d44), color-stop(0.55, #d44)); height: 100%; box-sizing: border-box;
"
</ins><span class="cx"> | <div>
</span><ins>+| id="inner"
</ins><span class="cx"> | pseudo="-webkit-meter-inner-element"
</span><span class="cx"> | shadow:pseudoId="-webkit-meter-inner-element"
</span><span class="cx"> | <div>
</span><ins>+| id="bar"
</ins><span class="cx"> | pseudo="-webkit-meter-bar"
</span><span class="cx"> | shadow:pseudoId="-webkit-meter-bar"
</span><span class="cx"> | <div>
</span><ins>+| class="optimum"
+| id="value"
</ins><span class="cx"> | pseudo="-webkit-meter-optimum-value"
</span><span class="cx"> | style="width: 70%;"
</span><span class="cx"> | shadow:pseudoId="-webkit-meter-optimum-value"
</span><span class="lines">@@ -26,13 +32,19 @@
</span><span class="cx"> | optimum="5"
</span><span class="cx"> | value="10"
</span><span class="cx"> | <shadow:root>
</span><ins>+| <style>
+| "div#inner { -webkit-appearance: inherit; box-sizing: inherit; height: 100%; width: 100%; } div#bar { background: -webkit-gradient(linear, left top, left bottom, from(#ddd), to(#ddd), color-stop(0.20, #eee), color-stop(0.45, #ccc), color-stop(0.55, #ccc)); height: 100%; width: 100%; box-sizing: border-box; } div#value { height: 100%; box-sizing: border-box; } div#value.optimum { background: -webkit-gradient(linear, left top, left bottom, from(#ad7), to(#ad7), color-stop(0.20, #cea), color-stop(0.45, #7a3), color-stop(0.55, #7a3)); } div#value.suboptimum { background: -webkit-gradient(linear, left top, left bottom, from(#fe7), to(#fe7), color-stop(0.20, #ffc), color-stop(0.45, #db3), color-stop(0.55, #db3)); height: 100%; box-sizing: border-box; } div#value.even-less-good { background: -webkit-gradient(linear, left top, left bottom, from(#f77), to(#f77), color-stop(0.20, #fcc), color-stop(0.45, #d44), color-stop(0.55, #d44)); height: 100%; box-sizing: border-box;
"
</ins><span class="cx"> | <div>
</span><ins>+| id="inner"
</ins><span class="cx"> | pseudo="-webkit-meter-inner-element"
</span><span class="cx"> | shadow:pseudoId="-webkit-meter-inner-element"
</span><span class="cx"> | <div>
</span><ins>+| id="bar"
</ins><span class="cx"> | pseudo="-webkit-meter-bar"
</span><span class="cx"> | shadow:pseudoId="-webkit-meter-bar"
</span><span class="cx"> | <div>
</span><ins>+| class="suboptimum"
+| id="value"
</ins><span class="cx"> | pseudo="-webkit-meter-suboptimum-value"
</span><span class="cx"> | style="width: 100%;"
</span><span class="cx"> | shadow:pseudoId="-webkit-meter-suboptimum-value"
</span><span class="lines">@@ -46,13 +58,19 @@
</span><span class="cx"> | optimum="0"
</span><span class="cx"> | value="10"
</span><span class="cx"> | <shadow:root>
</span><ins>+| <style>
+| "div#inner { -webkit-appearance: inherit; box-sizing: inherit; height: 100%; width: 100%; } div#bar { background: -webkit-gradient(linear, left top, left bottom, from(#ddd), to(#ddd), color-stop(0.20, #eee), color-stop(0.45, #ccc), color-stop(0.55, #ccc)); height: 100%; width: 100%; box-sizing: border-box; } div#value { height: 100%; box-sizing: border-box; } div#value.optimum { background: -webkit-gradient(linear, left top, left bottom, from(#ad7), to(#ad7), color-stop(0.20, #cea), color-stop(0.45, #7a3), color-stop(0.55, #7a3)); } div#value.suboptimum { background: -webkit-gradient(linear, left top, left bottom, from(#fe7), to(#fe7), color-stop(0.20, #ffc), color-stop(0.45, #db3), color-stop(0.55, #db3)); height: 100%; box-sizing: border-box; } div#value.even-less-good { background: -webkit-gradient(linear, left top, left bottom, from(#f77), to(#f77), color-stop(0.20, #fcc), color-stop(0.45, #d44), color-stop(0.55, #d44)); height: 100%; box-sizing: border-box;
"
</ins><span class="cx"> | <div>
</span><ins>+| id="inner"
</ins><span class="cx"> | pseudo="-webkit-meter-inner-element"
</span><span class="cx"> | shadow:pseudoId="-webkit-meter-inner-element"
</span><span class="cx"> | <div>
</span><ins>+| id="bar"
</ins><span class="cx"> | pseudo="-webkit-meter-bar"
</span><span class="cx"> | shadow:pseudoId="-webkit-meter-bar"
</span><span class="cx"> | <div>
</span><ins>+| class="even-less-good"
+| id="value"
</ins><span class="cx"> | pseudo="-webkit-meter-even-less-good-value"
</span><span class="cx"> | style="width: 100%;"
</span><span class="cx"> | shadow:pseudoId="-webkit-meter-even-less-good-value"
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorfastdomHTMLMeterElementmeterappearancescapacityexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/fast/dom/HTMLMeterElement/meter-appearances-capacity-expected.txt (207279 => 207280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/fast/dom/HTMLMeterElement/meter-appearances-capacity-expected.txt 2016-10-13 05:23:53 UTC (rev 207279)
+++ trunk/LayoutTests/platform/ios-simulator/fast/dom/HTMLMeterElement/meter-appearances-capacity-expected.txt 2016-10-13 09:22:38 UTC (rev 207280)
</span><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 88x19
</span><span class="cx"> text run at (0,0) width 88: "value=10/10:"
</span><span class="cx"> RenderBlock (floating) {METER} at (664,0) size 80x16
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderListItem {LI} at (40,20) size 744x20 [bgcolor=#CCCCCC]
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 80x19
</span><span class="cx"> text run at (0,0) width 80: "value=8/10:"
</span><span class="cx"> RenderBlock (floating) {METER} at (664,0) size 80x16
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 64x16
</span><span class="cx"> RenderListItem {LI} at (40,40) size 744x20 [bgcolor=#EEEEEE]
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 80x19
</span><span class="cx"> text run at (0,0) width 80: "value=5/10:"
</span><span class="cx"> RenderBlock (floating) {METER} at (664,0) size 80x16
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 40x16
</span><span class="cx"> RenderListItem {LI} at (40,60) size 744x20 [bgcolor=#CCCCCC]
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 80x19
</span><span class="cx"> text run at (0,0) width 80: "value=2/10:"
</span><span class="cx"> RenderBlock (floating) {METER} at (664,0) size 80x16
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 16x16
</span><span class="cx"> RenderListItem {LI} at (40,80) size 744x20 [bgcolor=#EEEEEE]
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 80x19
</span><span class="cx"> text run at (0,0) width 80: "value=0/10:"
</span><span class="cx"> RenderBlock (floating) {METER} at (664,0) size 80x16
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 0x16
</span><span class="cx"> RenderListItem {LI} at (40,100) size 744x20 [bgcolor=#CCCCCC]
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 38x19
</span><span class="cx"> text run at (0,0) width 38: "RTL:"
</span><span class="cx"> RenderBlock (floating) {METER} at (664,0) size 80x16
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (40,0) size 40x16
</span><span class="cx"> RenderListItem {LI} at (40,120) size 744x50 [bgcolor=#EEEEEE]
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 32x19
</span><span class="cx"> text run at (0,0) width 32: "Tall:"
</span><span class="cx"> RenderBlock (floating) {METER} at (664,0) size 80x50
</span><del>- RenderMeter {DIV} at (0,0) size 80x50
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x50
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x50
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 40x50
</span><span class="cx"> RenderListItem {LI} at (40,170) size 744x20 [bgcolor=#CCCCCC]
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 44x19
</span><span class="cx"> text run at (0,0) width 44: "Short:"
</span><span class="cx"> RenderBlock (floating) {METER} at (664,0) size 80x5
</span><del>- RenderMeter {DIV} at (0,0) size 80x5
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x5
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x5
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 24x5
</span><span class="cx"> RenderListItem {LI} at (40,190) size 744x20 [bgcolor=#EEEEEE]
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 42x19
</span><span class="cx"> text run at (0,0) width 42: "Wide:"
</span><span class="cx"> RenderBlock (floating) {METER} at (444,0) size 300x16
</span><del>- RenderMeter {DIV} at (0,0) size 300x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 300x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 300x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 150x16
</span><span class="cx"> RenderListItem {LI} at (40,210) size 744x20 [bgcolor=#CCCCCC]
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 59x19
</span><span class="cx"> text run at (0,0) width 59: "Narrow:"
</span><span class="cx"> RenderBlock (floating) {METER} at (714,0) size 30x16
</span><del>- RenderMeter {DIV} at (0,0) size 30x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 30x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 30x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 15x16
</span><span class="cx"> RenderBlock {H2} at (0,315) size 784x21
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 88x19
</span><span class="cx"> text run at (0,0) width 88: "value=10/10:"
</span><span class="cx"> RenderBlock (floating) {METER} at (664,0) size 80x16
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderListItem {LI} at (40,20) size 744x20 [bgcolor=#CCCCCC]
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 80x19
</span><span class="cx"> text run at (0,0) width 80: "value=8/10:"
</span><span class="cx"> RenderBlock (floating) {METER} at (664,0) size 80x16
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 64x16
</span><span class="cx"> RenderListItem {LI} at (40,40) size 744x20 [bgcolor=#EEEEEE]
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 80x19
</span><span class="cx"> text run at (0,0) width 80: "value=5/10:"
</span><span class="cx"> RenderBlock (floating) {METER} at (664,0) size 80x16
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 40x16
</span><span class="cx"> RenderListItem {LI} at (40,60) size 744x20 [bgcolor=#CCCCCC]
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 80x19
</span><span class="cx"> text run at (0,0) width 80: "value=2/10:"
</span><span class="cx"> RenderBlock (floating) {METER} at (664,0) size 80x16
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 16x16
</span><span class="cx"> RenderListItem {LI} at (40,80) size 744x20 [bgcolor=#EEEEEE]
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 80x19
</span><span class="cx"> text run at (0,0) width 80: "value=0/10:"
</span><span class="cx"> RenderBlock (floating) {METER} at (664,0) size 80x16
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 0x16
</span><span class="cx"> RenderListItem {LI} at (40,100) size 744x20 [bgcolor=#CCCCCC]
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 38x19
</span><span class="cx"> text run at (0,0) width 38: "RTL:"
</span><span class="cx"> RenderBlock (floating) {METER} at (664,0) size 80x16
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (40,0) size 40x16
</span><span class="cx"> RenderListItem {LI} at (40,120) size 744x50 [bgcolor=#EEEEEE]
</span><span class="lines">@@ -149,7 +149,7 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 32x19
</span><span class="cx"> text run at (0,0) width 32: "Tall:"
</span><span class="cx"> RenderBlock (floating) {METER} at (664,0) size 80x50
</span><del>- RenderMeter {DIV} at (0,0) size 80x50
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x50
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x50
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 40x50
</span><span class="cx"> RenderListItem {LI} at (40,170) size 744x20 [bgcolor=#CCCCCC]
</span><span class="lines">@@ -157,7 +157,7 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 44x19
</span><span class="cx"> text run at (0,0) width 44: "Short:"
</span><span class="cx"> RenderBlock (floating) {METER} at (664,0) size 80x5
</span><del>- RenderMeter {DIV} at (0,0) size 80x5
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x5
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x5
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 24x5
</span><span class="cx"> RenderListItem {LI} at (40,190) size 744x20 [bgcolor=#EEEEEE]
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 42x19
</span><span class="cx"> text run at (0,0) width 42: "Wide:"
</span><span class="cx"> RenderBlock (floating) {METER} at (444,0) size 300x16
</span><del>- RenderMeter {DIV} at (0,0) size 300x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 300x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 300x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 150x16
</span><span class="cx"> RenderListItem {LI} at (40,210) size 744x20 [bgcolor=#CCCCCC]
</span><span class="lines">@@ -173,6 +173,6 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 59x19
</span><span class="cx"> text run at (0,0) width 59: "Narrow:"
</span><span class="cx"> RenderBlock (floating) {METER} at (714,0) size 30x16
</span><del>- RenderMeter {DIV} at (0,0) size 30x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 30x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 30x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 15x16
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorfastdomHTMLMeterElementmeterappearancesratingrelevancyexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/fast/dom/HTMLMeterElement/meter-appearances-rating-relevancy-expected.txt (207279 => 207280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/fast/dom/HTMLMeterElement/meter-appearances-rating-relevancy-expected.txt 2016-10-13 05:23:53 UTC (rev 207279)
+++ trunk/LayoutTests/platform/ios-simulator/fast/dom/HTMLMeterElement/meter-appearances-rating-relevancy-expected.txt 2016-10-13 09:22:38 UTC (rev 207280)
</span><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 88x19
</span><span class="cx"> text run at (0,0) width 88: "value=10/10:"
</span><span class="cx"> RenderBlock (floating) {METER} at (664,0) size 80x16
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderListItem {LI} at (40,20) size 744x20 [bgcolor=#CCCCCC]
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 80x19
</span><span class="cx"> text run at (0,0) width 80: "value=8/10:"
</span><span class="cx"> RenderBlock (floating) {METER} at (664,0) size 80x16
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 64x16
</span><span class="cx"> RenderListItem {LI} at (40,40) size 744x20 [bgcolor=#EEEEEE]
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 80x19
</span><span class="cx"> text run at (0,0) width 80: "value=5/10:"
</span><span class="cx"> RenderBlock (floating) {METER} at (664,0) size 80x16
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 40x16
</span><span class="cx"> RenderListItem {LI} at (40,60) size 744x20 [bgcolor=#CCCCCC]
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 80x19
</span><span class="cx"> text run at (0,0) width 80: "value=2/10:"
</span><span class="cx"> RenderBlock (floating) {METER} at (664,0) size 80x16
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 16x16
</span><span class="cx"> RenderListItem {LI} at (40,80) size 744x20 [bgcolor=#EEEEEE]
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 80x19
</span><span class="cx"> text run at (0,0) width 80: "value=0/10:"
</span><span class="cx"> RenderBlock (floating) {METER} at (664,0) size 80x16
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 0x16
</span><span class="cx"> RenderListItem {LI} at (40,100) size 744x20 [bgcolor=#CCCCCC]
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 38x19
</span><span class="cx"> text run at (0,0) width 38: "RTL:"
</span><span class="cx"> RenderBlock (floating) {METER} at (664,0) size 80x16
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (40,0) size 40x16
</span><span class="cx"> RenderListItem {LI} at (40,120) size 744x50 [bgcolor=#EEEEEE]
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 32x19
</span><span class="cx"> text run at (0,0) width 32: "Tall:"
</span><span class="cx"> RenderBlock (floating) {METER} at (664,0) size 80x50
</span><del>- RenderMeter {DIV} at (0,0) size 80x50
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x50
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x50
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 40x50
</span><span class="cx"> RenderListItem {LI} at (40,170) size 744x20 [bgcolor=#CCCCCC]
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 44x19
</span><span class="cx"> text run at (0,0) width 44: "Short:"
</span><span class="cx"> RenderBlock (floating) {METER} at (664,0) size 80x5
</span><del>- RenderMeter {DIV} at (0,0) size 80x5
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x5
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x5
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 24x5
</span><span class="cx"> RenderListItem {LI} at (40,190) size 744x20 [bgcolor=#EEEEEE]
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 42x19
</span><span class="cx"> text run at (0,0) width 42: "Wide:"
</span><span class="cx"> RenderBlock (floating) {METER} at (444,0) size 300x16
</span><del>- RenderMeter {DIV} at (0,0) size 300x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 300x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 300x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 150x16
</span><span class="cx"> RenderListItem {LI} at (40,210) size 744x20 [bgcolor=#CCCCCC]
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 59x19
</span><span class="cx"> text run at (0,0) width 59: "Narrow:"
</span><span class="cx"> RenderBlock (floating) {METER} at (714,0) size 30x16
</span><del>- RenderMeter {DIV} at (0,0) size 30x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 30x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 30x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 15x16
</span><span class="cx"> RenderBlock {H2} at (0,315) size 784x21
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 88x19
</span><span class="cx"> text run at (0,0) width 88: "value=10/10:"
</span><span class="cx"> RenderBlock (floating) {METER} at (664,0) size 80x16
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderListItem {LI} at (40,20) size 744x20 [bgcolor=#CCCCCC]
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 80x19
</span><span class="cx"> text run at (0,0) width 80: "value=8/10:"
</span><span class="cx"> RenderBlock (floating) {METER} at (664,0) size 80x16
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 64x16
</span><span class="cx"> RenderListItem {LI} at (40,40) size 744x20 [bgcolor=#EEEEEE]
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 80x19
</span><span class="cx"> text run at (0,0) width 80: "value=5/10:"
</span><span class="cx"> RenderBlock (floating) {METER} at (664,0) size 80x16
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 40x16
</span><span class="cx"> RenderListItem {LI} at (40,60) size 744x20 [bgcolor=#CCCCCC]
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 80x19
</span><span class="cx"> text run at (0,0) width 80: "value=2/10:"
</span><span class="cx"> RenderBlock (floating) {METER} at (664,0) size 80x16
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 16x16
</span><span class="cx"> RenderListItem {LI} at (40,80) size 744x20 [bgcolor=#EEEEEE]
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 80x19
</span><span class="cx"> text run at (0,0) width 80: "value=0/10:"
</span><span class="cx"> RenderBlock (floating) {METER} at (664,0) size 80x16
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 0x16
</span><span class="cx"> RenderListItem {LI} at (40,100) size 744x20 [bgcolor=#CCCCCC]
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 38x19
</span><span class="cx"> text run at (0,0) width 38: "RTL:"
</span><span class="cx"> RenderBlock (floating) {METER} at (664,0) size 80x16
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (40,0) size 40x16
</span><span class="cx"> RenderListItem {LI} at (40,120) size 744x50 [bgcolor=#EEEEEE]
</span><span class="lines">@@ -149,7 +149,7 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 32x19
</span><span class="cx"> text run at (0,0) width 32: "Tall:"
</span><span class="cx"> RenderBlock (floating) {METER} at (664,0) size 80x50
</span><del>- RenderMeter {DIV} at (0,0) size 80x50
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x50
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x50
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 40x50
</span><span class="cx"> RenderListItem {LI} at (40,170) size 744x20 [bgcolor=#CCCCCC]
</span><span class="lines">@@ -157,7 +157,7 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 44x19
</span><span class="cx"> text run at (0,0) width 44: "Short:"
</span><span class="cx"> RenderBlock (floating) {METER} at (664,0) size 80x5
</span><del>- RenderMeter {DIV} at (0,0) size 80x5
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x5
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x5
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 24x5
</span><span class="cx"> RenderListItem {LI} at (40,190) size 744x20 [bgcolor=#EEEEEE]
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 42x19
</span><span class="cx"> text run at (0,0) width 42: "Wide:"
</span><span class="cx"> RenderBlock (floating) {METER} at (444,0) size 300x16
</span><del>- RenderMeter {DIV} at (0,0) size 300x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 300x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 300x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 150x16
</span><span class="cx"> RenderListItem {LI} at (40,210) size 744x20 [bgcolor=#CCCCCC]
</span><span class="lines">@@ -173,6 +173,6 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 59x19
</span><span class="cx"> text run at (0,0) width 59: "Narrow:"
</span><span class="cx"> RenderBlock (floating) {METER} at (714,0) size 30x16
</span><del>- RenderMeter {DIV} at (0,0) size 30x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 30x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 30x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 15x16
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorfastdomHTMLMeterElementmeterboundaryvaluesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/fast/dom/HTMLMeterElement/meter-boundary-values-expected.txt (207279 => 207280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/fast/dom/HTMLMeterElement/meter-boundary-values-expected.txt 2016-10-13 05:23:53 UTC (rev 207279)
+++ trunk/LayoutTests/platform/ios-simulator/fast/dom/HTMLMeterElement/meter-boundary-values-expected.txt 2016-10-13 09:22:38 UTC (rev 207280)
</span><span class="lines">@@ -19,7 +19,7 @@
</span><span class="cx"> RenderText {#text} at (8,0) size 108x19
</span><span class="cx"> text run at (8,0) width 108: "|10,20,30,40,50: "
</span><span class="cx"> RenderBlock {METER} at (115,2) size 81x17
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 0x16
</span><span class="cx"> RenderListItem {LI} at (40,40) size 744x20
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> RenderText {#text} at (16,0) size 89x19
</span><span class="cx"> text run at (16,0) width 89: ",20,30,40,50: "
</span><span class="cx"> RenderBlock {METER} at (104,2) size 81x17
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 0x16
</span><span class="cx"> RenderListItem {LI} at (40,60) size 744x20
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> RenderText {#text} at (36,0) size 69x19
</span><span class="cx"> text run at (36,0) width 69: ",30,40,50: "
</span><span class="cx"> RenderBlock {METER} at (104,2) size 81x17
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 20x16
</span><span class="cx"> RenderText {#text} at (184,0) size 113x19
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> RenderText {#text} at (56,0) size 49x19
</span><span class="cx"> text run at (56,0) width 49: ",40,50: "
</span><span class="cx"> RenderBlock {METER} at (104,2) size 81x17
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 40x16
</span><span class="cx"> RenderText {#text} at (184,0) size 113x19
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> RenderText {#text} at (76,0) size 29x19
</span><span class="cx"> text run at (76,0) width 29: ",50: "
</span><span class="cx"> RenderBlock {METER} at (104,2) size 81x17
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 60x16
</span><span class="cx"> RenderText {#text} at (184,0) size 113x19
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> RenderText {#text} at (96,0) size 9x19
</span><span class="cx"> text run at (96,0) width 9: ": "
</span><span class="cx"> RenderBlock {METER} at (104,2) size 81x17
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderText {#text} at (184,0) size 121x19
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx"> RenderText {#text} at (115,0) size 9x19
</span><span class="cx"> text run at (115,0) width 9: ": "
</span><span class="cx"> RenderBlock {METER} at (123,2) size 81x17
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderText {#text} at (203,0) size 121x19
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> RenderText {#text} at (36,0) size 69x19
</span><span class="cx"> text run at (36,0) width 69: ",30,40,50: "
</span><span class="cx"> RenderBlock {METER} at (104,2) size 81x17
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 0x16
</span><span class="cx"> RenderListItem {LI} at (40,180) size 744x20
</span><span class="lines">@@ -131,7 +131,7 @@
</span><span class="cx"> RenderText {#text} at (76,0) size 29x19
</span><span class="cx"> text run at (76,0) width 29: ",40: "
</span><span class="cx"> RenderBlock {METER} at (104,2) size 81x17
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderText {#text} at (184,0) size 113x19
</span><span class="lines">@@ -144,7 +144,7 @@
</span><span class="cx"> RenderText {#text} at (8,0) size 108x19
</span><span class="cx"> text run at (8,0) width 108: "|10,10,10,20,30: "
</span><span class="cx"> RenderBlock {METER} at (115,2) size 81x17
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 0x16
</span><span class="cx"> RenderListItem {LI} at (40,220) size 744x20
</span><span class="lines">@@ -157,7 +157,7 @@
</span><span class="cx"> RenderText {#text} at (56,0) size 49x19
</span><span class="cx"> text run at (56,0) width 49: ",20,30: "
</span><span class="cx"> RenderBlock {METER} at (104,2) size 81x17
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 0x16
</span><span class="cx"> RenderListItem {LI} at (40,240) size 744x20
</span><span class="lines">@@ -170,7 +170,7 @@
</span><span class="cx"> RenderText {#text} at (56,0) size 49x19
</span><span class="cx"> text run at (56,0) width 49: ",30,30: "
</span><span class="cx"> RenderBlock {METER} at (104,2) size 81x17
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderText {#text} at (184,0) size 113x19
</span><span class="lines">@@ -185,7 +185,7 @@
</span><span class="cx"> RenderText {#text} at (115,0) size 9x19
</span><span class="cx"> text run at (115,0) width 9: ": "
</span><span class="cx"> RenderBlock {METER} at (123,2) size 81x17
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderText {#text} at (203,0) size 113x19
</span><span class="lines">@@ -200,7 +200,7 @@
</span><span class="cx"> RenderText {#text} at (56,0) size 49x19
</span><span class="cx"> text run at (56,0) width 49: ",20,30: "
</span><span class="cx"> RenderBlock {METER} at (104,2) size 81x17
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 40x16
</span><span class="cx"> RenderText {#text} at (184,0) size 113x19
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorfastdomHTMLMeterElementmeterelementexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/ios-simulator/fast/dom/HTMLMeterElement/meter-element-expected.txt (0 => 207280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/fast/dom/HTMLMeterElement/meter-element-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/ios-simulator/fast/dom/HTMLMeterElement/meter-element-expected.txt 2016-10-13 09:22:38 UTC (rev 207280)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x584
+ RenderBlock {METER} at (0,43) size 80x17
+ RenderBlock {DIV} at (0,0) size 80x16
+ RenderBlock {DIV} at (0,0) size 80x16
+ RenderBlock {DIV} at (0,0) size 18x16
+ RenderBlock {METER} at (80,-1) size 10x61
+ RenderBlock {DIV} at (0,0) size 10x60
+ RenderBlock {DIV} at (0,0) size 10x60
+ RenderBlock {DIV} at (0,0) size 7x60
+ RenderText {#text} at (0,0) size 0x0
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorfastdomHTMLMeterElementmeterelementrepaintonupdatevalueexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/fast/dom/HTMLMeterElement/meter-element-repaint-on-update-value-expected.txt (207279 => 207280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/fast/dom/HTMLMeterElement/meter-element-repaint-on-update-value-expected.txt 2016-10-13 05:23:53 UTC (rev 207279)
+++ trunk/LayoutTests/platform/ios-simulator/fast/dom/HTMLMeterElement/meter-element-repaint-on-update-value-expected.txt 2016-10-13 09:22:38 UTC (rev 207280)
</span><span class="lines">@@ -4,13 +4,13 @@
</span><span class="cx"> RenderBlock {HTML} at (0,0) size 800x600
</span><span class="cx"> RenderBody {BODY} at (8,8) size 784x584
</span><span class="cx"> RenderBlock {METER} at (0,2) size 80x17
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 40x16
</span><span class="cx"> RenderText {#text} at (80,0) size 4x19
</span><span class="cx"> text run at (80,0) width 4: " "
</span><span class="cx"> RenderBlock {METER} at (84,2) size 80x17
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 40x16
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorfastdomHTMLMeterElementmeteroptimumsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/fast/dom/HTMLMeterElement/meter-optimums-expected.txt (207279 => 207280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/fast/dom/HTMLMeterElement/meter-optimums-expected.txt 2016-10-13 05:23:53 UTC (rev 207279)
+++ trunk/LayoutTests/platform/ios-simulator/fast/dom/HTMLMeterElement/meter-optimums-expected.txt 2016-10-13 09:22:38 UTC (rev 207280)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 77x19
</span><span class="cx"> text run at (0,0) width 77: "value=150: "
</span><span class="cx"> RenderBlock {METER} at (76,2) size 81x17
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 20x16
</span><span class="cx"> RenderListItem {LI} at (40,20) size 744x20
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 77x19
</span><span class="cx"> text run at (0,0) width 77: "value=450: "
</span><span class="cx"> RenderBlock {METER} at (76,2) size 81x17
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 36x16
</span><span class="cx"> RenderListItem {LI} at (40,40) size 744x20
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 77x19
</span><span class="cx"> text run at (0,0) width 77: "value=750: "
</span><span class="cx"> RenderBlock {METER} at (76,2) size 81x17
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 60x16
</span><span class="cx"> RenderListItem {LI} at (40,60) size 744x20
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 61x19
</span><span class="cx"> text run at (0,0) width 61: "value=0: "
</span><span class="cx"> RenderBlock {METER} at (60,2) size 81x17
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 0x16
</span><span class="cx"> RenderListItem {LI} at (40,80) size 744x20
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 85x19
</span><span class="cx"> text run at (0,0) width 85: "value=1000: "
</span><span class="cx"> RenderBlock {METER} at (84,2) size 81x17
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {H2} at (0,269) size 784x31
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 77x19
</span><span class="cx"> text run at (0,0) width 77: "value=150: "
</span><span class="cx"> RenderBlock {METER} at (76,2) size 81x17
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 20x16
</span><span class="cx"> RenderListItem {LI} at (40,20) size 744x20
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 77x19
</span><span class="cx"> text run at (0,0) width 77: "value=450: "
</span><span class="cx"> RenderBlock {METER} at (76,2) size 81x17
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 36x16
</span><span class="cx"> RenderListItem {LI} at (40,40) size 744x20
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 77x19
</span><span class="cx"> text run at (0,0) width 77: "value=750: "
</span><span class="cx"> RenderBlock {METER} at (76,2) size 81x17
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 60x16
</span><span class="cx"> RenderListItem {LI} at (40,60) size 744x20
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 61x19
</span><span class="cx"> text run at (0,0) width 61: "value=0: "
</span><span class="cx"> RenderBlock {METER} at (60,2) size 81x17
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 0x16
</span><span class="cx"> RenderListItem {LI} at (40,80) size 744x20
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 85x19
</span><span class="cx"> text run at (0,0) width 85: "value=1000: "
</span><span class="cx"> RenderBlock {METER} at (84,2) size 81x17
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {H2} at (0,438) size 784x31
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 77x19
</span><span class="cx"> text run at (0,0) width 77: "value=150: "
</span><span class="cx"> RenderBlock {METER} at (76,2) size 81x17
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 20x16
</span><span class="cx"> RenderListItem {LI} at (40,20) size 744x20
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 77x19
</span><span class="cx"> text run at (0,0) width 77: "value=450: "
</span><span class="cx"> RenderBlock {METER} at (76,2) size 81x17
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 36x16
</span><span class="cx"> RenderListItem {LI} at (40,40) size 744x20
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 77x19
</span><span class="cx"> text run at (0,0) width 77: "value=750: "
</span><span class="cx"> RenderBlock {METER} at (76,2) size 81x17
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 60x16
</span><span class="cx"> RenderListItem {LI} at (40,60) size 744x20
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 61x19
</span><span class="cx"> text run at (0,0) width 61: "value=0: "
</span><span class="cx"> RenderBlock {METER} at (60,2) size 81x17
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 0x16
</span><span class="cx"> RenderListItem {LI} at (40,80) size 744x20
</span><span class="lines">@@ -138,6 +138,6 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 85x19
</span><span class="cx"> text run at (0,0) width 85: "value=1000: "
</span><span class="cx"> RenderBlock {METER} at (84,2) size 81x17
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorfastdomHTMLMeterElementmeterstyleschangingpseudoexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/fast/dom/HTMLMeterElement/meter-styles-changing-pseudo-expected.txt (207279 => 207280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/fast/dom/HTMLMeterElement/meter-styles-changing-pseudo-expected.txt 2016-10-13 05:23:53 UTC (rev 207279)
+++ trunk/LayoutTests/platform/ios-simulator/fast/dom/HTMLMeterElement/meter-styles-changing-pseudo-expected.txt 2016-10-13 09:22:38 UTC (rev 207280)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> text run at (0,0) width 659: "Following meter gauge should be solid green - Changing the paseudo class by changing value attribute"
</span><span class="cx"> RenderBlock (anonymous) at (0,95) size 784x16
</span><span class="cx"> RenderBlock {METER} at (0,-1) size 80x17
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16 [bgcolor=#808080]
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 72x16 [bgcolor=#008000]
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorfastdomHTMLMeterElementmeterstylesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/fast/dom/HTMLMeterElement/meter-styles-expected.txt (207279 => 207280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/fast/dom/HTMLMeterElement/meter-styles-expected.txt 2016-10-13 05:23:53 UTC (rev 207279)
+++ trunk/LayoutTests/platform/ios-simulator/fast/dom/HTMLMeterElement/meter-styles-expected.txt 2016-10-13 09:22:38 UTC (rev 207280)
</span><span class="lines">@@ -9,36 +9,36 @@
</span><span class="cx"> RenderBlock {UL} at (3,23) size 778x65
</span><span class="cx"> RenderListItem {LI} at (43,0) size 732x20
</span><span class="cx"> RenderBlock {METER} at (0,2) size 80x17
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 20x16
</span><span class="cx"> RenderText {#text} at (80,0) size 4x19
</span><span class="cx"> text run at (80,0) width 4: " "
</span><span class="cx"> RenderBlock {METER} at (84,2) size 80x17
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 36x16
</span><span class="cx"> RenderText {#text} at (164,0) size 4x19
</span><span class="cx"> text run at (164,0) width 4: " "
</span><span class="cx"> RenderBlock {METER} at (168,2) size 80x17
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 60x16
</span><span class="cx"> RenderListItem {LI} at (43,23) size 732x42
</span><span class="cx"> RenderBlock {METER} at (0,-1) size 30x41
</span><del>- RenderMeter {DIV} at (0,0) size 30x40
</del><ins>+ RenderBlock {DIV} at (0,0) size 30x40
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 30x40
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 8x40
</span><span class="cx"> RenderText {#text} at (30,21) size 4x19
</span><span class="cx"> text run at (30,21) width 4: " "
</span><span class="cx"> RenderBlock {METER} at (34,-1) size 30x41
</span><del>- RenderMeter {DIV} at (0,0) size 30x40
</del><ins>+ RenderBlock {DIV} at (0,0) size 30x40
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 30x40
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 14x40
</span><span class="cx"> RenderText {#text} at (64,21) size 4x19
</span><span class="cx"> text run at (64,21) width 4: " "
</span><span class="cx"> RenderBlock {METER} at (68,-1) size 30x41
</span><del>- RenderMeter {DIV} at (0,0) size 30x40
</del><ins>+ RenderBlock {DIV} at (0,0) size 30x40
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 30x40
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 23x40
</span><span class="cx"> RenderBlock {H2} at (3,90) size 778x21
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> RenderBlock {UL} at (3,0) size 778x74
</span><span class="cx"> RenderListItem {LI} at (43,0) size 732x20
</span><span class="cx"> RenderBlock {METER} at (0,2) size 80x17 [bgcolor=#AAAACC] [border: (5px solid #222244) (20px solid #222244) (5px solid #222244) (10px solid #222244)]
</span><del>- RenderMeter {DIV} at (10,5) size 50x6
</del><ins>+ RenderBlock {DIV} at (10,5) size 50x6
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 50x6
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 40x6
</span><span class="cx"> RenderText {#text} at (80,0) size 72x19
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> text run at (80,0) width 72: " has border"
</span><span class="cx"> RenderListItem {LI} at (43,23) size 732x21
</span><span class="cx"> RenderBlock {METER} at (0,2) size 80x17 [bgcolor=#AAAACC]
</span><del>- RenderMeter {DIV} at (10,5) size 50x6
</del><ins>+ RenderBlock {DIV} at (10,5) size 50x6
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 50x6
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 40x6
</span><span class="cx"> RenderText {#text} at (80,0) size 81x19
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> text run at (80,0) width 81: " has padding"
</span><span class="cx"> RenderListItem {LI} at (43,46) size 732x28
</span><span class="cx"> RenderBlock {METER} at (10,4) size 80x17 [bgcolor=#AAAACC]
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 64x16
</span><span class="cx"> RenderText {#text} at (110,7) size 75x19
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> text run at (0,0) width 486: "default -webkit-appearance, thus should use platform theme (only for Mac.)"
</span><span class="cx"> RenderListItem {LI} at (43,23) size 732x21
</span><span class="cx"> RenderBlock {METER} at (0,2) size 80x17
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 64x16 [bgcolor=#008000] [border: (2px solid #77CC77)]
</span><span class="cx"> RenderText {#text} at (80,0) size 217x19
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> text run at (80,0) width 217: " has bar style but should ignore it."
</span><span class="cx"> RenderListItem {LI} at (43,46) size 732x21
</span><span class="cx"> RenderBlock {METER} at (0,2) size 80x17
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16 [bgcolor=#808080] [border: (2px solid #222222)]
</span><span class="cx"> RenderBlock {DIV} at (2,2) size 61x12
</span><span class="cx"> RenderText {#text} at (80,0) size 232x19
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> text run at (80,0) width 232: " has value style but should ignore it."
</span><span class="cx"> RenderListItem {LI} at (43,69) size 732x21
</span><span class="cx"> RenderBlock {METER} at (0,2) size 80x17
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16 [bgcolor=#808080] [border: (2px solid #222222)]
</span><span class="cx"> RenderBlock {DIV} at (2,2) size 61x12 [bgcolor=#008000] [border: (2px solid #77CC77)]
</span><span class="cx"> RenderText {#text} at (80,0) size 255x19
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> text run at (0,0) width 470: "-webkit-appearance: none, thus custom styled elements should be shown."
</span><span class="cx"> RenderListItem {LI} at (43,23) size 732x21
</span><span class="cx"> RenderBlock {METER} at (0,2) size 80x17
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 64x16 [bgcolor=#008000] [border: (2px solid #77CC77)]
</span><span class="cx"> RenderText {#text} at (80,0) size 276x19
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> text run at (80,0) width 276: " has bar style, should have solid value part."
</span><span class="cx"> RenderListItem {LI} at (43,46) size 732x21
</span><span class="cx"> RenderBlock {METER} at (0,2) size 80x17
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16 [bgcolor=#808080] [border: (2px solid #222222)]
</span><span class="cx"> RenderBlock {DIV} at (2,2) size 61x12
</span><span class="cx"> RenderText {#text} at (80,0) size 261x19
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx"> text run at (80,0) width 261: " has value style, should be solid bar part."
</span><span class="cx"> RenderListItem {LI} at (43,69) size 732x21
</span><span class="cx"> RenderBlock {METER} at (0,2) size 80x17
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16 [bgcolor=#808080] [border: (2px solid #222222)]
</span><span class="cx"> RenderBlock {DIV} at (2,2) size 61x12 [bgcolor=#008000] [border: (2px solid #77CC77)]
</span><span class="cx"> RenderText {#text} at (80,0) size 240x19
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx"> RenderBlock {UL} at (3,0) size 778x44
</span><span class="cx"> RenderListItem {LI} at (43,0) size 732x20
</span><span class="cx"> RenderBlock {METER} at (0,2) size 80x17
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 64x16
</span><span class="cx"> RenderText {#text} at (80,0) size 381x19
</span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx"> text run at (80,0) width 381: " has \"none\" appearance, should be styled with default style."
</span><span class="cx"> RenderListItem {LI} at (43,23) size 732x21
</span><span class="cx"> RenderBlock {METER} at (0,2) size 80x17
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 64x16
</span><span class="cx"> RenderText {#text} at (80,0) size 280x19
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx"> text run at (0,0) width 162: "Providing bar paddings"
</span><span class="cx"> RenderBlock {DIV} at (0,491) size 784x21 [bgcolor=#EEEEEE]
</span><span class="cx"> RenderBlock {METER} at (0,2) size 80x17
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (5,5) size 35x6
</span><span class="cx"> RenderText {#text} at (80,0) size 166x19
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastdomHTMLMeterElementmeterelementrepaintonupdatevalueexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/dom/HTMLMeterElement/meter-element-repaint-on-update-value-expected.txt (207279 => 207280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/dom/HTMLMeterElement/meter-element-repaint-on-update-value-expected.txt 2016-10-13 05:23:53 UTC (rev 207279)
+++ trunk/LayoutTests/platform/mac/fast/dom/HTMLMeterElement/meter-element-repaint-on-update-value-expected.txt 2016-10-13 09:22:38 UTC (rev 207280)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> RenderText {#text} at (80,0) size 4x18
</span><span class="cx"> text run at (80,0) width 4: " "
</span><span class="cx"> RenderBlock {METER} at (84,1) size 80x17
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 40x16
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastdomHTMLMeterElementmeterstyleschangingpseudoexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/dom/HTMLMeterElement/meter-styles-changing-pseudo-expected.txt (207279 => 207280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/dom/HTMLMeterElement/meter-styles-changing-pseudo-expected.txt 2016-10-13 05:23:53 UTC (rev 207279)
+++ trunk/LayoutTests/platform/mac/fast/dom/HTMLMeterElement/meter-styles-changing-pseudo-expected.txt 2016-10-13 09:22:38 UTC (rev 207280)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> text run at (0,0) width 659: "Following meter gauge should be solid green - Changing the paseudo class by changing value attribute"
</span><span class="cx"> RenderBlock (anonymous) at (0,92) size 784x16
</span><span class="cx"> RenderBlock {METER} at (0,-1) size 80x17
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16 [bgcolor=#808080]
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 72x16 [bgcolor=#008000]
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastdomHTMLMeterElementmeterstylesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/dom/HTMLMeterElement/meter-styles-expected.txt (207279 => 207280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/dom/HTMLMeterElement/meter-styles-expected.txt 2016-10-13 05:23:53 UTC (rev 207279)
+++ trunk/LayoutTests/platform/mac/fast/dom/HTMLMeterElement/meter-styles-expected.txt 2016-10-13 09:22:38 UTC (rev 207280)
</span><span class="lines">@@ -9,36 +9,36 @@
</span><span class="cx"> RenderBlock {UL} at (3,21) size 778x62
</span><span class="cx"> RenderListItem {LI} at (43,0) size 732x18
</span><span class="cx"> RenderBlock {METER} at (0,1) size 80x17
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 20x16
</span><span class="cx"> RenderText {#text} at (80,0) size 4x18
</span><span class="cx"> text run at (80,0) width 4: " "
</span><span class="cx"> RenderBlock {METER} at (84,1) size 80x17
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 36x16
</span><span class="cx"> RenderText {#text} at (164,0) size 4x18
</span><span class="cx"> text run at (164,0) width 4: " "
</span><span class="cx"> RenderBlock {METER} at (168,1) size 80x17
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 60x16
</span><span class="cx"> RenderListItem {LI} at (43,21) size 732x41
</span><span class="cx"> RenderBlock {METER} at (0,-1) size 30x41
</span><del>- RenderMeter {DIV} at (0,0) size 30x40
</del><ins>+ RenderBlock {DIV} at (0,0) size 30x40
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 30x40
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 8x40
</span><span class="cx"> RenderText {#text} at (30,22) size 4x18
</span><span class="cx"> text run at (30,22) width 4: " "
</span><span class="cx"> RenderBlock {METER} at (34,-1) size 30x41
</span><del>- RenderMeter {DIV} at (0,0) size 30x40
</del><ins>+ RenderBlock {DIV} at (0,0) size 30x40
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 30x40
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 14x40
</span><span class="cx"> RenderText {#text} at (64,22) size 4x18
</span><span class="cx"> text run at (64,22) width 4: " "
</span><span class="cx"> RenderBlock {METER} at (68,-1) size 30x41
</span><del>- RenderMeter {DIV} at (0,0) size 30x40
</del><ins>+ RenderBlock {DIV} at (0,0) size 30x40
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 30x40
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 23x40
</span><span class="cx"> RenderBlock {H2} at (3,85) size 778x19
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> RenderBlock {UL} at (3,0) size 778x69
</span><span class="cx"> RenderListItem {LI} at (43,0) size 732x18
</span><span class="cx"> RenderBlock {METER} at (0,1) size 80x17 [bgcolor=#AAAACC] [border: (5px solid #222244) (20px solid #222244) (5px solid #222244) (10px solid #222244)]
</span><del>- RenderMeter {DIV} at (10,5) size 50x6
</del><ins>+ RenderBlock {DIV} at (10,5) size 50x6
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 50x6
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 40x6
</span><span class="cx"> RenderText {#text} at (80,0) size 72x18
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> text run at (80,0) width 72: " has border"
</span><span class="cx"> RenderListItem {LI} at (43,21) size 732x19
</span><span class="cx"> RenderBlock {METER} at (0,1) size 80x17 [bgcolor=#AAAACC]
</span><del>- RenderMeter {DIV} at (10,5) size 50x6
</del><ins>+ RenderBlock {DIV} at (10,5) size 50x6
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 50x6
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 40x6
</span><span class="cx"> RenderText {#text} at (80,0) size 81x18
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> text run at (80,0) width 81: " has padding"
</span><span class="cx"> RenderListItem {LI} at (43,42) size 732x27
</span><span class="cx"> RenderBlock {METER} at (10,4) size 80x17 [bgcolor=#AAAACC]
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 64x16
</span><span class="cx"> RenderText {#text} at (110,8) size 75x18
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> text run at (0,0) width 470: "-webkit-appearance: none, thus custom styled elements should be shown."
</span><span class="cx"> RenderListItem {LI} at (43,21) size 732x19
</span><span class="cx"> RenderBlock {METER} at (0,1) size 80x17
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 64x16 [bgcolor=#008000] [border: (2px solid #77CC77)]
</span><span class="cx"> RenderText {#text} at (80,0) size 276x18
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> text run at (80,0) width 276: " has bar style, should have solid value part."
</span><span class="cx"> RenderListItem {LI} at (43,42) size 732x19
</span><span class="cx"> RenderBlock {METER} at (0,1) size 80x17
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16 [bgcolor=#808080] [border: (2px solid #222222)]
</span><span class="cx"> RenderBlock {DIV} at (2,2) size 61x12
</span><span class="cx"> RenderText {#text} at (80,0) size 261x18
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx"> text run at (80,0) width 261: " has value style, should be solid bar part."
</span><span class="cx"> RenderListItem {LI} at (43,63) size 732x19
</span><span class="cx"> RenderBlock {METER} at (0,1) size 80x17
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16 [bgcolor=#808080] [border: (2px solid #222222)]
</span><span class="cx"> RenderBlock {DIV} at (2,2) size 61x12 [bgcolor=#008000] [border: (2px solid #77CC77)]
</span><span class="cx"> RenderText {#text} at (80,0) size 240x18
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx"> RenderBlock {UL} at (3,0) size 778x40
</span><span class="cx"> RenderListItem {LI} at (43,0) size 732x18
</span><span class="cx"> RenderBlock {METER} at (0,1) size 80x17
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 64x16
</span><span class="cx"> RenderText {#text} at (80,0) size 381x18
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx"> text run at (0,0) width 162: "Providing bar paddings"
</span><span class="cx"> RenderBlock {DIV} at (0,453) size 784x19 [bgcolor=#EEEEEE]
</span><span class="cx"> RenderBlock {METER} at (0,1) size 80x17
</span><del>- RenderMeter {DIV} at (0,0) size 80x16
</del><ins>+ RenderBlock {DIV} at (0,0) size 80x16
</ins><span class="cx"> RenderBlock {DIV} at (0,0) size 80x16
</span><span class="cx"> RenderBlock {DIV} at (5,5) size 35x6
</span><span class="cx"> RenderText {#text} at (80,0) size 166x18
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (207279 => 207280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2016-10-13 05:23:53 UTC (rev 207279)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-10-13 09:22:38 UTC (rev 207280)
</span><span class="lines">@@ -1849,7 +1849,6 @@
</span><span class="cx"> html/shadow/MediaControlElementTypes.cpp
</span><span class="cx"> html/shadow/MediaControlElements.cpp
</span><span class="cx"> html/shadow/MediaControls.cpp
</span><del>- html/shadow/MeterShadowElement.cpp
</del><span class="cx"> html/shadow/ProgressShadowElement.cpp
</span><span class="cx"> html/shadow/SliderThumbElement.cpp
</span><span class="cx"> html/shadow/SpinButtonElement.cpp
</span><span class="lines">@@ -2987,6 +2986,7 @@
</span><span class="cx"> ${WEBCORE_DIR}/css/plugIns.css
</span><span class="cx"> ${WEBCORE_DIR}/css/quirks.css
</span><span class="cx"> ${WEBCORE_DIR}/css/svg.css
</span><ins>+ ${WEBCORE_DIR}/html/shadow/meterElementShadow.css
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> set(WebCore_PLUG_INS_RESOURCES
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207279 => 207280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-13 05:23:53 UTC (rev 207279)
+++ trunk/Source/WebCore/ChangeLog 2016-10-13 09:22:38 UTC (rev 207280)
</span><span class="lines">@@ -1,3 +1,93 @@
</span><ins>+2016-10-13 Antti Koivisto <antti@apple.com>
+
+ Support scoped style for user agent shadow trees
+ https://bugs.webkit.org/show_bug.cgi?id=163212
+ <rdar://problem/28715318>
+
+ Reviewed by Ryosuke Niwa and Andreas Kling.
+
+ This patch adds support for user agent shadow trees that have scoped style. This means
+ that the shadows can be styled via <style> elements contained in the tree instead of
+ using pseudo elements on the global UA sheet. Since the style is scoped it can use
+ normal id and class selectors.
+
+ Elements in the shadow tree can still be exposed for author styling if needed by giving
+ them pseudo ids
+
+ The patch also uses the new mechanism for the <meter> element.
+
+ The mechanism is not optimized yet, each shadow tree gets its own copy of style-related data
+ structures. This can be improved later.
+
+ * CMakeLists.txt:
+ * DerivedSources.make:
+ * WebCore.xcodeproj/project.pbxproj:
+ * css/ElementRuleCollector.cpp:
+ (WebCore::MatchRequest::MatchRequest):
+ (WebCore::ElementRuleCollector::addMatchedRule):
+ (WebCore::ElementRuleCollector::matchAuthorShadowPseudoElementRules):
+
+ Make treeContextOrdinal an int so we can use negative ordinals. This is used to allow author pseudo
+ elements from earlier tree context to win over the shadow tree (matching CSS scoping spec language).
+
+ * css/ElementRuleCollector.h:
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::MatchResult::addMatchedProperties):
+ (WebCore::StyleResolver::CascadedProperties::addImportantMatches):
+ * css/StyleResolver.h:
+ * css/html.css:
+ (meter::-webkit-meter-inner-element): Deleted.
+ (meter::-webkit-meter-bar): Deleted.
+ (meter::-webkit-meter-optimum-value): Deleted.
+ (meter::-webkit-meter-suboptimum-value): Deleted.
+ (meter::-webkit-meter-even-less-good-value): Deleted.
+
+ Remove meter pseudo elements from the UA sheet.
+
+ * html/HTMLMeterElement.cpp:
+ (WebCore::HTMLMeterElement::childShouldCreateRenderer):
+
+ Don't create shadow renderers when we have appearance (are using RenderMeter).
+
+ (WebCore::setValueClass):
+
+ Move this logic here from MeterShadowElement.cpp.
+ Set both class and pseudo id. The latter is needed to keep author styling working.
+
+ (WebCore::HTMLMeterElement::didElementStateChange):
+ (WebCore::HTMLMeterElement::renderMeter):
+
+ RenderMeter is now only instantiated when appearance is enabled.
+
+ (WebCore::HTMLMeterElement::didAddUserAgentShadowRoot):
+
+ Build the shadow tree out of <div>s instead of special shadow elements.
+
+ * html/HTMLMeterElement.h:
+ * html/shadow/MeterShadowElement.cpp: Removed.
+ * html/shadow/MeterShadowElement.h: Removed.
+
+ Not needed anymore.
+
+ * html/shadow/meterElementShadow.css: Added.
+ (div#inner):
+ (div#bar):
+ (div#value):
+ (div#value.optimum):
+ (div#value.suboptimum):
+ (div#value.even-less-good):
+
+ Stylesheet for meter element shadow tree using normal id and class selectors.
+
+ * style/StyleScope.cpp:
+ (WebCore::Style::Scope::shouldUseSharedUserAgentShadowTreeStyleResolver):
+
+ Switch to per-scope style resolver for UA shadow trees if there is stylesheets in the tree.
+
+ (WebCore::Style::Scope::resolver):
+ (WebCore::Style::Scope::resolverIfExists):
+ * style/StyleScope.h:
+
</ins><span class="cx"> 2016-10-12 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> [Web IDL] Drop support for legacy [ConstructorConditional=*]
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.make (207279 => 207280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.make 2016-10-13 05:23:53 UTC (rev 207279)
+++ trunk/Source/WebCore/DerivedSources.make 2016-10-13 09:22:38 UTC (rev 207280)
</span><span class="lines">@@ -1018,6 +1018,10 @@
</span><span class="cx"> USER_AGENT_STYLE_SHEETS := $(USER_AGENT_STYLE_SHEETS) $(WebCore)/css/themeWin.css $(WebCore)/css/themeWinQuirks.css
</span><span class="cx"> endif
</span><span class="cx">
</span><ins>+ifeq ($(findstring ENABLE_METER_ELEMENT,$(FEATURE_DEFINES)), ENABLE_METER_ELEMENT)
+ USER_AGENT_STYLE_SHEETS := $(USER_AGENT_STYLE_SHEETS) $(WebCore)/html/shadow/meterElementShadow.css
+endif
+
</ins><span class="cx"> UserAgentStyleSheets.h : css/make-css-file-arrays.pl bindings/scripts/preprocessor.pm $(USER_AGENT_STYLE_SHEETS) $(PLATFORM_FEATURE_DEFINES)
</span><span class="cx"> $(PERL) $< --defines "$(FEATURE_DEFINES)" $@ UserAgentStyleSheetsData.cpp $(USER_AGENT_STYLE_SHEETS)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (207279 => 207280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-10-13 05:23:53 UTC (rev 207279)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-10-13 09:22:38 UTC (rev 207280)
</span><span class="lines">@@ -3915,8 +3915,6 @@
</span><span class="cx"> A77E1FF014AACB6E005B7CB6 /* TreeScopeAdopter.h in Headers */ = {isa = PBXBuildFile; fileRef = A77E1FEE14AACB6E005B7CB6 /* TreeScopeAdopter.h */; };
</span><span class="cx"> A781C6A713828B5D0012A62A /* DocumentMarker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A781C6A613828B5D0012A62A /* DocumentMarker.cpp */; };
</span><span class="cx"> A784941B0B5FE507001E237A /* DataTransfer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A784941A0B5FE507001E237A /* DataTransfer.cpp */; };
</span><del>- A78E526F1346BD1700AD9C31 /* MeterShadowElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A78E526D1346BD1700AD9C31 /* MeterShadowElement.cpp */; };
- A78E52701346BD1700AD9C31 /* MeterShadowElement.h in Headers */ = {isa = PBXBuildFile; fileRef = A78E526E1346BD1700AD9C31 /* MeterShadowElement.h */; };
</del><span class="cx"> A78FE13B12366B1000ACE8D0 /* SpellChecker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A78FE13912366B1000ACE8D0 /* SpellChecker.cpp */; };
</span><span class="cx"> A78FE13C12366B1000ACE8D0 /* SpellChecker.h in Headers */ = {isa = PBXBuildFile; fileRef = A78FE13A12366B1000ACE8D0 /* SpellChecker.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> A795463E0B5C4C80007B438F /* DragDataMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = A795463D0B5C4C80007B438F /* DragDataMac.mm */; };
</span><span class="lines">@@ -6293,6 +6291,7 @@
</span><span class="cx"> E4DACE6C1D12E1160075980F /* StylePendingResources.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4DACE6B1D12E1160075980F /* StylePendingResources.cpp */; };
</span><span class="cx"> E4DEAA1717A93DC3000E0430 /* StyleTreeResolver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4DEAA1517A93DC3000E0430 /* StyleTreeResolver.cpp */; };
</span><span class="cx"> E4DEAA1817A93DC3000E0430 /* StyleTreeResolver.h in Headers */ = {isa = PBXBuildFile; fileRef = E4DEAA1617A93DC3000E0430 /* StyleTreeResolver.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><ins>+ E4E243831DAB953E00C26E4B /* meterElementShadow.css in Resources */ = {isa = PBXBuildFile; fileRef = E4E243821DAB953E00C26E4B /* meterElementShadow.css */; };
</ins><span class="cx"> E4E39AFB1330EFA8003AB274 /* LegacyTileLayerPool.h in Headers */ = {isa = PBXBuildFile; fileRef = E4E39AFA1330EFA8003AB274 /* LegacyTileLayerPool.h */; };
</span><span class="cx"> E4E39AFD1330EFC6003AB274 /* LegacyTileLayerPool.mm in Sources */ = {isa = PBXBuildFile; fileRef = E4E39AFC1330EFC5003AB274 /* LegacyTileLayerPool.mm */; };
</span><span class="cx"> E4E9B1191810916F003ACCDF /* SimpleLineLayoutResolver.h in Headers */ = {isa = PBXBuildFile; fileRef = E4E9B1181810916F003ACCDF /* SimpleLineLayoutResolver.h */; };
</span><span class="lines">@@ -11215,8 +11214,6 @@
</span><span class="cx"> A77E1FEE14AACB6E005B7CB6 /* TreeScopeAdopter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TreeScopeAdopter.h; sourceTree = "<group>"; };
</span><span class="cx"> A781C6A613828B5D0012A62A /* DocumentMarker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DocumentMarker.cpp; sourceTree = "<group>"; };
</span><span class="cx"> A784941A0B5FE507001E237A /* DataTransfer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = DataTransfer.cpp; sourceTree = "<group>"; };
</span><del>- A78E526D1346BD1700AD9C31 /* MeterShadowElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MeterShadowElement.cpp; sourceTree = "<group>"; };
- A78E526E1346BD1700AD9C31 /* MeterShadowElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MeterShadowElement.h; sourceTree = "<group>"; };
</del><span class="cx"> A78FE13912366B1000ACE8D0 /* SpellChecker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SpellChecker.cpp; sourceTree = "<group>"; };
</span><span class="cx"> A78FE13A12366B1000ACE8D0 /* SpellChecker.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; path = SpellChecker.h; sourceTree = "<group>"; };
</span><span class="cx"> A795463D0B5C4C80007B438F /* DragDataMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = DragDataMac.mm; sourceTree = "<group>"; };
</span><span class="lines">@@ -13942,6 +13939,7 @@
</span><span class="cx"> E4DACE6B1D12E1160075980F /* StylePendingResources.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StylePendingResources.cpp; sourceTree = "<group>"; };
</span><span class="cx"> E4DEAA1517A93DC3000E0430 /* StyleTreeResolver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StyleTreeResolver.cpp; sourceTree = "<group>"; };
</span><span class="cx"> E4DEAA1617A93DC3000E0430 /* StyleTreeResolver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StyleTreeResolver.h; sourceTree = "<group>"; };
</span><ins>+ E4E243821DAB953E00C26E4B /* meterElementShadow.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = meterElementShadow.css; sourceTree = "<group>"; };
</ins><span class="cx"> E4E39AFA1330EFA8003AB274 /* LegacyTileLayerPool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LegacyTileLayerPool.h; sourceTree = "<group>"; };
</span><span class="cx"> E4E39AFC1330EFC5003AB274 /* LegacyTileLayerPool.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LegacyTileLayerPool.mm; sourceTree = "<group>"; };
</span><span class="cx"> E4E9B1181810916F003ACCDF /* SimpleLineLayoutResolver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SimpleLineLayoutResolver.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -15986,8 +15984,7 @@
</span><span class="cx"> 1F3C3BE9135CAF3C00B8C1AC /* MediaControls.h */,
</span><span class="cx"> 4157AF7F12F1FB0400A8C6F5 /* MediaControlsApple.cpp */,
</span><span class="cx"> 4157AF7E12F1FB0400A8C6F5 /* MediaControlsApple.h */,
</span><del>- A78E526D1346BD1700AD9C31 /* MeterShadowElement.cpp */,
- A78E526E1346BD1700AD9C31 /* MeterShadowElement.h */,
</del><ins>+ E4E243821DAB953E00C26E4B /* meterElementShadow.css */,
</ins><span class="cx"> A715E650134BBBEC00D8E713 /* ProgressShadowElement.cpp */,
</span><span class="cx"> A715E651134BBBEC00D8E713 /* ProgressShadowElement.h */,
</span><span class="cx"> 4150F9F012B6E0E70008C860 /* SliderThumbElement.cpp */,
</span><span class="lines">@@ -25844,7 +25841,6 @@
</span><span class="cx"> 75793E840D0CE0B3007FC0AC /* MessageEvent.h in Headers */,
</span><span class="cx"> E1ADECBF0E76ACF1004A1A5E /* MessagePort.h in Headers */,
</span><span class="cx"> 41BF700C0FE86F49005E8DEC /* MessagePortChannel.h in Headers */,
</span><del>- A78E52701346BD1700AD9C31 /* MeterShadowElement.h in Headers */,
</del><span class="cx"> 37DDCDA51384501C0008B793 /* MHTMLArchive.h in Headers */,
</span><span class="cx"> 37DDCDA71384501C0008B793 /* MHTMLParser.h in Headers */,
</span><span class="cx"> 53B895AF19DC7ED9009CAA93 /* Microtasks.h in Headers */,
</span><span class="lines">@@ -27494,6 +27490,7 @@
</span><span class="cx"> BE8C753110681324001E93F5 /* SpellingDot.png in Resources */,
</span><span class="cx"> 01E6C2E41194B2820050821C /* SpellingDot@2x.png in Resources */,
</span><span class="cx"> 1C2417BA1992C04100EF9938 /* SpellingDot@3x.png in Resources */,
</span><ins>+ E4E243831DAB953E00C26E4B /* meterElementShadow.css in Resources */,
</ins><span class="cx"> 93153BDC141959BC00FCF5BE /* textAreaResizeCorner.png in Resources */,
</span><span class="cx"> 9370918D1416D86B00477333 /* textAreaResizeCorner@2x.png in Resources */,
</span><span class="cx"> );
</span><span class="lines">@@ -29576,7 +29573,6 @@
</span><span class="cx"> E1ADECCF0E76AD8B004A1A5E /* MessageChannel.cpp in Sources */,
</span><span class="cx"> 75793E830D0CE0B3007FC0AC /* MessageEvent.cpp in Sources */,
</span><span class="cx"> E1ADECC00E76ACF1004A1A5E /* MessagePort.cpp in Sources */,
</span><del>- A78E526F1346BD1700AD9C31 /* MeterShadowElement.cpp in Sources */,
</del><span class="cx"> CB8CF0181A9358D4000D510B /* Microtasks.cpp in Sources */,
</span><span class="cx"> 37DDCD9413844FD50008B793 /* MIMEHeader.cpp in Sources */,
</span><span class="cx"> BC772C4E0C4EB3040083285F /* MIMETypeRegistry.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCorecssElementRuleCollectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/ElementRuleCollector.cpp (207279 => 207280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/ElementRuleCollector.cpp 2016-10-13 05:23:53 UTC (rev 207279)
+++ trunk/Source/WebCore/css/ElementRuleCollector.cpp 2016-10-13 09:22:38 UTC (rev 207280)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx">
</span><span class="cx"> class MatchRequest {
</span><span class="cx"> public:
</span><del>- MatchRequest(const RuleSet* ruleSet, bool includeEmptyRules = false, unsigned treeContextOrdinal = 0)
</del><ins>+ MatchRequest(const RuleSet* ruleSet, bool includeEmptyRules = false, int treeContextOrdinal = 0)
</ins><span class="cx"> : ruleSet(ruleSet)
</span><span class="cx"> , includeEmptyRules(includeEmptyRules)
</span><span class="cx"> , treeContextOrdinal(treeContextOrdinal)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> }
</span><span class="cx"> const RuleSet* ruleSet;
</span><span class="cx"> const bool includeEmptyRules;
</span><del>- unsigned treeContextOrdinal;
</del><ins>+ int treeContextOrdinal;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> ElementRuleCollector::ElementRuleCollector(const Element& element, const DocumentRuleSets& ruleSets, const SelectorFilter* selectorFilter)
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> return m_matchedRuleList;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void ElementRuleCollector::addMatchedRule(const RuleData& ruleData, unsigned specificity, unsigned treeContextOrdinal, StyleResolver::RuleRange& ruleRange)
</del><ins>+inline void ElementRuleCollector::addMatchedRule(const RuleData& ruleData, unsigned specificity, int treeContextOrdinal, StyleResolver::RuleRange& ruleRange)
</ins><span class="cx"> {
</span><span class="cx"> // Update our first/last rule indices in the matched rules array.
</span><span class="cx"> ++ruleRange.lastRuleIndex;
</span><span class="lines">@@ -232,7 +232,7 @@
</span><span class="cx"> return;
</span><span class="cx"> // Look up shadow pseudo elements also from the host scope author style as they are web-exposed.
</span><span class="cx"> auto& hostAuthorRules = Style::Scope::forNode(*shadowRoot.host()).resolver().ruleSets().authorStyle();
</span><del>- MatchRequest hostAuthorRequest { &hostAuthorRules, matchRequest.includeEmptyRules };
</del><ins>+ MatchRequest hostAuthorRequest { &hostAuthorRules, matchRequest.includeEmptyRules, matchRequest.treeContextOrdinal - 1 };
</ins><span class="cx"> collectMatchingShadowPseudoElementRules(hostAuthorRequest, ruleRange);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssElementRuleCollectorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/ElementRuleCollector.h (207279 => 207280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/ElementRuleCollector.h 2016-10-13 05:23:53 UTC (rev 207279)
+++ trunk/Source/WebCore/css/ElementRuleCollector.h 2016-10-13 09:22:38 UTC (rev 207280)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> struct MatchedRule {
</span><span class="cx"> const RuleData* ruleData;
</span><span class="cx"> unsigned specificity;
</span><del>- unsigned treeContextOrdinal;
</del><ins>+ int treeContextOrdinal;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class ElementRuleCollector {
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> void sortMatchedRules();
</span><span class="cx"> void sortAndTransferMatchedRules();
</span><span class="cx">
</span><del>- void addMatchedRule(const RuleData&, unsigned specificity, unsigned treeContextOrdinal, StyleResolver::RuleRange&);
</del><ins>+ void addMatchedRule(const RuleData&, unsigned specificity, int treeContextOrdinal, StyleResolver::RuleRange&);
</ins><span class="cx">
</span><span class="cx"> const Element& m_element;
</span><span class="cx"> const RuleSet& m_authorStyle;
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (207279 => 207280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2016-10-13 05:23:53 UTC (rev 207279)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2016-10-13 09:22:38 UTC (rev 207280)
</span><span class="lines">@@ -192,7 +192,7 @@
</span><span class="cx"> m_cssToLengthConversionData = CSSToLengthConversionData();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void StyleResolver::MatchResult::addMatchedProperties(const StyleProperties& properties, StyleRule* rule, unsigned linkMatchType, PropertyWhitelistType propertyWhitelistType, unsigned treeContextOrdinal)
</del><ins>+void StyleResolver::MatchResult::addMatchedProperties(const StyleProperties& properties, StyleRule* rule, unsigned linkMatchType, PropertyWhitelistType propertyWhitelistType, int treeContextOrdinal)
</ins><span class="cx"> {
</span><span class="cx"> m_matchedProperties.grow(m_matchedProperties.size() + 1);
</span><span class="cx"> StyleResolver::MatchedProperties& newProperties = m_matchedProperties.last();
</span><span class="lines">@@ -2032,7 +2032,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline StyleResolver::MatchedProperties::MatchedProperties()
</span><del>- : possiblyPaddedMember(nullptr)
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2196,7 +2195,7 @@
</span><span class="cx">
</span><span class="cx"> struct IndexAndOrdinal {
</span><span class="cx"> int index;
</span><del>- unsigned ordinal;
</del><ins>+ int ordinal;
</ins><span class="cx"> };
</span><span class="cx"> Vector<IndexAndOrdinal> shadowTreeMatches;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.h (207279 => 207280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.h 2016-10-13 05:23:53 UTC (rev 207279)
+++ trunk/Source/WebCore/css/StyleResolver.h 2016-10-13 09:22:38 UTC (rev 207280)
</span><span class="lines">@@ -245,15 +245,9 @@
</span><span class="cx"> ~MatchedProperties();
</span><span class="cx">
</span><span class="cx"> RefPtr<StyleProperties> properties;
</span><del>- union {
- struct {
- unsigned linkMatchType : 2;
- unsigned whitelistType : 2;
- unsigned treeContextOrdinal : 28;
- };
- // Used to make sure all memory is zero-initialized since we compute the hash over the bytes of this object.
- void* possiblyPaddedMember;
- };
</del><ins>+ uint16_t linkMatchType;
+ uint16_t whitelistType;
+ int treeContextOrdinal;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> struct MatchResult {
</span><span class="lines">@@ -264,7 +258,7 @@
</span><span class="cx">
</span><span class="cx"> const Vector<MatchedProperties, 64>& matchedProperties() const { return m_matchedProperties; }
</span><span class="cx">
</span><del>- void addMatchedProperties(const StyleProperties&, StyleRule* = nullptr, unsigned linkMatchType = SelectorChecker::MatchAll, PropertyWhitelistType = PropertyWhitelistNone, unsigned treeContextOrdinal = 0);
</del><ins>+ void addMatchedProperties(const StyleProperties&, StyleRule* = nullptr, unsigned linkMatchType = SelectorChecker::MatchAll, PropertyWhitelistType = PropertyWhitelistNone, int treeContextOrdinal = 0);
</ins><span class="cx"> private:
</span><span class="cx"> Vector<MatchedProperties, 64> m_matchedProperties;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorecsshtmlcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/html.css (207279 => 207280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/html.css 2016-10-13 05:23:53 UTC (rev 207279)
+++ trunk/Source/WebCore/css/html.css 2016-10-13 09:22:38 UTC (rev 207280)
</span><span class="lines">@@ -999,37 +999,6 @@
</span><span class="cx"> vertical-align: -0.2em;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-meter::-webkit-meter-inner-element {
- -webkit-appearance: inherit;
- box-sizing: inherit;
- height: 100%;
- width: 100%;
-}
-
-meter::-webkit-meter-bar {
- background: -webkit-gradient(linear, left top, left bottom, from(#ddd), to(#ddd), color-stop(0.20, #eee), color-stop(0.45, #ccc), color-stop(0.55, #ccc));
- height: 100%;
- width: 100%;
- box-sizing: border-box;
-}
-
-meter::-webkit-meter-optimum-value {
- background: -webkit-gradient(linear, left top, left bottom, from(#ad7), to(#ad7), color-stop(0.20, #cea), color-stop(0.45, #7a3), color-stop(0.55, #7a3));
- height: 100%;
- box-sizing: border-box;
-}
-
-meter::-webkit-meter-suboptimum-value {
- background: -webkit-gradient(linear, left top, left bottom, from(#fe7), to(#fe7), color-stop(0.20, #ffc), color-stop(0.45, #db3), color-stop(0.55, #db3));
- height: 100%;
- box-sizing: border-box;
-}
-
-meter::-webkit-meter-even-less-good-value {
- background: -webkit-gradient(linear, left top, left bottom, from(#f77), to(#f77), color-stop(0.20, #fcc), color-stop(0.45, #d44), color-stop(0.55, #d44));
- height: 100%;
- box-sizing: border-box;
-}
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> /* progress */
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMeterElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMeterElement.cpp (207279 => 207280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMeterElement.cpp 2016-10-13 05:23:53 UTC (rev 207279)
+++ trunk/Source/WebCore/html/HTMLMeterElement.cpp 2016-10-13 09:22:38 UTC (rev 207280)
</span><span class="lines">@@ -27,14 +27,16 @@
</span><span class="cx"> #include "EventNames.h"
</span><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx"> #include "FormDataList.h"
</span><ins>+#include "HTMLDivElement.h"
</ins><span class="cx"> #include "HTMLFormElement.h"
</span><span class="cx"> #include "HTMLNames.h"
</span><span class="cx"> #include "HTMLParserIdioms.h"
</span><del>-#include "MeterShadowElement.h"
</del><ins>+#include "HTMLStyleElement.h"
</ins><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "RenderMeter.h"
</span><span class="cx"> #include "RenderTheme.h"
</span><span class="cx"> #include "ShadowRoot.h"
</span><ins>+#include "UserAgentStyleSheets.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -67,7 +69,7 @@
</span><span class="cx">
</span><span class="cx"> bool HTMLMeterElement::childShouldCreateRenderer(const Node& child) const
</span><span class="cx"> {
</span><del>- return hasShadowRootParent(child) && HTMLElement::childShouldCreateRenderer(child);
</del><ins>+ return !is<RenderMeter>(renderer()) && HTMLElement::childShouldCreateRenderer(child);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLMeterElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
</span><span class="lines">@@ -186,10 +188,31 @@
</span><span class="cx"> return (value - min) / (max - min);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static void setValueClass(HTMLElement& element, HTMLMeterElement::GaugeRegion gaugeRegion)
+{
+ switch (gaugeRegion) {
+ case HTMLMeterElement::GaugeRegionOptimum:
+ element.setAttribute(HTMLNames::classAttr, "optimum");
+ element.setPseudo("-webkit-meter-optimum-value");
+ return;
+ case HTMLMeterElement::GaugeRegionSuboptimal:
+ element.setAttribute(HTMLNames::classAttr, "suboptimum");
+ element.setPseudo("-webkit-meter-suboptimum-value");
+ return;
+ case HTMLMeterElement::GaugeRegionEvenLessGood:
+ element.setAttribute(HTMLNames::classAttr, "even-less-good");
+ element.setPseudo("-webkit-meter-even-less-good-value");
+ return;
+ default:
+ ASSERT_NOT_REACHED();
+ }
+}
+
</ins><span class="cx"> void HTMLMeterElement::didElementStateChange()
</span><span class="cx"> {
</span><del>- m_value->setWidthPercentage(valueRatio()*100);
- m_value->updatePseudo();
</del><ins>+ m_value->setInlineStyleProperty(CSSPropertyWidth, valueRatio()*100, CSSPrimitiveValue::CSS_PERCENTAGE);
+ setValueClass(*m_value, gaugeRegion());
+
</ins><span class="cx"> if (RenderMeter* render = renderMeter())
</span><span class="cx"> render->updateFromElement();
</span><span class="cx"> }
</span><span class="lines">@@ -198,7 +221,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (is<RenderMeter>(renderer()))
</span><span class="cx"> return downcast<RenderMeter>(renderer());
</span><del>- return downcast<RenderMeter>(descendantsOfType<Element>(*userAgentShadowRoot()).first()->renderer());
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLMeterElement::didAddUserAgentShadowRoot(ShadowRoot* root)
</span><span class="lines">@@ -205,16 +228,28 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_value);
</span><span class="cx">
</span><del>- auto inner = MeterInnerElement::create(document());
</del><ins>+ static NeverDestroyed<String> shadowStyle(meterElementShadowUserAgentStyleSheet, String::ConstructFromLiteral);
+
+ auto style = HTMLStyleElement::create(HTMLNames::styleTag, document(), false);
+ style->setTextContent(shadowStyle, IGNORE_EXCEPTION);
+ root->appendChild(style);
+
+ // Pseudos are set to allow author styling.
+ auto inner = HTMLDivElement::create(document());
+ inner->setIdAttribute("inner");
+ inner->setPseudo("-webkit-meter-inner-element");
</ins><span class="cx"> root->appendChild(inner);
</span><span class="cx">
</span><del>- auto bar = MeterBarElement::create(document());
- m_value = MeterValueElement::create(document());
- m_value->setWidthPercentage(0);
- m_value->updatePseudo();
</del><ins>+ auto bar = HTMLDivElement::create(document());
+ bar->setIdAttribute("bar");
+ bar->setPseudo("-webkit-meter-bar");
+ inner->appendChild(bar, ASSERT_NO_EXCEPTION);
+
+ m_value = HTMLDivElement::create(document());
+ m_value->setIdAttribute("value");
</ins><span class="cx"> bar->appendChild(*m_value, ASSERT_NO_EXCEPTION);
</span><span class="cx">
</span><del>- inner->appendChild(bar, ASSERT_NO_EXCEPTION);
</del><ins>+ didElementStateChange();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMeterElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMeterElement.h (207279 => 207280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMeterElement.h 2016-10-13 05:23:53 UTC (rev 207279)
+++ trunk/Source/WebCore/html/HTMLMeterElement.h 2016-10-13 09:22:38 UTC (rev 207280)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> void didElementStateChange();
</span><span class="cx"> void didAddUserAgentShadowRoot(ShadowRoot*) final;
</span><span class="cx">
</span><del>- RefPtr<MeterValueElement> m_value;
</del><ins>+ RefPtr<HTMLElement> m_value;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowMeterShadowElementcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/html/shadow/MeterShadowElement.cpp (207279 => 207280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/MeterShadowElement.cpp 2016-10-13 05:23:53 UTC (rev 207279)
+++ trunk/Source/WebCore/html/shadow/MeterShadowElement.cpp 2016-10-13 09:22:38 UTC (rev 207280)
</span><span class="lines">@@ -1,112 +0,0 @@
</span><del>-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#if ENABLE(METER_ELEMENT)
-#include "MeterShadowElement.h"
-
-#include "CSSPropertyNames.h"
-#include "HTMLMeterElement.h"
-#include "HTMLNames.h"
-#include "RenderMeter.h"
-#include "RenderTheme.h"
-#include "ShadowRoot.h"
-#include "StyleProperties.h"
-
-namespace WebCore {
-
-using namespace HTMLNames;
-
-MeterShadowElement::MeterShadowElement(Document& document)
- : HTMLDivElement(HTMLNames::divTag, document)
-{
-}
-
-HTMLMeterElement* MeterShadowElement::meterElement() const
-{
- return downcast<HTMLMeterElement>(shadowHost());
-}
-
-bool MeterShadowElement::rendererIsNeeded(const RenderStyle& style)
-{
- auto render = meterElement()->renderer();
- return render && !render->theme().supportsMeter(render->style().appearance()) && HTMLDivElement::rendererIsNeeded(style);
-}
-
-MeterInnerElement::MeterInnerElement(Document& document)
- : MeterShadowElement(document)
-{
- static NeverDestroyed<AtomicString> pseudoId("-webkit-meter-inner-element", AtomicString::ConstructFromLiteral);
- setPseudo(pseudoId);
-}
-
-bool MeterInnerElement::rendererIsNeeded(const RenderStyle& style)
-{
- auto render = meterElement()->renderer();
- return render && !render->theme().supportsMeter(render->style().appearance()) && HTMLDivElement::rendererIsNeeded(style);
-}
-
-RenderPtr<RenderElement> MeterInnerElement::createElementRenderer(RenderStyle&& style, const RenderTreePosition&)
-{
- return createRenderer<RenderMeter>(*this, WTFMove(style));
-}
-
-const AtomicString& MeterValueElement::valuePseudoId() const
-{
- static NeverDestroyed<AtomicString> optimumPseudoId("-webkit-meter-optimum-value", AtomicString::ConstructFromLiteral);
- static NeverDestroyed<AtomicString> suboptimumPseudoId("-webkit-meter-suboptimum-value", AtomicString::ConstructFromLiteral);
- static NeverDestroyed<AtomicString> evenLessGoodPseudoId("-webkit-meter-even-less-good-value", AtomicString::ConstructFromLiteral);
-
- HTMLMeterElement* meter = meterElement();
- if (!meter)
- return optimumPseudoId;
-
- switch (meter->gaugeRegion()) {
- case HTMLMeterElement::GaugeRegionOptimum:
- return optimumPseudoId;
- case HTMLMeterElement::GaugeRegionSuboptimal:
- return suboptimumPseudoId;
- case HTMLMeterElement::GaugeRegionEvenLessGood:
- return evenLessGoodPseudoId;
- default:
- ASSERT_NOT_REACHED();
- return optimumPseudoId;
- }
-}
-
-void MeterValueElement::setWidthPercentage(double width)
-{
- setInlineStyleProperty(CSSPropertyWidth, width, CSSPrimitiveValue::CSS_PERCENTAGE);
-}
-
-}
-
-#endif
-
</del></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowMeterShadowElementh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/html/shadow/MeterShadowElement.h (207279 => 207280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/MeterShadowElement.h 2016-10-13 05:23:53 UTC (rev 207279)
+++ trunk/Source/WebCore/html/shadow/MeterShadowElement.h 2016-10-13 09:22:38 UTC (rev 207280)
</span><span class="lines">@@ -1,112 +0,0 @@
</span><del>-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef MeterShadowElement_h
-#define MeterShadowElement_h
-
-#if ENABLE(METER_ELEMENT)
-#include "HTMLDivElement.h"
-#include <wtf/Forward.h>
-#include <wtf/NeverDestroyed.h>
-
-namespace WebCore {
-
-class HTMLMeterElement;
-class RenderMeter;
-
-class MeterShadowElement : public HTMLDivElement {
-public:
- HTMLMeterElement* meterElement() const;
-
-protected:
- MeterShadowElement(Document&);
-
-private:
- bool rendererIsNeeded(const RenderStyle&) override;
-};
-
-class MeterInnerElement final : public MeterShadowElement {
-public:
- static Ref<MeterInnerElement> create(Document&);
-
-private:
- MeterInnerElement(Document&);
-
- bool rendererIsNeeded(const RenderStyle&) override;
- RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) override;
-};
-
-inline Ref<MeterInnerElement> MeterInnerElement::create(Document& document)
-{
- return adoptRef(*new MeterInnerElement(document));
-}
-
-class MeterBarElement final : public MeterShadowElement {
-public:
- static Ref<MeterBarElement> create(Document&);
-
-private:
- MeterBarElement(Document& document)
- : MeterShadowElement(document)
- {
- static NeverDestroyed<AtomicString> pseudoId("-webkit-meter-bar", AtomicString::ConstructFromLiteral);
- setPseudo(pseudoId);
- }
-};
-
-inline Ref<MeterBarElement> MeterBarElement::create(Document& document)
-{
- return adoptRef(*new MeterBarElement(document));
-}
-
-class MeterValueElement final : public MeterShadowElement {
-public:
- static Ref<MeterValueElement> create(Document&);
- void setWidthPercentage(double);
- void updatePseudo() { setPseudo(valuePseudoId()); }
-
-private:
- MeterValueElement(Document& document)
- : MeterShadowElement(document)
- {
- updatePseudo();
- }
-
- const AtomicString& valuePseudoId() const;
-};
-
-inline Ref<MeterValueElement> MeterValueElement::create(Document& document)
-{
- return adoptRef(*new MeterValueElement(document));
-}
-
-}
-#endif // ENABLE(METER_ELEMENT)
-#endif // MeterShadowElement_h
</del></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowmeterElementShadowcss"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/html/shadow/meterElementShadow.css (0 => 207280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/meterElementShadow.css (rev 0)
+++ trunk/Source/WebCore/html/shadow/meterElementShadow.css 2016-10-13 09:22:38 UTC (rev 207280)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+/* use div# because the preprocessor doen't like # start */
+
+div#inner {
+ -webkit-appearance: inherit;
+ box-sizing: inherit;
+ height: 100%;
+ width: 100%;
+}
+
+div#bar {
+ background: -webkit-gradient(linear, left top, left bottom, from(#ddd), to(#ddd), color-stop(0.20, #eee), color-stop(0.45, #ccc), color-stop(0.55, #ccc));
+ height: 100%;
+ width: 100%;
+ box-sizing: border-box;
+}
+
+div#value {
+ height: 100%;
+ box-sizing: border-box;
+}
+
+div#value.optimum {
+ background: -webkit-gradient(linear, left top, left bottom, from(#ad7), to(#ad7), color-stop(0.20, #cea), color-stop(0.45, #7a3), color-stop(0.55, #7a3));
+}
+
+div#value.suboptimum {
+ background: -webkit-gradient(linear, left top, left bottom, from(#fe7), to(#fe7), color-stop(0.20, #ffc), color-stop(0.45, #db3), color-stop(0.55, #db3));
+ height: 100%;
+ box-sizing: border-box;
+}
+
+div#value.even-less-good {
+ background: -webkit-gradient(linear, left top, left bottom, from(#f77), to(#f77), color-stop(0.20, #fcc), color-stop(0.45, #d44), color-stop(0.55, #d44));
+ height: 100%;
+ box-sizing: border-box;
+}
</ins></span></pre></div>
<a id="trunkSourceWebCorestyleStyleScopecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleScope.cpp (207279 => 207280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleScope.cpp 2016-10-13 05:23:53 UTC (rev 207279)
+++ trunk/Source/WebCore/style/StyleScope.cpp 2016-10-13 09:22:38 UTC (rev 207280)
</span><span class="lines">@@ -71,9 +71,21 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool Scope::shouldUseSharedUserAgentShadowTreeStyleResolver() const
+{
+ if (!m_shadowRoot)
+ return false;
+ if (m_shadowRoot->mode() != ShadowRoot::Mode::UserAgent)
+ return false;
+ // If we have stylesheets in the user agent shadow tree use per-scope resolver.
+ if (!m_styleSheetCandidateNodes.isEmpty())
+ return false;
+ return true;
+}
+
</ins><span class="cx"> StyleResolver& Scope::resolver()
</span><span class="cx"> {
</span><del>- if (m_shadowRoot && m_shadowRoot->mode() == ShadowRoot::Mode::UserAgent)
</del><ins>+ if (shouldUseSharedUserAgentShadowTreeStyleResolver())
</ins><span class="cx"> return m_document.userAgentShadowTreeStyleResolver();
</span><span class="cx">
</span><span class="cx"> if (!m_resolver) {
</span><span class="lines">@@ -85,7 +97,7 @@
</span><span class="cx">
</span><span class="cx"> StyleResolver* Scope::resolverIfExists()
</span><span class="cx"> {
</span><del>- if (m_shadowRoot && m_shadowRoot->mode() == ShadowRoot::Mode::UserAgent)
</del><ins>+ if (shouldUseSharedUserAgentShadowTreeStyleResolver())
</ins><span class="cx"> return &m_document.userAgentShadowTreeStyleResolver();
</span><span class="cx">
</span><span class="cx"> return m_resolver.get();
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStyleScopeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleScope.h (207279 => 207280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleScope.h 2016-10-13 05:23:53 UTC (rev 207279)
+++ trunk/Source/WebCore/style/StyleScope.h 2016-10-13 09:22:38 UTC (rev 207280)
</span><span class="lines">@@ -96,6 +96,8 @@
</span><span class="cx"> static Scope& forNode(Node&);
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+ bool shouldUseSharedUserAgentShadowTreeStyleResolver() const;
+
</ins><span class="cx"> enum class UpdateType { ActiveSet, ContentsOrInterpretation };
</span><span class="cx"> void updateActiveStyleSheets(UpdateType);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>