Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1076)

Side by Side Diff: third_party/WebKit/Source/core/testing/DummyPageHolder.cpp

Issue 2730573003: Moved FrameHost::m_visualViewport to Page (Closed)
Patch Set: Fixed some compile errors on mac and android Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 if (settingOverrider) 76 if (settingOverrider)
77 (*settingOverrider)(settings); 77 (*settingOverrider)(settings);
78 78
79 m_localFrameClient = localFrameClient; 79 m_localFrameClient = localFrameClient;
80 if (!m_localFrameClient) 80 if (!m_localFrameClient)
81 m_localFrameClient = EmptyLocalFrameClient::create(); 81 m_localFrameClient = EmptyLocalFrameClient::create();
82 82
83 m_frame = LocalFrame::create(m_localFrameClient.get(), &m_page->frameHost(), 83 m_frame = LocalFrame::create(m_localFrameClient.get(), &m_page->frameHost(),
84 nullptr, interfaceProvider); 84 nullptr, interfaceProvider);
85 m_frame->setView(FrameView::create(*m_frame, initialViewSize)); 85 m_frame->setView(FrameView::create(*m_frame, initialViewSize));
86 m_frame->view()->page()->frameHost().visualViewport().setSize( 86 m_frame->view()->page()->visualViewport().setSize(initialViewSize);
87 initialViewSize);
88 m_frame->init(); 87 m_frame->init();
89 } 88 }
90 89
91 DummyPageHolder::~DummyPageHolder() { 90 DummyPageHolder::~DummyPageHolder() {
92 m_page->willBeDestroyed(); 91 m_page->willBeDestroyed();
93 m_page.clear(); 92 m_page.clear();
94 m_frame.clear(); 93 m_frame.clear();
95 } 94 }
96 95
97 Page& DummyPageHolder::page() const { 96 Page& DummyPageHolder::page() const {
98 return *m_page; 97 return *m_page;
99 } 98 }
100 99
101 LocalFrame& DummyPageHolder::frame() const { 100 LocalFrame& DummyPageHolder::frame() const {
102 DCHECK(m_frame); 101 DCHECK(m_frame);
103 return *m_frame; 102 return *m_frame;
104 } 103 }
105 104
106 FrameView& DummyPageHolder::frameView() const { 105 FrameView& DummyPageHolder::frameView() const {
107 return *m_frame->view(); 106 return *m_frame->view();
108 } 107 }
109 108
110 Document& DummyPageHolder::document() const { 109 Document& DummyPageHolder::document() const {
111 return *m_frame->domWindow()->document(); 110 return *m_frame->domWindow()->document();
112 } 111 }
113 112
114 } // namespace blink 113 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698