3 files changed, 61 insertions, 6 deletions
diff --git a/components/script/dom/bindings/conversions.rs b/components/script/dom/bindings/conversions.rs
index 17f72956ca1..c84adf64dbb 100644
--- a/components/script/dom/bindings/conversions.rs
+++ b/components/script/dom/bindings/conversions.rs
@@ -60,7 +60,7 @@ use js::jsapi::{
 };
 use js::jsapi::{JS_NewStringCopyN, JS_StringHasLatin1Chars};
 use js::jsval::{ObjectValue, StringValue, UndefinedValue};
-use js::rust::wrappers::{JS_GetProperty, JS_IsArrayObject};
+use js::rust::wrappers::{JS_GetProperty, JS_HasProperty, JS_IsArrayObject};
 use js::rust::{get_object_class, is_dom_class, is_dom_object, maybe_wrap_value, ToString};
 use js::rust::{HandleId, HandleObject, HandleValue, MutableHandleValue};
 use num_traits::Float;
@@ -596,11 +596,18 @@ pub unsafe fn get_property_jsval(
         Ok(cname) => cname,
         Err(_) => return Ok(()),
     };
-    JS_GetProperty(cx, object, cname.as_ptr(), rval);
-    if JS_IsExceptionPending(cx) {
-        return Err(Error::JSFailed);
+    let mut found = false;
+    if JS_HasProperty(cx, object, cname.as_ptr(), &mut found) && found {
+        JS_GetProperty(cx, object, cname.as_ptr(), rval);
+        if JS_IsExceptionPending(cx) {
+            return Err(Error::JSFailed);
+        }
+        Ok(())
+    } else if JS_IsExceptionPending(cx) {
+        Err(Error::JSFailed)
+    } else {
+        Ok(())
     }
-    Ok(())
 }
 
 /// Get a property from a JS object, and convert it to a Rust value.
diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs
index 8193c9b7ace..0ceed35db57 100644
--- a/components/script/script_thread.rs
+++ b/components/script/script_thread.rs
@@ -2157,6 +2157,15 @@ impl ScriptThread {
                     reply,
                 )
             },
+            WebDriverScriptCommand::GetElementProperty(node_id, name, reply) => {
+                webdriver_handlers::handle_get_property(
+                    &*documents,
+                    pipeline_id,
+                    node_id,
+                    name,
+                    reply,
+                )
+            },
             WebDriverScriptCommand::GetElementCSS(node_id, name, reply) => {
                 webdriver_handlers::handle_get_css(&*documents, pipeline_id, node_id, name, reply)
             },
diff --git a/components/script/webdriver_handlers.rs b/components/script/webdriver_handlers.rs
index 3871b7a6ef5..ab08c0efe7d 100644
--- a/components/script/webdriver_handlers.rs
+++ b/components/script/webdriver_handlers.rs
@@ -12,9 +12,11 @@ use crate::dom::bindings::codegen::Bindings::NodeBinding::NodeMethods;
 use crate::dom::bindings::codegen::Bindings::WindowBinding::WindowMethods;
 use crate::dom::bindings::codegen::Bindings::XMLSerializerBinding::XMLSerializerMethods;
 use crate::dom::bindings::conversions::{
-    ConversionResult, FromJSValConvertible, StringificationBehavior,
+    get_property_jsval, ConversionResult, FromJSValConvertible, StringificationBehavior,
 };
+use crate::dom::bindings::error::throw_dom_exception;
 use crate::dom::bindings::inheritance::Castable;
+use crate::dom::bindings::reflector::DomObject;
 use crate::dom::bindings::root::DomRoot;
 use crate::dom::bindings::str::DOMString;
 use crate::dom::element::Element;
@@ -710,6 +712,43 @@ pub fn handle_get_attribute(
         .unwrap();
 }
 
+#[allow(unsafe_code)]
+pub fn handle_get_property(
+    documents: &Documents,
+    pipeline: PipelineId,
+    node_id: String,
+    name: String,
+    reply: IpcSender<Result<WebDriverJSValue, ()>>,
+) {
+    reply
+        .send(match find_node_by_unique_id(documents, pipeline, node_id) {
+            Some(node) => {
+                let cx = documents.find_document(pipeline).unwrap().window().get_cx();
+
+                rooted!(in(cx) let mut property = UndefinedValue());
+                match unsafe {
+                    get_property_jsval(
+                        cx,
+                        node.reflector().get_jsobject(),
+                        &name,
+                        property.handle_mut(),
+                    )
+                } {
+                    Ok(_) => match unsafe { jsval_to_webdriver(cx, property.handle()) } {
+                        Ok(property) => Ok(property),
+                        Err(_) => Ok(WebDriverJSValue::Undefined),
+                    },
+                    Err(error) => {
+                        unsafe { throw_dom_exception(cx, &node.reflector().global(), error) };
+                        Ok(WebDriverJSValue::Undefined)
+                    },
+                }
+            },
+            None => Err(()),
+        })
+        .unwrap();
+}
+
 pub fn handle_get_css(
     documents: &Documents,
     pipeline: PipelineId,