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

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

Issue 1307013004: Propagate scrolling/marginwidth/marginheight property values to child frame. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: move setSandboxFlags call Created 5 years, 2 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 // 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/single_thread_task_runner.h" 7 #include "base/single_thread_task_runner.h"
8 #include "base/thread_task_runner_handle.h" 8 #include "base/thread_task_runner_handle.h"
9 #include "content/common/frame_messages.h" 9 #include "content/common/frame_messages.h"
10 #include "content/common/view_messages.h" 10 #include "content/common/view_messages.h"
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 const ViewHostMsg_CreateWindow_Params& params, 210 const ViewHostMsg_CreateWindow_Params& params,
211 int* route_id, 211 int* route_id,
212 int* main_frame_route_id, 212 int* main_frame_route_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 *cloned_session_storage_namespace_id = 0; 216 *cloned_session_storage_namespace_id = 0;
217 } 217 }
218 218
219 // The Frame expects to be returned a valid route_id different from its own. 219 // The Frame expects to be returned a valid route_id different from its own.
220 void MockRenderThread::OnCreateChildFrame(int new_frame_routing_id, 220 void MockRenderThread::OnCreateChildFrame(
221 blink::WebTreeScopeType scope, 221 int new_frame_routing_id,
222 const std::string& frame_name, 222 blink::WebTreeScopeType scope,
223 blink::WebSandboxFlags sandbox_flags, 223 const std::string& frame_name,
224 int* new_render_frame_id) { 224 blink::WebSandboxFlags sandbox_flags,
225 const blink::WebFrameOwnerProperties& frame_owner_properties,
226 int* new_render_frame_id) {
225 *new_render_frame_id = new_frame_routing_id_++; 227 *new_render_frame_id = new_frame_routing_id_++;
226 } 228 }
227 229
228 bool MockRenderThread::OnControlMessageReceived(const IPC::Message& msg) { 230 bool MockRenderThread::OnControlMessageReceived(const IPC::Message& msg) {
229 base::ObserverListBase<RenderProcessObserver>::Iterator it(&observers_); 231 base::ObserverListBase<RenderProcessObserver>::Iterator it(&observers_);
230 RenderProcessObserver* observer; 232 RenderProcessObserver* observer;
231 while ((observer = it.GetNext()) != NULL) { 233 while ((observer = it.GetNext()) != NULL) {
232 if (observer->OnControlMessageReceived(msg)) 234 if (observer->OnControlMessageReceived(msg))
233 return true; 235 return true;
234 } 236 }
(...skipping 18 matching lines...) Expand all
253 void MockRenderThread::OnDuplicateSection( 255 void MockRenderThread::OnDuplicateSection(
254 base::SharedMemoryHandle renderer_handle, 256 base::SharedMemoryHandle renderer_handle,
255 base::SharedMemoryHandle* browser_handle) { 257 base::SharedMemoryHandle* browser_handle) {
256 // We don't have to duplicate the input handles since RenderViewTest does not 258 // We don't have to duplicate the input handles since RenderViewTest does not
257 // separate a browser process from a renderer process. 259 // separate a browser process from a renderer process.
258 *browser_handle = renderer_handle; 260 *browser_handle = renderer_handle;
259 } 261 }
260 #endif // defined(OS_WIN) 262 #endif // defined(OS_WIN)
261 263
262 } // namespace content 264 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698