X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fcontent%2Fshell%2Frenderer%2Fwebkit_test_runner.cc;h=583f152e9027e31ebd33000969140071db43070a;hb=ff3e2503a20db9193d323c1d19c38c68004dec4a;hp=0484667d3fbbe30f638f30d29b5c0f2d7b5e7ef6;hpb=7338fba38ba696536d1cc9d389afd716a6ab2fe6;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/content/shell/renderer/webkit_test_runner.cc b/src/content/shell/renderer/webkit_test_runner.cc index 0484667..583f152 100644 --- a/src/content/shell/renderer/webkit_test_runner.cc +++ b/src/content/shell/renderer/webkit_test_runner.cc @@ -387,8 +387,8 @@ void WebKitTestRunner::clearDevToolsLocalStorage() { Send(new ShellViewHostMsg_ClearDevToolsLocalStorage(routing_id())); } -void WebKitTestRunner::showDevTools() { - Send(new ShellViewHostMsg_ShowDevTools(routing_id())); +void WebKitTestRunner::showDevTools(const std::string& settings) { + Send(new ShellViewHostMsg_ShowDevTools(routing_id(), settings)); } void WebKitTestRunner::closeDevTools() { @@ -554,9 +554,10 @@ void WebKitTestRunner::captureHistoryForWindow( void WebKitTestRunner::DidClearWindowObject(WebFrame* frame, int world_id) { WebTestingSupport::injectInternalsObject(frame); - ShellRenderProcessObserver::GetInstance()->test_interfaces()->bindTo(frame); - if (world_id == 0) + if (world_id == 0) { + ShellRenderProcessObserver::GetInstance()->test_interfaces()->bindTo(frame); GCController::Install(frame); + } } bool WebKitTestRunner::OnMessageReceived(const IPC::Message& message) {