<!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>[175659] trunk/Source/WebCore</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/175659">175659</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-11-05 20:09:25 -0800 (Wed, 05 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move 'size' CSS property to the new StyleBuilder
https://bugs.webkit.org/show_bug.cgi?id=138337
Reviewed by Andreas Kling.
Move 'size' CSS property from DeprecatedStyleBuilder to the new
StyleBuilder by using custom code as it requires special handling.
No new tests, new behavior change.
* css/CSSPropertyNames.in:
* css/DeprecatedStyleBuilder.cpp:
(WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder):
(WebCore::ApplyPropertyPageSize::mmLength): Deleted.
(WebCore::ApplyPropertyPageSize::inchLength): Deleted.
(WebCore::ApplyPropertyPageSize::getPageSizeFromName): Deleted.
(WebCore::ApplyPropertyPageSize::applyInheritValue): Deleted.
(WebCore::ApplyPropertyPageSize::applyInitialValue): Deleted.
(WebCore::ApplyPropertyPageSize::applyValue): Deleted.
(WebCore::ApplyPropertyPageSize::createHandler): Deleted.
* css/StyleBuilderCustom.h:
(WebCore::StyleBuilderFunctions::mmLength):
(WebCore::StyleBuilderFunctions::inchLength):
(WebCore::StyleBuilderFunctions::getPageSizeFromName):
(WebCore::StyleBuilderFunctions::applyInheritSize):
(WebCore::StyleBuilderFunctions::applyInitialSize):
(WebCore::StyleBuilderFunctions::applyValueSize):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSPropertyNamesin">trunk/Source/WebCore/css/CSSPropertyNames.in</a></li>
<li><a href="#trunkSourceWebCorecssDeprecatedStyleBuildercpp">trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleBuilderCustomh">trunk/Source/WebCore/css/StyleBuilderCustom.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (175658 => 175659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-11-06 04:06:27 UTC (rev 175658)
+++ trunk/Source/WebCore/ChangeLog 2014-11-06 04:09:25 UTC (rev 175659)
</span><span class="lines">@@ -1,5 +1,35 @@
</span><span class="cx"> 2014-11-05 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Move 'size' CSS property to the new StyleBuilder
+ https://bugs.webkit.org/show_bug.cgi?id=138337
+
+ Reviewed by Andreas Kling.
+
+ Move 'size' CSS property from DeprecatedStyleBuilder to the new
+ StyleBuilder by using custom code as it requires special handling.
+
+ No new tests, new behavior change.
+
+ * css/CSSPropertyNames.in:
+ * css/DeprecatedStyleBuilder.cpp:
+ (WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder):
+ (WebCore::ApplyPropertyPageSize::mmLength): Deleted.
+ (WebCore::ApplyPropertyPageSize::inchLength): Deleted.
+ (WebCore::ApplyPropertyPageSize::getPageSizeFromName): Deleted.
+ (WebCore::ApplyPropertyPageSize::applyInheritValue): Deleted.
+ (WebCore::ApplyPropertyPageSize::applyInitialValue): Deleted.
+ (WebCore::ApplyPropertyPageSize::applyValue): Deleted.
+ (WebCore::ApplyPropertyPageSize::createHandler): Deleted.
+ * css/StyleBuilderCustom.h:
+ (WebCore::StyleBuilderFunctions::mmLength):
+ (WebCore::StyleBuilderFunctions::inchLength):
+ (WebCore::StyleBuilderFunctions::getPageSizeFromName):
+ (WebCore::StyleBuilderFunctions::applyInheritSize):
+ (WebCore::StyleBuilderFunctions::applyInitialSize):
+ (WebCore::StyleBuilderFunctions::applyValueSize):
+
+2014-11-05 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Revert r175441 as it seems to be causing intermittent crashes in DOMTimer
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=138449
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPropertyNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (175658 => 175659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPropertyNames.in 2014-11-06 04:06:27 UTC (rev 175658)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in 2014-11-06 04:09:25 UTC (rev 175659)
</span><span class="lines">@@ -210,7 +210,7 @@
</span><span class="cx"> quotes [Inherited]
</span><span class="cx"> resize [Inherited]
</span><span class="cx"> right [NewStyleBuilder, Initial=initialOffset, Converter=LengthOrAuto]
</span><del>-size
</del><ins>+size [NewStyleBuilder, Custom=All]
</ins><span class="cx"> src
</span><span class="cx"> speak [Inherited, NewStyleBuilder]
</span><span class="cx"> table-layout [NewStyleBuilder]
</span></span></pre></div>
<a id="trunkSourceWebCorecssDeprecatedStyleBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp (175658 => 175659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-11-06 04:06:27 UTC (rev 175658)
+++ trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-11-06 04:09:25 UTC (rev 175659)
</span><span class="lines">@@ -1224,170 +1224,6 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class ApplyPropertyPageSize {
-private:
- static Length mmLength(double mm)
- {
- Ref<CSSPrimitiveValue> value(CSSPrimitiveValue::create(mm, CSSPrimitiveValue::CSS_MM));
- return value.get().computeLength<Length>(CSSToLengthConversionData());
- }
- static Length inchLength(double inch)
- {
- Ref<CSSPrimitiveValue> value(CSSPrimitiveValue::create(inch, CSSPrimitiveValue::CSS_IN));
- return value.get().computeLength<Length>(CSSToLengthConversionData());
- }
- static bool getPageSizeFromName(CSSPrimitiveValue* pageSizeName, CSSPrimitiveValue* pageOrientation, Length& width, Length& height)
- {
- static NeverDestroyed<Length> a5Width(mmLength(148));
- static NeverDestroyed<Length> a5Height(mmLength(210));
- static NeverDestroyed<Length> a4Width(mmLength(210));
- static NeverDestroyed<Length> a4Height(mmLength(297));
- static NeverDestroyed<Length> a3Width(mmLength(297));
- static NeverDestroyed<Length> a3Height(mmLength(420));
- static NeverDestroyed<Length> b5Width(mmLength(176));
- static NeverDestroyed<Length> b5Height(mmLength(250));
- static NeverDestroyed<Length> b4Width(mmLength(250));
- static NeverDestroyed<Length> b4Height(mmLength(353));
- static NeverDestroyed<Length> letterWidth(inchLength(8.5));
- static NeverDestroyed<Length> letterHeight(inchLength(11));
- static NeverDestroyed<Length> legalWidth(inchLength(8.5));
- static NeverDestroyed<Length> legalHeight(inchLength(14));
- static NeverDestroyed<Length> ledgerWidth(inchLength(11));
- static NeverDestroyed<Length> ledgerHeight(inchLength(17));
-
- if (!pageSizeName)
- return false;
-
- switch (pageSizeName->getValueID()) {
- case CSSValueA5:
- width = a5Width;
- height = a5Height;
- break;
- case CSSValueA4:
- width = a4Width;
- height = a4Height;
- break;
- case CSSValueA3:
- width = a3Width;
- height = a3Height;
- break;
- case CSSValueB5:
- width = b5Width;
- height = b5Height;
- break;
- case CSSValueB4:
- width = b4Width;
- height = b4Height;
- break;
- case CSSValueLetter:
- width = letterWidth;
- height = letterHeight;
- break;
- case CSSValueLegal:
- width = legalWidth;
- height = legalHeight;
- break;
- case CSSValueLedger:
- width = ledgerWidth;
- height = ledgerHeight;
- break;
- default:
- return false;
- }
-
- if (pageOrientation) {
- switch (pageOrientation->getValueID()) {
- case CSSValueLandscape:
- std::swap(width, height);
- break;
- case CSSValuePortrait:
- // Nothing to do.
- break;
- default:
- return false;
- }
- }
- return true;
- }
-public:
- static void applyInheritValue(CSSPropertyID, StyleResolver*) { }
- static void applyInitialValue(CSSPropertyID, StyleResolver*) { }
- static void applyValue(CSSPropertyID, StyleResolver* styleResolver, CSSValue* value)
- {
- styleResolver->style()->resetPageSizeType();
- Length width;
- Length height;
- PageSizeType pageSizeType = PAGE_SIZE_AUTO;
- if (!is<CSSValueList>(value))
- return;
-
- auto& valueList = downcast<CSSValueList>(*value);
- switch (valueList.length()) {
- case 2: {
- CSSValue* firstValue = valueList.itemWithoutBoundsCheck(0);
- CSSValue* secondValue = valueList.itemWithoutBoundsCheck(1);
- // <length>{2} | <page-size> <orientation>
- if (!is<CSSPrimitiveValue>(*firstValue) || !is<CSSPrimitiveValue>(*secondValue))
- return;
- auto& firstPrimitiveValue = downcast<CSSPrimitiveValue>(*firstValue);
- auto& secondPrimitiveValue = downcast<CSSPrimitiveValue>(*secondValue);
- if (firstPrimitiveValue.isLength()) {
- // <length>{2}
- if (!secondPrimitiveValue.isLength())
- return;
- CSSToLengthConversionData conversionData = styleResolver->state().cssToLengthConversionData().copyWithAdjustedZoom(1.0f);
- width = firstPrimitiveValue.computeLength<Length>(conversionData);
- height = secondPrimitiveValue.computeLength<Length>(conversionData);
- } else {
- // <page-size> <orientation>
- // The value order is guaranteed. See CSSParser::parseSizeParameter.
- if (!getPageSizeFromName(&firstPrimitiveValue, &secondPrimitiveValue, width, height))
- return;
- }
- pageSizeType = PAGE_SIZE_RESOLVED;
- break;
- }
- case 1: {
- CSSValue* value = valueList.itemWithoutBoundsCheck(0);
- // <length> | auto | <page-size> | [ portrait | landscape]
- if (!is<CSSPrimitiveValue>(*value))
- return;
- auto& primitiveValue = downcast<CSSPrimitiveValue>(*value);
- if (primitiveValue.isLength()) {
- // <length>
- pageSizeType = PAGE_SIZE_RESOLVED;
- width = height = primitiveValue.computeLength<Length>(styleResolver->state().cssToLengthConversionData().copyWithAdjustedZoom(1.0f));
- } else {
- switch (primitiveValue.getValueID()) {
- case 0:
- return;
- case CSSValueAuto:
- pageSizeType = PAGE_SIZE_AUTO;
- break;
- case CSSValuePortrait:
- pageSizeType = PAGE_SIZE_AUTO_PORTRAIT;
- break;
- case CSSValueLandscape:
- pageSizeType = PAGE_SIZE_AUTO_LANDSCAPE;
- break;
- default:
- // <page-size>
- pageSizeType = PAGE_SIZE_RESOLVED;
- if (!getPageSizeFromName(&primitiveValue, nullptr, width, height))
- return;
- }
- }
- break;
- }
- default:
- return;
- }
- styleResolver->style()->setPageSizeType(pageSizeType);
- styleResolver->style()->setPageSize(LengthSize(width, height));
- }
- static PropertyHandler createHandler() { return PropertyHandler(&applyInheritValue, &applyInitialValue, &applyValue); }
-};
-
</del><span class="cx"> class ApplyPropertyTextEmphasisStyle {
</span><span class="cx"> public:
</span><span class="cx"> static void applyInheritValue(CSSPropertyID, StyleResolver* styleResolver)
</span><span class="lines">@@ -1910,7 +1746,6 @@
</span><span class="cx"> setPropertyHandler(CSSPropertyOutlineColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::outlineColor, &RenderStyle::setOutlineColor, &RenderStyle::setVisitedLinkOutlineColor, &RenderStyle::color>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyOutlineStyle, ApplyPropertyOutlineStyle::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyResize, ApplyPropertyResize::createHandler());
</span><del>- setPropertyHandler(CSSPropertySize, ApplyPropertyPageSize::createHandler());
</del><span class="cx"> setPropertyHandler(CSSPropertyWebkitTextDecorationColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::textDecorationColor, &RenderStyle::setTextDecorationColor, &RenderStyle::setVisitedLinkTextDecorationColor, &RenderStyle::color>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitTextDecorationSkip, ApplyPropertyTextDecorationSkip::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitTextUnderlinePosition, ApplyPropertyTextUnderlinePosition::createHandler());
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleBuilderCustomh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleBuilderCustom.h (175658 => 175659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleBuilderCustom.h 2014-11-06 04:06:27 UTC (rev 175658)
+++ trunk/Source/WebCore/css/StyleBuilderCustom.h 2014-11-06 04:09:25 UTC (rev 175659)
</span><span class="lines">@@ -148,6 +148,166 @@
</span><span class="cx"> }
</span><span class="cx"> #endif // ENABLE(CSS_SHAPES)
</span><span class="cx">
</span><ins>+static inline Length mmLength(double mm)
+{
+ Ref<CSSPrimitiveValue> value(CSSPrimitiveValue::create(mm, CSSPrimitiveValue::CSS_MM));
+ return value.get().computeLength<Length>(CSSToLengthConversionData());
+}
+static inline Length inchLength(double inch)
+{
+ Ref<CSSPrimitiveValue> value(CSSPrimitiveValue::create(inch, CSSPrimitiveValue::CSS_IN));
+ return value.get().computeLength<Length>(CSSToLengthConversionData());
+}
+static bool getPageSizeFromName(CSSPrimitiveValue* pageSizeName, CSSPrimitiveValue* pageOrientation, Length& width, Length& height)
+{
+ static NeverDestroyed<Length> a5Width(mmLength(148));
+ static NeverDestroyed<Length> a5Height(mmLength(210));
+ static NeverDestroyed<Length> a4Width(mmLength(210));
+ static NeverDestroyed<Length> a4Height(mmLength(297));
+ static NeverDestroyed<Length> a3Width(mmLength(297));
+ static NeverDestroyed<Length> a3Height(mmLength(420));
+ static NeverDestroyed<Length> b5Width(mmLength(176));
+ static NeverDestroyed<Length> b5Height(mmLength(250));
+ static NeverDestroyed<Length> b4Width(mmLength(250));
+ static NeverDestroyed<Length> b4Height(mmLength(353));
+ static NeverDestroyed<Length> letterWidth(inchLength(8.5));
+ static NeverDestroyed<Length> letterHeight(inchLength(11));
+ static NeverDestroyed<Length> legalWidth(inchLength(8.5));
+ static NeverDestroyed<Length> legalHeight(inchLength(14));
+ static NeverDestroyed<Length> ledgerWidth(inchLength(11));
+ static NeverDestroyed<Length> ledgerHeight(inchLength(17));
+
+ if (!pageSizeName)
+ return false;
+
+ switch (pageSizeName->getValueID()) {
+ case CSSValueA5:
+ width = a5Width;
+ height = a5Height;
+ break;
+ case CSSValueA4:
+ width = a4Width;
+ height = a4Height;
+ break;
+ case CSSValueA3:
+ width = a3Width;
+ height = a3Height;
+ break;
+ case CSSValueB5:
+ width = b5Width;
+ height = b5Height;
+ break;
+ case CSSValueB4:
+ width = b4Width;
+ height = b4Height;
+ break;
+ case CSSValueLetter:
+ width = letterWidth;
+ height = letterHeight;
+ break;
+ case CSSValueLegal:
+ width = legalWidth;
+ height = legalHeight;
+ break;
+ case CSSValueLedger:
+ width = ledgerWidth;
+ height = ledgerHeight;
+ break;
+ default:
+ return false;
+ }
+
+ if (pageOrientation) {
+ switch (pageOrientation->getValueID()) {
+ case CSSValueLandscape:
+ std::swap(width, height);
+ break;
+ case CSSValuePortrait:
+ // Nothing to do.
+ break;
+ default:
+ return false;
+ }
+ }
+ return true;
+}
+
+inline void applyInheritSize(StyleResolver&) { }
+inline void applyInitialSize(StyleResolver&) { }
+inline void applyValueSize(StyleResolver& styleResolver, CSSValue& value)
+{
+ styleResolver.style()->resetPageSizeType();
+ Length width;
+ Length height;
+ PageSizeType pageSizeType = PAGE_SIZE_AUTO;
+ if (!is<CSSValueList>(value))
+ return;
+
+ auto& valueList = downcast<CSSValueList>(value);
+ switch (valueList.length()) {
+ case 2: {
+ CSSValue* firstValue = valueList.itemWithoutBoundsCheck(0);
+ CSSValue* secondValue = valueList.itemWithoutBoundsCheck(1);
+ // <length>{2} | <page-size> <orientation>
+ if (!is<CSSPrimitiveValue>(*firstValue) || !is<CSSPrimitiveValue>(*secondValue))
+ return;
+ auto& firstPrimitiveValue = downcast<CSSPrimitiveValue>(*firstValue);
+ auto& secondPrimitiveValue = downcast<CSSPrimitiveValue>(*secondValue);
+ if (firstPrimitiveValue.isLength()) {
+ // <length>{2}
+ if (!secondPrimitiveValue.isLength())
+ return;
+ CSSToLengthConversionData conversionData = styleResolver.state().cssToLengthConversionData().copyWithAdjustedZoom(1.0f);
+ width = firstPrimitiveValue.computeLength<Length>(conversionData);
+ height = secondPrimitiveValue.computeLength<Length>(conversionData);
+ } else {
+ // <page-size> <orientation>
+ // The value order is guaranteed. See CSSParser::parseSizeParameter.
+ if (!getPageSizeFromName(&firstPrimitiveValue, &secondPrimitiveValue, width, height))
+ return;
+ }
+ pageSizeType = PAGE_SIZE_RESOLVED;
+ break;
+ }
+ case 1: {
+ CSSValue* value = valueList.itemWithoutBoundsCheck(0);
+ // <length> | auto | <page-size> | [ portrait | landscape]
+ if (!is<CSSPrimitiveValue>(*value))
+ return;
+ auto& primitiveValue = downcast<CSSPrimitiveValue>(*value);
+ if (primitiveValue.isLength()) {
+ // <length>
+ pageSizeType = PAGE_SIZE_RESOLVED;
+ width = height = primitiveValue.computeLength<Length>(styleResolver.state().cssToLengthConversionData().copyWithAdjustedZoom(1.0f));
+ } else {
+ switch (primitiveValue.getValueID()) {
+ case 0:
+ return;
+ case CSSValueAuto:
+ pageSizeType = PAGE_SIZE_AUTO;
+ break;
+ case CSSValuePortrait:
+ pageSizeType = PAGE_SIZE_AUTO_PORTRAIT;
+ break;
+ case CSSValueLandscape:
+ pageSizeType = PAGE_SIZE_AUTO_LANDSCAPE;
+ break;
+ default:
+ // <page-size>
+ pageSizeType = PAGE_SIZE_RESOLVED;
+ if (!getPageSizeFromName(&primitiveValue, nullptr, width, height))
+ return;
+ }
+ }
+ break;
+ }
+ default:
+ return;
+ }
+ styleResolver.style()->setPageSizeType(pageSizeType);
+ styleResolver.style()->setPageSize(LengthSize(width, height));
+}
+
</ins><span class="cx"> } // namespace StyleBuilderFunctions
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>