Bug 1502118 - Make FinderResult non-final for testing. r=snorp,esawin
authorAgi Sferro <agi@mozilla.com>
Mon, 17 Dec 2018 22:31:59 +0000
changeset 511001 4cd3b9cf8159f9b73cfb625dd105eb5cd259395a
parent 511000 0d938252d0ed11c83387e1501aee8ebac8df894a
child 511002 42f4f1c36ef6daf56fae1433db40a3116b3dfe9d
push id1953
push userffxbld-merge
push dateMon, 11 Mar 2019 12:10:20 +0000
treeherdermozilla-release@9c35dcbaa899 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssnorp, esawin
bugs1502118
milestone66.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1502118 - Make FinderResult non-final for testing. r=snorp,esawin This allows mocking for embedders. Depends on D13881 Differential Revision: https://phabricator.services.mozilla.com/D13882
mobile/android/geckoview/CHANGELOG.md
mobile/android/geckoview/api.txt
mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoSession.java
--- a/mobile/android/geckoview/CHANGELOG.md
+++ b/mobile/android/geckoview/CHANGELOG.md
@@ -20,13 +20,14 @@
 - Added `GeckoSession.LOAD_FLAGS_BYPASS_CLASSIFIER` to bypass the URI
   classifier.
 - Added a `protected` empty constructor to all field-only classes so that apps
   can mock these classes in tests.
 - Added `ContentDelegate.ContextElement` to extend the information passed to
   `ContentDelegate#onContextMenu`. Extended information includes the element's
   title and alt attributes.
 - Changed `ContentDelegate.ContextElement` TYPE_ constants to public access.
-  Changed `ContentDelegate.ContextElement` to non-final class.
+- Changed `ContentDelegate.ContextElement`, `GeckoSession.FinderResult` to
+  non-final class.
 - Update `CrashReporter.sendCrashReport()` to return the crash ID as a
   GeckoResult<String>.
 
-[api-version]: c9e474cac6732fc645b03868ad1fcbea10be7b9f
+[api-version]: bb945ae930ebf055f11821c685a6691faa7e5a3a
--- a/mobile/android/geckoview/api.txt
+++ b/mobile/android/geckoview/api.txt
@@ -338,17 +338,17 @@ package org.mozilla.geckoview {
     field public static final int TYPE_VIDEO = 2;
     field public final java.lang.String altText;
     field public final java.lang.String linkUri;
     field public final java.lang.String srcUri;
     field public final java.lang.String title;
     field public final int type;
   }
 
-  @android.support.annotation.AnyThread public static final class GeckoSession.FinderResult {
+  @android.support.annotation.AnyThread public static class GeckoSession.FinderResult {
     ctor protected FinderResult();
     field public final android.graphics.RectF clientRect;
     field public final int current;
     field public final int flags;
     field public final boolean found;
     field public final java.lang.String linkUri;
     field public final java.lang.String searchString;
     field public final int total;
--- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoSession.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoSession.java
@@ -1589,17 +1589,17 @@ public class GeckoSession implements Par
     public static final int FINDER_DISPLAY_DIM_PAGE = 1 << 1;
     /** Draw outlines around matching links. */
     public static final int FINDER_DISPLAY_DRAW_LINK_OUTLINE = 1 << 2;
 
     /**
      * Represent the result of a find-in-page operation.
      */
     @AnyThread
-    public static final class FinderResult {
+    public static class FinderResult {
         /** Whether a match was found. */
         public final boolean found;
         /** Whether the search wrapped around the top or bottom of the page. */
         public final boolean wrapped;
         /** Ordinal number of the current match starting from 1, or 0 if no match. */
         public final int current;
         /** Total number of matches found so far, or -1 if unknown. */
         public final int total;