Changeset 176530 in webkit

Timestamp:

Nov 24, 2014, 4:26:35 PM (12 years ago)

Author:

benjamin@webkit.org

Message:

[WK2] Remove some bad stuff from WebPageProxy
​https://bugs.webkit.org/show_bug.cgi?id=138896

Patch by Benjamin Poulain <​bpoulain@apple.com> on 2014-11-24
Reviewed by Sam Weinig.

The state loadStateAtProcessExit does not seem to be used anywhere.

The state urlAtProcessExit only exists to forward the url from
WebPageProxy::resetStateAfterProcessExited() to the coordinated graphics code
WebView::processDidExit().

• UIProcess/CoordinatedGraphics/WebView.cpp:

(WebKit::WebView::processDidExit):

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::WebPageProxy):
(WebKit::WebPageProxy::resetStateAfterProcessExited):

• UIProcess/WebPageProxy.h:

(WebKit::WebPageProxy::urlAtProcessExit): Deleted.
(WebKit::WebPageProxy::loadStateAtProcessExit): Deleted.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/CoordinatedGraphics/WebView.cpp (modified) (2 diffs)
• UIProcess/WebPageProxy.cpp (modified) (2 diffs)
• UIProcess/WebPageProxy.h (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-11-24  Benjamin Poulain  <bpoulain@apple.com>
+
+        [WK2] Remove some bad stuff from WebPageProxy
+        https://bugs.webkit.org/show_bug.cgi?id=138896
+
+        Reviewed by Sam Weinig.
+
+        The state loadStateAtProcessExit does not seem to be used anywhere.
+
+        The state urlAtProcessExit only exists to forward the url from
+        WebPageProxy::resetStateAfterProcessExited() to the coordinated graphics code
+        WebView::processDidExit().
+
+        * UIProcess/CoordinatedGraphics/WebView.cpp:
+        (WebKit::WebView::processDidExit):
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::WebPageProxy):
+        (WebKit::WebPageProxy::resetStateAfterProcessExited):
+        * UIProcess/WebPageProxy.h:
+        (WebKit::WebPageProxy::urlAtProcessExit): Deleted.
+        (WebKit::WebPageProxy::loadStateAtProcessExit): Deleted.
+
 2014-11-24  Ryuan Choi  <ryuan.choi@navercorp.com>
 

trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp

@@ -35 +35 @@
 #include "NotImplemented.h"
 #include "ViewState.h"
+#include "WebBackForwardList.h"
+#include "WebBackForwardListItem.h"
 #include "WebContextMenuProxy.h"
 #include "WebPageProxy.h"
@@ -346 +348 @@
 void WebView::processDidExit()
 {
-    m_client.webProcessCrashed(this, m_page->urlAtProcessExit());
+    m_client.webProcessCrashed(this, m_page->backForwardList()->currentItem()->url());
 }
 

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -285 +285 @@
     , m_viewWasEverInWindow(false)
     , m_backForwardList(WebBackForwardList::create(*this))
-    , m_loadStateAtProcessExit(FrameLoadState::State::Finished)
 #if PLATFORM(MAC) && !USE(ASYNC_NSTEXTINPUTCLIENT)
     , m_temporarilyClosedComposition(false)
@@ -4546 +4545 @@
     m_isPageSuspended = false;
 
-    if (m_mainFrame) {
-        m_urlAtProcessExit = m_mainFrame->url();
-        m_loadStateAtProcessExit = m_mainFrame->frameLoadState().m_state;
-    }
-
     m_pageClient.processDidExit();
 

trunk/Source/WebKit2/UIProcess/WebPageProxy.h

@@ -757 +757 @@
     bool isValid() const;
 
-    const String& urlAtProcessExit() const { return m_urlAtProcessExit; }
-    FrameLoadState::State loadStateAtProcessExit() const { return m_loadStateAtProcessExit; }
-
 #if ENABLE(DRAG_SUPPORT)
     WebCore::DragOperation currentDragOperation() const { return m_currentDragOperation; }
@@ -1421 +1418 @@
     String m_toolTip;
 
-    String m_urlAtProcessExit;
-    FrameLoadState::State m_loadStateAtProcessExit;
-
     EditorState m_editorState;
 #if PLATFORM(MAC) && !USE(ASYNC_NSTEXTINPUTCLIENT)