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/logging.h" | 10 #include "base/logging.h" |
(...skipping 623 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
634 params.route_id, gpu_host_id)); | 634 params.route_id, gpu_host_id)); |
635 if (!compositor->HasObserver(this)) | 635 if (!compositor->HasObserver(this)) |
636 compositor->AddObserver(this); | 636 compositor->AddObserver(this); |
637 } | 637 } |
638 } | 638 } |
639 } | 639 } |
640 | 640 |
641 void RenderWidgetHostViewAura::AcceleratedSurfaceSuspend() { | 641 void RenderWidgetHostViewAura::AcceleratedSurfaceSuspend() { |
642 } | 642 } |
643 | 643 |
| 644 bool RenderWidgetHostViewAura::HasAcceleratedSurface( |
| 645 const gfx::Size& desired_size) { |
| 646 // Aura doesn't use GetBackingStore for accelerated pages, so it doesn't |
| 647 // matter what is returned here as GetBackingStore is the only caller of this |
| 648 // method. TODO(jbates) implement this if other Aura code needs it. |
| 649 return false; |
| 650 } |
| 651 |
644 void RenderWidgetHostViewAura::AcceleratedSurfaceNew( | 652 void RenderWidgetHostViewAura::AcceleratedSurfaceNew( |
645 int32 width, | 653 int32 width, |
646 int32 height, | 654 int32 height, |
647 uint64* surface_handle, | 655 uint64* surface_handle, |
648 TransportDIB::Handle* shm_handle) { | 656 TransportDIB::Handle* shm_handle) { |
649 ImageTransportFactory* factory = ImageTransportFactory::GetInstance(); | 657 ImageTransportFactory* factory = ImageTransportFactory::GetInstance(); |
650 scoped_refptr<ImageTransportClient> surface(factory->CreateTransportClient( | 658 scoped_refptr<ImageTransportClient> surface(factory->CreateTransportClient( |
651 gfx::Size(width, height), surface_handle)); | 659 gfx::Size(width, height), surface_handle)); |
652 if (!surface) { | 660 if (!surface) { |
653 LOG(ERROR) << "Failed to create ImageTransportClient"; | 661 LOG(ERROR) << "Failed to create ImageTransportClient"; |
(...skipping 668 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1322 RenderWidgetHostView* RenderWidgetHostView::CreateViewForWidget( | 1330 RenderWidgetHostView* RenderWidgetHostView::CreateViewForWidget( |
1323 RenderWidgetHost* widget) { | 1331 RenderWidgetHost* widget) { |
1324 return new RenderWidgetHostViewAura(widget); | 1332 return new RenderWidgetHostViewAura(widget); |
1325 } | 1333 } |
1326 | 1334 |
1327 // static | 1335 // static |
1328 void content::RenderWidgetHostViewPort::GetDefaultScreenInfo( | 1336 void content::RenderWidgetHostViewPort::GetDefaultScreenInfo( |
1329 WebKit::WebScreenInfo* results) { | 1337 WebKit::WebScreenInfo* results) { |
1330 GetScreenInfoForWindow(results, NULL); | 1338 GetScreenInfoForWindow(results, NULL); |
1331 } | 1339 } |
OLD | NEW |