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

Unified Diff: third_party/WebKit/Source/core/frame/DOMWindow.cpp

Issue 2643613003: Revert "binding: Makes window/frames/self attributes return itself." (Closed)
Patch Set: whack-a-mole Created 3 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 | « third_party/WebKit/Source/core/frame/DOMWindow.h ('k') | third_party/WebKit/Source/core/frame/Window.idl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/frame/DOMWindow.cpp
diff --git a/third_party/WebKit/Source/core/frame/DOMWindow.cpp b/third_party/WebKit/Source/core/frame/DOMWindow.cpp
index 2e3704b1996e71a73ee3de270a67bf39c85bb79c..3e4723950ddf5d5b5f8e47f46bf2669a907f6d40 100644
--- a/third_party/WebKit/Source/core/frame/DOMWindow.cpp
+++ b/third_party/WebKit/Source/core/frame/DOMWindow.cpp
@@ -81,8 +81,11 @@ unsigned DOMWindow::length() const {
return frame() ? frame()->tree().scopedChildCount() : 0;
}
-v8::Local<v8::Object> DOMWindow::self(ScriptState* scriptState) const {
- return scriptState->context()->Global();
+DOMWindow* DOMWindow::self() const {
+ if (!frame())
+ return nullptr;
+
+ return frame()->domWindow();
}
DOMWindow* DOMWindow::opener() const {
« no previous file with comments | « third_party/WebKit/Source/core/frame/DOMWindow.h ('k') | third_party/WebKit/Source/core/frame/Window.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698