move SkPDFD*.h from include to src

CQ_INCLUDE_TRYBOTS=client.skia:Mac Builder-Trybot,Linux Builder-Trybot,Win Builder-Trybot

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

diff --git a/gyp/pdf.gyp b/gyp/pdf.gyp
index 76b23bb..b253fd8 100644 (file)
--- a/gyp/pdf.gyp
+++ b/gyp/pdf.gyp
@@ -14,7 +14,6 @@
         'pdf.gypi',
       ],
       'include_dirs': [
-        '../include/pdf',
         '../src/core', # needed to get SkGlyphCache.h and SkTextFormatParams.h
         '../src/pdf',
         '../src/utils', # needed to get SkBitSet.h
@@ -43,7 +42,7 @@
           'SK_SUPPORT_PDF',
         ],
         'include_dirs': [
-          '../include/pdf',
+          '../include/core',  # SkDocument.h
         ],
       },
     },

diff --git a/gyp/pdf.gypi b/gyp/pdf.gypi
index c1b84ad..d4e6324 100644 (file)
--- a/gyp/pdf.gypi
+++ b/gyp/pdf.gypi
@@ -7,11 +7,9 @@
 #
 {
     'sources': [
-        '<(skia_include_path)/pdf/SkPDFDevice.h',
-        '<(skia_include_path)/pdf/SkPDFDocument.h',
-
         '<(skia_src_path)/doc/SkDocument_PDF.cpp',
-
+        '<(skia_src_path)/pdf/SkDeflateWStream.cpp',
+        '<(skia_src_path)/pdf/SkDeflateWStream.h',
         '<(skia_src_path)/pdf/SkPDFBitmap.cpp',
         '<(skia_src_path)/pdf/SkPDFBitmap.h',
         '<(skia_src_path)/pdf/SkPDFCanon.cpp',
@@ -19,9 +17,11 @@
         '<(skia_src_path)/pdf/SkPDFCatalog.cpp',
         '<(skia_src_path)/pdf/SkPDFCatalog.h',
         '<(skia_src_path)/pdf/SkPDFDevice.cpp',
+        '<(skia_src_path)/pdf/SkPDFDevice.h',
         '<(skia_src_path)/pdf/SkPDFDeviceFlattener.cpp',
         '<(skia_src_path)/pdf/SkPDFDeviceFlattener.h',
         '<(skia_src_path)/pdf/SkPDFDocument.cpp',
+        '<(skia_src_path)/pdf/SkPDFDocument.h',
         '<(skia_src_path)/pdf/SkPDFFont.cpp',
         '<(skia_src_path)/pdf/SkPDFFont.h',
         '<(skia_src_path)/pdf/SkPDFFontImpl.h',
@@ -44,7 +44,5 @@
         '<(skia_src_path)/pdf/SkPDFUtils.cpp',
         '<(skia_src_path)/pdf/SkPDFUtils.h',
         '<(skia_src_path)/pdf/SkTSet.h',
-        '<(skia_src_path)/pdf/SkDeflateWStream.cpp',
-        '<(skia_src_path)/pdf/SkDeflateWStream.h',
     ],
 }

diff --git a/gyp/tools.gyp b/gyp/tools.gyp
index 21d9c02..3ac32bd 100644 (file)
--- a/gyp/tools.gyp
+++ b/gyp/tools.gyp
@@ -624,7 +624,6 @@
           '<(skia_include_path)/gpu',
           '<(skia_include_path)/images',
           '<(skia_include_path)/pathops',
-          '<(skia_include_path)/pdf',
           '<(skia_include_path)/pipe',
           '<(skia_include_path)/ports',
           '<(skia_include_path)/svg/parser',

diff --git a/include/pdf/SkPDFDevice.h b/src/pdf/SkPDFDevice.h
similarity index 100%
rename from include/pdf/SkPDFDevice.h
rename to src/pdf/SkPDFDevice.h

diff --git a/include/pdf/SkPDFDocument.h b/src/pdf/SkPDFDocument.h
similarity index 100%
rename from include/pdf/SkPDFDocument.h
rename to src/pdf/SkPDFDocument.h