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

Unified Diff: content/browser/android/content_view_core_impl.cc

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 side-by-side diff with in-line comments
Download patch
Index: content/browser/android/content_view_core_impl.cc
diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc
index c9a638ae84367bfe850fe334aa2a3678157e1ef8..e6082525515414d1cd375b148221e6775e5223fe 100644
--- a/content/browser/android/content_view_core_impl.cc
+++ b/content/browser/android/content_view_core_impl.cc
@@ -19,7 +19,6 @@
#include "cc/layers/layer.h"
#include "cc/layers/solid_color_layer.h"
#include "cc/output/begin_frame_args.h"
-#include "cc/output/viewport_selection_bound.h"
#include "content/browser/accessibility/browser_accessibility_manager_android.h"
#include "content/browser/accessibility/browser_accessibility_state_impl.h"
#include "content/browser/android/gesture_event_type.h"
@@ -424,7 +423,7 @@ void ContentViewCoreImpl::UpdateFrameInfo(
const gfx::Vector2dF& controls_offset,
const gfx::Vector2dF& content_offset,
bool is_mobile_optimized_hint,
- const cc::ViewportSelectionBound& selection_start) {
+ const gfx::SelectionBound& selection_start) {
JNIEnv* env = AttachCurrentThread();
ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
if (obj.is_null() || !window_android_)
@@ -438,14 +437,14 @@ void ContentViewCoreImpl::UpdateFrameInfo(
// The CursorAnchorInfo API in Android only supports zero width selection
// bounds.
const jboolean has_insertion_marker =
- selection_start.type == cc::SELECTION_BOUND_CENTER;
- const jboolean is_insertion_marker_visible = selection_start.visible;
+ selection_start.type() == gfx::SelectionBound::CENTER;
+ const jboolean is_insertion_marker_visible = selection_start.visible();
const jfloat insertion_marker_horizontal =
- has_insertion_marker ? selection_start.edge_top.x() : 0.0f;
+ has_insertion_marker ? selection_start.edge_top().x() : 0.0f;
const jfloat insertion_marker_top =
- has_insertion_marker ? selection_start.edge_top.y() : 0.0f;
+ has_insertion_marker ? selection_start.edge_top().y() : 0.0f;
const jfloat insertion_marker_bottom =
- has_insertion_marker ? selection_start.edge_bottom.y() : 0.0f;
+ has_insertion_marker ? selection_start.edge_bottom().y() : 0.0f;
Java_ContentViewCore_updateFrameInfo(
env, obj.obj(),

Powered by Google App Engine
This is Rietveld 408576698