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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_aura.cc

Issue 10828262: Partial revert of 146621 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix win_aura bot Created 8 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/browser/renderer_host/image_transport_factory.cc ('k') | ui/aura/bench/bench_main.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/renderer_host/render_widget_host_view_aura.h" 5 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/debug/trace_event.h" 10 #include "base/debug/trace_event.h"
(...skipping 756 matching lines...) Expand 10 before | Expand all | Expand 10 after
767 } 767 }
768 768
769 // TODO(backer): Drop the |shm_handle| once I remove some unused service side 769 // TODO(backer): Drop the |shm_handle| once I remove some unused service side
770 // code. 770 // code.
771 void RenderWidgetHostViewAura::AcceleratedSurfaceNew( 771 void RenderWidgetHostViewAura::AcceleratedSurfaceNew(
772 int32 width_in_pixel, 772 int32 width_in_pixel,
773 int32 height_in_pixel, 773 int32 height_in_pixel,
774 uint64 surface_handle) { 774 uint64 surface_handle) {
775 ImageTransportFactory* factory = ImageTransportFactory::GetInstance(); 775 ImageTransportFactory* factory = ImageTransportFactory::GetInstance();
776 scoped_refptr<ui::Texture> surface(factory->CreateTransportClient( 776 scoped_refptr<ui::Texture> surface(factory->CreateTransportClient(
777 gfx::Size(width_in_pixel, height_in_pixel), surface_handle, 777 gfx::Size(width_in_pixel, height_in_pixel), surface_handle));
778 GetCompositor()));
779 if (!surface) { 778 if (!surface) {
780 LOG(ERROR) << "Failed to create ImageTransport texture"; 779 LOG(ERROR) << "Failed to create ImageTransport texture";
781 return; 780 return;
782 } 781 }
783 782
784 image_transport_clients_[surface_handle] = surface; 783 image_transport_clients_[surface_handle] = surface;
785 } 784 }
786 785
787 void RenderWidgetHostViewAura::AcceleratedSurfaceRelease( 786 void RenderWidgetHostViewAura::AcceleratedSurfaceRelease(
788 uint64 surface_handle) { 787 uint64 surface_handle) {
(...skipping 866 matching lines...) Expand 10 before | Expand all | Expand 10 after
1655 RenderWidgetHost* widget) { 1654 RenderWidgetHost* widget) {
1656 return new RenderWidgetHostViewAura(widget); 1655 return new RenderWidgetHostViewAura(widget);
1657 } 1656 }
1658 1657
1659 // static 1658 // static
1660 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { 1659 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) {
1661 GetScreenInfoForWindow(results, NULL); 1660 GetScreenInfoForWindow(results, NULL);
1662 } 1661 }
1663 1662
1664 } // namespace content 1663 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/image_transport_factory.cc ('k') | ui/aura/bench/bench_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698