<!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>[162088] trunk</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/162088">162088</a></dd>
<dt>Author</dt> <dd>barraclough@apple.com</dd>
<dt>Date</dt> <dd>2014-01-15 13:39:14 -0800 (Wed, 15 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/158369">r158369</a>): Some pop-up windows open at incorrect size (affects GMail, theblaze.com)
https://bugs.webkit.org/show_bug.cgi?id=126289
Reviewed by Anders Carlson.
Partial revert of https://bugs.webkit.org/show_bug.cgi?id=123557.
On window.open, update page when the UIProcess sends the create message
Source/WebKit2:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::initializeWebPage):
(WebKit::WebPageProxy::creationParameters):
* UIProcess/WebPageProxy.h:
- creation paraments are not preserved at window.open.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::reinitializeWebPage):
(WebKit::WebPage::setViewState):
(WebKit::WebPage::setViewStateInternal):
* WebProcess/WebPage/WebPage.h:
- add interface to update page.
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::createWebPage):
- if we try to create a page that already exists, update the current page's view state.
LayoutTests:
* platform/mac-wk2/TestExpectations:
- test is bad (results in DRT don't reflect in browser behaviour).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2TestExpectations">trunk/LayoutTests/platform/mac-wk2/TestExpectations</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</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>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcesscpp">trunk/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (162087 => 162088)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-01-15 21:30:26 UTC (rev 162087)
+++ trunk/LayoutTests/ChangeLog 2014-01-15 21:39:14 UTC (rev 162088)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-01-15 Gavin Barraclough <barraclough@apple.com>
+
+ REGRESSION (r158369): Some pop-up windows open at incorrect size (affects GMail, theblaze.com)
+ https://bugs.webkit.org/show_bug.cgi?id=126289
+
+ Reviewed by Anders Carlson.
+
+ Partial revert of https://bugs.webkit.org/show_bug.cgi?id=123557.
+ On window.open, update page when the UIProcess sends the create message
+
+ * platform/mac-wk2/TestExpectations:
+ - test is bad (results in DRT don't reflect in browser behaviour).
+
</ins><span class="cx"> 2014-01-15 Frédéric Wang <fred.wang@free.fr>
</span><span class="cx">
</span><span class="cx"> [SVG] Accept HTML and MathML namespaces as valid requiredExtensions
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (162087 => 162088)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/TestExpectations 2014-01-15 21:30:26 UTC (rev 162087)
+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations 2014-01-15 21:39:14 UTC (rev 162088)
</span><span class="lines">@@ -443,6 +443,9 @@
</span><span class="cx"> # <rdar://problem/15171108>
</span><span class="cx"> [ Mavericks ] fast/forms/form-associated-element-removal.html [ Crash Pass ]
</span><span class="cx">
</span><ins>+# test results in DRT don't match in browser behavior, test seems broken
+fast/dom/Window/mozilla-focus-blur.html [ Failure ]
+
</ins><span class="cx"> webkit.org/b/126962 plugins/plugin-document-load-prevented-userscript.html [ Crash Pass Timeout ]
</span><span class="cx">
</span><span class="cx"> ### END OF (3) Unclassified failures
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (162087 => 162088)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-01-15 21:30:26 UTC (rev 162087)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-15 21:39:14 UTC (rev 162088)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2014-01-10 Gavin Barraclough <barraclough@apple.com>
+
+ REGRESSION (r158369): Some pop-up windows open at incorrect size (affects GMail, theblaze.com)
+ https://bugs.webkit.org/show_bug.cgi?id=126289
+
+ Reviewed by Anders Carlson.
+
+ Partial revert of https://bugs.webkit.org/show_bug.cgi?id=123557.
+ On window.open, update page when the UIProcess sends the create message
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::initializeWebPage):
+ (WebKit::WebPageProxy::creationParameters):
+ * UIProcess/WebPageProxy.h:
+ - creation paraments are not preserved at window.open.
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::reinitializeWebPage):
+ (WebKit::WebPage::setViewState):
+ (WebKit::WebPage::setViewStateInternal):
+ * WebProcess/WebPage/WebPage.h:
+ - add interface to update page.
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::createWebPage):
+ - if we try to create a page that already exists, update the current page's view state.
+
</ins><span class="cx"> 2014-01-15 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Web process sometimes crashes when printing in synchronous mode
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (162087 => 162088)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-01-15 21:30:26 UTC (rev 162087)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-01-15 21:39:14 UTC (rev 162088)
</span><span class="lines">@@ -517,8 +517,7 @@
</span><span class="cx"> inspector()->enableRemoteInspection();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- initializeCreationParameters();
- process().send(Messages::WebProcess::CreateWebPage(m_pageID, m_creationParameters), 0);
</del><ins>+ process().send(Messages::WebProcess::CreateWebPage(m_pageID, creationParameters()), 0);
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> send(Messages::WebPage::SetSmartInsertDeleteEnabled(m_isSmartInsertDeleteEnabled));
</span><span class="lines">@@ -3868,41 +3867,45 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::initializeCreationParameters()
</del><ins>+WebPageCreationParameters WebPageProxy::creationParameters()
</ins><span class="cx"> {
</span><del>- m_creationParameters.viewSize = m_pageClient.viewSize();
- m_creationParameters.viewState = m_viewState;
- m_creationParameters.drawingAreaType = m_drawingArea->type();
- m_creationParameters.store = m_pageGroup->preferences()->store();
- m_creationParameters.pageGroupData = m_pageGroup->data();
- m_creationParameters.drawsBackground = m_drawsBackground;
- m_creationParameters.drawsTransparentBackground = m_drawsTransparentBackground;
- m_creationParameters.underlayColor = m_underlayColor;
- m_creationParameters.areMemoryCacheClientCallsEnabled = m_areMemoryCacheClientCallsEnabled;
- m_creationParameters.useFixedLayout = m_useFixedLayout;
- m_creationParameters.fixedLayoutSize = m_fixedLayoutSize;
- m_creationParameters.suppressScrollbarAnimations = m_suppressScrollbarAnimations;
- m_creationParameters.paginationMode = m_paginationMode;
- m_creationParameters.paginationBehavesLikeColumns = m_paginationBehavesLikeColumns;
- m_creationParameters.pageLength = m_pageLength;
- m_creationParameters.gapBetweenPages = m_gapBetweenPages;
- m_creationParameters.userAgent = userAgent();
- m_creationParameters.sessionState = SessionState(m_backForwardList->entries(), m_backForwardList->currentIndex());
- m_creationParameters.highestUsedBackForwardItemID = WebBackForwardListItem::highedUsedItemID();
- m_creationParameters.canRunBeforeUnloadConfirmPanel = m_uiClient.canRunBeforeUnloadConfirmPanel();
- m_creationParameters.canRunModal = m_canRunModal;
- m_creationParameters.deviceScaleFactor = deviceScaleFactor();
- m_creationParameters.mediaVolume = m_mediaVolume;
- m_creationParameters.mayStartMediaWhenInWindow = m_mayStartMediaWhenInWindow;
- m_creationParameters.minimumLayoutSize = m_minimumLayoutSize;
- m_creationParameters.autoSizingShouldExpandToViewHeight = m_autoSizingShouldExpandToViewHeight;
- m_creationParameters.scrollPinningBehavior = m_scrollPinningBehavior;
- m_creationParameters.backgroundExtendsBeyondPage = m_backgroundExtendsBeyondPage;
- m_creationParameters.layerHostingMode = m_layerHostingMode;
</del><ins>+ WebPageCreationParameters parameters;
</ins><span class="cx">
</span><ins>+ parameters.viewSize = m_pageClient.viewSize();
+ parameters.viewState = m_viewState;
+ parameters.drawingAreaType = m_drawingArea->type();
+ parameters.store = m_pageGroup->preferences()->store();
+ parameters.pageGroupData = m_pageGroup->data();
+ parameters.drawsBackground = m_drawsBackground;
+ parameters.drawsTransparentBackground = m_drawsTransparentBackground;
+ parameters.underlayColor = m_underlayColor;
+ parameters.areMemoryCacheClientCallsEnabled = m_areMemoryCacheClientCallsEnabled;
+ parameters.useFixedLayout = m_useFixedLayout;
+ parameters.fixedLayoutSize = m_fixedLayoutSize;
+ parameters.suppressScrollbarAnimations = m_suppressScrollbarAnimations;
+ parameters.paginationMode = m_paginationMode;
+ parameters.paginationBehavesLikeColumns = m_paginationBehavesLikeColumns;
+ parameters.pageLength = m_pageLength;
+ parameters.gapBetweenPages = m_gapBetweenPages;
+ parameters.userAgent = userAgent();
+ parameters.sessionState = SessionState(m_backForwardList->entries(), m_backForwardList->currentIndex());
+ parameters.highestUsedBackForwardItemID = WebBackForwardListItem::highedUsedItemID();
+ parameters.canRunBeforeUnloadConfirmPanel = m_uiClient.canRunBeforeUnloadConfirmPanel();
+ parameters.canRunModal = m_canRunModal;
+ parameters.deviceScaleFactor = deviceScaleFactor();
+ parameters.mediaVolume = m_mediaVolume;
+ parameters.mayStartMediaWhenInWindow = m_mayStartMediaWhenInWindow;
+ parameters.minimumLayoutSize = m_minimumLayoutSize;
+ parameters.autoSizingShouldExpandToViewHeight = m_autoSizingShouldExpandToViewHeight;
+ parameters.scrollPinningBehavior = m_scrollPinningBehavior;
+ parameters.backgroundExtendsBeyondPage = m_backgroundExtendsBeyondPage;
+ parameters.layerHostingMode = m_layerHostingMode;
+
</ins><span class="cx"> #if PLATFORM(MAC) && !PLATFORM(IOS)
</span><del>- m_creationParameters.colorSpace = m_pageClient.colorSpace();
</del><ins>+ parameters.colorSpace = m_pageClient.colorSpace();
</ins><span class="cx"> #endif
</span><ins>+
+ return parameters;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if USE(ACCELERATED_COMPOSITING)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (162087 => 162088)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-01-15 21:30:26 UTC (rev 162087)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-01-15 21:39:14 UTC (rev 162088)
</span><span class="lines">@@ -734,10 +734,7 @@
</span><span class="cx"> void didChooseFilesForOpenPanel(const Vector<String>&);
</span><span class="cx"> void didCancelForOpenPanel();
</span><span class="cx">
</span><del>- WebPageCreationParameters creationParameters() const
- {
- return m_creationParameters;
- }
</del><ins>+ WebPageCreationParameters creationParameters();
</ins><span class="cx">
</span><span class="cx"> #if USE(COORDINATED_GRAPHICS)
</span><span class="cx"> void findZoomableAreaForPoint(const WebCore::IntPoint&, const WebCore::IntSize&);
</span><span class="lines">@@ -856,7 +853,6 @@
</span><span class="cx"> private:
</span><span class="cx"> WebPageProxy(PageClient&, WebProcessProxy&, WebPageGroup&, uint64_t pageID);
</span><span class="cx"> void platformInitialize();
</span><del>- void initializeCreationParameters();
</del><span class="cx">
</span><span class="cx"> void updateViewState(WebCore::ViewState::Flags flagsToUpdate = WebCore::ViewState::AllFlags);
</span><span class="cx">
</span><span class="lines">@@ -1373,8 +1369,6 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> WebCore::ScrollPinningBehavior m_scrollPinningBehavior;
</span><del>-
- WebPageCreationParameters m_creationParameters;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (162087 => 162088)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-01-15 21:30:26 UTC (rev 162087)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-01-15 21:39:14 UTC (rev 162088)
</span><span class="lines">@@ -420,6 +420,14 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebPage::reinitializeWebPage(const WebPageCreationParameters& parameters)
+{
+ if (m_viewState != parameters.viewState)
+ setViewStateInternal(parameters.viewState, true);
+ if (m_layerHostingMode != parameters.layerHostingMode)
+ setLayerHostingMode(parameters.layerHostingMode);
+}
+
</ins><span class="cx"> WebPage::~WebPage()
</span><span class="cx"> {
</span><span class="cx"> if (m_backForwardList)
</span><span class="lines">@@ -2028,19 +2036,24 @@
</span><span class="cx">
</span><span class="cx"> void WebPage::setViewState(ViewState::Flags viewState, bool wantsDidUpdateViewState)
</span><span class="cx"> {
</span><ins>+ setViewStateInternal(viewState, false);
+
+ if (wantsDidUpdateViewState)
+ m_sendDidUpdateViewStateTimer.startOneShot(0);
+}
+
+void WebPage::setViewStateInternal(ViewState::Flags viewState, bool isInitialState)
+{
</ins><span class="cx"> ViewState::Flags changed = m_viewState ^ viewState;
</span><span class="cx"> m_viewState = viewState;
</span><span class="cx">
</span><span class="cx"> m_drawingArea->viewStateDidChange(changed);
</span><del>- m_page->setViewState(viewState);
</del><ins>+ m_page->setViewState(viewState, isInitialState);
</ins><span class="cx"> for (auto* pluginView : m_pluginViews)
</span><span class="cx"> pluginView->viewStateDidChange(changed);
</span><span class="cx">
</span><span class="cx"> if (changed & ViewState::IsInWindow)
</span><span class="cx"> updateIsInWindow();
</span><del>-
- if (wantsDidUpdateViewState)
- m_sendDidUpdateViewStateTimer.startOneShot(0);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPage::setLayerHostingMode(unsigned layerHostingMode)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (162087 => 162088)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-01-15 21:30:26 UTC (rev 162087)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-01-15 21:39:14 UTC (rev 162088)
</span><span class="lines">@@ -170,6 +170,8 @@
</span><span class="cx"> static PassRefPtr<WebPage> create(uint64_t pageID, const WebPageCreationParameters&);
</span><span class="cx"> virtual ~WebPage();
</span><span class="cx">
</span><ins>+ void reinitializeWebPage(const WebPageCreationParameters&);
+
</ins><span class="cx"> void close();
</span><span class="cx">
</span><span class="cx"> static WebPage* fromCorePage(WebCore::Page*);
</span><span class="lines">@@ -730,6 +732,7 @@
</span><span class="cx"> void setWindowResizerSize(const WebCore::IntSize&);
</span><span class="cx"> void updateIsInWindow(bool isInitialState = false);
</span><span class="cx"> void setViewState(WebCore::ViewState::Flags, bool wantsDidUpdateViewState);
</span><ins>+ void setViewStateInternal(WebCore::ViewState::Flags, bool isInitialState);
</ins><span class="cx"> void validateCommand(const String&, uint64_t);
</span><span class="cx"> void executeEditCommand(const String&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (162087 => 162088)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2014-01-15 21:30:26 UTC (rev 162087)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2014-01-15 21:39:14 UTC (rev 162088)
</span><span class="lines">@@ -564,7 +564,8 @@
</span><span class="cx">
</span><span class="cx"> // Balanced by an enableTermination in removeWebPage.
</span><span class="cx"> disableTermination();
</span><del>- }
</del><ins>+ } else
+ result.iterator->value->reinitializeWebPage(parameters);
</ins><span class="cx">
</span><span class="cx"> ASSERT(result.iterator->value);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>