Merge third_party/skia/gyp from https://chromium.googlesource.com/external/skia/gyp.git at a10662e47e520014f5aad5ce162edb8c9a81c2db

This commit was generated by merge_from_chromium.py.

Change-Id: Id2aa04cc30e26409b5239bcd257faa3321784d94

11 files changed, 107 insertions, 24 deletions

diff --git a/SampleApp.gyp b/SampleApp.gyp
index c2f0950..16a5c30 100644
--- a/SampleApp.gyp
+++ b/SampleApp.gyp
@@ -12,6 +12,8 @@
       'include_dirs' : [
         '../src/core',
         '../src/effects', #needed for BlurMask.h
+        '../src/images',
+        '../src/lazy',
         '../gm',       # needed to pull gm.h
         '../samplecode', # To pull SampleApp.h and SampleCode.h
         '../src/pipe/utils', # For TiledPipeController
diff --git a/core.gypi b/core.gypi
index 9edb2ce..69e8a56 100644
--- a/core.gypi
+++ b/core.gypi
@@ -14,7 +14,6 @@
         '<(skia_src_path)/core/SkAdvancedTypefaceMetrics.cpp',
         '<(skia_src_path)/core/SkAlphaRuns.cpp',
         '<(skia_src_path)/core/SkAntiRun.h',
-        '<(skia_src_path)/core/SkBBoxHierarchy.cpp',
         '<(skia_src_path)/core/SkBBoxHierarchy.h',
         '<(skia_src_path)/core/SkBBoxRecord.cpp',
         '<(skia_src_path)/core/SkBBoxRecord.h',
@@ -72,6 +71,7 @@
         '<(skia_src_path)/core/SkDevice.cpp',
         '<(skia_src_path)/core/SkDeviceLooper.cpp',
         '<(skia_src_path)/core/SkDeviceProfile.cpp',
+        '<(skia_src_path)/lazy/SkDiscardableMemoryPool.cpp',
         '<(skia_src_path)/lazy/SkDiscardablePixelRef.cpp',
         '<(skia_src_path)/core/SkDither.cpp',
         '<(skia_src_path)/core/SkDraw.cpp',
@@ -149,7 +149,6 @@
         '<(skia_src_path)/core/SkRasterClip.cpp',
         '<(skia_src_path)/core/SkRasterizer.cpp',
         '<(skia_src_path)/core/SkRect.cpp',
-        '<(skia_src_path)/core/SkRefCnt.cpp',
         '<(skia_src_path)/core/SkRefDict.cpp',
         '<(skia_src_path)/core/SkRegion.cpp',
         '<(skia_src_path)/core/SkRegionPriv.h',
@@ -309,23 +308,8 @@
         '<(skia_include_path)/core/SkXfermode.h',
 
         # Lazy decoding:
-        '<(skia_include_path)/lazy/SkBitmapFactory.h',
-        '<(skia_include_path)/lazy/SkImageCache.h',
-        '<(skia_include_path)/lazy/SkLruImageCache.h',
-        '<(skia_include_path)/lazy/SkPurgeableImageCache.h',
-
-        '<(skia_src_path)/lazy/SkBitmapFactory.cpp',
-        '<(skia_src_path)/lazy/SkLazyPixelRef.h',
-        '<(skia_src_path)/lazy/SkLazyPixelRef.cpp',
-        '<(skia_src_path)/lazy/SkLruImageCache.cpp',
-        '<(skia_src_path)/lazy/SkPurgeableMemoryBlock.h',
-        '<(skia_src_path)/lazy/SkPurgeableMemoryBlock_common.cpp',
-        '<(skia_src_path)/lazy/SkPurgeableImageCache.cpp',
-
         '<(skia_src_path)/lazy/SkCachingPixelRef.cpp',
         '<(skia_src_path)/lazy/SkCachingPixelRef.h',
-        '<(skia_src_path)/lazy/SkLazyCachingPixelRef.cpp',
-        '<(skia_src_path)/lazy/SkLazyCachingPixelRef.h',
 
         # Path ops
         '<(skia_include_path)/pathops/SkPathOps.h',
diff --git a/dm.gyp b/dm.gyp
index 7d8d5d8..8fa59c5 100644
--- a/dm.gyp
+++ b/dm.gyp
@@ -9,6 +9,8 @@
         'include_dirs': [
             '../dm',
             '../gm',
+            '../src/images',
+            '../src/lazy',
             '../src/core',
             '../src/effects',
             '../src/pipe/utils/',
diff --git a/everything.gyp b/everything.gyp
index 0a798b6..5d1697e 100644
--- a/everything.gyp
+++ b/everything.gyp
@@ -22,6 +22,7 @@
           'dependencies': [
             'debugger.gyp:debugger',
             'pdfviewer.gyp:pdfviewer',
+            #'v8.gyp:SkV8Example',
             ],
         }],
         # DM assumes you've got a GPU.
