From 2dd06eeefec484e31debecc4552ddd3f3cf96726 Mon Sep 17 00:00:00 2001
From: sammc <sammc@chromium.org>
Date: Thu, 27 Aug 2015 03:25:35 -0700
Subject: [PATCH] PDF: Use PDF metadata for the title instead of the last path
 element.

Review URL: https://codereview.chromium.org/1303103003

Cr-Commit-Position: refs/heads/master@{#345838}
---
 chrome/browser/pdf/pdf_extension_test.cc      |   8 +++
 .../viewer-pdf-toolbar.html                   |   2 +-
 chrome/browser/resources/pdf/pdf.js           |  15 ++++--
 chrome/test/data/pdf/basic_plugin_test.js     |   9 ++++
 chrome/test/data/pdf/test-title.pdf           | Bin 0 -> 11561 bytes
 chrome/test/data/pdf/title_test.js            |  19 +++++++
 pdf/out_of_process_instance.cc                |  17 ++++---
 pdf/pdf_engine.h                              |   2 +
 .../pdfium_api_string_buffer_adapter.cc       |  35 ++++++++++---
 pdf/pdfium/pdfium_api_string_buffer_adapter.h |  48 +++++++++++++++++-
 pdf/pdfium/pdfium_engine.cc                   |  40 +++++++++------
 pdf/pdfium/pdfium_engine.h                    |   1 +
 12 files changed, 161 insertions(+), 35 deletions(-)
 create mode 100644 chrome/test/data/pdf/test-title.pdf
 create mode 100644 chrome/test/data/pdf/title_test.js

diff --git a/chrome/browser/pdf/pdf_extension_test.cc b/chrome/browser/pdf/pdf_extension_test.cc
index 548341b76a8042..b90517984a16bd 100644
--- a/chrome/browser/pdf/pdf_extension_test.cc
+++ b/chrome/browser/pdf/pdf_extension_test.cc
@@ -326,6 +326,10 @@ IN_PROC_BROWSER_TEST_F(PDFExtensionTest, ZoomManager) {
   RunTestsInFile("zoom_manager_test.js", "test.pdf");
 }
 
+IN_PROC_BROWSER_TEST_F(PDFExtensionTest, Title) {
+  RunTestsInFile("title_test.js", "test-title.pdf");
+}
+
 // Ensure that the internal PDF plugin application/x-google-chrome-pdf won't be
 // loaded if it's not loaded in the chrome extension page.
 IN_PROC_BROWSER_TEST_F(PDFExtensionTest, EnsureInternalPluginDisabled) {
@@ -412,3 +416,7 @@ IN_PROC_BROWSER_TEST_F(MaterialPDFExtensionTest, Elements) {
 IN_PROC_BROWSER_TEST_F(MaterialPDFExtensionTest, ToolbarManager) {
   RunTestsInFile("toolbar_manager_test.js", "test.pdf");
 }
+
+IN_PROC_BROWSER_TEST_F(MaterialPDFExtensionTest, Title) {
+  RunTestsInFile("title_test.js", "test-title.pdf");
+}
diff --git a/chrome/browser/resources/pdf/elements/viewer-pdf-toolbar/viewer-pdf-toolbar.html b/chrome/browser/resources/pdf/elements/viewer-pdf-toolbar/viewer-pdf-toolbar.html
index 4a44ccee328e35..e10bab94f166cb 100644
--- a/chrome/browser/resources/pdf/elements/viewer-pdf-toolbar/viewer-pdf-toolbar.html
+++ b/chrome/browser/resources/pdf/elements/viewer-pdf-toolbar/viewer-pdf-toolbar.html
@@ -33,7 +33,7 @@
         <div id="buttons" class="invisible flex-5">
           <!-- TODO(tsergeant): "Bookmarks" should be localized. -->
           <viewer-toolbar-dropdown id="bookmarks"
-                                   hidden$="[[!bookmarks]]"
+                                   hidden$="[[!bookmarks.length]]"
                                    header="Bookmarks"
                                    open-icon="bookmark"
                                    closed-icon="bookmark-border">
diff --git a/chrome/browser/resources/pdf/pdf.js b/chrome/browser/resources/pdf/pdf.js
index 18c8f38e4e2d94..fad8c6cc77a164 100644
--- a/chrome/browser/resources/pdf/pdf.js
+++ b/chrome/browser/resources/pdf/pdf.js
@@ -149,8 +149,6 @@ function PDFViewer(browserApi) {
   window.addEventListener('message', this.handleScriptingMessage.bind(this),
                           false);
 
-  document.title = decodeURIComponent(
-      getFilenameFromURL(this.browserApi_.getStreamInfo().originalUrl));
   this.plugin_.setAttribute('src',
                             this.browserApi_.getStreamInfo().originalUrl);
   this.plugin_.setAttribute('stream-url',
@@ -198,7 +196,6 @@ function PDFViewer(browserApi) {
         this.viewport_.zoomOut.bind(this.viewport_));
 
     this.materialToolbar_ = $('material-toolbar');
-    this.materialToolbar_.docTitle = document.title;
     this.materialToolbar_.addEventListener('save', this.save_.bind(this));
     this.materialToolbar_.addEventListener('print', this.print_.bind(this));
     this.materialToolbar_.addEventListener('rotate-right',
@@ -607,10 +604,18 @@ PDFViewer.prototype = {
       case 'cancelStreamUrl':
         chrome.mimeHandlerPrivate.abortStream();
         break;
-      case 'bookmarks':
+      case 'metadata':
+        if (message.data.title) {
+          document.title = message.data.title;
+        } else {
+          document.title = decodeURIComponent(
+              getFilenameFromURL(this.browserApi_.getStreamInfo().originalUrl));
+        }
         this.bookmarks_ = message.data.bookmarks;
-        if (this.isMaterial_ && this.bookmarks_.length !== 0)
+        if (this.isMaterial_) {
+          this.materialToolbar_.docTitle = document.title;
           this.materialToolbar_.bookmarks = this.bookmarks;
+        }
         break;
       case 'setIsSelecting':
         this.viewportScroller_.setEnableScrolling(message.data.isSelecting);
diff --git a/chrome/test/data/pdf/basic_plugin_test.js b/chrome/test/data/pdf/basic_plugin_test.js
index fc73d5417b4ca6..dbcf0bc31e4ed4 100644
--- a/chrome/test/data/pdf/basic_plugin_test.js
+++ b/chrome/test/data/pdf/basic_plugin_test.js
@@ -55,6 +55,15 @@ var tests = [
       chrome.test.assertEq('this is some text\nsome more text', selectedText);
     }));
   },
+
+  /**
+   * Test that the filename is used as the title.pdf.
+   */
+  function testHasCorrectTitle() {
+    chrome.test.assertEq('test.pdf', document.title);
+
+    chrome.test.succeed();
+  },
 ];
 
 var scriptingAPI = new PDFScriptingAPI(window, window);
diff --git a/chrome/test/data/pdf/test-title.pdf b/chrome/test/data/pdf/test-title.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..227fa7aa174917b39f5861b39a116677dd3cb48c
GIT binary patch
literal 11561
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%0AoR&GBW^vcpB5l((cW
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
NjEIz!B66aL{|{Q5`!xUn

literal 0
HcmV?d00001

diff --git a/chrome/test/data/pdf/title_test.js b/chrome/test/data/pdf/title_test.js
new file mode 100644
index 00000000000000..d4262bed97b817
--- /dev/null
+++ b/chrome/test/data/pdf/title_test.js
@@ -0,0 +1,19 @@
+// Copyright 2015 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.
+
+var tests = [
+  /**
+   * Test that the correct title is displayed for test-title.pdf.
+   */
+  function testHasCorrectTitle() {
+    chrome.test.assertEq('PDF title test', document.title);
+
+    chrome.test.succeed();
+  }
+];
+
+var scriptingAPI = new PDFScriptingAPI(window, window);
+scriptingAPI.setLoadCallback(function() {
+  chrome.test.runTests(tests);
+});
diff --git a/pdf/out_of_process_instance.cc b/pdf/out_of_process_instance.cc
index dbe3968d0ca2d1..5f60a4bce286e7 100644
--- a/pdf/out_of_process_instance.cc
+++ b/pdf/out_of_process_instance.cc
@@ -77,9 +77,10 @@ const char kJSPageHeight[] = "height";
 // Document load progress arguments (Plugin -> Page)
 const char kJSLoadProgressType[] = "loadProgress";
 const char kJSProgressPercentage[] = "progress";
-// Bookmarks
-const char kJSBookmarksType[] = "bookmarks";
+// Metadata
+const char kJSMetadataType[] = "metadata";
 const char kJSBookmarks[] = "bookmarks";
+const char kJSTitle[] = "title";
 // Get password arguments (Plugin -> Page)
 const char kJSGetPasswordType[] = "getPassword";
 // Get password complete arguments (Page -> Plugin)
@@ -1126,10 +1127,14 @@ void OutOfProcessInstance::DocumentLoadComplete(int page_count) {
     OnGeometryChanged(0, 0);
   }
 
-  pp::VarDictionary bookmarks_message;
-  bookmarks_message.Set(pp::Var(kType), pp::Var(kJSBookmarksType));
-  bookmarks_message.Set(pp::Var(kJSBookmarks), engine_->GetBookmarks());
-  PostMessage(bookmarks_message);
+  pp::VarDictionary metadata_message;
+  metadata_message.Set(pp::Var(kType), pp::Var(kJSMetadataType));
+  std::string title = engine_->GetMetadata("Title");
+  if (!title.empty())
+    metadata_message.Set(pp::Var(kJSTitle), pp::Var(title));
+
+  metadata_message.Set(pp::Var(kJSBookmarks), engine_->GetBookmarks());
+  PostMessage(metadata_message);
 
   pp::VarDictionary progress_message;
   progress_message.Set(pp::Var(kType), pp::Var(kJSLoadProgressType));
diff --git a/pdf/pdf_engine.h b/pdf/pdf_engine.h
index 24c69b56c82f9b..69761a16b76cd6 100644
--- a/pdf/pdf_engine.h
+++ b/pdf/pdf_engine.h
@@ -279,6 +279,8 @@ class PDFEngine {
   virtual void SetScrollPosition(const pp::Point& position) = 0;
 
   virtual bool IsProgressiveLoad() = 0;
+
+  virtual std::string GetMetadata(const std::string& key) = 0;
 };
 
 // Interface for exports that wrap the PDF engine.
diff --git a/pdf/pdfium/pdfium_api_string_buffer_adapter.cc b/pdf/pdfium/pdfium_api_string_buffer_adapter.cc
index c5be3021d5b367..9ac7425f55e423 100644
--- a/pdf/pdfium/pdfium_api_string_buffer_adapter.cc
+++ b/pdf/pdfium/pdfium_api_string_buffer_adapter.cc
@@ -7,7 +7,6 @@
 #include <string>
 
 #include "base/logging.h"
-#include "base/numerics/safe_math.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 
@@ -36,12 +35,6 @@ void* PDFiumAPIStringBufferAdapter<StringType>::GetData() {
   return data_;
 }
 
-template <class StringType>
-void PDFiumAPIStringBufferAdapter<StringType>::Close(int actual_size) {
-  base::CheckedNumeric<size_t> unsigned_size = actual_size;
-  Close(unsigned_size.ValueOrDie());
-}
-
 template <class StringType>
 void PDFiumAPIStringBufferAdapter<StringType>::Close(size_t actual_size) {
   DCHECK(!is_closed_);
@@ -58,8 +51,36 @@ void PDFiumAPIStringBufferAdapter<StringType>::Close(size_t actual_size) {
   }
 }
 
+template <class StringType>
+PDFiumAPIStringBufferSizeInBytesAdapter<StringType>::
+    PDFiumAPIStringBufferSizeInBytesAdapter(StringType* str,
+                                            size_t expected_size,
+                                            bool check_expected_size)
+    : adapter_(str,
+               expected_size / sizeof(typename StringType::value_type),
+               check_expected_size) {
+  DCHECK(expected_size % sizeof(typename StringType::value_type) == 0);
+}
+
+template <class StringType>
+PDFiumAPIStringBufferSizeInBytesAdapter<
+    StringType>::~PDFiumAPIStringBufferSizeInBytesAdapter() = default;
+
+template <class StringType>
+void* PDFiumAPIStringBufferSizeInBytesAdapter<StringType>::GetData() {
+  return adapter_.GetData();
+}
+
+template <class StringType>
+void PDFiumAPIStringBufferSizeInBytesAdapter<StringType>::Close(
+    size_t actual_size) {
+  DCHECK(actual_size % sizeof(typename StringType::value_type) == 0);
+  adapter_.Close(actual_size / sizeof(typename StringType::value_type));
+}
+
 // explicit instantiations
 template class PDFiumAPIStringBufferAdapter<std::string>;
 template class PDFiumAPIStringBufferAdapter<base::string16>;
+template class PDFiumAPIStringBufferSizeInBytesAdapter<base::string16>;
 
 }  // namespace chrome_pdf
diff --git a/pdf/pdfium/pdfium_api_string_buffer_adapter.h b/pdf/pdfium/pdfium_api_string_buffer_adapter.h
index a36879f112bc74..0005e97b77bbc0 100644
--- a/pdf/pdfium/pdfium_api_string_buffer_adapter.h
+++ b/pdf/pdfium/pdfium_api_string_buffer_adapter.h
@@ -6,6 +6,7 @@
 #define PDF_PDFIUM_PDFIUM_API_STRING_BUFFER_ADAPTER_H_
 
 #include "base/basictypes.h"
+#include "base/numerics/safe_math.h"
 
 namespace chrome_pdf {
 
@@ -35,9 +36,14 @@ class PDFiumAPIStringBufferAdapter {
   // Resizes |str_| to |actual_size| - 1 characters, thereby removing the extra
   // null-terminator. This must be called prior to the adapter's destruction.
   // The pointer returned by GetData() should be considered invalid.
-  void Close(int actual_size);
   void Close(size_t actual_size);
 
+  template <typename IntType>
+  void Close(IntType actual_size) {
+    base::CheckedNumeric<size_t> unsigned_size = actual_size;
+    Close(unsigned_size.ValueOrDie());
+  }
+
  private:
   StringType* const str_;
   void* const data_;
@@ -48,6 +54,46 @@ class PDFiumAPIStringBufferAdapter {
   DISALLOW_COPY_AND_ASSIGN(PDFiumAPIStringBufferAdapter);
 };
 
+// Helper to deal with the fact that many PDFium APIs write the null-terminator
+// into string buffers that are passed to them, but the PDF plugin likes to pass
+// in std::strings / base::string16s, where one should not count on the internal
+// string buffers to be null-terminated. This version is suitable for APIs that
+// work in terms of number of bytes instead of the number of characters.
+template <class StringType>
+class PDFiumAPIStringBufferSizeInBytesAdapter {
+ public:
+  // |str| is the string to write into.
+  // |expected_size| is the number of bytes the PDFium API will write,
+  // including the null-terminator. It should be at least the size of a
+  // character in bytes.
+  // |check_expected_size| whether to check the actual number of bytes
+  // written into |str| against |expected_size| when calling Close().
+  PDFiumAPIStringBufferSizeInBytesAdapter(StringType* str,
+                                          size_t expected_size,
+                                          bool check_expected_size);
+  ~PDFiumAPIStringBufferSizeInBytesAdapter();
+
+  // Returns a pointer to |str_|'s buffer. The buffer's size is large enough to
+  // hold |expected_size_| + sizeof(StringType::value_type) bytes, so the PDFium
+  // API that uses the pointer has space to write a null-terminator.
+  void* GetData();
+
+  // Resizes |str_| to |actual_size| - sizeof(StringType::value_type) bytes,
+  // thereby removing the extra null-terminator. This must be called prior to
+  // the adapter's destruction. The pointer returned by GetData() should be
+  // considered invalid.
+  void Close(size_t actual_size);
+
+  template <typename IntType>
+  void Close(IntType actual_size) {
+    base::CheckedNumeric<size_t> unsigned_size = actual_size;
+    Close(unsigned_size.ValueOrDie());
+  }
+
+ private:
+  PDFiumAPIStringBufferAdapter<StringType> adapter_;
+};
+
 }  // namespace chrome_pdf
 
 #endif  // PDF_PDFIUM_PDFIUM_API_STRING_BUFFER_ADAPTER_H_
diff --git a/pdf/pdfium/pdfium_engine.cc b/pdf/pdfium/pdfium_engine.cc
index fc36c1ef152e46..ae3fb3e3b51d30 100644
--- a/pdf/pdfium/pdfium_engine.cc
+++ b/pdf/pdfium/pdfium_engine.cc
@@ -525,14 +525,11 @@ pp::VarDictionary TraverseBookmarks(FPDF_DOCUMENT doc, FPDF_BOOKMARK bookmark) {
   pp::VarDictionary dict;
   base::string16 title;
   unsigned long buffer_size = FPDFBookmark_GetTitle(bookmark, NULL, 0);
-  size_t title_length = base::checked_cast<size_t>(buffer_size) /
-      sizeof(base::string16::value_type);
-  if (title_length > 0) {
-    PDFiumAPIStringBufferAdapter<base::string16> api_string_adapter(
-        &title, title_length, true);
-    void* data = api_string_adapter.GetData();
-    FPDFBookmark_GetTitle(bookmark, data, buffer_size);
-    api_string_adapter.Close(title_length);
+  if (buffer_size > 0) {
+    PDFiumAPIStringBufferSizeInBytesAdapter<base::string16> api_string_adapter(
+        &title, buffer_size, true);
+    api_string_adapter.Close(FPDFBookmark_GetTitle(
+        bookmark, api_string_adapter.GetData(), buffer_size));
   }
   dict.Set(pp::Var("title"), pp::Var(base::UTF16ToUTF8(title)));
 
@@ -555,6 +552,19 @@ pp::VarDictionary TraverseBookmarks(FPDF_DOCUMENT doc, FPDF_BOOKMARK bookmark) {
   return dict;
 }
 
+std::string GetDocumentMetadata(FPDF_DOCUMENT doc, const std::string& key) {
+  size_t size = FPDF_GetMetaText(doc, key.c_str(), nullptr, 0);
+  if (size == 0)
+    return std::string();
+
+  base::string16 value;
+  PDFiumAPIStringBufferSizeInBytesAdapter<base::string16> string_adapter(
+      &value, size, false);
+  string_adapter.Close(
+      FPDF_GetMetaText(doc, key.c_str(), string_adapter.GetData(), size));
+  return base::UTF16ToUTF8(value);
+}
+
 }  // namespace
 
 bool InitializeSDK() {
@@ -1176,6 +1186,10 @@ bool PDFiumEngine::IsProgressiveLoad() {
   return doc_loader_.is_partial_document();
 }
 
+std::string PDFiumEngine::GetMetadata(const std::string& key) {
+  return GetDocumentMetadata(doc(), key);
+}
+
 void PDFiumEngine::OnPartialDocumentLoaded() {
   file_access_.m_FileLen = doc_loader_.document_size();
   fpdf_availability_ = FPDFAvail_Create(&file_availability_, &file_access_);
@@ -3931,15 +3945,11 @@ bool PDFiumEngineExports::RenderPDFPageToDC(const void* pdf_buffer,
   // bitmap. Note that this code does not kick in for PDFs printed from Chrome
   // because in that case we create a temp PDF first before printing and this
   // temp PDF does not have a creator string that starts with "cairo".
-  base::string16 creator;
-  size_t buffer_bytes = FPDF_GetMetaText(doc, "Creator", NULL, 0);
-  if (buffer_bytes > 1) {
-    FPDF_GetMetaText(doc, "Creator",
-                     base::WriteInto(&creator, buffer_bytes + 1), buffer_bytes);
-  }
   bool use_bitmap = false;
-  if (base::StartsWith(creator, L"cairo", base::CompareCase::INSENSITIVE_ASCII))
+  if (base::StartsWith(GetDocumentMetadata(doc, "Creator"), "cairo",
+                       base::CompareCase::INSENSITIVE_ASCII)) {
     use_bitmap = true;
+  }
 
   // Another temporary hack. Some PDFs seems to render very slowly if
   // FPDF_RenderPage is directly used on a printer DC. I suspect it is
diff --git a/pdf/pdfium/pdfium_engine.h b/pdf/pdfium/pdfium_engine.h
index c8ee6bdb4cb703..4cf49cd248b3d0 100644
--- a/pdf/pdfium/pdfium_engine.h
+++ b/pdf/pdfium/pdfium_engine.h
@@ -99,6 +99,7 @@ class PDFiumEngine : public PDFEngine,
   virtual pp::Point GetScrollPosition();
   virtual void SetScrollPosition(const pp::Point& position);
   virtual bool IsProgressiveLoad();
+  virtual std::string GetMetadata(const std::string& key);
 
   // DocumentLoader::Client implementation.
   virtual pp::Instance* GetPluginInstance();