<!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>[177616] 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/177616">177616</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-12-19 19:41:47 -0800 (Fri, 19 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix initial / inherit support for '-webkit-perspective-origin' CSS property
https://bugs.webkit.org/show_bug.cgi?id=139843
Reviewed by Simon Fraser.
Source/WebCore:
Fix initial / inherit support for '-webkit-perspective-origin' CSS
property. These previously had no effect.
This patch updates the code to be consistent with
'-webkit-transform-origin' and gets rid of the code in
DeprecatedStyleBuilder as it isn't used.
Test: fast/css/perspective-origin-initial-inherit.html
* css/DeprecatedStyleBuilder.cpp:
(WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder):
(WebCore::ApplyPropertyPerspectiveOrigin::applyInheritValue): Deleted.
(WebCore::ApplyPropertyPerspectiveOrigin::applyInitialValue): Deleted.
(WebCore::ApplyPropertyPerspectiveOrigin::applyValue): Deleted.
(WebCore::ApplyPropertyPerspectiveOrigin::createHandler): Deleted.
* css/StyleProperties.cpp:
(WebCore::StyleProperties::getPropertyValue):
(WebCore::StyleProperties::asText):
* css/StylePropertyShorthand.cpp:
(WebCore::webkitPerspectiveOriginShorthand):
(WebCore::shorthandForProperty):
(WebCore::matchingShorthandsForLonghand):
* css/StylePropertyShorthand.h:
* css/StyleResolver.cpp:
(WebCore::StyleResolver::applyProperty):
LayoutTests:
Add layout test to cover 'initial' / 'inherit' support for
'-webkit-perspective-origin' CSS property.
* fast/css/perspective-origin-initial-inherit-expected.txt: Added.
* fast/css/perspective-origin-initial-inherit.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssDeprecatedStyleBuildercpp">trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStylePropertiescpp">trunk/Source/WebCore/css/StyleProperties.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStylePropertyShorthandcpp">trunk/Source/WebCore/css/StylePropertyShorthand.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStylePropertyShorthandh">trunk/Source/WebCore/css/StylePropertyShorthand.h</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcssperspectiveorigininitialinheritexpectedtxt">trunk/LayoutTests/fast/css/perspective-origin-initial-inherit-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssperspectiveorigininitialinherithtml">trunk/LayoutTests/fast/css/perspective-origin-initial-inherit.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (177615 => 177616)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2014-12-20 02:39:28 UTC (rev 177615)
+++ trunk/LayoutTests/ChangeLog        2014-12-20 03:41:47 UTC (rev 177616)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-12-19 Chris Dumez <cdumez@apple.com>
+
+ Fix initial / inherit support for '-webkit-perspective-origin' CSS property
+ https://bugs.webkit.org/show_bug.cgi?id=139843
+
+ Reviewed by Simon Fraser.
+
+ Add layout test to cover 'initial' / 'inherit' support for
+ '-webkit-perspective-origin' CSS property.
+
+ * fast/css/perspective-origin-initial-inherit-expected.txt: Added.
+ * fast/css/perspective-origin-initial-inherit.html: Added.
+
</ins><span class="cx"> 2014-12-19 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (177368): Some tests started to immediately time out
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssperspectiveorigininitialinheritexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/perspective-origin-initial-inherit-expected.txt (0 => 177616)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/perspective-origin-initial-inherit-expected.txt         (rev 0)
+++ trunk/LayoutTests/fast/css/perspective-origin-initial-inherit-expected.txt        2014-12-20 03:41:47 UTC (rev 177616)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+Tests that setting -webkit-perspective-origin property is corrected parsed / computed.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS getComputedStyle(parentDiv)['-webkit-perspective'] is "150px"
+PASS getComputedStyle(parentDiv)['-webkit-perspective-origin'] is "10px 10px"
+PASS getComputedStyle(parentDiv)['-webkit-perspective-origin-x'] is ""
+PASS getComputedStyle(parentDiv)['-webkit-perspective-origin-y'] is ""
+PASS getComputedStyle(testDiv)['-webkit-perspective'] is "100px"
+PASS getComputedStyle(testDiv)['-webkit-perspective-origin'] is "5px 5px"
+PASS getComputedStyle(testDiv)['-webkit-perspective-origin-x'] is ""
+PASS getComputedStyle(testDiv)['-webkit-perspective-origin-y'] is ""
+PASS getComputedStyle(noShortHandDiv)['-webkit-perspective'] is "200px"
+PASS getComputedStyle(noShortHandDiv)['-webkit-perspective-origin'] is "15px 15px"
+PASS getComputedStyle(noShortHandDiv)['-webkit-perspective-origin-x'] is ""
+PASS getComputedStyle(noShortHandDiv)['-webkit-perspective-origin-y'] is ""
+testDiv.style['-webkit-perspective-origin'] = 'inherit'
+PASS getComputedStyle(testDiv)['-webkit-perspective-origin'] is "10px 10px"
+testDiv.style['-webkit-perspective-origin'] = 'initial'
+PASS getComputedStyle(testDiv)['-webkit-perspective-origin'] is "100px 100px"
+testDiv.style['-webkit-perspective-origin'] = '20px 20px'
+PASS getComputedStyle(testDiv)['-webkit-perspective-origin'] is "20px 20px"
+noShortHandDiv.style['-webkit-perspective-origin'] = 'inherit'
+PASS getComputedStyle(noShortHandDiv)['-webkit-perspective-origin'] is "10px 10px"
+noShortHandDiv.style['-webkit-perspective-origin'] = 'initial'
+PASS getComputedStyle(noShortHandDiv)['-webkit-perspective-origin'] is "150px 150px"
+noShortHandDiv.style['-webkit-perspective-origin'] = '20px 20px'
+PASS getComputedStyle(noShortHandDiv)['-webkit-perspective-origin'] is "20px 20px"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssperspectiveorigininitialinherithtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/perspective-origin-initial-inherit.html (0 => 177616)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/perspective-origin-initial-inherit.html         (rev 0)
+++ trunk/LayoutTests/fast/css/perspective-origin-initial-inherit.html        2014-12-20 03:41:47 UTC (rev 177616)
</span><span class="lines">@@ -0,0 +1,59 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+<div id="parentDiv" style="-webkit-perspective: 150px; -webkit-perspective-origin: 10px 10px; width: 400px; height: 400px">
+ <div id="testDiv" style="-webkit-perspective: 100px; -webkit-perspective-origin: 5px 5px; width: 200px; height: 200px"></div>
+ <div id="noShortHandDiv" style="-webkit-perspective: 200px; -webkit-perspective-origin: 15px 15px; width: 300px; height: 300px"></div>
+</div>
+<script>
+description("Tests that setting -webkit-perspective-origin property is corrected parsed / computed.");
+
+var parentDiv = document.getElementById("parentDiv");
+var testDiv = document.getElementById("testDiv");
+var noShortHandDiv = document.getElementById("noShortHandDiv");
+
+shouldBeEqualToString("getComputedStyle(parentDiv)['-webkit-perspective']", "150px");
+shouldBeEqualToString("getComputedStyle(parentDiv)['-webkit-perspective-origin']", "10px 10px");
+// Not implemented.
+shouldBeEmptyString("getComputedStyle(parentDiv)['-webkit-perspective-origin-x']");
+shouldBeEmptyString("getComputedStyle(parentDiv)['-webkit-perspective-origin-y']");
+
+shouldBeEqualToString("getComputedStyle(testDiv)['-webkit-perspective']", "100px");
+shouldBeEqualToString("getComputedStyle(testDiv)['-webkit-perspective-origin']", "5px 5px");
+// Not implemented.
+shouldBeEmptyString("getComputedStyle(testDiv)['-webkit-perspective-origin-x']");
+shouldBeEmptyString("getComputedStyle(testDiv)['-webkit-perspective-origin-y']");
+
+shouldBeEqualToString("getComputedStyle(noShortHandDiv)['-webkit-perspective']", "200px");
+shouldBeEqualToString("getComputedStyle(noShortHandDiv)['-webkit-perspective-origin']", "15px 15px");
+// Not implemented.
+shouldBeEmptyString("getComputedStyle(noShortHandDiv)['-webkit-perspective-origin-x']");
+shouldBeEmptyString("getComputedStyle(noShortHandDiv)['-webkit-perspective-origin-y']");
+
+evalAndLog("testDiv.style['-webkit-perspective-origin'] = 'inherit'");
+shouldBeEqualToString("getComputedStyle(testDiv)['-webkit-perspective-origin']", "10px 10px");
+
+evalAndLog("testDiv.style['-webkit-perspective-origin'] = 'initial'");
+// Initial is '50% 50%' -> '100px 100px', because width / height are 100px.
+shouldBeEqualToString("getComputedStyle(testDiv)['-webkit-perspective-origin']", "100px 100px");
+
+evalAndLog("testDiv.style['-webkit-perspective-origin'] = '20px 20px'");
+shouldBeEqualToString("getComputedStyle(testDiv)['-webkit-perspective-origin']", "20px 20px");
+
+evalAndLog("noShortHandDiv.style['-webkit-perspective-origin'] = 'inherit'");
+shouldBeEqualToString("getComputedStyle(noShortHandDiv)['-webkit-perspective-origin']", "10px 10px");
+
+evalAndLog("noShortHandDiv.style['-webkit-perspective-origin'] = 'initial'");
+// Initial is '50% 50%' -> '150px 150px', because width / height are 300px.
+shouldBeEqualToString("getComputedStyle(noShortHandDiv)['-webkit-perspective-origin']", "150px 150px");
+
+evalAndLog("noShortHandDiv.style['-webkit-perspective-origin'] = '20px 20px'");
+shouldBeEqualToString("getComputedStyle(noShortHandDiv)['-webkit-perspective-origin']", "20px 20px");
+
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177615 => 177616)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-12-20 02:39:28 UTC (rev 177615)
+++ trunk/Source/WebCore/ChangeLog        2014-12-20 03:41:47 UTC (rev 177616)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2014-12-19 Chris Dumez <cdumez@apple.com>
+
+ Fix initial / inherit support for '-webkit-perspective-origin' CSS property
+ https://bugs.webkit.org/show_bug.cgi?id=139843
+
+ Reviewed by Simon Fraser.
+
+ Fix initial / inherit support for '-webkit-perspective-origin' CSS
+ property. These previously had no effect.
+
+ This patch updates the code to be consistent with
+ '-webkit-transform-origin' and gets rid of the code in
+ DeprecatedStyleBuilder as it isn't used.
+
+ Test: fast/css/perspective-origin-initial-inherit.html
+
+ * css/DeprecatedStyleBuilder.cpp:
+ (WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder):
+ (WebCore::ApplyPropertyPerspectiveOrigin::applyInheritValue): Deleted.
+ (WebCore::ApplyPropertyPerspectiveOrigin::applyInitialValue): Deleted.
+ (WebCore::ApplyPropertyPerspectiveOrigin::applyValue): Deleted.
+ (WebCore::ApplyPropertyPerspectiveOrigin::createHandler): Deleted.
+ * css/StyleProperties.cpp:
+ (WebCore::StyleProperties::getPropertyValue):
+ (WebCore::StyleProperties::asText):
+ * css/StylePropertyShorthand.cpp:
+ (WebCore::webkitPerspectiveOriginShorthand):
+ (WebCore::shorthandForProperty):
+ (WebCore::matchingShorthandsForLonghand):
+ * css/StylePropertyShorthand.h:
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::applyProperty):
+
</ins><span class="cx"> 2014-12-19 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r177599.
</span></span></pre></div>
<a id="trunkSourceWebCorecssDeprecatedStyleBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp (177615 => 177616)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp        2014-12-20 02:39:28 UTC (rev 177615)
+++ trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp        2014-12-20 03:41:47 UTC (rev 177616)
</span><span class="lines">@@ -41,48 +41,6 @@
</span><span class="cx">
</span><span class="cx"> using namespace HTMLNames;
</span><span class="cx">
</span><del>-class ApplyPropertyPerspectiveOrigin {
-public:
- template <CSSPropertyID id>
- static inline void applyInheritValue(CSSPropertyID propertyID, StyleResolver* styleResolver)
- {
- // FIXME: This doesn't seem to do anything as CSSPropertyWebkitPerspectiveOriginX
- // and CSSPropertyWebkitPerspectiveOriginY don't have a property handler.
- const DeprecatedStyleBuilder& table = DeprecatedStyleBuilder::sharedStyleBuilder();
- const PropertyHandler& handler = table.propertyHandler(id);
- if (handler.isValid())
- handler.applyInheritValue(propertyID, styleResolver);
- }
-
- static void applyInheritValue(CSSPropertyID propertyID, StyleResolver* styleResolver)
- {
- applyInheritValue<CSSPropertyWebkitPerspectiveOriginX>(propertyID, styleResolver);
- applyInheritValue<CSSPropertyWebkitPerspectiveOriginY>(propertyID, styleResolver);
- }
-
- template <CSSPropertyID id>
- static inline void applyInitialValue(CSSPropertyID propertyID, StyleResolver* styleResolver)
- {
- // FIXME: This doesn't seem to do anything as CSSPropertyWebkitPerspectiveOriginX
- // and CSSPropertyWebkitPerspectiveOriginY don't have a property handler.
- const DeprecatedStyleBuilder& table = DeprecatedStyleBuilder::sharedStyleBuilder();
- const PropertyHandler& handler = table.propertyHandler(id);
- if (handler.isValid())
- handler.applyInitialValue(propertyID, styleResolver);
- }
-
- static void applyInitialValue(CSSPropertyID propertyID, StyleResolver* styleResolver)
- {
- applyInitialValue<CSSPropertyWebkitPerspectiveOriginX>(propertyID, styleResolver);
- applyInitialValue<CSSPropertyWebkitPerspectiveOriginY>(propertyID, styleResolver);
- }
-
- static void applyValue(CSSPropertyID, StyleResolver*, CSSValue*)
- { }
-
- static PropertyHandler createHandler() { return PropertyHandler(&applyInheritValue, &applyInitialValue, &applyValue); }
-};
-
</del><span class="cx"> enum AutoValueType {Number = 0, ComputeLength};
</span><span class="cx"> template <typename T, T (RenderStyle::*getterFunction)() const, void (RenderStyle::*setterFunction)(T), bool (RenderStyle::*hasAutoFunction)() const, void (RenderStyle::*setAutoFunction)(), AutoValueType valueType = Number, int autoIdentity = CSSValueAuto>
</span><span class="cx"> class ApplyPropertyAuto {
</span><span class="lines">@@ -670,7 +628,6 @@
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitMaskRepeatY, ApplyPropertyFillLayer<EFillRepeat, CSSPropertyWebkitMaskRepeatY, MaskFillLayer, &RenderStyle::accessMaskLayers, &RenderStyle::maskLayers, &FillLayer::isRepeatYSet, &FillLayer::repeatY, &FillLayer::setRepeatY, &FillLayer::clearRepeatY, &FillLayer::initialFillRepeatY, &CSSToStyleMap::mapFillRepeatY>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitMaskSize, ApplyPropertyFillLayer<FillSize, CSSPropertyWebkitMaskSize, MaskFillLayer, &RenderStyle::accessMaskLayers, &RenderStyle::maskLayers, &FillLayer::isSizeSet, &FillLayer::size, &FillLayer::setSize, &FillLayer::clearSize, &FillLayer::initialFillSize, &CSSToStyleMap::mapFillSize>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitMaskSourceType, ApplyPropertyFillLayer<EMaskSourceType, CSSPropertyWebkitMaskSourceType, MaskFillLayer, &RenderStyle::accessMaskLayers, &RenderStyle::maskLayers, &FillLayer::isMaskSourceTypeSet, &FillLayer::maskSourceType, &FillLayer::setMaskSourceType, &FillLayer::clearMaskSourceType, &FillLayer::initialMaskSourceType, &CSSToStyleMap::mapFillMaskSourceType>::createHandler());
</span><del>- setPropertyHandler(CSSPropertyWebkitPerspectiveOrigin, ApplyPropertyPerspectiveOrigin::createHandler());
</del><span class="cx"> setPropertyHandler(CSSPropertyWebkitTextEmphasisColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::textEmphasisColor, &RenderStyle::setTextEmphasisColor, &RenderStyle::setVisitedLinkTextEmphasisColor, &RenderStyle::color>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitTextFillColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::textFillColor, &RenderStyle::setTextFillColor, &RenderStyle::setVisitedLinkTextFillColor, &RenderStyle::color>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitTextStrokeColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::textStrokeColor, &RenderStyle::setTextStrokeColor, &RenderStyle::setVisitedLinkTextStrokeColor, &RenderStyle::color>::createHandler());
</span></span></pre></div>
<a id="trunkSourceWebCorecssStylePropertiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleProperties.cpp (177615 => 177616)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleProperties.cpp        2014-12-20 02:39:28 UTC (rev 177615)
+++ trunk/Source/WebCore/css/StyleProperties.cpp        2014-12-20 03:41:47 UTC (rev 177616)
</span><span class="lines">@@ -199,6 +199,8 @@
</span><span class="cx"> return getShorthandValue(webkitTextEmphasisShorthand());
</span><span class="cx"> case CSSPropertyWebkitTextStroke:
</span><span class="cx"> return getShorthandValue(webkitTextStrokeShorthand());
</span><ins>+ case CSSPropertyWebkitPerspectiveOrigin:
+ return getShorthandValue(webkitPerspectiveOriginShorthand());
</ins><span class="cx"> case CSSPropertyWebkitTransformOrigin:
</span><span class="cx"> return getShorthandValue(webkitTransformOriginShorthand());
</span><span class="cx"> case CSSPropertyWebkitTransition:
</span><span class="lines">@@ -926,6 +928,10 @@
</span><span class="cx"> case CSSPropertyWebkitMaskOrigin:
</span><span class="cx"> shorthandPropertyID = CSSPropertyWebkitMask;
</span><span class="cx"> break;
</span><ins>+ case CSSPropertyWebkitPerspectiveOriginX:
+ case CSSPropertyWebkitPerspectiveOriginY:
+ shorthandPropertyID = CSSPropertyWebkitPerspectiveOrigin;
+ break;
</ins><span class="cx"> case CSSPropertyWebkitTransformOriginX:
</span><span class="cx"> case CSSPropertyWebkitTransformOriginY:
</span><span class="cx"> case CSSPropertyWebkitTransformOriginZ:
</span></span></pre></div>
<a id="trunkSourceWebCorecssStylePropertyShorthandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StylePropertyShorthand.cpp (177615 => 177616)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StylePropertyShorthand.cpp        2014-12-20 02:39:28 UTC (rev 177615)
+++ trunk/Source/WebCore/css/StylePropertyShorthand.cpp        2014-12-20 03:41:47 UTC (rev 177616)
</span><span class="lines">@@ -509,6 +509,15 @@
</span><span class="cx"> return StylePropertyShorthand(CSSPropertyWebkitTransition, transitionProperties, WTF_ARRAY_LENGTH(transitionProperties));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+StylePropertyShorthand webkitPerspectiveOriginShorthand()
+{
+ static const CSSPropertyID perspectiveOriginProperties[] = {
+ CSSPropertyWebkitPerspectiveOriginX,
+ CSSPropertyWebkitPerspectiveOriginY
+ };
+ return StylePropertyShorthand(CSSPropertyWebkitPerspectiveOrigin, perspectiveOriginProperties, WTF_ARRAY_LENGTH(perspectiveOriginProperties));
+}
+
</ins><span class="cx"> StylePropertyShorthand webkitTransformOriginShorthand()
</span><span class="cx"> {
</span><span class="cx"> static const CSSPropertyID transformOriginProperties[] = {
</span><span class="lines">@@ -627,6 +636,8 @@
</span><span class="cx"> return webkitMaskPositionShorthand();
</span><span class="cx"> case CSSPropertyWebkitMaskRepeat:
</span><span class="cx"> return webkitMaskRepeatShorthand();
</span><ins>+ case CSSPropertyWebkitPerspectiveOrigin:
+ return webkitPerspectiveOriginShorthand();
</ins><span class="cx"> case CSSPropertyWebkitTextEmphasis:
</span><span class="cx"> return webkitTextEmphasisShorthand();
</span><span class="cx"> case CSSPropertyWebkitTextStroke:
</span><span class="lines">@@ -850,6 +861,9 @@
</span><span class="cx"> case CSSPropertyWebkitMaskRepeatX:
</span><span class="cx"> case CSSPropertyWebkitMaskRepeatY:
</span><span class="cx"> return makeVector(webkitMaskRepeatShorthand());
</span><ins>+ case CSSPropertyWebkitPerspectiveOriginX:
+ case CSSPropertyWebkitPerspectiveOriginY:
+ return makeVector(webkitPerspectiveOriginShorthand());
</ins><span class="cx"> case CSSPropertyWebkitTextEmphasisStyle:
</span><span class="cx"> case CSSPropertyWebkitTextEmphasisColor:
</span><span class="cx"> return makeVector(webkitTextEmphasisShorthand());
</span></span></pre></div>
<a id="trunkSourceWebCorecssStylePropertyShorthandh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StylePropertyShorthand.h (177615 => 177616)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StylePropertyShorthand.h        2014-12-20 02:39:28 UTC (rev 177615)
+++ trunk/Source/WebCore/css/StylePropertyShorthand.h        2014-12-20 03:41:47 UTC (rev 177616)
</span><span class="lines">@@ -110,6 +110,7 @@
</span><span class="cx"> StylePropertyShorthand webkitMaskShorthand();
</span><span class="cx"> StylePropertyShorthand webkitMaskPositionShorthand();
</span><span class="cx"> StylePropertyShorthand webkitMaskRepeatShorthand();
</span><ins>+StylePropertyShorthand webkitPerspectiveOriginShorthand();
</ins><span class="cx"> StylePropertyShorthand webkitTextEmphasisShorthand();
</span><span class="cx"> StylePropertyShorthand webkitTextStrokeShorthand();
</span><span class="cx"> StylePropertyShorthand webkitTransitionShorthand();
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (177615 => 177616)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp        2014-12-20 02:39:28 UTC (rev 177615)
+++ trunk/Source/WebCore/css/StyleResolver.cpp        2014-12-20 03:41:47 UTC (rev 177616)
</span><span class="lines">@@ -2426,6 +2426,7 @@
</span><span class="cx"> case CSSPropertyWebkitMask:
</span><span class="cx"> case CSSPropertyWebkitMaskPosition:
</span><span class="cx"> case CSSPropertyWebkitMaskRepeat:
</span><ins>+ case CSSPropertyWebkitPerspectiveOrigin:
</ins><span class="cx"> case CSSPropertyWebkitTextEmphasis:
</span><span class="cx"> case CSSPropertyWebkitTextStroke:
</span><span class="cx"> case CSSPropertyWebkitTransition:
</span><span class="lines">@@ -3040,7 +3041,6 @@
</span><span class="cx"> case CSSPropertyWebkitMaskSourceType:
</span><span class="cx"> case CSSPropertyWebkitNbspMode:
</span><span class="cx"> case CSSPropertyWebkitPerspective:
</span><del>- case CSSPropertyWebkitPerspectiveOrigin:
</del><span class="cx"> case CSSPropertyWebkitPerspectiveOriginX:
</span><span class="cx"> case CSSPropertyWebkitPerspectiveOriginY:
</span><span class="cx"> case CSSPropertyWebkitPrintColorAdjust:
</span></span></pre>
</div>
</div>
</body>
</html>