Changeset 75349 in webkit

Timestamp:

Jan 9, 2011 3:22:47 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-01-09 Xianzhu Wang <​phnixwxz@gmail.com>

Reviewed by Darin Fisher.

​https://bugs.webkit.org/show_bug.cgi?id=41441
createWindow method should only do window-creating without URL navigation.
Let client APIs know which URL a new window will start with

• loader/FrameLoader.cpp: (WebCore::createWindow):
• page/ContextMenuController.cpp: (WebCore::openNewWindow):
• page/DOMWindow.cpp: (WebCore::DOMWindow::createWindow):

2011-01-09 Xianzhu Wang <​phnixwxz@gmail.com>

Reviewed by Darin Fisher.

​https://bugs.webkit.org/show_bug.cgi?id=41441
createWindow method should only do window-creating without URL navigation.
Pass URL request to createView.

• public/WebViewClient.h: (WebKit::WebViewClient::createView):
• src/ChromeClientImpl.cpp: (WebKit::ChromeClientImpl::createWindow):

2011-01-09 Xianzhu Wang <​phnixwxz@gmail.com>

Reviewed by Darin Fisher.

​https://bugs.webkit.org/show_bug.cgi?id=41441
createWindow method should only do window-creating without URL navigation

• WebCoreSupport/ChromeClientEfl.cpp: (WebCore::ChromeClientEfl::createWindow):

2011-01-09 Xianzhu Wang <​phnixwxz@gmail.com>

Reviewed by Darin Fisher.

​https://bugs.webkit.org/show_bug.cgi?id=41441
createWindow method should only do window-creating without URL navigation

• WebCoreSupport/ChromeClientGtk.cpp: (WebKit::ChromeClient::createWindow):

2011-01-09 Xianzhu Wang <​phnixwxz@gmail.com>

Reviewed by Darin Fisher.

​https://bugs.webkit.org/show_bug.cgi?id=41441
createWindow method should only do window-creating without URL navigation

• WebCoreSupport/WebChromeClient.mm: (WebChromeClient::createWindow):

2011-01-09 Xianzhu Wang <​phnixwxz@gmail.com>

Reviewed by Darin Fisher.

​https://bugs.webkit.org/show_bug.cgi?id=41441
createWindow method should only do window-creating without URL navigation

• Api/qwebpage.cpp: (openNewWindow):
• WebCoreSupport/ChromeClientQt.cpp: (WebCore::ChromeClientQt::createWindow):

2011-01-09 Xianzhu Wang <​phnixwxz@gmail.com>

Reviewed by Darin Fisher.

​https://bugs.webkit.org/show_bug.cgi?id=41441
createWindow method should only do window-creating without URL navigation

• WebCoreSupport/WebChromeClient.cpp: (WebChromeClient::createWindow):

2011-01-09 Xianzhu Wang <​phnixwxz@gmail.com>

Reviewed by Darin Fisher.

​https://bugs.webkit.org/show_bug.cgi?id=41441
createWindow method should only do window-creating without URL navigation

• WebKitSupport/ChromeClientWx.cpp: (WebCore::ChromeClientWx::createWindow):

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/FrameLoader.cpp (modified) (1 diff)
• Source/WebCore/page/ChromeClient.h (modified) (1 diff)
• Source/WebCore/page/ContextMenuController.cpp (modified) (1 diff)
• Source/WebCore/page/DOMWindow.cpp (modified) (2 diffs)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/public/WebViewClient.h (modified) (2 diffs)
• WebKit/chromium/src/ChromeClientImpl.cpp (modified) (1 diff)
• WebKit/efl/ChangeLog (modified) (1 diff)
• WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp (modified) (1 diff)
• WebKit/gtk/ChangeLog (modified) (1 diff)
• WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp (modified) (1 diff)
• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/WebCoreSupport/WebChromeClient.mm (modified) (3 diffs)
• WebKit/qt/Api/qwebpage.cpp (modified) (1 diff)
• WebKit/qt/ChangeLog (modified) (1 diff)
• WebKit/qt/WebCoreSupport/ChromeClientQt.cpp (modified) (1 diff)
• WebKit/win/ChangeLog (modified) (1 diff)
• WebKit/win/WebCoreSupport/WebChromeClient.cpp (modified) (2 diffs)
• WebKit/wx/ChangeLog (modified) (1 diff)
• WebKit/wx/WebKitSupport/ChromeClientWx.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-01-09  Xianzhu Wang  <phnixwxz@gmail.com>
+
+        Reviewed by Darin Fisher.
+
+        https://bugs.webkit.org/show_bug.cgi?id=41441
+        createWindow method should only do window-creating without URL navigation.
+        Let client APIs know which URL a new window will start with
+
+        * loader/FrameLoader.cpp:
+        (WebCore::createWindow):
+        * page/ContextMenuController.cpp:
+        (WebCore::openNewWindow):
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::createWindow):
+
 2011-01-09  Dirk Schulze  <krit@webkit.org>
 

