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 19 matching lines...) Expand all Loading... |
30 #include "content/browser/renderer_host/overscroll_controller.h" | 30 #include "content/browser/renderer_host/overscroll_controller.h" |
31 #include "content/browser/renderer_host/render_view_host_delegate.h" | 31 #include "content/browser/renderer_host/render_view_host_delegate.h" |
32 #include "content/browser/renderer_host/render_widget_host_impl.h" | 32 #include "content/browser/renderer_host/render_widget_host_impl.h" |
33 #include "content/browser/renderer_host/ui_events_helper.h" | 33 #include "content/browser/renderer_host/ui_events_helper.h" |
34 #include "content/browser/renderer_host/web_input_event_aura.h" | 34 #include "content/browser/renderer_host/web_input_event_aura.h" |
35 #include "content/common/gpu/client/gl_helper.h" | 35 #include "content/common/gpu/client/gl_helper.h" |
36 #include "content/common/gpu/gpu_messages.h" | 36 #include "content/common/gpu/gpu_messages.h" |
37 #include "content/common/view_messages.h" | 37 #include "content/common/view_messages.h" |
38 #include "content/port/browser/render_widget_host_view_frame_subscriber.h" | 38 #include "content/port/browser/render_widget_host_view_frame_subscriber.h" |
39 #include "content/port/browser/render_widget_host_view_port.h" | 39 #include "content/port/browser/render_widget_host_view_port.h" |
40 #include "content/public/browser/browser_thread.h" | |
41 #include "content/public/browser/content_browser_client.h" | 40 #include "content/public/browser/content_browser_client.h" |
42 #include "content/public/browser/render_process_host.h" | 41 #include "content/public/browser/render_process_host.h" |
43 #include "content/public/browser/render_view_host.h" | 42 #include "content/public/browser/render_view_host.h" |
44 #include "content/public/browser/user_metrics.h" | 43 #include "content/public/browser/user_metrics.h" |
45 #include "content/public/common/content_switches.h" | 44 #include "content/public/common/content_switches.h" |
46 #include "media/base/video_util.h" | 45 #include "media/base/video_util.h" |
47 #include "skia/ext/image_operations.h" | 46 #include "skia/ext/image_operations.h" |
48 #include "third_party/WebKit/public/platform/WebScreenInfo.h" | 47 #include "third_party/WebKit/public/platform/WebScreenInfo.h" |
49 #include "third_party/WebKit/public/web/WebCompositionUnderline.h" | 48 #include "third_party/WebKit/public/web/WebCompositionUnderline.h" |
50 #include "third_party/WebKit/public/web/WebInputEvent.h" | 49 #include "third_party/WebKit/public/web/WebInputEvent.h" |
(...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
362 | 361 |
363 ack.sync_point = sync_point; | 362 ack.sync_point = sync_point; |
364 RenderWidgetHostImpl::AcknowledgeBufferPresent( | 363 RenderWidgetHostImpl::AcknowledgeBufferPresent( |
365 route_id, gpu_host_id, ack); | 364 route_id, gpu_host_id, ack); |
366 } | 365 } |
367 | 366 |
368 } // namespace | 367 } // namespace |
369 | 368 |
370 // We need to watch for mouse events outside a Web Popup or its parent | 369 // We need to watch for mouse events outside a Web Popup or its parent |
371 // and dismiss the popup for certain events. | 370 // and dismiss the popup for certain events. |
372 class RenderWidgetHostViewAura::EventFilterForPopupExit : | 371 class RenderWidgetHostViewAura::EventFilterForPopupExit |
373 public ui::EventHandler { | 372 : public ui::EventHandler { |
374 public: | 373 public: |
375 explicit EventFilterForPopupExit(RenderWidgetHostViewAura* rwhva) | 374 explicit EventFilterForPopupExit(RenderWidgetHostViewAura* rwhva) |
376 : rwhva_(rwhva) { | 375 : rwhva_(rwhva) { |
377 DCHECK(rwhva_); | 376 DCHECK(rwhva_); |
378 aura::Env::GetInstance()->AddPreTargetHandler(this); | 377 aura::Env::GetInstance()->AddPreTargetHandler(this); |
379 } | 378 } |
380 | 379 |
381 virtual ~EventFilterForPopupExit() { | 380 virtual ~EventFilterForPopupExit() { |
382 aura::Env::GetInstance()->RemovePreTargetHandler(this); | 381 aura::Env::GetInstance()->RemovePreTargetHandler(this); |
383 } | 382 } |
(...skipping 3218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3602 RenderWidgetHost* widget) { | 3601 RenderWidgetHost* widget) { |
3603 return new RenderWidgetHostViewAura(widget); | 3602 return new RenderWidgetHostViewAura(widget); |
3604 } | 3603 } |
3605 | 3604 |
3606 // static | 3605 // static |
3607 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { | 3606 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { |
3608 GetScreenInfoForWindow(results, NULL); | 3607 GetScreenInfoForWindow(results, NULL); |
3609 } | 3608 } |
3610 | 3609 |
3611 } // namespace content | 3610 } // namespace content |
OLD | NEW |