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

Unified Diff: third_party/WebKit/Source/platform/fonts/shaping/RunSegmenter.h

Issue 1613903003: Integrate SymbolsIterator into RunSegmenter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebaseline likely due to different run segmentation Created 4 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
Index: third_party/WebKit/Source/platform/fonts/shaping/RunSegmenter.h
diff --git a/third_party/WebKit/Source/platform/fonts/shaping/RunSegmenter.h b/third_party/WebKit/Source/platform/fonts/shaping/RunSegmenter.h
index b323b97955a589613f2d1c33cd4094d30182de59..9596ae988af3870f2c57e6d4e46a4c6852d92831 100644
--- a/third_party/WebKit/Source/platform/fonts/shaping/RunSegmenter.h
+++ b/third_party/WebKit/Source/platform/fonts/shaping/RunSegmenter.h
@@ -10,6 +10,7 @@
#include "platform/fonts/OrientationIterator.h"
#include "platform/fonts/ScriptRunIterator.h"
#include "platform/fonts/SmallCapsIterator.h"
+#include "platform/fonts/SymbolsIterator.h"
#include "platform/fonts/UTF16TextIterator.h"
#include "wtf/Allocator.h"
#include "wtf/Noncopyable.h"
@@ -34,6 +35,7 @@ public:
UScriptCode script;
OrientationIterator::RenderOrientation renderOrientation;
SmallCapsIterator::SmallCapsBehavior smallCapsBehavior;
+ FontFallbackPriority fontFallbackPriority;
};
RunSegmenter(const UChar* buffer, unsigned bufferSize, FontOrientation, FontVariant);
@@ -45,16 +47,19 @@ private:
void consumeOrientationIteratorPastLastSplit();
void consumeSmallCapsIteratorPastLastSplit();
void consumeScriptIteratorPastLastSplit();
+ void consumeSymbolsIteratorPastLastSplit();
unsigned m_bufferSize;
RunSegmenterRange m_candidateRange;
OwnPtr<ScriptRunIterator> m_scriptRunIterator;
OwnPtr<OrientationIterator> m_orientationIterator;
OwnPtr<SmallCapsIterator> m_smallCapsIterator;
+ OwnPtr<SymbolsIterator> m_symbolsIterator;
unsigned m_lastSplit;
unsigned m_scriptRunIteratorPosition;
unsigned m_orientationIteratorPosition;
unsigned m_smallCapsIteratorPosition;
+ unsigned m_symbolsIteratorPosition;
bool m_atEnd;
};
« no previous file with comments | « third_party/WebKit/LayoutTests/TestExpectations ('k') | third_party/WebKit/Source/platform/fonts/shaping/RunSegmenter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698