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

Side by Side 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: All comments fixed 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 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
(...skipping 12 matching lines...) Expand all
23 23
24 #include "core/rendering/RenderText.h" 24 #include "core/rendering/RenderText.h"
25 #include "platform/fonts/Font.h" 25 #include "platform/fonts/Font.h"
26 26
27 namespace blink { 27 namespace blink {
28 28
29 class RenderCombineText final : public RenderText { 29 class RenderCombineText final : public RenderText {
30 public: 30 public:
31 RenderCombineText(Node*, PassRefPtr<StringImpl>); 31 RenderCombineText(Node*, PassRefPtr<StringImpl>);
32 32
33 void combineText(); 33 void updateFont();
34 void adjustTextOrigin(FloatPoint& textOrigin, const FloatRect& boxRect) cons t; 34 void adjustTextOrigin(FloatPoint& textOrigin, const FloatRect& boxRect) cons t;
35 bool isTransformNeeded() const { return m_scaleX < 1.0f; }
kouhei (in TOK) 2015/01/21 18:05:54 Not sure here, if m_scaleX > 1.0f, wouldn't it sti
36 void transform(GraphicsContext&, const FloatRect& boxRect) const;
35 void getStringToRender(int, StringView&, int& length) const; 37 void getStringToRender(int, StringView&, int& length) const;
36 bool isCombined() const { return m_isCombined; } 38 bool isCombined() const { return m_isCombined; }
37 float combinedTextWidth(const Font& font) const { return font.fontDescriptio n().computedSize(); } 39 float combinedTextWidth(const Font& font) const { return font.fontDescriptio n().computedSize(); }
38 const Font& originalFont() const { return parent()->style()->font(); } 40 const Font& originalFont() const { return parent()->style()->font(); }
39 41
40 private: 42 private:
41 virtual bool isCombineText() const override { return true; } 43 virtual bool isCombineText() const override { return true; }
42 virtual float width(unsigned from, unsigned length, const Font&, float xPosi tion, TextDirection, HashSet<const SimpleFontData*>* fallbackFonts = 0, GlyphOve rflow* = 0) const override; 44 virtual float width(unsigned from, unsigned length, const Font&, float xPosi tion, TextDirection, HashSet<const SimpleFontData*>* fallbackFonts = 0, GlyphOve rflow* = 0) const override;
43 virtual const char* renderName() const override { return "RenderCombineText" ; } 45 virtual const char* renderName() const override { return "RenderCombineText" ; }
44 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) ov erride; 46 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) ov erride;
45 virtual void setTextInternal(PassRefPtr<StringImpl>) override; 47 virtual void setTextInternal(PassRefPtr<StringImpl>) override;
48 void updateIsCombinedAndText();
46 49
47 float m_combinedTextWidth; 50 float m_combinedTextWidth;
51 float m_scaleX;
48 String m_renderingText; 52 String m_renderingText;
49 bool m_isCombined : 1; 53 bool m_isCombined : 1;
50 bool m_needsFontUpdate : 1; 54 bool m_needsFontUpdate : 1;
51 }; 55 };
52 56
53 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderCombineText, isCombineText()); 57 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderCombineText, isCombineText());
54 58
55 } // namespace blink 59 } // namespace blink
56 60
57 #endif // RenderCombineText_h 61 #endif // RenderCombineText_h
OLDNEW
« 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