Use an atom for isDisplayed when driving a W3C remote end.

Because the spec doesn't include this as a valid end point.

Author: shs96c

java/client/src/org/openqa/selenium/remote/BUCK

@@ -117,6 +117,7 @@ java_library(name = 'remote-lib',
   ]),
   resources = [
     ':get-attribute',
+    ':is-displayed',
   ],
   deps = [
     ':api',
@@ -134,3 +135,9 @@ export_file(
   src = '//javascript/webdriver/atoms:getAttribute',
   out = 'getAttribute.js',
 )
+
+export_file(
+  name = 'is-displayed',
+  src = '//javascript/atoms/fragments:is-displayed',
+  out = 'isDisplayed.js',
+)

java/client/src/org/openqa/selenium/remote/http/AbstractHttpCommandCodec.java

@@ -81,7 +81,6 @@
 import static org.openqa.selenium.remote.DriverCommand.IME_IS_ACTIVATED;
 import static org.openqa.selenium.remote.DriverCommand.IMPLICITLY_WAIT;
 import static org.openqa.selenium.remote.DriverCommand.IS_BROWSER_ONLINE;
-import static org.openqa.selenium.remote.DriverCommand.IS_ELEMENT_DISPLAYED;
 import static org.openqa.selenium.remote.DriverCommand.IS_ELEMENT_ENABLED;
 import static org.openqa.selenium.remote.DriverCommand.IS_ELEMENT_SELECTED;
 import static org.openqa.selenium.remote.DriverCommand.MOUSE_DOWN;
@@ -197,7 +196,6 @@ public AbstractHttpCommandCodec() {
     defineCommand(
         GET_ELEMENT_VALUE_OF_CSS_PROPERTY,
         get("/session/:sessionId/element/:id/css/:propertyName"));
-    defineCommand(IS_ELEMENT_DISPLAYED, get("/session/:sessionId/element/:id/displayed"));
     defineCommand(FIND_CHILD_ELEMENT, post("/session/:sessionId/element/:id/element"));
     defineCommand(FIND_CHILD_ELEMENTS, post("/session/:sessionId/element/:id/elements"));
     defineCommand(IS_ELEMENT_ENABLED, get("/session/:sessionId/element/:id/enabled"));

java/client/src/org/openqa/selenium/remote/http/JsonHttpCommandCodec.java

@@ -29,6 +29,7 @@
 import static org.openqa.selenium.remote.DriverCommand.GET_ELEMENT_LOCATION_ONCE_SCROLLED_INTO_VIEW;
 import static org.openqa.selenium.remote.DriverCommand.GET_PAGE_SOURCE;
 import static org.openqa.selenium.remote.DriverCommand.GET_WINDOW_HANDLES;
+import static org.openqa.selenium.remote.DriverCommand.IS_ELEMENT_DISPLAYED;
 import static org.openqa.selenium.remote.DriverCommand.MAXIMIZE_CURRENT_WINDOW;
 import static org.openqa.selenium.remote.DriverCommand.SET_ALERT_VALUE;
 import static org.openqa.selenium.remote.DriverCommand.SET_CURRENT_WINDOW_POSITION;
@@ -52,6 +53,7 @@ public class JsonHttpCommandCodec extends AbstractHttpCommandCodec {
   public JsonHttpCommandCodec() {
     defineCommand(GET_ELEMENT_ATTRIBUTE, get("/session/:sessionId/element/:id/attribute/:name"));
     defineCommand(GET_ELEMENT_LOCATION_ONCE_SCROLLED_INTO_VIEW, get("/session/:sessionId/element/:id/location_in_view"));
+    defineCommand(IS_ELEMENT_DISPLAYED, get("/session/:sessionId/element/:id/displayed"));
     defineCommand(SUBMIT_ELEMENT, post("/session/:sessionId/element/:id/submit"));
 
     defineCommand(EXECUTE_SCRIPT, post("/session/:sessionId/execute"));

java/client/src/org/openqa/selenium/remote/http/W3CHttpCommandCodec.java

@@ -33,6 +33,7 @@
 import static org.openqa.selenium.remote.DriverCommand.GET_ELEMENT_LOCATION_ONCE_SCROLLED_INTO_VIEW;
 import static org.openqa.selenium.remote.DriverCommand.GET_PAGE_SOURCE;
 import static org.openqa.selenium.remote.DriverCommand.GET_WINDOW_HANDLES;
+import static org.openqa.selenium.remote.DriverCommand.IS_ELEMENT_DISPLAYED;
 import static org.openqa.selenium.remote.DriverCommand.MAXIMIZE_CURRENT_WINDOW;
 import static org.openqa.selenium.remote.DriverCommand.SET_ALERT_VALUE;
 import static org.openqa.selenium.remote.DriverCommand.SET_CURRENT_WINDOW_POSITION;
@@ -63,6 +64,7 @@ public class W3CHttpCommandCodec extends AbstractHttpCommandCodec {
   public W3CHttpCommandCodec() {
     alias(GET_ELEMENT_ATTRIBUTE, EXECUTE_SCRIPT);
     alias(GET_ELEMENT_LOCATION_ONCE_SCROLLED_INTO_VIEW, EXECUTE_SCRIPT);
+    alias(IS_ELEMENT_DISPLAYED, EXECUTE_SCRIPT);
     alias(SUBMIT_ELEMENT, EXECUTE_SCRIPT);
 
     defineCommand(EXECUTE_SCRIPT, post("/session/:sessionId/execute/sync"));
@@ -134,18 +136,10 @@ public W3CHttpCommandCodec() {
 
       case GET_ELEMENT_ATTRIBUTE:
         // Read the atom, wrap it, execute it.
-        try {
-          String scriptName = "/org/openqa/selenium/remote/getAttribute.js";
-          URL url = getClass().getResource(scriptName);
-
-          String rawFunction = Resources.toString(url, Charsets.UTF_8);
-          String script = String.format(
-            "return (%s).apply(null, arguments);",
-            rawFunction);
-          return toScript(script, asElement(parameters.get("id")), parameters.get("name"));
-        } catch (IOException | NullPointerException e) {
-          throw new WebDriverException(e);
-        }
+        return executeAtom(
+          "getAttribute.js",
+          asElement(parameters.get("id")),
+          parameters.get("name"));
 
       case GET_ELEMENT_LOCATION_ONCE_SCROLLED_INTO_VIEW:
         return toScript(
@@ -161,6 +155,9 @@ public W3CHttpCommandCodec() {
       case GET_CURRENT_WINDOW_POSITION:
         return toScript("return {x: window.screenX, y: window.screenY}");
 
+      case IS_ELEMENT_DISPLAYED:
+        return executeAtom("isDisplayed.js", asElement(parameters.get("id")));
+
       case SET_CURRENT_WINDOW_POSITION:
         return toScript(
           "window.screenX = arguments[0]; window.screenY = arguments[1]",
@@ -184,6 +181,21 @@ public W3CHttpCommandCodec() {
     }
   }
 
+  private Map<String, ?> executeAtom(String atomFileName, Object... args) {
+    try {
+      String scriptName = "/org/openqa/selenium/remote/" + atomFileName;
+      URL url = getClass().getResource(scriptName);
+
+      String rawFunction = Resources.toString(url, Charsets.UTF_8);
+      String script = String.format(
+        "return (%s).apply(null, arguments);",
+        rawFunction);
+      return toScript(script, args);
+    } catch (IOException | NullPointerException e) {
+      throw new WebDriverException(e);
+    }
+  }
+
   private Map<String, ?> toScript(String script, Object... args) {
     // Escape the quote marks
     script = script.replaceAll("\"", "\\\"");

javascript/atoms/fragments/BUCK

@@ -17,3 +17,13 @@ js_fragment(name = 'execute_script',
   ],
 )
 
+js_fragment(name = 'is-displayed',
+  function = 'bot.dom.isShown',
+  module = 'bot.dom',
+  deps = [
+    '//javascript/atoms:dom',
+  ],
+  visibility = [
+    '//java/client/src/org/openqa/selenium/remote:is-displayed',
+  ],
+)