Imported WebKit commit 26cd9bd8ab0471ffe987c9b60368f63dc0f1f31b (http://svn.webkit.org/repository/webkit/trunk@121325)

New snapshot with more Windows build fixes

15 files changed, 83 insertions, 83 deletions

diff --git a/Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp b/Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp
index e0d6012d2..e1f6759ac 100644
--- a/Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp
+++ b/Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp
@@ -21,7 +21,7 @@
 #include "config.h"
 #include "qquickwebpage_p.h"
 
-#include "LayerTreeHostProxy.h"
+#include "LayerTreeCoordinatorProxy.h"
 #include "QtWebPageEventHandler.h"
 #include "QtWebPageSGNode.h"
 #include "TransformationMatrix.h"
@@ -72,9 +72,9 @@ void QQuickWebPagePrivate::paint(QPainter* painter)
     if (!webPageProxy->drawingArea())
         return;
 
-    LayerTreeHostProxy* layerTreeHostProxy = webPageProxy->drawingArea()->layerTreeHostProxy();
-    if (layerTreeHostProxy->layerTreeRenderer())
-        layerTreeHostProxy->layerTreeRenderer()->paintToGraphicsContext(painter);
+    LayerTreeCoordinatorProxy* layerTreeCoordinatorProxy = webPageProxy->drawingArea()->layerTreeCoordinatorProxy();
+    if (layerTreeCoordinatorProxy->layerTreeRenderer())
+        layerTreeCoordinatorProxy->layerTreeRenderer()->paintToGraphicsContext(painter);
 }
 
 QSGNode* QQuickWebPage::updatePaintNode(QSGNode* oldNode, UpdatePaintNodeData*)
@@ -82,8 +82,8 @@ QSGNode* QQuickWebPage::updatePaintNode(QSGNode* oldNode, UpdatePaintNodeData*)
     if (!d->webPageProxy->drawingArea())
         return oldNode;
 
-    LayerTreeHostProxy* layerTreeHostProxy = d->webPageProxy->drawingArea()->layerTreeHostProxy();
-    WebLayerTreeRenderer* renderer = layerTreeHostProxy->layerTreeRenderer();
+    LayerTreeCoordinatorProxy* layerTreeCoordinatorProxy = d->webPageProxy->drawingArea()->layerTreeCoordinatorProxy();
+    WebLayerTreeRenderer* renderer = layerTreeCoordinatorProxy->layerTreeRenderer();
 
     QtWebPageSGNode* node = static_cast<QtWebPageSGNode*>(oldNode);
     if (!node)
@@ -159,8 +159,8 @@ void QQuickWebPagePrivate::updateSize()
     QSizeF scaledSize = contentsSize * contentsScale;
 
     DrawingAreaProxy* drawingArea = webPageProxy->drawingArea();
-    if (drawingArea && drawingArea->layerTreeHostProxy())
-        drawingArea->layerTreeHostProxy()->setContentsSize(contentsSize);
+    if (drawingArea && drawingArea->layerTreeCoordinatorProxy())
+        drawingArea->layerTreeCoordinatorProxy()->setContentsSize(contentsSize);
 
     q->setSize(scaledSize);
 
diff --git a/Source/WebKit2/UIProcess/DrawingAreaProxy.cpp b/Source/WebKit2/UIProcess/DrawingAreaProxy.cpp
index 08b225743..5f7b10654 100644
--- a/Source/WebKit2/UIProcess/DrawingAreaProxy.cpp
+++ b/Source/WebKit2/UIProcess/DrawingAreaProxy.cpp
@@ -29,7 +29,7 @@
 #include "WebPageProxy.h"
 
 #if USE(UI_SIDE_COMPOSITING)
-#include "LayerTreeHostProxy.h"
+#include "LayerTreeCoordinatorProxy.h"
 #include <CoreIPC/MessageID.h>
 #endif
 
@@ -69,7 +69,7 @@ WebCore::IntRect DrawingAreaProxy::contentsRect() const
     return IntRect(IntPoint::zero(), m_webPageProxy->viewSize());
 }
 
