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

Unified Diff: webkit/port/bindings/v8/ScriptController.cpp

Issue 113085: Split V8Proxy::retrieveActiveFrame() into two methods. (Closed)
Patch Set: Darin feedback Created 11 years, 7 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 | « webkit/port/bindings/v8/ScriptController.h ('k') | webkit/port/bindings/v8/v8_custom.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/port/bindings/v8/ScriptController.cpp
diff --git a/webkit/port/bindings/v8/ScriptController.cpp b/webkit/port/bindings/v8/ScriptController.cpp
index bde1b3dba68ae3bf24544fc00f25bd1bd49959ac..1865cd5e55986e4434a4d9ea25521b5f5ad2ba58 100644
--- a/webkit/port/bindings/v8/ScriptController.cpp
+++ b/webkit/port/bindings/v8/ScriptController.cpp
@@ -80,9 +80,14 @@ void ScriptController::setFlags(const char* str, int length)
v8::V8::SetFlagsFromString(str, length);
}
-Frame* ScriptController::retrieveActiveFrame()
+Frame* ScriptController::retrieveFrameForEnteredContext()
{
- return V8Proxy::retrieveActiveFrame();
+ return V8Proxy::retrieveFrameForEnteredContext();
+}
+
+Frame* ScriptController::retrieveFrameForCurrentContext()
+{
+ return V8Proxy::retrieveFrameForCurrentContext();
}
bool ScriptController::isSafeScript(Frame* target)
@@ -155,7 +160,7 @@ void ScriptController::disconnectFrame()
bool ScriptController::processingUserGesture() const
{
- Frame* active_frame = V8Proxy::retrieveActiveFrame();
+ Frame* active_frame = V8Proxy::retrieveFrameForEnteredContext();
// No script is running, must be run by users.
if (!active_frame)
return true;
« no previous file with comments | « webkit/port/bindings/v8/ScriptController.h ('k') | webkit/port/bindings/v8/v8_custom.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698