From 6aaeb2eea626993638a204284e61bfc2916f9804 Mon Sep 17 00:00:00 2001 From: vmpstr Date: Wed, 24 Feb 2016 17:55:38 -0800 Subject: cc: Add out-of-line copy ctors for complex classes. This patch adds out of line copy constructors for classes that our clang-plugin considers heavy. This is an effort to enable copy constructor checks by default. BUG=436357 R=enne@chromium.org, dcheng@chromium.org, thakis@chromium.org CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel Review URL: https://codereview.chromium.org/1732573002 Cr-Commit-Position: refs/heads/master@{#377462} --- cc/animation/animation_events.cc | 2 ++ cc/animation/animation_events.h | 1 + cc/debug/layer_tree_debug_state.cc | 3 +++ cc/debug/layer_tree_debug_state.h | 1 + cc/debug/rendering_stats.cc | 5 +++++ cc/debug/rendering_stats.h | 2 ++ cc/input/scroll_state.cc | 2 ++ cc/input/scroll_state.h | 1 + cc/input/scroll_state_data.cc | 2 ++ cc/input/scroll_state_data.h | 1 + cc/output/ca_layer_overlay.cc | 2 ++ cc/output/ca_layer_overlay.h | 1 + cc/output/compositor_frame_metadata.cc | 3 +++ cc/output/compositor_frame_metadata.h | 1 + cc/output/overlay_candidate.cc | 2 ++ cc/output/overlay_candidate.h | 1 + cc/output/renderer_settings.cc | 2 ++ cc/output/renderer_settings.h | 1 + cc/quads/draw_quad.cc | 2 ++ cc/quads/draw_quad.h | 1 + cc/quads/picture_draw_quad.cc | 2 ++ cc/quads/picture_draw_quad.h | 1 + cc/quads/render_pass_draw_quad.cc | 3 +++ cc/quads/render_pass_draw_quad.h | 1 + cc/quads/texture_draw_quad.cc | 2 ++ cc/quads/texture_draw_quad.h | 1 + cc/quads/yuv_video_draw_quad.cc | 3 +++ cc/quads/yuv_video_draw_quad.h | 1 + cc/raster/task_graph_runner.cc | 2 ++ cc/raster/task_graph_runner.h | 1 + cc/raster/task_graph_work_queue.cc | 3 +++ cc/raster/task_graph_work_queue.h | 1 + cc/resources/resource_provider.cc | 4 ++++ cc/resources/resource_provider.h | 2 ++ cc/resources/transferable_resource.cc | 3 +++ cc/resources/transferable_resource.h | 1 + cc/resources/ui_resource_bitmap.cc | 2 ++ cc/resources/ui_resource_bitmap.h | 1 + cc/resources/video_resource_updater.cc | 6 ++++++ cc/resources/video_resource_updater.h | 2 ++ cc/test/fake_content_layer_client.cc | 2 ++ cc/test/fake_content_layer_client.h | 1 + cc/trees/layer_tree_settings.cc | 2 ++ cc/trees/layer_tree_settings.h | 1 + cc/trees/property_tree.cc | 10 ++++++++++ cc/trees/property_tree.h | 5 +++++ 46 files changed, 99 insertions(+) diff --git a/cc/animation/animation_events.cc b/cc/animation/animation_events.cc index bb4cbb2..bdf6592 100644 --- a/cc/animation/animation_events.cc +++ b/cc/animation/animation_events.cc @@ -20,6 +20,8 @@ AnimationEvent::AnimationEvent(AnimationEvent::Type type, opacity(0.f) { } +AnimationEvent::AnimationEvent(const AnimationEvent& other) = default; + AnimationEvents::AnimationEvents() {} AnimationEvents::~AnimationEvents() {} diff --git a/cc/animation/animation_events.h b/cc/animation/animation_events.h index 63645ec..b65a678 100644 --- a/cc/animation/animation_events.h +++ b/cc/animation/animation_events.h @@ -22,6 +22,7 @@ struct CC_EXPORT AnimationEvent { int group_id, Animation::TargetProperty target_property, base::TimeTicks monotonic_time); + AnimationEvent(const AnimationEvent& other); Type type; int layer_id; diff --git a/cc/debug/layer_tree_debug_state.cc b/cc/debug/layer_tree_debug_state.cc index a7ea1d6..3779dcc 100644 --- a/cc/debug/layer_tree_debug_state.cc +++ b/cc/debug/layer_tree_debug_state.cc @@ -28,6 +28,9 @@ LayerTreeDebugState::LayerTreeDebugState() show_picture_borders(false), record_rendering_stats_(false) {} +LayerTreeDebugState::LayerTreeDebugState(const LayerTreeDebugState& other) = + default; + LayerTreeDebugState::~LayerTreeDebugState() {} void LayerTreeDebugState::SetRecordRenderingStats(bool enabled) { diff --git a/cc/debug/layer_tree_debug_state.h b/cc/debug/layer_tree_debug_state.h index 3b5ba3a..0e40d13 100644 --- a/cc/debug/layer_tree_debug_state.h +++ b/cc/debug/layer_tree_debug_state.h @@ -16,6 +16,7 @@ class LayerTreeDebugState; class CC_EXPORT LayerTreeDebugState { public: LayerTreeDebugState(); + LayerTreeDebugState(const LayerTreeDebugState& other); ~LayerTreeDebugState(); bool show_fps_counter; diff --git a/cc/debug/rendering_stats.cc b/cc/debug/rendering_stats.cc index a3d7a43..b78b4f9 100644 --- a/cc/debug/rendering_stats.cc +++ b/cc/debug/rendering_stats.cc @@ -9,6 +9,9 @@ namespace cc { RenderingStats::TimeDeltaList::TimeDeltaList() { } +RenderingStats::TimeDeltaList::TimeDeltaList(const TimeDeltaList& other) = + default; + RenderingStats::TimeDeltaList::~TimeDeltaList() { } @@ -42,6 +45,8 @@ RenderingStats::RenderingStats() checkerboarded_no_recording_content_area(0), checkerboarded_needs_raster_content_area(0) {} +RenderingStats::RenderingStats(const RenderingStats& other) = default; + RenderingStats::~RenderingStats() { } diff --git a/cc/debug/rendering_stats.h b/cc/debug/rendering_stats.h index f296447..d6d4478 100644 --- a/cc/debug/rendering_stats.h +++ b/cc/debug/rendering_stats.h @@ -22,6 +22,7 @@ struct CC_EXPORT RenderingStats { class CC_EXPORT TimeDeltaList { public: TimeDeltaList(); + TimeDeltaList(const TimeDeltaList& other); ~TimeDeltaList(); void Append(base::TimeDelta value); @@ -37,6 +38,7 @@ struct CC_EXPORT RenderingStats { }; RenderingStats(); + RenderingStats(const RenderingStats& other); ~RenderingStats(); // Note: when adding new members, please remember to update Add in diff --git a/cc/input/scroll_state.cc b/cc/input/scroll_state.cc index 6c67025..aa0baf1 100644 --- a/cc/input/scroll_state.cc +++ b/cc/input/scroll_state.cc @@ -12,6 +12,8 @@ namespace cc { ScrollState::ScrollState(ScrollStateData data) : data_(data) {} +ScrollState::ScrollState(const ScrollState& other) = default; + ScrollState::~ScrollState() {} void ScrollState::ConsumeDelta(double x, double y) { diff --git a/cc/input/scroll_state.h b/cc/input/scroll_state.h index 7a8761f..35a4f97 100644 --- a/cc/input/scroll_state.h +++ b/cc/input/scroll_state.h @@ -22,6 +22,7 @@ class LayerTreeImpl; class CC_EXPORT ScrollState { public: explicit ScrollState(ScrollStateData data); + ScrollState(const ScrollState& other); ~ScrollState(); // Reduce deltas by x, y. diff --git a/cc/input/scroll_state_data.cc b/cc/input/scroll_state_data.cc index 47f2f653..50e1269 100644 --- a/cc/input/scroll_state_data.cc +++ b/cc/input/scroll_state_data.cc @@ -26,6 +26,8 @@ ScrollStateData::ScrollStateData() current_native_scrolling_node_(nullptr), current_native_scrolling_element_(0) {} +ScrollStateData::ScrollStateData(const ScrollStateData& other) = default; + ScrollNode* ScrollStateData::current_native_scrolling_node() const { return current_native_scrolling_node_; } diff --git a/cc/input/scroll_state_data.h b/cc/input/scroll_state_data.h index 27fb787..63fbe43 100644 --- a/cc/input/scroll_state_data.h +++ b/cc/input/scroll_state_data.h @@ -17,6 +17,7 @@ namespace cc { class CC_EXPORT ScrollStateData { public: ScrollStateData(); + ScrollStateData(const ScrollStateData& other); // Scroll delta in viewport coordinates (DIP). double delta_x; diff --git a/cc/output/ca_layer_overlay.cc b/cc/output/ca_layer_overlay.cc index 2a0d84c..2dd2353 100644 --- a/cc/output/ca_layer_overlay.cc +++ b/cc/output/ca_layer_overlay.cc @@ -193,6 +193,8 @@ CALayerResult FromDrawQuad(ResourceProvider* resource_provider, CALayerOverlay::CALayerOverlay() {} +CALayerOverlay::CALayerOverlay(const CALayerOverlay& other) = default; + CALayerOverlay::~CALayerOverlay() {} bool ProcessForCALayerOverlays(ResourceProvider* resource_provider, diff --git a/cc/output/ca_layer_overlay.h b/cc/output/ca_layer_overlay.h index f0b7c22..00a4039 100644 --- a/cc/output/ca_layer_overlay.h +++ b/cc/output/ca_layer_overlay.h @@ -18,6 +18,7 @@ class ResourceProvider; class CC_EXPORT CALayerOverlay { public: CALayerOverlay(); + CALayerOverlay(const CALayerOverlay& other); ~CALayerOverlay(); // If |is_clipped| is true, then clip to |clip_rect| in the target space. diff --git a/cc/output/compositor_frame_metadata.cc b/cc/output/compositor_frame_metadata.cc index b3a9b2d..d77cca00 100644 --- a/cc/output/compositor_frame_metadata.cc +++ b/cc/output/compositor_frame_metadata.cc @@ -15,6 +15,9 @@ CompositorFrameMetadata::CompositorFrameMetadata() root_overflow_y_hidden(false), root_background_color(SK_ColorWHITE) {} +CompositorFrameMetadata::CompositorFrameMetadata( + const CompositorFrameMetadata& other) = default; + CompositorFrameMetadata::~CompositorFrameMetadata() { } diff --git a/cc/output/compositor_frame_metadata.h b/cc/output/compositor_frame_metadata.h index ad3cdd8..54b2047 100644 --- a/cc/output/compositor_frame_metadata.h +++ b/cc/output/compositor_frame_metadata.h @@ -22,6 +22,7 @@ namespace cc { class CC_EXPORT CompositorFrameMetadata { public: CompositorFrameMetadata(); + CompositorFrameMetadata(const CompositorFrameMetadata& other); ~CompositorFrameMetadata(); // The device scale factor used to generate this compositor frame. diff --git a/cc/output/overlay_candidate.cc b/cc/output/overlay_candidate.cc index 367f316..1a734ce 100644 --- a/cc/output/overlay_candidate.cc +++ b/cc/output/overlay_candidate.cc @@ -178,6 +178,8 @@ OverlayCandidate::OverlayCandidate() is_unoccluded(false), overlay_handled(false) {} +OverlayCandidate::OverlayCandidate(const OverlayCandidate& other) = default; + OverlayCandidate::~OverlayCandidate() {} // static diff --git a/cc/output/overlay_candidate.h b/cc/output/overlay_candidate.h index 1a73561..adf837e 100644 --- a/cc/output/overlay_candidate.h +++ b/cc/output/overlay_candidate.h @@ -46,6 +46,7 @@ class CC_EXPORT OverlayCandidate { QuadList::ConstIterator quad_list_end); OverlayCandidate(); + OverlayCandidate(const OverlayCandidate& other); ~OverlayCandidate(); // Transformation to apply to layer during composition. diff --git a/cc/output/renderer_settings.cc b/cc/output/renderer_settings.cc index c0927cc..b5d8e76 100644 --- a/cc/output/renderer_settings.cc +++ b/cc/output/renderer_settings.cc @@ -27,6 +27,8 @@ RendererSettings::RendererSettings() use_gpu_memory_buffer_resources(false), preferred_tile_format(PlatformColor::BestTextureFormat()) {} +RendererSettings::RendererSettings(const RendererSettings& other) = default; + RendererSettings::~RendererSettings() { } diff --git a/cc/output/renderer_settings.h b/cc/output/renderer_settings.h index 5aeaee6..e8cbd77 100644 --- a/cc/output/renderer_settings.h +++ b/cc/output/renderer_settings.h @@ -19,6 +19,7 @@ class RendererSettings; class CC_EXPORT RendererSettings { public: RendererSettings(); + RendererSettings(const RendererSettings& other); ~RendererSettings(); bool allow_antialiasing; diff --git a/cc/quads/draw_quad.cc b/cc/quads/draw_quad.cc index 9bf17f2..e5d0e14 100644 --- a/cc/quads/draw_quad.cc +++ b/cc/quads/draw_quad.cc @@ -29,6 +29,8 @@ DrawQuad::DrawQuad() : material(INVALID), needs_blending(false), shared_quad_state(0) { } +DrawQuad::DrawQuad(const DrawQuad& other) = default; + void DrawQuad::SetAll(const SharedQuadState* shared_quad_state, Material material, const gfx::Rect& rect, diff --git a/cc/quads/draw_quad.h b/cc/quads/draw_quad.h index 8cf0eee..4b6ae59 100644 --- a/cc/quads/draw_quad.h +++ b/cc/quads/draw_quad.h @@ -50,6 +50,7 @@ class CC_EXPORT DrawQuad { MATERIAL_LAST = YUV_VIDEO_CONTENT }; + DrawQuad(const DrawQuad& other); virtual ~DrawQuad(); Material material; diff --git a/cc/quads/picture_draw_quad.cc b/cc/quads/picture_draw_quad.cc index a1cf96a..bc528d0 100644 --- a/cc/quads/picture_draw_quad.cc +++ b/cc/quads/picture_draw_quad.cc @@ -14,6 +14,8 @@ namespace cc { PictureDrawQuad::PictureDrawQuad() { } +PictureDrawQuad::PictureDrawQuad(const PictureDrawQuad& other) = default; + PictureDrawQuad::~PictureDrawQuad() { } diff --git a/cc/quads/picture_draw_quad.h b/cc/quads/picture_draw_quad.h index 93140eb..66ee776 100644 --- a/cc/quads/picture_draw_quad.h +++ b/cc/quads/picture_draw_quad.h @@ -21,6 +21,7 @@ namespace cc { class CC_EXPORT PictureDrawQuad : public ContentDrawQuadBase { public: PictureDrawQuad(); + PictureDrawQuad(const PictureDrawQuad& other); ~PictureDrawQuad() override; void SetNew(const SharedQuadState* shared_quad_state, diff --git a/cc/quads/render_pass_draw_quad.cc b/cc/quads/render_pass_draw_quad.cc index a346691..3832a02 100644 --- a/cc/quads/render_pass_draw_quad.cc +++ b/cc/quads/render_pass_draw_quad.cc @@ -15,6 +15,9 @@ namespace cc { RenderPassDrawQuad::RenderPassDrawQuad() { } +RenderPassDrawQuad::RenderPassDrawQuad(const RenderPassDrawQuad& other) = + default; + RenderPassDrawQuad::~RenderPassDrawQuad() { } diff --git a/cc/quads/render_pass_draw_quad.h b/cc/quads/render_pass_draw_quad.h index 08e0cc0..2591ac8 100644 --- a/cc/quads/render_pass_draw_quad.h +++ b/cc/quads/render_pass_draw_quad.h @@ -19,6 +19,7 @@ namespace cc { class CC_EXPORT RenderPassDrawQuad : public DrawQuad { public: RenderPassDrawQuad(); + RenderPassDrawQuad(const RenderPassDrawQuad& other); ~RenderPassDrawQuad() override; void SetNew(const SharedQuadState* shared_quad_state, diff --git a/cc/quads/texture_draw_quad.cc b/cc/quads/texture_draw_quad.cc index 46f6be4..6d4c64e 100644 --- a/cc/quads/texture_draw_quad.cc +++ b/cc/quads/texture_draw_quad.cc @@ -25,6 +25,8 @@ TextureDrawQuad::TextureDrawQuad() this->vertex_opacity[3] = 0.f; } +TextureDrawQuad::TextureDrawQuad(const TextureDrawQuad& other) = default; + void TextureDrawQuad::SetNew(const SharedQuadState* shared_quad_state, const gfx::Rect& rect, const gfx::Rect& opaque_rect, diff --git a/cc/quads/texture_draw_quad.h b/cc/quads/texture_draw_quad.h index 2ba5b9d..5ec060e 100644 --- a/cc/quads/texture_draw_quad.h +++ b/cc/quads/texture_draw_quad.h @@ -17,6 +17,7 @@ namespace cc { class CC_EXPORT TextureDrawQuad : public DrawQuad { public: TextureDrawQuad(); + TextureDrawQuad(const TextureDrawQuad& other); void SetNew(const SharedQuadState* shared_quad_state, const gfx::Rect& rect, diff --git a/cc/quads/yuv_video_draw_quad.cc b/cc/quads/yuv_video_draw_quad.cc index 93a0c91..b502971 100644 --- a/cc/quads/yuv_video_draw_quad.cc +++ b/cc/quads/yuv_video_draw_quad.cc @@ -13,6 +13,9 @@ namespace cc { YUVVideoDrawQuad::YUVVideoDrawQuad() { } + +YUVVideoDrawQuad::YUVVideoDrawQuad(const YUVVideoDrawQuad& other) = default; + YUVVideoDrawQuad::~YUVVideoDrawQuad() {} void YUVVideoDrawQuad::SetNew(const SharedQuadState* shared_quad_state, diff --git a/cc/quads/yuv_video_draw_quad.h b/cc/quads/yuv_video_draw_quad.h index 015d5b7..7193377 100644 --- a/cc/quads/yuv_video_draw_quad.h +++ b/cc/quads/yuv_video_draw_quad.h @@ -27,6 +27,7 @@ class CC_EXPORT YUVVideoDrawQuad : public DrawQuad { ~YUVVideoDrawQuad() override; YUVVideoDrawQuad(); + YUVVideoDrawQuad(const YUVVideoDrawQuad& other); void SetNew(const SharedQuadState* shared_quad_state, const gfx::Rect& rect, diff --git a/cc/raster/task_graph_runner.cc b/cc/raster/task_graph_runner.cc index ad5aaff..4f1af43 100644 --- a/cc/raster/task_graph_runner.cc +++ b/cc/raster/task_graph_runner.cc @@ -37,6 +37,8 @@ bool Task::HasFinishedRunning() const { TaskGraph::TaskGraph() {} +TaskGraph::TaskGraph(const TaskGraph& other) = default; + TaskGraph::~TaskGraph() {} void TaskGraph::Swap(TaskGraph* other) { diff --git a/cc/raster/task_graph_runner.h b/cc/raster/task_graph_runner.h index 4b3c664..23094ef 100644 --- a/cc/raster/task_graph_runner.h +++ b/cc/raster/task_graph_runner.h @@ -85,6 +85,7 @@ struct CC_EXPORT TaskGraph { }; TaskGraph(); + TaskGraph(const TaskGraph& other); ~TaskGraph(); void Swap(TaskGraph* other); diff --git a/cc/raster/task_graph_work_queue.cc b/cc/raster/task_graph_work_queue.cc index f4368e1..98413ee 100644 --- a/cc/raster/task_graph_work_queue.cc +++ b/cc/raster/task_graph_work_queue.cc @@ -47,6 +47,9 @@ class CompareTaskNamespacePriority { TaskGraphWorkQueue::TaskNamespace::TaskNamespace() {} +TaskGraphWorkQueue::TaskNamespace::TaskNamespace(const TaskNamespace& other) = + default; + TaskGraphWorkQueue::TaskNamespace::~TaskNamespace() {} TaskGraphWorkQueue::TaskGraphWorkQueue() : next_namespace_id_(1) {} diff --git a/cc/raster/task_graph_work_queue.h b/cc/raster/task_graph_work_queue.h index 7fbd19b..0c82f67 100644 --- a/cc/raster/task_graph_work_queue.h +++ b/cc/raster/task_graph_work_queue.h @@ -53,6 +53,7 @@ class CC_EXPORT TaskGraphWorkQueue { typedef std::vector Vector; TaskNamespace(); + TaskNamespace(const TaskNamespace& other); ~TaskNamespace(); // Current task graph. diff --git a/cc/resources/resource_provider.cc b/cc/resources/resource_provider.cc index 2878e30..d7fcee7 100644 --- a/cc/resources/resource_provider.cc +++ b/cc/resources/resource_provider.cc @@ -321,6 +321,8 @@ ResourceProvider::Resource::Resource(const SharedBitmapId& bitmap_id, shared_bitmap(NULL), gpu_memory_buffer(NULL) {} +ResourceProvider::Resource::Resource(const Resource& other) = default; + void ResourceProvider::Resource::set_mailbox(const TextureMailbox& mailbox) { mailbox_ = mailbox; if (IsGpuResourceType(type)) { @@ -375,6 +377,8 @@ void ResourceProvider::Resource::WaitSyncToken(gpu::gles2::GLES2Interface* gl) { ResourceProvider::Child::Child() : marked_for_deletion(false), needs_sync_tokens(true) {} +ResourceProvider::Child::Child(const Child& other) = default; + ResourceProvider::Child::~Child() {} scoped_ptr ResourceProvider::Create( diff --git a/cc/resources/resource_provider.h b/cc/resources/resource_provider.h index a033967..0b0caf0 100644 --- a/cc/resources/resource_provider.h +++ b/cc/resources/resource_provider.h @@ -518,6 +518,7 @@ class CC_EXPORT ResourceProvider const gfx::Size& size, Origin origin, GLenum filter); + Resource(const Resource& other); bool needs_sync_token() const { return needs_sync_token_; } @@ -580,6 +581,7 @@ class CC_EXPORT ResourceProvider struct Child { Child(); + Child(const Child& other); ~Child(); ResourceIdMap child_to_parent_map; diff --git a/cc/resources/transferable_resource.cc b/cc/resources/transferable_resource.cc index af65ff6..cf463bf 100644 --- a/cc/resources/transferable_resource.cc +++ b/cc/resources/transferable_resource.cc @@ -15,6 +15,9 @@ TransferableResource::TransferableResource() is_software(false), is_overlay_candidate(false) {} +TransferableResource::TransferableResource(const TransferableResource& other) = + default; + TransferableResource::~TransferableResource() { } diff --git a/cc/resources/transferable_resource.h b/cc/resources/transferable_resource.h index 55d2216..ea63441 100644 --- a/cc/resources/transferable_resource.h +++ b/cc/resources/transferable_resource.h @@ -24,6 +24,7 @@ typedef std::vector TransferableResourceArray; struct CC_EXPORT TransferableResource { TransferableResource(); + TransferableResource(const TransferableResource& other); ~TransferableResource(); ReturnedResource ToReturnedResource() const; diff --git a/cc/resources/ui_resource_bitmap.cc b/cc/resources/ui_resource_bitmap.cc index b8fbf31..3acc6dc 100644 --- a/cc/resources/ui_resource_bitmap.cc +++ b/cc/resources/ui_resource_bitmap.cc @@ -77,6 +77,8 @@ UIResourceBitmap::UIResourceBitmap(const skia::RefPtr& pixel_ref, Create(pixel_ref, size, UIResourceBitmap::ETC1); } +UIResourceBitmap::UIResourceBitmap(const UIResourceBitmap& other) = default; + UIResourceBitmap::~UIResourceBitmap() {} AutoLockUIResourceBitmap::AutoLockUIResourceBitmap( diff --git a/cc/resources/ui_resource_bitmap.h b/cc/resources/ui_resource_bitmap.h index 34e73ee..a90159f 100644 --- a/cc/resources/ui_resource_bitmap.h +++ b/cc/resources/ui_resource_bitmap.h @@ -43,6 +43,7 @@ class CC_EXPORT UIResourceBitmap { UIResourceBitmap(const gfx::Size& size, bool is_opaque); UIResourceBitmap(const skia::RefPtr& pixel_ref, const gfx::Size& size); + UIResourceBitmap(const UIResourceBitmap& other); ~UIResourceBitmap(); private: diff --git a/cc/resources/video_resource_updater.cc b/cc/resources/video_resource_updater.cc index e6827ee..46dbbc9 100644 --- a/cc/resources/video_resource_updater.cc +++ b/cc/resources/video_resource_updater.cc @@ -128,6 +128,9 @@ VideoResourceUpdater::PlaneResource::PlaneResource( plane_index(0u) { } +VideoResourceUpdater::PlaneResource::PlaneResource(const PlaneResource& other) = + default; + bool VideoResourceUpdater::PlaneResourceMatchesUniqueID( const PlaneResource& plane_resource, const media::VideoFrame* video_frame, @@ -152,6 +155,9 @@ VideoFrameExternalResources::VideoFrameExternalResources() offset(0.0f), multiplier(1.0f) {} +VideoFrameExternalResources::VideoFrameExternalResources( + const VideoFrameExternalResources& other) = default; + VideoFrameExternalResources::~VideoFrameExternalResources() {} VideoResourceUpdater::VideoResourceUpdater(ContextProvider* context_provider, diff --git a/cc/resources/video_resource_updater.h b/cc/resources/video_resource_updater.h index 4e11110..1307be9 100644 --- a/cc/resources/video_resource_updater.h +++ b/cc/resources/video_resource_updater.h @@ -69,6 +69,7 @@ class CC_EXPORT VideoFrameExternalResources { float multiplier; VideoFrameExternalResources(); + VideoFrameExternalResources(const VideoFrameExternalResources& other); ~VideoFrameExternalResources(); }; @@ -105,6 +106,7 @@ class CC_EXPORT VideoResourceUpdater const gfx::Size& resource_size, ResourceFormat resource_format, gpu::Mailbox mailbox); + PlaneResource(const PlaneResource& other); }; static bool PlaneResourceMatchesUniqueID(const PlaneResource& plane_resource, diff --git a/cc/test/fake_content_layer_client.cc b/cc/test/fake_content_layer_client.cc index 7876d29..88c4f80 100644 --- a/cc/test/fake_content_layer_client.cc +++ b/cc/test/fake_content_layer_client.cc @@ -27,6 +27,8 @@ FakeContentLayerClient::ImageData::ImageData(const SkImage* img, const SkPaint& paint) : image(skia::SharePtr(img)), transform(transform), paint(paint) {} +FakeContentLayerClient::ImageData::ImageData(const ImageData& other) = default; + FakeContentLayerClient::ImageData::~ImageData() {} FakeContentLayerClient::FakeContentLayerClient() diff --git a/cc/test/fake_content_layer_client.h b/cc/test/fake_content_layer_client.h index 5354833..198c414 100644 --- a/cc/test/fake_content_layer_client.h +++ b/cc/test/fake_content_layer_client.h @@ -30,6 +30,7 @@ class FakeContentLayerClient : public ContentLayerClient { ImageData(const SkImage* image, const gfx::Transform& transform, const SkPaint& paint); + ImageData(const ImageData& other); ~ImageData(); skia::RefPtr image; gfx::Point point; diff --git a/cc/trees/layer_tree_settings.cc b/cc/trees/layer_tree_settings.cc index 73a9eb3..40606ed 100644 --- a/cc/trees/layer_tree_settings.cc +++ b/cc/trees/layer_tree_settings.cc @@ -107,6 +107,8 @@ LayerTreeSettings::LayerTreeSettings() gpu::MemoryAllocation::CUTOFF_ALLOW_EVERYTHING, ManagedMemoryPolicy::kDefaultNumResourcesLimit) {} +LayerTreeSettings::LayerTreeSettings(const LayerTreeSettings& other) = default; + LayerTreeSettings::~LayerTreeSettings() {} bool LayerTreeSettings::operator==(const LayerTreeSettings& other) const { diff --git a/cc/trees/layer_tree_settings.h b/cc/trees/layer_tree_settings.h index dfad4a5..ed7615c 100644 --- a/cc/trees/layer_tree_settings.h +++ b/cc/trees/layer_tree_settings.h @@ -26,6 +26,7 @@ class LayerTreeSettings; class CC_EXPORT LayerTreeSettings { public: LayerTreeSettings(); + LayerTreeSettings(const LayerTreeSettings& other); virtual ~LayerTreeSettings(); bool operator==(const LayerTreeSettings& other) const; diff --git a/cc/trees/property_tree.cc b/cc/trees/property_tree.cc index a3c7e5b..31ebad1 100644 --- a/cc/trees/property_tree.cc +++ b/cc/trees/property_tree.cc @@ -65,6 +65,8 @@ TransformTree::TransformTree() device_scale_factor_(1.f), device_transform_scale_factor_(1.f) {} +TransformTree::TransformTree(const TransformTree& other) = default; + TransformTree::~TransformTree() { } @@ -152,6 +154,8 @@ TransformNodeData::TransformNodeData() combined_maximum_animation_target_scale(0.f), combined_starting_animation_scale(0.f) {} +TransformNodeData::TransformNodeData(const TransformNodeData& other) = default; + TransformNodeData::~TransformNodeData() { } @@ -364,6 +368,8 @@ ClipNodeData::ClipNodeData() layers_are_clipped_when_surfaces_disabled(false), resets_clip(false) {} +ClipNodeData::ClipNodeData(const ClipNodeData& other) = default; + bool ClipNodeData::operator==(const ClipNodeData& other) const { return clip == other.clip && combined_clip_in_target_space == other.combined_clip_in_target_space && @@ -433,6 +439,8 @@ EffectNodeData::EffectNodeData() transform_id(0), clip_id(0) {} +EffectNodeData::EffectNodeData(const EffectNodeData& other) = default; + bool EffectNodeData::operator==(const EffectNodeData& other) const { return opacity == other.opacity && screen_space_opacity == other.screen_space_opacity && @@ -490,6 +498,8 @@ ScrollNodeData::ScrollNodeData() element_id(0), transform_id(0) {} +ScrollNodeData::ScrollNodeData(const ScrollNodeData& other) = default; + bool ScrollNodeData::operator==(const ScrollNodeData& other) const { return scrollable == other.scrollable && main_thread_scrolling_reasons == other.main_thread_scrolling_reasons && diff --git a/cc/trees/property_tree.h b/cc/trees/property_tree.h index 4961fd7..9be6e0c 100644 --- a/cc/trees/property_tree.h +++ b/cc/trees/property_tree.h @@ -50,6 +50,7 @@ struct CC_EXPORT TreeNode { struct CC_EXPORT TransformNodeData { TransformNodeData(); + TransformNodeData(const TransformNodeData& other); ~TransformNodeData(); // The local transform information is combined to form to_parent (ignoring @@ -193,6 +194,7 @@ typedef TreeNode TransformNode; struct CC_EXPORT ClipNodeData { ClipNodeData(); + ClipNodeData(const ClipNodeData& other); // The clip rect that this node contributes, expressed in the space of its // transform node. @@ -246,6 +248,7 @@ typedef TreeNode ClipNode; struct CC_EXPORT EffectNodeData { EffectNodeData(); + EffectNodeData(const EffectNodeData& other); float opacity; float screen_space_opacity; @@ -269,6 +272,7 @@ typedef TreeNode EffectNode; struct CC_EXPORT ScrollNodeData { ScrollNodeData(); + ScrollNodeData(const ScrollNodeData& other); bool scrollable; uint32_t main_thread_scrolling_reasons; @@ -354,6 +358,7 @@ class CC_EXPORT PropertyTree { class CC_EXPORT TransformTree final : public PropertyTree { public: TransformTree(); + TransformTree(const TransformTree& other); ~TransformTree() override; bool operator==(const TransformTree& other) const; -- cgit v1.1