Back out 400861eb8c62 (Bug 1236323 - Part 2) for unearthing Skia -Wunreachable-code warnings-as-errors
authorChris Peterson <cpeterson@mozilla.com>
Fri, 08 Jan 2016 00:32:01 -0800
changeset 279132 2c86ca757a1ec2514eb6ac2d47ada5fd29cceac3
parent 279131 f998906d53bca783b99762b7999f9e692d1ec367
child 279133 d607fcbd12d493b9bdea164c873448d212573f77
push id29871
push userphilringnalda@gmail.com
push dateSat, 09 Jan 2016 19:40:57 +0000
treeherdermozilla-central@9afb89dd315f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1236323
milestone46.0a1
backs out400861eb8c6202ea6b009fcf072010164f50bb93
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
Back out 400861eb8c62 (Bug 1236323 - Part 2) for unearthing Skia -Wunreachable-code warnings-as-errors
gfx/2d/moz.build
gfx/gl/moz.build
gfx/thebes/moz.build
--- a/gfx/2d/moz.build
+++ b/gfx/2d/moz.build
@@ -86,28 +86,23 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'wi
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'windows':
     SOURCES += [
         'JobScheduler_posix.cpp',
     ]
 
 if CONFIG['MOZ_ENABLE_SKIA']:
     UNIFIED_SOURCES += [
         'convolver.cpp',
-    ]
-    SOURCES += [
         'DrawTargetSkia.cpp',
-        'image_operations.cpp', # Uses _USE_MATH_DEFINES
         'PathSkia.cpp',
         'SourceSurfaceSkia.cpp',
     ]
-    if CONFIG['CLANG_CXX']:
-        # Suppress warnings from Skia header files.
-        SOURCES['DrawTargetSkia.cpp'].flags += ['-Wno-implicit-fallthrough']
-        SOURCES['PathSkia.cpp'].flags += ['-Wno-implicit-fallthrough']
-        SOURCES['SourceSurfaceSkia.cpp'].flags += ['-Wno-implicit-fallthrough']
+    SOURCES += [
+        'image_operations.cpp', # Uses _USE_MATH_DEFINES
+    ]
     EXPORTS.mozilla.gfx += [
         'HelpersSkia.h',
         'RefPtrSkia.h',
     ]
 
 # Are we targeting x86 or x64?  If so, build SSE2 files.
 if CONFIG['INTEL_ARCHITECTURE']:
     SOURCES += [
@@ -143,16 +138,17 @@ UNIFIED_SOURCES += [
     'DrawEventRecorder.cpp',
     'DrawingJob.cpp',
     'DrawTarget.cpp',
     'DrawTargetCairo.cpp',
     'DrawTargetCapture.cpp',
     'DrawTargetDual.cpp',
     'DrawTargetRecording.cpp',
     'DrawTargetTiled.cpp',
+    'Factory.cpp',
     'FilterNodeSoftware.cpp',
     'FilterProcessing.cpp',
     'FilterProcessingScalar.cpp',
     'ImageScaling.cpp',
     'JobScheduler.cpp',
     'Matrix.cpp',
     'Path.cpp',
     'PathCairo.cpp',
@@ -165,23 +161,16 @@ UNIFIED_SOURCES += [
     'ScaledFontBase.cpp',
     'ScaledFontCairo.cpp',
     'SFNTData.cpp',
     'SFNTNameTable.cpp',
     'SourceSurfaceCairo.cpp',
     'SourceSurfaceRawData.cpp',
 ]
 
-SOURCES += [
-    'Factory.cpp', # Need to suppress warnings in Skia header files.
-]
-
-if CONFIG['CLANG_CXX']:
-    SOURCES['Factory.cpp'].flags += ['-Wno-implicit-fallthrough']
-
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     EXPORTS.mozilla.gfx += [
         'QuartzSupport.h',
     ]
     SOURCES += [
         'MacIOSurface.cpp',
         'QuartzSupport.mm',
     ]
--- a/gfx/gl/moz.build
+++ b/gfx/gl/moz.build
@@ -75,22 +75,19 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'wind
     ]
     UNIFIED_SOURCES += [
         'GLContextProviderWGL.cpp',
         'SharedSurfaceANGLE.cpp',
         'SharedSurfaceD3D11Interop.cpp',
     ]
 if CONFIG['MOZ_ENABLE_SKIA_GPU']:
     EXPORTS += ['SkiaGLGlue.h']
-    SOURCES += [
+    UNIFIED_SOURCES += [
         'SkiaGLGlue.cpp',
     ]
-    if CONFIG['CLANG_CXX']:
-        # Suppress warnings from Skia header files.
-        SOURCES['SkiaGLGlue.cpp'].flags += ['-Wno-implicit-fallthrough']
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     UNIFIED_SOURCES += ['SharedSurfaceGralloc.cpp']
     EXPORTS += ['SharedSurfaceGralloc.h']
     LOCAL_INCLUDES += ['/widget/gonk']
     LOCAL_INCLUDES += ['%' + '%s/%s' % (CONFIG['ANDROID_SOURCE'], 'hardware/libhardware/include')]
 
 if gl_provider == 'CGL':
--- a/gfx/thebes/moz.build
+++ b/gfx/thebes/moz.build
@@ -302,12 +302,8 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'andr
     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']:
-    # Suppress warnings from Skia header files.
-    SOURCES['gfxPlatform.cpp'].flags += ['-Wno-implicit-fallthrough']