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

Side by Side Diff: content/browser/android/content_view_core_impl.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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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_ANDROID_CONTENT_VIEW_CORE_IMPL_H_ 5 #ifndef CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_
6 #define CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_ 6 #define CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/android/jni_android.h" 13 #include "base/android/jni_android.h"
14 #include "base/android/jni_weak_ref.h" 14 #include "base/android/jni_weak_ref.h"
15 #include "base/compiler_specific.h" 15 #include "base/compiler_specific.h"
16 #include "base/i18n/rtl.h" 16 #include "base/i18n/rtl.h"
17 #include "base/macros.h" 17 #include "base/macros.h"
18 #include "base/process/process.h" 18 #include "base/process/process.h"
19 #include "content/browser/android/content_view_core_impl_observer.h" 19 #include "content/browser/android/content_view_core_impl_observer.h"
20 #include "content/browser/renderer_host/render_widget_host_view_android.h" 20 #include "content/browser/renderer_host/render_widget_host_view_android.h"
21 #include "content/browser/web_contents/web_contents_impl.h" 21 #include "content/browser/web_contents/web_contents_impl.h"
22 #include "content/public/browser/android/content_view_core.h" 22 #include "content/public/browser/android/content_view_core.h"
23 #include "content/public/browser/web_contents_observer.h" 23 #include "content/public/browser/web_contents_observer.h"
24 #include "third_party/WebKit/public/web/WebInputEvent.h" 24 #include "third_party/WebKit/public/web/WebInputEvent.h"
25 #include "ui/android/overscroll_refresh.h" 25 #include "ui/android/overscroll_refresh.h"
26 #include "ui/android/view_android.h" 26 #include "ui/android/view_android.h"
27 #include "ui/gfx/geometry/rect.h" 27 #include "ui/gfx/geometry/rect.h"
28 #include "ui/gfx/geometry/rect_f.h" 28 #include "ui/gfx/geometry/rect_f.h"
29 #include "ui/gfx/selection_bound.h"
29 #include "url/gurl.h" 30 #include "url/gurl.h"
30 31
31 namespace cc { 32 namespace cc {
32 struct ViewportSelectionBound; 33 struct ViewportSelectionBound;
33 } 34 }
34 35
35 namespace ui { 36 namespace ui {
36 class WindowAndroid; 37 class WindowAndroid;
37 } 38 }
38 39
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 310
310 // All sizes and offsets are in CSS pixels as cached by the renderer. 311 // All sizes and offsets are in CSS pixels as cached by the renderer.
311 void UpdateFrameInfo(const gfx::Vector2dF& scroll_offset, 312 void UpdateFrameInfo(const gfx::Vector2dF& scroll_offset,
312 float page_scale_factor, 313 float page_scale_factor,
313 const gfx::Vector2dF& page_scale_factor_limits, 314 const gfx::Vector2dF& page_scale_factor_limits,
314 const gfx::SizeF& content_size, 315 const gfx::SizeF& content_size,
315 const gfx::SizeF& viewport_size, 316 const gfx::SizeF& viewport_size,
316 const gfx::Vector2dF& controls_offset, 317 const gfx::Vector2dF& controls_offset,
317 const gfx::Vector2dF& content_offset, 318 const gfx::Vector2dF& content_offset,
318 bool is_mobile_optimized_hint, 319 bool is_mobile_optimized_hint,
319 const cc::ViewportSelectionBound& selection_start); 320 const gfx::SelectionBound& selection_start);
320 321
321 void ForceUpdateImeAdapter(long native_ime_adapter); 322 void ForceUpdateImeAdapter(long native_ime_adapter);
322 void UpdateImeAdapter(long native_ime_adapter, 323 void UpdateImeAdapter(long native_ime_adapter,
323 int text_input_type, 324 int text_input_type,
324 int text_input_flags, 325 int text_input_flags,
325 const std::string& text, 326 const std::string& text,
326 int selection_start, 327 int selection_start,
327 int selection_end, 328 int selection_end,
328 int composition_start, 329 int composition_start,
329 int composition_end, 330 int composition_end,
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
470 scoped_refptr<GinJavaBridgeDispatcherHost> java_bridge_dispatcher_host_; 471 scoped_refptr<GinJavaBridgeDispatcherHost> java_bridge_dispatcher_host_;
471 472
472 DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl); 473 DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl);
473 }; 474 };
474 475
475 bool RegisterContentViewCore(JNIEnv* env); 476 bool RegisterContentViewCore(JNIEnv* env);
476 477
477 } // namespace content 478 } // namespace content
478 479
479 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_ 480 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698