Merge to M47: Fix extraction of colour components in CPDF_DIBSource::DownSampleScanline32Bit

pdfium.gyp

 {
   'variables': {
     'pdf_use_skia%': 0,
     'conditions': [
       ['OS=="linux"', {
         'bundle_freetype%': 0,
       }, {  # On Android there's no system FreeType. On Windows and Mac, only a
             # few methods are used from it.
         'bundle_freetype%': 1,
       }],
@@ skipping 739 matching lines @@
         'pdfium',
       ],
       'include_dirs': [
         '<(DEPTH)',
         '<(DEPTH)/v8',
         '<(DEPTH)/v8/include',
       ],
       'sources': [
         'core/src/fpdfapi/fpdf_page/fpdf_page_func_embeddertest.cpp',
         'core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp',
         'core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_embeddertest.cpp',

[Oliver Chang, 2015/11/13 17:24:03]

++<<<<<<< HEAD
++=======
+         'core/src/fpdfapi/fpdf_render/fpdf_render_loadimage_embeddertest.cpp',
+         'core/src/fpdfapi/fpdf_render/fpdf_render_pattern_embeddertest.cpp',
++>>>>>>> e21fe98... (Reland) Fix extraction of colour components in
CPDF_DIBSource::DownSampleScanline32Bit

+        'core/src/fpdfapi/fpdf_render/fpdf_render_loadimage_embeddertest.cpp',
         'fpdfsdk/src/fpdf_dataavail_embeddertest.cpp',
         'fpdfsdk/src/fpdfdoc_embeddertest.cpp',
         'fpdfsdk/src/fpdfformfill_embeddertest.cpp',
         'fpdfsdk/src/fpdftext_embeddertest.cpp',
         'fpdfsdk/src/fpdfview_c_api_test.c',
         'fpdfsdk/src/fpdfview_c_api_test.h',
         'fpdfsdk/src/fpdfview_embeddertest.cpp',
         'fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp',
         'testing/embedder_test.cpp',
         'testing/embedder_test.h',
         'testing/embedder_test_mock_delegate.h',
         'testing/embedder_test_timer_handling_delegate.h',
         'testing/fx_string_testhelpers.cpp',
         'testing/fx_string_testhelpers.h',
       ],
     },
   ],
 }