[chromedriver] Support clicking an element in sub frames.

chrome/test/chromedriver/element_commands.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/test/chromedriver/element_commands.h"
 
 #include <list>
 
 #include "base/callback.h"
 #include "base/third_party/icu/icu_utf.h"
@@ skipping 56 matching lines @@
     return Status(kElementNotVisible);
   bool is_enabled = false;
   status = IsElementEnabled(session, web_view, element_id, &is_enabled);
   if (status.IsError())
     return status;
   if (!is_enabled)
     return Status(kInvalidElementState);
   base::ListValue args;
   args.Append(CreateElement(element_id));
   scoped_ptr<base::Value> result;
-  status = web_view->CallFunction(session->frame, kFocusScript, args, &result);
+  status = web_view->CallFunction(
+      session->GetCurrentFrameId(), kFocusScript, args, &result);
   if (status.IsError())
     return status;
   return SendKeysOnWindow(web_view, keys, true);
 }
 
 }  // namespace
 
 Status ExecuteElementCommand(
     ElementCommand command,
     Session* session,
@@ skipping 29 matching lines @@
 }
 
 Status ExecuteHoverOverElement(
     Session* session,
     WebView* web_view,
     const std::string& element_id,
     const base::DictionaryValue& params,
     scoped_ptr<base::Value>* value) {
   WebPoint location;
   Status status = GetElementClickableLocation(
-      session, web_view, element_id, &location, NULL);
+      session, web_view, element_id, &location);
   if (status.IsError())
     return status;
 
   MouseEvent move_event(
       kMovedMouseEventType, kNoneMouseButton, location.x, location.y, 0);
   std::list<MouseEvent> events;
   events.push_back(move_event);
   status = web_view->DispatchMouseEvents(events);
   if (status.IsOk())
     session->mouse_position = location;
@@ skipping 15 matching lines @@
     status = IsOptionElementTogglable(
         session, web_view, element_id, &is_toggleable);
     if (status.IsError())
       return status;
     if (is_toggleable)
       return ToggleOptionElement(session, web_view, element_id);
     else
       return SetOptionElementSelected(session, web_view, element_id, true);
   } else {
     WebPoint location;
-    bool is_clickable;
     status = GetElementClickableLocation(
-        session, web_view, element_id, &location, &is_clickable);
+        session, web_view, element_id, &location);
     if (status.IsError())
       return status;
