diff options
| author | vmpstr <vmpstr@chromium.org> | 2016-02-25 12:31:31 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-25 20:33:17 +0000 |
| commit | 0ae825e70b6ff80370b7815b51f911add3c22b73 (patch) | |
| tree | fcfbf775a98f544b3e3fa756d7aa9f0dea5f782a | |
| parent | 41917db43066c1aee50ad5fa9c1f773cc4697fc9 (diff) | |
| download | chromium_src-0ae825e70b6ff80370b7815b51f911add3c22b73.zip chromium_src-0ae825e70b6ff80370b7815b51f911add3c22b73.tar.gz chromium_src-0ae825e70b6ff80370b7815b51f911add3c22b73.tar.bz2 | |
ui: 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=sky@chromium.org, dcheng@chromium.org, thakis@chromium.org
Review URL: https://codereview.chromium.org/1730393002
Cr-Commit-Position: refs/heads/master@{#377657}
58 files changed, 99 insertions, 0 deletions
diff --git a/ui/accessibility/ax_node_data.cc b/ui/accessibility/ax_node_data.cc index 3738db14..5f9ffd3 100644 --- a/ui/accessibility/ax_node_data.cc +++ b/ui/accessibility/ax_node_data.cc @@ -62,6 +62,8 @@ AXNodeData::AXNodeData() state(0xFFFFFFFF) { } +AXNodeData::AXNodeData(const AXNodeData& other) = default; + AXNodeData::~AXNodeData() { } diff --git a/ui/accessibility/ax_node_data.h b/ui/accessibility/ax_node_data.h index 5bb8c14..51c2c5f 100644 --- a/ui/accessibility/ax_node_data.h +++ b/ui/accessibility/ax_node_data.h @@ -24,6 +24,7 @@ namespace ui { // one process to another. struct AX_EXPORT AXNodeData { AXNodeData(); + AXNodeData(const AXNodeData& other); virtual ~AXNodeData(); // Accessing accessibility attributes: diff --git a/ui/accessibility/ax_tree_data.cc b/ui/accessibility/ax_tree_data.cc index 5094c3b..ef7894f 100644 --- a/ui/accessibility/ax_tree_data.cc +++ b/ui/accessibility/ax_tree_data.cc @@ -28,6 +28,8 @@ AXTreeData::AXTreeData() sel_focus_offset(-1) { } +AXTreeData::AXTreeData(const AXTreeData& other) = default; + AXTreeData::~AXTreeData() { } diff --git a/ui/accessibility/ax_tree_data.h b/ui/accessibility/ax_tree_data.h index 25e0db3..2079dfc 100644 --- a/ui/accessibility/ax_tree_data.h +++ b/ui/accessibility/ax_tree_data.h @@ -23,6 +23,7 @@ namespace ui { // tree and not associated with any particular node in the tree. struct AX_EXPORT AXTreeData { AXTreeData(); + AXTreeData(const AXTreeData& other); virtual ~AXTreeData(); // Return a string representation of this data, for debugging. diff --git a/ui/app_list/app_list_view_delegate.cc b/ui/app_list/app_list_view_delegate.cc index 3b98e2c..7ec19b7 100644 --- a/ui/app_list/app_list_view_delegate.cc +++ b/ui/app_list/app_list_view_delegate.cc @@ -9,6 +9,8 @@ namespace app_list { AppListViewDelegate::User::User() : active(false) { } +AppListViewDelegate::User::User(const User& other) = default; + AppListViewDelegate::User::~User() {} } // app_list diff --git a/ui/app_list/app_list_view_delegate.h b/ui/app_list/app_list_view_delegate.h index 349b976..69462e78 100644 --- a/ui/app_list/app_list_view_delegate.h +++ b/ui/app_list/app_list_view_delegate.h @@ -41,6 +41,7 @@ class APP_LIST_EXPORT AppListViewDelegate { // A user of the app list. struct APP_LIST_EXPORT User { User(); + User(const User& other); ~User(); // Whether or not this user is the current user of the app list. diff --git a/ui/app_list/search/history_data.cc b/ui/app_list/search/history_data.cc index c2b9257..0183cc0 100644 --- a/ui/app_list/search/history_data.cc +++ b/ui/app_list/search/history_data.cc @@ -34,6 +34,7 @@ bool EntrySortByTimeAscending(const EntrySortData& entry1, HistoryData::Data::Data() { } +HistoryData::Data::Data(const Data& other) = default; HistoryData::Data::~Data() { } diff --git a/ui/app_list/search/history_data.h b/ui/app_list/search/history_data.h index dd2a0ad..7c5cc49 100644 --- a/ui/app_list/search/history_data.h +++ b/ui/app_list/search/history_data.h @@ -40,6 +40,7 @@ class APP_LIST_EXPORT HistoryData : public base::SupportsWeakPtr<HistoryData> { // Defines data to be associated with a query. struct APP_LIST_EXPORT Data { Data(); + Data(const Data& other); ~Data(); // Primary result associated with the query. diff --git a/ui/app_list/search_result.cc b/ui/app_list/search_result.cc index f1abf58..7f64be1 100644 --- a/ui/app_list/search_result.cc +++ b/ui/app_list/search_result.cc @@ -27,6 +27,8 @@ SearchResult::Action::Action(const base::string16& label_text, : tooltip_text(tooltip_text), label_text(label_text) {} +SearchResult::Action::Action(const Action& other) = default; + SearchResult::Action::~Action() {} SearchResult::SearchResult() diff --git a/ui/app_list/search_result.h b/ui/app_list/search_result.h index 130e30c..870a397 100644 --- a/ui/app_list/search_result.h +++ b/ui/app_list/search_result.h @@ -75,6 +75,7 @@ class APP_LIST_EXPORT SearchResult { const base::string16& tooltip_text); Action(const base::string16& label_text, const base::string16& tooltip_text); + Action(const Action& other); ~Action(); gfx::ImageSkia base_image; diff --git a/ui/base/ime/candidate_window.cc b/ui/base/ime/candidate_window.cc index 60f8c4d..30259f5 100644 --- a/ui/base/ime/candidate_window.cc +++ b/ui/base/ime/candidate_window.cc @@ -99,6 +99,8 @@ CandidateWindow::CandidateWindowProperty::~CandidateWindowProperty() { CandidateWindow::Entry::Entry() { } +CandidateWindow::Entry::Entry(const Entry& other) = default; + CandidateWindow::Entry::~Entry() { } diff --git a/ui/base/ime/candidate_window.h b/ui/base/ime/candidate_window.h index ad52c33..ca2cc2b 100644 --- a/ui/base/ime/candidate_window.h +++ b/ui/base/ime/candidate_window.h @@ -43,6 +43,7 @@ class UI_BASE_IME_EXPORT CandidateWindow { // Represents a candidate entry. struct UI_BASE_IME_EXPORT Entry { Entry(); + Entry(const Entry& other); virtual ~Entry(); base::string16 value; base::string16 label; diff --git a/ui/base/models/table_model.cc b/ui/base/models/table_model.cc index b8b18ad..d98cdb2 100644 --- a/ui/base/models/table_model.cc +++ b/ui/base/models/table_model.cc @@ -35,6 +35,8 @@ TableColumn::TableColumn(int id, Alignment alignment, int width, float percent) initial_sort_is_ascending(true) { } +TableColumn::TableColumn(const TableColumn& other) = default; + // TableModel ----------------------------------------------------------------- // Used for sorting. diff --git a/ui/base/models/table_model.h b/ui/base/models/table_model.h index 16e68a9..c7172f4 100644 --- a/ui/base/models/table_model.h +++ b/ui/base/models/table_model.h @@ -98,6 +98,7 @@ struct UI_BASE_EXPORT TableColumn { TableColumn(); TableColumn(int id, Alignment alignment, int width, float percent); + TableColumn(const TableColumn& other); // A unique identifier for the column. int id; diff --git a/ui/base/test/test_clipboard.cc b/ui/base/test/test_clipboard.cc index 271ab05..2971149 100644 --- a/ui/base/test/test_clipboard.cc +++ b/ui/base/test/test_clipboard.cc @@ -182,6 +182,8 @@ void TestClipboard::WriteData(const FormatType& format, TestClipboard::DataStore::DataStore() : sequence_number(0) { } +TestClipboard::DataStore::DataStore(const DataStore& other) = default; + TestClipboard::DataStore::~DataStore() { } diff --git a/ui/base/test/test_clipboard.h b/ui/base/test/test_clipboard.h index 57e21e9..ca62d4d 100644 --- a/ui/base/test/test_clipboard.h +++ b/ui/base/test/test_clipboard.h @@ -68,6 +68,7 @@ class TestClipboard : public Clipboard { private: struct DataStore { DataStore(); + DataStore(const DataStore& other); ~DataStore(); void Clear(); uint64_t sequence_number; diff --git a/ui/base/x/selection_owner.cc b/ui/base/x/selection_owner.cc index d13f088d..170f32e 100644 --- a/ui/base/x/selection_owner.cc +++ b/ui/base/x/selection_owner.cc @@ -376,6 +376,9 @@ SelectionOwner::IncrementalTransfer::IncrementalTransfer( foreign_window_manager_id(foreign_window_manager_id) { } +SelectionOwner::IncrementalTransfer::IncrementalTransfer( + const IncrementalTransfer& other) = default; + SelectionOwner::IncrementalTransfer::~IncrementalTransfer() { } diff --git a/ui/base/x/selection_owner.h b/ui/base/x/selection_owner.h index f3bec33..6ae933a 100644 --- a/ui/base/x/selection_owner.h +++ b/ui/base/x/selection_owner.h @@ -67,6 +67,7 @@ class UI_BASE_EXPORT SelectionOwner { int offset, base::TimeTicks timeout, int foreign_window_manager_id); + IncrementalTransfer(const IncrementalTransfer& other); ~IncrementalTransfer(); // Parameters from the XSelectionRequest. The data is transferred over diff --git a/ui/base/x/selection_utils.cc b/ui/base/x/selection_utils.cc index 7b76e5f..d7acd52 100644 --- a/ui/base/x/selection_utils.cc +++ b/ui/base/x/selection_utils.cc @@ -121,6 +121,9 @@ base::string16 RefCountedMemoryToString16( SelectionFormatMap::SelectionFormatMap() {} +SelectionFormatMap::SelectionFormatMap(const SelectionFormatMap& other) = + default; + SelectionFormatMap::~SelectionFormatMap() {} void SelectionFormatMap::Insert( diff --git a/ui/base/x/selection_utils.h b/ui/base/x/selection_utils.h index 1c4bcbd..addbcf7 100644 --- a/ui/base/x/selection_utils.h +++ b/ui/base/x/selection_utils.h @@ -66,6 +66,7 @@ class UI_BASE_EXPORT SelectionFormatMap { typedef InternalMap::const_iterator const_iterator; SelectionFormatMap(); + SelectionFormatMap(const SelectionFormatMap& other); ~SelectionFormatMap(); // Copy and assignment deliberately open. diff --git a/ui/compositor/layer_animator.cc b/ui/compositor/layer_animator.cc index 061f1de..e7a1b00 100644 --- a/ui/compositor/layer_animator.cc +++ b/ui/compositor/layer_animator.cc @@ -957,6 +957,9 @@ LayerAnimator::RunningAnimation::RunningAnimation( : sequence_(sequence) { } +LayerAnimator::RunningAnimation::RunningAnimation( + const RunningAnimation& other) = default; + LayerAnimator::RunningAnimation::~RunningAnimation() { } } // namespace ui diff --git a/ui/compositor/layer_animator.h b/ui/compositor/layer_animator.h index 655c17c..349fd75 100644 --- a/ui/compositor/layer_animator.h +++ b/ui/compositor/layer_animator.h @@ -244,6 +244,7 @@ class COMPOSITOR_EXPORT LayerAnimator class RunningAnimation { public: RunningAnimation(const base::WeakPtr<LayerAnimationSequence>& sequence); + RunningAnimation(const RunningAnimation& other); ~RunningAnimation(); bool is_sequence_alive() const { return !!sequence_.get(); } diff --git a/ui/compositor/test/test_layer_animation_delegate.cc b/ui/compositor/test/test_layer_animation_delegate.cc index 980e3978..7189725 100644 --- a/ui/compositor/test/test_layer_animation_delegate.cc +++ b/ui/compositor/test/test_layer_animation_delegate.cc @@ -30,6 +30,9 @@ TestLayerAnimationDelegate::TestLayerAnimationDelegate( CreateCcLayer(); } +TestLayerAnimationDelegate::TestLayerAnimationDelegate( + const TestLayerAnimationDelegate& other) = default; + TestLayerAnimationDelegate::~TestLayerAnimationDelegate() { } diff --git a/ui/compositor/test/test_layer_animation_delegate.h b/ui/compositor/test/test_layer_animation_delegate.h index ef42158..81e8fc2 100644 --- a/ui/compositor/test/test_layer_animation_delegate.h +++ b/ui/compositor/test/test_layer_animation_delegate.h @@ -29,6 +29,7 @@ class TestLayerAnimationDelegate : public LayerAnimationDelegate { public: TestLayerAnimationDelegate(); explicit TestLayerAnimationDelegate(const LayerAnimationDelegate& other); + TestLayerAnimationDelegate(const TestLayerAnimationDelegate& other); ~TestLayerAnimationDelegate() override; // Implementation of LayerAnimationDelegate diff --git a/ui/compositor/transform_animation_curve_adapter.cc b/ui/compositor/transform_animation_curve_adapter.cc index 5439e0a..c3f2a31 100644 --- a/ui/compositor/transform_animation_curve_adapter.cc +++ b/ui/compositor/transform_animation_curve_adapter.cc @@ -21,6 +21,9 @@ TransformAnimationCurveAdapter::TransformAnimationCurveAdapter( gfx::DecomposeTransform(&decomposed_target_value_, target_value_); } +TransformAnimationCurveAdapter::TransformAnimationCurveAdapter( + const TransformAnimationCurveAdapter& other) = default; + TransformAnimationCurveAdapter::~TransformAnimationCurveAdapter() { } diff --git a/ui/compositor/transform_animation_curve_adapter.h b/ui/compositor/transform_animation_curve_adapter.h index 05b5644..6933241 100644 --- a/ui/compositor/transform_animation_curve_adapter.h +++ b/ui/compositor/transform_animation_curve_adapter.h @@ -23,6 +23,8 @@ class COMPOSITOR_EXPORT TransformAnimationCurveAdapter gfx::Transform target_value, base::TimeDelta duration); + TransformAnimationCurveAdapter(const TransformAnimationCurveAdapter& other); + ~TransformAnimationCurveAdapter() override; // TransformAnimationCurve implementation. diff --git a/ui/events/devices/input_device.cc b/ui/events/devices/input_device.cc index 02139b1..4734edd 100644 --- a/ui/events/devices/input_device.cc +++ b/ui/events/devices/input_device.cc @@ -32,6 +32,8 @@ InputDevice::InputDevice(int id, vendor_id(vendor), product_id(product) {} +InputDevice::InputDevice(const InputDevice& other) = default; + InputDevice::~InputDevice() { } diff --git a/ui/events/devices/input_device.h b/ui/events/devices/input_device.h index c118261..4ef06b3 100644 --- a/ui/events/devices/input_device.h +++ b/ui/events/devices/input_device.h @@ -33,6 +33,7 @@ struct EVENTS_DEVICES_EXPORT InputDevice { const base::FilePath& sys_path, uint16_t vendor, uint16_t product); + InputDevice(const InputDevice& other); virtual ~InputDevice(); // ID of the device. This ID is unique between all input devices. diff --git a/ui/events/gesture_detection/gesture_detector.cc b/ui/events/gesture_detection/gesture_detector.cc index 2996bc7..6fc39a8 100644 --- a/ui/events/gesture_detection/gesture_detector.cc +++ b/ui/events/gesture_detection/gesture_detector.cc @@ -61,6 +61,8 @@ GestureDetector::Config::Config() single_tap_repeat_interval(1), velocity_tracker_strategy(VelocityTracker::Strategy::STRATEGY_DEFAULT) {} +GestureDetector::Config::Config(const Config& other) = default; + GestureDetector::Config::~Config() {} class GestureDetector::TimeoutGestureHandler { diff --git a/ui/events/gesture_detection/gesture_detector.h b/ui/events/gesture_detection/gesture_detector.h index 49def14..9fb6999 100644 --- a/ui/events/gesture_detection/gesture_detector.h +++ b/ui/events/gesture_detection/gesture_detector.h @@ -25,6 +25,7 @@ class GESTURE_DETECTION_EXPORT GestureDetector { public: struct GESTURE_DETECTION_EXPORT Config { Config(); + Config(const Config& other); ~Config(); base::TimeDelta longpress_timeout; diff --git a/ui/events/gesture_detection/gesture_event_data.cc b/ui/events/gesture_detection/gesture_event_data.cc index b166ffa..676dade 100644 --- a/ui/events/gesture_detection/gesture_event_data.cc +++ b/ui/events/gesture_detection/gesture_event_data.cc @@ -49,6 +49,8 @@ GestureEventData::GestureEventData(EventType type, details.set_bounding_box(other.details.bounding_box_f()); } +GestureEventData::GestureEventData(const GestureEventData& other) = default; + GestureEventData::GestureEventData() : motion_event_id(0), primary_tool_type(MotionEvent::TOOL_TYPE_UNKNOWN), diff --git a/ui/events/gesture_detection/gesture_event_data.h b/ui/events/gesture_detection/gesture_event_data.h index 8f54355..541fe12 100644 --- a/ui/events/gesture_detection/gesture_event_data.h +++ b/ui/events/gesture_detection/gesture_event_data.h @@ -30,6 +30,7 @@ struct GESTURE_DETECTION_EXPORT GestureEventData { const gfx::RectF& bounding_box, int flags); GestureEventData(EventType type, const GestureEventData&); + GestureEventData(const GestureEventData& other); EventType type() const { return details.type(); } diff --git a/ui/events/gesture_detection/gesture_provider.cc b/ui/events/gesture_detection/gesture_provider.cc index 2ea2b53..40944ff 100644 --- a/ui/events/gesture_detection/gesture_provider.cc +++ b/ui/events/gesture_detection/gesture_provider.cc @@ -75,6 +75,8 @@ GestureProvider::Config::Config() max_gesture_bounds_length(0) { } +GestureProvider::Config::Config(const Config& other) = default; + GestureProvider::Config::~Config() { } diff --git a/ui/events/gesture_detection/gesture_provider.h b/ui/events/gesture_detection/gesture_provider.h index c738f53..0da3316 100644 --- a/ui/events/gesture_detection/gesture_provider.h +++ b/ui/events/gesture_detection/gesture_provider.h @@ -28,6 +28,7 @@ class GESTURE_DETECTION_EXPORT GestureProvider { public: struct GESTURE_DETECTION_EXPORT Config { Config(); + Config(const Config& other); ~Config(); gfx::Display display; GestureDetector::Config gesture_detector_config; diff --git a/ui/events/gesture_detection/motion_event_generic.cc b/ui/events/gesture_detection/motion_event_generic.cc index 041bddd..935584c 100644 --- a/ui/events/gesture_detection/motion_event_generic.cc +++ b/ui/events/gesture_detection/motion_event_generic.cc @@ -50,6 +50,8 @@ PointerProperties::PointerProperties(const MotionEvent& event, source_device_id(0) { } +PointerProperties::PointerProperties(const PointerProperties& other) = default; + void PointerProperties::SetAxesAndOrientation(float radius_x, float radius_y, float rotation_angle_degree) { diff --git a/ui/events/gesture_detection/motion_event_generic.h b/ui/events/gesture_detection/motion_event_generic.h index c5ea1b0..bc9b351 100644 --- a/ui/events/gesture_detection/motion_event_generic.h +++ b/ui/events/gesture_detection/motion_event_generic.h @@ -19,6 +19,7 @@ struct GESTURE_DETECTION_EXPORT PointerProperties { PointerProperties(); PointerProperties(float x, float y, float touch_major); PointerProperties(const MotionEvent& event, size_t pointer_index); + PointerProperties(const PointerProperties& other); // Sets |touch_major|, |touch_minor|, and |orientation| from the given radius // and rotation angle (in degrees). diff --git a/ui/events/latency_info.cc b/ui/events/latency_info.cc index cd03d4c..841d648 100644 --- a/ui/events/latency_info.cc +++ b/ui/events/latency_info.cc @@ -148,6 +148,8 @@ LatencyInfo::LatencyInfo() terminated_(false) { } +LatencyInfo::LatencyInfo(const LatencyInfo& other) = default; + LatencyInfo::~LatencyInfo() { } diff --git a/ui/events/latency_info.h b/ui/events/latency_info.h index 77efe5f7..31a1055 100644 --- a/ui/events/latency_info.h +++ b/ui/events/latency_info.h @@ -131,6 +131,7 @@ class EVENTS_BASE_EXPORT LatencyInfo { kTypicalMaxComponentsPerLatencyInfo> LatencyMap; LatencyInfo(); + LatencyInfo(const LatencyInfo& other); ~LatencyInfo(); // For test only. diff --git a/ui/gfx/display.cc b/ui/gfx/display.cc index 1777e87..7a9539d 100644 --- a/ui/gfx/display.cc +++ b/ui/gfx/display.cc @@ -80,6 +80,8 @@ Display::Display() touch_support_(TOUCH_SUPPORT_UNKNOWN) { } +Display::Display(const Display& other) = default; + Display::Display(int64_t id) : id_(id), device_scale_factor_(GetForcedDeviceScaleFactor()), diff --git a/ui/gfx/display.h b/ui/gfx/display.h index a3bb0a8..d575d6f 100644 --- a/ui/gfx/display.h +++ b/ui/gfx/display.h @@ -58,6 +58,7 @@ class GFX_EXPORT Display final { Display(); explicit Display(int64_t id); Display(int64_t id, const Rect& bounds); + Display(const Display& other); ~Display(); // Returns the forced device scale factor, which is given by diff --git a/ui/gfx/font_render_params.cc b/ui/gfx/font_render_params.cc index a434379..7b85435 100644 --- a/ui/gfx/font_render_params.cc +++ b/ui/gfx/font_render_params.cc @@ -17,6 +17,8 @@ FontRenderParams::FontRenderParams() subpixel_rendering(SUBPIXEL_RENDERING_NONE) { } +FontRenderParams::FontRenderParams(const FontRenderParams& other) = default; + FontRenderParams::~FontRenderParams() {} // static @@ -61,6 +63,9 @@ FontRenderParamsQuery::FontRenderParamsQuery() device_scale_factor(0) { } +FontRenderParamsQuery::FontRenderParamsQuery( + const FontRenderParamsQuery& other) = default; + FontRenderParamsQuery::~FontRenderParamsQuery() {} } // namespace gfx diff --git a/ui/gfx/font_render_params.h b/ui/gfx/font_render_params.h index 989f9aa..b460c6d 100644 --- a/ui/gfx/font_render_params.h +++ b/ui/gfx/font_render_params.h @@ -17,6 +17,7 @@ namespace gfx { // A collection of parameters describing how text should be rendered on Linux. struct GFX_EXPORT FontRenderParams { FontRenderParams(); + FontRenderParams(const FontRenderParams& other); ~FontRenderParams(); // Level of hinting to be applied. @@ -73,6 +74,7 @@ struct GFX_EXPORT FontRenderParams { // A query used to determine the appropriate FontRenderParams. struct GFX_EXPORT FontRenderParamsQuery { FontRenderParamsQuery(); + FontRenderParamsQuery(const FontRenderParamsQuery& other); ~FontRenderParamsQuery(); bool is_empty() const { diff --git a/ui/gfx/image/image_png_rep.cc b/ui/gfx/image/image_png_rep.cc index 78b496f..8ffa3e2 100644 --- a/ui/gfx/image/image_png_rep.cc +++ b/ui/gfx/image/image_png_rep.cc @@ -22,6 +22,8 @@ ImagePNGRep::ImagePNGRep(const scoped_refptr<base::RefCountedMemory>& data, scale(data_scale) { } +ImagePNGRep::ImagePNGRep(const ImagePNGRep& other) = default; + ImagePNGRep::~ImagePNGRep() { } diff --git a/ui/gfx/image/image_png_rep.h b/ui/gfx/image/image_png_rep.h index 5c26134..cdfe41d 100644 --- a/ui/gfx/image/image_png_rep.h +++ b/ui/gfx/image/image_png_rep.h @@ -18,6 +18,7 @@ struct GFX_EXPORT ImagePNGRep { ImagePNGRep(); ImagePNGRep(const scoped_refptr<base::RefCountedMemory>& data, float data_scale); + ImagePNGRep(const ImagePNGRep& other); ~ImagePNGRep(); // Width and height of the image, in pixels. diff --git a/ui/gfx/render_text.cc b/ui/gfx/render_text.cc index 4a59924..e6e7398 100644 --- a/ui/gfx/render_text.cc +++ b/ui/gfx/render_text.cc @@ -415,6 +415,8 @@ LineSegment::~LineSegment() {} Line::Line() : preceding_heights(0), baseline(0) {} +Line::Line(const Line& other) = default; + Line::~Line() {} #if !defined(OS_MACOSX) diff --git a/ui/gfx/render_text.h b/ui/gfx/render_text.h index 522cc4d..6f56a69 100644 --- a/ui/gfx/render_text.h +++ b/ui/gfx/render_text.h @@ -170,6 +170,7 @@ struct LineSegment { // A line of display text, comprised of a line segment list and some metrics. struct Line { Line(); + Line(const Line& other); ~Line(); // Segments that make up this line in visual order. diff --git a/ui/message_center/fake_notifier_settings_provider.cc b/ui/message_center/fake_notifier_settings_provider.cc index 9465149..9cafc93 100644 --- a/ui/message_center/fake_notifier_settings_provider.cc +++ b/ui/message_center/fake_notifier_settings_provider.cc @@ -12,6 +12,9 @@ namespace message_center { FakeNotifierSettingsProvider::NotifierGroupItem::NotifierGroupItem() { } +FakeNotifierSettingsProvider::NotifierGroupItem::NotifierGroupItem( + const NotifierGroupItem& other) = default; + FakeNotifierSettingsProvider::NotifierGroupItem::~NotifierGroupItem() { } diff --git a/ui/message_center/fake_notifier_settings_provider.h b/ui/message_center/fake_notifier_settings_provider.h index d5a2c8a..e8e6c2b 100644 --- a/ui/message_center/fake_notifier_settings_provider.h +++ b/ui/message_center/fake_notifier_settings_provider.h @@ -56,6 +56,7 @@ class FakeNotifierSettingsProvider : public NotifierSettingsProvider { std::vector<Notifier*> notifiers; NotifierGroupItem(); + NotifierGroupItem(const NotifierGroupItem& other); ~NotifierGroupItem(); }; diff --git a/ui/message_center/notifier_settings.cc b/ui/message_center/notifier_settings.cc index 72a378b..f5e9c01 100644 --- a/ui/message_center/notifier_settings.cc +++ b/ui/message_center/notifier_settings.cc @@ -24,6 +24,8 @@ NotifierId::NotifierId() : type(SYSTEM_COMPONENT) { } +NotifierId::NotifierId(const NotifierId& other) = default; + bool NotifierId::operator==(const NotifierId& other) const { if (type != other.type) return false; diff --git a/ui/message_center/notifier_settings.h b/ui/message_center/notifier_settings.h index 43e2032..f01a069 100644 --- a/ui/message_center/notifier_settings.h +++ b/ui/message_center/notifier_settings.h @@ -54,6 +54,8 @@ struct MESSAGE_CENTER_EXPORT NotifierId { // Constructor for WEB_PAGE type. explicit NotifierId(const GURL& url); + NotifierId(const NotifierId& other); + bool operator==(const NotifierId& other) const; // Allows NotifierId to be used as a key in std::map. bool operator<(const NotifierId& other) const; diff --git a/ui/shell_dialogs/select_file_dialog.cc b/ui/shell_dialogs/select_file_dialog.cc index c3f5013..82086dd 100644 --- a/ui/shell_dialogs/select_file_dialog.cc +++ b/ui/shell_dialogs/select_file_dialog.cc @@ -36,6 +36,9 @@ namespace ui { SelectFileDialog::FileTypeInfo::FileTypeInfo() : include_all_files(false), allowed_paths(NATIVE_PATH) {} +SelectFileDialog::FileTypeInfo::FileTypeInfo(const FileTypeInfo& other) = + default; + SelectFileDialog::FileTypeInfo::~FileTypeInfo() {} void SelectFileDialog::Listener::FileSelectedWithExtraInfo( diff --git a/ui/shell_dialogs/select_file_dialog.h b/ui/shell_dialogs/select_file_dialog.h index 6ed44e7..041fb4a 100644 --- a/ui/shell_dialogs/select_file_dialog.h +++ b/ui/shell_dialogs/select_file_dialog.h @@ -109,6 +109,7 @@ class SHELL_DIALOGS_EXPORT SelectFileDialog // Holds information about allowed extensions on a file save dialog. struct SHELL_DIALOGS_EXPORT FileTypeInfo { FileTypeInfo(); + FileTypeInfo(const FileTypeInfo& other); ~FileTypeInfo(); // A list of allowed extensions. For example, it might be diff --git a/ui/views/bubble/tray_bubble_view.cc b/ui/views/bubble/tray_bubble_view.cc index d07e1d9..4e891b7 100644 --- a/ui/views/bubble/tray_bubble_view.cc +++ b/ui/views/bubble/tray_bubble_view.cc @@ -290,6 +290,8 @@ TrayBubbleView::InitParams::InitParams(AnchorType anchor_type, arrow_alignment(BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE) { } +TrayBubbleView::InitParams::InitParams(const InitParams& other) = default; + // static TrayBubbleView* TrayBubbleView::Create(gfx::NativeView parent_window, View* anchor, diff --git a/ui/views/bubble/tray_bubble_view.h b/ui/views/bubble/tray_bubble_view.h index e79cdc0..22e5f76 100644 --- a/ui/views/bubble/tray_bubble_view.h +++ b/ui/views/bubble/tray_bubble_view.h @@ -96,6 +96,7 @@ class VIEWS_EXPORT TrayBubbleView : public views::BubbleDelegateView, AnchorAlignment anchor_alignment, int min_width, int max_width); + InitParams(const InitParams& other); AnchorType anchor_type; AnchorAlignment anchor_alignment; int min_width; diff --git a/ui/views/controls/menu/menu_controller.cc b/ui/views/controls/menu/menu_controller.cc index e9b7321..a3af4c1 100644 --- a/ui/views/controls/menu/menu_controller.cc +++ b/ui/views/controls/menu/menu_controller.cc @@ -373,6 +373,8 @@ MenuController::State::State() context_menu(false) { } +MenuController::State::State(const State& other) = default; + MenuController::State::~State() {} // MenuController ------------------------------------------------------------ diff --git a/ui/views/controls/menu/menu_controller.h b/ui/views/controls/menu/menu_controller.h index 88b00cc..2b743f7 100644 --- a/ui/views/controls/menu/menu_controller.h +++ b/ui/views/controls/menu/menu_controller.h @@ -240,6 +240,7 @@ class VIEWS_EXPORT MenuController : public WidgetObserver { // Tracks selection information. struct State { State(); + State(const State& other); ~State(); // The selected menu item. diff --git a/ui/views/widget/widget.cc b/ui/views/widget/widget.cc index 77bd880..3effd1b 100644 --- a/ui/views/widget/widget.cc +++ b/ui/views/widget/widget.cc @@ -137,6 +137,8 @@ Widget::InitParams::InitParams(Type type) force_software_compositing(false) { } +Widget::InitParams::InitParams(const InitParams& other) = default; + Widget::InitParams::~InitParams() { } diff --git a/ui/views/widget/widget.h b/ui/views/widget/widget.h index 8c92b90..2d5b68e 100644 --- a/ui/views/widget/widget.h +++ b/ui/views/widget/widget.h @@ -202,6 +202,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate, InitParams(); explicit InitParams(Type type); + InitParams(const InitParams& other); ~InitParams(); Type type; |
