commit f2f7c2a92321a1287798e1b7e708dd3a11243719
author Tom Sepez <tsepez@chromium.org> Thu Nov 01 01:11:29 2018 +0000
committer Chromium commit bot <commit-bot@chromium.org> Thu Nov 01 01:11:29 2018 +0000
tree b3dcd3df36297db2677c82fb4909dbeb9fd97b30
parent 9d88af8f4ebe571e298639a8f32015243d21ebf8

Add |k| to CPDF_ContentMarkItem::ParamType enum constants

Match style guide. Also re-arange members so two pointers are
adjacent since this is easier to read.

Change-Id: I9b5ac637862a17ef657cf30de0a18268d44b6fcc
Reviewed-on: https://pdfium-review.googlesource.com/c/44996
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>

core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp

diff --git a/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp b/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp
index 717a83c..07347a6 100644
--- a/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp
+++ b/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp
@@ -259,20 +259,20 @@
     *buf << "/" << PDF_NameEncode(item->GetName()) << " ";
 
     // If there are no parameters, write a BMC (begin marked content) operator.
-    if (item->GetParamType() == CPDF_ContentMarkItem::None) {
+    if (item->GetParamType() == CPDF_ContentMarkItem::kNone) {
       *buf << "BMC\n";
       continue;
     }
 
     // If there are parameters, write properties, direct or indirect.
     switch (item->GetParamType()) {
-      case CPDF_ContentMarkItem::DirectDict: {
+      case CPDF_ContentMarkItem::kDirectDict: {
         CPDF_StringArchiveStream archive_stream(buf);
         item->GetParam()->WriteTo(&archive_stream, nullptr);
         *buf << " ";
         break;
       }
-      case CPDF_ContentMarkItem::PropertiesDict: {
+      case CPDF_ContentMarkItem::kPropertiesDict: {
         *buf << "/" << item->GetPropertyName() << " ";
         break;
       }

core/fpdfapi/page/cpdf_contentmarkitem.cpp

diff --git a/core/fpdfapi/page/cpdf_contentmarkitem.cpp b/core/fpdfapi/page/cpdf_contentmarkitem.cpp
index 8eba4aa..4b084b6 100644
--- a/core/fpdfapi/page/cpdf_contentmarkitem.cpp
+++ b/core/fpdfapi/page/cpdf_contentmarkitem.cpp
@@ -17,11 +17,11 @@
 
 const CPDF_Dictionary* CPDF_ContentMarkItem::GetParam() const {
   switch (m_ParamType) {
-    case PropertiesDict:
+    case kPropertiesDict:
       return m_pPropertiesDict.Get();
-    case DirectDict:
+    case kDirectDict:
       return m_pDirectDict.get();
-    case None:
+    case kNone:
     default:
       return nullptr;
   }
@@ -39,13 +39,13 @@
 
 void CPDF_ContentMarkItem::SetDirectDict(
     std::unique_ptr<CPDF_Dictionary> pDict) {
-  m_ParamType = DirectDict;
+  m_ParamType = kDirectDict;
   m_pDirectDict = std::move(pDict);
 }
 
 void CPDF_ContentMarkItem::SetPropertiesDict(CPDF_Dictionary* pDict,
                                              const ByteString& property_name) {
-  m_ParamType = PropertiesDict;
+  m_ParamType = kPropertiesDict;
   m_pPropertiesDict = pDict;
   m_PropertyName = property_name;
 }

core/fpdfapi/page/cpdf_contentmarkitem.h

diff --git a/core/fpdfapi/page/cpdf_contentmarkitem.h b/core/fpdfapi/page/cpdf_contentmarkitem.h
index a0a92db..939dd31 100644
--- a/core/fpdfapi/page/cpdf_contentmarkitem.h
+++ b/core/fpdfapi/page/cpdf_contentmarkitem.h
@@ -19,7 +19,7 @@
 
 class CPDF_ContentMarkItem final : public Retainable {
  public:
-  enum ParamType { None, PropertiesDict, DirectDict };
+  enum ParamType { kNone, kPropertiesDict, kDirectDict };
 
   explicit CPDF_ContentMarkItem(ByteString name);
   ~CPDF_ContentMarkItem() override;
@@ -36,10 +36,10 @@
                          const ByteString& property_name);
 
  private:
+  ParamType m_ParamType = kNone;
   ByteString m_MarkName;
-  ParamType m_ParamType = None;
-  UnownedPtr<CPDF_Dictionary> m_pPropertiesDict;
   ByteString m_PropertyName;
+  UnownedPtr<CPDF_Dictionary> m_pPropertiesDict;
   std::unique_ptr<CPDF_Dictionary> m_pDirectDict;
 };
 

core/fpdfdoc/cpdf_occontext.cpp

diff --git a/core/fpdfdoc/cpdf_occontext.cpp b/core/fpdfdoc/cpdf_occontext.cpp
index 139b80d..72c4e15 100644
--- a/core/fpdfdoc/cpdf_occontext.cpp
+++ b/core/fpdfdoc/cpdf_occontext.cpp
@@ -185,7 +185,7 @@
   for (size_t i = 0; i < pObj->m_ContentMarks.CountItems(); ++i) {
     const CPDF_ContentMarkItem* item = pObj->m_ContentMarks.GetItem(i);
     if (item->GetName() == "OC" &&
-        item->GetParamType() == CPDF_ContentMarkItem::PropertiesDict &&
+        item->GetParamType() == CPDF_ContentMarkItem::kPropertiesDict &&
         !CheckOCGVisible(item->GetParam())) {
       return false;
     }