[webkit-changes] [159584] trunk/Source/WebKit2

[andersca]

Title: [159584] trunk/Source/WebKit2

Revision

159584

Author

ander...@apple.com

Date

2013-11-20 14:22:13 -0800 (Wed, 20 Nov 2013)

Log Message

PageLoadState should keep track of unreachable URLs
https://bugs.webkit.org/show_bug.cgi?id=124677

Reviewed by Dan Bernstein.

* UIProcess/PageLoadState.cpp:
(WebKit::PageLoadState::reset):
(WebKit::PageLoadState::didStartProvisionalLoad):
(WebKit::PageLoadState::didFailProvisionalLoad):
(WebKit::PageLoadState::setUnreachableURL):
* UIProcess/PageLoadState.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::loadAlternateHTMLString):

Modified Paths

• trunk/Source/WebKit2/ChangeLog
• trunk/Source/WebKit2/UIProcess/PageLoadState.cpp
• trunk/Source/WebKit2/UIProcess/PageLoadState.h
• trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

Diff

Modified: trunk/Source/WebKit2/ChangeLog (159583 => 159584)

--- trunk/Source/WebKit2/ChangeLog	2013-11-20 22:21:52 UTC (rev 159583)
+++ trunk/Source/WebKit2/ChangeLog	2013-11-20 22:22:13 UTC (rev 159584)
@@ -1,3 +1,19 @@
+2013-11-20  Anders Carlsson  <ander...@apple.com>
+
+        PageLoadState should keep track of unreachable URLs
+        https://bugs.webkit.org/show_bug.cgi?id=124677
+
+        Reviewed by Dan Bernstein.
+
+        * UIProcess/PageLoadState.cpp:
+        (WebKit::PageLoadState::reset):
+        (WebKit::PageLoadState::didStartProvisionalLoad):
+        (WebKit::PageLoadState::didFailProvisionalLoad):
+        (WebKit::PageLoadState::setUnreachableURL):
+        * UIProcess/PageLoadState.h:
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::loadAlternateHTMLString):
+
 2013-11-20  Tim Horton  <timothy_hor...@apple.com>
 
         Remote Layer Tree: 100% repro crasher on the IPC thread when creating lots of layers

Modified: trunk/Source/WebKit2/UIProcess/PageLoadState.cpp (159583 => 159584)

--- trunk/Source/WebKit2/UIProcess/PageLoadState.cpp	2013-11-20 22:21:52 UTC (rev 159583)
+++ trunk/Source/WebKit2/UIProcess/PageLoadState.cpp	2013-11-20 22:22:13 UTC (rev 159584)
@@ -46,6 +46,9 @@
     m_pendingAPIRequestURL = String();
     m_provisionalURL = String();
     m_url = String();
+
+    m_unreachableURL = String();
+    m_lastUnreachableURL = String();
 }
 
 const String& PageLoadState::pendingAPIRequestURL() const
@@ -70,7 +73,7 @@
     m_state = State::Provisional;
     m_provisionalURL = url;
 
-    // FIXME: Do something with the unreachable URL.
+    setUnreachableURL(unreachableURL);
 }
 
 void PageLoadState::didReceiveServerRedirectForProvisionalLoad(const String& url)
@@ -86,6 +89,7 @@
 
     m_state = State::Finished;
     m_provisionalURL = String();
+    m_unreachableURL = m_lastUnreachableURL;
 }
 
 void PageLoadState::didCommitLoad()
@@ -120,4 +124,10 @@
     m_url = url;
 }
 
+void PageLoadState::setUnreachableURL(const String& unreachableURL)
+{
+    m_lastUnreachableURL = m_unreachableURL;
+    m_unreachableURL = unreachableURL;
+}
+
 } // namespace WebKit

Modified: trunk/Source/WebKit2/UIProcess/PageLoadState.h (159583 => 159584)

--- trunk/Source/WebKit2/UIProcess/PageLoadState.h	2013-11-20 22:21:52 UTC (rev 159583)
+++ trunk/Source/WebKit2/UIProcess/PageLoadState.h	2013-11-20 22:22:13 UTC (rev 159584)
@@ -57,6 +57,8 @@
 
     void didSameDocumentNavigation(const String& url);
 
+    void setUnreachableURL(const String&);
+
 private:
     State m_state;
 
@@ -64,6 +66,9 @@
 
     String m_provisionalURL;
     String m_url;
+
+    String m_unreachableURL;
+    String m_lastUnreachableURL;
 };
 
 } // namespace WebKit

Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (159583 => 159584)

--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp	2013-11-20 22:21:52 UTC (rev 159583)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp	2013-11-20 22:22:13 UTC (rev 159584)
@@ -683,6 +683,8 @@
     if (!isValid())
         reattachToWebProcess();
 
+    m_pageLoadState.setUnreachableURL(unreachableURL);
+
     if (m_mainFrame)
         m_mainFrame->setUnreachableURL(unreachableURL);
 

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes