third_party/WebKit/Source/modules/canvas/HTMLCanvasElementModuleTest.cpp - Issue 2050123002: Remove OwnPtr from Blink.

Side by Side Diff: third_party/WebKit/Source/modules/canvas/HTMLCanvasElementModuleTest.cpp

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: First attempt to land. Created 4 years, 6 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/modules/cachestorage/InspectorCacheStorageAgent.cpp ('k') | third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.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/frame/FrameView.h"	8 #include "core/frame/FrameView.h"

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

10 #include "core/html/HTMLDocument.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	16

16 namespace blink {	17 namespace blink {

17	18

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

19 protected:	20 protected:

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

21 {	22 {

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

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

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

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

26 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);

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

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

29 }	30 }

30	31

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

32 private:	33 private:

33 Persistent<HTMLCanvasElement> m_canvasElement;	34 Persistent<HTMLCanvasElement> m_canvasElement;

34 };	35 };

35	36

36 TEST_F(HTMLCanvasElementModuleTest, TransferControlToOffscreen)	37 TEST_F(HTMLCanvasElementModuleTest, TransferControlToOffscreen)

37 {	38 {

38 NonThrowableExceptionState exceptionState;	39 NonThrowableExceptionState exceptionState;

39 OffscreenCanvas* offscreenCanvas = HTMLCanvasElementModule::transferControlT oOffscreen(canvasElement(), exceptionState);	40 OffscreenCanvas* offscreenCanvas = HTMLCanvasElementModule::transferControlT oOffscreen(canvasElement(), exceptionState);

40 int canvasId = offscreenCanvas->getAssociatedCanvasId();	41 int canvasId = offscreenCanvas->getAssociatedCanvasId();

41 EXPECT_EQ(canvasId, DOMNodeIds::idForNode(&(canvasElement())));	42 EXPECT_EQ(canvasId, DOMNodeIds::idForNode(&(canvasElement())));

42 }	43 }

43	44

44 } // namespace blink	45 } // namespace blink

OLD	NEW