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 "core/dom/Document.h" | 5 #include "core/dom/Document.h" |
6 #include "core/frame/FrameView.h" | 6 #include "core/frame/FrameView.h" |
| 7 #include "core/frame/Settings.h" |
7 #include "core/html/HTMLElement.h" | 8 #include "core/html/HTMLElement.h" |
8 #include "core/testing/DummyPageHolder.h" | 9 #include "core/testing/DummyPageHolder.h" |
9 #include "wtf/OwnPtr.h" | 10 #include "wtf/OwnPtr.h" |
10 #include <gtest/gtest.h> | 11 #include <gtest/gtest.h> |
11 | 12 |
12 namespace blink { | 13 namespace blink { |
13 | 14 |
14 class RenderingTest : public testing::Test { | 15 class RenderingTest : public testing::Test { |
15 protected: | 16 protected: |
16 virtual void SetUp() | 17 virtual void SetUp() |
17 { | 18 { |
18 m_pageHolder = DummyPageHolder::create(IntSize(800, 600)); | 19 m_pageHolder = DummyPageHolder::create(IntSize(800, 600)); |
19 | 20 |
| 21 document().settings()->setRegionBasedColumnsEnabled(true); |
| 22 |
20 // This ensures that the minimal DOM tree gets attached | 23 // This ensures that the minimal DOM tree gets attached |
21 // correctly for tests that don't call setBodyInnerHTML. | 24 // correctly for tests that don't call setBodyInnerHTML. |
22 document().view()->updateLayoutAndStyleIfNeededRecursive(); | 25 document().view()->updateLayoutAndStyleIfNeededRecursive(); |
23 } | 26 } |
24 | 27 |
25 Document& document() const { return m_pageHolder->document(); } | 28 Document& document() const { return m_pageHolder->document(); } |
26 | 29 |
27 void setBodyInnerHTML(const char* htmlContent) | 30 void setBodyInnerHTML(const String& htmlContent) |
28 { | 31 { |
29 document().body()->setInnerHTML(String::fromUTF8(htmlContent), ASSERT_NO
_EXCEPTION); | 32 document().body()->setInnerHTML(htmlContent, ASSERT_NO_EXCEPTION); |
30 document().view()->updateLayoutAndStyleIfNeededRecursive(); | 33 document().view()->updateLayoutAndStyleIfNeededRecursive(); |
31 } | 34 } |
32 | 35 |
33 private: | 36 private: |
34 OwnPtr<DummyPageHolder> m_pageHolder; | 37 OwnPtr<DummyPageHolder> m_pageHolder; |
35 }; | 38 }; |
36 | 39 |
37 } // namespace blink | 40 } // namespace blink |
OLD | NEW |