Revert 201510 "Revert 201498 "Add devtools instrumentation for c..."

Reverting this didn't fix the build, instead it turned out that crrev.com/201513
fixed the build. Hence I'm reverting this revery :-)

> Revert 201498 "Add devtools instrumentation for canvas creation ..."
> 
> This is a speculative revert to try and fix build breakage starting with:
> http://build.chromium.org/p/chromium.linux/builders/Android%20Tests%20%28dbg%29/builds/10905
> 
> If it doesn't help, this revert should be reverted :-)
> 
> > Add devtools instrumentation for canvas creation in BitmapContentLayerUpdater
> > 
> > Canvas bitmap allocation may take considerable time (close to that of
> > actual layer update), so having it intrumented helps to reduce "unknown"
> > time on Timeline.
> > 
> > - keep layer id in content layer updater, plumb it through all
> >     content layer updaters.
> > - extract boilerplate of devtools instrumentation classes to a macro;
> > - add instrumentation around canvas bitmap allocation in
> >     BitmapContentLayerUpdater.
> > 
> > Related blink change: https://codereview.chromium.org/15466005
> > 
> > R=nduca@chromium.org
> > 
> > Review URL: https://codereview.chromium.org/15317008
> 
> TBR=caseq@google.com
> 
> Review URL: https://codereview.chromium.org/15697005

TBR=johnme@chromium.org

Review URL: https://codereview.chromium.org/15734009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201536 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 1 deletions

diff --git a/cc/resources/content_layer_updater.h b/cc/resources/content_layer_updater.h
index 9176f2c..0b7e163 100644
--- a/cc/resources/content_layer_updater.h
+++ b/cc/resources/content_layer_updater.h
@@ -22,7 +22,8 @@ class RenderingStatsInstrumentation;
 class CC_EXPORT ContentLayerUpdater : public LayerUpdater {
  protected:
   ContentLayerUpdater(scoped_ptr<LayerPainter> painter,
-                      RenderingStatsInstrumentation* stats_instrumentation);
+                      RenderingStatsInstrumentation* stats_instrumentation,
+                      int layer_id);
   virtual ~ContentLayerUpdater();
 
   void PaintContents(SkCanvas* canvas,
@@ -34,6 +35,7 @@ class CC_EXPORT ContentLayerUpdater : public LayerUpdater {
   gfx::Rect content_rect() const { return content_rect_; }
 
   RenderingStatsInstrumentation* rendering_stats_instrumentation_;
+  int layer_id_;
 
  private:
   gfx::Rect content_rect_;