Roll cc snapshot up to 127605

cc/LayerChromium.cpp

 // Copyright 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #if USE(ACCELERATED_COMPOSITING)
 #include "LayerChromium.h"
 
 #include "CCActiveAnimation.h"
 #include "CCAnimationEvents.h"
 #include "CCLayerAnimationController.h"
 #include "CCLayerImpl.h"
 #include "CCLayerTreeHost.h"
 #include "CCSettings.h"
 #include "TextStream.h"
 
 #include <public/WebAnimationDelegate.h>
+#include <public/WebLayerScrollClient.h>
+#include <public/WebSize.h>
 
 using namespace std;
 using WebKit::WebTransformationMatrix;
 
 namespace WebCore {
 
 static int s_nextLayerId = 1;
 
 PassRefPtr<LayerChromium> LayerChromium::create()
 {
@@ skipping 29 matching lines @@
     , m_drawCheckerboardForMissingTiles(false)
     , m_forceRenderSurface(false)
     , m_replicaLayer(0)
     , m_drawOpacity(0)
     , m_drawOpacityIsAnimating(false)
     , m_renderTarget(0)
     , m_drawTransformIsAnimating(false)
     , m_screenSpaceTransformIsAnimating(false)
     , m_contentsScale(1.0)
     , m_layerAnimationDelegate(0)
-    , m_layerScrollDelegate(0)
+    , m_layerScrollClient(0)
 {
     if (m_layerId < 0) {
         s_nextLayerId = 1;
         m_layerId = s_nextLayerId++;
     }
 }
 
 LayerChromium::~LayerChromium()
 {
     // Our parent should be holding a reference to us so there should be no
@@ skipping 283 matching lines @@
 bool LayerChromium::transformIsAnimating() const
 {
     return m_layerAnimationController->isAnimatingProperty(CCActiveAnimation::Transform);
 }
 
 void LayerChromium::setScrollPosition(const IntPoint& scrollPosition)
 {
     if (m_scrollPosition == scrollPosition)
         return;
     m_scrollPosition = scrollPosition;
+    if (m_layerScrollClient)
+        m_layerScrollClient->didScroll();
     setNeedsCommit();
 }
 
 void LayerChromium::setMaxScrollPosition(const IntSize& maxScrollPosition)
 {
     if (m_maxScrollPosition == maxScrollPosition)
         return;
     m_maxScrollPosition = maxScrollPosition;
     setNeedsCommit();
 }
@@ skipping 24 matching lines @@
 
 void LayerChromium::setNonFastScrollableRegion(const Region& region)
 {
     if (m_nonFastScrollableRegion == region)
         return;
     m_nonFastScrollableRegion = region;
     m_nonFastScrollableRegionChanged = true;
     setNeedsCommit();
 }
 
-void LayerChromium::scrollBy(const IntSize& scrollDelta)
-{
-    setScrollPosition(scrollPosition() + scrollDelta);
-    if (m_layerScrollDelegate)
-        m_layerScrollDelegate->didScroll(scrollDelta);
-}
-
 void LayerChromium::setDrawCheckerboardForMissingTiles(bool checkerboard)
 {
     if (m_drawCheckerboardForMissingTiles == checkerboard)
         return;
     m_drawCheckerboardForMissingTiles = checkerboard;
     setNeedsCommit();
 }
 
 void LayerChromium::setForceRenderSurface(bool force)
 {
@@ skipping 275 matching lines @@
     return Region();
 }
 
 void sortLayers(Vector<RefPtr<LayerChromium> >::iterator, Vector<RefPtr<LayerChromium> >::iterator, void*)
 {
     // Currently we don't use z-order to decide what to paint, so there's no need to actually sort LayerChromiums.
 }
 
 }
 #endif // USE(ACCELERATED_COMPOSITING)