Replace agg with skia

pdfium.gyp

Index: pdfium.gyp
diff --git a/pdfium.gyp b/pdfium.gyp
index ff619319ab70d9457047e04fc4dd2cc87df03987..6cc8c3e1f5e1c334f01cd6e73096069b32ae7f10 100644
--- a/pdfium.gyp
+++ b/pdfium.gyp
@@ -1,7 +1,4 @@
 {
-  'variables': {
-    'pdf_use_skia%': 0,
-  },
   'target_defaults': {
     'defines' : [
       'FOXIT_CHROME_BUILD',
@@ -10,9 +7,6 @@
       '_NO_GDIPLUS_',  # workaround text rendering issues on Windows
     ],
     'conditions': [
-      ['pdf_use_skia==1', {
-        'defines': ['_SKIA_SUPPORT_'],
-      }],
       ['OS=="linux"', {
         'cflags!': [
           '-fno-exceptions',
@@ -550,6 +544,9 @@
     {
       'target_name': 'fxge',
       'type': 'static_library',
+      'dependencies': [
+            '<(DEPTH)/skia/skia.gyp:skia',
+          ],
       'ldflags': [ '-L<(PRODUCT_DIR)',],
       'sources': [
         'core/include/fxge/fpf.h',
@@ -559,23 +556,6 @@
         'core/include/fxge/fx_ge.h',
         'core/include/fxge/fx_ge_apple.h',
         'core/include/fxge/fx_ge_win32.h',
-        'core/src/fxge/agg/include/fxfx_agg_basics.h',
-        'core/src/fxge/agg/include/fxfx_agg_clip_liang_barsky.h',
-        'core/src/fxge/agg/include/fxfx_agg_conv_dash.h',
-        'core/src/fxge/agg/include/fxfx_agg_conv_stroke.h',
-        'core/src/fxge/agg/include/fxfx_agg_curves.h',
-        'core/src/fxge/agg/include/fxfx_agg_path_storage.h',
-        'core/src/fxge/agg/include/fxfx_agg_rasterizer_scanline_aa.h',
-        'core/src/fxge/agg/include/fxfx_agg_renderer_scanline.h',
-        'core/src/fxge/agg/include/fxfx_agg_rendering_buffer.h',
-        'core/src/fxge/agg/include/fxfx_agg_scanline_u.h',
-        'core/src/fxge/agg/include/fx_agg_driver.h',
-        'core/src/fxge/agg/src/fxfx_agg_curves.cpp',
-        'core/src/fxge/agg/src/fxfx_agg_driver.cpp',
-        'core/src/fxge/agg/src/fxfx_agg_path_storage.cpp',
-        'core/src/fxge/agg/src/fxfx_agg_rasterizer_scanline_aa.cpp',
-        'core/src/fxge/agg/src/fxfx_agg_vcgen_dash.cpp',
-        'core/src/fxge/agg/src/fxfx_agg_vcgen_stroke.cpp',
         'core/src/fxge/android/fpf_skiafont.cpp',
         'core/src/fxge/android/fpf_skiafont.h',
         'core/src/fxge/android/fpf_skiafontmgr.cpp',
@@ -649,27 +629,10 @@
         'core/src/fxge/ge/fx_ge_ps.cpp',
         'core/src/fxge/ge/fx_ge_text.cpp',
         'core/src/fxge/ge/text_int.h',
+        'core/src/fxge/skia/fx_skia_blitter.cpp',
+        'core/src/fxge/skia/fx_skia_driver.cpp',
       ],
       'conditions': [
-        ['pdf_use_skia==1', {
-          'sources': [
-            'core/src/fxge/skia/fx_skia_blitter_new.cpp',
-            'core/src/fxge/skia/fx_skia_device.cpp',
-          ],
-          'dependencies': [
-            '<(DEPTH)/skia/skia.gyp:skia',
-          ],
-          'include_dirs': [
-            '<(DEPTH)/third_party/skia/include/config',
-            '<(DEPTH)/third_party/skia/include/core',
-            '<(DEPTH)/third_party/skia/include/effects',
-            '<(DEPTH)/third_party/skia/include/images',
-            '<(DEPTH)/third_party/skia/include/lazy',
-            '<(DEPTH)/third_party/skia/include/pathops',
-            '<(DEPTH)/third_party/skia/include/utils',
-            '<(DEPTH)/third_party/skia/src/core',
-          ],
-        }],
         ['OS=="win"', {
           'defines!': [
             'NOMINMAX',