diff options
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/native/DEPS | 3 | ||||
| -rw-r--r-- | android_webview/native/aw_settings.cc | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/android_webview/native/DEPS b/android_webview/native/DEPS index b45be10..bb16f7d 100644 --- a/android_webview/native/DEPS +++ b/android_webview/native/DEPS @@ -9,4 +9,7 @@ include_rules = [ "+components/navigation_interception", "+components/user_prefs", "+components/web_contents_delegate_android", + + # These should be burned down. http://crbug.com/237267 + "!third_party/WebKit/public/web/WebView.h", ] diff --git a/android_webview/native/aw_settings.cc b/android_webview/native/aw_settings.cc index 667f426..9295c00 100644 --- a/android_webview/native/aw_settings.cc +++ b/android_webview/native/aw_settings.cc @@ -14,6 +14,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/content_client.h" #include "jni/AwSettings_jni.h" +#include "third_party/WebKit/public/web/WebView.h" #include "webkit/common/user_agent/user_agent.h" #include "webkit/common/webpreferences.h" #include "webkit/glue/webkit_glue.h" @@ -114,8 +115,8 @@ void AwSettings::UpdateWebkitPreferencesLocked(JNIEnv* env, jobject obj) { render_view_host_ext->SetTextZoomLevel(0); } else { prefs.force_enable_zoom = false; - render_view_host_ext->SetTextZoomLevel(webkit_glue::ZoomFactorToZoomLevel( - text_size_percent / 100.0f)); + render_view_host_ext->SetTextZoomLevel( + WebKit::WebView::zoomFactorToZoomLevel(text_size_percent / 100.0f)); } prefs.standard_font_family_map[webkit_glue::kCommonScript] = |