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

Unified Diff: content/public/test/mock_render_thread.cc

Issue 117603002: Always create FrameTreeNodes and RenderFrameHosts for every frame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add checks for allocation and insertion. Created 7 years 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 side-by-side diff with in-line comments
Download patch
Index: content/public/test/mock_render_thread.cc
diff --git a/content/public/test/mock_render_thread.cc b/content/public/test/mock_render_thread.cc
index 54758eaa139ef52c1b5e5bc2a7246df9b3e85d64..bca80f21a02c7f517bb8232731730a97376c52c3 100644
--- a/content/public/test/mock_render_thread.cc
+++ b/content/public/test/mock_render_thread.cc
@@ -5,6 +5,7 @@
#include "content/public/test/mock_render_thread.h"
#include "base/message_loop/message_loop_proxy.h"
+#include "content/common/frame_messages.h"
#include "content/common/view_messages.h"
#include "content/public/renderer/render_process_observer.h"
#include "ipc/ipc_message_utils.h"
@@ -19,7 +20,8 @@ MockRenderThread::MockRenderThread()
surface_id_(0),
opener_id_(0),
new_window_routing_id_(0),
- new_window_main_frame_routing_id_(0) {
+ new_window_main_frame_routing_id_(0),
+ new_frame_routing_id_(0) {
}
MockRenderThread::~MockRenderThread() {
@@ -231,6 +233,15 @@ void MockRenderThread::OnCreateWindow(
*cloned_session_storage_namespace_id = 0;
}
+// The Frame expects to be returned a valid route_id different from its own.
+void MockRenderThread::OnCreateChildFrame(int new_frame_routing_id,
+ int64 parent_frame_id,
+ int64 frame_id,
+ const std::string& frame_name,
+ int* new_render_frame_id) {
+ *new_render_frame_id = new_frame_routing_id_;
+}
+
bool MockRenderThread::OnControlMessageReceived(const IPC::Message& msg) {
ObserverListBase<RenderProcessObserver>::Iterator it(observers_);
RenderProcessObserver* observer;
@@ -250,6 +261,7 @@ bool MockRenderThread::OnMessageReceived(const IPC::Message& msg) {
IPC_BEGIN_MESSAGE_MAP_EX(MockRenderThread, msg, msg_is_ok)
IPC_MESSAGE_HANDLER(ViewHostMsg_CreateWidget, OnCreateWidget)
IPC_MESSAGE_HANDLER(ViewHostMsg_CreateWindow, OnCreateWindow)
+ IPC_MESSAGE_HANDLER(FrameHostMsg_CreateChildFrame, OnCreateChildFrame)
IPC_MESSAGE_UNHANDLED(handled = false)
IPC_END_MESSAGE_MAP_EX()
return handled;

Powered by Google App Engine
This is Rietveld 408576698