commit 60ca31bf5d206ff01b5441639806f7303365e162
author kjellander <kjellander@webrtc.org> Mon Jan 04 10:15:53 2016 -0800
committer Commit bot <commit-bot@chromium.org> Mon Jan 04 18:16:01 2016 +0000
tree fa5ace21afc4a428add12a8886ccb7a223ddeb7c
parent 4138e08eb6dd8122bbf56b94fd4b45bf4ce91cf5

Roll chromium_revision d66326c..4df108a (367167:367307)

The changes in https://chromium.googlesource.com/chromium/src/+/d66326c..4df108a/build/common.gypi
enables a lot more warnings, which have been disabled/fixed in this CL.
See tracking bugs for remaining work.

Change log: https://chromium.googlesource.com/chromium/src/+log/d66326c..4df108a
Full diff: https://chromium.googlesource.com/chromium/src/+/d66326c..4df108a

Changed dependencies:
* src/buildtools: https://chromium.googlesource.com/chromium/buildtools.git/+log/fee7f1e..6d0c448
* src/third_party/libsrtp: https://chromium.googlesource.com/chromium/deps/libsrtp.git/+log/b8dd754..8a7662a
DEPS diff: https://chromium.googlesource.com/chromium/src/+/d66326c..4df108a/DEPS

No update to Clang.

BUG=webrtc:5397, webrtc:5398, webrtc:5399
TBR=hta@webrtc.org, perkj@webrtc.org
NOTRY=True

Review URL: https://codereview.webrtc.org/1553033002

Cr-Commit-Position: refs/heads/master@{#11147}

talk/app/webrtc/java/jni/androidmediadecoder_jni.cc

diff --git a/talk/app/webrtc/java/jni/androidmediadecoder_jni.cc b/talk/app/webrtc/java/jni/androidmediadecoder_jni.cc
index 7ebcd20..c3d287c 100644
--- a/talk/app/webrtc/java/jni/androidmediadecoder_jni.cc
+++ b/talk/app/webrtc/java/jni/androidmediadecoder_jni.cc
@@ -112,6 +112,10 @@
   // Type of video codec.
   VideoCodecType codecType_;
 
+  // Render EGL context - owned by factory, should not be allocated/destroyed
+  // by VideoDecoder.
+  jobject render_egl_context_;
+
   bool key_frame_required_;
   bool inited_;
   bool sw_fallback_required_;
@@ -165,10 +169,6 @@
 
   // Global references; must be deleted in Release().
   std::vector<jobject> input_buffers_;
-
-  // Render EGL context - owned by factory, should not be allocated/destroyed
-  // by VideoDecoder.
-  jobject render_egl_context_;
 };
 
 MediaCodecVideoDecoder::MediaCodecVideoDecoder(

talk/app/webrtc/java/jni/androidmediaencoder_jni.cc

diff --git a/talk/app/webrtc/java/jni/androidmediaencoder_jni.cc b/talk/app/webrtc/java/jni/androidmediaencoder_jni.cc
index b36dc0b..64831c3 100644
--- a/talk/app/webrtc/java/jni/androidmediaencoder_jni.cc
+++ b/talk/app/webrtc/java/jni/androidmediaencoder_jni.cc
@@ -250,9 +250,6 @@
     JNIEnv* jni, VideoCodecType codecType, jobject egl_context) :
     codecType_(codecType),
     callback_(NULL),
-    inited_(false),
-    use_surface_(false),
-    picture_id_(0),
     codec_thread_(new Thread()),
     j_media_codec_video_encoder_class_(
         jni,
@@ -264,6 +261,9 @@
                                    *j_media_codec_video_encoder_class_,
                                    "<init>",
                                    "()V"))),
+    inited_(false),
+    use_surface_(false),
+    picture_id_(0),
     egl_context_(egl_context) {
   ScopedLocalRefFrame local_ref_frame(jni);
   // It would be nice to avoid spinning up a new thread per MediaCodec, and

talk/app/webrtc/java/jni/androidvideocapturer_jni.h

diff --git a/talk/app/webrtc/java/jni/androidvideocapturer_jni.h b/talk/app/webrtc/java/jni/androidvideocapturer_jni.h
index 91fc1ac..89ecacb 100644
--- a/talk/app/webrtc/java/jni/androidvideocapturer_jni.h
+++ b/talk/app/webrtc/java/jni/androidvideocapturer_jni.h
@@ -40,7 +40,7 @@
 
 namespace webrtc_jni {
 
-class NativeHandleImpl;
+struct NativeHandleImpl;
 class SurfaceTextureHelper;
 
 // AndroidVideoCapturerJni implements AndroidVideoCapturerDelegate.