Changeset 95988 in webkit

Timestamp:

Sep 26, 2011 1:31:12 PM (13 years ago)

Author:

wjmaclean@chromium.org

Message:

[chromium] Revise zoom animator backend to use full transform instead of just scale.
​https://bugs.webkit.org/show_bug.cgi?id=68535

Reviewed by Kenneth Russell.

Source/WebCore:

• page/Settings.cpp:

(WebCore::Settings::Settings):

• page/Settings.h:

(WebCore::Settings::setZoomAnimatorScale):
(WebCore::Settings::zoomAnimatorScale):
(WebCore::Settings::setZoomAnimatorPosition):
(WebCore::Settings::zoomAnimatorPosX):
(WebCore::Settings::zoomAnimatorPosY):

• platform/graphics/chromium/LayerRendererChromium.cpp:

(WebCore::LayerRendererChromium::LayerRendererChromium):
(WebCore::LayerRendererChromium::drawLayersInternal):

• platform/graphics/chromium/LayerRendererChromium.h:

(WebCore::LayerRendererChromium::setZoomAnimatorTransform):

• platform/graphics/chromium/cc/CCLayerTreeHost.cpp:

(WebCore::CCLayerTreeHost::CCLayerTreeHost):
(WebCore::CCLayerTreeHost::commitTo):
(WebCore::CCLayerTreeHost::setZoomAnimatorTransform):
(WebCore::CCLayerTreeHost::updateLayers):

• platform/graphics/chromium/cc/CCLayerTreeHost.h:
• platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp:

(WebCore::CCLayerTreeHostImpl::setZoomAnimatorTransform):

• platform/graphics/chromium/cc/CCLayerTreeHostImpl.h:
• testing/Internals.cpp:

(WebCore::Internals::setZoomAnimatorTransform):

• testing/Internals.h:
• testing/Internals.idl:

Source/WebKit/chromium:

• src/WebViewImpl.cpp:

(WebKit::WebViewImpl::setZoomLevel):
(WebKit::WebViewImpl::setRootLayerNeedsDisplay):

LayoutTests:

• platform/chromium-gpu-linux/platform/chromium/compositing/zoom-animator-scale-test-expected.png: Added.
• platform/chromium/compositing/zoom-animator-scale-test.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/chromium-gpu-linux/platform/chromium/compositing/zoom-animator-scale-test-expected.png (added)
• LayoutTests/platform/chromium/compositing/zoom-animator-scale-test.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/Settings.cpp (modified) (1 diff)
• Source/WebCore/page/Settings.h (modified) (2 diffs)
• Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp (modified) (4 diffs)
• Source/WebCore/platform/graphics/chromium/LayerRendererChromium.h (modified) (2 diffs)
• Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp (modified) (4 diffs)
• Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.h (modified) (3 diffs)
• Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp (modified) (1 diff)
• Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.h (modified) (2 diffs)
• Source/WebCore/testing/Internals.cpp (modified) (2 diffs)
• Source/WebCore/testing/Internals.h (modified) (1 diff)
• Source/WebCore/testing/Internals.idl (modified) (1 diff)
• Source/WebKit/chromium/ChangeLog (modified) (1 diff)
• Source/WebKit/chromium/src/WebViewImpl.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-09-26  W. James MacLean  <wjmaclean@chromium.org>
+
+        [chromium] Revise zoom animator backend to use full transform instead of just scale.
+        https://bugs.webkit.org/show_bug.cgi?id=68535
+
+        Reviewed by Kenneth Russell.
+
+        * platform/chromium-gpu-linux/platform/chromium/compositing/zoom-animator-scale-test-expected.png: Added.
+        * platform/chromium/compositing/zoom-animator-scale-test.html:
+
 2011-09-26  Mihai Parparita  <mihaip@chromium.org>
 

trunk/LayoutTests/platform/chromium/compositing/zoom-animator-scale-test.html

