cc: Consolidate LayerList types.

cc: Consolidate LayerList types.

We currently have Layer::LayerList, LayerImpl::LayerList,
LayerTreeHost::LayerList and LayerTreeHostImpl::LayerList,
as well as LayerTreeImpl::LayerList, LayerSorter::LayerList,
and I think some more.

This patch consolidates the list typedefs into three types:
LayerList, LayerImplList, and OwnedLayerImplList.

LayerList and LayerImplList are the output of
CalculateDrawProperties. While OwnedLayerImplList is a list
that owns the layer pointers in it, ie ScopedPtrVector.

R=jamesr

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=191442

[danakj, 2013-03-29 04:06:42]

I redid this with class types outside of the Layer/LayerImpl class so they can
be forward declared so I could get rid of all the std::vector<Layer> manual
types all over the place and not get circular includes.

[jamesr, 2013-03-29 04:11:04]

Hmm, subclassing std::vector seems a bit too subtle.  How many files forward
declare Layer* and need to know about the Layer*List types?

[danakj, 2013-03-29 04:14:55]

On Fri, Mar 29, 2013 at 12:11 AM, <jamesr@chromium.org> wrote:

> Hmm, subclassing std::vector seems a bit too subtle.  How many files
> forward
> declare Layer* and need to know about the Layer*List types?
>

Mostly it was for LTHCommon I believe.


>
>
https://codereview.chromium.**org/13285002/<https://codereview.chromium.org/1...
>

[danakj, 2013-03-29 04:18:30]

On 2013/03/29 04:14:55, danakj wrote:
> On Fri, Mar 29, 2013 at 12:11 AM, <mailto:jamesr@chromium.org> wrote:
> 
> > Hmm, subclassing std::vector seems a bit too subtle.  How many files
> > forward
> > declare Layer* and need to know about the Layer*List types?
> >
> 
> Mostly it was for LTHCommon I believe.

Oh, also for RenderSurface/RenderSurfaceImpl, to avoid circular includes.

I could also move the typedefs to another header(s).

[jamesr, 2013-03-29 04:19:35]

On 2013/03/29 04:18:30, danakj wrote:
> On 2013/03/29 04:14:55, danakj wrote:
> > On Fri, Mar 29, 2013 at 12:11 AM, <mailto:jamesr@chromium.org> wrote:
> > 
> > > Hmm, subclassing std::vector seems a bit too subtle.  How many files
> > > forward
> > > declare Layer* and need to know about the Layer*List types?
> > >
> > 
> > Mostly it was for LTHCommon I believe.
> 
> Oh, also for RenderSurface/RenderSurfaceImpl, to avoid circular includes.
> 
> I could also move the typedefs to another header(s).

layer_lists.h maybe?

[danakj, 2013-03-29 04:25:44]

On 2013/03/29 04:19:35, jamesr wrote:
> On 2013/03/29 04:18:30, danakj wrote:
> > On 2013/03/29 04:14:55, danakj wrote:
> > > On Fri, Mar 29, 2013 at 12:11 AM, <mailto:jamesr@chromium.org> wrote:
> > > 
> > > > Hmm, subclassing std::vector seems a bit too subtle.  How many files
> > > > forward
> > > > declare Layer* and need to know about the Layer*List types?
> > > >
> > > 
> > > Mostly it was for LTHCommon I believe.
> > 
> > Oh, also for RenderSurface/RenderSurfaceImpl, to avoid circular includes.
> > 
> > I could also move the typedefs to another header(s).
> 
> layer_lists.h maybe?

Done!

[enne (OOO), 2013-03-29 06:12:11]

Ooh, this is a really nice cleanup.  Drive-by lgtm.  :)

[commit-bot: I haz the power, 2013-03-29 16:22:59]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/danakj@chromium.org/13285002/16001

[commit-bot: I haz the power, 2013-03-29 16:23:08]

Failed to apply patch for cc/layers/layer.h:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file cc/layers/layer.h
  Hunk #2 FAILED at 40.
  Hunk #3 succeeded at 51 (offset 1 line).
  Hunk #4 succeeded at 276 (offset 1 line).
  1 out of 4 hunks FAILED -- saving rejects to file cc/layers/layer.h.rej

Patch:       cc/layers/layer.h
Index: cc/layers/layer.h
diff --git a/cc/layers/layer.h b/cc/layers/layer.h
index
2e72e63949ebe94e98ebaf9f934131de608366e3..c43cb3c5acb6a1271966537929176e962e181b23
100644
--- a/cc/layers/layer.h
+++ b/cc/layers/layer.h
@@ -16,7 +16,7 @@
 #include "cc/base/cc_export.h"
 #include "cc/base/region.h"
 #include "cc/layers/draw_properties.h"
-#include "cc/layers/render_surface.h"
+#include "cc/layers/layer_lists.h"
 #include "cc/trees/occlusion_tracker.h"
 #include "skia/ext/refptr.h"
 #include
"third_party/WebKit/Source/Platform/chromium/public/WebFilterOperations.h"
@@ -40,6 +40,7 @@ class LayerImpl;
 class LayerTreeHost;
 class LayerTreeImpl;
 class PriorityCalculator;
+class RenderSurface;
 class ResourceUpdateQueue;
 class ScrollbarLayer;
 struct AnimationEvent;
@@ -50,7 +51,6 @@ struct RenderingStats;
 class CC_EXPORT Layer : public base::RefCounted<Layer>,
                         public LayerAnimationValueObserver {
  public:
-  typedef std::vector<scoped_refptr<Layer> > LayerList;
   enum LayerIdLabels {
     PINCH_ZOOM_ROOT_SCROLL_LAYER_ID = -2,
     INVALID_ID = -1,
@@ -276,8 +276,8 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>,
 
   virtual void PushPropertiesTo(LayerImpl* layer);
 
-  void ClearRenderSurface() { draw_properties_.render_surface.reset(); }
   void CreateRenderSurface();
+  void ClearRenderSurface();
 
   // The contents scale converts from logical, non-page-scaled pixels to target
   // pixels. The contents scale is 1 for the root layer as it is already in

[commit-bot: I haz the power, 2013-03-29 16:51:39]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/danakj@chromium.org/13285002/23001

[commit-bot: I haz the power, 2013-03-29 17:17:30]

Sorry for I got bad news for ya.
Compile failed with a clobber build on win_x64_rel.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_x64_re...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2013-03-29 17:28:09]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/danakj@chromium.org/13285002/32001

[commit-bot: I haz the power, 2013-03-29 17:58:48]

Sorry for I got bad news for ya.
Compile failed with a clobber build on win_x64_rel.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_x64_re...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2013-03-29 18:02:47]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/danakj@chromium.org/13285002/32001

[commit-bot: I haz the power, 2013-03-29 18:33:12]

Sorry for I got bad news for ya.
Compile failed with a clobber build on win_x64_rel.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_x64_re...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2013-03-29 18:50:34]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/danakj@chromium.org/13285002/32001

[commit-bot: I haz the power, 2013-03-29 19:01:49]

Sorry for I got bad news for ya.
Compile failed with a clobber build on win_x64_rel.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_x64_re...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2013-03-29 19:44:54]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/danakj@chromium.org/13285002/32001

[danakj, 2013-03-29 20:51:34]

Committed patchset #6 manually as r191442 (presubmit successful).