Changeset 65164 in webkit

Timestamp:

Aug 11, 2010 10:40:23 AM (14 years ago)

Author:

Chris Jerdonek

Message:

2010-08-11 Chris Jerdonek <Chris Jerdonek>

Reviewed by Adam Barth.

Refactored FrameLoader::createWindow() out of the FrameLoader class
since FrameLoader should not be responsible for creating windows.

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

No new functionality, so no new tests.

• bindings/generic/BindingDOMWindow.h: (WebCore::::createWindow):
  • Updated the call to FrameLoader's createWindow().
• bindings/js/JSDOMWindowCustom.cpp: (WebCore::createWindow):
  • Updated the call to FrameLoader's createWindow().
• loader/FrameLoader.cpp: (WebCore::createWindowFromFrameLoader):
  • Made FrameLoader::createWindow() non-member, non-friend and changed it to accept Frame* parameters instead of FrameLoader*.
• loader/FrameLoader.h:
  • Updated the header file to reflect the above change to FrameLoader.cpp.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/generic/BindingDOMWindow.h (modified) (1 diff)
• bindings/js/JSDOMWindowCustom.cpp (modified) (1 diff)
• loader/FrameLoader.cpp (modified) (2 diffs)
• loader/FrameLoader.h (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-11  Chris Jerdonek  <cjerdonek@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        Refactored FrameLoader::createWindow() out of the FrameLoader class
+        since FrameLoader should not be responsible for creating windows.
+
+        https://bugs.webkit.org/show_bug.cgi?id=39156
+
+        No new functionality, so no new tests.
+
+        * bindings/generic/BindingDOMWindow.h:
+        (WebCore::::createWindow):
+          - Updated the call to FrameLoader's createWindow().
+        * bindings/js/JSDOMWindowCustom.cpp:
+        (WebCore::createWindow):
+          - Updated the call to FrameLoader's createWindow().
+        * loader/FrameLoader.cpp:
+        (WebCore::createWindowFromFrameLoader):
+          - Made FrameLoader::createWindow() non-member, non-friend and changed it
+            to accept Frame* parameters instead of FrameLoader*.
+        * loader/FrameLoader.h:
+          - Updated the header file to reflect the above change to FrameLoader.cpp.
+
 2010-08-11  Ilya Tikhonovsky  <loislo@chromium.org>
 

trunk/WebCore/bindings/generic/BindingDOMWindow.h

@@ -109 +109 @@
 
     bool created;
-    // We pass in the opener frame here so it can be used for looking up the
-    // frame name, in case the active frame is different from the opener frame,
-    // and the name references a frame relative to the opener frame, for example
-    // "_self" or "_parent".
-    Frame* newFrame = callingFrame->loader()->createWindow(openerFrame->loader(), frameRequest, windowFeatures, created);
+    // We pass the opener frame for the lookupFrame in case the active frame is different from
+    // the opener frame, and the name references a frame relative to the opener frame.
+    Frame* newFrame = WebCore::createWindow(callingFrame, openerFrame, frameRequest, windowFeatures, created);
     if (!newFrame)
         return 0;

trunk/WebCore/bindings/js/JSDOMWindowCustom.cpp

@@ -725 +725 @@
 
     bool created;
-    // We pass in the opener frame here so it can be used for looking up the frame name, in case the active frame
-    // is different from the opener frame, and the name references a frame relative to the opener frame, for example
-    // "_self" or "_parent".
-    Frame* newFrame = lexicalFrame->loader()->createWindow(openerFrame->loader(), frameRequest, windowFeatures, created);
+    // We pass the opener frame for the lookupFrame in case the active frame is different from
+    // the opener frame, and the name references a frame relative to the opener frame.
+    Frame* newFrame = createWindow(lexicalFrame, openerFrame, frameRequest, windowFeatures, created);
     if (!newFrame)
         return 0;

trunk/WebCore/loader/FrameLoader.cpp

@@ -259 +259 @@
 }
 
