Reduce diffs with master in core

core/include/fpdfapi/fpdf_render.h

 // Copyright 2014 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.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef CORE_INCLUDE_FPDFAPI_FPDF_RENDER_H_
 #define CORE_INCLUDE_FPDFAPI_FPDF_RENDER_H_
 
 #include "core/include/fxge/fx_ge.h"
@@ skipping 119 matching lines @@
   friend class CPDF_RenderStatus;
   friend class CPDF_ProgressiveRenderer;
 };
 
 class CPDF_ProgressiveRenderer {
  public:
   // Must match FDF_RENDER_* definitions in public/fpdf_progressive.h, but
   // cannot #include that header. fpdfsdk/src/fpdf_progressive.cpp has
   // static_asserts to make sure the two sets of values match.
   enum Status {
-    Ready,          // FPDF_RENDER_READER,
-    ToBeContinued,  // FPDF_RENDER_TOBECOUNTINUED,
-    Done,           // FPDF_RENDER_DONE,
-    Failed,         // FPDF_RENDER_FAILED
+    Ready,          // FPDF_RENDER_READER
+    ToBeContinued,  // FPDF_RENDER_TOBECOUNTINUED
+    Done,           // FPDF_RENDER_DONE
+    Failed          // FPDF_RENDER_FAILED
   };
+
   static int ToFPDFStatus(Status status) { return static_cast<int>(status); }
 
   CPDF_ProgressiveRenderer(CPDF_RenderContext* pContext,
                            CFX_RenderDevice* pDevice,
                            const CPDF_RenderOptions* pOptions);
   ~CPDF_ProgressiveRenderer();
 
   Status GetStatus() const { return m_Status; }
   void Start(IFX_Pause* pPause);
   void Continue(IFX_Pause* pPause);
@@ skipping 130 matching lines @@
  public:
   CPDF_RenderConfig();
   ~CPDF_RenderConfig();
   int m_HalftoneLimit;
   int m_RenderStepLimit;
 };
 
 FX_BOOL IsAvailableMatrix(const CFX_AffineMatrix& matrix);
 
 #endif  // CORE_INCLUDE_FPDFAPI_FPDF_RENDER_H_