Remove display item scope

third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 131 matching lines @@
 #include "core/loader/FrameLoadRequest.h"
 #include "core/loader/FrameLoader.h"
 #include "core/loader/HistoryItem.h"
 #include "core/loader/MixedContentChecker.h"
 #include "core/loader/NavigationScheduler.h"
 #include "core/page/FocusController.h"
 #include "core/page/FrameTree.h"
 #include "core/page/Page.h"
 #include "core/page/PrintContext.h"
 #include "core/paint/PaintLayer.h"
-#include "core/paint/ScopeRecorder.h"
 #include "core/paint/TransformRecorder.h"
 #include "core/timing/DOMWindowPerformance.h"
 #include "core/timing/Performance.h"
 #include "modules/app_banner/AppBannerController.h"
 #include "modules/audio_output_devices/AudioOutputDeviceClient.h"
 #include "modules/bluetooth/BluetoothSupplement.h"
 #include "modules/installedapp/InstalledAppController.h"
 #include "modules/notifications/NotificationPermissionClient.h"
 #include "modules/permissions/PermissionController.h"
 #include "modules/presentation/PresentationController.h"
 #include "modules/push_messaging/PushController.h"
 #include "modules/screen_orientation/ScreenOrientationController.h"
 #include "modules/vr/VRController.h"
 #include "modules/wake_lock/ScreenWakeLock.h"
 #include "platform/ScriptForbiddenScope.h"
 #include "platform/TraceEvent.h"
 #include "platform/UserGestureIndicator.h"
 #include "platform/clipboard/ClipboardUtilities.h"
 #include "platform/fonts/FontCache.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/GraphicsLayerClient.h"
 #include "platform/graphics/paint/ClipRecorder.h"
+#include "platform/graphics/paint/DisplayItemCacheSkipper.h"
 #include "platform/graphics/paint/DrawingRecorder.h"
 #include "platform/graphics/paint/SkPictureBuilder.h"
 #include "platform/graphics/skia/SkiaUtils.h"
 #include "platform/heap/Handle.h"
 #include "platform/network/ResourceRequest.h"
 #include "platform/scroll/ScrollTypes.h"
 #include "platform/scroll/ScrollbarTheme.h"
 #include "platform/weborigin/KURL.h"
 #include "platform/weborigin/SchemeRegistry.h"
 #include "platform/weborigin/SecurityPolicy.h"
@@ skipping 146 matching lines @@
         computePageRects(FloatRect(FloatPoint(0, 0), pageSizeInPixels), 0, 0, 1, pageHeight);
 
         const float pageWidth = pageSizeInPixels.width();
         size_t numPages = pageRects().size();
         int totalHeight = numPages * (pageSizeInPixels.height() + 1) - 1;
         IntRect allPagesRect(0, 0, pageWidth, totalHeight);
 
         SkPictureBuilder pictureBuilder(allPagesRect, &skia::GetMetaData(*canvas));
         pictureBuilder.context().setPrinting(true);
 
-        GraphicsContext& context = pictureBuilder.context();
+        {
+            GraphicsContext& context = pictureBuilder.context();
+            DisplayItemCacheSkipper skipper(context);
 
-        // Fill the whole background by white.
-        {
-            DrawingRecorder backgroundRecorder(context, pictureBuilder, DisplayItem::PrintedContentBackground, allPagesRect);
-            context.fillRect(FloatRect(0, 0, pageWidth, totalHeight), Color::white);
-        }
-
-        int currentHeight = 0;
-        for (size_t pageIndex = 0; pageIndex < numPages; pageIndex++) {
-            ScopeRecorder scopeRecorder(context);
-            // Draw a line for a page boundary if this isn't the first page.
-            if (pageIndex > 0) {
-                DrawingRecorder lineBoundaryRecorder(context, pictureBuilder, DisplayItem::PrintedContentLineBoundary, allPagesRect);
-                context.save();
-                context.setStrokeColor(Color(0, 0, 255));
-                context.setFillColor(Color(0, 0, 255));
-                context.drawLine(IntPoint(0, currentHeight), IntPoint(pageWidth, currentHeight));
-                context.restore();
+            // Fill the whole background by white.
+            {
+                DrawingRecorder backgroundRecorder(context, pictureBuilder, DisplayItem::PrintedContentBackground, allPagesRect);
+                context.fillRect(FloatRect(0, 0, pageWidth, totalHeight), Color::white);
             }
 
-            AffineTransform transform;
-            transform.translate(0, currentHeight);
+
+            int currentHeight = 0;
+            for (size_t pageIndex = 0; pageIndex < numPages; pageIndex++) {
+                // Draw a line for a page boundary if this isn't the first page.
+                if (pageIndex > 0) {
+                    DrawingRecorder lineBoundaryRecorder(context, pictureBuilder, DisplayItem::PrintedContentLineBoundary, allPagesRect);
+                    context.save();
+                    context.setStrokeColor(Color(0, 0, 255));
+                    context.setFillColor(Color(0, 0, 255));
+                    context.drawLine(IntPoint(0, currentHeight), IntPoint(pageWidth, currentHeight));
+                    context.restore();
+                }
+
+                AffineTransform transform;
+                transform.translate(0, currentHeight);
 #if OS(WIN) || OS(MACOSX)
-            // Account for the disabling of scaling in spoolPage. In the context
-            // of spoolAllPagesWithBoundaries the scale HAS NOT been pre-applied.
-            float scale = getPageShrink(pageIndex);
-            transform.scale(scale, scale);
+                // Account for the disabling of scaling in spoolPage. In the context
+                // of spoolAllPagesWithBoundaries the scale HAS NOT been pre-applied.
+                float scale = getPageShrink(pageIndex);
+                transform.scale(scale, scale);
 #endif
-            TransformRecorder transformRecorder(context, pictureBuilder, transform);
-            spoolPage(pictureBuilder, pageIndex);
+                TransformRecorder transformRecorder(context, pictureBuilder, transform);
+                spoolPage(pictureBuilder, pageIndex);
 
-            currentHeight += pageSizeInPixels.height() + 1;
+                currentHeight += pageSizeInPixels.height() + 1;
+            }
         }
         pictureBuilder.endRecording()->playback(canvas);
     }
 
 protected:
     // Spools the printed page, a subrect of frame(). Skip the scale step.
     // NativeTheme doesn't play well with scaling. Scaling is done browser side
     // instead. Returns the scale to be applied.
     // On Linux, we don't have the problem with NativeTheme, hence we let WebKit
     // do the scaling and ignore the return value.
@@ skipping 1706 matching lines @@
         return WebSandboxFlags::None;
     return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags());
 }
 
 void WebLocalFrameImpl::forceSandboxFlags(WebSandboxFlags flags)
 {
     frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags));
 }
 
 } // namespace blink