diff --git a/gm.gyp b/gm.gyp
index bc70e16..a543aca 100644
--- a/gm.gyp
+++ b/gm.gyp
@@ -29,6 +29,8 @@
       'type': 'executable',
       'include_dirs' : [
         '../src/core',
+        '../src/images',
+        '../src/lazy',
         '../src/effects',
         '../src/pipe/utils/',
         '../src/utils/',
diff --git a/gpu.gypi b/gpu.gypi
index 07cc1dd..3eb60d2 100644
--- a/gpu.gypi
+++ b/gpu.gypi
@@ -70,7 +70,6 @@
       '<(skia_src_path)/gpu/GrDrawTarget.h',
       '<(skia_src_path)/gpu/GrDrawTargetCaps.h',
       '<(skia_src_path)/gpu/GrEffect.cpp',
-      '<(skia_src_path)/gpu/GrGeometryBuffer.cpp',
       '<(skia_src_path)/gpu/GrGeometryBuffer.h',
       '<(skia_src_path)/gpu/GrClipMaskCache.h',
       '<(skia_src_path)/gpu/GrClipMaskCache.cpp',
diff --git a/images.gyp b/images.gyp
index e16a41f..6cc8965 100644
--- a/images.gyp
+++ b/images.gyp
@@ -38,6 +38,7 @@
         '../src/images/bmpdecoderhelper.h',
 
         '../src/images/SkDecodingImageGenerator.cpp',
+        '../src/images/SkDecodingImageGenerator.h',
         '../src/images/SkForceLinking.cpp',
         '../src/images/SkImageDecoder.cpp',
         '../src/images/SkImageDecoder_FactoryDefault.cpp',
diff --git a/public_headers.gypi b/public_headers.gypi
index b209e71..45114e8 100644
--- a/public_headers.gypi
+++ b/public_headers.gypi
@@ -297,10 +297,6 @@
       'views/SkOSWindow_Unix.h',
       'views/SkWidget.h',
       'views/SkOSWindow_Win.h',
-      'lazy/SkBitmapFactory.h',
-      'lazy/SkImageCache.h',
-      'lazy/SkPurgeableImageCache.h',
-      'lazy/SkLruImageCache.h',
     ],
   },
 }
diff --git a/tests.gyp b/tests.gyp
index aa228c5..ed1d077 100644
--- a/tests.gyp
+++ b/tests.gyp
@@ -33,7 +33,6 @@
         '../tests/ARGBImageEncoderTest.cpp',
         '../tests/AtomicTest.cpp',
         '../tests/BitmapCopyTest.cpp',
-        '../tests/BitmapFactoryTest.cpp',
         '../tests/BitmapGetColorTest.cpp',
         '../tests/BitmapHasherTest.cpp',
         '../tests/BitmapHeapTest.cpp',
@@ -56,6 +55,7 @@
         '../tests/DeferredCanvasTest.cpp',
         '../tests/DequeTest.cpp',
         '../tests/DeviceLooperTest.cpp',
+        '../tests/DiscardableMemoryPool.cpp',
         '../tests/DocumentTest.cpp',
         '../tests/DrawBitmapRectTest.cpp',
         '../tests/DrawPathTest.cpp',
