commit 80d418c6c40663ecce0eefb81b790c6af2066a01
author James Robinson <jamesr@chromium.org> Thu Oct 16 16:00:02 2014 -0700
committer James Robinson <jamesr@chromium.org> Thu Oct 16 16:00:02 2014 -0700
tree 913febd085f6b6500b75516345be0122799aa957
parent 730d7b3d79bb2a354ce4cc42f30dc559a5a297bf

Revved to chromium 2a04445358913b81ed786927172647b701b73113 refs/remotes/origin/HEAD

cc/layers/layer_impl.cc

diff --git a/cc/layers/layer_impl.cc b/cc/layers/layer_impl.cc
index a361772..4c16da7 100644
--- a/cc/layers/layer_impl.cc
+++ b/cc/layers/layer_impl.cc
@@ -349,9 +349,10 @@
   return RenderPassId(0, 0);
 }
 
-ResourceProvider::ResourceId LayerImpl::ContentsResourceId() const {
+void LayerImpl::GetContentsResourceId(ResourceProvider::ResourceId* resource_id,
+                                      gfx::Size* resource_size) const {
   NOTREACHED();
-  return 0;
+  *resource_id = 0;
 }
 
 void LayerImpl::SetSentScrollDelta(const gfx::Vector2dF& sent_scroll_delta) {
@@ -1579,7 +1580,8 @@
 
 void LayerImpl::NotifyAnimationFinished(
     base::TimeTicks monotonic_time,
-    Animation::TargetProperty target_property) {
+    Animation::TargetProperty target_property,
+    int group) {
   if (target_property == Animation::ScrollOffset)
     layer_tree_impl_->InputScrollAnimationFinished();
 }