[chromedriver] Support clicking an element in sub frames.

chrome/test/chromedriver/session.cc

 // Copyright (c) 2012 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/session.h"
 
 #include <list>
 
 #include "base/sys_info.h"
 #include "base/values.h"
 #include "chrome/test/chromedriver/chrome.h"
 #include "chrome/test/chromedriver/status.h"
 #include "chrome/test/chromedriver/version.h"
 #include "chrome/test/chromedriver/web_view.h"
 
+FrameElement::FrameElement(const std::string& parent_frame_id,
+                           const std::string& frame_id,
+                           const std::string& chromedriver_frame_id)
+    : parent_frame_id(parent_frame_id), frame_id(frame_id),

[kkania, 2013/03/13 00:06:20]

normal style is to put these on separate lines if they can't all fit on one

[chrisgao (Use stgao instead), 2013/03/13 00:36:48]

Done.

+      chromedriver_frame_id(chromedriver_frame_id) {}
+
 Session::Session(const std::string& id)
     : id(id),
       mouse_position(0, 0),
       implicit_wait(0),
       page_load_timeout(0),
       script_timeout(0) {
 }
 
 Session::Session(const std::string& id, scoped_ptr<Chrome> chrome)
     : id(id),
@@ skipping 19 matching lines @@
   for (std::list<WebView*>::const_iterator it = web_views.begin();
        it != web_views.end(); ++it) {
     if ((*it)->GetId() == window) {
       *web_view = *it;
       return Status(kOk);
     }
   }
   return Status(kNoSuchWindow, "target window already closed");
 }
 
+void Session::SwitchToTopFrame() {
+  frame_elements.clear();
+}
+
+void Session::SwitchToSubFrame(const std::string& frame_id,
+                               const std::string& chromedriver_frame_id) {
+  std::string parent_frame_id = "";

[kkania, 2013/03/13 00:06:20]

remove = ""

[chrisgao (Use stgao instead), 2013/03/13 00:36:48]

Done.

+  if (!frame_elements.empty())
+    parent_frame_id = frame_elements.back().frame_id;
+  frame_elements.push_back(
+      FrameElement(parent_frame_id, frame_id, chromedriver_frame_id));
+}
+
+std::string Session::GetCurrentFrameId() const {
+  if (frame_elements.empty())
+    return "";
+  return frame_elements.back().frame_id;
+}
+
 scoped_ptr<base::DictionaryValue> Session::CreateCapabilities() {
   scoped_ptr<base::DictionaryValue> caps(new base::DictionaryValue());
   caps->SetString("browserName", "chrome");
   caps->SetString("version", chrome->GetVersion());
   caps->SetString("driverVersion", kChromeDriverVersion);
   caps->SetString("platform", base::SysInfo::OperatingSystemName());
   caps->SetBoolean("javascriptEnabled", true);
   caps->SetBoolean("takesScreenshot", true);
   caps->SetBoolean("handlesAlerts", true);
   caps->SetBoolean("databaseEnabled", true);
@@ skipping 10 matching lines @@
 
 SessionAccessorImpl::SessionAccessorImpl(scoped_ptr<Session> session)
     : session_(session.Pass()) {}
 
 Session* SessionAccessorImpl::Access(scoped_ptr<base::AutoLock>* lock) {
   lock->reset(new base::AutoLock(session_lock_));
   return session_.get();
 }
 
 SessionAccessorImpl::~SessionAccessorImpl() {}