Changeset 85655 in webkit
- Timestamp:
- May 3, 2011 1:54:26 PM (13 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r85653 r85655 1 2011-05-03 Jeff Miller <jeffm@apple.com> 2 3 Reviewed by Darin Adler. 4 5 Unreachable URL is lost when canceling load of a new page 6 https://bugs.webkit.org/show_bug.cgi?id=60057 7 <rdar://problem/9049135> 8 9 When setting the unreachable URL in the WebFrameProxy, keep track of any previous unreachable URL 10 so we can restore it if the page load fails. 11 12 * UIProcess/WebFrameProxy.cpp: 13 (WebKit::WebFrameProxy::didFailProvisionalLoad): Restore m_unreachableURL to previous value. 14 (WebKit::WebFrameProxy::setUnreachableURL): Keep track of previous unreachable URL in m_lastUnreachableURL. 15 * UIProcess/WebFrameProxy.h: Moved setUnreachableURL() implementation to .cpp file, added m_lastUnreachableURL. 16 1 17 2011-05-03 Adam Roben <aroben@apple.com> 2 18 -
trunk/Source/WebKit2/UIProcess/WebFrameProxy.cpp
r78397 r85655 148 148 m_loadState = LoadStateFinished; 149 149 m_provisionalURL = String(); 150 m_unreachableURL = m_lastUnreachableURL; 150 151 } 151 152 … … 322 323 } 323 324 325 void WebFrameProxy::setUnreachableURL(const String& unreachableURL) 326 { 327 m_lastUnreachableURL = m_unreachableURL; 328 m_unreachableURL = unreachableURL; 329 } 330 324 331 } // namespace WebKit -
trunk/Source/WebKit2/UIProcess/WebFrameProxy.h
r76403 r85655 93 93 const String& provisionalURL() const { return m_provisionalURL; } 94 94 95 void setUnreachableURL(const String& unreachableURL) { m_unreachableURL = unreachableURL; }95 void setUnreachableURL(const String&); 96 96 const String& unreachableURL() const { return m_unreachableURL; } 97 97 … … 150 150 String m_provisionalURL; 151 151 String m_unreachableURL; 152 String m_lastUnreachableURL; 152 153 String m_MIMEType; 153 154 String m_title;
Note: See TracChangeset
for help on using the changeset viewer.