Title: [88812] trunk/Source/WebKit/chromium
- Revision
- 88812
- Author
- [email protected]
- Date
- 2011-06-14 09:46:49 -0700 (Tue, 14 Jun 2011)
Log Message
2011-06-14 Adam Barth <[email protected]>
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):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (88811 => 88812)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-06-14 16:34:03 UTC (rev 88811)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-06-14 16:46:49 UTC (rev 88812)
@@ -1,3 +1,16 @@
+2011-06-14 Adam Barth <[email protected]>
+
+ 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 <[email protected]>
[Chromium] Unreviewed, rolled DEPS.
Modified: trunk/Source/WebKit/chromium/public/WebFrame.h (88811 => 88812)
--- trunk/Source/WebKit/chromium/public/WebFrame.h 2011-06-14 16:34:03 UTC (rev 88811)
+++ trunk/Source/WebKit/chromium/public/WebFrame.h 2011-06-14 16:46:49 UTC (rev 88812)
@@ -128,8 +128,7 @@
// A globally unique identifier for this frame.
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;
// The urls of the given combination types of favicon (if any) specified by
Modified: trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp (88811 => 88812)
--- trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp 2011-06-14 16:34:03 UTC (rev 88811)
+++ trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp 2011-06-14 16:46:49 UTC (rev 88812)
@@ -519,10 +519,7 @@
WebURL WebFrameImpl::url() const
{
- const WebDataSource* ds = dataSource();
- if (!ds)
- return WebURL();
- return ds->request().url();
+ return m_frame->document()->url();
}
WebVector<WebIconURL> WebFrameImpl::iconURLs(int iconTypes) const
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