trunk/Source/WebCore/loader/FrameLoader.cpp

@@ -3475 +3475 @@
         Frame* frame = lookupFrame->tree()->find(request.frameName());
         if (frame && openerFrame->loader()->shouldAllowNavigation(frame)) {
-            if (!request.resourceRequest().url().isEmpty())
-                frame->loader()->loadFrameRequest(request, false, false, 0, 0, SendReferrer);
             if (Page* page = frame->page())
                 page->chrome()->focus();

trunk/Source/WebCore/page/ChromeClient.h

@@ -101 +101 @@
         // should not be shown to the user until the ChromeClient of the newly
         // created Page has its show method called.
+        // The FrameLoadRequest parameter is only for ChromeClient to check if the
+        // request could be fulfilled.  The ChromeClient should not load the request.
         virtual Page* createWindow(Frame*, const FrameLoadRequest&, const WindowFeatures&, const NavigationAction&) = 0;
         virtual void show() = 0;

trunk/Source/WebCore/page/ContextMenuController.cpp

@@ -159 +159 @@
     if (Page* oldPage = frame->page()) {
         FrameLoadRequest request(frame->document()->securityOrigin(), ResourceRequest(urlToLoad, frame->loader()->outgoingReferrer()));
-        WindowFeatures features;
-        if (Page* newPage = oldPage->chrome()->createWindow(frame, request, features, NavigationAction()))
+        if (Page* newPage = oldPage->chrome()->createWindow(frame, request, WindowFeatures(), NavigationAction())) {
+            newPage->mainFrame()->loader()->loadFrameRequest(request, false, false, 0, 0, SendReferrer);   
             newPage->chrome()->show();
+        }
     }
 }

trunk/Source/WebCore/page/DOMWindow.cpp

@@ -1697 +1697 @@
     Frame* activeFrame = activeWindow->frame();
 
-    // FIXME: It's much better for client API if a new window starts with a URL, here where we
-    // know what URL we are going to open. Unfortunately, this code passes the empty string
-    // for the URL, but there's a reason for that. Before loading we have to set up the opener,
-    // openedByDOM, and dialogArguments values. Also, to decide whether to use the URL we currently
-    // do an isInsecureScriptAccess call using the window we create, which can't be done before
-    // creating it. We'd have to resolve all those issues to pass the URL instead of an empty string.
-
     // For whatever reason, Firefox uses the first frame to determine the outgoingReferrer. We replicate that behavior here.
     String referrer = firstFrame->loader()->outgoingReferrer();
 
-    ResourceRequest request(KURL(), referrer);
+    KURL completedURL = urlString.isEmpty() ? KURL(ParsedURLString, "") : firstFrame->document()->completeURL(urlString);
+    ResourceRequest request(completedURL, referrer);
     FrameLoader::addHTTPOriginIfNeeded(request, firstFrame->loader()->outgoingOrigin());
     FrameLoadRequest frameRequest(activeWindow->securityOrigin(), request, frameName);
@@ -1726 +1720 @@
     if (function)
         function(newFrame->domWindow(), functionContext);
-
-    KURL completedURL = urlString.isEmpty() ? KURL(ParsedURLString, "") : firstFrame->document()->completeURL(urlString);
 
     if (created)

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-01-09  Xianzhu Wang  <phnixwxz@gmail.com>
+
+        Reviewed by Darin Fisher.
+
+        https://bugs.webkit.org/show_bug.cgi?id=41441
+        createWindow method should only do window-creating without URL navigation.
+        Pass URL request to createView.
+
+        * public/WebViewClient.h:
+        (WebKit::WebViewClient::createView):
+        * src/ChromeClientImpl.cpp:
+        (WebKit::ChromeClientImpl::createWindow):
+
 2011-01-08  Adam Barth  <abarth@webkit.org>
 

trunk/WebKit/chromium/public/WebViewClient.h

@@ -65 +65 @@
 class WebStorageNamespace;
 class WebURL;
+class WebURLRequest;
 class WebView;
 class WebWidget;
@@ -83 +84 @@
     // so any subsequent calls to createSessionStorageNamespace conform to the
     // WebStorage specification.
+    // FIXME: This method is DEPRECATED and should be removed once the new
+    // createView() (the next method) is implemented at Chromium side.
     virtual WebView* createView(WebFrame* creator,
                                 const WebWindowFeatures& features,
                                 const WebString& name) { return 0; }
