Backed out changeset 43ecf82afb92 (bug 1270241) for android reftest failures
authorWes Kocher <wkocher@mozilla.com>
Tue, 31 May 2016 16:06:06 -0700
changeset 324299 1f44042a7baff06e2d8afd124574286f0e716c95
parent 324298 a62db76a344a395d3d12790490d4145bc16e6af4
child 324300 6f17ed092065401027c426535657ea3af981b668
push id9671
push userraliiev@mozilla.com
push dateMon, 06 Jun 2016 20:27:52 +0000
treeherdermozilla-aurora@cea65ca3d0bd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1270241
milestone49.0a1
backs out43ecf82afb926bffd86a4154f2efc8059c073f58
Backed out changeset 43ecf82afb92 (bug 1270241) for android reftest failures
gfx/thebes/gfxAndroidPlatform.cpp
gfx/thebes/moz.build
--- a/gfx/thebes/gfxAndroidPlatform.cpp
+++ b/gfx/thebes/gfxAndroidPlatform.cpp
@@ -308,25 +308,25 @@ gfxAndroidPlatform::GetScaledFontForFont
 }
 
 bool
 gfxAndroidPlatform::FontHintingEnabled()
 {
     // In "mobile" builds, we sometimes use non-reflow-zoom, so we
     // might not want hinting.  Let's see.
 
-#ifdef MOZ_WIDGET_ANDROID
-    // On Android, we currently only use gecko to render web
+#ifdef MOZ_USING_ANDROID_JAVA_WIDGETS
+    // On android-java, we currently only use gecko to render web
     // content that can always be be non-reflow-zoomed.  So turn off
     // hinting.
     // 
     // XXX when gecko-android-java is used as an "app runtime", we may
     // want to re-enable hinting for non-browser processes there.
     return false;
-#endif //  MOZ_WIDGET_ANDROID
+#endif //  MOZ_USING_ANDROID_JAVA_WIDGETS
 
 #ifdef MOZ_WIDGET_GONK
     // On B2G, the UX preference is currently to keep hinting disabled
     // for all text (see bug 829523).
     return false;
 #endif
 
     // Currently, we don't have any other targets, but if/when we do,
@@ -334,18 +334,18 @@ gfxAndroidPlatform::FontHintingEnabled()
 
     NS_NOTREACHED("oops, what platform is this?");
     return gfxPlatform::FontHintingEnabled();
 }
 
 bool
 gfxAndroidPlatform::RequiresLinearZoom()
 {
-#ifdef MOZ_WIDGET_ANDROID
-    // On Android, we currently only use gecko to render web
+#ifdef MOZ_USING_ANDROID_JAVA_WIDGETS
+    // On android-java, we currently only use gecko to render web
     // content that can always be be non-reflow-zoomed.
     //
     // XXX when gecko-android-java is used as an "app runtime", we may
     // want to treat it like B2G and use linear zoom only for the web
     // browser process, not other apps.
     return true;
 #endif
 
--- a/gfx/thebes/moz.build
+++ b/gfx/thebes/moz.build
@@ -284,16 +284,21 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'wind
 CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
 CXXFLAGS += CONFIG['TK_CFLAGS']
 CFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
 CFLAGS += CONFIG['TK_CFLAGS']
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk', 'qt'):
     CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
 
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
+    # This is set for "normal Android", that is, when Gecko is running on
+    # top of the android java runtime.
+    DEFINES['MOZ_USING_ANDROID_JAVA_WIDGETS'] = True
+
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'qt'):
     CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']
 
 LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']
 
 DEFINES['GRAPHITE2_STATIC'] = True
 
 if CONFIG['CLANG_CXX']: