Make the PDF viewer background color a property of the instance.

pdf/out_of_process_instance.cc

 // Copyright (c) 2012 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 "pdf/out_of_process_instance.h"
 
 #include <algorithm>  // for min/max()
 #define _USE_MATH_DEFINES  // for M_PI
 #include <cmath>      // for log() and pow()
 #include <math.h>
@@ skipping 330 matching lines @@
       original_url = argv[i];
     else if (strcmp(argn[i], "stream-url") == 0)
       stream_url = argv[i];
     else if (strcmp(argn[i], "headers") == 0)
       headers = argv[i];
     else if (strcmp(argn[i], "is-material") == 0)
       is_material = true;
   }
 
   if (is_material)
-      engine_->SetBackgroundColor(kBackgroundColorMaterial);
+    background_color_ = kBackgroundColorMaterial;
   else
-      engine_->SetBackgroundColor(kBackgroundColor);
-
+    background_color_ = kBackgroundColor;

[Sam McNally, 2015/02/09 01:35:47]

Initialize background_color_ to kBackgroundColor.

[raymes, 2015/02/09 01:45:57]

Done.

 
   // TODO(raymes): This is a hack to ensure that if no headers are passed in
   // then we get the right MIME type. When the in process plugin is removed we
   // can fix the document loader properly and remove this hack.
   if (!headers || strcmp(headers, "") == 0)
     headers = "content-type: application/pdf";
 
   if (!original_url)
     return false;
 
@@ skipping 303 matching lines @@
     const std::vector<pp::Rect>& paint_rects,
     std::vector<PaintManager::ReadyRect>* ready,
     std::vector<pp::Rect>* pending) {
   if (image_data_.is_null()) {
     DCHECK(plugin_size_.IsEmpty());
     return;
   }
   if (first_paint_) {
     first_paint_ = false;
     pp::Rect rect = pp::Rect(pp::Point(), image_data_.size());
-    FillRect(rect, engine_->GetBackgroundColor());
+    FillRect(rect, background_color_);
     ready->push_back(PaintManager::ReadyRect(rect, image_data_, true));
   }
 
   if (!received_viewport_message_)
     return;
 
   engine_->PrePaint();
 
   for (size_t i = 0; i < paint_rects.size(); i++) {
     // Intersect with plugin area since there could be pending invalidates from
@@ skipping 72 matching lines @@
   background_parts_.clear();
   int left_width = available_area_.x();
   int right_start = available_area_.right();
   int right_width = abs(plugin_size_.width() - available_area_.right());
   int bottom = std::min(available_area_.bottom(), plugin_size_.height());
 
   // Add the left, right, and bottom rectangles.  Note: we assume only
   // horizontal centering.
   BackgroundPart part = {
     pp::Rect(0, 0, left_width, bottom),
-    engine_->GetBackgroundColor()
+    background_color_
   };
   if (!part.location.IsEmpty())
     background_parts_.push_back(part);
   part.location = pp::Rect(right_start, 0, right_width, bottom);
   if (!part.location.IsEmpty())
     background_parts_.push_back(part);
   part.location = pp::Rect(
       0, bottom, plugin_size_.width(), plugin_size_.height() - bottom);
   if (!part.location.IsEmpty())
     background_parts_.push_back(part);
@@ skipping 558 matching lines @@
     return;
   engine_->AppendBlankPages(print_preview_page_count_);
   if (preview_pages_info_.size() > 0)
     LoadAvailablePreviewPage();
 }
 
 bool OutOfProcessInstance::IsPrintPreview() {
   return IsPrintPreviewUrl(url_);
 }
 
+uint32 OutOfProcessInstance::GetBackgroundColor() {
+  return background_color_;
+}
+
 void OutOfProcessInstance::ProcessPreviewPageInfo(const std::string& url,
                                                   int dst_page_index) {
   if (!IsPrintPreview())
     return;
 
   int src_page_index = ExtractPrintPreviewPageIndex(url);
   if (src_page_index < 1)
     return;
 
   preview_pages_info_.push(std::make_pair(url, dst_page_index));
@@ skipping 28 matching lines @@
 pp::FloatPoint OutOfProcessInstance::BoundScrollOffsetToDocument(
     const pp::FloatPoint& scroll_offset) {
   float max_x = document_size_.width() * zoom_ - plugin_dip_size_.width();
   float x = std::max(std::min(scroll_offset.x(), max_x), 0.0f);
   float max_y = document_size_.height() * zoom_ - plugin_dip_size_.height();
   float y = std::max(std::min(scroll_offset.y(), max_y), 0.0f);
   return pp::FloatPoint(x, y);
 }
 
 }  // namespace chrome_pdf