@@ -4 +4 @@
         if (window.internals) {
             window.internals.setForceCompositingMode(document, true);
-            window.internals.setZoomAnimatorScale(document, 1.25);
+            window.internals.setZoomAnimatorTransform(document, 1.25, -25.0, -25.0);
         }
         if (window.layoutTestController) {

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-26  W. James MacLean  <wjmaclean@chromium.org>
+
+        [chromium] Revise zoom animator backend to use full transform instead of just scale.
+        https://bugs.webkit.org/show_bug.cgi?id=68535
+
+        Reviewed by Kenneth Russell.
+
+        * page/Settings.cpp:
+        (WebCore::Settings::Settings):
+        * page/Settings.h:
+        (WebCore::Settings::setZoomAnimatorScale):
+        (WebCore::Settings::zoomAnimatorScale):
+        (WebCore::Settings::setZoomAnimatorPosition):
+        (WebCore::Settings::zoomAnimatorPosX):
+        (WebCore::Settings::zoomAnimatorPosY):
+        * platform/graphics/chromium/LayerRendererChromium.cpp:
+        (WebCore::LayerRendererChromium::LayerRendererChromium):
+        (WebCore::LayerRendererChromium::drawLayersInternal):
+        * platform/graphics/chromium/LayerRendererChromium.h:
+        (WebCore::LayerRendererChromium::setZoomAnimatorTransform):
+        * platform/graphics/chromium/cc/CCLayerTreeHost.cpp:
+        (WebCore::CCLayerTreeHost::CCLayerTreeHost):
+        (WebCore::CCLayerTreeHost::commitTo):
+        (WebCore::CCLayerTreeHost::setZoomAnimatorTransform):
+        (WebCore::CCLayerTreeHost::updateLayers):
+        * platform/graphics/chromium/cc/CCLayerTreeHost.h:
+        * platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp:
+        (WebCore::CCLayerTreeHostImpl::setZoomAnimatorTransform):
+        * platform/graphics/chromium/cc/CCLayerTreeHostImpl.h:
+        * testing/Internals.cpp:
+        (WebCore::Internals::setZoomAnimatorTransform):
+        * testing/Internals.h:
+        * testing/Internals.idl:
+
 2011-09-26  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebCore/page/Settings.cpp

@@ -220 +220 @@
     , m_loadsImagesAutomaticallyTimer(this, &Settings::loadsImagesAutomaticallyTimerFired)
     , m_zoomAnimatorScale(1)
+    , m_zoomAnimatorPosX(0)
+    , m_zoomAnimatorPosY(0)
 {
     // A Frame may not have been created yet, so we initialize the AtomicString 

trunk/Source/WebCore/page/Settings.h

@@ -433 +433 @@
         bool forceCompositingMode() { return m_forceCompositingMode; }
 
-        void setZoomAnimatorScale(double scale) { m_zoomAnimatorScale = scale; }
-        double zoomAnimatorScale() { return m_zoomAnimatorScale; }
+        void setZoomAnimatorScale(float scale) { m_zoomAnimatorScale = scale; }
+        float zoomAnimatorScale() { return m_zoomAnimatorScale; }
+
+        void setZoomAnimatorPosition(float x, float y) { m_zoomAnimatorPosX = x; m_zoomAnimatorPosY = y; }
+        float zoomAnimatorPosX() { return m_zoomAnimatorPosX; }
+        float zoomAnimatorPosY() { return m_zoomAnimatorPosY; }
 
         void setShouldInjectUserScriptsInInitialEmptyDocument(bool flag) { m_shouldInjectUserScriptsInInitialEmptyDocument = flag; }
@@ -604 +608 @@
         static bool gMockScrollbarsEnabled;
 
-        double m_zoomAnimatorScale;
+        float m_zoomAnimatorScale;
+        float m_zoomAnimatorPosX;
+        float m_zoomAnimatorPosY;
 
 #if USE(SAFARI_THEME)

trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp

@@ -148 +148 @@
     , m_currentRenderSurface(0)
     , m_offscreenFramebufferId(0)
-    , m_zoomAnimatorScale(1)
     , m_contentsTextureMemoryUseBytes(0)
     , m_context(context)
@@ -268 +267 @@
     renderSurfaceLayerList.append(rootDrawLayer);
 
-    TransformationMatrix zoomMatrix;
-    zoomMatrix.scale3d(m_zoomAnimatorScale, m_zoomAnimatorScale, 1);
     m_defaultRenderSurface = rootDrawLayer->renderSurface();
     m_defaultRenderSurface->clearLayerList();
@@ -275 +272 @@
     {
         TRACE_EVENT("LayerRendererChromium::drawLayersInternal::calcDrawEtc", this, 0);
-        CCLayerTreeHostCommon::calculateDrawTransformsAndVisibility(rootDrawLayer, rootDrawLayer, zoomMatrix, zoomMatrix, renderSurfaceLayerList, m_defaultRenderSurface->layerList(), &m_layerSorter, m_capabilities.maxTextureSize);
+        CCLayerTreeHostCommon::calculateDrawTransformsAndVisibility(rootDrawLayer, rootDrawLayer, m_zoomAnimatorTransform, m_zoomAnimatorTransform, renderSurfaceLayerList, m_defaultRenderSurface->layerList(), &m_layerSorter, m_capabilities.maxTextureSize);
     }
 
@@ -291 +288 @@
     useRenderSurface(m_defaultRenderSurface);
 
-    // Clear to blue to make it easier to spot unrendered regions.
-    m_context->clearColor(0, 0, 1, 1);
+    if (m_zoomAnimatorTransform.isIdentity())
+        // Clear to blue to make it easier to spot unrendered regions.
+        m_context->clearColor(0, 0, 1, 1);
+    else
+        // Clear to grey, as zoom animation may leave unrendered regions.
+        // FIXME(wjmaclean): Render some interesting texture in unrendered regions.
+        m_context->clearColor(0.25, 0.25, 0.25, 1);
     m_context->colorMask(true, true, true, true);
     m_context->clear(GraphicsContext3D::COLOR_BUFFER_BIT);

trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.h

@@ -104 +104 @@
     void present();
 
-    void setZoomAnimatorScale(double factor) { m_zoomAnimatorScale = factor; }
+    void setZoomAnimatorTransform(const TransformationMatrix& t) { m_zoomAnimatorTransform = t; }
 
     unsigned createLayerTexture();
@@ -192 +192 @@
     CCRenderSurface* m_currentRenderSurface;
     unsigned m_offscreenFramebufferId;
-    double m_zoomAnimatorScale;
+    TransformationMatrix m_zoomAnimatorTransform;
 
     // Store values that are shared between instances of each layer type

trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp

@@ -54 +54 @@
     , m_rootLayer(rootLayer)
     , m_settings(settings)
-    , m_zoomAnimatorScale(1)
     , m_visible(true)
 {
@@ -120 +119 @@
 
     hostImpl->setVisible(m_visible);
-    hostImpl->setZoomAnimatorScale(m_zoomAnimatorScale);
+    hostImpl->setZoomAnimatorTransform(m_zoomAnimatorTransform);
     hostImpl->setViewport(viewportSize());
 
@@ -188 +187 @@
 }
 
-void CCLayerTreeHost::setZoomAnimatorScale(double zoom)
-{
-    bool zoomChanged = m_zoomAnimatorScale != zoom;
-
-    m_zoomAnimatorScale = zoom;
+void CCLayerTreeHost::setZoomAnimatorTransform(const TransformationMatrix& zoom)
+{
+    bool zoomChanged = m_zoomAnimatorTransform != zoom;
+
+    m_zoomAnimatorTransform = zoom;
 
     if (zoomChanged)
@@ -284 +283 @@
     rootRenderSurface->clearLayerList();
 
-    TransformationMatrix zoomMatrix;
-    zoomMatrix.scale3d(m_zoomAnimatorScale, m_zoomAnimatorScale, 1);
     {
         TRACE_EVENT("CCLayerTreeHost::updateLayers::calcDrawEtc", this, 0);
-        CCLayerTreeHostCommon::calculateDrawTransformsAndVisibility(rootLayer, rootLayer, zoomMatrix, zoomMatrix, m_updateList, rootRenderSurface->layerList(), layerRendererCapabilities().maxTextureSize);
+        CCLayerTreeHostCommon::calculateDrawTransformsAndVisibility(rootLayer, rootLayer, m_zoomAnimatorTransform, m_zoomAnimatorTransform, m_updateList, rootRenderSurface->layerList(), layerRendererCapabilities().maxTextureSize);
     }
 

trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.h

@@ -28 +28 @@
 #include "GraphicsTypes3D.h"
 #include "IntRect.h"
+#include "TransformationMatrix.h"
 #include "cc/CCProxy.h"
 
@@ -127 +128 @@
     int frameNumber() const { return m_frameNumber; }
 
-    void setZoomAnimatorScale(double);
+    void setZoomAnimatorTransform(const TransformationMatrix&);
 
     const LayerRendererCapabilities& layerRendererCapabilities() const;
@@ -182 +183 @@
 
     IntSize m_viewportSize;
-    double m_zoomAnimatorScale;
+    TransformationMatrix m_zoomAnimatorTransform;
     bool m_visible;
 };

trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp

@@ -152 +152 @@
 }
 
-void CCLayerTreeHostImpl::setZoomAnimatorScale(double zoom)
+void CCLayerTreeHostImpl::setZoomAnimatorTransform(const TransformationMatrix& zoom)
 {
-    m_layerRenderer->setZoomAnimatorScale(zoom);
+    m_layerRenderer->setZoomAnimatorTransform(zoom);
 }
 

trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.h

@@ -39 +39 @@
 class LayerRendererChromium;
 struct LayerRendererCapabilities;
+class TransformationMatrix;
 
 // CCLayerTreeHostImpl owns the CCLayerImpl tree as well as associated rendering state
@@ -76 +77 @@
     void setViewport(const IntSize& viewportSize);
     const IntSize& viewportSize() const { return m_viewportSize; }
-    void setZoomAnimatorScale(double);
+    void setZoomAnimatorTransform(const TransformationMatrix&);
 
     const CCSettings& settings() const { return m_settings; }

trunk/Source/WebCore/testing/Internals.cpp

@@ -245 +245 @@
 }
 
-void Internals::setZoomAnimatorScale(Document *document, double scale, ExceptionCode& ec)
+void Internals::setZoomAnimatorTransform(Document *document, double scale, double tx, double ty, ExceptionCode& ec)
 {
     if (!document || !document->settings()) {
@@ -253 +253 @@
 
     document->settings()->setZoomAnimatorScale(scale);
+    document->settings()->setZoomAnimatorPosition(tx, ty);
 }
 

trunk/Source/WebCore/testing/Internals.h

@@ -78 +78 @@
 
     void setForceCompositingMode(Document*, bool enabled, ExceptionCode&);
-    void setZoomAnimatorScale(Document*, double scale, ExceptionCode&);
+    void setZoomAnimatorTransform(Document*, double scale, double tx, double ty, ExceptionCode&);
 
     void setPasswordEchoEnabled(Document*, bool enabled, ExceptionCode&);

trunk/Source/WebCore/testing/Internals.idl

@@ -52 +52 @@
 
         void setForceCompositingMode(in Document document, in boolean enabled) raises(DOMException);
-        void setZoomAnimatorScale(in Document document, in double scale) raises(DOMException);
+        void setZoomAnimatorTransform(in Document document, in double scale, in double tx, in double ty) raises(DOMException);
 
         void setPasswordEchoEnabled(in Document document, in boolean enabled) raises(DOMException);

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-09-26  W. James MacLean  <wjmaclean@chromium.org>
+
+        [chromium] Revise zoom animator backend to use full transform instead of just scale.
+        https://bugs.webkit.org/show_bug.cgi?id=68535
+
+        Reviewed by Kenneth Russell.
+
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::setZoomLevel):
+        (WebKit::WebViewImpl::setRootLayerNeedsDisplay):
+
 2011-09-26  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebKit/chromium/src/WebViewImpl.cpp

@@ -1833 +1833 @@
 {
     if (m_layerTreeHost)
-        m_layerTreeHost->setZoomAnimatorScale(1);
+        m_layerTreeHost->setZoomAnimatorTransform(TransformationMatrix());
 
     if (zoomLevel < m_minimumZoomLevel)
@@ -2567 +2567 @@
 void WebViewImpl::setRootLayerNeedsDisplay()
 {
-    if (m_layerTreeHost)
-        m_layerTreeHost->setZoomAnimatorScale(m_page->settings()->zoomAnimatorScale());
+    if (m_layerTreeHost) {
+        TransformationMatrix zoomMatrix;
+        zoomMatrix.translate(m_page->settings()->zoomAnimatorPosX(), m_page->settings()->zoomAnimatorPosY());
+        zoomMatrix.scale(m_page->settings()->zoomAnimatorScale());
+        m_layerTreeHost->setZoomAnimatorTransform(zoomMatrix);
+    }
 #if USE(THREADED_COMPOSITING)
     if (m_layerTreeHost)