Changeset 88812 in webkit

Timestamp:

Jun 14, 2011 9:46:49 AM (13 years ago)

Author:

abarth@webkit.org

Message:

2011-06-14 Adam Barth <​abarth@webkit.org>

Reviewed by Darin Fisher.

WebFrame::url() should use the one true URL
​https://bugs.webkit.org/show_bug.cgi?id=62610

The Document's URL is the one true URL. Thou shalt have no URLs before
Document::url().

• src/WebFrameImpl.cpp: (WebKit::WebFrameImpl::url):

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• public/WebFrame.h (modified) (1 diff)
• src/WebFrameImpl.cpp (modified) (1 diff)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-06-14  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Darin Fisher.
+
+        WebFrame::url() should use the one true URL
+        https://bugs.webkit.org/show_bug.cgi?id=62610
+
+        The Document's URL is the one true URL.  Thou shalt have no URLs before
+        Document::url().
+
+        * src/WebFrameImpl.cpp:
+        (WebKit::WebFrameImpl::url):
+
 2011-06-13  James Simonsen  <simonjam@chromium.org>
 

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

@@ -129 +129 @@
     virtual long long identifier() const = 0;
 
-    // The url of the document loaded in this frame.  This is equivalent to
-    // dataSource()->request().url().
+    // The url of the document loaded in this frame.
     virtual WebURL url() const = 0;
 

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

@@ -520 +520 @@
 WebURL WebFrameImpl::url() const
 {
-    const WebDataSource* ds = dataSource();
-    if (!ds)
-        return WebURL();
-    return ds->request().url();
+    return m_frame->document()->url();
 }