Index: third_party/WebKit/Source/core/layout/ng/ng_layout_input_text.h |
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_layout_input_text.h b/third_party/WebKit/Source/core/layout/ng/ng_layout_input_text.h |
index 146b57ba648e2b765ce475d1b0680013bc726a1a..839c5fab7e0702e9492444b3ab1ebd813a1ab693 100644 |
--- a/third_party/WebKit/Source/core/layout/ng/ng_layout_input_text.h |
+++ b/third_party/WebKit/Source/core/layout/ng/ng_layout_input_text.h |
@@ -6,22 +6,31 @@ |
#define NGLayoutInputText_h |
#include "core/CoreExport.h" |
+#include "core/layout/ng/ng_direction.h" |
+#include "core/layout/ng/ng_writing_mode.h" |
#include "core/style/ComputedStyle.h" |
#include "platform/fonts/shaping/CachingWordShaper.h" |
#include "platform/fonts/shaping/ShapeResult.h" |
#include "platform/heap/Handle.h" |
#include "wtf/Vector.h" |
#include "wtf/text/WTFString.h" |
+#include <unicode/uscript.h> |
namespace blink { |
// Struct representing a single text node or styled inline element with text |
-// content. In this representation TextNodes are merged up into their parent |
-// inline element where possible. |
+// content segmented by style, text direction, writing mode and script (but not |
drott
2016/09/09 11:11:21
See below.
|
+// by font). |
+// In this representation TextNodes are merged up into their parent inline |
+// element where possible. |
struct NGLayoutInputTextItem { |
unsigned start_offset; |
unsigned end_offset; |
+ NGDirection direction; |
+ NGWritingMode writing_mode; |
drott
2016/09/09 11:11:21
Rather than NGWritingMode this probably should rep
|
+ UScriptCode script; |
RefPtr<ComputedStyle> style; |
+ RefPtr<ShapeResult> shape_result; |
}; |
// Class representing all text content for a given inline layout root in the |
@@ -53,7 +62,6 @@ class CORE_EXPORT NGLayoutInputText final |
// utf-8 or utf-16. Currently we always shape in utf16 and |
// upconvert latin-1. |
String text_; |
- RefPtr<ShapeResult> shape_result_; |
Vector<NGLayoutInputTextItem> items_; |
}; |