Clear the PrintContext in WebLocalFrameImpl::Close().

third_party/WebKit/Source/core/page/PrintContext.cpp

Index: third_party/WebKit/Source/core/page/PrintContext.cpp
diff --git a/third_party/WebKit/Source/core/page/PrintContext.cpp b/third_party/WebKit/Source/core/page/PrintContext.cpp
index 58e5f8214c3d78a4bf5a7dda2076104fa3339566..10df658157b29ed11fc4c2ea1792848639d2c09b 100644
--- a/third_party/WebKit/Source/core/page/PrintContext.cpp
+++ b/third_party/WebKit/Source/core/page/PrintContext.cpp
@@ -28,6 +28,8 @@
 
 namespace blink {
 
+namespace {
+
 // By shrinking to a width of 75% (1.333f) we will render the correct physical
 // dimensions in paged media (i.e. cm, pt,). The shrinkage used
 // to be 80% (1.25f) to match other browsers - they have since moved on.
@@ -41,12 +43,26 @@ const float kPrintingMinimumShrinkFactor = 1.333f;
 // TODO(rhogan): Decide if this quirk is still required.
 const float kPrintingMaximumShrinkFactor = 2;
 
+LayoutBoxModelObject* EnclosingBoxModelObject(LayoutObject* object) {
+  while (object && !object->IsBoxModelObject())
+    object = object->Parent();
+  if (!object)
+    return nullptr;
+  return ToLayoutBoxModelObject(object);
+}
+
+bool IsCoordinateInPage(int top, int left, const IntRect& page) {
+  return page.X() <= left && left < page.MaxX() && page.Y() <= top &&
+         top < page.MaxY();
+}
+
+}  // namespace
+
 PrintContext::PrintContext(LocalFrame* frame)
     : frame_(frame), is_printing_(false), linked_destinations_valid_(false) {}
 
 PrintContext::~PrintContext() {
-  if (is_printing_)
-    EndPrintMode();
+  DCHECK(!is_printing_);
 }
 
 void PrintContext::ComputePageRects(const FloatRect& print_rect,
@@ -57,8 +73,7 @@ void PrintContext::ComputePageRects(const FloatRect& print_rect,
   page_rects_.clear();
   out_page_height = 0;
 
-  if (!frame_->GetDocument() || !frame_->View() ||
-      frame_->GetDocument()->GetLayoutViewItem().IsNull())
+  if (!IsFrameValid())
     return;
 
   if (user_scale_factor <= 0) {
@@ -95,8 +110,7 @@ void PrintContext::ComputePageRectsWithPageSize(
 
 void PrintContext::ComputePageRectsWithPageSizeInternal(
     const FloatSize& page_size_in_pixels) {
-  if (!frame_->GetDocument() || !frame_->View() ||
-      frame_->GetDocument()->GetLayoutViewItem().IsNull())
+  if (!IsFrameValid())
     return;
 
   LayoutViewItem view = frame_->GetDocument()->GetLayoutViewItem();
@@ -186,19 +200,13 @@ void PrintContext::BeginPrintMode(float width, float height) {
 void PrintContext::EndPrintMode() {
   ASSERT(is_printing_);
   is_printing_ = false;
-  frame_->SetPrinting(false, FloatSize(), FloatSize(), 0);
+  if (IsFrameValid())
+    frame_->SetPrinting(false, FloatSize(), FloatSize(), 0);
   linked_destinations_.clear();
   linked_destinations_valid_ = false;
 }
 
-static LayoutBoxModelObject* EnclosingBoxModelObject(LayoutObject* object) {
-  while (object && !object->IsBoxModelObject())
-    object = object->Parent();
-  if (!object)
-    return nullptr;
-  return ToLayoutBoxModelObject(object);
-}
-
+// static
 int PrintContext::PageNumberForElement(Element* element,
                                        const FloatSize& page_size_in_pixels) {
   element->GetDocument().UpdateStyleAndLayout();
@@ -206,7 +214,7 @@ int PrintContext::PageNumberForElement(Element* element,
   LocalFrame* frame = element->GetDocument().GetFrame();
   FloatRect page_rect(FloatPoint(0, 0), page_size_in_pixels);
   PrintContext print_context(frame);
-  print_context.BeginPrintMode(page_rect.Width(), page_rect.Height());
+  ScopedPrintMode(&print_context, page_rect.Width(), page_rect.Height());

[haraken, 2017/05/01 00:21:16]

Would it be simpler to create ScopedPrintContext (for most cases) and a
heap-allocated PrintContext (for the LocalFrameImpl case)?

[Lei Zhang, 2017/05/01 03:18:27]

Sure. See patch set 5. I tried it earlier but I did something wrong and the
blink-gc Clang plugin stopped me.

 
   LayoutBoxModelObject* box =
       EnclosingBoxModelObject(element->GetLayoutObject());
@@ -220,11 +228,9 @@ int PrintContext::PageNumberForElement(Element* element,
 
   int top = box->PixelSnappedOffsetTop(box->OffsetParent());
   int left = box->PixelSnappedOffsetLeft(box->OffsetParent());
-  size_t page_number = 0;
-  for (; page_number < print_context.PageCount(); page_number++) {
-    const IntRect& page = print_context.PageRect(page_number);
-    if (page.X() <= left && left < page.MaxX() && page.Y() <= top &&
-        top < page.MaxY())
+  for (size_t page_number = 0; page_number < print_context.PageCount();
+       ++page_number) {
+    if (IsCoordinateInPage(top, left, print_context.PageRect(page_number)))
       return page_number;
   }
   return -1;
@@ -277,6 +283,7 @@ void PrintContext::OutputLinkedDestinations(GraphicsContext& context,
   }
 }
 
+// static
 String PrintContext::PageProperty(LocalFrame* frame,
                                   const char* property_name,
                                   int page_number) {
@@ -285,7 +292,7 @@ String PrintContext::PageProperty(LocalFrame* frame,
   // Any non-zero size is OK here. We don't care about actual layout. We just
   // want to collect @page rules and figure out what declarations apply on a
   // given page (that may or may not exist).
-  print_context.BeginPrintMode(800, 1000);
+  ScopedPrintMode(&print_context, 800, 1000);
   RefPtr<ComputedStyle> style = document->StyleForPage(page_number);
 
   // Implement formatters for properties we care about.
@@ -330,13 +337,14 @@ String PrintContext::PageSizeAndMarginsInPixels(LocalFrame* frame,
          String::Number(margin_bottom) + ' ' + String::Number(margin_left);
 }
 
+// static
 int PrintContext::NumberOfPages(LocalFrame* frame,
                                 const FloatSize& page_size_in_pixels) {
   frame->GetDocument()->UpdateStyleAndLayout();
 
   FloatRect page_rect(FloatPoint(0, 0), page_size_in_pixels);
   PrintContext print_context(frame);
-  print_context.BeginPrintMode(page_rect.Width(), page_rect.Height());
+  ScopedPrintMode(&print_context, page_rect.Width(), page_rect.Height());
   // Account for shrink-to-fit.
   FloatSize scaled_page_size = page_size_in_pixels;
   scaled_page_size.Scale(frame->View()->ContentsSize().Width() /
@@ -345,9 +353,25 @@ int PrintContext::NumberOfPages(LocalFrame* frame,
   return print_context.PageCount();
 }
 
+bool PrintContext::IsFrameValid() const {
+  return frame_->View() && frame_->GetDocument() &&
+         !frame_->GetDocument()->GetLayoutViewItem().IsNull();
+}
+
 DEFINE_TRACE(PrintContext) {
   visitor->Trace(frame_);
   visitor->Trace(linked_destinations_);
 }
 
+ScopedPrintMode::ScopedPrintMode(PrintContext* context,
+                                 float width,
+                                 float height)
+    : context_(context) {
+  context_->BeginPrintMode(width, height);
+}
+
+ScopedPrintMode::~ScopedPrintMode() {
+  context_->EndPrintMode();
+}
+
 }  // namespace blink