PdfMetafileSkia: don't rely on SkPicture::cullRect

printing/pdf_metafile_skia.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 "printing/pdf_metafile_skia.h"
 
 #include "base/files/file.h"
 #include "base/time/time.h"
 #include "printing/print_settings.h"
 #include "third_party/skia/include/core/SkDocument.h"
@@ skipping 49 matching lines @@
   metadata.fCreator = agent.empty() ? SkString("Chromium")
                                     : SkString(agent.c_str(), agent.size());
   return SkDocument::MakePDF(wStream, SK_ScalarDefaultRasterDPI, metadata,
                              nullptr, false);
 }
 
 }  // namespace
 
 namespace printing {
 
+struct Page {
+  Page(SkSize s, sk_sp<SkPicture> c) : size_(s), content_(std::move(c)) {}
+  Page(Page&& that) : size_(that.size_), content_(std::move(that.content_)) {}
+  Page(const Page&) = default;
+  Page& operator=(const Page&) = default;
+  Page& operator=(Page&& that) {
+    size_ = that.size_;
+    content_ = std::move(that.content_);
+    return *this;
+  }
+  SkSize size_;
+  sk_sp<SkPicture> content_;
+};
+
 struct PdfMetafileSkiaData {
   SkPictureRecorder recorder_;  // Current recording
 
-  std::vector<sk_sp<SkPicture>> pages_;
+  std::vector<Page> pages_;
   std::unique_ptr<SkStreamAsset> pdf_data_;
 
   // The scale factor is used because Blink occasionally calls
   // SkCanvas::getTotalMatrix() even though the total matrix is not as
   // meaningful for a vector canvas as for a raster canvas.
   float scale_factor_;
+  SkSize size_;
 
 #if defined(OS_MACOSX)
   PdfMetafileCg pdf_cg_;
 #endif
 };
 
 PdfMetafileSkia::~PdfMetafileSkia() {}
 
 bool PdfMetafileSkia::Init() {
   return true;
@@ skipping 22 matching lines @@
   SkCanvas* canvas = data_->recorder_.beginRecording(
       inverse_scale * page_size.width(), inverse_scale * page_size.height());
   if (content_area != gfx::Rect(page_size)) {
     canvas->scale(inverse_scale, inverse_scale);
     SkRect sk_content_area = gfx::RectToSkRect(content_area);
     canvas->clipRect(sk_content_area);
     canvas->translate(sk_content_area.x(), sk_content_area.y());
     canvas->scale(scale_factor, scale_factor);
   }
 
+  data_->size_ = gfx::SizeFToSkSize(gfx::SizeF(page_size));
   data_->scale_factor_ = scale_factor;
   // We scale the recording canvas's size so that
   // canvas->getTotalMatrix() returns a value that ignores the scale
   // factor.  We store the scale factor and re-apply it later.
   // http://crbug.com/469656
   // Recording canvas is owned by the data_->recorder_.  No ref() necessary.
 }
 
 SkCanvas* PdfMetafileSkia::GetVectorCanvasForNewPage(
     const gfx::Size& page_size,
     const gfx::Rect& content_area,
     const float& scale_factor) {
   StartPage(page_size, content_area, scale_factor);
   return data_->recorder_.getRecordingCanvas();
 }
 
 bool PdfMetafileSkia::FinishPage() {
   if (!data_->recorder_.getRecordingCanvas())
     return false;
 
   sk_sp<SkPicture> pic = data_->recorder_.finishRecordingAsPicture();
   if (data_->scale_factor_ != 1.0f) {
-    SkRect rect = pic->cullRect();
-    DCHECK_EQ(rect.x(), 0);
-    DCHECK_EQ(rect.y(), 0);
-    DCHECK_GT(rect.right(), 0);
-    DCHECK_GT(rect.bottom(), 0);
     SkCanvas* canvas =
-        data_->recorder_.beginRecording(data_->scale_factor_ * rect.right(),
-                                        data_->scale_factor_ * rect.bottom());
+        data_->recorder_.beginRecording(data_->size_.width(),
+                                        data_->size_.height());
     canvas->scale(data_->scale_factor_, data_->scale_factor_);
     canvas->drawPicture(pic);
     pic = data_->recorder_.finishRecordingAsPicture();
   }
-  data_->pages_.push_back(std::move(pic));
+  data_->pages_.emplace_back(data_->size_, std::move(pic));
   return true;
 }
 
 bool PdfMetafileSkia::FinishDocument() {
   // If we've already set the data in InitFromData, leave it be.
   if (data_->pdf_data_)
     return false;
 
   if (data_->recorder_.getRecordingCanvas())
     FinishPage();
 
   SkDynamicMemoryWStream stream;
   // TODO(halcanary): support more document types (XPS, a sequence of display
   // lists).
   sk_sp<SkDocument> doc = MakePdfDocument(&stream);
 
-  for (const sk_sp<SkPicture>& page : data_->pages_) {
-    SkRect rect = page->cullRect();
-    DCHECK_EQ(rect.x(), 0);
-    DCHECK_EQ(rect.y(), 0);
-    DCHECK_GT(rect.right(), 0);
-    DCHECK_GT(rect.bottom(), 0);
-    SkCanvas* canvas = doc->beginPage(rect.right(), rect.bottom());
-    canvas->drawPicture(page);
+  for (const Page& page : data_->pages_) {
+    SkCanvas* canvas = doc->beginPage(page.size_.width(), page.size_.height());
+    canvas->drawPicture(page.content_);
     doc->endPage();
   }
   if (!doc->close())
     return false;
 
   data_->pdf_data_.reset(stream.detachAsStream());
   return true;
 }
 
 uint32_t PdfMetafileSkia::GetDataSize() const {
   if (!data_->pdf_data_)
     return 0;
   return base::checked_cast<uint32_t>(data_->pdf_data_->getLength());
 }
 
 bool PdfMetafileSkia::GetData(void* dst_buffer,
                               uint32_t dst_buffer_size) const {
   if (!data_->pdf_data_)
     return false;
   return WriteAssetToBuffer(data_->pdf_data_.get(), dst_buffer,
                             base::checked_cast<size_t>(dst_buffer_size));
 }
 
 gfx::Rect PdfMetafileSkia::GetPageBounds(unsigned int page_number) const {
   if (page_number < data_->pages_.size()) {
-    const sk_sp<SkPicture>& page = data_->pages_[page_number];
-    SkRect rect = page->cullRect();
-    DCHECK_EQ(rect.x(), 0);
-    DCHECK_EQ(rect.y(), 0);
-    DCHECK_GT(rect.right(), 0);
-    DCHECK_GT(rect.bottom(), 0);
-    return gfx::Rect(gfx::ToRoundedInt(rect.right()),
-                     gfx::ToRoundedInt(rect.bottom()));
+    SkSize size = data_->pages_[page_number].size_;
+    return gfx::Rect(gfx::ToRoundedInt(size.width()),
+                     gfx::ToRoundedInt(size.height()));
   }
   return gfx::Rect();
 }
 
 unsigned int PdfMetafileSkia::GetPageCount() const {
   return base::checked_cast<unsigned int>(data_->pages_.size());
 }
 
 gfx::NativeDrawingContext PdfMetafileSkia::context() const {
   NOTREACHED();
@@ skipping 78 matching lines @@
 
   metafile->data_->pages_.push_back(data_->pages_.back());
 
   if (!metafile->FinishDocument())  // Generate PDF.
     metafile.reset();
 
   return metafile;
 }
 
 }  // namespace printing