<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[176530] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/176530">176530</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-11-24 16:26:35 -0800 (Mon, 24 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCoordinatedGraphicsWebViewcpp">trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (176529 => 176530)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-11-25 00:20:35 UTC (rev 176529)
+++ trunk/Source/WebKit2/ChangeLog 2014-11-25 00:26:35 UTC (rev 176530)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+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.
+
</ins><span class="cx"> 2014-11-24 Ryuan Choi <ryuan.choi@navercorp.com>
</span><span class="cx">
</span><span class="cx"> [EFL] REGRESSION(176066): It made all performance tests fail
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCoordinatedGraphicsWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp (176529 => 176530)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp 2014-11-25 00:20:35 UTC (rev 176529)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp 2014-11-25 00:26:35 UTC (rev 176530)
</span><span class="lines">@@ -34,6 +34,8 @@
</span><span class="cx"> #include "CoordinatedLayerTreeHostProxy.h"
</span><span class="cx"> #include "NotImplemented.h"
</span><span class="cx"> #include "ViewState.h"
</span><ins>+#include "WebBackForwardList.h"
+#include "WebBackForwardListItem.h"
</ins><span class="cx"> #include "WebContextMenuProxy.h"
</span><span class="cx"> #include "WebPageProxy.h"
</span><span class="cx">
</span><span class="lines">@@ -345,7 +347,7 @@
</span><span class="cx">
</span><span class="cx"> void WebView::processDidExit()
</span><span class="cx"> {
</span><del>- m_client.webProcessCrashed(this, m_page->urlAtProcessExit());
</del><ins>+ m_client.webProcessCrashed(this, m_page->backForwardList()->currentItem()->url());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebView::didRelaunchProcess()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (176529 => 176530)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-11-25 00:20:35 UTC (rev 176529)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-11-25 00:26:35 UTC (rev 176530)
</span><span class="lines">@@ -284,7 +284,6 @@
</span><span class="cx"> , m_viewState(ViewState::NoFlags)
</span><span class="cx"> , m_viewWasEverInWindow(false)
</span><span class="cx"> , m_backForwardList(WebBackForwardList::create(*this))
</span><del>- , m_loadStateAtProcessExit(FrameLoadState::State::Finished)
</del><span class="cx"> #if PLATFORM(MAC) && !USE(ASYNC_NSTEXTINPUTCLIENT)
</span><span class="cx"> , m_temporarilyClosedComposition(false)
</span><span class="cx"> #endif
</span><span class="lines">@@ -4545,11 +4544,6 @@
</span><span class="cx"> m_isValid = false;
</span><span class="cx"> m_isPageSuspended = false;
</span><span class="cx">
</span><del>- if (m_mainFrame) {
- m_urlAtProcessExit = m_mainFrame->url();
- m_loadStateAtProcessExit = m_mainFrame->frameLoadState().m_state;
- }
-
</del><span class="cx"> m_pageClient.processDidExit();
</span><span class="cx">
</span><span class="cx"> resetState(ResetStateReason::WebProcessExited);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (176529 => 176530)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-11-25 00:20:35 UTC (rev 176529)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-11-25 00:26:35 UTC (rev 176530)
</span><span class="lines">@@ -756,9 +756,6 @@
</span><span class="cx">
</span><span class="cx"> bool isValid() const;
</span><span class="cx">
</span><del>- const String& urlAtProcessExit() const { return m_urlAtProcessExit; }
- FrameLoadState::State loadStateAtProcessExit() const { return m_loadStateAtProcessExit; }
-
</del><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><span class="cx"> WebCore::DragOperation currentDragOperation() const { return m_currentDragOperation; }
</span><span class="cx"> bool currentDragIsOverFileInput() const { return m_currentDragIsOverFileInput; }
</span><span class="lines">@@ -1420,9 +1417,6 @@
</span><span class="cx">
</span><span class="cx"> String m_toolTip;
</span><span class="cx">
</span><del>- String m_urlAtProcessExit;
- FrameLoadState::State m_loadStateAtProcessExit;
-
</del><span class="cx"> EditorState m_editorState;
</span><span class="cx"> #if PLATFORM(MAC) && !USE(ASYNC_NSTEXTINPUTCLIENT)
</span><span class="cx"> bool m_temporarilyClosedComposition; // Editor state changed from hasComposition to !hasComposition, but that was only with shouldIgnoreCompositionSelectionChange yet.
</span></span></pre>
</div>
</div>
</body>
</html>