| 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/render_widget_host.h" | 9 #include "content/browser/renderer_host/render_widget_host.h" |
| 10 #include "content/browser/renderer_host/web_input_event_aura.h" | 10 #include "content/browser/renderer_host/web_input_event_aura.h" |
| (...skipping 501 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 512 case ui::ET_MOUSE_PRESSED: | 512 case ui::ET_MOUSE_PRESSED: |
| 513 window_->SetCapture(); | 513 window_->SetCapture(); |
| 514 break; | 514 break; |
| 515 case ui::ET_MOUSE_RELEASED: | 515 case ui::ET_MOUSE_RELEASED: |
| 516 window_->ReleaseCapture(); | 516 window_->ReleaseCapture(); |
| 517 break; | 517 break; |
| 518 default: | 518 default: |
| 519 break; | 519 break; |
| 520 } | 520 } |
| 521 | 521 |
| 522 // Needed to propagate mouse event to native_tab_contents_view_aura. |
| 523 // TODO(pkotwicz): Find a better way of doing this. |
| 524 window_->parent()->delegate()->OnMouseEvent(event); |
| 525 |
| 522 // Return true so that we receive released/drag events. | 526 // Return true so that we receive released/drag events. |
| 523 return true; | 527 return true; |
| 524 } | 528 } |
| 525 | 529 |
| 526 ui::TouchStatus RenderWidgetHostViewAura::OnTouchEvent( | 530 ui::TouchStatus RenderWidgetHostViewAura::OnTouchEvent( |
| 527 aura::TouchEvent* event) { | 531 aura::TouchEvent* event) { |
| 528 // Update the touch event first. | 532 // Update the touch event first. |
| 529 WebKit::WebTouchPoint* point = content::UpdateWebTouchEvent(event, | 533 WebKit::WebTouchPoint* point = content::UpdateWebTouchEvent(event, |
| 530 &touch_event_); | 534 &touch_event_); |
| 531 | 535 |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 619 // static | 623 // static |
| 620 void RenderWidgetHostView::GetDefaultScreenInfo( | 624 void RenderWidgetHostView::GetDefaultScreenInfo( |
| 621 WebKit::WebScreenInfo* results) { | 625 WebKit::WebScreenInfo* results) { |
| 622 const gfx::Size size = gfx::Screen::GetPrimaryMonitorSize(); | 626 const gfx::Size size = gfx::Screen::GetPrimaryMonitorSize(); |
| 623 results->rect = WebKit::WebRect(0, 0, size.width(), size.height()); | 627 results->rect = WebKit::WebRect(0, 0, size.width(), size.height()); |
| 624 results->availableRect = results->rect; | 628 results->availableRect = results->rect; |
| 625 // TODO(derat): Don't hardcode this? | 629 // TODO(derat): Don't hardcode this? |
| 626 results->depth = 24; | 630 results->depth = 24; |
| 627 results->depthPerComponent = 8; | 631 results->depthPerComponent = 8; |
| 628 } | 632 } |
| OLD | NEW |