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

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

Issue 1508903002: Use GrGLTextureInfo for Skia texture handles. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ignore_gl_target
Patch Set: Set target type in from mailbox in skcanvas_video_renderer 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
« no previous file with comments | « third_party/WebKit/Source/platform/graphics/ImageBuffer.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 14 matching lines...) Expand all
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 "public/platform/Platform.h" 33 #include "public/platform/Platform.h"
34 #include "public/platform/WebGraphicsContext3DProvider.h" 34 #include "public/platform/WebGraphicsContext3DProvider.h"
35 #include "skia/ext/texture_handle.h"
35 #include "third_party/skia/include/gpu/GrContext.h" 36 #include "third_party/skia/include/gpu/GrContext.h"
36 #include "wtf/PassOwnPtr.h" 37 #include "wtf/PassOwnPtr.h"
37 #include "wtf/RefPtr.h" 38 #include "wtf/RefPtr.h"
38 39
39 namespace blink { 40 namespace blink {
40 41
41 AcceleratedImageBufferSurface::AcceleratedImageBufferSurface(const IntSize& size , OpacityMode opacityMode) 42 AcceleratedImageBufferSurface::AcceleratedImageBufferSurface(const IntSize& size , OpacityMode opacityMode)
42 : ImageBufferSurface(size, opacityMode) 43 : ImageBufferSurface(size, opacityMode)
43 { 44 {
44 m_contextProvider = adoptPtr(Platform::current()->createSharedOffscreenGraph icsContext3DProvider()); 45 m_contextProvider = adoptPtr(Platform::current()->createSharedOffscreenGraph icsContext3DProvider());
(...skipping 15 matching lines...) Expand all
60 61
61 PassRefPtr<SkImage> AcceleratedImageBufferSurface::newImageSnapshot(Acceleration Hint, SnapshotReason) 62 PassRefPtr<SkImage> AcceleratedImageBufferSurface::newImageSnapshot(Acceleration Hint, SnapshotReason)
62 { 63 {
63 return adoptRef(m_surface->newImageSnapshot()); 64 return adoptRef(m_surface->newImageSnapshot());
64 } 65 }
65 66
66 Platform3DObject AcceleratedImageBufferSurface::getBackingTextureHandleForOverwr ite() 67 Platform3DObject AcceleratedImageBufferSurface::getBackingTextureHandleForOverwr ite()
67 { 68 {
68 if (!m_surface) 69 if (!m_surface)
69 return 0; 70 return 0;
70 return m_surface->getTextureHandle(SkSurface::kDiscardWrite_TextureHandleAcc ess); 71 return skia::GrBackendObjectToGrGLTextureInfo(m_surface->getTextureHandle(Sk Surface::kDiscardWrite_TextureHandleAccess))->fID;
71 } 72 }
72 73
73 } // namespace blink 74 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/graphics/ImageBuffer.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698