bug 829523 followup - use MOZ_WIDGET_GONK for the platform conditional, rather than MOZ_B2G. r=cjones
authorJonathan Kew <jkew@mozilla.com>
Wed, 30 Jan 2013 12:03:39 +0000
changeset 120365 7ae2b53bd0b732f3a98578285a89b0b8df810712
parent 120364 85ea275d77b91bf6e9081639ce92be0043e3ca9e
child 120366 538d00d025c41f4b5d6f4f7f88e42147ab2478d1
push id24251
push userryanvm@gmail.com
push dateThu, 31 Jan 2013 20:56:22 +0000
treeherdermozilla-central@683b08dc1afd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerscjones
bugs829523
milestone21.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 829523 followup - use MOZ_WIDGET_GONK for the platform conditional, rather than MOZ_B2G. r=cjones
gfx/thebes/gfxAndroidPlatform.cpp
--- a/gfx/thebes/gfxAndroidPlatform.cpp
+++ b/gfx/thebes/gfxAndroidPlatform.cpp
@@ -255,23 +255,23 @@ gfxAndroidPlatform::FontHintingEnabled()
 #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
+#endif //  MOZ_USING_ANDROID_JAVA_WIDGETS
 
-#ifdef MOZ_B2G
+#ifdef MOZ_WIDGET_GONK
     // On B2G, the UX preference is currently to keep hinting disabled
     // for all text (see bug 829523).
     return false;
-#endif //  MOZ_USING_ANDROID_JAVA_WIDGETS
+#endif
 
     // Currently, we don't have any other targets, but if/when we do,
     // decide how to handle them here.
 
     NS_NOTREACHED("oops, what platform is this?");
     return gfxPlatform::FontHintingEnabled();
 }
 
@@ -283,17 +283,17 @@ gfxAndroidPlatform::RequiresLinearZoom()
     // 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
 
-#ifdef MOZ_B2G
+#ifdef MOZ_WIDGET_GONK
     // On B2G, we need linear zoom for the browser, but otherwise prefer
     // the improved glyph spacing that results from respecting the device
     // pixel resolution for glyph layout (see bug 816614).
     return XRE_GetProcessType() == GeckoProcessType_Content &&
            ContentChild::GetSingleton()->IsForBrowser();
 #endif
 
     NS_NOTREACHED("oops, what platform is this?");