Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(250)

Unified Diff: third_party/WebKit/Source/core/page/PrintContextTest.cpp

Issue 2864753004: M59: Clear the PrintContext in WebLocalFrameImpl::Close(). (Closed)
Patch Set: fix Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/page/PrintContextTest.cpp
diff --git a/third_party/WebKit/Source/core/page/PrintContextTest.cpp b/third_party/WebKit/Source/core/page/PrintContextTest.cpp
index c0f7b1a3dab90c79590697c7a110657e069f4745..0c45e4ad4561565a8b2bfdd7643d841538721439 100644
--- a/third_party/WebKit/Source/core/page/PrintContextTest.cpp
+++ b/third_party/WebKit/Source/core/page/PrintContextTest.cpp
@@ -27,16 +27,6 @@ namespace blink {
const int kPageWidth = 800;
const int kPageHeight = 600;
-class MockPrintContext : public PrintContext {
- public:
- MockPrintContext(LocalFrame* frame) : PrintContext(frame) {}
-
- void OutputLinkedDestinations(GraphicsContext& context,
- const IntRect& page_rect) {
- PrintContext::OutputLinkedDestinations(context, page_rect);
- }
-};
-
class MockCanvas : public SkCanvas {
public:
enum OperationType { kDrawRect, kDrawPoint };
@@ -47,6 +37,7 @@ class MockCanvas : public SkCanvas {
};
MockCanvas() : SkCanvas(kPageWidth, kPageHeight) {}
+ ~MockCanvas() override {}
void onDrawAnnotation(const SkRect& rect,
const char key[],
@@ -75,13 +66,14 @@ class PrintContextTest : public RenderingTest {
protected:
explicit PrintContextTest(LocalFrameClient* local_frame_client = nullptr)
: RenderingTest(local_frame_client) {}
+ ~PrintContextTest() override {}
void SetUp() override {
RenderingTest::SetUp();
- print_context_ = new MockPrintContext(GetDocument().GetFrame());
+ print_context_ = new PrintContext(GetDocument().GetFrame());
}
- MockPrintContext& PrintContext() { return *print_context_.Get(); }
+ PrintContext& GetPrintContext() { return *print_context_.Get(); }
void SetBodyInnerHTML(String body_content) {
GetDocument().body()->setAttribute(HTMLNames::styleAttr, "margin: 0");
@@ -90,7 +82,7 @@ class PrintContextTest : public RenderingTest {
void PrintSinglePage(MockCanvas& canvas) {
IntRect page_rect(0, 0, kPageWidth, kPageHeight);
- PrintContext().begin(page_rect.Width(), page_rect.Height());
+ GetPrintContext().begin(page_rect.Width(), page_rect.Height());
GetDocument().View()->UpdateAllLifecyclePhases();
PaintRecordBuilder builder(page_rect);
GraphicsContext& context = builder.Context();
@@ -101,10 +93,10 @@ class PrintContextTest : public RenderingTest {
DrawingRecorder recorder(context, *GetDocument().GetLayoutView(),
DisplayItem::kPrintedContentDestinationLocations,
page_rect);
- PrintContext().OutputLinkedDestinations(context, page_rect);
+ GetPrintContext().OutputLinkedDestinations(context, page_rect);
}
builder.EndRecording()->playback(&canvas);
- PrintContext().end();
+ GetPrintContext().end();
}
static String AbsoluteBlockHtmlForLink(int x,
@@ -139,7 +131,7 @@ class PrintContextTest : public RenderingTest {
private:
std::unique_ptr<DummyPageHolder> page_holder_;
- Persistent<MockPrintContext> print_context_;
+ Persistent<PrintContext> print_context_;
};
class PrintContextFrameTest : public PrintContextTest {
« no previous file with comments | « third_party/WebKit/Source/core/page/PrintContext.cpp ('k') | third_party/WebKit/Source/web/WebLocalFrameImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698