<!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>[161226] 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/161226">161226</a></dd>
<dt>Author</dt> <dd>barraclough@apple.com</dd>
<dt>Date</dt> <dd>2014-01-02 14:20:05 -0800 (Thu, 02 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Refactor ViewState handling for drawing area / plugins
https://bugs.webkit.org/show_bug.cgi?id=126272
Reviewed by Tim Horton.
Instead of all ViewState changes being handled by the WebPage, notify the DrawingArea & PluginView to better encapsulate.
* WebProcess/Plugins/PluginView.cpp:
(WebKit::PluginView::viewStateDidChange):
(WebKit::PluginView::platformViewStateDidChange):
- added, handle changes in ViewState relevant to PluginView.
(WebKit::PluginView::didInitializePlugin):
- helper function removed.
* WebProcess/Plugins/PluginView.h:
- added/removed function declarations.
* WebProcess/WebPage/DrawingArea.h:
(WebKit::DrawingArea::viewStateDidChange):
- declare viewStateDidChange.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::setActive):
- no need to notify plugin.
(WebKit::WebPage::setViewIsVisible):
- no need to notify drawing area.
(WebKit::WebPage::setViewState):
- send viewStateDidChange to drawing area / plugin.
(WebKit::WebPage::setWindowIsVisible):
- no need to notify plugin.
* WebProcess/WebPage/WebPage.h:
(WebKit::WebPage::layerHostingMode):
- removed setLayerHostingMode.
* WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h:
- declare viewStateDidChange.
* WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
(WebKit::TiledCoreAnimationDrawingArea::viewStateDidChange):
- added, handle changes in ViewState relevant to DrawingArea.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginViewcpp">trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginViewh">trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageDrawingAreah">trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreah">trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreamm">trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (161225 => 161226)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-01-02 22:16:59 UTC (rev 161225)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-02 22:20:05 UTC (rev 161226)
</span><span class="lines">@@ -1,3 +1,41 @@
</span><ins>+2014-01-02 Gavin Barraclough <barraclough@apple.com>
+
+ Refactor ViewState handling for drawing area / plugins
+ https://bugs.webkit.org/show_bug.cgi?id=126272
+
+ Reviewed by Tim Horton.
+
+ Instead of all ViewState changes being handled by the WebPage, notify the DrawingArea & PluginView to better encapsulate.
+
+ * WebProcess/Plugins/PluginView.cpp:
+ (WebKit::PluginView::viewStateDidChange):
+ (WebKit::PluginView::platformViewStateDidChange):
+ - added, handle changes in ViewState relevant to PluginView.
+ (WebKit::PluginView::didInitializePlugin):
+ - helper function removed.
+ * WebProcess/Plugins/PluginView.h:
+ - added/removed function declarations.
+ * WebProcess/WebPage/DrawingArea.h:
+ (WebKit::DrawingArea::viewStateDidChange):
+ - declare viewStateDidChange.
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::setActive):
+ - no need to notify plugin.
+ (WebKit::WebPage::setViewIsVisible):
+ - no need to notify drawing area.
+ (WebKit::WebPage::setViewState):
+ - send viewStateDidChange to drawing area / plugin.
+ (WebKit::WebPage::setWindowIsVisible):
+ - no need to notify plugin.
+ * WebProcess/WebPage/WebPage.h:
+ (WebKit::WebPage::layerHostingMode):
+ - removed setLayerHostingMode.
+ * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h:
+ - declare viewStateDidChange.
+ * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
+ (WebKit::TiledCoreAnimationDrawingArea::viewStateDidChange):
+ - added, handle changes in ViewState relevant to DrawingArea.
+
</ins><span class="cx"> 2014-01-02 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge didMoveOnscreen / page visibility to isVisible
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp (161225 => 161226)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2014-01-02 22:16:59 UTC (rev 161225)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2014-01-02 22:20:05 UTC (rev 161226)
</span><span class="lines">@@ -481,21 +481,34 @@
</span><span class="cx"> m_webPage = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
-void PluginView::setWindowIsVisible(bool windowIsVisible)
</del><ins>+void PluginView::viewStateDidChange(ViewState::Flags changed)
</ins><span class="cx"> {
</span><del>- if (!m_isInitialized || !m_plugin)
- return;
-
- m_plugin->windowVisibilityChanged(windowIsVisible);
</del><ins>+#if PLATFORM(MAC)
+ platformViewStateDidChange(changed);
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void PluginView::setWindowIsFocused(bool windowIsFocused)
</del><ins>+#if PLATFORM(MAC)
+void PluginView::platformViewStateDidChange(ViewState::Flags changed)
</ins><span class="cx"> {
</span><del>- if (!m_isInitialized || !m_plugin)
</del><ins>+ if (!m_plugin)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- m_plugin->windowFocusChanged(windowIsFocused);
</del><ins>+ if (!m_isInitialized) {
+#if HAVE(LAYER_HOSTING_IN_WINDOW_SERVER)
+ m_parameters.layerHostingMode = m_webPage->layerHostingMode();
+#endif
+ return;
+ }
+
+ if (changed & ViewState::WindowIsVisible)
+ m_plugin->windowVisibilityChanged(m_webPage->windowIsVisible());
+ if (changed & ViewState::WindowIsActive)
+ m_plugin->windowFocusChanged(m_webPage->windowIsFocused());
+#if HAVE(LAYER_HOSTING_IN_WINDOW_SERVER)
+ if (changed & ViewState::IsLayerWindowServerHosted)
+ m_plugin->setLayerHostingMode(m_webPage->layerHostingMode());
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PluginView::setDeviceScaleFactor(float scaleFactor)
</span><span class="lines">@@ -526,19 +539,6 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PluginView::setLayerHostingMode(LayerHostingMode layerHostingMode)
-{
- if (!m_plugin)
- return;
-
- if (!m_isInitialized) {
- m_parameters.layerHostingMode = layerHostingMode;
- return;
- }
-
- m_plugin->setLayerHostingMode(layerHostingMode);
-}
-
</del><span class="cx"> NSObject *PluginView::accessibilityObject() const
</span><span class="cx"> {
</span><span class="cx"> if (!m_isInitialized || !m_plugin)
</span><span class="lines">@@ -624,8 +624,8 @@
</span><span class="cx"> m_pluginElement->dispatchPendingMouseClick();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- setWindowIsVisible(m_webPage->windowIsVisible());
- setWindowIsFocused(m_webPage->windowIsFocused());
</del><ins>+ m_plugin->windowVisibilityChanged(m_webPage->windowIsVisible());
+ m_plugin->windowFocusChanged(m_webPage->windowIsFocused());
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (wantsWheelEvents()) {
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h (161225 => 161226)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h 2014-01-02 22:16:59 UTC (rev 161225)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h 2014-01-02 22:20:05 UTC (rev 161226)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include "NPRuntimeObjectMap.h"
</span><span class="cx"> #include "Plugin.h"
</span><span class="cx"> #include "PluginController.h"
</span><ins>+#include "ViewState.h"
</ins><span class="cx"> #include "WebFrame.h"
</span><span class="cx"> #include <WebCore/FindOptions.h>
</span><span class="cx"> #include <WebCore/Image.h>
</span><span class="lines">@@ -68,13 +69,13 @@
</span><span class="cx"> void manualLoadDidFinishLoading();
</span><span class="cx"> void manualLoadDidFail(const WebCore::ResourceError&);
</span><span class="cx">
</span><ins>+ void viewStateDidChange(ViewState::Flags changed);
+
</ins><span class="cx"> #if PLATFORM(MAC)
</span><del>- void setWindowIsVisible(bool);
- void setWindowIsFocused(bool);
</del><ins>+ void platformViewStateDidChange(ViewState::Flags changed);
</ins><span class="cx"> void setDeviceScaleFactor(float);
</span><span class="cx"> void windowAndViewFramesChanged(const WebCore::FloatRect& windowFrameInScreenCoordinates, const WebCore::FloatRect& viewFrameInWindowCoordinates);
</span><span class="cx"> bool sendComplexTextInput(uint64_t pluginComplexTextInputIdentifier, const String& textInput);
</span><del>- void setLayerHostingMode(LayerHostingMode);
</del><span class="cx"> RetainPtr<PDFDocument> pdfDocumentForPrinting() const { return m_plugin->pdfDocumentForPrinting(); }
</span><span class="cx"> NSObject *accessibilityObject() const;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageDrawingAreah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h (161225 => 161226)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h 2014-01-02 22:16:59 UTC (rev 161225)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h 2014-01-02 22:20:05 UTC (rev 161226)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "DrawingAreaInfo.h"
</span><span class="cx"> #include "LayerTreeContext.h"
</span><ins>+#include "ViewState.h"
</ins><span class="cx"> #include <WebCore/FloatPoint.h>
</span><span class="cx"> #include <WebCore/IntRect.h>
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="lines">@@ -105,9 +106,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void dispatchAfterEnsuringUpdatedScrollPosition(const Function<void ()>&);
</span><span class="cx">
</span><del>- virtual void suspendPainting() { }
- virtual void resumePainting() { }
- virtual void setLayerHostingMode(LayerHostingMode) { }
</del><ins>+ virtual void viewStateDidChange(ViewState::Flags changed) { }
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> DrawingArea(DrawingAreaType, WebPage*);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (161225 => 161226)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-01-02 22:16:59 UTC (rev 161225)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-01-02 22:20:05 UTC (rev 161226)
</span><span class="lines">@@ -1912,21 +1912,10 @@
</span><span class="cx"> void WebPage::setActive(bool isActive)
</span><span class="cx"> {
</span><span class="cx"> m_page->focusController().setActive(isActive);
</span><del>-
-#if PLATFORM(MAC)
- // Tell all our plug-in views that the window focus changed.
- for (auto* pluginView : m_pluginViews)
- pluginView->setWindowIsFocused(isActive);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPage::setViewIsVisible(bool isVisible)
</span><span class="cx"> {
</span><del>- if (isVisible)
- m_drawingArea->resumePainting();
- else
- m_drawingArea->suspendPainting();
-
</del><span class="cx"> m_page->setIsVisible(m_viewState & ViewState::IsVisible, false);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2076,6 +2065,8 @@
</span><span class="cx"> ViewState::Flags changed = m_viewState ^ viewState;
</span><span class="cx"> m_viewState = viewState;
</span><span class="cx">
</span><ins>+ m_drawingArea->viewStateDidChange(changed);
+
</ins><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><span class="cx"> if (changed & ViewState::WindowIsVisible)
</span><span class="lines">@@ -2090,11 +2081,10 @@
</span><span class="cx"> setActive(viewState & ViewState::WindowIsActive);
</span><span class="cx"> if (changed & ViewState::IsInWindow)
</span><span class="cx"> setIsInWindow(viewState & ViewState::IsInWindow);
</span><del>-#if HAVE(LAYER_HOSTING_IN_WINDOW_SERVER)
- if (changed & ViewState::IsLayerWindowServerHosted)
- setLayerHostingMode(layerHostingMode());
-#endif
</del><span class="cx">
</span><ins>+ for (auto* pluginView : m_pluginViews)
+ pluginView->viewStateDidChange(changed);
+
</ins><span class="cx"> if (wantsDidUpdateViewState)
</span><span class="cx"> m_sendDidUpdateViewStateTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="lines">@@ -3052,23 +3042,9 @@
</span><span class="cx"> m_windowIsVisible = windowIsVisible;
</span><span class="cx">
</span><span class="cx"> corePage()->focusController().setContainingWindowIsVisible(windowIsVisible);
</span><del>-
-#if PLATFORM(MAC)
- // Tell all our plug-in views that the window visibility changed.
- for (auto* pluginView : m_pluginViews)
- pluginView->setWindowIsVisible(windowIsVisible);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>-void WebPage::setLayerHostingMode(LayerHostingMode layerHostingMode)
-{
- for (auto* pluginView : m_pluginViews)
- pluginView->setLayerHostingMode(layerHostingMode);
-
- m_drawingArea->setLayerHostingMode(layerHostingMode);
-}
-
</del><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="cx"> m_windowFrameInScreenCoordinates = windowFrameInScreenCoordinates;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (161225 => 161226)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-01-02 22:16:59 UTC (rev 161225)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-01-02 22:20:05 UTC (rev 161226)
</span><span class="lines">@@ -347,6 +347,7 @@
</span><span class="cx"> void removePluginView(PluginView*);
</span><span class="cx">
</span><span class="cx"> bool windowIsVisible() const { return m_windowIsVisible; }
</span><ins>+ bool isVisible() const { return m_viewState & ViewState::IsVisible; }
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> LayerHostingMode layerHostingMode() const
</span><span class="lines">@@ -357,7 +358,6 @@
</span><span class="cx"> return LayerHostingModeDefault;
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><del>- void setLayerHostingMode(LayerHostingMode);
</del><span class="cx">
</span><span class="cx"> void updatePluginsActiveAndFocusedState();
</span><span class="cx"> const WebCore::FloatRect& windowFrameInScreenCoordinates() const { return m_windowFrameInScreenCoordinates; }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h (161225 => 161226)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h 2014-01-02 22:16:59 UTC (rev 161225)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h 2014-01-02 22:20:05 UTC (rev 161226)
</span><span class="lines">@@ -55,8 +55,7 @@
</span><span class="cx"> TiledCoreAnimationDrawingArea(WebPage*, const WebPageCreationParameters&);
</span><span class="cx"> virtual ~TiledCoreAnimationDrawingArea();
</span><span class="cx">
</span><del>- virtual void suspendPainting() OVERRIDE;
- virtual void resumePainting() OVERRIDE;
</del><ins>+ virtual void viewStateDidChange(ViewState::Flags changed) OVERRIDE;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> // DrawingArea
</span><span class="lines">@@ -101,7 +100,9 @@
</span><span class="cx"> // Message handlers.
</span><span class="cx"> virtual void updateGeometry(const WebCore::IntSize& viewSize, const WebCore::IntSize& layerPosition) OVERRIDE;
</span><span class="cx"> virtual void setDeviceScaleFactor(float) OVERRIDE;
</span><del>- virtual void setLayerHostingMode(LayerHostingMode) OVERRIDE;
</del><ins>+ void suspendPainting();
+ void resumePainting();
+ void setLayerHostingMode(LayerHostingMode);
</ins><span class="cx"> virtual void setColorSpace(const ColorSpaceData&) OVERRIDE;
</span><span class="cx">
</span><span class="cx"> virtual void adjustTransientZoom(double scale, WebCore::FloatPoint origin) OVERRIDE;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (161225 => 161226)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2014-01-02 22:16:59 UTC (rev 161225)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2014-01-02 22:20:05 UTC (rev 161226)
</span><span class="lines">@@ -389,6 +389,21 @@
</span><span class="cx"> return returnValue;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void TiledCoreAnimationDrawingArea::viewStateDidChange(ViewState::Flags changed)
+{
+ if (changed & ViewState::IsVisible) {
+ if (m_webPage->isVisible())
+ resumePainting();
+ else
+ suspendPainting();
+ }
+
+#if HAVE(LAYER_HOSTING_IN_WINDOW_SERVER)
+ if (changed & ViewState::IsLayerWindowServerHosted)
+ setLayerHostingMode(m_webPage->layerHostingMode());
+#endif
+}
+
</ins><span class="cx"> void TiledCoreAnimationDrawingArea::suspendPainting()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_isPaintingSuspended);
</span></span></pre>
</div>
</div>
</body>
</html>