Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1459)

Unified Diff: sky/engine/core/css/resolver/FontBuilder.cpp

Issue 688213002: First pass at removing dead vertical writing mode code. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/engine/core/css/CSSProperty.h ('k') | sky/engine/core/dom/Position.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/css/resolver/FontBuilder.cpp
diff --git a/sky/engine/core/css/resolver/FontBuilder.cpp b/sky/engine/core/css/resolver/FontBuilder.cpp
index 6dab4e6b41c7720033c3e7d0dbb59bc6c136ab19..d0ea86d139bbd24044a60aff582e192398b03dae 100644
--- a/sky/engine/core/css/resolver/FontBuilder.cpp
+++ b/sky/engine/core/css/resolver/FontBuilder.cpp
@@ -441,35 +441,9 @@ float FontBuilder::getComputedSizeFromSpecifiedSize(FontDescription& fontDescrip
static void getFontAndGlyphOrientation(const RenderStyle* style, FontOrientation& fontOrientation, NonCJKGlyphOrientation& glyphOrientation)
{
- if (style->isHorizontalWritingMode()) {
- fontOrientation = Horizontal;
- glyphOrientation = NonCJKGlyphOrientationVerticalRight;
- return;
- }
-
- switch (style->textOrientation()) {
- case TextOrientationVerticalRight:
- fontOrientation = Vertical;
- glyphOrientation = NonCJKGlyphOrientationVerticalRight;
- return;
- case TextOrientationUpright:
- fontOrientation = Vertical;
- glyphOrientation = NonCJKGlyphOrientationUpright;
- return;
- case TextOrientationSideways:
- fontOrientation = Horizontal;
- glyphOrientation = NonCJKGlyphOrientationVerticalRight;
- return;
- case TextOrientationSidewaysRight:
- fontOrientation = Horizontal;
- glyphOrientation = NonCJKGlyphOrientationVerticalRight;
- return;
- default:
- ASSERT_NOT_REACHED();
- fontOrientation = Horizontal;
- glyphOrientation = NonCJKGlyphOrientationVerticalRight;
- return;
- }
+ // FIXME(sky): Remove this function now that we don't have writing modes.
+ fontOrientation = Horizontal;
+ glyphOrientation = NonCJKGlyphOrientationVerticalRight;
}
void FontBuilder::checkForOrientationChange(RenderStyle* style)
« no previous file with comments | « sky/engine/core/css/CSSProperty.h ('k') | sky/engine/core/dom/Position.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698