Backed out changeset 3f8cf0d3f2c2 (bug 1286663)

iaxat · Jul 21, 2016 · 677b21a · 677b21a
1 parent accc5f6
commit 677b21a
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 36 deletions.
diff --git a/widget/android/GeneratedJNINatives.h b/widget/android/GeneratedJNINatives.h
@@ -326,21 +326,6 @@ const JNINativeMethod PrefsHelper::Natives<Impl>::methods[] = {
             ::template Wrap<&Impl::SetPref>)
 };
 
-template<class Impl>
-class ThumbnailHelper::Natives : public mozilla::jni::NativeImpl<ThumbnailHelper, Impl>
-{
-public:
-    static const JNINativeMethod methods[1];
-};
-
-template<class Impl>
-const JNINativeMethod ThumbnailHelper::Natives<Impl>::methods[] = {
-
-    mozilla::jni::MakeNativeMethod<ThumbnailHelper::RequestThumbnail_t>(
-            mozilla::jni::NativeStub<ThumbnailHelper::RequestThumbnail_t, Impl>
-            ::template Wrap<&Impl::RequestThumbnail>)
-};
-
 template<class Impl>
 class GLController::Natives : public mozilla::jni::NativeImpl<GLController, Impl>
 {

diff --git a/widget/android/GeneratedJNIWrappers.cpp b/widget/android/GeneratedJNIWrappers.cpp
@@ -1183,9 +1183,6 @@ auto ThumbnailHelper::SendThumbnail(mozilla::jni::ByteBuffer::Param a0, int32_t
     return mozilla::jni::Method<SendThumbnail_t>::Call(ThumbnailHelper::Context(), nullptr, a0, a1, a2, a3);
 }
 
-constexpr char ThumbnailHelper::RequestThumbnail_t::name[];
-constexpr char ThumbnailHelper::RequestThumbnail_t::signature[];
-
 const char Distribution::name[] =
         "org/mozilla/gecko/distribution/Distribution";
 

diff --git a/widget/android/GeneratedJNIWrappers.h b/widget/android/GeneratedJNIWrappers.h
@@ -2969,26 +2969,8 @@ class ThumbnailHelper : public mozilla::jni::ObjectBase<ThumbnailHelper, jobject
 
     static auto SendThumbnail(mozilla::jni::ByteBuffer::Param, int32_t, bool, bool) -> void;
 
-    struct RequestThumbnail_t {
-        typedef ThumbnailHelper Owner;
-        typedef void ReturnType;
-        typedef void SetterType;
-        typedef mozilla::jni::Args<
-                mozilla::jni::ByteBuffer::Param,
-                int32_t,
-                int32_t,
-                int32_t> Args;
-        static constexpr char name[] = "requestThumbnail";
-        static constexpr char signature[] =
-                "(Ljava/nio/ByteBuffer;III)V";
-        static const bool isStatic = true;
-        static const mozilla::jni::ExceptionMode exceptionMode =
-                mozilla::jni::ExceptionMode::ABORT;
-    };
-
     static const bool isMultithreaded = false;
 
-    template<class Impl> class Natives;
 };
 
 class Distribution : public mozilla::jni::ObjectBase<Distribution, jobject>