| 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 11 matching lines...) Expand all  Loading... | 
| 22         Page::PageClients pageClients; | 22         Page::PageClients pageClients; | 
| 23         fillWithEmptyClients(pageClients); | 23         fillWithEmptyClients(pageClients); | 
| 24         OwnPtr<DummyPageHolder> m_dummyPageHolder = DummyPageHolder::create(IntS
    ize(800, 600), &pageClients); | 24         OwnPtr<DummyPageHolder> m_dummyPageHolder = DummyPageHolder::create(IntS
    ize(800, 600), &pageClients); | 
| 25         Persistent<HTMLDocument> m_document = toHTMLDocument(&m_dummyPageHolder-
    >document()); | 25         Persistent<HTMLDocument> m_document = toHTMLDocument(&m_dummyPageHolder-
    >document()); | 
| 26         m_document->documentElement()->setInnerHTML("<body><canvas id='c'></canv
    as></body>", ASSERT_NO_EXCEPTION); | 26         m_document->documentElement()->setInnerHTML("<body><canvas id='c'></canv
    as></body>", ASSERT_NO_EXCEPTION); | 
| 27         m_document->view()->updateAllLifecyclePhases(); | 27         m_document->view()->updateAllLifecyclePhases(); | 
| 28         m_canvasElement = toHTMLCanvasElement(m_document->getElementById("c")); | 28         m_canvasElement = toHTMLCanvasElement(m_document->getElementById("c")); | 
| 29     } | 29     } | 
| 30 | 30 | 
| 31     HTMLCanvasElement& canvasElement() const { return *m_canvasElement; } | 31     HTMLCanvasElement& canvasElement() const { return *m_canvasElement; } | 
|  | 32     OffscreenCanvas* transferControlToOffscreen(ExceptionState&); | 
|  | 33 | 
| 32 private: | 34 private: | 
| 33     Persistent<HTMLCanvasElement> m_canvasElement; | 35     Persistent<HTMLCanvasElement> m_canvasElement; | 
| 34 }; | 36 }; | 
| 35 | 37 | 
|  | 38 OffscreenCanvas* HTMLCanvasElementModuleTest::transferControlToOffscreen(Excepti
    onState& exceptionState) | 
|  | 39 { | 
|  | 40     // This unit test only tests if the Canvas Id is associated correctly, so we
     exclude the part that | 
|  | 41     // creates surface layer bridge because a mojo message pipe cannot be tested
     using webkit unit tests. | 
|  | 42     return HTMLCanvasElementModule::transferControlToOffscreenInternal(canvasEle
    ment(), exceptionState); | 
|  | 43 } | 
|  | 44 | 
| 36 TEST_F(HTMLCanvasElementModuleTest, TransferControlToOffscreen) | 45 TEST_F(HTMLCanvasElementModuleTest, TransferControlToOffscreen) | 
| 37 { | 46 { | 
| 38     NonThrowableExceptionState exceptionState; | 47     NonThrowableExceptionState exceptionState; | 
| 39     OffscreenCanvas* offscreenCanvas = HTMLCanvasElementModule::transferControlT
    oOffscreen(canvasElement(), exceptionState); | 48     OffscreenCanvas* offscreenCanvas = transferControlToOffscreen(exceptionState
    ); | 
| 40     int canvasId = offscreenCanvas->getAssociatedCanvasId(); | 49     int canvasId = offscreenCanvas->getAssociatedCanvasId(); | 
| 41     EXPECT_EQ(canvasId, DOMNodeIds::idForNode(&(canvasElement()))); | 50     EXPECT_EQ(canvasId, DOMNodeIds::idForNode(&(canvasElement()))); | 
| 42 } | 51 } | 
| 43 | 52 | 
| 44 } // namespace blink | 53 } // namespace blink | 
| OLD | NEW | 
|---|