From 18680e5c4fadd7ff5db1747b9c93e2b905cdd7e0 Mon Sep 17 00:00:00 2001 From: Mark Capella Date: Fri, 7 Aug 2015 02:09:08 -0400 Subject: [PATCH] Bug 1191161 - p3 - Surprise update-generated-wrappers changes, r=jchen --- widget/android/GeneratedJNIWrappers.cpp | 10 ------- widget/android/GeneratedJNIWrappers.h | 35 ------------------------- 2 files changed, 45 deletions(-) diff --git a/widget/android/GeneratedJNIWrappers.cpp b/widget/android/GeneratedJNIWrappers.cpp index c29ce4d491d..7d5023439b7 100644 --- a/widget/android/GeneratedJNIWrappers.cpp +++ b/widget/android/GeneratedJNIWrappers.cpp @@ -1214,16 +1214,6 @@ void ViewTransform::Y(float a0) const return mozilla::jni::Field::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::Call(this, nullptr, a0, a1); -} - constexpr char MatrixBlobCursor::name[]; constexpr char MatrixBlobCursor::New_t::name[]; diff --git a/widget/android/GeneratedJNIWrappers.h b/widget/android/GeneratedJNIWrappers.h index d7be1ceef29..c743d4f7ab2 100644 --- a/widget/android/GeneratedJNIWrappers.h +++ b/widget/android/GeneratedJNIWrappers.h @@ -2826,41 +2826,6 @@ public: }; -class NativeZip : public mozilla::jni::Class -{ -public: - typedef mozilla::jni::Ref Ref; - typedef mozilla::jni::LocalRef LocalRef; - typedef mozilla::jni::GlobalRef GlobalRef; - typedef const mozilla::jni::Param& 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 { public: