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

Side by Side Diff: sky/engine/core/rendering/RenderCombineText.cpp

Issue 684383002: Delete a ton more dead vertical writing mode code. (Closed) Base URL: git@github.com:domokit/mojo.git@writingmode1
Patch Set: Created 6 years, 1 month 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2011 Apple Inc. All rights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12 * Library General Public License for more details. 12 * Library General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU Library General Public License 14 * You should have received a copy of the GNU Library General Public License
15 * along with this library; see the file COPYING.LIB. If not, write to 15 * along with this library; see the file COPYING.LIB. If not, write to
16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
17 * Boston, MA 02110-1301, USA. 17 * Boston, MA 02110-1301, USA.
18 * 18 *
19 */ 19 */
20 20
21 #include "config.h" 21 #include "config.h"
22 #include "core/rendering/RenderCombineText.h" 22 #include "core/rendering/RenderCombineText.h"
23 23
24 #include "core/rendering/TextRunConstructor.h" 24 #include "core/rendering/TextRunConstructor.h"
25 25
26 namespace blink { 26 namespace blink {
27 27
28 const float textCombineMargin = 1.1f; // Allow em + 10% margin
29
30 RenderCombineText::RenderCombineText(Node* node, PassRefPtr<StringImpl> string) 28 RenderCombineText::RenderCombineText(Node* node, PassRefPtr<StringImpl> string)
31 : RenderText(node, string) 29 : RenderText(node, string)
32 , m_combinedTextWidth(0) 30 , m_combinedTextWidth(0)
33 , m_isCombined(false) 31 , m_isCombined(false)
34 , m_needsFontUpdate(false) 32 , m_needsFontUpdate(false)
35 { 33 {
36 } 34 }
37 35
38 void RenderCombineText::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle) 36 void RenderCombineText::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
39 { 37 {
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 87
90 void RenderCombineText::combineText() 88 void RenderCombineText::combineText()
91 { 89 {
92 if (!m_needsFontUpdate) 90 if (!m_needsFontUpdate)
93 return; 91 return;
94 92
95 m_isCombined = false; 93 m_isCombined = false;
96 m_needsFontUpdate = false; 94 m_needsFontUpdate = false;
97 95
98 // CSS3 spec says text-combine works only in vertical writing mode. 96 // CSS3 spec says text-combine works only in vertical writing mode.
99 if (style()->isHorizontalWritingMode()) 97 // FIXME(sky): Remove
100 return;
101
102 TextRun run = constructTextRun(this, originalFont(), this, style(), style()- >direction());
103 FontDescription description = originalFont().fontDescription();
104 float emWidth = description.computedSize() * textCombineMargin;
105 bool shouldUpdateFont = false;
106
107 description.setOrientation(Horizontal); // We are going to draw combined tex t horizontally.
108 m_combinedTextWidth = originalFont().width(run);
109 m_isCombined = m_combinedTextWidth <= emWidth;
110
111 FontSelector* fontSelector = style()->font().fontSelector();
112
113 if (m_isCombined)
114 shouldUpdateFont = style()->setFontDescription(description); // Need to change font orientation to horizontal.
115 else {
116 // Need to try compressed glyphs.
117 static const FontWidthVariant widthVariants[] = { HalfWidth, ThirdWidth, QuarterWidth };
118 for (size_t i = 0 ; i < WTF_ARRAY_LENGTH(widthVariants) ; ++i) {
119 description.setWidthVariant(widthVariants[i]);
120 Font compressedFont = Font(description);
121 compressedFont.update(fontSelector);
122 float runWidth = compressedFont.width(run);
123 if (runWidth <= emWidth) {
124 m_combinedTextWidth = runWidth;
125 m_isCombined = true;
126
127 // Replace my font with the new one.
128 shouldUpdateFont = style()->setFontDescription(description);
129 break;
130 }
131 }
132 }
133
134 if (!m_isCombined)
135 shouldUpdateFont = style()->setFontDescription(originalFont().fontDescri ption());
136
137 if (shouldUpdateFont)
138 style()->font().update(fontSelector);
139
140 if (m_isCombined) {
141 DEFINE_STATIC_LOCAL(String, objectReplacementCharacterString, (&objectRe placementCharacter, 1));
142 m_renderingText = text();
143 RenderText::setTextInternal(objectReplacementCharacterString.impl());
144 }
145 } 98 }
146 99
147 } // namespace blink 100 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/RenderBoxModelObject.cpp ('k') | sky/engine/core/rendering/RenderFlexibleBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698