Diff
Modified: trunk/Source/WebCore/ChangeLog (104105 => 104106)
--- trunk/Source/WebCore/ChangeLog 2012-01-05 01:18:26 UTC (rev 104105)
+++ trunk/Source/WebCore/ChangeLog 2012-01-05 01:19:16 UTC (rev 104106)
@@ -1,3 +1,24 @@
+2012-01-04 James Robinson <[email protected]>
+
+ [chromium] Remove chromium compositor support for unused zoomAnimatorTransform
+ https://bugs.webkit.org/show_bug.cgi?id=75585
+
+ Reviewed by Kenneth Russell.
+
+ Removes compositor support for zoomAnimatorTransform property. This code is unused and never was used.
+ Zoom animations are handled by adjusting the page scale factor and scroll offsets.
+
+ * platform/graphics/chromium/LayerChromium.h:
+ * platform/graphics/chromium/cc/CCLayerImpl.cpp:
+ * platform/graphics/chromium/cc/CCLayerImpl.h:
+ * platform/graphics/chromium/cc/CCLayerTreeHost.cpp:
+ (WebCore::CCLayerTreeHost::finishCommitOnImplThread):
+ * platform/graphics/chromium/cc/CCLayerTreeHost.h:
+ * platform/graphics/chromium/cc/CCLayerTreeHostCommon.cpp:
+ (WebCore::calculateDrawTransformsAndVisibilityInternal):
+ * platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp:
+ * platform/graphics/chromium/cc/CCLayerTreeHostImpl.h:
+
2012-01-04 Kenneth Russell <[email protected]>
Fix semantics of WEBKIT_WEBGL_lose_context
Modified: trunk/Source/WebCore/platform/graphics/chromium/LayerChromium.h (104105 => 104106)
--- trunk/Source/WebCore/platform/graphics/chromium/LayerChromium.h 2012-01-05 01:18:26 UTC (rev 104105)
+++ trunk/Source/WebCore/platform/graphics/chromium/LayerChromium.h 2012-01-05 01:19:16 UTC (rev 104106)
@@ -119,8 +119,6 @@
void setSublayerTransform(const TransformationMatrix&);
const TransformationMatrix& sublayerTransform() const { return m_sublayerTransform; }
- TransformationMatrix zoomAnimatorTransform() const { return TransformationMatrix(); }
-
void setTransform(const TransformationMatrix&);
const TransformationMatrix& transform() const { return m_transform; }
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerImpl.cpp (104105 => 104106)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerImpl.cpp 2012-01-05 01:18:26 UTC (rev 104105)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerImpl.cpp 2012-01-05 01:19:16 UTC (rev 104106)
@@ -383,16 +383,6 @@
noteLayerPropertyChangedForSubtree();
}
-void CCLayerImpl::setZoomAnimatorTransform(const TransformationMatrix& zoomAnimatorTransform)
-{
- if (m_zoomAnimatorTransform == zoomAnimatorTransform)
- return;
-
- m_zoomAnimatorTransform = zoomAnimatorTransform;
- noteLayerPropertyChangedForSubtree();
-}
-
-
void CCLayerImpl::setSublayerTransform(const TransformationMatrix& sublayerTransform)
{
if (m_sublayerTransform == sublayerTransform)
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerImpl.h (104105 => 104106)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerImpl.h 2012-01-05 01:18:26 UTC (rev 104105)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerImpl.h 2012-01-05 01:19:16 UTC (rev 104106)
@@ -124,9 +124,6 @@
void setTransform(const TransformationMatrix&);
const TransformationMatrix& transform() const { return m_transform; }
- void setZoomAnimatorTransform(const TransformationMatrix&);
- const TransformationMatrix& zoomAnimatorTransform() const { return m_zoomAnimatorTransform; }
-
void setName(const String& name) { m_name = name; }
const String& name() const { return m_name; }
@@ -248,7 +245,6 @@
float m_opacity;
FloatPoint m_position;
bool m_preserves3D;
- TransformationMatrix m_zoomAnimatorTransform;
TransformationMatrix m_sublayerTransform;
TransformationMatrix m_transform;
bool m_usesLayerClipping;
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp (104105 => 104106)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp 2012-01-05 01:18:26 UTC (rev 104105)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp 2012-01-05 01:19:16 UTC (rev 104106)
@@ -151,7 +151,6 @@
hostImpl->setSourceFrameNumber(frameNumber());
hostImpl->setHaveWheelEventHandlers(m_haveWheelEventHandlers);
- hostImpl->setZoomAnimatorTransform(m_zoomAnimatorTransform);
hostImpl->setViewport(viewportSize());
hostImpl->setPageScaleFactorAndLimits(pageScale(), m_minPageScale, m_maxPageScale);
@@ -208,16 +207,6 @@
return m_proxy->layerRendererCapabilities();
}
-void CCLayerTreeHost::setZoomAnimatorTransform(const TransformationMatrix& zoom)
-{
- bool zoomChanged = m_zoomAnimatorTransform != zoom;
-
- m_zoomAnimatorTransform = zoom;
-
- if (zoomChanged)
- setNeedsCommit();
-}
-
void CCLayerTreeHost::setNeedsAnimate()
{
ASSERT(CCProxy::hasImplThread());
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.h (104105 => 104106)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.h 2012-01-05 01:18:26 UTC (rev 104105)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.h 2012-01-05 01:19:16 UTC (rev 104106)
@@ -155,8 +155,6 @@
int frameNumber() const { return m_frameNumber; }
- void setZoomAnimatorTransform(const TransformationMatrix&);
-
const LayerRendererCapabilities& layerRendererCapabilities() const;
// Test-only hook
@@ -229,7 +227,6 @@
CCSettings m_settings;
IntSize m_viewportSize;
- TransformationMatrix m_zoomAnimatorTransform;
bool m_visible;
bool m_haveWheelEventHandlers;
typedef HashMap<GraphicsContext3D*, RefPtr<RateLimiter> > RateLimiterMap;
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostCommon.cpp (104105 => 104106)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostCommon.cpp 2012-01-05 01:18:26 UTC (rev 104105)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostCommon.cpp 2012-01-05 01:19:16 UTC (rev 104106)
@@ -206,15 +206,13 @@
float centerOffsetY = (0.5 - anchorPoint.y()) * bounds.height();
TransformationMatrix layerLocalTransform;
- // LT = Tr[origin] * M[zoomAnimator]
- layerLocalTransform.multiply(layer->zoomAnimatorTransform());
- // LT = Tr[origin] * M[zoomAnimator] * S[pageScaleDelta]
+ // LT = Tr[origin] * S[pageScaleDelta]
layerLocalTransform.scale(layer->pageScaleDelta());
- // LT = Tr[origin] * M[zoomAnimator] * S[pageScaleDelta] * Tr[origin2anchor]
+ // LT = Tr[origin] * S[pageScaleDelta] * Tr[origin2anchor]
layerLocalTransform.translate3d(position.x(), position.y(), layer->anchorPointZ());
- // LT = Tr[origin] * M[zoomAnimator] * S[pageScaleDelta] * Tr[origin2anchor] * M[layer]
+ // LT = Tr[origin] * S[pageScaleDelta] * Tr[origin2anchor] * M[layer]
layerLocalTransform.multiply(layer->transform());
- // LT = Tr[origin] * M[zoomAnimator] * S[pageScaleDelta] * Tr[origin2anchor] * M[layer] * Tr[anchor2center]
+ // LT = Tr[origin] * S[pageScaleDelta] * Tr[origin2anchor] * M[layer] * Tr[anchor2center]
layerLocalTransform.translate3d(centerOffsetX, centerOffsetY, -layer->anchorPointZ());
TransformationMatrix combinedTransform = parentMatrix;
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp (104105 => 104106)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp 2012-01-05 01:18:26 UTC (rev 104105)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp 2012-01-05 01:19:16 UTC (rev 104106)
@@ -442,14 +442,6 @@
// TODO(aelias): Also update sublayers.
}
-void CCLayerTreeHostImpl::setZoomAnimatorTransform(const TransformationMatrix& zoom)
-{
- if (!m_scrollLayerImpl)
- return;
-
- m_scrollLayerImpl->setZoomAnimatorTransform(zoom);
-}
-
double CCLayerTreeHostImpl::currentTimeMs() const
{
return monotonicallyIncreasingTime() * 1000.0;
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.h (104105 => 104106)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.h 2012-01-05 01:18:26 UTC (rev 104105)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.h 2012-01-05 01:19:16 UTC (rev 104106)
@@ -109,7 +109,6 @@
void setViewport(const IntSize& viewportSize);
const IntSize& viewportSize() const { return m_viewportSize; }
- void setZoomAnimatorTransform(const TransformationMatrix&);
void setPageScaleFactorAndLimits(float pageScale, float minPageScale, float maxPageScale);
float pageScale() const { return m_pageScale; }
Modified: trunk/Source/WebKit/chromium/ChangeLog (104105 => 104106)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-01-05 01:18:26 UTC (rev 104105)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-01-05 01:19:16 UTC (rev 104106)
@@ -1,5 +1,18 @@
2012-01-04 James Robinson <[email protected]>
+ [chromium] Remove chromium compositor support for unused zoomAnimatorTransform
+ https://bugs.webkit.org/show_bug.cgi?id=75585
+
+ Reviewed by Kenneth Russell.
+
+ * src/WebViewImpl.cpp:
+ (WebKit::WebViewImpl::setZoomLevel):
+ (WebKit::WebViewImpl::setRootLayerNeedsDisplay):
+ * tests/CCLayerImplTest.cpp:
+ (WebCore::TEST):
+
+2012-01-04 James Robinson <[email protected]>
+
[chromium] Compile fix, rename libplatform.a to libwebkit_platform.a to avoid collision with nacl
* WebKit.gyp:
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.cpp (104105 => 104106)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-01-05 01:18:26 UTC (rev 104105)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-01-05 01:19:16 UTC (rev 104106)
@@ -1897,9 +1897,6 @@
double WebViewImpl::setZoomLevel(bool textOnly, double zoomLevel)
{
- if (m_layerTreeHost)
- m_layerTreeHost->setZoomAnimatorTransform(TransformationMatrix());
-
if (zoomLevel < m_minimumZoomLevel)
m_zoomLevel = m_minimumZoomLevel;
else if (zoomLevel > m_maximumZoomLevel)
@@ -2831,13 +2828,6 @@
void WebViewImpl::setRootLayerNeedsDisplay()
{
- if (m_layerTreeHost) {
- TransformationMatrix zoomMatrix;
- FloatPoint trans = m_page->mainFrame()->view()->scrollAnimator()->zoomTranslation();
- zoomMatrix.translate(trans.x(), trans.y());
- zoomMatrix.scale(m_page->mainFrame()->view()->scrollAnimator()->zoomScale());
- m_layerTreeHost->setZoomAnimatorTransform(zoomMatrix);
- }
if (m_layerTreeHost)
m_layerTreeHost->setNeedsCommit();
}
Modified: trunk/Source/WebKit/chromium/tests/CCLayerImplTest.cpp (104105 => 104106)
--- trunk/Source/WebKit/chromium/tests/CCLayerImplTest.cpp 2012-01-05 01:18:26 UTC (rev 104105)
+++ trunk/Source/WebKit/chromium/tests/CCLayerImplTest.cpp 2012-01-05 01:19:16 UTC (rev 104106)
@@ -100,7 +100,6 @@
EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->setPosition(arbitraryFloatPoint));
EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->setPreserves3D(true));
EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->setTransform(arbitraryTransform));
- EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->setZoomAnimatorTransform(arbitraryTransform));
EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->setDoubleSided(false)); // constructor initializes it to "true".
EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->scrollBy(arbitraryIntSize));
EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->setScrollDelta(arbitraryIntSize));
@@ -136,7 +135,6 @@
EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->setReplicaLayer(dummyReplica));
EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->setPosition(arbitraryFloatPoint));
EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->setPreserves3D(true));
- EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->setZoomAnimatorTransform(arbitraryTransform));
EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->setTransform(arbitraryTransform));
EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->setDoubleSided(false)); // constructor initializes it to "true".
EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(root->setScrollDelta(arbitraryIntSize));
