third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp - Issue 2197953002: Remove unnecessary uses of HTMLDocument

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp

Issue 2197953002: Remove unnecessary uses of HTMLDocument (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: simplify Created 4 years, 5 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

« no previous file with comments | « third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DAPITest.cpp ('k') | third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DUsageTrackingTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp

diff --git a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp

index 93d11b0cc1ab3fd2b60f7cca2fca83c8938c6495..3f4c4641aa86b64763ca9409ad5691a64b576de8 100644

--- a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp

+++ b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp

@@ -4,11 +4,11 @@

#include "modules/canvas2d/CanvasRenderingContext2D.h"

+#include "core/dom/Document.h"

#include "core/fetch/MemoryCache.h"

#include "core/frame/FrameView.h"

#include "core/frame/ImageBitmap.h"

#include "core/html/HTMLCanvasElement.h"

-#include "core/html/HTMLDocument.h"

#include "core/html/ImageData.h"

#include "core/imagebitmap/ImageBitmapOptions.h"

#include "core/loader/EmptyClients.h"

@@ -83,7 +83,7 @@ protected:

void SetUp() override;

DummyPageHolder& page() const { return *m_dummyPageHolder; }

- HTMLDocument& document() const { return *m_document; }

+ Document& document() const { return *m_document; }

HTMLCanvasElement& canvasElement() const { return *m_canvasElement; }

CanvasRenderingContext2D* context2d() const { return static_cast<CanvasRenderingContext2D*>(canvasElement().renderingContext()); }

intptr_t getGlobalGPUMemoryUsage() const { return ImageBuffer::getGlobalGPUMemoryUsage(); }

@@ -97,7 +97,7 @@ protected:

private:

std::unique_ptr<DummyPageHolder> m_dummyPageHolder;

- Persistent<HTMLDocument> m_document;

+ Persistent<Document> m_document;

Persistent<HTMLCanvasElement> m_canvasElement;

Persistent<MemoryCache> m_globalMemoryCache;

@@ -151,7 +151,7 @@ void CanvasRenderingContext2DTest::SetUp()

Page::PageClients pageClients;

fillWithEmptyClients(pageClients);

m_dummyPageHolder = DummyPageHolder::create(IntSize(800, 600), &pageClients);

- m_document = toHTMLDocument(&m_dummyPageHolder->document());

+ m_document = &m_dummyPageHolder->document();

m_document->documentElement()->setInnerHTML("<body><canvas id='c'></canvas></body>", ASSERT_NO_EXCEPTION);

m_document->view()->updateAllLifecyclePhases();

m_canvasElement = toHTMLCanvasElement(m_document->getElementById("c"));