Bug 1191161 - p3 - Surprise update-generated-wrappers changes, r=jchen
authorMark Capella <markcapella@twcny.rr.com>
Fri, 07 Aug 2015 02:09:08 -0400
changeset 288445 f068f356e2a1b2770f6cb40396f9d7d15413cbe0
parent 288444 2dac39ceb9903de46375abc09916df0e5b454a26
child 288446 3b01a9b0930527309e3eefca7b003998e530844d
push id5067
push userraliiev@mozilla.com
push dateMon, 21 Sep 2015 14:04:52 +0000
treeherdermozilla-beta@14221ffe5b2f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjchen
bugs1191161
milestone42.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1191161 - p3 - Surprise update-generated-wrappers changes, r=jchen
widget/android/GeneratedJNIWrappers.cpp
widget/android/GeneratedJNIWrappers.h
--- a/widget/android/GeneratedJNIWrappers.cpp
+++ b/widget/android/GeneratedJNIWrappers.cpp
@@ -1209,26 +1209,16 @@ float ViewTransform::Y() const
     return mozilla::jni::Field<Y_t>::Get(this, nullptr);
 }
 
 void ViewTransform::Y(float a0) const
 {
     return mozilla::jni::Field<Y_t>::Set(this, nullptr, a0);
 }
 
-constexpr char NativeZip::name[];
-
-constexpr char NativeZip::CreateInputStream_t::name[];
-constexpr char NativeZip::CreateInputStream_t::signature[];
-
-mozilla::jni::Object::LocalRef NativeZip::CreateInputStream(mozilla::jni::Object::Param a0, int32_t a1) const
-{
-    return mozilla::jni::Method<CreateInputStream_t>::Call(this, nullptr, a0, a1);
-}
-
 constexpr char MatrixBlobCursor::name[];
 
 constexpr char MatrixBlobCursor::New_t::name[];
 constexpr char MatrixBlobCursor::New_t::signature[];
 
 MatrixBlobCursor::LocalRef MatrixBlobCursor::New(mozilla::jni::ObjectArray::Param a0)
 {
     return mozilla::jni::Constructor<New_t>::Call(nullptr, nullptr, a0);
--- a/widget/android/GeneratedJNIWrappers.h
+++ b/widget/android/GeneratedJNIWrappers.h
@@ -2821,51 +2821,16 @@ public:
     };
 
     float Y() const;
 
     void Y(float) const;
 
 };
 
-class NativeZip : public mozilla::jni::Class<NativeZip>
-{
-public:
-    typedef mozilla::jni::Ref<NativeZip> Ref;
-    typedef mozilla::jni::LocalRef<NativeZip> LocalRef;
-    typedef mozilla::jni::GlobalRef<NativeZip> GlobalRef;
-    typedef const mozilla::jni::Param<NativeZip>& Param;
-
-    static constexpr char name[] =
-            "org/mozilla/gecko/mozglue/NativeZip";
-
-protected:
-    NativeZip(jobject instance) : Class(instance) {}
-
-public:
-    struct CreateInputStream_t {
-        typedef NativeZip Owner;
-        typedef mozilla::jni::Object::LocalRef ReturnType;
-        typedef mozilla::jni::Object::Param SetterType;
-        typedef mozilla::jni::Args<
-                mozilla::jni::Object::Param,
-                int32_t> Args;
-        static constexpr char name[] = "createInputStream";
-        static constexpr char signature[] =
-                "(Ljava/nio/ByteBuffer;I)Ljava/io/InputStream;";
-        static const bool isStatic = false;
-        static const bool isMultithreaded = false;
-        static const mozilla::jni::ExceptionMode exceptionMode =
-                mozilla::jni::ExceptionMode::ABORT;
-    };
-
-    mozilla::jni::Object::LocalRef CreateInputStream(mozilla::jni::Object::Param, int32_t) const;
-
-};
-
 class MatrixBlobCursor : public mozilla::jni::Class<MatrixBlobCursor>
 {
 public:
     typedef mozilla::jni::Ref<MatrixBlobCursor> Ref;
     typedef mozilla::jni::LocalRef<MatrixBlobCursor> LocalRef;
     typedef mozilla::jni::GlobalRef<MatrixBlobCursor> GlobalRef;
     typedef const mozilla::jni::Param<MatrixBlobCursor>& Param;