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

Side by Side Diff: Source/core/layout/MultiColumnFragmentainerGroupTest.cpp

Issue 1033943002: Rename LayoutStyle to papayawhip (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: ensureComputedStyle Created 5 years, 8 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "config.h" 5 #include "config.h"
6 6
7 #include "core/layout/MultiColumnFragmentainerGroup.h" 7 #include "core/layout/MultiColumnFragmentainerGroup.h"
8 8
9 #include "core/layout/LayoutMultiColumnFlowThread.h" 9 #include "core/layout/LayoutMultiColumnFlowThread.h"
10 #include "core/layout/LayoutMultiColumnSet.h" 10 #include "core/layout/LayoutMultiColumnSet.h"
(...skipping 18 matching lines...) Expand all
29 static int groupCount(const MultiColumnFragmentainerGroupList&); 29 static int groupCount(const MultiColumnFragmentainerGroupList&);
30 30
31 private: 31 private:
32 LayoutMultiColumnFlowThread* m_flowThread; 32 LayoutMultiColumnFlowThread* m_flowThread;
33 LayoutMultiColumnSet* m_columnSet; 33 LayoutMultiColumnSet* m_columnSet;
34 }; 34 };
35 35
36 void MultiColumnFragmentainerGroupTest::SetUp() 36 void MultiColumnFragmentainerGroupTest::SetUp()
37 { 37 {
38 RenderingTest::SetUp(); 38 RenderingTest::SetUp();
39 RefPtr<LayoutStyle> style = LayoutStyle::create(); 39 RefPtr<ComputedStyle> style = ComputedStyle::create();
40 m_flowThread = LayoutMultiColumnFlowThread::createAnonymous(document(), *sty le.get()); 40 m_flowThread = LayoutMultiColumnFlowThread::createAnonymous(document(), *sty le.get());
41 m_columnSet = LayoutMultiColumnSet::createAnonymous(*m_flowThread, *m_flowTh read->style()); 41 m_columnSet = LayoutMultiColumnSet::createAnonymous(*m_flowThread, *m_flowTh read->style());
42 } 42 }
43 43
44 void MultiColumnFragmentainerGroupTest::TearDown() 44 void MultiColumnFragmentainerGroupTest::TearDown()
45 { 45 {
46 m_columnSet->destroy(); 46 m_columnSet->destroy();
47 m_flowThread->destroy(); 47 m_flowThread->destroy();
48 RenderingTest::TearDown(); 48 RenderingTest::TearDown();
49 } 49 }
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 EXPECT_EQ(groupCount(groupList), 3); 98 EXPECT_EQ(groupCount(groupList), 3);
99 groupList.addExtraGroup(); 99 groupList.addExtraGroup();
100 EXPECT_EQ(groupCount(groupList), 4); 100 EXPECT_EQ(groupCount(groupList), 4);
101 groupList.deleteExtraGroups(); 101 groupList.deleteExtraGroups();
102 EXPECT_EQ(groupCount(groupList), 1); 102 EXPECT_EQ(groupCount(groupList), 1);
103 } 103 }
104 104
105 } // anonymous namespace 105 } // anonymous namespace
106 106
107 } // blink 107 } // blink
OLDNEW
« no previous file with comments | « Source/core/layout/MultiColumnFragmentainerGroup.cpp ('k') | Source/core/layout/PointerEventsHitRules.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698