| OLD | NEW |
| 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 "gpu/command_buffer/client/gles2_interface.h" | 28 #include "gpu/command_buffer/client/gles2_interface.h" |
| 29 #include "gpu/command_buffer/common/capabilities.h" |
| 29 #include "platform/Task.h" | 30 #include "platform/Task.h" |
| 30 #include "platform/ThreadSafeFunctional.h" | 31 #include "platform/ThreadSafeFunctional.h" |
| 31 #include "platform/WaitableEvent.h" | 32 #include "platform/WaitableEvent.h" |
| 32 #include "platform/graphics/ImageBuffer.h" | 33 #include "platform/graphics/ImageBuffer.h" |
| 33 #include "platform/graphics/UnacceleratedImageBufferSurface.h" | 34 #include "platform/graphics/UnacceleratedImageBufferSurface.h" |
| 34 #include "platform/graphics/test/FakeGLES2Interface.h" | 35 #include "platform/graphics/test/FakeGLES2Interface.h" |
| 35 #include "public/platform/Platform.h" | 36 #include "public/platform/Platform.h" |
| 36 #include "public/platform/WebExternalBitmap.h" | 37 #include "public/platform/WebExternalBitmap.h" |
| 37 #include "public/platform/WebGraphicsContext3DProvider.h" | 38 #include "public/platform/WebGraphicsContext3DProvider.h" |
| 38 #include "public/platform/WebScheduler.h" | 39 #include "public/platform/WebScheduler.h" |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 74 WebGraphicsContext3D* context3d() override | 75 WebGraphicsContext3D* context3d() override |
| 75 { | 76 { |
| 76 return nullptr; | 77 return nullptr; |
| 77 } | 78 } |
| 78 | 79 |
| 79 GrContext* grContext() override | 80 GrContext* grContext() override |
| 80 { | 81 { |
| 81 return m_grContext.get(); | 82 return m_grContext.get(); |
| 82 } | 83 } |
| 83 | 84 |
| 85 gpu::Capabilities getCapabilities() |
| 86 { |
| 87 return gpu::Capabilities(); |
| 88 } |
| 89 |
| 84 gpu::gles2::GLES2Interface* contextGL() override | 90 gpu::gles2::GLES2Interface* contextGL() override |
| 85 { | 91 { |
| 86 return m_gl; | 92 return m_gl; |
| 87 } | 93 } |
| 88 | 94 |
| 89 void setLostContextCallback(WebClosure) override {} | 95 void setLostContextCallback(WebClosure) override {} |
| 90 void setErrorMessageCallback(WebFunction<void(const char*, int32_t id)>) {} | 96 void setErrorMessageCallback(WebFunction<void(const char*, int32_t id)>) {} |
| 91 | 97 |
| 92 private: | 98 private: |
| 93 gpu::gles2::GLES2Interface* m_gl; | 99 gpu::gles2::GLES2Interface* m_gl; |
| (...skipping 946 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1040 WebExternalTextureMailbox mailbox; | 1046 WebExternalTextureMailbox mailbox; |
| 1041 EXPECT_FALSE(bridge->prepareMailbox(&mailbox, 0)); | 1047 EXPECT_FALSE(bridge->prepareMailbox(&mailbox, 0)); |
| 1042 EXPECT_TRUE(bridge->checkSurfaceValid()); | 1048 EXPECT_TRUE(bridge->checkSurfaceValid()); |
| 1043 | 1049 |
| 1044 // Tear down the bridge on the thread so that 'bridge' can go out of scope | 1050 // Tear down the bridge on the thread so that 'bridge' can go out of scope |
| 1045 // without crashing due to thread checks | 1051 // without crashing due to thread checks |
| 1046 postAndWaitDestroyBridgeTask(BLINK_FROM_HERE, testThread.get(), &bridge); | 1052 postAndWaitDestroyBridgeTask(BLINK_FROM_HERE, testThread.get(), &bridge); |
| 1047 } | 1053 } |
| 1048 | 1054 |
| 1049 } // namespace blink | 1055 } // namespace blink |
| OLD | NEW |