<!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>[163679] 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/163679">163679</a></dd>
<dt>Author</dt> <dd>barraclough@apple.com</dd>
<dt>Date</dt> <dd>2014-02-07 18:25:03 -0800 (Fri, 07 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove isInitialState flag from Page::setViewState
https://bugs.webkit.org/show_bug.cgi?id=128428
Reviewed by Sam Weinig.
Source/WebCore:
* WebCore.exp.in:
- removed isInitialState.
* page/Page.cpp:
(WebCore::Page::setViewState):
- removed isInitialState.
(WebCore::Page::setIsVisible):
- removed isInitialState.
(WebCore::Page::setIsVisibleInternal):
- removed isInitialState.
* page/Page.h:
- removed isInitialState.
Source/WebKit/efl:
* ewk/ewk_view.cpp:
(ewk_view_visibility_state_set):
- don't pass isInitialState to setViewState.
Source/WebKit/gtk:
* WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
(DumpRenderTreeSupportGtk::setPageVisibility):
- don't pass isInitialState to setViewState.
Source/WebKit/mac:
* WebView/WebView.mm:
(-[WebView _commonInitializationWithFrameName:groupName:]):
(-[WebView _updateVisibilityState]):
(-[WebView _setIsVisible:]):
(-[WebView _setVisibilityState:isInitialState:]):
(-[WebView _windowWillOrderOnScreen:]):
(-[WebView _windowWillOrderOffScreen:]):
- don't pass isInitialState to setViewState.
Source/WebKit2:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::WebPage):
- don't pass isInitialState to setViewState.
(WebKit::WebPage::reinitializeWebPage):
- if the viewState changes this should fire a visibility event.
(WebKit::WebPage::setViewState):
- merged with setViewStateInternal.
* WebProcess/WebPage/WebPage.h:
- removed setViewStateInternal.
LayoutTests:
* fast/events/page-visibility-iframe-delete-test.html:
* fast/events/page-visibility-iframe-move-test.html:
- resetPageVisibility will now cause additional visibiliy events to fire;
clean up the event listeners to avoid this affecting the test results.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfasteventspagevisibilityiframedeletetesthtml">trunk/LayoutTests/fast/events/page-visibility-iframe-delete-test.html</a></li>
<li><a href="#trunkLayoutTestsfasteventspagevisibilityiframemovetesthtml">trunk/LayoutTests/fast/events/page-visibility-iframe-move-test.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCorepagePagecpp">trunk/Source/WebCore/page/Page.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageh">trunk/Source/WebCore/page/Page.h</a></li>
<li><a href="#trunkSourceWebKiteflChangeLog">trunk/Source/WebKit/efl/ChangeLog</a></li>
<li><a href="#trunkSourceWebKiteflewkewk_viewcpp">trunk/Source/WebKit/efl/ewk/ewk_view.cpp</a></li>
<li><a href="#trunkSourceWebKitgtkChangeLog">trunk/Source/WebKit/gtk/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitgtkWebCoreSupportDumpRenderTreeSupportGtkcpp">trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (163678 => 163679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-02-08 02:23:44 UTC (rev 163678)
+++ trunk/LayoutTests/ChangeLog 2014-02-08 02:25:03 UTC (rev 163679)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-02-07 Gavin Barraclough <barraclough@apple.com>
+
+ Remove isInitialState flag from Page::setViewState
+ https://bugs.webkit.org/show_bug.cgi?id=128428
+
+ Reviewed by Sam Weinig.
+
+ * fast/events/page-visibility-iframe-delete-test.html:
+ * fast/events/page-visibility-iframe-move-test.html:
+ - resetPageVisibility will now cause additional visibiliy events to fire;
+ clean up the event listeners to avoid this affecting the test results.
+
</ins><span class="cx"> 2014-02-07 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> Should get rid of TileController's CoverageForSlowScrolling mode
</span></span></pre></div>
<a id="trunkLayoutTestsfasteventspagevisibilityiframedeletetesthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/events/page-visibility-iframe-delete-test.html (163678 => 163679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/page-visibility-iframe-delete-test.html 2014-02-08 02:23:44 UTC (rev 163678)
+++ trunk/LayoutTests/fast/events/page-visibility-iframe-delete-test.html 2014-02-08 02:25:03 UTC (rev 163679)
</span><span class="lines">@@ -15,6 +15,7 @@
</span><span class="cx"> var docsLoaded = 0;
</span><span class="cx"> var mainPageVisibilityChangeDone = false;
</span><span class="cx"> var frame2VisiblityChangeDone = false;
</span><ins>+var finishTestDone = false;
</ins><span class="cx">
</span><span class="cx"> function startTest() {
</span><span class="cx"> ++docsLoaded;
</span><span class="lines">@@ -43,6 +44,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function finishTest() {
</span><ins>+ document.removeEventListener(
+ "visibilitychange", onMainPageVisibilityChange, false);
+ frame2.contentDocument.removeEventListener(
+ "visibilitychange", onFrame2VisibilityChange, false);
+
</ins><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.resetPageVisibility();
</span><span class="cx"> finishJSTest();
</span></span></pre></div>
<a id="trunkLayoutTestsfasteventspagevisibilityiframemovetesthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/events/page-visibility-iframe-move-test.html (163678 => 163679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/page-visibility-iframe-move-test.html 2014-02-08 02:23:44 UTC (rev 163678)
+++ trunk/LayoutTests/fast/events/page-visibility-iframe-move-test.html 2014-02-08 02:25:03 UTC (rev 163679)
</span><span class="lines">@@ -61,6 +61,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function finishTest() {
</span><ins>+ document.removeEventListener("visibilitychange",
+ onVisibilityChange, false);
+ window2.removeEventListener("load", window2Loaded, false);
+
</ins><span class="cx"> if (window.testRunner) {
</span><span class="cx"> testRunner.resetPageVisibility();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163678 => 163679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-08 02:23:44 UTC (rev 163678)
+++ trunk/Source/WebCore/ChangeLog 2014-02-08 02:25:03 UTC (rev 163679)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-02-07 Gavin Barraclough <barraclough@apple.com>
+
+ Remove isInitialState flag from Page::setViewState
+ https://bugs.webkit.org/show_bug.cgi?id=128428
+
+ Reviewed by Sam Weinig.
+
+ * WebCore.exp.in:
+ - removed isInitialState.
+ * page/Page.cpp:
+ (WebCore::Page::setViewState):
+ - removed isInitialState.
+ (WebCore::Page::setIsVisible):
+ - removed isInitialState.
+ (WebCore::Page::setIsVisibleInternal):
+ - removed isInitialState.
+ * page/Page.h:
+ - removed isInitialState.
+
</ins><span class="cx"> 2014-02-07 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Encode requestedScrollPosition on ScrollingStateScrollingNodes to send to the UI process
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (163678 => 163679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-02-08 02:23:44 UTC (rev 163678)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-02-08 02:25:03 UTC (rev 163679)
</span><span class="lines">@@ -992,8 +992,8 @@
</span><span class="cx"> __ZN7WebCore4Page11PageClientsC1Ev
</span><span class="cx"> __ZN7WebCore4Page11PageClientsD1Ev
</span><span class="cx"> __ZN7WebCore4Page12setGroupNameERKN3WTF6StringE
</span><del>-__ZN7WebCore4Page12setIsVisibleEbb
-__ZN7WebCore4Page12setViewStateEjb
</del><ins>+__ZN7WebCore4Page12setIsVisibleEb
+__ZN7WebCore4Page12setViewStateEj
</ins><span class="cx"> __ZN7WebCore4Page13rangeOfStringERKN3WTF6StringEPNS_5RangeEj
</span><span class="cx"> __ZN7WebCore4Page13setIsInWindowEb
</span><span class="cx"> __ZN7WebCore4Page13setPaginationERKNS_10PaginationE
</span></span></pre></div>
<a id="trunkSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.cpp (163678 => 163679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.cpp 2014-02-08 02:23:44 UTC (rev 163678)
+++ trunk/Source/WebCore/page/Page.cpp 2014-02-08 02:25:03 UTC (rev 163679)
</span><span class="lines">@@ -1148,7 +1148,7 @@
</span><span class="cx"> CachedImage::resumeAnimatingImagesForLoader(frame->document()->cachedResourceLoader());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Page::setViewState(ViewState::Flags viewState, bool isInitialState)
</del><ins>+void Page::setViewState(ViewState::Flags viewState)
</ins><span class="cx"> {
</span><span class="cx"> ViewState::Flags changed = m_viewState ^ viewState;
</span><span class="cx"> if (!changed)
</span><span class="lines">@@ -1158,19 +1158,19 @@
</span><span class="cx"> m_focusController->setViewState(viewState);
</span><span class="cx">
</span><span class="cx"> if (changed & ViewState::IsVisible)
</span><del>- setIsVisibleInternal(viewState & ViewState::IsVisible, isInitialState);
</del><ins>+ setIsVisibleInternal(viewState & ViewState::IsVisible);
</ins><span class="cx"> if (changed & ViewState::IsInWindow)
</span><span class="cx"> setIsInWindowInternal(viewState & ViewState::IsInWindow);
</span><span class="cx"> if (changed & ViewState::IsVisuallyIdle)
</span><span class="cx"> setIsVisuallyIdleInternal(viewState & ViewState::IsVisuallyIdle);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Page::setIsVisible(bool isVisible, bool isInitialState)
</del><ins>+void Page::setIsVisible(bool isVisible)
</ins><span class="cx"> {
</span><del>- setViewState(isVisible ? m_viewState | ViewState::IsVisible : m_viewState & ~ViewState::IsVisible, isInitialState);
</del><ins>+ setViewState(isVisible ? m_viewState | ViewState::IsVisible : m_viewState & ~ViewState::IsVisible);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void Page::setIsVisibleInternal(bool isVisible, bool isInitialState)
</del><ins>+void Page::setIsVisibleInternal(bool isVisible)
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: The visibility state should be stored on the top-level document.
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=116769
</span><span class="lines">@@ -1199,16 +1199,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(PAGE_VISIBILITY_API)
</span><del>- if (!isInitialState) {
- Vector<Ref<Document>> documents;
- for (Frame* frame = m_mainFrame.get(); frame; frame = frame->tree().traverseNext())
- documents.append(*frame->document());
</del><ins>+ Vector<Ref<Document>> documents;
+ for (Frame* frame = m_mainFrame.get(); frame; frame = frame->tree().traverseNext())
+ documents.append(*frame->document());
</ins><span class="cx">
</span><del>- for (size_t i = 0, size = documents.size(); i < size; ++i)
- documents[i]->visibilityStateChanged();
- }
-#else
- UNUSED_PARAM(isInitialState);
</del><ins>+ for (size_t i = 0, size = documents.size(); i < size; ++i)
+ documents[i]->visibilityStateChanged();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (!isVisible) {
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.h (163678 => 163679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.h 2014-02-08 02:23:44 UTC (rev 163678)
+++ trunk/Source/WebCore/page/Page.h 2014-02-08 02:25:03 UTC (rev 163679)
</span><span class="lines">@@ -290,8 +290,8 @@
</span><span class="cx"> unsigned pageCount() const;
</span><span class="cx">
</span><span class="cx"> // Notifications when the Page starts and stops being presented via a native window.
</span><del>- void setViewState(ViewState::Flags, bool isInitial = false);
- void setIsVisible(bool isVisible, bool isInitial);
</del><ins>+ void setViewState(ViewState::Flags);
+ void setIsVisible(bool);
</ins><span class="cx"> void setIsPrerender();
</span><span class="cx"> bool isVisible() const { return m_viewState & ViewState::IsVisible; }
</span><span class="cx">
</span><span class="lines">@@ -419,7 +419,7 @@
</span><span class="cx"> void initGroup();
</span><span class="cx">
</span><span class="cx"> void setIsInWindowInternal(bool);
</span><del>- void setIsVisibleInternal(bool isVisible, bool isInitial);
</del><ins>+ void setIsVisibleInternal(bool);
</ins><span class="cx"> void setIsVisuallyIdleInternal(bool);
</span><span class="cx">
</span><span class="cx"> #if ASSERT_DISABLED
</span></span></pre></div>
<a id="trunkSourceWebKiteflChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/efl/ChangeLog (163678 => 163679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/efl/ChangeLog 2014-02-08 02:23:44 UTC (rev 163678)
+++ trunk/Source/WebKit/efl/ChangeLog 2014-02-08 02:25:03 UTC (rev 163679)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-02-07 Gavin Barraclough <barraclough@apple.com>
+
+ Remove isInitialState flag from Page::setViewState
+ https://bugs.webkit.org/show_bug.cgi?id=128428
+
+ Reviewed by Sam Weinig.
+
+ * ewk/ewk_view.cpp:
+ (ewk_view_visibility_state_set):
+ - don't pass isInitialState to setViewState.
+
</ins><span class="cx"> 2014-02-05 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove ENABLE(DIRECTORY_UPLOAD).
</span></span></pre></div>
<a id="trunkSourceWebKiteflewkewk_viewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/efl/ewk/ewk_view.cpp (163678 => 163679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/efl/ewk/ewk_view.cpp 2014-02-08 02:23:44 UTC (rev 163678)
+++ trunk/Source/WebKit/efl/ewk/ewk_view.cpp 2014-02-08 02:25:03 UTC (rev 163679)
</span><span class="lines">@@ -4442,7 +4442,7 @@
</span><span class="cx"> evas_object_smart_callback_call(ewkView, "mixedcontent,run", 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Eina_Bool ewk_view_visibility_state_set(Evas_Object* ewkView, Ewk_Page_Visibility_State pageVisibilityState, Eina_Bool initialState)
</del><ins>+Eina_Bool ewk_view_visibility_state_set(Evas_Object* ewkView, Ewk_Page_Visibility_State pageVisibilityState, Eina_Bool)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(PAGE_VISIBILITY_API)
</span><span class="cx"> EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData, false);
</span><span class="lines">@@ -4452,7 +4452,7 @@
</span><span class="cx"> if (pageVisibilityState == EWK_PAGE_VISIBILITY_STATE_UNLOADED)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- priv->page->setIsVisible(pageVisibilityState == EWK_PAGE_VISIBILITY_STATE_VISIBLE, initialState);
</del><ins>+ priv->page->setIsVisible(pageVisibilityState == EWK_PAGE_VISIBILITY_STATE_VISIBLE);
</ins><span class="cx"> if (pageVisibilityState == EWK_PAGE_VISIBILITY_STATE_PRERENDER)
</span><span class="cx"> priv->page->setIsPrerender();
</span><span class="cx">
</span><span class="lines">@@ -4461,7 +4461,6 @@
</span><span class="cx"> DBG("PAGE_VISIBILITY_API is disabled.");
</span><span class="cx"> UNUSED_PARAM(ewkView);
</span><span class="cx"> UNUSED_PARAM(pageVisibilityState);
</span><del>- UNUSED_PARAM(initialState);
</del><span class="cx"> return false;
</span><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitgtkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/ChangeLog (163678 => 163679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/ChangeLog 2014-02-08 02:23:44 UTC (rev 163678)
+++ trunk/Source/WebKit/gtk/ChangeLog 2014-02-08 02:25:03 UTC (rev 163679)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-02-07 Gavin Barraclough <barraclough@apple.com>
+
+ Remove isInitialState flag from Page::setViewState
+ https://bugs.webkit.org/show_bug.cgi?id=128428
+
+ Reviewed by Sam Weinig.
+
+ * WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
+ (DumpRenderTreeSupportGtk::setPageVisibility):
+ - don't pass isInitialState to setViewState.
+
</ins><span class="cx"> 2014-02-06 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Add Console support to JSContext Inspection
</span></span></pre></div>
<a id="trunkSourceWebKitgtkWebCoreSupportDumpRenderTreeSupportGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp (163678 => 163679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp 2014-02-08 02:23:44 UTC (rev 163678)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp 2014-02-08 02:25:03 UTC (rev 163679)
</span><span class="lines">@@ -680,14 +680,14 @@
</span><span class="cx"> s_authenticationCallback = authenticationCallback;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DumpRenderTreeSupportGtk::setPageVisibility(WebKitWebView* webView, WebCore::PageVisibilityState visibilityState, bool isInitialState)
</del><ins>+void DumpRenderTreeSupportGtk::setPageVisibility(WebKitWebView* webView, WebCore::PageVisibilityState visibilityState, bool)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(PAGE_VISIBILITY_API)
</span><span class="cx"> Page* page = core(webView);
</span><span class="cx"> if (!page)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- page->setIsVisible(visibilityState == PageVisibilityStateVisible, isInitialState);
</del><ins>+ page->setIsVisible(visibilityState == PageVisibilityStateVisible);
</ins><span class="cx"> if (visibilityState == PageVisibilityStatePrerender)
</span><span class="cx"> page->setIsPrerender();
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (163678 => 163679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-02-08 02:23:44 UTC (rev 163678)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-02-08 02:25:03 UTC (rev 163679)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-02-07 Gavin Barraclough <barraclough@apple.com>
+
+ Remove isInitialState flag from Page::setViewState
+ https://bugs.webkit.org/show_bug.cgi?id=128428
+
+ Reviewed by Sam Weinig.
+
+ * WebView/WebView.mm:
+ (-[WebView _commonInitializationWithFrameName:groupName:]):
+ (-[WebView _updateVisibilityState]):
+ (-[WebView _setIsVisible:]):
+ (-[WebView _setVisibilityState:isInitialState:]):
+ (-[WebView _windowWillOrderOnScreen:]):
+ (-[WebView _windowWillOrderOffScreen:]):
+ - don't pass isInitialState to setViewState.
+
</ins><span class="cx"> 2014-02-06 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> More FTL build scaffolding
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (163678 => 163679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2014-02-08 02:23:44 UTC (rev 163678)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2014-02-08 02:25:03 UTC (rev 163679)
</span><span class="lines">@@ -994,7 +994,7 @@
</span><span class="cx"> [self _registerDraggedTypes];
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- [self _setIsVisible:[self _isViewVisible] isInitialState:YES];
</del><ins>+ [self _setIsVisible:[self _isViewVisible]];
</ins><span class="cx">
</span><span class="cx"> WebPreferences *prefs = [self preferences];
</span><span class="cx"> [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_preferencesChangedNotification:)
</span><span class="lines">@@ -4009,7 +4009,7 @@
</span><span class="cx"> - (void)_updateVisibilityState
</span><span class="cx"> {
</span><span class="cx"> if (_private && _private->page)
</span><del>- [self _setIsVisible:[self _isViewVisible] isInitialState:NO];
</del><ins>+ [self _setIsVisible:[self _isViewVisible]];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_updateActiveState
</span><span class="lines">@@ -4374,16 +4374,18 @@
</span><span class="cx"> return WebPageVisibilityStateVisible;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)_setIsVisible:(BOOL)isVisible isInitialState:(BOOL)isInitialState
</del><ins>+- (void)_setIsVisible:(BOOL)isVisible
</ins><span class="cx"> {
</span><span class="cx"> if (_private->page)
</span><del>- _private->page->setIsVisible(isVisible, isInitialState);
</del><ins>+ _private->page->setIsVisible(isVisible);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_setVisibilityState:(WebPageVisibilityState)visibilityState isInitialState:(BOOL)isInitialState
</span><span class="cx"> {
</span><ins>+ UNUSED_PARAM(isInitialState);
+
</ins><span class="cx"> if (_private->page) {
</span><del>- _private->page->setIsVisible(visibilityState == WebPageVisibilityStateVisible, isInitialState);
</del><ins>+ _private->page->setIsVisible(visibilityState == WebPageVisibilityStateVisible);
</ins><span class="cx"> if (visibilityState == WebPageVisibilityStatePrerender)
</span><span class="cx"> _private->page->setIsPrerender();
</span><span class="cx"> }
</span><span class="lines">@@ -5352,7 +5354,7 @@
</span><span class="cx">
</span><span class="cx"> if (_private && _private->page) {
</span><span class="cx"> _private->page->resumeScriptedAnimations();
</span><del>- _private->page->setIsVisible(true, false);
</del><ins>+ _private->page->setIsVisible(true);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -5365,7 +5367,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (_private && _private->page) {
</span><span class="cx"> _private->page->suspendScriptedAnimations();
</span><del>- _private->page->setIsVisible(false, false);
</del><ins>+ _private->page->setIsVisible(false);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (163678 => 163679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-02-08 02:23:44 UTC (rev 163678)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-08 02:25:03 UTC (rev 163679)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-02-07 Gavin Barraclough <barraclough@apple.com>
+
+ Remove isInitialState flag from Page::setViewState
+ https://bugs.webkit.org/show_bug.cgi?id=128428
+
+ Reviewed by Sam Weinig.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::WebPage):
+ - don't pass isInitialState to setViewState.
+ (WebKit::WebPage::reinitializeWebPage):
+ - if the viewState changes this should fire a visibility event.
+ (WebKit::WebPage::setViewState):
+ - merged with setViewStateInternal.
+ * WebProcess/WebPage/WebPage.h:
+ - removed setViewStateInternal.
+
</ins><span class="cx"> 2014-02-07 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Encode requestedScrollPosition on ScrollingStateScrollingNodes to send to the UI process
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (163678 => 163679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-02-08 02:23:44 UTC (rev 163678)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-02-08 02:25:03 UTC (rev 163679)
</span><span class="lines">@@ -384,7 +384,7 @@
</span><span class="cx">
</span><span class="cx"> setMemoryCacheMessagesEnabled(parameters.areMemoryCacheClientCallsEnabled);
</span><span class="cx">
</span><del>- m_page->setViewState(m_viewState, true);
</del><ins>+ m_page->setViewState(m_viewState);
</ins><span class="cx"> updateIsInWindow(true);
</span><span class="cx">
</span><span class="cx"> setMinimumLayoutSize(parameters.minimumLayoutSize);
</span><span class="lines">@@ -434,7 +434,7 @@
</span><span class="cx"> void WebPage::reinitializeWebPage(const WebPageCreationParameters& parameters)
</span><span class="cx"> {
</span><span class="cx"> if (m_viewState != parameters.viewState)
</span><del>- setViewStateInternal(parameters.viewState, true);
</del><ins>+ setViewState(parameters.viewState);
</ins><span class="cx"> if (m_layerHostingMode != parameters.layerHostingMode)
</span><span class="cx"> setLayerHostingMode(static_cast<unsigned>(parameters.layerHostingMode));
</span><span class="cx"> }
</span><span class="lines">@@ -2069,24 +2069,19 @@
</span><span class="cx">
</span><span class="cx"> void WebPage::setViewState(ViewState::Flags viewState, bool wantsDidUpdateViewState)
</span><span class="cx"> {
</span><del>- setViewStateInternal(viewState, false);
-
- if (wantsDidUpdateViewState)
- m_sendDidUpdateViewStateTimer.startOneShot(0);
-}
-
-void WebPage::setViewStateInternal(ViewState::Flags viewState, bool isInitialState)
-{
</del><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, isInitialState);
</del><ins>+ m_page->setViewState(viewState);
</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><ins>+
+ if (wantsDidUpdateViewState)
+ m_sendDidUpdateViewStateTimer.startOneShot(0);
</ins><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 (163678 => 163679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-02-08 02:23:44 UTC (rev 163678)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-02-08 02:25:03 UTC (rev 163679)
</span><span class="lines">@@ -760,8 +760,7 @@
</span><span class="cx"> void setInitialFocus(bool forward, bool isKeyboardEventValid, const WebKeyboardEvent&);
</span><span class="cx"> void setWindowResizerSize(const WebCore::IntSize&);
</span><span class="cx"> void updateIsInWindow(bool isInitialState = false);
</span><del>- void setViewState(WebCore::ViewState::Flags, bool wantsDidUpdateViewState);
- void setViewStateInternal(WebCore::ViewState::Flags, bool isInitialState);
</del><ins>+ void setViewState(WebCore::ViewState::Flags, bool wantsDidUpdateViewState = false);
</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>
</div>
</body>
</html>