| 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/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/memory/weak_ptr.h" | 9 #include "base/memory/weak_ptr.h" |
| 10 #include "content/browser/renderer_host/backing_store_skia.h" | 10 #include "content/browser/renderer_host/backing_store_skia.h" |
| (...skipping 551 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 562 } | 562 } |
| 563 | 563 |
| 564 gfx::Rect RenderWidgetHostViewAura::GetRootWindowBounds() { | 564 gfx::Rect RenderWidgetHostViewAura::GetRootWindowBounds() { |
| 565 // TODO(beng): this is actually wrong, we are supposed to return the bounds | 565 // TODO(beng): this is actually wrong, we are supposed to return the bounds |
| 566 // of the container "top level" window, but we don't have a firm | 566 // of the container "top level" window, but we don't have a firm |
| 567 // concept of what constitutes a toplevel right now, so just do | 567 // concept of what constitutes a toplevel right now, so just do |
| 568 // this. | 568 // this. |
| 569 return window_->GetScreenBounds(); | 569 return window_->GetScreenBounds(); |
| 570 } | 570 } |
| 571 | 571 |
| 572 void RenderWidgetHostViewAura::UnhandledWheelEvent( | |
| 573 const WebKit::WebMouseWheelEvent& event) { | |
| 574 // Not needed. Mac-only. | |
| 575 } | |
| 576 | |
| 577 void RenderWidgetHostViewAura::ProcessTouchAck( | 572 void RenderWidgetHostViewAura::ProcessTouchAck( |
| 578 WebKit::WebInputEvent::Type type, bool processed) { | 573 WebKit::WebInputEvent::Type type, bool processed) { |
| 579 // The ACKs for the touch-events arrive in the same sequence as they were | 574 // The ACKs for the touch-events arrive in the same sequence as they were |
| 580 // dispatched. | 575 // dispatched. |
| 581 aura::RootWindow* root_window = window_->GetRootWindow(); | 576 aura::RootWindow* root_window = window_->GetRootWindow(); |
| 582 if (root_window) | 577 if (root_window) |
| 583 root_window->AdvanceQueuedTouchEvent(window_, processed); | 578 root_window->AdvanceQueuedTouchEvent(window_, processed); |
| 584 } | 579 } |
| 585 | 580 |
| 586 void RenderWidgetHostViewAura::SetHasHorizontalScrollbar( | 581 void RenderWidgetHostViewAura::SetHasHorizontalScrollbar( |
| (...skipping 613 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1200 WebKit::WebScreenInfo* results) { | 1195 WebKit::WebScreenInfo* results) { |
| 1201 const gfx::Size size = gfx::Screen::GetPrimaryMonitorSize(); | 1196 const gfx::Size size = gfx::Screen::GetPrimaryMonitorSize(); |
| 1202 results->rect = WebKit::WebRect(0, 0, size.width(), size.height()); | 1197 results->rect = WebKit::WebRect(0, 0, size.width(), size.height()); |
| 1203 results->availableRect = results->rect; | 1198 results->availableRect = results->rect; |
| 1204 // TODO(derat): Don't hardcode this? | 1199 // TODO(derat): Don't hardcode this? |
| 1205 results->depth = 24; | 1200 results->depth = 24; |
| 1206 results->depthPerComponent = 8; | 1201 results->depthPerComponent = 8; |
| 1207 results->verticalDPI = 96; | 1202 results->verticalDPI = 96; |
| 1208 results->horizontalDPI = 96; | 1203 results->horizontalDPI = 96; |
| 1209 } | 1204 } |
| OLD | NEW |