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

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

Issue 240003009: [Android]: Fix incorrect use of jint for pointer in ContentViewCoreImpl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fix_atomics
Patch Set: Created 6 years, 8 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
« no previous file with comments | « content/browser/android/content_view_core_impl.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "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 1420 matching lines...) Expand 10 before | Expand all | Expand 10 after
1431 return view->Animate(base::TimeTicks::FromInternalValue(frame_time_micros)); 1431 return view->Animate(base::TimeTicks::FromInternalValue(frame_time_micros));
1432 } 1432 }
1433 1433
1434 void ContentViewCoreImpl::WasResized(JNIEnv* env, jobject obj) { 1434 void ContentViewCoreImpl::WasResized(JNIEnv* env, jobject obj) {
1435 RenderWidgetHostViewAndroid* view = GetRenderWidgetHostViewAndroid(); 1435 RenderWidgetHostViewAndroid* view = GetRenderWidgetHostViewAndroid();
1436 if (view) 1436 if (view)
1437 view->WasResized(); 1437 view->WasResized();
1438 } 1438 }
1439 1439
1440 void ContentViewCoreImpl::ShowInterstitialPage( 1440 void ContentViewCoreImpl::ShowInterstitialPage(
1441 JNIEnv* env, jobject obj, jstring jurl, jint delegate_ptr) { 1441 JNIEnv* env, jobject obj, jstring jurl, jlong delegate_ptr) {
1442 GURL url(base::android::ConvertJavaStringToUTF8(env, jurl)); 1442 GURL url(base::android::ConvertJavaStringToUTF8(env, jurl));
1443 InterstitialPageDelegateAndroid* delegate = 1443 InterstitialPageDelegateAndroid* delegate =
1444 reinterpret_cast<InterstitialPageDelegateAndroid*>(delegate_ptr); 1444 reinterpret_cast<InterstitialPageDelegateAndroid*>(delegate_ptr);
1445 InterstitialPage* interstitial = InterstitialPage::Create( 1445 InterstitialPage* interstitial = InterstitialPage::Create(
1446 web_contents_, false, url, delegate); 1446 web_contents_, false, url, delegate);
1447 delegate->set_interstitial_page(interstitial); 1447 delegate->set_interstitial_page(interstitial);
1448 interstitial->Show(); 1448 interstitial->Show();
1449 } 1449 }
1450 1450
1451 jboolean ContentViewCoreImpl::IsShowingInterstitialPage(JNIEnv* env, 1451 jboolean ContentViewCoreImpl::IsShowingInterstitialPage(JNIEnv* env,
(...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after
1797 reinterpret_cast<ui::ViewAndroid*>(view_android), 1797 reinterpret_cast<ui::ViewAndroid*>(view_android),
1798 reinterpret_cast<ui::WindowAndroid*>(window_android)); 1798 reinterpret_cast<ui::WindowAndroid*>(window_android));
1799 return reinterpret_cast<intptr_t>(view); 1799 return reinterpret_cast<intptr_t>(view);
1800 } 1800 }
1801 1801
1802 bool RegisterContentViewCore(JNIEnv* env) { 1802 bool RegisterContentViewCore(JNIEnv* env) {
1803 return RegisterNativesImpl(env); 1803 return RegisterNativesImpl(env);
1804 } 1804 }
1805 1805
1806 } // namespace content 1806 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/android/content_view_core_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698