commit ccd7899b2d662c0a1be6cd52c6b6068472c27375
author Dan Sinclair <dsinclair@chromium.org> Wed Jan 10 19:44:16 2018 +0000
committer Chromium commit bot <commit-bot@chromium.org> Wed Jan 10 19:44:16 2018 +0000
tree 13baee4d5893332917cae9f9e49d35473f086176
parent 948879d23226aea31aa9ae5f6eb1fb8572f0fc05

Rename GetOrCreateFont to GetOrCreateFontIfPossible

This CL makes it explicit that GetOrCreateFontIfPossible can return
nullptr.

Change-Id: Ib5be6995e4225ad596dfb78a94f0bc56802716cc
Reviewed-on: https://pdfium-review.googlesource.com/22674
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>

fxjs/xfa/cjx_object.cpp

diff --git a/fxjs/xfa/cjx_object.cpp b/fxjs/xfa/cjx_object.cpp
index 8f528c8..a1d9daf 100644
--- a/fxjs/xfa/cjx_object.cpp
+++ b/fxjs/xfa/cjx_object.cpp
@@ -1297,7 +1297,7 @@
 void CJX_Object::Script_Som_FontColor(CFXJSE_Value* pValue,
                                       bool bSetting,
                                       XFA_Attribute eAttribute) {
-  CXFA_Font* font = ToNode(object_.Get())->GetOrCreateFont();
+  CXFA_Font* font = ToNode(object_.Get())->GetOrCreateFontIfPossible();
   if (!font)
     return;
 

xfa/fxfa/parser/cxfa_node.cpp

diff --git a/xfa/fxfa/parser/cxfa_node.cpp b/xfa/fxfa/parser/cxfa_node.cpp
index 8c0b195..d44b203 100644
--- a/xfa/fxfa/parser/cxfa_node.cpp
+++ b/xfa/fxfa/parser/cxfa_node.cpp
@@ -1542,7 +1542,7 @@
   return JSObject()->GetProperty<CXFA_Caption>(0, XFA_Element::Caption);
 }
 
-CXFA_Font* CXFA_Node::GetOrCreateFont() {
+CXFA_Font* CXFA_Node::GetOrCreateFontIfPossible() {
   return JSObject()->GetOrCreateProperty<CXFA_Font>(0, XFA_Element::Font);
 }
 

xfa/fxfa/parser/cxfa_node.h

diff --git a/xfa/fxfa/parser/cxfa_node.h b/xfa/fxfa/parser/cxfa_node.h
index 673c430..69cd12c 100644
--- a/xfa/fxfa/parser/cxfa_node.h
+++ b/xfa/fxfa/parser/cxfa_node.h
@@ -241,7 +241,7 @@
   CXFA_Caption* GetCaptionIfExists() const;
 
   CXFA_Font* GetFontIfExists() const;
-  CXFA_Font* GetOrCreateFont();
+  CXFA_Font* GetOrCreateFontIfPossible();
   float GetFontSize() const;
   FX_ARGB GetTextColor() const;
   float GetLineHeight() const;