-Frame* FrameLoader::createWindow(FrameLoader* frameLoaderForFrameLookup, const FrameLoadRequest& request, const WindowFeatures& features, bool& created)
-{ 
-    ASSERT(!features.dialog || request.frameName().isEmpty());
-
-    if (!request.frameName().isEmpty() && request.frameName() != "_blank") {
-        Frame* frame = frameLoaderForFrameLookup->frame()->tree()->find(request.frameName());
-        if (frame && shouldAllowNavigation(frame)) {
-            if (!request.resourceRequest().url().isEmpty())
-                frame->loader()->loadFrameRequest(request, false, false, 0, 0, SendReferrer);
-            if (Page* page = frame->page())
-                page->chrome()->focus();
-            created = false;
-            return frame;
-        }
-    }
-
-    // Sandboxed frames cannot open new auxiliary browsing contexts.
-    if (isDocumentSandboxed(m_frame, SandboxNavigation))
-        return 0;
-
-    // FIXME: Setting the referrer should be the caller's responsibility.
-    FrameLoadRequest requestWithReferrer = request;
-    requestWithReferrer.resourceRequest().setHTTPReferrer(m_outgoingReferrer);
-    addHTTPOriginIfNeeded(requestWithReferrer.resourceRequest(), outgoingOrigin());
-
-    Page* oldPage = m_frame->page();
-    if (!oldPage)
-        return 0;
-        
-    Page* page = oldPage->chrome()->createWindow(m_frame, requestWithReferrer, features);
-    if (!page)
-        return 0;
-
-    Frame* frame = page->mainFrame();
-    if (request.frameName() != "_blank")
-        frame->tree()->setName(request.frameName());
-
-    page->chrome()->setToolbarsVisible(features.toolBarVisible || features.locationBarVisible);
-    page->chrome()->setStatusbarVisible(features.statusBarVisible);
-    page->chrome()->setScrollbarsVisible(features.scrollbarsVisible);
-    page->chrome()->setMenubarVisible(features.menuBarVisible);
-    page->chrome()->setResizable(features.resizable);
-
-    // 'x' and 'y' specify the location of the window, while 'width' and 'height' 
-    // specify the size of the page. We can only resize the window, so 
-    // adjust for the difference between the window size and the page size.
-
-    FloatRect windowRect = page->chrome()->windowRect();
-    FloatSize pageSize = page->chrome()->pageRect().size();
-    if (features.xSet)
-        windowRect.setX(features.x);
-    if (features.ySet)
-        windowRect.setY(features.y);
-    if (features.widthSet)
-        windowRect.setWidth(features.width + (windowRect.width() - pageSize.width()));
-    if (features.heightSet)
-        windowRect.setHeight(features.height + (windowRect.height() - pageSize.height()));
-    page->chrome()->setWindowRect(windowRect);
-
-    page->chrome()->show();
-
-    created = true;
-    return frame;
-}
-
 bool FrameLoader::canHandleRequest(const ResourceRequest& request)
 {
@@ -3509 +3444 @@
 }
 
+Frame* createWindow(Frame* openerFrame, Frame* lookupFrame, const FrameLoadRequest& request, const WindowFeatures& features, bool& created)
+{
+    ASSERT(!features.dialog || request.frameName().isEmpty());
+
+    if (!request.frameName().isEmpty() && request.frameName() != "_blank") {
+        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();
+            created = false;
+            return frame;
+        }
+    }
+
+    // Sandboxed frames cannot open new auxiliary browsing contexts.
+    if (isDocumentSandboxed(openerFrame, SandboxNavigation))
+        return 0;
+
+    // FIXME: Setting the referrer should be the caller's responsibility.
+    FrameLoadRequest requestWithReferrer = request;
+    requestWithReferrer.resourceRequest().setHTTPReferrer(openerFrame->loader()->outgoingReferrer());
+    FrameLoader::addHTTPOriginIfNeeded(requestWithReferrer.resourceRequest(), openerFrame->loader()->outgoingOrigin());
+
+    Page* oldPage = openerFrame->page();
+    if (!oldPage)
+        return 0;
+
+    Page* page = oldPage->chrome()->createWindow(openerFrame, requestWithReferrer, features);
+    if (!page)
+        return 0;
+
+    Frame* frame = page->mainFrame();
+    if (request.frameName() != "_blank")
+        frame->tree()->setName(request.frameName());
+
+    page->chrome()->setToolbarsVisible(features.toolBarVisible || features.locationBarVisible);
+    page->chrome()->setStatusbarVisible(features.statusBarVisible);
+    page->chrome()->setScrollbarsVisible(features.scrollbarsVisible);
+    page->chrome()->setMenubarVisible(features.menuBarVisible);
+    page->chrome()->setResizable(features.resizable);
+
+    // 'x' and 'y' specify the location of the window, while 'width' and 'height'
+    // specify the size of the page. We can only resize the window, so
+    // adjust for the difference between the window size and the page size.
+
+    FloatRect windowRect = page->chrome()->windowRect();
+    FloatSize pageSize = page->chrome()->pageRect().size();
+    if (features.xSet)
+        windowRect.setX(features.x);
+    if (features.ySet)
+        windowRect.setY(features.y);
+    if (features.widthSet)
+        windowRect.setWidth(features.width + (windowRect.width() - pageSize.width()));
+    if (features.heightSet)
+        windowRect.setHeight(features.height + (windowRect.height() - pageSize.height()));
+    page->chrome()->setWindowRect(windowRect);
+
+    page->chrome()->show();
+
+    created = true;
+    return frame;
+}
+
 } // namespace WebCore

trunk/WebCore/loader/FrameLoader.h

@@ -121 +121 @@
     static void reportLocalLoadFailed(Frame*, const String& url);
 
-    // Called by createWindow in JSDOMWindowBase.cpp, e.g. to fulfill a modal dialog creation
-    // FIXME: Move this method outside of the FrameLoader class.
-    Frame* createWindow(FrameLoader* frameLoaderForFrameLookup, const FrameLoadRequest&, const WindowFeatures&, bool& created);
-
     unsigned long loadResourceSynchronously(const ResourceRequest&, StoredCredentials, ResourceError&, ResourceResponse&, Vector<char>& data);
 
@@ -502 +498 @@
 };
 
+// This function is called by createWindow() in JSDOMWindowBase.cpp, for example, for
+// modal dialog creation.  The lookupFrame is for looking up the frame name in case
+// the frame name references a frame different from the openerFrame, e.g. when it is
+// "_self" or "_parent".
+//
+// FIXME: Consider making this function part of an appropriate class (not FrameLoader)
+// and moving it to a more appropriate location.
+Frame* createWindow(Frame* openerFrame, Frame* lookupFrame, const FrameLoadRequest&, const WindowFeatures&, bool& created);
+
 } // namespace WebCore