Merge to XFA: Cleanup CPDF_Stream:

core/src/fpdfdoc/doc_ap.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "core/include/fpdfdoc/fpdf_ap.h"
 #include "core/include/fpdfdoc/fpdf_doc.h"
 #include "core/include/fpdfdoc/fpdf_vt.h"
 #include "doc_utils.h"
@@ skipping 409 matching lines @@
   rcBody.Normalize();
   CPDF_Dictionary* pAPDict = pAnnotDict->GetDict("AP");
   if (pAPDict == NULL) {
     pAPDict = CPDF_Dictionary::Create();
     if (pAPDict == NULL) {
       return FALSE;
     }
     pAnnotDict->SetAt("AP", pAPDict);
   }
   CPDF_Stream* pNormalStream = pAPDict->GetStream("N");
-  if (pNormalStream == NULL) {
-    pNormalStream = CPDF_Stream::Create(NULL, 0, NULL);
-    if (pNormalStream == NULL) {
-      return FALSE;
-    }
+  if (!pNormalStream) {
+    pNormalStream = new CPDF_Stream(nullptr, 0, nullptr);
     int32_t objnum = pDoc->AddIndirectObject(pNormalStream);
     pAnnotDict->GetDict("AP")->SetAtReference("N", pDoc, objnum);
   }
   CPDF_Dictionary* pStreamDict = pNormalStream->GetDict();
   if (pStreamDict) {
     pStreamDict->SetAtMatrix("Matrix", matrix);
     pStreamDict->SetAtRect("BBox", rcBBox);
     CPDF_Dictionary* pStreamResList = pStreamDict->GetDict("Resources");
     if (pStreamResList) {
       CPDF_Dictionary* pStreamResFontList = pStreamResList->GetDict("Font");
@@ skipping 484 matching lines @@
                    << "\n";
       break;
     case CT_CMYK:
       sColorStream << color.fColor1 << " " << color.fColor2 << " "
                    << color.fColor3 << " " << color.fColor4 << " "
                    << (bFillOrStroke ? "k" : "K") << "\n";
       break;
   }
   return sColorStream.GetByteString();
 }