- Revision
- 113610
- Author
- [email protected]
- Date
- 2012-04-09 13:26:05 -0700 (Mon, 09 Apr 2012)
Log Message
[Qt][WK2] Remove all USE(TILED_BACKING_STORE) defines from code that contains UI_SIDE_COMPOSITING
https://bugs.webkit.org/show_bug.cgi?id=82533
Reviewed by Kenneth Rohde Christiansen.
No change in behavior, removing some #defines.
* WebProcess/WebCoreSupport/WebGraphicsLayer.cpp:
(WebCore::WebGraphicsLayer::setShouldUpdateVisibleRect):
(WebCore::WebGraphicsLayer::adjustContentsScale):
* WebProcess/WebCoreSupport/WebGraphicsLayer.h:
(WebGraphicsLayer):
* WebProcess/WebPage/LayerTreeHost.h:
(LayerTreeHost):
* WebProcess/WebPage/qt/LayerTreeHostQt.cpp:
(WebKit::LayerTreeHostQt::LayerTreeHostQt):
(WebKit::LayerTreeHostQt::detachLayer):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (113609 => 113610)
--- trunk/Source/WebKit2/ChangeLog 2012-04-09 20:10:42 UTC (rev 113609)
+++ trunk/Source/WebKit2/ChangeLog 2012-04-09 20:26:05 UTC (rev 113610)
@@ -1,5 +1,25 @@
2012-04-09 No'am Rosenthal <[email protected]>
+ [Qt][WK2] Remove all USE(TILED_BACKING_STORE) defines from code that contains UI_SIDE_COMPOSITING
+ https://bugs.webkit.org/show_bug.cgi?id=82533
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ No change in behavior, removing some #defines.
+
+ * WebProcess/WebCoreSupport/WebGraphicsLayer.cpp:
+ (WebCore::WebGraphicsLayer::setShouldUpdateVisibleRect):
+ (WebCore::WebGraphicsLayer::adjustContentsScale):
+ * WebProcess/WebCoreSupport/WebGraphicsLayer.h:
+ (WebGraphicsLayer):
+ * WebProcess/WebPage/LayerTreeHost.h:
+ (LayerTreeHost):
+ * WebProcess/WebPage/qt/LayerTreeHostQt.cpp:
+ (WebKit::LayerTreeHostQt::LayerTreeHostQt):
+ (WebKit::LayerTreeHostQt::detachLayer):
+
+2012-04-09 No'am Rosenthal <[email protected]>
+
[Qt][WK2] Disable the content-scaling and visible contents rect when the layer's transform is not affine
https://bugs.webkit.org/show_bug.cgi?id=82523
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.cpp (113609 => 113610)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.cpp 2012-04-09 20:10:42 UTC (rev 113609)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.cpp 2012-04-09 20:26:05 UTC (rev 113610)
@@ -85,10 +85,8 @@
, m_contentNeedsDisplay(false)
, m_hasPendingAnimations(false)
, m_inUpdateMode(false)
-#if USE(TILED_BACKING_STORE)
, m_webGraphicsLayerClient(0)
, m_contentsScale(1.f)
-#endif
{
static WebLayerID nextLayerID = 1;
m_layerInfo.id = nextLayerID++;
@@ -476,7 +474,6 @@
m_hasPendingAnimations = false;
}
-#if USE(TILED_BACKING_STORE)
void WebGraphicsLayer::tiledBackingStorePaintBegin()
{
}
@@ -675,7 +672,6 @@
adjustVisibleRect();
adjustContentsScale();
}
-#endif
static PassOwnPtr<GraphicsLayer> createWebGraphicsLayer(GraphicsLayerClient* client)
{
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.h (113609 => 113610)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.h 2012-04-09 20:10:42 UTC (rev 113609)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.h 2012-04-09 20:26:05 UTC (rev 113610)
@@ -118,7 +118,6 @@
static void initFactory();
-#if USE(TILED_BACKING_STORE)
// TiledBackingStoreClient
virtual void tiledBackingStorePaintBegin();
virtual void tiledBackingStorePaint(GraphicsContext*, const IntRect&);
@@ -139,7 +138,6 @@
bool isReadyForTileBufferSwap() const;
void updateContentBuffers();
void purgeBackingStores();
-#endif
private:
virtual void willBeDestroyed();
@@ -159,7 +157,6 @@
void createBackingStore();
HashSet<String> m_transformAnimations;
-#if USE(TILED_BACKING_STORE)
bool selfOrAncestorHaveNonAffineTransforms();
bool shouldUseTiledBackingStore();
void adjustContentsScale();
@@ -170,7 +167,6 @@
OwnPtr<WebCore::TiledBackingStore> m_mainBackingStore;
OwnPtr<WebCore::TiledBackingStore> m_previousBackingStore;
float m_contentsScale;
-#endif
};
WebGraphicsLayer* toWebGraphicsLayer(GraphicsLayer*);
Modified: trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h (113609 => 113610)
--- trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h 2012-04-09 20:10:42 UTC (rev 113609)
+++ trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h 2012-04-09 20:26:05 UTC (rev 113610)
@@ -79,7 +79,7 @@
virtual void pauseRendering() { }
virtual void resumeRendering() { }
-#if USE(TILED_BACKING_STORE)
+#if USE(UI_SIDE_COMPOSITING)
virtual void setVisibleContentsRect(const WebCore::IntRect&, float scale, const WebCore::FloatPoint&) { }
virtual void setVisibleContentsRectForLayer(int layerID, const WebCore::IntRect&) { }
virtual void renderNextFrame() { }
@@ -100,8 +100,7 @@
WebPage* m_webPage;
-
-#if USE(TILED_BACKING_STORE)
+#if USE(UI_SIDE_COMPOSITING)
bool m_waitingForUIProcess;
#endif
};
Modified: trunk/Source/WebKit2/WebProcess/WebPage/qt/LayerTreeHostQt.cpp (113609 => 113610)
--- trunk/Source/WebKit2/WebProcess/WebPage/qt/LayerTreeHostQt.cpp 2012-04-09 20:10:42 UTC (rev 113609)
+++ trunk/Source/WebKit2/WebProcess/WebPage/qt/LayerTreeHostQt.cpp 2012-04-09 20:26:05 UTC (rev 113610)
@@ -63,11 +63,9 @@
: LayerTreeHost(webPage)
, m_notifyAfterScheduledLayerFlush(false)
, m_isValid(true)
-#if USE(TILED_BACKING_STORE)
, m_waitingForUIProcess(false)
, m_isSuspended(false)
, m_contentsScale(1)
-#endif
, m_shouldSyncFrame(false)
, m_shouldSyncRootLayer(true)
, m_layerFlushTimer(this, &LayerTreeHostQt::layerFlushTimerFired)
@@ -85,9 +83,7 @@
m_layerTreeContext.webLayerID = toWebGraphicsLayer(webRootLayer)->id();
m_nonCompositedContentLayer = GraphicsLayer::create(this);
-#if USE(TILED_BACKING_STORE)
toWebGraphicsLayer(m_rootLayer.get())->setWebGraphicsLayerClient(this);
-#endif
#ifndef NDEBUG
m_nonCompositedContentLayer->setName("LayerTreeHostQt non-composited content");
#endif
@@ -254,10 +250,8 @@
void LayerTreeHostQt::performScheduledLayerFlush()
{
-#if USE(TILED_BACKING_STORE)
if (m_isSuspended || m_waitingForUIProcess)
return;
-#endif
m_webPage->layoutIfNeeded();
