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

Unified Diff: Source/core/rendering/RenderCombineText.h

Issue 799123003: text-combine should scale rather than fall back to none when wide (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Remove one expected.txt and rebase-update (there was a directory rename) Created 5 years, 11 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 | « Source/core/rendering/RenderBlockLineLayout.cpp ('k') | Source/core/rendering/RenderCombineText.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderCombineText.h
diff --git a/Source/core/rendering/RenderCombineText.h b/Source/core/rendering/RenderCombineText.h
index c1fc771a767cfc4b3ad552ef8369b86b775a56e5..b9a1b9a37b97ec79418a16361067e3e7c1f6b5da 100644
--- a/Source/core/rendering/RenderCombineText.h
+++ b/Source/core/rendering/RenderCombineText.h
@@ -30,9 +30,10 @@ class RenderCombineText final : public RenderText {
public:
RenderCombineText(Node*, PassRefPtr<StringImpl>);
- void combineText();
+ void updateFont();
void adjustTextOrigin(FloatPoint& textOrigin, const FloatRect& boxRect) const;
- void getStringToRender(int, StringView&, int& length) const;
+ bool isTransformNeeded() const { return m_scaleX < 1.0f; }
+ void transform(GraphicsContext&, const FloatRect& boxRect) const;
bool isCombined() const { return m_isCombined; }
float combinedTextWidth(const Font& font) const { return font.fontDescription().computedSize(); }
const Font& originalFont() const { return parent()->style()->font(); }
@@ -43,9 +44,10 @@ private:
virtual const char* renderName() const override { return "RenderCombineText"; }
virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
virtual void setTextInternal(PassRefPtr<StringImpl>) override;
+ void updateIsCombined();
float m_combinedTextWidth;
- String m_renderingText;
+ float m_scaleX;
bool m_isCombined : 1;
bool m_needsFontUpdate : 1;
};
« no previous file with comments | « Source/core/rendering/RenderBlockLineLayout.cpp ('k') | Source/core/rendering/RenderCombineText.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698