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

Side by Side Diff: Source/WebKit/chromium/src/Extensions3DChromium.cpp

Issue 7671031: Merge 92520 - [chromium] Accelerated canvas breaks when moving canvases or resources between Pages (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/835/
Patch Set: Created 9 years, 4 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) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 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 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 void* Extensions3DChromium::mapTexSubImage2DCHROMIUM(unsigned target, int level, int xoffset, int yoffset, int width, int height, unsigned format, unsigned type , unsigned access) 90 void* Extensions3DChromium::mapTexSubImage2DCHROMIUM(unsigned target, int level, int xoffset, int yoffset, int width, int height, unsigned format, unsigned type , unsigned access)
91 { 91 {
92 return m_internal->mapTexSubImage2DCHROMIUM(target, level, xoffset, yoffset, width, height, format, type, access); 92 return m_internal->mapTexSubImage2DCHROMIUM(target, level, xoffset, yoffset, width, height, format, type, access);
93 } 93 }
94 94
95 void Extensions3DChromium::unmapTexSubImage2DCHROMIUM(const void* data) 95 void Extensions3DChromium::unmapTexSubImage2DCHROMIUM(const void* data)
96 { 96 {
97 m_internal->unmapTexSubImage2DCHROMIUM(data); 97 m_internal->unmapTexSubImage2DCHROMIUM(data);
98 } 98 }
99 99
100 void Extensions3DChromium::copyTextureToParentTextureCHROMIUM(unsigned texture, unsigned parentTexture)
101 {
102 m_internal->copyTextureToParentTextureCHROMIUM(texture, parentTexture);
103 }
104
105 Platform3DObject Extensions3DChromium::createVertexArrayOES() 100 Platform3DObject Extensions3DChromium::createVertexArrayOES()
106 { 101 {
107 return 0; 102 return 0;
108 } 103 }
109 104
110 void Extensions3DChromium::deleteVertexArrayOES(Platform3DObject) 105 void Extensions3DChromium::deleteVertexArrayOES(Platform3DObject)
111 { 106 {
112 } 107 }
113 108
114 GC3Dboolean Extensions3DChromium::isVertexArrayOES(Platform3DObject) 109 GC3Dboolean Extensions3DChromium::isVertexArrayOES(Platform3DObject)
(...skipping 16 matching lines...) Expand all
131 } 126 }
132 127
133 void Extensions3DChromium::paintFramebufferToCanvas(int framebuffer, int width, int height, bool premultiplyAlpha, ImageBuffer* imageBuffer) 128 void Extensions3DChromium::paintFramebufferToCanvas(int framebuffer, int width, int height, bool premultiplyAlpha, ImageBuffer* imageBuffer)
134 { 129 {
135 m_internal->paintFramebufferToCanvas(framebuffer, width, height, premultiply Alpha, imageBuffer); 130 m_internal->paintFramebufferToCanvas(framebuffer, width, height, premultiply Alpha, imageBuffer);
136 } 131 }
137 132
138 } // namespace WebCore 133 } // namespace WebCore
139 134
140 #endif // ENABLE(WEBGL) 135 #endif // ENABLE(WEBGL)
OLDNEW
« no previous file with comments | « Source/WebKit/chromium/public/WebGraphicsContext3D.h ('k') | Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698