Index: chrome/browser/renderer_host/render_widget_host_view_win.cc |
=================================================================== |
--- chrome/browser/renderer_host/render_widget_host_view_win.cc (revision 65168) |
+++ chrome/browser/renderer_host/render_widget_host_view_win.cc (working copy) |
@@ -24,7 +24,6 @@ |
#include "chrome/browser/plugin_process_host.h" |
#include "chrome/browser/renderer_host/backing_store.h" |
#include "chrome/browser/renderer_host/backing_store_win.h" |
-#include "chrome/browser/renderer_host/gpu_view_host.h" |
#include "chrome/browser/renderer_host/render_process_host.h" |
#include "chrome/browser/renderer_host/render_widget_host.h" |
#include "chrome/common/chrome_constants.h" |
@@ -315,10 +314,6 @@ |
new app::win::ScopedProp(m_hWnd, |
chrome::kChromiumRendererIdProperty, |
reinterpret_cast<HANDLE>(renderer_id))); |
- |
- // Uncommenting this will enable experimental out-of-process painting. |
- // Contact brettw for more, |
- // gpu_view_host_.reset(new GpuViewHost(render_widget_host_, m_hWnd)); |
} |
/////////////////////////////////////////////////////////////////////////////// |
@@ -791,17 +786,9 @@ |
BackingStore* RenderWidgetHostViewWin::AllocBackingStore( |
const gfx::Size& size) { |
- if (gpu_view_host_.get()) |
- return gpu_view_host_->CreateBackingStore(size); |
return new BackingStoreWin(render_widget_host_, size); |
} |
-VideoLayer* RenderWidgetHostViewWin::AllocVideoLayer( |
- const gfx::Size& size) { |
- NOTIMPLEMENTED(); |
- return NULL; |
-} |
- |
void RenderWidgetHostViewWin::SetBackground(const SkBitmap& background) { |
RenderWidgetHostView::SetBackground(background); |
Send(new ViewMsg_SetBackground(render_widget_host_->routing_id(), |
@@ -890,16 +877,6 @@ |
void RenderWidgetHostViewWin::OnPaint(HDC unused_dc) { |
DCHECK(render_widget_host_->process()->HasConnection()); |
- if (gpu_view_host_.get()) { |
- // When we're proxying painting, we don't actually display the web page |
- // ourselves. We clear it white in case the proxy window isn't visible |
- // yet we won't show gibberish. |
- CPaintDC paint_dc(m_hWnd); |
- FillRect(paint_dc.m_hDC, &paint_dc.m_ps.rcPaint, |
- static_cast<HBRUSH>(GetStockObject(WHITE_BRUSH))); |
- return; |
- } |
- |
// If the GPU process is rendering directly into the View, |
// call the compositor directly. |
RenderWidgetHost* render_widget_host = GetRenderWidgetHost(); |