Changeset 83366 in webkit

Timestamp:

Apr 8, 2011 5:54:36 PM (13 years ago)

Author:

aa@chromium.org

Message:

Reviewed by Dmitry Titov.

Re-land ​http://trac.webkit.org/changeset/83007. This works
without changes after ​https://bugs.webkit.org/show_bug.cgi?id=58110.

​https://bugs.webkit.org/show_bug.cgi?id=58096

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• WebKit.gyp (modified) (1 diff)
• WebKit.gypi (modified) (1 diff)
• public/WebFrame.h (modified) (1 diff)
• src/WebFrameImpl.cpp (modified) (1 diff)
• tests/WebFrameTest.cpp (modified) (7 diffs)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-04-08  Aaron Boodman  <aa@chromium.org>
+
+        Reviewed by Dmitry Titov.
+
+        Re-land http://trac.webkit.org/changeset/83007. This works
+        without changes after https://bugs.webkit.org/show_bug.cgi?id=58110.
+
+        https://bugs.webkit.org/show_bug.cgi?id=58096
+
+        * WebKit.gyp:
+        * WebKit.gypi:
+        * public/WebFrame.h:
+        * src/WebFrameImpl.cpp:
+        (WebKit::WebFrame::frameForContext):
+        * tests/WebFrameTest.cpp:
+        (WebKit::WebFrameTest::WebFrameTest):
+        (WebKit::WebFrameTest::registerMockedURLLoad):
+        (WebKit::WebFrameTest::loadFrame):
+        (WebKit::TEST_F):
+
 2011-04-08  Daniel Cheng  <dcheng@chromium.org>
 

trunk/Source/WebKit/chromium/WebKit.gyp

@@ -825 +825 @@
                         ['OS=="win"', {
                             'sources': [
-                                # FIXME: Port PopupMenuTest and WebFrameTest to Linux and Mac.
+                                # FIXME: Port PopupMenuTest to Linux and Mac.
                                 'tests/PopupMenuTest.cpp',
                                 'tests/TransparencyWinTest.cpp',
                                 'tests/UniscribeHelperTest.cpp',
-                                'tests/WebFrameTest.cpp',
                                 'tests/WebPageSerializerTest.cpp',
                             ],

trunk/Source/WebKit/chromium/WebKit.gypi

@@ -67 +67 @@
             'tests/TreeTestHelpers.cpp',
             'tests/TreeTestHelpers.h',
+            'tests/WebFrameTest.cpp',
         ],
     },

trunk/Source/WebKit/chromium/public/WebFrame.h

@@ -99 +99 @@
     WEBKIT_API static WebFrame* frameForCurrentContext();
 
+#if WEBKIT_USING_V8
+    // Returns the frame corresponding to the given context. This can return 0
+    // if the context is detached from the frame, or if the context doesn't
+    // correspond to a frame (e.g., workers).
+    WEBKIT_API static WebFrame* frameForContext(v8::Handle<v8::Context>);
+#endif
+
     // Returns the frame inside a given frame or iframe element. Returns 0 if
     // the given element is not a frame, iframe or if the frame is empty.

trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp

@@ -477 +477 @@
 }
 
