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

Unified Diff: content/browser/renderer_host/render_widget_host_view_aura.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 | « content/browser/renderer_host/image_transport_client.cc ('k') | content/content_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/render_widget_host_view_aura.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
index 60e463429fc912e19bebe2feb4983d40880cd035..3b67fdd19055942974ab1606671bc4264bb76831 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -195,8 +195,7 @@ void RenderWidgetHostViewAura::AcceleratedSurfaceNew(
uint64* surface_id,
TransportDIB::Handle* surface_handle) {
scoped_ptr<AcceleratedSurfaceContainerLinux> surface(
- AcceleratedSurfaceContainerLinux::CreateAcceleratedSurfaceContainer(
- gfx::Size(width, height)));
+ AcceleratedSurfaceContainerLinux::Create(gfx::Size(width, height)));
if (!surface->Initialize(surface_id)) {
LOG(ERROR) << "Failed to create AcceleratedSurfaceContainer";
return;
@@ -211,7 +210,7 @@ void RenderWidgetHostViewAura::AcceleratedSurfaceBuffersSwapped(
int32 route_id,
int gpu_host_id) {
window_->layer()->SetExternalTexture(
- accelerated_surface_containers_[surface_id].get());
+ accelerated_surface_containers_[surface_id]->GetTexture());
glFlush();
if (!window_->layer()->GetCompositor()) {
« no previous file with comments | « content/browser/renderer_host/image_transport_client.cc ('k') | content/content_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698