<!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>[191935] 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/191935">191935</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2015-11-02 19:53:33 -0800 (Mon, 02 Nov 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>[Vertical Writing Mode] Rename &quot;vertical-right&quot; CSS value to match spec
https://bugs.webkit.org/show_bug.cgi?id=150766

Reviewed by Darin Adler.

Source/WebCore:

The spec has changed the initial value of text-orientation from &quot;vertical-right&quot;
to &quot;mixed.&quot; This patch follows this movement, but also keeps the existing
property working (the parser will treat both values the same).

Test: fast/text/vertical-mixed.html

* css/CSSParser.cpp:
(WebCore::CSSParser::parseValue):
* css/CSSPrimitiveValueMappings.h:
(WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
(WebCore::CSSPrimitiveValue::operator TextOrientation):
* css/CSSValueKeywords.in:
* css/StyleResolver.cpp:
(WebCore::checkForOrientationChange):
* platform/graphics/FontCascadeFonts.cpp:
(WebCore::glyphDataForNonCJKCharacterWithGlyphOrientation):
* platform/graphics/FontDescription.cpp:
(WebCore::FontDescription::FontDescription):
* platform/graphics/cocoa/FontCascadeCocoa.mm:
(WebCore::FontCascade::fontForCombiningCharacterSequence):
* platform/text/TextFlags.h:
* rendering/style/RenderStyle.cpp:
(WebCore::RenderStyle::getFontAndGlyphOrientation):
* rendering/style/RenderStyle.h:
* rendering/style/RenderStyleConstants.h:
* rendering/style/StyleRareInheritedData.cpp:
(WebCore::StyleRareInheritedData::StyleRareInheritedData):
* style/StyleResolveForDocument.cpp:
(WebCore::Style::resolveForDocument):

LayoutTests:

* fast/css/getComputedStyle/computed-style-expected.txt:
* fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
* fast/css/inherited-properties-rare-text-expected.txt:
* fast/text/vertical-mixed-expected.html: Added.
* fast/text/vertical-mixed.html: Added.
* svg/css/getComputedStyle-basic-expected.txt:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</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="#trunkLayoutTestsfastcssinheritedpropertiesraretextexpectedtxt">trunk/LayoutTests/fast/css/inherited-properties-rare-text-expected.txt</a></li>
<li><a href="#trunkLayoutTestssvgcssgetComputedStylebasicexpectedtxt">trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSPrimitiveValueMappingsh">trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSValueKeywordsin">trunk/Source/WebCore/css/CSSValueKeywords.in</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
<li><a href="#trunkSourceWebCorepageSettingscpp">trunk/Source/WebCore/page/Settings.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontCascadeFontscpp">trunk/Source/WebCore/platform/graphics/FontCascadeFonts.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontDescriptioncpp">trunk/Source/WebCore/platform/graphics/FontDescription.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontDescriptionh">trunk/Source/WebCore/platform/graphics/FontDescription.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscocoaFontCascadeCocoamm">trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinFontCacheWincpp">trunk/Source/WebCore/platform/graphics/win/FontCacheWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinFontCustomPlatformDatacpp">trunk/Source/WebCore/platform/graphics/win/FontCustomPlatformData.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinFontCustomPlatformDataCairocpp">trunk/Source/WebCore/platform/graphics/win/FontCustomPlatformDataCairo.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformtextTextFlagsh">trunk/Source/WebCore/platform/text/TextFlags.h</a></li>
<li><a href="#trunkSourceWebCoreplatformwinDragImageWincpp">trunk/Source/WebCore/platform/win/DragImageWin.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingInlineFlowBoxcpp">trunk/Source/WebCore/rendering/InlineFlowBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStylecpp">trunk/Source/WebCore/rendering/style/RenderStyle.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStyleh">trunk/Source/WebCore/rendering/style/RenderStyle.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStyleConstantsh">trunk/Source/WebCore/rendering/style/RenderStyleConstants.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleRareInheritedDatacpp">trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp</a></li>
<li><a href="#trunkSourceWebCorestyleStyleResolveForDocumentcpp">trunk/Source/WebCore/style/StyleResolveForDocument.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebKitGraphicscpp">trunk/Source/WebKit/win/WebKitGraphics.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebViewcpp">trunk/Source/WebKit/win/WebView.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttextverticalmixedexpectedhtml">trunk/LayoutTests/fast/text/vertical-mixed-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttextverticalmixedhtml">trunk/LayoutTests/fast/text/vertical-mixed.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (191934 => 191935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2015-11-03 03:52:16 UTC (rev 191934)
+++ trunk/LayoutTests/ChangeLog        2015-11-03 03:53:33 UTC (rev 191935)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2015-11-02  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        [Vertical Writing Mode] Rename &quot;vertical-right&quot; CSS value to match spec
+        https://bugs.webkit.org/show_bug.cgi?id=150766
+
+        Reviewed by Darin Adler.
+
+        * fast/css/getComputedStyle/computed-style-expected.txt:
+        * fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
+        * fast/css/inherited-properties-rare-text-expected.txt:
+        * fast/text/vertical-mixed-expected.html: Added.
+        * fast/text/vertical-mixed.html: Added.
+        * svg/css/getComputedStyle-basic-expected.txt:
+
+2015-11-02  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;
+
</ins><span class="cx">         [Cocoa] Support WOFF2
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=150830
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgetComputedStylecomputedstyleexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt (191934 => 191935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt        2015-11-03 03:52:16 UTC (rev 191934)
+++ trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt        2015-11-03 03:53:33 UTC (rev 191935)
</span><span class="lines">@@ -217,7 +217,7 @@
</span><span class="cx"> -webkit-text-emphasis-position: over right;
</span><span class="cx"> -webkit-text-emphasis-style: none;
</span><span class="cx"> -webkit-text-fill-color: rgb(0, 0, 0);
</span><del>--webkit-text-orientation: vertical-right;
</del><ins>+-webkit-text-orientation: mixed;
</ins><span class="cx"> -webkit-text-security: none;
</span><span class="cx"> -webkit-text-stroke-color: rgb(0, 0, 0);
</span><span class="cx"> -webkit-text-stroke-width: 0px;
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgetComputedStylecomputedstylewithoutrendererexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt (191934 => 191935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt        2015-11-03 03:52:16 UTC (rev 191934)
+++ trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt        2015-11-03 03:53:33 UTC (rev 191935)
</span><span class="lines">@@ -216,7 +216,7 @@
</span><span class="cx"> -webkit-text-emphasis-position: over right
</span><span class="cx"> -webkit-text-emphasis-style: none
</span><span class="cx"> -webkit-text-fill-color: rgb(0, 0, 0)
</span><del>--webkit-text-orientation: vertical-right
</del><ins>+-webkit-text-orientation: mixed
</ins><span class="cx"> -webkit-text-security: none
</span><span class="cx"> -webkit-text-stroke-color: rgb(0, 0, 0)
</span><span class="cx"> -webkit-text-stroke-width: 0px
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssinheritedpropertiesraretextexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/inherited-properties-rare-text-expected.txt (191934 => 191935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/inherited-properties-rare-text-expected.txt        2015-11-03 03:52:16 UTC (rev 191934)
+++ trunk/LayoutTests/fast/css/inherited-properties-rare-text-expected.txt        2015-11-03 03:53:33 UTC (rev 191935)
</span><span class="lines">@@ -3,5 +3,5 @@
</span><span class="cx"> test1 -webkit-font-smoothing: antialiased
</span><span class="cx"> test2 -webkit-font-smoothing: auto
</span><span class="cx"> test1 -webkit-text-orientation: upright
</span><del>-test2 -webkit-text-orientation: vertical-right
</del><ins>+test2 -webkit-text-orientation: mixed
</ins><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextverticalmixedexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/vertical-mixed-expected.html (0 => 191935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/vertical-mixed-expected.html                                (rev 0)
+++ trunk/LayoutTests/fast/text/vertical-mixed-expected.html        2015-11-03 03:53:33 UTC (rev 191935)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;html&gt;
+&lt;head&gt;
+&lt;/head&gt;
+&lt;body&gt;
+This test makes sure that text-orientation: mixed works the same as text-orientation: vertical-right.
+&lt;div style=&quot;font-size: 100px; -webkit-writing-mode: vertical-rl; -webkit-text-orientation: vertical-right;&quot;&gt;asdf&amp;#x7f51;&lt;/div&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextverticalmixedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/vertical-mixed.html (0 => 191935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/vertical-mixed.html                                (rev 0)
+++ trunk/LayoutTests/fast/text/vertical-mixed.html        2015-11-03 03:53:33 UTC (rev 191935)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;html&gt;
+&lt;head&gt;
+&lt;/head&gt;
+&lt;body&gt;
+This test makes sure that text-orientation: mixed works the same as text-orientation: vertical-right.
+&lt;div style=&quot;-webkit-text-orientation: upright;&quot;&gt;
+&lt;div style=&quot;font-size: 100px; -webkit-writing-mode: vertical-rl; -webkit-text-orientation: mixed;&quot;&gt;asdf&amp;#x7f51;&lt;/div&gt;
+&lt;/div&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestssvgcssgetComputedStylebasicexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt (191934 => 191935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt        2015-11-03 03:52:16 UTC (rev 191934)
+++ trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt        2015-11-03 03:53:33 UTC (rev 191935)
</span><span class="lines">@@ -432,7 +432,7 @@
</span><span class="cx"> rect: style.getPropertyCSSValue(-webkit-text-emphasis-style) : [object CSSPrimitiveValue]
</span><span class="cx"> rect: style.getPropertyValue(-webkit-text-fill-color) : rgb(0, 0, 0)
</span><span class="cx"> rect: style.getPropertyCSSValue(-webkit-text-fill-color) : [object CSSPrimitiveValue]
</span><del>-rect: style.getPropertyValue(-webkit-text-orientation) : vertical-right
</del><ins>+rect: style.getPropertyValue(-webkit-text-orientation) : mixed
</ins><span class="cx"> rect: style.getPropertyCSSValue(-webkit-text-orientation) : [object CSSPrimitiveValue]
</span><span class="cx"> rect: style.getPropertyValue(-webkit-text-security) : none
</span><span class="cx"> rect: style.getPropertyCSSValue(-webkit-text-security) : [object CSSPrimitiveValue]
</span><span class="lines">@@ -966,7 +966,7 @@
</span><span class="cx"> g: style.getPropertyCSSValue(-webkit-text-emphasis-style) : [object CSSPrimitiveValue]
</span><span class="cx"> g: style.getPropertyValue(-webkit-text-fill-color) : rgb(0, 0, 0)
</span><span class="cx"> g: style.getPropertyCSSValue(-webkit-text-fill-color) : [object CSSPrimitiveValue]
</span><del>-g: style.getPropertyValue(-webkit-text-orientation) : vertical-right
</del><ins>+g: style.getPropertyValue(-webkit-text-orientation) : mixed
</ins><span class="cx"> g: style.getPropertyCSSValue(-webkit-text-orientation) : [object CSSPrimitiveValue]
</span><span class="cx"> g: style.getPropertyValue(-webkit-text-security) : none
</span><span class="cx"> g: style.getPropertyCSSValue(-webkit-text-security) : [object CSSPrimitiveValue]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (191934 => 191935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-11-03 03:52:16 UTC (rev 191934)
+++ trunk/Source/WebCore/ChangeLog        2015-11-03 03:53:33 UTC (rev 191935)
</span><span class="lines">@@ -1,5 +1,42 @@
</span><span class="cx"> 2015-11-02  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        [Vertical Writing Mode] Rename &quot;vertical-right&quot; CSS value to match spec
+        https://bugs.webkit.org/show_bug.cgi?id=150766
+
+        Reviewed by Darin Adler.
+
+        The spec has changed the initial value of text-orientation from &quot;vertical-right&quot;
+        to &quot;mixed.&quot; This patch follows this movement, but also keeps the existing
+        property working (the parser will treat both values the same).
+
+        Test: fast/text/vertical-mixed.html
+
+        * css/CSSParser.cpp:
+        (WebCore::CSSParser::parseValue):
+        * css/CSSPrimitiveValueMappings.h:
+        (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
+        (WebCore::CSSPrimitiveValue::operator TextOrientation):
+        * css/CSSValueKeywords.in:
+        * css/StyleResolver.cpp:
+        (WebCore::checkForOrientationChange):
+        * platform/graphics/FontCascadeFonts.cpp:
+        (WebCore::glyphDataForNonCJKCharacterWithGlyphOrientation):
+        * platform/graphics/FontDescription.cpp:
+        (WebCore::FontDescription::FontDescription):
+        * platform/graphics/cocoa/FontCascadeCocoa.mm:
+        (WebCore::FontCascade::fontForCombiningCharacterSequence):
+        * platform/text/TextFlags.h:
+        * rendering/style/RenderStyle.cpp:
+        (WebCore::RenderStyle::getFontAndGlyphOrientation):
+        * rendering/style/RenderStyle.h:
+        * rendering/style/RenderStyleConstants.h:
+        * rendering/style/StyleRareInheritedData.cpp:
+        (WebCore::StyleRareInheritedData::StyleRareInheritedData):
+        * style/StyleResolveForDocument.cpp:
+        (WebCore::Style::resolveForDocument):
+
+2015-11-02  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;
+
</ins><span class="cx">         [Cocoa] Support WOFF2
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=150830
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (191934 => 191935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp        2015-11-03 03:52:16 UTC (rev 191934)
+++ trunk/Source/WebCore/css/CSSParser.cpp        2015-11-03 03:53:33 UTC (rev 191935)
</span><span class="lines">@@ -3107,8 +3107,7 @@
</span><span class="cx">         return parseTextEmphasisPosition(important);
</span><span class="cx"> 
</span><span class="cx">     case CSSPropertyWebkitTextOrientation:
</span><del>-        // FIXME: For now just support sideways, sideways-right, upright and vertical-right.
-        if (id == CSSValueSideways || id == CSSValueSidewaysRight || id == CSSValueVerticalRight || id == CSSValueUpright)
</del><ins>+        if (id == CSSValueSideways || id == CSSValueSidewaysRight || id == CSSValueVerticalRight || id == CSSValueMixed || id == CSSValueUpright)
</ins><span class="cx">             validPrimitive = true;
</span><span class="cx">         break;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPrimitiveValueMappingsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h (191934 => 191935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h        2015-11-03 03:52:16 UTC (rev 191934)
+++ trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h        2015-11-03 03:53:33 UTC (rev 191935)
</span><span class="lines">@@ -3331,16 +3331,16 @@
</span><span class="cx"> {
</span><span class="cx">     m_primitiveUnitType = CSS_VALUE_ID;
</span><span class="cx">     switch (e) {
</span><del>-    case TextOrientationSideways:
</del><ins>+    case TextOrientation::Sideways:
</ins><span class="cx">         m_value.valueID = CSSValueSideways;
</span><span class="cx">         break;
</span><del>-    case TextOrientationSidewaysRight:
</del><ins>+    case TextOrientation::SidewaysRight:
</ins><span class="cx">         m_value.valueID = CSSValueSidewaysRight;
</span><span class="cx">         break;
</span><del>-    case TextOrientationVerticalRight:
-        m_value.valueID = CSSValueVerticalRight;
</del><ins>+    case TextOrientation::Mixed:
+        m_value.valueID = CSSValueMixed;
</ins><span class="cx">         break;
</span><del>-    case TextOrientationUpright:
</del><ins>+    case TextOrientation::Upright:
</ins><span class="cx">         m_value.valueID = CSSValueUpright;
</span><span class="cx">         break;
</span><span class="cx">     }
</span><span class="lines">@@ -3352,19 +3352,21 @@
</span><span class="cx"> 
</span><span class="cx">     switch (m_value.valueID) {
</span><span class="cx">     case CSSValueSideways:
</span><del>-        return TextOrientationSideways;
</del><ins>+        return TextOrientation::Sideways;
</ins><span class="cx">     case CSSValueSidewaysRight:
</span><del>-        return TextOrientationSidewaysRight;
</del><ins>+        return TextOrientation::SidewaysRight;
</ins><span class="cx">     case CSSValueVerticalRight:
</span><del>-        return TextOrientationVerticalRight;
</del><ins>+        return TextOrientation::Mixed;
+    case CSSValueMixed:
+        return TextOrientation::Mixed;
</ins><span class="cx">     case CSSValueUpright:
</span><del>-        return TextOrientationUpright;
</del><ins>+        return TextOrientation::Upright;
</ins><span class="cx">     default:
</span><span class="cx">         break;
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     ASSERT_NOT_REACHED();
</span><del>-    return TextOrientationVerticalRight;
</del><ins>+    return TextOrientation::Mixed;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> template&lt;&gt; inline CSSPrimitiveValue::CSSPrimitiveValue(EPointerEvents e)
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValueKeywordsin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValueKeywords.in (191934 => 191935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValueKeywords.in        2015-11-03 03:52:16 UTC (rev 191934)
+++ trunk/Source/WebCore/css/CSSValueKeywords.in        2015-11-03 03:53:33 UTC (rev 191935)
</span><span class="lines">@@ -1035,6 +1035,7 @@
</span><span class="cx"> sideways-right
</span><span class="cx"> upright
</span><span class="cx"> vertical-right
</span><ins>+mixed
</ins><span class="cx"> 
</span><span class="cx"> // -webkit-line-box-contain
</span><span class="cx"> font
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (191934 => 191935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp        2015-11-03 03:52:16 UTC (rev 191934)
+++ trunk/Source/WebCore/css/StyleResolver.cpp        2015-11-03 03:53:33 UTC (rev 191935)
</span><span class="lines">@@ -1375,7 +1375,7 @@
</span><span class="cx"> {
</span><span class="cx">     FontOrientation fontOrientation;
</span><span class="cx">     NonCJKGlyphOrientation glyphOrientation;
</span><del>-    style-&gt;getFontAndGlyphOrientation(fontOrientation, glyphOrientation);
</del><ins>+    std::tie(fontOrientation, glyphOrientation) = style-&gt;fontAndGlyphOrientation();
</ins><span class="cx"> 
</span><span class="cx">     const auto&amp; fontDescription = style-&gt;fontDescription();
</span><span class="cx">     if (fontDescription.orientation() == fontOrientation &amp;&amp; fontDescription.nonCJKGlyphOrientation() == glyphOrientation)
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.cpp (191934 => 191935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.cpp        2015-11-03 03:52:16 UTC (rev 191934)
+++ trunk/Source/WebCore/page/Settings.cpp        2015-11-03 03:53:33 UTC (rev 191935)
</span><span class="lines">@@ -503,7 +503,7 @@
</span><span class="cx"> {
</span><span class="cx">     if (fontRenderingMode() == mode)
</span><span class="cx">         return;
</span><del>-    m_fontRenderingMode = mode;
</del><ins>+    m_fontRenderingMode = static_cast&lt;int&gt;(mode);
</ins><span class="cx">     if (m_page)
</span><span class="cx">         m_page-&gt;setNeedsRecalcStyleInAllFrames();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCascadeFontscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCascadeFonts.cpp (191934 => 191935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCascadeFonts.cpp        2015-11-03 03:52:16 UTC (rev 191934)
+++ trunk/Source/WebCore/platform/graphics/FontCascadeFonts.cpp        2015-11-03 03:53:33 UTC (rev 191935)
</span><span class="lines">@@ -294,7 +294,7 @@
</span><span class="cx">     
</span><span class="cx"> static GlyphData glyphDataForNonCJKCharacterWithGlyphOrientation(UChar32 character, NonCJKGlyphOrientation orientation, const GlyphData&amp; data)
</span><span class="cx"> {
</span><del>-    if (orientation == NonCJKGlyphOrientationUpright || shouldIgnoreRotation(character)) {
</del><ins>+    if (orientation == NonCJKGlyphOrientation::Upright || shouldIgnoreRotation(character)) {
</ins><span class="cx">         GlyphData uprightData = data.font-&gt;uprightOrientationFont().glyphDataForCharacter(character);
</span><span class="cx">         // If the glyphs are the same, then we know we can just use the horizontal glyph rotated vertically to be upright.
</span><span class="cx">         if (data.glyph == uprightData.glyph)
</span><span class="lines">@@ -303,7 +303,7 @@
</span><span class="cx">         // glyph, so we fall back to the upright data and use the horizontal glyph.
</span><span class="cx">         if (uprightData.font)
</span><span class="cx">             return uprightData;
</span><del>-    } else if (orientation == NonCJKGlyphOrientationVerticalRight) {
</del><ins>+    } else if (orientation == NonCJKGlyphOrientation::Mixed) {
</ins><span class="cx">         GlyphData verticalRightData = data.font-&gt;verticalRightOrientationFont().glyphDataForCharacter(character);
</span><span class="cx">         // If the glyphs are distinct, we will make the assumption that the font has a vertical-right glyph baked
</span><span class="cx">         // into it.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontDescriptioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontDescription.cpp (191934 => 191935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontDescription.cpp        2015-11-03 03:52:16 UTC (rev 191934)
+++ trunk/Source/WebCore/platform/graphics/FontDescription.cpp        2015-11-03 03:53:33 UTC (rev 191935)
</span><span class="lines">@@ -46,12 +46,12 @@
</span><span class="cx"> 
</span><span class="cx"> FontDescription::FontDescription()
</span><span class="cx">     : m_orientation(Horizontal)
</span><del>-    , m_nonCJKGlyphOrientation(NonCJKGlyphOrientationVerticalRight)
</del><ins>+    , m_nonCJKGlyphOrientation(static_cast&lt;unsigned&gt;(NonCJKGlyphOrientation::Mixed))
</ins><span class="cx">     , m_widthVariant(RegularWidth)
</span><span class="cx">     , m_italic(FontItalicOff)
</span><span class="cx">     , m_smallCaps(FontSmallCapsOff)
</span><span class="cx">     , m_weight(FontWeightNormal)
</span><del>-    , m_renderingMode(NormalRenderingMode)
</del><ins>+    , m_renderingMode(static_cast&lt;unsigned&gt;(FontRenderingMode::Normal))
</ins><span class="cx">     , m_textRendering(AutoTextRendering)
</span><span class="cx">     , m_script(USCRIPT_COMMON)
</span><span class="cx">     , m_fontSynthesis(FontSynthesisWeight | FontSynthesisStyle)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontDescriptionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontDescription.h (191934 => 191935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontDescription.h        2015-11-03 03:52:16 UTC (rev 191934)
+++ trunk/Source/WebCore/platform/graphics/FontDescription.h        2015-11-03 03:53:33 UTC (rev 191935)
</span><span class="lines">@@ -101,10 +101,10 @@
</span><span class="cx">     void setSmallCaps(FontSmallCaps c) { m_smallCaps = c; }
</span><span class="cx">     void setIsSmallCaps(bool c) { setSmallCaps(c ? FontSmallCapsOn : FontSmallCapsOff); }
</span><span class="cx">     void setWeight(FontWeight w) { m_weight = w; }
</span><del>-    void setRenderingMode(FontRenderingMode mode) { m_renderingMode = mode; }
</del><ins>+    void setRenderingMode(FontRenderingMode mode) { m_renderingMode = static_cast&lt;unsigned&gt;(mode); }
</ins><span class="cx">     void setTextRenderingMode(TextRenderingMode rendering) { m_textRendering = rendering; }
</span><span class="cx">     void setOrientation(FontOrientation orientation) { m_orientation = orientation; }
</span><del>-    void setNonCJKGlyphOrientation(NonCJKGlyphOrientation orientation) { m_nonCJKGlyphOrientation = orientation; }
</del><ins>+    void setNonCJKGlyphOrientation(NonCJKGlyphOrientation orientation) { m_nonCJKGlyphOrientation = static_cast&lt;unsigned&gt;(orientation); }
</ins><span class="cx">     void setWidthVariant(FontWidthVariant widthVariant) { m_widthVariant = widthVariant; } // Make sure new callers of this sync with FontPlatformData::isForTextCombine()!
</span><span class="cx">     void setScript(UScriptCode s) { m_script = s; }
</span><span class="cx">     void setFeatureSettings(FontFeatureSettings&amp;&amp; settings) { m_featureSettings = WTF::move(settings); }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaFontCascadeCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm (191934 => 191935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm        2015-11-03 03:52:16 UTC (rev 191934)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm        2015-11-03 03:53:33 UTC (rev 191935)
</span><span class="lines">@@ -700,7 +700,7 @@
</span><span class="cx">     GlyphData baseCharacterGlyphData = glyphDataForCharacter(baseCharacter, false, variant);
</span><span class="cx"> 
</span><span class="cx">     if (!baseCharacterGlyphData.glyph)
</span><del>-        return 0;
</del><ins>+        return nullptr;
</ins><span class="cx"> 
</span><span class="cx">     if (length == baseCharacterLength)
</span><span class="cx">         return baseCharacterGlyphData.font;
</span><span class="lines">@@ -720,7 +720,7 @@
</span><span class="cx">                 if (isCJKIdeographOrSymbol(baseCharacter) &amp;&amp; !font-&gt;hasVerticalGlyphs()) {
</span><span class="cx">                     variant = BrokenIdeographVariant;
</span><span class="cx">                     font = &amp;font-&gt;brokenIdeographFont();
</span><del>-                } else if (m_fontDescription.nonCJKGlyphOrientation() == NonCJKGlyphOrientationVerticalRight) {
</del><ins>+                } else if (m_fontDescription.nonCJKGlyphOrientation() == NonCJKGlyphOrientation::Mixed) {
</ins><span class="cx">                     const Font&amp; verticalRightFont = font-&gt;verticalRightOrientationFont();
</span><span class="cx">                     Glyph verticalRightGlyph = verticalRightFont.glyphForCharacter(baseCharacter);
</span><span class="cx">                     if (verticalRightGlyph == baseCharacterGlyphData.glyph)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinFontCacheWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/FontCacheWin.cpp (191934 => 191935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/FontCacheWin.cpp        2015-11-03 03:52:16 UTC (rev 191934)
+++ trunk/Source/WebCore/platform/graphics/win/FontCacheWin.cpp        2015-11-03 03:53:33 UTC (rev 191935)
</span><span class="lines">@@ -569,7 +569,7 @@
</span><span class="cx">     if (equalIgnoringCase(family, lucidaStr))
</span><span class="cx">         isLucidaGrande = true;
</span><span class="cx"> 
</span><del>-    bool useGDI = fontDescription.renderingMode() == AlternateRenderingMode &amp;&amp; !isLucidaGrande;
</del><ins>+    bool useGDI = fontDescription.renderingMode() == FontRenderingMode::Alternate &amp;&amp; !isLucidaGrande;
</ins><span class="cx"> 
</span><span class="cx">     // The logical size constant is 32. We do this for subpixel precision when rendering using Uniscribe.
</span><span class="cx">     // This masks rounding errors related to the HFONT metrics being  different from the CGFont metrics.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinFontCustomPlatformDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/FontCustomPlatformData.cpp (191934 => 191935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/FontCustomPlatformData.cpp        2015-11-03 03:52:16 UTC (rev 191934)
+++ trunk/Source/WebCore/platform/graphics/win/FontCustomPlatformData.cpp        2015-11-03 03:53:33 UTC (rev 191935)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx">     memcpy(logFont.lfFaceName, m_name.charactersWithNullTermination().data(), sizeof(logFont.lfFaceName[0]) * std::min&lt;size_t&gt;(static_cast&lt;size_t&gt;(LF_FACESIZE), 1 + m_name.length()));
</span><span class="cx"> 
</span><span class="cx">     logFont.lfHeight = -size;
</span><del>-    if (renderingMode == NormalRenderingMode)
</del><ins>+    if (renderingMode == FontRenderingMode::Normal)
</ins><span class="cx">         logFont.lfHeight *= 32;
</span><span class="cx">     logFont.lfWidth = 0;
</span><span class="cx">     logFont.lfEscapement = 0;
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx">     auto hfont = adoptGDIObject(::CreateFontIndirect(&amp;logFont));
</span><span class="cx"> 
</span><span class="cx">     RetainPtr&lt;CGFontRef&gt; cgFont = adoptCF(CGFontCreateWithPlatformFont(&amp;logFont));
</span><del>-    return FontPlatformData(WTF::move(hfont), cgFont.get(), size, bold, italic, renderingMode == AlternateRenderingMode);
</del><ins>+    return FontPlatformData(WTF::move(hfont), cgFont.get(), size, bold, italic, renderingMode == FontRenderingMode::Alternate);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> // Creates a unique and unpredictable font name, in order to avoid collisions and to
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinFontCustomPlatformDataCairocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/FontCustomPlatformDataCairo.cpp (191934 => 191935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/FontCustomPlatformDataCairo.cpp        2015-11-03 03:52:16 UTC (rev 191934)
+++ trunk/Source/WebCore/platform/graphics/win/FontCustomPlatformDataCairo.cpp        2015-11-03 03:53:33 UTC (rev 191935)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx">     wcsncpy(logFont.lfFaceName, m_name.charactersWithNullTermination().data(), LF_FACESIZE - 1);
</span><span class="cx"> 
</span><span class="cx">     logFont.lfHeight = -size;
</span><del>-    if (renderingMode == NormalRenderingMode)
</del><ins>+    if (renderingMode == FontRenderingMode::Normal)
</ins><span class="cx">         logFont.lfHeight *= 32;
</span><span class="cx">     logFont.lfWidth = 0;
</span><span class="cx">     logFont.lfEscapement = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextTextFlagsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/TextFlags.h (191934 => 191935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/TextFlags.h        2015-11-03 03:52:16 UTC (rev 191934)
+++ trunk/Source/WebCore/platform/text/TextFlags.h        2015-11-03 03:53:33 UTC (rev 191935)
</span><span class="lines">@@ -43,11 +43,11 @@
</span><span class="cx"> 
</span><span class="cx"> // This setting is used to provide ways of switching between multiple rendering modes that may have different
</span><span class="cx"> // metrics. It is used to switch between CG and GDI text on Windows.
</span><del>-enum FontRenderingMode { NormalRenderingMode, AlternateRenderingMode };
</del><ins>+enum class FontRenderingMode { Normal, Alternate };
</ins><span class="cx"> 
</span><span class="cx"> enum FontOrientation { Horizontal, Vertical };
</span><span class="cx"> 
</span><del>-enum NonCJKGlyphOrientation { NonCJKGlyphOrientationVerticalRight, NonCJKGlyphOrientationUpright };
</del><ins>+enum class NonCJKGlyphOrientation { Mixed, Upright };
</ins><span class="cx"> 
</span><span class="cx"> // Here, &quot;Leading&quot; and &quot;Trailing&quot; are relevant after the line has been rearranged for bidi.
</span><span class="cx"> // (&quot;Leading&quot; means &quot;left&quot; and &quot;Trailing&quot; means &quot;right.&quot;)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformwinDragImageWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/win/DragImageWin.cpp (191934 => 191935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/win/DragImageWin.cpp        2015-11-03 03:52:16 UTC (rev 191934)
+++ trunk/Source/WebCore/platform/win/DragImageWin.cpp        2015-11-03 03:53:33 UTC (rev 191935)
</span><span class="lines">@@ -126,14 +126,14 @@
</span><span class="cx">     const FontCascade* labelFont;
</span><span class="cx">     const FontCascade* urlFont;
</span><span class="cx"> 
</span><del>-    if (fontRenderingMode == AlternateRenderingMode) {
-        static const FontCascade alternateRenderingModeLabelFont = dragLabelFont(DragLinkLabelFontsize, true, AlternateRenderingMode);
-        static const FontCascade alternateRenderingModeURLFont = dragLabelFont(DragLinkUrlFontSize, false, AlternateRenderingMode);
</del><ins>+    if (fontRenderingMode == FontRenderingMode::Alternate) {
+        static const FontCascade alternateRenderingModeLabelFont = dragLabelFont(DragLinkLabelFontsize, true, FontRenderingMode::Alternate);
+        static const FontCascade alternateRenderingModeURLFont = dragLabelFont(DragLinkUrlFontSize, false, FontRenderingMode::Alternate);
</ins><span class="cx">         labelFont = &amp;alternateRenderingModeLabelFont;
</span><span class="cx">         urlFont = &amp;alternateRenderingModeURLFont;
</span><span class="cx">     } else {
</span><del>-        static const FontCascade normalRenderingModeLabelFont = dragLabelFont(DragLinkLabelFontsize, true, NormalRenderingMode);
-        static const FontCascade normalRenderingModeURLFont = dragLabelFont(DragLinkUrlFontSize, false, NormalRenderingMode);
</del><ins>+        static const FontCascade normalRenderingModeLabelFont = dragLabelFont(DragLinkLabelFontsize, true, FontRenderingMode::Normal);
+        static const FontCascade normalRenderingModeURLFont = dragLabelFont(DragLinkUrlFontSize, false, FontRenderingMode::Normal);
</ins><span class="cx">         labelFont = &amp;normalRenderingModeLabelFont;
</span><span class="cx">         urlFont = &amp;normalRenderingModeURLFont;
</span><span class="cx">     }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineFlowBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineFlowBox.cpp (191934 => 191935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineFlowBox.cpp        2015-11-03 03:52:16 UTC (rev 191934)
+++ trunk/Source/WebCore/rendering/InlineFlowBox.cpp        2015-11-03 03:53:33 UTC (rev 191935)
</span><span class="lines">@@ -455,7 +455,7 @@
</span><span class="cx">         return false;
</span><span class="cx"> 
</span><span class="cx">     const RenderStyle&amp; lineStyle = this-&gt;lineStyle();
</span><del>-    if (lineStyle.fontDescription().nonCJKGlyphOrientation() == NonCJKGlyphOrientationUpright
</del><ins>+    if (lineStyle.fontDescription().nonCJKGlyphOrientation() == NonCJKGlyphOrientation::Upright
</ins><span class="cx">         || lineStyle.fontCascade().primaryFont().hasVerticalGlyphs())
</span><span class="cx">         return true;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.cpp (191934 => 191935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.cpp        2015-11-03 03:52:16 UTC (rev 191934)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.cpp        2015-11-03 03:53:33 UTC (rev 191935)
</span><span class="lines">@@ -1819,42 +1819,25 @@
</span><span class="cx">                            NinePieceImage::computeOutset(image.outset().left(), borderLeftWidth()));
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void RenderStyle::getFontAndGlyphOrientation(FontOrientation&amp; fontOrientation, NonCJKGlyphOrientation&amp; glyphOrientation)
</del><ins>+std::pair&lt;FontOrientation, NonCJKGlyphOrientation&gt; RenderStyle::fontAndGlyphOrientation()
</ins><span class="cx"> {
</span><del>-    if (isHorizontalWritingMode()) {
-        fontOrientation = Horizontal;
-        glyphOrientation = NonCJKGlyphOrientationVerticalRight;
-        return;
-    }
</del><ins>+    // FIXME: TextOrientationSideways should map to sideways-left in vertical-lr, which is not supported yet.
</ins><span class="cx"> 
</span><ins>+    if (isHorizontalWritingMode())
+        return { Horizontal, NonCJKGlyphOrientation::Mixed };
+
</ins><span class="cx">     switch (textOrientation()) {
</span><del>-    case TextOrientationVerticalRight:
-        fontOrientation = Vertical;
-        glyphOrientation = NonCJKGlyphOrientationVerticalRight;
-        return;
-    case TextOrientationUpright:
-        fontOrientation = Vertical;
-        glyphOrientation = NonCJKGlyphOrientationUpright;
-        return;
-    case TextOrientationSideways:
-        if (writingMode() == LeftToRightWritingMode) {
-            // FIXME: This should map to sideways-left, which is not supported yet.
-            fontOrientation = Vertical;
-            glyphOrientation = NonCJKGlyphOrientationVerticalRight;
-            return;
-        }
-        fontOrientation = Horizontal;
-        glyphOrientation = NonCJKGlyphOrientationVerticalRight;
-        return;
-    case TextOrientationSidewaysRight:
-        fontOrientation = Horizontal;
-        glyphOrientation = NonCJKGlyphOrientationVerticalRight;
-        return;
</del><ins>+    case TextOrientation::Mixed:
+        return { Vertical, NonCJKGlyphOrientation::Mixed };
+    case TextOrientation::Upright:
+        return { Vertical, NonCJKGlyphOrientation::Upright };
+    case TextOrientation::Sideways:
+        return { Horizontal, NonCJKGlyphOrientation::Mixed };
+    case TextOrientation::SidewaysRight:
+        return { Horizontal, NonCJKGlyphOrientation::Mixed };
</ins><span class="cx">     default:
</span><span class="cx">         ASSERT_NOT_REACHED();
</span><del>-        fontOrientation = Horizontal;
-        glyphOrientation = NonCJKGlyphOrientationVerticalRight;
-        return;
</del><ins>+        return { Horizontal, NonCJKGlyphOrientation::Mixed };
</ins><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (191934 => 191935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.h        2015-11-03 03:52:16 UTC (rev 191934)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h        2015-11-03 03:53:33 UTC (rev 191935)
</span><span class="lines">@@ -710,7 +710,7 @@
</span><span class="cx">     float specifiedFontSize() const;
</span><span class="cx">     float computedFontSize() const;
</span><span class="cx">     int fontSize() const;
</span><del>-    void getFontAndGlyphOrientation(FontOrientation&amp;, NonCJKGlyphOrientation&amp;);
</del><ins>+    std::pair&lt;FontOrientation, NonCJKGlyphOrientation&gt; fontAndGlyphOrientation();
</ins><span class="cx"> 
</span><span class="cx"> #if ENABLE(TEXT_AUTOSIZING)
</span><span class="cx">     float textAutosizingMultiplier() const { return visual-&gt;m_textAutosizingMultiplier; }
</span><span class="lines">@@ -1904,7 +1904,8 @@
</span><span class="cx">     static TextDirection initialDirection() { return LTR; }
</span><span class="cx">     static WritingMode initialWritingMode() { return TopToBottomWritingMode; }
</span><span class="cx">     static TextCombine initialTextCombine() { return TextCombineNone; }
</span><del>-    static TextOrientation initialTextOrientation() { return TextOrientationVerticalRight; }
</del><ins>+    static TextOrientation initialTextOrientation() { return TextOrientation::
+    Mixed; }
</ins><span class="cx">     static ObjectFit initialObjectFit() { return ObjectFitFill; }
</span><span class="cx">     static EEmptyCell initialEmptyCells() { return SHOW; }
</span><span class="cx">     static EListStylePosition initialListStylePosition() { return OUTSIDE; }
</span><span class="lines">@@ -2286,10 +2287,10 @@
</span><span class="cx"> 
</span><span class="cx"> inline bool RenderStyle::setTextOrientation(TextOrientation textOrientation)
</span><span class="cx"> {
</span><del>-    if (compareEqual(rareInheritedData-&gt;m_textOrientation, textOrientation))
</del><ins>+    if (compareEqual(rareInheritedData-&gt;m_textOrientation, static_cast&lt;unsigned&gt;(textOrientation)))
</ins><span class="cx">         return false;
</span><span class="cx"> 
</span><del>-    rareInheritedData.access()-&gt;m_textOrientation = textOrientation;
</del><ins>+    rareInheritedData.access()-&gt;m_textOrientation = static_cast&lt;unsigned&gt;(textOrientation);
</ins><span class="cx">     return true;
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleConstantsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyleConstants.h (191934 => 191935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyleConstants.h        2015-11-03 03:52:16 UTC (rev 191934)
+++ trunk/Source/WebCore/rendering/style/RenderStyleConstants.h        2015-11-03 03:53:33 UTC (rev 191935)
</span><span class="lines">@@ -586,7 +586,7 @@
</span><span class="cx"> };
</span><span class="cx"> typedef unsigned TextEmphasisPosition;
</span><span class="cx"> 
</span><del>-enum TextOrientation { TextOrientationVerticalRight, TextOrientationUpright, TextOrientationSideways, TextOrientationSidewaysRight };
</del><ins>+enum class TextOrientation { Mixed, Upright, Sideways, SidewaysRight };
</ins><span class="cx"> 
</span><span class="cx"> enum TextOverflow { TextOverflowClip = 0, TextOverflowEllipsis };
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleRareInheritedDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp (191934 => 191935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp        2015-11-03 03:52:16 UTC (rev 191934)
+++ trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp        2015-11-03 03:53:33 UTC (rev 191935)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx">     , textEmphasisFill(TextEmphasisFillFilled)
</span><span class="cx">     , textEmphasisMark(TextEmphasisMarkNone)
</span><span class="cx">     , textEmphasisPosition(TextEmphasisPositionOver | TextEmphasisPositionRight)
</span><del>-    , m_textOrientation(TextOrientationVerticalRight)
</del><ins>+    , m_textOrientation(static_cast&lt;unsigned&gt;(TextOrientation::Mixed))
</ins><span class="cx"> #if ENABLE(CSS3_TEXT)
</span><span class="cx">     , m_textIndentLine(RenderStyle::initialTextIndentLine())
</span><span class="cx">     , m_textIndentType(RenderStyle::initialTextIndentType())
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStyleResolveForDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleResolveForDocument.cpp (191934 => 191935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleResolveForDocument.cpp        2015-11-03 03:52:16 UTC (rev 191934)
+++ trunk/Source/WebCore/style/StyleResolveForDocument.cpp        2015-11-03 03:53:33 UTC (rev 191935)
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> 
</span><span class="cx">     FontOrientation fontOrientation;
</span><span class="cx">     NonCJKGlyphOrientation glyphOrientation;
</span><del>-    documentStyle.get().getFontAndGlyphOrientation(fontOrientation, glyphOrientation);
</del><ins>+    std::tie(fontOrientation, glyphOrientation) = documentStyle.get().fontAndGlyphOrientation();
</ins><span class="cx">     fontDescription.setOrientation(fontOrientation);
</span><span class="cx">     fontDescription.setNonCJKGlyphOrientation(glyphOrientation);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebKitGraphicscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebKitGraphics.cpp (191934 => 191935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebKitGraphics.cpp        2015-11-03 03:52:16 UTC (rev 191934)
+++ trunk/Source/WebKit/win/WebKitGraphics.cpp        2015-11-03 03:53:33 UTC (rev 191935)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> 
</span><span class="cx">     FontSmoothingType smoothingType;
</span><span class="cx">     if (SUCCEEDED(WebPreferences::sharedStandardPreferences()-&gt;fontSmoothing(&amp;smoothingType)))
</span><del>-        f.setRenderingMode(smoothingType == FontSmoothingTypeWindows ? AlternateRenderingMode : NormalRenderingMode);
</del><ins>+        f.setRenderingMode(smoothingType == FontSmoothingTypeWindows ? FontRenderingMode::Alternate : FontRenderingMode::Normal);
</ins><span class="cx"> 
</span><span class="cx">     FontCascade font(f, 0, 0);
</span><span class="cx">     font.update(0);
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebView.cpp (191934 => 191935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebView.cpp        2015-11-03 03:52:16 UTC (rev 191934)
+++ trunk/Source/WebKit/win/WebView.cpp        2015-11-03 03:53:33 UTC (rev 191935)
</span><span class="lines">@@ -5140,7 +5140,7 @@
</span><span class="cx">     hr = preferences-&gt;fontSmoothing(&amp;smoothingType);
</span><span class="cx">     if (FAILED(hr))
</span><span class="cx">         return hr;
</span><del>-    settings.setFontRenderingMode(smoothingType != FontSmoothingTypeWindows ? NormalRenderingMode : AlternateRenderingMode);
</del><ins>+    settings.setFontRenderingMode(smoothingType != FontSmoothingTypeWindows ? FontRenderingMode::Normal : FontRenderingMode::Alternate);
</ins><span class="cx"> 
</span><span class="cx"> #if USE(AVFOUNDATION)
</span><span class="cx">     hr = preferences-&gt;avFoundationEnabled(&amp;enabled);
</span></span></pre>
</div>
</div>

</body>
</html>