+#if WEBKIT_USING_V8
+WebFrame* WebFrame::frameForContext(v8::Handle<v8::Context> context)
+{
+    return WebFrameImpl::fromFrame(V8Proxy::retrieveFrame(context));
+}
+#endif
+
 WebFrame* WebFrame::fromFrameOwnerElement(const WebElement& element)
 {

trunk/Source/WebKit/chromium/tests/WebFrameTest.cpp

@@ -36 +36 @@
 #include "WebFrame.h"
 #include "WebFrameClient.h"
+#include "WebSettings.h"
 #include "WebString.h"
 #include "WebURL.h"
@@ -41 +42 @@
 #include "WebURLResponse.h"
 #include "WebView.h"
+#include "v8.h"
 
 using namespace WebKit;
@@ -48 +50 @@
 class WebFrameTest : public testing::Test {
 public:
-    WebFrameTest() {}
+    WebFrameTest()
+        : baseURL("http://www.test.com/")
+    {
+    }
 
     virtual void TearDown()
@@ -55 +60 @@
     }
 
-    void registerMockedURLLoad(const WebURL& url, const WebURLResponse& response, const WebString& fileName)
+    void registerMockedURLLoad(const std::string& fileName)
     {
+        WebURLResponse response;
+        response.initialize();
+        response.setMIMEType("text/html");
+
         std::string filePath = webkit_support::GetWebKitRootDir().utf8();
-        filePath.append("/Source/WebKit/chromium/tests/data/");
-        filePath.append(fileName.utf8());
-        webkit_support::RegisterMockedURL(url, response, WebString::fromUTF8(filePath));
+        filePath += "/Source/WebKit/chromium/tests/data/";
+        filePath += fileName;
+
+        webkit_support::RegisterMockedURL(WebURL(GURL(baseURL + fileName)), response, WebString::fromUTF8(filePath));
     }
 
@@ -67 +77 @@
         webkit_support::ServeAsynchronousMockedRequests();
     }
+
+    void loadFrame(WebFrame* frame, const std::string& fileName)
+    {
+        WebURLRequest urlRequest;
+        urlRequest.initialize();
+        urlRequest.setURL(WebURL(GURL(baseURL + fileName)));
+        frame->loadRequest(urlRequest);
+    }
+
+protected:
+    std::string baseURL;
 };
 
@@ -74 +95 @@
 TEST_F(WebFrameTest, ContentText)
 {
-    // Register our resources.
-    WebURLResponse response;
-    response.initialize();
-    response.setMIMEType("text/html");
-    std::string rootURL = "http://www.test.com/";
-    const char* files[] = { "iframes_test.html", "visible_iframe.html",
-                            "invisible_iframe.html", "zero_sized_iframe.html" };
-    for (int i = 0; i < (sizeof(files) / sizeof(char*)); ++i) {
-        WebURL webURL = GURL(rootURL + files[i]);
-        registerMockedURLLoad(webURL, response, WebString::fromUTF8(files[i]));
-    }
+    registerMockedURLLoad("iframes_test.html");
+    registerMockedURLLoad("visible_iframe.html");
+    registerMockedURLLoad("invisible_iframe.html");
+    registerMockedURLLoad("zero_sized_iframe.html");
 
-    // Create and initialize the WebView.    
+    // Create and initialize the WebView.
     TestWebFrameClient webFrameClient;
     WebView* webView = WebView::create(0);
     webView->initializeMainFrame(&webFrameClient);
 
-    // Load the main frame URL.
-    WebURL testURL(GURL(rootURL + files[0]));
-    WebURLRequest urlRequest;
-    urlRequest.initialize();
-    urlRequest.setURL(testURL);
-    webView->mainFrame()->loadRequest(urlRequest);
-
-    // Load all pending asynchronous requests.
+    loadFrame(webView->mainFrame(), "iframes_test.html");
     serveRequests();
 
@@ -112 +119 @@
 }
 
+TEST_F(WebFrameTest, FrameForEnteredContext)
+{
+    registerMockedURLLoad("iframes_test.html");
+    registerMockedURLLoad("visible_iframe.html");
+    registerMockedURLLoad("invisible_iframe.html");
+    registerMockedURLLoad("zero_sized_iframe.html");
+
+    // Create and initialize the WebView.
+    TestWebFrameClient webFrameClient;
+    WebView* webView = WebView::create(0);
+    webView->settings()->setJavaScriptEnabled(true);
+    webView->initializeMainFrame(&webFrameClient);
+
+    loadFrame(webView->mainFrame(), "iframes_test.html");
+    serveRequests();
+
+    v8::HandleScope scope;
+    EXPECT_EQ(webView->mainFrame(),
+              WebFrame::frameForContext(
+                  webView->mainFrame()->mainWorldScriptContext()));
+    EXPECT_EQ(webView->mainFrame()->firstChild(),
+              WebFrame::frameForContext(
+                  webView->mainFrame()->firstChild()->mainWorldScriptContext()));
+
+    webView->close();
 }
+
+}