| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/logging.h" | 7 #include "base/logging.h" |
| 8 #include "content/browser/renderer_host/backing_store_skia.h" | 8 #include "content/browser/renderer_host/backing_store_skia.h" |
| 9 #include "content/browser/renderer_host/web_input_event_aura.h" | 9 #include "content/browser/renderer_host/web_input_event_aura.h" |
| 10 #include "content/browser/renderer_host/render_widget_host.h" | 10 #include "content/browser/renderer_host/render_widget_host.h" |
| (...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 226 const gfx::Size& size) { | 226 const gfx::Size& size) { |
| 227 return new BackingStoreSkia(host_, size); | 227 return new BackingStoreSkia(host_, size); |
| 228 } | 228 } |
| 229 | 229 |
| 230 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT) | 230 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT) |
| 231 void RenderWidgetHostViewAura::AcceleratedSurfaceNew( | 231 void RenderWidgetHostViewAura::AcceleratedSurfaceNew( |
| 232 int32 width, | 232 int32 width, |
| 233 int32 height, | 233 int32 height, |
| 234 uint64* surface_id, | 234 uint64* surface_id, |
| 235 TransportDIB::Handle* surface_handle) { | 235 TransportDIB::Handle* surface_handle) { |
| 236 scoped_ptr<AcceleratedSurfaceContainerLinux> surface( | 236 scoped_refptr<AcceleratedSurfaceContainerLinux> surface( |
| 237 AcceleratedSurfaceContainerLinux::Create(gfx::Size(width, height))); | 237 AcceleratedSurfaceContainerLinux::Create(gfx::Size(width, height))); |
| 238 if (!surface->Initialize(surface_id)) { | 238 if (!surface->Initialize(surface_id)) { |
| 239 LOG(ERROR) << "Failed to create AcceleratedSurfaceContainer"; | 239 LOG(ERROR) << "Failed to create AcceleratedSurfaceContainer"; |
| 240 return; | 240 return; |
| 241 } | 241 } |
| 242 *surface_handle = surface->Handle(); | 242 *surface_handle = surface->Handle(); |
| 243 | 243 |
| 244 accelerated_surface_containers_[*surface_id] = surface; | 244 accelerated_surface_containers_[*surface_id] = surface; |
| 245 } | 245 } |
| 246 | 246 |
| (...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 466 } | 466 } |
| 467 #endif | 467 #endif |
| 468 | 468 |
| 469 //////////////////////////////////////////////////////////////////////////////// | 469 //////////////////////////////////////////////////////////////////////////////// |
| 470 // RenderWidgetHostViewAura, private: | 470 // RenderWidgetHostViewAura, private: |
| 471 | 471 |
| 472 void RenderWidgetHostViewAura::UpdateCursorIfOverSelf() { | 472 void RenderWidgetHostViewAura::UpdateCursorIfOverSelf() { |
| 473 //NOTIMPLEMENTED(); | 473 //NOTIMPLEMENTED(); |
| 474 // TODO(beng): See RenderWidgetHostViewWin. | 474 // TODO(beng): See RenderWidgetHostViewWin. |
| 475 } | 475 } |
| OLD | NEW |