Changeset 167852 in webkit

Timestamp:

Apr 27, 2014 1:15:13 AM (10 years ago)

Author:

ddkilzer@apple.com

Message:

Roll out changes not part of the patch reviewed for Bug 132089
<​http://webkit.org/b/132089>

• loader/SubframeLoader.cpp:

(WebCore::SubframeLoader::loadOrRedirectSubframe):

• page/DOMWindow.cpp:

(WebCore::DOMWindow::setLocation):
(WebCore::DOMWindow::createWindow):
(WebCore::DOMWindow::open):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/SubframeLoader.cpp (modified) (1 diff)
• page/DOMWindow.cpp (modified) (8 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-27  David Kilzer  <ddkilzer@apple.com>
+
+        Roll out changes not part of the patch reviewed for Bug 132089
+        <http://webkit.org/b/132089>
+
+        * loader/SubframeLoader.cpp:
+        (WebCore::SubframeLoader::loadOrRedirectSubframe):
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::setLocation):
+        (WebCore::DOMWindow::createWindow):
+        (WebCore::DOMWindow::open):
+
 2014-04-26  Darin Adler  <darin@apple.com>
 

trunk/Source/WebCore/loader/SubframeLoader.cpp

@@ -323 +323 @@
 Frame* SubframeLoader::loadOrRedirectSubframe(HTMLFrameOwnerElement& ownerElement, const URL& url, const AtomicString& frameName, LockHistory lockHistory, LockBackForwardList lockBackForwardList)
 {
-    if (!url.isValid())
-        return nullptr;
-
     Frame* frame = ownerElement.contentFrame();
     if (frame)

trunk/Source/WebCore/page/DOMWindow.cpp

@@ -1892 +1892 @@
 
     URL completedURL = firstFrame->document()->completeURL(urlString);
-    if (!completedURL.isValid())
+    if (completedURL.isNull())
         return;
 
     if (isInsecureScriptAccess(activeWindow, completedURL))
-        return;
-
-    Frame* referrerFrame = activeDocument->frame();
-    if (!referrerFrame)
         return;
 
@@ -1905 +1901 @@
     LockHistory lockHistory = (locking != LockHistoryBasedOnGestureState || !ScriptController::processingUserGesture()) ? LockHistory::Yes : LockHistory::No;
     LockBackForwardList lockBackForwardList = (locking != LockHistoryBasedOnGestureState) ? LockBackForwardList::Yes : LockBackForwardList::No;
-    m_frame->navigationScheduler().scheduleLocationChange(activeDocument->securityOrigin(), completedURL, referrerFrame->loader().outgoingReferrer(), lockHistory, lockBackForwardList);
+    m_frame->navigationScheduler().scheduleLocationChange(activeDocument->securityOrigin(),
+        // FIXME: What if activeDocument()->frame() is 0?
+        completedURL, activeDocument->frame()->loader().outgoingReferrer(),
+        lockHistory, lockBackForwardList);
 }
 
@@ -1990 +1989 @@
         // Don't expose client code to invalid URLs.
         activeWindow.printErrorMessage("Unable to open a window with invalid URL '" + completedURL.string() + "'.\n");
-        return nullptr;
+        return 0;
     }
 
@@ -2005 +2004 @@
     RefPtr<Frame> newFrame = WebCore::createWindow(activeFrame, openerFrame, frameRequest, windowFeatures, created);
     if (!newFrame)
-        return nullptr;
+        return 0;
 
     newFrame->loader().setOpener(openerFrame);
@@ -2034 +2033 @@
 {
     if (!isCurrentlyDisplayedInFrame())
-        return nullptr;
+        return 0;
     Document* activeDocument = activeWindow.document();
     if (!activeDocument)
-        return nullptr;
+        return 0;
     Frame* firstFrame = firstWindow.frame();
     if (!firstFrame)
-        return nullptr;
+        return 0;
 
     if (!firstWindow.allowPopUp()) {
@@ -2046 +2045 @@
         // Otherwise, illegitimate window.open() calls with no name will pass right through the popup blocker.
         if (frameName.isEmpty() || !m_frame->tree().find(frameName))
-            return nullptr;
+            return 0;
     }
 
     // Get the target frame for the special cases of _top and _parent.
     // In those cases, we schedule a location change right now and return early.
-    Frame* targetFrame = nullptr;
+    Frame* targetFrame = 0;
     if (frameName == "_top")
         targetFrame = &m_frame->tree().top();
@@ -2062 +2061 @@
     if (targetFrame) {
         if (!activeDocument->canNavigate(targetFrame))
-            return nullptr;
+            return 0;
 
         URL completedURL = firstFrame->document()->completeURL(urlString);
-        if (!completedURL.isValid())
-            return nullptr;
 
         if (targetFrame->document()->domWindow()->isInsecureScriptAccess(activeWindow, completedURL))
@@ -2084 +2081 @@
     WindowFeatures windowFeatures(windowFeaturesString);
     RefPtr<Frame> result = createWindow(urlString, frameName, windowFeatures, activeWindow, firstFrame, m_frame);
-    return result ? result->document()->domWindow() : nullptr;
+    return result ? result->document()->domWindow() : 0;
 }