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

Unified Diff: third_party/WebKit/Source/core/layout/ng/ng_inline_node_test.cc

Issue 2614883007: Change computed style enums to be prefixed with 'k'. (Closed)
Patch Set: Rebase on ToT. Created 3 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/core/layout/ng/ng_inline_node_test.cc
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_inline_node_test.cc b/third_party/WebKit/Source/core/layout/ng/ng_inline_node_test.cc
index 5bebe45a54c46f77a46834b098b6bc5ad9312487..8769b77d581073678ad6ebd47b60dec6645f3b06 100644
--- a/third_party/WebKit/Source/core/layout/ng/ng_inline_node_test.cc
+++ b/third_party/WebKit/Source/core/layout/ng/ng_inline_node_test.cc
@@ -90,7 +90,7 @@ TEST_F(NGInlineNodeTest, SegmentASCII) {
node->SegmentText();
Vector<NGLayoutInlineItem>& items = node->Items();
ASSERT_EQ(1u, items.size());
- TEST_ITEM_OFFSET_DIR(items[0], 0u, 5u, TextDirection::Ltr);
+ TEST_ITEM_OFFSET_DIR(items[0], 0u, 5u, TextDirection::kLtr);
}
TEST_F(NGInlineNodeTest, SegmentHebrew) {
@@ -100,7 +100,7 @@ TEST_F(NGInlineNodeTest, SegmentHebrew) {
ASSERT_EQ(1u, node->Items().size());
Vector<NGLayoutInlineItem>& items = node->Items();
ASSERT_EQ(1u, items.size());
- TEST_ITEM_OFFSET_DIR(items[0], 0u, 5u, TextDirection::Rtl);
+ TEST_ITEM_OFFSET_DIR(items[0], 0u, 5u, TextDirection::kRtl);
}
TEST_F(NGInlineNodeTest, SegmentSplit1To2) {
@@ -110,8 +110,8 @@ TEST_F(NGInlineNodeTest, SegmentSplit1To2) {
ASSERT_EQ(2u, node->Items().size());
Vector<NGLayoutInlineItem>& items = node->Items();
ASSERT_EQ(2u, items.size());
- TEST_ITEM_OFFSET_DIR(items[0], 0u, 6u, TextDirection::Ltr);
- TEST_ITEM_OFFSET_DIR(items[1], 6u, 11u, TextDirection::Rtl);
+ TEST_ITEM_OFFSET_DIR(items[0], 0u, 6u, TextDirection::kLtr);
+ TEST_ITEM_OFFSET_DIR(items[1], 6u, 11u, TextDirection::kRtl);
}
TEST_F(NGInlineNodeTest, SegmentSplit3To4) {
@@ -122,10 +122,10 @@ TEST_F(NGInlineNodeTest, SegmentSplit3To4) {
node->SegmentText();
Vector<NGLayoutInlineItem>& items = node->Items();
ASSERT_EQ(4u, items.size());
- TEST_ITEM_OFFSET_DIR(items[0], 0u, 3u, TextDirection::Ltr);
- TEST_ITEM_OFFSET_DIR(items[1], 3u, 6u, TextDirection::Ltr);
- TEST_ITEM_OFFSET_DIR(items[2], 6u, 7u, TextDirection::Rtl);
- TEST_ITEM_OFFSET_DIR(items[3], 7u, 11u, TextDirection::Rtl);
+ TEST_ITEM_OFFSET_DIR(items[0], 0u, 3u, TextDirection::kLtr);
+ TEST_ITEM_OFFSET_DIR(items[1], 3u, 6u, TextDirection::kLtr);
+ TEST_ITEM_OFFSET_DIR(items[2], 6u, 7u, TextDirection::kRtl);
+ TEST_ITEM_OFFSET_DIR(items[3], 7u, 11u, TextDirection::kRtl);
}
TEST_F(NGInlineNodeTest, SegmentBidiOverride) {
@@ -137,10 +137,10 @@ TEST_F(NGInlineNodeTest, SegmentBidiOverride) {
node->SegmentText();
Vector<NGLayoutInlineItem>& items = node->Items();
ASSERT_EQ(4u, items.size());
- TEST_ITEM_OFFSET_DIR(items[0], 0u, 6u, TextDirection::Ltr);
- TEST_ITEM_OFFSET_DIR(items[1], 6u, 7u, TextDirection::Rtl);
- TEST_ITEM_OFFSET_DIR(items[2], 7u, 10u, TextDirection::Rtl);
- TEST_ITEM_OFFSET_DIR(items[3], 10u, 11u, TextDirection::Ltr);
+ TEST_ITEM_OFFSET_DIR(items[0], 0u, 6u, TextDirection::kLtr);
+ TEST_ITEM_OFFSET_DIR(items[1], 6u, 7u, TextDirection::kRtl);
+ TEST_ITEM_OFFSET_DIR(items[2], 7u, 10u, TextDirection::kRtl);
+ TEST_ITEM_OFFSET_DIR(items[3], 10u, 11u, TextDirection::kLtr);
}
static NGInlineNodeForTest* CreateBidiIsolateNode(const ComputedStyle* style) {
@@ -162,15 +162,15 @@ TEST_F(NGInlineNodeTest, SegmentBidiIsolate) {
NGInlineNodeForTest* node = CreateBidiIsolateNode(style_.get());
Vector<NGLayoutInlineItem>& items = node->Items();
ASSERT_EQ(9u, items.size());
- TEST_ITEM_OFFSET_DIR(items[0], 0u, 6u, TextDirection::Ltr);
- TEST_ITEM_OFFSET_DIR(items[1], 6u, 7u, TextDirection::Ltr);
- TEST_ITEM_OFFSET_DIR(items[2], 7u, 13u, TextDirection::Rtl);
- TEST_ITEM_OFFSET_DIR(items[3], 13u, 14u, TextDirection::Rtl);
- TEST_ITEM_OFFSET_DIR(items[4], 14u, 15u, TextDirection::Ltr);
- TEST_ITEM_OFFSET_DIR(items[5], 15u, 16u, TextDirection::Rtl);
- TEST_ITEM_OFFSET_DIR(items[6], 16u, 21u, TextDirection::Rtl);
- TEST_ITEM_OFFSET_DIR(items[7], 21u, 22u, TextDirection::Ltr);
- TEST_ITEM_OFFSET_DIR(items[8], 22u, 28u, TextDirection::Ltr);
+ TEST_ITEM_OFFSET_DIR(items[0], 0u, 6u, TextDirection::kLtr);
+ TEST_ITEM_OFFSET_DIR(items[1], 6u, 7u, TextDirection::kLtr);
+ TEST_ITEM_OFFSET_DIR(items[2], 7u, 13u, TextDirection::kRtl);
+ TEST_ITEM_OFFSET_DIR(items[3], 13u, 14u, TextDirection::kRtl);
+ TEST_ITEM_OFFSET_DIR(items[4], 14u, 15u, TextDirection::kLtr);
+ TEST_ITEM_OFFSET_DIR(items[5], 15u, 16u, TextDirection::kRtl);
+ TEST_ITEM_OFFSET_DIR(items[6], 16u, 21u, TextDirection::kRtl);
+ TEST_ITEM_OFFSET_DIR(items[7], 21u, 22u, TextDirection::kLtr);
+ TEST_ITEM_OFFSET_DIR(items[8], 22u, 28u, TextDirection::kLtr);
}
#define TEST_TEXT_FRAGMENT(fragment, node, start_index, end_index, dir) \
@@ -184,11 +184,11 @@ TEST_F(NGInlineNodeTest, CreateLineBidiIsolate) {
HeapVector<Member<const NGPhysicalTextFragment>> fragments;
CreateLine(node, &fragments);
ASSERT_EQ(5u, fragments.size());
- TEST_TEXT_FRAGMENT(fragments[0], node, 0u, 1u, TextDirection::Ltr);
- TEST_TEXT_FRAGMENT(fragments[1], node, 6u, 7u, TextDirection::Rtl);
- TEST_TEXT_FRAGMENT(fragments[2], node, 4u, 5u, TextDirection::Ltr);
- TEST_TEXT_FRAGMENT(fragments[3], node, 2u, 3u, TextDirection::Rtl);
- TEST_TEXT_FRAGMENT(fragments[4], node, 8u, 9u, TextDirection::Ltr);
+ TEST_TEXT_FRAGMENT(fragments[0], node, 0u, 1u, TextDirection::kLtr);
+ TEST_TEXT_FRAGMENT(fragments[1], node, 6u, 7u, TextDirection::kRtl);
+ TEST_TEXT_FRAGMENT(fragments[2], node, 4u, 5u, TextDirection::kLtr);
+ TEST_TEXT_FRAGMENT(fragments[3], node, 2u, 3u, TextDirection::kRtl);
+ TEST_TEXT_FRAGMENT(fragments[4], node, 8u, 9u, TextDirection::kLtr);
}
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698