diff options
| author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-05 06:55:03 +0000 |
|---|---|---|
| committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-05 06:55:03 +0000 |
| commit | 34ba1ffb32e6b517f3051ae0cc32cdf783aab47d (patch) | |
| tree | da7444e0dda04a656d4a223016168efe3f260f9c /cc/layers/layer.h | |
| parent | 514266b099e9e2177d230d3696c0f3835d5ffba7 (diff) | |
| download | chromium_src-34ba1ffb32e6b517f3051ae0cc32cdf783aab47d.zip chromium_src-34ba1ffb32e6b517f3051ae0cc32cdf783aab47d.tar.gz chromium_src-34ba1ffb32e6b517f3051ae0cc32cdf783aab47d.tar.bz2 | |
cc: Clean up OcclusionTracker template parameters.
Currently it takes LayerType and RenderSurfaceType, but the latter is
derivable from the former, so just pass the former. Since there's only
one parameter, it's clearer to use OcclusionTracker<Layer(Impl)>
directly instead of using typedefs.
Also rename the TestOcclusionTracker file from
occlusion_tracker_test_common.h to test_occlusion_tracker.h.
R=enne
BUG=344962
Review URL: https://codereview.chromium.org/183563003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254965 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/layers/layer.h')
| -rw-r--r-- | cc/layers/layer.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cc/layers/layer.h b/cc/layers/layer.h index 37772e9..97d3753 100644 --- a/cc/layers/layer.h +++ b/cc/layers/layer.h @@ -24,7 +24,6 @@ #include "cc/layers/paint_properties.h" #include "cc/layers/render_surface.h" #include "cc/output/filter_operations.h" -#include "cc/trees/occlusion_tracker.h" #include "skia/ext/refptr.h" #include "third_party/skia/include/core/SkColor.h" #include "third_party/skia/include/core/SkImageFilter.h" @@ -61,6 +60,8 @@ class RenderingStatsInstrumentation; class ResourceUpdateQueue; class ScrollbarLayerInterface; struct AnimationEvent; +template <typename LayerType> +class OcclusionTracker; // Base class for composited layers. Special layer types are derived from // this class. @@ -352,7 +353,7 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>, virtual void SavePaintProperties(); // Returns true iff any resources were updated that need to be committed. virtual bool Update(ResourceUpdateQueue* queue, - const OcclusionTracker* occlusion); + const OcclusionTracker<Layer>* occlusion); virtual bool NeedMoreUpdates(); virtual void SetIsMask(bool is_mask) {} virtual void ReduceMemoryUsage() {} |