Unverified Commit 4ec9dd3d authored by Matthew Finkel's avatar Matthew Finkel
Browse files

Revert "Bug 34439: Isolate Icon loader on Android" 

This reverts commit bff7eca5.
This reverts commit 698c81b9.
parent c98643cb

components/browser/engine-gecko-beta/src/main/java/mozilla/components/browser/engine/gecko/fetch/GeckoViewFetchClient.kt

+0 −1
Changes for components/browser/engine-gecko-beta/src/main/java/mozilla/components/browser/engine/gecko/fetch/GeckoViewFetchClient.kt: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -80,7 +80,6 @@ private fun Request.toWebRequest(): WebRequest = WebRequest.Builder(url) 
    .addHeadersFrom(this)

    .addBodyFrom(this)

    .cacheMode(if (useCaches) CACHE_MODE_DEFAULT else CACHE_MODE_RELOAD)

    .origin(origin)

    .build()



private fun WebRequest.Builder.addHeadersFrom(request: Request): WebRequest.Builder {

components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/fetch/GeckoViewFetchClient.kt

+0 −1
Changes for components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/fetch/GeckoViewFetchClient.kt: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -80,7 +80,6 @@ private fun Request.toWebRequest(): WebRequest = WebRequest.Builder(url) 
    .addHeadersFrom(this)

    .addBodyFrom(this)

    .cacheMode(if (useCaches) CACHE_MODE_DEFAULT else CACHE_MODE_RELOAD)

    .origin(origin)

    .build()



private fun WebRequest.Builder.addHeadersFrom(request: Request): WebRequest.Builder {

components/browser/icons/src/main/java/mozilla/components/browser/icons/loader/HttpIconLoader.kt

+1 −2
Changes for components/browser/icons/src/main/java/mozilla/components/browser/icons/loader/HttpIconLoader.kt: 1 added line, 2 removed lines.
Original line number Diff line number Diff line
@@ -51,8 +51,7 @@ class HttpIconLoader( 
            connectTimeout = Pair(CONNECT_TIMEOUT, TimeUnit.SECONDS),

            readTimeout = Pair(READ_TIMEOUT, TimeUnit.SECONDS),

            redirect = Request.Redirect.FOLLOW,

            useCaches = true,

            origin = request.url)

            useCaches = true)



        return try {

            val response = httpClient.fetch(downloadRequest)

components/concept/fetch/src/main/java/mozilla/components/concept/fetch/Request.kt

+1 −2
Changes for components/concept/fetch/src/main/java/mozilla/components/concept/fetch/Request.kt: 1 added line, 2 removed lines.
Original line number Diff line number Diff line
@@ -46,8 +46,7 @@ data class Request( 
    val body: Body? = null,

    val redirect: Redirect = Redirect.FOLLOW,

    val cookiePolicy: CookiePolicy = CookiePolicy.INCLUDE,

    val useCaches: Boolean = true,

    val origin: String? = null

    val useCaches: Boolean = true

) {

    /**

     * A [Body] to be send with the [Request].