Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(96)

Side by Side Diff: third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridgeTest.cpp

Issue 1819663002: Bind GrContext to GLES2Interfaces in tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@function
Patch Set: Minimal GetString impl for TestGLES2Interface in skcanvas_video_renderer_unittest.cc Created 4 years, 9 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND AN Y 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND AN Y
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
15 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 15 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
16 * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR AN Y 16 * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR AN Y
17 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 17 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
18 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 18 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
19 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND O N 19 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND O N
20 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 20 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
22 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 22 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23 */ 23 */
24 24
25 #include "platform/graphics/Canvas2DLayerBridge.h" 25 #include "platform/graphics/Canvas2DLayerBridge.h"
26 26
27 #include "SkSurface.h" 27 #include "SkSurface.h"
28 #include "base/memory/scoped_ptr.h" 28 #include "base/memory/scoped_ptr.h"
29 #include "gpu/command_buffer/client/gles2_interface.h" 29 #include "gpu/command_buffer/client/gles2_interface.h"
30 #include "gpu/skia_bindings/gl_bindings_skia_cmd_buffer.h"
30 #include "platform/Task.h" 31 #include "platform/Task.h"
31 #include "platform/ThreadSafeFunctional.h" 32 #include "platform/ThreadSafeFunctional.h"
32 #include "platform/WaitableEvent.h" 33 #include "platform/WaitableEvent.h"
33 #include "platform/graphics/ImageBuffer.h" 34 #include "platform/graphics/ImageBuffer.h"
34 #include "platform/graphics/UnacceleratedImageBufferSurface.h" 35 #include "platform/graphics/UnacceleratedImageBufferSurface.h"
35 #include "platform/graphics/test/MockGLES2Interface.h" 36 #include "platform/graphics/test/MockGLES2Interface.h"
36 #include "platform/graphics/test/MockWebGraphicsContext3D.h" 37 #include "platform/graphics/test/MockWebGraphicsContext3D.h"
37 #include "public/platform/Platform.h" 38 #include "public/platform/Platform.h"
38 #include "public/platform/WebExternalBitmap.h" 39 #include "public/platform/WebExternalBitmap.h"
39 #include "public/platform/WebGraphicsContext3DProvider.h" 40 #include "public/platform/WebGraphicsContext3DProvider.h"
40 #include "public/platform/WebScheduler.h" 41 #include "public/platform/WebScheduler.h"
41 #include "public/platform/WebTaskRunner.h" 42 #include "public/platform/WebTaskRunner.h"
42 #include "public/platform/WebThread.h" 43 #include "public/platform/WebThread.h"
43 #include "public/platform/WebTraceLocation.h" 44 #include "public/platform/WebTraceLocation.h"
44 #include "skia/ext/texture_handle.h" 45 #include "skia/ext/texture_handle.h"
45 #include "testing/gmock/include/gmock/gmock.h" 46 #include "testing/gmock/include/gmock/gmock.h"
46 #include "testing/gtest/include/gtest/gtest.h" 47 #include "testing/gtest/include/gtest/gtest.h"
47 #include "third_party/skia/include/core/SkCanvas.h" 48 #include "third_party/skia/include/core/SkCanvas.h"
48 #include "third_party/skia/include/gpu/GrContext.h" 49 #include "third_party/skia/include/gpu/GrContext.h"
50 #include "third_party/skia/include/gpu/gl/GrGLInterface.h"
49 #include "third_party/skia/include/gpu/gl/GrGLTypes.h" 51 #include "third_party/skia/include/gpu/gl/GrGLTypes.h"
50 #include "third_party/skia/include/gpu/gl/SkNullGLContext.h"
51 #include "wtf/RefPtr.h" 52 #include "wtf/RefPtr.h"
52 53
53 using testing::AnyNumber; 54 using testing::AnyNumber;
54 using testing::AtLeast; 55 using testing::AtLeast;
55 using testing::InSequence; 56 using testing::InSequence;
56 using testing::Return; 57 using testing::Return;
57 using testing::Test; 58 using testing::Test;
58 using testing::_; 59 using testing::_;
59 60
60 namespace blink { 61 namespace blink {
61 62
62 namespace { 63 namespace {
63 64
64 class MockCanvasContext : public MockWebGraphicsContext3D { 65 class MockCanvasContext : public MockWebGraphicsContext3D {
65 public: 66 public:
66 MOCK_METHOD0(flush, void(void)); 67 MOCK_METHOD0(flush, void(void));
67 MOCK_METHOD0(createTexture, unsigned(void)); 68 MOCK_METHOD0(createTexture, unsigned(void));
68 MOCK_METHOD1(deleteTexture, void(unsigned)); 69 MOCK_METHOD1(deleteTexture, void(unsigned));
69 }; 70 };
70 71
71 class MockWebGraphicsContext3DProvider : public WebGraphicsContext3DProvider { 72 class MockWebGraphicsContext3DProvider : public WebGraphicsContext3DProvider {
72 public: 73 public:
73 MockWebGraphicsContext3DProvider(WebGraphicsContext3D* context3d, gpu::gles2 ::GLES2Interface* gl) 74 MockWebGraphicsContext3DProvider(WebGraphicsContext3D* context3d, gpu::gles2 ::GLES2Interface* gl)
74 : m_context3d(context3d) 75 : m_context3d(context3d)
75 , m_gl(gl) 76 , m_gl(gl)
76 { 77 {
77 scoped_ptr<SkGLContext> glContext(SkNullGLContext::Create()); 78 RefPtr<GrGLInterface> glInterface = adoptRef(new GrGLInterface);
78 glContext->makeCurrent(); 79 skia_bindings::InitGLES2InterfaceBindings(glInterface.get(), gl);
79 m_grContext = adoptRef(GrContext::Create(kOpenGL_GrBackend, reinterpret_ cast<GrBackendContext>(glContext->gl()))); 80 m_grContext = adoptRef(GrContext::Create(kOpenGL_GrBackend, reinterpret_ cast<GrBackendContext>(glInterface.get())));
80 } 81 }
81 82
82 WebGraphicsContext3D* context3d() override 83 WebGraphicsContext3D* context3d() override
83 { 84 {
84 return m_context3d; 85 return m_context3d;
85 } 86 }
86 87
87 GrContext* grContext() override 88 GrContext* grContext() override
88 { 89 {
89 return m_grContext.get(); 90 return m_grContext.get();
(...skipping 1034 matching lines...) Expand 10 before | Expand all | Expand 10 after
1124 WebExternalTextureMailbox mailbox; 1125 WebExternalTextureMailbox mailbox;
1125 EXPECT_FALSE(bridge->prepareMailbox(&mailbox, 0)); 1126 EXPECT_FALSE(bridge->prepareMailbox(&mailbox, 0));
1126 EXPECT_TRUE(bridge->checkSurfaceValid()); 1127 EXPECT_TRUE(bridge->checkSurfaceValid());
1127 1128
1128 // Tear down the bridge on the thread so that 'bridge' can go out of scope 1129 // Tear down the bridge on the thread so that 'bridge' can go out of scope
1129 // without crashing due to thread checks 1130 // without crashing due to thread checks
1130 postAndWaitDestroyBridgeTask(BLINK_FROM_HERE, testThread.get(), &bridge); 1131 postAndWaitDestroyBridgeTask(BLINK_FROM_HERE, testThread.get(), &bridge);
1131 } 1132 }
1132 1133
1133 } // namespace blink 1134 } // namespace blink
OLDNEW
« no previous file with comments | « media/renderers/skcanvas_video_renderer_unittest.cc ('k') | third_party/WebKit/Source/platform/graphics/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698