Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(303)

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_base.h

Issue 2317563004: Change blink::WebScreenInfo to content::ScreenInfo (Closed)
Patch Set: Fix Windows compile Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_BASE_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_BASE_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_BASE_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_BASE_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
11 #include <memory> 11 #include <memory>
12 #include <string> 12 #include <string>
13 #include <vector> 13 #include <vector>
14 14
15 #include "base/callback_forward.h" 15 #include "base/callback_forward.h"
16 #include "base/macros.h" 16 #include "base/macros.h"
17 #include "base/observer_list.h" 17 #include "base/observer_list.h"
18 #include "base/process/kill.h" 18 #include "base/process/kill.h"
19 #include "base/strings/string16.h" 19 #include "base/strings/string16.h"
20 #include "base/timer/timer.h" 20 #include "base/timer/timer.h"
21 #include "build/build_config.h" 21 #include "build/build_config.h"
22 #include "cc/output/compositor_frame.h" 22 #include "cc/output/compositor_frame.h"
23 #include "cc/surfaces/surface_id.h" 23 #include "cc/surfaces/surface_id.h"
24 #include "content/browser/renderer_host/event_with_latency_info.h" 24 #include "content/browser/renderer_host/event_with_latency_info.h"
25 #include "content/common/content_export.h" 25 #include "content/common/content_export.h"
26 #include "content/common/input/input_event_ack_state.h" 26 #include "content/common/input/input_event_ack_state.h"
27 #include "content/public/browser/readback_types.h" 27 #include "content/public/browser/readback_types.h"
28 #include "content/public/browser/render_widget_host_view.h" 28 #include "content/public/browser/render_widget_host_view.h"
29 #include "content/public/common/screen_info.h"
29 #include "ipc/ipc_listener.h" 30 #include "ipc/ipc_listener.h"
30 #include "third_party/WebKit/public/platform/modules/screen_orientation/WebScree nOrientationType.h" 31 #include "third_party/WebKit/public/platform/modules/screen_orientation/WebScree nOrientationType.h"
31 #include "third_party/WebKit/public/web/WebPopupType.h" 32 #include "third_party/WebKit/public/web/WebPopupType.h"
32 #include "third_party/WebKit/public/web/WebTextDirection.h" 33 #include "third_party/WebKit/public/web/WebTextDirection.h"
33 #include "third_party/skia/include/core/SkImageInfo.h" 34 #include "third_party/skia/include/core/SkImageInfo.h"
34 #include "ui/base/ime/text_input_mode.h" 35 #include "ui/base/ime/text_input_mode.h"
35 #include "ui/base/ime/text_input_type.h" 36 #include "ui/base/ime/text_input_type.h"
36 #include "ui/display/display.h" 37 #include "ui/display/display.h"
37 #include "ui/gfx/geometry/rect.h" 38 #include "ui/gfx/geometry/rect.h"
38 #include "ui/gfx/native_widget_types.h" 39 #include "ui/gfx/native_widget_types.h"
39 #include "ui/gfx/range/range.h" 40 #include "ui/gfx/range/range.h"
40 #include "ui/surface/transport_dib.h" 41 #include "ui/surface/transport_dib.h"
41 42
42 class SkBitmap; 43 class SkBitmap;
43 44
44 struct AccessibilityHostMsg_EventParams; 45 struct AccessibilityHostMsg_EventParams;
45 struct ViewHostMsg_SelectionBounds_Params; 46 struct ViewHostMsg_SelectionBounds_Params;
46 47
47 namespace media { 48 namespace media {
48 class VideoFrame; 49 class VideoFrame;
49 } 50 }
50 51
51 namespace blink { 52 namespace blink {
52 struct WebScreenInfo;
53 class WebMouseEvent; 53 class WebMouseEvent;
54 class WebMouseWheelEvent; 54 class WebMouseWheelEvent;
55 } 55 }
56 56
57 namespace cc { 57 namespace cc {
58 class SurfaceHittestDelegate; 58 class SurfaceHittestDelegate;
59 } 59 }
60 60
61 namespace ui { 61 namespace ui {
62 class LatencyInfo; 62 class LatencyInfo;
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
361 // should be renamed to HasCompositingSurface(), or unified with 361 // should be renamed to HasCompositingSurface(), or unified with
362 // IsSurfaceAvailableForCopy() and HasAcceleratedSurface(). 362 // IsSurfaceAvailableForCopy() and HasAcceleratedSurface().
363 virtual bool CanCopyToVideoFrame() const = 0; 363 virtual bool CanCopyToVideoFrame() const = 0;
364 364
365 // Return true if the view has an accelerated surface that contains the last 365 // Return true if the view has an accelerated surface that contains the last
366 // presented frame for the view. If |desired_size| is non-empty, true is 366 // presented frame for the view. If |desired_size| is non-empty, true is
367 // returned only if the accelerated surface size matches. 367 // returned only if the accelerated surface size matches.
368 virtual bool HasAcceleratedSurface(const gfx::Size& desired_size) = 0; 368 virtual bool HasAcceleratedSurface(const gfx::Size& desired_size) = 0;
369 369
370 // Compute the orientation type of the display assuming it is a mobile device. 370 // Compute the orientation type of the display assuming it is a mobile device.
371 static blink::WebScreenOrientationType GetOrientationTypeForMobile( 371 static ScreenOrientationValues GetOrientationTypeForMobile(
372 const display::Display& display); 372 const display::Display& display);
373 373
374 // Compute the orientation type of the display assuming it is a desktop. 374 // Compute the orientation type of the display assuming it is a desktop.
375 static blink::WebScreenOrientationType GetOrientationTypeForDesktop( 375 static ScreenOrientationValues GetOrientationTypeForDesktop(
376 const display::Display& display); 376 const display::Display& display);
377 377
378 // Gets the bounds of the window, in screen coordinates. 378 // Gets the bounds of the window, in screen coordinates.
379 virtual gfx::Rect GetBoundsInRootWindow() = 0; 379 virtual gfx::Rect GetBoundsInRootWindow() = 0;
380 380
381 // Called by the RenderWidgetHost when an ambiguous gesture is detected to 381 // Called by the RenderWidgetHost when an ambiguous gesture is detected to
382 // show the disambiguation popup bubble. 382 // show the disambiguation popup bubble.
383 virtual void ShowDisambiguationPopup(const gfx::Rect& rect_pixels, 383 virtual void ShowDisambiguationPopup(const gfx::Rect& rect_pixels,
384 const SkBitmap& zoomed_bitmap); 384 const SkBitmap& zoomed_bitmap);
385 385
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
480 base::ObserverList<RenderWidgetHostViewBaseObserver> observers_; 480 base::ObserverList<RenderWidgetHostViewBaseObserver> observers_;
481 481
482 base::WeakPtrFactory<RenderWidgetHostViewBase> weak_factory_; 482 base::WeakPtrFactory<RenderWidgetHostViewBase> weak_factory_;
483 483
484 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewBase); 484 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewBase);
485 }; 485 };
486 486
487 } // namespace content 487 } // namespace content
488 488
489 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_BASE_H_ 489 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_BASE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698