<!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>[197617] 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/197617">197617</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2016-03-05 15:23:40 -0800 (Sat, 05 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add parsing support for object-position
https://bugs.webkit.org/show_bug.cgi?id=155065
Reviewed by Sam Weinig.
Source/WebCore:
Add parsing support for object-position. This is the first property with
CSS <position> values which does not have equivalent -x and -y shorthands,
so we can store it as a new LengthPoint type.
Per the CSS Values spec, bottom- and right-relative values are translated
into calc() expressions, which are exposed via computed style. For example,
"right 10px bottom" becomes "calc(100% - 10px) 100%". This also allows transitions
between, say, "left 10px bottom" and "right 10px bottom".
Test: fast/css/object-position/parsing-object-position.html
* CMakeLists.txt:
* WebCore.xcodeproj/project.pbxproj:
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::ComputedStyleExtractor::propertyValue):
* css/CSSParser.cpp:
(WebCore::CSSParser::parseValue):
* css/CSSPrimitiveValue.h:
(WebCore::CSSPrimitiveValue::isPair):
* css/CSSPropertyNames.in:
* css/CSSValue.h:
* css/StyleBuilderConverter.h:
(WebCore::StyleBuilderConverter::convertLength):
(WebCore::StyleBuilderConverter::convertTo100PercentMinusLength):
(WebCore::StyleBuilderConverter::convertPositionComponent):
(WebCore::StyleBuilderConverter::convertObjectPosition):
* platform/LengthPoint.cpp: Added.
(WebCore::operator<<):
* platform/LengthPoint.h: Added.
(WebCore::LengthPoint::LengthPoint):
(WebCore::LengthPoint::operator==):
(WebCore::LengthPoint::setX):
(WebCore::LengthPoint::x):
(WebCore::LengthPoint::setY):
(WebCore::LengthPoint::y):
(WebCore::LengthPoint::blend):
* rendering/style/RenderStyle.cpp:
(WebCore::RenderStyle::changeRequiresRepaint):
* rendering/style/RenderStyle.h:
* rendering/style/StyleRareNonInheritedData.cpp:
(WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
(WebCore::StyleRareNonInheritedData::operator==):
* rendering/style/StyleRareNonInheritedData.h:
LayoutTests:
object-position parsing test.
* fast/css/object-position/parsing-object-position-expected.txt: Added.
* fast/css/object-position/parsing-object-position.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</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="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorecssCSSComputedStyleDeclarationcpp">trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSPrimitiveValueh">trunk/Source/WebCore/css/CSSPrimitiveValue.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSPropertyNamesin">trunk/Source/WebCore/css/CSSPropertyNames.in</a></li>
<li><a href="#trunkSourceWebCorecssStyleBuilderConverterh">trunk/Source/WebCore/css/StyleBuilderConverter.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStylecpp">trunk/Source/WebCore/rendering/style/RenderStyle.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStyleh">trunk/Source/WebCore/rendering/style/RenderStyle.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleRareNonInheritedDatacpp">trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleRareNonInheritedDatah">trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/LayoutTests/fast/css/object-position/</li>
<li><a href="#trunkLayoutTestsfastcssobjectpositionparsingobjectpositionexpectedtxt">trunk/LayoutTests/fast/css/object-position/parsing-object-position-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssobjectpositionparsingobjectpositionhtml">trunk/LayoutTests/fast/css/object-position/parsing-object-position.html</a></li>
<li><a href="#trunkSourceWebCoreplatformLengthPointcpp">trunk/Source/WebCore/platform/LengthPoint.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformLengthPointh">trunk/Source/WebCore/platform/LengthPoint.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (197616 => 197617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-03-05 21:35:57 UTC (rev 197616)
+++ trunk/LayoutTests/ChangeLog 2016-03-05 23:23:40 UTC (rev 197617)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-03-05 Simon Fraser <simon.fraser@apple.com>
+
+ Add parsing support for object-position
+ https://bugs.webkit.org/show_bug.cgi?id=155065
+
+ Reviewed by Sam Weinig.
+
+ object-position parsing test.
+
+ * fast/css/object-position/parsing-object-position-expected.txt: Added.
+ * fast/css/object-position/parsing-object-position.html: Added.
+
</ins><span class="cx"> 2016-03-05 Joanmarie Diggs <jdiggs@igalia.com>
</span><span class="cx">
</span><span class="cx"> AX: Implement missing/different accessibility API mappings for SVG
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssobjectpositionparsingobjectpositionexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/object-position/parsing-object-position-expected.txt (0 => 197617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/object-position/parsing-object-position-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/css/object-position/parsing-object-position-expected.txt 2016-03-05 23:23:40 UTC (rev 197617)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+This tests checks that all of the input values for object-position parse correctly.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS testComputedStyle(";") is "50% 50%"
+PASS test("object-position: inherit;") is "inherit"
+PASS test("object-position: initial;") is "initial"
+PASS test("object-position: 23px;") is "23px 50%"
+PASS test("object-position: center 23px;") is "50% 23px"
+PASS test("object-position: 50% 23px;") is "50% 23px"
+PASS test("object-position: 50% left;") is ""
+PASS test("object-position: left 10px top 15px;") is "left 10px top 15px"
+PASS test("object-position: right 10px bottom 15px;") is "right 10px bottom 15px"
+PASS testComputedStyle("object-position: bottom 20%;") is "50% 50%"
+PASS testComputedStyle("object-position: right 20%;") is "100% 20%"
+PASS testComputedStyle("object-position: right") is "100% 50%"
+PASS testComputedStyle("object-position: center bottom 20%;") is "50% 80%"
+PASS testComputedStyle("object-position: right bottom") is "100% 100%"
+PASS testComputedStyle("object-position: left 10px top 15px;") is "10px 15px"
+PASS testComputedStyle("object-position: right 10px bottom 15px;") is "calc(100% - 10px) calc(100% - 15px)"
+PASS testComputedStyle("object-position: bottom 20% right -20px;") is "calc(100% - -20px) 80%"
+PASS testComputedStyle("object-position: calc(100% - 20px) calc(100% - 10%)") is "calc(100% - 20px) 90%"
+PASS testComputedStyle("object-position: right calc(100% - 20px) bottom calc(100% - 10%)") is "calc(100% - (100% - 20px)) 10%"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssobjectpositionparsingobjectpositionhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/object-position/parsing-object-position.html (0 => 197617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/object-position/parsing-object-position.html (rev 0)
+++ trunk/LayoutTests/fast/css/object-position/parsing-object-position.html 2016-03-05 23:23:40 UTC (rev 197617)
</span><span class="lines">@@ -0,0 +1,59 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <script src="../../../resources/js-test-pre.js"></script>
+ </head>
+ <body>
+ <script>
+ description("This tests checks that all of the input values for object-position parse correctly.");
+
+ function test(value)
+ {
+ var div = document.createElement("div");
+ div.setAttribute("style", value);
+ document.body.appendChild(div);
+
+ var result = div.style.getPropertyValue("object-position");
+ document.body.removeChild(div);
+ return result;
+ }
+
+ function testComputedStyle(value)
+ {
+ var div = document.createElement("div");
+ div.setAttribute("style", value);
+ document.body.appendChild(div);
+
+ var result = window.getComputedStyle(div).objectPosition;
+ document.body.removeChild(div);
+ return result;
+ }
+
+ shouldBe('testComputedStyle(";")', '"50% 50%"');
+ shouldBe('test("object-position: inherit;")', '"inherit"');
+ shouldBe('test("object-position: initial;")', '"initial"');
+
+ shouldBeEqualToString('test("object-position: 23px;")', '23px 50%');
+ shouldBeEqualToString('test("object-position: center 23px;")', '50% 23px');
+ shouldBeEqualToString('test("object-position: 50% 23px;")', '50% 23px');
+ shouldBeEqualToString('test("object-position: 50% left;")', '');
+
+ shouldBeEqualToString('test("object-position: left 10px top 15px;")', 'left 10px top 15px');
+ shouldBeEqualToString('test("object-position: right 10px bottom 15px;")', 'right 10px bottom 15px');
+
+ shouldBeEqualToString('testComputedStyle("object-position: bottom 20%;")', '50% 50%');
+ shouldBeEqualToString('testComputedStyle("object-position: right 20%;")', '100% 20%');
+ shouldBeEqualToString('testComputedStyle("object-position: right")', '100% 50%');
+ shouldBeEqualToString('testComputedStyle("object-position: center bottom 20%;")', '50% 80%');
+ shouldBeEqualToString('testComputedStyle("object-position: right bottom")', '100% 100%');
+
+ shouldBeEqualToString('testComputedStyle("object-position: left 10px top 15px;")', '10px 15px');
+ shouldBeEqualToString('testComputedStyle("object-position: right 10px bottom 15px;")', 'calc(100% - 10px) calc(100% - 15px)');
+ shouldBeEqualToString('testComputedStyle("object-position: bottom 20% right -20px;")', 'calc(100% - -20px) 80%');
+ shouldBeEqualToString('testComputedStyle("object-position: calc(100% - 20px) calc(100% - 10%)")', 'calc(100% - 20px) 90%');
+ shouldBeEqualToString('testComputedStyle("object-position: right calc(100% - 20px) bottom calc(100% - 10%)")', 'calc(100% - (100% - 20px)) 10%');
+
+ </script>
+ <script src="../../../resources/js-test-post.js"></script>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (197616 => 197617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2016-03-05 21:35:57 UTC (rev 197616)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-03-05 23:23:40 UTC (rev 197617)
</span><span class="lines">@@ -2105,6 +2105,7 @@
</span><span class="cx"> platform/FileSystem.cpp
</span><span class="cx"> platform/Language.cpp
</span><span class="cx"> platform/Length.cpp
</span><ins>+ platform/LengthPoint.cpp
</ins><span class="cx"> platform/LengthSize.cpp
</span><span class="cx"> platform/LinkHash.cpp
</span><span class="cx"> platform/Logging.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (197616 => 197617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-05 21:35:57 UTC (rev 197616)
+++ trunk/Source/WebCore/ChangeLog 2016-03-05 23:23:40 UTC (rev 197617)
</span><span class="lines">@@ -1,3 +1,54 @@
</span><ins>+2016-03-05 Simon Fraser <simon.fraser@apple.com>
+
+ Add parsing support for object-position
+ https://bugs.webkit.org/show_bug.cgi?id=155065
+
+ Reviewed by Sam Weinig.
+
+ Add parsing support for object-position. This is the first property with
+ CSS <position> values which does not have equivalent -x and -y shorthands,
+ so we can store it as a new LengthPoint type.
+
+ Per the CSS Values spec, bottom- and right-relative values are translated
+ into calc() expressions, which are exposed via computed style. For example,
+ "right 10px bottom" becomes "calc(100% - 10px) 100%". This also allows transitions
+ between, say, "left 10px bottom" and "right 10px bottom".
+
+ Test: fast/css/object-position/parsing-object-position.html
+
+ * CMakeLists.txt:
+ * WebCore.xcodeproj/project.pbxproj:
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::ComputedStyleExtractor::propertyValue):
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseValue):
+ * css/CSSPrimitiveValue.h:
+ (WebCore::CSSPrimitiveValue::isPair):
+ * css/CSSPropertyNames.in:
+ * css/CSSValue.h:
+ * css/StyleBuilderConverter.h:
+ (WebCore::StyleBuilderConverter::convertLength):
+ (WebCore::StyleBuilderConverter::convertTo100PercentMinusLength):
+ (WebCore::StyleBuilderConverter::convertPositionComponent):
+ (WebCore::StyleBuilderConverter::convertObjectPosition):
+ * platform/LengthPoint.cpp: Added.
+ (WebCore::operator<<):
+ * platform/LengthPoint.h: Added.
+ (WebCore::LengthPoint::LengthPoint):
+ (WebCore::LengthPoint::operator==):
+ (WebCore::LengthPoint::setX):
+ (WebCore::LengthPoint::x):
+ (WebCore::LengthPoint::setY):
+ (WebCore::LengthPoint::y):
+ (WebCore::LengthPoint::blend):
+ * rendering/style/RenderStyle.cpp:
+ (WebCore::RenderStyle::changeRequiresRepaint):
+ * rendering/style/RenderStyle.h:
+ * rendering/style/StyleRareNonInheritedData.cpp:
+ (WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
+ (WebCore::StyleRareNonInheritedData::operator==):
+ * rendering/style/StyleRareNonInheritedData.h:
+
</ins><span class="cx"> 2016-03-05 Joanmarie Diggs <jdiggs@igalia.com>
</span><span class="cx">
</span><span class="cx"> AX: Implement missing/different accessibility API mappings for SVG
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (197616 => 197617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-03-05 21:35:57 UTC (rev 197616)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-03-05 23:23:40 UTC (rev 197617)
</span><span class="lines">@@ -508,6 +508,8 @@
</span><span class="cx"> 0F6A12BD1A00923700C6DE72 /* DebugPageOverlays.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F6A12BB1A00923700C6DE72 /* DebugPageOverlays.cpp */; };
</span><span class="cx"> 0F6A12BE1A00923700C6DE72 /* DebugPageOverlays.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F6A12BC1A00923700C6DE72 /* DebugPageOverlays.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 0F7D07331884C56C00B4AF86 /* PlatformTextTrack.h in Headers */ = {isa = PBXBuildFile; fileRef = 072847E216EBC5B00043CFA4 /* PlatformTextTrack.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><ins>+ 0F87166F1C869D83004FF0DE /* LengthPoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F87166D1C869D83004FF0DE /* LengthPoint.cpp */; };
+ 0F8716701C869D83004FF0DE /* LengthPoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F87166E1C869D83004FF0DE /* LengthPoint.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 0F97A658155DA81E00FADD4C /* DisplayRefreshMonitorIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0F97A657155DA81E00FADD4C /* DisplayRefreshMonitorIOS.mm */; };
</span><span class="cx"> 0FA24D79162DF91900A3F4C0 /* GraphicsLayerUpdater.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FA24D77162DF91900A3F4C0 /* GraphicsLayerUpdater.cpp */; };
</span><span class="cx"> 0FA24D7A162DF91900A3F4C0 /* GraphicsLayerUpdater.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FA24D78162DF91900A3F4C0 /* GraphicsLayerUpdater.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -7901,6 +7903,8 @@
</span><span class="cx"> 0F6383DC18615B29003E5DB5 /* ThreadedScrollingTree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadedScrollingTree.h; sourceTree = "<group>"; };
</span><span class="cx"> 0F6A12BB1A00923700C6DE72 /* DebugPageOverlays.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DebugPageOverlays.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 0F6A12BC1A00923700C6DE72 /* DebugPageOverlays.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DebugPageOverlays.h; sourceTree = "<group>"; };
</span><ins>+ 0F87166D1C869D83004FF0DE /* LengthPoint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LengthPoint.cpp; sourceTree = "<group>"; };
+ 0F87166E1C869D83004FF0DE /* LengthPoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LengthPoint.h; sourceTree = "<group>"; };
</ins><span class="cx"> 0F97A657155DA81E00FADD4C /* DisplayRefreshMonitorIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DisplayRefreshMonitorIOS.mm; sourceTree = "<group>"; };
</span><span class="cx"> 0FA24D77162DF91900A3F4C0 /* GraphicsLayerUpdater.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GraphicsLayerUpdater.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 0FA24D78162DF91900A3F4C0 /* GraphicsLayerUpdater.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GraphicsLayerUpdater.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -22877,6 +22881,8 @@
</span><span class="cx"> BCE65BE80EACDF16007E4533 /* Length.cpp */,
</span><span class="cx"> BCE65BE90EACDF16007E4533 /* Length.h */,
</span><span class="cx"> BCFF648F0EAD15C200C1D6F7 /* LengthBox.h */,
</span><ins>+ 0F87166D1C869D83004FF0DE /* LengthPoint.cpp */,
+ 0F87166E1C869D83004FF0DE /* LengthPoint.h */,
</ins><span class="cx"> 0FEF20CD1BD4A24100128E5D /* LengthSize.cpp */,
</span><span class="cx"> BCFF64900EAD15C200C1D6F7 /* LengthSize.h */,
</span><span class="cx"> A7AD2F850EC89D07008AB002 /* LinkHash.cpp */,
</span><span class="lines">@@ -27841,6 +27847,7 @@
</span><span class="cx"> 31741AAD16636609008A5B7E /* SimulatedClickOptions.h in Headers */,
</span><span class="cx"> FD00D7A514A3F61900734011 /* SincResampler.h in Headers */,
</span><span class="cx"> 51327D6011A33A2B004F9D65 /* SinkDocument.h in Headers */,
</span><ins>+ 0F8716701C869D83004FF0DE /* LengthPoint.h in Headers */,
</ins><span class="cx"> 49E911CD0EF86D47009D0CAF /* SkewTransformOperation.h in Headers */,
</span><span class="cx"> 4150F9F112B6E0E70008C860 /* SliderThumbElement.h in Headers */,
</span><span class="cx"> 9B532EA41BA928570038A827 /* SlotAssignment.h in Headers */,
</span><span class="lines">@@ -30450,6 +30457,7 @@
</span><span class="cx"> 31078CC91880AAC9008099DC /* JSOESTextureHalfFloatLinear.cpp in Sources */,
</span><span class="cx"> 77A17AA612F28B2A004E02F6 /* JSOESVertexArrayObject.cpp in Sources */,
</span><span class="cx"> FDF6BAF8134A4C9800822920 /* JSOfflineAudioCompletionEvent.cpp in Sources */,
</span><ins>+ 0F87166F1C869D83004FF0DE /* LengthPoint.cpp in Sources */,
</ins><span class="cx"> FDA9326616703BA9008982DC /* JSOfflineAudioContext.cpp in Sources */,
</span><span class="cx"> FDEA6242152102E200479DF0 /* JSOscillatorNode.cpp in Sources */,
</span><span class="cx"> FDBD1DFC167FE27D0051A11E /* JSOscillatorNodeCustom.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (197616 => 197617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2016-03-05 21:35:57 UTC (rev 197616)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2016-03-05 23:23:40 UTC (rev 197617)
</span><span class="lines">@@ -2970,6 +2970,12 @@
</span><span class="cx"> return zoomAdjustedPixelValueForLength(style->minWidth(), *style);
</span><span class="cx"> case CSSPropertyObjectFit:
</span><span class="cx"> return cssValuePool.createValue(style->objectFit());
</span><ins>+ case CSSPropertyObjectPosition: {
+ RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
+ list->append(zoomAdjustedPixelValueForLength(style->objectPosition().x(), *style));
+ list->append(zoomAdjustedPixelValueForLength(style->objectPosition().y(), *style));
+ return list;
+ }
</ins><span class="cx"> case CSSPropertyOpacity:
</span><span class="cx"> return cssValuePool.createValue(style->opacity(), CSSPrimitiveValue::CSS_NUMBER);
</span><span class="cx"> case CSSPropertyOrphans:
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (197616 => 197617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2016-03-05 21:35:57 UTC (rev 197616)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2016-03-05 23:23:40 UTC (rev 197617)
</span><span class="lines">@@ -2886,6 +2886,16 @@
</span><span class="cx"> case CSSPropertyColumnWidth: // auto | <length>
</span><span class="cx"> parsedValue = parseColumnWidth();
</span><span class="cx"> break;
</span><ins>+ case CSSPropertyObjectPosition: {
+ RefPtr<CSSPrimitiveValue> val1;
+ RefPtr<CSSPrimitiveValue> val2;
+ parseFillPosition(*m_valueList, val1, val2);
+ if (val1) {
+ addProperty(CSSPropertyObjectPosition, createPrimitiveValuePair(val1.release(), val2.release()), important);
+ return true;
+ }
+ return false;
+ }
</ins><span class="cx"> // End of CSS3 properties
</span><span class="cx">
</span><span class="cx"> case CSSPropertyWillChange: // auto | [scroll-position | contents | <custom-ident>]#
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPrimitiveValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPrimitiveValue.h (197616 => 197617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPrimitiveValue.h 2016-03-05 21:35:57 UTC (rev 197616)
+++ trunk/Source/WebCore/css/CSSPrimitiveValue.h 2016-03-05 23:23:40 UTC (rev 197617)
</span><span class="lines">@@ -210,6 +210,7 @@
</span><span class="cx"> #if ENABLE(CSS_SCROLL_SNAP)
</span><span class="cx"> bool isLengthRepeat() const { return m_primitiveUnitType == CSS_LENGTH_REPEAT; }
</span><span class="cx"> #endif
</span><ins>+ bool isPair() const { return m_primitiveUnitType == CSS_PAIR; }
</ins><span class="cx"> bool isPropertyID() const { return m_primitiveUnitType == CSS_PROPERTY_ID; }
</span><span class="cx"> bool isRGBColor() const { return m_primitiveUnitType == CSS_RGBCOLOR; }
</span><span class="cx"> bool isShape() const { return m_primitiveUnitType == CSS_SHAPE; }
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPropertyNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (197616 => 197617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPropertyNames.in 2016-03-05 21:35:57 UTC (rev 197616)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in 2016-03-05 23:23:40 UTC (rev 197617)
</span><span class="lines">@@ -274,6 +274,7 @@
</span><span class="cx"> min-height [Initial=initialMinSize, Converter=LengthSizing]
</span><span class="cx"> min-width [Initial=initialMinSize, Converter=LengthSizing]
</span><span class="cx"> object-fit
</span><ins>+object-position [Converter=ObjectPosition]
</ins><span class="cx"> opacity
</span><span class="cx"> // Honor -webkit-opacity as a synonym for opacity. This was the only syntax that worked in Safari 1.1,
</span><span class="cx"> // and may be in use on some websites and widgets.
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleBuilderConverterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleBuilderConverter.h (197616 => 197617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleBuilderConverter.h 2016-03-05 21:35:57 UTC (rev 197616)
+++ trunk/Source/WebCore/css/StyleBuilderConverter.h 2016-03-05 23:23:40 UTC (rev 197617)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> // Note that we assume the CSS parser only allows valid CSSValue types.
</span><span class="cx"> class StyleBuilderConverter {
</span><span class="cx"> public:
</span><del>- static Length convertLength(StyleResolver&, CSSValue&);
</del><ins>+ static Length convertLength(StyleResolver&, const CSSValue&);
</ins><span class="cx"> static Length convertLengthOrAuto(StyleResolver&, CSSValue&);
</span><span class="cx"> static Length convertLengthSizing(StyleResolver&, CSSValue&);
</span><span class="cx"> static Length convertLengthMaxSizing(StyleResolver&, CSSValue&);
</span><span class="lines">@@ -64,6 +64,7 @@
</span><span class="cx"> template <typename T> static T convertLineWidth(StyleResolver&, CSSValue&);
</span><span class="cx"> static float convertSpacing(StyleResolver&, CSSValue&);
</span><span class="cx"> static LengthSize convertRadius(StyleResolver&, CSSValue&);
</span><ins>+ static LengthPoint convertObjectPosition(StyleResolver&, CSSValue&);
</ins><span class="cx"> static TextDecoration convertTextDecoration(StyleResolver&, CSSValue&);
</span><span class="cx"> template <typename T> static T convertNumber(StyleResolver&, CSSValue&);
</span><span class="cx"> template <typename T> static T convertNumberOrAuto(StyleResolver&, CSSValue&);
</span><span class="lines">@@ -147,6 +148,10 @@
</span><span class="cx"> #if ENABLE(CSS_SCROLL_SNAP)
</span><span class="cx"> static Length parseSnapCoordinate(StyleResolver&, const CSSValue&);
</span><span class="cx"> #endif
</span><ins>+
+ static Length convertTo100PercentMinusLength(const Length&);
+ static Length convertPositionComponent(StyleResolver&, const CSSPrimitiveValue&);
+
</ins><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class="cx"> static GridLength createGridTrackBreadth(CSSPrimitiveValue&, StyleResolver&);
</span><span class="cx"> static GridTrackSize createGridTrackSize(CSSValue&, StyleResolver&);
</span><span class="lines">@@ -157,7 +162,7 @@
</span><span class="cx"> static CSSToLengthConversionData csstoLengthConversionDataWithTextZoomFactor(StyleResolver&);
</span><span class="cx"> };
</span><span class="cx">
</span><del>-inline Length StyleBuilderConverter::convertLength(StyleResolver& styleResolver, CSSValue& value)
</del><ins>+inline Length StyleBuilderConverter::convertLength(StyleResolver& styleResolver, const CSSValue& value)
</ins><span class="cx"> {
</span><span class="cx"> auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
</span><span class="cx"> CSSToLengthConversionData conversionData = styleResolver.useSVGZoomRulesForLength() ?
</span><span class="lines">@@ -297,6 +302,54 @@
</span><span class="cx"> return LengthSize(radiusWidth, radiusHeight);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline Length StyleBuilderConverter::convertTo100PercentMinusLength(const Length& length)
+{
+ if (length.isPercent())
+ return Length(100 - length.value(), Percent);
+
+ // Turn this into a calc expression: calc(100% - length)
+ auto lhs = std::make_unique<CalcExpressionLength>(Length(100, Percent));
+ auto rhs = std::make_unique<CalcExpressionLength>(length);
+ auto op = std::make_unique<CalcExpressionBinaryOperation>(WTFMove(lhs), WTFMove(rhs), CalcSubtract);
+ return Length(CalculationValue::create(WTFMove(op), CalculationRangeAll));
+}
+
+inline Length StyleBuilderConverter::convertPositionComponent(StyleResolver& styleResolver, const CSSPrimitiveValue& value)
+{
+ Length length;
+
+ auto* lengthValue = &value;
+ bool relativeToTrailingEdge = false;
+
+ if (value.isPair()) {
+ auto& first = *value.getPairValue()->first();
+ if (first.getValueID() == CSSValueRight || first.getValueID() == CSSValueBottom)
+ relativeToTrailingEdge = true;
+
+ lengthValue = value.getPairValue()->second();
+ }
+
+ length = convertLength(styleResolver, *lengthValue);
+
+ if (relativeToTrailingEdge)
+ length = convertTo100PercentMinusLength(length);
+
+ return length;
+}
+
+inline LengthPoint StyleBuilderConverter::convertObjectPosition(StyleResolver& styleResolver, CSSValue& value)
+{
+ auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
+ Pair* pair = primitiveValue.getPairValue();
+ if (!pair || !pair->first() || !pair->second())
+ return RenderStyle::initialObjectPosition();
+
+ Length lengthX = convertPositionComponent(styleResolver, *pair->first());
+ Length lengthY = convertPositionComponent(styleResolver, *pair->second());
+
+ return LengthPoint(lengthX, lengthY);
+}
+
</ins><span class="cx"> inline TextDecoration StyleBuilderConverter::convertTextDecoration(StyleResolver&, CSSValue& value)
</span><span class="cx"> {
</span><span class="cx"> TextDecoration result = RenderStyle::initialTextDecoration();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformLengthPointcpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/platform/LengthPoint.cpp (0 => 197617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/LengthPoint.cpp (rev 0)
+++ trunk/Source/WebCore/platform/LengthPoint.cpp 2016-03-05 23:23:40 UTC (rev 197617)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+/*
+ * Copyright (C) 2016 Apple 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:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS 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 APPLE INC. OR ITS 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"
+#include "LengthPoint.h"
+
+#include "TextStream.h"
+
+namespace WebCore {
+
+TextStream& operator<<(TextStream& ts, const LengthPoint& size)
+{
+ return ts << size.x() << " " << size.y();
+}
+
+} // namespace WebCore
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformLengthPointh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/platform/LengthPoint.h (0 => 197617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/LengthPoint.h (rev 0)
+++ trunk/Source/WebCore/platform/LengthPoint.h 2016-03-05 23:23:40 UTC (rev 197617)
</span><span class="lines">@@ -0,0 +1,76 @@
</span><ins>+/*
+ * Copyright (C) 2016 Apple 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:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS 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 APPLE INC. OR ITS 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 LengthPoint_h
+#define LengthPoint_h
+
+#include "Length.h"
+
+namespace WebCore {
+
+struct LengthPoint {
+public:
+ LengthPoint()
+ {
+ }
+
+ LengthPoint(Length x, Length y)
+ : m_x(WTFMove(x))
+ , m_y(WTFMove(y))
+ {
+ }
+
+ bool operator==(const LengthPoint& o) const
+ {
+ return m_x == o.m_x && m_y == o.m_y;
+ }
+
+ bool operator!=(const LengthPoint& o) const
+ {
+ return !(*this == o);
+ }
+
+ void setX(Length x) { m_x = WTFMove(x); }
+ const Length& x() const { return m_x; }
+
+ void setY(Length y) { m_y = WTFMove(y); }
+ const Length& y() const { return m_y; }
+
+ LengthPoint blend(const LengthPoint& from, double progress) const
+ {
+ return LengthPoint(m_x.blend(from.x(), progress), m_y.blend(from.y(), progress));
+ }
+
+private:
+ // FIXME: it would be nice to pack the two Lengths together better somehow (to avoid padding between them).
+ Length m_x;
+ Length m_y;
+};
+
+TextStream& operator<<(TextStream&, const LengthPoint&);
+
+} // namespace WebCore
+
+#endif // LengthPoint_h
</ins></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.cpp (197616 => 197617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2016-03-05 21:35:57 UTC (rev 197616)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2016-03-05 23:23:40 UTC (rev 197617)
</span><span class="lines">@@ -809,6 +809,7 @@
</span><span class="cx"> || rareNonInheritedData->userDrag != other.rareNonInheritedData->userDrag
</span><span class="cx"> || rareNonInheritedData->m_borderFit != other.rareNonInheritedData->m_borderFit
</span><span class="cx"> || rareNonInheritedData->m_objectFit != other.rareNonInheritedData->m_objectFit
</span><ins>+ || rareNonInheritedData->m_objectPosition != other.rareNonInheritedData->m_objectPosition
</ins><span class="cx"> || rareInheritedData->m_imageRendering != other.rareInheritedData->m_imageRendering)
</span><span class="cx"> return true;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (197616 => 197617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2016-03-05 21:35:57 UTC (rev 197616)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2016-03-05 23:23:40 UTC (rev 197617)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx"> #include "Length.h"
</span><span class="cx"> #include "LengthBox.h"
</span><span class="cx"> #include "LengthFunctions.h"
</span><ins>+#include "LengthPoint.h"
</ins><span class="cx"> #include "LengthSize.h"
</span><span class="cx"> #include "LineClampValue.h"
</span><span class="cx"> #include "NinePieceImage.h"
</span><span class="lines">@@ -1031,8 +1032,9 @@
</span><span class="cx"> TextOrientation textOrientation() const { return static_cast<TextOrientation>(rareInheritedData->m_textOrientation); }
</span><span class="cx">
</span><span class="cx"> ObjectFit objectFit() const { return static_cast<ObjectFit>(rareNonInheritedData->m_objectFit); }
</span><del>-
- // Return true if any transform related property (currently transform, transformStyle3D or perspective)
</del><ins>+ LengthPoint objectPosition() const { return rareNonInheritedData->m_objectPosition; }
+
+ // Return true if any transform related property (currently transform, transformStyle3D or perspective)
</ins><span class="cx"> // indicates that we are transforming
</span><span class="cx"> bool hasTransformRelatedProperty() const { return hasTransform() || preserves3D() || hasPerspective(); }
</span><span class="cx">
</span><span class="lines">@@ -1601,6 +1603,7 @@
</span><span class="cx"> bool setTextOrientation(TextOrientation);
</span><span class="cx">
</span><span class="cx"> void setObjectFit(ObjectFit fit) { SET_VAR(rareNonInheritedData, m_objectFit, fit); }
</span><ins>+ void setObjectPosition(const LengthPoint& position) { SET_VAR(rareNonInheritedData, m_objectPosition, position); }
</ins><span class="cx">
</span><span class="cx"> void setRubyPosition(RubyPosition position) { SET_VAR(rareInheritedData, m_rubyPosition, position); }
</span><span class="cx">
</span><span class="lines">@@ -1891,6 +1894,7 @@
</span><span class="cx"> static TextOrientation initialTextOrientation() { return TextOrientation::
</span><span class="cx"> Mixed; }
</span><span class="cx"> static ObjectFit initialObjectFit() { return ObjectFitFill; }
</span><ins>+ static LengthPoint initialObjectPosition() { return LengthPoint(Length(50.0f, Percent), Length(50.0f, Percent)); }
</ins><span class="cx"> static EEmptyCell initialEmptyCells() { return SHOW; }
</span><span class="cx"> static EListStylePosition initialListStylePosition() { return OUTSIDE; }
</span><span class="cx"> static EListStyleType initialListStyleType() { return Disc; }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleRareNonInheritedDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp (197616 => 197617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp 2016-03-05 21:35:57 UTC (rev 197616)
+++ trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp 2016-03-05 23:23:40 UTC (rev 197617)
</span><span class="lines">@@ -63,6 +63,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> , m_willChange(RenderStyle::initialWillChange())
</span><span class="cx"> , m_mask(FillLayer(MaskFillLayer))
</span><ins>+ , m_objectPosition(RenderStyle::initialObjectPosition())
</ins><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><span class="cx"> , m_shapeOutside(RenderStyle::initialShapeOutside())
</span><span class="cx"> , m_shapeMargin(RenderStyle::initialShapeMargin())
</span><span class="lines">@@ -148,6 +149,7 @@
</span><span class="cx"> , m_mask(o.m_mask)
</span><span class="cx"> , m_maskBoxImage(o.m_maskBoxImage)
</span><span class="cx"> , m_pageSize(o.m_pageSize)
</span><ins>+ , m_objectPosition(o.m_objectPosition)
</ins><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><span class="cx"> , m_shapeOutside(o.m_shapeOutside)
</span><span class="cx"> , m_shapeMargin(o.m_shapeMargin)
</span><span class="lines">@@ -250,6 +252,7 @@
</span><span class="cx"> && m_mask == o.m_mask
</span><span class="cx"> && m_maskBoxImage == o.m_maskBoxImage
</span><span class="cx"> && m_pageSize == o.m_pageSize
</span><ins>+ && m_objectPosition == o.m_objectPosition
</ins><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><span class="cx"> && arePointingToEqualData(m_shapeOutside, o.m_shapeOutside)
</span><span class="cx"> && m_shapeMargin == o.m_shapeMargin
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleRareNonInheritedDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h (197616 => 197617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h 2016-03-05 21:35:57 UTC (rev 197616)
+++ trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h 2016-03-05 23:23:40 UTC (rev 197617)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "CursorData.h"
</span><span class="cx"> #include "DataRef.h"
</span><span class="cx"> #include "FillLayer.h"
</span><ins>+#include "LengthPoint.h"
</ins><span class="cx"> #include "LineClampValue.h"
</span><span class="cx"> #include "NinePieceImage.h"
</span><span class="cx"> #include "ShapeValue.h"
</span><span class="lines">@@ -154,6 +155,7 @@
</span><span class="cx"> NinePieceImage m_maskBoxImage;
</span><span class="cx">
</span><span class="cx"> LengthSize m_pageSize;
</span><ins>+ LengthPoint m_objectPosition;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><span class="cx"> RefPtr<ShapeValue> m_shapeOutside;
</span></span></pre>
</div>
</div>
</body>
</html>