diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-12-27 06:58:56 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2020-12-27 06:58:56 +0000 |
| commit | 8d4456c797eea9236f4d84cdb23d85ce670152dc (patch) | |
| tree | 5328170540665a789e1d857957e433f253849f8b /gfx/2d | |
| parent | ae2a160348562dfa5361f1e68226365b240c9597 (diff) | |
| download | UXP-8d4456c797eea9236f4d84cdb23d85ce670152dc.tar UXP-8d4456c797eea9236f4d84cdb23d85ce670152dc.tar.gz UXP-8d4456c797eea9236f4d84cdb23d85ce670152dc.tar.lz UXP-8d4456c797eea9236f4d84cdb23d85ce670152dc.tar.xz UXP-8d4456c797eea9236f4d84cdb23d85ce670152dc.zip | |
Issue #1053 - Part 3a: Remove Android conditionals from /gfx
Diffstat (limited to 'gfx/2d')
| -rw-r--r-- | gfx/2d/Logging.h | 11 | ||||
| -rw-r--r-- | gfx/2d/image_operations.cpp | 2 | ||||
| -rw-r--r-- | gfx/2d/moz.build | 4 |
3 files changed, 3 insertions, 14 deletions
diff --git a/gfx/2d/Logging.h b/gfx/2d/Logging.h index e6be2a7e8..534ee3d40 100644 --- a/gfx/2d/Logging.h +++ b/gfx/2d/Logging.h @@ -16,9 +16,6 @@ #endif #include "mozilla/Tuple.h" -#if defined(MOZ_WIDGET_ANDROID) -#include "nsDebug.h" -#endif #include "Point.h" #include "BaseRect.h" #include "Matrix.h" @@ -141,9 +138,6 @@ struct BasicLogger // in the appropriate places in that method. static bool ShouldOutputMessage(int aLevel) { if (LoggingPrefs::sGfxLogLevel >= aLevel) { -#if defined(MOZ_WIDGET_ANDROID) - return true; -#else #if defined(MOZ_LOGGING) if (MOZ_LOG_TEST(GetGFX2DLog(), PRLogLevelForLevel(aLevel))) { return true; @@ -153,7 +147,6 @@ struct BasicLogger (aLevel < LOG_DEBUG)) { return true; } -#endif } return false; } @@ -174,9 +167,6 @@ struct BasicLogger // make the corresponding change in the ShouldOutputMessage method // above. if (LoggingPrefs::sGfxLogLevel >= aLevel) { -#if defined(MOZ_WIDGET_ANDROID) - printf_stderr("%s%s", aString.c_str(), aNoNewline ? "" : "\n"); -#else #if defined(MOZ_LOGGING) if (MOZ_LOG_TEST(GetGFX2DLog(), PRLogLevelForLevel(aLevel))) { PR_LogPrint("%s%s", aString.c_str(), aNoNewline ? "" : "\n"); @@ -186,7 +176,6 @@ struct BasicLogger (aLevel < LOG_DEBUG)) { printf("%s%s", aString.c_str(), aNoNewline ? "" : "\n"); } -#endif } } }; diff --git a/gfx/2d/image_operations.cpp b/gfx/2d/image_operations.cpp index 79fa879d9..e9492a150 100644 --- a/gfx/2d/image_operations.cpp +++ b/gfx/2d/image_operations.cpp @@ -303,7 +303,7 @@ SkBitmap ImageOperations::ResizeSubpixel(const SkBitmap& source, return result; #else return SkBitmap(); -#endif // OS_POSIX && !OS_MACOSX && !defined(OS_ANDROID) +#endif // OS_POSIX && !OS_MACOSX } // static diff --git a/gfx/2d/moz.build b/gfx/2d/moz.build index e1742f93d..4f437d575 100644 --- a/gfx/2d/moz.build +++ b/gfx/2d/moz.build @@ -201,12 +201,12 @@ FINAL_LIBRARY = 'xul' for var in ('USE_CAIRO', 'MOZ2D_HAS_MOZ_CAIRO'): DEFINES[var] = True -if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk2', 'gtk3'): +if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'): DEFINES['MOZ_ENABLE_FREETYPE'] = True CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS'] -if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk2', 'gtk3'): +if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'): CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS'] LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES'] |