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

Unified Diff: Source/platform/text/TextRun.h

Issue 616703004: Merge 183104 "Force ComplexPath if any part of the node requires it" (Closed) Base URL: svn://svn.chromium.org/blink/branches/chromium/2171/
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 | « Source/platform/fonts/win/FontCacheSkiaWin.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/text/TextRun.h
===================================================================
--- Source/platform/text/TextRun.h (revision 183159)
+++ Source/platform/text/TextRun.h (working copy)
@@ -66,6 +66,7 @@
, m_direction(direction)
, m_directionalOverride(directionalOverride)
, m_characterScanForCodePath(characterScanForCodePath)
+ , m_useComplexCodePath(false)
, m_disableSpacing(false)
, m_tabSize(0)
, m_normalizeSpace(false)
@@ -85,6 +86,7 @@
, m_direction(direction)
, m_directionalOverride(directionalOverride)
, m_characterScanForCodePath(characterScanForCodePath)
+ , m_useComplexCodePath(false)
, m_disableSpacing(false)
, m_tabSize(0)
, m_normalizeSpace(false)
@@ -103,6 +105,7 @@
, m_direction(direction)
, m_directionalOverride(directionalOverride)
, m_characterScanForCodePath(characterScanForCodePath)
+ , m_useComplexCodePath(false)
, m_disableSpacing(false)
, m_tabSize(0)
, m_normalizeSpace(normalizeSpace)
@@ -130,6 +133,7 @@
, m_direction(direction)
, m_directionalOverride(directionalOverride)
, m_characterScanForCodePath(characterScanForCodePath)
+ , m_useComplexCodePath(false)
, m_disableSpacing(false)
, m_tabSize(0)
, m_normalizeSpace(normalizeSpace)
@@ -196,12 +200,14 @@
bool ltr() const { return m_direction == LTR; }
bool directionalOverride() const { return m_directionalOverride; }
bool characterScanForCodePath() const { return m_characterScanForCodePath; }
+ bool useComplexCodePath() const { return m_useComplexCodePath; }
bool spacingDisabled() const { return m_disableSpacing; }
void disableSpacing() { m_disableSpacing = true; }
void setDirection(TextDirection direction) { m_direction = direction; }
void setDirectionalOverride(bool override) { m_directionalOverride = override; }
void setCharacterScanForCodePath(bool scan) { m_characterScanForCodePath = scan; }
+ void setUseComplexCodePath(bool useComplex) { m_useComplexCodePath = useComplex; }
class RenderingContext : public RefCounted<RenderingContext> {
public:
@@ -236,6 +242,7 @@
unsigned m_direction : 1;
unsigned m_directionalOverride : 1; // Was this direction set by an override character.
unsigned m_characterScanForCodePath : 1;
+ unsigned m_useComplexCodePath : 1;
unsigned m_disableSpacing : 1;
unsigned m_tabSize;
bool m_normalizeSpace;
« no previous file with comments | « Source/platform/fonts/win/FontCacheSkiaWin.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698