-void DrawingAreaProxy::didReceiveLayerTreeHostProxyMessage(CoreIPC::Connection*, CoreIPC::MessageID messageID, CoreIPC::ArgumentDecoder* arguments)
+void DrawingAreaProxy::didReceiveLayerTreeCoordinatorProxyMessage(CoreIPC::Connection*, CoreIPC::MessageID messageID, CoreIPC::ArgumentDecoder* arguments)
 {
 }
 #endif
diff --git a/Source/WebKit2/UIProcess/DrawingAreaProxy.h b/Source/WebKit2/UIProcess/DrawingAreaProxy.h
index 9f1705dd7..426fea14a 100644
--- a/Source/WebKit2/UIProcess/DrawingAreaProxy.h
+++ b/Source/WebKit2/UIProcess/DrawingAreaProxy.h
@@ -54,7 +54,7 @@ namespace WebCore {
 namespace WebKit {
 
 class LayerTreeContext;
-class LayerTreeHostProxy;
+class LayerTreeCoordinatorProxy;
 class UpdateInfo;
 class WebLayerTreeInfo;
 class WebLayerUpdateInfo;
@@ -93,12 +93,12 @@ public:
     virtual WebCore::IntRect viewportVisibleRect() const { return contentsRect(); }
     virtual WebCore::IntRect contentsRect() const;
     virtual bool isBackingStoreReady() const { return true; }
-    LayerTreeHostProxy* layerTreeHostProxy() const { return m_layerTreeHostProxy.get(); }
+    LayerTreeCoordinatorProxy* layerTreeCoordinatorProxy() const { return m_layerTreeCoordinatorProxy.get(); }
     virtual void setVisibleContentsRect(const WebCore::IntRect& visibleContentsRect, float scale, const WebCore::FloatPoint& trajectoryVector, const WebCore::FloatPoint& accurateVisibleContentsPosition = WebCore::FloatPoint()) { }
     virtual void createTileForLayer(int layerID, int tileID, const WebKit::UpdateInfo&) { }
     virtual void updateTileForLayer(int layerID, int tileID, const WebKit::UpdateInfo&) { }
     virtual void removeTileForLayer(int layerID, int tileID) { }
-    virtual void didReceiveLayerTreeHostProxyMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*);
+    virtual void didReceiveLayerTreeCoordinatorProxyMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*);
 
     WebPageProxy* page() { return m_webPageProxy; }
 #endif
@@ -112,7 +112,7 @@ protected:
     WebCore::IntSize m_scrollOffset;
 
 #if USE(UI_SIDE_COMPOSITING)
-    OwnPtr<LayerTreeHostProxy> m_layerTreeHostProxy;
+    OwnPtr<LayerTreeCoordinatorProxy> m_layerTreeCoordinatorProxy;
 #endif
 
 private:
diff --git a/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp b/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp
index 156267164..0bb74484e 100644
--- a/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp
+++ b/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp
@@ -37,7 +37,7 @@
 #include <WebCore/Region.h>
 
 #if USE(UI_SIDE_COMPOSITING)
-#include "LayerTreeHostProxy.h"
+#include "LayerTreeCoordinatorProxy.h"
 #endif
 
 using namespace WebCore;
@@ -61,7 +61,7 @@ DrawingAreaProxyImpl::DrawingAreaProxyImpl(WebPageProxy* webPageProxy)
 #if USE(UI_SIDE_COMPOSITING)
     // Construct the proxy early to allow messages to be sent to the web process while AC is entered there.
     if (webPageProxy->pageGroup()->preferences()->forceCompositingMode())
-        m_layerTreeHostProxy = adoptPtr(new LayerTreeHostProxy(this));
+        m_layerTreeCoordinatorProxy = adoptPtr(new LayerTreeCoordinatorProxy(this));
 #endif
 }
 
@@ -354,22 +354,22 @@ void DrawingAreaProxyImpl::enterAcceleratedCompositingMode(const LayerTreeContex
     m_layerTreeContext = layerTreeContext;
     m_webPageProxy->enterAcceleratedCompositingMode(layerTreeContext);
 #if USE(UI_SIDE_COMPOSITING)
-    if (!m_layerTreeHostProxy)
-        m_layerTreeHostProxy = adoptPtr(new LayerTreeHostProxy(this));
+    if (!m_layerTreeCoordinatorProxy)
+        m_layerTreeCoordinatorProxy = adoptPtr(new LayerTreeCoordinatorProxy(this));
 #endif
 }
 
 #if USE(UI_SIDE_COMPOSITING)
