Changeset 159096 in webkit
- Timestamp:
- Nov 11, 2013 10:43:34 PM (10 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r159094 r159096 1 2013-11-11 Commit Queue <commit-queue@webkit.org> 2 3 Unreviewed, rolling out r159088. 4 http://trac.webkit.org/changeset/159088 5 https://bugs.webkit.org/show_bug.cgi?id=124187 6 7 It broke the EFL build, because it removed a used function 8 (rs=thorton) (Requested by Ossy_night on #webkit). 9 10 * UIProcess/WebPageProxy.cpp: 11 (WebKit::WebPageProxy::WebPageProxy): 12 (WebKit::WebPageProxy::resetStateAfterProcessExited): 13 * UIProcess/WebPageProxy.h: 14 (WebKit::WebPageProxy::urlAtProcessExit): 15 (WebKit::WebPageProxy::loadStateAtProcessExit): 16 1 17 2013-11-11 Csaba Osztrogonác <ossy@webkit.org> 2 18 -
trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp
r159088 r159096 239 239 , m_viewState(ViewState::NoFlags) 240 240 , m_backForwardList(WebBackForwardList::create(this)) 241 , m_loadStateAtProcessExit(FrameLoadState::LoadStateFinished) 241 242 , m_temporarilyClosedComposition(false) 242 243 , m_textZoomFactor(1) … … 3786 3787 m_waitingForDidUpdateViewState = false; 3787 3788 3789 if (m_mainFrame) { 3790 m_urlAtProcessExit = m_mainFrame->url(); 3791 m_loadStateAtProcessExit = m_mainFrame->loadState(); 3792 } 3793 3788 3794 resetState(); 3789 3795 -
trunk/Source/WebKit2/UIProcess/WebPageProxy.h
r159088 r159096 610 610 PassRefPtr<ImmutableArray> relatedPages() const; 611 611 612 const String& urlAtProcessExit() const { return m_urlAtProcessExit; } 613 FrameLoadState::LoadState loadStateAtProcessExit() const { return m_loadStateAtProcessExit; } 614 612 615 #if ENABLE(DRAG_SUPPORT) 613 616 WebCore::DragSession dragSession() const { return m_currentDragSession; } … … 1087 1090 String m_toolTip; 1088 1091 1092 String m_urlAtProcessExit; 1093 FrameLoadState::LoadState m_loadStateAtProcessExit; 1094 1089 1095 EditorState m_editorState; 1090 1096 bool m_temporarilyClosedComposition; // Editor state changed from hasComposition to !hasComposition, but that was only with shouldIgnoreCompositionSelectionChange yet.
Note: See TracChangeset
for help on using the changeset viewer.