+
+    // Create a new related WebView.  This method must clone its session storage
+    // so any subsequent calls to createSessionStorageNamespace conform to the
+    // WebStorage specification.
+    // The request parameter is only for the client to check if the request
+    // could be fulfilled.  The client should not load the request.
+    virtual WebView* createView(WebFrame* creator,
+                                const WebURLRequest& request,
+                                const WebWindowFeatures& features,
+                                const WebString& name) {
+        // FIXME: This is a temporary default implementation which calls the old
+        // version of createView(). Should change to 'return 0' when the old one
+        // is removed.
+        (void)request;
+        return createView(creator, features, name); 
+    }
 
     // Create a new WebPopupMenu.  In the second form, the client is

trunk/WebKit/chromium/src/ChromeClientImpl.cpp

@@ -264 +264 @@
         return 0;
 
+    WrappedResourceRequest request;
+    if (!r.resourceRequest().isEmpty())
+        request.bind(r.resourceRequest());
     WebViewImpl* newView = static_cast<WebViewImpl*>(
-        m_webView->client()->createView(WebFrameImpl::fromFrame(frame), features, r.frameName()));
+        m_webView->client()->createView(WebFrameImpl::fromFrame(frame), request, features, r.frameName()));
     if (!newView)
         return 0;
-
-    // The request is empty when we are just being asked to open a blank window.
-    // This corresponds to window.open(""), for example.
-    if (!r.resourceRequest().isEmpty()) {
-        WrappedResourceRequest request(r.resourceRequest());
-        newView->mainFrame()->loadRequest(request);
-    }
 
     return newView->page();

trunk/WebKit/efl/ChangeLog

@@ +1 @@
+2011-01-09  Xianzhu Wang <phnixwxz@gmail.com>
+
+        Reviewed by Darin Fisher.
+
+        https://bugs.webkit.org/show_bug.cgi?id=41441
+        createWindow method should only do window-creating without URL navigation
+
+        * WebCoreSupport/ChromeClientEfl.cpp:
+        (WebCore::ChromeClientEfl::createWindow):
+
 2010-12-27  Rafael Antognolli  <antognolli@profusion.mobi>
 

trunk/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp

@@ -155 +155 @@
         return 0;
 
-    if (!frameLoadRequest.isEmpty())
-        ewk_view_uri_set(newView, frameLoadRequest.resourceRequest().url().string().utf8().data());
-
     return ewk_view_core_page_get(newView);
 }

trunk/WebKit/gtk/ChangeLog

@@ +1 @@
+2011-01-09  Xianzhu Wang <phnixwxz@gmail.com>
+
+        Reviewed by Darin Fisher.
+
+        https://bugs.webkit.org/show_bug.cgi?id=41441
+        createWindow method should only do window-creating without URL navigation
+
+        * WebCoreSupport/ChromeClientGtk.cpp:
+        (WebKit::ChromeClient::createWindow):
+
 2011-01-08  Martin Robinson  <mrobinson@igalia.com>
 

trunk/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp

@@ -161 +161 @@
     g_object_set(webView, "window-features", webWindowFeatures.get(), NULL);
 
-    if (!frameLoadRequest.isEmpty())
-        webkit_web_view_open(webView, frameLoadRequest.resourceRequest().url().string().utf8().data());
-
     return core(webView);
 }

trunk/WebKit/mac/ChangeLog

@@ +1 @@
+2011-01-09  Xianzhu Wang <phnixwxz@gmail.com>
+
+        Reviewed by Darin Fisher.
+
+        https://bugs.webkit.org/show_bug.cgi?id=41441
+        createWindow method should only do window-creating without URL navigation
+
+        * WebCoreSupport/WebChromeClient.mm:
+        (WebChromeClient::createWindow):
+
 2011-01-08  Dan Bernstein  <mitz@apple.com>
 

trunk/WebKit/mac/WebCoreSupport/WebChromeClient.mm

@@ -198 +198 @@
 }
 
-Page* WebChromeClient::createWindow(Frame* frame, const FrameLoadRequest& request, const WindowFeatures& features, const NavigationAction&)
-{
-    NSURLRequest *URLRequest = nil;
-    if (!request.isEmpty())
-        URLRequest = request.resourceRequest().nsURLRequest();
-    
+Page* WebChromeClient::createWindow(Frame* frame, const FrameLoadRequest&, const WindowFeatures& features, const NavigationAction&)
+{
     id delegate = [m_webView UIDelegate];
     WebView *newWebView;
@@ -239 +235 @@
             [dictFeatures setObject:height forKey:@"height"];
         
-        newWebView = CallUIDelegate(m_webView, @selector(webView:createWebViewWithRequest:windowFeatures:), URLRequest, dictFeatures);
+        newWebView = CallUIDelegate(m_webView, @selector(webView:createWebViewWithRequest:windowFeatures:), nil, dictFeatures);
         
         [dictFeatures release];
@@ -254 +250 @@
         [dialog release];
     } else if (features.dialog && [delegate respondsToSelector:@selector(webView:createWebViewModalDialogWithRequest:)]) {
-        newWebView = CallUIDelegate(m_webView, @selector(webView:createWebViewModalDialogWithRequest:), URLRequest);
+        newWebView = CallUIDelegate(m_webView, @selector(webView:createWebViewModalDialogWithRequest:), nil);
     } else {
-        newWebView = CallUIDelegate(m_webView, @selector(webView:createWebViewWithRequest:), URLRequest);
+        newWebView = CallUIDelegate(m_webView, @selector(webView:createWebViewWithRequest:), nil);
     }
 

trunk/WebKit/qt/Api/qwebpage.cpp

@@ -2263 +2263 @@
         WindowFeatures features;
         NavigationAction action;
-        if (Page* newPage = oldPage->chrome()->createWindow(frame,
-                frameLoadRequest(url, frame), features, action))
+        FrameLoadRequest request = frameLoadRequest(url, frame);
+        if (Page* newPage = oldPage->chrome()->createWindow(frame, request, features, action)) {
+            newPage->mainFrame()->loader()->loadFrameRequest(request, false, false, 0, 0, SendReferrer);
             newPage->chrome()->show();
+        }
     }
 }

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2011-01-09  Xianzhu Wang <phnixwxz@gmail.com>
+
+        Reviewed by Darin Fisher.
+
+        https://bugs.webkit.org/show_bug.cgi?id=41441
+        createWindow method should only do window-creating without URL navigation
+
+        * Api/qwebpage.cpp:
+        (openNewWindow):
+        * WebCoreSupport/ChromeClientQt.cpp:
+        (WebCore::ChromeClientQt::createWindow):
+
 2011-01-08  Benjamin Poulain  <benjamin.poulain@nokia.com>
 

trunk/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp

@@ -183 +183 @@
     // A call to QWebPage::mainFrame() implicitly creates the main frame.
     // Make sure it exists, as WebCore expects it when returning from this call.
-    QWebFrame* mainFrame = newPage->mainFrame();
-
-    if (!request.isEmpty())
-        mainFrame->load(request.resourceRequest().url());
+    newPage->mainFrame();
     return newPage->d->page;
 }

trunk/WebKit/win/ChangeLog

@@ +1 @@
+2011-01-09  Xianzhu Wang <phnixwxz@gmail.com>
+
+        Reviewed by Darin Fisher.
+
+        https://bugs.webkit.org/show_bug.cgi?id=41441
+        createWindow method should only do window-creating without URL navigation
+
+        * WebCoreSupport/WebChromeClient.cpp:
+        (WebChromeClient::createWindow):
+
 2011-01-07  Adam Barth  <abarth@webkit.org>
 

trunk/WebKit/win/WebCoreSupport/WebChromeClient.cpp

@@ -197 +197 @@
 }
 
-Page* WebChromeClient::createWindow(Frame*, const FrameLoadRequest& frameLoadRequest, const WindowFeatures& features, const NavigationAction&)
+Page* WebChromeClient::createWindow(Frame*, const FrameLoadRequest&, const WindowFeatures& features, const NavigationAction&)
 {
     COMPtr<IWebUIDelegate> delegate = uiDelegate();
@@ -203 +203 @@
         return 0;
 
-    COMPtr<IWebMutableURLRequest> request(AdoptCOM, WebMutableURLRequest::createInstance(frameLoadRequest.resourceRequest()));
+    // Just create a blank request because createWindow() is only required to create window but not to load URL.
+    COMPtr<IWebMutableURLRequest> request(AdoptCOM, WebMutableURLRequest::createInstance());
 
     COMPtr<IWebUIDelegatePrivate2> delegatePrivate(Query, delegate);

trunk/WebKit/wx/ChangeLog

@@ +1 @@
+2011-01-09  Xianzhu Wang <phnixwxz@gmail.com>
+
+        Reviewed by Darin Fisher.
+
+        https://bugs.webkit.org/show_bug.cgi?id=41441
+        createWindow method should only do window-creating without URL navigation
+
+        * WebKitSupport/ChromeClientWx.cpp:
+        (WebCore::ChromeClientWx::createWindow):
+
 2011-01-07  Adam Barth  <abarth@webkit.org>
 

trunk/WebKit/wx/WebKitSupport/ChromeClientWx.cpp

@@ -142 +142 @@
 }
 
-Page* ChromeClientWx::createWindow(Frame*, const FrameLoadRequest& request, const WindowFeatures& features, const NavigationAction&)
+Page* ChromeClientWx::createWindow(Frame*, const FrameLoadRequest&, const WindowFeatures& features, const NavigationAction&)
 {
     Page* myPage = 0;
     wxWebViewNewWindowEvent wkEvent(m_webView);
-    wkEvent.SetURL(request.resourceRequest().url().string());
     
     wxWebKitWindowFeatures wkFeatures = wkFeaturesforWindowFeatures(features);