Remove CFX_PrivateData from CPDF_ModuleMgr

pdfium.gyp

Index: pdfium.gyp
diff --git a/pdfium.gyp b/pdfium.gyp
index 3a3bf69f422b720b8ab88d03a3ed293e2471003d..bdd885340b197d0a1bb0cb6aee48bb7720755155 100644
--- a/pdfium.gyp
+++ b/pdfium.gyp
@@ -262,7 +262,7 @@
       'target_name': 'fpdfapi',
       'type': 'static_library',
       'sources': [
-        'core/fpdfapi/fpdf_basic_module.cpp',
+        'core/fpdfapi/cpdf_modulemgr.cpp',
         'core/fpdfapi/fpdf_cmaps/cmap_int.h',
         'core/fpdfapi/fpdf_cmaps/CNS1/Adobe-CNS1-UCS2_5.cpp',
         'core/fpdfapi/fpdf_cmaps/CNS1/B5pc-H_0.cpp',
@@ -309,25 +309,25 @@
         'core/fpdfapi/fpdf_cmaps/Japan1/Ext-RKSJ-H_2.cpp',
         'core/fpdfapi/fpdf_cmaps/Japan1/Ext-RKSJ-V_2.cpp',
         'core/fpdfapi/fpdf_cmaps/Japan1/H_1.cpp',
+        'core/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-H_4.cpp',

[Lei Zhang, 2016/05/24 22:07:50]

Not ASCII order. 'W' is 97 and '_' is 95. Basically my gripe is this list
doesn't match BUILD.gn, ordering-wise.

[Tom Sepez, 2016/05/24 23:08:58]

You mean 'W' is 87, '_', is 95, 'w' is 119. So its that that case-insensitive
thing.  Do we pretend to upcase everything and sort, or do we pretend to
downcase everything and sort?

I'll manually put these two back where they were.  Otherwise, the other
re-arrangements look like they fix actual issues.

         'core/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-HW-H_4.cpp',
         'core/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-HW-V_4.cpp',
-        '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/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-H_1.cpp',
         'core/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-HW-H_1.cpp',
         'core/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-HW-V_1.cpp',
-        'core/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-H_1.cpp',
         'core/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-V_1.cpp',
         'core/fpdfapi/fpdf_cmaps/Korea1/KSCpc-EUC-H_0.cpp',
         '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_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 +382,8 @@
         '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",

[Lei Zhang, 2016/05/24 22:07:50]

Doh.

-        "core/fpdfapi/fpdf_page/cpdf_pagemodule.h",
+        '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',