<!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>[196062] 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/196062">196062</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-02-03 03:04:33 -0800 (Wed, 03 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Reduce IPC traffic due to view state changes
https://bugs.webkit.org/show_bug.cgi?id=153745
Reviewed by Sergio Villar Senin.
Very often view state changes happen one after another in a very
short period of time, even in the same run loop iteration. For
example, when you switch to the web view window, the view is
focused and the active window flag changes as well. In that case
we are sending two messages to the web process and the page
updates its status according to the new flags in two steps. So, we
could group all state changes happening in the same run loop
iteration and notify about them all in the next iteration. This
also prevents unnecessary changes of state when we quickly go back
to a previous state, for example in focus follows mouse
configurations if you move the mouse outside the window and then
inside the window again quickly.
* UIProcess/API/gtk/WebKitWebViewBase.cpp:
(_WebKitWebViewBasePrivate::_WebKitWebViewBasePrivate): Use
VirewState::Flags to keep the web view state instead of
boolean, and also to keep the flags that need to be updated. Use a
timer to update web view state flags.
(_WebKitWebViewBasePrivate::updateViewStateTimerFired): Call
WebPageProxy::viewStateDidChange() and reset the flags that need
to be updated.
(webkitWebViewBaseScheduleUpdateViewState): Update the flags that
need to be updated and schedule the timer if it's not active.
(toplevelWindowFocusInEvent): Use the flags and schedule an update.
(toplevelWindowFocusOutEvent): Ditto.
(toplevelWindowStateEvent): Also mark the view as hidden when minimized.
(webkitWebViewBaseSetToplevelOnScreenWindow): Connect to
window-state-event instead of deprecated visibility-notify-event.
(webkitWebViewBaseMap): Use the flags and schedule an update.
(webkitWebViewBaseUnmap): Ditto.
(webkitWebViewBaseSetFocus): Ditto.
(webkitWebViewBaseIsInWindowActive): Use the flags.
(webkitWebViewBaseIsFocused): Ditto
(webkitWebViewBaseIsVisible): Ditto.
(webkitWebViewBaseIsInWindow): Removed this since it was unused.
* UIProcess/API/gtk/WebKitWebViewBasePrivate.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewBasecpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewBasePrivateh">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBasePrivate.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (196061 => 196062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-02-03 10:37:12 UTC (rev 196061)
+++ trunk/Source/WebKit2/ChangeLog 2016-02-03 11:04:33 UTC (rev 196062)
</span><span class="lines">@@ -1,5 +1,49 @@
</span><span class="cx"> 2016-02-03 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><ins>+ [GTK] Reduce IPC traffic due to view state changes
+ https://bugs.webkit.org/show_bug.cgi?id=153745
+
+ Reviewed by Sergio Villar Senin.
+
+ Very often view state changes happen one after another in a very
+ short period of time, even in the same run loop iteration. For
+ example, when you switch to the web view window, the view is
+ focused and the active window flag changes as well. In that case
+ we are sending two messages to the web process and the page
+ updates its status according to the new flags in two steps. So, we
+ could group all state changes happening in the same run loop
+ iteration and notify about them all in the next iteration. This
+ also prevents unnecessary changes of state when we quickly go back
+ to a previous state, for example in focus follows mouse
+ configurations if you move the mouse outside the window and then
+ inside the window again quickly.
+
+ * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+ (_WebKitWebViewBasePrivate::_WebKitWebViewBasePrivate): Use
+ VirewState::Flags to keep the web view state instead of
+ boolean, and also to keep the flags that need to be updated. Use a
+ timer to update web view state flags.
+ (_WebKitWebViewBasePrivate::updateViewStateTimerFired): Call
+ WebPageProxy::viewStateDidChange() and reset the flags that need
+ to be updated.
+ (webkitWebViewBaseScheduleUpdateViewState): Update the flags that
+ need to be updated and schedule the timer if it's not active.
+ (toplevelWindowFocusInEvent): Use the flags and schedule an update.
+ (toplevelWindowFocusOutEvent): Ditto.
+ (toplevelWindowStateEvent): Also mark the view as hidden when minimized.
+ (webkitWebViewBaseSetToplevelOnScreenWindow): Connect to
+ window-state-event instead of deprecated visibility-notify-event.
+ (webkitWebViewBaseMap): Use the flags and schedule an update.
+ (webkitWebViewBaseUnmap): Ditto.
+ (webkitWebViewBaseSetFocus): Ditto.
+ (webkitWebViewBaseIsInWindowActive): Use the flags.
+ (webkitWebViewBaseIsFocused): Ditto
+ (webkitWebViewBaseIsVisible): Ditto.
+ (webkitWebViewBaseIsInWindow): Removed this since it was unused.
+ * UIProcess/API/gtk/WebKitWebViewBasePrivate.h:
+
+2016-02-03 Carlos Garcia Campos <cgarcia@igalia.com>
+
</ins><span class="cx"> Unreviewed. Fix incorrect ASSERT introduced in r196053.
</span><span class="cx">
</span><span class="cx"> * WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp:
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (196061 => 196062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2016-02-03 10:37:12 UTC (rev 196061)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2016-02-03 11:04:33 UTC (rev 196062)
</span><span class="lines">@@ -148,12 +148,23 @@
</span><span class="cx"> typedef HashMap<uint32_t, GUniquePtr<GdkEvent>> TouchEventsMap;
</span><span class="cx">
</span><span class="cx"> struct _WebKitWebViewBasePrivate {
</span><ins>+ _WebKitWebViewBasePrivate()
+ : updateViewStateTimer(RunLoop::main(), this, &_WebKitWebViewBasePrivate::updateViewStateTimerFired)
</ins><span class="cx"> #if USE(REDIRECTED_XCOMPOSITE_WINDOW)
</span><del>- _WebKitWebViewBasePrivate()
- : clearRedirectedWindowSoonTimer(RunLoop::main(), this, &_WebKitWebViewBasePrivate::clearRedirectedWindowSoonTimerFired)
</del><ins>+ , clearRedirectedWindowSoonTimer(RunLoop::main(), this, &_WebKitWebViewBasePrivate::clearRedirectedWindowSoonTimerFired)
+#endif
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ void updateViewStateTimerFired()
+ {
+ if (!pageProxy)
+ return;
+ pageProxy->viewStateDidChange(viewStateFlagsToUpdate);
+ viewStateFlagsToUpdate = ViewState::NoFlags;
+ }
+
+#if USE(REDIRECTED_XCOMPOSITE_WINDOW)
</ins><span class="cx"> void clearRedirectedWindowSoonTimerFired()
</span><span class="cx"> {
</span><span class="cx"> if (redirectedWindow)
</span><span class="lines">@@ -182,13 +193,12 @@
</span><span class="cx"> GtkWindow* toplevelOnScreenWindow;
</span><span class="cx"> unsigned long toplevelFocusInEventID;
</span><span class="cx"> unsigned long toplevelFocusOutEventID;
</span><del>- unsigned long toplevelVisibilityEventID;
</del><ins>+ unsigned long toplevelWindowStateEventID;
</ins><span class="cx">
</span><span class="cx"> // View State.
</span><del>- bool isInWindowActive : 1;
- bool isFocused : 1;
- bool isVisible : 1;
- bool isWindowVisible : 1;
</del><ins>+ ViewState::Flags viewState;
+ ViewState::Flags viewStateFlagsToUpdate;
+ RunLoop::Timer<WebKitWebViewBasePrivate> updateViewStateTimer;
</ins><span class="cx">
</span><span class="cx"> WebKitWebViewBaseDownloadRequestHandler downloadHandler;
</span><span class="cx">
</span><span class="lines">@@ -216,37 +226,56 @@
</span><span class="cx">
</span><span class="cx"> WEBKIT_DEFINE_TYPE(WebKitWebViewBase, webkit_web_view_base, GTK_TYPE_CONTAINER)
</span><span class="cx">
</span><ins>+static void webkitWebViewBaseScheduleUpdateViewState(WebKitWebViewBase* webViewBase, ViewState::Flags flagsToUpdate)
+{
+ WebKitWebViewBasePrivate* priv = webViewBase->priv;
+ priv->viewStateFlagsToUpdate |= flagsToUpdate;
+ if (priv->updateViewStateTimer.isActive())
+ return;
+
+ priv->updateViewStateTimer.startOneShot(0);
+}
+
</ins><span class="cx"> static gboolean toplevelWindowFocusInEvent(GtkWidget*, GdkEventFocus*, WebKitWebViewBase* webViewBase)
</span><span class="cx"> {
</span><span class="cx"> WebKitWebViewBasePrivate* priv = webViewBase->priv;
</span><del>- if (!priv->isInWindowActive) {
- priv->isInWindowActive = true;
- priv->pageProxy->viewStateDidChange(ViewState::WindowIsActive);
- }
</del><ins>+ if (priv->viewState & ViewState::WindowIsActive)
+ return FALSE;
</ins><span class="cx">
</span><ins>+ priv->viewState |= ViewState::WindowIsActive;
+ webkitWebViewBaseScheduleUpdateViewState(webViewBase, ViewState::WindowIsActive);
+
</ins><span class="cx"> return FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static gboolean toplevelWindowFocusOutEvent(GtkWidget*, GdkEventFocus*, WebKitWebViewBase* webViewBase)
</span><span class="cx"> {
</span><span class="cx"> WebKitWebViewBasePrivate* priv = webViewBase->priv;
</span><del>- if (priv->isInWindowActive) {
- priv->isInWindowActive = false;
- priv->pageProxy->viewStateDidChange(ViewState::WindowIsActive);
- }
</del><ins>+ if (!(priv->viewState & ViewState::WindowIsActive))
+ return FALSE;
</ins><span class="cx">
</span><ins>+ priv->viewState &= ~ViewState::WindowIsActive;
+ webkitWebViewBaseScheduleUpdateViewState(webViewBase, ViewState::WindowIsActive);
+
</ins><span class="cx"> return FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static gboolean toplevelWindowVisibilityEvent(GtkWidget*, GdkEventVisibility* visibilityEvent, WebKitWebViewBase* webViewBase)
</del><ins>+static gboolean toplevelWindowStateEvent(GtkWidget*, GdkEventWindowState* event, WebKitWebViewBase* webViewBase)
</ins><span class="cx"> {
</span><span class="cx"> WebKitWebViewBasePrivate* priv = webViewBase->priv;
</span><del>- bool isWindowVisible = visibilityEvent->state != GDK_VISIBILITY_FULLY_OBSCURED;
- if (priv->isWindowVisible != isWindowVisible) {
- priv->isWindowVisible = isWindowVisible;
- priv->pageProxy->viewStateDidChange(ViewState::IsVisible);
- }
</del><ins>+ if (!(event->changed_mask & GDK_WINDOW_STATE_ICONIFIED))
+ return FALSE;
</ins><span class="cx">
</span><ins>+ bool visible = !(event->new_window_state & GDK_WINDOW_STATE_ICONIFIED);
+ if ((visible && priv->viewState & ViewState::IsVisible) || (!visible && !(priv->viewState & ViewState::IsVisible)))
+ return FALSE;
+
+ if (visible)
+ priv->viewState |= ViewState::IsVisible;
+ else
+ priv->viewState &= ~ViewState::IsVisible;
+ webkitWebViewBaseScheduleUpdateViewState(webViewBase, ViewState::IsVisible);
+
</ins><span class="cx"> return FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -264,13 +293,16 @@
</span><span class="cx"> g_signal_handler_disconnect(priv->toplevelOnScreenWindow, priv->toplevelFocusOutEventID);
</span><span class="cx"> priv->toplevelFocusOutEventID = 0;
</span><span class="cx"> }
</span><del>- if (priv->toplevelVisibilityEventID) {
- g_signal_handler_disconnect(priv->toplevelOnScreenWindow, priv->toplevelVisibilityEventID);
- priv->toplevelVisibilityEventID = 0;
</del><ins>+ if (priv->toplevelWindowStateEventID) {
+ g_signal_handler_disconnect(priv->toplevelOnScreenWindow, priv->toplevelWindowStateEventID);
+ priv->toplevelWindowStateEventID = 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> priv->toplevelOnScreenWindow = window;
</span><del>- priv->pageProxy->viewStateDidChange(ViewState::IsInWindow);
</del><ins>+ if (!(priv->viewState & ViewState::IsInWindow)) {
+ priv->viewState |= ViewState::IsInWindow;
+ webkitWebViewBaseScheduleUpdateViewState(webViewBase, ViewState::IsInWindow);
+ }
</ins><span class="cx"> if (!priv->toplevelOnScreenWindow)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -280,9 +312,8 @@
</span><span class="cx"> priv->toplevelFocusOutEventID =
</span><span class="cx"> g_signal_connect(priv->toplevelOnScreenWindow, "focus-out-event",
</span><span class="cx"> G_CALLBACK(toplevelWindowFocusOutEvent), webViewBase);
</span><del>- priv->toplevelVisibilityEventID =
- g_signal_connect(priv->toplevelOnScreenWindow, "visibility-notify-event",
- G_CALLBACK(toplevelWindowVisibilityEvent), webViewBase);
</del><ins>+ priv->toplevelWindowStateEventID =
+ g_signal_connect(priv->toplevelOnScreenWindow, "window-state-event", G_CALLBACK(toplevelWindowStateEvent), webViewBase);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void webkitWebViewBaseRealize(GtkWidget* widget)
</span><span class="lines">@@ -639,21 +670,24 @@
</span><span class="cx">
</span><span class="cx"> WebKitWebViewBase* webViewBase = WEBKIT_WEB_VIEW_BASE(widget);
</span><span class="cx"> WebKitWebViewBasePrivate* priv = webViewBase->priv;
</span><del>- if (!priv->isVisible) {
- priv->isVisible = true;
- priv->pageProxy->viewStateDidChange(ViewState::IsVisible);
- }
</del><ins>+ if (priv->viewState & ViewState::IsVisible)
+ return;
+
+ priv->viewState |= ViewState::IsVisible;
+ webkitWebViewBaseScheduleUpdateViewState(webViewBase, ViewState::IsVisible);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void webkitWebViewBaseUnmap(GtkWidget* widget)
</span><span class="cx"> {
</span><span class="cx"> GTK_WIDGET_CLASS(webkit_web_view_base_parent_class)->unmap(widget);
</span><span class="cx">
</span><del>- WebKitWebViewBasePrivate* priv = WEBKIT_WEB_VIEW_BASE(widget)->priv;
- if (priv->isVisible) {
- priv->isVisible = false;
- priv->pageProxy->viewStateDidChange(ViewState::IsVisible);
- }
</del><ins>+ WebKitWebViewBase* webViewBase = WEBKIT_WEB_VIEW_BASE(widget);
+ WebKitWebViewBasePrivate* priv = webViewBase->priv;
+ if (!(priv->viewState & ViewState::IsVisible))
+ return;
+
+ priv->viewState &= ~ViewState::IsVisible;
+ webkitWebViewBaseScheduleUpdateViewState(webViewBase, ViewState::IsVisible);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static gboolean webkitWebViewBaseFocusInEvent(GtkWidget* widget, GdkEventFocus* event)
</span><span class="lines">@@ -1300,49 +1334,48 @@
</span><span class="cx"> void webkitWebViewBaseSetFocus(WebKitWebViewBase* webViewBase, bool focused)
</span><span class="cx"> {
</span><span class="cx"> WebKitWebViewBasePrivate* priv = webViewBase->priv;
</span><del>- if (priv->isFocused == focused)
</del><ins>+ if ((focused && priv->viewState & ViewState::IsFocused) || (!focused && !(priv->viewState & ViewState::IsFocused)))
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- unsigned viewStateFlags = ViewState::IsFocused;
- priv->isFocused = focused;
</del><ins>+ ViewState::Flags flagsToUpdate = ViewState::IsFocused;
+ if (focused) {
+ priv->viewState |= ViewState::IsFocused;
</ins><span class="cx">
</span><del>- // If the view has received the focus and the window is not active
- // mark the current window as active now. This can happen if the
- // toplevel window is a GTK_WINDOW_POPUP and the focus has been
- // set programatically like WebKitTestRunner does, because POPUP
- // can't be focused.
- if (priv->isFocused && !priv->isInWindowActive) {
- priv->isInWindowActive = true;
- viewStateFlags |= ViewState::WindowIsActive;
- }
- priv->pageProxy->viewStateDidChange(viewStateFlags);
</del><ins>+ // If the view has received the focus and the window is not active
+ // mark the current window as active now. This can happen if the
+ // toplevel window is a GTK_WINDOW_POPUP and the focus has been
+ // set programatically like WebKitTestRunner does, because POPUP
+ // can't be focused.
+ if (!(priv->viewState & ViewState::WindowIsActive)) {
+ priv->viewState |= ViewState::WindowIsActive;
+ flagsToUpdate |= ViewState::WindowIsActive;
+ }
+ } else
+ priv->viewState &= ~ViewState::IsFocused;
+
+ webkitWebViewBaseScheduleUpdateViewState(webViewBase, flagsToUpdate);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool webkitWebViewBaseIsInWindowActive(WebKitWebViewBase* webViewBase)
</span><span class="cx"> {
</span><del>- return webViewBase->priv->isInWindowActive;
</del><ins>+ return webViewBase->priv->viewState & ViewState::WindowIsActive;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool webkitWebViewBaseIsFocused(WebKitWebViewBase* webViewBase)
</span><span class="cx"> {
</span><del>- return webViewBase->priv->isFocused;
</del><ins>+ return webViewBase->priv->viewState & ViewState::IsFocused;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool webkitWebViewBaseIsVisible(WebKitWebViewBase* webViewBase)
</span><span class="cx"> {
</span><del>- return webViewBase->priv->isVisible;
</del><ins>+ return webViewBase->priv->viewState & ViewState::IsVisible;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool webkitWebViewBaseIsInWindow(WebKitWebViewBase* webViewBase)
</span><span class="cx"> {
</span><del>- return webViewBase->priv->toplevelOnScreenWindow;
</del><ins>+ return webViewBase->priv->viewState & ViewState::IsInWindow;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-bool webkitWebViewBaseIsWindowVisible(WebKitWebViewBase* webViewBase)
-{
- return webViewBase->priv->isWindowVisible;
-}
-
</del><span class="cx"> void webkitWebViewBaseSetDownloadRequestHandler(WebKitWebViewBase* webViewBase, WebKitWebViewBaseDownloadRequestHandler downloadHandler)
</span><span class="cx"> {
</span><span class="cx"> webViewBase->priv->downloadHandler = downloadHandler;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewBasePrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBasePrivate.h (196061 => 196062)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBasePrivate.h 2016-02-03 10:37:12 UTC (rev 196061)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBasePrivate.h 2016-02-03 11:04:33 UTC (rev 196062)
</span><span class="lines">@@ -60,7 +60,6 @@
</span><span class="cx"> bool webkitWebViewBaseIsFocused(WebKitWebViewBase*);
</span><span class="cx"> bool webkitWebViewBaseIsVisible(WebKitWebViewBase*);
</span><span class="cx"> bool webkitWebViewBaseIsInWindow(WebKitWebViewBase*);
</span><del>-bool webkitWebViewBaseIsWindowVisible(WebKitWebViewBase*);
</del><span class="cx">
</span><span class="cx"> typedef void (*WebKitWebViewBaseDownloadRequestHandler) (WebKitWebViewBase*, WebKit::DownloadProxy*);
</span><span class="cx"> void webkitWebViewBaseSetDownloadRequestHandler(WebKitWebViewBase*, WebKitWebViewBaseDownloadRequestHandler);
</span></span></pre>
</div>
</div>
</body>
</html>