<!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>[160977] 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/160977">160977</a></dd>
<dt>Author</dt> <dd>barraclough@apple.com</dd>
<dt>Date</dt> <dd>2013-12-22 08:45:31 -0800 (Sun, 22 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>URTBF after <a href="http://trac.webkit.org/projects/webkit/changeset/160971">r160971</a> to try to make EFL build again.
Patch by Csaba Osztrogonác <ossy@webkit.org> on 2013-12-22
* WebProcess/WebCoreSupport/efl/WebErrorsEfl.cpp:
(WebKit::internalError):</pre>
<h3>Modified Paths</h3>
<ul>
<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="#trunkSourceWebKit2SharedWebPageCreationParameterscpp">trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPageCreationParametersh">trunk/Source/WebKit2/Shared/WebPageCreationParameters.h</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="#trunkSourceWebKit2UIProcessCoordinatedGraphicsCoordinatedDrawingAreaProxycpp">trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCoordinatedGraphicsCoordinatedDrawingAreaProxyh">trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessDrawingAreaProxyh">trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessDrawingAreaProxyImplcpp">trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessDrawingAreaProxyImplh">trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.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="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacTiledCoreAnimationDrawingAreaProxyh">trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacTiledCoreAnimationDrawingAreaProxymm">trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageDrawingAreah">trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageDrawingAreamessagesin">trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.messages.in</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="#trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm">trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm</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>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacWebPageMacmm">trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (160976 => 160977)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-22 16:33:41 UTC (rev 160976)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-22 16:45:31 UTC (rev 160977)
</span><span class="lines">@@ -701,6 +701,83 @@
</span><span class="cx">
</span><span class="cx"> 2013-12-18 Gavin Barraclough <barraclough@apple.com>
</span><span class="cx">
</span><ins>+ Add layer hosting mode to ViewState
+ https://bugs.webkit.org/show_bug.cgi?id=125803
+
+ Reviewed by Anders Carlsson.
+
+ When the view state of the page is updated the layer mode may also
+ change. Currently this is passed by a separate message, remove this
+ and fold it into ViewState.
+
+ Previously the setLayerHostingMode message would be passed to the
+ DrawingArea, which would inform the WebPage. Since the WebPage is
+ passed the SetVisibilityState messgae reverse this.
+
+ WebPageProxy had a policy of only updating the hosting mode when
+ visible - the value is sticky whilst the view is not visible. Make
+ this policy explicit in the PageClientImpl, rather then implicit
+ from the flow control.
+
+ * Shared/ViewState.h:
+ - Added ViewState::IsLayerWindowServerHosted.
+ * Shared/WebPageCreationParameters.cpp:
+ (WebKit::WebPageCreationParameters::encode):
+ (WebKit::WebPageCreationParameters::decode):
+ * Shared/WebPageCreationParameters.h:
+ - removed layerHostingMode.
+ * UIProcess/API/mac/PageClientImpl.h:
+ * UIProcess/API/mac/PageClientImpl.mm:
+ (WebKit::PageClientImpl::PageClientImpl):
+ (WebKit::PageClientImpl::isLayerWindowServerHosted):
+ (WebKit::PageClientImpl::viewWillMoveToAnotherWindow):
+ - viewLayerHostingMode -> isLayerWindowServerHosted, added m_layerHostingMode.
+ * UIProcess/DrawingAreaProxy.h:
+ - removed layerHostingModeDidChange.
+ * UIProcess/PageClient.h:
+ - viewLayerHostingMode -> isLayerWindowServerHosted.
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::WebPageProxy):
+ - removed m_layerHostingMode.
+ (WebKit::WebPageProxy::updateViewState):
+ - added IsLayerWindowServerHosted.
+ (WebKit::WebPageProxy::viewStateDidChange):
+ - changes to ViewState::IsInWindow implies ViewState::IsLayerWindowServerHosted may change too.
+ - remove special handling (separate message) for LayerHostingMode.
+ (WebKit::WebPageProxy::initializeCreationParameters):
+ - removed m_layerHostingMode.
+ * UIProcess/WebPageProxy.h:
+ - removed m_layerHostingMode.
+ * UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h:
+ * UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm:
+ - removed layerHostingModeDidChange.
+ * WebProcess/WebPage/DrawingArea.h:
+ (WebKit::DrawingArea::setLayerHostingMode):
+ (WebKit::DrawingArea::didUpdate):
+ - setLayerHostingMode takes a LayerHostingMode.
+ * WebProcess/WebPage/DrawingArea.messages.in:
+ - SetLayerHostingMode is no longer a message.
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::WebPage):
+ - removed m_layerHostingMode.
+ (WebKit::WebPage::setViewState):
+ - handle ViewState::IsLayerWindowServerHosted.
+ (WebKit::WebPage::setLayerHostingMode):
+ - moved from ~Mac.mm (matching other ViewState setters), calls to DrawingArea.
+ * WebProcess/WebPage/WebPage.h:
+ (WebKit::WebPage::layerHostingMode):
+ - layerHostingMode queries m_viewState, removed m_layerHostingMode.
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ - removed setLayerHostingMode.
+ * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h:
+ * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
+ (WebKit::TiledCoreAnimationDrawingArea::setLayerHostingMode):
+ - setLayerHostingMode takes a LayerHostingMode, WebPage now calls to DrawingArea.
+ * WebProcess/WebPage/mac/WebPageMac.mm:
+ - removed setLayerHostingMode.
+
+2013-12-18 Gavin Barraclough <barraclough@apple.com>
+
</ins><span class="cx"> Fix page visibility api test, initialization in WebKit2
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=125933
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedViewStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ViewState.h (160976 => 160977)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/ViewState.h 2013-12-22 16:33:41 UTC (rev 160976)
+++ trunk/Source/WebKit2/Shared/ViewState.h 2013-12-22 16:45:31 UTC (rev 160977)
</span><span class="lines">@@ -34,13 +34,14 @@
</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
</del><ins>+ WindowIsVisible = 1 << 4,
+ IsLayerWindowServerHosted = 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 | WindowIsVisible;
</del><ins>+ static const Flags AllFlags = WindowIsActive | IsFocused | IsVisible | IsInWindow | WindowIsVisible | IsLayerWindowServerHosted;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPageCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp (160976 => 160977)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp 2013-12-22 16:33:41 UTC (rev 160976)
+++ trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp 2013-12-22 16:45:31 UTC (rev 160977)
</span><span class="lines">@@ -62,7 +62,6 @@
</span><span class="cx"> encoder << backgroundExtendsBeyondPage;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>- encoder.encodeEnum(layerHostingMode);
</del><span class="cx"> encoder << colorSpace;
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -125,8 +124,6 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>- if (!decoder.decodeEnum(parameters.layerHostingMode))
- return false;
</del><span class="cx"> if (!decoder.decode(parameters.colorSpace))
</span><span class="cx"> return false;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPageCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPageCreationParameters.h (160976 => 160977)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPageCreationParameters.h 2013-12-22 16:33:41 UTC (rev 160976)
+++ trunk/Source/WebKit2/Shared/WebPageCreationParameters.h 2013-12-22 16:45:31 UTC (rev 160977)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #define WebPageCreationParameters_h
</span><span class="cx">
</span><span class="cx"> #include "DrawingAreaInfo.h"
</span><del>-#include "LayerTreeContext.h"
</del><span class="cx"> #include "SessionState.h"
</span><span class="cx"> #include "ViewState.h"
</span><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><span class="lines">@@ -100,7 +99,6 @@
</span><span class="cx"> bool backgroundExtendsBeyondPage;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>- LayerHostingMode layerHostingMode;
</del><span class="cx"> ColorSpaceData colorSpace;
</span><span class="cx"> #endif
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacPageClientImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.h (160976 => 160977)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.h 2013-12-22 16:33:41 UTC (rev 160976)
+++ trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.h 2013-12-22 16:45:31 UTC (rev 160977)
</span><span class="lines">@@ -66,7 +66,9 @@
</span><span class="cx"> virtual bool isViewVisible();
</span><span class="cx"> virtual bool isWindowVisible();
</span><span class="cx"> virtual bool isViewInWindow();
</span><del>- virtual LayerHostingMode viewLayerHostingMode() OVERRIDE;
</del><ins>+#if HAVE(LAYER_HOSTING_IN_WINDOW_SERVER)
+ virtual bool isLayerWindowServerHosted();
+#endif
</ins><span class="cx"> virtual ColorSpaceData colorSpace() OVERRIDE;
</span><span class="cx"> virtual void setAcceleratedCompositingRootLayer(CALayer *) OVERRIDE;
</span><span class="cx">
</span><span class="lines">@@ -163,6 +165,9 @@
</span><span class="cx"> #if USE(DICTATION_ALTERNATIVES)
</span><span class="cx"> OwnPtr<WebCore::AlternativeTextUIController> m_alternativeTextUIController;
</span><span class="cx"> #endif
</span><ins>+#if HAVE(LAYER_HOSTING_IN_WINDOW_SERVER)
+ bool m_isLayerWindowServerHosted;
+#endif
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacPageClientImplmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm (160976 => 160977)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm 2013-12-22 16:33:41 UTC (rev 160976)
+++ trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm 2013-12-22 16:45:31 UTC (rev 160977)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #import "DataReference.h"
</span><span class="cx"> #import "DictionaryPopupInfo.h"
</span><span class="cx"> #import "FindIndicator.h"
</span><ins>+#import "LayerTreeContext.h"
</ins><span class="cx"> #import "NativeWebKeyboardEvent.h"
</span><span class="cx"> #import "StringUtilities.h"
</span><span class="cx"> #import "WKAPICast.h"
</span><span class="lines">@@ -127,6 +128,9 @@
</span><span class="cx"> #if USE(DICTATION_ALTERNATIVES)
</span><span class="cx"> , m_alternativeTextUIController(adoptPtr(new AlternativeTextUIController))
</span><span class="cx"> #endif
</span><ins>+#if HAVE(LAYER_HOSTING_IN_WINDOW_SERVER)
+ , m_isLayerWindowServerHosted(true)
+#endif
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -215,21 +219,20 @@
</span><span class="cx"> return [m_wkView window];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PageClientImpl::viewWillMoveToAnotherWindow()
</del><ins>+#if HAVE(LAYER_HOSTING_IN_WINDOW_SERVER)
+bool PageClientImpl::isLayerWindowServerHosted()
</ins><span class="cx"> {
</span><del>- clearAllEditCommands();
</del><ins>+ // Only update m_isLayerWindowServerHosted when the view is in a window - otherwise just report the last value.
+ if ([m_wkView window])
+ m_isLayerWindowServerHosted = [[m_wkView window] _hostsLayersInWindowServer];
+
+ return m_isLayerWindowServerHosted;
</ins><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><del>-LayerHostingMode PageClientImpl::viewLayerHostingMode()
</del><ins>+void PageClientImpl::viewWillMoveToAnotherWindow()
</ins><span class="cx"> {
</span><del>-#if HAVE(LAYER_HOSTING_IN_WINDOW_SERVER)
- if (![m_wkView window])
- return LayerHostingModeDefault;
-
- return [[m_wkView window] _hostsLayersInWindowServer] ? LayerHostingModeInWindowServer : LayerHostingModeDefault;
-#else
- return LayerHostingModeDefault;
-#endif
</del><ins>+ clearAllEditCommands();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ColorSpaceData PageClientImpl::colorSpace()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCoordinatedGraphicsCoordinatedDrawingAreaProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.cpp (160976 => 160977)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.cpp 2013-12-22 16:33:41 UTC (rev 160976)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.cpp 2013-12-22 16:45:31 UTC (rev 160977)
</span><span class="lines">@@ -130,11 +130,6 @@
</span><span class="cx"> backingStoreStateDidChange(RespondImmediately);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CoordinatedDrawingAreaProxy::layerHostingModeDidChange()
-{
- m_webPageProxy->process().send(Messages::DrawingArea::SetLayerHostingMode(m_webPageProxy->layerHostingMode()), m_webPageProxy->pageID());
-}
-
</del><span class="cx"> #if USE(ACCELERATED_COMPOSITING)
</span><span class="cx"> void CoordinatedDrawingAreaProxy::visibilityDidChange()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCoordinatedGraphicsCoordinatedDrawingAreaProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.h (160976 => 160977)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.h 2013-12-22 16:33:41 UTC (rev 160976)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.h 2013-12-22 16:45:31 UTC (rev 160977)
</span><span class="lines">@@ -70,7 +70,6 @@
</span><span class="cx"> // DrawingAreaProxy
</span><span class="cx"> virtual void sizeDidChange();
</span><span class="cx"> virtual void deviceScaleFactorDidChange();
</span><del>- virtual void layerHostingModeDidChange() OVERRIDE;
</del><span class="cx">
</span><span class="cx"> virtual void setBackingStoreIsDiscardable(bool);
</span><span class="cx"> virtual void waitForBackingStoreUpdateOnNextPaint();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessDrawingAreaProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h (160976 => 160977)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h 2013-12-22 16:33:41 UTC (rev 160976)
+++ trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h 2013-12-22 16:45:31 UTC (rev 160977)
</span><span class="lines">@@ -53,8 +53,6 @@
</span><span class="cx"> virtual void deviceScaleFactorDidChange() = 0;
</span><span class="cx">
</span><span class="cx"> // FIXME: These should be pure virtual.
</span><del>- virtual void layerHostingModeDidChange() { }
-
</del><span class="cx"> virtual void setBackingStoreIsDiscardable(bool) { }
</span><span class="cx">
</span><span class="cx"> virtual void waitForBackingStoreUpdateOnNextPaint() { }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessDrawingAreaProxyImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp (160976 => 160977)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp 2013-12-22 16:33:41 UTC (rev 160976)
+++ trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp 2013-12-22 16:45:31 UTC (rev 160977)
</span><span class="lines">@@ -113,11 +113,6 @@
</span><span class="cx"> backingStoreStateDidChange(RespondImmediately);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DrawingAreaProxyImpl::layerHostingModeDidChange()
-{
- m_webPageProxy->process().send(Messages::DrawingArea::SetLayerHostingMode(m_webPageProxy->layerHostingMode()), m_webPageProxy->pageID());
-}
-
</del><span class="cx"> void DrawingAreaProxyImpl::setBackingStoreIsDiscardable(bool isBackingStoreDiscardable)
</span><span class="cx"> {
</span><span class="cx"> if (m_isBackingStoreDiscardable == isBackingStoreDiscardable)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessDrawingAreaProxyImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h (160976 => 160977)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h 2013-12-22 16:33:41 UTC (rev 160976)
+++ trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h 2013-12-22 16:45:31 UTC (rev 160977)
</span><span class="lines">@@ -55,7 +55,6 @@
</span><span class="cx"> // DrawingAreaProxy
</span><span class="cx"> virtual void sizeDidChange();
</span><span class="cx"> virtual void deviceScaleFactorDidChange();
</span><del>- virtual void layerHostingModeDidChange() OVERRIDE;
</del><span class="cx">
</span><span class="cx"> virtual void setBackingStoreIsDiscardable(bool);
</span><span class="cx"> virtual void waitForBackingStoreUpdateOnNextPaint();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPageClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/PageClient.h (160976 => 160977)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/PageClient.h 2013-12-22 16:33:41 UTC (rev 160976)
+++ trunk/Source/WebKit2/UIProcess/PageClient.h 2013-12-22 16:45:31 UTC (rev 160977)
</span><span class="lines">@@ -111,8 +111,10 @@
</span><span class="cx"> // Return whether the view is in a window.
</span><span class="cx"> virtual bool isViewInWindow() = 0;
</span><span class="cx">
</span><del>- // Return the layer hosting mode for the view.
- virtual LayerHostingMode viewLayerHostingMode() { return LayerHostingModeDefault; }
</del><ins>+#if HAVE(LAYER_HOSTING_IN_WINDOW_SERVER)
+ // Return whether the layer is window server hosted.
+ virtual bool isLayerWindowServerHosted() = 0;
+#endif
</ins><span class="cx">
</span><span class="cx"> virtual void processDidCrash() = 0;
</span><span class="cx"> virtual void didRelaunchProcess() = 0;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (160976 => 160977)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2013-12-22 16:33:41 UTC (rev 160976)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2013-12-22 16:45:31 UTC (rev 160977)
</span><span class="lines">@@ -243,11 +243,6 @@
</span><span class="cx"> , m_pageScaleFactor(1)
</span><span class="cx"> , m_intrinsicDeviceScaleFactor(1)
</span><span class="cx"> , m_customDeviceScaleFactor(0)
</span><del>-#if HAVE(LAYER_HOSTING_IN_WINDOW_SERVER)
- , m_layerHostingMode(LayerHostingModeInWindowServer)
-#else
- , m_layerHostingMode(LayerHostingModeDefault)
-#endif
</del><span class="cx"> , m_drawsBackground(true)
</span><span class="cx"> , m_drawsTransparentBackground(false)
</span><span class="cx"> , m_areMemoryCacheClientCallsEnabled(true)
</span><span class="lines">@@ -947,6 +942,10 @@
</span><span class="cx"> m_viewState |= ViewState::IsVisible;
</span><span class="cx"> if (flagsToUpdate & ViewState::IsInWindow && m_pageClient.isViewInWindow())
</span><span class="cx"> m_viewState |= ViewState::IsInWindow;
</span><ins>+#if HAVE(LAYER_HOSTING_IN_WINDOW_SERVER)
+ if (flagsToUpdate & ViewState::IsLayerWindowServerHosted && m_pageClient.isLayerWindowServerHosted())
+ m_viewState |= ViewState::IsLayerWindowServerHosted;
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::viewStateDidChange(ViewState::Flags mayHaveChanged, WantsReplyOrNot wantsReply)
</span><span class="lines">@@ -954,6 +953,10 @@
</span><span class="cx"> if (!isValid())
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ // If the in-window state may have changed, then so may the layer hosting.
+ if (mayHaveChanged & ViewState::IsInWindow)
+ mayHaveChanged |= ViewState::IsLayerWindowServerHosted;
+
</ins><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 class="cx"> ViewState::Flags previousViewState = m_viewState;
</span><span class="lines">@@ -982,22 +985,13 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (mayHaveChanged & ViewState::IsInWindow) {
- if (m_viewState & ViewState::IsInWindow) {
- LayerHostingMode layerHostingMode = m_pageClient.viewLayerHostingMode();
- if (m_layerHostingMode != layerHostingMode) {
- m_layerHostingMode = layerHostingMode;
- m_drawingArea->layerHostingModeDidChange();
- }
- }
</del><span class="cx"> #if ENABLE(INPUT_TYPE_COLOR_POPOVER)
</span><del>- else {
- // When leaving the current page, close the popover color well.
- if (m_colorPicker)
- endColorPicker();
- }
-#endif
</del><ins>+ if (mayHaveChanged & ViewState::IsInWindow && !(m_viewState & ViewState::IsInWindow)) {
+ // When leaving the current page, close the popover color well.
+ if (m_colorPicker)
+ endColorPicker();
</ins><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> updateBackingStoreDiscardableState();
</span><span class="cx"> }
</span><span class="lines">@@ -3913,11 +3907,8 @@
</span><span class="cx"> m_creationParameters.scrollPinningBehavior = m_scrollPinningBehavior;
</span><span class="cx"> m_creationParameters.backgroundExtendsBeyondPage = m_backgroundExtendsBeyondPage;
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
- m_creationParameters.layerHostingMode = m_layerHostingMode;
-#if !PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC) && !PLATFORM(IOS)
</ins><span class="cx"> m_creationParameters.colorSpace = m_pageClient.colorSpace();
</span><del>-#endif // !PLATFORM(IOS)
</del><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (160976 => 160977)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2013-12-22 16:33:41 UTC (rev 160976)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2013-12-22 16:45:31 UTC (rev 160977)
</span><span class="lines">@@ -33,7 +33,6 @@
</span><span class="cx"> #include "DrawingAreaProxy.h"
</span><span class="cx"> #include "EditorState.h"
</span><span class="cx"> #include "GeolocationPermissionRequestManagerProxy.h"
</span><del>-#include "LayerTreeContext.h"
</del><span class="cx"> #include "MessageSender.h"
</span><span class="cx"> #include "NotificationPermissionRequestManagerProxy.h"
</span><span class="cx"> #include "PageLoadState.h"
</span><span class="lines">@@ -555,8 +554,6 @@
</span><span class="cx"> void setCustomDeviceScaleFactor(float);
</span><span class="cx"> void windowScreenDidChange(PlatformDisplayID);
</span><span class="cx">
</span><del>- LayerHostingMode layerHostingMode() const { return m_layerHostingMode; }
-
</del><span class="cx"> void setUseFixedLayout(bool);
</span><span class="cx"> void setFixedLayoutSize(const WebCore::IntSize&);
</span><span class="cx"> bool useFixedLayout() const { return m_useFixedLayout; };
</span><span class="lines">@@ -1240,8 +1237,6 @@
</span><span class="cx"> float m_intrinsicDeviceScaleFactor;
</span><span class="cx"> float m_customDeviceScaleFactor;
</span><span class="cx">
</span><del>- LayerHostingMode m_layerHostingMode;
-
</del><span class="cx"> bool m_drawsBackground;
</span><span class="cx"> bool m_drawsTransparentBackground;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacTiledCoreAnimationDrawingAreaProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h (160976 => 160977)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h 2013-12-22 16:33:41 UTC (rev 160976)
+++ trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h 2013-12-22 16:45:31 UTC (rev 160977)
</span><span class="lines">@@ -40,7 +40,6 @@
</span><span class="cx"> private:
</span><span class="cx"> // DrawingAreaProxy
</span><span class="cx"> virtual void deviceScaleFactorDidChange() OVERRIDE;
</span><del>- virtual void layerHostingModeDidChange() OVERRIDE;
</del><span class="cx"> virtual void sizeDidChange() OVERRIDE;
</span><span class="cx"> virtual void waitForPossibleGeometryUpdate(double timeout = didUpdateBackingStoreStateTimeout) OVERRIDE;
</span><span class="cx"> virtual void colorSpaceDidChange() OVERRIDE;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacTiledCoreAnimationDrawingAreaProxymm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm (160976 => 160977)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm 2013-12-22 16:33:41 UTC (rev 160976)
+++ trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm 2013-12-22 16:45:31 UTC (rev 160977)
</span><span class="lines">@@ -54,11 +54,6 @@
</span><span class="cx"> m_webPageProxy->process().send(Messages::DrawingArea::SetDeviceScaleFactor(m_webPageProxy->deviceScaleFactor()), m_webPageProxy->pageID());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void TiledCoreAnimationDrawingAreaProxy::layerHostingModeDidChange()
-{
- m_webPageProxy->process().send(Messages::DrawingArea::SetLayerHostingMode(m_webPageProxy->layerHostingMode()), m_webPageProxy->pageID());
-}
-
</del><span class="cx"> void TiledCoreAnimationDrawingAreaProxy::sizeDidChange()
</span><span class="cx"> {
</span><span class="cx"> if (!m_webPageProxy->isValid())
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageDrawingAreah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h (160976 => 160977)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h 2013-12-22 16:33:41 UTC (rev 160976)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h 2013-12-22 16:45:31 UTC (rev 160977)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #define DrawingArea_h
</span><span class="cx">
</span><span class="cx"> #include "DrawingAreaInfo.h"
</span><ins>+#include "LayerTreeContext.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">@@ -106,6 +107,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void suspendPainting() { }
</span><span class="cx"> virtual void resumePainting() { }
</span><ins>+ virtual void setLayerHostingMode(LayerHostingMode) { }
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> DrawingArea(DrawingAreaType, WebPage*);
</span><span class="lines">@@ -119,7 +121,6 @@
</span><span class="cx"> virtual void updateBackingStoreState(uint64_t /*backingStoreStateID*/, bool /*respondImmediately*/, float /*deviceScaleFactor*/, const WebCore::IntSize& /*size*/,
</span><span class="cx"> const WebCore::IntSize& /*scrollOffset*/) { }
</span><span class="cx"> virtual void didUpdate() { }
</span><del>- virtual void setLayerHostingMode(uint32_t) { }
</del><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> // Used by TiledCoreAnimationDrawingArea.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageDrawingAreamessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.messages.in (160976 => 160977)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.messages.in 2013-12-22 16:33:41 UTC (rev 160976)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.messages.in 2013-12-22 16:45:31 UTC (rev 160977)
</span><span class="lines">@@ -23,7 +23,6 @@
</span><span class="cx"> messages -> DrawingArea LegacyReceiver {
</span><span class="cx"> UpdateBackingStoreState(uint64_t backingStoreStateID, bool respondImmediately, float deviceScaleFactor, WebCore::IntSize size, WebCore::IntSize scrollOffset)
</span><span class="cx"> DidUpdate()
</span><del>- SetLayerHostingMode(uint32_t layerHostingMode)
</del><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> // Used by TiledCoreAnimationDrawingArea.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (160976 => 160977)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-12-22 16:33:41 UTC (rev 160976)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-12-22 16:45:31 UTC (rev 160977)
</span><span class="lines">@@ -244,7 +244,6 @@
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> , m_pdfPluginEnabled(false)
</span><span class="cx"> , m_hasCachedWindowFrame(false)
</span><del>- , m_layerHostingMode(parameters.layerHostingMode)
</del><span class="cx"> , m_keyboardEventBeingInterpreted(0)
</span><span class="cx"> , m_viewGestureGeometryCollector(*this)
</span><span class="cx"> #elif PLATFORM(GTK)
</span><span class="lines">@@ -443,8 +442,8 @@
</span><span class="cx">
</span><span class="cx"> m_sandboxExtensionTracker.invalidate();
</span><span class="cx">
</span><del>- for (HashSet<PluginView*>::const_iterator it = m_pluginViews.begin(), end = m_pluginViews.end(); it != end; ++it)
- (*it)->webPageDestroyed();
</del><ins>+ for (auto* pluginView : m_pluginViews)
+ pluginView->webPageDestroyed();
</ins><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> if (m_headerBanner)
</span><span class="lines">@@ -1234,8 +1233,8 @@
</span><span class="cx">
</span><span class="cx"> m_page->setPageScaleFactor(scale, origin);
</span><span class="cx">
</span><del>- for (HashSet<PluginView*>::const_iterator it = m_pluginViews.begin(), end = m_pluginViews.end(); it != end; ++it)
- (*it)->pageScaleFactorDidChange();
</del><ins>+ for (auto* pluginView : m_pluginViews)
+ pluginView->pageScaleFactorDidChange();
</ins><span class="cx">
</span><span class="cx"> if (m_drawingArea->layerTreeHost())
</span><span class="cx"> m_drawingArea->layerTreeHost()->deviceOrPageScaleFactorChanged();
</span><span class="lines">@@ -1261,8 +1260,8 @@
</span><span class="cx">
</span><span class="cx"> // Tell all our plug-in views that the device scale factor changed.
</span><span class="cx"> #if PLATFORM(MAC) && !PLATFORM(IOS)
</span><del>- for (HashSet<PluginView*>::const_iterator it = m_pluginViews.begin(), end = m_pluginViews.end(); it != end; ++it)
- (*it)->setDeviceScaleFactor(scaleFactor);
</del><ins>+ for (auto* pluginView : m_pluginViews)
+ pluginView->setDeviceScaleFactor(scaleFactor);
</ins><span class="cx">
</span><span class="cx"> updateHeaderAndFooterLayersForDeviceScaleChange(scaleFactor);
</span><span class="cx"> #endif
</span><span class="lines">@@ -1916,8 +1915,8 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> // Tell all our plug-in views that the window focus changed.
</span><del>- for (HashSet<PluginView*>::const_iterator it = m_pluginViews.begin(), end = m_pluginViews.end(); it != end; ++it)
- (*it)->setWindowIsFocused(isActive);
</del><ins>+ for (auto* pluginView : m_pluginViews)
+ pluginView->setWindowIsFocused(isActive);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2084,6 +2083,7 @@
</span><span class="cx"> void WebPage::setViewState(ViewState::Flags viewState, bool wantsDidUpdateViewState)
</span><span class="cx"> {
</span><span class="cx"> ViewState::Flags changed = m_viewState ^ viewState;
</span><ins>+ m_viewState = viewState;
</ins><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><span class="lines">@@ -2099,9 +2099,11 @@
</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><ins>+#if HAVE(LAYER_HOSTING_IN_WINDOW_SERVER)
+ if (changed & ViewState::IsLayerWindowServerHosted)
+ setLayerHostingMode(layerHostingMode());
+#endif
</ins><span class="cx">
</span><del>- m_viewState = viewState;
-
</del><span class="cx"> if (wantsDidUpdateViewState)
</span><span class="cx"> m_sendDidUpdateViewStateTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="lines">@@ -3062,12 +3064,20 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> // Tell all our plug-in views that the window visibility changed.
</span><del>- for (HashSet<PluginView*>::const_iterator it = m_pluginViews.begin(), end = m_pluginViews.end(); it != end; ++it)
- (*it)->setWindowIsVisible(windowIsVisible);
</del><ins>+ for (auto* pluginView : m_pluginViews)
+ pluginView->setWindowIsVisible(windowIsVisible);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><ins>+void WebPage::setLayerHostingMode(LayerHostingMode layerHostingMode)
+{
+ for (auto* pluginView : m_pluginViews)
+ pluginView->setLayerHostingMode(layerHostingMode);
+
+ m_drawingArea->setLayerHostingMode(layerHostingMode);
+}
+
</ins><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 class="lines">@@ -3076,8 +3086,8 @@
</span><span class="cx"> m_accessibilityPosition = accessibilityViewCoordinates;
</span><span class="cx">
</span><span class="cx"> // Tell all our plug-in views that the window and view frames have changed.
</span><del>- for (HashSet<PluginView*>::const_iterator it = m_pluginViews.begin(), end = m_pluginViews.end(); it != end; ++it)
- (*it)->windowAndViewFramesChanged(enclosingIntRect(windowFrameInScreenCoordinates), enclosingIntRect(viewFrameInWindowCoordinates));
</del><ins>+ for (auto* pluginView : m_pluginViews)
+ pluginView->windowAndViewFramesChanged(enclosingIntRect(windowFrameInScreenCoordinates), enclosingIntRect(viewFrameInWindowCoordinates));
</ins><span class="cx">
</span><span class="cx"> m_hasCachedWindowFrame = !m_windowFrameInUnflippedScreenCoordinates.isEmpty();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (160976 => 160977)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2013-12-22 16:33:41 UTC (rev 160976)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2013-12-22 16:45:31 UTC (rev 160977)
</span><span class="lines">@@ -349,7 +349,14 @@
</span><span class="cx"> bool windowIsVisible() const { return m_windowIsVisible; }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>- LayerHostingMode layerHostingMode() const { return m_layerHostingMode; }
</del><ins>+ LayerHostingMode layerHostingMode() const
+ {
+#if HAVE(LAYER_HOSTING_IN_WINDOW_SERVER)
+ return m_viewState & ViewState::IsLayerWindowServerHosted ? LayerHostingModeInWindowServer : LayerHostingModeDefault;
+#else
+ return LayerHostingModeDefault;
+#endif
+ }
</ins><span class="cx"> void setLayerHostingMode(LayerHostingMode);
</span><span class="cx">
</span><span class="cx"> void updatePluginsActiveAndFocusedState();
</span><span class="lines">@@ -928,9 +935,6 @@
</span><span class="cx"> // The accessibility position of the view.
</span><span class="cx"> WebCore::FloatPoint m_accessibilityPosition;
</span><span class="cx">
</span><del>- // The layer hosting mode.
- LayerHostingMode m_layerHostingMode;
-
</del><span class="cx"> RetainPtr<WKAccessibilityWebPageObject> m_mockAccessibilityElement;
</span><span class="cx">
</span><span class="cx"> WebCore::KeyboardEvent* m_keyboardEventBeingInterpreted;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (160976 => 160977)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2013-12-22 16:33:41 UTC (rev 160976)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2013-12-22 16:45:31 UTC (rev 160977)
</span><span class="lines">@@ -268,11 +268,6 @@
</span><span class="cx"> notImplemented();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPage::setLayerHostingMode(LayerHostingMode)
-{
- notImplemented();
-}
-
</del><span class="cx"> void WebPage::computePagesForPrintingPDFDocument(uint64_t, const PrintInfo&, Vector<IntRect>&)
</span><span class="cx"> {
</span><span class="cx"> notImplemented();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h (160976 => 160977)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h 2013-12-22 16:33:41 UTC (rev 160976)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h 2013-12-22 16:45:31 UTC (rev 160977)
</span><span class="lines">@@ -101,7 +101,7 @@
</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(uint32_t) OVERRIDE;
</del><ins>+ virtual void setLayerHostingMode(LayerHostingMode) OVERRIDE;
</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 (160976 => 160977)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2013-12-22 16:33:41 UTC (rev 160976)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2013-12-22 16:45:31 UTC (rev 160977)
</span><span class="lines">@@ -505,14 +505,8 @@
</span><span class="cx"> it->value->noteDeviceOrPageScaleFactorChangedIncludingDescendants();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void TiledCoreAnimationDrawingArea::setLayerHostingMode(uint32_t opaqueLayerHostingMode)
</del><ins>+void TiledCoreAnimationDrawingArea::setLayerHostingMode(LayerHostingMode)
</ins><span class="cx"> {
</span><del>- LayerHostingMode layerHostingMode = static_cast<LayerHostingMode>(opaqueLayerHostingMode);
- if (layerHostingMode == m_webPage->layerHostingMode())
- return;
-
- m_webPage->setLayerHostingMode(layerHostingMode);
-
</del><span class="cx"> updateLayerHostingContext();
</span><span class="cx">
</span><span class="cx"> // Finally, inform the UIProcess that the context has changed.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacWebPageMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm (160976 => 160977)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2013-12-22 16:33:41 UTC (rev 160976)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2013-12-22 16:45:31 UTC (rev 160977)
</span><span class="lines">@@ -249,8 +249,8 @@
</span><span class="cx">
</span><span class="cx"> void WebPage::sendComplexTextInputToPlugin(uint64_t pluginComplexTextInputIdentifier, const String& textInput)
</span><span class="cx"> {
</span><del>- for (HashSet<PluginView*>::const_iterator it = m_pluginViews.begin(), end = m_pluginViews.end(); it != end; ++it) {
- if ((*it)->sendComplexTextInput(pluginComplexTextInputIdentifier, textInput))
</del><ins>+ for (auto* pluginView : m_pluginViews) {
+ if (pluginView->sendComplexTextInput(pluginComplexTextInputIdentifier, textInput))
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -792,14 +792,6 @@
</span><span class="cx"> result = !!hitResult.scrollbar();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPage::setLayerHostingMode(LayerHostingMode layerHostingMode)
-{
- m_layerHostingMode = layerHostingMode;
-
- for (HashSet<PluginView*>::const_iterator it = m_pluginViews.begin(), end = m_pluginViews.end(); it != end; ++it)
- (*it)->setLayerHostingMode(layerHostingMode);
-}
-
</del><span class="cx"> void WebPage::setTopOverhangImage(PassRefPtr<WebImage> image)
</span><span class="cx"> {
</span><span class="cx"> FrameView* frameView = m_mainFrame->coreFrame()->view();
</span></span></pre>
</div>
</div>
</body>
</html>