<!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>[69220] 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/69220">69220</a></dd>
<dt>Author</dt> <dd>hyatt@apple.com</dd>
<dt>Date</dt> <dd>2010-10-06 12:02:34 -0700 (Wed, 06 Oct 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>https://bugs.webkit.org/show_bug.cgi?id=47285

Reviewed by Dan Bernstein.

Update to the latest writing-mode draft. The block-flow property is gone and has been replaced with writing-mode.
Change all the code to use writingMode() instead of blockFlow() and rename all functions that referred to block flow
as appropriate.

WebCore: 

* css/CSSComputedStyleDeclaration.cpp:
(WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
* css/CSSParser.cpp:
(WebCore::CSSParser::parseValue):
* css/CSSPrimitiveValueMappings.h:
(WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
(WebCore::CSSPrimitiveValue::operator WritingMode):
(WebCore::CSSPrimitiveValue::operator SVGWritingMode):
* css/CSSProperty.cpp:
(WebCore::resolveToPhysicalProperty):
(WebCore::CSSProperty::resolveDirectionAwareProperty):
* css/CSSProperty.h:
* css/CSSPropertyNames.in:
* css/CSSStyleSelector.cpp:
(WebCore::CSSStyleSelector::styleForDocument):
(WebCore::CSSStyleSelector::adjustRenderStyle):
(WebCore::CSSStyleSelector::applyDeclarations):
(WebCore::CSSStyleSelector::applyProperty):
* css/CSSValueKeywords.in:
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::MarginInfo::MarginInfo):
(WebCore::RenderBlock::expandsToEncloseOverhangingFloats):
(WebCore::RenderBlock::setLogicalLeftForChild):
(WebCore::RenderBlock::setLogicalTopForChild):
(WebCore::RenderBlock::layoutBlockChild):
(WebCore::RenderBlock::insertFloatingObject):
(WebCore::RenderBlock::addOverhangingFloats):
(WebCore::RenderBlock::addIntrudingFloats):
(WebCore::RenderBlock::collapsedMarginBeforeForChild):
(WebCore::RenderBlock::collapsedMarginAfterForChild):
(WebCore::RenderBlock::marginBeforeForChild):
(WebCore::RenderBlock::marginAfterForChild):
(WebCore::RenderBlock::marginStartForChild):
(WebCore::RenderBlock::marginEndForChild):
(WebCore::RenderBlock::setMarginStartForChild):
(WebCore::RenderBlock::setMarginEndForChild):
(WebCore::RenderBlock::setMarginBeforeForChild):
(WebCore::RenderBlock::setMarginAfterForChild):
(WebCore::RenderBlock::marginValuesForChild):
* rendering/RenderBlock.h:
(WebCore::RenderBlock::logicalWidthForChild):
(WebCore::RenderBlock::logicalHeightForChild):
(WebCore::RenderBlock::logicalTopForChild):
(WebCore::RenderBlock::logicalRightOffsetForContent):
(WebCore::RenderBlock::logicalLeftOffsetForContent):
(WebCore::RenderBlock::logicalTopForFloat):
(WebCore::RenderBlock::logicalBottomForFloat):
(WebCore::RenderBlock::logicalLeftForFloat):
(WebCore::RenderBlock::logicalRightForFloat):
(WebCore::RenderBlock::logicalWidthForFloat):
(WebCore::RenderBlock::setLogicalTopForFloat):
(WebCore::RenderBlock::setLogicalLeftForFloat):
(WebCore::RenderBlock::setLogicalHeightForFloat):
(WebCore::RenderBlock::setLogicalWidthForFloat):
* rendering/RenderBox.cpp:
(WebCore::RenderBox::marginBefore):
(WebCore::RenderBox::marginAfter):
(WebCore::RenderBox::marginStart):
(WebCore::RenderBox::marginEnd):
(WebCore::RenderBox::setMarginStart):
(WebCore::RenderBox::setMarginEnd):
(WebCore::RenderBox::setMarginBefore):
(WebCore::RenderBox::setMarginAfter):
(WebCore::RenderBox::styleDidChange):
(WebCore::RenderBox::perpendicularContainingBlockLogicalHeight):
(WebCore::RenderBox::computeLogicalWidth):
(WebCore::RenderBox::computeLogicalHeight):
(WebCore::RenderBox::availableLogicalHeightUsing):
(WebCore::RenderBox::avoidsFloats):
* rendering/RenderBox.h:
(WebCore::RenderBox::logicalLeft):
(WebCore::RenderBox::logicalTop):
(WebCore::RenderBox::logicalWidth):
(WebCore::RenderBox::logicalHeight):
(WebCore::RenderBox::setLogicalLeft):
(WebCore::RenderBox::setLogicalTop):
(WebCore::RenderBox::setLogicalWidth):
(WebCore::RenderBox::setLogicalHeight):
(WebCore::RenderBox::setLogicalLocation):
(WebCore::RenderBox::contentLogicalWidth):
(WebCore::RenderBox::contentLogicalHeight):
(WebCore::RenderBox::stretchesToViewport):
(WebCore::RenderBox::intrinsicLogicalWidth):
(WebCore::RenderBox::intrinsicLogicalHeight):
(WebCore::RenderBox::availableWidth):
(WebCore::RenderBox::availableHeight):
(WebCore::RenderBox::scrollbarLogicalHeight):
(WebCore::RenderBox::isWritingModeRoot):
* rendering/RenderFieldset.cpp:
(WebCore::RenderFieldset::paintBoxDecorations):
(WebCore::RenderFieldset::paintMask):
* rendering/RenderImage.cpp:
(WebCore::RenderImage::computeReplacedLogicalWidth):
(WebCore::RenderImage::computeReplacedLogicalHeight):
* rendering/RenderInline.cpp:
(WebCore::RenderInline::marginLeft):
(WebCore::RenderInline::marginRight):
(WebCore::RenderInline::marginTop):
(WebCore::RenderInline::marginBottom):
* rendering/RenderTableCell.cpp:
(WebCore::RenderTableCell::paddingTop):
(WebCore::RenderTableCell::paddingBottom):
(WebCore::RenderTableCell::paddingLeft):
(WebCore::RenderTableCell::paddingRight):
* rendering/RenderView.h:
(WebCore::RenderView::viewLogicalWidth):
(WebCore::RenderView::viewLogicalHeight):
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::RootInlineBox):
* rendering/style/RenderStyle.cpp:
(WebCore::RenderStyle::diff):
(WebCore::RenderStyle::logicalWidth):
(WebCore::RenderStyle::logicalHeight):
(WebCore::RenderStyle::logicalMinWidth):
(WebCore::RenderStyle::logicalMaxWidth):
(WebCore::RenderStyle::logicalMinHeight):
(WebCore::RenderStyle::logicalMaxHeight):
(WebCore::RenderStyle::borderBeforeWidth):
(WebCore::RenderStyle::borderAfterWidth):
(WebCore::RenderStyle::borderStartWidth):
(WebCore::RenderStyle::borderEndWidth):
(WebCore::RenderStyle::marginBefore):
(WebCore::RenderStyle::marginAfter):
(WebCore::RenderStyle::marginBeforeUsing):
(WebCore::RenderStyle::marginAfterUsing):
(WebCore::RenderStyle::marginStart):
(WebCore::RenderStyle::marginEnd):
(WebCore::RenderStyle::marginStartUsing):
(WebCore::RenderStyle::marginEndUsing):
(WebCore::RenderStyle::paddingBefore):
(WebCore::RenderStyle::paddingAfter):
(WebCore::RenderStyle::paddingStart):
(WebCore::RenderStyle::paddingEnd):
* rendering/style/RenderStyle.h:
(WebCore::InheritedFlags::setBitDefaults):
(WebCore::InheritedFlags::writingMode):
(WebCore::InheritedFlags::isHorizontalWritingMode):
(WebCore::InheritedFlags::setWritingMode):
(WebCore::InheritedFlags::initialWritingMode):
* rendering/style/RenderStyleConstants.h:
* rendering/style/SVGRenderStyle.h:
(WebCore::SVGRenderStyle::initialWritingMode):
(WebCore::SVGRenderStyle::setWritingMode):
(WebCore::SVGRenderStyle::writingMode):
* rendering/style/SVGRenderStyleDefs.h:

LayoutTests: 

Also hacked all of the getComputedStyle tests to just omit dashboard regions so that the results can be
cross-platform.

* fast/blockflow/auto-margins-across-boundaries.html:
* fast/blockflow/block-formatting-context.html:
* fast/blockflow/block-level-images.html:
* fast/blockflow/display-mutation.html:
* fast/blockflow/fieldsets.html:
* fast/blockflow/floats-in-block-layout.html:
* fast/blockflow/inline-direction-positioning.html:
* fast/blockflow/margin-collapse.html:
* fast/blockflow/percentage-padding.html:
* fast/blockflow/relative-positioning-percentages.html:
* fast/blockflow/root-lr-basic.html:
* fast/blockflow/self-collapsing-block.html:
* fast/css/getComputedStyle/computed-style-expected.txt:
* fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
* fast/css/getComputedStyle/computed-style-without-renderer.html:
* fast/css/getComputedStyle/computed-style.html:
* fast/css/logical-property-resolution.html:
* platform/mac/fast/css/getComputedStyle/computed-style-expected.txt: Removed.
* platform/mac/svg/css/getComputedStyle-basic-expected.checksum: Removed.
* platform/mac/svg/css/getComputedStyle-basic-expected.png: Removed.
* platform/win/fast/css/getComputedStyle/computed-style-expected.txt: Removed.
* platform/win/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt: Removed.
* svg/css/getComputedStyle-basic-expected.txt:
* svg/css/getComputedStyle-basic.xhtml:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastblockflowautomarginsacrossboundarieshtml">trunk/LayoutTests/fast/blockflow/auto-margins-across-boundaries.html</a></li>
<li><a href="#trunkLayoutTestsfastblockflowblockformattingcontexthtml">trunk/LayoutTests/fast/blockflow/block-formatting-context.html</a></li>
<li><a href="#trunkLayoutTestsfastblockflowblocklevelimageshtml">trunk/LayoutTests/fast/blockflow/block-level-images.html</a></li>
<li><a href="#trunkLayoutTestsfastblockflowdisplaymutationhtml">trunk/LayoutTests/fast/blockflow/display-mutation.html</a></li>
<li><a href="#trunkLayoutTestsfastblockflowfieldsetshtml">trunk/LayoutTests/fast/blockflow/fieldsets.html</a></li>
<li><a href="#trunkLayoutTestsfastblockflowfloatsinblocklayouthtml">trunk/LayoutTests/fast/blockflow/floats-in-block-layout.html</a></li>
<li><a href="#trunkLayoutTestsfastblockflowinlinedirectionpositioninghtml">trunk/LayoutTests/fast/blockflow/inline-direction-positioning.html</a></li>
<li><a href="#trunkLayoutTestsfastblockflowmargincollapsehtml">trunk/LayoutTests/fast/blockflow/margin-collapse.html</a></li>
<li><a href="#trunkLayoutTestsfastblockflowpercentagepaddinghtml">trunk/LayoutTests/fast/blockflow/percentage-padding.html</a></li>
<li><a href="#trunkLayoutTestsfastblockflowrelativepositioningpercentageshtml">trunk/LayoutTests/fast/blockflow/relative-positioning-percentages.html</a></li>
<li><a href="#trunkLayoutTestsfastblockflowrootlrbasichtml">trunk/LayoutTests/fast/blockflow/root-lr-basic.html</a></li>
<li><a href="#trunkLayoutTestsfastblockflowselfcollapsingblockhtml">trunk/LayoutTests/fast/blockflow/self-collapsing-block.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgetComputedStylecomputedstyleexpectedtxt">trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgetComputedStylecomputedstylewithoutrendererexpectedtxt">trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgetComputedStylecomputedstylewithoutrendererhtml">trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgetComputedStylecomputedstylehtml">trunk/LayoutTests/fast/css/getComputedStyle/computed-style.html</a></li>
<li><a href="#trunkLayoutTestsfastcsslogicalpropertyresolutionhtml">trunk/LayoutTests/fast/css/logical-property-resolution.html</a></li>
<li><a href="#trunkLayoutTestssvgcssgetComputedStylebasicexpectedtxt">trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt</a></li>
<li><a href="#trunkLayoutTestssvgcssgetComputedStylebasicxhtml">trunk/LayoutTests/svg/css/getComputedStyle-basic.xhtml</a></li>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCorecssCSSComputedStyleDeclarationcpp">trunk/WebCore/css/CSSComputedStyleDeclaration.cpp</a></li>
<li><a href="#trunkWebCorecssCSSParsercpp">trunk/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#trunkWebCorecssCSSPrimitiveValueMappingsh">trunk/WebCore/css/CSSPrimitiveValueMappings.h</a></li>
<li><a href="#trunkWebCorecssCSSPropertycpp">trunk/WebCore/css/CSSProperty.cpp</a></li>
<li><a href="#trunkWebCorecssCSSPropertyh">trunk/WebCore/css/CSSProperty.h</a></li>
<li><a href="#trunkWebCorecssCSSPropertyNamesin">trunk/WebCore/css/CSSPropertyNames.in</a></li>
<li><a href="#trunkWebCorecssCSSStyleSelectorcpp">trunk/WebCore/css/CSSStyleSelector.cpp</a></li>
<li><a href="#trunkWebCorecssCSSValueKeywordsin">trunk/WebCore/css/CSSValueKeywords.in</a></li>
<li><a href="#trunkWebCorerenderingRenderBlockcpp">trunk/WebCore/rendering/RenderBlock.cpp</a></li>
<li><a href="#trunkWebCorerenderingRenderBlockh">trunk/WebCore/rendering/RenderBlock.h</a></li>
<li><a href="#trunkWebCorerenderingRenderBoxcpp">trunk/WebCore/rendering/RenderBox.cpp</a></li>
<li><a href="#trunkWebCorerenderingRenderBoxh">trunk/WebCore/rendering/RenderBox.h</a></li>
<li><a href="#trunkWebCorerenderingRenderFieldsetcpp">trunk/WebCore/rendering/RenderFieldset.cpp</a></li>
<li><a href="#trunkWebCorerenderingRenderImagecpp">trunk/WebCore/rendering/RenderImage.cpp</a></li>
<li><a href="#trunkWebCorerenderingRenderInlinecpp">trunk/WebCore/rendering/RenderInline.cpp</a></li>
<li><a href="#trunkWebCorerenderingRenderTableCellcpp">trunk/WebCore/rendering/RenderTableCell.cpp</a></li>
<li><a href="#trunkWebCorerenderingRenderViewh">trunk/WebCore/rendering/RenderView.h</a></li>
<li><a href="#trunkWebCorerenderingRootInlineBoxcpp">trunk/WebCore/rendering/RootInlineBox.cpp</a></li>
<li><a href="#trunkWebCorerenderingstyleRenderStylecpp">trunk/WebCore/rendering/style/RenderStyle.cpp</a></li>
<li><a href="#trunkWebCorerenderingstyleRenderStyleh">trunk/WebCore/rendering/style/RenderStyle.h</a></li>
<li><a href="#trunkWebCorerenderingstyleRenderStyleConstantsh">trunk/WebCore/rendering/style/RenderStyleConstants.h</a></li>
<li><a href="#trunkWebCorerenderingstyleSVGRenderStyleh">trunk/WebCore/rendering/style/SVGRenderStyle.h</a></li>
<li><a href="#trunkWebCorerenderingstyleSVGRenderStyleDefsh">trunk/WebCore/rendering/style/SVGRenderStyleDefs.h</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsplatformmacfastcssgetComputedStylecomputedstyleexpectedtxt">trunk/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacsvgcssgetComputedStylebasicexpectedchecksum">trunk/LayoutTests/platform/mac/svg/css/getComputedStyle-basic-expected.checksum</a></li>
<li><a href="#trunkLayoutTestsplatformmacsvgcssgetComputedStylebasicexpectedpng">trunk/LayoutTests/platform/mac/svg/css/getComputedStyle-basic-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformwinfastcssgetComputedStylecomputedstyleexpectedtxt">trunk/LayoutTests/platform/win/fast/css/getComputedStyle/computed-style-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformwinfastcssgetComputedStylecomputedstylewithoutrendererexpectedtxt">trunk/LayoutTests/platform/win/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (69219 => 69220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2010-10-06 18:59:27 UTC (rev 69219)
+++ trunk/LayoutTests/ChangeLog        2010-10-06 19:02:34 UTC (rev 69220)
</span><span class="lines">@@ -1,3 +1,41 @@
</span><ins>+2010-10-06  David Hyatt  &lt;hyatt@apple.com&gt;
+
+        Reviewed by Dan Bernstein.
+
+        https://bugs.webkit.org/show_bug.cgi?id=47285
+
+        Update to the latest writing-mode draft. The block-flow property is gone and has been replaced with writing-mode.
+        Change all the code to use writingMode() instead of blockFlow() and rename all functions that referred to block flow
+        as appropriate.
+
+        Also hacked all of the getComputedStyle tests to just omit dashboard regions so that the results can be
+        cross-platform.
+
+        * fast/blockflow/auto-margins-across-boundaries.html:
+        * fast/blockflow/block-formatting-context.html:
+        * fast/blockflow/block-level-images.html:
+        * fast/blockflow/display-mutation.html:
+        * fast/blockflow/fieldsets.html:
+        * fast/blockflow/floats-in-block-layout.html:
+        * fast/blockflow/inline-direction-positioning.html:
+        * fast/blockflow/margin-collapse.html:
+        * fast/blockflow/percentage-padding.html:
+        * fast/blockflow/relative-positioning-percentages.html:
+        * fast/blockflow/root-lr-basic.html:
+        * fast/blockflow/self-collapsing-block.html:
+        * fast/css/getComputedStyle/computed-style-expected.txt:
+        * fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
+        * fast/css/getComputedStyle/computed-style-without-renderer.html:
+        * fast/css/getComputedStyle/computed-style.html:
+        * fast/css/logical-property-resolution.html:
+        * platform/mac/fast/css/getComputedStyle/computed-style-expected.txt: Removed.
+        * platform/mac/svg/css/getComputedStyle-basic-expected.checksum: Removed.
+        * platform/mac/svg/css/getComputedStyle-basic-expected.png: Removed.
+        * platform/win/fast/css/getComputedStyle/computed-style-expected.txt: Removed.
+        * platform/win/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt: Removed.
+        * svg/css/getComputedStyle-basic-expected.txt:
+        * svg/css/getComputedStyle-basic.xhtml:
+
</ins><span class="cx"> 2010-10-06  Albert J. Wong  &lt;ajwong@chromium.org&gt;
</span><span class="cx"> 
</span><span class="cx">         [chromium] Unreviewed. Build fix.
</span></span></pre></div>
<a id="trunkLayoutTestsfastblockflowautomarginsacrossboundarieshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/blockflow/auto-margins-across-boundaries.html (69219 => 69220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/blockflow/auto-margins-across-boundaries.html        2010-10-06 18:59:27 UTC (rev 69219)
+++ trunk/LayoutTests/fast/blockflow/auto-margins-across-boundaries.html        2010-10-06 19:02:34 UTC (rev 69220)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> &lt;html&gt;
</span><span class="cx"> &lt;head&gt;
</span><span class="cx"> &lt;style&gt;
</span><del>-.lr { -webkit-block-flow: lr; block-flow: lr; background-color:green; margin-left:auto; margin-right:auto; width:100px; height:100px; }
</del><ins>+.lr { -webkit-writing-mode: vertical-lr; background-color:green; margin-left:auto; margin-right:auto; width:100px; height:100px; }
</ins><span class="cx"> &lt;/style&gt;
</span><span class="cx"> &lt;/head&gt;
</span><span class="cx"> &lt;body&gt;
</span></span></pre></div>
<a id="trunkLayoutTestsfastblockflowblockformattingcontexthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/blockflow/block-formatting-context.html (69219 => 69220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/blockflow/block-formatting-context.html        2010-10-06 18:59:27 UTC (rev 69219)
+++ trunk/LayoutTests/fast/blockflow/block-formatting-context.html        2010-10-06 19:02:34 UTC (rev 69220)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> &lt;html&gt;
</span><span class="cx"> &lt;head&gt;
</span><span class="cx"> &lt;style&gt;
</span><del>-.lr { -webkit-block-flow: lr; block-flow: lr; background-color:green; margin:10px; width:100px; height:100px; }
</del><ins>+.lr { -webkit-writing-mode: vertical-lr; background-color:green; margin:10px; width:100px; height:100px; }
</ins><span class="cx"> .float { width:100px; height:100px; background-color:blue; float:left}
</span><span class="cx"> body { margin: 0 }
</span><span class="cx"> &lt;/style&gt;
</span></span></pre></div>
<a id="trunkLayoutTestsfastblockflowblocklevelimageshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/blockflow/block-level-images.html (69219 => 69220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/blockflow/block-level-images.html        2010-10-06 18:59:27 UTC (rev 69219)
+++ trunk/LayoutTests/fast/blockflow/block-level-images.html        2010-10-06 19:02:34 UTC (rev 69220)
</span><span class="lines">@@ -1,12 +1,12 @@
</span><span class="cx"> &lt;!doctype html&gt;
</span><del>-&lt;div style=&quot;margin:2px; float:left; height:300px;border:2px solid black;-webkit-writing-mode:tb-lr; writing-mode:tb-lr&quot;&gt;
</del><ins>+&lt;div style=&quot;margin:2px; float:left; height:300px;border:2px solid black;-webkit-writing-mode:vertical-lr&quot;&gt;
</ins><span class="cx"> &lt;div style=&quot;width:25px;background-color:green&quot;&gt;&lt;/div&gt;
</span><span class="cx"> &lt;img style=&quot;display:block;height:50%; -webkit-border-before:2px solid maroon; -webkit-border-after:2px solid maroon; -webkit-border-start: 1px solid purple; -webkit-border-end:5px dashed grey&quot; src=&quot;resources/circle.svg&quot;&gt;
</span><span class="cx"> &lt;img style=&quot;-webkit-margin-start: 40px; display:block;height:50px&quot; src=&quot;resources/oval.png&quot;&gt;
</span><span class="cx"> &lt;div style=&quot;width:25px;background-color:green&quot;&gt;&lt;/div&gt;
</span><span class="cx"> &lt;/div&gt;
</span><span class="cx"> 
</span><del>-&lt;div style=&quot;margin:2px; float:left; height:300px;border:2px solid black;-webkit-writing-mode:bt-lr; writing-mode:bt-lr&quot;&gt;
</del><ins>+&lt;div style=&quot;margin:2px; float:left; height:300px;border:2px solid black;-webkit-writing-mode:vertical-lr; direction:rtl&quot;&gt;
</ins><span class="cx"> &lt;div style=&quot;width:25px;background-color:green&quot;&gt;&lt;/div&gt;
</span><span class="cx"> &lt;img style=&quot;display:block;height:50%; -webkit-border-before:2px solid maroon; -webkit-border-after:2px solid maroon; -webkit-border-start: 1px solid purple; -webkit-border-end:5px dashed grey&quot; src=&quot;resources/circle.svg&quot;&gt;
</span><span class="cx"> &lt;img style=&quot;-webkit-margin-start: 40px; display:block;height:50px&quot; src=&quot;resources/oval.png&quot;&gt;
</span></span></pre></div>
<a id="trunkLayoutTestsfastblockflowdisplaymutationhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/blockflow/display-mutation.html (69219 => 69220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/blockflow/display-mutation.html        2010-10-06 18:59:27 UTC (rev 69219)
+++ trunk/LayoutTests/fast/blockflow/display-mutation.html        2010-10-06 19:02:34 UTC (rev 69220)
</span><span class="lines">@@ -15,5 +15,5 @@
</span><span class="cx"> &lt;/script&gt;
</span><span class="cx"> &lt;/head&gt;
</span><span class="cx"> &lt;body onload=&quot;runTest()&quot;&gt;
</span><del>-&lt;span id=&quot;test&quot; style=&quot;-webkit-block-flow:lr&quot;&gt;&lt;/span&gt;
</del><ins>+&lt;span id=&quot;test&quot; style=&quot;-webkit-writing-mode:vertical-lr&quot;&gt;&lt;/span&gt;
</ins><span class="cx"> &lt;div id=&quot;console&quot;&gt;&lt;/div&gt;
</span></span></pre></div>
<a id="trunkLayoutTestsfastblockflowfieldsetshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/blockflow/fieldsets.html (69219 => 69220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/blockflow/fieldsets.html        2010-10-06 18:59:27 UTC (rev 69219)
+++ trunk/LayoutTests/fast/blockflow/fieldsets.html        2010-10-06 19:02:34 UTC (rev 69220)
</span><span class="lines">@@ -53,15 +53,15 @@
</span><span class="cx"> 
</span><span class="cx"> Vertical LTR fieldset with left/center/right text-align: &lt;br&gt;
</span><span class="cx"> 
</span><del>-&lt;fieldset style=&quot;-webkit-block-flow:lr;&quot;&gt;
</del><ins>+&lt;fieldset style=&quot;-webkit-writing-mode:vertical-lr&quot;&gt;
</ins><span class="cx"> &lt;legend style=&quot;text-align:left; margin-top:20px&quot;&gt;&lt;div&gt;&lt;/div&gt;&lt;/legend&gt;
</span><span class="cx"> &lt;/fieldset&gt;
</span><span class="cx"> 
</span><del>-&lt;fieldset style=&quot;-webkit-block-flow:lr;&quot;&gt;
</del><ins>+&lt;fieldset style=&quot;-webkit-writing-mode:vertical-lr&quot;&gt;
</ins><span class="cx"> &lt;legend style=&quot;text-align:right; margin-bottom:20px&quot;&gt;&lt;div&gt;&lt;/div&gt;&lt;/legend&gt;
</span><span class="cx"> &lt;/fieldset&gt;
</span><span class="cx"> 
</span><del>-&lt;fieldset style=&quot;-webkit-block-flow:lr;&quot;&gt;
</del><ins>+&lt;fieldset style=&quot;-webkit-writing-mode:vertical-lr&quot;&gt;
</ins><span class="cx"> &lt;legend style=&quot;text-align:center&quot;&gt;&lt;div&gt;&lt;/div&gt;&lt;/legend&gt;
</span><span class="cx"> &lt;/fieldset&gt;
</span><span class="cx"> 
</span><span class="lines">@@ -70,14 +70,14 @@
</span><span class="cx"> 
</span><span class="cx"> Vertical RTL fieldset with left/center/right text-align: &lt;br&gt;
</span><span class="cx"> 
</span><del>-&lt;fieldset dir=rtl style=&quot;-webkit-block-flow:lr;&quot;&gt;
</del><ins>+&lt;fieldset dir=rtl style=&quot;-webkit-writing-mode:vertical-lr&quot;&gt;
</ins><span class="cx"> &lt;legend style=&quot;text-align:left; margin-top:20px&quot;&gt;&lt;div&gt;&lt;/div&gt;&lt;/legend&gt;
</span><span class="cx"> &lt;/fieldset&gt;
</span><span class="cx"> 
</span><del>-&lt;fieldset dir=rtl style=&quot;-webkit-block-flow:lr;&quot;&gt;
</del><ins>+&lt;fieldset dir=rtl style=&quot;-webkit-writing-mode:vertical-lr&quot;&gt;
</ins><span class="cx"> &lt;legend style=&quot;text-align:right; margin-bottom:20px&quot;&gt;&lt;div&gt;&lt;/div&gt;&lt;/legend&gt;
</span><span class="cx"> &lt;/fieldset&gt;
</span><span class="cx"> 
</span><del>-&lt;fieldset dir=rtl style=&quot;-webkit-block-flow:lr;&quot;&gt;
</del><ins>+&lt;fieldset dir=rtl style=&quot;-webkit-writing-mode:vertical-lr&quot;&gt;
</ins><span class="cx"> &lt;legend style=&quot;text-align:center&quot;&gt;&lt;div&gt;&lt;/div&gt;&lt;/legend&gt;
</span><span class="cx"> &lt;/fieldset&gt;
</span></span></pre></div>
<a id="trunkLayoutTestsfastblockflowfloatsinblocklayouthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/blockflow/floats-in-block-layout.html (69219 => 69220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/blockflow/floats-in-block-layout.html        2010-10-06 18:59:27 UTC (rev 69219)
+++ trunk/LayoutTests/fast/blockflow/floats-in-block-layout.html        2010-10-06 19:02:34 UTC (rev 69220)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> &lt;!doctype html&gt;
</span><span class="cx"> &lt;html&gt;
</span><del>-&lt;body style=&quot;-webkit-writing-mode:tb-lr; writing-mode:tb-lr;&quot;&gt;
</del><ins>+&lt;body style=&quot;-webkit-writing-mode:vertical-lr&quot;&gt;
</ins><span class="cx"> &lt;div style=&quot;width:100px; background-color:yellow&quot;&gt;&lt;/div&gt;
</span><span class="cx"> &lt;div style=&quot;float:left;width:100px;height:100px;background-color:green; margin-top:10px;&quot;&gt;&lt;/div&gt;
</span><span class="cx"> &lt;div style=&quot;float:right;width:100px;height:100px;background-color:green; margin-bottom:10px&quot;&gt;&lt;/div&gt;
</span></span></pre></div>
<a id="trunkLayoutTestsfastblockflowinlinedirectionpositioninghtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/blockflow/inline-direction-positioning.html (69219 => 69220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/blockflow/inline-direction-positioning.html        2010-10-06 18:59:27 UTC (rev 69219)
+++ trunk/LayoutTests/fast/blockflow/inline-direction-positioning.html        2010-10-06 19:02:34 UTC (rev 69220)
</span><span class="lines">@@ -1,9 +1,9 @@
</span><span class="cx"> &lt;html&gt;
</span><span class="cx"> &lt;body&gt;
</span><span class="cx"> &lt;div style=&quot;border:2px solid black;width:600px;&quot;&gt;
</span><del>-&lt;div style=&quot;-webkit-writing-mode: tb-lr; writing-mode:tb-lr; width:100px; height:100px; margin-left:50px; background-color:green&quot;&gt;&lt;/div&gt;
</del><ins>+&lt;div style=&quot;-webkit-writing-mode:vertical-lr; width:100px; height:100px; margin-left:50px; background-color:green&quot;&gt;&lt;/div&gt;
</ins><span class="cx"> &lt;/div&gt;
</span><span class="cx"> 
</span><span class="cx"> &lt;div style=&quot;border:2px solid black;width:600px;direction:rtl&quot;&gt;
</span><del>-&lt;div style=&quot;-webkit-writing-mode: tb-lr; writing-mode:tb-lr; width:100px; height:100px; margin-right:50px; background-color:green&quot;&gt;&lt;/div&gt;
</del><ins>+&lt;div style=&quot;-webkit-writing-mode:vertical-lr; width:100px; height:100px; margin-right:50px; background-color:green&quot;&gt;&lt;/div&gt;
</ins><span class="cx"> &lt;/div&gt;
</span></span></pre></div>
<a id="trunkLayoutTestsfastblockflowmargincollapsehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/blockflow/margin-collapse.html (69219 => 69220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/blockflow/margin-collapse.html        2010-10-06 18:59:27 UTC (rev 69219)
+++ trunk/LayoutTests/fast/blockflow/margin-collapse.html        2010-10-06 19:02:34 UTC (rev 69220)
</span><span class="lines">@@ -5,9 +5,9 @@
</span><span class="cx"> &lt;/style&gt;
</span><span class="cx"> &lt;body&gt;
</span><span class="cx"> &lt;div style=&quot;border:2px solid black&quot;&gt;
</span><del>-&lt;div style=&quot;-webkit-block-flow:lr&quot; class=&quot;block&quot;&gt;&lt;/div&gt;
-&lt;div style=&quot;-webkit-block-flow:rl&quot; class=&quot;block&quot;&gt;&lt;/div&gt;
-&lt;div style=&quot;-webkit-block-flow:bt&quot; class=&quot;block&quot;&gt;&lt;/div&gt;
</del><ins>+&lt;div style=&quot;-webkit-writing-mode:vertical-lr&quot; class=&quot;block&quot;&gt;&lt;/div&gt;
+&lt;div style=&quot;-webkit-writing-mode:vertical-rl&quot; class=&quot;block&quot;&gt;&lt;/div&gt;
+&lt;div style=&quot;-webkit-writing-mode:horizontal-bt&quot; class=&quot;block&quot;&gt;&lt;/div&gt;
</ins><span class="cx"> &lt;div class=&quot;block&quot;&gt;&lt;/div&gt;
</span><span class="cx"> &lt;/div&gt;
</span><span class="cx"> &lt;/body&gt;
</span></span></pre></div>
<a id="trunkLayoutTestsfastblockflowpercentagepaddinghtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/blockflow/percentage-padding.html (69219 => 69220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/blockflow/percentage-padding.html        2010-10-06 18:59:27 UTC (rev 69219)
+++ trunk/LayoutTests/fast/blockflow/percentage-padding.html        2010-10-06 19:02:34 UTC (rev 69220)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> &lt;/style&gt;
</span><span class="cx"> &lt;/head&gt;
</span><span class="cx"> &lt;body&gt;
</span><del>-&lt;div style=&quot;width:100px;height:200px; -webkit-block-flow:lr;&quot;&gt;
</del><ins>+&lt;div style=&quot;width:100px;height:200px; -webkit-writing-mode:vertical-lr&quot;&gt;
</ins><span class="cx"> &lt;div id=&quot;test&quot; class=&quot;block&quot;&gt;&lt;/div&gt;
</span><span class="cx"> &lt;/div&gt;
</span><span class="cx"> &lt;div id=&quot;console&quot;&gt;&lt;/div&gt;
</span></span></pre></div>
<a id="trunkLayoutTestsfastblockflowrelativepositioningpercentageshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/blockflow/relative-positioning-percentages.html (69219 => 69220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/blockflow/relative-positioning-percentages.html        2010-10-06 18:59:27 UTC (rev 69219)
+++ trunk/LayoutTests/fast/blockflow/relative-positioning-percentages.html        2010-10-06 19:02:34 UTC (rev 69220)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> &lt;html&gt;
</span><span class="cx"> &lt;head&gt;
</span><span class="cx"> &lt;style&gt;
</span><del>-.lr { -webkit-block-flow: lr; block-flow: lr; background-color:green; width:100px; height:100px; position:relative; top:50%; }
</del><ins>+.lr { -webkit-writing-mode:vertical-lr; background-color:green; width:100px; height:100px; position:relative; top:50%; }
</ins><span class="cx"> &lt;/style&gt;
</span><span class="cx"> &lt;/head&gt;
</span><span class="cx"> &lt;body&gt;
</span></span></pre></div>
<a id="trunkLayoutTestsfastblockflowrootlrbasichtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/blockflow/root-lr-basic.html (69219 => 69220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/blockflow/root-lr-basic.html        2010-10-06 18:59:27 UTC (rev 69219)
+++ trunk/LayoutTests/fast/blockflow/root-lr-basic.html        2010-10-06 19:02:34 UTC (rev 69220)
</span><span class="lines">@@ -1,2 +1,2 @@
</span><span class="cx"> &lt;!doctype html&gt;
</span><del>-&lt;html style=&quot;overflow:hidden; -webkit-block-flow:lr; -webkit-logical-height:100px; border:2px solid black&quot;&gt;&lt;/html&gt;
</del><ins>+&lt;html style=&quot;overflow:hidden; -webkit-writing-mode:vertical-lr; -webkit-logical-height:100px; border:2px solid black&quot;&gt;&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestsfastblockflowselfcollapsingblockhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/blockflow/self-collapsing-block.html (69219 => 69220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/blockflow/self-collapsing-block.html        2010-10-06 18:59:27 UTC (rev 69219)
+++ trunk/LayoutTests/fast/blockflow/self-collapsing-block.html        2010-10-06 19:02:34 UTC (rev 69220)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> &lt;!doctype html&gt;
</span><span class="cx"> &lt;html&gt;
</span><del>-&lt;body style=&quot;-webkit-writing-mode:tb-lr; writing-mode:tb-lr&quot;&gt;
</del><ins>+&lt;body style=&quot;-webkit-writing-mode:vertical-lr&quot;&gt;
</ins><span class="cx"> &lt;div style=&quot;width:100px;background-color:green&quot;&gt;&lt;/div&gt;
</span><span class="cx"> &lt;div style=&quot;height:100px;margin-left:100px;margin-right:100px&quot;&gt;&lt;/div&gt;
</span><span class="cx"> &lt;div style=&quot;width:100px;background-color:green&quot;&gt;&lt;/div&gt;
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgetComputedStylecomputedstyleexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt (69219 => 69220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt        2010-10-06 18:59:27 UTC (rev 69219)
+++ trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt        2010-10-06 19:02:34 UTC (rev 69220)
</span><span class="lines">@@ -1,11 +1,16 @@
</span><span class="cx"> Attributes that are exposed in the CSS computed style object:
</span><span class="cx"> 
</span><span class="cx"> background-attachment: scroll;
</span><ins>+background-clip: border-box;
</ins><span class="cx"> background-color: rgba(0, 0, 0, 0);
</span><span class="cx"> background-image: none;
</span><ins>+background-origin: padding-box;
</ins><span class="cx"> background-position: 0% 0%;
</span><span class="cx"> background-repeat: repeat;
</span><ins>+background-size: auto auto;
</ins><span class="cx"> border-bottom-color: rgb(0, 0, 0);
</span><ins>+border-bottom-left-radius: 0px;
+border-bottom-right-radius: 0px;
</ins><span class="cx"> border-bottom-style: none;
</span><span class="cx"> border-bottom-width: 0px;
</span><span class="cx"> border-collapse: separate;
</span><span class="lines">@@ -16,11 +21,14 @@
</span><span class="cx"> border-right-style: none;
</span><span class="cx"> border-right-width: 0px;
</span><span class="cx"> border-top-color: rgb(0, 0, 0);
</span><ins>+border-top-left-radius: 0px;
+border-top-right-radius: 0px;
</ins><span class="cx"> border-top-style: none;
</span><span class="cx"> border-top-width: 0px;
</span><span class="cx"> bottom: auto;
</span><span class="cx"> caption-side: top;
</span><span class="cx"> clear: none;
</span><ins>+clip: auto;
</ins><span class="cx"> color: rgb(0, 0, 0);
</span><span class="cx"> cursor: auto;
</span><span class="cx"> direction: ltr;
</span><span class="lines">@@ -65,10 +73,12 @@
</span><span class="cx"> position: static;
</span><span class="cx"> resize: none;
</span><span class="cx"> right: auto;
</span><ins>+speak: normal;
</ins><span class="cx"> table-layout: auto;
</span><span class="cx"> text-align: -webkit-auto;
</span><span class="cx"> text-decoration: none;
</span><span class="cx"> text-indent: 0px;
</span><ins>+text-rendering: auto;
</ins><span class="cx"> text-shadow: none;
</span><span class="cx"> text-overflow: clip;
</span><span class="cx"> text-transform: none;
</span><span class="lines">@@ -79,6 +89,7 @@
</span><span class="cx"> white-space: normal;
</span><span class="cx"> widows: 2;
</span><span class="cx"> width: 784px;
</span><ins>+word-break: normal;
</ins><span class="cx"> word-spacing: 0px;
</span><span class="cx"> word-wrap: normal;
</span><span class="cx"> z-index: auto;
</span><span class="lines">@@ -89,6 +100,7 @@
</span><span class="cx"> -webkit-animation-fill-mode: none;
</span><span class="cx"> -webkit-animation-iteration-count: 1;
</span><span class="cx"> -webkit-animation-name: none;
</span><ins>+-webkit-animation-play-state: running;
</ins><span class="cx"> -webkit-animation-timing-function: cubic-bezier(0.25, 0.1, 0.25, 1);
</span><span class="cx"> -webkit-appearance: none;
</span><span class="cx"> -webkit-backface-visibility: visible;
</span><span class="lines">@@ -96,10 +108,9 @@
</span><span class="cx"> -webkit-background-composite: source-over;
</span><span class="cx"> -webkit-background-origin: padding-box;
</span><span class="cx"> -webkit-background-size: auto auto;
</span><del>--webkit-block-flow: tb;
</del><span class="cx"> -webkit-border-fit: border;
</span><ins>+-webkit-border-horizontal-spacing: 0px;
</ins><span class="cx"> -webkit-border-image: none;
</span><del>--webkit-border-horizontal-spacing: 0px;
</del><span class="cx"> -webkit-border-vertical-spacing: 0px;
</span><span class="cx"> -webkit-box-align: stretch;
</span><span class="cx"> -webkit-box-direction: normal;
</span><span class="lines">@@ -112,6 +123,7 @@
</span><span class="cx"> -webkit-box-reflect: none;
</span><span class="cx"> -webkit-box-shadow: none;
</span><span class="cx"> -webkit-box-sizing: content-box;
</span><ins>+-webkit-color-correction: default;
</ins><span class="cx"> -webkit-column-break-after: auto;
</span><span class="cx"> -webkit-column-break-before: auto;
</span><span class="cx"> -webkit-column-break-inside: auto;
</span><span class="lines">@@ -122,23 +134,24 @@
</span><span class="cx"> -webkit-column-rule-width: 0px;
</span><span class="cx"> -webkit-column-span: 1;
</span><span class="cx"> -webkit-column-width: auto;
</span><ins>+-webkit-font-smoothing: auto;
</ins><span class="cx"> -webkit-highlight: none;
</span><span class="cx"> -webkit-line-break: normal;
</span><span class="cx"> -webkit-line-clamp: none;
</span><del>--webkit-margin-bottom-collapse: collapse;
--webkit-margin-top-collapse: collapse;
</del><ins>+-webkit-margin-before-collapse: collapse;
+-webkit-margin-after-collapse: collapse;
</ins><span class="cx"> -webkit-marquee-direction: auto;
</span><span class="cx"> -webkit-marquee-increment: 6px;
</span><span class="cx"> -webkit-marquee-repetition: infinite;
</span><span class="cx"> -webkit-marquee-style: scroll;
</span><span class="cx"> -webkit-mask-attachment: scroll;
</span><span class="cx"> -webkit-mask-box-image: none;
</span><ins>+-webkit-mask-clip: border-box;
+-webkit-mask-composite: source-over;
</ins><span class="cx"> -webkit-mask-image: none;
</span><ins>+-webkit-mask-origin: border-box;
</ins><span class="cx"> -webkit-mask-position: 0% 0%;
</span><span class="cx"> -webkit-mask-repeat: repeat;
</span><del>--webkit-mask-clip: border-box;
--webkit-mask-composite: source-over;
--webkit-mask-origin: border-box;
</del><span class="cx"> -webkit-mask-size: auto auto;
</span><span class="cx"> -webkit-nbsp-mode: normal;
</span><span class="cx"> -webkit-perspective: none;
</span><span class="lines">@@ -159,10 +172,7 @@
</span><span class="cx"> -webkit-user-drag: auto;
</span><span class="cx"> -webkit-user-modify: read-only;
</span><span class="cx"> -webkit-user-select: text;
</span><del>--webkit-border-bottom-left-radius: 0px;
--webkit-border-bottom-right-radius: 0px;
--webkit-border-top-left-radius: 0px;
--webkit-border-top-right-radius: 0px;
</del><ins>+-webkit-writing-mode: horizontal-tb;
</ins><span class="cx"> clip-path: none;
</span><span class="cx"> clip-rule: nonzero;
</span><span class="cx"> mask: none;
</span><span class="lines">@@ -184,28 +194,32 @@
</span><span class="cx"> marker-start: none;
</span><span class="cx"> shape-rendering: auto;
</span><span class="cx"> stroke: none;
</span><del>-stroke-dasharray: ;
-stroke-dashoffset: ;
</del><ins>+stroke-dasharray: none;
+stroke-dashoffset: 0;
</ins><span class="cx"> stroke-linecap: butt;
</span><span class="cx"> stroke-linejoin: miter;
</span><span class="cx"> stroke-miterlimit: 4;
</span><span class="cx"> stroke-opacity: 1;
</span><del>-stroke-width: ;
-text-rendering: auto;
</del><ins>+stroke-width: 1;
</ins><span class="cx"> alignment-baseline: auto;
</span><span class="cx"> baseline-shift: baseline;
</span><span class="cx"> dominant-baseline: auto;
</span><del>-kerning: ;
</del><ins>+kerning: 0;
</ins><span class="cx"> text-anchor: start;
</span><span class="cx"> writing-mode: lr-tb;
</span><span class="cx"> glyph-orientation-horizontal: 0deg;
</span><span class="cx"> glyph-orientation-vertical: auto;
</span><ins>+-webkit-svg-shadow: none;
+vector-effect: none;
</ins><span class="cx"> 
</span><span class="cx"> Other attributes that the computed style class supports:
</span><span class="cx"> 
</span><del>-background-position: 0% 0%;
</del><ins>+background-position-x: 0%;
+background-position-y: 0%;
</ins><span class="cx"> border-spacing: 0px 0px;
</span><span class="cx"> overflow: visible;
</span><ins>+-webkit-mask-position-x: 0%;
+-webkit-mask-position-y: 0%;
</ins><span class="cx"> -webkit-match-nearest-mail-blockquote-color: normal;
</span><span class="cx"> -webkit-text-size-adjust: auto;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgetComputedStylecomputedstylewithoutrendererexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt (69219 => 69220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt        2010-10-06 18:59:27 UTC (rev 69219)
+++ trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt        2010-10-06 19:02:34 UTC (rev 69220)
</span><span class="lines">@@ -1,10 +1,15 @@
</span><span class="cx"> Computed style of an element whose parent's 'display' value is 'none':
</span><span class="cx">     background-attachment: scroll
</span><ins>+    background-clip: border-box
</ins><span class="cx">     background-color: rgb(0, 128, 0)
</span><span class="cx">     background-image: none
</span><ins>+    background-origin: padding-box
</ins><span class="cx">     background-position: 0% 0%
</span><span class="cx">     background-repeat: repeat
</span><ins>+    background-size: auto auto
</ins><span class="cx">     border-bottom-color: rgb(0, 0, 0)
</span><ins>+    border-bottom-left-radius: 0px
+    border-bottom-right-radius: 0px
</ins><span class="cx">     border-bottom-style: none
</span><span class="cx">     border-bottom-width: 0px
</span><span class="cx">     border-collapse: separate
</span><span class="lines">@@ -15,11 +20,14 @@
</span><span class="cx">     border-right-style: none
</span><span class="cx">     border-right-width: 0px
</span><span class="cx">     border-top-color: rgb(0, 0, 0)
</span><ins>+    border-top-left-radius: 0px
+    border-top-right-radius: 0px
</ins><span class="cx">     border-top-style: solid
</span><span class="cx">     border-top-width: 16px
</span><span class="cx">     bottom: auto
</span><span class="cx">     caption-side: top
</span><span class="cx">     clear: none
</span><ins>+    clip: auto
</ins><span class="cx">     color: rgb(0, 0, 0)
</span><span class="cx">     cursor: auto
</span><span class="cx">     direction: ltr
</span><span class="lines">@@ -64,10 +72,12 @@
</span><span class="cx">     position: static
</span><span class="cx">     resize: none
</span><span class="cx">     right: auto
</span><ins>+    speak: normal
</ins><span class="cx">     table-layout: auto
</span><span class="cx">     text-align: -webkit-auto
</span><span class="cx">     text-decoration: none
</span><span class="cx">     text-indent: 0px
</span><ins>+    text-rendering: auto
</ins><span class="cx">     text-shadow: none
</span><span class="cx">     text-overflow: clip
</span><span class="cx">     text-transform: none
</span><span class="lines">@@ -78,6 +88,7 @@
</span><span class="cx">     white-space: normal
</span><span class="cx">     widows: 2
</span><span class="cx">     width: 50%
</span><ins>+    word-break: normal
</ins><span class="cx">     word-spacing: 0px
</span><span class="cx">     word-wrap: normal
</span><span class="cx">     z-index: auto
</span><span class="lines">@@ -88,6 +99,7 @@
</span><span class="cx">     -webkit-animation-fill-mode: none
</span><span class="cx">     -webkit-animation-iteration-count: 1
</span><span class="cx">     -webkit-animation-name: none
</span><ins>+    -webkit-animation-play-state: running
</ins><span class="cx">     -webkit-animation-timing-function: cubic-bezier(0.25, 0.1, 0.25, 1)
</span><span class="cx">     -webkit-appearance: none
</span><span class="cx">     -webkit-backface-visibility: visible
</span><span class="lines">@@ -95,10 +107,9 @@
</span><span class="cx">     -webkit-background-composite: source-over
</span><span class="cx">     -webkit-background-origin: padding-box
</span><span class="cx">     -webkit-background-size: auto auto
</span><del>-    -webkit-block-flow: tb
</del><span class="cx">     -webkit-border-fit: border
</span><ins>+    -webkit-border-horizontal-spacing: 0px
</ins><span class="cx">     -webkit-border-image: none
</span><del>-    -webkit-border-horizontal-spacing: 0px
</del><span class="cx">     -webkit-border-vertical-spacing: 0px
</span><span class="cx">     -webkit-box-align: stretch
</span><span class="cx">     -webkit-box-direction: normal
</span><span class="lines">@@ -111,6 +122,7 @@
</span><span class="cx">     -webkit-box-reflect: none
</span><span class="cx">     -webkit-box-shadow: none
</span><span class="cx">     -webkit-box-sizing: content-box
</span><ins>+    -webkit-color-correction: default
</ins><span class="cx">     -webkit-column-break-after: auto
</span><span class="cx">     -webkit-column-break-before: auto
</span><span class="cx">     -webkit-column-break-inside: auto
</span><span class="lines">@@ -121,23 +133,24 @@
</span><span class="cx">     -webkit-column-rule-width: 0px
</span><span class="cx">     -webkit-column-span: 1
</span><span class="cx">     -webkit-column-width: auto
</span><ins>+    -webkit-font-smoothing: auto
</ins><span class="cx">     -webkit-highlight: none
</span><span class="cx">     -webkit-line-break: normal
</span><span class="cx">     -webkit-line-clamp: none
</span><del>-    -webkit-margin-bottom-collapse: collapse
-    -webkit-margin-top-collapse: collapse
</del><ins>+    -webkit-margin-before-collapse: collapse
+    -webkit-margin-after-collapse: collapse
</ins><span class="cx">     -webkit-marquee-direction: auto
</span><span class="cx">     -webkit-marquee-increment: 6px
</span><span class="cx">     -webkit-marquee-repetition: infinite
</span><span class="cx">     -webkit-marquee-style: scroll
</span><span class="cx">     -webkit-mask-attachment: scroll
</span><span class="cx">     -webkit-mask-box-image: none
</span><ins>+    -webkit-mask-clip: border-box
+    -webkit-mask-composite: source-over
</ins><span class="cx">     -webkit-mask-image: none
</span><ins>+    -webkit-mask-origin: border-box
</ins><span class="cx">     -webkit-mask-position: 0% 0%
</span><span class="cx">     -webkit-mask-repeat: repeat
</span><del>-    -webkit-mask-clip: border-box
-    -webkit-mask-composite: source-over
-    -webkit-mask-origin: border-box
</del><span class="cx">     -webkit-mask-size: auto auto
</span><span class="cx">     -webkit-nbsp-mode: normal
</span><span class="cx">     -webkit-perspective: none
</span><span class="lines">@@ -158,10 +171,7 @@
</span><span class="cx">     -webkit-user-drag: auto
</span><span class="cx">     -webkit-user-modify: read-only
</span><span class="cx">     -webkit-user-select: text
</span><del>-    -webkit-border-bottom-left-radius: 0px
-    -webkit-border-bottom-right-radius: 0px
-    -webkit-border-top-left-radius: 0px
-    -webkit-border-top-right-radius: 0px
</del><ins>+    -webkit-writing-mode: horizontal-tb
</ins><span class="cx">     clip-path: none
</span><span class="cx">     clip-rule: nonzero
</span><span class="cx">     mask: none
</span><span class="lines">@@ -183,25 +193,29 @@
</span><span class="cx">     marker-start: none
</span><span class="cx">     shape-rendering: auto
</span><span class="cx">     stroke: none
</span><del>-    stroke-dasharray: 
-    stroke-dashoffset: 
</del><ins>+    stroke-dasharray: none
+    stroke-dashoffset: 0
</ins><span class="cx">     stroke-linecap: butt
</span><span class="cx">     stroke-linejoin: miter
</span><span class="cx">     stroke-miterlimit: 4
</span><span class="cx">     stroke-opacity: 1
</span><del>-    stroke-width: 
-    text-rendering: auto
</del><ins>+    stroke-width: 1
</ins><span class="cx">     alignment-baseline: auto
</span><span class="cx">     baseline-shift: baseline
</span><span class="cx">     dominant-baseline: auto
</span><del>-    kerning: 
</del><ins>+    kerning: 0
</ins><span class="cx">     text-anchor: start
</span><span class="cx">     writing-mode: lr-tb
</span><span class="cx">     glyph-orientation-horizontal: 0deg
</span><span class="cx">     glyph-orientation-vertical: auto
</span><del>-    background-position: 0% 0%
</del><ins>+    -webkit-svg-shadow: none
+    vector-effect: none
+    background-position-x: 0%
+    background-position-y: 0%
</ins><span class="cx">     border-spacing: 0px 0px
</span><span class="cx">     overflow: visible
</span><ins>+    -webkit-mask-position-x: 0%
+    -webkit-mask-position-y: 0%
</ins><span class="cx">     -webkit-match-nearest-mail-blockquote-color: normal
</span><span class="cx">     -webkit-text-size-adjust: auto
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgetComputedStylecomputedstylewithoutrendererhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer.html (69219 => 69220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer.html        2010-10-06 18:59:27 UTC (rev 69219)
+++ trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer.html        2010-10-06 19:02:34 UTC (rev 69220)
</span><span class="lines">@@ -28,7 +28,8 @@
</span><span class="cx">             if (!properties) {
</span><span class="cx">                 for (var i = 0; i != style.length; ++i) {
</span><span class="cx">                     var name = style.item(i);
</span><del>-                    log(&quot;    &quot; + name + &quot;: &quot; + style.getPropertyValue(name));
</del><ins>+                    if (name != &quot;-webkit-dashboard-region&quot;)
+                        log(&quot;    &quot; + name + &quot;: &quot; + style.getPropertyValue(name));
</ins><span class="cx">                 }
</span><span class="cx">                 properties = others;
</span><span class="cx">             }
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgetComputedStylecomputedstylehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/getComputedStyle/computed-style.html (69219 => 69220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/getComputedStyle/computed-style.html        2010-10-06 18:59:27 UTC (rev 69219)
+++ trunk/LayoutTests/fast/css/getComputedStyle/computed-style.html        2010-10-06 19:02:34 UTC (rev 69220)
</span><span class="lines">@@ -7,7 +7,8 @@
</span><span class="cx">     for (var i = 0; i != style.length; ++i) {
</span><span class="cx">         var name = style.item(i);
</span><span class="cx">         var value = style.getPropertyValue(name);
</span><del>-        text += name + &quot;: &quot; + value + &quot;;\n&quot;;
</del><ins>+        if (name != &quot;-webkit-dashboard-region&quot;)
+            text += name + &quot;: &quot; + value + &quot;;\n&quot;;
</ins><span class="cx">     }
</span><span class="cx">     document.getElementById(&quot;exposed&quot;).textContent = text;
</span><span class="cx">     var others = [
</span></span></pre></div>
<a id="trunkLayoutTestsfastcsslogicalpropertyresolutionhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/logical-property-resolution.html (69219 => 69220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/logical-property-resolution.html        2010-10-06 18:59:27 UTC (rev 69219)
+++ trunk/LayoutTests/fast/css/logical-property-resolution.html        2010-10-06 19:02:34 UTC (rev 69220)
</span><span class="lines">@@ -10,19 +10,19 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> .tb-block {
</span><del>-  -webkit-block-flow: tb
</del><ins>+  -webkit-writing-mode: horizontal-tb;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> .bt-block {
</span><del>-  -webkit-block-flow: bt
</del><ins>+  -webkit-writing-mode: horizontal-bt
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> .lr-block {
</span><del>-  -webkit-block-flow: lr
</del><ins>+  -webkit-writing-mode: vertical-lr
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> .rl-block {
</span><del>-  -webkit-block-flow: rl
</del><ins>+  -webkit-writing-mode: vertical-rl
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> .test {
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastcssgetComputedStylecomputedstyleexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-expected.txt (69219 => 69220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-expected.txt        2010-10-06 18:59:27 UTC (rev 69219)
+++ trunk/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-expected.txt        2010-10-06 19:02:34 UTC (rev 69220)
</span><span class="lines">@@ -1,226 +0,0 @@
</span><del>-Attributes that are exposed in the CSS computed style object:
-
-background-attachment: scroll;
-background-clip: border-box;
-background-color: rgba(0, 0, 0, 0);
-background-image: none;
-background-origin: padding-box;
-background-position: 0% 0%;
-background-repeat: repeat;
-background-size: auto auto;
-border-bottom-color: rgb(0, 0, 0);
-border-bottom-left-radius: 0px;
-border-bottom-right-radius: 0px;
-border-bottom-style: none;
-border-bottom-width: 0px;
-border-collapse: separate;
-border-left-color: rgb(0, 0, 0);
-border-left-style: none;
-border-left-width: 0px;
-border-right-color: rgb(0, 0, 0);
-border-right-style: none;
-border-right-width: 0px;
-border-top-color: rgb(0, 0, 0);
-border-top-left-radius: 0px;
-border-top-right-radius: 0px;
-border-top-style: none;
-border-top-width: 0px;
-bottom: auto;
-caption-side: top;
-clear: none;
-clip: auto;
-color: rgb(0, 0, 0);
-cursor: auto;
-direction: ltr;
-display: block;
-empty-cells: show;
-float: none;
-font-family: Times;
-font-size: 16px;
-font-style: normal;
-font-variant: normal;
-font-weight: normal;
-height: 576px;
-left: auto;
-letter-spacing: normal;
-line-height: normal;
-list-style-image: none;
-list-style-position: outside;
-list-style-type: disc;
-margin-bottom: 8px;
-margin-left: 8px;
-margin-right: 8px;
-margin-top: 8px;
-max-height: none;
-max-width: none;
-min-height: 0px;
-min-width: 0px;
-opacity: 1;
-orphans: 2;
-outline-color: rgb(0, 0, 0);
-outline-style: none;
-outline-width: 0px;
-overflow-x: visible;
-overflow-y: visible;
-padding-bottom: 0px;
-padding-left: 0px;
-padding-right: 0px;
-padding-top: 0px;
-page-break-after: auto;
-page-break-before: auto;
-page-break-inside: auto;
-pointer-events: auto;
-position: static;
-resize: none;
-right: auto;
-speak: normal;
-table-layout: auto;
-text-align: -webkit-auto;
-text-decoration: none;
-text-indent: 0px;
-text-rendering: auto;
-text-shadow: none;
-text-overflow: clip;
-text-transform: none;
-top: auto;
-unicode-bidi: normal;
-vertical-align: baseline;
-visibility: visible;
-white-space: normal;
-widows: 2;
-width: 784px;
-word-break: normal;
-word-spacing: 0px;
-word-wrap: normal;
-z-index: auto;
-zoom: 1;
--webkit-animation-delay: 0s;
--webkit-animation-direction: normal;
--webkit-animation-duration: 0s;
--webkit-animation-fill-mode: none;
--webkit-animation-iteration-count: 1;
--webkit-animation-name: none;
--webkit-animation-play-state: running;
--webkit-animation-timing-function: cubic-bezier(0.25, 0.1, 0.25, 1);
--webkit-appearance: none;
--webkit-backface-visibility: visible;
--webkit-background-clip: border-box;
--webkit-background-composite: source-over;
--webkit-background-origin: padding-box;
--webkit-background-size: auto auto;
--webkit-block-flow: tb;
--webkit-border-fit: border;
--webkit-border-horizontal-spacing: 0px;
--webkit-border-image: none;
--webkit-border-vertical-spacing: 0px;
--webkit-box-align: stretch;
--webkit-box-direction: normal;
--webkit-box-flex: 0;
--webkit-box-flex-group: 1;
--webkit-box-lines: single;
--webkit-box-ordinal-group: 1;
--webkit-box-orient: horizontal;
--webkit-box-pack: start;
--webkit-box-reflect: none;
--webkit-box-shadow: none;
--webkit-box-sizing: content-box;
--webkit-color-correction: default;
--webkit-column-break-after: auto;
--webkit-column-break-before: auto;
--webkit-column-break-inside: auto;
--webkit-column-count: auto;
--webkit-column-gap: normal;
--webkit-column-rule-color: rgb(0, 0, 0);
--webkit-column-rule-style: none;
--webkit-column-rule-width: 0px;
--webkit-column-span: 1;
--webkit-column-width: auto;
--webkit-dashboard-region: null;
--webkit-font-smoothing: auto;
--webkit-highlight: none;
--webkit-line-break: normal;
--webkit-line-clamp: none;
--webkit-margin-before-collapse: collapse;
--webkit-margin-after-collapse: collapse;
--webkit-marquee-direction: auto;
--webkit-marquee-increment: 6px;
--webkit-marquee-repetition: infinite;
--webkit-marquee-style: scroll;
--webkit-mask-attachment: scroll;
--webkit-mask-box-image: none;
--webkit-mask-clip: border-box;
--webkit-mask-composite: source-over;
--webkit-mask-image: none;
--webkit-mask-origin: border-box;
--webkit-mask-position: 0% 0%;
--webkit-mask-repeat: repeat;
--webkit-mask-size: auto auto;
--webkit-nbsp-mode: normal;
--webkit-perspective: none;
--webkit-perspective-origin: 392px 288px;
--webkit-rtl-ordering: logical;
--webkit-text-decorations-in-effect: none;
--webkit-text-fill-color: rgb(0, 0, 0);
--webkit-text-security: none;
--webkit-text-stroke-color: rgb(0, 0, 0);
--webkit-text-stroke-width: 0px;
--webkit-transform: none;
--webkit-transform-origin: 392px 288px;
--webkit-transform-style: flat;
--webkit-transition-delay: 0s;
--webkit-transition-duration: 0s;
--webkit-transition-property: all;
--webkit-transition-timing-function: cubic-bezier(0.25, 0.1, 0.25, 1);
--webkit-user-drag: auto;
--webkit-user-modify: read-only;
--webkit-user-select: text;
-clip-path: none;
-clip-rule: nonzero;
-mask: none;
-filter: none;
-flood-color: rgb(0, 0, 0);
-flood-opacity: 1;
-lighting-color: rgb(255, 255, 255);
-stop-color: rgb(0, 0, 0);
-stop-opacity: 1;
-color-interpolation: srgb;
-color-interpolation-filters: linearrgb;
-color-rendering: auto;
-fill: #000000;
-fill-opacity: 1;
-fill-rule: nonzero;
-image-rendering: auto;
-marker-end: none;
-marker-mid: none;
-marker-start: none;
-shape-rendering: auto;
-stroke: none;
-stroke-dasharray: none;
-stroke-dashoffset: 0;
-stroke-linecap: butt;
-stroke-linejoin: miter;
-stroke-miterlimit: 4;
-stroke-opacity: 1;
-stroke-width: 1;
-alignment-baseline: auto;
-baseline-shift: baseline;
-dominant-baseline: auto;
-kerning: 0;
-text-anchor: start;
-writing-mode: lr-tb;
-glyph-orientation-horizontal: 0deg;
-glyph-orientation-vertical: auto;
--webkit-svg-shadow: none;
-vector-effect: none;
-
-Other attributes that the computed style class supports:
-
-background-position-x: 0%;
-background-position-y: 0%;
-border-spacing: 0px 0px;
-overflow: visible;
--webkit-mask-position-x: 0%;
--webkit-mask-position-y: 0%;
--webkit-match-nearest-mail-blockquote-color: normal;
--webkit-text-size-adjust: auto;
-
</del></span></pre></div>
<a id="trunkLayoutTestsplatformmacsvgcssgetComputedStylebasicexpectedchecksum"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/mac/svg/css/getComputedStyle-basic-expected.checksum (69219 => 69220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/svg/css/getComputedStyle-basic-expected.checksum        2010-10-06 18:59:27 UTC (rev 69219)
+++ trunk/LayoutTests/platform/mac/svg/css/getComputedStyle-basic-expected.checksum        2010-10-06 19:02:34 UTC (rev 69220)
</span><span class="lines">@@ -1 +0,0 @@
</span><del>-5f0c4aea9e09e80487d4ecd186f071fd
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacsvgcssgetComputedStylebasicexpectedpng"></a>
<div class="binary"><h4>Deleted: trunk/LayoutTests/platform/mac/svg/css/getComputedStyle-basic-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformwinfastcssgetComputedStylecomputedstyleexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/win/fast/css/getComputedStyle/computed-style-expected.txt (69219 => 69220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/win/fast/css/getComputedStyle/computed-style-expected.txt        2010-10-06 18:59:27 UTC (rev 69219)
+++ trunk/LayoutTests/platform/win/fast/css/getComputedStyle/computed-style-expected.txt        2010-10-06 19:02:34 UTC (rev 69220)
</span><span class="lines">@@ -1,225 +0,0 @@
</span><del>-Attributes that are exposed in the CSS computed style object:
-
-background-attachment: scroll;
-background-clip: border-box;
-background-color: rgba(0, 0, 0, 0);
-background-image: none;
-background-origin: padding-box;
-background-position: 0% 0%;
-background-repeat: repeat;
-background-size: auto auto;
-border-bottom-color: rgb(0, 0, 0);
-border-bottom-left-radius: 0px;
-border-bottom-right-radius: 0px;
-border-bottom-style: none;
-border-bottom-width: 0px;
-border-collapse: separate;
-border-left-color: rgb(0, 0, 0);
-border-left-style: none;
-border-left-width: 0px;
-border-right-color: rgb(0, 0, 0);
-border-right-style: none;
-border-right-width: 0px;
-border-top-color: rgb(0, 0, 0);
-border-top-left-radius: 0px;
-border-top-right-radius: 0px;
-border-top-style: none;
-border-top-width: 0px;
-bottom: auto;
-caption-side: top;
-clear: none;
-clip: auto;
-color: rgb(0, 0, 0);
-cursor: auto;
-direction: ltr;
-display: block;
-empty-cells: show;
-float: none;
-font-family: Times;
-font-size: 16px;
-font-style: normal;
-font-variant: normal;
-font-weight: normal;
-height: 576px;
-left: auto;
-letter-spacing: normal;
-line-height: normal;
-list-style-image: none;
-list-style-position: outside;
-list-style-type: disc;
-margin-bottom: 8px;
-margin-left: 8px;
-margin-right: 8px;
-margin-top: 8px;
-max-height: none;
-max-width: none;
-min-height: 0px;
-min-width: 0px;
-opacity: 1;
-orphans: 2;
-outline-color: rgb(0, 0, 0);
-outline-style: none;
-outline-width: 0px;
-overflow-x: visible;
-overflow-y: visible;
-padding-bottom: 0px;
-padding-left: 0px;
-padding-right: 0px;
-padding-top: 0px;
-page-break-after: auto;
-page-break-before: auto;
-page-break-inside: auto;
-pointer-events: auto;
-position: static;
-resize: none;
-right: auto;
-speak: normal;
-table-layout: auto;
-text-align: -webkit-auto;
-text-decoration: none;
-text-indent: 0px;
-text-rendering: auto;
-text-shadow: none;
-text-overflow: clip;
-text-transform: none;
-top: auto;
-unicode-bidi: normal;
-vertical-align: baseline;
-visibility: visible;
-white-space: normal;
-widows: 2;
-width: 784px;
-word-break: normal;
-word-spacing: 0px;
-word-wrap: normal;
-z-index: auto;
-zoom: 1;
--webkit-animation-delay: 0s;
--webkit-animation-direction: normal;
--webkit-animation-duration: 0s;
--webkit-animation-fill-mode: none;
--webkit-animation-iteration-count: 1;
--webkit-animation-name: none;
--webkit-animation-play-state: running;
--webkit-animation-timing-function: cubic-bezier(0.25, 0.1, 0.25, 1);
--webkit-appearance: none;
--webkit-backface-visibility: visible;
--webkit-background-clip: border-box;
--webkit-background-composite: source-over;
--webkit-background-origin: padding-box;
--webkit-background-size: auto auto;
--webkit-block-flow: tb;
--webkit-border-fit: border;
--webkit-border-horizontal-spacing: 0px;
--webkit-border-image: none;
--webkit-border-vertical-spacing: 0px;
--webkit-box-align: stretch;
--webkit-box-direction: normal;
--webkit-box-flex: 0;
--webkit-box-flex-group: 1;
--webkit-box-lines: single;
--webkit-box-ordinal-group: 1;
--webkit-box-orient: horizontal;
--webkit-box-pack: start;
--webkit-box-reflect: none;
--webkit-box-shadow: none;
--webkit-box-sizing: content-box;
--webkit-color-correction: default;
--webkit-column-break-after: auto;
--webkit-column-break-before: auto;
--webkit-column-break-inside: auto;
--webkit-column-count: auto;
--webkit-column-gap: normal;
--webkit-column-rule-color: rgb(0, 0, 0);
--webkit-column-rule-style: none;
--webkit-column-rule-width: 0px;
--webkit-column-span: 1;
--webkit-column-width: auto;
--webkit-font-smoothing: auto;
--webkit-highlight: none;
--webkit-line-break: normal;
--webkit-line-clamp: none;
--webkit-margin-before-collapse: collapse;
--webkit-margin-after-collapse: collapse;
--webkit-marquee-direction: auto;
--webkit-marquee-increment: 6px;
--webkit-marquee-repetition: infinite;
--webkit-marquee-style: scroll;
--webkit-mask-attachment: scroll;
--webkit-mask-box-image: none;
--webkit-mask-clip: border-box;
--webkit-mask-composite: source-over;
--webkit-mask-image: none;
--webkit-mask-origin: border-box;
--webkit-mask-position: 0% 0%;
--webkit-mask-repeat: repeat;
--webkit-mask-size: auto auto;
--webkit-nbsp-mode: normal;
--webkit-perspective: none;
--webkit-perspective-origin: 392px 288px;
--webkit-rtl-ordering: logical;
--webkit-text-decorations-in-effect: none;
--webkit-text-fill-color: rgb(0, 0, 0);
--webkit-text-security: none;
--webkit-text-stroke-color: rgb(0, 0, 0);
--webkit-text-stroke-width: 0px;
--webkit-transform: none;
--webkit-transform-origin: 392px 288px;
--webkit-transform-style: flat;
--webkit-transition-delay: 0s;
--webkit-transition-duration: 0s;
--webkit-transition-property: all;
--webkit-transition-timing-function: cubic-bezier(0.25, 0.1, 0.25, 1);
--webkit-user-drag: auto;
--webkit-user-modify: read-only;
--webkit-user-select: text;
-clip-path: none;
-clip-rule: nonzero;
-mask: none;
-filter: none;
-flood-color: rgb(0, 0, 0);
-flood-opacity: 1;
-lighting-color: rgb(255, 255, 255);
-stop-color: rgb(0, 0, 0);
-stop-opacity: 1;
-color-interpolation: srgb;
-color-interpolation-filters: linearrgb;
-color-rendering: auto;
-fill: #000000;
-fill-opacity: 1;
-fill-rule: nonzero;
-image-rendering: auto;
-marker-end: none;
-marker-mid: none;
-marker-start: none;
-shape-rendering: auto;
-stroke: none;
-stroke-dasharray: none;
-stroke-dashoffset: 0;
-stroke-linecap: butt;
-stroke-linejoin: miter;
-stroke-miterlimit: 4;
-stroke-opacity: 1;
-stroke-width: 1;
-alignment-baseline: auto;
-baseline-shift: baseline;
-dominant-baseline: auto;
-kerning: 0;
-text-anchor: start;
-writing-mode: lr-tb;
-glyph-orientation-horizontal: 0deg;
-glyph-orientation-vertical: auto;
--webkit-svg-shadow: none;
-vector-effect: none;
-
-Other attributes that the computed style class supports:
-
-background-position-x: 0%;
-background-position-y: 0%;
-border-spacing: 0px 0px;
-overflow: visible;
--webkit-mask-position-x: 0%;
--webkit-mask-position-y: 0%;
--webkit-match-nearest-mail-blockquote-color: normal;
--webkit-text-size-adjust: auto;
-
</del></span></pre></div>
<a id="trunkLayoutTestsplatformwinfastcssgetComputedStylecomputedstylewithoutrendererexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/win/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt (69219 => 69220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/win/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt        2010-10-06 18:59:27 UTC (rev 69219)
+++ trunk/LayoutTests/platform/win/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt        2010-10-06 19:02:34 UTC (rev 69220)
</span><span class="lines">@@ -1,236 +0,0 @@
</span><del>-Computed style of an element whose parent's 'display' value is 'none':
-    background-attachment: scroll
-    background-clip: border-box
-    background-color: rgb(0, 128, 0)
-    background-image: none
-    background-origin: padding-box
-    background-position: 0% 0%
-    background-repeat: repeat
-    background-size: auto auto
-    border-bottom-color: rgb(0, 0, 0)
-    border-bottom-left-radius: 0px
-    border-bottom-right-radius: 0px
-    border-bottom-style: none
-    border-bottom-width: 0px
-    border-collapse: separate
-    border-left-color: rgb(0, 0, 0)
-    border-left-style: none
-    border-left-width: 0px
-    border-right-color: rgb(0, 0, 0)
-    border-right-style: none
-    border-right-width: 0px
-    border-top-color: rgb(0, 0, 0)
-    border-top-left-radius: 0px
-    border-top-right-radius: 0px
-    border-top-style: solid
-    border-top-width: 16px
-    bottom: auto
-    caption-side: top
-    clear: none
-    clip: auto
-    color: rgb(0, 0, 0)
-    cursor: auto
-    direction: ltr
-    display: block
-    empty-cells: show
-    float: none
-    font-family: Times
-    font-size: 16px
-    font-style: normal
-    font-variant: normal
-    font-weight: normal
-    height: 100px
-    left: auto
-    letter-spacing: normal
-    line-height: normal
-    list-style-image: none
-    list-style-position: outside
-    list-style-type: disc
-    margin-bottom: 0px
-    margin-left: auto
-    margin-right: 0px
-    margin-top: 0px
-    max-height: none
-    max-width: none
-    min-height: 0px
-    min-width: 0px
-    opacity: 1
-    orphans: 2
-    outline-color: rgb(0, 0, 0)
-    outline-style: none
-    outline-width: 0px
-    overflow-x: visible
-    overflow-y: visible
-    padding-bottom: 0px
-    padding-left: 0px
-    padding-right: 0px
-    padding-top: 0px
-    page-break-after: auto
-    page-break-before: auto
-    page-break-inside: auto
-    pointer-events: auto
-    position: static
-    resize: none
-    right: auto
-    speak: normal
-    table-layout: auto
-    text-align: -webkit-auto
-    text-decoration: none
-    text-indent: 0px
-    text-rendering: auto
-    text-shadow: none
-    text-overflow: clip
-    text-transform: none
-    top: auto
-    unicode-bidi: normal
-    vertical-align: baseline
-    visibility: visible
-    white-space: normal
-    widows: 2
-    width: 50%
-    word-break: normal
-    word-spacing: 0px
-    word-wrap: normal
-    z-index: auto
-    zoom: 1
-    -webkit-animation-delay: 0s
-    -webkit-animation-direction: normal
-    -webkit-animation-duration: 0s
-    -webkit-animation-fill-mode: none
-    -webkit-animation-iteration-count: 1
-    -webkit-animation-name: none
-    -webkit-animation-play-state: running
-    -webkit-animation-timing-function: cubic-bezier(0.25, 0.1, 0.25, 1)
-    -webkit-appearance: none
-    -webkit-backface-visibility: visible
-    -webkit-background-clip: border-box
-    -webkit-background-composite: source-over
-    -webkit-background-origin: padding-box
-    -webkit-background-size: auto auto
-    -webkit-block-flow: tb
-    -webkit-border-fit: border
-    -webkit-border-horizontal-spacing: 0px
-    -webkit-border-image: none
-    -webkit-border-vertical-spacing: 0px
-    -webkit-box-align: stretch
-    -webkit-box-direction: normal
-    -webkit-box-flex: 0
-    -webkit-box-flex-group: 1
-    -webkit-box-lines: single
-    -webkit-box-ordinal-group: 1
-    -webkit-box-orient: horizontal
-    -webkit-box-pack: start
-    -webkit-box-reflect: none
-    -webkit-box-shadow: none
-    -webkit-box-sizing: content-box
-    -webkit-color-correction: default
-    -webkit-column-break-after: auto
-    -webkit-column-break-before: auto
-    -webkit-column-break-inside: auto
-    -webkit-column-count: auto
-    -webkit-column-gap: normal
-    -webkit-column-rule-color: rgb(0, 0, 0)
-    -webkit-column-rule-style: none
-    -webkit-column-rule-width: 0px
-    -webkit-column-span: 1
-    -webkit-column-width: auto
-    -webkit-font-smoothing: auto
-    -webkit-highlight: none
-    -webkit-line-break: normal
-    -webkit-line-clamp: none
-    -webkit-margin-before-collapse: collapse
-    -webkit-margin-after-collapse: collapse
-    -webkit-marquee-direction: auto
-    -webkit-marquee-increment: 6px
-    -webkit-marquee-repetition: infinite
-    -webkit-marquee-style: scroll
-    -webkit-mask-attachment: scroll
-    -webkit-mask-box-image: none
-    -webkit-mask-clip: border-box
-    -webkit-mask-composite: source-over
-    -webkit-mask-image: none
-    -webkit-mask-origin: border-box
-    -webkit-mask-position: 0% 0%
-    -webkit-mask-repeat: repeat
-    -webkit-mask-size: auto auto
-    -webkit-nbsp-mode: normal
-    -webkit-perspective: none
-    -webkit-perspective-origin: 50% 50%
-    -webkit-rtl-ordering: logical
-    -webkit-text-decorations-in-effect: none
-    -webkit-text-fill-color: rgb(0, 0, 0)
-    -webkit-text-security: none
-    -webkit-text-stroke-color: rgb(0, 0, 0)
-    -webkit-text-stroke-width: 0px
-    -webkit-transform: none
-    -webkit-transform-origin: 50% 50%
-    -webkit-transform-style: flat
-    -webkit-transition-delay: 0s
-    -webkit-transition-duration: 0s
-    -webkit-transition-property: all
-    -webkit-transition-timing-function: cubic-bezier(0.25, 0.1, 0.25, 1)
-    -webkit-user-drag: auto
-    -webkit-user-modify: read-only
-    -webkit-user-select: text
-    clip-path: none
-    clip-rule: nonzero
-    mask: none
-    filter: none
-    flood-color: rgb(0, 0, 0)
-    flood-opacity: 1
-    lighting-color: rgb(255, 255, 255)
-    stop-color: rgb(0, 0, 0)
-    stop-opacity: 1
-    color-interpolation: srgb
-    color-interpolation-filters: linearrgb
-    color-rendering: auto
-    fill: #000000
-    fill-opacity: 1
-    fill-rule: nonzero
-    image-rendering: auto
-    marker-end: none
-    marker-mid: none
-    marker-start: none
-    shape-rendering: auto
-    stroke: none
-    stroke-dasharray: none
-    stroke-dashoffset: 0
-    stroke-linecap: butt
-    stroke-linejoin: miter
-    stroke-miterlimit: 4
-    stroke-opacity: 1
-    stroke-width: 1
-    alignment-baseline: auto
-    baseline-shift: baseline
-    dominant-baseline: auto
-    kerning: 0
-    text-anchor: start
-    writing-mode: lr-tb
-    glyph-orientation-horizontal: 0deg
-    glyph-orientation-vertical: auto
-    -webkit-svg-shadow: none
-    vector-effect: none
-    background-position-x: 0%
-    background-position-y: 0%
-    border-spacing: 0px 0px
-    overflow: visible
-    -webkit-mask-position-x: 0%
-    -webkit-mask-position-y: 0%
-    -webkit-match-nearest-mail-blockquote-color: normal
-    -webkit-text-size-adjust: auto
-
-After changing grandparent's 'color' and the parent's 'font-size' inherited properties:
-    border-top-width: 18px
-    color: rgb(0, 0, 255)
-
-After changing the parent's 'display' property to 'block', so that the child gets a renderer:
-    height: 100px
-    margin-left: 385px
-    width: 384px
-
-After changing the parent's 'display' property back to 'none':
-    height: 100px
-    margin-left: auto
-    width: 50%
-
-
</del></span></pre></div>
<a id="trunkLayoutTestssvgcssgetComputedStylebasicexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt (69219 => 69220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt        2010-10-06 18:59:27 UTC (rev 69219)
+++ trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt        2010-10-06 19:02:34 UTC (rev 69220)
</span><span class="lines">@@ -214,8 +214,6 @@
</span><span class="cx"> rect: style.getPropertyCSSValue(-webkit-background-origin) : [object CSSPrimitiveValue]
</span><span class="cx"> rect: style.getPropertyValue(-webkit-background-size) : auto auto
</span><span class="cx"> rect: style.getPropertyCSSValue(-webkit-background-size) : [object CSSValueList]
</span><del>-rect: style.getPropertyValue(-webkit-block-flow) : tb
-rect: style.getPropertyCSSValue(-webkit-block-flow) : [object CSSPrimitiveValue]
</del><span class="cx"> rect: style.getPropertyValue(-webkit-border-fit) : border
</span><span class="cx"> rect: style.getPropertyCSSValue(-webkit-border-fit) : [object CSSPrimitiveValue]
</span><span class="cx"> rect: style.getPropertyValue(-webkit-border-horizontal-spacing) : 0px
</span><span class="lines">@@ -268,8 +266,6 @@
</span><span class="cx"> rect: style.getPropertyCSSValue(-webkit-column-span) : [object CSSPrimitiveValue]
</span><span class="cx"> rect: style.getPropertyValue(-webkit-column-width) : auto
</span><span class="cx"> rect: style.getPropertyCSSValue(-webkit-column-width) : [object CSSPrimitiveValue]
</span><del>-rect: style.getPropertyValue(-webkit-dashboard-region) : null
-rect: style.getPropertyCSSValue(-webkit-dashboard-region) : [object CSSPrimitiveValue]
</del><span class="cx"> rect: style.getPropertyValue(-webkit-font-smoothing) : auto
</span><span class="cx"> rect: style.getPropertyCSSValue(-webkit-font-smoothing) : [object CSSPrimitiveValue]
</span><span class="cx"> rect: style.getPropertyValue(-webkit-highlight) : none
</span><span class="lines">@@ -346,6 +342,8 @@
</span><span class="cx"> rect: style.getPropertyCSSValue(-webkit-user-modify) : [object CSSPrimitiveValue]
</span><span class="cx"> rect: style.getPropertyValue(-webkit-user-select) : text
</span><span class="cx"> rect: style.getPropertyCSSValue(-webkit-user-select) : [object CSSPrimitiveValue]
</span><ins>+rect: style.getPropertyValue(-webkit-writing-mode) : horizontal-tb
+rect: style.getPropertyCSSValue(-webkit-writing-mode) : [object CSSPrimitiveValue]
</ins><span class="cx"> rect: style.getPropertyValue(clip-path) : none
</span><span class="cx"> rect: style.getPropertyCSSValue(clip-path) : [object CSSPrimitiveValue]
</span><span class="cx"> rect: style.getPropertyValue(clip-rule) : nonzero
</span><span class="lines">@@ -638,8 +636,6 @@
</span><span class="cx"> g: style.getPropertyCSSValue(-webkit-background-origin) : [object CSSPrimitiveValue]
</span><span class="cx"> g: style.getPropertyValue(-webkit-background-size) : auto auto
</span><span class="cx"> g: style.getPropertyCSSValue(-webkit-background-size) : [object CSSValueList]
</span><del>-g: style.getPropertyValue(-webkit-block-flow) : tb
-g: style.getPropertyCSSValue(-webkit-block-flow) : [object CSSPrimitiveValue]
</del><span class="cx"> g: style.getPropertyValue(-webkit-border-fit) : border
</span><span class="cx"> g: style.getPropertyCSSValue(-webkit-border-fit) : [object CSSPrimitiveValue]
</span><span class="cx"> g: style.getPropertyValue(-webkit-border-horizontal-spacing) : 0px
</span><span class="lines">@@ -692,8 +688,6 @@
</span><span class="cx"> g: style.getPropertyCSSValue(-webkit-column-span) : [object CSSPrimitiveValue]
</span><span class="cx"> g: style.getPropertyValue(-webkit-column-width) : auto
</span><span class="cx"> g: style.getPropertyCSSValue(-webkit-column-width) : [object CSSPrimitiveValue]
</span><del>-g: style.getPropertyValue(-webkit-dashboard-region) : null
-g: style.getPropertyCSSValue(-webkit-dashboard-region) : [object CSSPrimitiveValue]
</del><span class="cx"> g: style.getPropertyValue(-webkit-font-smoothing) : auto
</span><span class="cx"> g: style.getPropertyCSSValue(-webkit-font-smoothing) : [object CSSPrimitiveValue]
</span><span class="cx"> g: style.getPropertyValue(-webkit-highlight) : none
</span><span class="lines">@@ -770,6 +764,8 @@
</span><span class="cx"> g: style.getPropertyCSSValue(-webkit-user-modify) : [object CSSPrimitiveValue]
</span><span class="cx"> g: style.getPropertyValue(-webkit-user-select) : text
</span><span class="cx"> g: style.getPropertyCSSValue(-webkit-user-select) : [object CSSPrimitiveValue]
</span><ins>+g: style.getPropertyValue(-webkit-writing-mode) : horizontal-tb
+g: style.getPropertyCSSValue(-webkit-writing-mode) : [object CSSPrimitiveValue]
</ins><span class="cx"> g: style.getPropertyValue(clip-path) : none
</span><span class="cx"> g: style.getPropertyCSSValue(clip-path) : [object CSSPrimitiveValue]
</span><span class="cx"> g: style.getPropertyValue(clip-rule) : nonzero
</span></span></pre></div>
<a id="trunkLayoutTestssvgcssgetComputedStylebasicxhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/svg/css/getComputedStyle-basic.xhtml (69219 => 69220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/css/getComputedStyle-basic.xhtml        2010-10-06 18:59:27 UTC (rev 69219)
+++ trunk/LayoutTests/svg/css/getComputedStyle-basic.xhtml        2010-10-06 19:02:34 UTC (rev 69220)
</span><span class="lines">@@ -25,8 +25,10 @@
</span><span class="cx">           var value = style.getPropertyValue(name);
</span><span class="cx">           var cssValue = style.getPropertyCSSValue(name);
</span><span class="cx">   
</span><del>-          debugLog(elementId + &quot;: style.getPropertyValue(&quot; + name + &quot;) : &quot; + value);
-          debugLog(elementId + &quot;: style.getPropertyCSSValue(&quot; + name + &quot;) : &quot; + cssValue);
</del><ins>+          if (name != &quot;-webkit-dashboard-region&quot;) {
+            debugLog(elementId + &quot;: style.getPropertyValue(&quot; + name + &quot;) : &quot; + value);
+            debugLog(elementId + &quot;: style.getPropertyCSSValue(&quot; + name + &quot;) : &quot; + cssValue);
+          }
</ins><span class="cx">         }
</span><span class="cx">       }
</span><span class="cx">       
</span></span></pre></div>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (69219 => 69220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2010-10-06 18:59:27 UTC (rev 69219)
+++ trunk/WebCore/ChangeLog        2010-10-06 19:02:34 UTC (rev 69220)
</span><span class="lines">@@ -1,3 +1,159 @@
</span><ins>+2010-10-06  David Hyatt  &lt;hyatt@apple.com&gt;
+
+        Reviewed by Dan Bernstein.
+
+        https://bugs.webkit.org/show_bug.cgi?id=47285
+
+        Update to the latest writing-mode draft. The block-flow property is gone and has been replaced with writing-mode.
+        Change all the code to use writingMode() instead of blockFlow() and rename all functions that referred to block flow
+        as appropriate.
+
+        * css/CSSComputedStyleDeclaration.cpp:
+        (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
+        * css/CSSParser.cpp:
+        (WebCore::CSSParser::parseValue):
+        * css/CSSPrimitiveValueMappings.h:
+        (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
+        (WebCore::CSSPrimitiveValue::operator WritingMode):
+        (WebCore::CSSPrimitiveValue::operator SVGWritingMode):
+        * css/CSSProperty.cpp:
+        (WebCore::resolveToPhysicalProperty):
+        (WebCore::CSSProperty::resolveDirectionAwareProperty):
+        * css/CSSProperty.h:
+        * css/CSSPropertyNames.in:
+        * css/CSSStyleSelector.cpp:
+        (WebCore::CSSStyleSelector::styleForDocument):
+        (WebCore::CSSStyleSelector::adjustRenderStyle):
+        (WebCore::CSSStyleSelector::applyDeclarations):
+        (WebCore::CSSStyleSelector::applyProperty):
+        * css/CSSValueKeywords.in:
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::MarginInfo::MarginInfo):
+        (WebCore::RenderBlock::expandsToEncloseOverhangingFloats):
+        (WebCore::RenderBlock::setLogicalLeftForChild):
+        (WebCore::RenderBlock::setLogicalTopForChild):
+        (WebCore::RenderBlock::layoutBlockChild):
+        (WebCore::RenderBlock::insertFloatingObject):
+        (WebCore::RenderBlock::addOverhangingFloats):
+        (WebCore::RenderBlock::addIntrudingFloats):
+        (WebCore::RenderBlock::collapsedMarginBeforeForChild):
+        (WebCore::RenderBlock::collapsedMarginAfterForChild):
+        (WebCore::RenderBlock::marginBeforeForChild):
+        (WebCore::RenderBlock::marginAfterForChild):
+        (WebCore::RenderBlock::marginStartForChild):
+        (WebCore::RenderBlock::marginEndForChild):
+        (WebCore::RenderBlock::setMarginStartForChild):
+        (WebCore::RenderBlock::setMarginEndForChild):
+        (WebCore::RenderBlock::setMarginBeforeForChild):
+        (WebCore::RenderBlock::setMarginAfterForChild):
+        (WebCore::RenderBlock::marginValuesForChild):
+        * rendering/RenderBlock.h:
+        (WebCore::RenderBlock::logicalWidthForChild):
+        (WebCore::RenderBlock::logicalHeightForChild):
+        (WebCore::RenderBlock::logicalTopForChild):
+        (WebCore::RenderBlock::logicalRightOffsetForContent):
+        (WebCore::RenderBlock::logicalLeftOffsetForContent):
+        (WebCore::RenderBlock::logicalTopForFloat):
+        (WebCore::RenderBlock::logicalBottomForFloat):
+        (WebCore::RenderBlock::logicalLeftForFloat):
+        (WebCore::RenderBlock::logicalRightForFloat):
+        (WebCore::RenderBlock::logicalWidthForFloat):
+        (WebCore::RenderBlock::setLogicalTopForFloat):
+        (WebCore::RenderBlock::setLogicalLeftForFloat):
+        (WebCore::RenderBlock::setLogicalHeightForFloat):
+        (WebCore::RenderBlock::setLogicalWidthForFloat):
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::marginBefore):
+        (WebCore::RenderBox::marginAfter):
+        (WebCore::RenderBox::marginStart):
+        (WebCore::RenderBox::marginEnd):
+        (WebCore::RenderBox::setMarginStart):
+        (WebCore::RenderBox::setMarginEnd):
+        (WebCore::RenderBox::setMarginBefore):
+        (WebCore::RenderBox::setMarginAfter):
+        (WebCore::RenderBox::styleDidChange):
+        (WebCore::RenderBox::perpendicularContainingBlockLogicalHeight):
+        (WebCore::RenderBox::computeLogicalWidth):
+        (WebCore::RenderBox::computeLogicalHeight):
+        (WebCore::RenderBox::availableLogicalHeightUsing):
+        (WebCore::RenderBox::avoidsFloats):
+        * rendering/RenderBox.h:
+        (WebCore::RenderBox::logicalLeft):
+        (WebCore::RenderBox::logicalTop):
+        (WebCore::RenderBox::logicalWidth):
+        (WebCore::RenderBox::logicalHeight):
+        (WebCore::RenderBox::setLogicalLeft):
+        (WebCore::RenderBox::setLogicalTop):
+        (WebCore::RenderBox::setLogicalWidth):
+        (WebCore::RenderBox::setLogicalHeight):
+        (WebCore::RenderBox::setLogicalLocation):
+        (WebCore::RenderBox::contentLogicalWidth):
+        (WebCore::RenderBox::contentLogicalHeight):
+        (WebCore::RenderBox::stretchesToViewport):
+        (WebCore::RenderBox::intrinsicLogicalWidth):
+        (WebCore::RenderBox::intrinsicLogicalHeight):
+        (WebCore::RenderBox::availableWidth):
+        (WebCore::RenderBox::availableHeight):
+        (WebCore::RenderBox::scrollbarLogicalHeight):
+        (WebCore::RenderBox::isWritingModeRoot):
+        * rendering/RenderFieldset.cpp:
+        (WebCore::RenderFieldset::paintBoxDecorations):
+        (WebCore::RenderFieldset::paintMask):
+        * rendering/RenderImage.cpp:
+        (WebCore::RenderImage::computeReplacedLogicalWidth):
+        (WebCore::RenderImage::computeReplacedLogicalHeight):
+        * rendering/RenderInline.cpp:
+        (WebCore::RenderInline::marginLeft):
+        (WebCore::RenderInline::marginRight):
+        (WebCore::RenderInline::marginTop):
+        (WebCore::RenderInline::marginBottom):
+        * rendering/RenderTableCell.cpp:
+        (WebCore::RenderTableCell::paddingTop):
+        (WebCore::RenderTableCell::paddingBottom):
+        (WebCore::RenderTableCell::paddingLeft):
+        (WebCore::RenderTableCell::paddingRight):
+        * rendering/RenderView.h:
+        (WebCore::RenderView::viewLogicalWidth):
+        (WebCore::RenderView::viewLogicalHeight):
+        * rendering/RootInlineBox.cpp:
+        (WebCore::RootInlineBox::RootInlineBox):
+        * rendering/style/RenderStyle.cpp:
+        (WebCore::RenderStyle::diff):
+        (WebCore::RenderStyle::logicalWidth):
+        (WebCore::RenderStyle::logicalHeight):
+        (WebCore::RenderStyle::logicalMinWidth):
+        (WebCore::RenderStyle::logicalMaxWidth):
+        (WebCore::RenderStyle::logicalMinHeight):
+        (WebCore::RenderStyle::logicalMaxHeight):
+        (WebCore::RenderStyle::borderBeforeWidth):
+        (WebCore::RenderStyle::borderAfterWidth):
+        (WebCore::RenderStyle::borderStartWidth):
+        (WebCore::RenderStyle::borderEndWidth):
+        (WebCore::RenderStyle::marginBefore):
+        (WebCore::RenderStyle::marginAfter):
+        (WebCore::RenderStyle::marginBeforeUsing):
+        (WebCore::RenderStyle::marginAfterUsing):
+        (WebCore::RenderStyle::marginStart):
+        (WebCore::RenderStyle::marginEnd):
+        (WebCore::RenderStyle::marginStartUsing):
+        (WebCore::RenderStyle::marginEndUsing):
+        (WebCore::RenderStyle::paddingBefore):
+        (WebCore::RenderStyle::paddingAfter):
+        (WebCore::RenderStyle::paddingStart):
+        (WebCore::RenderStyle::paddingEnd):
+        * rendering/style/RenderStyle.h:
+        (WebCore::InheritedFlags::setBitDefaults):
+        (WebCore::InheritedFlags::writingMode):
+        (WebCore::InheritedFlags::isHorizontalWritingMode):
+        (WebCore::InheritedFlags::setWritingMode):
+        (WebCore::InheritedFlags::initialWritingMode):
+        * rendering/style/RenderStyleConstants.h:
+        * rendering/style/SVGRenderStyle.h:
+        (WebCore::SVGRenderStyle::initialWritingMode):
+        (WebCore::SVGRenderStyle::setWritingMode):
+        (WebCore::SVGRenderStyle::writingMode):
+        * rendering/style/SVGRenderStyleDefs.h:
+
</ins><span class="cx"> 2010-10-06  Sheriff Bot  &lt;webkit.review.bot@gmail.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Unreviewed, rolling out r69201.
</span></span></pre></div>
<a id="trunkWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/css/CSSComputedStyleDeclaration.cpp (69219 => 69220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/css/CSSComputedStyleDeclaration.cpp        2010-10-06 18:59:27 UTC (rev 69219)
+++ trunk/WebCore/css/CSSComputedStyleDeclaration.cpp        2010-10-06 19:02:34 UTC (rev 69220)
</span><span class="lines">@@ -159,7 +159,6 @@
</span><span class="cx">     CSSPropertyWebkitBackgroundComposite,
</span><span class="cx">     CSSPropertyWebkitBackgroundOrigin,
</span><span class="cx">     CSSPropertyWebkitBackgroundSize,
</span><del>-    CSSPropertyWebkitBlockFlow,
</del><span class="cx">     CSSPropertyWebkitBorderFit,
</span><span class="cx">     CSSPropertyWebkitBorderHorizontalSpacing,
</span><span class="cx">     CSSPropertyWebkitBorderImage,
</span><span class="lines">@@ -226,7 +225,8 @@
</span><span class="cx">     CSSPropertyWebkitTransitionTimingFunction,
</span><span class="cx">     CSSPropertyWebkitUserDrag,
</span><span class="cx">     CSSPropertyWebkitUserModify,
</span><del>-    CSSPropertyWebkitUserSelect
</del><ins>+    CSSPropertyWebkitUserSelect,
+    CSSPropertyWebkitWritingMode
</ins><span class="cx"> 
</span><span class="cx"> #if ENABLE(SVG)
</span><span class="cx">     ,
</span><span class="lines">@@ -734,7 +734,7 @@
</span><span class="cx">     if (!style)
</span><span class="cx">         return 0;
</span><span class="cx"> 
</span><del>-    propertyID = CSSProperty::resolveDirectionAwareProperty(propertyID, style-&gt;direction(), style-&gt;blockFlow());
</del><ins>+    propertyID = CSSProperty::resolveDirectionAwareProperty(propertyID, style-&gt;direction(), style-&gt;writingMode());
</ins><span class="cx"> 
</span><span class="cx">     switch (static_cast&lt;CSSPropertyID&gt;(propertyID)) {
</span><span class="cx">         case CSSPropertyInvalid:
</span><span class="lines">@@ -1354,8 +1354,6 @@
</span><span class="cx">             return CSSPrimitiveValue::create(style-&gt;appearance());
</span><span class="cx">         case CSSPropertyWebkitBackfaceVisibility:
</span><span class="cx">             return CSSPrimitiveValue::createIdentifier((style-&gt;backfaceVisibility() == BackfaceVisibilityHidden) ? CSSValueHidden : CSSValueVisible);
</span><del>-        case CSSPropertyWebkitBlockFlow:
-            return CSSPrimitiveValue::create(style-&gt;blockFlow());
</del><span class="cx">         case CSSPropertyWebkitBorderImage:
</span><span class="cx">             return valueForNinePieceImage(style-&gt;borderImage());
</span><span class="cx">         case CSSPropertyWebkitMaskBoxImage:
</span><span class="lines">@@ -1463,7 +1461,9 @@
</span><span class="cx">             return CSSPrimitiveValue::create(style-&gt;pointerEvents());
</span><span class="cx">         case CSSPropertyWebkitColorCorrection:
</span><span class="cx">             return CSSPrimitiveValue::create(style-&gt;colorSpace());
</span><del>-
</del><ins>+        case CSSPropertyWebkitWritingMode:
+            return CSSPrimitiveValue::create(style-&gt;writingMode());
+        
</ins><span class="cx">         /* Shorthand properties, currently not supported see bug 13658*/
</span><span class="cx">         case CSSPropertyBackground:
</span><span class="cx">         case CSSPropertyBorder:
</span><span class="lines">@@ -1479,7 +1479,6 @@
</span><span class="cx">         case CSSPropertyListStyle:
</span><span class="cx">         case CSSPropertyMargin:
</span><span class="cx">         case CSSPropertyPadding:
</span><del>-        case CSSPropertyWebkitWritingMode:
</del><span class="cx">             break;
</span><span class="cx"> 
</span><span class="cx">         /* Unimplemented CSS 3 properties (including CSS3 shorthand properties) */
</span></span></pre></div>
<a id="trunkWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/css/CSSParser.cpp (69219 => 69220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/css/CSSParser.cpp        2010-10-06 18:59:27 UTC (rev 69219)
+++ trunk/WebCore/css/CSSParser.cpp        2010-10-06 19:02:34 UTC (rev 69220)
</span><span class="lines">@@ -1781,15 +1781,8 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     // CSS Text Layout Module Level 3: Vertical writing support
</span><del>-    case CSSPropertyWebkitBlockFlow:
-        // [ &quot;tb&quot; | &quot;rl&quot; | &quot;lr&quot; | &quot;bt&quot; ]
-        if (id == CSSValueTb || id == CSSValueRl || id == CSSValueLr || id == CSSValueBt)
-            validPrimitive = true;
-        break;
-
</del><span class="cx">     case CSSPropertyWebkitWritingMode:
</span><del>-        // [ &quot;lr-tb&quot; | &quot;rl-tb&quot; | &quot;tb-rl&quot; | &quot;bt-rl&quot; | &quot;tb-lr&quot; | &quot;bt-lr&quot; ]
-        if (id == CSSValueLrTb || id == CSSValueRlTb || id == CSSValueTbRl || id == CSSValueBtRl || id == CSSValueTbLr || id == CSSValueBtLr)
</del><ins>+        if (id &gt;= CSSValueHorizontalTb &amp;&amp; id &lt;= CSSValueHorizontalBt)
</ins><span class="cx">             validPrimitive = true;
</span><span class="cx">         break;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebCorecssCSSPrimitiveValueMappingsh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/css/CSSPrimitiveValueMappings.h (69219 => 69220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/css/CSSPrimitiveValueMappings.h        2010-10-06 18:59:27 UTC (rev 69219)
+++ trunk/WebCore/css/CSSPrimitiveValueMappings.h        2010-10-06 19:02:34 UTC (rev 69220)
</span><span class="lines">@@ -2003,40 +2003,40 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-template&lt;&gt; inline CSSPrimitiveValue::CSSPrimitiveValue(EBlockFlowDirection e)
</del><ins>+template&lt;&gt; inline CSSPrimitiveValue::CSSPrimitiveValue(WritingMode e)
</ins><span class="cx">     : m_type(CSS_IDENT)
</span><span class="cx">     , m_hasCachedCSSText(false)
</span><span class="cx"> {
</span><span class="cx">     switch (e) {
</span><del>-    case TopToBottomBlockFlow:
-        m_value.ident = CSSValueTb;
</del><ins>+    case TopToBottomWritingMode:
+        m_value.ident = CSSValueHorizontalTb;
</ins><span class="cx">         break;
</span><del>-    case RightToLeftBlockFlow:
-        m_value.ident = CSSValueRl;
</del><ins>+    case RightToLeftWritingMode:
+        m_value.ident = CSSValueVerticalRl;
</ins><span class="cx">         break;
</span><del>-    case LeftToRightBlockFlow:
-        m_value.ident = CSSValueLr;
</del><ins>+    case LeftToRightWritingMode:
+        m_value.ident = CSSValueVerticalLr;
</ins><span class="cx">         break;
</span><del>-    case BottomToTopBlockFlow:
-        m_value.ident = CSSValueBt;
</del><ins>+    case BottomToTopWritingMode:
+        m_value.ident = CSSValueHorizontalBt;
</ins><span class="cx">         break;
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-template&lt;&gt; inline CSSPrimitiveValue::operator EBlockFlowDirection() const
</del><ins>+template&lt;&gt; inline CSSPrimitiveValue::operator WritingMode() const
</ins><span class="cx"> {
</span><span class="cx">     switch (m_value.ident) {
</span><del>-    case CSSValueTb:
-        return TopToBottomBlockFlow;
-    case CSSValueRl:
-        return RightToLeftBlockFlow;
-    case CSSValueLr:
-        return LeftToRightBlockFlow;
-    case CSSValueBt:
-        return BottomToTopBlockFlow;
</del><ins>+    case CSSValueHorizontalTb:
+        return TopToBottomWritingMode;
+    case CSSValueVerticalRl:
+        return RightToLeftWritingMode;
+    case CSSValueVerticalLr:
+        return LeftToRightWritingMode;
+    case CSSValueHorizontalBt:
+        return BottomToTopWritingMode;
</ins><span class="cx">     default:
</span><span class="cx">         ASSERT_NOT_REACHED();
</span><del>-        return TopToBottomBlockFlow;
</del><ins>+        return TopToBottomWritingMode;
</ins><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -2703,7 +2703,7 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-template&lt;&gt; inline CSSPrimitiveValue::CSSPrimitiveValue(EWritingMode e)
</del><ins>+template&lt;&gt; inline CSSPrimitiveValue::CSSPrimitiveValue(SVGWritingMode e)
</ins><span class="cx">     : m_type(CSS_IDENT)
</span><span class="cx">     , m_hasCachedCSSText(false)
</span><span class="cx"> {
</span><span class="lines">@@ -2729,7 +2729,7 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-template&lt;&gt; inline CSSPrimitiveValue::operator EWritingMode() const
</del><ins>+template&lt;&gt; inline CSSPrimitiveValue::operator SVGWritingMode() const
</ins><span class="cx"> {
</span><span class="cx">     switch (m_value.ident) {
</span><span class="cx">     case CSSValueLrTb:
</span></span></pre></div>
<a id="trunkWebCorecssCSSPropertycpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/css/CSSProperty.cpp (69219 => 69220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/css/CSSProperty.cpp        2010-10-06 18:59:27 UTC (rev 69219)
+++ trunk/WebCore/css/CSSProperty.cpp        2010-10-06 19:02:34 UTC (rev 69220)
</span><span class="lines">@@ -42,16 +42,16 @@
</span><span class="cx"> enum LogicalBoxSide { BeforeSide, EndSide, AfterSide, StartSide };
</span><span class="cx"> enum PhysicalBoxSide { TopSide, RightSide, BottomSide, LeftSide };
</span><span class="cx"> 
</span><del>-static int resolveToPhysicalProperty(TextDirection direction, EBlockFlowDirection blockDirection, LogicalBoxSide logicalSide, const int* properties)
</del><ins>+static int resolveToPhysicalProperty(TextDirection direction, WritingMode writingMode, LogicalBoxSide logicalSide, const int* properties)
</ins><span class="cx"> {
</span><span class="cx">     if (direction == LTR) {
</span><del>-        if (blockDirection == TopToBottomBlockFlow) {
</del><ins>+        if (writingMode == TopToBottomWritingMode) {
</ins><span class="cx">             // The common case. The logical and physical box sides match.
</span><span class="cx">             // Left = Start, Right = End, Before = Top, After = Bottom
</span><span class="cx">             return properties[logicalSide];
</span><span class="cx">         }
</span><span class="cx">         
</span><del>-        if (blockDirection == BottomToTopBlockFlow) {
</del><ins>+        if (writingMode == BottomToTopWritingMode) {
</ins><span class="cx">             // Start = Left, End = Right, Before = Bottom, After = Top.
</span><span class="cx">             switch (logicalSide) {
</span><span class="cx">             case StartSide:
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx">             }
</span><span class="cx">         }
</span><span class="cx">         
</span><del>-        if (blockDirection == LeftToRightBlockFlow) {
</del><ins>+        if (writingMode == LeftToRightWritingMode) {
</ins><span class="cx">             // Start = Top, End = Bottom, Before = Left, After = Right.
</span><span class="cx">             switch (logicalSide) {
</span><span class="cx">             case StartSide:
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx">         }
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    if (blockDirection == TopToBottomBlockFlow) {
</del><ins>+    if (writingMode == TopToBottomWritingMode) {
</ins><span class="cx">         // Start = Right, End = Left, Before = Top, After = Bottom
</span><span class="cx">         switch (logicalSide) {
</span><span class="cx">         case StartSide:
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx">         }
</span><span class="cx">     }
</span><span class="cx">     
</span><del>-    if (blockDirection == BottomToTopBlockFlow) {
</del><ins>+    if (writingMode == BottomToTopWritingMode) {
</ins><span class="cx">         // Start = Right, End = Left, Before = Bottom, After = Top
</span><span class="cx">         switch (logicalSide) {
</span><span class="cx">         case StartSide:
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx">         }
</span><span class="cx">     }
</span><span class="cx">     
</span><del>-    if (blockDirection == LeftToRightBlockFlow) {
</del><ins>+    if (writingMode == LeftToRightWritingMode) {
</ins><span class="cx">         // Start = Bottom, End = Top, Before = Left, After = Right
</span><span class="cx">         switch (logicalSide) {
</span><span class="cx">         case StartSide:
</span><span class="lines">@@ -149,135 +149,135 @@
</span><span class="cx"> 
</span><span class="cx"> enum LogicalExtent { LogicalWidth, LogicalHeight };
</span><span class="cx"> 
</span><del>-static int resolveToPhysicalProperty(EBlockFlowDirection blockDirection, LogicalExtent logicalSide, const int* properties)
</del><ins>+static int resolveToPhysicalProperty(WritingMode writingMode, LogicalExtent logicalSide, const int* properties)
</ins><span class="cx"> {
</span><del>-    if (blockDirection == TopToBottomBlockFlow || blockDirection == BottomToTopBlockFlow)
</del><ins>+    if (writingMode == TopToBottomWritingMode || writingMode == BottomToTopWritingMode)
</ins><span class="cx">         return properties[logicalSide];
</span><span class="cx">     return logicalSide == LogicalWidth ? properties[1] : properties[0];
</span><span class="cx"> }
</span><span class="cx">         
</span><del>-int CSSProperty::resolveDirectionAwareProperty(int propertyID, TextDirection direction, EBlockFlowDirection blockDirection)
</del><ins>+int CSSProperty::resolveDirectionAwareProperty(int propertyID, TextDirection direction, WritingMode writingMode)
</ins><span class="cx"> {
</span><span class="cx">     switch (static_cast&lt;CSSPropertyID&gt;(propertyID)) {
</span><span class="cx">     case CSSPropertyWebkitMarginEnd: {
</span><span class="cx">         const int properties[4] = { CSSPropertyMarginTop, CSSPropertyMarginRight, CSSPropertyMarginBottom, CSSPropertyMarginLeft };
</span><del>-        return resolveToPhysicalProperty(direction, blockDirection, EndSide, properties);
</del><ins>+        return resolveToPhysicalProperty(direction, writingMode, EndSide, properties);
</ins><span class="cx">     }
</span><span class="cx">     case CSSPropertyWebkitMarginStart: {
</span><span class="cx">         const int properties[4] = { CSSPropertyMarginTop, CSSPropertyMarginRight, CSSPropertyMarginBottom, CSSPropertyMarginLeft };
</span><del>-        return resolveToPhysicalProperty(direction, blockDirection, StartSide, properties);
</del><ins>+        return resolveToPhysicalProperty(direction, writingMode, StartSide, properties);
</ins><span class="cx">     }
</span><span class="cx">     case CSSPropertyWebkitMarginBefore: {
</span><span class="cx">         const int properties[4] = { CSSPropertyMarginTop, CSSPropertyMarginRight, CSSPropertyMarginBottom, CSSPropertyMarginLeft };
</span><del>-        return resolveToPhysicalProperty(direction, blockDirection, BeforeSide, properties);
</del><ins>+        return resolveToPhysicalProperty(direction, writingMode, BeforeSide, properties);
</ins><span class="cx">     }
</span><span class="cx">     case CSSPropertyWebkitMarginAfter: {
</span><span class="cx">         const int properties[4] = { CSSPropertyMarginTop, CSSPropertyMarginRight, CSSPropertyMarginBottom, CSSPropertyMarginLeft };
</span><del>-        return resolveToPhysicalProperty(direction, blockDirection, AfterSide, properties);
</del><ins>+        return resolveToPhysicalProperty(direction, writingMode, AfterSide, properties);
</ins><span class="cx">     }
</span><span class="cx">     case CSSPropertyWebkitPaddingEnd: {
</span><span class="cx">         const int properties[4] = { CSSPropertyPaddingTop, CSSPropertyPaddingRight, CSSPropertyPaddingBottom, CSSPropertyPaddingLeft };
</span><del>-        return resolveToPhysicalProperty(direction, blockDirection, EndSide, properties);
</del><ins>+        return resolveToPhysicalProperty(direction, writingMode, EndSide, properties);
</ins><span class="cx">     }
</span><span class="cx">     case CSSPropertyWebkitPaddingStart: {
</span><span class="cx">         const int properties[4] = { CSSPropertyPaddingTop, CSSPropertyPaddingRight, CSSPropertyPaddingBottom, CSSPropertyPaddingLeft };
</span><del>-        return resolveToPhysicalProperty(direction, blockDirection, StartSide, properties);
</del><ins>+        return resolveToPhysicalProperty(direction, writingMode, StartSide, properties);
</ins><span class="cx">     }
</span><span class="cx">     case CSSPropertyWebkitPaddingBefore: {
</span><span class="cx">         const int properties[4] = { CSSPropertyPaddingTop, CSSPropertyPaddingRight, CSSPropertyPaddingBottom, CSSPropertyPaddingLeft };
</span><del>-        return resolveToPhysicalProperty(direction, blockDirection, BeforeSide, properties);
</del><ins>+        return resolveToPhysicalProperty(direction, writingMode, BeforeSide, properties);
</ins><span class="cx">     }
</span><span class="cx">     case CSSPropertyWebkitPaddingAfter: {
</span><span class="cx">         const int properties[4] = { CSSPropertyPaddingTop, CSSPropertyPaddingRight, CSSPropertyPaddingBottom, CSSPropertyPaddingLeft };
</span><del>-        return resolveToPhysicalProperty(direction, blockDirection, AfterSide, properties);
</del><ins>+        return resolveToPhysicalProperty(direction, writingMode, AfterSide, properties);
</ins><span class="cx">     }
</span><span class="cx">     case CSSPropertyWebkitBorderEnd: {
</span><span class="cx">         const int properties[4] = { CSSPropertyBorderTop, CSSPropertyBorderRight, CSSPropertyBorderBottom, CSSPropertyBorderLeft };
</span><del>-        return resolveToPhysicalProperty(direction, blockDirection, EndSide, properties);
</del><ins>+        return resolveToPhysicalProperty(direction, writingMode, EndSide, properties);
</ins><span class="cx">     }
</span><span class="cx">     case CSSPropertyWebkitBorderStart: {
</span><span class="cx">         const int properties[4] = { CSSPropertyBorderTop, CSSPropertyBorderRight, CSSPropertyBorderBottom, CSSPropertyBorderLeft };
</span><del>-        return resolveToPhysicalProperty(direction, blockDirection, StartSide, properties);
</del><ins>+        return resolveToPhysicalProperty(direction, writingMode, StartSide, properties);
</ins><span class="cx">     }
</span><span class="cx">     case CSSPropertyWebkitBorderBefore: {
</span><span class="cx">         const int properties[4] = { CSSPropertyBorderTop, CSSPropertyBorderRight, CSSPropertyBorderBottom, CSSPropertyBorderLeft };
</span><del>-        return resolveToPhysicalProperty(direction, blockDirection, BeforeSide, properties);
</del><ins>+        return resolveToPhysicalProperty(direction, writingMode, BeforeSide, properties);
</ins><span class="cx">     }
</span><span class="cx">     case CSSPropertyWebkitBorderAfter: {
</span><span class="cx">         const int properties[4] = { CSSPropertyBorderTop, CSSPropertyBorderRight, CSSPropertyBorderBottom, CSSPropertyBorderLeft };
</span><del>-        return resolveToPhysicalProperty(direction, blockDirection, AfterSide, properties);
</del><ins>+        return resolveToPhysicalProperty(direction, writingMode, AfterSide, properties);
</ins><span class="cx">     }
</span><span class="cx">     case CSSPropertyWebkitBorderEndColor: {
</span><span class="cx">         const int properties[4] = { CSSPropertyBorderTopColor, CSSPropertyBorderRightColor, CSSPropertyBorderBottomColor, CSSPropertyBorderLeftColor };
</span><del>-        return resolveToPhysicalProperty(direction, blockDirection, EndSide, properties);
</del><ins>+        return resolveToPhysicalProperty(direction, writingMode, EndSide, properties);
</ins><span class="cx">     }
</span><span class="cx">     case CSSPropertyWebkitBorderStartColor: {
</span><span class="cx">         const int properties[4] = { CSSPropertyBorderTopColor, CSSPropertyBorderRightColor, CSSPropertyBorderBottomColor, CSSPropertyBorderLeftColor };
</span><del>-        return resolveToPhysicalProperty(direction, blockDirection, StartSide, properties);
</del><ins>+        return resolveToPhysicalProperty(direction, writingMode, StartSide, properties);
</ins><span class="cx">     }
</span><span class="cx">     case CSSPropertyWebkitBorderBeforeColor: {
</span><span class="cx">         const int properties[4] = { CSSPropertyBorderTopColor, CSSPropertyBorderRightColor, CSSPropertyBorderBottomColor, CSSPropertyBorderLeftColor };
</span><del>-        return resolveToPhysicalProperty(direction, blockDirection, BeforeSide, properties);
</del><ins>+        return resolveToPhysicalProperty(direction, writingMode, BeforeSide, properties);
</ins><span class="cx">     }
</span><span class="cx">     case CSSPropertyWebkitBorderAfterColor: {
</span><span class="cx">         const int properties[4] = { CSSPropertyBorderTopColor, CSSPropertyBorderRightColor, CSSPropertyBorderBottomColor, CSSPropertyBorderLeftColor };
</span><del>-        return resolveToPhysicalProperty(direction, blockDirection, AfterSide, properties);
</del><ins>+        return resolveToPhysicalProperty(direction, writingMode, AfterSide, properties);
</ins><span class="cx">     }
</span><span class="cx">     case CSSPropertyWebkitBorderEndStyle: {
</span><span class="cx">         const int properties[4] = { CSSPropertyBorderTopStyle, CSSPropertyBorderRightStyle, CSSPropertyBorderBottomStyle, CSSPropertyBorderLeftStyle };
</span><del>-        return resolveToPhysicalProperty(direction, blockDirection, EndSide, properties);
</del><ins>+        return resolveToPhysicalProperty(direction, writingMode, EndSide, properties);
</ins><span class="cx">     }
</span><span class="cx">     case CSSPropertyWebkitBorderStartStyle: {
</span><span class="cx">         const int properties[4] = { CSSPropertyBorderTopStyle, CSSPropertyBorderRightStyle, CSSPropertyBorderBottomStyle, CSSPropertyBorderLeftStyle };
</span><del>-        return resolveToPhysicalProperty(direction, blockDirection, StartSide, properties);
</del><ins>+        return resolveToPhysicalProperty(direction, writingMode, StartSide, properties);
</ins><span class="cx">     }
</span><span class="cx">     case CSSPropertyWebkitBorderBeforeStyle: {
</span><span class="cx">         const int properties[4] = { CSSPropertyBorderTopStyle, CSSPropertyBorderRightStyle, CSSPropertyBorderBottomStyle, CSSPropertyBorderLeftStyle };
</span><del>-        return resolveToPhysicalProperty(direction, blockDirection, BeforeSide, properties);
</del><ins>+        return resolveToPhysicalProperty(direction, writingMode, BeforeSide, properties);
</ins><span class="cx">     }
</span><span class="cx">     case CSSPropertyWebkitBorderAfterStyle: {
</span><span class="cx">         const int properties[4] = { CSSPropertyBorderTopStyle, CSSPropertyBorderRightStyle, CSSPropertyBorderBottomStyle, CSSPropertyBorderLeftStyle };
</span><del>-        return resolveToPhysicalProperty(direction, blockDirection, AfterSide, properties);
</del><ins>+        return resolveToPhysicalProperty(direction, writingMode, AfterSide, properties);
</ins><span class="cx">     }
</span><span class="cx">     case CSSPropertyWebkitBorderEndWidth: {
</span><span class="cx">         const int properties[4] = { CSSPropertyBorderTopWidth, CSSPropertyBorderRightWidth, CSSPropertyBorderBottomWidth, CSSPropertyBorderLeftWidth };
</span><del>-        return resolveToPhysicalProperty(direction, blockDirection, EndSide, properties);
</del><ins>+        return resolveToPhysicalProperty(direction, writingMode, EndSide, properties);
</ins><span class="cx">     }
</span><span class="cx">     case CSSPropertyWebkitBorderStartWidth: {
</span><span class="cx">         const int properties[4] = { CSSPropertyBorderTopWidth, CSSPropertyBorderRightWidth, CSSPropertyBorderBottomWidth, CSSPropertyBorderLeftWidth };
</span><del>-        return resolveToPhysicalProperty(direction, blockDirection, StartSide, properties);
</del><ins>+        return resolveToPhysicalProperty(direction, writingMode, StartSide, properties);
</ins><span class="cx">     }
</span><span class="cx">     case CSSPropertyWebkitBorderBeforeWidth: {
</span><span class="cx">         const int properties[4] = { CSSPropertyBorderTopWidth, CSSPropertyBorderRightWidth, CSSPropertyBorderBottomWidth, CSSPropertyBorderLeftWidth };
</span><del>-        return resolveToPhysicalProperty(direction, blockDirection, BeforeSide, properties);
</del><ins>+        return resolveToPhysicalProperty(direction, writingMode, BeforeSide, properties);
</ins><span class="cx">     }
</span><span class="cx">     case CSSPropertyWebkitBorderAfterWidth: {
</span><span class="cx">         const int properties[4] = { CSSPropertyBorderTopWidth, CSSPropertyBorderRightWidth, CSSPropertyBorderBottomWidth, CSSPropertyBorderLeftWidth };
</span><del>-        return resolveToPhysicalProperty(direction, blockDirection, AfterSide, properties);
</del><ins>+        return resolveToPhysicalProperty(direction, writingMode, AfterSide, properties);
</ins><span class="cx">     }
</span><span class="cx">     case CSSPropertyWebkitLogicalWidth: {
</span><span class="cx">         const int properties[2] = { CSSPropertyWidth, CSSPropertyHeight };
</span><del>-        return resolveToPhysicalProperty(blockDirection, LogicalWidth, properties);
</del><ins>+        return resolveToPhysicalProperty(writingMode, LogicalWidth, properties);
</ins><span class="cx">     }
</span><span class="cx">     case CSSPropertyWebkitLogicalHeight: {
</span><span class="cx">         const int properties[2] = { CSSPropertyWidth, CSSPropertyHeight };
</span><del>-        return resolveToPhysicalProperty(blockDirection, LogicalHeight, properties);
</del><ins>+        return resolveToPhysicalProperty(writingMode, LogicalHeight, properties);
</ins><span class="cx">     }
</span><span class="cx">     case CSSPropertyWebkitMinLogicalWidth: {
</span><span class="cx">         const int properties[2] = { CSSPropertyMinWidth, CSSPropertyMinHeight };
</span><del>-        return resolveToPhysicalProperty(blockDirection, LogicalWidth, properties);
</del><ins>+        return resolveToPhysicalProperty(writingMode, LogicalWidth, properties);
</ins><span class="cx">     }
</span><span class="cx">     case CSSPropertyWebkitMinLogicalHeight: {
</span><span class="cx">         const int properties[2] = { CSSPropertyMinWidth, CSSPropertyMinHeight };
</span><del>-        return resolveToPhysicalProperty(blockDirection, LogicalHeight, properties);
</del><ins>+        return resolveToPhysicalProperty(writingMode, LogicalHeight, properties);
</ins><span class="cx">     }
</span><span class="cx">     case CSSPropertyWebkitMaxLogicalWidth: {
</span><span class="cx">         const int properties[2] = { CSSPropertyMaxWidth, CSSPropertyMaxHeight };
</span><del>-        return resolveToPhysicalProperty(blockDirection, LogicalWidth, properties);
</del><ins>+        return resolveToPhysicalProperty(writingMode, LogicalWidth, properties);
</ins><span class="cx">     }
</span><span class="cx">     case CSSPropertyWebkitMaxLogicalHeight: {
</span><span class="cx">         const int properties[2] = { CSSPropertyMaxWidth, CSSPropertyMaxHeight };
</span><del>-        return resolveToPhysicalProperty(blockDirection, LogicalHeight, properties);
</del><ins>+        return resolveToPhysicalProperty(writingMode, LogicalHeight, properties);
</ins><span class="cx">     }
</span><span class="cx">     default:
</span><span class="cx">         return propertyID;
</span></span></pre></div>
<a id="trunkWebCorecssCSSPropertyh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/css/CSSProperty.h (69219 => 69220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/css/CSSProperty.h        2010-10-06 18:59:27 UTC (rev 69219)
+++ trunk/WebCore/css/CSSProperty.h        2010-10-06 19:02:34 UTC (rev 69220)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx">     
</span><span class="cx">     String cssText() const;
</span><span class="cx"> 
</span><del>-    static int resolveDirectionAwareProperty(int propertyID, TextDirection, EBlockFlowDirection);
</del><ins>+    static int resolveDirectionAwareProperty(int propertyID, TextDirection, WritingMode);
</ins><span class="cx"> 
</span><span class="cx">     friend bool operator==(const CSSProperty&amp;, const CSSProperty&amp;);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebCorecssCSSPropertyNamesin"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/css/CSSPropertyNames.in (69219 => 69220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/css/CSSPropertyNames.in        2010-10-06 18:59:27 UTC (rev 69219)
+++ trunk/WebCore/css/CSSPropertyNames.in        2010-10-06 19:02:34 UTC (rev 69220)
</span><span class="lines">@@ -20,7 +20,6 @@
</span><span class="cx"> font-variant
</span><span class="cx"> font-weight
</span><span class="cx"> text-rendering
</span><del>--webkit-block-flow
</del><span class="cx"> -webkit-font-smoothing
</span><span class="cx"> -webkit-text-size-adjust
</span><span class="cx"> -webkit-writing-mode
</span></span></pre></div>
<a id="trunkWebCorecssCSSStyleSelectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/css/CSSStyleSelector.cpp (69219 => 69220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/css/CSSStyleSelector.cpp        2010-10-06 18:59:27 UTC (rev 69219)
+++ trunk/WebCore/css/CSSStyleSelector.cpp        2010-10-06 19:02:34 UTC (rev 69220)
</span><span class="lines">@@ -1110,7 +1110,7 @@
</span><span class="cx">     if (docElement &amp;&amp; docElement-&gt;renderer()) {
</span><span class="cx">         // Use the direction and block-flow of the document element to set the
</span><span class="cx">         // viewport's direction and block-flow.
</span><del>-        documentStyle-&gt;setBlockFlow(docElement-&gt;renderer()-&gt;style()-&gt;blockFlow());
</del><ins>+        documentStyle-&gt;setWritingMode(docElement-&gt;renderer()-&gt;style()-&gt;writingMode());
</ins><span class="cx">         documentStyle-&gt;setDirection(docElement-&gt;renderer()-&gt;style()-&gt;direction());
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="lines">@@ -1726,7 +1726,7 @@
</span><span class="cx">         
</span><span class="cx">         // FIXME: Don't support this mutation for pseudo styles like first-letter or first-line, since it's not completely
</span><span class="cx">         // clear how that should work.
</span><del>-        if (style-&gt;display() == INLINE &amp;&amp; style-&gt;styleType() == NOPSEUDO &amp;&amp; parentStyle &amp;&amp; style-&gt;blockFlow() != parentStyle-&gt;blockFlow())
</del><ins>+        if (style-&gt;display() == INLINE &amp;&amp; style-&gt;styleType() == NOPSEUDO &amp;&amp; parentStyle &amp;&amp; style-&gt;writingMode() != parentStyle-&gt;writingMode())
</ins><span class="cx">             style-&gt;setDisplay(INLINE_BLOCK);
</span><span class="cx">         
</span><span class="cx">         // After performing the display mutation, check table rows.  We do not honor position:relative on
</span><span class="lines">@@ -1738,14 +1738,14 @@
</span><span class="cx">             style-&gt;setPosition(StaticPosition);
</span><span class="cx">         
</span><span class="cx">         // FIXME: Since we don't support block-flow on either tables or flexible boxes yet, disallow setting
</span><del>-        // of block-flow to anything other than TopToBottomBlockFlow.
</del><ins>+        // of block-flow to anything other than TopToBottomWritingMode.
</ins><span class="cx">         // https://bugs.webkit.org/show_bug.cgi?id=46417 - Tables support
</span><span class="cx">         // https://bugs.webkit.org/show_bug.cgi?id=46418 - Flexible box support.
</span><del>-        if (style-&gt;blockFlow() != TopToBottomBlockFlow &amp;&amp; (style-&gt;display() == TABLE || style-&gt;display() == INLINE_TABLE
</del><ins>+        if (style-&gt;writingMode() != TopToBottomWritingMode &amp;&amp; (style-&gt;display() == TABLE || style-&gt;display() == INLINE_TABLE
</ins><span class="cx">             || style-&gt;display() == TABLE_HEADER_GROUP || style-&gt;display() == TABLE_ROW_GROUP
</span><span class="cx">             || style-&gt;display() == TABLE_FOOTER_GROUP || style-&gt;display() == TABLE_ROW || style-&gt;display() == TABLE_CELL
</span><span class="cx">             || style-&gt;display() == BOX || style-&gt;display() == INLINE_BOX))
</span><del>-            style-&gt;setBlockFlow(TopToBottomBlockFlow);
</del><ins>+            style-&gt;setWritingMode(TopToBottomWritingMode);
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     // Make sure our z-index value is only applied if the object is positioned.
</span><span class="lines">@@ -2946,7 +2946,7 @@
</span><span class="cx"> 
</span><span class="cx">                 if (applyFirst) {
</span><span class="cx">                     COMPILE_ASSERT(firstCSSProperty == CSSPropertyColor, CSS_color_is_first_property);
</span><del>-                    COMPILE_ASSERT(CSSPropertyZoom == CSSPropertyColor + 14, CSS_zoom_is_end_of_first_prop_range);
</del><ins>+                    COMPILE_ASSERT(CSSPropertyZoom == CSSPropertyColor + 13, CSS_zoom_is_end_of_first_prop_range);
</ins><span class="cx">                     COMPILE_ASSERT(CSSPropertyLineHeight == CSSPropertyZoom + 1, CSS_line_height_is_after_zoom);
</span><span class="cx"> 
</span><span class="cx">                     // give special priority to font-xxx, color properties, etc
</span><span class="lines">@@ -3134,7 +3134,7 @@
</span><span class="cx">     bool isInherit = m_parentNode &amp;&amp; valueType == CSSValue::CSS_INHERIT;
</span><span class="cx">     bool isInitial = valueType == CSSValue::CSS_INITIAL || (!m_parentNode &amp;&amp; valueType == CSSValue::CSS_INHERIT);
</span><span class="cx">     
</span><del>-    id = CSSProperty::resolveDirectionAwareProperty(id, m_style-&gt;direction(), m_style-&gt;blockFlow());
</del><ins>+    id = CSSProperty::resolveDirectionAwareProperty(id, m_style-&gt;direction(), m_style-&gt;writingMode());
</ins><span class="cx"> 
</span><span class="cx">     if (m_checker.m_matchVisitedPseudoClass &amp;&amp; !isValidVisitedLinkProperty(id)) {
</span><span class="cx">         // Limit the properties that can be applied to only the ones honored by :visited.
</span><span class="lines">@@ -5571,50 +5571,8 @@
</span><span class="cx"> #endif 
</span><span class="cx"> 
</span><span class="cx">     // CSS Text Layout Module Level 3: Vertical writing support
</span><del>-    case CSSPropertyWebkitBlockFlow:
-        HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE(blockFlow, BlockFlow)
-        return;
-
</del><span class="cx">     case CSSPropertyWebkitWritingMode:
</span><del>-        // The 'writing-mode' property is a shorthand property for the 'direction' property and the 'block-flow' property. 
-        if (isInherit) {
-            m_style-&gt;setDirection(m_parentStyle-&gt;direction());
-            m_style-&gt;setBlockFlow(m_parentStyle-&gt;blockFlow());
-        } else if (isInitial) {
-            m_style-&gt;setDirection(m_style-&gt;initialDirection());
-            m_style-&gt;setBlockFlow(m_style-&gt;initialBlockFlow());
-        } else {
-            if (!primitiveValue)
-                return;
-            switch (primitiveValue-&gt;getIdent()) {
-            case CSSValueLrTb:
-                m_style-&gt;setDirection(LTR);
-                m_style-&gt;setBlockFlow(TopToBottomBlockFlow);
-                break;
-            case CSSValueRlTb:
-                m_style-&gt;setDirection(RTL);
-                m_style-&gt;setBlockFlow(TopToBottomBlockFlow);
-                break;
-            case CSSValueTbRl:
-                m_style-&gt;setDirection(LTR);
-                m_style-&gt;setBlockFlow(RightToLeftBlockFlow);
-                break;
-            case CSSValueBtRl:
-                m_style-&gt;setDirection(RTL);
-                m_style-&gt;setBlockFlow(RightToLeftBlockFlow);
-                break;
-            case CSSValueTbLr:
-                m_style-&gt;setDirection(LTR);
-                m_style-&gt;setBlockFlow(LeftToRightBlockFlow);
-                break;
-            case CSSValueBtLr:
-                m_style-&gt;setDirection(RTL);
-                m_style-&gt;setBlockFlow(LeftToRightBlockFlow);
-                break;
-            default:
-                break;
-            }
-        }
</del><ins>+        HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE(writingMode, WritingMode)
</ins><span class="cx">         return;
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(SVG)
</span></span></pre></div>
<a id="trunkWebCorecssCSSValueKeywordsin"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/css/CSSValueKeywords.in (69219 => 69220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/css/CSSValueKeywords.in        2010-10-06 18:59:27 UTC (rev 69219)
+++ trunk/WebCore/css/CSSValueKeywords.in        2010-10-06 19:02:34 UTC (rev 69220)
</span><span class="lines">@@ -751,16 +751,16 @@
</span><span class="cx"> manual
</span><span class="cx"> # auto
</span><span class="cx"> 
</span><del>-# -webkit-block-flow
</del><ins>+# -webkit-writing-mode
+# SVG compatibility
+lr
+rl
</ins><span class="cx"> tb
</span><del>-rl
-lr
-bt
-
-# -webkit-writing-mode
</del><span class="cx"> lr-tb
</span><span class="cx"> rl-tb
</span><span class="cx"> tb-rl
</span><del>-bt-rl
-tb-lr
-bt-lr
</del><ins>+# Standard values from CSS3
+horizontal-tb
+vertical-rl
+vertical-lr
+horizontal-bt
</ins></span></pre></div>
<a id="trunkWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/RenderBlock.cpp (69219 => 69220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/RenderBlock.cpp        2010-10-06 18:59:27 UTC (rev 69219)
+++ trunk/WebCore/rendering/RenderBlock.cpp        2010-10-06 19:02:34 UTC (rev 69220)
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx">     // we're positioned, floating, a table cell.
</span><span class="cx">     m_canCollapseWithChildren = !block-&gt;isRenderView() &amp;&amp; !block-&gt;isRoot() &amp;&amp; !block-&gt;isPositioned()
</span><span class="cx">         &amp;&amp; !block-&gt;isFloating() &amp;&amp; !block-&gt;isTableCell() &amp;&amp; !block-&gt;hasOverflowClip() &amp;&amp; !block-&gt;isInlineBlockOrInlineTable()
</span><del>-        &amp;&amp; !block-&gt;isBlockFlowRoot();
</del><ins>+        &amp;&amp; !block-&gt;isWritingModeRoot();
</ins><span class="cx"> 
</span><span class="cx">     m_canCollapseMarginBeforeWithChildren = m_canCollapseWithChildren &amp;&amp; (beforeBorderPadding == 0) &amp;&amp; block-&gt;style()-&gt;marginBeforeCollapse() != MSEPARATE;
</span><span class="cx"> 
</span><span class="lines">@@ -1319,7 +1319,7 @@
</span><span class="cx"> bool RenderBlock::expandsToEncloseOverhangingFloats() const
</span><span class="cx"> {
</span><span class="cx">     return isInlineBlockOrInlineTable() || isFloatingOrPositioned() || hasOverflowClip() || (parent() &amp;&amp; parent()-&gt;isFlexibleBox())
</span><del>-           || hasColumns() || isTableCell() || isFieldset() || isBlockFlowRoot();
</del><ins>+           || hasColumns() || isTableCell() || isFieldset() || isWritingModeRoot();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void RenderBlock::adjustPositionedBlock(RenderBox* child, const MarginInfo&amp; marginInfo)
</span><span class="lines">@@ -1720,7 +1720,7 @@
</span><span class="cx"> 
</span><span class="cx"> void RenderBlock::setLogicalLeftForChild(RenderBox* child, int logicalLeft, ApplyLayoutDeltaMode applyDelta)
</span><span class="cx"> {
</span><del>-    if (style()-&gt;isVerticalBlockFlow()) {
</del><ins>+    if (style()-&gt;isHorizontalWritingMode()) {
</ins><span class="cx">         if (applyDelta == ApplyLayoutDelta)
</span><span class="cx">             view()-&gt;addLayoutDelta(IntSize(child-&gt;x() - logicalLeft, 0));
</span><span class="cx">         child-&gt;setX(logicalLeft);
</span><span class="lines">@@ -1733,7 +1733,7 @@
</span><span class="cx"> 
</span><span class="cx"> void RenderBlock::setLogicalTopForChild(RenderBox* child, int logicalTop, ApplyLayoutDeltaMode applyDelta)
</span><span class="cx"> {
</span><del>-    if (style()-&gt;isVerticalBlockFlow()) {
</del><ins>+    if (style()-&gt;isHorizontalWritingMode()) {
</ins><span class="cx">         if (applyDelta == ApplyLayoutDelta)
</span><span class="cx">             view()-&gt;addLayoutDelta(IntSize(0, child-&gt;y() - logicalTop));
</span><span class="cx">         child-&gt;setY(logicalTop);
</span><span class="lines">@@ -1858,7 +1858,7 @@
</span><span class="cx">     if (childRenderBlock) {
</span><span class="cx">         if (markDescendantsWithFloats)
</span><span class="cx">             childRenderBlock-&gt;markAllDescendantsWithFloatsForLayout();
</span><del>-        if (!child-&gt;isBlockFlowRoot())
</del><ins>+        if (!child-&gt;isWritingModeRoot())
</ins><span class="cx">             previousFloatLogicalBottom = max(previousFloatLogicalBottom, oldLogicalTop + childRenderBlock-&gt;lowestFloatLogicalBottom());
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="lines">@@ -2936,7 +2936,7 @@
</span><span class="cx">     // Our location is irrelevant if we're unsplittable or no pagination is in effect.
</span><span class="cx">     // Just go ahead and lay out the float.
</span><span class="cx">     bool affectedByPagination = o-&gt;isRenderBlock() &amp;&amp; view()-&gt;layoutState()-&gt;m_pageHeight;
</span><del>-    if (!affectedByPagination || isBlockFlowRoot()) // We are unsplittable if we're a block flow root.
</del><ins>+    if (!affectedByPagination || isWritingModeRoot()) // We are unsplittable if we're a block flow root.
</ins><span class="cx">         o-&gt;layoutIfNeeded();
</span><span class="cx">     else {
</span><span class="cx">         o-&gt;computeLogicalWidth();
</span><span class="lines">@@ -3720,7 +3720,7 @@
</span><span class="cx"> int RenderBlock::addOverhangingFloats(RenderBlock* child, int logicalLeftOffset, int logicalTopOffset, bool makeChildPaintOtherFloats)
</span><span class="cx"> {
</span><span class="cx">     // Prevent floats from being added to the canvas by the root element, e.g., &lt;html&gt;.
</span><del>-    if (child-&gt;hasOverflowClip() || !child-&gt;containsFloats() || child-&gt;isRoot() || child-&gt;hasColumns() || child-&gt;isBlockFlowRoot())
</del><ins>+    if (child-&gt;hasOverflowClip() || !child-&gt;containsFloats() || child-&gt;isRoot() || child-&gt;hasColumns() || child-&gt;isWritingModeRoot())
</ins><span class="cx">         return 0;
</span><span class="cx"> 
</span><span class="cx">     int lowestFloatLogicalBottom = 0;
</span><span class="lines">@@ -3735,8 +3735,8 @@
</span><span class="cx">         if (logicalBottom &gt; logicalHeight()) {
</span><span class="cx">             // If the object is not in the list, we add it now.
</span><span class="cx">             if (!containsFloat(r-&gt;m_renderer)) {
</span><del>-                int leftOffset = style()-&gt;isVerticalBlockFlow() ? logicalLeftOffset : logicalTopOffset;
-                int topOffset = style()-&gt;isVerticalBlockFlow() ? logicalTopOffset : logicalLeftOffset;
</del><ins>+                int leftOffset = style()-&gt;isHorizontalWritingMode() ? logicalLeftOffset : logicalTopOffset;
+                int topOffset = style()-&gt;isHorizontalWritingMode() ? logicalTopOffset : logicalLeftOffset;
</ins><span class="cx">                 FloatingObject* floatingObj = new FloatingObject(r-&gt;type(), IntRect(r-&gt;left() - leftOffset, r-&gt;top() - topOffset, r-&gt;width(), r-&gt;height()));
</span><span class="cx">                 floatingObj-&gt;m_renderer = r-&gt;m_renderer;
</span><span class="cx"> 
</span><span class="lines">@@ -3777,7 +3777,7 @@
</span><span class="cx">     if (!prev-&gt;m_floatingObjects)
</span><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    logicalLeftOffset += (style()-&gt;isVerticalBlockFlow() ? marginLeft() : marginTop());
</del><ins>+    logicalLeftOffset += (style()-&gt;isHorizontalWritingMode() ? marginLeft() : marginTop());
</ins><span class="cx">                 
</span><span class="cx">     DeprecatedPtrListIterator&lt;FloatingObject&gt; it(*prev-&gt;m_floatingObjects);
</span><span class="cx">     for (FloatingObject *r; (r = it.current()); ++it) {
</span><span class="lines">@@ -3794,8 +3794,8 @@
</span><span class="cx">                 }
</span><span class="cx">             }
</span><span class="cx">             if (!f) {
</span><del>-                int leftOffset = style()-&gt;isVerticalBlockFlow() ? logicalLeftOffset : logicalTopOffset;
-                int topOffset = style()-&gt;isVerticalBlockFlow() ? logicalTopOffset : logicalLeftOffset;
</del><ins>+                int leftOffset = style()-&gt;isHorizontalWritingMode() ? logicalLeftOffset : logicalTopOffset;
+                int topOffset = style()-&gt;isHorizontalWritingMode() ? logicalTopOffset : logicalLeftOffset;
</ins><span class="cx">                 
</span><span class="cx">                 FloatingObject* floatingObj = new FloatingObject(r-&gt;type(), IntRect(r-&gt;left() - leftOffset, r-&gt;top() - topOffset, r-&gt;width(), r-&gt;height()));
</span><span class="cx"> 
</span><span class="lines">@@ -3805,7 +3805,7 @@
</span><span class="cx">                 // into account.  Only apply this code if prev is the parent, since otherwise the left margin
</span><span class="cx">                 // will get applied twice.
</span><span class="cx">                 if (prev != parent())
</span><del>-                    floatingObj-&gt;setLeft(floatingObj-&gt;left() + (style()-&gt;isVerticalBlockFlow() ? prev-&gt;marginLeft() : prev-&gt;marginTop()));
</del><ins>+                    floatingObj-&gt;setLeft(floatingObj-&gt;left() + (style()-&gt;isHorizontalWritingMode() ? prev-&gt;marginLeft() : prev-&gt;marginTop()));
</ins><span class="cx">                
</span><span class="cx">                 floatingObj-&gt;m_shouldPaint = false;  // We are not in the direct inheritance chain for this float. We will never paint it.
</span><span class="cx">                 floatingObj-&gt;m_renderer = r-&gt;m_renderer;
</span><span class="lines">@@ -5997,12 +5997,12 @@
</span><span class="cx"> {
</span><span class="cx">     // If the child has the same directionality as we do, then we can just return its
</span><span class="cx">     // collapsed margin.
</span><del>-    if (!child-&gt;isBlockFlowRoot())
</del><ins>+    if (!child-&gt;isWritingModeRoot())
</ins><span class="cx">         return child-&gt;collapsedMarginBefore();
</span><span class="cx">     
</span><span class="cx">     // The child has a different directionality.  If the child is parallel, then it's just
</span><span class="cx">     // flipped relative to us.  We can use the collapsed margin for the opposite edge.
</span><del>-    if (child-&gt;style()-&gt;isVerticalBlockFlow() == style()-&gt;isVerticalBlockFlow())
</del><ins>+    if (child-&gt;style()-&gt;isHorizontalWritingMode() == style()-&gt;isHorizontalWritingMode())
</ins><span class="cx">         return child-&gt;collapsedMarginAfter();
</span><span class="cx">     
</span><span class="cx">     // The child is perpendicular to us, which means its margins don't collapse but are on the
</span><span class="lines">@@ -6014,12 +6014,12 @@
</span><span class="cx"> {
</span><span class="cx">     // If the child has the same directionality as we do, then we can just return its
</span><span class="cx">     // collapsed margin.
</span><del>-    if (!child-&gt;isBlockFlowRoot())
</del><ins>+    if (!child-&gt;isWritingModeRoot())
</ins><span class="cx">         return child-&gt;collapsedMarginAfter();
</span><span class="cx">     
</span><span class="cx">     // The child has a different directionality.  If the child is parallel, then it's just
</span><span class="cx">     // flipped relative to us.  We can use the collapsed margin for the opposite edge.
</span><del>-    if (child-&gt;style()-&gt;isVerticalBlockFlow() == style()-&gt;isVerticalBlockFlow())
</del><ins>+    if (child-&gt;style()-&gt;isHorizontalWritingMode() == style()-&gt;isHorizontalWritingMode())
</ins><span class="cx">         return child-&gt;collapsedMarginBefore();
</span><span class="cx">     
</span><span class="cx">     // The child is perpendicular to us, which means its margins don't collapse but are on the
</span><span class="lines">@@ -6029,14 +6029,14 @@
</span><span class="cx"> 
</span><span class="cx"> int RenderBlock::marginBeforeForChild(RenderBoxModelObject* child) const
</span><span class="cx"> {
</span><del>-    switch (style()-&gt;blockFlow()) {
-    case TopToBottomBlockFlow:
</del><ins>+    switch (style()-&gt;writingMode()) {
+    case TopToBottomWritingMode:
</ins><span class="cx">         return child-&gt;marginTop();
</span><del>-    case BottomToTopBlockFlow:
</del><ins>+    case BottomToTopWritingMode:
</ins><span class="cx">         return child-&gt;marginBottom();
</span><del>-    case LeftToRightBlockFlow:
</del><ins>+    case LeftToRightWritingMode:
</ins><span class="cx">         return child-&gt;marginLeft();
</span><del>-    case RightToLeftBlockFlow:
</del><ins>+    case RightToLeftWritingMode:
</ins><span class="cx">         return child-&gt;marginRight();
</span><span class="cx">     }
</span><span class="cx">     ASSERT_NOT_REACHED();
</span><span class="lines">@@ -6045,14 +6045,14 @@
</span><span class="cx"> 
</span><span class="cx"> int RenderBlock::marginAfterForChild(RenderBoxModelObject* child) const
</span><span class="cx"> {
</span><del>-    switch (style()-&gt;blockFlow()) {
-    case TopToBottomBlockFlow:
</del><ins>+    switch (style()-&gt;writingMode()) {
+    case TopToBottomWritingMode:
</ins><span class="cx">         return child-&gt;marginBottom();
</span><del>-    case BottomToTopBlockFlow:
</del><ins>+    case BottomToTopWritingMode:
</ins><span class="cx">         return child-&gt;marginTop();
</span><del>-    case LeftToRightBlockFlow:
</del><ins>+    case LeftToRightWritingMode:
</ins><span class="cx">         return child-&gt;marginRight();
</span><del>-    case RightToLeftBlockFlow:
</del><ins>+    case RightToLeftWritingMode:
</ins><span class="cx">         return child-&gt;marginLeft();
</span><span class="cx">     }
</span><span class="cx">     ASSERT_NOT_REACHED();
</span><span class="lines">@@ -6061,21 +6061,21 @@
</span><span class="cx">     
</span><span class="cx"> int RenderBlock::marginStartForChild(RenderBoxModelObject* child) const
</span><span class="cx"> {
</span><del>-    if (style()-&gt;isVerticalBlockFlow())
</del><ins>+    if (style()-&gt;isHorizontalWritingMode())
</ins><span class="cx">         return style()-&gt;isLeftToRightDirection() ? child-&gt;marginLeft() : child-&gt;marginRight();
</span><span class="cx">     return style()-&gt;isLeftToRightDirection() ? child-&gt;marginTop() : child-&gt;marginBottom();
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> int RenderBlock::marginEndForChild(RenderBoxModelObject* child) const
</span><span class="cx"> {
</span><del>-    if (style()-&gt;isVerticalBlockFlow())
</del><ins>+    if (style()-&gt;isHorizontalWritingMode())
</ins><span class="cx">         return style()-&gt;isLeftToRightDirection() ? child-&gt;marginRight() : child-&gt;marginLeft();
</span><span class="cx">     return style()-&gt;isLeftToRightDirection() ? child-&gt;marginBottom() : child-&gt;marginTop();
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void RenderBlock::setMarginStartForChild(RenderBox* child, int margin)
</span><span class="cx"> {
</span><del>-    if (style()-&gt;isVerticalBlockFlow()) {
</del><ins>+    if (style()-&gt;isHorizontalWritingMode()) {
</ins><span class="cx">         if (style()-&gt;isLeftToRightDirection())
</span><span class="cx">             child-&gt;setMarginLeft(margin);
</span><span class="cx">         else
</span><span class="lines">@@ -6090,7 +6090,7 @@
</span><span class="cx"> 
</span><span class="cx"> void RenderBlock::setMarginEndForChild(RenderBox* child, int margin)
</span><span class="cx"> {
</span><del>-    if (style()-&gt;isVerticalBlockFlow()) {
</del><ins>+    if (style()-&gt;isHorizontalWritingMode()) {
</ins><span class="cx">         if (style()-&gt;isLeftToRightDirection())
</span><span class="cx">             child-&gt;setMarginRight(margin);
</span><span class="cx">         else
</span><span class="lines">@@ -6105,17 +6105,17 @@
</span><span class="cx"> 
</span><span class="cx"> void RenderBlock::setMarginBeforeForChild(RenderBox* child, int margin)
</span><span class="cx"> {
</span><del>-    switch (style()-&gt;blockFlow()) {
-    case TopToBottomBlockFlow:
</del><ins>+    switch (style()-&gt;writingMode()) {
+    case TopToBottomWritingMode:
</ins><span class="cx">         child-&gt;setMarginTop(margin);
</span><span class="cx">         break;
</span><del>-    case BottomToTopBlockFlow:
</del><ins>+    case BottomToTopWritingMode:
</ins><span class="cx">         child-&gt;setMarginBottom(margin);
</span><span class="cx">         break;
</span><del>-    case LeftToRightBlockFlow:
</del><ins>+    case LeftToRightWritingMode:
</ins><span class="cx">         child-&gt;setMarginLeft(margin);
</span><span class="cx">         break;
</span><del>-    case RightToLeftBlockFlow:
</del><ins>+    case RightToLeftWritingMode:
</ins><span class="cx">         child-&gt;setMarginRight(margin);
</span><span class="cx">         break;
</span><span class="cx">     }
</span><span class="lines">@@ -6123,17 +6123,17 @@
</span><span class="cx"> 
</span><span class="cx"> void RenderBlock::setMarginAfterForChild(RenderBox* child, int margin)
</span><span class="cx"> {
</span><del>-    switch (style()-&gt;blockFlow()) {
-    case TopToBottomBlockFlow:
</del><ins>+    switch (style()-&gt;writingMode()) {
+    case TopToBottomWritingMode:
</ins><span class="cx">         child-&gt;setMarginBottom(margin);
</span><span class="cx">         break;
</span><del>-    case BottomToTopBlockFlow:
</del><ins>+    case BottomToTopWritingMode:
</ins><span class="cx">         child-&gt;setMarginTop(margin);
</span><span class="cx">         break;
</span><del>-    case LeftToRightBlockFlow:
</del><ins>+    case LeftToRightWritingMode:
</ins><span class="cx">         child-&gt;setMarginRight(margin);
</span><span class="cx">         break;
</span><del>-    case RightToLeftBlockFlow:
</del><ins>+    case RightToLeftWritingMode:
</ins><span class="cx">         child-&gt;setMarginLeft(margin);
</span><span class="cx">         break;
</span><span class="cx">     }
</span><span class="lines">@@ -6153,7 +6153,7 @@
</span><span class="cx">     
</span><span class="cx">     // If the child has the same directionality as we do, then we can just return its
</span><span class="cx">     // margins in the same direction.
</span><del>-    if (!child-&gt;isBlockFlowRoot()) {
</del><ins>+    if (!child-&gt;isWritingModeRoot()) {
</ins><span class="cx">         if (childRenderBlock) {
</span><span class="cx">             childBeforePositive = childRenderBlock-&gt;maxPositiveMarginBefore();
</span><span class="cx">             childBeforeNegative = childRenderBlock-&gt;maxNegativeMarginBefore();
</span><span class="lines">@@ -6163,7 +6163,7 @@
</span><span class="cx">             beforeMargin = child-&gt;marginBefore();
</span><span class="cx">             afterMargin = child-&gt;marginAfter();
</span><span class="cx">         }
</span><del>-    } else if (child-&gt;style()-&gt;isVerticalBlockFlow() == style()-&gt;isVerticalBlockFlow()) {
</del><ins>+    } else if (child-&gt;style()-&gt;isHorizontalWritingMode() == style()-&gt;isHorizontalWritingMode()) {
</ins><span class="cx">         // The child has a different directionality.  If the child is parallel, then it's just
</span><span class="cx">         // flipped relative to us.  We can use the margins for the opposite edges.
</span><span class="cx">         if (childRenderBlock) {
</span></span></pre></div>
<a id="trunkWebCorerenderingRenderBlockh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/RenderBlock.h (69219 => 69220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/RenderBlock.h        2010-10-06 18:59:27 UTC (rev 69219)
+++ trunk/WebCore/rendering/RenderBlock.h        2010-10-06 19:02:34 UTC (rev 69220)
</span><span class="lines">@@ -171,9 +171,9 @@
</span><span class="cx"> 
</span><span class="cx">     // Accessors for logical width/height and margins in the containing block's block-flow direction.
</span><span class="cx">     enum ApplyLayoutDeltaMode { ApplyLayoutDelta, DoNotApplyLayoutDelta };
</span><del>-    int logicalWidthForChild(RenderBox* child) { return style()-&gt;isVerticalBlockFlow() ? child-&gt;width() : child-&gt;height(); }
-    int logicalHeightForChild(RenderBox* child) { return style()-&gt;isVerticalBlockFlow() ? child-&gt;height() : child-&gt;width(); }
-    int logicalTopForChild(RenderBox* child) { return style()-&gt;isVerticalBlockFlow() ? child-&gt;y() : child-&gt;x(); }
</del><ins>+    int logicalWidthForChild(RenderBox* child) { return style()-&gt;isHorizontalWritingMode() ? child-&gt;width() : child-&gt;height(); }
+    int logicalHeightForChild(RenderBox* child) { return style()-&gt;isHorizontalWritingMode() ? child-&gt;height() : child-&gt;width(); }
+    int logicalTopForChild(RenderBox* child) { return style()-&gt;isHorizontalWritingMode() ? child-&gt;y() : child-&gt;x(); }
</ins><span class="cx">     void setLogicalLeftForChild(RenderBox* child, int logicalLeft, ApplyLayoutDeltaMode = DoNotApplyLayoutDelta);
</span><span class="cx">     void setLogicalTopForChild(RenderBox* child, int logicalTop, ApplyLayoutDeltaMode = DoNotApplyLayoutDelta);
</span><span class="cx">     int marginBeforeForChild(RenderBoxModelObject* child) const;
</span><span class="lines">@@ -263,8 +263,8 @@
</span><span class="cx">     virtual void paint(PaintInfo&amp;, int tx, int ty);
</span><span class="cx">     virtual void paintObject(PaintInfo&amp;, int tx, int ty);
</span><span class="cx"> 
</span><del>-    int logicalRightOffsetForContent() const { return style()-&gt;isVerticalBlockFlow() ? borderLeft() + paddingLeft() + availableLogicalWidth() : borderTop() + paddingTop() + availableLogicalWidth(); }
-    int logicalLeftOffsetForContent() const { return style()-&gt;isVerticalBlockFlow() ? borderLeft() + paddingLeft() : borderTop() + paddingTop(); }
</del><ins>+    int logicalRightOffsetForContent() const { return style()-&gt;isHorizontalWritingMode() ? borderLeft() + paddingLeft() + availableLogicalWidth() : borderTop() + paddingTop() + availableLogicalWidth(); }
+    int logicalLeftOffsetForContent() const { return style()-&gt;isHorizontalWritingMode() ? borderLeft() + paddingLeft() : borderTop() + paddingTop(); }
</ins><span class="cx">     int logicalRightOffsetForLine(int position, int fixedOffset, bool applyTextIndent = true, int* logicalHeightRemaining = 0) const;
</span><span class="cx">     int logicalLeftOffsetForLine(int position, int fixedOffset, bool applyTextIndent = true, int* logicalHeightRemaining = 0) const;
</span><span class="cx"> 
</span><span class="lines">@@ -414,35 +414,35 @@
</span><span class="cx">         bool m_isPlaced : 1;
</span><span class="cx">     };
</span><span class="cx"> 
</span><del>-    int logicalTopForFloat(FloatingObject* child) const { return style()-&gt;isVerticalBlockFlow() ? child-&gt;top() : child-&gt;left(); }
-    int logicalBottomForFloat(FloatingObject* child) const { return style()-&gt;isVerticalBlockFlow() ? child-&gt;bottom() : child-&gt;right(); }
-    int logicalLeftForFloat(FloatingObject* child) const { return style()-&gt;isVerticalBlockFlow() ? child-&gt;left() : child-&gt;top(); }
-    int logicalRightForFloat(FloatingObject* child) const { return style()-&gt;isVerticalBlockFlow() ? child-&gt;right() : child-&gt;bottom(); }
-    int logicalWidthForFloat(FloatingObject* child) const { return style()-&gt;isVerticalBlockFlow() ? child-&gt;width() : child-&gt;height(); }
</del><ins>+    int logicalTopForFloat(FloatingObject* child) const { return style()-&gt;isHorizontalWritingMode() ? child-&gt;top() : child-&gt;left(); }
+    int logicalBottomForFloat(FloatingObject* child) const { return style()-&gt;isHorizontalWritingMode() ? child-&gt;bottom() : child-&gt;right(); }
+    int logicalLeftForFloat(FloatingObject* child) const { return style()-&gt;isHorizontalWritingMode() ? child-&gt;left() : child-&gt;top(); }
+    int logicalRightForFloat(FloatingObject* child) const { return style()-&gt;isHorizontalWritingMode() ? child-&gt;right() : child-&gt;bottom(); }
+    int logicalWidthForFloat(FloatingObject* child) const { return style()-&gt;isHorizontalWritingMode() ? child-&gt;width() : child-&gt;height(); }
</ins><span class="cx">     void setLogicalTopForFloat(FloatingObject* child, int logicalTop)
</span><span class="cx">     {
</span><del>-        if (style()-&gt;isVerticalBlockFlow())
</del><ins>+        if (style()-&gt;isHorizontalWritingMode())
</ins><span class="cx">             child-&gt;setTop(logicalTop);
</span><span class="cx">         else
</span><span class="cx">             child-&gt;setLeft(logicalTop);
</span><span class="cx">     }
</span><span class="cx">     void setLogicalLeftForFloat(FloatingObject* child, int logicalLeft)
</span><span class="cx">     {
</span><del>-        if (style()-&gt;isVerticalBlockFlow())
</del><ins>+        if (style()-&gt;isHorizontalWritingMode())
</ins><span class="cx">             child-&gt;setLeft(logicalLeft);
</span><span class="cx">         else
</span><span class="cx">             child-&gt;setTop(logicalLeft);
</span><span class="cx">     }
</span><span class="cx">     void setLogicalHeightForFloat(FloatingObject* child, int logicalHeight)
</span><span class="cx">     {
</span><del>-        if (style()-&gt;isVerticalBlockFlow())
</del><ins>+        if (style()-&gt;isHorizontalWritingMode())
</ins><span class="cx">             child-&gt;setHeight(logicalHeight);
</span><span class="cx">         else
</span><span class="cx">             child-&gt;setWidth(logicalHeight);
</span><span class="cx">     }
</span><span class="cx">     void setLogicalWidthForFloat(FloatingObject* child, int logicalWidth)
</span><span class="cx">     {
</span><del>-        if (style()-&gt;isVerticalBlockFlow())
</del><ins>+        if (style()-&gt;isHorizontalWritingMode())
</ins><span class="cx">             child-&gt;setWidth(logicalWidth);
</span><span class="cx">         else
</span><span class="cx">             child-&gt;setHeight(logicalWidth);
</span></span></pre></div>
<a id="trunkWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/RenderBox.cpp (69219 => 69220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/RenderBox.cpp        2010-10-06 18:59:27 UTC (rev 69219)
+++ trunk/WebCore/rendering/RenderBox.cpp        2010-10-06 19:02:34 UTC (rev 69220)
</span><span class="lines">@@ -85,14 +85,14 @@
</span><span class="cx"> 
</span><span class="cx"> int RenderBox::marginBefore() const
</span><span class="cx"> {
</span><del>-    switch (style()-&gt;blockFlow()) {
-    case TopToBottomBlockFlow:
</del><ins>+    switch (style()-&gt;writingMode()) {
+    case TopToBottomWritingMode:
</ins><span class="cx">         return m_marginTop;
</span><del>-    case BottomToTopBlockFlow:
</del><ins>+    case BottomToTopWritingMode:
</ins><span class="cx">         return m_marginBottom;
</span><del>-    case LeftToRightBlockFlow:
</del><ins>+    case LeftToRightWritingMode:
</ins><span class="cx">         return m_marginLeft;
</span><del>-    case RightToLeftBlockFlow:
</del><ins>+    case RightToLeftWritingMode:
</ins><span class="cx">         return m_marginRight;
</span><span class="cx">     }
</span><span class="cx">     ASSERT_NOT_REACHED();
</span><span class="lines">@@ -101,14 +101,14 @@
</span><span class="cx"> 
</span><span class="cx"> int RenderBox::marginAfter() const
</span><span class="cx"> {
</span><del>-    switch (style()-&gt;blockFlow()) {
-    case TopToBottomBlockFlow:
</del><ins>+    switch (style()-&gt;writingMode()) {
+    case TopToBottomWritingMode:
</ins><span class="cx">         return m_marginBottom;
</span><del>-    case BottomToTopBlockFlow:
</del><ins>+    case BottomToTopWritingMode:
</ins><span class="cx">         return m_marginTop;
</span><del>-    case LeftToRightBlockFlow:
</del><ins>+    case LeftToRightWritingMode:
</ins><span class="cx">         return m_marginRight;
</span><del>-    case RightToLeftBlockFlow:
</del><ins>+    case RightToLeftWritingMode:
</ins><span class="cx">         return m_marginLeft;
</span><span class="cx">     }
</span><span class="cx">     ASSERT_NOT_REACHED();
</span><span class="lines">@@ -117,21 +117,21 @@
</span><span class="cx"> 
</span><span class="cx"> int RenderBox::marginStart() const
</span><span class="cx"> {
</span><del>-    if (style()-&gt;isVerticalBlockFlow())
</del><ins>+    if (style()-&gt;isHorizontalWritingMode())
</ins><span class="cx">         return style()-&gt;isLeftToRightDirection() ? m_marginLeft : m_marginRight;
</span><span class="cx">     return style()-&gt;isLeftToRightDirection() ? m_marginTop : m_marginBottom;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> int RenderBox::marginEnd() const
</span><span class="cx"> {
</span><del>-    if (style()-&gt;isVerticalBlockFlow())
</del><ins>+    if (style()-&gt;isHorizontalWritingMode())
</ins><span class="cx">         return style()-&gt;isLeftToRightDirection() ? m_marginRight : m_marginLeft;
</span><span class="cx">     return style()-&gt;isLeftToRightDirection() ? m_marginBottom : m_marginTop;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void RenderBox::setMarginStart(int margin)
</span><span class="cx"> {
</span><del>-    if (style()-&gt;isVerticalBlockFlow()) {
</del><ins>+    if (style()-&gt;isHorizontalWritingMode()) {
</ins><span class="cx">         if (style()-&gt;isLeftToRightDirection())
</span><span class="cx">             m_marginLeft = margin;
</span><span class="cx">         else
</span><span class="lines">@@ -146,7 +146,7 @@
</span><span class="cx"> 
</span><span class="cx"> void RenderBox::setMarginEnd(int margin)
</span><span class="cx"> {
</span><del>-    if (style()-&gt;isVerticalBlockFlow()) {
</del><ins>+    if (style()-&gt;isHorizontalWritingMode()) {
</ins><span class="cx">         if (style()-&gt;isLeftToRightDirection())
</span><span class="cx">             m_marginRight = margin;
</span><span class="cx">         else
</span><span class="lines">@@ -161,17 +161,17 @@
</span><span class="cx"> 
</span><span class="cx"> void RenderBox::setMarginBefore(int margin)
</span><span class="cx"> {
</span><del>-    switch (style()-&gt;blockFlow()) {
-    case TopToBottomBlockFlow:
</del><ins>+    switch (style()-&gt;writingMode()) {
+    case TopToBottomWritingMode:
</ins><span class="cx">         m_marginTop = margin;
</span><span class="cx">         break;
</span><del>-    case BottomToTopBlockFlow:
</del><ins>+    case BottomToTopWritingMode:
</ins><span class="cx">         m_marginBottom = margin;
</span><span class="cx">         break;
</span><del>-    case LeftToRightBlockFlow:
</del><ins>+    case LeftToRightWritingMode:
</ins><span class="cx">         m_marginLeft = margin;
</span><span class="cx">         break;
</span><del>-    case RightToLeftBlockFlow:
</del><ins>+    case RightToLeftWritingMode:
</ins><span class="cx">         m_marginRight = margin;
</span><span class="cx">         break;
</span><span class="cx">     }
</span><span class="lines">@@ -179,17 +179,17 @@
</span><span class="cx"> 
</span><span class="cx"> void RenderBox::setMarginAfter(int margin)
</span><span class="cx"> {
</span><del>-    switch (style()-&gt;blockFlow()) {
-    case TopToBottomBlockFlow:
</del><ins>+    switch (style()-&gt;writingMode()) {
+    case TopToBottomWritingMode:
</ins><span class="cx">         m_marginBottom = margin;
</span><span class="cx">         break;
</span><del>-    case BottomToTopBlockFlow:
</del><ins>+    case BottomToTopWritingMode:
</ins><span class="cx">         m_marginTop = margin;
</span><span class="cx">         break;
</span><del>-    case LeftToRightBlockFlow:
</del><ins>+    case LeftToRightWritingMode:
</ins><span class="cx">         m_marginRight = margin;
</span><span class="cx">         break;
</span><del>-    case RightToLeftBlockFlow:
</del><ins>+    case RightToLeftWritingMode:
</ins><span class="cx">         m_marginLeft = margin;
</span><span class="cx">         break;
</span><span class="cx">     }
</span><span class="lines">@@ -300,13 +300,13 @@
</span><span class="cx">     // Set the text color if we're the body.
</span><span class="cx">     if (isBody())
</span><span class="cx">         document()-&gt;setTextColor(style()-&gt;visitedDependentColor(CSSPropertyColor));
</span><del>-    else if (isRoot() &amp;&amp; (!oldStyle || oldStyle-&gt;blockFlow() != style()-&gt;blockFlow() || oldStyle-&gt;direction() != style()-&gt;direction())) {
</del><ins>+    else if (isRoot() &amp;&amp; (!oldStyle || oldStyle-&gt;writingMode() != style()-&gt;writingMode() || oldStyle-&gt;direction() != style()-&gt;direction())) {
</ins><span class="cx">         // Propagate the new block flow and direction up to the RenderView.
</span><span class="cx">         // FIXME: WinIE seems to propagate from the &lt;body&gt; as well.  We may want to consider doing that at some point.
</span><span class="cx">         RenderView* viewRenderer = view();
</span><span class="cx">         RenderStyle* viewStyle = viewRenderer-&gt;style();
</span><del>-        if (viewStyle-&gt;blockFlow() != style()-&gt;blockFlow() || viewStyle-&gt;direction() != style()-&gt;direction()) {
-            viewStyle-&gt;setBlockFlow(style()-&gt;blockFlow());
</del><ins>+        if (viewStyle-&gt;writingMode() != style()-&gt;writingMode() || viewStyle-&gt;direction() != style()-&gt;direction()) {
+            viewStyle-&gt;setWritingMode(style()-&gt;writingMode());
</ins><span class="cx">             viewStyle-&gt;setDirection(style()-&gt;direction());
</span><span class="cx">             viewRenderer-&gt;setNeedsLayoutAndPrefWidthsRecalc();
</span><span class="cx">         }
</span><span class="lines">@@ -1099,7 +1099,7 @@
</span><span class="cx">         // Rather than making the child be completely unconstrained, WinIE uses the viewport width and height
</span><span class="cx">         // as a constraint.  We do that for now as well even though it's likely being unconstrained is what the spec
</span><span class="cx">         // will decide.
</span><del>-        return containingBlockStyle-&gt;isVerticalBlockFlow() ? view()-&gt;frameView()-&gt;visibleHeight() : view()-&gt;frameView()-&gt;visibleWidth();
</del><ins>+        return containingBlockStyle-&gt;isHorizontalWritingMode() ? view()-&gt;frameView()-&gt;visibleHeight() : view()-&gt;frameView()-&gt;visibleWidth();
</ins><span class="cx">     }
</span><span class="cx">     
</span><span class="cx">     // Use the content box logical height as specified by the style.
</span><span class="lines">@@ -1443,7 +1443,7 @@
</span><span class="cx"> 
</span><span class="cx">     RenderBlock* cb = containingBlock();
</span><span class="cx">     int containerLogicalWidth = max(0, containingBlockLogicalWidthForContent());
</span><del>-    bool hasPerpendicularContainingBlock = cb-&gt;style()-&gt;isVerticalBlockFlow() != style()-&gt;isVerticalBlockFlow();
</del><ins>+    bool hasPerpendicularContainingBlock = cb-&gt;style()-&gt;isHorizontalWritingMode() != style()-&gt;isHorizontalWritingMode();
</ins><span class="cx">     int containerWidthInInlineDirection = containerLogicalWidth;
</span><span class="cx">     if (hasPerpendicularContainingBlock)
</span><span class="cx">         containerWidthInInlineDirection = perpendicularContainingBlockLogicalHeight();
</span><span class="lines">@@ -1618,7 +1618,7 @@
</span><span class="cx">         computePositionedLogicalHeight();
</span><span class="cx">     } else {
</span><span class="cx">         RenderBlock* cb = containingBlock();
</span><del>-        bool hasPerpendicularContainingBlock = cb-&gt;style()-&gt;isVerticalBlockFlow() != style()-&gt;isVerticalBlockFlow();
</del><ins>+        bool hasPerpendicularContainingBlock = cb-&gt;style()-&gt;isHorizontalWritingMode() != style()-&gt;isHorizontalWritingMode();
</ins><span class="cx">     
</span><span class="cx">         if (!hasPerpendicularContainingBlock)
</span><span class="cx">             computeBlockDirectionMargins(cb);
</span><span class="lines">@@ -1699,7 +1699,7 @@
</span><span class="cx">         if (document()-&gt;printing())
</span><span class="cx">             visHeight = static_cast&lt;int&gt;(view()-&gt;pageHeight());
</span><span class="cx">         else  {
</span><del>-            if (style()-&gt;isVerticalBlockFlow())
</del><ins>+            if (style()-&gt;isHorizontalWritingMode())
</ins><span class="cx">                 visHeight = view()-&gt;viewHeight();
</span><span class="cx">             else
</span><span class="cx">                 visHeight = view()-&gt;viewWidth();
</span><span class="lines">@@ -1907,7 +1907,7 @@
</span><span class="cx">         return computeContentBoxLogicalHeight(h.value());
</span><span class="cx"> 
</span><span class="cx">     if (isRenderView())
</span><del>-        return style()-&gt;isVerticalBlockFlow() ? toRenderView(this)-&gt;frameView()-&gt;visibleHeight() : toRenderView(this)-&gt;frameView()-&gt;visibleWidth();
</del><ins>+        return style()-&gt;isHorizontalWritingMode() ? toRenderView(this)-&gt;frameView()-&gt;visibleHeight() : toRenderView(this)-&gt;frameView()-&gt;visibleWidth();
</ins><span class="cx"> 
</span><span class="cx">     // We need to stop here, since we don't want to increase the height of the table
</span><span class="cx">     // artificially.  We're going to rely on this cell getting expanded to some new
</span><span class="lines">@@ -3038,7 +3038,7 @@
</span><span class="cx"> 
</span><span class="cx"> bool RenderBox::avoidsFloats() const
</span><span class="cx"> {
</span><del>-    return isReplaced() || hasOverflowClip() || isHR() || isBlockFlowRoot();
</del><ins>+    return isReplaced() || hasOverflowClip() || isHR() || isWritingModeRoot();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void RenderBox::addShadowOverflow()
</span></span></pre></div>
<a id="trunkWebCorerenderingRenderBoxh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/RenderBox.h (69219 => 69220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/RenderBox.h        2010-10-06 18:59:27 UTC (rev 69219)
+++ trunk/WebCore/rendering/RenderBox.h        2010-10-06 19:02:34 UTC (rev 69220)
</span><span class="lines">@@ -50,41 +50,41 @@
</span><span class="cx">     void setWidth(int width) { m_frameRect.setWidth(width); }
</span><span class="cx">     void setHeight(int height) { m_frameRect.setHeight(height); }
</span><span class="cx"> 
</span><del>-    int logicalLeft() const { return style()-&gt;isVerticalBlockFlow() ? x() : y(); }
-    int logicalTop() const { return style()-&gt;isVerticalBlockFlow() ? y() : x(); }
-    int logicalWidth() const { return style()-&gt;isVerticalBlockFlow() ? width() : height(); }
-    int logicalHeight() const { return style()-&gt;isVerticalBlockFlow() ? height() : width(); }
</del><ins>+    int logicalLeft() const { return style()-&gt;isHorizontalWritingMode() ? x() : y(); }
+    int logicalTop() const { return style()-&gt;isHorizontalWritingMode() ? y() : x(); }
+    int logicalWidth() const { return style()-&gt;isHorizontalWritingMode() ? width() : height(); }
+    int logicalHeight() const { return style()-&gt;isHorizontalWritingMode() ? height() : width(); }
</ins><span class="cx">     void setLogicalLeft(int left)
</span><span class="cx">     {
</span><del>-        if (style()-&gt;isVerticalBlockFlow())
</del><ins>+        if (style()-&gt;isHorizontalWritingMode())
</ins><span class="cx">             setX(left);
</span><span class="cx">         else
</span><span class="cx">             setY(left);
</span><span class="cx">     }
</span><span class="cx">     void setLogicalTop(int top)
</span><span class="cx">     {
</span><del>-        if (style()-&gt;isVerticalBlockFlow())
</del><ins>+        if (style()-&gt;isHorizontalWritingMode())
</ins><span class="cx">             setY(top);
</span><span class="cx">         else
</span><span class="cx">             setX(top);
</span><span class="cx">     }
</span><span class="cx">     void setLogicalWidth(int size)
</span><span class="cx">     {
</span><del>-        if (style()-&gt;isVerticalBlockFlow())
</del><ins>+        if (style()-&gt;isHorizontalWritingMode())
</ins><span class="cx">             setWidth(size);
</span><span class="cx">         else
</span><span class="cx">             setHeight(size);
</span><span class="cx">     }
</span><span class="cx">     void setLogicalHeight(int size)
</span><span class="cx">     {
</span><del>-        if (style()-&gt;isVerticalBlockFlow())
</del><ins>+        if (style()-&gt;isHorizontalWritingMode())
</ins><span class="cx">             setHeight(size);
</span><span class="cx">         else
</span><span class="cx">             setWidth(size);
</span><span class="cx">     }
</span><span class="cx">     void setLogicalLocation(int left, int top)
</span><span class="cx">     {
</span><del>-        if (style()-&gt;isVerticalBlockFlow())
</del><ins>+        if (style()-&gt;isHorizontalWritingMode())
</ins><span class="cx">             setLocation(left, top);
</span><span class="cx">         else
</span><span class="cx">             setLocation(top, left);
</span><span class="lines">@@ -150,8 +150,8 @@
</span><span class="cx"> 
</span><span class="cx">     int contentWidth() const { return clientWidth() - paddingLeft() - paddingRight(); }
</span><span class="cx">     int contentHeight() const { return clientHeight() - paddingTop() - paddingBottom(); }
</span><del>-    int contentLogicalWidth() const { return style()-&gt;isVerticalBlockFlow() ? contentWidth() : contentHeight(); }
-    int contentLogicalHeight() const { return style()-&gt;isVerticalBlockFlow() ? contentHeight() : contentWidth(); }
</del><ins>+    int contentLogicalWidth() const { return style()-&gt;isHorizontalWritingMode() ? contentWidth() : contentHeight(); }
+    int contentLogicalHeight() const { return style()-&gt;isHorizontalWritingMode() ? contentHeight() : contentWidth(); }
</ins><span class="cx"> 
</span><span class="cx">     // IE extensions. Used to calculate offsetWidth/Height.  Overridden by inlines (RenderFlow)
</span><span class="cx">     // to return the remaining width on a given line (and the height of a single line).
</span><span class="lines">@@ -272,12 +272,12 @@
</span><span class="cx"> 
</span><span class="cx">     bool stretchesToViewport() const
</span><span class="cx">     {
</span><del>-        return document()-&gt;inQuirksMode() &amp;&amp; style()-&gt;logicalHeight().isAuto() &amp;&amp; !isFloatingOrPositioned() &amp;&amp; (isRoot() || isBody()) &amp;&amp; !isBlockFlowRoot();
</del><ins>+        return document()-&gt;inQuirksMode() &amp;&amp; style()-&gt;logicalHeight().isAuto() &amp;&amp; !isFloatingOrPositioned() &amp;&amp; (isRoot() || isBody()) &amp;&amp; !isWritingModeRoot();
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     virtual IntSize intrinsicSize() const { return IntSize(); }
</span><del>-    int intrinsicLogicalWidth() const { return style()-&gt;isVerticalBlockFlow() ? intrinsicSize().width() : intrinsicSize().height(); }
-    int intrinsicLogicalHeight() const { return style()-&gt;isVerticalBlockFlow() ? intrinsicSize().height() : intrinsicSize().width(); }
</del><ins>+    int intrinsicLogicalWidth() const { return style()-&gt;isHorizontalWritingMode() ? intrinsicSize().width() : intrinsicSize().height(); }
+    int intrinsicLogicalHeight() const { return style()-&gt;isHorizontalWritingMode() ? intrinsicSize().height() : intrinsicSize().width(); }
</ins><span class="cx"> 
</span><span class="cx">     // Whether or not the element shrinks to its intrinsic width (rather than filling the width
</span><span class="cx">     // of a containing block).  HTML4 buttons, &lt;select&gt;s, &lt;input&gt;s, legends, and floating/compact elements do this.
</span><span class="lines">@@ -301,12 +301,12 @@
</span><span class="cx">     
</span><span class="cx">     // There are a few cases where we need to refer specifically to the available physical width and available physical height.
</span><span class="cx">     // Relative positioning is one of those cases, since left/top offsets are physical.
</span><del>-    int availableWidth() const { return style()-&gt;isVerticalBlockFlow() ? availableLogicalWidth() : availableLogicalHeight(); }
-    int availableHeight() const { return style()-&gt;isVerticalBlockFlow() ? availableLogicalHeight() : availableLogicalWidth(); }
</del><ins>+    int availableWidth() const { return style()-&gt;isHorizontalWritingMode() ? availableLogicalWidth() : availableLogicalHeight(); }
+    int availableHeight() const { return style()-&gt;isHorizontalWritingMode() ? availableLogicalHeight() : availableLogicalWidth(); }
</ins><span class="cx"> 
</span><span class="cx">     virtual int verticalScrollbarWidth() const;
</span><span class="cx">     int horizontalScrollbarHeight() const;
</span><del>-    int scrollbarLogicalHeight() const { return style()-&gt;isVerticalBlockFlow() ? horizontalScrollbarHeight() : verticalScrollbarWidth(); }
</del><ins>+    int scrollbarLogicalHeight() const { return style()-&gt;isHorizontalWritingMode() ? horizontalScrollbarHeight() : verticalScrollbarWidth(); }
</ins><span class="cx">     virtual bool scroll(ScrollDirection, ScrollGranularity, float multiplier = 1, Node** stopNode = 0);
</span><span class="cx">     bool canBeScrolledAndHasScrollableArea() const;
</span><span class="cx">     virtual bool canBeProgramaticallyScrolled(bool) const;
</span><span class="lines">@@ -360,7 +360,7 @@
</span><span class="cx"> 
</span><span class="cx">     virtual void markDescendantBlocksAndLinesForLayout(bool inLayout = true);
</span><span class="cx">     
</span><del>-    bool isBlockFlowRoot() const { return !parent() || parent()-&gt;style()-&gt;blockFlow() != style()-&gt;blockFlow(); }
</del><ins>+    bool isWritingModeRoot() const { return !parent() || parent()-&gt;style()-&gt;writingMode() != style()-&gt;writingMode(); }
</ins><span class="cx"> 
</span><span class="cx"> protected:
</span><span class="cx">     virtual void styleWillChange(StyleDifference, const RenderStyle* newStyle);
</span></span></pre></div>
<a id="trunkWebCorerenderingRenderFieldsetcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/RenderFieldset.cpp (69219 => 69220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/RenderFieldset.cpp        2010-10-06 18:59:27 UTC (rev 69219)
+++ trunk/WebCore/rendering/RenderFieldset.cpp        2010-10-06 19:02:34 UTC (rev 69220)
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx">     // FIXME: We need to work with &quot;rl&quot; and &quot;bt&quot; block flow directions.  In those
</span><span class="cx">     // cases the legend is embedded in the right and bottom borders respectively.
</span><span class="cx">     // https://bugs.webkit.org/show_bug.cgi?id=47236
</span><del>-    if (style()-&gt;isVerticalBlockFlow()) {
</del><ins>+    if (style()-&gt;isHorizontalWritingMode()) {
</ins><span class="cx">         int yOff = (legend-&gt;y() &gt; 0) ? 0 : (legend-&gt;height() - borderTop()) / 2;
</span><span class="cx">         h -= yOff;
</span><span class="cx">         ty += yOff;
</span><span class="lines">@@ -166,7 +166,7 @@
</span><span class="cx">     // FIXME: We need to work with &quot;rl&quot; and &quot;bt&quot; block flow directions.  In those
</span><span class="cx">     // cases the legend is embedded in the right and bottom borders respectively.
</span><span class="cx">     // https://bugs.webkit.org/show_bug.cgi?id=47236
</span><del>-    if (style()-&gt;isVerticalBlockFlow()) {
</del><ins>+    if (style()-&gt;isHorizontalWritingMode()) {
</ins><span class="cx">         int clipTop = ty;
</span><span class="cx">         int clipHeight = max(static_cast&lt;int&gt;(style()-&gt;borderTopWidth()), legend-&gt;height());
</span><span class="cx">         graphicsContext-&gt;clipOut(IntRect(tx + legend-&gt;x(), clipTop, legend-&gt;width(), clipHeight));
</span><span class="lines">@@ -195,7 +195,7 @@
</span><span class="cx">     // FIXME: We need to work with &quot;rl&quot; and &quot;bt&quot; block flow directions.  In those
</span><span class="cx">     // cases the legend is embedded in the right and bottom borders respectively.
</span><span class="cx">     // https://bugs.webkit.org/show_bug.cgi?id=47236
</span><del>-    if (style()-&gt;isVerticalBlockFlow()) {
</del><ins>+    if (style()-&gt;isHorizontalWritingMode()) {
</ins><span class="cx">         int yOff = (legend-&gt;y() &gt; 0) ? 0 : (legend-&gt;height() - borderTop()) / 2;
</span><span class="cx">         h -= yOff;
</span><span class="cx">         ty += yOff;
</span></span></pre></div>
<a id="trunkWebCorerenderingRenderImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/RenderImage.cpp (69219 => 69220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/RenderImage.cpp        2010-10-06 18:59:27 UTC (rev 69219)
+++ trunk/WebCore/rendering/RenderImage.cpp        2010-10-06 19:02:34 UTC (rev 69220)
</span><span class="lines">@@ -442,7 +442,7 @@
</span><span class="cx">         logicalWidth = computeReplacedLogicalWidthUsing(style()-&gt;logicalWidth());
</span><span class="cx">     else if (m_imageResource-&gt;usesImageContainerSize()) {
</span><span class="cx">         IntSize size = m_imageResource-&gt;imageSize(style()-&gt;effectiveZoom());
</span><del>-        logicalWidth = style()-&gt;isVerticalBlockFlow() ? size.width() : size.height();
</del><ins>+        logicalWidth = style()-&gt;isHorizontalWritingMode() ? size.width() : size.height();
</ins><span class="cx">     } else if (m_imageResource-&gt;imageHasRelativeWidth())
</span><span class="cx">         logicalWidth = 0; // If the image is relatively-sized, set the width to 0 until there is a set container size.
</span><span class="cx">     else
</span><span class="lines">@@ -461,7 +461,7 @@
</span><span class="cx">         logicalHeight = computeReplacedLogicalHeightUsing(style()-&gt;logicalHeight());
</span><span class="cx">     else if (m_imageResource-&gt;usesImageContainerSize()) {
</span><span class="cx">         IntSize size = m_imageResource-&gt;imageSize(style()-&gt;effectiveZoom());
</span><del>-        logicalHeight = style()-&gt;isVerticalBlockFlow() ? size.height() : size.width();
</del><ins>+        logicalHeight = style()-&gt;isHorizontalWritingMode() ? size.height() : size.width();
</ins><span class="cx">     } else if (m_imageResource-&gt;imageHasRelativeHeight())
</span><span class="cx">         logicalHeight = 0; // If the image is relatively-sized, set the height to 0 until there is a set container size.
</span><span class="cx">     else
</span></span></pre></div>
<a id="trunkWebCorerenderingRenderInlinecpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/RenderInline.cpp (69219 => 69220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/RenderInline.cpp        2010-10-06 18:59:27 UTC (rev 69219)
+++ trunk/WebCore/rendering/RenderInline.cpp        2010-10-06 19:02:34 UTC (rev 69220)
</span><span class="lines">@@ -471,28 +471,28 @@
</span><span class="cx"> 
</span><span class="cx"> int RenderInline::marginLeft() const
</span><span class="cx"> {
</span><del>-    if (!style()-&gt;isVerticalBlockFlow())
</del><ins>+    if (!style()-&gt;isHorizontalWritingMode())
</ins><span class="cx">         return 0;
</span><span class="cx">     return computeMargin(this, style()-&gt;marginLeft());
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> int RenderInline::marginRight() const
</span><span class="cx"> {
</span><del>-    if (!style()-&gt;isVerticalBlockFlow())
</del><ins>+    if (!style()-&gt;isHorizontalWritingMode())
</ins><span class="cx">         return 0;
</span><span class="cx">     return computeMargin(this, style()-&gt;marginRight());
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> int RenderInline::marginTop() const
</span><span class="cx"> {
</span><del>-    if (style()-&gt;isVerticalBlockFlow())
</del><ins>+    if (style()-&gt;isHorizontalWritingMode())
</ins><span class="cx">         return 0;
</span><span class="cx">     return computeMargin(this, style()-&gt;marginTop());
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> int RenderInline::marginBottom() const
</span><span class="cx"> {
</span><del>-    if (style()-&gt;isVerticalBlockFlow())
</del><ins>+    if (style()-&gt;isHorizontalWritingMode())
</ins><span class="cx">         return 0;
</span><span class="cx">     return computeMargin(this, style()-&gt;marginBottom());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkWebCorerenderingRenderTableCellcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/RenderTableCell.cpp (69219 => 69220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/RenderTableCell.cpp        2010-10-06 18:59:27 UTC (rev 69219)
+++ trunk/WebCore/rendering/RenderTableCell.cpp        2010-10-06 19:02:34 UTC (rev 69220)
</span><span class="lines">@@ -165,34 +165,34 @@
</span><span class="cx"> int RenderTableCell::paddingTop(bool includeIntrinsicPadding) const
</span><span class="cx"> {
</span><span class="cx">     int result = RenderBlock::paddingTop();
</span><del>-    if (!includeIntrinsicPadding || !style()-&gt;isVerticalBlockFlow())
</del><ins>+    if (!includeIntrinsicPadding || !style()-&gt;isHorizontalWritingMode())
</ins><span class="cx">         return result;
</span><del>-    return result + (style()-&gt;blockFlow() == TopToBottomBlockFlow ? intrinsicPaddingBefore() : intrinsicPaddingAfter());
</del><ins>+    return result + (style()-&gt;writingMode() == TopToBottomWritingMode ? intrinsicPaddingBefore() : intrinsicPaddingAfter());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> int RenderTableCell::paddingBottom(bool includeIntrinsicPadding) const
</span><span class="cx"> {
</span><span class="cx">     int result = RenderBlock::paddingBottom();
</span><del>-    if (!includeIntrinsicPadding || !style()-&gt;isVerticalBlockFlow())
</del><ins>+    if (!includeIntrinsicPadding || !style()-&gt;isHorizontalWritingMode())
</ins><span class="cx">         return result;
</span><del>-    return result + (style()-&gt;blockFlow() == TopToBottomBlockFlow ? intrinsicPaddingAfter() : intrinsicPaddingBefore());
</del><ins>+    return result + (style()-&gt;writingMode() == TopToBottomWritingMode ? intrinsicPaddingAfter() : intrinsicPaddingBefore());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> int RenderTableCell::paddingLeft(bool includeIntrinsicPadding) const
</span><span class="cx"> {
</span><span class="cx">     int result = RenderBlock::paddingLeft();
</span><del>-    if (!includeIntrinsicPadding || style()-&gt;isVerticalBlockFlow())
</del><ins>+    if (!includeIntrinsicPadding || style()-&gt;isHorizontalWritingMode())
</ins><span class="cx">         return result;
</span><del>-    return result + (style()-&gt;blockFlow() == LeftToRightBlockFlow ? intrinsicPaddingBefore() : intrinsicPaddingAfter());
</del><ins>+    return result + (style()-&gt;writingMode() == LeftToRightWritingMode ? intrinsicPaddingBefore() : intrinsicPaddingAfter());
</ins><span class="cx">     
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> int RenderTableCell::paddingRight(bool includeIntrinsicPadding) const
</span><span class="cx"> {   
</span><span class="cx">     int result = RenderBlock::paddingRight();
</span><del>-    if (!includeIntrinsicPadding || style()-&gt;isVerticalBlockFlow())
</del><ins>+    if (!includeIntrinsicPadding || style()-&gt;isHorizontalWritingMode())
</ins><span class="cx">         return result;
</span><del>-    return result + (style()-&gt;blockFlow() == LeftToRightBlockFlow ? intrinsicPaddingAfter() : intrinsicPaddingBefore());
</del><ins>+    return result + (style()-&gt;writingMode() == LeftToRightWritingMode ? intrinsicPaddingAfter() : intrinsicPaddingBefore());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> int RenderTableCell::paddingBefore(bool includeIntrinsicPadding) const
</span></span></pre></div>
<a id="trunkWebCorerenderingRenderViewh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/RenderView.h (69219 => 69220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/RenderView.h        2010-10-06 18:59:27 UTC (rev 69219)
+++ trunk/WebCore/rendering/RenderView.h        2010-10-06 19:02:34 UTC (rev 69220)
</span><span class="lines">@@ -54,8 +54,8 @@
</span><span class="cx">     // The same as the FrameView's layoutHeight/layoutWidth but with null check guards.
</span><span class="cx">     int viewHeight() const;
</span><span class="cx">     int viewWidth() const;
</span><del>-    int viewLogicalWidth() const { return style()-&gt;isVerticalBlockFlow() ? viewWidth() : viewHeight(); }
-    int viewLogicalHeight() const { return style()-&gt;isVerticalBlockFlow() ? viewHeight() : viewWidth(); }
</del><ins>+    int viewLogicalWidth() const { return style()-&gt;isHorizontalWritingMode() ? viewWidth() : viewHeight(); }
+    int viewLogicalHeight() const { return style()-&gt;isHorizontalWritingMode() ? viewHeight() : viewWidth(); }
</ins><span class="cx"> 
</span><span class="cx">     float zoomFactor() const;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebCorerenderingRootInlineBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/RootInlineBox.cpp (69219 => 69220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/RootInlineBox.cpp        2010-10-06 18:59:27 UTC (rev 69219)
+++ trunk/WebCore/rendering/RootInlineBox.cpp        2010-10-06 19:02:34 UTC (rev 69220)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx">     , m_lineBottom(0)
</span><span class="cx">     , m_paginationStrut(0)
</span><span class="cx"> {
</span><del>-    setIsVertical(!block-&gt;style()-&gt;isVerticalBlockFlow());
</del><ins>+    setIsVertical(!block-&gt;style()-&gt;isHorizontalWritingMode());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebCorerenderingstyleRenderStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/style/RenderStyle.cpp (69219 => 69220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/style/RenderStyle.cpp        2010-10-06 18:59:27 UTC (rev 69219)
+++ trunk/WebCore/rendering/style/RenderStyle.cpp        2010-10-06 19:02:34 UTC (rev 69220)
</span><span class="lines">@@ -446,7 +446,7 @@
</span><span class="cx">         return StyleDifferenceLayout;
</span><span class="cx"> 
</span><span class="cx">     // Check block flow direction.
</span><del>-    if (inherited_flags._blockFlow != other-&gt;inherited_flags._blockFlow)
</del><ins>+    if (inherited_flags.m_writingMode != other-&gt;inherited_flags.m_writingMode)
</ins><span class="cx">         return StyleDifferenceLayout;
</span><span class="cx"> 
</span><span class="cx">     // Overflow returns a layout hint.
</span><span class="lines">@@ -1079,56 +1079,56 @@
</span><span class="cx"> 
</span><span class="cx"> Length RenderStyle::logicalWidth() const
</span><span class="cx"> {
</span><del>-    if (isVerticalBlockFlow())
</del><ins>+    if (isHorizontalWritingMode())
</ins><span class="cx">         return width();
</span><span class="cx">     return height();
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> Length RenderStyle::logicalHeight() const
</span><span class="cx"> {
</span><del>-    if (isVerticalBlockFlow())
</del><ins>+    if (isHorizontalWritingMode())
</ins><span class="cx">         return height();
</span><span class="cx">     return width();
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> Length RenderStyle::logicalMinWidth() const
</span><span class="cx"> {
</span><del>-    if (isVerticalBlockFlow())
</del><ins>+    if (isHorizontalWritingMode())
</ins><span class="cx">         return minWidth();
</span><span class="cx">     return minHeight();
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> Length RenderStyle::logicalMaxWidth() const
</span><span class="cx"> {
</span><del>-    if (isVerticalBlockFlow())
</del><ins>+    if (isHorizontalWritingMode())
</ins><span class="cx">         return maxWidth();
</span><span class="cx">     return maxHeight();
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> Length RenderStyle::logicalMinHeight() const
</span><span class="cx"> {
</span><del>-    if (isVerticalBlockFlow())
</del><ins>+    if (isHorizontalWritingMode())
</ins><span class="cx">         return minHeight();
</span><span class="cx">     return minWidth();
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> Length RenderStyle::logicalMaxHeight() const
</span><span class="cx"> {
</span><del>-    if (isVerticalBlockFlow())
</del><ins>+    if (isHorizontalWritingMode())
</ins><span class="cx">         return maxHeight();
</span><span class="cx">     return maxWidth();
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> unsigned short RenderStyle::borderBeforeWidth() const
</span><span class="cx"> {
</span><del>-    switch (blockFlow()) {
-    case TopToBottomBlockFlow:
</del><ins>+    switch (writingMode()) {
+    case TopToBottomWritingMode:
</ins><span class="cx">         return borderTopWidth();
</span><del>-    case BottomToTopBlockFlow:
</del><ins>+    case BottomToTopWritingMode:
</ins><span class="cx">         return borderBottomWidth();
</span><del>-    case LeftToRightBlockFlow:
</del><ins>+    case LeftToRightWritingMode:
</ins><span class="cx">         return borderLeftWidth();
</span><del>-    case RightToLeftBlockFlow:
</del><ins>+    case RightToLeftWritingMode:
</ins><span class="cx">         return borderRightWidth();
</span><span class="cx">     }
</span><span class="cx">     ASSERT_NOT_REACHED();
</span><span class="lines">@@ -1137,14 +1137,14 @@
</span><span class="cx"> 
</span><span class="cx"> unsigned short RenderStyle::borderAfterWidth() const
</span><span class="cx"> {
</span><del>-    switch (blockFlow()) {
-    case TopToBottomBlockFlow:
</del><ins>+    switch (writingMode()) {
+    case TopToBottomWritingMode:
</ins><span class="cx">         return borderBottomWidth();
</span><del>-    case BottomToTopBlockFlow:
</del><ins>+    case BottomToTopWritingMode:
</ins><span class="cx">         return borderTopWidth();
</span><del>-    case LeftToRightBlockFlow:
</del><ins>+    case LeftToRightWritingMode:
</ins><span class="cx">         return borderRightWidth();
</span><del>-    case RightToLeftBlockFlow:
</del><ins>+    case RightToLeftWritingMode:
</ins><span class="cx">         return borderLeftWidth();
</span><span class="cx">     }
</span><span class="cx">     ASSERT_NOT_REACHED();
</span><span class="lines">@@ -1153,28 +1153,28 @@
</span><span class="cx"> 
</span><span class="cx"> unsigned short RenderStyle::borderStartWidth() const
</span><span class="cx"> {
</span><del>-    if (isVerticalBlockFlow())
</del><ins>+    if (isHorizontalWritingMode())
</ins><span class="cx">         return isLeftToRightDirection() ? borderLeftWidth() : borderRightWidth();
</span><span class="cx">     return isLeftToRightDirection() ? borderTopWidth() : borderBottomWidth();
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> unsigned short RenderStyle::borderEndWidth() const
</span><span class="cx"> {
</span><del>-    if (isVerticalBlockFlow())
</del><ins>+    if (isHorizontalWritingMode())
</ins><span class="cx">         return isLeftToRightDirection() ? borderRightWidth() : borderLeftWidth();
</span><span class="cx">     return isLeftToRightDirection() ? borderBottomWidth() : borderTopWidth();
</span><span class="cx"> }
</span><span class="cx">     
</span><span class="cx"> Length RenderStyle::marginBefore() const
</span><span class="cx"> {
</span><del>-    switch (blockFlow()) {
-    case TopToBottomBlockFlow:
</del><ins>+    switch (writingMode()) {
+    case TopToBottomWritingMode:
</ins><span class="cx">         return marginTop();
</span><del>-    case BottomToTopBlockFlow:
</del><ins>+    case BottomToTopWritingMode:
</ins><span class="cx">         return marginBottom();
</span><del>-    case LeftToRightBlockFlow:
</del><ins>+    case LeftToRightWritingMode:
</ins><span class="cx">         return marginLeft();
</span><del>-    case RightToLeftBlockFlow:
</del><ins>+    case RightToLeftWritingMode:
</ins><span class="cx">         return marginRight();
</span><span class="cx">     }
</span><span class="cx">     ASSERT_NOT_REACHED();
</span><span class="lines">@@ -1183,14 +1183,14 @@
</span><span class="cx"> 
</span><span class="cx"> Length RenderStyle::marginAfter() const
</span><span class="cx"> {
</span><del>-    switch (blockFlow()) {
-    case TopToBottomBlockFlow:
</del><ins>+    switch (writingMode()) {
+    case TopToBottomWritingMode:
</ins><span class="cx">         return marginBottom();
</span><del>-    case BottomToTopBlockFlow:
</del><ins>+    case BottomToTopWritingMode:
</ins><span class="cx">         return marginTop();
</span><del>-    case LeftToRightBlockFlow:
</del><ins>+    case LeftToRightWritingMode:
</ins><span class="cx">         return marginRight();
</span><del>-    case RightToLeftBlockFlow:
</del><ins>+    case RightToLeftWritingMode:
</ins><span class="cx">         return marginLeft();
</span><span class="cx">     }
</span><span class="cx">     ASSERT_NOT_REACHED();
</span><span class="lines">@@ -1199,14 +1199,14 @@
</span><span class="cx"> 
</span><span class="cx"> Length RenderStyle::marginBeforeUsing(const RenderStyle* otherStyle) const
</span><span class="cx"> {
</span><del>-    switch (otherStyle-&gt;blockFlow()) {
-    case TopToBottomBlockFlow:
</del><ins>+    switch (otherStyle-&gt;writingMode()) {
+    case TopToBottomWritingMode:
</ins><span class="cx">         return marginTop();
</span><del>-    case BottomToTopBlockFlow:
</del><ins>+    case BottomToTopWritingMode:
</ins><span class="cx">         return marginBottom();
</span><del>-    case LeftToRightBlockFlow:
</del><ins>+    case LeftToRightWritingMode:
</ins><span class="cx">         return marginLeft();
</span><del>-    case RightToLeftBlockFlow:
</del><ins>+    case RightToLeftWritingMode:
</ins><span class="cx">         return marginRight();
</span><span class="cx">     }
</span><span class="cx">     ASSERT_NOT_REACHED();
</span><span class="lines">@@ -1215,14 +1215,14 @@
</span><span class="cx"> 
</span><span class="cx"> Length RenderStyle::marginAfterUsing(const RenderStyle* otherStyle) const
</span><span class="cx"> {
</span><del>-    switch (otherStyle-&gt;blockFlow()) {
-    case TopToBottomBlockFlow:
</del><ins>+    switch (otherStyle-&gt;writingMode()) {
+    case TopToBottomWritingMode:
</ins><span class="cx">         return marginBottom();
</span><del>-    case BottomToTopBlockFlow:
</del><ins>+    case BottomToTopWritingMode:
</ins><span class="cx">         return marginTop();
</span><del>-    case LeftToRightBlockFlow:
</del><ins>+    case LeftToRightWritingMode:
</ins><span class="cx">         return marginRight();
</span><del>-    case RightToLeftBlockFlow:
</del><ins>+    case RightToLeftWritingMode:
</ins><span class="cx">         return marginLeft();
</span><span class="cx">     }
</span><span class="cx">     ASSERT_NOT_REACHED();
</span><span class="lines">@@ -1231,42 +1231,42 @@
</span><span class="cx"> 
</span><span class="cx"> Length RenderStyle::marginStart() const
</span><span class="cx"> {
</span><del>-    if (isVerticalBlockFlow())
</del><ins>+    if (isHorizontalWritingMode())
</ins><span class="cx">         return isLeftToRightDirection() ? marginLeft() : marginRight();
</span><span class="cx">     return isLeftToRightDirection() ? marginTop() : marginBottom();
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> Length RenderStyle::marginEnd() const
</span><span class="cx"> {
</span><del>-    if (isVerticalBlockFlow())
</del><ins>+    if (isHorizontalWritingMode())
</ins><span class="cx">         return isLeftToRightDirection() ? marginRight() : marginLeft();
</span><span class="cx">     return isLeftToRightDirection() ? marginBottom() : marginTop();
</span><span class="cx"> }
</span><span class="cx">     
</span><span class="cx"> Length RenderStyle::marginStartUsing(const RenderStyle* otherStyle) const
</span><span class="cx"> {
</span><del>-    if (otherStyle-&gt;isVerticalBlockFlow())
</del><ins>+    if (otherStyle-&gt;isHorizontalWritingMode())
</ins><span class="cx">         return otherStyle-&gt;isLeftToRightDirection() ? marginLeft() : marginRight();
</span><span class="cx">     return otherStyle-&gt;isLeftToRightDirection() ? marginTop() : marginBottom();
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> Length RenderStyle::marginEndUsing(const RenderStyle* otherStyle) const
</span><span class="cx"> {
</span><del>-    if (otherStyle-&gt;isVerticalBlockFlow())
</del><ins>+    if (otherStyle-&gt;isHorizontalWritingMode())
</ins><span class="cx">         return otherStyle-&gt;isLeftToRightDirection() ? marginRight() : marginLeft();
</span><span class="cx">     return otherStyle-&gt;isLeftToRightDirection() ? marginBottom() : marginTop();
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> Length RenderStyle::paddingBefore() const
</span><span class="cx"> {
</span><del>-    switch (blockFlow()) {
-    case TopToBottomBlockFlow:
</del><ins>+    switch (writingMode()) {
+    case TopToBottomWritingMode:
</ins><span class="cx">         return paddingTop();
</span><del>-    case BottomToTopBlockFlow:
</del><ins>+    case BottomToTopWritingMode:
</ins><span class="cx">         return paddingBottom();
</span><del>-    case LeftToRightBlockFlow:
</del><ins>+    case LeftToRightWritingMode:
</ins><span class="cx">         return paddingLeft();
</span><del>-    case RightToLeftBlockFlow:
</del><ins>+    case RightToLeftWritingMode:
</ins><span class="cx">         return paddingRight();
</span><span class="cx">     }
</span><span class="cx">     ASSERT_NOT_REACHED();
</span><span class="lines">@@ -1275,14 +1275,14 @@
</span><span class="cx"> 
</span><span class="cx"> Length RenderStyle::paddingAfter() const
</span><span class="cx"> {
</span><del>-    switch (blockFlow()) {
-    case TopToBottomBlockFlow:
</del><ins>+    switch (writingMode()) {
+    case TopToBottomWritingMode:
</ins><span class="cx">         return paddingBottom();
</span><del>-    case BottomToTopBlockFlow:
</del><ins>+    case BottomToTopWritingMode:
</ins><span class="cx">         return paddingTop();
</span><del>-    case LeftToRightBlockFlow:
</del><ins>+    case LeftToRightWritingMode:
</ins><span class="cx">         return paddingRight();
</span><del>-    case RightToLeftBlockFlow:
</del><ins>+    case RightToLeftWritingMode:
</ins><span class="cx">         return paddingLeft();
</span><span class="cx">     }
</span><span class="cx">     ASSERT_NOT_REACHED();
</span><span class="lines">@@ -1291,14 +1291,14 @@
</span><span class="cx"> 
</span><span class="cx"> Length RenderStyle::paddingStart() const
</span><span class="cx"> {
</span><del>-    if (isVerticalBlockFlow())
</del><ins>+    if (isHorizontalWritingMode())
</ins><span class="cx">         return isLeftToRightDirection() ? paddingLeft() : paddingRight();
</span><span class="cx">     return isLeftToRightDirection() ? paddingTop() : paddingBottom();
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> Length RenderStyle::paddingEnd() const
</span><span class="cx"> {
</span><del>-    if (isVerticalBlockFlow())
</del><ins>+    if (isHorizontalWritingMode())
</ins><span class="cx">         return isLeftToRightDirection() ? paddingRight() : paddingLeft();
</span><span class="cx">     return isLeftToRightDirection() ? paddingBottom() : paddingTop();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkWebCorerenderingstyleRenderStyleh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/style/RenderStyle.h (69219 => 69220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/style/RenderStyle.h        2010-10-06 18:59:27 UTC (rev 69219)
+++ trunk/WebCore/rendering/style/RenderStyle.h        2010-10-06 19:02:34 UTC (rev 69220)
</span><span class="lines">@@ -178,7 +178,7 @@
</span><span class="cx">                    (_force_backgrounds_to_white == other._force_backgrounds_to_white) &amp;&amp;
</span><span class="cx">                    (_pointerEvents == other._pointerEvents) &amp;&amp;
</span><span class="cx">                    (_insideLink == other._insideLink) &amp;&amp;
</span><del>-                   (_blockFlow == other._blockFlow);
</del><ins>+                   (m_writingMode == other.m_writingMode);
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         bool operator!=(const InheritedFlags&amp; other) const { return !(*this == other); }
</span><span class="lines">@@ -206,7 +206,7 @@
</span><span class="cx">         // 43 bits
</span><span class="cx"> 
</span><span class="cx">         // CSS Text Layout Module Level 3: Vertical writing support
</span><del>-        unsigned _blockFlow : 2; // EBlockFlowDirection
</del><ins>+        unsigned m_writingMode : 2; // WritingMode
</ins><span class="cx">         // 45 bits
</span><span class="cx">     } inherited_flags;
</span><span class="cx"> 
</span><span class="lines">@@ -283,7 +283,7 @@
</span><span class="cx">         inherited_flags._force_backgrounds_to_white = false;
</span><span class="cx">         inherited_flags._pointerEvents = initialPointerEvents();
</span><span class="cx">         inherited_flags._insideLink = NotInsideLink;
</span><del>-        inherited_flags._blockFlow = initialBlockFlow();
</del><ins>+        inherited_flags.m_writingMode = initialWritingMode();
</ins><span class="cx"> 
</span><span class="cx">         noninherited_flags._effectiveDisplay = noninherited_flags._originalDisplay = initialDisplay();
</span><span class="cx">         noninherited_flags._overflowX = initialOverflowX();
</span><span class="lines">@@ -743,8 +743,8 @@
</span><span class="cx">     bool textSizeAdjust() const { return rareInheritedData-&gt;textSizeAdjust; }
</span><span class="cx">     ETextSecurity textSecurity() const { return static_cast&lt;ETextSecurity&gt;(rareInheritedData-&gt;textSecurity); }
</span><span class="cx"> 
</span><del>-    EBlockFlowDirection blockFlow() const { return static_cast&lt;EBlockFlowDirection&gt;(inherited_flags._blockFlow); }
-    bool isVerticalBlockFlow() const { return blockFlow() == TopToBottomBlockFlow || blockFlow() == BottomToTopBlockFlow; }
</del><ins>+    WritingMode writingMode() const { return static_cast&lt;WritingMode&gt;(inherited_flags.m_writingMode); }
+    bool isHorizontalWritingMode() const { return writingMode() == TopToBottomWritingMode || writingMode() == BottomToTopWritingMode; }
</ins><span class="cx"> 
</span><span class="cx">     ESpeak speak() { return static_cast&lt;ESpeak&gt;(rareInheritedData-&gt;speak); }
</span><span class="cx">         
</span><span class="lines">@@ -1124,7 +1124,7 @@
</span><span class="cx">                originalDisplay() == INLINE_BOX || originalDisplay() == INLINE_TABLE;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    void setBlockFlow(EBlockFlowDirection v) { inherited_flags._blockFlow = v; }
</del><ins>+    void setWritingMode(WritingMode v) { inherited_flags.m_writingMode = v; }
</ins><span class="cx"> 
</span><span class="cx">     // To tell if this style matched attribute selectors. This makes it impossible to share.
</span><span class="cx">     bool affectedByAttributeSelectors() const { return m_affectedByAttributeSelectors; }
</span><span class="lines">@@ -1165,7 +1165,7 @@
</span><span class="cx">     static ECaptionSide initialCaptionSide() { return CAPTOP; }
</span><span class="cx">     static EClear initialClear() { return CNONE; }
</span><span class="cx">     static TextDirection initialDirection() { return LTR; }
</span><del>-    static EBlockFlowDirection initialBlockFlow() { return TopToBottomBlockFlow; }
</del><ins>+    static WritingMode initialWritingMode() { return TopToBottomWritingMode; }
</ins><span class="cx">     static EDisplay initialDisplay() { return INLINE; }
</span><span class="cx">     static EEmptyCell initialEmptyCells() { return SHOW; }
</span><span class="cx">     static EFloat initialFloating() { return FNONE; }
</span></span></pre></div>
<a id="trunkWebCorerenderingstyleRenderStyleConstantsh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/style/RenderStyleConstants.h (69219 => 69220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/style/RenderStyleConstants.h        2010-10-06 18:59:27 UTC (rev 69219)
+++ trunk/WebCore/rendering/style/RenderStyleConstants.h        2010-10-06 19:02:34 UTC (rev 69220)
</span><span class="lines">@@ -129,8 +129,8 @@
</span><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> // CSS Text Layout Module Level 3: Vertical writing support
</span><del>-enum EBlockFlowDirection {
-    TopToBottomBlockFlow, RightToLeftBlockFlow, LeftToRightBlockFlow, BottomToTopBlockFlow
</del><ins>+enum WritingMode {
+    TopToBottomWritingMode, RightToLeftWritingMode, LeftToRightWritingMode, BottomToTopWritingMode
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> enum EFillAttachment {
</span></span></pre></div>
<a id="trunkWebCorerenderingstyleSVGRenderStyleh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/style/SVGRenderStyle.h (69219 => 69220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/style/SVGRenderStyle.h        2010-10-06 18:59:27 UTC (rev 69219)
+++ trunk/WebCore/rendering/style/SVGRenderStyle.h        2010-10-06 19:02:34 UTC (rev 69220)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx">     static LineJoin initialJoinStyle() { return MiterJoin; }
</span><span class="cx">     static EShapeRendering initialShapeRendering() { return SR_AUTO; }
</span><span class="cx">     static ETextAnchor initialTextAnchor() { return TA_START; }
</span><del>-    static EWritingMode initialWritingMode() { return WM_LRTB; }
</del><ins>+    static SVGWritingMode initialWritingMode() { return WM_LRTB; }
</ins><span class="cx">     static EGlyphOrientation initialGlyphOrientationHorizontal() { return GO_0DEG; }
</span><span class="cx">     static EGlyphOrientation initialGlyphOrientationVertical() { return GO_AUTO; }
</span><span class="cx">     static float initialFillOpacity() { return 1.0f; }
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx">     void setJoinStyle(LineJoin val) { svg_inherited_flags._joinStyle = val; }
</span><span class="cx">     void setShapeRendering(EShapeRendering val) { svg_inherited_flags._shapeRendering = val; }
</span><span class="cx">     void setTextAnchor(ETextAnchor val) { svg_inherited_flags._textAnchor = val; }
</span><del>-    void setWritingMode(EWritingMode val) { svg_inherited_flags._writingMode = val; }
</del><ins>+    void setWritingMode(SVGWritingMode val) { svg_inherited_flags._writingMode = val; }
</ins><span class="cx">     void setGlyphOrientationHorizontal(EGlyphOrientation val) { svg_inherited_flags._glyphOrientationHorizontal = val; }
</span><span class="cx">     void setGlyphOrientationVertical(EGlyphOrientation val) { svg_inherited_flags._glyphOrientationVertical = val; }
</span><span class="cx">     
</span><span class="lines">@@ -281,7 +281,7 @@
</span><span class="cx">     LineJoin joinStyle() const { return (LineJoin) svg_inherited_flags._joinStyle; }
</span><span class="cx">     EShapeRendering shapeRendering() const { return (EShapeRendering) svg_inherited_flags._shapeRendering; }
</span><span class="cx">     ETextAnchor textAnchor() const { return (ETextAnchor) svg_inherited_flags._textAnchor; }
</span><del>-    EWritingMode writingMode() const { return (EWritingMode) svg_inherited_flags._writingMode; }
</del><ins>+    SVGWritingMode writingMode() const { return (SVGWritingMode) svg_inherited_flags._writingMode; }
</ins><span class="cx">     EGlyphOrientation glyphOrientationHorizontal() const { return (EGlyphOrientation) svg_inherited_flags._glyphOrientationHorizontal; }
</span><span class="cx">     EGlyphOrientation glyphOrientationVertical() const { return (EGlyphOrientation) svg_inherited_flags._glyphOrientationVertical; }
</span><span class="cx">     float fillOpacity() const { return fill-&gt;opacity; }
</span><span class="lines">@@ -351,7 +351,7 @@
</span><span class="cx">         unsigned _textAnchor : 2; // ETextAnchor
</span><span class="cx">         unsigned _colorInterpolation : 2; // EColorInterpolation
</span><span class="cx">         unsigned _colorInterpolationFilters : 2; // EColorInterpolation
</span><del>-        unsigned _writingMode : 3; // EWritingMode
</del><ins>+        unsigned _writingMode : 3; // SVGWritingMode
</ins><span class="cx">         unsigned _glyphOrientationHorizontal : 3; // EGlyphOrientation
</span><span class="cx">         unsigned _glyphOrientationVertical : 3; // EGlyphOrientation
</span><span class="cx">     } svg_inherited_flags;
</span></span></pre></div>
<a id="trunkWebCorerenderingstyleSVGRenderStyleDefsh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/style/SVGRenderStyleDefs.h (69219 => 69220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/style/SVGRenderStyleDefs.h        2010-10-06 18:59:27 UTC (rev 69219)
+++ trunk/WebCore/rendering/style/SVGRenderStyleDefs.h        2010-10-06 19:02:34 UTC (rev 69220)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx">         SR_AUTO, SR_OPTIMIZESPEED, SR_CRISPEDGES, SR_GEOMETRICPRECISION
</span><span class="cx">     };
</span><span class="cx"> 
</span><del>-    enum EWritingMode {
</del><ins>+    enum SVGWritingMode {
</ins><span class="cx">         WM_LRTB, WM_LR, WM_RLTB, WM_RL, WM_TBRL, WM_TB
</span><span class="cx">     };
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>