-void DrawingAreaProxyImpl::didReceiveLayerTreeHostProxyMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::ArgumentDecoder* arguments)
+void DrawingAreaProxyImpl::didReceiveLayerTreeCoordinatorProxyMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::ArgumentDecoder* arguments)
 {
-    if (m_layerTreeHostProxy)
-        m_layerTreeHostProxy->didReceiveLayerTreeHostProxyMessage(connection, messageID, arguments);
+    if (m_layerTreeCoordinatorProxy)
+        m_layerTreeCoordinatorProxy->didReceiveLayerTreeCoordinatorProxyMessage(connection, messageID, arguments);
 }
 
 void DrawingAreaProxyImpl::setVisibleContentsRect(const WebCore::IntRect& visibleContentsRect, float scale, const WebCore::FloatPoint& trajectoryVector, const WebCore::FloatPoint& accurateVisibleContentsPosition)
 {
-    if (m_layerTreeHostProxy)
-        m_layerTreeHostProxy->setVisibleContentsRect(visibleContentsRect, scale, trajectoryVector, accurateVisibleContentsPosition);
+    if (m_layerTreeCoordinatorProxy)
+        m_layerTreeCoordinatorProxy->setVisibleContentsRect(visibleContentsRect, scale, trajectoryVector, accurateVisibleContentsPosition);
 }
 
 #endif
diff --git a/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h b/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h
index 346f3546d..4c4ac5939 100644
--- a/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h
+++ b/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h
@@ -39,7 +39,7 @@ class Region;
 
 namespace WebKit {
 
-class LayerTreeHostProxy;
+class LayerTreeCoordinatorProxy;
 
 class DrawingAreaProxyImpl : public DrawingAreaProxy {
 public:
@@ -83,7 +83,7 @@ private:
 
 #if USE(UI_SIDE_COMPOSITING)
     virtual void setVisibleContentsRect(const WebCore::IntRect& visibleContentsRect, float scale, const WebCore::FloatPoint& trajectory, const WebCore::FloatPoint& accurateVisibleContentsPosition = WebCore::FloatPoint());
-    void didReceiveLayerTreeHostProxyMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*);
+    void didReceiveLayerTreeCoordinatorProxyMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*);
 #endif
 #else
     bool isInAcceleratedCompositingMode() const { return false; }
diff --git a/Source/WebKit2/UIProcess/LayerTreeHostProxy.cpp b/Source/WebKit2/UIProcess/LayerTreeCoordinatorProxy.cpp
index 687f072f6..3b0214344 100644
--- a/Source/WebKit2/UIProcess/LayerTreeHostProxy.cpp
+++ b/Source/WebKit2/UIProcess/LayerTreeCoordinatorProxy.cpp
@@ -20,9 +20,9 @@
 #include "config.h"
 
 #if USE(UI_SIDE_COMPOSITING)
-#include "LayerTreeHostProxy.h"
+#include "LayerTreeCoordinatorProxy.h"
 
-#include "LayerTreeHostMessages.h"
+#include "LayerTreeCoordinatorMessages.h"
 #include "UpdateInfo.h"
 #include "WebCoreArgumentCoders.h"
 #include "WebLayerTreeInfo.h"
