Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (109301 => 109302)
--- trunk/Source/_javascript_Core/ChangeLog 2012-03-01 04:20:18 UTC (rev 109301)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-03-01 04:22:28 UTC (rev 109302)
@@ -1,3 +1,14 @@
+2012-02-29 No'am Rosenthal <[email protected]>
+
+ [Qt][WK2] Get rid of the #ifdef mess in LayerTreeHost[Proxy]
+ https://bugs.webkit.org/show_bug.cgi?id=79501
+
+ Enable WTF_USE_UI_SIDE_COMPOSITING for Qt.
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ * wtf/Platform.h:
+
2012-02-29 Gavin Barraclough <[email protected]>
Rubber stamped by Oliver Hunt.
Modified: trunk/Source/_javascript_Core/wtf/Platform.h (109301 => 109302)
--- trunk/Source/_javascript_Core/wtf/Platform.h 2012-03-01 04:20:18 UTC (rev 109301)
+++ trunk/Source/_javascript_Core/wtf/Platform.h 2012-03-01 04:22:28 UTC (rev 109302)
@@ -1074,6 +1074,11 @@
#define WTF_USE_ACCELERATED_COMPOSITING 1
#endif
+/* Compositing on the UI-process in WebKit2 */
+#if PLATFORM(QT)
+#define WTF_USE_UI_SIDE_COMPOSITING 1
+#endif
+
#if (PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD)) || PLATFORM(IOS)
#define WTF_USE_PROTECTION_SPACE_AUTH_CALLBACK 1
#endif
Modified: trunk/Source/WebKit2/ChangeLog (109301 => 109302)
--- trunk/Source/WebKit2/ChangeLog 2012-03-01 04:20:18 UTC (rev 109301)
+++ trunk/Source/WebKit2/ChangeLog 2012-03-01 04:22:28 UTC (rev 109302)
@@ -1,3 +1,46 @@
+2012-02-29 No'am Rosenthal <[email protected]>
+
+ [Qt][WK2] Get rid of the #ifdef mess in LayerTreeHost[Proxy]
+ https://bugs.webkit.org/show_bug.cgi?id=79501
+
+ Use a new UI_SIDE_COMPOSITING flag instead of the several #ifdef flags we currently use.
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ * Shared/WebLayerTreeInfo.cpp:
+ * Shared/WebLayerTreeInfo.h:
+ * UIProcess/DrawingAreaProxy.cpp:
+ (WebKit):
+ * UIProcess/DrawingAreaProxy.h:
+ (DrawingAreaProxy):
+ * UIProcess/DrawingAreaProxyImpl.cpp:
+ (WebKit::DrawingAreaProxyImpl::DrawingAreaProxyImpl):
+ (WebKit::DrawingAreaProxyImpl::enterAcceleratedCompositingMode):
+ (WebKit):
+ * UIProcess/DrawingAreaProxyImpl.h:
+ (DrawingAreaProxyImpl):
+ * UIProcess/LayerTreeHostProxy.h:
+ (LayerTreeHostProxy):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::didReceiveMessage):
+ * UIProcess/qt/LayerBackingStore.cpp:
+ * UIProcess/qt/LayerBackingStore.h:
+ * UIProcess/qt/LayerTreeHostProxyQt.cpp:
+ * WebProcess/WebCoreSupport/WebGraphicsLayer.cpp:
+ * WebProcess/WebCoreSupport/WebGraphicsLayer.h:
+ * WebProcess/WebPage/DrawingArea.h:
+ (DrawingArea):
+ * WebProcess/WebPage/DrawingAreaImpl.cpp:
+ (WebKit):
+ * WebProcess/WebPage/DrawingAreaImpl.h:
+ (DrawingAreaImpl):
+ * WebProcess/WebPage/LayerTreeHost.cpp:
+ (WebKit::LayerTreeHost::create):
+ * WebProcess/WebPage/qt/LayerTreeHostQt.cpp:
+ (WebKit::LayerTreeHostQt::purgeBackingStores):
+ * WebProcess/WebPage/qt/LayerTreeHostQt.h:
+ (LayerTreeHostQt):
+
2012-02-28 Brian Weinstein <[email protected]>
WebKit2: didNewFirstVisuallyNonEmptyLayout should be sent to injected bundle
Modified: trunk/Source/WebKit2/Shared/WebLayerTreeInfo.cpp (109301 => 109302)
--- trunk/Source/WebKit2/Shared/WebLayerTreeInfo.cpp 2012-03-01 04:20:18 UTC (rev 109301)
+++ trunk/Source/WebKit2/Shared/WebLayerTreeInfo.cpp 2012-03-01 04:22:28 UTC (rev 109302)
@@ -19,8 +19,7 @@
#include "config.h"
-#if USE(ACCELERATED_COMPOSITING)
-
+#if USE(UI_SIDE_COMPOSITING)
#include "WebLayerTreeInfo.h"
#include "Arguments.h"
Modified: trunk/Source/WebKit2/Shared/WebLayerTreeInfo.h (109301 => 109302)
--- trunk/Source/WebKit2/Shared/WebLayerTreeInfo.h 2012-03-01 04:20:18 UTC (rev 109301)
+++ trunk/Source/WebKit2/Shared/WebLayerTreeInfo.h 2012-03-01 04:22:28 UTC (rev 109302)
@@ -20,7 +20,7 @@
#ifndef WebLayerTreeInfo_h
#define WebLayerTreeInfo_h
-#if USE(ACCELERATED_COMPOSITING)
+#if USE(UI_SIDE_COMPOSITING)
#include "ArgumentDecoder.h"
#include "ArgumentEncoder.h"
Modified: trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.cpp (109301 => 109302)
--- trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.cpp 2012-03-01 04:20:18 UTC (rev 109301)
+++ trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.cpp 2012-03-01 04:22:28 UTC (rev 109302)
@@ -28,7 +28,7 @@
#include "WebPageProxy.h"
-#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
+#if USE(UI_SIDE_COMPOSITING)
#include "LayerTreeHostProxy.h"
#include <CoreIPC/MessageID.h>
#endif
@@ -58,7 +58,7 @@
sizeDidChange();
}
-#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
+#if USE(UI_SIDE_COMPOSITING)
void DrawingAreaProxy::updateViewport()
{
m_webPageProxy->setViewNeedsDisplay(viewportVisibleRect());
@@ -69,12 +69,9 @@
return IntRect(IntPoint::zero(), m_webPageProxy->viewSize());
}
-#if USE(TILED_BACKING_STORE)
void DrawingAreaProxy::didReceiveLayerTreeHostProxyMessage(CoreIPC::Connection*, CoreIPC::MessageID messageID, CoreIPC::ArgumentDecoder* arguments)
{
}
#endif
-#endif
-
} // namespace WebKit
Modified: trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h (109301 => 109302)
--- trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h 2012-03-01 04:20:18 UTC (rev 109301)
+++ trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h 2012-03-01 04:22:28 UTC (rev 109302)
@@ -83,7 +83,7 @@
virtual void pageCustomRepresentationChanged() { }
-#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
+#if USE(UI_SIDE_COMPOSITING)
virtual void updateViewport();
virtual WebCore::IntRect viewportVisibleRect() const { return contentsRect(); }
virtual WebCore::IntRect contentsRect() const;
@@ -91,8 +91,6 @@
virtual void paintToCurrentGLContext(const WebCore::TransformationMatrix&, float, const WebCore::FloatRect&) { }
virtual void paintLayerTree(BackingStore::PlatformGraphicsContext) { }
LayerTreeHostProxy* layerTreeHostProxy() const { return m_layerTreeHostProxy.get(); }
-
-#if USE(TILED_BACKING_STORE)
virtual void setVisibleContentsRectForScaling(const WebCore::IntRect& visibleContentsRect, float scale) { }
virtual void setVisibleContentsRectForPanning(const WebCore::IntRect& visibleContentsRect, const WebCore::FloatPoint& trajectoryVector) { }
virtual void createTileForLayer(int layerID, int tileID, const WebKit::UpdateInfo&) { }
@@ -102,7 +100,6 @@
WebPageProxy* page() { return m_webPageProxy; }
#endif
-#endif
protected:
explicit DrawingAreaProxy(DrawingAreaType, WebPageProxy*);
@@ -112,7 +109,7 @@
WebCore::IntSize m_size;
WebCore::IntSize m_scrollOffset;
-#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
+#if USE(UI_SIDE_COMPOSITING)
OwnPtr<LayerTreeHostProxy> m_layerTreeHostProxy;
#endif
Modified: trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp (109301 => 109302)
--- trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp 2012-03-01 04:20:18 UTC (rev 109301)
+++ trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp 2012-03-01 04:22:28 UTC (rev 109302)
@@ -36,7 +36,7 @@
#include "WebProcessProxy.h"
#include <WebCore/Region.h>
-#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
+#if USE(UI_SIDE_COMPOSITING)
#include "LayerTreeHostProxy.h"
#endif
@@ -58,7 +58,7 @@
, m_isBackingStoreDiscardable(true)
, m_discardBackingStoreTimer(RunLoop::current(), this, &DrawingAreaProxyImpl::discardBackingStore)
{
-#if USE(TEXTURE_MAPPER)
+#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));
@@ -335,13 +335,13 @@
m_backingStore = nullptr;
m_layerTreeContext = layerTreeContext;
m_webPageProxy->enterAcceleratedCompositingMode(layerTreeContext);
-#if USE(TEXTURE_MAPPER)
+#if USE(UI_SIDE_COMPOSITING)
if (!m_layerTreeHostProxy)
m_layerTreeHostProxy = adoptPtr(new LayerTreeHostProxy(this));
#endif
}
-#if USE(TILED_BACKING_STORE)
+#if USE(UI_SIDE_COMPOSITING)
void DrawingAreaProxyImpl::didReceiveLayerTreeHostProxyMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::ArgumentDecoder* arguments)
{
if (m_layerTreeHostProxy)
Modified: trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h (109301 => 109302)
--- trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h 2012-03-01 04:20:18 UTC (rev 109301)
+++ trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h 2012-03-01 04:22:28 UTC (rev 109302)
@@ -77,7 +77,7 @@
bool isInAcceleratedCompositingMode() const { return !m_layerTreeContext.isEmpty(); }
-#if USE(TILED_BACKING_STORE)
+#if USE(UI_SIDE_COMPOSITING)
virtual void setVisibleContentsRectForScaling(const WebCore::IntRect& visibleContentsRect, float scale);
virtual void setVisibleContentsRectForPanning(const WebCore::IntRect& visibleContentsRect, const WebCore::FloatPoint&);
virtual void paintToCurrentGLContext(const WebCore::TransformationMatrix&, float opacity, const WebCore::FloatRect&);
Modified: trunk/Source/WebKit2/UIProcess/LayerTreeHostProxy.h (109301 => 109302)
--- trunk/Source/WebKit2/UIProcess/LayerTreeHostProxy.h 2012-03-01 04:20:18 UTC (rev 109301)
+++ trunk/Source/WebKit2/UIProcess/LayerTreeHostProxy.h 2012-03-01 04:22:28 UTC (rev 109302)
@@ -20,9 +20,13 @@
#ifndef LayerTreeHostProxy_h
#define LayerTreeHostProxy_h
+#if USE(UI_SIDE_COMPOSITING)
+
#include "BackingStore.h"
#include "DrawingAreaProxy.h"
#include "Region.h"
+#include "TextureMapper.h"
+#include "TextureMapperBackingStore.h"
#include "WebLayerTreeInfo.h"
#include <WebCore/GraphicsContext.h>
#include <WebCore/GraphicsLayer.h>
@@ -33,10 +37,6 @@
#include <wtf/Functional.h>
#include <wtf/HashSet.h>
-#if USE(TEXTURE_MAPPER)
-#include "TextureMapper.h"
-#include "TextureMapperBackingStore.h"
-#endif
namespace WebKit {
@@ -57,7 +57,6 @@
void purgeGLResources();
void setVisibleContentsRectForScaling(const WebCore::IntRect&, float);
void setVisibleContentsRectForPanning(const WebCore::IntRect&, const WebCore::FloatPoint&);
-#if USE(TILED_BACKING_STORE)
void syncRemoteContent();
void swapContentBuffers();
void didRenderFrame();
@@ -68,7 +67,6 @@
void destroyDirectlyCompositedImage(int64_t);
void didReceiveLayerTreeHostProxyMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*);
void updateViewport();
-#endif
protected:
PassOwnPtr<WebCore::GraphicsLayer> createLayer(WebLayerID);
@@ -94,9 +92,11 @@
#if USE(TEXTURE_MAPPER)
OwnPtr<WebCore::TextureMapper> m_textureMapper;
+ PassRefPtr<LayerBackingStore> getBackingStore(WebLayerID);
+ HashMap<int64_t, RefPtr<WebCore::TextureMapperBackingStore> > m_directlyCompositedImages;
+ HashSet<RefPtr<LayerBackingStore> > m_backingStoresWithPendingBuffers;
#endif
-#if PLATFORM(QT)
void scheduleWebViewUpdate();
void synchronizeViewport();
void deleteLayer(WebLayerID);
@@ -111,15 +111,11 @@
void flushLayerChanges();
void ensureRootLayer();
void ensureLayer(WebLayerID);
- PassRefPtr<LayerBackingStore> getBackingStore(WebLayerID);
void swapBuffers();
void syncAnimations();
-#endif
OwnPtr<WebCore::GraphicsLayer> m_rootLayer;
Vector<WebLayerID> m_layersToDelete;
- HashMap<int64_t, RefPtr<WebCore::TextureMapperBackingStore> > m_directlyCompositedImages;
- HashSet<RefPtr<LayerBackingStore> > m_backingStoresWithPendingBuffers;
LayerMap m_layers;
WebLayerID m_rootLayerID;
@@ -128,4 +124,6 @@
}
+#endif
+
#endif // LayerTreeHostProxy_h
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (109301 => 109302)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2012-03-01 04:20:18 UTC (rev 109301)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2012-03-01 04:22:28 UTC (rev 109302)
@@ -85,7 +85,7 @@
#include <WebCore/WindowFeatures.h>
#include <stdio.h>
-#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
+#if USE(UI_SIDE_COMPOSITING)
#include "LayerTreeHostProxyMessages.h"
#endif
@@ -1542,7 +1542,7 @@
return;
}
-#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER) && USE(TILED_BACKING_STORE)
+#if USE(UI_SIDE_COMPOSITING)
if (messageID.is<CoreIPC::MessageClassLayerTreeHostProxy>()) {
m_drawingArea->didReceiveLayerTreeHostProxyMessage(connection, messageID, arguments);
return;
Modified: trunk/Source/WebKit2/UIProcess/qt/LayerBackingStore.cpp (109301 => 109302)
--- trunk/Source/WebKit2/UIProcess/qt/LayerBackingStore.cpp 2012-03-01 04:20:18 UTC (rev 109301)
+++ trunk/Source/WebKit2/UIProcess/qt/LayerBackingStore.cpp 2012-03-01 04:22:28 UTC (rev 109302)
@@ -20,6 +20,7 @@
#include "config.h"
#include "LayerBackingStore.h"
+#if USE(UI_SIDE_COMPOSITING)
#include "GraphicsLayer.h"
#include "TextureMapper.h"
@@ -141,3 +142,4 @@
}
}
+#endif
Modified: trunk/Source/WebKit2/UIProcess/qt/LayerBackingStore.h (109301 => 109302)
--- trunk/Source/WebKit2/UIProcess/qt/LayerBackingStore.h 2012-03-01 04:20:18 UTC (rev 109301)
+++ trunk/Source/WebKit2/UIProcess/qt/LayerBackingStore.h 2012-03-01 04:22:28 UTC (rev 109302)
@@ -20,6 +20,7 @@
#ifndef LayerBackingStore_h
#define LayerBackingStore_h
+#if USE(UI_SIDE_COMPOSITING)
#include "HashMap.h"
#include "ShareableBitmap.h"
#include "TextureMapper.h"
@@ -65,4 +66,6 @@
};
}
+#endif
+
#endif // LayerBackingStore_h
Modified: trunk/Source/WebKit2/UIProcess/qt/LayerTreeHostProxyQt.cpp (109301 => 109302)
--- trunk/Source/WebKit2/UIProcess/qt/LayerTreeHostProxyQt.cpp 2012-03-01 04:20:18 UTC (rev 109301)
+++ trunk/Source/WebKit2/UIProcess/qt/LayerTreeHostProxyQt.cpp 2012-03-01 04:22:28 UTC (rev 109302)
@@ -19,7 +19,6 @@
#include "config.h"
-#if USE(ACCELERATED_COMPOSITING)
#include "LayerTreeHostProxy.h"
#include "GraphicsLayerTextureMapper.h"
@@ -416,4 +415,3 @@
}
}
-#endif
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.cpp (109301 => 109302)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.cpp 2012-03-01 04:20:18 UTC (rev 109301)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.cpp 2012-03-01 04:22:28 UTC (rev 109302)
@@ -19,8 +19,7 @@
#include "config.h"
-#if USE(ACCELERATED_COMPOSITING)
-
+#if USE(UI_SIDE_COMPOSITING)
#include "WebGraphicsLayer.h"
#include "Animation.h"
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.h (109301 => 109302)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.h 2012-03-01 04:20:18 UTC (rev 109301)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.h 2012-03-01 04:22:28 UTC (rev 109302)
@@ -37,8 +37,7 @@
#include <WebCore/RunLoop.h>
#include <wtf/text/StringHash.h>
-#if USE(ACCELERATED_COMPOSITING)
-
+#if USE(UI_SIDE_COMPOSITING)
namespace WebCore {
class WebGraphicsLayer;
}
@@ -65,10 +64,8 @@
namespace WebCore {
class WebGraphicsLayer : public WebCore::GraphicsLayer
-#if USE(TILED_BACKING_STORE)
, public TiledBackingStoreClient
, public WebKit::TiledBackingStoreRemoteTileClient
-#endif
{
public:
WebGraphicsLayer(GraphicsLayerClient*);
Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h (109301 => 109302)
--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h 2012-03-01 04:20:18 UTC (rev 109301)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h 2012-03-01 04:22:28 UTC (rev 109302)
@@ -79,10 +79,11 @@
#if USE(ACCELERATED_COMPOSITING)
virtual void setRootCompositingLayer(WebCore::GraphicsLayer*) = 0;
virtual void scheduleCompositingLayerSync() = 0;
-#if USE(TEXTURE_MAPPER) && USE(TILED_BACKING_STORE)
+#endif
+
+#if USE(UI_SIDE_COMPOSITING)
virtual void didReceiveLayerTreeHostMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*) = 0;
#endif
-#endif
#if PLATFORM(WIN)
virtual void scheduleChildWindowGeometryUpdate(const WindowGeometry&) = 0;
Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp (109301 => 109302)
--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp 2012-03-01 04:20:18 UTC (rev 109301)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp 2012-03-01 04:22:28 UTC (rev 109302)
@@ -667,7 +667,7 @@
m_displayTimer.stop();
}
-#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER) && USE(TILED_BACKING_STORE)
+#if USE(UI_SIDE_COMPOSITING)
void DrawingAreaImpl::didReceiveLayerTreeHostMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::ArgumentDecoder* arguments)
{
if (m_layerTreeHost)
Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h (109301 => 109302)
--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h 2012-03-01 04:20:18 UTC (rev 109301)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h 2012-03-01 04:22:28 UTC (rev 109302)
@@ -70,7 +70,7 @@
virtual void scheduleChildWindowGeometryUpdate(const WindowGeometry&);
#endif
-#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER) && USE(TILED_BACKING_STORE)
+#if USE(UI_SIDE_COMPOSITING)
virtual void didReceiveLayerTreeHostMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*);
#endif
Modified: trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.cpp (109301 => 109302)
--- trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.cpp 2012-03-01 04:20:18 UTC (rev 109301)
+++ trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.cpp 2012-03-01 04:22:28 UTC (rev 109302)
@@ -34,7 +34,7 @@
#endif
#endif
-#if PLATFORM(QT) && USE(TEXTURE_MAPPER)
+#if PLATFORM(QT)
#include "qt/LayerTreeHostQt.h"
#endif
@@ -48,7 +48,7 @@
return LayerTreeHostCAMac::create(webPage);
#elif PLATFORM(WIN) && HAVE(WKQCA)
return LayerTreeHostCAWin::create(webPage);
-#elif PLATFORM(QT) && USE(TEXTURE_MAPPER)
+#elif PLATFORM(QT)
return LayerTreeHostQt::create(webPage);
#else
return 0;
Modified: trunk/Source/WebKit2/WebProcess/WebPage/qt/LayerTreeHostQt.cpp (109301 => 109302)
--- trunk/Source/WebKit2/WebProcess/WebPage/qt/LayerTreeHostQt.cpp 2012-03-01 04:20:18 UTC (rev 109301)
+++ trunk/Source/WebKit2/WebProcess/WebPage/qt/LayerTreeHostQt.cpp 2012-03-01 04:22:28 UTC (rev 109302)
@@ -26,8 +26,6 @@
#include "config.h"
-#if USE(ACCELERATED_COMPOSITING)
-
#include "LayerTreeHostQt.h"
#include "DrawingAreaImpl.h"
@@ -397,7 +395,6 @@
return true;
}
-#if USE(TILED_BACKING_STORE)
void LayerTreeHostQt::createTile(WebLayerID layerID, int tileID, const UpdateInfo& updateInfo)
{
m_webPage->send(Messages::LayerTreeHostProxy::CreateTileForLayer(layerID, tileID, updateInfo));
@@ -459,20 +456,5 @@
ASSERT(!m_directlyCompositedImageRefCounts.size());
}
-#endif
} // namespace WebKit
-#else
-#include "LayerTreeHost.h"
-
-using namespace WebCore;
-
-namespace WebKit {
-
-bool LayerTreeHost::supportsAcceleratedCompositing()
-{
- return false;
-}
-
-} // namespace WebKit
-#endif
Modified: trunk/Source/WebKit2/WebProcess/WebPage/qt/LayerTreeHostQt.h (109301 => 109302)
--- trunk/Source/WebKit2/WebProcess/WebPage/qt/LayerTreeHostQt.h 2012-03-01 04:20:18 UTC (rev 109301)
+++ trunk/Source/WebKit2/WebProcess/WebPage/qt/LayerTreeHostQt.h 2012-03-01 04:22:28 UTC (rev 109302)
@@ -33,9 +33,7 @@
class WebPage;
class LayerTreeHostQt : public LayerTreeHost, WebCore::GraphicsLayerClient
-#if USE(TILED_BACKING_STORE)
, public WebGraphicsLayerClient
-#endif
{
public:
static PassRefPtr<LayerTreeHostQt> create(WebPage*);
@@ -65,7 +63,6 @@
virtual int64_t adoptImageBackingStore(WebCore::Image*);
virtual void releaseImageBackingStore(int64_t);
-#if USE(TILED_BACKING_STORE)
virtual void createTile(WebLayerID, int tileID, const UpdateInfo&);
virtual void updateTile(WebLayerID, int tileID, const UpdateInfo&);
virtual void removeTile(WebLayerID, int tileID);
@@ -78,7 +75,6 @@
virtual void didSyncCompositingStateForLayer(const WebLayerInfo&);
virtual void attachLayer(WebCore::WebGraphicsLayer*);
virtual void detachLayer(WebCore::WebGraphicsLayer*);
-#endif
protected:
explicit LayerTreeHostQt(WebPage*);
@@ -112,12 +108,12 @@
bool m_notifyAfterScheduledLayerFlush;
bool m_isValid;
-#if USE(TILED_BACKING_STORE)
+
bool m_waitingForUIProcess;
bool m_isSuspended;
WebCore::IntRect m_visibleContentsRect;
float m_contentsScale;
-#endif
+
LayerTreeContext m_layerTreeContext;
bool m_shouldSyncFrame;
bool m_shouldSyncRootLayer;
