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

Unified Diff: content/renderer/gpu/renderer_gl_context.cc

Issue 7745042: Revert 98392 - Split WebGraphicsContext3DCommandBufferImpl::initialize() into two stages. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/gpu/renderer_gl_context.cc
===================================================================
--- content/renderer/gpu/renderer_gl_context.cc (revision 98394)
+++ content/renderer/gpu/renderer_gl_context.cc (working copy)
@@ -10,7 +10,6 @@
#include "base/memory/scoped_ptr.h"
#include "base/memory/singleton.h"
#include "base/memory/weak_ptr.h"
-#include "base/message_loop.h"
#include "base/shared_memory.h"
#include "content/common/view_messages.h"
#include "content/renderer/gpu/command_buffer_proxy.h"
@@ -210,7 +209,6 @@
bool RendererGLContext::MakeCurrent(RendererGLContext* context) {
if (context) {
- DCHECK(MessageLoop::current() == context->message_loop_);
gles2::SetGLContext(context->gles2_implementation_);
// Don't request latest error status from service. Just use the locally
@@ -286,11 +284,7 @@
transfer_buffer_id_(-1),
gles2_implementation_(NULL),
last_error_(SUCCESS),
- frame_number_(0)
-#ifndef NDEBUG
- , message_loop_(MessageLoop::current())
-#endif
-{
+ frame_number_(0) {
DCHECK(channel);
}
@@ -303,7 +297,6 @@
const char* allowed_extensions,
const int32* attrib_list,
const GURL& active_url) {
- DCHECK(MessageLoop::current() == message_loop_);
DCHECK(size.width() >= 0 && size.height() >= 0);
TRACE_EVENT2("gpu", "RendererGLContext::Initialize",
"on_screen", onscreen, "num_pixels", size.GetArea());
@@ -422,7 +415,6 @@
void RendererGLContext::Destroy() {
TRACE_EVENT0("gpu", "RendererGLContext::Destroy");
- DCHECK(MessageLoop::current() == message_loop_);
SetParent(NULL);
if (gles2_implementation_) {
« no previous file with comments | « content/renderer/gpu/renderer_gl_context.h ('k') | content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698