| 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" |
| (...skipping 12 matching lines...) Expand all Loading... |
| 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<HTMLDocument> m_document = toHTMLDocument(&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&); |
| 34 |
| 33 private: | 35 private: |
| 34 Persistent<HTMLCanvasElement> m_canvasElement; | 36 Persistent<HTMLCanvasElement> m_canvasElement; |
| 35 }; | 37 }; |
| 36 | 38 |
| 39 OffscreenCanvas* HTMLCanvasElementModuleTest::transferControlToOffscreen(Excepti
onState& exceptionState) |
| 40 { |
| 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. |
| 43 return HTMLCanvasElementModule::transferControlToOffscreenInternal(canvasEle
ment(), exceptionState); |
| 44 } |
| 45 |
| 37 TEST_F(HTMLCanvasElementModuleTest, TransferControlToOffscreen) | 46 TEST_F(HTMLCanvasElementModuleTest, TransferControlToOffscreen) |
| 38 { | 47 { |
| 39 NonThrowableExceptionState exceptionState; | 48 NonThrowableExceptionState exceptionState; |
| 40 OffscreenCanvas* offscreenCanvas = HTMLCanvasElementModule::transferControlT
oOffscreen(canvasElement(), exceptionState); | 49 OffscreenCanvas* offscreenCanvas = transferControlToOffscreen(exceptionState
); |
| 41 int canvasId = offscreenCanvas->getAssociatedCanvasId(); | 50 int canvasId = offscreenCanvas->getAssociatedCanvasId(); |
| 42 EXPECT_EQ(canvasId, DOMNodeIds::idForNode(&(canvasElement()))); | 51 EXPECT_EQ(canvasId, DOMNodeIds::idForNode(&(canvasElement()))); |
| 43 } | 52 } |
| 44 | 53 |
| 45 } // namespace blink | 54 } // namespace blink |
| OLD | NEW |