Chromium -> Mojo roll.

cc/layers/layer_impl.h

Index: cc/layers/layer_impl.h
diff --git a/cc/layers/layer_impl.h b/cc/layers/layer_impl.h
index 0357252eae7e4b71b4e3ab56bf8f861b28e07eb0..e0c42f0bfecf3bbc31c7c9e74bbb86d4d3463c51 100644
--- a/cc/layers/layer_impl.h
+++ b/cc/layers/layer_impl.h
@@ -5,6 +5,7 @@
 #ifndef CC_LAYERS_LAYER_IMPL_H_
 #define CC_LAYERS_LAYER_IMPL_H_
 
+#include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ -31,6 +32,7 @@
 #include "cc/output/filter_operations.h"
 #include "cc/quads/shared_quad_state.h"
 #include "cc/resources/resource_provider.h"
+#include "cc/resources/tile_priority.h"
 #include "skia/ext/refptr.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkImageFilter.h"
@@ -561,7 +563,8 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver,
   virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl);
   virtual void PushPropertiesTo(LayerImpl* layer);
 
-  virtual void GetAllTilesForTracing(std::set<const Tile*>* tiles) const;
+  virtual void GetAllTilesAndPrioritiesForTracing(
+      std::map<const Tile*, TilePriority>* tile_map) const;
   virtual void AsValueInto(base::trace_event::TracedValue* dict) const;
 
   virtual size_t GPUMemoryUsageInBytes() const;
@@ -600,6 +603,8 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver,
   // for layers that provide it.
   virtual Region GetInvalidationRegion();
 
+  virtual gfx::Rect GetEnclosingRectInTargetSpace() const;
+
  protected:
   LayerImpl(LayerTreeImpl* layer_impl,
             int id,
@@ -626,6 +631,8 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver,
   // Note carefully this does not affect the current layer.
   void NoteLayerPropertyChangedForDescendants();
 
+  gfx::Rect GetScaledEnclosingRectInTargetSpace(float scale) const;
+
  private:
   void PushScrollOffset(const gfx::ScrollOffset* scroll_offset);
   void DidUpdateScrollOffset();