Unifies LayerTreeHost::SetNeedsUpdateLayers and SetNeedsAnimate

content/test/web_layer_tree_view_impl_for_testing.h

 // Copyright 2013 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.
 
 #ifndef CONTENT_TEST_WEB_LAYER_TREE_VIEW_IMPL_FOR_TESTING_H_
 #define CONTENT_TEST_WEB_LAYER_TREE_VIEW_IMPL_FOR_TESTING_H_
 
+#include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/trees/layer_tree_host_client.h"
 #include "cc/trees/layer_tree_host_single_thread_client.h"
 #include "third_party/WebKit/public/platform/WebLayerTreeView.h"
 
 namespace cc {
 class LayerTreeHost;
 }
 
 namespace blink { class WebLayer; }
@@ skipping 23 matching lines @@
   virtual void setBackgroundColor(blink::WebColor);
   virtual void setHasTransparentBackground(bool transparent);
   virtual void setVisible(bool visible);
   virtual void setPageScaleFactorAndLimits(float page_scale_factor,
                                            float minimum,
                                            float maximum);
   virtual void startPageScaleAnimation(const blink::WebPoint& destination,
                                        bool use_anchor,
                                        float new_page_scale,
                                        double duration_sec);
-  virtual void setNeedsAnimate();
+  virtual void setNeedsAnimate() { setNeedsUpdateLayers(); } // Renamed. Staged for removal.
+  virtual void setNeedsUpdateLayers();
   virtual void setNeedsRedraw();
-  virtual bool commitRequested() const;
+  virtual bool commitRequested() const { NOTREACHED(); return false; } // Unused. Staged for removal.
   virtual void composite();
   virtual void didStopFlinging();
   virtual bool compositeAndReadback(void* pixels, const blink::WebRect& rect);
   virtual void finishAllRendering();
   virtual void setDeferCommits(bool defer_commits);
   virtual void renderingStats(
       blink::WebRenderingStats& stats) const;  // NOLINT(runtime/references)
 
   // cc::LayerTreeHostClient implementation.
   virtual void WillBeginMainFrame(int frame_id) OVERRIDE {}
@@ skipping 19 matching lines @@
 
  private:
   scoped_ptr<cc::LayerTreeHost> layer_tree_host_;
 
   DISALLOW_COPY_AND_ASSIGN(WebLayerTreeViewImplForTesting);
 };
 
 }  // namespace webkit
 
 #endif  // CONTENT_TEST_WEB_LAYER_TREE_VIEW_IMPL_FOR_TESTING_H_