zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Roll chromium_revision e144d30..6fdb142 (318658:318841) + remove OVERRIDE macro

Browse Source 
Clang version changed 223108:230914
Details: e144d30..6fdb142/tools/clang/scripts/update.sh

Removes the OVERRIDE macro defined in:
* webrtc/base/common.h
* webrtc/typedefs.h

The majority of the source changes were done by running this in src/:
perl -0pi -e "s/virtual\s([^({;]*(\([^({;]*\)[^({;]*))(OVERRIDE|override)/\1override/sg" `find {talk,webrtc} -name "*.h"  -o -name "*.cc*" -o -name "*.mm*"`

which converted all:
virtual Foo() OVERRIDE
functions to:
Foo() override

Then I manually edited:
* talk/media/webrtc/fakewebrtccommon.h
* webrtc/test/fake_common.h

Remaining uses of OVERRIDE was fixed by search+replace.

Manual edits were done to fix virtual destructors that were
overriding inherited ones.

Finally a build error related to the pure virtual definitions of
Read, Write and Rewind in common_types.h required a bit of
refactoring in:
* webrtc/common_types.cc
* webrtc/common_types.h
* webrtc/system_wrappers/interface/file_wrapper.h
* webrtc/system_wrappers/source/file_impl.cc

This roll should make it possible for us to finally re-enable deadlock
detection for TSan on the buildbots.

BUG=4106
R=pbos@webrtc.org, tommi@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/41069004

Cr-Commit-Position: refs/heads/master@{#8596}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8596 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
kjellander@webrtc.org
2015-03-04 12:58:35 +00:00
parent 792f1a14e2
commit 14665ff7d4
286 changed files with 3546 additions and 3920 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/modules/video_render/include/video_render.h
View File

@ -52,8 +52,8 @@ public:
*/
static void DestroyVideoRender(VideoRender* module);
virtual int64_t TimeUntilNextProcess() OVERRIDE = 0;
virtual int32_t Process() OVERRIDE = 0;
int64_t TimeUntilNextProcess() override = 0;
int32_t Process() override = 0;
/**************************************************************************
*

4
webrtc/modules/video_render/ios/video_render_ios_channel.h
View File

@ -24,8 +24,8 @@ class VideoRenderIosChannel : public VideoRenderCallback {
virtual ~VideoRenderIosChannel();
// Implementation of VideoRenderCallback.
virtual int32_t RenderFrame(const uint32_t stream_id,
I420VideoFrame& video_frame) OVERRIDE;
int32_t RenderFrame(const uint32_t stream_id,
I420VideoFrame& video_frame) override;
int SetStreamSettings(const float z_order,
const float left,

32
webrtc/modules/video_render/ios/video_render_ios_impl.h
View File

@ -30,50 +30,50 @@ class VideoRenderIosImpl : IVideoRender {
~VideoRenderIosImpl();
// Implementation of IVideoRender.
int32_t Init() OVERRIDE;
int32_t ChangeWindow(void* window) OVERRIDE;
int32_t Init() override;
int32_t ChangeWindow(void* window) override;
VideoRenderCallback* AddIncomingRenderStream(const uint32_t stream_id,
const uint32_t z_order,
const float left,
const float top,
const float right,
const float bottom) OVERRIDE;
const float bottom) override;
int32_t DeleteIncomingRenderStream(const uint32_t stream_id) OVERRIDE;
int32_t DeleteIncomingRenderStream(const uint32_t stream_id) override;
int32_t GetIncomingRenderStreamProperties(const uint32_t stream_id,
uint32_t& z_order,
float& left,
float& top,
float& right,
float& bottom) const OVERRIDE;
float& bottom) const override;
int32_t StartRender() OVERRIDE;
int32_t StopRender() OVERRIDE;
int32_t StartRender() override;
int32_t StopRender() override;
VideoRenderType RenderType() OVERRIDE;
RawVideoType PerferedVideoType() OVERRIDE;
bool FullScreen() OVERRIDE;
VideoRenderType RenderType() override;
RawVideoType PerferedVideoType() override;
bool FullScreen() override;
int32_t GetGraphicsMemory(
uint64_t& total_graphics_memory,
uint64_t& available_graphics_memory) const OVERRIDE; // NOLINT
uint64_t& available_graphics_memory) const override; // NOLINT
int32_t GetScreenResolution(
uint32_t& screen_width,
uint32_t& screen_height) const OVERRIDE; // NOLINT
uint32_t& screen_height) const override; // NOLINT
uint32_t RenderFrameRate(const uint32_t stream_id);
int32_t SetStreamCropping(const uint32_t stream_id,
const float left,
const float top,
const float right,
const float bottom) OVERRIDE;
const float bottom) override;
int32_t ConfigureRenderer(const uint32_t stream_id,
const unsigned int z_order,
const float left,
const float top,
const float right,
const float bottom) OVERRIDE;
int32_t SetTransparentBackground(const bool enable) OVERRIDE;
const float bottom) override;
int32_t SetTransparentBackground(const bool enable) override;
int32_t SetText(const uint8_t text_id,
const uint8_t* text,
const int32_t text_length,
@ -82,7 +82,7 @@ class VideoRenderIosImpl : IVideoRender {
const float left,
const float top,
const float right,
const float bottom) OVERRIDE;
const float bottom) override;
int32_t SetBitmap(const void* bit_map,
const uint8_t picture_id,
const void* color_key,