| OLD | NEW |
| 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 "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
| 8 #include "base/android/jni_array.h" | 8 #include "base/android/jni_array.h" |
| 9 #include "base/android/jni_string.h" | 9 #include "base/android/jni_string.h" |
| 10 #include "base/android/scoped_java_ref.h" | 10 #include "base/android/scoped_java_ref.h" |
| (...skipping 1263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1274 GetWebContents()->GetRoutingID(), rect)); | 1274 GetWebContents()->GetRoutingID(), rect)); |
| 1275 } | 1275 } |
| 1276 | 1276 |
| 1277 jint ContentViewCoreImpl::GetCurrentRenderProcessId(JNIEnv* env, jobject obj) { | 1277 jint ContentViewCoreImpl::GetCurrentRenderProcessId(JNIEnv* env, jobject obj) { |
| 1278 return GetRenderProcessIdFromRenderViewHost( | 1278 return GetRenderProcessIdFromRenderViewHost( |
| 1279 web_contents_->GetRenderViewHost()); | 1279 web_contents_->GetRenderViewHost()); |
| 1280 } | 1280 } |
| 1281 | 1281 |
| 1282 void ContentViewCoreImpl::SetBackgroundOpaque(JNIEnv* env, jobject jobj, | 1282 void ContentViewCoreImpl::SetBackgroundOpaque(JNIEnv* env, jobject jobj, |
| 1283 jboolean opaque) { | 1283 jboolean opaque) { |
| 1284 if (GetRenderWidgetHostViewAndroid()) | 1284 if (GetRenderWidgetHostViewAndroid()) { |
| 1285 GetRenderWidgetHostViewAndroid()->SetBackgroundOpaque(opaque); | 1285 if (opaque) |
| 1286 GetRenderWidgetHostViewAndroid()->FillBackgroundWithDefaultColor(); |
| 1287 else |
| 1288 GetRenderWidgetHostViewAndroid()->SetBackgroundColor(SK_ColorTRANSPARENT); |
| 1289 } |
| 1286 } | 1290 } |
| 1287 | 1291 |
| 1288 void ContentViewCoreImpl::RequestTextSurroundingSelection( | 1292 void ContentViewCoreImpl::RequestTextSurroundingSelection( |
| 1289 int max_length, | 1293 int max_length, |
| 1290 const base::Callback< | 1294 const base::Callback< |
| 1291 void(const base::string16& content, int start_offset, int end_offset)>& | 1295 void(const base::string16& content, int start_offset, int end_offset)>& |
| 1292 callback) { | 1296 callback) { |
| 1293 DCHECK(!callback.is_null()); | 1297 DCHECK(!callback.is_null()); |
| 1294 RenderFrameHost* focused_frame = web_contents_->GetFocusedFrame(); | 1298 RenderFrameHost* focused_frame = web_contents_->GetFocusedFrame(); |
| 1295 if (!focused_frame) | 1299 if (!focused_frame) |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1338 reinterpret_cast<ui::WindowAndroid*>(window_android), | 1342 reinterpret_cast<ui::WindowAndroid*>(window_android), |
| 1339 retained_objects_set); | 1343 retained_objects_set); |
| 1340 return reinterpret_cast<intptr_t>(view); | 1344 return reinterpret_cast<intptr_t>(view); |
| 1341 } | 1345 } |
| 1342 | 1346 |
| 1343 bool RegisterContentViewCore(JNIEnv* env) { | 1347 bool RegisterContentViewCore(JNIEnv* env) { |
| 1344 return RegisterNativesImpl(env); | 1348 return RegisterNativesImpl(env); |
| 1345 } | 1349 } |
| 1346 | 1350 |
| 1347 } // namespace content | 1351 } // namespace content |
| OLD | NEW |