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

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

Issue 2744213004: Re-enable TextFloatsAroundFloatsBefore and check left offsets only (Closed)
Patch Set: Created 3 years, 9 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_text_layout_algorithm_test.cc
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_text_layout_algorithm_test.cc b/third_party/WebKit/Source/core/layout/ng/ng_text_layout_algorithm_test.cc
index cfabfcc8f2c4bc1d16a60dad88c6d0eb8dd2f3b5..6b10956bd53c8a565d43ff5ab6be84127f5d48a0 100644
--- a/third_party/WebKit/Source/core/layout/ng/ng_text_layout_algorithm_test.cc
+++ b/third_party/WebKit/Source/core/layout/ng/ng_text_layout_algorithm_test.cc
@@ -18,13 +18,7 @@ class NGTextLayoutAlgorithmTest : public NGBaseLayoutAlgorithmTest {};
// Verifies that text can flow correctly around floats that were positioned
// before the inline block.
-// Failing on Android: crbug.com/700868
-#if OS(ANDROID)
-#define MAYBE_TextFloatsAroundFloatsBefore DISABLED_TextFloatsAroundFloatsBefore
-#else
-#define MAYBE_TextFloatsAroundFloatsBefore TextFloatsAroundFloatsBefore
-#endif
-TEST_F(NGTextLayoutAlgorithmTest, MAYBE_TextFloatsAroundFloatsBefore) {
+TEST_F(NGTextLayoutAlgorithmTest, TextFloatsAroundFloatsBefore) {
setBodyInnerHTML(R"HTML(
<!DOCTYPE html>
<style>
@@ -81,7 +75,7 @@ TEST_F(NGTextLayoutAlgorithmTest, MAYBE_TextFloatsAroundFloatsBefore) {
EXPECT_EQ("The quick ", text_node->Text(text_fragment1->StartOffset(),
text_fragment1->EndOffset()));
InlineTextBox* inline_text_box1 = layout_text->firstTextBox();
- EXPECT_EQ(LayoutPoint(40, 0), inline_text_box1->frameRect().location());
+ EXPECT_EQ(LayoutUnit(40), inline_text_box1->x());
auto* text_fragment2 =
toNGPhysicalTextFragment(text_fragments_wrapper->Children()[1].get());
@@ -91,7 +85,7 @@ TEST_F(NGTextLayoutAlgorithmTest, MAYBE_TextFloatsAroundFloatsBefore) {
text_node->Text(text_fragment2->StartOffset(),
text_fragment2->EndOffset()));
InlineTextBox* inline_text_box2 = inline_text_box1->nextTextBox();
- EXPECT_EQ(LayoutPoint(30, 22), inline_text_box2->frameRect().location());
+ EXPECT_EQ(LayoutUnit(30), inline_text_box2->x());
auto* text_fragment3 =
toNGPhysicalTextFragment(text_fragments_wrapper->Children()[2].get());
@@ -100,7 +94,7 @@ TEST_F(NGTextLayoutAlgorithmTest, MAYBE_TextFloatsAroundFloatsBefore) {
text_node->Text(text_fragment3->StartOffset(),
text_fragment3->EndOffset()));
InlineTextBox* inline_text_box3 = inline_text_box2->nextTextBox();
- EXPECT_EQ(LayoutPoint(0, 44), inline_text_box3->frameRect().location());
+ EXPECT_EQ(LayoutUnit(), inline_text_box3->x());
}
} // namespace
« 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