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

Unified Diff: Source/core/page/Chrome.cpp

Issue 898593002: DevTools: use per-LocalFrame instrumenting agents instead of per-Page ones. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fixed assertion Created 5 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/inspector/PageRuntimeAgent.cpp ('k') | Source/core/page/Page.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/page/Chrome.cpp
diff --git a/Source/core/page/Chrome.cpp b/Source/core/page/Chrome.cpp
index 5aeec7f64a4badee2a1fc1d81aa2498cb793736b..70e759f0d873d9cb183887aff4b05a5ba5fbf5cc 100644
--- a/Source/core/page/Chrome.cpp
+++ b/Source/core/page/Chrome.cpp
@@ -196,7 +196,7 @@ bool Chrome::runBeforeUnloadConfirmPanel(const String& message, LocalFrame* fram
// otherwise cause the load to continue while we're in the middle of executing JavaScript.
ScopedPageLoadDeferrer deferrer;
- InspectorInstrumentationCookie cookie = InspectorInstrumentation::willRunJavaScriptDialog(m_page, message);
+ InspectorInstrumentationCookie cookie = InspectorInstrumentation::willRunJavaScriptDialog(frame, message);
bool ok = m_client->runBeforeUnloadConfirmPanel(message, frame);
InspectorInstrumentation::didRunJavaScriptDialog(cookie);
return ok;
@@ -219,7 +219,7 @@ void Chrome::runJavaScriptAlert(LocalFrame* frame, const String& message)
ASSERT(frame);
notifyPopupOpeningObservers();
- InspectorInstrumentationCookie cookie = InspectorInstrumentation::willRunJavaScriptDialog(m_page, message);
+ InspectorInstrumentationCookie cookie = InspectorInstrumentation::willRunJavaScriptDialog(frame, message);
m_client->runJavaScriptAlert(frame, message);
InspectorInstrumentation::didRunJavaScriptDialog(cookie);
}
@@ -236,7 +236,7 @@ bool Chrome::runJavaScriptConfirm(LocalFrame* frame, const String& message)
ASSERT(frame);
notifyPopupOpeningObservers();
- InspectorInstrumentationCookie cookie = InspectorInstrumentation::willRunJavaScriptDialog(m_page, message);
+ InspectorInstrumentationCookie cookie = InspectorInstrumentation::willRunJavaScriptDialog(frame, message);
bool ok = m_client->runJavaScriptConfirm(frame, message);
InspectorInstrumentation::didRunJavaScriptDialog(cookie);
return ok;
@@ -254,7 +254,7 @@ bool Chrome::runJavaScriptPrompt(LocalFrame* frame, const String& prompt, const
ASSERT(frame);
notifyPopupOpeningObservers();
- InspectorInstrumentationCookie cookie = InspectorInstrumentation::willRunJavaScriptDialog(m_page, prompt);
+ InspectorInstrumentationCookie cookie = InspectorInstrumentation::willRunJavaScriptDialog(frame, prompt);
bool ok = m_client->runJavaScriptPrompt(frame, prompt, defaultValue, result);
InspectorInstrumentation::didRunJavaScriptDialog(cookie);
« no previous file with comments | « Source/core/inspector/PageRuntimeAgent.cpp ('k') | Source/core/page/Page.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698