Commit e47c5f09 authored by MozLando's avatar MozLando
Browse files

Merge #8239 



8239: Update GeckoView (Beta) to 81.0.20200825191644. r=Amejia481 a=pocmo

Follow-up from #8221. We got a new beta build and now we can update safely. :)

Co-authored-by: default avatarSebastian Kaspari <s.kaspari@gmail.com>
parents a4c3139e 481787c9

buildSrc/src/main/java/Gecko.kt

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

     * GeckoView Beta Version.

     */

    const val beta_version = "80.0.20200813191622"

    const val beta_version = "81.0.20200825191644"



    /**

     * GeckoView Release Version.

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

+4 −0
Original line number Diff line number Diff line
@@ -546,6 +546,10 @@ class GeckoEngine( 
                        if (cookieBehavior != value.cookiePolicy.id) {

                            cookieBehavior = value.cookiePolicy.id

                        }



                        if (cookiePurging != value.cookiePurging) {

                            setCookiePurging(value.cookiePurging)

                        }

                    }



                    defaultSettings?.trackingProtectionPolicy = value

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

+4 −0
Original line number Diff line number Diff line
@@ -701,6 +701,10 @@ class GeckoEngineSession( 
            notifyObservers { onFirstContentfulPaint() }

        }



        override fun onPaintStatusReset(session: GeckoSession) {

            notifyObservers { onPaintStatusReset() }

        }



        override fun onContextMenu(

            session: GeckoSession,

            screenX: Int,

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

+16 −2
Original line number Diff line number Diff line
@@ -156,7 +156,21 @@ class GeckoEngineView @JvmOverloads constructor( 
     * GeckoEngineSession) - since the previous one is no longer usable.

     */

    private fun rebind() {

        try {

            currentSession?.let { currentGeckoView.setSession(it.geckoSession) }

        } catch (e: IllegalArgumentException) {

            // This is to debug "Display not attached" crashes

            val otherActivityClassName =

                currentSession?.geckoSession?.accessibility?.view?.context?.javaClass?.simpleName

            val otherActivityClassHashcode =

                    currentSession?.geckoSession?.accessibility?.view?.context?.hashCode()

            val activityClassName = context.javaClass.simpleName

            val activityClassHashCode = context.hashCode()

            val msg = "REBIND: Current activity: $activityClassName hashcode " +

                    "$activityClassHashCode Other activity: $otherActivityClassName " +

                    "hashcode $otherActivityClassHashcode"

            throw IllegalArgumentException(msg, e)

        }

    }



    @Synchronized

components/browser/engine-gecko-beta/src/main/java/mozilla/components/browser/engine/gecko/ext/TrackingProtectionPolicy.kt

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ fun TrackingProtectionPolicy.toContentBlockingSetting( 
    enhancedTrackingProtectionLevel(getEtpLevel())

    antiTracking(getAntiTrackingPolicy())

    cookieBehavior(cookiePolicy.id)

    cookiePurging(cookiePurging)

    safeBrowsing(safeBrowsingPolicy.sumBy { it.id })

    strictSocialTrackingProtection(getStrictSocialTrackingProtection())

}.build()