commit 769fa6a013baca6d7404e2bf096a34a7e3635fa5
author ctguil@chromium.org <ctguil@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Sat Aug 20 00:36:18 2011 +0000
committer ctguil@chromium.org <ctguil@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Sat Aug 20 00:36:18 2011 +0000
tree db4deec19b1c983e9b4edd866034324e7b00a60a
parent 971d0c8049c6bfc7a58f0b41f8f59f9ec9ca077b

No effect cleanup in pdf code.
Review URL: http://codereview.appspot.com/4927042

git-svn-id: http://skia.googlecode.com/svn/trunk@2146 2bbb7eff-a529-9590-31e7-b0007b416f81

src/pdf/SkPDFDocument.cpp

diff --git a/src/pdf/SkPDFDocument.cpp b/src/pdf/SkPDFDocument.cpp
index e566856..cb87d8f 100644
--- a/src/pdf/SkPDFDocument.cpp
+++ b/src/pdf/SkPDFDocument.cpp
@@ -68,8 +68,9 @@
 
     // The page tree has both child and parent pointers, so it creates a
     // reference cycle.  We must clear that cycle to properly reclaim memory.
-    for (int i = 0; i < fPageTree.count(); i++)
+    for (int i = 0; i < fPageTree.count(); i++) {
         fPageTree[i]->clear();
+    }
     fPageTree.safeUnrefAll();
     fPageResources.safeUnrefAll();
     fSubstitutes.safeUnrefAll();
@@ -86,13 +87,13 @@
     }
 
     // We haven't emitted the document before if fPageTree is empty.
-    if (fPageTree.count() == 0) {
+    if (fPageTree.isEmpty()) {
         SkPDFDict* pageTreeRoot;
         SkPDFPage::GeneratePageTree(fPages, fCatalog.get(), &fPageTree,
                                     &pageTreeRoot);
         fDocCatalog->insert("Pages", new SkPDFObjRef(pageTreeRoot))->unref();
 
-        /* TODO(vandebo) output intent
+        /* TODO(vandebo): output intent
         SkRefPtr<SkPDFDict> outputIntent = new SkPDFDict("OutputIntent");
         outputIntent->unref();  // SkRefPtr and new both took a reference.
         outputIntent->insert("S", new SkPDFName("GTS_PDFA1"))->unref();
@@ -131,21 +132,24 @@
         // Add the size of resources of substitute objects used on page 1.
         fileOffset += fCatalog->setSubstituteResourcesOffsets(fileOffset, true);
         if (fPages.count() > 1) {
-            // TODO(vandebo) For linearized format, save the start of the
+            // TODO(vandebo): For linearized format, save the start of the
             // first page xref table and calculate the size.
         }
 
-        for (int i = 0; i < fPageTree.count(); i++)
+        for (int i = 0; i < fPageTree.count(); i++) {
             fileOffset += fCatalog->setFileOffset(fPageTree[i], fileOffset);
+        }
 
-        for (int i = 1; i < fPages.count(); i++)
+        for (int i = 1; i < fPages.count(); i++) {
             fileOffset += fPages[i]->getPageSize(fCatalog.get(), fileOffset);
+        }
 
         for (int i = fSecondPageFirstResourceIndex;
                  i < fPageResources.count();
-                 i++)
+                 i++) {
             fileOffset += fCatalog->setFileOffset(fPageResources[i],
                                                   fileOffset);
+        }
 
         fileOffset += fCatalog->setSubstituteResourcesOffsets(fileOffset,
                                                               false);
@@ -160,9 +164,9 @@
         fPageResources[i]->emit(stream, fCatalog.get(), true);
     }
     fCatalog->emitSubstituteResources(stream, true);
-    // TODO(vandebo) support linearized format
+    // TODO(vandebo): Support linearized format
     // if (fPages.size() > 1) {
-    //     // TODO(vandebo) save the file offset for the first page xref table.
+    //     // TODO(vandebo): Save the file offset for the first page xref table.
     //     fCatalog->emitXrefTable(stream, true);
     // }
 
@@ -187,7 +191,7 @@
 }
 
 bool SkPDFDocument::setPage(int pageNumber, SkPDFDevice* pdfDevice) {
-    if (fPageTree.count() != 0) {
+    if (!fPageTree.isEmpty()) {
         return false;
     }
 
@@ -209,7 +213,7 @@
 }
 
 bool SkPDFDocument::appendPage(SkPDFDevice* pdfDevice) {
-    if (fPageTree.count() != 0) {
+    if (!fPageTree.isEmpty()) {
         return false;
     }
 
@@ -241,8 +245,8 @@
         fTrailerDict = new SkPDFDict();
         fTrailerDict->unref();  // SkRefPtr and new both took a reference.
 
-        // TODO(vandebo) Linearized format will take a Prev entry too.
-        // TODO(vandebo) PDF/A requires an ID entry.
+        // TODO(vandebo): Linearized format will take a Prev entry too.
+        // TODO(vandebo): PDF/A requires an ID entry.
         fTrailerDict->insertInt("Size", objCount);
         fTrailerDict->insert("Root",
                              new SkPDFObjRef(fDocCatalog.get()))->unref();