| OLD | NEW | 
|    1 // Copyright 2012 The Chromium Authors. All rights reserved. |    1 // Copyright 2012 The Chromium Authors. All rights reserved. | 
|    2 // Use of this source code is governed by a BSD-style license that can be |    2 // Use of this source code is governed by a BSD-style license that can be | 
|    3 // found in the LICENSE file. |    3 // found in the LICENSE file. | 
|    4  |    4  | 
|    5 #ifndef CC_LAYERS_DELEGATED_RENDERER_LAYER_IMPL_H_ |    5 #ifndef CC_LAYERS_DELEGATED_RENDERER_LAYER_IMPL_H_ | 
|    6 #define CC_LAYERS_DELEGATED_RENDERER_LAYER_IMPL_H_ |    6 #define CC_LAYERS_DELEGATED_RENDERER_LAYER_IMPL_H_ | 
|    7  |    7  | 
|    8 #include "base/containers/hash_tables.h" |    8 #include "base/containers/hash_tables.h" | 
|    9 #include "base/memory/scoped_ptr.h" |    9 #include "base/memory/scoped_ptr.h" | 
|   10 #include "cc/base/cc_export.h" |   10 #include "cc/base/cc_export.h" | 
| (...skipping 27 matching lines...) Expand all  Loading... | 
|   38                            AppendQuadsData* append_quads_data) OVERRIDE; |   38                            AppendQuadsData* append_quads_data) OVERRIDE; | 
|   39   virtual void PushPropertiesTo(LayerImpl* layer) OVERRIDE; |   39   virtual void PushPropertiesTo(LayerImpl* layer) OVERRIDE; | 
|   40  |   40  | 
|   41   void AppendContributingRenderPasses(RenderPassSink* render_pass_sink); |   41   void AppendContributingRenderPasses(RenderPassSink* render_pass_sink); | 
|   42  |   42  | 
|   43   // Creates an ID with the resource provider for the child renderer |   43   // Creates an ID with the resource provider for the child renderer | 
|   44   // that will be sending quads to the layer. Registers the callback to |   44   // that will be sending quads to the layer. Registers the callback to | 
|   45   // inform when resources are no longer in use. |   45   // inform when resources are no longer in use. | 
|   46   void CreateChildIdIfNeeded(const ReturnCallback& return_callback); |   46   void CreateChildIdIfNeeded(const ReturnCallback& return_callback); | 
|   47  |   47  | 
|   48   void SetFrameData(scoped_ptr<DelegatedFrameData> frame_data, |   48   void SetFrameData(const DelegatedFrameData* frame_data, | 
|   49                     gfx::RectF damage_in_frame); |   49                     gfx::RectF damage_in_frame); | 
|   50  |   50  | 
|   51   void SetDisplaySize(gfx::Size size); |   51   void SetDisplaySize(gfx::Size size); | 
|   52  |   52  | 
|   53  protected: |   53  protected: | 
|   54   DelegatedRendererLayerImpl(LayerTreeImpl* tree_impl, int id); |   54   DelegatedRendererLayerImpl(LayerTreeImpl* tree_impl, int id); | 
|   55  |   55  | 
|   56   int ChildIdForTesting() const { return child_id_; } |   56   int ChildIdForTesting() const { return child_id_; } | 
|   57   const ScopedPtrVector<RenderPass>& RenderPassesInDrawOrderForTesting() const { |   57   const ScopedPtrVector<RenderPass>& RenderPassesInDrawOrderForTesting() const { | 
|   58     return render_passes_in_draw_order_; |   58     return render_passes_in_draw_order_; | 
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   97   gfx::Size display_size_; |   97   gfx::Size display_size_; | 
|   98   int child_id_; |   98   int child_id_; | 
|   99   bool own_child_id_; |   99   bool own_child_id_; | 
|  100  |  100  | 
|  101   DISALLOW_COPY_AND_ASSIGN(DelegatedRendererLayerImpl); |  101   DISALLOW_COPY_AND_ASSIGN(DelegatedRendererLayerImpl); | 
|  102 }; |  102 }; | 
|  103  |  103  | 
|  104 }  // namespace cc |  104 }  // namespace cc | 
|  105  |  105  | 
|  106 #endif  // CC_LAYERS_DELEGATED_RENDERER_LAYER_IMPL_H_ |  106 #endif  // CC_LAYERS_DELEGATED_RENDERER_LAYER_IMPL_H_ | 
| OLD | NEW |