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

Unified Diff: third_party/WebKit/public/web/WebFrame.h

Issue 2923053002: Move MainWorldScriptContext accessor/method from WebFrame to WebLocalFrame. (Closed)
Patch Set: Rebasing... Created 3 years, 6 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 | « third_party/WebKit/Source/web/tests/WebFrameTest.cpp ('k') | third_party/WebKit/public/web/WebLocalFrame.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/public/web/WebFrame.h
diff --git a/third_party/WebKit/public/web/WebFrame.h b/third_party/WebKit/public/web/WebFrame.h
index 4b95fb4f6c355ba34ac596ee1e25bf048d75e311..204841a2590e031d78f127c2e2b8164db325188a 100644
--- a/third_party/WebKit/public/web/WebFrame.h
+++ b/third_party/WebKit/public/web/WebFrame.h
@@ -40,14 +40,7 @@
#include "public/platform/WebInsecureRequestPolicy.h"
#include "public/web/WebFrameLoadType.h"
#include "public/web/WebTreeScopeType.h"
-
-namespace v8 {
-class Context;
-class Function;
-class Value;
-template <class T>
-class Local;
-}
+#include "v8/include/v8.h"
namespace blink {
@@ -219,6 +212,9 @@ class BLINK_EXPORT WebFrame {
// Scripting ----------------------------------------------------------
+ // Returns the global proxy object.
+ virtual v8::Local<v8::Object> GlobalProxy() const = 0;
+
// Executes JavaScript in a new world associated with the web frame.
// The script gets its own global scope and its own prototypes for
// intrinsic JavaScript objects (String, Array, and so-on). It also
@@ -272,13 +268,6 @@ class BLINK_EXPORT WebFrame {
int argc,
v8::Local<v8::Value> argv[]) = 0;
- // Returns the V8 context for associated with the main world and this
- // frame. There can be many V8 contexts associated with this frame, one for
- // each isolated world and one for the main world. If you don't know what
- // the "main world" or an "isolated world" is, then you probably shouldn't
- // be calling this API.
- virtual v8::Local<v8::Context> MainWorldScriptContext() const = 0;
-
// Returns true if the WebFrame currently executing JavaScript has access
// to the given WebFrame, or false otherwise.
static bool ScriptCanAccess(WebFrame*);
« no previous file with comments | « third_party/WebKit/Source/web/tests/WebFrameTest.cpp ('k') | third_party/WebKit/public/web/WebLocalFrame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698