Add 'printing' flag to PaintInfo

Source/core/page/PrintContextTest.cpp

 // Copyright 2014 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 "config.h"
 #include "core/page/PrintContext.h"
 
 #include "core/dom/Document.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
@@ skipping 76 matching lines @@
 
     void setBodyInnerHTML(String bodyContent)
     {
         document().body()->setAttribute(HTMLNames::styleAttr, "margin: 0");
         document().body()->setInnerHTML(bodyContent, ASSERT_NO_EXCEPTION);
     }
 
     void printSinglePage(SkCanvas& canvas)
     {
         IntRect pageRect(0, 0, kPageWidth, kPageHeight);
+        printContext().begin(pageRect.width(), pageRect.height());
         document().view()->updateAllLifecyclePhases();
-        document().setPrinting(true);

[Julien - ping for review, 2015/07/15 17:14:25]

Should we remove Document::setPrinting if we're not testing this configuration
anymore? Or do you reserve this to a follow-up change (in which case a TODO is
in order)?

[fs, 2015/07/15 18:25:58]

Document::setPrinting(...) is still called, only via printContext().begin(...),
so this call was made redundant by rearranging the code (which now more like the
"real" printing code.) The flag is still used during layout AFAIK. Maybe we can
eventually drop the GC::setPrinting call below though.

[Julien - ping for review, 2015/07/16 14:32:01]

I am just concerned about having several sites holding the same information,
potentially with discrepancies between them. You're bringing down the number of
places where we store the painting information so that's a great change.

         SkPictureBuilder pictureBuilder(pageRect);
         GraphicsContext& context = pictureBuilder.context();
         context.setPrinting(true);
-        DeprecatedPaintLayer& rootLayer = *document().view()->layoutView()->layer();
-        DeprecatedPaintLayerPaintingInfo paintingInfo(&rootLayer, LayoutRect(pageRect), PaintBehaviorNormal, LayoutSize());
-        DeprecatedPaintLayerPainter(rootLayer).paintLayerContents(&context, paintingInfo, PaintLayerPaintingCompositingAllPhases);
-        printContext().begin(kPageWidth, kPageHeight);
-        printContext().end();
+        document().view()->paintContents(&context, pageRect);
         pictureBuilder.endRecording()->playback(&canvas);
         printContext().outputLinkedDestinations(&canvas, pageRect);
-        document().setPrinting(false);
+        printContext().end();
     }
 
     static String absoluteBlockHtmlForLink(int x, int y, int width, int height, const char* url, const char* children = nullptr)
     {
         TextStream ts;
         ts << "<a style='position: absolute; left: " << x << "px; top: " << y << "px; width: " << width << "px; height: " << height
             << "px' href='" << url << "'>" << (children ? children : url) << "</a>";
         return ts.release();
     }
 
@@ skipping 256 matching lines @@
     EXPECT_SKRECT_EQ(150, 160, 170, 180, operations[1].rect);
     EXPECT_EQ(MockCanvas::DrawRect, operations[2].type);
     EXPECT_SKRECT_EQ(250, 260, 270, 280, operations[2].rect);
 
     subframe->detach(FrameDetachType::Remove);
     static_cast<SingleChildFrameLoaderClient*>(document().frame()->client())->setChild(nullptr);
     document().frame()->host()->decrementSubframeCount();
 }
 
 } // namespace blink