| 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 #ifndef LayoutTestHelper_h | 5 #ifndef LayoutTestHelper_h |
| 6 #define LayoutTestHelper_h | 6 #define LayoutTestHelper_h |
| 7 | 7 |
| 8 #include "core/dom/Document.h" | 8 #include "core/dom/Document.h" |
| 9 #include "core/frame/FrameHost.h" | 9 #include "core/frame/FrameHost.h" |
| 10 #include "core/frame/FrameView.h" | 10 #include "core/frame/FrameView.h" |
| 11 #include "core/frame/Settings.h" | 11 #include "core/frame/Settings.h" |
| 12 #include "core/html/HTMLElement.h" | 12 #include "core/html/HTMLElement.h" |
| 13 #include "core/loader/EmptyClients.h" | 13 #include "core/loader/EmptyClients.h" |
| 14 #include "core/testing/DummyPageHolder.h" | 14 #include "core/testing/DummyPageHolder.h" |
| 15 #include "wtf/Allocator.h" | 15 #include "wtf/Allocator.h" |
| 16 #include "wtf/OwnPtr.h" | |
| 17 #include <gtest/gtest.h> | 16 #include <gtest/gtest.h> |
| 17 #include <memory> |
| 18 | 18 |
| 19 namespace blink { | 19 namespace blink { |
| 20 | 20 |
| 21 class RenderingTest : public testing::Test { | 21 class RenderingTest : public testing::Test { |
| 22 USING_FAST_MALLOC(RenderingTest); | 22 USING_FAST_MALLOC(RenderingTest); |
| 23 public: | 23 public: |
| 24 virtual FrameSettingOverrideFunction settingOverrider() const { return nullp
tr; } | 24 virtual FrameSettingOverrideFunction settingOverrider() const { return nullp
tr; } |
| 25 | 25 |
| 26 RenderingTest(FrameLoaderClient* = nullptr); | 26 RenderingTest(FrameLoaderClient* = nullptr); |
| 27 | 27 |
| (...skipping 25 matching lines...) Expand all Loading... |
| 53 LayoutObject* getLayoutObjectByElementId(const char* id) const | 53 LayoutObject* getLayoutObjectByElementId(const char* id) const |
| 54 { | 54 { |
| 55 Node* node = document().getElementById(id); | 55 Node* node = document().getElementById(id); |
| 56 return node ? node->layoutObject() : nullptr; | 56 return node ? node->layoutObject() : nullptr; |
| 57 } | 57 } |
| 58 | 58 |
| 59 private: | 59 private: |
| 60 Persistent<LocalFrame> m_subframe; | 60 Persistent<LocalFrame> m_subframe; |
| 61 Persistent<FrameLoaderClient> m_frameLoaderClient; | 61 Persistent<FrameLoaderClient> m_frameLoaderClient; |
| 62 Persistent<FrameLoaderClient> m_childFrameLoaderClient; | 62 Persistent<FrameLoaderClient> m_childFrameLoaderClient; |
| 63 OwnPtr<DummyPageHolder> m_pageHolder; | 63 std::unique_ptr<DummyPageHolder> m_pageHolder; |
| 64 }; | 64 }; |
| 65 | 65 |
| 66 class SingleChildFrameLoaderClient final : public EmptyFrameLoaderClient { | 66 class SingleChildFrameLoaderClient final : public EmptyFrameLoaderClient { |
| 67 public: | 67 public: |
| 68 static SingleChildFrameLoaderClient* create() { return new SingleChildFrameL
oaderClient; } | 68 static SingleChildFrameLoaderClient* create() { return new SingleChildFrameL
oaderClient; } |
| 69 | 69 |
| 70 DEFINE_INLINE_VIRTUAL_TRACE() | 70 DEFINE_INLINE_VIRTUAL_TRACE() |
| 71 { | 71 { |
| 72 visitor->trace(m_child); | 72 visitor->trace(m_child); |
| 73 EmptyFrameLoaderClient::trace(visitor); | 73 EmptyFrameLoaderClient::trace(visitor); |
| (...skipping 27 matching lines...) Expand all Loading... |
| 101 | 101 |
| 102 private: | 102 private: |
| 103 explicit FrameLoaderClientWithParent(Frame* parent) : m_parent(parent) { } | 103 explicit FrameLoaderClientWithParent(Frame* parent) : m_parent(parent) { } |
| 104 | 104 |
| 105 Member<Frame> m_parent; | 105 Member<Frame> m_parent; |
| 106 }; | 106 }; |
| 107 | 107 |
| 108 } // namespace blink | 108 } // namespace blink |
| 109 | 109 |
| 110 #endif // LayoutTestHelper_h | 110 #endif // LayoutTestHelper_h |
| OLD | NEW |