Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 #ifndef CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_ | 5 #ifndef CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_ |
| 6 #define CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_ | 6 #define CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_ |
| 7 | 7 |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/android/jni_android.h" | 10 #include "base/android/jni_android.h" |
| (...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 192 void GetDirectedNavigationHistory(JNIEnv* env, | 192 void GetDirectedNavigationHistory(JNIEnv* env, |
| 193 jobject obj, | 193 jobject obj, |
| 194 jobject history, | 194 jobject history, |
| 195 jboolean is_forward, | 195 jboolean is_forward, |
| 196 jint max_entries); | 196 jint max_entries); |
| 197 base::android::ScopedJavaLocalRef<jstring> | 197 base::android::ScopedJavaLocalRef<jstring> |
| 198 GetOriginalUrlForActiveNavigationEntry(JNIEnv* env, jobject obj); | 198 GetOriginalUrlForActiveNavigationEntry(JNIEnv* env, jobject obj); |
| 199 void UpdateVSyncParameters(JNIEnv* env, jobject obj, jlong timebase_micros, | 199 void UpdateVSyncParameters(JNIEnv* env, jobject obj, jlong timebase_micros, |
| 200 jlong interval_micros); | 200 jlong interval_micros); |
| 201 void OnVSync(JNIEnv* env, jobject /* obj */, jlong frame_time_micros); | 201 void OnVSync(JNIEnv* env, jobject /* obj */, jlong frame_time_micros); |
| 202 jboolean Animate(JNIEnv* env, jobject /* obj */, jlong frame_time_micros); | |
|
no sievers
2013/05/13 18:38:24
Hmm, why 'frame_time_micros'? Maybe just 'monotoni
jdduke (slow)
2013/05/13 20:44:24
This was primarily for consistency with the *VSync
| |
| 202 jboolean PopulateBitmapFromCompositor(JNIEnv* env, | 203 jboolean PopulateBitmapFromCompositor(JNIEnv* env, |
| 203 jobject obj, | 204 jobject obj, |
| 204 jobject jbitmap); | 205 jobject jbitmap); |
| 205 void WasResized(JNIEnv* env, jobject obj); | 206 void WasResized(JNIEnv* env, jobject obj); |
| 206 jboolean IsRenderWidgetHostViewReady(JNIEnv* env, jobject obj); | 207 jboolean IsRenderWidgetHostViewReady(JNIEnv* env, jobject obj); |
| 207 void ExitFullscreen(JNIEnv* env, jobject obj); | 208 void ExitFullscreen(JNIEnv* env, jobject obj); |
| 208 void UpdateTopControlsState(JNIEnv* env, | 209 void UpdateTopControlsState(JNIEnv* env, |
| 209 jobject obj, | 210 jobject obj, |
| 210 bool enable_hiding, | 211 bool enable_hiding, |
| 211 bool enable_showing, | 212 bool enable_showing, |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 289 gfx::Size GetPhysicalBackingSize() const; | 290 gfx::Size GetPhysicalBackingSize() const; |
| 290 gfx::Size GetViewportSizeDip() const; | 291 gfx::Size GetViewportSizeDip() const; |
| 291 gfx::Size GetViewportSizeOffsetDip() const; | 292 gfx::Size GetViewportSizeOffsetDip() const; |
| 292 float GetOverdrawBottomHeightDip() const; | 293 float GetOverdrawBottomHeightDip() const; |
| 293 | 294 |
| 294 InputEventAckState FilterInputEvent(const WebKit::WebInputEvent& input_event); | 295 InputEventAckState FilterInputEvent(const WebKit::WebInputEvent& input_event); |
| 295 | 296 |
| 296 void AttachLayer(scoped_refptr<cc::Layer> layer); | 297 void AttachLayer(scoped_refptr<cc::Layer> layer); |
| 297 void RemoveLayer(scoped_refptr<cc::Layer> layer); | 298 void RemoveLayer(scoped_refptr<cc::Layer> layer); |
| 298 void SetVSyncNotificationEnabled(bool enabled); | 299 void SetVSyncNotificationEnabled(bool enabled); |
| 300 void SetNeedsAnimate(); | |
| 299 | 301 |
| 300 private: | 302 private: |
| 301 enum InputEventVSyncStatus { | 303 enum InputEventVSyncStatus { |
| 302 NOT_LAST_INPUT_EVENT_FOR_VSYNC, | 304 NOT_LAST_INPUT_EVENT_FOR_VSYNC, |
| 303 LAST_INPUT_EVENT_FOR_VSYNC | 305 LAST_INPUT_EVENT_FOR_VSYNC |
| 304 }; | 306 }; |
| 305 | 307 |
| 306 class ContentViewUserData; | 308 class ContentViewUserData; |
| 307 | 309 |
| 308 friend class ContentViewUserData; | 310 friend class ContentViewUserData; |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 365 scoped_ptr<SyncInputEventFilter> input_event_filter_; | 367 scoped_ptr<SyncInputEventFilter> input_event_filter_; |
| 366 | 368 |
| 367 DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl); | 369 DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl); |
| 368 }; | 370 }; |
| 369 | 371 |
| 370 bool RegisterContentViewCore(JNIEnv* env); | 372 bool RegisterContentViewCore(JNIEnv* env); |
| 371 | 373 |
| 372 } // namespace content | 374 } // namespace content |
| 373 | 375 |
| 374 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_ | 376 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_ |
| OLD | NEW |