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

Side by Side Diff: content/browser/android/content_view_core_impl.cc

Issue 2465173004: Revert "Allow selection change update before beginBatchEdit" on M55 (Closed)
Patch Set: Created 4 years, 1 month 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 #include "content/browser/android/content_view_core_impl.h" 5 #include "content/browser/android/content_view_core_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/android/jni_android.h" 9 #include "base/android/jni_android.h"
10 #include "base/android/jni_array.h" 10 #include "base/android/jni_array.h"
(...skipping 1256 matching lines...) Expand 10 before | Expand all | Expand 10 after
1267 1267
1268 void ContentViewCoreImpl::UpdateImeAdapter(long native_ime_adapter, 1268 void ContentViewCoreImpl::UpdateImeAdapter(long native_ime_adapter,
1269 int text_input_type, 1269 int text_input_type,
1270 int text_input_flags, 1270 int text_input_flags,
1271 const std::string& text, 1271 const std::string& text,
1272 int selection_start, 1272 int selection_start,
1273 int selection_end, 1273 int selection_end,
1274 int composition_start, 1274 int composition_start,
1275 int composition_end, 1275 int composition_end,
1276 bool show_ime_if_needed, 1276 bool show_ime_if_needed,
1277 bool is_non_ime_change, 1277 bool is_non_ime_change) {
1278 bool in_batch_edit_mode) {
1279 JNIEnv* env = AttachCurrentThread(); 1278 JNIEnv* env = AttachCurrentThread();
1280 ScopedJavaLocalRef<jobject> obj = java_ref_.get(env); 1279 ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
1281 if (obj.is_null()) 1280 if (obj.is_null())
1282 return; 1281 return;
1283 1282
1284 ScopedJavaLocalRef<jstring> jstring_text = ConvertUTF8ToJavaString(env, text); 1283 ScopedJavaLocalRef<jstring> jstring_text = ConvertUTF8ToJavaString(env, text);
1285 Java_ContentViewCore_updateImeAdapter( 1284 Java_ContentViewCore_updateImeAdapter(
1286 env, obj, native_ime_adapter, text_input_type, text_input_flags, 1285 env, obj, native_ime_adapter, text_input_type, text_input_flags,
1287 jstring_text, selection_start, selection_end, composition_start, 1286 jstring_text, selection_start, selection_end, composition_start,
1288 composition_end, show_ime_if_needed, is_non_ime_change, 1287 composition_end, show_ime_if_needed, is_non_ime_change);
1289 in_batch_edit_mode);
1290 } 1288 }
1291 1289
1292 void ContentViewCoreImpl::SetAccessibilityEnabled( 1290 void ContentViewCoreImpl::SetAccessibilityEnabled(
1293 JNIEnv* env, 1291 JNIEnv* env,
1294 const JavaParamRef<jobject>& obj, 1292 const JavaParamRef<jobject>& obj,
1295 bool enabled) { 1293 bool enabled) {
1296 SetAccessibilityEnabledInternal(enabled); 1294 SetAccessibilityEnabledInternal(enabled);
1297 } 1295 }
1298 1296
1299 void ContentViewCoreImpl::SetTextTrackSettings( 1297 void ContentViewCoreImpl::SetTextTrackSettings(
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after
1577 return ScopedJavaLocalRef<jobject>(); 1575 return ScopedJavaLocalRef<jobject>();
1578 1576
1579 return view->GetJavaObject(); 1577 return view->GetJavaObject();
1580 } 1578 }
1581 1579
1582 bool RegisterContentViewCore(JNIEnv* env) { 1580 bool RegisterContentViewCore(JNIEnv* env) {
1583 return RegisterNativesImpl(env); 1581 return RegisterNativesImpl(env);
1584 } 1582 }
1585 1583
1586 } // namespace content 1584 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/android/content_view_core_impl.h ('k') | content/browser/renderer_host/ime_adapter_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698