<!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>[161228] 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/161228">161228</a></dd>
<dt>Author</dt> <dd>barraclough@apple.com</dd>
<dt>Date</dt> <dd>2014-01-02 14:35:58 -0800 (Thu, 02 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Source/WebCore: [iOS] Tapping any link crashes in WebCore::EventHandler::mouseMoved()
(also crashes when scrolling certain sites)
https://bugs.webkit.org/show_bug.cgi?id=126401
<rdar://problem/15739334>
Patch by Daniel Bates <dabates@apple.com> on 2014-01-02
Reviewed by Tim Horton.
* page/ios/EventHandlerIOS.mm:
(WebCore::currentEventSlot): Make the shared variable have static-storage duration.
Source/WebKit/mac: Remove WindowIsVisible
https://bugs.webkit.org/show_bug.cgi?id=126270
Reviewed by Tim Horton.
We currently track visibility in two ways - ViewState::IsVisible and ViewState::WindowIsVisible.
The latter detects that the content is hidden in fewer cases than the former, and as such, the
former is always preferable.
This affects the hidden state provided to FocusController::contentAreaDidShowOrHide and to
Plugin::windowVisibilityChanged.
* WebView/WebView.mm:
(-[WebView _windowWillOrderOnScreen:]):
(-[WebView _windowWillOrderOffScreen:]):
- rename ContainingWindowIsVisible -> ContentIsVisible.
Source/WebKit2: Remove WindowIsVisible
https://bugs.webkit.org/show_bug.cgi?id=126270
Reviewed by Tim Horton.
We currently track visibility in two ways - ViewState::IsVisible and ViewState::WindowIsVisible.
The latter detects that the content is hidden in fewer cases than the former, and as such, the
former is always preferable.
This affects the hidden state provided to FocusController::contentAreaDidShowOrHide and to
Plugin::windowVisibilityChanged.
* Shared/ViewState.h:
- remove WindowIsVisible.
* UIProcess/API/mac/PageClientImpl.h:
* UIProcess/API/mac/PageClientImpl.mm:
- remove isWindowVisible.
* UIProcess/API/mac/WKView.mm:
(-[WKView viewDidMoveToWindow]):
(-[WKView _windowDidMiniaturize:]):
(-[WKView _windowDidDeminiaturize:]):
(-[WKView _windowDidOrderOffScreen:]):
(-[WKView _windowDidOrderOnScreen:]):
- remove ViewState::WindowIsVisible.
* UIProcess/PageClient.h:
- remove isWindowVisible.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::updateViewState):
- remove handling of ViewState::WindowIsVisible.
* WebProcess/Plugins/PluginView.cpp:
(WebKit::PluginView::setIsVisible):
(WebKit::PluginView::didInitializePlugin):
* WebProcess/Plugins/PluginView.h:
- setWindowIsVisible -> setIsVisible.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::WebPage):
(WebKit::WebPage::setViewIsVisible):
(WebKit::WebPage::setViewState):
(WebKit::WebPage::windowAndWebPageAreFocused):
* WebProcess/WebPage/WebPage.h:
(WebKit::WebPage::isVisible):
- remove m_windowIsVisible, setWindowIsVisible (implementation moved to setViewIsVisible).</pre>
<h3>Modified Paths</h3>
<ul>
<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="#trunkSourceWebCorepageFocusControllercpp">trunk/Source/WebCore/page/FocusController.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFocusControllerh">trunk/Source/WebCore/page/FocusController.h</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="#trunkSourceWebKit2SharedViewStateh">trunk/Source/WebKit2/Shared/ViewState.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkPageClientImplcpp">trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkPageClientImplh">trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewBasecpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIiosPageClientImplIOSh">trunk/Source/WebKit2/UIProcess/API/ios/PageClientImplIOS.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIiosPageClientImplIOSmm">trunk/Source/WebKit2/UIProcess/API/ios/PageClientImplIOS.mm</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="#trunkSourceWebKit2UIProcessAPImacWKViewmm">trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCoordinatedGraphicsWebViewcpp">trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCoordinatedGraphicsWebViewh">trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.h</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="#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="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161227 => 161228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-02 22:32:19 UTC (rev 161227)
+++ trunk/Source/WebCore/ChangeLog 2014-01-02 22:35:58 UTC (rev 161228)
</span><span class="lines">@@ -12,6 +12,27 @@
</span><span class="cx">
</span><span class="cx"> 2014-01-02 Gavin Barraclough <barraclough@apple.com>
</span><span class="cx">
</span><ins>+ Remove WindowIsVisible
+ https://bugs.webkit.org/show_bug.cgi?id=126270
+
+ Reviewed by Tim Horton.
+
+ We currently track visibility in two ways - ViewState::IsVisible and ViewState::WindowIsVisible.
+ The latter detects that the content is hidden in fewer cases than the former, and as such, the
+ former is always preferable.
+
+ This affects the hidden state provided to FocusController::contentAreaDidShowOrHide and to
+ Plugin::windowVisibilityChanged.
+
+ * WebCore.exp.in:
+ * page/FocusController.cpp:
+ (WebCore::FocusController::FocusController):
+ (WebCore::FocusController::setContentIsVisible):
+ * page/FocusController.h:
+ - rename ContainingWindowIsVisible -> ContentIsVisible.
+
+2014-01-02 Gavin Barraclough <barraclough@apple.com>
+
</ins><span class="cx"> Merge didMoveOnscreen / page visibility to isVisible
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=126268
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (161227 => 161228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-01-02 22:32:19 UTC (rev 161227)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-01-02 22:35:58 UTC (rev 161228)
</span><span class="lines">@@ -482,7 +482,7 @@
</span><span class="cx"> __ZN7WebCore15FocusController15setFocusedFrameEN3WTF10PassRefPtrINS_5FrameEEE
</span><span class="cx"> __ZN7WebCore15FocusController15setInitialFocusENS_14FocusDirectionEPNS_13KeyboardEventE
</span><span class="cx"> __ZN7WebCore15FocusController17setFocusedElementEPNS_7ElementEN3WTF10PassRefPtrINS_5FrameEEENS_14FocusDirectionE
</span><del>-__ZN7WebCore15FocusController28setContainingWindowIsVisibleEb
</del><ins>+__ZN7WebCore15FocusController19setContentIsVisibleEb
</ins><span class="cx"> __ZN7WebCore15FocusController9setActiveEb
</span><span class="cx"> __ZN7WebCore15GraphicsContext10strokeRectERKNS_9FloatRectEf
</span><span class="cx"> __ZN7WebCore15GraphicsContext11clearShadowEv
</span></span></pre></div>
<a id="trunkSourceWebCorepageFocusControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FocusController.cpp (161227 => 161228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FocusController.cpp 2014-01-02 22:32:19 UTC (rev 161227)
+++ trunk/Source/WebCore/page/FocusController.cpp 2014-01-02 22:35:58 UTC (rev 161228)
</span><span class="lines">@@ -163,7 +163,7 @@
</span><span class="cx"> , m_isActive(false)
</span><span class="cx"> , m_isFocused(false)
</span><span class="cx"> , m_isChangingFocusedFrame(false)
</span><del>- , m_containingWindowIsVisible(false)
</del><ins>+ , m_contentIsVisible(false)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -663,18 +663,18 @@
</span><span class="cx"> scrollableArea->contentAreaDidHide();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FocusController::setContainingWindowIsVisible(bool containingWindowIsVisible)
</del><ins>+void FocusController::setContentIsVisible(bool contentIsVisible)
</ins><span class="cx"> {
</span><del>- if (m_containingWindowIsVisible == containingWindowIsVisible)
</del><ins>+ if (m_contentIsVisible == contentIsVisible)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- m_containingWindowIsVisible = containingWindowIsVisible;
</del><ins>+ m_contentIsVisible = contentIsVisible;
</ins><span class="cx">
</span><span class="cx"> FrameView* view = m_page.mainFrame().view();
</span><span class="cx"> if (!view)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- contentAreaDidShowOrHide(view, containingWindowIsVisible);
</del><ins>+ contentAreaDidShowOrHide(view, contentIsVisible);
</ins><span class="cx">
</span><span class="cx"> for (Frame* frame = &m_page.mainFrame(); frame; frame = frame->tree().traverseNext()) {
</span><span class="cx"> FrameView* frameView = frame->view();
</span><span class="lines">@@ -689,7 +689,7 @@
</span><span class="cx"> ScrollableArea* scrollableArea = *it;
</span><span class="cx"> ASSERT(scrollableArea->scrollbarsCanBeActive() || m_page.shouldSuppressScrollbarAnimations());
</span><span class="cx">
</span><del>- contentAreaDidShowOrHide(scrollableArea, containingWindowIsVisible);
</del><ins>+ contentAreaDidShowOrHide(scrollableArea, contentIsVisible);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageFocusControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FocusController.h (161227 => 161228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FocusController.h 2014-01-02 22:32:19 UTC (rev 161227)
+++ trunk/Source/WebCore/page/FocusController.h 2014-01-02 22:35:58 UTC (rev 161228)
</span><span class="lines">@@ -79,8 +79,7 @@
</span><span class="cx"> void setFocused(bool);
</span><span class="cx"> bool isFocused() const { return m_isFocused; }
</span><span class="cx">
</span><del>- void setContainingWindowIsVisible(bool);
- bool containingWindowIsVisible() const { return m_containingWindowIsVisible; }
</del><ins>+ void setContentIsVisible(bool);
</ins><span class="cx">
</span><span class="cx"> // These methods are used in WebCore/bindings/objc/DOM.mm.
</span><span class="cx"> Element* nextFocusableElement(FocusNavigationScope, Node* start, KeyboardEvent*);
</span><span class="lines">@@ -115,7 +114,7 @@
</span><span class="cx"> bool m_isActive;
</span><span class="cx"> bool m_isFocused;
</span><span class="cx"> bool m_isChangingFocusedFrame;
</span><del>- bool m_containingWindowIsVisible;
</del><ins>+ bool m_contentIsVisible;
</ins><span class="cx">
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (161227 => 161228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-01-02 22:32:19 UTC (rev 161227)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-01-02 22:35:58 UTC (rev 161228)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2014-01-02 Gavin Barraclough <barraclough@apple.com>
</span><span class="cx">
</span><ins>+ Remove WindowIsVisible
+ https://bugs.webkit.org/show_bug.cgi?id=126270
+
+ Reviewed by Tim Horton.
+
+ We currently track visibility in two ways - ViewState::IsVisible and ViewState::WindowIsVisible.
+ The latter detects that the content is hidden in fewer cases than the former, and as such, the
+ former is always preferable.
+
+ This affects the hidden state provided to FocusController::contentAreaDidShowOrHide and to
+ Plugin::windowVisibilityChanged.
+
+ * WebView/WebView.mm:
+ (-[WebView _windowWillOrderOnScreen:]):
+ (-[WebView _windowWillOrderOffScreen:]):
+ - rename ContainingWindowIsVisible -> ContentIsVisible.
+
+2014-01-02 Gavin Barraclough <barraclough@apple.com>
+
</ins><span class="cx"> Merge didMoveOnscreen / page visibility to isVisible
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=126268
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (161227 => 161228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2014-01-02 22:32:19 UTC (rev 161227)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2014-01-02 22:35:58 UTC (rev 161228)
</span><span class="lines">@@ -5337,7 +5337,7 @@
</span><span class="cx">
</span><span class="cx"> if (_private && _private->page) {
</span><span class="cx"> _private->page->resumeScriptedAnimations();
</span><del>- _private->page->focusController().setContainingWindowIsVisible(true);
</del><ins>+ _private->page->focusController().setContentIsVisible(true);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -5350,7 +5350,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (_private && _private->page) {
</span><span class="cx"> _private->page->suspendScriptedAnimations();
</span><del>- _private->page->focusController().setContainingWindowIsVisible(false);
</del><ins>+ _private->page->focusController().setContentIsVisible(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 (161227 => 161228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-01-02 22:32:19 UTC (rev 161227)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-02 22:35:58 UTC (rev 161228)
</span><span class="lines">@@ -1,5 +1,50 @@
</span><span class="cx"> 2014-01-02 Gavin Barraclough <barraclough@apple.com>
</span><span class="cx">
</span><ins>+ Remove WindowIsVisible
+ https://bugs.webkit.org/show_bug.cgi?id=126270
+
+ Reviewed by Tim Horton.
+
+ We currently track visibility in two ways - ViewState::IsVisible and ViewState::WindowIsVisible.
+ The latter detects that the content is hidden in fewer cases than the former, and as such, the
+ former is always preferable.
+
+ This affects the hidden state provided to FocusController::contentAreaDidShowOrHide and to
+ Plugin::windowVisibilityChanged.
+
+ * Shared/ViewState.h:
+ - remove WindowIsVisible.
+ * UIProcess/API/mac/PageClientImpl.h:
+ * UIProcess/API/mac/PageClientImpl.mm:
+ - remove isWindowVisible.
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView viewDidMoveToWindow]):
+ (-[WKView _windowDidMiniaturize:]):
+ (-[WKView _windowDidDeminiaturize:]):
+ (-[WKView _windowDidOrderOffScreen:]):
+ (-[WKView _windowDidOrderOnScreen:]):
+ - remove ViewState::WindowIsVisible.
+ * UIProcess/PageClient.h:
+ - remove isWindowVisible.
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::updateViewState):
+ - remove handling of ViewState::WindowIsVisible.
+ * WebProcess/Plugins/PluginView.cpp:
+ (WebKit::PluginView::setIsVisible):
+ (WebKit::PluginView::didInitializePlugin):
+ * WebProcess/Plugins/PluginView.h:
+ - setWindowIsVisible -> setIsVisible.
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::WebPage):
+ (WebKit::WebPage::setViewIsVisible):
+ (WebKit::WebPage::setViewState):
+ (WebKit::WebPage::windowAndWebPageAreFocused):
+ * WebProcess/WebPage/WebPage.h:
+ (WebKit::WebPage::isVisible):
+ - remove m_windowIsVisible, setWindowIsVisible (implementation moved to setViewIsVisible).
+
+2014-01-02 Gavin Barraclough <barraclough@apple.com>
+
</ins><span class="cx"> Refactor ViewState handling for drawing area / plugins
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=126272
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedViewStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ViewState.h (161227 => 161228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/ViewState.h 2014-01-02 22:32:19 UTC (rev 161227)
+++ trunk/Source/WebKit2/Shared/ViewState.h 2014-01-02 22:35:58 UTC (rev 161228)
</span><span class="lines">@@ -34,14 +34,13 @@
</span><span class="cx"> IsFocused = 1 << 1,
</span><span class="cx"> IsVisible = 1 << 2,
</span><span class="cx"> IsInWindow = 1 << 3,
</span><del>- WindowIsVisible = 1 << 4,
- IsLayerWindowServerHosted = 1 << 5
</del><ins>+ IsLayerWindowServerHosted = 1 << 4
</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 | WindowIsVisible | IsLayerWindowServerHosted;
</del><ins>+ static const Flags AllFlags = WindowIsActive | IsFocused | IsVisible | IsInWindow | IsLayerWindowServerHosted;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkPageClientImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp (161227 => 161228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp 2014-01-02 22:32:19 UTC (rev 161227)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp 2014-01-02 22:35:58 UTC (rev 161228)
</span><span class="lines">@@ -279,11 +279,6 @@
</span><span class="cx"> webkitWebViewBaseHandleDownloadRequest(WEBKIT_WEB_VIEW_BASE(m_viewWidget), download);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool PageClientImpl::isWindowVisible()
-{
- return webkitWebViewBaseIsWindowVisible(WEBKIT_WEB_VIEW_BASE(m_viewWidget));
-}
-
</del><span class="cx"> void PageClientImpl::didCommitLoadForMainFrame()
</span><span class="cx"> {
</span><span class="cx"> webkitWebViewBaseResetClickCounter(WEBKIT_WEB_VIEW_BASE(m_viewWidget));
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkPageClientImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h (161227 => 161228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h 2014-01-02 22:32:19 UTC (rev 161227)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h 2014-01-02 22:35:58 UTC (rev 161228)
</span><span class="lines">@@ -96,7 +96,6 @@
</span><span class="cx"> virtual void getEditorCommandsForKeyEvent(const NativeWebKeyboardEvent&, const AtomicString&, Vector<WTF::String>&) OVERRIDE;
</span><span class="cx"> virtual void updateTextInputState() OVERRIDE;
</span><span class="cx"> virtual void startDrag(const WebCore::DragData&, PassRefPtr<ShareableBitmap> dragImage) OVERRIDE;
</span><del>- virtual bool isWindowVisible() OVERRIDE;
</del><span class="cx">
</span><span class="cx"> #if USE(ACCELERATED_COMPOSITING)
</span><span class="cx"> virtual void enterAcceleratedCompositingMode(const LayerTreeContext&) OVERRIDE;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (161227 => 161228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2014-01-02 22:32:19 UTC (rev 161227)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2014-01-02 22:35:58 UTC (rev 161228)
</span><span class="lines">@@ -196,7 +196,7 @@
</span><span class="cx"> bool isWindowVisible = visibilityEvent->state != GDK_VISIBILITY_FULLY_OBSCURED;
</span><span class="cx"> if (priv->isWindowVisible != isWindowVisible) {
</span><span class="cx"> priv->isWindowVisible = isWindowVisible;
</span><del>- priv->pageProxy->viewStateDidChange(ViewState::WindowIsVisible);
</del><ins>+ priv->pageProxy->viewStateDidChange(ViewState::IsVisible);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return FALSE;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIiosPageClientImplIOSh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/ios/PageClientImplIOS.h (161227 => 161228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/ios/PageClientImplIOS.h 2014-01-02 22:32:19 UTC (rev 161227)
+++ trunk/Source/WebKit2/UIProcess/API/ios/PageClientImplIOS.h 2014-01-02 22:35:58 UTC (rev 161228)
</span><span class="lines">@@ -54,7 +54,6 @@
</span><span class="cx"> virtual bool isViewWindowActive() OVERRIDE;
</span><span class="cx"> virtual bool isViewFocused() OVERRIDE;
</span><span class="cx"> virtual bool isViewVisible() OVERRIDE;
</span><del>- virtual bool isWindowVisible() OVERRIDE;
</del><span class="cx"> virtual bool isViewInWindow() OVERRIDE;
</span><span class="cx"> virtual void processDidCrash() OVERRIDE;
</span><span class="cx"> virtual void didRelaunchProcess() OVERRIDE;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIiosPageClientImplIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/ios/PageClientImplIOS.mm (161227 => 161228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/ios/PageClientImplIOS.mm 2014-01-02 22:32:19 UTC (rev 161227)
+++ trunk/Source/WebKit2/UIProcess/API/ios/PageClientImplIOS.mm 2014-01-02 22:35:58 UTC (rev 161228)
</span><span class="lines">@@ -103,12 +103,6 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool PageClientImpl::isWindowVisible()
-{
- notImplemented();
- return true;
-}
-
</del><span class="cx"> bool PageClientImpl::isViewInWindow()
</span><span class="cx"> {
</span><span class="cx"> return [m_view window];
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacPageClientImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.h (161227 => 161228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.h 2014-01-02 22:32:19 UTC (rev 161227)
+++ trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.h 2014-01-02 22:35:58 UTC (rev 161228)
</span><span class="lines">@@ -64,7 +64,6 @@
</span><span class="cx"> virtual bool isViewWindowActive();
</span><span class="cx"> virtual bool isViewFocused();
</span><span class="cx"> virtual bool isViewVisible();
</span><del>- virtual bool isWindowVisible();
</del><span class="cx"> virtual bool isViewInWindow();
</span><span class="cx"> #if HAVE(LAYER_HOSTING_IN_WINDOW_SERVER)
</span><span class="cx"> virtual bool isLayerWindowServerHosted();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacPageClientImplmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm (161227 => 161228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm 2014-01-02 22:32:19 UTC (rev 161227)
+++ trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm 2014-01-02 22:35:58 UTC (rev 161228)
</span><span class="lines">@@ -209,11 +209,6 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool PageClientImpl::isWindowVisible()
-{
- return [[m_wkView window] isVisible];
-}
-
</del><span class="cx"> bool PageClientImpl::isViewInWindow()
</span><span class="cx"> {
</span><span class="cx"> return [m_wkView window];
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (161227 => 161228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-01-02 22:32:19 UTC (rev 161227)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-01-02 22:35:58 UTC (rev 161228)
</span><span class="lines">@@ -1882,7 +1882,7 @@
</span><span class="cx"> _data->_windowHasValidBackingStore = NO;
</span><span class="cx"> [self doWindowDidChangeScreen];
</span><span class="cx">
</span><del>- ViewState::Flags viewStateChanges = ViewState::WindowIsVisible | ViewState::WindowIsActive | ViewState::IsVisible;
</del><ins>+ ViewState::Flags viewStateChanges = ViewState::WindowIsActive | ViewState::IsVisible;
</ins><span class="cx"> if ([self isDeferringViewInWindowChanges])
</span><span class="cx"> _data->_viewInWindowChangeWasDeferred = YES;
</span><span class="cx"> else
</span><span class="lines">@@ -1900,7 +1900,7 @@
</span><span class="cx">
</span><span class="cx"> [self _accessibilityRegisterUIProcessTokens];
</span><span class="cx"> } else {
</span><del>- ViewState::Flags viewStateChanges = ViewState::WindowIsVisible | ViewState::WindowIsActive | ViewState::IsVisible;
</del><ins>+ ViewState::Flags viewStateChanges = ViewState::WindowIsActive | ViewState::IsVisible;
</ins><span class="cx"> if ([self isDeferringViewInWindowChanges])
</span><span class="cx"> _data->_viewInWindowChangeWasDeferred = YES;
</span><span class="cx"> else
</span><span class="lines">@@ -1947,12 +1947,12 @@
</span><span class="cx"> - (void)_windowDidMiniaturize:(NSNotification *)notification
</span><span class="cx"> {
</span><span class="cx"> _data->_windowHasValidBackingStore = NO;
</span><del>- _data->_page->viewStateDidChange(ViewState::WindowIsVisible);
</del><ins>+ _data->_page->viewStateDidChange(ViewState::IsVisible);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_windowDidDeminiaturize:(NSNotification *)notification
</span><span class="cx"> {
</span><del>- _data->_page->viewStateDidChange(ViewState::WindowIsVisible);
</del><ins>+ _data->_page->viewStateDidChange(ViewState::IsVisible);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_windowDidMove:(NSNotification *)notification
</span><span class="lines">@@ -1969,12 +1969,12 @@
</span><span class="cx">
</span><span class="cx"> - (void)_windowDidOrderOffScreen:(NSNotification *)notification
</span><span class="cx"> {
</span><del>- _data->_page->viewStateDidChange(ViewState::WindowIsVisible | ViewState::IsVisible | ViewState::WindowIsActive);
</del><ins>+ _data->_page->viewStateDidChange(ViewState::IsVisible | ViewState::WindowIsActive);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_windowDidOrderOnScreen:(NSNotification *)notification
</span><span class="cx"> {
</span><del>- _data->_page->viewStateDidChange(ViewState::WindowIsVisible | ViewState::IsVisible | ViewState::WindowIsActive);
</del><ins>+ _data->_page->viewStateDidChange(ViewState::IsVisible | ViewState::WindowIsActive);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_windowDidChangeBackingProperties:(NSNotification *)notification
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCoordinatedGraphicsWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp (161227 => 161228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp 2014-01-02 22:32:19 UTC (rev 161227)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp 2014-01-02 22:35:58 UTC (rev 161228)
</span><span class="lines">@@ -340,12 +340,6 @@
</span><span class="cx"> return isVisible();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool WebView::isWindowVisible()
-{
- notImplemented();
- return true;
-}
-
</del><span class="cx"> bool WebView::isViewInWindow()
</span><span class="cx"> {
</span><span class="cx"> notImplemented();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCoordinatedGraphicsWebViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.h (161227 => 161228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.h 2014-01-02 22:32:19 UTC (rev 161227)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.h 2014-01-02 22:35:58 UTC (rev 161228)
</span><span class="lines">@@ -140,7 +140,6 @@
</span><span class="cx"> virtual bool isViewWindowActive() OVERRIDE;
</span><span class="cx"> virtual bool isViewFocused() OVERRIDE;
</span><span class="cx"> virtual bool isViewVisible() OVERRIDE;
</span><del>- virtual bool isWindowVisible() OVERRIDE;
</del><span class="cx"> virtual bool isViewInWindow() OVERRIDE;
</span><span class="cx">
</span><span class="cx"> virtual void processDidCrash() OVERRIDE;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPageClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/PageClient.h (161227 => 161228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/PageClient.h 2014-01-02 22:32:19 UTC (rev 161227)
+++ trunk/Source/WebKit2/UIProcess/PageClient.h 2014-01-02 22:35:58 UTC (rev 161228)
</span><span class="lines">@@ -105,9 +105,6 @@
</span><span class="cx"> // Return whether the view is visible.
</span><span class="cx"> virtual bool isViewVisible() = 0;
</span><span class="cx">
</span><del>- // Return whether the window is visible.
- virtual bool isWindowVisible() = 0;
-
</del><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 (161227 => 161228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-01-02 22:32:19 UTC (rev 161227)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-01-02 22:35:58 UTC (rev 161228)
</span><span class="lines">@@ -921,8 +921,6 @@
</span><span class="cx"> void WebPageProxy::updateViewState(ViewState::Flags flagsToUpdate)
</span><span class="cx"> {
</span><span class="cx"> m_viewState &= ~flagsToUpdate;
</span><del>- if (flagsToUpdate & ViewState::WindowIsVisible && m_pageClient.isWindowVisible())
- m_viewState |= ViewState::WindowIsVisible;
</del><span class="cx"> if (flagsToUpdate & ViewState::IsFocused && m_pageClient.isViewFocused())
</span><span class="cx"> m_viewState |= ViewState::IsFocused;
</span><span class="cx"> if (flagsToUpdate & ViewState::WindowIsActive && m_pageClient.isViewWindowActive())
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp (161227 => 161228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2014-01-02 22:32:19 UTC (rev 161227)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2014-01-02 22:35:58 UTC (rev 161228)
</span><span class="lines">@@ -501,8 +501,8 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (changed & ViewState::WindowIsVisible)
- m_plugin->windowVisibilityChanged(m_webPage->windowIsVisible());
</del><ins>+ if (changed & ViewState::IsVisible)
+ m_plugin->windowVisibilityChanged(m_webPage->isVisible());
</ins><span class="cx"> if (changed & ViewState::WindowIsActive)
</span><span class="cx"> m_plugin->windowFocusChanged(m_webPage->windowIsFocused());
</span><span class="cx"> #if HAVE(LAYER_HOSTING_IN_WINDOW_SERVER)
</span><span class="lines">@@ -624,7 +624,7 @@
</span><span class="cx"> m_pluginElement->dispatchPendingMouseClick();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_plugin->windowVisibilityChanged(m_webPage->windowIsVisible());
</del><ins>+ m_plugin->windowVisibilityChanged(m_webPage->isVisible());
</ins><span class="cx"> m_plugin->windowFocusChanged(m_webPage->windowIsFocused());
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (161227 => 161228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-01-02 22:32:19 UTC (rev 161227)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-01-02 22:35:58 UTC (rev 161228)
</span><span class="lines">@@ -235,7 +235,6 @@
</span><span class="cx"> , m_artificialPluginInitializationDelayEnabled(false)
</span><span class="cx"> , m_scrollingPerformanceLoggingEnabled(false)
</span><span class="cx"> , m_mainFrameIsScrollable(true)
</span><del>- , m_windowIsVisible(false)
</del><span class="cx"> #if ENABLE(PRIMARY_SNAPSHOTTED_PLUGIN_HEURISTIC)
</span><span class="cx"> , m_readyToFindPrimarySnapshottedPlugin(false)
</span><span class="cx"> , m_didFindPrimarySnapshottedPlugin(false)
</span><span class="lines">@@ -1916,6 +1915,8 @@
</span><span class="cx">
</span><span class="cx"> void WebPage::setViewIsVisible(bool isVisible)
</span><span class="cx"> {
</span><ins>+ corePage()->focusController().setContentIsVisible(isVisible);
+
</ins><span class="cx"> m_page->setIsVisible(m_viewState & ViewState::IsVisible, false);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2069,8 +2070,6 @@
</span><span class="cx">
</span><span class="cx"> // We want to make sure to update the active state while hidden, so if the view is hidden then update the active state
</span><span class="cx"> // early (in case it becomes visible), and if the view was visible then update active state later (in case it hides).
</span><del>- if (changed & ViewState::WindowIsVisible)
- setWindowIsVisible(viewState & ViewState::WindowIsVisible);
</del><span class="cx"> if (changed & ViewState::IsFocused)
</span><span class="cx"> setFocused(viewState & ViewState::IsFocused);
</span><span class="cx"> if (changed & ViewState::WindowIsActive && !(m_viewState & ViewState::IsVisible))
</span><span class="lines">@@ -3037,13 +3036,6 @@
</span><span class="cx"> send(Messages::WebPageProxy::SetWindowFrame(windowFrame));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPage::setWindowIsVisible(bool windowIsVisible)
-{
- m_windowIsVisible = windowIsVisible;
-
- corePage()->focusController().setContainingWindowIsVisible(windowIsVisible);
-}
-
</del><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> void WebPage::windowAndViewFramesChanged(const FloatRect& windowFrameInScreenCoordinates, const FloatRect& windowFrameInUnflippedScreenCoordinates, const FloatRect& viewFrameInWindowCoordinates, const FloatPoint& accessibilityViewCoordinates)
</span><span class="cx"> {
</span><span class="lines">@@ -3084,7 +3076,7 @@
</span><span class="cx">
</span><span class="cx"> bool WebPage::windowAndWebPageAreFocused() const
</span><span class="cx"> {
</span><del>- if (!m_windowIsVisible)
</del><ins>+ if (!isVisible())
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> return m_page->focusController().isFocused() && m_page->focusController().isActive();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (161227 => 161228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-01-02 22:32:19 UTC (rev 161227)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-01-02 22:35:58 UTC (rev 161228)
</span><span class="lines">@@ -346,7 +346,6 @@
</span><span class="cx"> void addPluginView(PluginView*);
</span><span class="cx"> void removePluginView(PluginView*);
</span><span class="cx">
</span><del>- bool windowIsVisible() const { return m_windowIsVisible; }
</del><span class="cx"> bool isVisible() const { return m_viewState & ViewState::IsVisible; }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="lines">@@ -729,7 +728,6 @@
</span><span class="cx"> void setActive(bool);
</span><span class="cx"> void setFocused(bool);
</span><span class="cx"> void setViewIsVisible(bool);
</span><del>- void setWindowIsVisible(bool);
</del><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 setIsInWindow(bool);
</span><span class="lines">@@ -904,9 +902,6 @@
</span><span class="cx">
</span><span class="cx"> bool m_mainFrameIsScrollable;
</span><span class="cx">
</span><del>- // Whether the containing window is visible or not.
- bool m_windowIsVisible;
-
</del><span class="cx"> #if ENABLE(PRIMARY_SNAPSHOTTED_PLUGIN_HEURISTIC)
</span><span class="cx"> bool m_readyToFindPrimarySnapshottedPlugin;
</span><span class="cx"> bool m_didFindPrimarySnapshottedPlugin;
</span></span></pre>
</div>
</div>
</body>
</html>