diff options
| author | vmpstr <vmpstr@chromium.org> | 2016-03-24 13:22:54 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-24 20:25:04 +0000 |
| commit | bf0d713a72db33bdf6c51d65f009f73e822db3e0 (patch) | |
| tree | fa6a45c9d24364ee4bbb6c2ca642ed55378a4a2c /ui | |
| parent | 1b9ba3a73f704481805e775df401a5bfd21ee3a9 (diff) | |
| download | chromium_src-bf0d713a72db33bdf6c51d65f009f73e822db3e0.zip chromium_src-bf0d713a72db33bdf6c51d65f009f73e822db3e0.tar.gz chromium_src-bf0d713a72db33bdf6c51d65f009f73e822db3e0.tar.bz2 | |
Add more out of line copy ctors for complex classes.
This patch adds the remaining copy constructors for complex classes.
After this patch, it should be possible to enable the heavy class copy
constructor checks by default.
R=thakis@chromium.org, dcheng@chromium.org
TBR=jam@chromium.org
BUG=436357
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1825273002
Cr-Commit-Position: refs/heads/master@{#383131}
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/base/ime/composition_text.cc | 2 | ||||
| -rw-r--r-- | ui/base/ime/composition_text.h | 1 | ||||
| -rw-r--r-- | ui/native_theme/native_theme.cc | 4 | ||||
| -rw-r--r-- | ui/native_theme/native_theme.h | 1 | ||||
| -rw-r--r-- | ui/platform_window/text_input_state.cc | 2 | ||||
| -rw-r--r-- | ui/platform_window/text_input_state.h | 1 |
6 files changed, 11 insertions, 0 deletions
diff --git a/ui/base/ime/composition_text.cc b/ui/base/ime/composition_text.cc index d3ae7f3..a2e583f 100644 --- a/ui/base/ime/composition_text.cc +++ b/ui/base/ime/composition_text.cc @@ -9,6 +9,8 @@ namespace ui { CompositionText::CompositionText() { } +CompositionText::CompositionText(const CompositionText& other) = default; + CompositionText::~CompositionText() { } diff --git a/ui/base/ime/composition_text.h b/ui/base/ime/composition_text.h index 9b729b5..ba56c62 100644 --- a/ui/base/ime/composition_text.h +++ b/ui/base/ime/composition_text.h @@ -17,6 +17,7 @@ namespace ui { // A struct represents the status of an ongoing composition text. struct UI_BASE_IME_EXPORT CompositionText { CompositionText(); + CompositionText(const CompositionText& other); ~CompositionText(); bool operator==(const CompositionText& rhs) const { diff --git a/ui/native_theme/native_theme.cc b/ui/native_theme/native_theme.cc index 96b0072..e4911c9 100644 --- a/ui/native_theme/native_theme.cc +++ b/ui/native_theme/native_theme.cc @@ -14,6 +14,10 @@ NativeTheme::ExtraParams::ExtraParams() { memset(this, 0, sizeof(*this)); } +NativeTheme::ExtraParams::ExtraParams(const ExtraParams& other) { + memcpy(this, &other, sizeof(*this)); +} + void NativeTheme::SetScrollbarColors(unsigned inactive_color, unsigned active_color, unsigned track_color) { diff --git a/ui/native_theme/native_theme.h b/ui/native_theme/native_theme.h index 057d49c..a9f56d5 100644 --- a/ui/native_theme/native_theme.h +++ b/ui/native_theme/native_theme.h @@ -199,6 +199,7 @@ class NATIVE_THEME_EXPORT NativeTheme { union NATIVE_THEME_EXPORT ExtraParams { ExtraParams(); + ExtraParams(const ExtraParams& other); ButtonExtraParams button; InnerSpinButtonExtraParams inner_spin; diff --git a/ui/platform_window/text_input_state.cc b/ui/platform_window/text_input_state.cc index ce6db84..ffc3e52 100644 --- a/ui/platform_window/text_input_state.cc +++ b/ui/platform_window/text_input_state.cc @@ -32,6 +32,8 @@ TextInputState::TextInputState(TextInputType type, composition_end(composition_end), can_compose_inline(can_compose_inline) {} +TextInputState::TextInputState(const TextInputState& other) = default; + bool TextInputState::operator==(const TextInputState& other) const { return type == other.type && flags == other.flags && diff --git a/ui/platform_window/text_input_state.h b/ui/platform_window/text_input_state.h index 14d016b..c2dff0d 100644 --- a/ui/platform_window/text_input_state.h +++ b/ui/platform_window/text_input_state.h @@ -23,6 +23,7 @@ struct TextInputState { int composition_start, int composition_end, bool can_compose_inline); + TextInputState(const TextInputState& other); bool operator==(const TextInputState& other) const; // The type of input field. |
