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

Unified Diff: chrome/browser/renderer_host/render_widget_host_view_views.cc

Issue 8307001: Enable accelerated compositing of web pages when using webkit compositor (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: rebase Created 9 years, 2 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
« no previous file with comments | « build/common.gypi ('k') | content/browser/renderer_host/accelerated_surface_container_linux.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/renderer_host/render_widget_host_view_views.cc
diff --git a/chrome/browser/renderer_host/render_widget_host_view_views.cc b/chrome/browser/renderer_host/render_widget_host_view_views.cc
index ffe15301410b319b29853b01b04a0006c07525c9..a13d19a9f6241710df6429fdd36991af5051fd7e 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_views.cc
+++ b/chrome/browser/renderer_host/render_widget_host_view_views.cc
@@ -1119,9 +1119,8 @@ void RenderWidgetHostViewViews::AcceleratedSurfaceNew(
int32 height,
uint64* surface_id,
TransportDIB::Handle* surface_handle) {
- scoped_ptr<AcceleratedSurfaceContainerLinux> surface(
- AcceleratedSurfaceContainerLinux::CreateAcceleratedSurfaceContainer(
- gfx::Size(width, height)));
+ scoped_refptr<AcceleratedSurfaceContainerLinux> surface(
+ AcceleratedSurfaceContainerLinux::Create(gfx::Size(width, height)));
if (!surface->Initialize(surface_id)) {
LOG(ERROR) << "Failed to create AcceleratedSurfaceContainer";
return;
@@ -1139,7 +1138,7 @@ void RenderWidgetHostViewViews::AcceleratedSurfaceBuffersSwapped(
uint64 surface_id,
int32 route_id,
int gpu_host_id) {
- SetExternalTexture(accelerated_surface_containers_[surface_id].get());
+ SetExternalTexture(accelerated_surface_containers_[surface_id]->GetTexture());
glFlush();
if (!GetWidget() || !GetWidget()->GetCompositor()) {
« no previous file with comments | « build/common.gypi ('k') | content/browser/renderer_host/accelerated_surface_container_linux.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698