Chromium Code Reviews| 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 1277 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1288 | 1288 |
| 1289 return view->Animate(base::TimeTicks::FromInternalValue(frame_time_micros)); | 1289 return view->Animate(base::TimeTicks::FromInternalValue(frame_time_micros)); |
| 1290 } | 1290 } |
| 1291 | 1291 |
| 1292 jboolean ContentViewCoreImpl::PopulateBitmapFromCompositor(JNIEnv* env, | 1292 jboolean ContentViewCoreImpl::PopulateBitmapFromCompositor(JNIEnv* env, |
| 1293 jobject obj, | 1293 jobject obj, |
| 1294 jobject jbitmap) { | 1294 jobject jbitmap) { |
| 1295 RenderWidgetHostViewAndroid* view = GetRenderWidgetHostViewAndroid(); | 1295 RenderWidgetHostViewAndroid* view = GetRenderWidgetHostViewAndroid(); |
| 1296 if (!view) | 1296 if (!view) |
| 1297 return false; | 1297 return false; |
| 1298 | |
|
no sievers
2014/01/09 14:58:53
nit: whitespace change
sivag
2014/01/10 12:20:01
Done.
| |
| 1299 return view->PopulateBitmapWithContents(jbitmap); | 1298 return view->PopulateBitmapWithContents(jbitmap); |
| 1300 } | 1299 } |
| 1301 | 1300 |
| 1302 void ContentViewCoreImpl::WasResized(JNIEnv* env, jobject obj) { | 1301 void ContentViewCoreImpl::WasResized(JNIEnv* env, jobject obj) { |
| 1303 RenderWidgetHostViewAndroid* view = GetRenderWidgetHostViewAndroid(); | 1302 RenderWidgetHostViewAndroid* view = GetRenderWidgetHostViewAndroid(); |
| 1304 if (view) | 1303 if (view) |
| 1305 view->WasResized(); | 1304 view->WasResized(); |
| 1306 } | 1305 } |
| 1307 | 1306 |
| 1308 void ContentViewCoreImpl::ShowInterstitialPage( | 1307 void ContentViewCoreImpl::ShowInterstitialPage( |
| (...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1682 reinterpret_cast<ui::ViewAndroid*>(view_android), | 1681 reinterpret_cast<ui::ViewAndroid*>(view_android), |
| 1683 reinterpret_cast<ui::WindowAndroid*>(window_android)); | 1682 reinterpret_cast<ui::WindowAndroid*>(window_android)); |
| 1684 return reinterpret_cast<intptr_t>(view); | 1683 return reinterpret_cast<intptr_t>(view); |
| 1685 } | 1684 } |
| 1686 | 1685 |
| 1687 bool RegisterContentViewCore(JNIEnv* env) { | 1686 bool RegisterContentViewCore(JNIEnv* env) { |
| 1688 return RegisterNativesImpl(env); | 1687 return RegisterNativesImpl(env); |
| 1689 } | 1688 } |
| 1690 | 1689 |
| 1691 } // namespace content | 1690 } // namespace content |
| OLD | NEW |