Changeset 24491 in webkit
- Timestamp:
- Jul 20, 2007 3:42:18 PM (17 years ago)
- Location:
- trunk
- Files:
-
- 3 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r24490 r24491 1 2007-07-20 Brady Eidson <beidson@apple.com> 2 3 Reviewed by Darin 4 5 <rdar://problem/5153021> and http://bugs.webkit.org/show_bug.cgi?id=13364 6 7 * fast/frames/frame-base-url-expected.txt: Added. 8 * fast/frames/frame-base-url.html: Added. 9 * fast/frames/resources/subframe-base-url.html: Added. 10 1 11 2007-07-20 Maciej Stachowiak <mjs@apple.com> 2 12 -
trunk/WebCore/ChangeLog
r24490 r24491 1 2007-07-20 Brady Eidson <beidson@apple.com> 2 3 Reviewed by Darin 4 5 <rdar://problem/5153021> and http://bugs.webkit.org/show_bug.cgi?id=13364 6 7 The issue here was that if a document in a subframe was loaded from a URL, but then a script did 8 document.open or document.write during parsing, we would overwrite the document's url and baseurl 9 with the parent frame's url. WRONG! 10 11 * dom/Document.cpp: 12 (WebCore::Document::open): Only set the url and baseURL in document.open if they are still empty or about:blank 13 1 14 2007-07-20 Maciej Stachowiak <mjs@apple.com> 2 15 -
trunk/WebCore/dom/Document.cpp
r24417 r24491 1259 1259 // happen when implicitOpen() is called unless we reorganize Frame code. 1260 1260 if (Document *parent = parentDocument()) { 1261 setURL(parent->baseURL()); 1262 setBaseURL(parent->baseURL()); 1261 if (m_url.isEmpty() || m_url == "about:blank") 1262 setURL(parent->baseURL()); 1263 if (m_baseURL.isEmpty() || m_baseURL == "about:blank") 1264 setBaseURL(parent->baseURL()); 1263 1265 } 1264 1266
Note: See TracChangeset
for help on using the changeset viewer.