Diff
Modified: trunk/Source/WebKit2/ChangeLog (88925 => 88926)
--- trunk/Source/WebKit2/ChangeLog 2011-06-15 13:57:09 UTC (rev 88925)
+++ trunk/Source/WebKit2/ChangeLog 2011-06-15 14:21:50 UTC (rev 88926)
@@ -1,3 +1,26 @@
+2011-06-15 Csaba Osztrogonác <[email protected]>
+
+ [Qt][WK2] Unreviewed rolling out r88799, because it made web process crash.
+
+ * Scripts/webkit2/messages.py:
+ * Shared/LayerTreeContext.h:
+ * Shared/qt/LayerTreeContextQt.cpp:
+ (WebKit::LayerTreeContext::LayerTreeContext):
+ (WebKit::LayerTreeContext::~LayerTreeContext):
+ (WebKit::LayerTreeContext::encode):
+ (WebKit::LayerTreeContext::decode):
+ (WebKit::LayerTreeContext::isEmpty):
+ (WebKit::operator==):
+ * UIProcess/DrawingAreaProxy.h:
+ * UIProcess/DrawingAreaProxy.messages.in:
+ * WebKit2.pro:
+ * WebProcess/WebCoreSupport/WebGraphicsLayer.cpp:
+ (WebCore::collectCompositingInfoForThisLayer):
+ * WebProcess/WebPage/LayerTreeHost.cpp:
+ (WebKit::LayerTreeHost::create):
+ * WebProcess/WebPage/qt/LayerTreeHostQt.cpp:
+ * WebProcess/WebPage/qt/LayerTreeHostQt.h: Removed.
+
2011-06-14 Eunmi Lee <[email protected]>
Reviewed by Sam Weinig.
Modified: trunk/Source/WebKit2/Scripts/webkit2/messages.py (88925 => 88926)
--- trunk/Source/WebKit2/Scripts/webkit2/messages.py 2011-06-15 13:57:09 UTC (rev 88925)
+++ trunk/Source/WebKit2/Scripts/webkit2/messages.py 2011-06-15 14:21:50 UTC (rev 88926)
@@ -464,7 +464,6 @@
'WebCore::TextCheckingResult': '<WebCore/TextCheckerClient.h>',
'WebKit::WebGestureEvent': '"WebEvent.h"',
'WebKit::WebKeyboardEvent': '"WebEvent.h"',
- 'WebKit::WebLayerUpdateInfo': '"WebLayerTreeInfo.h"',
'WebKit::WebMouseEvent': '"WebEvent.h"',
'WebKit::WebTouchEvent': '"WebEvent.h"',
'WebKit::WebWheelEvent': '"WebEvent.h"',
Modified: trunk/Source/WebKit2/Shared/LayerTreeContext.h (88925 => 88926)
--- trunk/Source/WebKit2/Shared/LayerTreeContext.h 2011-06-15 13:57:09 UTC (rev 88925)
+++ trunk/Source/WebKit2/Shared/LayerTreeContext.h 2011-06-15 14:21:50 UTC (rev 88926)
@@ -47,8 +47,6 @@
uint32_t contextID;
#elif PLATFORM(WIN)
HWND window;
-#elif PLATFORM(QT)
- uint32_t webLayerID;
#endif
};
Modified: trunk/Source/WebKit2/Shared/qt/LayerTreeContextQt.cpp (88925 => 88926)
--- trunk/Source/WebKit2/Shared/qt/LayerTreeContextQt.cpp 2011-06-15 13:57:09 UTC (rev 88925)
+++ trunk/Source/WebKit2/Shared/qt/LayerTreeContextQt.cpp 2011-06-15 14:21:50 UTC (rev 88926)
@@ -26,38 +26,41 @@
#include "config.h"
#include "LayerTreeContext.h"
-#include "ArgumentDecoder.h"
-#include "ArgumentEncoder.h"
+#include "NotImplemented.h"
namespace WebKit {
LayerTreeContext::LayerTreeContext()
- : webLayerID(0)
{
+ notImplemented();
}
LayerTreeContext::~LayerTreeContext()
{
+ notImplemented();
}
-void LayerTreeContext::encode(CoreIPC::ArgumentEncoder* encoder) const
+void LayerTreeContext::encode(CoreIPC::ArgumentEncoder*) const
{
- encoder->encode(webLayerID);
+ notImplemented();
}
-bool LayerTreeContext::decode(CoreIPC::ArgumentDecoder* decoder, LayerTreeContext& context)
+bool LayerTreeContext::decode(CoreIPC::ArgumentDecoder*, LayerTreeContext&)
{
- return decoder->decode(context.webLayerID);
+ notImplemented();
+ return true;
}
bool LayerTreeContext::isEmpty() const
{
- return !webLayerID;
+ notImplemented();
+ return true;
}
-bool operator==(const LayerTreeContext& a, const LayerTreeContext& b)
+bool operator==(const LayerTreeContext&, const LayerTreeContext&)
{
- return a.webLayerID == b.webLayerID;
+ notImplemented();
+ return true;
}
} // namespace WebKit
Modified: trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h (88925 => 88926)
--- trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h 2011-06-15 13:57:09 UTC (rev 88925)
+++ trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.h 2011-06-15 14:21:50 UTC (rev 88926)
@@ -52,8 +52,6 @@
class LayerTreeContext;
class UpdateInfo;
-class WebLayerTreeInfo;
-class WebLayerUpdateInfo;
class WebPageProxy;
#if PLATFORM(MAC)
@@ -109,11 +107,7 @@
#if USE(ACCELERATED_COMPOSITING)
virtual void enterAcceleratedCompositingMode(uint64_t backingStoreStateID, const LayerTreeContext&) { }
virtual void exitAcceleratedCompositingMode(uint64_t backingStoreStateID, const UpdateInfo&) { }
-#if USE(TEXTURE_MAPPER)
- virtual void syncCompositingLayers(const WebLayerTreeInfo&) { }
- virtual void updateCompositingLayerContent(const WebLayerUpdateInfo&) { }
#endif
-#endif
#if ENABLE(TILED_BACKING_STORE)
virtual void didSetSize(const WebCore::IntSize&) { }
virtual void invalidate(const WebCore::IntRect&) { }
Modified: trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.messages.in (88925 => 88926)
--- trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.messages.in 2011-06-15 13:57:09 UTC (rev 88925)
+++ trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.messages.in 2011-06-15 14:21:50 UTC (rev 88926)
@@ -27,10 +27,6 @@
EnterAcceleratedCompositingMode(uint64_t backingStoreStateID, WebKit::LayerTreeContext context)
ExitAcceleratedCompositingMode(uint64_t backingStoreStateID, WebKit::UpdateInfo updateInfo)
#endif
-#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
- SyncCompositingLayers(WebKit::WebLayerTreeInfo layerTreeInfo)
- UpdateCompositingLayerContent(WebKit::WebLayerUpdateInfo layerUpdateInfo)
-#endif
#if ENABLE(TILED_BACKING_STORE)
Invalidate(WebCore::IntRect dirtyRect)
DidSetSize(WebCore::IntSize viewSize)
Modified: trunk/Source/WebKit2/WebKit2.pro (88925 => 88926)
--- trunk/Source/WebKit2/WebKit2.pro 2011-06-15 13:57:09 UTC (rev 88925)
+++ trunk/Source/WebKit2/WebKit2.pro 2011-06-15 14:21:50 UTC (rev 88926)
@@ -149,7 +149,6 @@
Shared/WebGeolocationPosition.h \
Shared/WebGraphicsContext.h \
Shared/WebImage.h \
- Shared/WebLayerTreeInfo.h \
Shared/WebNavigationDataStore.h \
Shared/WebNumber.h \
Shared/WebOpenPanelParameters.h \
@@ -281,7 +280,6 @@
WebProcess/WebCoreSupport/WebErrors.h \
WebProcess/WebCoreSupport/WebFrameLoaderClient.h \
WebProcess/WebCoreSupport/WebGeolocationClient.h \
- WebProcess/WebCoreSupport/WebGraphicsLayer.h \
WebProcess/WebCoreSupport/WebInspectorClient.h \
WebProcess/WebCoreSupport/WebInspectorFrontendClient.h \
WebProcess/WebCoreSupport/WebPlatformStrategies.h \
@@ -362,7 +360,6 @@
Shared/WebGraphicsContext.cpp \
Shared/WebKeyboardEvent.cpp \
Shared/WebImage.cpp \
- Shared/WebLayerTreeInfo.cpp \
Shared/WebMouseEvent.cpp \
Shared/WebOpenPanelParameters.cpp \
Shared/WebPageCreationParameters.cpp \
@@ -510,7 +507,6 @@
WebProcess/WebCoreSupport/WebEditorClient.cpp \
WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp \
WebProcess/WebCoreSupport/WebGeolocationClient.cpp \
- WebProcess/WebCoreSupport/WebGraphicsLayer.cpp \
WebProcess/WebCoreSupport/WebInspectorClient.cpp \
WebProcess/WebCoreSupport/WebInspectorFrontendClient.cpp \
WebProcess/WebCoreSupport/WebPlatformStrategies.cpp \
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.cpp (88925 => 88926)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.cpp 2011-06-15 13:57:09 UTC (rev 88925)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.cpp 2011-06-15 14:21:50 UTC (rev 88926)
@@ -405,9 +405,9 @@
return tiles;
}
-static void collectCompositingInfoForThisLayer(GraphicsLayer* graphicsLayer, WebLayerTreeInfo& outInfo, Vector<WebGraphicsLayer*>& outLayers)
+static void collectCompositingInfoForThisLayer(GraphicsLayer* layer, WebLayerTreeInfo& outInfo, Vector<WebGraphicsLayer*>& outLayers)
{
- WebGraphicsLayer* layer = toWebGraphicsLayer(graphicsLayer);
+ WebGraphicsLayer* layer = toWebGraphicsLayer(layer);
if (!layer)
return;
if (!layer->isModified())
Modified: trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.cpp (88925 => 88926)
--- trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.cpp 2011-06-15 13:57:09 UTC (rev 88925)
+++ trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.cpp 2011-06-15 14:21:50 UTC (rev 88926)
@@ -34,10 +34,6 @@
#endif
#endif
-#if PLATFORM(QT) && USE(TEXTURE_MAPPER)
-#include "qt/LayerTreeHostQt.h"
-#endif
-
using namespace WebCore;
namespace WebKit {
@@ -48,8 +44,6 @@
return LayerTreeHostCAMac::create(webPage);
#elif PLATFORM(WIN) && HAVE(WKQCA)
return LayerTreeHostCAWin::create(webPage);
-#elif PLATFORM(QT) && USE(TEXTURE_MAPPER)
- return LayerTreeHostQt::create(webPage);
#else
return 0;
#endif
Modified: trunk/Source/WebKit2/WebProcess/WebPage/qt/LayerTreeHostQt.cpp (88925 => 88926)
--- trunk/Source/WebKit2/WebProcess/WebPage/qt/LayerTreeHostQt.cpp 2011-06-15 13:57:09 UTC (rev 88925)
+++ trunk/Source/WebKit2/WebProcess/WebPage/qt/LayerTreeHostQt.cpp 2011-06-15 14:21:50 UTC (rev 88926)
@@ -25,277 +25,8 @@
*/
#include "config.h"
-
-#if USE(ACCELERATED_COMPOSITING)
-
-#include "LayerTreeHostQt.h"
-
-#include "DrawingAreaImpl.h"
-#include "DrawingAreaMessages.h"
-#include "DrawingAreaProxyMessages.h"
-#include "GraphicsContext.h"
-#include "MessageID.h"
-#include "WebGraphicsLayer.h"
-#include "WebPage.h"
-#include <WebCore/Frame.h>
-#include <WebCore/FrameView.h>
-#include <WebCore/Page.h>
-#include <WebCore/Settings.h>
-
-using namespace WebCore;
-
-namespace WebKit {
-
-PassRefPtr<LayerTreeHostQt> LayerTreeHostQt::create(WebPage* webPage)
-{
- return adoptRef(new LayerTreeHostQt(webPage));
-}
-
-LayerTreeHostQt::~LayerTreeHostQt()
-{
-}
-
-LayerTreeHostQt::LayerTreeHostQt(WebPage* webPage)
- : LayerTreeHost(webPage)
- , m_notifyAfterScheduledLayerFlush(false)
- , m_isValid(true)
- , m_layerFlushTimer(this, &LayerTreeHostQt::layerFlushTimerFired)
- , m_layerFlushSchedulingEnabled(true)
-{
- // Create a root layer.
- m_rootLayer = GraphicsLayer::create(this);
-#ifndef NDEBUG
- m_rootLayer->setName("LayerTreeHostQt root layer");
-#endif
- m_rootLayer->setDrawsContent(false);
- m_rootLayer->setSize(m_webPage->size());
- m_layerTreeContext.webLayerID = toWebGraphicsLayer(m_rootLayer.get())->id();
-
- m_nonCompositedContentLayer = GraphicsLayer::create(this);
-#ifndef NDEBUG
- m_nonCompositedContentLayer->setName("LayerTreeHostQt non-composited content");
-#endif
- m_nonCompositedContentLayer->setDrawsContent(true);
- m_nonCompositedContentLayer->setContentsOpaque(m_webPage->drawsBackground() && !m_webPage->drawsTransparentBackground());
- m_nonCompositedContentLayer->setSize(m_webPage->size());
-
- m_rootLayer->addChild(m_nonCompositedContentLayer.get());
-
- if (m_webPage->hasPageOverlay())
- createPageOverlayLayer();
-
- scheduleLayerFlush();
-}
-
-void LayerTreeHostQt::setLayerFlushSchedulingEnabled(bool layerFlushingEnabled)
-{
- if (m_layerFlushSchedulingEnabled == layerFlushingEnabled)
- return;
-
- m_layerFlushSchedulingEnabled = layerFlushingEnabled;
-
- if (m_layerFlushSchedulingEnabled)
- return;
-
- cancelPendingLayerFlush();
-}
-
-void LayerTreeHostQt::scheduleLayerFlush()
-{
- if (!m_layerFlushSchedulingEnabled)
- return;
-
- if (!m_layerFlushTimer.isActive())
- m_layerFlushTimer.startOneShot(0);
-}
-
-void LayerTreeHostQt::cancelPendingLayerFlush()
-{
- m_layerFlushTimer.stop();
-}
-
-void LayerTreeHostQt::setShouldNotifyAfterNextScheduledLayerFlush(bool notifyAfterScheduledLayerFlush)
-{
- m_notifyAfterScheduledLayerFlush = notifyAfterScheduledLayerFlush;
-}
-
-void LayerTreeHostQt::setRootCompositingLayer(WebCore::GraphicsLayer* graphicsLayer)
-{
- m_nonCompositedContentLayer->removeAllChildren();
-
- // Add the accelerated layer tree hierarchy.
- if (graphicsLayer)
- m_nonCompositedContentLayer->addChild(graphicsLayer);
-}
-
-void LayerTreeHostQt::invalidate()
-{
- cancelPendingLayerFlush();
-
- ASSERT(m_isValid);
- m_rootLayer = nullptr;
- m_isValid = false;
-}
-
-void LayerTreeHostQt::setNonCompositedContentsNeedDisplay(const WebCore::IntRect& rect)
-{
- m_nonCompositedContentLayer->setNeedsDisplayInRect(rect);
- if (m_pageOverlayLayer)
- m_pageOverlayLayer->setNeedsDisplayInRect(rect);
-
- scheduleLayerFlush();
-}
-
-void LayerTreeHostQt::scrollNonCompositedContents(const WebCore::IntRect& scrollRect, const WebCore::IntSize& scrollOffset)
-{
- setNonCompositedContentsNeedDisplay(scrollRect);
-}
-
-void LayerTreeHostQt::forceRepaint()
-{
- scheduleLayerFlush();
-}
-
-void LayerTreeHostQt::sizeDidChange(const WebCore::IntSize& newSize)
-{
- m_rootLayer->setSize(newSize);
-
- // If the newSize exposes new areas of the non-composited content a setNeedsDisplay is needed
- // for those newly exposed areas.
- FloatSize oldSize = m_nonCompositedContentLayer->size();
- m_nonCompositedContentLayer->setSize(newSize);
-
- if (newSize.width() > oldSize.width()) {
- float height = std::min(static_cast<float>(newSize.height()), oldSize.height());
- m_nonCompositedContentLayer->setNeedsDisplayInRect(FloatRect(oldSize.width(), 0, newSize.width() - oldSize.width(), height));
- }
-
- if (newSize.height() > oldSize.height())
- m_nonCompositedContentLayer->setNeedsDisplayInRect(FloatRect(0, oldSize.height(), newSize.width(), newSize.height() - oldSize.height()));
-
- if (m_pageOverlayLayer)
- m_pageOverlayLayer->setSize(newSize);
-
- scheduleLayerFlush();
-}
-
-void LayerTreeHostQt::didInstallPageOverlay()
-{
- createPageOverlayLayer();
- scheduleLayerFlush();
-
-}
-
-void LayerTreeHostQt::didUninstallPageOverlay()
-{
- destroyPageOverlayLayer();
- scheduleLayerFlush();
-}
-
-void LayerTreeHostQt::setPageOverlayNeedsDisplay(const WebCore::IntRect& rect)
-{
- ASSERT(m_pageOverlayLayer);
- m_pageOverlayLayer->setNeedsDisplayInRect(rect);
- scheduleLayerFlush();
-}
-
-bool LayerTreeHostQt::flushPendingLayerChanges()
-{
- m_rootLayer->syncCompositingStateForThisLayerOnly();
- m_nonCompositedContentLayer->syncCompositingStateForThisLayerOnly();
- if (m_pageOverlayLayer)
- m_pageOverlayLayer->syncCompositingStateForThisLayerOnly();
-
- return m_webPage->corePage()->mainFrame()->view()->syncCompositingStateIncludingSubframes();
-}
-
-
-void LayerTreeHostQt::performScheduledLayerFlush()
-{
- m_webPage->layoutIfNeeded();
-
- if (!m_isValid)
- return;
-
- if (flushPendingLayerChanges()) {
- if (m_notifyAfterScheduledLayerFlush) {
- // Let the drawing area know that we've done a flush of the layer changes.
- static_cast<DrawingAreaImpl*>(m_webPage->drawingArea())->layerHostDidFlushLayers();
- m_notifyAfterScheduledLayerFlush = false;
- }
- WebGraphicsLayer::sendLayersToUIProcess(m_rootLayer.get(), m_webPage);
- }
-}
-
-void LayerTreeHostQt::layerFlushTimerFired(Timer<LayerTreeHostQt>*)
-{
- performScheduledLayerFlush();
-}
-
-void LayerTreeHostQt::createPageOverlayLayer()
-{
- ASSERT(!m_pageOverlayLayer);
-
- m_pageOverlayLayer = GraphicsLayer::create(this);
-#ifndef NDEBUG
- m_pageOverlayLayer->setName("LayerTreeHostQt page overlay content");
-#endif
-
- m_pageOverlayLayer->setDrawsContent(true);
- m_pageOverlayLayer->setSize(m_webPage->size());
-
- m_rootLayer->addChild(m_pageOverlayLayer.get());
-}
-
-void LayerTreeHostQt::destroyPageOverlayLayer()
-{
- ASSERT(m_pageOverlayLayer);
- m_pageOverlayLayer->removeFromParent();
- m_pageOverlayLayer = nullptr;
-}
-
-void LayerTreeHostQt::notifyAnimationStarted(const WebCore::GraphicsLayer*, double time)
-{
-}
-
-void LayerTreeHostQt::notifySyncRequired(const WebCore::GraphicsLayer*)
-{
-}
-
-void LayerTreeHostQt::paintContents(const WebCore::GraphicsLayer* graphicsLayer, WebCore::GraphicsContext& graphicsContext, WebCore::GraphicsLayerPaintingPhase, const WebCore::IntRect& clipRect)
-{
- if (graphicsLayer == m_nonCompositedContentLayer) {
- m_webPage->drawRect(graphicsContext, clipRect);
- return;
- }
-
- if (graphicsLayer == m_pageOverlayLayer) {
- m_webPage->drawPageOverlay(graphicsContext, clipRect);
- return;
- }
-}
-
-bool LayerTreeHostQt::showDebugBorders() const
-{
- return m_webPage->corePage()->settings()->showDebugBorders();
-}
-
-bool LayerTreeHostQt::showRepaintCounter() const
-{
- return m_webPage->corePage()->settings()->showRepaintCounter();
-}
-
-bool LayerTreeHost::supportsAcceleratedCompositing()
-{
- return true;
-}
-
-} // namespace WebKit
-#else
#include "LayerTreeHost.h"
-using namespace WebCore;
-
namespace WebKit {
bool LayerTreeHost::supportsAcceleratedCompositing()
@@ -304,4 +35,3 @@
}
} // namespace WebKit
-#endif
Deleted: trunk/Source/WebKit2/WebProcess/WebPage/qt/LayerTreeHostQt.h (88925 => 88926)
--- trunk/Source/WebKit2/WebProcess/WebPage/qt/LayerTreeHostQt.h 2011-06-15 13:57:09 UTC (rev 88925)
+++ trunk/Source/WebKit2/WebProcess/WebPage/qt/LayerTreeHostQt.h 2011-06-15 14:21:50 UTC (rev 88926)
@@ -1,97 +0,0 @@
-/*
- Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies)
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#ifndef LayerTreeHostQt_h
-#define LayerTreeHostQt_h
-
-#include "LayerTreeContext.h"
-#include "LayerTreeHost.h"
-#include "Timer.h"
-#include <WebCore/GraphicsLayerClient.h>
-#include <wtf/OwnPtr.h>
-
-namespace WebKit {
-
-class UpdateInfo;
-class WebPage;
-
-class LayerTreeHostQt : public LayerTreeHost, WebCore::GraphicsLayerClient {
-public:
- static PassRefPtr<LayerTreeHostQt> create(WebPage*);
- virtual ~LayerTreeHostQt();
-
- static bool supportsAcceleratedCompositing();
-
- virtual const LayerTreeContext& layerTreeContext() { return m_layerTreeContext; }
- virtual void setLayerFlushSchedulingEnabled(bool);
- virtual void scheduleLayerFlush();
- virtual void setShouldNotifyAfterNextScheduledLayerFlush(bool);
- virtual void setRootCompositingLayer(WebCore::GraphicsLayer*);
- virtual void invalidate();
-
- virtual void setNonCompositedContentsNeedDisplay(const WebCore::IntRect&);
- virtual void scrollNonCompositedContents(const WebCore::IntRect& scrollRect, const WebCore::IntSize& scrollOffset);
- virtual void forceRepaint();
- virtual void sizeDidChange(const WebCore::IntSize& newSize);
-
- virtual void didInstallPageOverlay();
- virtual void didUninstallPageOverlay();
- virtual void setPageOverlayNeedsDisplay(const WebCore::IntRect&);
-
- virtual void pauseRendering() { }
- virtual void resumeRendering() { }
-
-protected:
- explicit LayerTreeHostQt(WebPage*);
-
-private:
- // GraphicsLayerClient
- virtual void notifyAnimationStarted(const WebCore::GraphicsLayer*, double time);
- virtual void notifySyncRequired(const WebCore::GraphicsLayer*);
- virtual void paintContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext&, WebCore::GraphicsLayerPaintingPhase, const WebCore::IntRect& clipRect);
- virtual bool showDebugBorders() const;
- virtual bool showRepaintCounter() const;
-
- // LayerTreeHostQt
- void createPageOverlayLayer();
- void destroyPageOverlayLayer();
- bool flushPendingLayerChanges();
- void cancelPendingLayerFlush();
- void performScheduledLayerFlush();
- void sendLayersToUI();
-
- OwnPtr<WebCore::GraphicsLayer> m_rootLayer;
-
- // The layer which contains all non-composited content.
- OwnPtr<WebCore::GraphicsLayer> m_nonCompositedContentLayer;
-
- // The page overlay layer. Will be null if there's no page overlay.
- OwnPtr<WebCore::GraphicsLayer> m_pageOverlayLayer;
-
- bool m_notifyAfterScheduledLayerFlush;
- bool m_isValid;
- LayerTreeContext m_layerTreeContext;
- void layerFlushTimerFired(WebCore::Timer<LayerTreeHostQt>*);
- WebCore::Timer<LayerTreeHostQt> m_layerFlushTimer;
- bool m_layerFlushSchedulingEnabled;
-};
-
-}
-
-#endif // LayerTreeHostQt_h
