Changeset 125613 in webkit

Timestamp:

Aug 14, 2012, 3:14:47 PM (13 years ago)

Author:

abarth@webkit.org

Message:

Delete DOMWindow::m_url
​https://bugs.webkit.org/show_bug.cgi?id=93989

Reviewed by Eric Seidel.

Source/WebCore:

There's no reason for DOMWindow to keep a separate copy of the
Document's URL now that there is a predictable way to get a Document
from a DOMWindow.

• loader/DocumentWriter.cpp:

(WebCore::DocumentWriter::begin):

• loader/FrameLoader.cpp:

(WebCore::FrameLoader::open):

• page/DOMWindow.cpp:

(WebCore::DOMWindow::crossDomainAccessErrorMessage):

• page/DOMWindow.h:

(DOMWindow):

LayoutTests:

The error messages for these tests now relect the document's updated
URL after document.write has changed the URL. Previously, we failed to
sync these changes to DOMWindow::m_url, which is why the error messages
showed the wrong URL.

• http/tests/security/aboutBlank/xss-DENIED-navigate-opener-document-write-expected.txt:
• http/tests/security/aboutBlank/xss-DENIED-set-opener-expected.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/security/aboutBlank/xss-DENIED-navigate-opener-document-write-expected.txt (modified) (1 diff)
• LayoutTests/http/tests/security/aboutBlank/xss-DENIED-set-opener-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/DocumentWriter.cpp (modified) (1 diff)
• Source/WebCore/loader/FrameLoader.cpp (modified) (1 diff)
• Source/WebCore/page/DOMWindow.cpp (modified) (2 diffs)
• Source/WebCore/page/DOMWindow.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-08-14  Adam Barth  <abarth@webkit.org>
+
+        Delete DOMWindow::m_url
+        https://bugs.webkit.org/show_bug.cgi?id=93989
+
+        Reviewed by Eric Seidel.
+
+        The error messages for these tests now relect the document's updated
+        URL after document.write has changed the URL. Previously, we failed to
+        sync these changes to DOMWindow::m_url, which is why the error messages
+        showed the wrong URL.
+
+        * http/tests/security/aboutBlank/xss-DENIED-navigate-opener-document-write-expected.txt:
+        * http/tests/security/aboutBlank/xss-DENIED-set-opener-expected.txt:
+
 2012-08-14  Andrei Onea  <onea@adobe.com>
 

trunk/LayoutTests/http/tests/security/aboutBlank/xss-DENIED-navigate-opener-document-write-expected.txt

@@ -1 @@
-CONSOLE MESSAGE: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/innocent-victim-with-notify.html from frame with URL about:blank. Domains, protocols and ports must match.
+CONSOLE MESSAGE: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/innocent-victim-with-notify.html from frame with URL http://127.0.0.1:8000/security/aboutBlank/xss-DENIED-navigate-opener-document-write.html. Domains, protocols and ports must match.
 
 CONSOLE MESSAGE: line 1: TypeError: 'undefined' is not an object (evaluating 'target.document.body')

trunk/LayoutTests/http/tests/security/aboutBlank/xss-DENIED-set-opener-expected.txt

@@ -1 +1 @@
 CONSOLE MESSAGE: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/innocent-victim.html from frame with URL http://127.0.0.1:8000/security/aboutBlank/xss-DENIED-set-opener.html. Domains, protocols and ports must match.
 
-CONSOLE MESSAGE: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/innocent-victim.html from frame with URL about:blank. Domains, protocols and ports must match.
+CONSOLE MESSAGE: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/innocent-victim.html from frame with URL http://127.0.0.1:8000/security/aboutBlank/xss-DENIED-set-opener.html. Domains, protocols and ports must match.
 
 CONSOLE MESSAGE: line 1: TypeError: 'undefined' is not an object (evaluating 'target.document.body')

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-08-14  Adam Barth  <abarth@webkit.org>
+
+        Delete DOMWindow::m_url
+        https://bugs.webkit.org/show_bug.cgi?id=93989
+
+        Reviewed by Eric Seidel.
+
+        There's no reason for DOMWindow to keep a separate copy of the
+        Document's URL now that there is a predictable way to get a Document
+        from a DOMWindow.
+
+        * loader/DocumentWriter.cpp:
+        (WebCore::DocumentWriter::begin):
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::open):
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::crossDomainAccessErrorMessage):
+        * page/DOMWindow.h:
+        (DOMWindow):
+
 2012-08-14  Nikhil Bhargava  <nbhargava@google.com>
 

trunk/Source/WebCore/loader/DocumentWriter.cpp

@@ -147 +147 @@
         document->setSecurityOrigin(ownerDocument->securityOrigin());
     }
-
-    // FIXME: DOMWindow should get the URL from the document itself.
-    m_frame->domWindow()->setURL(document->url());
 
     m_frame->loader()->didBeginDocument(dispatch);

trunk/Source/WebCore/loader/FrameLoader.cpp

@@ -1950 +1950 @@
     m_frame->setDocument(document);
     document->domWindow()->resumeFromPageCache();
-    // FIXME: This shouldn't be necessary now that Document owns the DOMWindow.
-    m_frame->domWindow()->setURL(document->url());
 
     updateFirstPartyForCookies();

trunk/Source/WebCore/page/DOMWindow.cpp

@@ -1761 +1761 @@
 String DOMWindow::crossDomainAccessErrorMessage(DOMWindow* activeWindow)
 {
-    const KURL& activeWindowURL = activeWindow->url();
+    const KURL& activeWindowURL = activeWindow->document()->url();
     if (activeWindowURL.isNull())
         return String();
@@ -1768 +1768 @@
     // Perhaps we should involve the security origin object in composing it.
     // FIXME: This message, and other console messages, have extra newlines. Should remove them.
-    return "Unsafe JavaScript attempt to access frame with URL " + m_url.string() + " from frame with URL " + activeWindowURL.string() + ". Domains, protocols and ports must match.\n";
+    return "Unsafe JavaScript attempt to access frame with URL " + document()->url().string() + " from frame with URL " + activeWindowURL.string() + ". Domains, protocols and ports must match.\n";
 }
 

trunk/Source/WebCore/page/DOMWindow.h

@@ -118 +118 @@
         // FIXME: Callers should use document()->securityOrigin() directly.
         SecurityOrigin* securityOrigin() const;
-
-        // FIXME: We should get the URL from document()->url() directly.
-        void setURL(const KURL& url) { m_url = url; }
-        KURL url() const { return m_url; }
 
         unsigned pendingUnloadEventListeners() const;
@@ -435 +431 @@
         void willDestroyDocumentInFrame();
 
-        KURL m_url;
-
         bool m_shouldPrintWhenFinishedLoading;
         bool m_suspendedForPageCache;