Remove CFX_PrivateData from CPDF_ModuleMgr

pdfium.gyp

Index: pdfium.gyp
diff --git a/pdfium.gyp b/pdfium.gyp
index 3a3bf69f422b720b8ab88d03a3ed293e2471003d..9802da9faedfff0c97cc2aec2486ad5df3d3962e 100644
--- a/pdfium.gyp
+++ b/pdfium.gyp
@@ -262,12 +262,12 @@
       'target_name': 'fpdfapi',
       'type': 'static_library',
       'sources': [
-        'core/fpdfapi/fpdf_basic_module.cpp',
-        'core/fpdfapi/fpdf_cmaps/cmap_int.h',
+        "core/fpdfapi/fpdf_page/cpdf_pagemodule.cpp",
+        "core/fpdfapi/fpdf_page/cpdf_pagemodule.h",
+        'core/fpdfapi/cpdf_modulemgr.cpp',

[Lei Zhang, 2016/05/24 21:34:58]

- double quotes

- can we sort this by ascii order once and for all?

[Tom Sepez, 2016/05/24 21:56:55]

Ah, case sensitivity is what shuffled this up.

         'core/fpdfapi/fpdf_cmaps/CNS1/Adobe-CNS1-UCS2_5.cpp',
         'core/fpdfapi/fpdf_cmaps/CNS1/B5pc-H_0.cpp',
         'core/fpdfapi/fpdf_cmaps/CNS1/B5pc-V_0.cpp',
-        'core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.cpp',
         'core/fpdfapi/fpdf_cmaps/CNS1/CNS-EUC-H_0.cpp',
         'core/fpdfapi/fpdf_cmaps/CNS1/CNS-EUC-V_0.cpp',
         'core/fpdfapi/fpdf_cmaps/CNS1/ETen-B5-H_0.cpp',
@@ -279,9 +279,8 @@
         'core/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UCS2-H_3.cpp',
         'core/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UCS2-V_3.cpp',
         'core/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UTF16-H_0.cpp',
-        'core/fpdfapi/fpdf_cmaps/fpdf_cmaps.cpp',
+        'core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.cpp',
         'core/fpdfapi/fpdf_cmaps/GB1/Adobe-GB1-UCS2_5.cpp',
-        'core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp',
         'core/fpdfapi/fpdf_cmaps/GB1/GB-EUC-H_0.cpp',
         'core/fpdfapi/fpdf_cmaps/GB1/GB-EUC-V_0.cpp',
         'core/fpdfapi/fpdf_cmaps/GB1/GBK-EUC-H_2.cpp',
@@ -294,6 +293,7 @@
         'core/fpdfapi/fpdf_cmaps/GB1/GBpc-EUC-V_0.cpp',
         'core/fpdfapi/fpdf_cmaps/GB1/UniGB-UCS2-H_4.cpp',
         'core/fpdfapi/fpdf_cmaps/GB1/UniGB-UCS2-V_4.cpp',
+        'core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp',
         'core/fpdfapi/fpdf_cmaps/Japan1/83pv-RKSJ-H_1.cpp',
         'core/fpdfapi/fpdf_cmaps/Japan1/90ms-RKSJ-H_2.cpp',
         'core/fpdfapi/fpdf_cmaps/Japan1/90ms-RKSJ-V_2.cpp',
@@ -303,7 +303,6 @@
         'core/fpdfapi/fpdf_cmaps/Japan1/Add-RKSJ-H_1.cpp',
         'core/fpdfapi/fpdf_cmaps/Japan1/Add-RKSJ-V_1.cpp',
         'core/fpdfapi/fpdf_cmaps/Japan1/Adobe-Japan1-UCS2_4.cpp',
-        'core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.cpp',
         'core/fpdfapi/fpdf_cmaps/Japan1/EUC-H_1.cpp',
         'core/fpdfapi/fpdf_cmaps/Japan1/EUC-V_1.cpp',
         'core/fpdfapi/fpdf_cmaps/Japan1/Ext-RKSJ-H_2.cpp',
@@ -314,8 +313,8 @@
         'core/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-H_4.cpp',
         'core/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-V_4.cpp',
         'core/fpdfapi/fpdf_cmaps/Japan1/V_1.cpp',
+        'core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.cpp',
         'core/fpdfapi/fpdf_cmaps/Korea1/Adobe-Korea1-UCS2_2.cpp',
-        'core/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.cpp',
         'core/fpdfapi/fpdf_cmaps/Korea1/KSC-EUC-H_0.cpp',
         'core/fpdfapi/fpdf_cmaps/Korea1/KSC-EUC-V_0.cpp',
         'core/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-HW-H_1.cpp',
@@ -326,8 +325,11 @@
         'core/fpdfapi/fpdf_cmaps/Korea1/UniKS-UCS2-H_1.cpp',
         'core/fpdfapi/fpdf_cmaps/Korea1/UniKS-UCS2-V_1.cpp',
         'core/fpdfapi/fpdf_cmaps/Korea1/UniKS-UTF16-H_0.cpp',
-        'core/fpdfapi/fpdf_edit/editint.h',
+        'core/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.cpp',
+        'core/fpdfapi/fpdf_cmaps/cmap_int.h',
+        'core/fpdfapi/fpdf_cmaps/fpdf_cmaps.cpp',
         'core/fpdfapi/fpdf_edit/cpdf_pagecontentgenerator.cpp',
+        'core/fpdfapi/fpdf_edit/editint.h',
         'core/fpdfapi/fpdf_edit/fpdf_edit_create.cpp',
         'core/fpdfapi/fpdf_edit/include/cpdf_creator.h',
         'core/fpdfapi/fpdf_edit/include/cpdf_pagecontentgenerator.h',
@@ -382,8 +384,6 @@
         'core/fpdfapi/fpdf_page/cpdf_meshstream.cpp',
         'core/fpdfapi/fpdf_page/cpdf_meshstream.h',
         'core/fpdfapi/fpdf_page/cpdf_page.cpp',
-        "core/fpdfapi/fpdf_page/cpdf_pagemodule.cpp",
-        "core/fpdfapi/fpdf_page/cpdf_pagemodule.h",
         'core/fpdfapi/fpdf_page/cpdf_pageobject.cpp',
         'core/fpdfapi/fpdf_page/cpdf_pageobjectholder.cpp',
         'core/fpdfapi/fpdf_page/cpdf_pageobjectlist.cpp',
@@ -476,9 +476,9 @@
         'core/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp',
         'core/fpdfapi/fpdf_render/fpdf_render_pattern.cpp',
         'core/fpdfapi/fpdf_render/fpdf_render_text.cpp',
-        'core/fpdfapi/fpdf_render/include/cpdf_renderoptions.h',
-        'core/fpdfapi/fpdf_render/include/cpdf_rendercontext.h',
         'core/fpdfapi/fpdf_render/include/cpdf_progressiverenderer.h',
+        'core/fpdfapi/fpdf_render/include/cpdf_rendercontext.h',
+        'core/fpdfapi/fpdf_render/include/cpdf_renderoptions.h',
         'core/fpdfapi/fpdf_render/include/cpdf_textrenderer.h',
         'core/fpdfapi/fpdf_render/render_int.h',
         'core/fpdfapi/include/cpdf_modulemgr.h',