Bug 1509266 - [2.0] Update onContextMenu delegate implementations. r=snorp

Differential Revision: https://phabricator.services.mozilla.com/D12968

--HG--
extra : moz-landing-system : lando

mobile/android/base/java/org/mozilla/gecko/GeckoApp.java

@@ -899,9 +899,9 @@ public abstract class GeckoApp extends GeckoActivity
     }
 
     @Override
-    public void onContextMenu(final GeckoSession session, final int screenX,
-                              final int screenY, final String uri,
-                              int elementType, final String elementSrc) {
+    public void onContextMenu(final GeckoSession session,
+                              final int screenX, final int screenY,
+                              final GeckoSession.ContentDelegate.ContextElement element) {
     }
 
     @Override

mobile/android/base/java/org/mozilla/gecko/customtabs/CustomTabsActivity.java

@@ -695,11 +695,12 @@ public class CustomTabsActivity extends AppCompatActivity
     }
 
     @Override
-    public void onContextMenu(GeckoSession session, int screenX, int screenY,
-                              final String uri, int elementType,
-                              final String elementSrc) {
-
-        final String content = uri != null ? uri : elementSrc != null ? elementSrc : "";
+    public void onContextMenu(final GeckoSession session,
+                              int screenX, int screenY,
+                              final ContextElement element) {
+        final String content = element.linkUri != null
+                               ? element.linkUri
+                               : element.srcUri != null ? element.srcUri : "";
         final Uri validUri = WebApps.getValidURL(content);
         if (validUri == null) {
             return;

mobile/android/base/java/org/mozilla/gecko/webapps/WebAppActivity.java

@@ -352,9 +352,12 @@ public class WebAppActivity extends AppCompatActivity
     }
 
     @Override // GeckoSession.ContentDelegate
-    public void onContextMenu(GeckoSession session, int screenX, int screenY,
-                              String uri, int elementType, String elementSrc) {
-        final String content = uri != null ? uri : elementSrc != null ? elementSrc : "";
+    public void onContextMenu(final GeckoSession session,
+                              int screenX, int screenY,
+                              final ContextElement element) {
+        final String content = element.linkUri != null
+                               ? element.linkUri
+                               : element.srcUri != null ? element.srcUri : "";
         final Uri validUri = WebApps.getValidURL(content);
         if (validUri == null) {
             return;

mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/TestRunnerActivity.java

@@ -94,7 +94,8 @@ public class TestRunnerActivity extends Activity {
         }
 
         @Override
-        public void onContextMenu(GeckoSession session, int screenX, int screenY, String uri, int elementType, String elementSrc) {
+        public void onContextMenu(GeckoSession session, int screenX, int screenY,
+                                  ContextElement element) {
 
         }
 

mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/util/Callbacks.kt

@@ -9,6 +9,7 @@ import org.mozilla.geckoview.AllowOrDeny
 import org.mozilla.geckoview.GeckoResponse
 import org.mozilla.geckoview.GeckoResult
 import org.mozilla.geckoview.GeckoSession
+import org.mozilla.geckoview.GeckoSession.ContentDelegate.ContextElement
 import org.mozilla.geckoview.GeckoSession.NavigationDelegate.LoadRequest
 import org.mozilla.geckoview.MediaElement
 import org.mozilla.geckoview.WebRequestError
@@ -38,7 +39,9 @@ class Callbacks private constructor() {
         override fun onFullScreen(session: GeckoSession, fullScreen: Boolean) {
         }
 
-        override fun onContextMenu(session: GeckoSession, screenX: Int, screenY: Int, uri: String, elementType: Int, elementSrc: String) {
+        override fun onContextMenu(session: GeckoSession,
+                                   screenX: Int, screenY: Int,
+                                   element: ContextElement) {
         }
 
         override fun onExternalResponse(session: GeckoSession, response: GeckoSession.WebResponseInfo) {

mobile/android/geckoview_example/src/main/java/org/mozilla/geckoview_example/GeckoViewActivity.java

@@ -476,12 +476,16 @@ public class GeckoViewActivity extends AppCompatActivity {
         }
 
         @Override
-        public void onContextMenu(GeckoSession session, int screenX, int screenY,
-                                  String uri, int elementType, String elementSrc) {
+        public void onContextMenu(final GeckoSession session,
+                                  int screenX, int screenY,
+                                  final ContextElement element) {
             Log.d(LOGTAG, "onContextMenu screenX=" + screenX +
-                          " screenY=" + screenY + " uri=" + uri +
-                          " elementType=" + elementType +
-                          " elementSrc=" + elementSrc);
+                          " screenY=" + screenY +
+                          " type=" + element.type +
+                          " linkUri=" + element.linkUri +
+                          " title=" + element.title +
+                          " alt=" + element.altText +
+                          " srcUri=" + element.srcUri);
         }
 
         @Override