projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 5.34.104.0
[platform/framework/web/crosswalk.git]
/
src
/
content
/
shell
/
renderer
/
webkit_test_runner.cc
diff --git
a/src/content/shell/renderer/webkit_test_runner.cc
b/src/content/shell/renderer/webkit_test_runner.cc
index
0484667
..
583f152
100644
(file)
--- 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()));
}
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() {
}
void WebKitTestRunner::closeDevTools() {
@@
-554,9
+554,10
@@
void WebKitTestRunner::captureHistoryForWindow(
void WebKitTestRunner::DidClearWindowObject(WebFrame* frame, int world_id) {
WebTestingSupport::injectInternalsObject(frame);
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);
GCController::Install(frame);
+ }
}
bool WebKitTestRunner::OnMessageReceived(const IPC::Message& message) {
}
bool WebKitTestRunner::OnMessageReceived(const IPC::Message& message) {