Commit edbbfcd9 authored by ossy@webkit.org's avatar ossy@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).

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):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@159096 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent f596c75a
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>
URTBF after r159077 to make GTK build happy.
......
......@@ -238,6 +238,7 @@ WebPageProxy::WebPageProxy(PageClient* pageClient, PassRefPtr<WebProcessProxy> p
, m_estimatedProgress(0)
, m_viewState(ViewState::NoFlags)
, m_backForwardList(WebBackForwardList::create(this))
, m_loadStateAtProcessExit(FrameLoadState::LoadStateFinished)
, m_temporarilyClosedComposition(false)
, m_textZoomFactor(1)
, m_pageZoomFactor(1)
......@@ -3785,6 +3786,11 @@ void WebPageProxy::resetStateAfterProcessExited()
m_isPageSuspended = false;
m_waitingForDidUpdateViewState = false;
if (m_mainFrame) {
m_urlAtProcessExit = m_mainFrame->url();
m_loadStateAtProcessExit = m_mainFrame->loadState();
}
resetState();
m_pageClient->clearAllEditCommands();
......
......@@ -609,6 +609,9 @@ public:
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; }
void resetDragOperation() { m_currentDragSession = WebCore::DragSession(); }
......@@ -1086,6 +1089,9 @@ private:
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.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment