| 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" |
| (...skipping 20 matching lines...) Expand all Loading... |
| 31 #include "content/browser/renderer_host/overscroll_controller.h" | 31 #include "content/browser/renderer_host/overscroll_controller.h" |
| 32 #include "content/browser/renderer_host/render_view_host_delegate.h" | 32 #include "content/browser/renderer_host/render_view_host_delegate.h" |
| 33 #include "content/browser/renderer_host/render_view_host_delegate_view.h" | 33 #include "content/browser/renderer_host/render_view_host_delegate_view.h" |
| 34 #include "content/browser/renderer_host/render_view_host_impl.h" | 34 #include "content/browser/renderer_host/render_view_host_impl.h" |
| 35 #include "content/browser/renderer_host/render_widget_host_impl.h" | 35 #include "content/browser/renderer_host/render_widget_host_impl.h" |
| 36 #include "content/browser/renderer_host/ui_events_helper.h" | 36 #include "content/browser/renderer_host/ui_events_helper.h" |
| 37 #include "content/browser/renderer_host/web_input_event_aura.h" | 37 #include "content/browser/renderer_host/web_input_event_aura.h" |
| 38 #include "content/common/gpu/client/gl_helper.h" | 38 #include "content/common/gpu/client/gl_helper.h" |
| 39 #include "content/common/gpu/gpu_messages.h" | 39 #include "content/common/gpu/gpu_messages.h" |
| 40 #include "content/common/view_messages.h" | 40 #include "content/common/view_messages.h" |
| 41 #include "content/public/browser/bad_message.h" |
| 41 #include "content/public/browser/content_browser_client.h" | 42 #include "content/public/browser/content_browser_client.h" |
| 42 #include "content/public/browser/overscroll_configuration.h" | 43 #include "content/public/browser/overscroll_configuration.h" |
| 43 #include "content/public/browser/render_view_host.h" | 44 #include "content/public/browser/render_view_host.h" |
| 44 #include "content/public/browser/render_widget_host_view_frame_subscriber.h" | 45 #include "content/public/browser/render_widget_host_view_frame_subscriber.h" |
| 45 #include "content/public/browser/user_metrics.h" | 46 #include "content/public/browser/user_metrics.h" |
| 46 #include "content/public/common/content_switches.h" | 47 #include "content/public/common/content_switches.h" |
| 47 #include "third_party/WebKit/public/platform/WebScreenInfo.h" | 48 #include "third_party/WebKit/public/platform/WebScreenInfo.h" |
| 48 #include "third_party/WebKit/public/web/WebCompositionUnderline.h" | 49 #include "third_party/WebKit/public/web/WebCompositionUnderline.h" |
| 49 #include "third_party/WebKit/public/web/WebInputEvent.h" | 50 #include "third_party/WebKit/public/web/WebInputEvent.h" |
| 50 #include "ui/aura/client/aura_constants.h" | 51 #include "ui/aura/client/aura_constants.h" |
| (...skipping 1014 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1065 delegated_frame_host_->SwapDelegatedFrame( | 1066 delegated_frame_host_->SwapDelegatedFrame( |
| 1066 output_surface_id, | 1067 output_surface_id, |
| 1067 frame->delegated_frame_data.Pass(), | 1068 frame->delegated_frame_data.Pass(), |
| 1068 frame->metadata.device_scale_factor, | 1069 frame->metadata.device_scale_factor, |
| 1069 frame->metadata.latency_info); | 1070 frame->metadata.latency_info); |
| 1070 return; | 1071 return; |
| 1071 } | 1072 } |
| 1072 | 1073 |
| 1073 if (frame->software_frame_data) { | 1074 if (frame->software_frame_data) { |
| 1074 DLOG(ERROR) << "Unable to use software frame in aura"; | 1075 DLOG(ERROR) << "Unable to use software frame in aura"; |
| 1075 RecordAction( | 1076 host_->GetProcess()->ReceivedBadMessage(BadMessage::RWHVA_SHARED_MEMORY); |
| 1076 base::UserMetricsAction("BadMessageTerminate_SharedMemoryAura")); | |
| 1077 host_->GetProcess()->ReceivedBadMessage(); | |
| 1078 return; | 1077 return; |
| 1079 } | 1078 } |
| 1080 } | 1079 } |
| 1081 | 1080 |
| 1082 void RenderWidgetHostViewAura::DidStopFlinging() { | 1081 void RenderWidgetHostViewAura::DidStopFlinging() { |
| 1083 if (touch_editing_client_) | 1082 if (touch_editing_client_) |
| 1084 touch_editing_client_->DidStopFlinging(); | 1083 touch_editing_client_->DidStopFlinging(); |
| 1085 } | 1084 } |
| 1086 | 1085 |
| 1087 #if defined(OS_WIN) | 1086 #if defined(OS_WIN) |
| (...skipping 1593 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2681 | 2680 |
| 2682 //////////////////////////////////////////////////////////////////////////////// | 2681 //////////////////////////////////////////////////////////////////////////////// |
| 2683 // RenderWidgetHostViewBase, public: | 2682 // RenderWidgetHostViewBase, public: |
| 2684 | 2683 |
| 2685 // static | 2684 // static |
| 2686 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { | 2685 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { |
| 2687 GetScreenInfoForWindow(results, NULL); | 2686 GetScreenInfoForWindow(results, NULL); |
| 2688 } | 2687 } |
| 2689 | 2688 |
| 2690 } // namespace content | 2689 } // namespace content |
| OLD | NEW |