diff options
| author | Steve Block <steveblock@google.com> | 2010-09-30 12:10:26 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-10-01 12:01:49 +0100 |
| commit | e3fbba10e78cdeea2757b306d02c2853ac0187ee (patch) | |
| tree | 302893eaf728ba52aa17582a20f979c60c61b168 | |
| parent | ad9d1f8f641a8800bcfcb19fbf988621229f0360 (diff) | |
| download | external_webkit-e3fbba10e78cdeea2757b306d02c2853ac0187ee.zip external_webkit-e3fbba10e78cdeea2757b306d02c2853ac0187ee.tar.gz external_webkit-e3fbba10e78cdeea2757b306d02c2853ac0187ee.tar.bz2 | |
Update AndroidURLRequestContextGetter to take a pointer to the getter function
This allows users of AndroidURLRequestContextGetter to instantiate a
URLRequestContext lazilly.
When used in AutoFill++, this means that when the URLRequestContext is
first initialized, the WebCore thread is set-up and the necessary
settings are available.
Also re-enables AutoFill++
The corresponding external/chromium change is
https://android-git.corp.google.com/g/71275
Bug: 3044989
Change-Id: I4b577f08717775bce5268f3f4b4f5fcf23e54536
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | CleanSpec.mk | 1 | ||||
| -rw-r--r-- | WebKit/android/WebCoreSupport/autofill/WebAutoFill.cpp | 2 |
3 files changed, 3 insertions, 2 deletions
@@ -100,7 +100,7 @@ endif # The default is on. Chrome HTTP stack must be used when Autofill # is turned on. ifneq ($(ENABLE_AUTOFILL),false) - ENABLE_AUTOFILL = false + ENABLE_AUTOFILL = true endif ifneq ($(HTTP_STACK),chrome) ENABLE_AUTOFILL = false diff --git a/CleanSpec.mk b/CleanSpec.mk index bdc598d..587af0f 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -65,6 +65,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libwebcore_int $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libwebcore_intermediates) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libwebcore_intermediates) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libwebcore_intermediates) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libwebcore_intermediates) # ************************************************ diff --git a/WebKit/android/WebCoreSupport/autofill/WebAutoFill.cpp b/WebKit/android/WebCoreSupport/autofill/WebAutoFill.cpp index f9fc954..aff1e2f 100644 --- a/WebKit/android/WebCoreSupport/autofill/WebAutoFill.cpp +++ b/WebKit/android/WebCoreSupport/autofill/WebAutoFill.cpp @@ -55,7 +55,7 @@ WebAutoFill::WebAutoFill() mFormManager = new FormManager(); mQueryId = 1; - AndroidURLRequestContextGetter::Get()->SetURLRequestContext(WebRequestContext::GetAndroidContext()); + AndroidURLRequestContextGetter::Get()->SetURLRequestContextGetterFunction(&WebRequestContext::GetAndroidContext); AndroidURLRequestContextGetter::Get()->SetIOThread(WebUrlLoaderClient::ioThread()); TabContents* tabContents = new TabContents(); mAutoFillManager = new AutoFillManager(tabContents); |