From 470dd37b41fd108b31f63841d308a58f5e2d5afd Mon Sep 17 00:00:00 2001 From: kjellander Date: Tue, 19 Apr 2016 03:03:23 -0700 Subject: [PATCH] Roll chromium_revision 212f976fef..61ed337cfe (387882:388120) https://codereview.chromium.org/1826693002 enables some more Clang warnings which were fixed. Change log: https://chromium.googlesource.com/chromium/src/+log/212f976fef..61ed337cfe Full diff: https://chromium.googlesource.com/chromium/src/+/212f976fef..61ed337cfe No dependencies changed. No update to Clang. TBR= NOTRY=True Review URL: https://codereview.webrtc.org/1896953004 Cr-Commit-Position: refs/heads/master@{#12422} --- DEPS | 2 +- webrtc/base/pathutils.cc | 8 +++++--- webrtc/base/pathutils.h | 1 + webrtc/modules/audio_coding/codecs/audio_encoder.cc | 2 ++ webrtc/modules/audio_coding/codecs/audio_encoder.h | 1 + webrtc/modules/desktop_capture/desktop_region.cc | 2 ++ webrtc/modules/desktop_capture/desktop_region.h | 1 + 7 files changed, 13 insertions(+), 4 deletions(-) diff --git a/DEPS b/DEPS index 0694795012..70f1380fd0 100644 --- a/DEPS +++ b/DEPS @@ -6,7 +6,7 @@ vars = { 'extra_gyp_flag': '-Dextra_gyp_flag=0', 'chromium_git': 'https://chromium.googlesource.com', - 'chromium_revision': '212f976fef1762e638035798780a5b4c6597890a', + 'chromium_revision': '61ed337cfe003bbc8f6619f644e90f95b1bcfd33', } # NOTE: Use http rather than https; the latter can cause problems for users diff --git a/webrtc/base/pathutils.cc b/webrtc/base/pathutils.cc index b5227ecb10..60e2b8bf47 100644 --- a/webrtc/base/pathutils.cc +++ b/webrtc/base/pathutils.cc @@ -13,7 +13,7 @@ #include #include #include -#endif // WEBRTC_WIN +#endif // WEBRTC_WIN #include "webrtc/base/common.h" #include "webrtc/base/fileutils.h" @@ -35,9 +35,9 @@ const char* const FOLDER_DELIMS = "/\\"; // DEFAULT_FOLDER_DELIM is the preferred delimiter for this platform #if WEBRTC_WIN const char DEFAULT_FOLDER_DELIM = '\\'; -#else // !WEBRTC_WIN +#else // !WEBRTC_WIN const char DEFAULT_FOLDER_DELIM = '/'; -#endif // !WEBRTC_WIN +#endif // !WEBRTC_WIN /////////////////////////////////////////////////////////////////////////////// // Pathname - parsing of pathnames into components, and vice versa @@ -55,6 +55,8 @@ Pathname::Pathname() : folder_delimiter_(DEFAULT_FOLDER_DELIM) { } +Pathname::Pathname(const Pathname&) = default; + Pathname::Pathname(const std::string& pathname) : folder_delimiter_(DEFAULT_FOLDER_DELIM) { SetPathname(pathname); diff --git a/webrtc/base/pathutils.h b/webrtc/base/pathutils.h index 2d5819f1b6..c155e8cd1d 100644 --- a/webrtc/base/pathutils.h +++ b/webrtc/base/pathutils.h @@ -44,6 +44,7 @@ public: static char DefaultFolderDelimiter(); Pathname(); + Pathname(const Pathname&); Pathname(const std::string& pathname); Pathname(const std::string& folder, const std::string& filename); diff --git a/webrtc/modules/audio_coding/codecs/audio_encoder.cc b/webrtc/modules/audio_coding/codecs/audio_encoder.cc index fa262c4644..f6bdd49f69 100644 --- a/webrtc/modules/audio_coding/codecs/audio_encoder.cc +++ b/webrtc/modules/audio_coding/codecs/audio_encoder.cc @@ -17,6 +17,8 @@ namespace webrtc { AudioEncoder::EncodedInfo::EncodedInfo() = default; +AudioEncoder::EncodedInfo::EncodedInfo(const EncodedInfo&) = default; + AudioEncoder::EncodedInfo::~EncodedInfo() = default; int AudioEncoder::RtpTimestampRateHz() const { diff --git a/webrtc/modules/audio_coding/codecs/audio_encoder.h b/webrtc/modules/audio_coding/codecs/audio_encoder.h index 58d9fff451..a9d96743f8 100644 --- a/webrtc/modules/audio_coding/codecs/audio_encoder.h +++ b/webrtc/modules/audio_coding/codecs/audio_encoder.h @@ -45,6 +45,7 @@ class AudioEncoder { // vector. struct EncodedInfo : public EncodedInfoLeaf { EncodedInfo(); + EncodedInfo(const EncodedInfo&); ~EncodedInfo(); std::vector redundant; diff --git a/webrtc/modules/desktop_capture/desktop_region.cc b/webrtc/modules/desktop_capture/desktop_region.cc index bc9972660a..a4c4a5f91e 100644 --- a/webrtc/modules/desktop_capture/desktop_region.cc +++ b/webrtc/modules/desktop_capture/desktop_region.cc @@ -20,6 +20,8 @@ DesktopRegion::RowSpan::RowSpan(int32_t left, int32_t right) : left(left), right(right) { } +DesktopRegion::Row::Row(const Row&) = default; + DesktopRegion::Row::Row(int32_t top, int32_t bottom) : top(top), bottom(bottom) { } diff --git a/webrtc/modules/desktop_capture/desktop_region.h b/webrtc/modules/desktop_capture/desktop_region.h index c86da56e17..d846917473 100644 --- a/webrtc/modules/desktop_capture/desktop_region.h +++ b/webrtc/modules/desktop_capture/desktop_region.h @@ -47,6 +47,7 @@ class DesktopRegion { // Row represents a single row of a region. A row is set of rectangles that // have the same vertical position. struct Row { + Row(const Row&); Row(int32_t top, int32_t bottom); ~Row();