Bug 1291375 - 6. Move Fennec JNI headers; r=snorp
authorJim Chen <nchen@mozilla.com>
Fri, 16 Sep 2016 15:13:48 -0400
changeset 355598 29dc959e853c140144167a522d638bf97465a6b9
parent 355597 3cf1197dbe96388050fc0931f5a98a221465296d
child 355599 72d223d9dec07b716230a099989386f144f0a814
push id6570
push userraliiev@mozilla.com
push dateMon, 14 Nov 2016 12:26:13 +0000
treeherdermozilla-beta@f455459b2ae5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssnorp
bugs1291375
milestone51.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 1291375 - 6. Move Fennec JNI headers; r=snorp Move Fennec-specific JNI headers to widget/android/fennec.
widget/android/MemoryMonitor.h
widget/android/Telemetry.h
widget/android/ThumbnailHelper.h
widget/android/fennec/MemoryMonitor.h
widget/android/fennec/Telemetry.h
widget/android/fennec/ThumbnailHelper.h
widget/android/nsAppShell.cpp
rename from widget/android/MemoryMonitor.h
rename to widget/android/fennec/MemoryMonitor.h
--- a/widget/android/MemoryMonitor.h
+++ b/widget/android/fennec/MemoryMonitor.h
@@ -1,17 +1,17 @@
 /* -*- Mode: c++; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef MemoryMonitor_h
 #define MemoryMonitor_h
 
-#include "GeneratedJNINatives.h"
+#include "FennecJNINatives.h"
 #include "nsMemoryPressure.h"
 
 namespace mozilla {
 
 class MemoryMonitor final
     : public java::MemoryMonitor::Natives<MemoryMonitor>
 {
 public:
rename from widget/android/Telemetry.h
rename to widget/android/fennec/Telemetry.h
--- a/widget/android/Telemetry.h
+++ b/widget/android/fennec/Telemetry.h
@@ -1,17 +1,17 @@
 /* -*- Mode: c++; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef mozilla_widget_Telemetry_h__
 #define mozilla_widget_Telemetry_h__
 
-#include "GeneratedJNINatives.h"
+#include "FennecJNINatives.h"
 #include "nsAppShell.h"
 #include "nsIAndroidBridge.h"
 
 #include "mozilla/Telemetry.h"
 
 namespace mozilla {
 namespace widget {
 
rename from widget/android/ThumbnailHelper.h
rename to widget/android/fennec/ThumbnailHelper.h
--- a/widget/android/ThumbnailHelper.h
+++ b/widget/android/fennec/ThumbnailHelper.h
@@ -2,17 +2,17 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef ThumbnailHelper_h
 #define ThumbnailHelper_h
 
 #include "AndroidBridge.h"
-#include "GeneratedJNINatives.h"
+#include "FennecJNINatives.h"
 #include "gfxPlatform.h"
 #include "mozIDOMWindow.h"
 #include "nsAppShell.h"
 #include "nsCOMPtr.h"
 #include "nsIChannel.h"
 #include "nsIDOMWindowUtils.h"
 #include "nsIDOMClientRect.h"
 #include "nsIDocShell.h"
--- a/widget/android/nsAppShell.cpp
+++ b/widget/android/nsAppShell.cpp
@@ -58,20 +58,20 @@
 #include "nsExceptionHandler.h"
 #endif
 
 #include "AndroidAlerts.h"
 #include "ANRReporter.h"
 #include "GeckoBatteryManager.h"
 #include "GeckoNetworkManager.h"
 #include "GeckoScreenOrientation.h"
-#include "MemoryMonitor.h"
 #include "PrefsHelper.h"
-#include "Telemetry.h"
-#include "ThumbnailHelper.h"
+#include "fennec/MemoryMonitor.h"
+#include "fennec/Telemetry.h"
+#include "fennec/ThumbnailHelper.h"
 
 #ifdef DEBUG_ANDROID_EVENTS
 #define EVLOG(args...)  ALOG(args)
 #else
 #define EVLOG(args...) do { } while (0)
 #endif
 
 using namespace mozilla;