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

Side by Side Diff: content/public/test/mock_render_thread.cc

Issue 172063002: Unify frame IDs with RenderFrameHost routing IDs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix type Created 6 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « content/public/test/mock_render_thread.h ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include "content/public/test/mock_render_thread.h" 5 #include "content/public/test/mock_render_thread.h"
6 6
7 #include "base/message_loop/message_loop_proxy.h" 7 #include "base/message_loop/message_loop_proxy.h"
8 #include "content/common/frame_messages.h" 8 #include "content/common/frame_messages.h"
9 #include "content/common/view_messages.h" 9 #include "content/common/view_messages.h"
10 #include "content/public/renderer/render_process_observer.h" 10 #include "content/public/renderer/render_process_observer.h"
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 int* surface_id, 212 int* surface_id,
213 int64* cloned_session_storage_namespace_id) { 213 int64* cloned_session_storage_namespace_id) {
214 *route_id = new_window_routing_id_; 214 *route_id = new_window_routing_id_;
215 *main_frame_route_id = new_window_main_frame_routing_id_; 215 *main_frame_route_id = new_window_main_frame_routing_id_;
216 *surface_id = surface_id_; 216 *surface_id = surface_id_;
217 *cloned_session_storage_namespace_id = 0; 217 *cloned_session_storage_namespace_id = 0;
218 } 218 }
219 219
220 // The Frame expects to be returned a valid route_id different from its own. 220 // The Frame expects to be returned a valid route_id different from its own.
221 void MockRenderThread::OnCreateChildFrame(int new_frame_routing_id, 221 void MockRenderThread::OnCreateChildFrame(int new_frame_routing_id,
222 int64 parent_frame_id,
223 int64 frame_id,
224 const std::string& frame_name, 222 const std::string& frame_name,
225 int* new_render_frame_id) { 223 int* new_render_frame_id) {
226 *new_render_frame_id = new_frame_routing_id_; 224 *new_render_frame_id = new_frame_routing_id_;
227 } 225 }
228 226
229 bool MockRenderThread::OnControlMessageReceived(const IPC::Message& msg) { 227 bool MockRenderThread::OnControlMessageReceived(const IPC::Message& msg) {
230 ObserverListBase<RenderProcessObserver>::Iterator it(observers_); 228 ObserverListBase<RenderProcessObserver>::Iterator it(observers_);
231 RenderProcessObserver* observer; 229 RenderProcessObserver* observer;
232 while ((observer = it.GetNext()) != NULL) { 230 while ((observer = it.GetNext()) != NULL) {
233 if (observer->OnControlMessageReceived(msg)) 231 if (observer->OnControlMessageReceived(msg))
(...skipping 21 matching lines...) Expand all
255 void MockRenderThread::OnDuplicateSection( 253 void MockRenderThread::OnDuplicateSection(
256 base::SharedMemoryHandle renderer_handle, 254 base::SharedMemoryHandle renderer_handle,
257 base::SharedMemoryHandle* browser_handle) { 255 base::SharedMemoryHandle* browser_handle) {
258 // We don't have to duplicate the input handles since RenderViewTest does not 256 // We don't have to duplicate the input handles since RenderViewTest does not
259 // separate a browser process from a renderer process. 257 // separate a browser process from a renderer process.
260 *browser_handle = renderer_handle; 258 *browser_handle = renderer_handle;
261 } 259 }
262 #endif // defined(OS_WIN) 260 #endif // defined(OS_WIN)
263 261
264 } // namespace content 262 } // namespace content
OLDNEW
« no previous file with comments | « content/public/test/mock_render_thread.h ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698