OLD | NEW |
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 758 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
769 } | 769 } |
770 | 770 |
771 // TODO(backer): Drop the |shm_handle| once I remove some unused service side | 771 // TODO(backer): Drop the |shm_handle| once I remove some unused service side |
772 // code. | 772 // code. |
773 void RenderWidgetHostViewAura::AcceleratedSurfaceNew( | 773 void RenderWidgetHostViewAura::AcceleratedSurfaceNew( |
774 int32 width_in_pixel, | 774 int32 width_in_pixel, |
775 int32 height_in_pixel, | 775 int32 height_in_pixel, |
776 uint64 surface_handle) { | 776 uint64 surface_handle) { |
777 ImageTransportFactory* factory = ImageTransportFactory::GetInstance(); | 777 ImageTransportFactory* factory = ImageTransportFactory::GetInstance(); |
778 scoped_refptr<ui::Texture> surface(factory->CreateTransportClient( | 778 scoped_refptr<ui::Texture> surface(factory->CreateTransportClient( |
779 gfx::Size(width_in_pixel, height_in_pixel), surface_handle)); | 779 gfx::Size(width_in_pixel, height_in_pixel), surface_handle, |
| 780 GetCompositor())); |
780 if (!surface) { | 781 if (!surface) { |
781 LOG(ERROR) << "Failed to create ImageTransport texture"; | 782 LOG(ERROR) << "Failed to create ImageTransport texture"; |
782 return; | 783 return; |
783 } | 784 } |
784 | 785 |
785 image_transport_clients_[surface_handle] = surface; | 786 image_transport_clients_[surface_handle] = surface; |
786 } | 787 } |
787 | 788 |
788 void RenderWidgetHostViewAura::AcceleratedSurfaceRelease( | 789 void RenderWidgetHostViewAura::AcceleratedSurfaceRelease( |
789 uint64 surface_handle) { | 790 uint64 surface_handle) { |
(...skipping 866 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1656 RenderWidgetHost* widget) { | 1657 RenderWidgetHost* widget) { |
1657 return new RenderWidgetHostViewAura(widget); | 1658 return new RenderWidgetHostViewAura(widget); |
1658 } | 1659 } |
1659 | 1660 |
1660 // static | 1661 // static |
1661 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { | 1662 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { |
1662 GetScreenInfoForWindow(results, NULL); | 1663 GetScreenInfoForWindow(results, NULL); |
1663 } | 1664 } |
1664 | 1665 |
1665 } // namespace content | 1666 } // namespace content |
OLD | NEW |