chromium/src
0
Fork 0
Code Activity

Fold PrintFrameToBitmap() into TestRunner::PrintFrameToBitmap()

Browse Source 
Change-Id: Id38d601af7c49151da99a4654bb5f1ff453b0425
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5569604
Commit-Queue: Morten Stenshorne <mstensho@chromium.org>
Reviewed-by: danakj <danakj@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1306440}
This commit is contained in:
Morten Stenshorne
2024-05-27 15:32:44 +00:00
committed by Chromium LUCI CQ
parent ef98427491
commit 71e4415a59
4 changed files with 32 additions and 87 deletions

4
content/web_test/BUILD.gn

@ -369,10 +369,6 @@ static_library("web_test_renderer") {
]
if (enable_printing || enable_printing_tests) {
sources += [
"renderer/pixel_dump.cc",
"renderer/pixel_dump.h",
]
deps += [ "//printing" ]
}
}

53
content/web_test/renderer/pixel_dump.cc

@ -1,53 +0,0 @@
// Copyright 2016 The Chromium Authors
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "content/web_test/renderer/pixel_dump.h"
#include "base/logging.h"
#include "cc/paint/skia_paint_canvas.h"
#include "printing/metafile_skia.h"
#include "printing/mojom/print.mojom.h"
#include "printing/page_number.h"
#include "printing/page_range.h"
#include "printing/print_settings.h"
#include "third_party/blink/public/platform/web_vector.h"
#include "third_party/blink/public/web/web_frame_widget.h"
#include "third_party/blink/public/web/web_local_frame.h"
#include "third_party/blink/public/web/web_print_params.h"
#include "ui/gfx/geometry/size.h"
namespace content {
SkBitmap PrintFrameToBitmap(blink::WebLocalFrame* web_frame,
const blink::WebPrintParams& print_params,
const printing::PageRanges& page_ranges) {
auto* frame_widget = web_frame->LocalRoot()->FrameWidget();
frame_widget->UpdateAllLifecyclePhases(blink::DocumentUpdateReason::kTest);
uint32_t page_count = web_frame->PrintBegin(print_params, blink::WebNode());
blink::WebVector<uint32_t> pages(
printing::PageNumber::GetPages(page_ranges, page_count));
gfx::Size spool_size = web_frame->SpoolSizeInPixelsForTesting(pages);
bool is_opaque = false;
SkBitmap bitmap;
if (!bitmap.tryAllocN32Pixels(spool_size.width(), spool_size.height(),
is_opaque)) {
LOG(ERROR) << "Failed to create bitmap width=" << spool_size.width()
<< " height=" << spool_size.height();
return SkBitmap();
}
printing::MetafileSkia metafile(printing::mojom::SkiaDocumentType::kMSKP,
printing::PrintSettings::NewCookie());
cc::SkiaPaintCanvas canvas(bitmap);
canvas.SetPrintingMetafile(&metafile);
web_frame->PrintPagesForTesting(&canvas, spool_size, &pages);
web_frame->PrintEnd();
return bitmap;
}
} // namespace content

27
content/web_test/renderer/pixel_dump.h

@ -1,27 +0,0 @@
// Copyright 2016 The Chromium Authors
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CONTENT_WEB_TEST_RENDERER_PIXEL_DUMP_H_
#define CONTENT_WEB_TEST_RENDERER_PIXEL_DUMP_H_
#include "printing/page_range.h"
class SkBitmap;
namespace blink {
class WebLocalFrame;
struct WebPrintParams;
} // namespace blink
namespace content {
// Goes through a test-only path to dump the frame's pixel output as if it was
// printed.
SkBitmap PrintFrameToBitmap(blink::WebLocalFrame* web_frame,
const blink::WebPrintParams& print_params,
const printing::PageRanges& pages);
} // namespace content
#endif // CONTENT_WEB_TEST_RENDERER_PIXEL_DUMP_H_

35
content/web_test/renderer/test_runner.cc

@ -25,6 +25,7 @@
#include "base/test/bind.h"
#include "build/build_config.h"
#include "cc/paint/paint_canvas.h"
#include "cc/paint/skia_paint_canvas.h"
#include "content/public/common/isolated_world_ids.h"
#include "content/public/renderer/render_frame_observer.h"
#include "content/renderer/render_thread_impl.h"
@ -33,7 +34,6 @@
#include "content/web_test/renderer/app_banner_service.h"
#include "content/web_test/renderer/blink_test_helpers.h"
#include "content/web_test/renderer/fake_subresource_filter.h"
#include "content/web_test/renderer/pixel_dump.h"
#include "content/web_test/renderer/spell_check_client.h"
#include "content/web_test/renderer/test_preferences.h"
#include "content/web_test/renderer/web_frame_test_proxy.h"
@ -45,7 +45,11 @@
#include "gin/wrappable.h"
#include "mojo/public/mojom/base/text_direction.mojom-forward.h"
#include "net/base/filename_util.h"
#include "printing/metafile_skia.h"
#include "printing/mojom/print.mojom.h"
#include "printing/page_number.h"
#include "printing/page_range.h"
#include "printing/print_settings.h"
#include "services/network/public/mojom/cors.mojom.h"
#include "third_party/blink/public/common/page/page_zoom.h"
#include "third_party/blink/public/common/permissions/permission_utils.h"
@ -2877,8 +2881,33 @@ SkBitmap TestRunner::PrintFrameToBitmap(blink::WebLocalFrame* frame) {
? printing::mojom::PrintScalingOption::kCenterShrinkToFitPaper
: printing::mojom::PrintScalingOption::kSourceSize;
return content::PrintFrameToBitmap(frame, print_params,
GetPrintingPageRanges(frame));
auto* frame_widget = frame->LocalRoot()->FrameWidget();
frame_widget->UpdateAllLifecyclePhases(blink::DocumentUpdateReason::kTest);
uint32_t page_count = frame->PrintBegin(print_params, blink::WebNode());
const printing::PageRanges& page_ranges = GetPrintingPageRanges(frame);
blink::WebVector<uint32_t> pages(
printing::PageNumber::GetPages(page_ranges, page_count));
gfx::Size spool_size = frame->SpoolSizeInPixelsForTesting(pages);
bool is_opaque = false;
SkBitmap bitmap;
if (!bitmap.tryAllocN32Pixels(spool_size.width(), spool_size.height(),
is_opaque)) {
LOG(ERROR) << "Failed to create bitmap width=" << spool_size.width()
<< " height=" << spool_size.height();
return SkBitmap();
}
printing::MetafileSkia metafile(printing::mojom::SkiaDocumentType::kMSKP,
printing::PrintSettings::NewCookie());
cc::SkiaPaintCanvas canvas(bitmap);
canvas.SetPrintingMetafile(&metafile);
frame->PrintPagesForTesting(&canvas, spool_size, &pages);
frame->PrintEnd();
return bitmap;
}
#endif // BUILDFLAG(ENABLE_PRINTING)