From a5085d45e8288a7ed7af24fc9134d07cbc56e9dc Mon Sep 17 00:00:00 2001
From: Dan Sinclair <dsinclair@chromium.org>
Date: Thu, 11 May 2017 16:26:50 -0400
Subject: Rename render device classes

This Cl renames the CFX_RenderDevice subclasses to make their usage
clearer.

Change-Id: Ie820b57df9a3743ce8c6893fb483b398a1f1bdbe
Reviewed-on: https://pdfium-review.googlesource.com/5390
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
---
 xfa/fde/cfde_textout.cpp         | 2 +-
 xfa/fde/cfde_textout.h           | 2 +-
 xfa/fwl/cfx_barcode_unittest.cpp | 4 ++--
 xfa/fxgraphics/cfx_graphics.cpp  | 4 ++--
 xfa/fxgraphics/cfx_graphics.h    | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'xfa')

diff --git a/xfa/fde/cfde_textout.cpp b/xfa/fde/cfde_textout.cpp
index d5706dd497..b41ee1fbd8 100644
--- a/xfa/fde/cfde_textout.cpp
+++ b/xfa/fde/cfde_textout.cpp
@@ -119,7 +119,7 @@ void CFDE_TextOut::SetDIBitmap(const CFX_RetainPtr<CFX_DIBitmap>& pDIB) {
   ASSERT(pDIB);
 
   m_pRenderDevice.reset();
-  CFX_FxgeDevice* device = new CFX_FxgeDevice;
+  CFX_DefaultRenderDevice* device = new CFX_DefaultRenderDevice;
   device->Attach(pDIB, false, nullptr, false);
   m_pRenderDevice = pdfium::MakeUnique<CFDE_RenderDevice>(device, false);
 }
diff --git a/xfa/fde/cfde_textout.h b/xfa/fde/cfde_textout.h
index c505c0737f..360c3051e9 100644
--- a/xfa/fde/cfde_textout.h
+++ b/xfa/fde/cfde_textout.h
@@ -12,7 +12,7 @@
 #include <vector>
 
 #include "core/fxcrt/cfx_char.h"
-#include "core/fxge/cfx_fxgedevice.h"
+#include "core/fxge/cfx_defaultrenderdevice.h"
 #include "core/fxge/cfx_renderdevice.h"
 #include "core/fxge/fx_dib.h"
 #include "xfa/fgas/font/cfgas_fontmgr.h"
diff --git a/xfa/fwl/cfx_barcode_unittest.cpp b/xfa/fwl/cfx_barcode_unittest.cpp
index a6b908788d..3283dd132b 100644
--- a/xfa/fwl/cfx_barcode_unittest.cpp
+++ b/xfa/fwl/cfx_barcode_unittest.cpp
@@ -10,7 +10,7 @@
 
 #include "core/fxcrt/fx_coordinates.h"
 #include "core/fxcrt/fx_string.h"
-#include "core/fxge/cfx_fxgedevice.h"
+#include "core/fxge/cfx_defaultrenderdevice.h"
 #include "core/fxge/cfx_renderdevice.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/test_support.h"
@@ -22,7 +22,7 @@ class BarcodeTest : public testing::Test {
     BC_Library_Init();
     barcode_ = pdfium::MakeUnique<CFX_Barcode>();
 
-    auto device = pdfium::MakeUnique<CFX_FxgeDevice>();
+    auto device = pdfium::MakeUnique<CFX_DefaultRenderDevice>();
     auto bitmap = pdfium::MakeRetain<CFX_DIBitmap>();
     if (bitmap->Create(640, 480, FXDIB_Rgb32))
       bitmap_ = bitmap;
diff --git a/xfa/fxgraphics/cfx_graphics.cpp b/xfa/fxgraphics/cfx_graphics.cpp
index c02c30676b..79e4b7a6cc 100644
--- a/xfa/fxgraphics/cfx_graphics.cpp
+++ b/xfa/fxgraphics/cfx_graphics.cpp
@@ -8,7 +8,7 @@
 
 #include <memory>
 
-#include "core/fxge/cfx_fxgedevice.h"
+#include "core/fxge/cfx_defaultrenderdevice.h"
 #include "core/fxge/cfx_gemodule.h"
 #include "core/fxge/cfx_renderdevice.h"
 #include "core/fxge/cfx_unicodeencoding.h"
@@ -367,7 +367,7 @@ void CFX_Graphics::FillPathWithPattern(CFX_Path* path,
 
   FX_RECT rect(FXSYS_round(rectf.left), FXSYS_round(rectf.top),
                FXSYS_round(rectf.right), FXSYS_round(rectf.bottom));
-  CFX_FxgeDevice device;
+  CFX_DefaultRenderDevice device;
   device.Attach(bmp, false, nullptr, false);
   device.FillRect(&rect, m_info.fillColor->m_info.pattern->m_backArgb);
   for (int32_t j = rect.bottom; j < rect.top; j += mask->GetHeight()) {
diff --git a/xfa/fxgraphics/cfx_graphics.h b/xfa/fxgraphics/cfx_graphics.h
index 264ec94d53..b2e2cd1c88 100644
--- a/xfa/fxgraphics/cfx_graphics.h
+++ b/xfa/fxgraphics/cfx_graphics.h
@@ -11,7 +11,7 @@
 #include <vector>
 
 #include "core/fxcrt/fx_system.h"
-#include "core/fxge/cfx_fxgedevice.h"
+#include "core/fxge/cfx_defaultrenderdevice.h"
 #include "core/fxge/cfx_graphstatedata.h"
 #include "core/fxge/cfx_renderdevice.h"
 #include "core/fxge/fx_dib.h"
-- 
cgit v1.2.3