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> |
41 | 43 |
42 namespace blink { | 44 namespace blink { |
43 | 45 |
44 void RootLayerScrollsFrameSettingOverride(Settings& settings) | 46 void RootLayerScrollsFrameSettingOverride(Settings& settings) |
45 { | 47 { |
46 settings.setRootLayerScrolls(true); | 48 settings.setRootLayerScrolls(true); |
47 } | 49 } |
48 | 50 |
49 PassOwnPtr<DummyPageHolder> DummyPageHolder::create( | 51 std::unique_ptr<DummyPageHolder> DummyPageHolder::create( |
50 const IntSize& initialViewSize, | 52 const IntSize& initialViewSize, |
51 Page::PageClients* pageClients, | 53 Page::PageClients* pageClients, |
52 FrameLoaderClient* frameLoaderClient, | 54 FrameLoaderClient* frameLoaderClient, |
53 FrameSettingOverrideFunction settingOverrider) { | 55 FrameSettingOverrideFunction settingOverrider) { |
54 return adoptPtr(new DummyPageHolder(initialViewSize, pageClients, frameLoade
rClient, settingOverrider)); | 56 return wrapUnique(new DummyPageHolder(initialViewSize, pageClients, frameLoa
derClient, settingOverrider)); |
55 } | 57 } |
56 | 58 |
57 DummyPageHolder::DummyPageHolder( | 59 DummyPageHolder::DummyPageHolder( |
58 const IntSize& initialViewSize, | 60 const IntSize& initialViewSize, |
59 Page::PageClients* pageClientsArgument, | 61 Page::PageClients* pageClientsArgument, |
60 FrameLoaderClient* frameLoaderClient, | 62 FrameLoaderClient* frameLoaderClient, |
61 FrameSettingOverrideFunction settingOverrider) | 63 FrameSettingOverrideFunction settingOverrider) |
62 { | 64 { |
63 Page::PageClients pageClients; | 65 Page::PageClients pageClients; |
64 if (!pageClientsArgument) { | 66 if (!pageClientsArgument) { |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
109 { | 111 { |
110 return *m_frame->view(); | 112 return *m_frame->view(); |
111 } | 113 } |
112 | 114 |
113 Document& DummyPageHolder::document() const | 115 Document& DummyPageHolder::document() const |
114 { | 116 { |
115 return *m_frame->domWindow()->document(); | 117 return *m_frame->domWindow()->document(); |
116 } | 118 } |
117 | 119 |
118 } // namespace blink | 120 } // namespace blink |
OLD | NEW |