| 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 ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_ | 5 #ifndef ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_ | 
| 6 #define ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_ | 6 #define ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_ | 
| 7 | 7 | 
| 8 #include <jni.h> | 8 #include <jni.h> | 
| 9 #include <list> | 9 #include <list> | 
| 10 #include <string> | 10 #include <string> | 
| (...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 198   void OnNewPicture() override; | 198   void OnNewPicture() override; | 
| 199   gfx::Point GetLocationOnScreen() override; | 199   gfx::Point GetLocationOnScreen() override; | 
| 200   void ScrollContainerViewTo(gfx::Vector2d new_value) override; | 200   void ScrollContainerViewTo(gfx::Vector2d new_value) override; | 
| 201   bool IsFlingActive() const override; | 201   bool IsFlingActive() const override; | 
| 202   void UpdateScrollState(gfx::Vector2d max_scroll_offset, | 202   void UpdateScrollState(gfx::Vector2d max_scroll_offset, | 
| 203                          gfx::SizeF contents_size_dip, | 203                          gfx::SizeF contents_size_dip, | 
| 204                          float page_scale_factor, | 204                          float page_scale_factor, | 
| 205                          float min_page_scale_factor, | 205                          float min_page_scale_factor, | 
| 206                          float max_page_scale_factor) override; | 206                          float max_page_scale_factor) override; | 
| 207   void DidOverscroll(gfx::Vector2d overscroll_delta) override; | 207   void DidOverscroll(gfx::Vector2d overscroll_delta) override; | 
|  | 208   void ParentDrawConstraintsUpdated( | 
|  | 209       const ParentCompositorDrawConstraints& draw_constraints) override {} | 
| 208 | 210 | 
| 209   void ClearCache(JNIEnv* env, jobject obj, jboolean include_disk_files); | 211   void ClearCache(JNIEnv* env, jobject obj, jboolean include_disk_files); | 
| 210   void SetPendingWebContentsForPopup(scoped_ptr<content::WebContents> pending); | 212   void SetPendingWebContentsForPopup(scoped_ptr<content::WebContents> pending); | 
| 211   jlong ReleasePopupAwContents(JNIEnv* env, jobject obj); | 213   jlong ReleasePopupAwContents(JNIEnv* env, jobject obj); | 
| 212 | 214 | 
| 213   void ScrollTo(JNIEnv* env, jobject obj, jint x, jint y); | 215   void ScrollTo(JNIEnv* env, jobject obj, jint x, jint y); | 
| 214   void SetDipScale(JNIEnv* env, jobject obj, jfloat dip_scale); | 216   void SetDipScale(JNIEnv* env, jobject obj, jfloat dip_scale); | 
| 215   void SetSaveFormData(bool enabled); | 217   void SetSaveFormData(bool enabled); | 
| 216 | 218 | 
| 217   // Sets the java client | 219   // Sets the java client | 
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 256   GLViewRendererManager::Key renderer_manager_key_; | 258   GLViewRendererManager::Key renderer_manager_key_; | 
| 257 | 259 | 
| 258   DISALLOW_COPY_AND_ASSIGN(AwContents); | 260   DISALLOW_COPY_AND_ASSIGN(AwContents); | 
| 259 }; | 261 }; | 
| 260 | 262 | 
| 261 bool RegisterAwContents(JNIEnv* env); | 263 bool RegisterAwContents(JNIEnv* env); | 
| 262 | 264 | 
| 263 }  // namespace android_webview | 265 }  // namespace android_webview | 
| 264 | 266 | 
| 265 #endif  // ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_ | 267 #endif  // ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_ | 
| OLD | NEW | 
|---|