<!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>[163061] trunk/Source</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/163061">163061</a></dd>
<dt>Author</dt> <dd>barraclough@apple.com</dd>
<dt>Date</dt> <dd>2014-01-29 18:10:00 -0800 (Wed, 29 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add IsVisibleOrOccluded to ViewState
https://bugs.webkit.org/show_bug.cgi?id=127875
Reviewed by Anders Carlsson.
../WebCore:
* page/ViewState.h:
- added IsVisibleOrOccluded
../WebKit2:
When the WKView associated with a plugin becomes occluded
we tell the plugin it is no longer visible. This is a problem
if the plugin is being occluded by its own fullscreen window.
Instead, consider plugins to be visible any time they are in
a visible window – i.e. when they are visible or occluded.
* UIProcess/API/mac/PageClientImpl.h:
* UIProcess/API/mac/PageClientImpl.mm:
(WebKit::PageClientImpl::isViewVisibleOrOccluded):
* UIProcess/PageClient.h:
(WebKit::PageClient::isViewVisibleOrOccluded):
- added isViewVisibleOrOccluded.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::updateViewState):
- update IsVisibleOrOccluded.
(WebKit::WebPageProxy::viewStateDidChange):
- when updating IsVisible also update IsVisibleOrOccluded.
* WebProcess/Plugins/PluginView.cpp:
(WebKit::PluginView::platformViewStateDidChange):
- use isVisibleOrOccluded to determine plugin visibility.
* WebProcess/WebPage/WebPage.h:
(WebKit::WebPage::isVisibleOrOccluded):
- accessor.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageViewStateh">trunk/Source/WebCore/page/ViewState.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPImacPageClientImplh">trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPImacPageClientImplmm">trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPageClienth">trunk/Source/WebKit2/UIProcess/PageClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginViewcpp">trunk/Source/WebKit2/WebProcess/Plugins/PluginView.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="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163060 => 163061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-30 02:07:03 UTC (rev 163060)
+++ trunk/Source/WebCore/ChangeLog 2014-01-30 02:10:00 UTC (rev 163061)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-01-29 Gavin Barraclough <barraclough@apple.com>
+
+ Add IsVisibleOrOccluded to ViewState
+ https://bugs.webkit.org/show_bug.cgi?id=127875
+
+ Reviewed by Anders Carlsson.
+
+ * page/ViewState.h:
+ - added IsVisibleOrOccluded
+
</ins><span class="cx"> 2014-01-29 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> EventHandler::handleMouseReleaseEvent shouldn't call updateSelectionCachesIfSelectionIsInsideTextFormControl
</span></span></pre></div>
<a id="trunkSourceWebCorepageViewStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ViewState.h (163060 => 163061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ViewState.h 2014-01-30 02:07:03 UTC (rev 163060)
+++ trunk/Source/WebCore/page/ViewState.h 2014-01-30 02:10:00 UTC (rev 163061)
</span><span class="lines">@@ -33,14 +33,15 @@
</span><span class="cx"> WindowIsActive = 1 << 0,
</span><span class="cx"> IsFocused = 1 << 1,
</span><span class="cx"> IsVisible = 1 << 2,
</span><del>- IsInWindow = 1 << 3,
- IsVisuallyIdle = 1 << 4,
</del><ins>+ IsVisibleOrOccluded = 1 << 3,
+ IsInWindow = 1 << 4,
+ IsVisuallyIdle = 1 << 5,
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> typedef unsigned Flags;
</span><span class="cx">
</span><span class="cx"> static const Flags NoFlags = 0;
</span><del>- static const Flags AllFlags = WindowIsActive | IsFocused | IsVisible | IsInWindow | IsVisuallyIdle;
</del><ins>+ static const Flags AllFlags = WindowIsActive | IsFocused | IsVisible | IsVisibleOrOccluded | IsInWindow | IsVisuallyIdle;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (163060 => 163061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-01-30 02:07:03 UTC (rev 163060)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-30 02:10:00 UTC (rev 163061)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2014-01-29 Gavin Barraclough <barraclough@apple.com>
+
+ Add IsVisibleOrOccluded to ViewState
+ https://bugs.webkit.org/show_bug.cgi?id=127875
+
+ Reviewed by Anders Carlsson.
+
+ When the WKView associated with a plugin becomes occluded
+ we tell the plugin it is no longer visible. This is a problem
+ if the plugin is being occluded by its own fullscreen window.
+
+ Instead, consider plugins to be visible any time they are in
+ a visible window – i.e. when they are visible or occluded.
+
+ * UIProcess/API/mac/PageClientImpl.h:
+ * UIProcess/API/mac/PageClientImpl.mm:
+ (WebKit::PageClientImpl::isViewVisibleOrOccluded):
+ * UIProcess/PageClient.h:
+ (WebKit::PageClient::isViewVisibleOrOccluded):
+ - added isViewVisibleOrOccluded.
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::updateViewState):
+ - update IsVisibleOrOccluded.
+ (WebKit::WebPageProxy::viewStateDidChange):
+ - when updating IsVisible also update IsVisibleOrOccluded.
+ * WebProcess/Plugins/PluginView.cpp:
+ (WebKit::PluginView::platformViewStateDidChange):
+ - use isVisibleOrOccluded to determine plugin visibility.
+ * WebProcess/WebPage/WebPage.h:
+ (WebKit::WebPage::isVisibleOrOccluded):
+ - accessor.
+
</ins><span class="cx"> 2014-01-29 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Pass navigation IDs along to LoadRequest and Reload
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacPageClientImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.h (163060 => 163061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.h 2014-01-30 02:07:03 UTC (rev 163060)
+++ trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.h 2014-01-30 02:10:00 UTC (rev 163061)
</span><span class="lines">@@ -64,6 +64,7 @@
</span><span class="cx"> virtual bool isViewWindowActive();
</span><span class="cx"> virtual bool isViewFocused();
</span><span class="cx"> virtual bool isViewVisible();
</span><ins>+ virtual bool isViewVisibleOrOccluded();
</ins><span class="cx"> virtual bool isViewInWindow();
</span><span class="cx"> virtual bool isVisuallyIdle();
</span><span class="cx"> virtual LayerHostingMode viewLayerHostingMode() override;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacPageClientImplmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm (163060 => 163061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm 2014-01-30 02:07:03 UTC (rev 163060)
+++ trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm 2014-01-30 02:10:00 UTC (rev 163061)
</span><span class="lines">@@ -207,6 +207,11 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool PageClientImpl::isViewVisibleOrOccluded()
+{
+ return [[m_wkView window] isVisible];
+}
+
</ins><span class="cx"> bool PageClientImpl::isViewInWindow()
</span><span class="cx"> {
</span><span class="cx"> return [m_wkView window];
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPageClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/PageClient.h (163060 => 163061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/PageClient.h 2014-01-30 02:07:03 UTC (rev 163060)
+++ trunk/Source/WebKit2/UIProcess/PageClient.h 2014-01-30 02:10:00 UTC (rev 163061)
</span><span class="lines">@@ -105,6 +105,9 @@
</span><span class="cx"> // Return whether the view is visible.
</span><span class="cx"> virtual bool isViewVisible() = 0;
</span><span class="cx">
</span><ins>+ // Return whether the view is visible, or occluded by another window.
+ virtual bool isViewVisibleOrOccluded() { return isViewVisible(); }
+
</ins><span class="cx"> // Return whether the view is in a window.
</span><span class="cx"> virtual bool isViewInWindow() = 0;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (163060 => 163061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-01-30 02:07:03 UTC (rev 163060)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-01-30 02:10:00 UTC (rev 163061)
</span><span class="lines">@@ -934,6 +934,8 @@
</span><span class="cx"> m_viewState |= ViewState::WindowIsActive;
</span><span class="cx"> if (flagsToUpdate & ViewState::IsVisible && m_pageClient.isViewVisible())
</span><span class="cx"> m_viewState |= ViewState::IsVisible;
</span><ins>+ if (flagsToUpdate & ViewState::IsVisibleOrOccluded && m_pageClient.isViewVisibleOrOccluded())
+ m_viewState |= ViewState::IsVisibleOrOccluded;
</ins><span class="cx"> if (flagsToUpdate & ViewState::IsInWindow && m_pageClient.isViewInWindow())
</span><span class="cx"> m_viewState |= ViewState::IsInWindow;
</span><span class="cx"> if (flagsToUpdate & ViewState::IsVisuallyIdle && m_pageClient.isVisuallyIdle())
</span><span class="lines">@@ -945,9 +947,9 @@
</span><span class="cx"> if (!isValid())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- // If the visibility state may have changed, then so may the visually idle.
</del><ins>+ // If the visibility state may have changed, then so may the visually idle & occluded agnostic state.
</ins><span class="cx"> if (mayHaveChanged & ViewState::IsVisible)
</span><del>- mayHaveChanged |= ViewState::IsVisuallyIdle;
</del><ins>+ mayHaveChanged |= ViewState::IsVisibleOrOccluded | ViewState::IsVisuallyIdle;
</ins><span class="cx">
</span><span class="cx"> // Record the prior view state, update the flags that may have changed,
</span><span class="cx"> // and check which flags have actually changed.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp (163060 => 163061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2014-01-30 02:07:03 UTC (rev 163060)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2014-01-30 02:10:00 UTC (rev 163061)
</span><span class="lines">@@ -509,8 +509,8 @@
</span><span class="cx"> if (!m_plugin || !m_isInitialized)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (changed & ViewState::IsVisible)
- m_plugin->windowVisibilityChanged(m_webPage->isVisible());
</del><ins>+ if (changed & ViewState::IsVisibleOrOccluded)
+ m_plugin->windowVisibilityChanged(m_webPage->isVisibleOrOccluded());
</ins><span class="cx"> if (changed & ViewState::WindowIsActive)
</span><span class="cx"> m_plugin->windowFocusChanged(m_webPage->windowIsFocused());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (163060 => 163061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-01-30 02:07:03 UTC (rev 163060)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-01-30 02:10:00 UTC (rev 163061)
</span><span class="lines">@@ -361,6 +361,7 @@
</span><span class="cx"> void removePluginView(PluginView*);
</span><span class="cx">
</span><span class="cx"> bool isVisible() const { return m_viewState & WebCore::ViewState::IsVisible; }
</span><ins>+ bool isVisibleOrOccluded() const { return m_viewState & WebCore::ViewState::IsVisibleOrOccluded; }
</ins><span class="cx">
</span><span class="cx"> LayerHostingMode layerHostingMode() const { return m_layerHostingMode; }
</span><span class="cx"> void setLayerHostingMode(unsigned);
</span></span></pre>
</div>
</div>
</body>
</html>