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

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

Issue 2721503002: Rename all uses of EmptyFrameLoaderClient with EmptyLocalFrameClient. (Closed)
Patch Set: Change V8 headers to user includes and introduce a space between system and user headers. Headers w… 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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 m_page = Page::create(pageClients); 71 m_page = Page::create(pageClients);
72 Settings& settings = m_page->settings(); 72 Settings& settings = m_page->settings();
73 // FIXME: http://crbug.com/363843. This needs to find a better way to 73 // FIXME: http://crbug.com/363843. This needs to find a better way to
74 // not create graphics layers. 74 // not create graphics layers.
75 settings.setAcceleratedCompositingEnabled(false); 75 settings.setAcceleratedCompositingEnabled(false);
76 if (settingOverrider) 76 if (settingOverrider)
77 (*settingOverrider)(settings); 77 (*settingOverrider)(settings);
78 78
79 m_frameLoaderClient = frameLoaderClient; 79 m_frameLoaderClient = frameLoaderClient;
80 if (!m_frameLoaderClient) 80 if (!m_frameLoaderClient)
81 m_frameLoaderClient = EmptyFrameLoaderClient::create(); 81 m_frameLoaderClient = EmptyLocalFrameClient::create();
82 82
83 m_frame = LocalFrame::create(m_frameLoaderClient.get(), &m_page->frameHost(), 83 m_frame = LocalFrame::create(m_frameLoaderClient.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()->frameHost().visualViewport().setSize(
87 initialViewSize); 87 initialViewSize);
88 m_frame->init(); 88 m_frame->init();
89 } 89 }
90 90
91 DummyPageHolder::~DummyPageHolder() { 91 DummyPageHolder::~DummyPageHolder() {
(...skipping 13 matching lines...) Expand all
105 105
106 FrameView& DummyPageHolder::frameView() const { 106 FrameView& DummyPageHolder::frameView() const {
107 return *m_frame->view(); 107 return *m_frame->view();
108 } 108 }
109 109
110 Document& DummyPageHolder::document() const { 110 Document& DummyPageHolder::document() const {
111 return *m_frame->domWindow()->document(); 111 return *m_frame->domWindow()->document();
112 } 112 }
113 113
114 } // namespace blink 114 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698