Updating MakeMenuItemStringsFor() to include custom items if provided by blink.

content/shell/renderer/test_runner/event_sender.cc

 // Copyright 2014 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 "content/shell/renderer/test_runner/event_sender.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "content/public/common/page_zoom.h"
@@ skipping 14 matching lines @@
 #include "v8/include/v8.h"
 
 using blink::WebContextMenuData;
 using blink::WebDragData;
 using blink::WebDragOperationsMask;
 using blink::WebFloatPoint;
 using blink::WebFrame;
 using blink::WebGestureEvent;
 using blink::WebInputEvent;
 using blink::WebKeyboardEvent;
+using blink::WebMenuItemInfo;
 using blink::WebMouseEvent;
 using blink::WebMouseWheelEvent;
 using blink::WebPoint;
 using blink::WebString;
 using blink::WebTouchEvent;
 using blink::WebTouchPoint;
 using blink::WebVector;
 using blink::WebView;
 
 namespace content {
@@ skipping 69 matching lines @@
     gin::Converter<std::vector<std::string> >::FromV8(
         NULL, value, &modifier_names);
   }
   return GetKeyModifiers(modifier_names);
 }
 
 // Maximum distance (in space and time) for a mouse click to register as a
 // double or triple click.
 const double kMultipleClickTimeSec = 1;
 const int kMultipleClickRadiusPixels = 5;
+const std::string kSubMenuIdentifier = " >";

[tkent, 2014/08/05 08:50:10]

We don't allow static initialization of classes.
kSubMenuIdentifier and kSubMenuDepthIdentifier should be moved into functions,
or their type should be const char[].

[pals, 2014/08/05 09:02:24]

Done.

+const std::string kSubMenuDepthIdentifier = "_";
 
 bool OutsideMultiClickRadius(const WebPoint& a, const WebPoint& b) {
   return ((a.x - b.x) * (a.x - b.x) + (a.y - b.y) * (a.y - b.y)) >
          kMultipleClickRadiusPixels * kMultipleClickRadiusPixels;
 }
 
+std::string depthPrefix(unsigned depth)
+{
+  if (depth < 1)
+    return std::string();
+
+  std::string prefix;
+  for (size_t i = 0; i < depth; ++i) {
+    prefix += kSubMenuDepthIdentifier;
+  }
+  return std::string(prefix);
+}
+
+void PopulateCustomItems(const WebVector<WebMenuItemInfo>& customItems,
+    std::vector<std::string>& strings, unsigned depth) {

[tkent, 2014/08/05 08:50:10]

Please make the third argument |const std::string& prefix| and apply following
comments.

They will make the code simpler.

[pals, 2014/08/05 09:02:24]

Done. Thanks

+  for (size_t i = 0; i < customItems.size(); ++i) {
+    if (customItems[i].type == blink::WebMenuItemInfo::SubMenu) {
+      unsigned newDepth = depth + 1;
+      strings.push_back(depthPrefix(newDepth) + customItems[i].label.utf8() + kSubMenuIdentifier);

[tkent, 2014/08/05 08:50:10]

|depthPrefix(newDepth) +| -> |prefix +|

[pals, 2014/08/05 09:02:24]

Done.

+      PopulateCustomItems(customItems[i].subMenuItems, strings, newDepth);

[tkent, 2014/08/05 08:50:10]

|newDepth| -> |prefix + kSubMenuDepthIdentifier|

[pals, 2014/08/05 09:02:24]

Done.

+    } else {
+      strings.push_back(depthPrefix(depth) + customItems[i].label.utf8());

[tkent, 2014/08/05 08:50:11]

|depthPrefix(newDepth) +| -> |prefix +|

[pals, 2014/08/05 09:02:24]

Done.

+    }
+  }
+}
+
 // Because actual context menu is implemented by the browser side,
 // this function does only what LayoutTests are expecting:
 // - Many test checks the count of items. So returning non-zero value makes
 // sense.
 // - Some test compares the count before and after some action. So changing the
 // count based on flags also makes sense. This function is doing such for some
 // flags.
 // - Some test even checks actual string content. So providing it would be also
 // helpful.
 std::vector<std::string> MakeMenuItemStringsFor(
@@ skipping 25 matching lines @@
     "<separator>",
     0
   };
 
   // This is possible because mouse events are cancelleable.
   if (!context_menu)
     return std::vector<std::string>();
 
   std::vector<std::string> strings;
 
+  // Populate custom menu items if provided by the WebCore internals.

[tkent, 2014/08/05 08:50:11]

|WebCore| is an obsolete name.

"provided by Blink."

[pals, 2014/08/05 09:02:24]

Done.

+  PopulateCustomItems(context_menu->customItems, strings, 0);

[tkent, 2014/08/05 08:50:10]

|0| -> |""|

[pals, 2014/08/05 09:02:24]

Done.

+
   if (context_menu->isEditable) {
     for (const char** item = kEditableMenuStrings; *item; ++item) {
       strings.push_back(*item);
     }
     WebVector<WebString> suggestions;
     MockSpellCheck::FillSuggestionList(context_menu->misspelledWord,
                                        &suggestions);
     for (size_t i = 0; i < suggestions.size(); ++i) {
       strings.push_back(suggestions[i].utf8());
     }
@@ skipping 2073 matching lines @@
       }
       default:
         NOTREACHED();
     }
   }
 
   replaying_saved_events_ = false;
 }
 
 }  // namespace content