@@ -34,34 +34,34 @@ namespace WebKit {
 
 using namespace WebCore;
 
-LayerTreeHostProxy::LayerTreeHostProxy(DrawingAreaProxy* drawingAreaProxy)
+LayerTreeCoordinatorProxy::LayerTreeCoordinatorProxy(DrawingAreaProxy* drawingAreaProxy)
     : m_drawingAreaProxy(drawingAreaProxy)
     , m_renderer(adoptRef(new WebLayerTreeRenderer(this)))
 {
 }
 
-LayerTreeHostProxy::~LayerTreeHostProxy()
+LayerTreeCoordinatorProxy::~LayerTreeCoordinatorProxy()
 {
     m_renderer->detach();
 }
 
-void LayerTreeHostProxy::updateViewport()
+void LayerTreeCoordinatorProxy::updateViewport()
 {
     m_drawingAreaProxy->updateViewport();
 }
 
-void LayerTreeHostProxy::dispatchUpdate(const Function<void()>& function)
+void LayerTreeCoordinatorProxy::dispatchUpdate(const Function<void()>& function)
 {
     m_renderer->appendUpdate(function);
 }
 
-void LayerTreeHostProxy::createTileForLayer(int layerID, int tileID, const IntRect& targetRect, const WebKit::SurfaceUpdateInfo& updateInfo)
+void LayerTreeCoordinatorProxy::createTileForLayer(int layerID, int tileID, const IntRect& targetRect, const WebKit::SurfaceUpdateInfo& updateInfo)
 {
     dispatchUpdate(bind(&WebLayerTreeRenderer::createTile, m_renderer.get(), layerID, tileID, updateInfo.scaleFactor));
     updateTileForLayer(layerID, tileID, targetRect, updateInfo);
 }
 
-void LayerTreeHostProxy::updateTileForLayer(int layerID, int tileID, const IntRect& targetRect, const WebKit::SurfaceUpdateInfo& updateInfo)
+void LayerTreeCoordinatorProxy::updateTileForLayer(int layerID, int tileID, const IntRect& targetRect, const WebKit::SurfaceUpdateInfo& updateInfo)
 {
     RefPtr<ShareableSurface> surface;
 #if USE(GRAPHICS_SURFACE)
@@ -78,86 +78,86 @@ void LayerTreeHostProxy::updateTileForLayer(int layerID, int tileID, const IntRe
     dispatchUpdate(bind(&WebLayerTreeRenderer::updateTile, m_renderer.get(), layerID, tileID, WebLayerTreeRenderer::TileUpdate(updateInfo.updateRect, targetRect, surface, updateInfo.surfaceOffset)));
 }
 
-void LayerTreeHostProxy::removeTileForLayer(int layerID, int tileID)
+void LayerTreeCoordinatorProxy::removeTileForLayer(int layerID, int tileID)
 {
     dispatchUpdate(bind(&WebLayerTreeRenderer::removeTile, m_renderer.get(), layerID, tileID));
 }
 
-void LayerTreeHostProxy::deleteCompositingLayer(WebLayerID id)
+void LayerTreeCoordinatorProxy::deleteCompositingLayer(WebLayerID id)
 {
     dispatchUpdate(bind(&WebLayerTreeRenderer::deleteLayer, m_renderer.get(), id));
     updateViewport();
 }
 
-void LayerTreeHostProxy::setRootCompositingLayer(WebLayerID id)
+void LayerTreeCoordinatorProxy::setRootCompositingLayer(WebLayerID id)
 {
     dispatchUpdate(bind(&WebLayerTreeRenderer::setRootLayerID, m_renderer.get(), id));
     updateViewport();
 }
 
-void LayerTreeHostProxy::setCompositingLayerState(WebLayerID id, const WebLayerInfo& info)
+void LayerTreeCoordinatorProxy::setCompositingLayerState(WebLayerID id, const WebLayerInfo& info)
 {
     dispatchUpdate(bind(&WebLayerTreeRenderer::setLayerState, m_renderer.get(), id, info));
 }
 
-void LayerTreeHostProxy::setCompositingLayerChildren(WebLayerID id, const Vector<WebLayerID>& children)
+void LayerTreeCoordinatorProxy::setCompositingLayerChildren(WebLayerID id, const Vector<WebLayerID>& children)
 {
     dispatchUpdate(bind(&WebLayerTreeRenderer::setLayerChildren, m_renderer.get(), id, children));
 }
 
 #if ENABLE(CSS_FILTERS)
-void LayerTreeHostProxy::setCompositingLayerFilters(WebLayerID id, const FilterOperations& filters)
+void LayerTreeCoordinatorProxy::setCompositingLayerFilters(WebLayerID id, const FilterOperations& filters)
 {
     dispatchUpdate(bind(&WebLayerTreeRenderer::setLayerFilters, m_renderer.get(), id, filters));
 }
 #endif
 
-void LayerTreeHostProxy::didRenderFrame()
+void LayerTreeCoordinatorProxy::didRenderFrame()
 {
     dispatchUpdate(bind(&WebLayerTreeRenderer::flushLayerChanges, m_renderer.get()));
     updateViewport();
 }
 
-void LayerTreeHostProxy::createDirectlyCompositedImage(int64_t key, const WebKit::ShareableBitmap::Handle& handle)
+void LayerTreeCoordinatorProxy::createDirectlyCompositedImage(int64_t key, const WebKit::ShareableBitmap::Handle& handle)
 {
     RefPtr<ShareableBitmap> bitmap = ShareableBitmap::create(handle);
     dispatchUpdate(bind(&WebLayerTreeRenderer::createImage, m_renderer.get(), key, bitmap));
 }
 
-void LayerTreeHostProxy::destroyDirectlyCompositedImage(int64_t key)
+void LayerTreeCoordinatorProxy::destroyDirectlyCompositedImage(int64_t key)
 {
     dispatchUpdate(bind(&WebLayerTreeRenderer::destroyImage, m_renderer.get(), key));
 }
 
-void LayerTreeHostProxy::setContentsSize(const FloatSize& contentsSize)
+void LayerTreeCoordinatorProxy::setContentsSize(const FloatSize& contentsSize)
 {
     dispatchUpdate(bind(&WebLayerTreeRenderer::setContentsSize, m_renderer.get(), contentsSize));
 }
 
-void LayerTreeHostProxy::setVisibleContentsRect(const IntRect& rect, float scale, const FloatPoint& trajectoryVector, const WebCore::FloatPoint& accurateVisibleContentsPosition)
+void LayerTreeCoordinatorProxy::setVisibleContentsRect(const IntRect& rect, float scale, const FloatPoint& trajectoryVector, const WebCore::FloatPoint& accurateVisibleContentsPosition)
 {
     dispatchUpdate(bind(&WebLayerTreeRenderer::setVisibleContentsRect, m_renderer.get(), rect, scale, accurateVisibleContentsPosition));
-    m_drawingAreaProxy->page()->process()->send(Messages::LayerTreeHost::SetVisibleContentsRect(rect, scale, trajectoryVector), m_drawingAreaProxy->page()->pageID());
+    m_drawingAreaProxy->page()->process()->send(Messages::LayerTreeCoordinator::SetVisibleContentsRect(rect, scale, trajectoryVector), m_drawingAreaProxy->page()->pageID());
 }
 
-void LayerTreeHostProxy::renderNextFrame()
+void LayerTreeCoordinatorProxy::renderNextFrame()
 {
-    m_drawingAreaProxy->page()->process()->send(Messages::LayerTreeHost::RenderNextFrame(), m_drawingAreaProxy->page()->pageID());
+    m_drawingAreaProxy->page()->process()->send(Messages::LayerTreeCoordinator::RenderNextFrame(), m_drawingAreaProxy->page()->pageID());
 }
 
-void LayerTreeHostProxy::didChangeScrollPosition(const IntPoint& position)
+void LayerTreeCoordinatorProxy::didChangeScrollPosition(const IntPoint& position)
 {
     dispatchUpdate(bind(&WebLayerTreeRenderer::didChangeScrollPosition, m_renderer.get(), position));
 }
 
-void LayerTreeHostProxy::syncCanvas(uint32_t id, const IntSize& canvasSize, uint32_t graphicsSurfaceToken)
+void LayerTreeCoordinatorProxy::syncCanvas(uint32_t id, const IntSize& canvasSize, uint32_t graphicsSurfaceToken)
 {
     dispatchUpdate(bind(&WebLayerTreeRenderer::syncCanvas, m_renderer.get(), id, canvasSize, graphicsSurfaceToken));
 }
 
-void LayerTreeHostProxy::purgeBackingStores()
+void LayerTreeCoordinatorProxy::purgeBackingStores()
 {
-    m_drawingAreaProxy->page()->process()->send(Messages::LayerTreeHost::PurgeBackingStores(), m_drawingAreaProxy->page()->pageID());
+    m_drawingAreaProxy->page()->process()->send(Messages::LayerTreeCoordinator::PurgeBackingStores(), m_drawingAreaProxy->page()->pageID());
 }
 
 }
diff --git a/Source/WebKit2/UIProcess/LayerTreeHostProxy.h b/Source/WebKit2/UIProcess/LayerTreeCoordinatorProxy.h
index 7958a5a5d..b4e7b7ce2 100644
--- a/Source/WebKit2/UIProcess/LayerTreeHostProxy.h
+++ b/Source/WebKit2/UIProcess/LayerTreeCoordinatorProxy.h
@@ -17,8 +17,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef LayerTreeHostProxy_h
-#define LayerTreeHostProxy_h
+#ifndef LayerTreeCoordinatorProxy_h
+#define LayerTreeCoordinatorProxy_h
 
 #if USE(UI_SIDE_COMPOSITING)
 
@@ -44,10 +44,10 @@ class WebLayerInfo;
 class WebLayerTreeRenderer;
 class WebLayerUpdateInfo;
 
-class LayerTreeHostProxy {
+class LayerTreeCoordinatorProxy {
 public:
-    LayerTreeHostProxy(DrawingAreaProxy*);
-    virtual ~LayerTreeHostProxy();
+    LayerTreeCoordinatorProxy(DrawingAreaProxy*);
+    virtual ~LayerTreeCoordinatorProxy();
     void setCompositingLayerState(WebLayerID, const WebLayerInfo&);
     void setCompositingLayerChildren(WebLayerID, const Vector<WebLayerID>&);
 #if ENABLE(CSS_FILTERS)
@@ -65,7 +65,7 @@ public:
     void removeTileForLayer(int layerID, int tileID);
     void createDirectlyCompositedImage(int64_t, const WebKit::ShareableBitmap::Handle&);
     void destroyDirectlyCompositedImage(int64_t);
-    void didReceiveLayerTreeHostProxyMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*);
+    void didReceiveLayerTreeCoordinatorProxyMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*);
     void updateViewport();
     void renderNextFrame();
     void didChangeScrollPosition(const WebCore::IntPoint& position);
@@ -87,4 +87,4 @@ protected:
 
 #endif
 
-#endif // LayerTreeHostProxy_h
+#endif // LayerTreeCoordinatorProxy_h
diff --git a/Source/WebKit2/UIProcess/LayerTreeHostProxy.messages.in b/Source/WebKit2/UIProcess/LayerTreeCoordinatorProxy.messages.in
index a88b44fd8..c284b915b 100644
--- a/Source/WebKit2/UIProcess/LayerTreeHostProxy.messages.in
+++ b/Source/WebKit2/UIProcess/LayerTreeCoordinatorProxy.messages.in
@@ -18,7 +18,7 @@
 #
 
 #if USE(ACCELERATED_COMPOSITING) && USE(TILED_BACKING_STORE)
-messages -> LayerTreeHostProxy {
+messages -> LayerTreeCoordinatorProxy {
     SetCompositingLayerState(uint32_t id, WebKit::WebLayerInfo layerInfo)
     SetCompositingLayerChildren(uint32_t id, Vector<uint32_t> children)
 #if ENABLE(CSS_FILTERS)
diff --git a/Source/WebKit2/UIProcess/WebLayerTreeRenderer.cpp b/Source/WebKit2/UIProcess/WebLayerTreeRenderer.cpp
index 3850e53ca..b85e01383 100644
--- a/Source/WebKit2/UIProcess/WebLayerTreeRenderer.cpp
+++ b/Source/WebKit2/UIProcess/WebLayerTreeRenderer.cpp
@@ -25,7 +25,7 @@
 
 #include "GraphicsLayerTextureMapper.h"
 #include "LayerBackingStore.h"
-#include "LayerTreeHostProxy.h"
+#include "LayerTreeCoordinatorProxy.h"
 #include "MessageID.h"
 #include "ShareableBitmap.h"
 #include "TextureMapper.h"
@@ -85,9 +85,9 @@ static IntPoint boundedScrollPosition(const IntPoint& scrollPosition, const IntR
     return IntPoint(scrollPositionX, scrollPositionY);
 }
 
-WebLayerTreeRenderer::WebLayerTreeRenderer(LayerTreeHostProxy* layerTreeHostProxy)
+WebLayerTreeRenderer::WebLayerTreeRenderer(LayerTreeCoordinatorProxy* layerTreeCoordinatorProxy)
     : m_contentsScale(1)
-    , m_layerTreeHostProxy(layerTreeHostProxy)
+    , m_layerTreeCoordinatorProxy(layerTreeCoordinatorProxy)
     , m_rootLayerID(InvalidWebLayerID)
     , m_isActive(false)
 {
@@ -175,8 +175,8 @@ void WebLayerTreeRenderer::setVisibleContentsRect(const IntRect& rect, float sca
 
 void WebLayerTreeRenderer::updateViewport()
 {
-    if (m_layerTreeHostProxy)
-        m_layerTreeHostProxy->updateViewport();
+    if (m_layerTreeCoordinatorProxy)
+        m_layerTreeCoordinatorProxy->updateViewport();
 }
 
 void WebLayerTreeRenderer::adjustPositionForFixedLayers()
@@ -406,8 +406,8 @@ void WebLayerTreeRenderer::flushLayerChanges()
 
 void WebLayerTreeRenderer::renderNextFrame()
 {
-    if (m_layerTreeHostProxy)
-        m_layerTreeHostProxy->renderNextFrame();
+    if (m_layerTreeCoordinatorProxy)
+        m_layerTreeCoordinatorProxy->renderNextFrame();
 }
 
 void WebLayerTreeRenderer::ensureRootLayer()
@@ -465,13 +465,13 @@ void WebLayerTreeRenderer::purgeGLResources()
 
 void WebLayerTreeRenderer::purgeBackingStores()
 {
-    if (m_layerTreeHostProxy)
-        m_layerTreeHostProxy->purgeBackingStores();
+    if (m_layerTreeCoordinatorProxy)
+        m_layerTreeCoordinatorProxy->purgeBackingStores();
 }
 
 void WebLayerTreeRenderer::detach()
 {
-    m_layerTreeHostProxy = 0;
+    m_layerTreeCoordinatorProxy = 0;
 }
 
 void WebLayerTreeRenderer::appendUpdate(const Function<void()>& function)
diff --git a/Source/WebKit2/UIProcess/WebLayerTreeRenderer.h b/Source/WebKit2/UIProcess/WebLayerTreeRenderer.h
index d66b19d63..2a4bab536 100644
--- a/Source/WebKit2/UIProcess/WebLayerTreeRenderer.h
+++ b/Source/WebKit2/UIProcess/WebLayerTreeRenderer.h
@@ -40,7 +40,7 @@
 namespace WebKit {
 
 class LayerBackingStore;
-class LayerTreeHostProxy;
+class LayerTreeCoordinatorProxy;
 class WebLayerInfo;
 class WebLayerUpdateInfo;
 
@@ -59,7 +59,7 @@ public:
         {
         }
     };
-    WebLayerTreeRenderer(LayerTreeHostProxy*);
+    WebLayerTreeRenderer(LayerTreeCoordinatorProxy*);
     virtual ~WebLayerTreeRenderer();
     void purgeGLResources();
     void paintToCurrentGLContext(const WebCore::TransformationMatrix&, float, const WebCore::FloatRect&, WebCore::TextureMapper::PaintFlags = 0);
@@ -135,7 +135,7 @@ private:
     void renderNextFrame();
     void purgeBackingStores();
 
-    LayerTreeHostProxy* m_layerTreeHostProxy;
+    LayerTreeCoordinatorProxy* m_layerTreeCoordinatorProxy;
     OwnPtr<WebCore::GraphicsLayer> m_rootLayer;
     Vector<WebLayerID> m_layersToDelete;
 
diff --git a/Source/WebKit2/UIProcess/WebPageProxy.cpp b/Source/WebKit2/UIProcess/WebPageProxy.cpp
index 627ee5207..b5046b299 100644
--- a/Source/WebKit2/UIProcess/WebPageProxy.cpp
+++ b/Source/WebKit2/UIProcess/WebPageProxy.cpp
@@ -94,7 +94,7 @@
 #endif
 
 #if USE(UI_SIDE_COMPOSITING)
-#include "LayerTreeHostProxyMessages.h"
+#include "LayerTreeCoordinatorProxyMessages.h"
 #endif
 
 #if PLATFORM(QT)
@@ -1737,8 +1737,8 @@ void WebPageProxy::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::M
     }
 
 #if USE(UI_SIDE_COMPOSITING)
-    if (messageID.is<CoreIPC::MessageClassLayerTreeHostProxy>()) {
-        m_drawingArea->didReceiveLayerTreeHostProxyMessage(connection, messageID, arguments);
+    if (messageID.is<CoreIPC::MessageClassLayerTreeCoordinatorProxy>()) {
+        m_drawingArea->didReceiveLayerTreeCoordinatorProxyMessage(connection, messageID, arguments);
         return;
     }
 #endif
diff --git a/Source/WebKit2/UIProcess/gtk/TextCheckerGtk.cpp b/Source/WebKit2/UIProcess/gtk/TextCheckerGtk.cpp
index 5b26d1207..405c0e132 100644
--- a/Source/WebKit2/UIProcess/gtk/TextCheckerGtk.cpp
+++ b/Source/WebKit2/UIProcess/gtk/TextCheckerGtk.cpp
@@ -38,7 +38,7 @@ static TextCheckerState textCheckerState;
 
 const TextCheckerState& TextChecker::state()
 {
-    static bool didInitializeState;
+    static bool didInitializeState = false;
     if (didInitializeState)
         return textCheckerState;
 
diff --git a/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp b/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp
index 4f131ccdf..648119486 100644
--- a/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp
+++ b/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp
@@ -31,7 +31,7 @@
 #include <QCursor>
 #include <QDrag>
 #include <QGuiApplication>
-#include <QInputPanel>
+#include <QInputMethod>
 #include <QMimeData>
 #include <QtQuick/QQuickCanvas>
 #include <QStyleHints>
@@ -100,12 +100,12 @@ QtWebPageEventHandler::QtWebPageEventHandler(WKPageRef pageRef, QQuickWebPage* q
     , m_postponeTextInputStateChanged(false)
     , m_isTapHighlightActive(false)
 {
-    connect(qApp->inputPanel(), SIGNAL(visibleChanged()), this, SLOT(inputPanelVisibleChanged()));
+    connect(qApp->inputMethod(), SIGNAL(visibleChanged()), this, SLOT(inputPanelVisibleChanged()));
 }
 
 QtWebPageEventHandler::~QtWebPageEventHandler()
 {
-    disconnect(qApp->inputPanel(), SIGNAL(visibleChanged()), this, SLOT(inputPanelVisibleChanged()));
+    disconnect(qApp->inputMethod(), SIGNAL(visibleChanged()), this, SLOT(inputPanelVisibleChanged()));
 }
 
 void QtWebPageEventHandler::handleMouseMoveEvent(QMouseEvent* ev)
@@ -390,10 +390,10 @@ void QtWebPageEventHandler::resetGestureRecognizers()
 
 static void setInputPanelVisible(bool visible)
 {
-    if (qApp->inputPanel()->visible() == visible)
+    if (qApp->inputMethod()->visible() == visible)
         return;
 
-    qApp->inputPanel()->setVisible(visible);
+    qApp->inputMethod()->setVisible(visible);
 }
 
 void QtWebPageEventHandler::inputPanelVisibleChanged()
@@ -402,7 +402,7 @@ void QtWebPageEventHandler::inputPanelVisibleChanged()
         return;
 
     // We only respond to the input panel becoming visible.
-    if (!m_webView->hasActiveFocus() || !qApp->inputPanel()->visible())
+    if (!m_webView->hasActiveFocus() || !qApp->inputMethod()->visible())
         return;
 
     const EditorState& editor = m_webPageProxy->editorState();
@@ -422,7 +422,7 @@ void QtWebPageEventHandler::updateTextInputState()
     if (!m_webView->hasActiveFocus())
         return;
 
-    qApp->inputPanel()->update(Qt::ImQueryInput | Qt::ImEnabled);
+    qApp->inputMethod()->update(Qt::ImQueryInput | Qt::ImEnabled);
 
     setInputPanelVisible(editor.isContentEditable);
 }
diff --git a/Source/WebKit2/UIProcess/qt/LayerBackingStore.cpp b/Source/WebKit2/UIProcess/texmap/LayerBackingStore.cpp
index caaffe9e5..caaffe9e5 100644
--- a/Source/WebKit2/UIProcess/qt/LayerBackingStore.cpp
+++ b/Source/WebKit2/UIProcess/texmap/LayerBackingStore.cpp
diff --git a/Source/WebKit2/UIProcess/qt/LayerBackingStore.h b/Source/WebKit2/UIProcess/texmap/LayerBackingStore.h
index a3e219b04..a3e219b04 100644
--- a/Source/WebKit2/UIProcess/qt/LayerBackingStore.h
+++ b/Source/WebKit2/UIProcess/texmap/LayerBackingStore.h