Remove CFX_PrivateData from CPDF_ModuleMgr

pdfium.gyp

 # Copyright 2015 PDFium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
 
     'variables': {
       'clang_use_pdfium_plugins%': 0,
@@ skipping 244 matching lines @@
         'core/fpdfdoc/include/cpvt_wordrange.h',
         'core/fpdfdoc/include/ipvt_fontmap.h',
         'core/fpdfdoc/pdf_vt.h',
         'core/fpdfdoc/tagged_int.h',
       ],
     },
     {
       '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',
         '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',
         'core/fpdfapi/fpdf_cmaps/CNS1/ETen-B5-V_0.cpp',
         'core/fpdfapi/fpdf_cmaps/CNS1/ETenms-B5-H_0.cpp',
@@ skipping 26 matching lines @@
         'core/fpdfapi/fpdf_cmaps/Japan1/90pv-RKSJ-H_1.cpp',
         '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',
         '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/cpdf_pagecontentgenerator.cpp',
         'core/fpdfapi/fpdf_edit/editint.h',
-        'core/fpdfapi/fpdf_edit/cpdf_pagecontentgenerator.cpp',
         'core/fpdfapi/fpdf_edit/fpdf_edit_create.cpp',
         'core/fpdfapi/fpdf_edit/include/cpdf_creator.h',
         'core/fpdfapi/fpdf_edit/include/cpdf_pagecontentgenerator.h',
         'core/fpdfapi/fpdf_font/cpdf_cidfont.cpp',
         'core/fpdfapi/fpdf_font/cpdf_cidfont.h',
         'core/fpdfapi/fpdf_font/cpdf_font.cpp',
         'core/fpdfapi/fpdf_font/cpdf_fontencoding.cpp',
         'core/fpdfapi/fpdf_font/cpdf_simplefont.cpp',
         'core/fpdfapi/fpdf_font/cpdf_simplefont.h',
         'core/fpdfapi/fpdf_font/cpdf_truetypefont.cpp',
@@ skipping 34 matching lines @@
         'core/fpdfapi/fpdf_page/cpdf_generalstate.cpp',
         'core/fpdfapi/fpdf_page/cpdf_generalstatedata.cpp',
         'core/fpdfapi/fpdf_page/cpdf_graphicstates.cpp',
         'core/fpdfapi/fpdf_page/cpdf_graphicstates.h',
         'core/fpdfapi/fpdf_page/cpdf_graphstate.h',
         'core/fpdfapi/fpdf_page/cpdf_image.cpp',
         'core/fpdfapi/fpdf_page/cpdf_imageobject.cpp',
         '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',
         'core/fpdfapi/fpdf_page/cpdf_pageobjectlist.h',
         'core/fpdfapi/fpdf_page/cpdf_pathobject.cpp',
         'core/fpdfapi/fpdf_page/cpdf_pattern.cpp',
         'core/fpdfapi/fpdf_page/cpdf_pattern.h',
         'core/fpdfapi/fpdf_page/cpdf_shadingobject.cpp',
         'core/fpdfapi/fpdf_page/cpdf_shadingpattern.cpp',
         'core/fpdfapi/fpdf_page/cpdf_shadingpattern.h',
@@ skipping 72 matching lines @@
         'core/fpdfapi/fpdf_parser/include/cpdf_string.h',
         'core/fpdfapi/fpdf_parser/include/fpdf_parser_decode.h',
         'core/fpdfapi/fpdf_parser/include/ipdf_data_avail.h',
         'core/fpdfapi/fpdf_render/cpdf_pagerendercache.h',
         'core/fpdfapi/fpdf_render/fpdf_render.cpp',
         'core/fpdfapi/fpdf_render/fpdf_render_cache.cpp',
         'core/fpdfapi/fpdf_render/fpdf_render_image.cpp',
         '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_progressiverenderer.h',
+        'core/fpdfapi/fpdf_render/include/cpdf_rendercontext.h',
         '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_textrenderer.h',
         'core/fpdfapi/fpdf_render/render_int.h',
         'core/fpdfapi/include/cpdf_modulemgr.h',
       ],
     },
     {
       'target_name': 'fpdftext',
       'type': 'static_library',
       'sources': [
         'core/fpdftext/include/cpdf_linkextract.h',
@@ skipping 573 matching lines @@
             'fpdfsdk/fpdfxfa/include/fpdfxfa_app.h',
             'fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h',
             'fpdfsdk/fpdfxfa/include/fpdfxfa_page.h',
             'fpdfsdk/fpdfxfa/include/fpdfxfa_util.h',
           ],
         },
       ]
     }],
   ]
 }