commit 59d2a590a5fc061663fec0a1543b608e8af9eec9
author Tom Sepez <tsepez@chromium.org> Fri Sep 14 19:51:10 2018 +0000
committer Chromium commit bot <commit-bot@chromium.org> Fri Sep 14 19:51:10 2018 +0000
tree 8e262b0c37cf68a6194199c14b98203e4e292afa
parent 4dc8c50f81bd78711bcfb432629800b8683102b6

Rename FPDF_RenderPage_Retail() to RenderPageWithContext()

Removing the FPDF_ prefix also makes it more obvious that this is
not a public/ entry point. No functional changes.

Bug: pdfium:1149

Change-Id: I6d68d7951cbfc65128339e237017e7b4bc965635
Reviewed-on: https://pdfium-review.googlesource.com/42490
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>

fpdfsdk/cpdfsdk_helpers.h

diff --git a/fpdfsdk/cpdfsdk_helpers.h b/fpdfsdk/cpdfsdk_helpers.h
index 5de947a..3695bb1 100644
--- a/fpdfsdk/cpdfsdk_helpers.h
+++ b/fpdfsdk/cpdfsdk_helpers.h
@@ -245,16 +245,16 @@
 FPDF_BOOL FSDK_IsSandBoxPolicyEnabled(FPDF_DWORD policy);
 
 // TODO(dsinclair): Where should this live?
-void FPDF_RenderPage_Retail(CPDF_PageRenderContext* pContext,
-                            FPDF_PAGE page,
-                            int start_x,
-                            int start_y,
-                            int size_x,
-                            int size_y,
-                            int rotate,
-                            int flags,
-                            bool bNeedToRestore,
-                            IPDFSDK_PauseAdapter* pause);
+void RenderPageWithContext(CPDF_PageRenderContext* pContext,
+                           FPDF_PAGE page,
+                           int start_x,
+                           int start_y,
+                           int size_x,
+                           int size_y,
+                           int rotate,
+                           int flags,
+                           bool bNeedToRestore,
+                           IPDFSDK_PauseAdapter* pause);
 
 void ReportUnsupportedFeatures(CPDF_Document* pDoc);
 void CheckUnSupportAnnot(CPDF_Document* pDoc, const CPDF_Annot* pPDFAnnot);

fpdfsdk/fpdf_progressive.cpp

diff --git a/fpdfsdk/fpdf_progressive.cpp b/fpdfsdk/fpdf_progressive.cpp
index 6d16bce..931ee17 100644
--- a/fpdfsdk/fpdf_progressive.cpp
+++ b/fpdfsdk/fpdf_progressive.cpp
@@ -57,8 +57,8 @@
   pDevice->Attach(pBitmap, !!(flags & FPDF_REVERSE_BYTE_ORDER), nullptr, false);
 
   IPDFSDK_PauseAdapter IPauseAdapter(pause);
-  FPDF_RenderPage_Retail(pContext, page, start_x, start_y, size_x, size_y,
-                         rotate, flags, false, &IPauseAdapter);
+  RenderPageWithContext(pContext, page, start_x, start_y, size_x, size_y,
+                        rotate, flags, false, &IPauseAdapter);
 
 #ifdef _SKIA_SUPPORT_PATHS_
   pDevice->Flush(false);

fpdfsdk/fpdf_view.cpp

diff --git a/fpdfsdk/fpdf_view.cpp b/fpdfsdk/fpdf_view.cpp
index 0cfa362..247a902 100644
--- a/fpdfsdk/fpdf_view.cpp
+++ b/fpdfsdk/fpdf_view.cpp
@@ -555,8 +555,8 @@
     pContext->m_pDevice = pdfium::MakeUnique<CFX_WindowsRenderDevice>(dc);
   }
 
-  FPDF_RenderPage_Retail(pContext, page, start_x, start_y, size_x, size_y,
-                         rotate, flags, true, nullptr);
+  RenderPageWithContext(pContext, page, start_x, start_y, size_x, size_y,
+                        rotate, flags, true, nullptr);
 
   if (bHasMask) {
     // Finish rendering the page to bitmap and copy the correct segments
@@ -586,8 +586,8 @@
     option_flags |= RENDER_BREAKFORMASKS;
     pContext->m_pOptions->SetFlags(option_flags);
 
-    FPDF_RenderPage_Retail(pContext, page, start_x, start_y, size_x, size_y,
-                           rotate, flags, true, nullptr);
+    RenderPageWithContext(pContext, page, start_x, start_y, size_x, size_y,
+                          rotate, flags, true, nullptr);
 
     // Render masks
     for (size_t i = 0; i < mask_boxes.size(); i++) {
@@ -642,8 +642,8 @@
 
   RetainPtr<CFX_DIBitmap> pBitmap(CFXDIBitmapFromFPDFBitmap(bitmap));
   pDevice->Attach(pBitmap, !!(flags & FPDF_REVERSE_BYTE_ORDER), nullptr, false);
-  FPDF_RenderPage_Retail(pContext, page, start_x, start_y, size_x, size_y,
-                         rotate, flags, true, nullptr);
+  RenderPageWithContext(pContext, page, start_x, start_y, size_x, size_y,
+                        rotate, flags, true, nullptr);
 
 #ifdef _SKIA_SUPPORT_PATHS_
   pDevice->Flush(true);
@@ -706,8 +706,8 @@
   CFX_DefaultRenderDevice* skDevice = new CFX_DefaultRenderDevice;
   FPDF_RECORDER recorder = skDevice->CreateRecorder(size_x, size_y);
   pContext->m_pDevice.reset(skDevice);
-  FPDF_RenderPage_Retail(pContext, page, 0, 0, size_x, size_y, 0, 0, true,
-                         nullptr);
+  RenderPageWithContext(pContext, page, 0, 0, size_x, size_y, 0, 0, true,
+                        nullptr);
   pPage->SetRenderContext(nullptr);
   return recorder;
 }
@@ -899,16 +899,16 @@
   destroyer.Unleak(CFXDIBitmapFromFPDFBitmap(bitmap));
 }
 
-void FPDF_RenderPage_Retail(CPDF_PageRenderContext* pContext,
-                            FPDF_PAGE page,
-                            int start_x,
-                            int start_y,
-                            int size_x,
-                            int size_y,
-                            int rotate,
-                            int flags,
-                            bool bNeedToRestore,
-                            IPDFSDK_PauseAdapter* pause) {
+void RenderPageWithContext(CPDF_PageRenderContext* pContext,
+                           FPDF_PAGE page,
+                           int start_x,
+                           int start_y,
+                           int size_x,
+                           int size_y,
+                           int rotate,
+                           int flags,
+                           bool bNeedToRestore,
+                           IPDFSDK_PauseAdapter* pause) {
   CPDF_Page* pPage = CPDFPageFromFPDFPage(page);
   if (!pPage)
     return;