Updating IE to return top-level URL when focused on a frame.

This makes the driver now consistent with other implementations.

Author: jimevans

cpp/iedriver/CommandHandlers/GetCurrentUrlCommandHandler.h

@@ -43,8 +43,21 @@ class GetCurrentUrlCommandHandler : public IECommandHandler {
       return;
     }
 
-    std::string url = browser_wrapper->GetCurrentUrl();
-    response->SetSuccessResponse(url);
+    CComPtr<IHTMLDocument2> top_level_document;
+    browser_wrapper->GetDocument(true, &top_level_document);
+    if (!top_level_document) {
+      LOG(WARN) << "Unable to get document from browser. Are you viewing a non-HTML document?";
+    }
+
+    CComBSTR url;
+    HRESULT hr = top_level_document->get_URL(&url);
+    if (FAILED(hr)) {
+      LOGHR(WARN, hr) << "IHTMLDocument2::get_URL failed.";
+    }
+    
+    std::wstring converted_url(url, ::SysStringLen(url));
+    std::string current_url = StringUtilities::ToString(converted_url);
+    response->SetSuccessResponse(current_url);
   }
 };
 

cpp/iedriver/DocumentHost.cpp

@@ -83,7 +83,7 @@ std::string DocumentHost::GetCurrentUrl() {
     return "";
   }
 
-  std::wstring converted_url = url;
+  std::wstring converted_url(url, ::SysStringLen(url));
   std::string current_url = StringUtilities::ToString(converted_url);
   return current_url;
 }

cpp/iedriverserver/CHANGELOG

@@ -9,6 +9,11 @@ available via the project downloads page. Changes in "revision" field indicate
 private releases checked into the prebuilts directory of the source tree, but
 not made generally available on the downloads page.
 
+v2.48.0.1
+=========
+ * Updating to return top-level URL when focused on a frame. This makes the
+   driver now consistent with other implementations.
+
 v2.48.0.0
 =========
  * Release to synchronize with release of Selenium project.