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

Side by Side Diff: android_webview/native/aw_contents.h

Issue 23533051: [android_webview] Use a fraction to calculate scroll offset. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: get rid of NaNs Created 7 years, 3 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 | Annotate | Revision Log
OLDNEW
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 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 float page_scale_factor) OVERRIDE; 149 float page_scale_factor) OVERRIDE;
150 virtual void OnWebLayoutContentsSizeChanged( 150 virtual void OnWebLayoutContentsSizeChanged(
151 const gfx::Size& contents_size) OVERRIDE; 151 const gfx::Size& contents_size) OVERRIDE;
152 152
153 // BrowserViewRenderer::Client implementation. 153 // BrowserViewRenderer::Client implementation.
154 virtual bool RequestDrawGL(jobject canvas) OVERRIDE; 154 virtual bool RequestDrawGL(jobject canvas) OVERRIDE;
155 virtual void PostInvalidate() OVERRIDE; 155 virtual void PostInvalidate() OVERRIDE;
156 virtual void UpdateGlobalVisibleRect() OVERRIDE; 156 virtual void UpdateGlobalVisibleRect() OVERRIDE;
157 virtual void OnNewPicture() OVERRIDE; 157 virtual void OnNewPicture() OVERRIDE;
158 virtual gfx::Point GetLocationOnScreen() OVERRIDE; 158 virtual gfx::Point GetLocationOnScreen() OVERRIDE;
159 virtual void SetMaxContainerViewScrollOffset(
160 gfx::Vector2d new_value) OVERRIDE;
159 virtual void ScrollContainerViewTo(gfx::Vector2d new_value) OVERRIDE; 161 virtual void ScrollContainerViewTo(gfx::Vector2d new_value) OVERRIDE;
160 virtual void DidOverscroll(gfx::Vector2d overscroll_delta) OVERRIDE; 162 virtual void DidOverscroll(gfx::Vector2d overscroll_delta) OVERRIDE;
161 163
162 void ClearCache(JNIEnv* env, jobject obj, jboolean include_disk_files); 164 void ClearCache(JNIEnv* env, jobject obj, jboolean include_disk_files);
163 void SetPendingWebContentsForPopup(scoped_ptr<content::WebContents> pending); 165 void SetPendingWebContentsForPopup(scoped_ptr<content::WebContents> pending);
164 jint ReleasePopupAwContents(JNIEnv* env, jobject obj); 166 jint ReleasePopupAwContents(JNIEnv* env, jobject obj);
165 167
166 void ScrollTo(JNIEnv* env, jobject obj, jint xPix, jint yPix); 168 void ScrollTo(JNIEnv* env, jobject obj, jint x, jint y);
167 void SetDipScale(JNIEnv* env, jobject obj, jfloat dip_scale); 169 void SetDipScale(JNIEnv* env, jobject obj, jfloat dipScale);
aelias_OOO_until_Jul13 2013/09/24 22:03:19 nit: Chromium style is for the underscore, also xP
mkosiba (inactive) 2013/09/25 14:23:49 yes, accidental change, thanks for pointing it out
168 void SetDisplayedPageScaleFactor(JNIEnv* env, 170 void SetDisplayedPageScaleFactor(JNIEnv* env,
169 jobject obj, 171 jobject obj,
170 jfloat page_scale_factor); 172 jfloat page_scale_factor);
171 void SetFixedLayoutSize(JNIEnv* env, 173 void SetFixedLayoutSize(JNIEnv* env,
172 jobject obj, 174 jobject obj,
173 jint width_dip, 175 jint width_dip,
174 jint height_dip); 176 jint height_dip);
175 void SetSaveFormData(bool enabled); 177 void SetSaveFormData(bool enabled);
176 178
177 // Sets the java delegate 179 // Sets the java delegate
(...skipping 23 matching lines...) Expand all
201 std::list<OriginCallback> pending_geolocation_prompts_; 203 std::list<OriginCallback> pending_geolocation_prompts_;
202 204
203 DISALLOW_COPY_AND_ASSIGN(AwContents); 205 DISALLOW_COPY_AND_ASSIGN(AwContents);
204 }; 206 };
205 207
206 bool RegisterAwContents(JNIEnv* env); 208 bool RegisterAwContents(JNIEnv* env);
207 209
208 } // namespace android_webview 210 } // namespace android_webview
209 211
210 #endif // ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_ 212 #endif // ANDROID_WEBVIEW_NATIVE_AW_CONTENTS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698