| 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/auto_reset.h" | 7 #include "base/auto_reset.h" |
| 8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/callback_helpers.h" | 10 #include "base/callback_helpers.h" |
| 11 #include "base/command_line.h" | 11 #include "base/command_line.h" |
| 12 #include "base/logging.h" | 12 #include "base/logging.h" |
| 13 #include "base/message_loop/message_loop.h" | 13 #include "base/message_loop/message_loop.h" |
| 14 #include "base/strings/string_number_conversions.h" | 14 #include "base/strings/string_number_conversions.h" |
| 15 #include "base/trace_event/trace_event.h" | 15 #include "base/trace_event/trace_event.h" |
| 16 #include "cc/layers/layer.h" | 16 #include "cc/layers/layer.h" |
| 17 #include "cc/output/copy_output_request.h" | 17 #include "cc/output/copy_output_request.h" |
| 18 #include "cc/output/copy_output_result.h" | 18 #include "cc/output/copy_output_result.h" |
| 19 #include "cc/resources/texture_mailbox.h" | 19 #include "cc/resources/texture_mailbox.h" |
| 20 #include "cc/trees/layer_tree_settings.h" | 20 #include "cc/trees/layer_tree_settings.h" |
| 21 #include "content/browser/accessibility/browser_accessibility_manager.h" | 21 #include "content/browser/accessibility/browser_accessibility_manager.h" |
| 22 #include "content/browser/accessibility/browser_accessibility_state_impl.h" | 22 #include "content/browser/accessibility/browser_accessibility_state_impl.h" |
| 23 #include "content/browser/bad_message.h" |
| 23 #include "content/browser/frame_host/frame_tree.h" | 24 #include "content/browser/frame_host/frame_tree.h" |
| 24 #include "content/browser/frame_host/frame_tree_node.h" | 25 #include "content/browser/frame_host/frame_tree_node.h" |
| 25 #include "content/browser/frame_host/render_frame_host_impl.h" | 26 #include "content/browser/frame_host/render_frame_host_impl.h" |
| 26 #include "content/browser/gpu/compositor_util.h" | 27 #include "content/browser/gpu/compositor_util.h" |
| 27 #include "content/browser/renderer_host/compositor_resize_lock_aura.h" | 28 #include "content/browser/renderer_host/compositor_resize_lock_aura.h" |
| 28 #include "content/browser/renderer_host/dip_util.h" | 29 #include "content/browser/renderer_host/dip_util.h" |
| 29 #include "content/browser/renderer_host/input/synthetic_gesture_target_aura.h" | 30 #include "content/browser/renderer_host/input/synthetic_gesture_target_aura.h" |
| 30 #include "content/browser/renderer_host/input/web_input_event_util.h" | 31 #include "content/browser/renderer_host/input/web_input_event_util.h" |
| 31 #include "content/browser/renderer_host/overscroll_controller.h" | 32 #include "content/browser/renderer_host/overscroll_controller.h" |
| 32 #include "content/browser/renderer_host/render_view_host_delegate.h" | 33 #include "content/browser/renderer_host/render_view_host_delegate.h" |
| (...skipping 1035 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1068 delegated_frame_host_->SwapDelegatedFrame( | 1069 delegated_frame_host_->SwapDelegatedFrame( |
| 1069 output_surface_id, | 1070 output_surface_id, |
| 1070 frame->delegated_frame_data.Pass(), | 1071 frame->delegated_frame_data.Pass(), |
| 1071 frame->metadata.device_scale_factor, | 1072 frame->metadata.device_scale_factor, |
| 1072 frame->metadata.latency_info); | 1073 frame->metadata.latency_info); |
| 1073 return; | 1074 return; |
| 1074 } | 1075 } |
| 1075 | 1076 |
| 1076 if (frame->software_frame_data) { | 1077 if (frame->software_frame_data) { |
| 1077 DLOG(ERROR) << "Unable to use software frame in aura"; | 1078 DLOG(ERROR) << "Unable to use software frame in aura"; |
| 1078 RecordAction( | 1079 bad_message::ReceivedBadMessage(host_->GetProcess(), |
| 1079 base::UserMetricsAction("BadMessageTerminate_SharedMemoryAura")); | 1080 bad_message::RWHVA_SHARED_MEMORY); |
| 1080 host_->GetProcess()->ReceivedBadMessage(); | |
| 1081 return; | 1081 return; |
| 1082 } | 1082 } |
| 1083 } | 1083 } |
| 1084 | 1084 |
| 1085 void RenderWidgetHostViewAura::DidStopFlinging() { | 1085 void RenderWidgetHostViewAura::DidStopFlinging() { |
| 1086 if (touch_editing_client_) | 1086 if (touch_editing_client_) |
| 1087 touch_editing_client_->DidStopFlinging(); | 1087 touch_editing_client_->DidStopFlinging(); |
| 1088 } | 1088 } |
| 1089 | 1089 |
| 1090 #if defined(OS_WIN) | 1090 #if defined(OS_WIN) |
| (...skipping 1599 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2690 | 2690 |
| 2691 //////////////////////////////////////////////////////////////////////////////// | 2691 //////////////////////////////////////////////////////////////////////////////// |
| 2692 // RenderWidgetHostViewBase, public: | 2692 // RenderWidgetHostViewBase, public: |
| 2693 | 2693 |
| 2694 // static | 2694 // static |
| 2695 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { | 2695 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { |
| 2696 GetScreenInfoForWindow(results, NULL); | 2696 GetScreenInfoForWindow(results, NULL); |
| 2697 } | 2697 } |
| 2698 | 2698 |
| 2699 } // namespace content | 2699 } // namespace content |
| OLD | NEW |