Commit 737d54db authored by MozLando's avatar MozLando
Browse files

Merge #6181 



6181: Closes #6180: Update browser-engine-gecko to GeckoView 74 RC2. r=jonalmeida a=pocmo

The actual merge day is next week. But we do already have a stable RC build for GeckoView 74 and therefore would like to update `browser-engine-gecko` already to ship it with Focus. `browser-engine-beta` and `browser-engine-nightly` will be updated next week after merge day.

Co-authored-by: default avatarSebastian <s.kaspari@gmail.com>
parents 9a7cca9e 61e3c87a

buildSrc/src/main/java/Gecko.kt

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ internal object GeckoVersions { 
    /**

     * GeckoView Release Version.

     */

    const val release_version = "73.0.20200217142647"

    const val release_version = "74.0.20200305014626"

}



@Suppress("MaxLineLength")

components/browser/engine-gecko/docs/metrics.md

+5 −2
Original line number Diff line number Diff line
@@ -20,11 +20,13 @@ The following metrics are added to the ping: 


| Name | Type | Description | Data reviews | Extras | Expiration |

| --- | --- | --- | --- | --- | --- |

| geckoview.build_id |[string](https://mozilla.github.io/glean/book/user/metrics/string.html) |The Buildid of the Gecko engine, example: 20200205124310  |[1](https://bugzilla.mozilla.org/show_bug.cgi?id=1611240#c2)||never |

| geckoview.document_site_origins |[custom_distribution](https://mozilla.github.io/glean/book/user/metrics/custom_distribution.html) |When a document is loaded, report the number of [site origins](https://searchfox.org/ mozilla-central/rev/ 3300072e993ae05d50d5c63d815260367eaf9179/ caps/nsIPrincipal.idl#264) of the entire browser if it has been at least 5 minutes since last time we collect this data.  |[1](https://bugzilla.mozilla.org/show_bug.cgi?id=1589700#c5)||never |

| geckoview.page_load_progress_time |[timing_distribution](https://mozilla.github.io/glean/book/user/metrics/timing_distribution.html) |Time between page load progress starts (0) and completion (100).  |[1](https://bugzilla.mozilla.org/show_bug.cgi?id=1580077#c10)||never |

| geckoview.page_load_time |[timing_distribution](https://mozilla.github.io/glean/book/user/metrics/timing_distribution.html) |The time taken to load a page. This includes all static contents, no dynamic content. Loading of about: pages is not counted.  |[1](https://bugzilla.mozilla.org/show_bug.cgi?id=1584109#c1)||never |

| geckoview.page_reload_time |[timing_distribution](https://mozilla.github.io/glean/book/user/metrics/timing_distribution.html) |Time taken to reload a page. This includes all static contents, no dynamic content. Loading of about: pages is not counted.  |[1](https://bugzilla.mozilla.org/show_bug.cgi?id=1580077#c10)||never |

| geckoview.startup_runtime |[timing_distribution](https://mozilla.github.io/glean/book/user/metrics/timing_distribution.html) |The time taken to initialize GeckoRuntime.  |[1](https://bugzilla.mozilla.org/show_bug.cgi?id=1584109#c1)||never |

| geckoview.version |[string](https://mozilla.github.io/glean/book/user/metrics/string.html) |The version of the Gecko engine, example: 74.0a1  |[1](https://bugzilla.mozilla.org/show_bug.cgi?id=1611240#c2)||never |

| gfx.adapter.primary.description |[string](https://mozilla.github.io/glean/book/user/metrics/string.html) |Long form description of the Graphics adapter  |[1](https://bugzilla.mozilla.org/show_bug.cgi?id=1594145#c4)||never |

| gfx.adapter.primary.device_id |[string](https://mozilla.github.io/glean/book/user/metrics/string.html) |Graphics adapter device identification  |[1](https://bugzilla.mozilla.org/show_bug.cgi?id=1594145#c4)||never |

| gfx.adapter.primary.device_id_last_seen |[string](https://mozilla.github.io/glean/book/user/metrics/string.html) |Graphics adapter device identification last seen This is a temporary workaround for some early telemetry system issues. See Bug 1601091 for more information  |[1](https://bugzilla.mozilla.org/show_bug.cgi?id=1594145#c4)||2020-04-01 |
@@ -51,8 +53,9 @@ The following metrics are added to the ping: 
| gfx.display.count |[quantity](https://mozilla.github.io/glean/book/user/metrics/quantity.html) |Amount of displays connected to the device  |[1](https://bugzilla.mozilla.org/show_bug.cgi?id=1594145#c4)||never |

| gfx.display.primary_height |[quantity](https://mozilla.github.io/glean/book/user/metrics/quantity.html) |Height of the primary display, takes device rotation into account.  |[1](https://bugzilla.mozilla.org/show_bug.cgi?id=1594145#c4)||never |

| gfx.display.primary_width |[quantity](https://mozilla.github.io/glean/book/user/metrics/quantity.html) |Width of the primary display, takes device rotation into account.  |[1](https://bugzilla.mozilla.org/show_bug.cgi?id=1594145#c4)||never |

| gfx.status.compositor |[string](https://mozilla.github.io/glean/book/user/metrics/string.html) |Name of the graphics compositor in use. possible values are "opengl, d3d11, client, webrender or basic"  |[1](https://bugzilla.mozilla.org/show_bug.cgi?id=1594145#c4)||never |

| gfx.status.compositor_last_seen |[string](https://mozilla.github.io/glean/book/user/metrics/string.html) |Name of the graphics compositor last seen in use. possible values are "opengl, d3d11, client, webrender or basic" This is a temporary workaround for some early telemetry system issues. See Bug 1601091 for more information  |[1](https://bugzilla.mozilla.org/show_bug.cgi?id=1594145#c4)||2020-04-01 |

| gfx.scroll_present_latency |[timing_distribution](https://mozilla.github.io/glean/book/user/metrics/timing_distribution.html) |Time between receiving a scroll event on the event loop and compositing its result onto the screen (ms).  |[1](https://bugzilla.mozilla.org/show_bug.cgi?id=1604818#c4)||never |

| gfx.status.compositor |[string](https://mozilla.github.io/glean/book/user/metrics/string.html) |Name of the graphics compositor in use. Possible values are "opengl, d3d11, client, webrender or basic"  |[1](https://bugzilla.mozilla.org/show_bug.cgi?id=1594145#c4)||never |

| gfx.status.compositor_last_seen |[string](https://mozilla.github.io/glean/book/user/metrics/string.html) |Name of the graphics compositor last seen in use. Possible values are "opengl, d3d11, client, webrender or basic" This is a temporary workaround for some early telemetry system issues. See Bug 1601091 for more information  |[1](https://bugzilla.mozilla.org/show_bug.cgi?id=1594145#c4)||2020-04-01 |

| gfx.status.framebuild_time |[timing_distribution](https://mozilla.github.io/glean/book/user/metrics/timing_distribution.html) |The time taken to build a webrender frame. This involves calculating the visibility of primitives, requesting resources, and building the render passes which will be used to render the frame.  |[1](https://bugzilla.mozilla.org/show_bug.cgi?id=1584109#c1)||never |

| gfx.status.headless |[boolean](https://mozilla.github.io/glean/book/user/metrics/boolean.html) |Boolean indicated whether graphics is running in headless (no display) mode  |[1](https://bugzilla.mozilla.org/show_bug.cgi?id=1594145#c4)||never |

| gfx.status.sceneswap_time |[timing_distribution](https://mozilla.github.io/glean/book/user/metrics/timing_distribution.html) |The time taken to do a webrender scene swap. This is book-keeping that APZ must perform once webrender has built a new scene.  |[1](https://bugzilla.mozilla.org/show_bug.cgi?id=1584109#c1)||never |

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

+50 −12
Original line number Diff line number Diff line
@@ -239,9 +239,20 @@ class GeckoEngine( 
        onSuccess: (WebExtension?) -> Unit,

        onError: (String, Throwable) -> Unit

    ) {

        // GeckoView support for updating extensions hasn't been implemented yet

        // TODO https://bugzilla.mozilla.org/show_bug.cgi?id=1599581

        onSuccess(null)

        runtime.webExtensionController.update((extension as GeckoWebExtension).nativeExtension).then({ geckoExtension ->

            val updatedExtension = if (geckoExtension != null) {

                GeckoWebExtension(geckoExtension, runtime.webExtensionController).also {

                    it.registerActionHandler(webExtensionActionHandler)

                }

            } else {

                null

            }

            onSuccess(updatedExtension)

            GeckoResult<Void>()

        }, { throwable ->

            onError(extension.id, throwable)

            GeckoResult<Void>()

        })

    }



    /**
@@ -303,9 +314,24 @@ class GeckoEngine( 
                    GeckoResult.DENY

                }

            }

            // TODO implement onUpdatePrompt:

            // https://bugzilla.mozilla.org/show_bug.cgi?id=1599581

            // https://github.com/mozilla-mobile/android-components/issues/5143



            override fun onUpdatePrompt(

                current: org.mozilla.geckoview.WebExtension,

                updated: org.mozilla.geckoview.WebExtension,

                newPermissions: Array<out String>,

                newOrigins: Array<out String>

            ): GeckoResult<AllowOrDeny>? {

                // NB: We don't have a user flow for handling updated origins so we ignore them for now.

                val result = GeckoResult<AllowOrDeny>()

                webExtensionDelegate.onUpdatePermissionRequest(

                    GeckoWebExtension(current, runtime.webExtensionController),

                    GeckoWebExtension(updated, runtime.webExtensionController),

                    newPermissions.toList()

                ) {

                    allow -> if (allow) result.complete(AllowOrDeny.ALLOW) else result.complete(AllowOrDeny.DENY)

                }

                return result

            }

        }



        runtime.webExtensionController.promptDelegate = promptDelegate
@@ -339,9 +365,15 @@ class GeckoEngine( 
        onSuccess: (WebExtension) -> Unit,

        onError: (Throwable) -> Unit

    ) {

        // TODO https://bugzilla.mozilla.org/show_bug.cgi?id=1599585

        webExtensionDelegate?.onEnabled(extension)

        onSuccess(extension)

        runtime.webExtensionController.enable((extension as GeckoWebExtension).nativeExtension, source.id).then({

            val enabledExtension = GeckoWebExtension(it!!, runtime.webExtensionController)

            webExtensionDelegate?.onEnabled(enabledExtension)

            onSuccess(enabledExtension)

            GeckoResult<Void>()

        }, { throwable ->

            onError(throwable)

            GeckoResult<Void>()

        })

    }



    /**
@@ -353,9 +385,15 @@ class GeckoEngine( 
        onSuccess: (WebExtension) -> Unit,

        onError: (Throwable) -> Unit

    ) {

        // TODO https://bugzilla.mozilla.org/show_bug.cgi?id=1599585

        webExtensionDelegate?.onDisabled(extension)

        onSuccess(extension)

        runtime.webExtensionController.disable((extension as GeckoWebExtension).nativeExtension, source.id).then({

            val disabledExtension = GeckoWebExtension(it!!, runtime.webExtensionController)

            webExtensionDelegate?.onDisabled(disabledExtension)

            onSuccess(disabledExtension)

            GeckoResult<Void>()

        }, { throwable ->

            onError(throwable)

            GeckoResult<Void>()

        })

    }



    /**

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

+9 −1
Original line number Diff line number Diff line
@@ -313,6 +313,13 @@ class GeckoEngineSession( 
        }

    }



    /**

     * See [EngineSession.markActiveForWebExtensions].

     */

    override fun markActiveForWebExtensions(active: Boolean) {

        runtime.webExtensionController.setTabActive(geckoSession, active)

    }



    /**

     * See [EngineSession.close].

     */
@@ -446,7 +453,8 @@ class GeckoEngineSession( 
            }



            notifyObservers {

                onSecurityChange(securityInfo.isSecure, securityInfo.host, securityInfo.issuerOrganization)

                // TODO provide full certificate info: https://github.com/mozilla-mobile/android-components/issues/5557

                onSecurityChange(securityInfo.isSecure, securityInfo.host, securityInfo.certificate?.issuerDN?.name)

            }

        }

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

+1 −2
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ import mozilla.components.browser.engine.gecko.selection.GeckoSelectionActionDel 
import mozilla.components.concept.engine.EngineSession

import mozilla.components.concept.engine.EngineView

import mozilla.components.concept.engine.permission.PermissionRequest

import org.mozilla.geckoview.BasicSelectionActionDelegate

import mozilla.components.concept.engine.selection.SelectionActionDelegate

import org.mozilla.geckoview.BasicSelectionActionDelegate

import org.mozilla.geckoview.GeckoResult

import java.lang.IllegalStateException
@@ -108,7 +108,6 @@ class GeckoEngineView @JvmOverloads constructor( 


            try {

                currentGeckoView.setSession(internalSession.geckoSession)



                currentSelection = GeckoSelectionActionDelegate.maybeCreate(context, selectionActionDelegate)

                    ?: internalSession.geckoSession.selectionActionDelegate as? BasicSelectionActionDelegate

                internalSession.geckoSession.selectionActionDelegate = currentSelection