OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2013, Google Inc. All rights reserved. | 2 * Copyright (c) 2013, Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 20 matching lines...) Expand all Loading... |
31 #include "core/testing/DummyPageHolder.h" | 31 #include "core/testing/DummyPageHolder.h" |
32 | 32 |
33 #include "core/frame/FrameHost.h" | 33 #include "core/frame/FrameHost.h" |
34 #include "core/frame/FrameView.h" | 34 #include "core/frame/FrameView.h" |
35 #include "core/frame/LocalDOMWindow.h" | 35 #include "core/frame/LocalDOMWindow.h" |
36 #include "core/frame/LocalFrame.h" | 36 #include "core/frame/LocalFrame.h" |
37 #include "core/frame/Settings.h" | 37 #include "core/frame/Settings.h" |
38 #include "core/frame/VisualViewport.h" | 38 #include "core/frame/VisualViewport.h" |
39 #include "core/loader/EmptyClients.h" | 39 #include "core/loader/EmptyClients.h" |
40 #include "wtf/Assertions.h" | 40 #include "wtf/Assertions.h" |
41 #include "wtf/PtrUtil.h" | |
42 #include <memory> | |
43 | 41 |
44 namespace blink { | 42 namespace blink { |
45 | 43 |
46 void RootLayerScrollsFrameSettingOverride(Settings& settings) | 44 void RootLayerScrollsFrameSettingOverride(Settings& settings) |
47 { | 45 { |
48 settings.setRootLayerScrolls(true); | 46 settings.setRootLayerScrolls(true); |
49 } | 47 } |
50 | 48 |
51 std::unique_ptr<DummyPageHolder> DummyPageHolder::create( | 49 PassOwnPtr<DummyPageHolder> DummyPageHolder::create( |
52 const IntSize& initialViewSize, | 50 const IntSize& initialViewSize, |
53 Page::PageClients* pageClients, | 51 Page::PageClients* pageClients, |
54 FrameLoaderClient* frameLoaderClient, | 52 FrameLoaderClient* frameLoaderClient, |
55 FrameSettingOverrideFunction settingOverrider) { | 53 FrameSettingOverrideFunction settingOverrider) { |
56 return wrapUnique(new DummyPageHolder(initialViewSize, pageClients, frameLoa
derClient, settingOverrider)); | 54 return adoptPtr(new DummyPageHolder(initialViewSize, pageClients, frameLoade
rClient, settingOverrider)); |
57 } | 55 } |
58 | 56 |
59 DummyPageHolder::DummyPageHolder( | 57 DummyPageHolder::DummyPageHolder( |
60 const IntSize& initialViewSize, | 58 const IntSize& initialViewSize, |
61 Page::PageClients* pageClientsArgument, | 59 Page::PageClients* pageClientsArgument, |
62 FrameLoaderClient* frameLoaderClient, | 60 FrameLoaderClient* frameLoaderClient, |
63 FrameSettingOverrideFunction settingOverrider) | 61 FrameSettingOverrideFunction settingOverrider) |
64 { | 62 { |
65 Page::PageClients pageClients; | 63 Page::PageClients pageClients; |
66 if (!pageClientsArgument) { | 64 if (!pageClientsArgument) { |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
111 { | 109 { |
112 return *m_frame->view(); | 110 return *m_frame->view(); |
113 } | 111 } |
114 | 112 |
115 Document& DummyPageHolder::document() const | 113 Document& DummyPageHolder::document() const |
116 { | 114 { |
117 return *m_frame->domWindow()->document(); | 115 return *m_frame->domWindow()->document(); |
118 } | 116 } |
119 | 117 |
120 } // namespace blink | 118 } // namespace blink |
OLD | NEW |