-    if (!is_clickable)
-      return Status(kUnknownError, status.message());
 
     std::list<MouseEvent> events;
     events.push_back(
         MouseEvent(kMovedMouseEventType, kNoneMouseButton,
                    location.x, location.y, 0));
     events.push_back(
         MouseEvent(kPressedMouseEventType, kLeftMouseButton,
                    location.x, location.y, 1));
     events.push_back(
         MouseEvent(kReleasedMouseEventType, kLeftMouseButton,
                    location.x, location.y, 1));
     status = web_view->DispatchMouseEvents(events);
     if (status.IsOk())
       session->mouse_position = location;
     return status;
   }
 }
 
 Status ExecuteClearElement(
     Session* session,
     WebView* web_view,
     const std::string& element_id,
     const base::DictionaryValue& params,
     scoped_ptr<base::Value>* value) {
   base::ListValue args;
   args.Append(CreateElement(element_id));
   scoped_ptr<base::Value> result;
   return web_view->CallFunction(
-      session->frame,
+      session->GetCurrentFrameId(),
       webdriver::atoms::asString(webdriver::atoms::CLEAR),
       args, &result);
 }
 
 Status ExecuteSendKeysToElement(
     Session* session,
     WebView* web_view,
     const std::string& element_id,
     const base::DictionaryValue& params,
     scoped_ptr<base::Value>* value) {
@@ skipping 25 matching lines @@
 
 Status ExecuteSubmitElement(
     Session* session,
     WebView* web_view,
     const std::string& element_id,
     const base::DictionaryValue& params,
     scoped_ptr<base::Value>* value) {
   base::ListValue args;
   args.Append(CreateElement(element_id));
   return web_view->CallFunction(
-      session->frame,
+      session->GetCurrentFrameId(),
       webdriver::atoms::asString(webdriver::atoms::SUBMIT),
       args,
       value);
 }
 
 Status ExecuteGetElementText(
     Session* session,
     WebView* web_view,
     const std::string& element_id,
     const base::DictionaryValue& params,
     scoped_ptr<base::Value>* value) {
   base::ListValue args;
   args.Append(CreateElement(element_id));
   return web_view->CallFunction(
-      session->frame,
+      session->GetCurrentFrameId(),
       webdriver::atoms::asString(webdriver::atoms::GET_TEXT),
       args,
       value);
 }
 
 Status ExecuteGetElementValue(
     Session* session,
     WebView* web_view,
     const std::string& element_id,
     const base::DictionaryValue& params,
     scoped_ptr<base::Value>* value) {
   base::ListValue args;
   args.Append(CreateElement(element_id));
   return web_view->CallFunction(
-      session->frame,
+      session->GetCurrentFrameId(),
       "function(elem) { return elem['value'] }",
       args,
       value);
 }
 
 Status ExecuteGetElementTagName(
     Session* session,
     WebView* web_view,
     const std::string& element_id,
     const base::DictionaryValue& params,
     scoped_ptr<base::Value>* value) {
   base::ListValue args;
   args.Append(CreateElement(element_id));
   return web_view->CallFunction(
-      session->frame,
+      session->GetCurrentFrameId(),
       "function(elem) { return elem.tagName.toLowerCase() }",
       args,
       value);
 }
 
 Status ExecuteIsElementSelected(
     Session* session,
     WebView* web_view,
     const std::string& element_id,
     const base::DictionaryValue& params,
     scoped_ptr<base::Value>* value) {
   base::ListValue args;
   args.Append(CreateElement(element_id));
   return web_view->CallFunction(
-      session->frame,
+      session->GetCurrentFrameId(),
       webdriver::atoms::asString(webdriver::atoms::IS_SELECTED),
       args,
       value);
 }
 
 Status ExecuteIsElementEnabled(
     Session* session,
     WebView* web_view,
     const std::string& element_id,
     const base::DictionaryValue& params,
     scoped_ptr<base::Value>* value) {
   base::ListValue args;
   args.Append(CreateElement(element_id));
   return web_view->CallFunction(
-      session->frame,
+      session->GetCurrentFrameId(),
       webdriver::atoms::asString(webdriver::atoms::IS_ENABLED),
       args,
       value);
 }
 
 Status ExecuteIsElementDisplayed(
     Session* session,
     WebView* web_view,
     const std::string& element_id,
     const base::DictionaryValue& params,
     scoped_ptr<base::Value>* value) {
   base::ListValue args;
   args.Append(CreateElement(element_id));
   return web_view->CallFunction(
-      session->frame,
+      session->GetCurrentFrameId(),
       webdriver::atoms::asString(webdriver::atoms::IS_DISPLAYED),
       args,
       value);
 }
 
 Status ExecuteGetElementLocation(
     Session* session,
     WebView* web_view,
     const std::string& element_id,
     const base::DictionaryValue& params,
     scoped_ptr<base::Value>* value) {
   base::ListValue args;
   args.Append(CreateElement(element_id));
   return web_view->CallFunction(
-      session->frame,
+      session->GetCurrentFrameId(),
       webdriver::atoms::asString(webdriver::atoms::GET_LOCATION),
       args,
       value);
 }
 
 Status ExecuteGetElementLocationOnceScrolledIntoView(
     Session* session,
     WebView* web_view,
     const std::string& element_id,
     const base::DictionaryValue& params,
     scoped_ptr<base::Value>* value) {
   base::ListValue args;
   args.Append(CreateElement(element_id));
   return web_view->CallFunction(
-      session->frame,
+      session->GetCurrentFrameId(),
       webdriver::atoms::asString(webdriver::atoms::GET_LOCATION_IN_VIEW),
       args,
       value);
 }
 
 Status ExecuteGetElementSize(
     Session* session,
     WebView* web_view,
     const std::string& element_id,
     const base::DictionaryValue& params,
     scoped_ptr<base::Value>* value) {
   base::ListValue args;
   args.Append(CreateElement(element_id));
   return web_view->CallFunction(
-      session->frame,
+      session->GetCurrentFrameId(),
       webdriver::atoms::asString(webdriver::atoms::GET_SIZE),
       args,
       value);
 }
 
 Status ExecuteGetElementAttribute(
     Session* session,
     WebView* web_view,
     const std::string& element_id,
     const base::DictionaryValue& params,
     scoped_ptr<base::Value>* value) {
   std::string name;
   if (!params.GetString("name", &name))
     return Status(kUnknownError, "missing 'name'");
   return GetElementAttribute(session, web_view, element_id, name, value);
 }
 
 Status ExecuteGetElementValueOfCSSProperty(
     Session* session,
     WebView* web_view,
     const std::string& element_id,
     const base::DictionaryValue& params,
     scoped_ptr<base::Value>* value) {
   base::ListValue args;
   args.Append(CreateElement(element_id));
   return web_view->CallFunction(
-      session->frame,
+      session->GetCurrentFrameId(),
       webdriver::atoms::asString(webdriver::atoms::GET_EFFECTIVE_STYLE),
       args,
       value);
 }
 
 Status ExecuteElementEquals(
     Session* session,
     WebView* web_view,
     const std::string& element_id,
     const base::DictionaryValue& params,
     scoped_ptr<base::Value>* value) {
   std::string other_element_id;
   if (!params.GetString("other", &other_element_id))
     return Status(kUnknownError, "'other' must be a string");
   value->reset(new base::FundamentalValue(element_id == other_element_id));
   return Status(kOk);
 }