diff --git a/tools.gyp b/tools.gyp
index b6086d5..04d4e3f 100644
--- a/tools.gyp
+++ b/tools.gyp
@@ -211,6 +211,9 @@
         '../tools/render_pictures_main.cpp',
       ],
       'include_dirs': [
+        '../src/core',
+        '../src/images',
+        '../src/lazy',
         '../src/pipe/utils/',
       ],
       'dependencies': [
@@ -232,6 +235,7 @@
         '../tools/PictureBenchmark.cpp',
       ],
       'include_dirs': [
+        '../src/core/',
         '../bench',
         '../src/lazy/',
       ],
@@ -258,7 +262,9 @@
         '../src/pipe/utils/SamplePipeControllers.cpp',
       ],
       'include_dirs': [
-        '../src/core/',
+        '../src/core',
+        '../src/images',
+        '../src/lazy',
         '../src/pipe/utils/',
         '../src/utils/',
       ],
diff --git a/v8.gyp b/v8.gyp
new file mode 100644
index 0000000..b6e065e
--- /dev/null
+++ b/v8.gyp
@@ -0,0 +1,90 @@
+# GYP file to build a V8 sample.
+{
+  'targets': [
+    {
+      'target_name': 'SkV8Example',
+      'type': 'executable',
+      'mac_bundle' : 1,
+      'include_dirs' : [
+        '../tools/flags',
+        '../../../v8/include',
+        ],
+      'includes': [],
+       'sources': [
+         '../experimental/SkV8Example/SkV8Example.h',
+         '../experimental/SkV8Example/SkV8Example.cpp',
+       ],
+       'dependencies': [
+         'skia_lib.gyp:skia_lib',
+         'views.gyp:views',
+         'xml.gyp:xml',
+       ],
+
+        'link_settings': {
+          'libraries': [
+
+#            'd:/src/v8/build/Debug/lib/v8_base.ia32.lib',
+#            'd:/src/v8/build/Debug/lib/v8_snapshot.lib',
+
+#            'd:/src/v8/build/Debug/lib/icuuc.lib',
+#            'd:/src/v8/build/Debug/lib/icui18n.lib',
+
+#            'Ws2_32.lib',
+#            'Winmm.lib',
+
+            '-lpthread',
+            '-lrt',
+            '../../../v8/out/native/obj.target/tools/gyp/libv8_base.x64.a',
+          '../../../v8/out/native/obj.target/tools/gyp/libv8_snapshot.a',
+
+          '../../../v8/out/native/obj.target/third_party/icu/libicudata.a',
+          '../../../v8/out/native/obj.target/third_party/icu/libicui18n.a',
+          '../../../v8/out/native/obj.target/third_party/icu/libicuuc.a',
+
+          '../../../v8/out/native/obj.target/icudata/third_party/icu/linux/icudt46l_dat.o',
+            ],
+        },
+       'conditions' : [
+         [ 'skia_gpu == 1', {
+           'include_dirs' : [
+             '../src/gpu',  #gl/GrGLUtil.h
+             ]
+         }],
+        [ 'skia_os == "win"', {
+         'sources' : [
+           '../src/views/win/SkOSWindow_Win.cpp',
+           '../src/views/win/skia_win.cpp',
+           ],
+          },
+        ],
+
+        [ 'skia_os == "mac"', {
+          'sources': [
+
+          '../src/views/mac/SampleAppDelegate.h',
+          '../src/views/mac/SampleAppDelegate.mm',
+          '../src/views/mac/SkEventNotifier.mm',
+          '../src/views/mac/skia_mac.mm',
+          '../src/views/mac/SkNSView.h',
+          '../src/views/mac/SkNSView.mm',
+          '../src/views/mac/SkOptionsTableView.h',
+          '../src/views/mac/SkOptionsTableView.mm',
+          '../src/views/mac/SkOSWindow_Mac.mm',
+          '../src/views/mac/SkTextFieldCell.h',
+          '../src/views/mac/SkTextFieldCell.m',
+          ],
+        'include_dirs' : [
+          '../src/views/mac/'
+          ],
+        'xcode_settings' : {
+          'INFOPLIST_FILE' : '../experimental/SkiaExamples/SkiaExamples-Info.plist',
+        },
+        'mac_bundle_resources' : [
+          '../experimental/SkiaExamples/SkiaExamples.xib'
+          ],
+        }
+      ],
+     ],
+    }
+  ],
+}