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

Unified Diff: Source/core/platform/graphics/Font.cpp

Issue 27030014: Remove Backslash-as-JPY hack (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: TextCodec/Encoding added Created 7 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 | « Source/core/platform/graphics/Font.h ('k') | Source/core/platform/text/transcoder/FontTranscoder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/platform/graphics/Font.cpp
diff --git a/Source/core/platform/graphics/Font.cpp b/Source/core/platform/graphics/Font.cpp
index 33b02dd5249c257f9098140a91dcfb829544acf9..53a43b1dd75813d4c132592d4659893bd005dddc 100644
--- a/Source/core/platform/graphics/Font.cpp
+++ b/Source/core/platform/graphics/Font.cpp
@@ -26,7 +26,6 @@
#include "core/platform/graphics/TextRun.h"
#include "core/platform/graphics/WidthIterator.h"
-#include "core/platform/text/transcoder/FontTranscoder.h"
#include "platform/geometry/FloatRect.h"
#include "wtf/MainThread.h"
#include "wtf/MathExtras.h"
@@ -93,7 +92,6 @@ Font::Font()
: m_letterSpacing(0)
, m_wordSpacing(0)
, m_isPlatformFont(false)
- , m_needsTranscoding(false)
, m_typesettingFeatures(0)
{
}
@@ -103,7 +101,6 @@ Font::Font(const FontDescription& fd, float letterSpacing, float wordSpacing)
, m_letterSpacing(letterSpacing)
, m_wordSpacing(wordSpacing)
, m_isPlatformFont(false)
- , m_needsTranscoding(fontTranscoder().needsTranscoding(fd))
, m_typesettingFeatures(computeTypesettingFeatures())
{
}
@@ -117,7 +114,6 @@ Font::Font(const FontPlatformData& fontData, bool isPrinterFont, FontSmoothingMo
{
m_fontDescription.setUsePrinterFont(isPrinterFont);
m_fontDescription.setFontSmoothing(fontSmoothingMode);
- m_needsTranscoding = fontTranscoder().needsTranscoding(fontDescription());
m_fontFallbackList->setPlatformFont(fontData);
}
@@ -127,7 +123,6 @@ Font::Font(const Font& other)
, m_letterSpacing(other.m_letterSpacing)
, m_wordSpacing(other.m_wordSpacing)
, m_isPlatformFont(other.m_isPlatformFont)
- , m_needsTranscoding(other.m_needsTranscoding)
, m_typesettingFeatures(computeTypesettingFeatures())
{
}
@@ -139,7 +134,6 @@ Font& Font::operator=(const Font& other)
m_letterSpacing = other.m_letterSpacing;
m_wordSpacing = other.m_wordSpacing;
m_isPlatformFont = other.m_isPlatformFont;
- m_needsTranscoding = other.m_needsTranscoding;
m_typesettingFeatures = other.m_typesettingFeatures;
return *this;
}
« no previous file with comments | « Source/core/platform/graphics/Font.h ('k') | Source/core/platform/text/transcoder/FontTranscoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698