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

BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//testing/test.gni")
 
 pdf_use_skia = false
 
 declare_args() {
   # On Android there's no system FreeType. On Windows and Mac, only a few
@@ skipping 121 matching lines @@
       "CoreFoundation.framework",
     ]
   }
 
   if (pdfium_bundle_freetype) {
     deps += [ "third_party:fx_freetype" ]
   } else {
     libs += [ "freetype" ]
   }
 }
 

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

another weird change picked up by cherry-pick:

++<<<<<<< HEAD
++=======
+ source_set("test_support") {
+   testonly = true
+   sources = [
+     "testing/fx_string_testhelpers.cpp",
+     "testing/fx_string_testhelpers.h",
+     "testing/test_support.cpp",
+     "testing/test_support.h",
+     'testing/utils/path_service.cpp',
+   ]
+   deps = [
+     "//testing/gmock",
+     "//testing/gtest",
+     ":pdfium",
+   ]
+   include_dirs = []
+   if (pdf_enable_v8) {
+     deps += [
+       "//v8",
+       "//v8:v8_libplatform",
+     ]
+     include_dirs += [
+       "//v8",
+       "//v8/include",
+     ]
+   }
+   configs += [ ":pdfium_config" ]
+ }
+ 
++>>>>>>> e21fe98... (Reland) Fix extraction of colour components in
CPDF_DIBSource::DownSampleScanline32Bit

 # Targets below this are only visible within this file (and to the
 # top-level gn_visibility target used to help gn_all build everything).
 visibility = [
   ":*",
   "//:gn_visibility",
 ]
 
 static_library("fdrm") {
   sources = [
     "core/include/fdrm/fx_crypt.h",
@@ skipping 615 matching lines @@
     ":pdfium_config",
     "//build/config/compiler:no_chromium_code",
   ]
 }
 
 test("pdfium_embeddertests") {
   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",
+    "core/src/fpdfapi/fpdf_render/fpdf_render_loadimage_embeddertest.cpp",

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

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

     "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",
@@ skipping 13 matching lines @@
     "//v8",
     "//v8/include",
     "."
   ]
   configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [
     ":pdfium_config",
     "//build/config/compiler:no_chromium_code",
   ]
 }