Diff
Modified: trunk/Source/Platform/ChangeLog (125787 => 125788)
--- trunk/Source/Platform/ChangeLog 2012-08-16 17:06:56 UTC (rev 125787)
+++ trunk/Source/Platform/ChangeLog 2012-08-16 17:16:06 UTC (rev 125788)
@@ -1,3 +1,15 @@
+2012-08-16 James Robinson <[email protected]>
+
+ [chromium] Remove alwaysReserveTextures code - it doesn't do anything
+ https://bugs.webkit.org/show_bug.cgi?id=94183
+
+ Reviewed by Dimitri Glazkov.
+
+ Remove deprecated setAlwaysReserveTextures() call from WebLayer.
+
+ * chromium/public/WebLayer.h:
+ (WebLayer):
+
2012-08-14 Gregg Tavares <[email protected]>
Plumb through EXT_debug_marker entry points
Modified: trunk/Source/Platform/chromium/public/WebLayer.h (125787 => 125788)
--- trunk/Source/Platform/chromium/public/WebLayer.h 2012-08-16 17:06:56 UTC (rev 125787)
+++ trunk/Source/Platform/chromium/public/WebLayer.h 2012-08-16 17:16:06 UTC (rev 125788)
@@ -174,11 +174,6 @@
// Transfers all animations running on the current layer.
WEBKIT_EXPORT void transferAnimationsTo(WebLayer*);
- // DEPRECATED.
- // This requests that this layer's compositor-managed textures always be reserved
- // when determining texture limits.
- WEBKIT_EXPORT void setAlwaysReserveTextures(bool);
-
// Forces this layer to use a render surface. There is no benefit in doing
// so, but this is to facilitate benchmarks and tests.
WEBKIT_EXPORT void setForceRenderSurface(bool);
Modified: trunk/Source/WebCore/ChangeLog (125787 => 125788)
--- trunk/Source/WebCore/ChangeLog 2012-08-16 17:06:56 UTC (rev 125787)
+++ trunk/Source/WebCore/ChangeLog 2012-08-16 17:16:06 UTC (rev 125788)
@@ -1,3 +1,18 @@
+2012-08-16 James Robinson <[email protected]>
+
+ [chromium] Remove alwaysReserveTextures code - it doesn't do anything
+ https://bugs.webkit.org/show_bug.cgi?id=94183
+
+ Reviewed by Dimitri Glazkov.
+
+ LayerChromium::setAlwaysReservesTextures doesn't do anything and hasn't since the prioritized texture manager
+ landed. This deletes the associated code.
+
+ * platform/graphics/chromium/LayerChromium.cpp:
+ (WebCore::LayerChromium::LayerChromium):
+ * platform/graphics/chromium/LayerChromium.h:
+ (LayerChromium):
+
2012-08-16 Adam Barth <[email protected]>
Unreviewed. Sort the xcodeproj file.
Modified: trunk/Source/WebCore/platform/graphics/chromium/LayerChromium.cpp (125787 => 125788)
--- trunk/Source/WebCore/platform/graphics/chromium/LayerChromium.cpp 2012-08-16 17:06:56 UTC (rev 125787)
+++ trunk/Source/WebCore/platform/graphics/chromium/LayerChromium.cpp 2012-08-16 17:16:06 UTC (rev 125788)
@@ -81,7 +81,6 @@
, m_useLCDText(false)
, m_preserves3D(false)
, m_useParentBackfaceVisibility(false)
- , m_alwaysReserveTextures(false)
, m_drawCheckerboardForMissingTiles(false)
, m_forceRenderSurface(false)
, m_replicaLayer(0)
Modified: trunk/Source/WebCore/platform/graphics/chromium/LayerChromium.h (125787 => 125788)
--- trunk/Source/WebCore/platform/graphics/chromium/LayerChromium.h 2012-08-16 17:06:56 UTC (rev 125787)
+++ trunk/Source/WebCore/platform/graphics/chromium/LayerChromium.h 2012-08-16 17:16:06 UTC (rev 125788)
@@ -267,9 +267,6 @@
// Set the priority of all desired textures in this layer.
virtual void setTexturePriorities(const CCPriorityCalculator&) { }
- void setAlwaysReserveTextures(bool alwaysReserveTextures) { m_alwaysReserveTextures = alwaysReserveTextures; }
- bool alwaysReserveTextures() const { return m_alwaysReserveTextures; }
-
bool addAnimation(PassOwnPtr<CCActiveAnimation>);
void pauseAnimation(int animationId, double timeOffset);
void removeAnimation(int animationId);
@@ -373,7 +370,6 @@
bool m_useLCDText;
bool m_preserves3D;
bool m_useParentBackfaceVisibility;
- bool m_alwaysReserveTextures;
bool m_drawCheckerboardForMissingTiles;
bool m_forceRenderSurface;
Modified: trunk/Source/WebKit/chromium/ChangeLog (125787 => 125788)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-08-16 17:06:56 UTC (rev 125787)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-08-16 17:16:06 UTC (rev 125788)
@@ -1,3 +1,17 @@
+2012-08-16 James Robinson <[email protected]>
+
+ [chromium] Remove alwaysReserveTextures code - it doesn't do anything
+ https://bugs.webkit.org/show_bug.cgi?id=94183
+
+ Reviewed by Dimitri Glazkov.
+
+ Stops attempting to find the scrollbar layers and call setAlwaysReserveTextures() on them since the call doesn't
+ do anything.
+
+ * src/NonCompositedContentHost.cpp:
+ (WebKit::NonCompositedContentHost::setViewport):
+ * src/WebLayer.cpp:
+
2012-08-16 Peter Beverloo <[email protected]>
Unreviewed. Rolled DEPS.
Modified: trunk/Source/WebKit/chromium/src/NonCompositedContentHost.cpp (125787 => 125788)
--- trunk/Source/WebKit/chromium/src/NonCompositedContentHost.cpp 2012-08-16 17:06:56 UTC (rev 125787)
+++ trunk/Source/WebKit/chromium/src/NonCompositedContentHost.cpp 2012-08-16 17:16:06 UTC (rev 125788)
@@ -87,20 +87,6 @@
ASSERT(haveScrollLayer());
}
-static void reserveScrollbarLayers(WebLayer layer, WebLayer clipLayer)
-{
- // Scrollbars and corners are known to be attached outside the root clip
- // rect, so skip the clipLayer subtree.
- if (layer == clipLayer)
- return;
-
- for (size_t i = 0; i < layer.numberOfChildren(); ++i)
- reserveScrollbarLayers(layer.childAt(i), clipLayer);
-
- if (layer.drawsContent())
- layer.setAlwaysReserveTextures(true);
-}
-
void NonCompositedContentHost::setViewport(const WebCore::IntSize& viewportSize, const WebCore::IntSize& contentsSize, const WebCore::IntPoint& scrollPosition, const WebCore::IntPoint& scrollOrigin, float deviceScale)
{
if (!haveScrollLayer())
@@ -134,12 +120,6 @@
m_graphicsLayer->setNeedsDisplay();
} else if (visibleRectChanged)
m_graphicsLayer->setNeedsDisplay();
-
- WebLayer clipLayer = layer.parent();
- WebLayer rootLayer = clipLayer;
- while (!rootLayer.parent().isNull())
- rootLayer = rootLayer.parent();
- reserveScrollbarLayers(rootLayer, clipLayer);
}
bool NonCompositedContentHost::haveScrollLayer()
Modified: trunk/Source/WebKit/chromium/src/WebLayer.cpp (125787 => 125788)
--- trunk/Source/WebKit/chromium/src/WebLayer.cpp 2012-08-16 17:06:56 UTC (rev 125787)
+++ trunk/Source/WebKit/chromium/src/WebLayer.cpp 2012-08-16 17:16:06 UTC (rev 125788)
@@ -375,11 +375,6 @@
other->m_private->setLayerAnimationController(m_private->releaseLayerAnimationController());
}
-void WebLayer::setAlwaysReserveTextures(bool reserve)
-{
- m_private->setAlwaysReserveTextures(reserve);
-}
-
void WebLayer::setForceRenderSurface(bool forceRenderSurface)
{
m_private->setForceRenderSurface(forceRenderSurface);
