Rename RenderView to RenderViewImpl. Update Chrome's DEPS so that it can't include the RenderView...

content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #if defined(ENABLE_GPU)
 
 #include "content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h"
 
 #include "gpu/GLES2/gl2.h"
 #ifndef GL_GLEXT_PROTOTYPES
 #define GL_GLEXT_PROTOTYPES 1
 #endif
 #include "gpu/GLES2/gl2ext.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/string_tokenizer.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/synchronization/lock.h"
 #include "content/common/content_switches.h"
 #include "content/renderer/gpu/gpu_channel_host.h"
 #include "content/renderer/render_thread_impl.h"
-#include "content/renderer/render_view.h"
+#include "content/renderer/render_view_impl.h"
 #include "gpu/command_buffer/client/gles2_implementation.h"
 #include "gpu/command_buffer/common/constants.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "webkit/glue/gl_bindings_skia_cmd_buffer.h"
 
 static base::LazyInstance<base::Lock>
     g_all_shared_contexts_lock(base::LINKER_INITIALIZED);
 static base::LazyInstance<std::set<WebGraphicsContext3DCommandBufferImpl*> >
@@ skipping 50 matching lines @@
     if (gpu_info.can_lose_context)
       return false;
   }
 
   if (web_view && web_view->mainFrame())
     active_url_ = GURL(web_view->mainFrame()->document().url());
 
   attributes_ = attributes;
   render_directly_to_web_view_ = render_directly_to_web_view;
   if (render_directly_to_web_view_) {
-    RenderView* render_view = RenderView::FromWebView(web_view);
+    RenderViewImpl* render_view = RenderViewImpl::FromWebView(web_view);
     if (!render_view)
       return false;
     render_view_routing_id_ = render_view->routing_id();
     web_view_ = web_view;
   }
   return true;
 }
 
 bool WebGraphicsContext3DCommandBufferImpl::MaybeInitializeGL() {
   if (context_)
@@ skipping 123 matching lines @@
       parent_context_impl ? parent_context_impl->context() : NULL);
 }
 
 WebGLId WebGraphicsContext3DCommandBufferImpl::getPlatformTextureId() {
   return context_->GetParentTextureId();
 }
 
 void WebGraphicsContext3DCommandBufferImpl::prepareTexture() {
   // Copies the contents of the off-screen render target into the texture
   // used by the compositor.
-  RenderView* renderview =
-      web_view_ ? RenderView::FromWebView(web_view_) : NULL;
+  RenderViewImpl* renderview =
+      web_view_ ? RenderViewImpl::FromWebView(web_view_) : NULL;
   if (renderview)
     renderview->OnViewContextSwapBuffersPosted();
   context_->SwapBuffers();
   context_->Echo(base::Bind(
       &WebGraphicsContext3DCommandBufferImpl::OnSwapBuffersComplete,
       weak_ptr_factory_.GetWeakPtr()));
 #if defined(OS_MACOSX)
   // It appears that making the compositor's on-screen context current on
   // other platforms implies this flush. TODO(kbr): this means that the
   // TOUCH build and, in the future, other platforms might need this.
@@ skipping 761 matching lines @@
 void WebGraphicsContext3DCommandBufferImpl::deleteShader(WebGLId shader) {
   gl_->DeleteShader(shader);
 }
 
 void WebGraphicsContext3DCommandBufferImpl::deleteTexture(WebGLId texture) {
   gl_->DeleteTextures(1, &texture);
 }
 
 void WebGraphicsContext3DCommandBufferImpl::OnSwapBuffersComplete() {
   // This may be called after tear-down of the RenderView.
-  RenderView* renderview =
-      web_view_ ? RenderView::FromWebView(web_view_) : NULL;
+  RenderViewImpl* renderview =
+      web_view_ ? RenderViewImpl::FromWebView(web_view_) : NULL;
   if (renderview)
     renderview->OnViewContextSwapBuffersComplete();
 
   if (swapbuffers_complete_callback_)
     swapbuffers_complete_callback_->onSwapBuffersComplete();
 }
 
 void WebGraphicsContext3DCommandBufferImpl::setContextLostCallback(
     WebGraphicsContext3D::WebGraphicsContextLostCallback* cb) {
   context_lost_callback_ = cb;
@@ skipping 37 matching lines @@
 }
 
 }  // anonymous namespace
 
 void WebGraphicsContext3DCommandBufferImpl::OnContextLost(
     RendererGLContext::ContextLostReason reason) {
   context_lost_reason_ = convertReason(reason);
   if (context_lost_callback_) {
     context_lost_callback_->onContextLost();
   }
-  RenderView* renderview =
-      web_view_ ? RenderView::FromWebView(web_view_) : NULL;
+  RenderViewImpl* renderview =
+      web_view_ ? RenderViewImpl::FromWebView(web_view_) : NULL;
   if (renderview)
     renderview->OnViewContextSwapBuffersAborted();
 }
 
 #endif  // defined(ENABLE_GPU)