diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-27 09:28:46 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-27 09:28:46 +0200 |
| commit | 6668b07fcd51f86be243b9e08e667224e30c0cf8 (patch) | |
| tree | 64f466e09b68a77ae1156c0d35cd5b95e18a34ca /Source/WebKit2/UIProcess/WebLayerTreeRenderer.cpp | |
| parent | e7923d9de38974f0c6fb7646c898a6ea618261e8 (diff) | |
| download | qtwebkit-6668b07fcd51f86be243b9e08e667224e30c0cf8.tar.gz | |
Imported WebKit commit 26cd9bd8ab0471ffe987c9b60368f63dc0f1f31b (http://svn.webkit.org/repository/webkit/trunk@121325)
New snapshot with more Windows build fixes
Diffstat (limited to 'Source/WebKit2/UIProcess/WebLayerTreeRenderer.cpp')
| -rw-r--r-- | Source/WebKit2/UIProcess/WebLayerTreeRenderer.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
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) |