SkPDF: eliminate skpdfpage class

SkPDF: eliminate skpdfpage class

BUG=skia:3585
Committed: https://skia.googlesource.com/skia/+/2f7ebcb424cd1d1acf07478157f86b0a3eafd712

[hal.canary, 2015-03-25 18:58:12]

The CQ bit was checked by halcanary@google.com

[commit-bot: I haz the power, 2015-03-25 18:58:29]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1007083004/1

[commit-bot: I haz the power, 2015-03-25 18:58:30]

Note for Reviewers:
The CQ is waiting for an approval.
If you believe that the CL is not ready yet, or if you would like to L-G-T-M
with comments then please uncheck the CQ checkbox.

Waiting for LGTM from valid reviewer(s) till 2015-03-26 00:58 UTC

[commit-bot: I haz the power, 2015-03-25 18:59:31]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-03-25 18:59:32]

Try jobs failed on following builders:
  Test-Ubuntu-GCE-NoGPU-x86_64-Debug-Trybot on client.skia (JOB_FAILED,
http://build.chromium.org/p/client.skia/builders/Test-Ubuntu-GCE-NoGPU-x86_64...)
  Test-Ubuntu-GCE-NoGPU-x86_64-Release-Shared-Trybot on client.skia (JOB_FAILED,
http://build.chromium.org/p/client.skia/builders/Test-Ubuntu-GCE-NoGPU-x86_64...)
  Build-Ubuntu-Clang-x86_64-Debug-Trybot on client.skia.compile (JOB_FAILED,
http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-Clang-x...)
  Build-Ubuntu-GCC-Arm7-Debug-Android-Trybot on client.skia.compile (JOB_FAILED,
http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-GCC-Arm...)

[hal.canary, 2015-03-25 19:01:20]

The CQ bit was checked by halcanary@google.com

[commit-bot: I haz the power, 2015-03-25 19:01:40]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1007083004/20001

[commit-bot: I haz the power, 2015-03-25 19:01:41]

Note for Reviewers:
The CQ is waiting for an approval.
If you believe that the CL is not ready yet, or if you would like to L-G-T-M
with comments then please uncheck the CQ checkbox.

Waiting for LGTM from valid reviewer(s) till 2015-03-26 01:01 UTC

[hal.canary, 2015-03-25 19:16:28]

halcanary@google.com changed reviewers:
+ mtklein@google.com

[hal.canary, 2015-03-25 19:16:29]

ptal

[mtklein, 2015-03-25 19:18:00]

lgtm

[commit-bot: I haz the power, 2015-03-25 19:19:53]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-03-25 19:19:54]

Failed to apply patch for src/pdf/SkPDFDocument.cpp:
While running git apply --index -3 -p1;
  <stdin>:44: trailing whitespace.
      
  error: src/pdf/SkPDFDocument.cpp: does not exist in index

Patch:       src/pdf/SkPDFDocument.cpp
Index: src/pdf/SkPDFDocument.cpp
diff --git a/src/pdf/SkPDFDocument.cpp b/src/pdf/SkPDFDocument.cpp
index
5f86598c08e27f882f320b3b9bb56e1801d88a09..b3b6be266a2d27ceb17f4c72186fff1ad7fb99b6
100644
--- a/src/pdf/SkPDFDocument.cpp
+++ b/src/pdf/SkPDFDocument.cpp
@@ -11,18 +11,20 @@
 #include "SkPDFDevice.h"
 #include "SkPDFDocument.h"
 #include "SkPDFFont.h"
-#include "SkPDFPage.h"
+#include "SkPDFResourceDict.h"
+#include "SkPDFStream.h"
 #include "SkPDFTypes.h"
 #include "SkStream.h"
 
 
-static void perform_font_subsetting(SkPDFCatalog* catalog,
-                                    const SkTDArray<SkPDFPage*>& pages) {
+static void perform_font_subsetting(
+        const SkTDArray<const SkPDFDevice*>& pageDevices,
+        SkPDFCatalog* catalog) {
     SkASSERT(catalog);
 
     SkPDFGlyphSetMap usage;
-    for (int i = 0; i < pages.count(); ++i) {
-        usage.merge(pages[i]->getFontGlyphUsage());
+    for (int i = 0; i < pageDevices.count(); ++i) {
+        usage.merge(pageDevices[i]->getFontGlyphUsage());
     }
     SkPDFGlyphSetMap::F2BIter iterator(usage);
     const SkPDFGlyphSetMap::FontGlyphSetPair* entry = iterator.next();
@@ -62,23 +64,125 @@ static void emit_pdf_footer(SkWStream* stream,
     stream->writeText("\n%%EOF");
 }
 
+static SkPDFDict* create_pdf_page(const SkPDFDevice* pageDevice) {
+    SkAutoTUnref<SkPDFDict> page(SkNEW_ARGS(SkPDFDict, ("Page")));
+    SkAutoTUnref<SkPDFResourceDict> deviceResourceDict(
+            pageDevice->createResourceDict());
+    page->insert("Resources", deviceResourceDict.get());
+
+    SkAutoTUnref<SkPDFArray> mediaBox(pageDevice->copyMediaBox());
+    page->insert("MediaBox", mediaBox.get());
+    
+    SkPDFArray* annots = pageDevice->getAnnotations();
+    if (annots && annots->size() > 0) {
+        page->insert("Annots", annots);
+    }
+
+    SkAutoTDelete<SkStreamAsset> content(pageDevice->content());
+    SkAutoTUnref<SkPDFStream> contentStream(
+            SkNEW_ARGS(SkPDFStream, (content.get())));
+    page->insert("Contents", new SkPDFObjRef(contentStream.get()))->unref();
+    return page.detach();
+}
+
+static void generate_page_tree(const SkTDArray<SkPDFDict*>& pages,
+                               SkTDArray<SkPDFDict*>* pageTree,
+                               SkPDFDict** rootNode) {
+    // PDF wants a tree describing all the pages in the document.  We arbitrary
+    // choose 8 (kNodeSize) as the number of allowed children.  The internal
+    // nodes have type "Pages" with an array of children, a parent pointer, and
+    // the number of leaves below the node as "Count."  The leaves are passed
+    // into the method, have type "Page" and need a parent pointer. This method
+    // builds the tree bottom up, skipping internal nodes that would have only
+    // one child.
+    static const int kNodeSize = 8;
+
+    SkAutoTUnref<SkPDFName> kidsName(new SkPDFName("Kids"));
+    SkAutoTUnref<SkPDFName> countName(new SkPDFName("Count"));
+    SkAutoTUnref<SkPDFName> parentName(new SkPDFName("Parent"));
+
+    // curNodes takes a reference to its items, which it passes to pageTree.
+    SkTDArray<SkPDFDict*> curNodes;
+    curNodes.setReserve(pages.count());
+    for (int i = 0; i < pages.count(); i++) {
+        SkSafeRef(pages[i]);
+        curNodes.push(pages[i]);
+    }
+
+    // nextRoundNodes passes its references to nodes on to curNodes.
+    SkTDArray<SkPDFDict*> nextRoundNodes;
+    nextRoundNodes.setReserve((pages.count() + kNodeSize - 1)/kNodeSize);
+
+    int treeCapacity = kNodeSize;
+    do {
+        for (int i = 0; i < curNodes.count(); ) {
+            if (i > 0 && i + 1 == curNodes.count()) {
+                nextRoundNodes.push(curNodes[i]);
+                break;
+            }
+
+            SkPDFDict* newNode = new SkPDFDict("Pages");
+            SkAutoTUnref<SkPDFObjRef> newNodeRef(new SkPDFObjRef(newNode));
+
+            SkAutoTUnref<SkPDFArray> kids(new SkPDFArray);
+            kids->reserve(kNodeSize);
+
+            int count = 0;
+            for (; i < curNodes.count() && count < kNodeSize; i++, count++) {
+                curNodes[i]->insert(parentName.get(), newNodeRef.get());
+                kids->append(new SkPDFObjRef(curNodes[i]))->unref();
+
+                // TODO(vandebo): put the objects in strict access order.
+                // Probably doesn't matter because they are so small.
+                if (curNodes[i] != pages[0]) {
+                    pageTree->push(curNodes[i]);  // Transfer reference.
+                } else {
+                    SkSafeUnref(curNodes[i]);
+                }
+            }
+
+            // treeCapacity is the number of leaf nodes possible for the
+            // current set of subtrees being generated. (i.e. 8, 64, 512, ...).
+            // It is hard to count the number of leaf nodes in the current
+            // subtree. However, by construction, we know that unless it's the
+            // last subtree for the current depth, the leaf count will be
+            // treeCapacity, otherwise it's what ever is left over after
+            // consuming treeCapacity chunks.
+            int pageCount = treeCapacity;
+            if (i == curNodes.count()) {
+                pageCount = ((pages.count() - 1) % treeCapacity) + 1;
+            }
+            newNode->insert(countName.get(), new SkPDFInt(pageCount))->unref();
+            newNode->insert(kidsName.get(), kids.get());
+            nextRoundNodes.push(newNode);  // Transfer reference.
+        }
+
+        curNodes = nextRoundNodes;
+        nextRoundNodes.rewind();
+        treeCapacity *= kNodeSize;
+    } while (curNodes.count() > 1);
+
+    pageTree->push(curNodes[0]);  // Transfer reference.
+    if (rootNode) {
+        *rootNode = curNodes[0];
+    }
+}
+
 bool SkPDFDocument::EmitPDF(const SkTDArray<const SkPDFDevice*>& pageDevices,
                             SkWStream* stream) {
     if (pageDevices.isEmpty()) {
         return false;
     }
 
-    SkTDArray<SkPDFPage*> pages;
+    SkTDArray<SkPDFDict*> pages;
     SkAutoTUnref<SkPDFDict> dests(SkNEW(SkPDFDict));
 
     for (int i = 0; i < pageDevices.count(); i++) {
         SkASSERT(pageDevices[i]);
         SkASSERT(i == 0 ||
                  pageDevices[i - 1]->getCanon() == pageDevices[i]->getCanon());
-        // Reference from new passed to pages.
-        SkAutoTUnref<SkPDFPage> page(SkNEW_ARGS(SkPDFPage, (pageDevices[i])));
-        page->finalizePage();
-        page->appendDestinations(dests);
+        SkAutoTUnref<SkPDFDict> page(create_pdf_page(pageDevices[i]));
+        pageDevices[i]->appendDestinations(dests, page.get());
         pages.push(page.detach());
     }
     SkPDFCatalog catalog;
@@ -87,7 +191,7 @@ bool SkPDFDocument::EmitPDF(const SkTDArray<const
SkPDFDevice*>& pageDevices,
     SkAutoTUnref<SkPDFDict> docCatalog(SkNEW_ARGS(SkPDFDict, ("Catalog")));
 
     SkPDFDict* pageTreeRoot;
-    SkPDFPage::GeneratePageTree(pages, &pageTree, &pageTreeRoot);
+    generate_page_tree(pages, &pageTree, &pageTreeRoot);
 
     docCatalog->insert("Pages", new SkPDFObjRef(pageTreeRoot))->unref();
 
@@ -107,7 +211,7 @@ bool SkPDFDocument::EmitPDF(const SkTDArray<const
SkPDFDevice*>& pageDevices,
     }
 
     // Build font subsetting info before proceeding.
-    perform_font_subsetting(&catalog, pages);
+    perform_font_subsetting(pageDevices, &catalog);
 
     SkTSet<SkPDFObject*> resourceSet;
     if (resourceSet.add(docCatalog.get())) {

[hal.canary, 2015-03-25 19:32:01]

The CQ bit was checked by halcanary@google.com

[hal.canary, 2015-03-25 19:32:02]

The patchset sent to the CQ was uploaded after l-g-t-m from mtklein@google.com
Link to the patchset: https://codereview.chromium.org/1007083004/#ps40001
(title: "2015-03-25 (Wednesday) 15:31:19 EDT")

[commit-bot: I haz the power, 2015-03-25 19:32:22]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1007083004/40001

[commit-bot: I haz the power, 2015-03-25 19:45:33]

Committed patchset #3 (id:40001) as
https://skia.googlesource.com/skia/+/2f7ebcb424cd1d1acf07478157f86b0a3eafd712