Autocheckout: parse multiple clicks setting in autofill response.

components/autofill/browser/autofill_xml_parser.cc

 // Copyright (c) 2011 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 "components/autofill/browser/autofill_xml_parser.h"
 
 #include <stdlib.h>
 #include <string.h>
 
 #include "base/logging.h"
@@ skipping 23 matching lines @@
 }
 
 AutofillQueryXmlParser::AutofillQueryXmlParser(
     std::vector<AutofillServerFieldInfo>* field_infos,
     UploadRequired* upload_required,
     std::string* experiment_id,
     AutocheckoutPageMetaData* page_meta_data)
     : field_infos_(field_infos),
       upload_required_(upload_required),
       experiment_id_(experiment_id),
       page_meta_data_(page_meta_data) {

[Ilya Sherman, 2013/05/31 23:14:49]

Make sure to initialize |current_click_element_| here.

[benquan, 2013/06/01 01:08:39]

Done.

   DCHECK(upload_required_);
   DCHECK(experiment_id_);
   DCHECK(page_meta_data_);
 }
 
 AutofillQueryXmlParser::~AutofillQueryXmlParser() {}
 
 void AutofillQueryXmlParser::StartElement(buzz::XmlParseContext* context,
                                           const char* name,
                                           const char** attrs) {
@@ skipping 59 matching lines @@
       buzz::QName attribute_qname = context->ResolveQName(*attrs, true);
       ++attrs;
       const std::string& attribute_name = attribute_qname.LocalPart();
       if (attribute_name.compare("page_no") == 0)
         page_meta_data_->current_page_number = GetIntValue(context, *attrs);
       else if (attribute_name.compare("total_pages") == 0)
         page_meta_data_->total_pages = GetIntValue(context, *attrs);
       ++attrs;
     }
   } else if (element.compare("page_advance_button") == 0) {
     // |attrs| is a NULL-terminated list of (attribute, value) pairs.

[Ilya Sherman, 2013/05/31 23:14:49]

nit: This comment should be moved into ParseElementDescriptor() as well.

[benquan, 2013/06/01 01:08:39]

Done.

-    // If both id and css_selector are set, the first one to appear will take
-    // precedence.
-    while (*attrs) {
-      buzz::QName attribute_qname = context->ResolveQName(*attrs, true);
-      ++attrs;
-      const std::string& attribute_name = attribute_qname.LocalPart();
-      buzz::QName value_qname = context->ResolveQName(*attrs, true);
-      ++attrs;
-      const std::string& attribute_value = value_qname.LocalPart();
-      if (attribute_name.compare("id") == 0 && !attribute_value.empty()) {
-        page_meta_data_->proceed_element_descriptor.retrieval_method =
-            autofill::WebElementDescriptor::ID;
-        page_meta_data_->proceed_element_descriptor.descriptor =
-            attribute_value;
-        break;
-      } else if (attribute_name.compare("css_selector") == 0 &&
-                 !attribute_value.empty()) {
-        page_meta_data_->proceed_element_descriptor.retrieval_method =
-            autofill::WebElementDescriptor::CSS_SELECTOR;
-        page_meta_data_->proceed_element_descriptor.descriptor =
-            attribute_value;
-        break;
-      }
+    page_meta_data_->proceed_element_descriptor = WebElementDescriptor();
+    ParseElementDescriptor(context,
+                           attrs,
+                           &page_meta_data_->proceed_element_descriptor);
+  } else if (element.compare("click_elements_before_formfill") == 0) {
+    HandleClickElement(&page_meta_data_->click_elements_before_form_fill);
+  } else if (element.compare("click_elements_after_formfill") == 0) {
+    HandleClickElement(&page_meta_data_->click_elements_after_form_fill);
+  } else if (element.compare("web_element") == 0) {
+    ParseElementDescriptor(context, attrs, current_click_element_);
+  }
+}
+
+void AutofillQueryXmlParser::HandleClickElement(
+    std::vector<WebElementDescriptor>* click_elements) {
+  click_elements->push_back(WebElementDescriptor());
+  current_click_element_ = &click_elements->back();

[Ilya Sherman, 2013/05/31 23:14:49]

IMO it would be clearer to just inline this code in the two places where this
method is currently called, as "HandleClickElement()" is a pretty vague name
relative to what this method does, and the body is extremely short.

[benquan, 2013/06/01 01:08:39]

Done.

+}
+
+void AutofillQueryXmlParser::ParseElementDescriptor(
+    buzz::XmlParseContext* context,
+    const char* const* attrs,
+    WebElementDescriptor* element_descriptor) {
+  // If both id and css_selector are set, the first one to appear will take
+  // precedence.
+  while (*attrs) {
+    buzz::QName attribute_qname = context->ResolveQName(*attrs, true);
+    ++attrs;
+    const std::string& attribute_name = attribute_qname.LocalPart();
+    buzz::QName value_qname = context->ResolveQName(*attrs, true);
+    ++attrs;
+    const std::string& attribute_value = value_qname.LocalPart();
+    if (attribute_name.compare("id") == 0 && !attribute_value.empty()) {
+      element_descriptor->retrieval_method = autofill::WebElementDescriptor::ID;
+      element_descriptor->descriptor = attribute_value;
+      break;
+    } else if (attribute_name.compare("css_selector") == 0 &&
+               !attribute_value.empty()) {
+      element_descriptor->retrieval_method =
+          autofill::WebElementDescriptor::CSS_SELECTOR;
+      element_descriptor->descriptor = attribute_value;
+      break;
     }
   }
 }
 
 int AutofillQueryXmlParser::GetIntValue(buzz::XmlParseContext* context,
                                         const char* attribute) {
   char* attr_end = NULL;
   int value = strtol(attribute, &attr_end, 10);
   if (attr_end != NULL && attr_end == attribute) {
     context->RaiseError(XML_ERROR_SYNTAX);
@@ skipping 36 matching lines @@
   char* attr_end = NULL;
   double value = strtod(attribute, &attr_end);
   if (attr_end != NULL && attr_end == attribute) {
     context->RaiseError(XML_ERROR_SYNTAX);
     return 0.0;
   }
   return value;
 }
 
 }  // namespace autofill