OLD | NEW |
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 "config.h" | 5 #include "config.h" |
6 #include "core/layout/LayoutTestHelper.h" | 6 #include "core/layout/LayoutTestHelper.h" |
7 | 7 |
8 #include "core/loader/EmptyClients.h" | 8 #include "core/loader/EmptyClients.h" |
9 #include "platform/graphics/GraphicsLayer.h" | 9 #include "platform/graphics/GraphicsLayer.h" |
10 #include "platform/graphics/GraphicsLayerFactory.h" | 10 #include "platform/graphics/GraphicsLayerFactory.h" |
(...skipping 17 matching lines...) Expand all Loading... |
28 } | 28 } |
29 }; | 29 }; |
30 | 30 |
31 void RenderingTest::SetUp() | 31 void RenderingTest::SetUp() |
32 { | 32 { |
33 fillWithEmptyClients(m_pageClients); | 33 fillWithEmptyClients(m_pageClients); |
34 static FakeChromeClient* chromeClient = adoptPtr(new FakeChromeClient).leakP
tr(); | 34 static FakeChromeClient* chromeClient = adoptPtr(new FakeChromeClient).leakP
tr(); |
35 m_pageClients.chromeClient = chromeClient; | 35 m_pageClients.chromeClient = chromeClient; |
36 m_pageHolder = DummyPageHolder::create(IntSize(800, 600), &m_pageClients); | 36 m_pageHolder = DummyPageHolder::create(IntSize(800, 600), &m_pageClients); |
37 | 37 |
| 38 document().settings()->setRegionBasedColumnsEnabled(true); |
| 39 |
38 // This ensures that the minimal DOM tree gets attached | 40 // This ensures that the minimal DOM tree gets attached |
39 // correctly for tests that don't call setBodyInnerHTML. | 41 // correctly for tests that don't call setBodyInnerHTML. |
40 document().view()->updateLayoutAndStyleIfNeededRecursive(); | 42 document().view()->updateLayoutAndStyleIfNeededRecursive(); |
41 } | 43 } |
42 | 44 |
43 | 45 |
44 } // namespace blink | 46 } // namespace blink |
OLD | NEW |