Remove all code related to NaCl

BUG=skia:3600
DOCS_PREVIEW= https://skia.org/?cl=1036283002

Review URL: https://codereview.chromium.org/1036283002

15 files changed, 72 insertions, 230 deletions

diff --git a/gyp/SampleApp.gyp b/gyp/SampleApp.gyp
index 170145d9f1..402c4247ab 100644
--- a/gyp/SampleApp.gyp
+++ b/gyp/SampleApp.gyp
@@ -297,11 +297,6 @@
             'gputest.gyp:skgputest',
           ],
         }],
-        [ 'skia_os == "nacl"', {
-          'sources': [
-            '../../nacl/src/nacl_sample.cpp',
-          ],
-        }],
       ],
       'msvs_settings': {
         'VCLinkerTool': {
diff --git a/gyp/apptype_console.gypi b/gyp/apptype_console.gypi
index 242b0f563a..d3613b3662 100644
--- a/gyp/apptype_console.gypi
+++ b/gyp/apptype_console.gypi
@@ -29,11 +29,6 @@
           'android_output.gyp:android_output',
         ],
       }],
-      [ 'skia_os == "nacl"', {
-        'dependencies': [
-          'nacl.gyp:nacl_interface',
-        ],
-      }],
       ['skia_os == "ios"', {
         'target_conditions': [
           ['_type == "executable"', {
diff --git a/gyp/common.gypi b/gyp/common.gypi
index ce3fc2669d..f0d653f82a 100644
--- a/gyp/common.gypi
+++ b/gyp/common.gypi
@@ -25,7 +25,6 @@
     'variables': {
       'conditions': [
         [ 'skia_os != OS and not ((skia_os == "ios" and OS == "mac") or \
-                                  (skia_os == "nacl" and OS == "linux") or \
                                   (skia_os == "chromeos" and OS == "linux"))', {
           'error': '<!(Cannot build with skia_os=<(skia_os) on OS=<(OS))',
         }],
@@ -38,9 +37,6 @@
         [ 'skia_arch_width != 32 and skia_arch_width != 64', {
           'error': '<!(skia_arch_width can only be 32 or 64 bits not <(skia_arch_width) bits)',
         }],
-        [ 'skia_os == "nacl" and OS != "linux"', {
-          'error': '<!(Skia NaCl build only currently supported on Linux.)',
-        }],
         [ 'skia_os == "chromeos" and OS != "linux"', {
           'error': '<!(Skia ChromeOS build is only supported on Linux.)',
         }],
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index 5f99eae340..6be5c86a7a 100644
--- a/gyp/common_conditions.gypi
+++ b/gyp/common_conditions.gypi
@@ -208,7 +208,7 @@
     ],
 
     # The following section is common to linux + derivatives and android
-    [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos", "android"]',
+    [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos", "android"]',
       {
         'cflags': [
           '-g',
@@ -329,13 +329,6 @@
       },
     ],
 
-    [ 'skia_os == "nacl"', {
-      # NaCl compiler is GCC 4.4, which is too old to understand 'c++11', so call it '0x'.
-      # NaCl's newlib needs gnu++ mode to see snprintf, vsnprintf, etc in C++11 mode.
-      'cflags_cc!': [ '-std=c++11' ],
-      'cflags_cc' : [ '-std=gnu++0x' ],
-    }],
-
     ['skia_android_framework', {
       'includes' : [
         'skia_for_android_framework_defines.gypi',
@@ -407,7 +400,7 @@
       ],
     }],
 
-    [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos"]',
+    [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]',
       {
         'defines': [
           'SK_SAMPLES_FOR_X',
@@ -434,26 +427,6 @@
               'SKIA_IMPLEMENTATION=1',
             ],
           }],
-          [ 'skia_os == "nacl"', {
-            'defines': [
-              'SK_BUILD_FOR_NACL',
-            ],
-            'variables': {
-              'nacl_sdk_root': '<!(echo ${NACL_SDK_ROOT})',
-            },
-            'link_settings': {
-              'libraries': [
-                '-lppapi',
-                '-lppapi_cpp',
-                '-lnosys',
-                '-pthread',
-              ],
-              'ldflags': [
-                '-L<(nacl_sdk_root)/lib/newlib_x86_<(skia_arch_width)/Release',
-                '-L<(nacl_sdk_root)/ports/lib/newlib_x86_<(skia_arch_width)/Release',
-              ],
-            },
-          }],
           # Enable asan, tsan, etc.
           [ 'skia_sanitizer', {
             'cflags': [
diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi
index 80ab7c91ed..b9f0bd7a9a 100644
--- a/gyp/common_variables.gypi
+++ b/gyp/common_variables.gypi
@@ -102,10 +102,7 @@
           'arm_version%': 7,
           'arm_neon%': 0, # neon asm files known not to work with the ios build
         }],
-        [ 'skia_os == "nacl"', {
-          'skia_egl%': 1,
-        }],
-        [ 'skia_os in ["android", "nacl"] and not skia_android_framework',
+        [ 'skia_os == "android" and not skia_android_framework',
           # skia_freetype_static - on OS variants that normally would
           #     dynamically link the system FreeType library, don't do
           #     that; instead statically link to the version in
diff --git a/gyp/debugger.gyp b/gyp/debugger.gyp
index 03f05907eb..e9133901e6 100644
--- a/gyp/debugger.gyp
+++ b/gyp/debugger.gyp
@@ -89,6 +89,8 @@
         '../src/ports',     # To pull SkFontDescriptor.h
         '../bench',
         '../tools',
+        '../debugger/QT',   # For all the QT UI Goodies
+        '<@(qt_includes)',
       ],
       'sources': [
         '../debugger/SkDebugger.cpp',
@@ -98,100 +100,75 @@
         '../src/utils/debugger/SkDrawCommand.cpp',
         '../src/utils/debugger/SkObjectParser.h',
         '../src/utils/debugger/SkObjectParser.cpp',
+        '../debugger/debuggermain.cpp',
+        '../debugger/QT/SkDebuggerGUI.cpp',
+        '../debugger/QT/SkDebuggerGUI.h',
+        '../debugger/QT/SkDrawCommandGeometryWidget.h',
+        '../debugger/QT/SkDrawCommandGeometryWidget.cpp',
+        '../debugger/QT/SkCanvasWidget.cpp',
+        '../debugger/QT/SkCanvasWidget.h',
+        '../debugger/QT/SkInspectorWidget.h',
+        '../debugger/QT/SkInspectorWidget.cpp',
+        '../debugger/QT/SkListWidget.h',
+        '../debugger/QT/SkListWidget.cpp',
+        '../debugger/QT/SkSettingsWidget.h',
+        '../debugger/QT/SkSettingsWidget.cpp',
+        '../debugger/QT/SkGLWidget.h',
+        '../debugger/QT/SkGLWidget.cpp',
+        '../debugger/QT/SkRasterWidget.h',
+        '../debugger/QT/SkRasterWidget.cpp',
+
+        # To update this file edit SkIcons.qrc and rerun rcc to generate cpp
+        '../debugger/QT/qrc_SkIcons.cpp',
+
+        # Generated MOC files
+        '<(moc_gen_dir)/moc_SkCanvasWidget.cpp',
+        '<(moc_gen_dir)/moc_SkDebuggerGUI.cpp',
+        '<(moc_gen_dir)/moc_SkDrawCommandGeometryWidget.cpp',
+        '<(moc_gen_dir)/moc_SkInspectorWidget.cpp',
+        '<(moc_gen_dir)/moc_SkSettingsWidget.cpp',
+        '<(moc_gen_dir)/moc_SkRasterWidget.cpp',
+        '<(moc_gen_dir)/moc_SkGLWidget.cpp',
       ],
       'dependencies': [
+        'debugger_qt_mocs',
         'skia_lib.gyp:skia_lib',
         'tools.gyp:picture_renderer',
         'tools.gyp:timer',
       ],
-      'conditions': [
-        [ 'skia_os == "nacl"', {
-          'include_dirs': [
-            '../src/utils',
-          ],
-          'sources': [
-            '../platform_tools/nacl/src/nacl_debugger.cpp',
-          ],
-        }, { # skia_os != "nacl"
-          'include_dirs': [
-            '../debugger/QT',   # For all the QT UI Goodies
-            '<@(qt_includes)',
-          ],
-          'sources': [
-            '../debugger/debuggermain.cpp',
-            '../debugger/QT/SkDebuggerGUI.cpp',
-            '../debugger/QT/SkDebuggerGUI.h',
-            '../debugger/QT/SkDrawCommandGeometryWidget.h',
-            '../debugger/QT/SkDrawCommandGeometryWidget.cpp',
-            '../debugger/QT/SkCanvasWidget.cpp',
-            '../debugger/QT/SkCanvasWidget.h',
-            '../debugger/QT/SkInspectorWidget.h',
-            '../debugger/QT/SkInspectorWidget.cpp',
-            '../debugger/QT/SkListWidget.h',
-            '../debugger/QT/SkListWidget.cpp',
-            '../debugger/QT/SkSettingsWidget.h',
-            '../debugger/QT/SkSettingsWidget.cpp',
-            '../debugger/QT/SkGLWidget.h',
-            '../debugger/QT/SkGLWidget.cpp',
-            '../debugger/QT/SkRasterWidget.h',
-            '../debugger/QT/SkRasterWidget.cpp',
-
-            # To update this file edit SkIcons.qrc and rerun rcc to generate cpp
-            '../debugger/QT/qrc_SkIcons.cpp',
-
-            # Generated MOC files
-            '<(moc_gen_dir)/moc_SkCanvasWidget.cpp',
-            '<(moc_gen_dir)/moc_SkDebuggerGUI.cpp',
-            '<(moc_gen_dir)/moc_SkDrawCommandGeometryWidget.cpp',
-            '<(moc_gen_dir)/moc_SkInspectorWidget.cpp',
-            '<(moc_gen_dir)/moc_SkSettingsWidget.cpp',
-            '<(moc_gen_dir)/moc_SkRasterWidget.cpp',
-            '<(moc_gen_dir)/moc_SkGLWidget.cpp',
-          ],
-          'cflags': [
-            # Clang gets confused by QWeakPointer, see http://llvm.org/bugs/show_bug.cgi?id=13127
-            '-Wno-uninitialized',
-          ],
-          'dependencies': [
-            'debugger_qt_mocs',
-          ],
-          'link_settings': {
-            'libraries': [
-              '<@(qt_libs)',
-            ],
-          },
-        }],
+      'cflags': [
+        # Clang gets confused by QWeakPointer, see http://llvm.org/bugs/show_bug.cgi?id=13127
+        '-Wno-uninitialized',
       ],
+      'link_settings': {
+        'libraries': [
+          '<@(qt_libs)',
+        ],
+      },
     },
-  ],
-  'conditions': [
-    [ 'skia_os != "nacl"', {
-      'targets': [
+    {
+      'target_name': 'debugger_qt_mocs',
+      'type': 'none',
+      'sources': [
+        '<(moc_src_dir)/SkCanvasWidget.h',
+        '<(moc_src_dir)/SkDebuggerGUI.h',
+        '<(moc_src_dir)/SkDrawCommandGeometryWidget.h',
+        '<(moc_src_dir)/SkInspectorWidget.h',
+        '<(moc_src_dir)/SkSettingsWidget.h',
+        '<(moc_src_dir)/SkRasterWidget.h',
+        '<(moc_src_dir)/SkGLWidget.h',
+      ],
+      'rules': [
         {
-          'target_name': 'debugger_qt_mocs',
-          'type': 'none',
-          'sources': [
-            '<(moc_src_dir)/SkCanvasWidget.h',
-            '<(moc_src_dir)/SkDebuggerGUI.h',
-            '<(moc_src_dir)/SkDrawCommandGeometryWidget.h',
-            '<(moc_src_dir)/SkInspectorWidget.h',
-            '<(moc_src_dir)/SkSettingsWidget.h',
-            '<(moc_src_dir)/SkRasterWidget.h',
-            '<(moc_src_dir)/SkGLWidget.h',
-          ],
-          'rules': [
-            {
-              'rule_name': 'generate_moc',
-              'extension': 'h',
-              'outputs': [ '<(moc_gen_dir)/moc_<(RULE_INPUT_ROOT).cpp' ],
-              'action': [ '<(qt_moc)', '-DSK_SUPPORT_GPU=<(skia_gpu)',
-                          '<(RULE_INPUT_PATH)',
-                          '-o', '<(moc_gen_dir)/moc_<(RULE_INPUT_ROOT).cpp' ],
-              'message': 'Generating <(RULE_INPUT_ROOT).cpp.',
-            },
-          ],
+          'rule_name': 'generate_moc',
+          'extension': 'h',
+          'outputs': [ '<(moc_gen_dir)/moc_<(RULE_INPUT_ROOT).cpp' ],
+          'action': [ '<(qt_moc)', '-DSK_SUPPORT_GPU=<(skia_gpu)',
+                      '<(RULE_INPUT_PATH)',
+                      '-o', '<(moc_gen_dir)/moc_<(RULE_INPUT_ROOT).cpp' ],
+          'message': 'Generating <(RULE_INPUT_ROOT).cpp.',
         },
       ],
-    }],
+    },
   ],
 }
diff --git a/gyp/freetype.gyp b/gyp/freetype.gyp
index 7187d9af14..85018a49ac 100644
--- a/gyp/freetype.gyp
+++ b/gyp/freetype.gyp
@@ -18,11 +18,11 @@
               'freetype_static'
             ],
             'conditions': [
-              [ 'skia_os in ["android", "nacl"]',
+              [ 'skia_os == "android"',
                 {
                   'direct_dependent_settings': {
                     'defines': [
-                      # Both Android and NaCl provide at least FreeType 2.4.0
+                      # Android provides at least FreeType 2.4.0
                       'SK_FONTHOST_FREETYPE_RUNTIME_VERSION=0x020400',
                       'SK_CAN_USE_DLOPEN=0',
                     ],
diff --git a/gyp/gpu.gyp b/gyp/gpu.gyp
index 8e4cb070b2..7d3dad5463 100644
--- a/gyp/gpu.gyp
+++ b/gyp/gpu.gyp
@@ -26,11 +26,7 @@
         'sources/': [ ['exclude', '_android.(h|cpp)$'],
         ],
       }],
-      ['skia_os != "nacl"', {
-        'sources/': [ ['exclude', '_nacl.(h|cpp)$'],
-        ],
-      }],
-      ['skia_os == "nacl" or skia_egl == 0', {
+      ['skia_egl == 0', {
         'sources/': [ ['exclude', '_egl.(h|cpp)$'],
         ],
       }],
@@ -170,13 +166,6 @@
             ],
           },
         }],
-        [ 'skia_os == "nacl"', {
-          'link_settings': {
-            'libraries': [
-              '-lppapi_gles2',
-            ],
-          },
-        }],
         [ 'skia_egl == 1', {
           'defines': [
             'SK_EGL=1',
diff --git a/gyp/gpu.gypi b/gyp/gpu.gypi
index a2c227a1b0..cb57aae483 100644
--- a/gyp/gpu.gypi
+++ b/gyp/gpu.gypi
@@ -354,7 +354,6 @@
 
       # Sk files
       '<(skia_src_path)/gpu/gl/mac/SkCreatePlatformGLContext_mac.cpp',
-      '<(skia_src_path)/gpu/gl/nacl/SkCreatePlatformGLContext_nacl.cpp',
       '<(skia_src_path)/gpu/gl/win/SkCreatePlatformGLContext_win.cpp',
       '<(skia_src_path)/gpu/gl/glx/SkCreatePlatformGLContext_glx.cpp',
       '<(skia_src_path)/gpu/gl/egl/SkCreatePlatformGLContext_egl.cpp',
diff --git a/gyp/images.gyp b/gyp/images.gyp
index 34cc8a8fa8..d40626db73 100644
--- a/gyp/images.gyp
+++ b/gyp/images.gyp
@@ -123,18 +123,6 @@
           ],
           # end libpng stuff
         }],
-        # FIXME: NaCl should be just like linux, etc, above, but it currently is separated out
-        # to remove gif. Once gif is supported by naclports, this can be merged into the above
-        # condition.
-        [ 'skia_os == "nacl"', {
-          'sources!': [
-            '../src/images/SkImageDecoder_libgif.cpp',
-            '../src/images/SkMovie_gif.cpp',
-          ],
-          'dependencies!': [
-            'giflib.gyp:giflib'
-          ],
-        }],
         [ 'skia_os == "android"', {
           'include_dirs': [
              '../src/utils',
diff --git a/gyp/nacl.gyp b/gyp/nacl.gyp
deleted file mode 100644
index d98b2c28ee..0000000000
--- a/gyp/nacl.gyp
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2015 Google Inc.
-#
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-# Common entry point for all Skia executables running in NaCl
-{
-  'targets': [
-    {
-      'target_name': 'nacl_interface',
-      'type': 'static_library',
-      'dependencies': [
-        'skia_lib.gyp:skia_lib',
-      ],
-      'include_dirs': [
-        # For SkThreadUtils.h
-        '../src/utils',
-      ],
-      'sources': [
-        '../platform_tools/nacl/src/nacl_interface.cpp',
-      ],
-    },
-  ],
-}
diff --git a/gyp/ports.gyp b/gyp/ports.gyp
index 0f442cde1b..48fe89f37a 100644
--- a/gyp/ports.gyp
+++ b/gyp/ports.gyp
@@ -26,7 +26,6 @@
         '../src/utils',
       ],
       'sources': [
-        '../src/ports/SkDebug_nacl.cpp',
         '../src/ports/SkDebug_stdio.cpp',
         '../src/ports/SkDebug_win.cpp',
 
@@ -59,7 +58,7 @@
         '../include/ports/SkRemotableFontMgr.h',
       ],
       'conditions': [
-        [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos", "nacl", "android"]', {
+        [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos", "android"]', {
           'sources': [
             '../src/ports/SkFontHost_FreeType.cpp',
             '../src/ports/SkFontHost_FreeType_common.cpp',
@@ -130,18 +129,6 @@
             }]
           ],
         }],
-        [ 'skia_os == "nacl"', {
-          'sources': [
-            '../src/ports/SkFontHost_linux.cpp',
-          ],
-          'sources!': [
-            '../src/ports/SkDebug_stdio.cpp',
-          ],
-        }, {
-          'sources!': [
-            '../src/ports/SkDebug_nacl.cpp',
-          ],
-        }],
         [ 'skia_os == "mac"', {
           'include_dirs': [
             '../include/utils/mac',
diff --git a/gyp/tools.gyp b/gyp/tools.gyp
index 55f4819371..7b8122c3e3 100644
--- a/gyp/tools.gyp
+++ b/gyp/tools.gyp
@@ -242,22 +242,12 @@
       'target_name': 'skhello',
       'type': 'executable',
       'dependencies': [
+        'flags.gyp:flags',
+        'pdf.gyp:pdf',
         'skia_lib.gyp:skia_lib',
       ],
-      'conditions': [
-        [ 'skia_os == "nacl"', {
-          'sources': [
-            '../platform_tools/nacl/src/nacl_hello.cpp',
-          ],
-        }, {
-          'sources': [
-            '../tools/skhello.cpp',
-          ],
-          'dependencies': [
-            'flags.gyp:flags',
-            'pdf.gyp:pdf',
-          ],
-        }],
+      'sources': [
+        '../tools/skhello.cpp',
       ],
     },
     {
@@ -653,7 +643,6 @@
           '<(skia_include_path)/views/SkOSWindow_Android.h',
           '<(skia_include_path)/views/SkOSWindow_iOS.h',
           '<(skia_include_path)/views/SkOSWindow_Mac.h',
-          '<(skia_include_path)/views/SkOSWindow_NaCl.h',
           '<(skia_include_path)/views/SkOSWindow_SDL.h',
           '<(skia_include_path)/views/SkOSWindow_Unix.h',
           '<(skia_include_path)/views/SkOSWindow_Win.h',
diff --git a/gyp/utils.gyp b/gyp/utils.gyp
index 73a9d329e3..d5b2ef7cdd 100644
--- a/gyp/utils.gyp
+++ b/gyp/utils.gyp
@@ -107,14 +107,6 @@
             '../src/utils/win/SkIStream.cpp',
           ],
         }],
-        [ 'skia_os == "nacl"', {
-          'sources': [
-            '../src/utils/SkThreadUtils_pthread_other.cpp',
-          ],
-          'sources!': [
-            '../src/utils/SkThreadUtils_pthread_linux.cpp',
-          ],
-        }],
         ['skia_run_pdfviewer_in_gm', {
           'defines': [
             'SK_BUILD_NATIVE_PDF_RENDERER',
diff --git a/gyp/views.gyp b/gyp/views.gyp
index a69d40eedf..06b5fcc42c 100644
--- a/gyp/views.gyp
+++ b/gyp/views.gyp
@@ -32,7 +32,6 @@
         '../include/views/SkKey.h',
         '../include/views/SkOSMenu.h',
         '../include/views/SkOSWindow_Mac.h',
-        '../include/views/SkOSWindow_NaCl.h',
         '../include/views/SkOSWindow_SDL.h',
         '../include/views/SkOSWindow_Unix.h',
         '../include/views/SkOSWindow_Win.h',
@@ -122,17 +121,6 @@
             '../src/views/win/skia_win.cpp',
           ],
         }],
-        [ 'skia_os == "nacl"', {
-          'sources!': [
-            '../src/views/unix/SkOSWindow_Unix.cpp',
-            '../src/views/unix/keysym2ucs.c',
-            '../src/views/unix/skia_unix.cpp',
-          ],
-        }, {
-          'sources!': [
-            '../src/views/nacl/SkOSWindow_NaCl.cpp',
-          ],
-        }],
         [ 'skia_gpu == 1', {
           'include_dirs': [
             '../include/gpu',