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

Side by Side Diff: webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc

Issue 10031036: Revert 131177 - aura: Change shared context to be offscreen for arm (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « gpu/gles2_conform_support/egl/display.cc ('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 // 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 "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" 5 #include "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h"
6 6
7 #include <GLES2/gl2.h> 7 #include <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 408 matching lines...) Expand 10 before | Expand all | Expand 10 after
419 surface_.get(), 419 surface_.get(),
420 gpu_preference); 420 gpu_preference);
421 if (!context_.get()) { 421 if (!context_.get()) {
422 LOG(ERROR) << "Could not create GLContext."; 422 LOG(ERROR) << "Could not create GLContext.";
423 Destroy(); 423 Destroy();
424 return false; 424 return false;
425 } 425 }
426 426
427 if (!decoder_->Initialize(surface_.get(), 427 if (!decoder_->Initialize(surface_.get(),
428 context_.get(), 428 context_.get(),
429 true,
430 size, 429 size,
431 ::gpu::gles2::DisallowedFeatures(), 430 ::gpu::gles2::DisallowedFeatures(),
432 allowed_extensions, 431 allowed_extensions,
433 attribs)) { 432 attribs)) {
434 LOG(ERROR) << "Could not initialize decoder."; 433 LOG(ERROR) << "Could not initialize decoder.";
435 Destroy(); 434 Destroy();
436 return false; 435 return false;
437 } 436 }
438 437
439 if (!decoder_->SetParent( 438 if (!decoder_->SetParent(
(...skipping 1162 matching lines...) Expand 10 before | Expand all | Expand 10 after
1602 void WebGraphicsContext3DInProcessCommandBufferImpl::OnContextLost() { 1601 void WebGraphicsContext3DInProcessCommandBufferImpl::OnContextLost() {
1603 // TODO(kbr): improve the precision here. 1602 // TODO(kbr): improve the precision here.
1604 context_lost_reason_ = GL_UNKNOWN_CONTEXT_RESET_ARB; 1603 context_lost_reason_ = GL_UNKNOWN_CONTEXT_RESET_ARB;
1605 if (context_lost_callback_) { 1604 if (context_lost_callback_) {
1606 context_lost_callback_->onContextLost(); 1605 context_lost_callback_->onContextLost();
1607 } 1606 }
1608 } 1607 }
1609 1608
1610 } // namespace gpu 1609 } // namespace gpu
1611 } // namespace webkit 1610 } // namespace webkit
OLDNEW
« no previous file with comments | « gpu/gles2_conform_support/egl/display.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698