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

Side by Side Diff: content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc

Issue 11474014: Rename discardFramebufferEXT to discardBackbufferCHROMIUM to avoid collision with real discardFrame… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: back out accidental change to compositor_impl_android.cc Created 8 years 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h" 5 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
6 6
7 #include "third_party/khronos/GLES2/gl2.h" 7 #include "third_party/khronos/GLES2/gl2.h"
8 #ifndef GL_GLEXT_PROTOTYPES 8 #ifndef GL_GLEXT_PROTOTYPES
9 #define GL_GLEXT_PROTOTYPES 1 9 #define GL_GLEXT_PROTOTYPES 1
10 #endif 10 #endif
(...skipping 664 matching lines...) Expand 10 before | Expand all | Expand 10 after
675 bool visible) { 675 bool visible) {
676 gl_->Flush(); 676 gl_->Flush();
677 visible_ = visible; 677 visible_ = visible;
678 command_buffer_->SetSurfaceVisible(visible); 678 command_buffer_->SetSurfaceVisible(visible);
679 if (!visible) 679 if (!visible)
680 gl_->FreeEverything(); 680 gl_->FreeEverything();
681 } 681 }
682 682
683 void WebGraphicsContext3DCommandBufferImpl::discardFramebufferEXT( 683 void WebGraphicsContext3DCommandBufferImpl::discardFramebufferEXT(
684 WGC3Denum target, WGC3Dsizei numAttachments, const WGC3Denum* attachments) { 684 WGC3Denum target, WGC3Dsizei numAttachments, const WGC3Denum* attachments) {
685 // TODO(jamesr): Call the real function when it exists on GLES2Implementation.
686 // gl_->DiscardFramebufferEXT(target, numAttachments, attachments);
687 }
688
689 void WebGraphicsContext3DCommandBufferImpl::discardBackbufferCHROMIUM() {
685 gl_->Flush(); 690 gl_->Flush();
686 command_buffer_->DiscardBackbuffer(); 691 command_buffer_->DiscardBackbuffer();
687 } 692 }
688 693
689 void WebGraphicsContext3DCommandBufferImpl::ensureFramebufferCHROMIUM() { 694 void WebGraphicsContext3DCommandBufferImpl::ensureBackbufferCHROMIUM() {
690 gl_->Flush(); 695 gl_->Flush();
691 command_buffer_->EnsureBackbuffer(); 696 command_buffer_->EnsureBackbuffer();
692 } 697 }
693 698
694 void WebGraphicsContext3DCommandBufferImpl::sendManagedMemoryStatsCHROMIUM( 699 void WebGraphicsContext3DCommandBufferImpl::sendManagedMemoryStatsCHROMIUM(
695 const WebGraphicsManagedMemoryStats* stats) 700 const WebGraphicsManagedMemoryStats* stats)
696 { 701 {
697 CHECK(command_buffer_); 702 CHECK(command_buffer_);
698 command_buffer_->SendManagedMemoryStats(GpuManagedMemoryStats( 703 command_buffer_->SendManagedMemoryStats(GpuManagedMemoryStats(
699 stats->bytesVisible, 704 stats->bytesVisible,
(...skipping 1010 matching lines...) Expand 10 before | Expand all | Expand 10 after
1710 1715
1711 void WebGraphicsContext3DCommandBufferImpl::OnErrorMessage( 1716 void WebGraphicsContext3DCommandBufferImpl::OnErrorMessage(
1712 const std::string& message, int id) { 1717 const std::string& message, int id) {
1713 if (error_message_callback_) { 1718 if (error_message_callback_) {
1714 WebKit::WebString str = WebKit::WebString::fromUTF8(message.c_str()); 1719 WebKit::WebString str = WebKit::WebString::fromUTF8(message.c_str());
1715 error_message_callback_->onErrorMessage(str, id); 1720 error_message_callback_->onErrorMessage(str, id);
1716 } 1721 }
1717 } 1722 }
1718 1723
1719 } // namespace content 1724 } // namespace content
OLDNEW
« no previous file with comments | « content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h ('k') | gpu/command_buffer/service/feature_info.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698