diff options
| author | Steve Block <steveblock@google.com> | 2012-02-16 17:33:50 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2012-02-22 17:09:24 +0000 |
| commit | 4bcd50196a7fe4c0c909ce6a7cfac6a808336611 (patch) | |
| tree | d196d6ed654433d3953cbf9476e76f7db8394ef3 /Source/WebKit/android/jni/WebSettings.cpp | |
| parent | fa20d5d7a15b724e0209ba319750249dcd540402 (diff) | |
| download | external_webkit-4bcd50196a7fe4c0c909ce6a7cfac6a808336611.zip external_webkit-4bcd50196a7fe4c0c909ce6a7cfac6a808336611.tar.gz external_webkit-4bcd50196a7fe4c0c909ce6a7cfac6a808336611.tar.bz2 | |
Drop support for Android HTTP stack
All future releases will use the Chromium HTTP stack and maintaining two HTTP
stacks adds maintenance overhead. The Chromium HTTP stack requires V8, but we
now use V8 in all build targets (b/5495373), so we can safely drop the Android
HTTP stack.
See corresponding framework change
https://android-git.corp.google.com/g/166325.
Bug: 5495616
Change-Id: I41117b6750fbc1c84cbd4a5951b0d1a457354f93
Diffstat (limited to 'Source/WebKit/android/jni/WebSettings.cpp')
| -rw-r--r-- | Source/WebKit/android/jni/WebSettings.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/Source/WebKit/android/jni/WebSettings.cpp b/Source/WebKit/android/jni/WebSettings.cpp index 9f7c2fa..281e8ed 100644 --- a/Source/WebKit/android/jni/WebSettings.cpp +++ b/Source/WebKit/android/jni/WebSettings.cpp @@ -144,9 +144,7 @@ struct FieldIds { mAutoFillProfilePhoneNumber = env->GetFieldID(autoFillProfileClass, "mPhoneNumber", "Ljava/lang/String;"); env->DeleteLocalRef(autoFillProfileClass); #endif -#if USE(CHROME_NETWORK_STACK) mOverrideCacheMode = env->GetFieldID(clazz, "mOverrideCacheMode", "I"); -#endif ALOG_ASSERT(mLayoutAlgorithm, "Could not find field mLayoutAlgorithm"); ALOG_ASSERT(mTextSize, "Could not find field mTextSize"); @@ -265,9 +263,7 @@ struct FieldIds { jfieldID mAutoFillProfileCountry; jfieldID mAutoFillProfilePhoneNumber; #endif -#if USE(CHROME_NETWORK_STACK) jfieldID mOverrideCacheMode; -#endif }; static struct FieldIds* gFieldIds; @@ -367,7 +363,6 @@ public: str = (jstring)env->GetObjectField(obj, gFieldIds->mUserAgent); WebFrame::getWebFrame(pFrame)->setUserAgent(jstringToWtfString(env, str)); -#if USE(CHROME_NETWORK_STACK) WebViewCore::getWebViewCore(pFrame->view())->setWebRequestContextUserAgent(); jint cacheMode = env->GetIntField(obj, gFieldIds->mOverrideCacheMode); @@ -375,7 +370,6 @@ public: str = (jstring)env->GetObjectField(obj, gFieldIds->mAcceptLanguage); WebRequestContext::setAcceptLanguage(jstringToWtfString(env, str)); -#endif jint size = env->GetIntField(obj, gFieldIds->mMinimumFontSize); s->setMinimumFontSize(size); |