diff options
41 files changed, 160 insertions, 2 deletions
diff --git a/cc/animation/animation_id_provider.h b/cc/animation/animation_id_provider.h index a8d3a5b..b403841 100644 --- a/cc/animation/animation_id_provider.h +++ b/cc/animation/animation_id_provider.h @@ -5,6 +5,7 @@ #ifndef CC_ANIMATION_ANIMATION_ID_PROVIDER_H_ #define CC_ANIMATION_ANIMATION_ID_PROVIDER_H_ +#include "base/basictypes.h" #include "cc/base/cc_export.h" namespace cc { @@ -14,6 +15,9 @@ class CC_EXPORT AnimationIdProvider { // These functions each return monotonically increasing values. static int NextAnimationId(); static int NextGroupId(); + + private: + DISALLOW_IMPLICIT_CONSTRUCTORS(AnimationIdProvider); }; } // namespace cc diff --git a/cc/animation/scrollbar_animation_controller_linear_fade.h b/cc/animation/scrollbar_animation_controller_linear_fade.h index bc6972c..9ecb3c1 100644 --- a/cc/animation/scrollbar_animation_controller_linear_fade.h +++ b/cc/animation/scrollbar_animation_controller_linear_fade.h @@ -47,6 +47,8 @@ class CC_EXPORT ScrollbarAnimationControllerLinearFade base::TimeDelta fadeout_delay_; base::TimeDelta fadeout_length_; + + DISALLOW_COPY_AND_ASSIGN(ScrollbarAnimationControllerLinearFade); }; } // namespace cc diff --git a/cc/animation/timing_function.h b/cc/animation/timing_function.h index 30cbd0d..b1080e6 100644 --- a/cc/animation/timing_function.h +++ b/cc/animation/timing_function.h @@ -21,6 +21,9 @@ class CC_EXPORT TimingFunction : public FloatAnimationCurve { protected: TimingFunction(); + + private: + DISALLOW_ASSIGN(TimingFunction); }; class CC_EXPORT CubicBezierTimingFunction : public TimingFunction { @@ -40,26 +43,41 @@ class CC_EXPORT CubicBezierTimingFunction : public TimingFunction { SkScalar y1_; SkScalar x2_; SkScalar y2_; + + private: + DISALLOW_ASSIGN(CubicBezierTimingFunction); }; class CC_EXPORT EaseTimingFunction { public: static scoped_ptr<TimingFunction> Create(); + + private: + DISALLOW_IMPLICIT_CONSTRUCTORS(EaseTimingFunction); }; class CC_EXPORT EaseInTimingFunction { public: static scoped_ptr<TimingFunction> Create(); + + private: + DISALLOW_IMPLICIT_CONSTRUCTORS(EaseInTimingFunction); }; class CC_EXPORT EaseOutTimingFunction { public: static scoped_ptr<TimingFunction> Create(); + + private: + DISALLOW_IMPLICIT_CONSTRUCTORS(EaseOutTimingFunction); }; class CC_EXPORT EaseInOutTimingFunction { public: static scoped_ptr<TimingFunction> Create(); + + private: + DISALLOW_IMPLICIT_CONSTRUCTORS(EaseInOutTimingFunction); }; } // namespace cc diff --git a/cc/animation/transform_operations.h b/cc/animation/transform_operations.h index 9ab0196..b5f960f 100644 --- a/cc/animation/transform_operations.h +++ b/cc/animation/transform_operations.h @@ -74,6 +74,8 @@ class CC_EXPORT TransformOperations { // For efficiency, we cache the decomposed transform. mutable scoped_ptr<gfx::DecomposedTransform> decomposed_transform_; mutable bool decomposed_transform_dirty_; + + DISALLOW_ASSIGN(TransformOperations); }; } // namespace cc diff --git a/cc/debug/debug_colors.h b/cc/debug/debug_colors.h index be1294d9..a5ae859 100644 --- a/cc/debug/debug_colors.h +++ b/cc/debug/debug_colors.h @@ -104,6 +104,7 @@ class DebugColors { static SkColor MemoryDisplayTextColor(); static SkColor PaintTimeDisplayTextAndGraphColor(); + private: DISALLOW_IMPLICIT_CONSTRUCTORS(DebugColors); }; diff --git a/cc/debug/fake_web_graphics_context_3d.h b/cc/debug/fake_web_graphics_context_3d.h index a1ccc05..0fe10b8 100644 --- a/cc/debug/fake_web_graphics_context_3d.h +++ b/cc/debug/fake_web_graphics_context_3d.h @@ -589,6 +589,9 @@ class CC_EXPORT FakeWebGraphicsContext3D virtual void drawBuffersEXT(WebKit::WGC3Dsizei m, const WebKit::WGC3Denum* bufs) {} + + private: + DISALLOW_COPY_AND_ASSIGN(FakeWebGraphicsContext3D); }; } // namespace cc diff --git a/cc/debug/ring_buffer.h b/cc/debug/ring_buffer.h index 74da2d9..94d8459 100644 --- a/cc/debug/ring_buffer.h +++ b/cc/debug/ring_buffer.h @@ -113,6 +113,8 @@ class RingBuffer { T buffer_[kSize]; size_t current_index_; + + DISALLOW_COPY_AND_ASSIGN(RingBuffer); }; } // namespace cc diff --git a/cc/input/pinch_zoom_scrollbar.h b/cc/input/pinch_zoom_scrollbar.h index 2aa6005..c21a5e5 100644 --- a/cc/input/pinch_zoom_scrollbar.h +++ b/cc/input/pinch_zoom_scrollbar.h @@ -46,7 +46,7 @@ class PinchZoomScrollbar : public WebKit::WebScrollbar { LayerTreeHost* owner_; DISALLOW_COPY_AND_ASSIGN(PinchZoomScrollbar); -}; // class PinchZoomScrollbar +}; } // namespace cc #endif // CC_INPUT_PINCH_ZOOM_SCROLLBAR_H_ diff --git a/cc/input/pinch_zoom_scrollbar_geometry.h b/cc/input/pinch_zoom_scrollbar_geometry.h index b2795b1..d3c0aca 100644 --- a/cc/input/pinch_zoom_scrollbar_geometry.h +++ b/cc/input/pinch_zoom_scrollbar_geometry.h @@ -5,6 +5,7 @@ #ifndef CC_INPUT_PINCH_ZOOM_SCROLLBAR_GEOMETRY_H_ #define CC_INPUT_PINCH_ZOOM_SCROLLBAR_GEOMETRY_H_ +#include "base/basictypes.h" #include "cc/base/cc_export.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebScrollbarThemeGeometry.h" @@ -16,6 +17,7 @@ namespace cc { class PinchZoomScrollbarGeometry : public WebScrollbarThemeGeometry { public: + PinchZoomScrollbarGeometry() {} virtual ~PinchZoomScrollbarGeometry() {} static const int kTrackWidth; @@ -43,6 +45,9 @@ class PinchZoomScrollbarGeometry : public WebScrollbarThemeGeometry { virtual void splitTrack( WebScrollbar* scrollbar, const WebRect& track, WebRect& start_track, WebRect& thumb, WebRect& end_track); + + private: + DISALLOW_COPY_AND_ASSIGN(PinchZoomScrollbarGeometry); }; } // namespace WebKit diff --git a/cc/input/pinch_zoom_scrollbar_painter.h b/cc/input/pinch_zoom_scrollbar_painter.h index 1a70a748..77bd87b 100644 --- a/cc/input/pinch_zoom_scrollbar_painter.h +++ b/cc/input/pinch_zoom_scrollbar_painter.h @@ -5,6 +5,7 @@ #ifndef CC_INPUT_PINCH_ZOOM_SCROLLBAR_PAINTER_H_ #define CC_INPUT_PINCH_ZOOM_SCROLLBAR_PAINTER_H_ +#include "base/basictypes.h" #include "base/compiler_specific.h" #include "cc/layers/scrollbar_theme_painter.h" @@ -27,6 +28,9 @@ class PinchZoomScrollbarPainter : public ScrollbarThemePainter { virtual void PaintForwardButtonEnd(SkCanvas* canvas, gfx::Rect rect) OVERRIDE; virtual void PaintTickmarks(SkCanvas* canvas, gfx::Rect rect) OVERRIDE; virtual void PaintThumb(SkCanvas* canvas, gfx::Rect rect) OVERRIDE; + + private: + DISALLOW_COPY_AND_ASSIGN(PinchZoomScrollbarPainter); }; } // namespace cc diff --git a/cc/layers/contents_scaling_layer.h b/cc/layers/contents_scaling_layer.h index a550c26..04879d5 100644 --- a/cc/layers/contents_scaling_layer.h +++ b/cc/layers/contents_scaling_layer.h @@ -35,6 +35,8 @@ class CC_EXPORT ContentsScalingLayer : public Layer { private: float last_update_contents_scale_x_; float last_update_contents_scale_y_; + + DISALLOW_COPY_AND_ASSIGN(ContentsScalingLayer); }; } // namespace cc diff --git a/cc/layers/delegated_renderer_layer.h b/cc/layers/delegated_renderer_layer.h index a65855d..b5673d7 100644 --- a/cc/layers/delegated_renderer_layer.h +++ b/cc/layers/delegated_renderer_layer.h @@ -43,6 +43,8 @@ class CC_EXPORT DelegatedRendererLayer : public Layer { gfx::Size frame_size_; gfx::Size display_size_; TransferableResourceArray unused_resources_for_child_compositor_; + + DISALLOW_COPY_AND_ASSIGN(DelegatedRendererLayer); }; } // namespace cc diff --git a/cc/layers/delegated_renderer_layer_impl.h b/cc/layers/delegated_renderer_layer_impl.h index b5e2467..f48ab74 100644 --- a/cc/layers/delegated_renderer_layer_impl.h +++ b/cc/layers/delegated_renderer_layer_impl.h @@ -86,6 +86,8 @@ class CC_EXPORT DelegatedRendererLayerImpl : public LayerImpl { gfx::Size display_size_; int child_id_; + + DISALLOW_COPY_AND_ASSIGN(DelegatedRendererLayerImpl); }; } // namespace cc diff --git a/cc/layers/heads_up_display_layer.h b/cc/layers/heads_up_display_layer.h index d7656c5..31294d8 100644 --- a/cc/layers/heads_up_display_layer.h +++ b/cc/layers/heads_up_display_layer.h @@ -28,6 +28,8 @@ class CC_EXPORT HeadsUpDisplayLayer : public Layer { private: virtual ~HeadsUpDisplayLayer(); + + DISALLOW_COPY_AND_ASSIGN(HeadsUpDisplayLayer); }; } // namespace cc diff --git a/cc/layers/io_surface_layer.h b/cc/layers/io_surface_layer.h index 67d8e21..0207587 100644 --- a/cc/layers/io_surface_layer.h +++ b/cc/layers/io_surface_layer.h @@ -29,6 +29,8 @@ class CC_EXPORT IOSurfaceLayer : public Layer { uint32_t io_surface_id_; gfx::Size io_surface_size_; + + DISALLOW_COPY_AND_ASSIGN(IOSurfaceLayer); }; } // namespace cc diff --git a/cc/layers/nine_patch_layer.h b/cc/layers/nine_patch_layer.h index 21b8cb9..9d6498c 100644 --- a/cc/layers/nine_patch_layer.h +++ b/cc/layers/nine_patch_layer.h @@ -54,6 +54,8 @@ class CC_EXPORT NinePatchLayer : public Layer { // The transparent center region that shows the parent layer's contents in // image space. gfx::Rect image_aperture_; + + DISALLOW_COPY_AND_ASSIGN(NinePatchLayer); }; } // namespace cc diff --git a/cc/layers/nine_patch_layer_impl.h b/cc/layers/nine_patch_layer_impl.h index d87f785..7350b03 100644 --- a/cc/layers/nine_patch_layer_impl.h +++ b/cc/layers/nine_patch_layer_impl.h @@ -58,6 +58,8 @@ class CC_EXPORT NinePatchLayerImpl : public LayerImpl { gfx::Rect image_aperture_; ResourceProvider::ResourceId resource_id_; + + DISALLOW_COPY_AND_ASSIGN(NinePatchLayerImpl); }; } // namespace cc diff --git a/cc/layers/picture_image_layer.h b/cc/layers/picture_image_layer.h index 4f5e5c5..09db1df 100644 --- a/cc/layers/picture_image_layer.h +++ b/cc/layers/picture_image_layer.h @@ -36,6 +36,8 @@ class CC_EXPORT PictureImageLayer : public PictureLayer, ContentLayerClient { virtual ~PictureImageLayer(); SkBitmap bitmap_; + + DISALLOW_COPY_AND_ASSIGN(PictureImageLayer); }; } // namespace cc diff --git a/cc/layers/picture_layer.h b/cc/layers/picture_layer.h index 0ba4031..0cb1583 100644 --- a/cc/layers/picture_layer.h +++ b/cc/layers/picture_layer.h @@ -50,6 +50,8 @@ class CC_EXPORT PictureLayer : public ContentsScalingLayer { // Invalidation from the last time update was called. Region pile_invalidation_; bool is_mask_; + + DISALLOW_COPY_AND_ASSIGN(PictureLayer); }; } // namespace cc diff --git a/cc/layers/scrollbar_geometry_fixed_thumb.h b/cc/layers/scrollbar_geometry_fixed_thumb.h index 74135d3..54f0ecc 100644 --- a/cc/layers/scrollbar_geometry_fixed_thumb.h +++ b/cc/layers/scrollbar_geometry_fixed_thumb.h @@ -38,6 +38,8 @@ class CC_EXPORT ScrollbarGeometryFixedThumb : public ScrollbarGeometryStub { scoped_ptr<WebKit::WebScrollbarThemeGeometry> geometry); gfx::Size thumb_size_; + + DISALLOW_COPY_AND_ASSIGN(ScrollbarGeometryFixedThumb); }; } // namespace cc diff --git a/cc/layers/scrollbar_layer.h b/cc/layers/scrollbar_layer.h index db97272..df95ed5 100644 --- a/cc/layers/scrollbar_layer.h +++ b/cc/layers/scrollbar_layer.h @@ -92,6 +92,8 @@ class CC_EXPORT ScrollbarLayer : public ContentsScalingLayer { scoped_ptr<LayerUpdater::Resource> back_track_; scoped_ptr<LayerUpdater::Resource> fore_track_; scoped_ptr<LayerUpdater::Resource> thumb_; + + DISALLOW_COPY_AND_ASSIGN(ScrollbarLayer); }; } // namespace cc diff --git a/cc/layers/scrollbar_layer_impl.h b/cc/layers/scrollbar_layer_impl.h index 7cf405b..bf1cbe8 100644 --- a/cc/layers/scrollbar_layer_impl.h +++ b/cc/layers/scrollbar_layer_impl.h @@ -100,6 +100,8 @@ class CC_EXPORT ScrollbarLayerImpl : public ScrollbarLayerImplBase { private: ScrollbarLayerImpl* owner_; + + DISALLOW_COPY_AND_ASSIGN(Scrollbar); }; virtual const char* LayerTypeAsString() const OVERRIDE; @@ -143,6 +145,8 @@ class CC_EXPORT ScrollbarLayerImpl : public ScrollbarLayerImplBase { bool enabled_; bool is_custom_scrollbar_; bool is_overlay_scrollbar_; + + DISALLOW_COPY_AND_ASSIGN(ScrollbarLayerImpl); }; } // namespace cc diff --git a/cc/layers/solid_color_layer.h b/cc/layers/solid_color_layer.h index ae5a592..d391070 100644 --- a/cc/layers/solid_color_layer.h +++ b/cc/layers/solid_color_layer.h @@ -27,6 +27,8 @@ class CC_EXPORT SolidColorLayer : public Layer { private: virtual ~SolidColorLayer(); + + DISALLOW_COPY_AND_ASSIGN(SolidColorLayer); }; } // namespace cc diff --git a/cc/layers/solid_color_layer_impl.h b/cc/layers/solid_color_layer_impl.h index 36be2f7..d83c7b0 100644 --- a/cc/layers/solid_color_layer_impl.h +++ b/cc/layers/solid_color_layer_impl.h @@ -32,6 +32,8 @@ class CC_EXPORT SolidColorLayerImpl : public LayerImpl { virtual const char* LayerTypeAsString() const OVERRIDE; const int tile_size_; + + DISALLOW_COPY_AND_ASSIGN(SolidColorLayerImpl); }; } // namespace cc diff --git a/cc/layers/video_layer.h b/cc/layers/video_layer.h index c9705cd..c894c84 100644 --- a/cc/layers/video_layer.h +++ b/cc/layers/video_layer.h @@ -31,6 +31,8 @@ class CC_EXPORT VideoLayer : public Layer { // This pointer is only for passing to VideoLayerImpl's constructor. It should // never be dereferenced by this class. VideoFrameProvider* provider_; + + DISALLOW_COPY_AND_ASSIGN(VideoLayer); }; } // namespace cc diff --git a/cc/output/compositor_frame.h b/cc/output/compositor_frame.h index bf3ae3e..e5c8a33 100644 --- a/cc/output/compositor_frame.h +++ b/cc/output/compositor_frame.h @@ -25,6 +25,9 @@ class CC_EXPORT CompositorFrame { scoped_ptr<SoftwareFrameData> software_frame_data; void AssignTo(CompositorFrame* target); + + private: + DISALLOW_COPY_AND_ASSIGN(CompositorFrame); }; } // namespace cc diff --git a/cc/output/compositor_frame_ack.h b/cc/output/compositor_frame_ack.h index 73b7b1a..5a63e0d 100644 --- a/cc/output/compositor_frame_ack.h +++ b/cc/output/compositor_frame_ack.h @@ -21,6 +21,9 @@ class CC_EXPORT CompositorFrameAck { TransferableResourceArray resources; scoped_ptr<GLFrameData> gl_frame_data; TransportDIB::Handle last_content_dib; + + private: + DISALLOW_COPY_AND_ASSIGN(CompositorFrameAck); }; } // namespace cc diff --git a/cc/output/delegated_frame_data.h b/cc/output/delegated_frame_data.h index 7402da1..f7b89bc 100644 --- a/cc/output/delegated_frame_data.h +++ b/cc/output/delegated_frame_data.h @@ -20,6 +20,9 @@ class CC_EXPORT DelegatedFrameData { TransferableResourceArray resource_list; ScopedPtrVector<RenderPass> render_pass_list; + + private: + DISALLOW_COPY_AND_ASSIGN(DelegatedFrameData); }; } // namespace cc diff --git a/cc/output/geometry_binding.h b/cc/output/geometry_binding.h index 74321aa..2318b27 100644 --- a/cc/output/geometry_binding.h +++ b/cc/output/geometry_binding.h @@ -5,6 +5,8 @@ #ifndef CC_OUTPUT_GEOMETRY_BINDING_H_ #define CC_OUTPUT_GEOMETRY_BINDING_H_ +#include "base/basictypes.h" + namespace gfx { class RectF; } namespace WebKit { class WebGraphicsContext3D; } @@ -31,6 +33,8 @@ class GeometryBinding { unsigned quad_vertices_vbo_; unsigned quad_elements_vbo_; + + DISALLOW_COPY_AND_ASSIGN(GeometryBinding); }; } // namespace cc diff --git a/cc/output/program_binding.h b/cc/output/program_binding.h index 213213e..0e5aa9e 100644 --- a/cc/output/program_binding.h +++ b/cc/output/program_binding.h @@ -41,6 +41,9 @@ class ProgramBindingBase { unsigned vertex_shader_id_; unsigned fragment_shader_id_; bool initialized_; + + private: + DISALLOW_COPY_AND_ASSIGN(ProgramBindingBase); }; template <class VertexShader, class FragmentShader> @@ -83,6 +86,8 @@ class ProgramBinding : public ProgramBindingBase { private: VertexShader vertex_shader_; FragmentShader fragment_shader_; + + DISALLOW_COPY_AND_ASSIGN(ProgramBinding); }; } // namespace cc diff --git a/cc/output/render_surface_filters.h b/cc/output/render_surface_filters.h index 62dde8e3..e13c11c 100644 --- a/cc/output/render_surface_filters.h +++ b/cc/output/render_surface_filters.h @@ -6,6 +6,7 @@ #ifndef CC_OUTPUT_RENDER_SURFACE_FILTERS_H_ #define CC_OUTPUT_RENDER_SURFACE_FILTERS_H_ +#include "base/basictypes.h" #include "cc/base/cc_export.h" class GrContext; @@ -31,7 +32,7 @@ class CC_EXPORT RenderSurfaceFilters { const WebKit::WebFilterOperations& filters); private: - RenderSurfaceFilters(); + DISALLOW_IMPLICIT_CONSTRUCTORS(RenderSurfaceFilters); }; } diff --git a/cc/output/shader.cc b/cc/output/shader.cc index 428e125..d70352f 100644 --- a/cc/output/shader.cc +++ b/cc/output/shader.cc @@ -443,6 +443,9 @@ void FragmentTexOpaqueBinding::Init(WebGraphicsContext3D* context, DCHECK(sampler_location_ != -1); } +FragmentShaderOESImageExternal::FragmentShaderOESImageExternal() + : sampler_location_(-1) {} + bool FragmentShaderOESImageExternal::Init(WebGraphicsContext3D* context, unsigned program, bool using_bind_uniform, diff --git a/cc/output/shader.h b/cc/output/shader.h index fb8d658..3772a87 100644 --- a/cc/output/shader.h +++ b/cc/output/shader.h @@ -6,6 +6,8 @@ #define CC_OUTPUT_SHADER_H_ #include <string> + +#include "base/basictypes.h" #include "third_party/skia/include/core/SkColorPriv.h" namespace WebKit { @@ -28,6 +30,8 @@ class VertexShaderPosTex { private: int matrix_location_; + + DISALLOW_COPY_AND_ASSIGN(VertexShaderPosTex); }; class VertexShaderPosTexYUVStretch { @@ -46,6 +50,8 @@ class VertexShaderPosTexYUVStretch { private: int matrix_location_; int tex_scale_location_; + + DISALLOW_COPY_AND_ASSIGN(VertexShaderPosTexYUVStretch); }; class VertexShaderPos { @@ -62,6 +68,8 @@ class VertexShaderPos { private: int matrix_location_; + + DISALLOW_COPY_AND_ASSIGN(VertexShaderPos); }; class VertexShaderPosTexIdentity { @@ -91,6 +99,8 @@ class VertexShaderPosTexTransform { int matrix_location_; int tex_transform_location_; int vertex_opacity_location_; + + DISALLOW_COPY_AND_ASSIGN(VertexShaderPosTexTransform); }; class VertexShaderPosTexTransformFlip : public VertexShaderPosTexTransform { @@ -116,6 +126,8 @@ class VertexShaderQuad { int matrix_location_; int point_location_; int tex_scale_location_; + + DISALLOW_COPY_AND_ASSIGN(VertexShaderQuad); }; class VertexShaderTile { @@ -138,6 +150,8 @@ class VertexShaderTile { int matrix_location_; int point_location_; int vertex_tex_transform_location_; + + DISALLOW_COPY_AND_ASSIGN(VertexShaderTile); }; class VertexShaderVideoTransform { @@ -156,6 +170,8 @@ class VertexShaderVideoTransform { private: int matrix_location_; int tex_matrix_location_; + + DISALLOW_COPY_AND_ASSIGN(VertexShaderVideoTransform); }; class FragmentTexAlphaBinding { @@ -174,6 +190,8 @@ class FragmentTexAlphaBinding { private: int sampler_location_; int alpha_location_; + + DISALLOW_COPY_AND_ASSIGN(FragmentTexAlphaBinding); }; class FragmentTexOpaqueBinding { @@ -191,6 +209,8 @@ class FragmentTexOpaqueBinding { private: int sampler_location_; + + DISALLOW_COPY_AND_ASSIGN(FragmentTexOpaqueBinding); }; class FragmentShaderRGBATexVaryingAlpha : public FragmentTexOpaqueBinding { @@ -233,6 +253,8 @@ class FragmentShaderRGBATexSwizzleOpaque : public FragmentTexOpaqueBinding { // Fragment shader for external textures. class FragmentShaderOESImageExternal : public FragmentTexAlphaBinding { public: + FragmentShaderOESImageExternal(); + std::string GetShaderString() const; bool Init(WebKit::WebGraphicsContext3D*, unsigned program, @@ -240,6 +262,8 @@ class FragmentShaderOESImageExternal : public FragmentTexAlphaBinding { int* base_uniform_index); private: int sampler_location_; + + DISALLOW_COPY_AND_ASSIGN(FragmentShaderOESImageExternal); }; class FragmentShaderRGBATexAlphaAA { @@ -260,6 +284,8 @@ class FragmentShaderRGBATexAlphaAA { int sampler_location_; int alpha_location_; int edge_location_; + + DISALLOW_COPY_AND_ASSIGN(FragmentShaderRGBATexAlphaAA); }; class FragmentTexClampAlphaAABinding { @@ -282,6 +308,8 @@ class FragmentTexClampAlphaAABinding { int alpha_location_; int fragment_tex_transform_location_; int edge_location_; + + DISALLOW_COPY_AND_ASSIGN(FragmentTexClampAlphaAABinding); }; class FragmentShaderRGBATexClampAlphaAA : @@ -322,6 +350,8 @@ class FragmentShaderRGBATexAlphaMask { int alpha_location_; int mask_tex_coord_scale_location_; int mask_tex_coord_offset_location_; + + DISALLOW_COPY_AND_ASSIGN(FragmentShaderRGBATexAlphaMask); }; class FragmentShaderRGBATexAlphaMaskAA { @@ -351,6 +381,8 @@ class FragmentShaderRGBATexAlphaMaskAA { int edge_location_; int mask_tex_coord_scale_location_; int mask_tex_coord_offset_location_; + + DISALLOW_COPY_AND_ASSIGN(FragmentShaderRGBATexAlphaMaskAA); }; class FragmentShaderYUVVideo { @@ -376,6 +408,8 @@ class FragmentShaderYUVVideo { int alpha_location_; int yuv_matrix_location_; int yuv_adj_location_; + + DISALLOW_COPY_AND_ASSIGN(FragmentShaderYUVVideo); }; class FragmentShaderColor { @@ -392,6 +426,8 @@ class FragmentShaderColor { private: int color_location_; + + DISALLOW_COPY_AND_ASSIGN(FragmentShaderColor); }; class FragmentShaderColorAA { @@ -409,6 +445,8 @@ class FragmentShaderColorAA { private: int edge_location_; int color_location_; + + DISALLOW_COPY_AND_ASSIGN(FragmentShaderColorAA); }; class FragmentShaderCheckerboard { @@ -430,6 +468,8 @@ class FragmentShaderCheckerboard { int tex_transform_location_; int frequency_location_; int color_location_; + + DISALLOW_COPY_AND_ASSIGN(FragmentShaderCheckerboard); }; } // namespace cc diff --git a/cc/resources/picture_layer_tiling.h b/cc/resources/picture_layer_tiling.h index bc61321..a2423e9 100644 --- a/cc/resources/picture_layer_tiling.h +++ b/cc/resources/picture_layer_tiling.h @@ -168,6 +168,9 @@ class CC_EXPORT PictureLayerTiling { double last_impl_frame_time_; friend class Iterator; + + private: + DISALLOW_ASSIGN(PictureLayerTiling); }; } // namespace cc diff --git a/cc/resources/picture_layer_tiling_set.h b/cc/resources/picture_layer_tiling_set.h index 901bb9b..44b1585 100644 --- a/cc/resources/picture_layer_tiling_set.h +++ b/cc/resources/picture_layer_tiling_set.h @@ -118,6 +118,7 @@ class CC_EXPORT PictureLayerTilingSet { ScopedPtrVector<PictureLayerTiling> tilings_; friend class Iterator; + DISALLOW_COPY_AND_ASSIGN(PictureLayerTilingSet); }; } // namespace cc diff --git a/cc/resources/platform_color.h b/cc/resources/platform_color.h index f1b1cc6..a144471 100644 --- a/cc/resources/platform_color.h +++ b/cc/resources/platform_color.h @@ -5,6 +5,7 @@ #ifndef CC_RESOURCES_PLATFORM_COLOR_H_ #define CC_RESOURCES_PLATFORM_COLOR_H_ +#include "base/basictypes.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h" #include "third_party/khronos/GLES2/gl2.h" #include "third_party/khronos/GLES2/gl2ext.h" @@ -54,6 +55,9 @@ class PlatformColor { return false; } } + + private: + DISALLOW_IMPLICIT_CONSTRUCTORS(PlatformColor); }; } // namespace cc diff --git a/cc/resources/priority_calculator.h b/cc/resources/priority_calculator.h index 2c940d8..8778961 100644 --- a/cc/resources/priority_calculator.h +++ b/cc/resources/priority_calculator.h @@ -5,6 +5,7 @@ #ifndef CC_RESOURCES_PRIORITY_CALCULATOR_H_ #define CC_RESOURCES_PRIORITY_CALCULATOR_H_ +#include "base/basictypes.h" #include "cc/base/cc_export.h" namespace gfx { class Rect; } @@ -13,6 +14,8 @@ namespace cc { class CC_EXPORT PriorityCalculator { public: + PriorityCalculator() {} + static int UIPriority(bool draws_to_root_surface); static int VisiblePriority(bool draws_to_root_surface); static int RenderSurfacePriority(); @@ -34,6 +37,9 @@ class CC_EXPORT PriorityCalculator { static int AllowVisibleOnlyCutoff(); static int AllowVisibleAndNearbyCutoff(); static int AllowEverythingCutoff(); + + private: + DISALLOW_COPY_AND_ASSIGN(PriorityCalculator); }; } // namespace cc diff --git a/cc/resources/resource.h b/cc/resources/resource.h index dd4ff76..8010722 100644 --- a/cc/resources/resource.h +++ b/cc/resources/resource.h @@ -37,6 +37,8 @@ class CC_EXPORT Resource { ResourceProvider::ResourceId id_; gfx::Size size_; GLenum format_; + + DISALLOW_COPY_AND_ASSIGN(Resource); }; } // namespace cc diff --git a/cc/resources/tile.h b/cc/resources/tile.h index 40acb5b..8d47da7 100644 --- a/cc/resources/tile.h +++ b/cc/resources/tile.h @@ -95,6 +95,8 @@ class CC_EXPORT Tile : public base::RefCounted<Tile> { TilePriority priority_[NUM_BIN_PRIORITIES]; ManagedTileState managed_state_; int layer_id_; + + DISALLOW_COPY_AND_ASSIGN(Tile); }; } // namespace cc diff --git a/cc/trees/proxy.h b/cc/trees/proxy.h index 51ae7de..824cd06 100644 --- a/cc/trees/proxy.h +++ b/cc/trees/proxy.h @@ -135,12 +135,15 @@ class DebugScopedSetMainThreadBlocked { } private: Proxy* proxy_; + DISALLOW_COPY_AND_ASSIGN(DebugScopedSetMainThreadBlocked); }; #else class DebugScopedSetMainThreadBlocked { public: explicit DebugScopedSetMainThreadBlocked(Proxy* proxy) {} ~DebugScopedSetMainThreadBlocked() {} + private: + DISALLOW_COPY_AND_ASSIGN(DebugScopedSetMainThreadBlocked); }; #endif diff --git a/cc/trees/thread_proxy.h b/cc/trees/thread_proxy.h index 23a3348..5d6837c 100644 --- a/cc/trees/thread_proxy.h +++ b/cc/trees/thread_proxy.h @@ -256,6 +256,8 @@ class ThreadProxy : public Proxy, base::TimeTicks smoothness_takes_priority_expiration_time_; bool renew_tree_priority_on_impl_thread_pending_; + + DISALLOW_COPY_AND_ASSIGN(ThreadProxy); }; } // namespace cc |