diff options
| author | pbos <pbos@chromium.org> | 2015-10-07 07:27:19 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-07 14:28:09 +0000 |
| commit | 10b0fb04758034c452cea80c8298a2379a7b4eac (patch) | |
| tree | c9691fd4c2a53f050c8365373e826d85fb3f28f8 | |
| parent | c68e20f51052269ba633d6c524a239bf961b5d31 (diff) | |
| download | chromium_src-10b0fb04758034c452cea80c8298a2379a7b4eac.zip chromium_src-10b0fb04758034c452cea80c8298a2379a7b4eac.tar.gz chromium_src-10b0fb04758034c452cea80c8298a2379a7b4eac.tar.bz2 | |
Roll WebRTC 10183:10197, Libjingle 10176:10196
Also adds some #include "base/basictypes.h" to remoting/ (uses uint16).
WebRTC 10183:10197
Changes: https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git/+log/e2c433c..dd1d405
Libjingle 10176:10196
Changes: https://chromium.googlesource.com/external/webrtc/trunk/talk.git/+log/bfcf08f..cb124ee
BUG=webrtc:5024
R=henrika@chromium.org
TBR=sergeyu@chromium.org, mcasas@chromium.org
Review URL: https://codereview.chromium.org/1392713003
Cr-Commit-Position: refs/heads/master@{#352835}
| -rw-r--r-- | DEPS | 4 | ||||
| -rw-r--r-- | content/renderer/media/mock_data_channel_impl.h | 1 | ||||
| -rw-r--r-- | remoting/client/plugin/pepper_packet_socket_factory.h | 1 | ||||
| -rw-r--r-- | remoting/protocol/chromium_socket_factory.h | 1 | ||||
| -rw-r--r-- | third_party/libjingle/README.chromium | 2 |
5 files changed, 6 insertions, 3 deletions
@@ -193,7 +193,7 @@ deps = { Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + '525a71ab8ee3b61da48138f7e1c406989d2879fc', 'src/third_party/libjingle/source/talk': - Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + 'bfcf08f1a0ecf0340affb521cef0abc481f27b81', # commit position 10176 + Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + 'cb124eec069bd28f486bde5f95b5603e2b823219', # commit position 10196 'src/third_party/usrsctp/usrsctplib': Var('chromium_git') + '/external/usrsctplib.git' + '@' + '36444a999739e9e408f8f587cb4c3ffeef2e50ac', # from svn revision 9215 @@ -217,7 +217,7 @@ deps = { Var('chromium_git') + '/native_client/src/third_party/scons-2.0.1.git' + '@' + '1c1550e17fc26355d08627fbdec13d8291227067', 'src/third_party/webrtc': - Var('chromium_git') + '/external/webrtc/trunk/webrtc.git' + '@' + 'e2c433c08e48b83d6c585f221267abd4d17d48c3', # commit position 10183 + Var('chromium_git') + '/external/webrtc/trunk/webrtc.git' + '@' + 'dd1d405d54622392d726dacf0b36b454c189c1f2', # commit position 10197 'src/third_party/openmax_dl': Var('chromium_git') + '/external/webrtc/deps/third_party/openmax.git' + '@' + Var('openmax_dl_revision'), diff --git a/content/renderer/media/mock_data_channel_impl.h b/content/renderer/media/mock_data_channel_impl.h index cc3f385..0bdd0a6 100644 --- a/content/renderer/media/mock_data_channel_impl.h +++ b/content/renderer/media/mock_data_channel_impl.h @@ -7,6 +7,7 @@ #include <string> +#include "base/basictypes.h" #include "base/macros.h" #include "third_party/libjingle/source/talk/app/webrtc/peerconnectioninterface.h" diff --git a/remoting/client/plugin/pepper_packet_socket_factory.h b/remoting/client/plugin/pepper_packet_socket_factory.h index 12dc128..d355ff3 100644 --- a/remoting/client/plugin/pepper_packet_socket_factory.h +++ b/remoting/client/plugin/pepper_packet_socket_factory.h @@ -5,6 +5,7 @@ #ifndef REMOTING_CLIENT_PLUGIN_PEPPER_PACKET_SOCKET_FACTORY_H_ #define REMOTING_CLIENT_PLUGIN_PEPPER_PACKET_SOCKET_FACTORY_H_ +#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/macros.h" #include "ppapi/cpp/instance_handle.h" diff --git a/remoting/protocol/chromium_socket_factory.h b/remoting/protocol/chromium_socket_factory.h index b0ebd21..6bf7696 100644 --- a/remoting/protocol/chromium_socket_factory.h +++ b/remoting/protocol/chromium_socket_factory.h @@ -5,6 +5,7 @@ #ifndef REMOTING_PROTOCOL_CHROMIUM_SOCKET_FACTORY_H_ #define REMOTING_PROTOCOL_CHROMIUM_SOCKET_FACTORY_H_ +#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/macros.h" #include "third_party/webrtc/p2p/base/packetsocketfactory.h" diff --git a/third_party/libjingle/README.chromium b/third_party/libjingle/README.chromium index 5ab4698..9bd4fde 100644 --- a/third_party/libjingle/README.chromium +++ b/third_party/libjingle/README.chromium @@ -1,7 +1,7 @@ Name: libjingle URL: http://code.google.com/p/webrtc/ Version: unknown -Revision: 10176 +Revision: 10196 License: BSD License File: source/talk/COPYING Security Critical: yes |