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

Unified Diff: third_party/WebKit/Source/core/layout/ng/ng_layout_input_text.h

Issue 2323283002: [LayoutNG] Update NGLayoutInputText (Closed)
Patch Set: Patch for landing Created 4 years, 3 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..3b645bb702c446e27c8ee106d39e151208db70c4 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,32 @@
#define NGLayoutInputText_h
#include "core/CoreExport.h"
+#include "core/layout/ng/ng_direction.h"
#include "core/style/ComputedStyle.h"
+#include "platform/fonts/FontFallbackPriority.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, sideways rotation, font fallback
+// priority (text, symbol, emoji, etc) and script (but not 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;
+ UScriptCode script;
+ FontFallbackPriority fallback_priority;
+ bool rotate_sideways;
RefPtr<ComputedStyle> style;
+ RefPtr<ShapeResult> shape_result;
};
// Class representing all text content for a given inline layout root in the
@@ -53,7 +63,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_;
};
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698