Changeset 159096 in webkit

Timestamp:

Nov 11, 2013 10:43:34 PM (10 years ago)

Author:

Csaba Osztrogonác

Message:

Unreviewed, rolling out r159088.
​http://trac.webkit.org/changeset/159088
​https://bugs.webkit.org/show_bug.cgi?id=124187

It broke the EFL build, because it removed a used function
(rs=thorton) (Requested by Ossy_night on #webkit).

Patch by Commit Queue <​commit-queue@webkit.org> on 2013-11-11

• UIProcess/WebPageProxy.cpp:

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

• UIProcess/WebPageProxy.h:

(WebKit::WebPageProxy::urlAtProcessExit):
(WebKit::WebPageProxy::loadStateAtProcessExit):

Location:

trunk/Source/WebKit2

Files:

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

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-11-11  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r159088.
+        http://trac.webkit.org/changeset/159088
+        https://bugs.webkit.org/show_bug.cgi?id=124187
+
+        It broke the EFL build, because it removed a used function
+        (rs=thorton) (Requested by Ossy_night on #webkit).
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::WebPageProxy):
+        (WebKit::WebPageProxy::resetStateAfterProcessExited):
+        * UIProcess/WebPageProxy.h:
+        (WebKit::WebPageProxy::urlAtProcessExit):
+        (WebKit::WebPageProxy::loadStateAtProcessExit):
+
 2013-11-11  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -239 +239 @@
     , m_viewState(ViewState::NoFlags)
     , m_backForwardList(WebBackForwardList::create(this))
+    , m_loadStateAtProcessExit(FrameLoadState::LoadStateFinished)
     , m_temporarilyClosedComposition(false)
     , m_textZoomFactor(1)
@@ -3786 +3787 @@
     m_waitingForDidUpdateViewState = false;
 
+    if (m_mainFrame) {
+        m_urlAtProcessExit = m_mainFrame->url();
+        m_loadStateAtProcessExit = m_mainFrame->loadState();
+    }
+
     resetState();
 

trunk/Source/WebKit2/UIProcess/WebPageProxy.h

@@ -610 +610 @@
     PassRefPtr<ImmutableArray> relatedPages() const;
 
+    const String& urlAtProcessExit() const { return m_urlAtProcessExit; }
+    FrameLoadState::LoadState loadStateAtProcessExit() const { return m_loadStateAtProcessExit; }
+
 #if ENABLE(DRAG_SUPPORT)
     WebCore::DragSession dragSession() const { return m_currentDragSession; }
@@ -1087 +1090 @@
     String m_toolTip;
 
+    String m_urlAtProcessExit;
+    FrameLoadState::LoadState m_loadStateAtProcessExit;
+
     EditorState m_editorState;
     bool m_temporarilyClosedComposition; // Editor state changed from hasComposition to !hasComposition, but that was only with shouldIgnoreCompositionSelectionChange yet.