diff options
| author | kjellander@webrtc.org <kjellander@webrtc.org> | 2015-03-04 12:58:35 +0000 |
|---|---|---|
| committer | kjellander@webrtc.org <kjellander@webrtc.org> | 2015-03-04 13:04:54 +0000 |
| commit | 14665ff7d4024d07e58622f498b23fd980001871 (patch) | |
| tree | 7548808544f25988d15e2d0172e92474a228756a /webrtc/test/win | |
| parent | 792f1a14e2b62382c5c6080d0b8fdc5c89d27bc6 (diff) | |
| download | webrtc-14665ff7d4024d07e58622f498b23fd980001871.tar.gz | |
Roll chromium_revision e144d30..6fdb142 (318658:318841) + remove OVERRIDE macro
Clang version changed 223108:230914
Details: https://chromium.googlesource.com/chromium/src/+/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
Diffstat (limited to 'webrtc/test/win')
| -rw-r--r-- | webrtc/test/win/d3d_renderer.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/webrtc/test/win/d3d_renderer.h b/webrtc/test/win/d3d_renderer.h index 7cf4982079..4fa6c7ef46 100644 --- a/webrtc/test/win/d3d_renderer.h +++ b/webrtc/test/win/d3d_renderer.h @@ -27,9 +27,8 @@ class D3dRenderer : public VideoRenderer { size_t height); virtual ~D3dRenderer(); - virtual void RenderFrame(const webrtc::I420VideoFrame& frame, - int delta) override; - virtual bool IsTextureSupported() const override { return false; } + void RenderFrame(const webrtc::I420VideoFrame& frame, int delta) override; + bool IsTextureSupported() const override { return false; } private: D3dRenderer(size_t width, size_t height); |