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

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

Issue 7631029: Merge 91736 - Source/WebCore: Removed support for the GL_latch_CHROMIUM extension which Chromium ... (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) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 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 820 matching lines...) Expand 10 before | Expand all | Expand 10 after
831 DELEGATE_TO_IMPL_1(unmapTexSubImage2DCHROMIUM, const void*) 831 DELEGATE_TO_IMPL_1(unmapTexSubImage2DCHROMIUM, const void*)
832 832
833 void GraphicsContext3DInternal::copyTextureToParentTextureCHROMIUM(Platform3DObj ect texture, Platform3DObject parentTexture) 833 void GraphicsContext3DInternal::copyTextureToParentTextureCHROMIUM(Platform3DObj ect texture, Platform3DObject parentTexture)
834 { 834 {
835 m_impl->setParentContext(m_webViewImpl->graphicsContext3D()); 835 m_impl->setParentContext(m_webViewImpl->graphicsContext3D());
836 m_impl->copyTextureToParentTextureCHROMIUM(texture, parentTexture); 836 m_impl->copyTextureToParentTextureCHROMIUM(texture, parentTexture);
837 } 837 }
838 838
839 DELEGATE_TO_IMPL_10(blitFramebufferCHROMIUM, GC3Dint, GC3Dint, GC3Dint, GC3Dint, GC3Dint, GC3Dint, GC3Dint, GC3Dint, GC3Dbitfield, GC3Denum) 839 DELEGATE_TO_IMPL_10(blitFramebufferCHROMIUM, GC3Dint, GC3Dint, GC3Dint, GC3Dint, GC3Dint, GC3Dint, GC3Dint, GC3Dint, GC3Dbitfield, GC3Denum)
840 DELEGATE_TO_IMPL_5(renderbufferStorageMultisampleCHROMIUM, GC3Denum, GC3Dsizei, GC3Denum, GC3Dsizei, GC3Dsizei) 840 DELEGATE_TO_IMPL_5(renderbufferStorageMultisampleCHROMIUM, GC3Denum, GC3Dsizei, GC3Denum, GC3Dsizei, GC3Dsizei)
841 DELEGATE_TO_IMPL_1(getParentToChildLatchCHROMIUM, GC3Duint*)
842 DELEGATE_TO_IMPL_1(getChildToParentLatchCHROMIUM, GC3Duint*)
843 DELEGATE_TO_IMPL_1(waitLatchCHROMIUM, GC3Duint)
844 DELEGATE_TO_IMPL_1(setLatchCHROMIUM, GC3Duint)
845 841
846 DELEGATE_TO_IMPL(rateLimitOffscreenContextCHROMIUM) 842 DELEGATE_TO_IMPL(rateLimitOffscreenContextCHROMIUM)
847 DELEGATE_TO_IMPL_R(getGraphicsResetStatusARB, GC3Denum) 843 DELEGATE_TO_IMPL_R(getGraphicsResetStatusARB, GC3Denum)
848 844
849 //---------------------------------------------------------------------- 845 //----------------------------------------------------------------------
850 // GraphicsContext3D 846 // GraphicsContext3D
851 // 847 //
852 848
853 // Macros to assist in delegating from GraphicsContext3D to 849 // Macros to assist in delegating from GraphicsContext3D to
854 // GraphicsContext3DInternal. 850 // GraphicsContext3DInternal.
(...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after
1257 1253
1258 void GraphicsContext3DInternal::setSwapBuffersCompleteCallbackCHROMIUM(PassOwnPt r<Extensions3DChromium::SwapBuffersCompleteCallbackCHROMIUM> cb) 1254 void GraphicsContext3DInternal::setSwapBuffersCompleteCallbackCHROMIUM(PassOwnPt r<Extensions3DChromium::SwapBuffersCompleteCallbackCHROMIUM> cb)
1259 { 1255 {
1260 m_swapBuffersCompleteCallbackAdapter = SwapBuffersCompleteCallbackAdapter::c reate(cb); 1256 m_swapBuffersCompleteCallbackAdapter = SwapBuffersCompleteCallbackAdapter::c reate(cb);
1261 m_impl->setSwapBuffersCompleteCallbackCHROMIUM(m_swapBuffersCompleteCallback Adapter.get()); 1257 m_impl->setSwapBuffersCompleteCallbackCHROMIUM(m_swapBuffersCompleteCallback Adapter.get());
1262 } 1258 }
1263 1259
1264 } // namespace WebCore 1260 } // namespace WebCore
1265 1261
1266 #endif // ENABLE(WEBGL) 1262 #endif // ENABLE(WEBGL)
OLDNEW
« no previous file with comments | « Source/WebKit/chromium/src/Extensions3DChromium.cpp ('k') | Source/WebKit/chromium/src/GraphicsContext3DInternal.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698