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

Side by Side Diff: third_party/WebKit/Source/modules/canvas/HTMLCanvasElementModuleTest.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, 4 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 unified diff | Download patch

« no previous file with comments | « third_party/WebKit/Source/core/origin_trials/OriginTrialContextTest.cpp ('k') | third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DAPITest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2016 The Chromium Authors. All rights reserved.	1 // Copyright 2016 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "modules/canvas/HTMLCanvasElementModule.h"	5 #include "modules/canvas/HTMLCanvasElementModule.h"

6	6

7 #include "core/dom/DOMNodeIds.h"	7 #include "core/dom/DOMNodeIds.h"

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

8 #include "core/frame/FrameView.h"	9 #include "core/frame/FrameView.h"

9 #include "core/html/HTMLCanvasElement.h"	10 #include "core/html/HTMLCanvasElement.h"

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

11 #include "core/loader/EmptyClients.h"	11 #include "core/loader/EmptyClients.h"

12 #include "core/offscreencanvas/OffscreenCanvas.h"	12 #include "core/offscreencanvas/OffscreenCanvas.h"

13 #include "core/testing/DummyPageHolder.h"	13 #include "core/testing/DummyPageHolder.h"

14 #include "testing/gtest/include/gtest/gtest.h"	14 #include "testing/gtest/include/gtest/gtest.h"

15 #include <memory>	15 #include <memory>

16	16

17 namespace blink {	17 namespace blink {

18	18

19 class HTMLCanvasElementModuleTest : public ::testing::Test {	19 class HTMLCanvasElementModuleTest : public ::testing::Test {

20 protected:	20 protected:

21 virtual void SetUp()	21 virtual void SetUp()

22 {	22 {

23 Page::PageClients pageClients;	23 Page::PageClients pageClients;

24 fillWithEmptyClients(pageClients);	24 fillWithEmptyClients(pageClients);

25 std::unique_ptr<DummyPageHolder> m_dummyPageHolder = DummyPageHolder::cr eate(IntSize(800, 600), &pageClients);	25 std::unique_ptr<DummyPageHolder> m_dummyPageHolder = DummyPageHolder::cr eate(IntSize(800, 600), &pageClients);

26 Persistent<HTMLDocument> m_document = toHTMLDocument(&m_dummyPageHolder- >document());	26 Persistent<Document> m_document = &m_dummyPageHolder->document();

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

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

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

30 }	30 }

31	31

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

33 OffscreenCanvas* transferControlToOffscreen(ExceptionState&);	33 OffscreenCanvas* transferControlToOffscreen(ExceptionState&);

34	34

35 private:	35 private:

36 Persistent<HTMLCanvasElement> m_canvasElement;	36 Persistent<HTMLCanvasElement> m_canvasElement;

37 };	37 };

38	38

39 OffscreenCanvas* HTMLCanvasElementModuleTest::transferControlToOffscreen(Excepti onState& exceptionState)	39 OffscreenCanvas* HTMLCanvasElementModuleTest::transferControlToOffscreen(Excepti onState& exceptionState)

40 {	40 {

41 // This unit test only tests if the Canvas Id is associated correctly, so we exclude the part that	41 // This unit test only tests if the Canvas Id is associated correctly, so we exclude the part that

42 // creates surface layer bridge because a mojo message pipe cannot be tested using webkit unit tests.	42 // creates surface layer bridge because a mojo message pipe cannot be tested using webkit unit tests.

43 return HTMLCanvasElementModule::transferControlToOffscreenInternal(canvasEle ment(), exceptionState);	43 return HTMLCanvasElementModule::transferControlToOffscreenInternal(canvasEle ment(), exceptionState);

44 }	44 }

45	45

46 TEST_F(HTMLCanvasElementModuleTest, TransferControlToOffscreen)	46 TEST_F(HTMLCanvasElementModuleTest, TransferControlToOffscreen)

47 {	47 {

48 NonThrowableExceptionState exceptionState;	48 NonThrowableExceptionState exceptionState;

49 OffscreenCanvas* offscreenCanvas = transferControlToOffscreen(exceptionState );	49 OffscreenCanvas* offscreenCanvas = transferControlToOffscreen(exceptionState );

50 int canvasId = offscreenCanvas->getAssociatedCanvasId();	50 int canvasId = offscreenCanvas->getAssociatedCanvasId();

51 EXPECT_EQ(canvasId, DOMNodeIds::idForNode(&(canvasElement())));	51 EXPECT_EQ(canvasId, DOMNodeIds::idForNode(&(canvasElement())));

52 }	52 }

53	53

54 } // namespace blink	54 } // namespace blink

OLD	NEW