From: Matthew Leibowitz <mattleibow@live.com>
Date: Fri, 18 Nov 2016 02:17:14 +0000 (+0200)
Subject: Merge branch 'chrome/m56' into update-m56
X-Git-Tag: accepted/tizen/5.0/unified/20181102.025319~102^2~11
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4c3f4c7878f3fc8809b1e6445b1e4c65b44b5a61;p=platform%2Fupstream%2FlibSkiaSharp.git

Merge branch 'chrome/m56' into update-m56
 - there is something wrong since there are missing files...
---

4c3f4c7878f3fc8809b1e6445b1e4c65b44b5a61
diff --cc dm/DM.cpp
index 53709ba,d42a5f0..cc4c2a5
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@@ -34,7 -35,10 +35,9 @@@
  #include "Timer.h"
  #include "picture_utils.h"
  #include "sk_tool_utils.h"
 -#include "SkScan.h"
  
+ #include <vector>
+ 
  #ifdef SK_PDF_IMAGE_STATS
  extern void SkPDFImageDumpStats();
  #endif
diff --cc gyp/core.gyp
index 237fbaf,0fbc56c..fbe073b
--- a/gyp/core.gyp
+++ b/gyp/core.gyp
@@@ -12,16 -12,10 +12,12 @@@
        'standalone_static_library': 1,
        'msvs_guid': 'B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76',
  
-       'includes': [
-         'core.gypi',
-       ],
- 
        'include_dirs': [
          '../include/c',
 +        '../include/codec',
          '../include/config',
          '../include/core',
 +        '../include/effects',
          '../include/pathops',
          '../include/ports',
          '../include/private',