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

Unified Diff: webkit/glue/webframe_impl.cc

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/glue/webframe.h ('k') | webkit/port/bindings/v8/JSXPathNSResolver.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/webframe_impl.cc
diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc
index 466fe5f656e7ead97c7a18494da787c770b169d1..db177aa3e2649ed9c065a08d6f1940d7070f83f9 100644
--- a/webkit/glue/webframe_impl.cc
+++ b/webkit/glue/webframe_impl.cc
@@ -341,8 +341,19 @@ class ChromePrintContext : public WebCore::PrintContext {
int WebFrameImpl::live_object_count_ = 0;
// static
-WebFrame* WebFrame::RetrieveActiveFrame() {
- WebCore::Frame* frame = WebCore::ScriptController::retrieveActiveFrame();
+WebFrame* WebFrame::RetrieveFrameForEnteredContext() {
+ WebCore::Frame* frame =
+ WebCore::ScriptController::retrieveFrameForEnteredContext();
+ if (frame)
+ return WebFrameImpl::FromFrame(frame);
+ else
+ return NULL;
+}
+
+// static
+WebFrame* WebFrame::RetrieveFrameForCurrentContext() {
+ WebCore::Frame* frame =
+ WebCore::ScriptController::retrieveFrameForCurrentContext();
if (frame)
return WebFrameImpl::FromFrame(frame);
else
« no previous file with comments | « webkit/glue/webframe.h ('k') | webkit/port/bindings/v8/JSXPathNSResolver.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698