Refactor Skia document type into an enum class

Change Skia document type from an enum type to an enum class type so
that type checking will be stricter and more clear.

BUG=455764
TBR=eseckler@chromium.org

Change-Id: Ia474e0c0a2b607884dc2f248301f3b003ef07e66
Reviewed-on: https://chromium-review.googlesource.com/619502
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#496202}

chrome/browser/printing/print_view_manager_base.cc

@@ -171,7 +171,7 @@ void PrintViewManagerBase::OnDidPrintPage(
   }
 
   std::unique_ptr<PdfMetafileSkia> metafile(
-      new PdfMetafileSkia(PDF_SKIA_DOCUMENT_TYPE));
+      new PdfMetafileSkia(SkiaDocumentType::PDF));
   if (metafile_must_be_valid) {
     if (!metafile->InitFromData(shared_buf->memory(), params.data_size)) {
       NOTREACHED() << "Invalid metafile header";

components/printing/renderer/print_render_frame_helper.cc

@@ -1407,7 +1407,7 @@ bool PrintRenderFrameHelper::RenderPreviewPage(
   std::unique_ptr<PdfMetafileSkia> draft_metafile;
   PdfMetafileSkia* initial_render_metafile = print_preview_context_.metafile();
   if (print_preview_context_.IsModifiable() && is_print_ready_metafile_sent_) {
-    draft_metafile = base::MakeUnique<PdfMetafileSkia>(PDF_SKIA_DOCUMENT_TYPE);
+    draft_metafile = base::MakeUnique<PdfMetafileSkia>(SkiaDocumentType::PDF);
     initial_render_metafile = draft_metafile.get();
   }
 
@@ -1425,7 +1425,7 @@ bool PrintRenderFrameHelper::RenderPreviewPage(
     DCHECK(!draft_metafile.get());
     draft_metafile =
         print_preview_context_.metafile()->GetMetafileForCurrentPage(
-            PDF_SKIA_DOCUMENT_TYPE);
+            SkiaDocumentType::PDF);
   }
   return PreviewPageRendered(page_number, draft_metafile.get());
 }
@@ -2211,7 +2211,7 @@ bool PrintRenderFrameHelper::PrintPreviewContext::CreatePreviewDocument(
     return false;
   }
 
-  metafile_ = base::MakeUnique<PdfMetafileSkia>(PDF_SKIA_DOCUMENT_TYPE);
+  metafile_ = base::MakeUnique<PdfMetafileSkia>(SkiaDocumentType::PDF);
   CHECK(metafile_->Init());
 
   current_page_index_ = 0;

components/printing/renderer/print_render_frame_helper_linux.cc

@@ -46,7 +46,7 @@ namespace printing {
 #if BUILDFLAG(ENABLE_BASIC_PRINTING)
 bool PrintRenderFrameHelper::PrintPagesNative(blink::WebLocalFrame* frame,
                                               int page_count) {
-  PdfMetafileSkia metafile(PDF_SKIA_DOCUMENT_TYPE);
+  PdfMetafileSkia metafile(SkiaDocumentType::PDF);
   CHECK(metafile.Init());
 
   const PrintMsg_PrintPages_Params& params = *print_pages_params_;

components/printing/renderer/print_render_frame_helper_mac.mm

@@ -45,7 +45,7 @@
     const std::vector<int>& printed_pages,
     int page_count,
     blink::WebLocalFrame* frame) {
-  PdfMetafileSkia metafile(PDF_SKIA_DOCUMENT_TYPE);
+  PdfMetafileSkia metafile(SkiaDocumentType::PDF);
   CHECK(metafile.Init());
 
   gfx::Size page_size_in_dpi;
@@ -88,7 +88,7 @@
       print_preview_context_.IsModifiable() && is_print_ready_metafile_sent_;
 
   if (render_to_draft) {
-    draft_metafile.reset(new PdfMetafileSkia(PDF_SKIA_DOCUMENT_TYPE));
+    draft_metafile.reset(new PdfMetafileSkia(SkiaDocumentType::PDF));
     CHECK(draft_metafile->Init());
     initial_render_metafile = draft_metafile.get();
   }
@@ -110,7 +110,7 @@
       DCHECK(!draft_metafile.get());
       draft_metafile =
           print_preview_context_.metafile()->GetMetafileForCurrentPage(
-              PDF_SKIA_DOCUMENT_TYPE);
+              SkiaDocumentType::PDF);
     }
   }
   return PreviewPageRendered(page_number, draft_metafile.get());

components/printing/renderer/print_render_frame_helper_pdf_win.cc

@@ -26,7 +26,7 @@ bool PrintRenderFrameHelper::PrintPagesNative(blink::WebLocalFrame* frame,
   std::vector<gfx::Rect> content_area_in_dpi(printed_pages.size());
   std::vector<gfx::Rect> printable_area_in_dpi(printed_pages.size());
 
-  PdfMetafileSkia metafile(PDF_SKIA_DOCUMENT_TYPE);
+  PdfMetafileSkia metafile(SkiaDocumentType::PDF);
   CHECK(metafile.Init());
 
   for (size_t i = 0; i < printed_pages.size(); ++i) {

components/printing/test/mock_printer.cc

@@ -212,7 +212,7 @@ void MockPrinter::PrintPage(const PrintHostMsg_DidPrintPage_Params& params) {
 #if defined(OS_MACOSX)
   printing::PdfMetafileCg metafile;
 #else
-  printing::PdfMetafileSkia metafile(printing::PDF_SKIA_DOCUMENT_TYPE);
+  printing::PdfMetafileSkia metafile(printing::SkiaDocumentType::PDF);
 #endif
   metafile.InitFromData(metafile_data.memory(), params.data_size);
   printing::Image image(metafile);

headless/lib/browser/headless_print_manager.cc

@@ -293,7 +293,7 @@ void HeadlessPrintManager::OnDidPrintPage(
       return;
     }
     auto metafile = base::MakeUnique<printing::PdfMetafileSkia>(
-        printing::PDF_SKIA_DOCUMENT_TYPE);
+        printing::SkiaDocumentType::PDF);
     if (!metafile->InitFromData(shared_buf->memory(), params.data_size)) {
       ReleaseJob(METAFILE_INVALID_HEADER);
       return;

printing/common/pdf_metafile_utils.h

@@ -14,10 +14,11 @@
 
 namespace printing {
 
-enum SkiaDocumentType {
-  PDF_SKIA_DOCUMENT_TYPE,
+enum class SkiaDocumentType {
+  PDF,
   // MSKP is an experimental, fragile, and diagnostic-only document type.
-  MSKP_SKIA_DOCUMENT_TYPE,
+  MSKP,
+  MAX = MSKP
 };
 
 sk_sp<SkDocument> MakePdfDocument(const std::string& creator,

printing/pdf_metafile_skia.cc

@@ -161,10 +161,10 @@ bool PdfMetafileSkia::FinishDocument() {
   SkDynamicMemoryWStream stream;
   sk_sp<SkDocument> doc;
   switch (data_->type_) {
-    case PDF_SKIA_DOCUMENT_TYPE:
+    case SkiaDocumentType::PDF:
       doc = MakePdfDocument(printing::GetAgent(), &stream);
       break;
-    case MSKP_SKIA_DOCUMENT_TYPE:
+    case SkiaDocumentType::MSKP:
       doc = SkMakeMultiPictureDocument(&stream);
       break;
   }