Do all the font UMA work in PdfMetafileSkia::FinishDocument.

printing/pdf_metafile_skia.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "printing/pdf_metafile_skia.h"
 
 #include "base/eintr_wrapper.h"
 #include "base/file_descriptor_posix.h"
 #include "base/file_util.h"
 #include "base/hash_tables.h"
 #include "base/metrics/histogram.h"
 #include "skia/ext/vector_platform_device_skia.h"
 #include "third_party/skia/include/core/SkRefCnt.h"
 #include "third_party/skia/include/core/SkScalar.h"
 #include "third_party/skia/include/core/SkStream.h"
 #include "third_party/skia/include/core/SkTypeface.h"
 #include "third_party/skia/include/pdf/SkPDFDevice.h"
 #include "third_party/skia/include/pdf/SkPDFDocument.h"
 #include "third_party/skia/include/pdf/SkPDFFont.h"
 #include "third_party/skia/include/pdf/SkPDFPage.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 
-namespace {
-  typedef base::hash_map<SkFontID, SkAdvancedTypefaceMetrics::FontType>
-      FontTypeMap;
-};
-
 namespace printing {
 
 struct PdfMetafileSkiaData {
   SkRefPtr<SkPDFDevice> current_page_;
   SkPDFDocument pdf_doc_;
   SkDynamicMemoryWStream pdf_stream_;
-  FontTypeMap font_type_stats_;
 };
 
 PdfMetafileSkia::~PdfMetafileSkia() {}
 
 bool PdfMetafileSkia::Init() {
   return true;
 }
 bool PdfMetafileSkia::InitFromData(const void* src_buffer,
                                    uint32 src_buffer_size) {
   return data_->pdf_stream_.write(src_buffer, src_buffer_size);
@@ skipping 27 matching lines @@
 bool PdfMetafileSkia::StartPage(const gfx::Size& page_size,
                                 const gfx::Rect& content_area,
                                 const float& scale_factor) {
   NOTREACHED();
   return NULL;
 }
 
 bool PdfMetafileSkia::FinishPage() {
   DCHECK(data_->current_page_.get());
 
-  const SkTDArray<SkPDFFont*>& font_resources =
-      data_->current_page_->getFontResources();
-  for (int i = 0; i < font_resources.count(); i++) {
-    SkFontID key = font_resources[i]->typeface()->uniqueID();
-    data_->font_type_stats_[key] = font_resources[i]->getType();
-  }
-
   data_->pdf_doc_.appendPage(data_->current_page_);
   data_->current_page_ = NULL;
   return true;
 }
 
 bool PdfMetafileSkia::FinishDocument() {
   // Don't do anything if we've already set the data in InitFromData.
   if (data_->pdf_stream_.getOffset())
     return true;
 
   if (data_->current_page_.get())
     FinishPage();
 
-  for (FontTypeMap::const_iterator it = data_->font_type_stats_.begin();
-       it != data_->font_type_stats_.end();
+  typedef base::hash_map<SkFontID, SkAdvancedTypefaceMetrics::FontType>
+      FontTypeMap;
+  FontTypeMap font_type_stats;
+
+  const SkTDArray<SkPDFPage*>& pages = data_->pdf_doc_.getPages();
+  for (int page_number = 0; page_number < pages.count(); page_number++) {
+    const SkTDArray<SkPDFFont*>& font_resources =
+      pages[page_number]->getFontResources();
+    for (int font = 0; font < font_resources.count(); font++) {
+      SkFontID key = font_resources[font]->typeface()->uniqueID();

[Chris Guillory, 2011/05/31 18:15:45]

We can call UMA_HISTOGRAM_ENUMERATION here when the hash_map doesn't contain the
key. Looks like we can also just use a simple set of font ids instead of a
hash_map.

[vandebo (ex-Chrome), 2011/05/31 18:55:11]

Good point. Done.

+      font_type_stats[key] = font_resources[font]->getType();
+    }
+  }
+
+  for (FontTypeMap::const_iterator it = font_type_stats.begin();
+       it != font_type_stats.end();
        it++) {
     UMA_HISTOGRAM_ENUMERATION(
         "PrintPreview.FontType",
         it->second,
         SkAdvancedTypefaceMetrics::kNotEmbeddable_Font + 1);
   }
 
   return data_->pdf_doc_.emitPDF(&data_->pdf_stream_);
 }
 
@@ skipping 79 matching lines @@
       result = false;
     }
   }
   return result;
 }
 #endif
 
 PdfMetafileSkia::PdfMetafileSkia() : data_(new PdfMetafileSkiaData) {}
 
 }  // namespace printing