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

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

Issue 2030033003: Replace cc::ViewportSelectionBound with gfx::SelectionBound (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Android build compiles locally Created 4 years, 6 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_ANDROID_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
11 #include <map> 11 #include <map>
12 #include <memory> 12 #include <memory>
13 #include <queue> 13 #include <queue>
14 14
15 #include "base/callback.h" 15 #include "base/callback.h"
16 #include "base/compiler_specific.h" 16 #include "base/compiler_specific.h"
17 #include "base/i18n/rtl.h" 17 #include "base/i18n/rtl.h"
18 #include "base/macros.h" 18 #include "base/macros.h"
19 #include "base/memory/weak_ptr.h" 19 #include "base/memory/weak_ptr.h"
20 #include "base/process/process.h" 20 #include "base/process/process.h"
21 #include "cc/input/selection.h"
21 #include "cc/output/begin_frame_args.h" 22 #include "cc/output/begin_frame_args.h"
22 #include "cc/surfaces/surface_factory_client.h" 23 #include "cc/surfaces/surface_factory_client.h"
23 #include "cc/surfaces/surface_id.h" 24 #include "cc/surfaces/surface_id.h"
24 #include "content/browser/accessibility/browser_accessibility_manager.h" 25 #include "content/browser/accessibility/browser_accessibility_manager.h"
25 #include "content/browser/android/content_view_core_impl_observer.h" 26 #include "content/browser/android/content_view_core_impl_observer.h"
26 #include "content/browser/renderer_host/delegated_frame_evictor.h" 27 #include "content/browser/renderer_host/delegated_frame_evictor.h"
27 #include "content/browser/renderer_host/ime_adapter_android.h" 28 #include "content/browser/renderer_host/ime_adapter_android.h"
28 #include "content/browser/renderer_host/input/stylus_text_selector.h" 29 #include "content/browser/renderer_host/input/stylus_text_selector.h"
29 #include "content/browser/renderer_host/render_widget_host_view_base.h" 30 #include "content/browser/renderer_host/render_widget_host_view_base.h"
30 #include "content/common/content_export.h" 31 #include "content/common/content_export.h"
31 #include "content/public/browser/readback_types.h" 32 #include "content/public/browser/readback_types.h"
32 #include "gpu/command_buffer/common/mailbox.h" 33 #include "gpu/command_buffer/common/mailbox.h"
33 #include "third_party/skia/include/core/SkColor.h" 34 #include "third_party/skia/include/core/SkColor.h"
34 #include "ui/android/window_android_observer.h" 35 #include "ui/android/window_android_observer.h"
35 #include "ui/events/gesture_detection/filtered_gesture_provider.h" 36 #include "ui/events/gesture_detection/filtered_gesture_provider.h"
36 #include "ui/gfx/geometry/size.h" 37 #include "ui/gfx/geometry/size.h"
37 #include "ui/gfx/geometry/vector2d_f.h" 38 #include "ui/gfx/geometry/vector2d_f.h"
39 #include "ui/gfx/selection_bound.h"
38 #include "ui/touch_selection/touch_selection_controller.h" 40 #include "ui/touch_selection/touch_selection_controller.h"
39 41
40 namespace cc { 42 namespace cc {
41 class CopyOutputResult; 43 class CopyOutputResult;
42 class Layer; 44 class Layer;
43 class SurfaceFactory; 45 class SurfaceFactory;
44 class SurfaceIdAllocator; 46 class SurfaceIdAllocator;
45 enum class SurfaceDrawStatus; 47 enum class SurfaceDrawStatus;
46 } 48 }
47 49
(...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after
348 SkColor cached_background_color_; 350 SkColor cached_background_color_;
349 351
350 scoped_refptr<cc::Layer> layer_; 352 scoped_refptr<cc::Layer> layer_;
351 353
352 std::unique_ptr<cc::SurfaceIdAllocator> id_allocator_; 354 std::unique_ptr<cc::SurfaceIdAllocator> id_allocator_;
353 std::unique_ptr<cc::SurfaceFactory> surface_factory_; 355 std::unique_ptr<cc::SurfaceFactory> surface_factory_;
354 cc::SurfaceId surface_id_; 356 cc::SurfaceId surface_id_;
355 gfx::Size current_surface_size_; 357 gfx::Size current_surface_size_;
356 cc::ReturnedResourceArray surface_returned_resources_; 358 cc::ReturnedResourceArray surface_returned_resources_;
357 gfx::Vector2dF location_bar_content_translation_; 359 gfx::Vector2dF location_bar_content_translation_;
358 cc::ViewportSelection current_viewport_selection_; 360 cc::Selection<gfx::SelectionBound> current_viewport_selection_;
359 361
360 // The most recent texture size that was pushed to the texture layer. 362 // The most recent texture size that was pushed to the texture layer.
361 gfx::Size texture_size_in_layer_; 363 gfx::Size texture_size_in_layer_;
362 364
363 // The output surface id of the last received frame. 365 // The output surface id of the last received frame.
364 uint32_t last_output_surface_id_; 366 uint32_t last_output_surface_id_;
365 367
366 368
367 std::queue<base::Closure> ack_callbacks_; 369 std::queue<base::Closure> ack_callbacks_;
368 370
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
407 gfx::Vector2dF last_scroll_offset_; 409 gfx::Vector2dF last_scroll_offset_;
408 410
409 base::WeakPtrFactory<RenderWidgetHostViewAndroid> weak_ptr_factory_; 411 base::WeakPtrFactory<RenderWidgetHostViewAndroid> weak_ptr_factory_;
410 412
411 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAndroid); 413 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAndroid);
412 }; 414 };
413 415
414 } // namespace content 416 } // namespace content
415 417
416 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_ 418 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698