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

Unified Diff: android_webview/java/src/org/chromium/android_webview/AwContents.java

Issue 12217134: [Android WebView] Implement WebSettings.{get|set}LoadWithOverviewMode (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Really get rid of render_view_impl.cc change Created 7 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: android_webview/java/src/org/chromium/android_webview/AwContents.java
diff --git a/android_webview/java/src/org/chromium/android_webview/AwContents.java b/android_webview/java/src/org/chromium/android_webview/AwContents.java
index adf23f92125b197157aaf82feda779bbee721b9c..40d367efaa6eccb57e83f98a44ff34d07e7b2ee6 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwContents.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java
@@ -265,7 +265,7 @@ public class AwContents {
mContentViewCore.setContentSizeChangeListener(mLayoutSizer);
mContentsClient.installWebContentsObserver(mContentViewCore);
- mSettings = new AwSettings(mContentViewCore.getContext(), nativeWebContents);
+ mSettings = new AwSettings(this, mContentViewCore.getContext(), nativeWebContents);
setIoThreadClient(new IoThreadClientImpl());
setInterceptNavigationDelegate(new InterceptNavigationDelegateImpl());
@@ -675,6 +675,10 @@ public class AwContents {
msg.sendToTarget();
}
+ public void resetScrollAndScaleState() {
benm (inactive) 2013/02/25 12:37:04 does this need to be public?
mnaganov (inactive) 2013/02/25 12:59:23 After addressing your second comment, now it reall
+ nativeResetScrollAndScaleState(mNativeAwContents);
+ }
+
//--------------------------------------------------------------------------------------------
// View and ViewGroup method implementations
//--------------------------------------------------------------------------------------------
@@ -1071,6 +1075,8 @@ public class AwContents {
private native void nativeSetWebContents(int nativeAwContents, int nativeNewWebContents);
private native void nativeFocusFirstNode(int nativeAwContents);
+ private native void nativeResetScrollAndScaleState(int nativeAwContents);
+
private native boolean nativeDrawSW(int nativeAwContents, Canvas canvas, int clipX, int clipY,
int clipW, int clipH);
private native int nativeGetAwDrawGLViewContext(int nativeAwContents);

Powered by Google App Engine
This is Rietveld 408576698