Title: [131223] trunk/Source/WebKit/chromium
Revision
131223
Author
[email protected]
Date
2012-10-12 14:01:31 -0700 (Fri, 12 Oct 2012)

Log Message

[Chromium] Remove used frameForEnteredContext API
https://bugs.webkit.org/show_bug.cgi?id=99201

Reviewed by Eric Seidel.

No one in Chromium-land understands the difference between
frameForEnteredContext and frameForCurrentContext. Rather than give
folks a confusing choice, let's just expose the one we most often want
to use.

I've already removed all callers of frameForEnteredContext downstream.

* public/WebFrame.h:
* src/WebFrameImpl.cpp:
(WebKit):

Modified Paths

Diff

Modified: trunk/Source/WebKit/chromium/ChangeLog (131222 => 131223)


--- trunk/Source/WebKit/chromium/ChangeLog	2012-10-12 20:53:20 UTC (rev 131222)
+++ trunk/Source/WebKit/chromium/ChangeLog	2012-10-12 21:01:31 UTC (rev 131223)
@@ -1,3 +1,21 @@
+2012-10-12  Adam Barth  <[email protected]>
+
+        [Chromium] Remove used frameForEnteredContext API
+        https://bugs.webkit.org/show_bug.cgi?id=99201
+
+        Reviewed by Eric Seidel.
+
+        No one in Chromium-land understands the difference between
+        frameForEnteredContext and frameForCurrentContext. Rather than give
+        folks a confusing choice, let's just expose the one we most often want
+        to use.
+
+        I've already removed all callers of frameForEnteredContext downstream.
+
+        * public/WebFrame.h:
+        * src/WebFrameImpl.cpp:
+        (WebKit):
+
 2012-10-12  Joshua Bell  <[email protected]>
 
         [Chromium] IndexedDB: WebKit API plumbing to pass abort reason code/message to script

Modified: trunk/Source/WebKit/chromium/public/WebFrame.h (131222 => 131223)


--- trunk/Source/WebKit/chromium/public/WebFrame.h	2012-10-12 20:53:20 UTC (rev 131222)
+++ trunk/Source/WebKit/chromium/public/WebFrame.h	2012-10-12 21:01:31 UTC (rev 131223)
@@ -99,23 +99,9 @@
     // Returns the number of live WebFrame objects, used for leak checking.
     WEBKIT_EXPORT static int instanceCount();
 
-    // The two functions below retrieve the WebFrame instances relating the
-    // currently executing _javascript_.  Since _javascript_ can make function
-    // calls across frames, though, we need to be more precise.
-    //
-    // For example, imagine that a JS function in frame A calls a function
-    // in frame B, which calls native code, which wants to know what the
-    // 'active' frame is.
-    //
-    // The 'entered context' is the context where execution first entered
-    // the script engine; the context that is at the bottom of the JS
-    // function stack.  frameForEnteredContext() would return frame A in
-    // our example.
-    //
-    // The 'current context' is the context the JS engine is currently
-    // inside of; the context that is at the top of the JS function stack.
-    // frameForCurrentContext() would return frame B in our example.
-    WEBKIT_EXPORT static WebFrame* frameForEnteredContext();
+    // Returns the WebFrame associated with the current V8 context. This
+    // function can return 0 if the context is associated with a Document that
+    // is not currently being displayed in a Frame.
     WEBKIT_EXPORT static WebFrame* frameForCurrentContext();
 
 #if WEBKIT_USING_V8

Modified: trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp (131222 => 131223)


--- trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp	2012-10-12 20:53:20 UTC (rev 131222)
+++ trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp	2012-10-12 21:01:31 UTC (rev 131223)
@@ -555,14 +555,6 @@
     return frameCount;
 }
 
-WebFrame* WebFrame::frameForEnteredContext()
-{
-    v8::Handle<v8::Context> context = v8::Context::GetEntered();
-    if (context.IsEmpty())
-        return 0;
-    return frameForContext(context);
-}
-
 WebFrame* WebFrame::frameForCurrentContext()
 {
     v8::Handle<v8::Context> context = v8::Context::GetCurrent();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to