Refactoring IE element's parent document detection to be the focused doc

Author: jimevans

cpp/iedriver/Element.cpp

@@ -1093,6 +1093,18 @@ bool Element::IsAttachedToDom() {
   return false;
 }
 
+bool Element::IsDocumentFocused(IHTMLDocument2* focused_doc) {
+  CComPtr<IDispatch> parent_doc_dispatch;
+  this->element_->get_document(&parent_doc_dispatch);
+
+  if (parent_doc_dispatch.IsEqualObject(focused_doc)) {
+    return true;
+  } else {
+    LOG(WARN) << "Found managed element's document is not currently focused";
+  }
+  return false;
+}
+
 bool Element::HasFirstChildTextNodeOfMultipleChildren() {
   CComPtr<IHTMLDOMNode> element_node;
   HRESULT hr = this->element_.QueryInterface<IHTMLDOMNode>(&element_node);

cpp/iedriver/Element.h

@@ -62,6 +62,7 @@ class Element {
   bool IsInteractable(void);
   bool IsEditable(void);
   bool IsAttachedToDom(void);
+  bool IsDocumentFocused(IHTMLDocument2* focused_doc);
 
   std::string element_id(void) const { return this->element_id_; }
   IHTMLElement* element(void) { return this->element_; }

cpp/iedriver/IECommandHandler.cpp

@@ -62,10 +62,7 @@ int IECommandHandler::GetElement(const IECommandExecutor& executor,
       CComPtr<IHTMLDocument2> focused_doc;
       current_browser->GetDocument(&focused_doc);
 
-      CComPtr<IDispatch> parent_doc_dispatch;
-      candidate_wrapper->element()->get_document(&parent_doc_dispatch);
-
-      if (focused_doc.IsEqualObject(parent_doc_dispatch)) {
+      if (candidate_wrapper->IsDocumentFocused(focused_doc)) {
         *element_wrapper = candidate_wrapper;
         return WD_SUCCESS;
       } else {

cpp/iedriver/Script.cpp

@@ -683,9 +683,12 @@ int Script::AddArgument(HWND element_repository_handle, const Json::Value& arg)
         ElementHandle wrapped_element(new Element(info.element, info.element_id));
         bool is_element_valid = wrapped_element->IsAttachedToDom();
         if (is_element_valid) {
-          CComPtr<IDispatch> parent_doc_dispatch;
-          wrapped_element->element()->get_document(&parent_doc_dispatch);
-          is_element_valid = this->script_engine_host_.IsEqualObject(parent_doc_dispatch);
+          is_element_valid = wrapped_element->IsDocumentFocused(this->script_engine_host_);
+        } else {
+          status_code = static_cast<int>(::SendMessage(element_repository_handle,
+                                         WD_REMOVE_MANAGED_ELEMENT,
+                                         NULL,
+                                         reinterpret_cast<LPARAM>(&info)));
         }
 
         if (is_element_valid) {