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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutMultiColumnFlowThreadTest.cpp

Issue 1964203004: Helper method for non-direct beforeChild in LayoutBlock::addChild(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix broken test. Use RELEASE_ASSERT. Back out unnecessary change. Created 4 years, 7 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "core/layout/LayoutMultiColumnFlowThread.h" 5 #include "core/layout/LayoutMultiColumnFlowThread.h"
6 6
7 #include "core/layout/LayoutMultiColumnSet.h" 7 #include "core/layout/LayoutMultiColumnSet.h"
8 #include "core/layout/LayoutMultiColumnSpannerPlaceholder.h" 8 #include "core/layout/LayoutMultiColumnSpannerPlaceholder.h"
9 #include "core/layout/LayoutTestHelper.h" 9 #include "core/layout/LayoutTestHelper.h"
10 #include "testing/gtest/include/gtest/gtest.h" 10 #include "testing/gtest/include/gtest/gtest.h"
(...skipping 639 matching lines...) Expand 10 before | Expand all | Expand 10 after
650 { 650 {
651 setMulticolHTML("<div id='block'>text<div class='s'></div>text</div><div id= 'mc'><div id='insertBefore'>column content</div></div>"); 651 setMulticolHTML("<div id='block'>text<div class='s'></div>text</div><div id= 'mc'><div id='insertBefore'>column content</div></div>");
652 reparentLayoutObject("mc", "block", "insertBefore"); 652 reparentLayoutObject("mc", "block", "insertBefore");
653 EXPECT_EQ(columnSetSignature("mc"), "csc"); 653 EXPECT_EQ(columnSetSignature("mc"), "csc");
654 destroyLayoutObject("block"); 654 destroyLayoutObject("block");
655 EXPECT_EQ(columnSetSignature("mc"), "c"); 655 EXPECT_EQ(columnSetSignature("mc"), "c");
656 } 656 }
657 657
658 TEST_F(MultiColumnTreeModifyingTest, InsertSubtreeWithSpannerInsideContentAndRem ove) 658 TEST_F(MultiColumnTreeModifyingTest, InsertSubtreeWithSpannerInsideContentAndRem ove)
659 { 659 {
660 setMulticolHTML("<div id='block'>text<div class='s'></div>text</div><div id= 'mc'><div>outside<div id='insertBefore'>outside</div></div></div>"); 660 setMulticolHTML("<div id='block'>text<div class='s'></div>text</div><div id= 'mc'><div id='newParent'>outside<div id='insertBefore'>outside</div></div></div> ");
661 EXPECT_EQ(columnSetSignature("mc"), "c"); 661 EXPECT_EQ(columnSetSignature("mc"), "c");
662 reparentLayoutObject("mc", "block", "insertBefore"); 662 reparentLayoutObject("newParent", "block", "insertBefore");
663 EXPECT_EQ(columnSetSignature("mc"), "csc"); 663 EXPECT_EQ(columnSetSignature("mc"), "csc");
664 destroyLayoutObject("block"); 664 destroyLayoutObject("block");
665 EXPECT_EQ(columnSetSignature("mc"), "c"); 665 EXPECT_EQ(columnSetSignature("mc"), "c");
666 } 666 }
667 667
668 TEST_F(MultiColumnTreeModifyingTest, InsertSubtreeWithSpannerAfterSpannerAndRemo ve) 668 TEST_F(MultiColumnTreeModifyingTest, InsertSubtreeWithSpannerAfterSpannerAndRemo ve)
669 { 669 {
670 setMulticolHTML("<div id='block'>text<div class='s'></div>text</div><div id= 'mc'><div class='s'></div></div>"); 670 setMulticolHTML("<div id='block'>text<div class='s'></div>text</div><div id= 'mc'><div class='s'></div></div>");
671 EXPECT_EQ(columnSetSignature("mc"), "s"); 671 EXPECT_EQ(columnSetSignature("mc"), "s");
672 reparentLayoutObject("mc", "block"); 672 reparentLayoutObject("mc", "block");
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
785 { 785 {
786 setMulticolHTML("<div id='mc'>text<div id='spanner'><div class='s'></div></d iv>text</div>"); 786 setMulticolHTML("<div id='mc'>text<div id='spanner'><div class='s'></div></d iv>text</div>");
787 EXPECT_EQ(columnSetSignature("mc"), "csc"); 787 EXPECT_EQ(columnSetSignature("mc"), "csc");
788 destroyLayoutObject("spanner"); 788 destroyLayoutObject("spanner");
789 EXPECT_EQ(columnSetSignature("mc"), "c"); 789 EXPECT_EQ(columnSetSignature("mc"), "c");
790 } 790 }
791 791
792 } // anonymous namespace 792 } // anonymous namespace
793 793
794 } // namespace blink 794 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698