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

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

Issue 2323573002: Revert of Allow canvases to be GPU-accelerated in Workers (Closed)
Patch Set: Created 4 years, 3 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) 2013, Google Inc. All rights reserved. 2 * Copyright (c) 2013, 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 12 matching lines...) Expand all
23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "platform/graphics/gpu/AcceleratedImageBufferSurface.h" 31 #include "platform/graphics/gpu/AcceleratedImageBufferSurface.h"
32 32
33 #include "platform/graphics/gpu/SharedGpuContext.h"
34 #include "platform/graphics/skia/SkiaUtils.h" 33 #include "platform/graphics/skia/SkiaUtils.h"
34 #include "public/platform/Platform.h"
35 #include "public/platform/WebGraphicsContext3DProvider.h"
35 #include "skia/ext/texture_handle.h" 36 #include "skia/ext/texture_handle.h"
36 #include "third_party/skia/include/gpu/GrContext.h" 37 #include "third_party/skia/include/gpu/GrContext.h"
37 #include "wtf/PtrUtil.h" 38 #include "wtf/PtrUtil.h"
38 #include "wtf/RefPtr.h" 39 #include "wtf/RefPtr.h"
39 40
40 namespace blink { 41 namespace blink {
41 42
42 AcceleratedImageBufferSurface::AcceleratedImageBufferSurface(const IntSize& size , OpacityMode opacityMode, sk_sp<SkColorSpace> colorSpace) 43 AcceleratedImageBufferSurface::AcceleratedImageBufferSurface(const IntSize& size , OpacityMode opacityMode, sk_sp<SkColorSpace> colorSpace)
43 : ImageBufferSurface(size, opacityMode, colorSpace) 44 : ImageBufferSurface(size, opacityMode, colorSpace)
44 { 45 {
45 if (!SharedGpuContext::isValid()) 46 m_contextProvider = wrapUnique(Platform::current()->createSharedOffscreenGra phicsContext3DProvider());
47 if (!m_contextProvider)
46 return; 48 return;
47 GrContext* grContext = SharedGpuContext::gr(); 49 GrContext* grContext = m_contextProvider->grContext();
48 m_contextId = SharedGpuContext::contextId(); 50 if (!grContext)
49 CHECK(grContext); 51 return;
50 52
51 SkAlphaType alphaType = (Opaque == opacityMode) ? kOpaque_SkAlphaType : kPre mul_SkAlphaType; 53 SkAlphaType alphaType = (Opaque == opacityMode) ? kOpaque_SkAlphaType : kPre mul_SkAlphaType;
52 SkImageInfo info = SkImageInfo::MakeN32(size.width(), size.height(), alphaTy pe); 54 SkImageInfo info = SkImageInfo::MakeN32(size.width(), size.height(), alphaTy pe);
53 SkSurfaceProps disableLCDProps(0, kUnknown_SkPixelGeometry); 55 SkSurfaceProps disableLCDProps(0, kUnknown_SkPixelGeometry);
54 m_surface = SkSurface::MakeRenderTarget(grContext, SkBudgeted::kYes, info, 0 /* sampleCount */, 56 m_surface = SkSurface::MakeRenderTarget(grContext, SkBudgeted::kYes, info, 0 /* sampleCount */,
55 Opaque == opacityMode ? nullptr : &disableLCDProps); 57 Opaque == opacityMode ? nullptr : &disableLCDProps);
56 if (!m_surface.get()) 58 if (!m_surface.get())
57 return; 59 return;
58 clear(); 60 clear();
59 } 61 }
60 62
61 bool AcceleratedImageBufferSurface::isValid() const
62 {
63 return m_surface && SharedGpuContext::isValid() && m_contextId == SharedGpuC ontext::contextId();
64 }
65
66 sk_sp<SkImage> AcceleratedImageBufferSurface::newImageSnapshot(AccelerationHint, SnapshotReason) 63 sk_sp<SkImage> AcceleratedImageBufferSurface::newImageSnapshot(AccelerationHint, SnapshotReason)
67 { 64 {
68 return m_surface->makeImageSnapshot(); 65 return m_surface->makeImageSnapshot();
69 } 66 }
70 67
71 GLuint AcceleratedImageBufferSurface::getBackingTextureHandleForOverwrite() 68 GLuint AcceleratedImageBufferSurface::getBackingTextureHandleForOverwrite()
72 { 69 {
73 if (!m_surface) 70 if (!m_surface)
74 return 0; 71 return 0;
75 return skia::GrBackendObjectToGrGLTextureInfo(m_surface->getTextureHandle(Sk Surface::kDiscardWrite_TextureHandleAccess))->fID; 72 return skia::GrBackendObjectToGrGLTextureInfo(m_surface->getTextureHandle(Sk Surface::kDiscardWrite_TextureHandleAccess))->fID;
76 } 73 }
77 74
78 } // namespace blink 75 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698