commit edfd3c3d6a56bee2456e96df4b945c095ea3a290
author caryclark <caryclark@google.com> Wed May 25 14:08:25 2016 -0700
committer Commit bot <commit-bot@chromium.org> Wed May 25 14:08:25 2016 -0700
tree 0de1411b79bcdb78800eec4fab24de850dad1a2b
parent d6faaaab0749d80b78bc9bb6ef5126c81dc3ffa2

get skia building

Resolve changes to cpdf_shadingpattern.h that prevent
Skia from building.

R=thestig@chromium.org,dsinclair@chromium.org,reed@google.com
BUG=

Review-Url: https://codereview.chromium.org/2017463002

core/fpdfapi/fpdf_page/cpdf_shadingpattern.h

diff --git a/core/fpdfapi/fpdf_page/cpdf_shadingpattern.h b/core/fpdfapi/fpdf_page/cpdf_shadingpattern.h
index 0ff258b..f5cef17 100644
--- a/core/fpdfapi/fpdf_page/cpdf_shadingpattern.h
+++ b/core/fpdfapi/fpdf_page/cpdf_shadingpattern.h
@@ -55,7 +55,7 @@
   FX_BOOL IsShadingObject() const { return m_bShadingObj; }
   CPDF_Object* GetShadingObject() const { return m_pShadingObj; }
   CPDF_ColorSpace* GetCS() const { return m_pCS; }
-  const std::vector<std::unique_ptr<CPDF_Function>>& GetFuncs() {
+  const std::vector<std::unique_ptr<CPDF_Function>>& GetFuncs() const {
     return m_pFunctions;
   }
 

core/fxge/skia/fx_skia_device.cpp

diff --git a/core/fxge/skia/fx_skia_device.cpp b/core/fxge/skia/fx_skia_device.cpp
index 0edb73a..3d08cb5 100644
--- a/core/fxge/skia/fx_skia_device.cpp
+++ b/core/fxge/skia/fx_skia_device.cpp
@@ -753,16 +753,17 @@
                                           const FX_RECT& clip_rect,
                                           int alpha,
                                           FX_BOOL bAlphaMode) {
-  if (kAxialShading != pPattern->m_ShadingType &&
-      kRadialShading != pPattern->m_ShadingType) {
+  if (kAxialShading != pPattern->GetShadingType() &&
+      kRadialShading != pPattern->GetShadingType()) {
     // TODO(caryclark) more types
     return false;
   }
-  CPDF_Function* const* pFuncs = pPattern->m_pFunctions;
-  int nFuncs = pPattern->m_nFuncs;
+  const std::vector<std::unique_ptr<CPDF_Function>>& pFuncs =
+      pPattern->GetFuncs();
+  int nFuncs = pFuncs.size();
   if (nFuncs != 1)  // TODO(caryclark) remove this restriction
     return false;
-  CPDF_Dictionary* pDict = pPattern->m_pShadingObj->GetDict();
+  CPDF_Dictionary* pDict = pPattern->GetShadingObject()->GetDict();
   CPDF_Array* pCoords = pDict->GetArrayBy("Coords");
   if (!pCoords)
     return true;
@@ -771,23 +772,22 @@
   SkTDArray<SkColor> skColors;
   SkTDArray<SkScalar> skPos;
   for (int j = 0; j < nFuncs; j++) {
-    const CPDF_Function* pFunc = pFuncs[j];
-    if (!pFunc)
+    if (!pFuncs[j])
       continue;
 
-    if (const CPDF_SampledFunc* pSampledFunc = pFunc->ToSampledFunc()) {
+    if (const CPDF_SampledFunc* pSampledFunc = pFuncs[j]->ToSampledFunc()) {
       /* TODO(caryclark)
          Type 0 Sampled Functions in PostScript can also have an Order integer
          in the dictionary. PDFium doesn't appear to check for this anywhere.
        */
       if (!AddSamples(pSampledFunc, &skColors, &skPos))
         return false;
-    } else if (const CPDF_ExpIntFunc* pExpIntFuc = pFunc->ToExpIntFunc()) {
+    } else if (const CPDF_ExpIntFunc* pExpIntFuc = pFuncs[j]->ToExpIntFunc()) {
       if (!AddColors(pExpIntFuc, &skColors))
         return false;
       skPos.push(0);
       skPos.push(1);
-    } else if (const CPDF_StitchFunc* pStitchFunc = pFunc->ToStitchFunc()) {
+    } else if (const CPDF_StitchFunc* pStitchFunc = pFuncs[j]->ToStitchFunc()) {
       if (!AddStitching(pStitchFunc, &skColors, &skPos))
         return false;
     } else {
@@ -805,7 +805,7 @@
                                    clip_rect.right, clip_rect.bottom);
   SkPath skClip;
   SkPath skPath;
-  if (kAxialShading == pPattern->m_ShadingType) {
+  if (kAxialShading == pPattern->GetShadingType()) {
     FX_FLOAT start_x = pCoords->GetNumberAt(0);
     FX_FLOAT start_y = pCoords->GetNumberAt(1);
     FX_FLOAT end_x = pCoords->GetNumberAt(2);
@@ -846,7 +846,7 @@
     skPath.addRect(skRect);
     skMatrix.setIdentity();
   } else {
-    ASSERT(kRadialShading == pPattern->m_ShadingType);
+    ASSERT(kRadialShading == pPattern->GetShadingType());
     FX_FLOAT start_x = pCoords->GetNumberAt(0);
     FX_FLOAT start_y = pCoords->GetNumberAt(1);
     FX_FLOAT start_r = pCoords->GetNumberAt(2);