If an element A has a parent element, then A's assigned context menu is the assigned context menu o…

LayoutTests/fast/dom/HTMLMenuElement/custom-context-menu.html

Index: LayoutTests/fast/dom/HTMLMenuElement/custom-context-menu.html
diff --git a/LayoutTests/fast/dom/HTMLMenuElement/custom-context-menu.html b/LayoutTests/fast/dom/HTMLMenuElement/custom-context-menu.html
index e1d311ffa4eba27f674f3e426e9c042cfdb061c1..8502c0b51b9008a0c8a27879d1ad86476426f078 100644
--- a/LayoutTests/fast/dom/HTMLMenuElement/custom-context-menu.html
+++ b/LayoutTests/fast/dom/HTMLMenuElement/custom-context-menu.html
@@ -8,35 +8,35 @@
     <menu id="menu_id" type="PopUp">
         <!-- Test removal of separator at the start. -->
         <hr>
-        <menuitem label="Item1"></menuitem>

[tkent, 2014/11/12 07:17:21]

Please don't change lines unrelated to the subject of the CL.  It's noise for
code review.

[pals, 2014/11/12 09:30:05]

Done.

-        <menuitem label="Item2"></menuitem>
+        <menuitem label="Item1">
+        <menuitem label="Item2">
         <!-- Test addition of separator for <hr>. -->
         <hr>
-        <menuitem label="Item3"></menuitem>
+        <menuitem label="Item3">
         <!-- Test child menu with label. -->
         <menu label="Submenu">
-            <menuitem label="Item4"></menuitem>
+            <menuitem label="Item4">
             <menu label="Deeper submenu">
                 <!-- Test removal of separator at the start inside submenu. -->
                 <hr>
-                <menuitem label="Item5"></menuitem>
+                <menuitem label="Item5">
                 <hr>
-                <menuitem label="Item6"></menuitem>
+                <menuitem label="Item6">
                 <!-- Test removal of separator at the end inside submenu. -->
                 <hr>
             </menu>
         </menu>
-        <menuitem label="Item7"></menuitem>
+        <menuitem label="Item7">
         <!-- Test child menu without label. -->
         <menu>
-            <menuitem label="Item8"></menuitem>
+            <menuitem label="Item8">
             <!-- Test child menu with empty label. -->
             <menu label="">
-                <menuitem label="Item9"></menuitem>
-                <menuitem label="Item10"></menuitem>
+                <menuitem label="Item9">
+                <menuitem label="Item10">
             </menu>
-            <menuitem label="Item11"></menuitem>
-            <menuitem label="Item12"></menuitem>
+            <menuitem label="Item11">
+            <menuitem label="Item12">
         </menu>
         <!-- Test collapsing two or more adjacent separators. -->
         <hr>
@@ -44,10 +44,10 @@
         <hr>
         <hr>
         <!-- Test menuitem menu without label. -->
-        <menuitem></menuitem>
+        <menuitem>
         <!-- Test menuitem menu with empty label. -->
-        <menuitem label=""></menuitem>
-        <menuitem label="Item13"></menuitem>
+        <menuitem label="">
+        <menuitem label="Item13">
         <!-- Test removal of separator at the end. -->
         <hr>
     </menu>
@@ -55,25 +55,25 @@
 <!-- Test with menu element without type attribute specified. -->
 <button id="button_1" contextmenu="menu_without_type" style="height: 100px; width: 100px;">
     <menu id="menu_without_type">
-        <menuitem label="Item1"></menuitem>
-        <menuitem label="Item2"></menuitem>
-        <menuitem label="Item3"></menuitem>
+        <menuitem label="Item1">
+        <menuitem label="Item2">
+        <menuitem label="Item3">
     </menu>
 </button>
 <!-- Test cancelling show event. -->
 <button id="button_2" contextmenu="menu_2" style="height: 100px; width: 100px;">
     <menu id="menu_2" type="popup">
-        <menuitem label="Item1"></menuitem>
-        <menuitem label="Item2"></menuitem>
-        <menuitem label="Item3"></menuitem>
+        <menuitem label="Item1">
+        <menuitem label="Item2">
+        <menuitem label="Item3">
     </menu>
 </button>
 <!-- Test removing menu element inside show event handler. -->
 <button id="button_3" contextmenu="menu_3" style="height: 100px; width: 100px;">
     <menu id="menu_3" type="popup">
-        <menuitem label="Item1"></menuitem>
-        <menuitem label="Item2"></menuitem>
-        <menuitem label="Item3"></menuitem>
+        <menuitem label="Item1">
+        <menuitem label="Item2">
+        <menuitem label="Item3">
     </menu>
 </button>
 <!-- Test with menu element without any children. -->
@@ -81,6 +81,17 @@
     <menu id="menu_4" type="popup">
     </menu>
 </button>
+<!-- Test if an element A has a parent element, then A's assigned context menu is the assigned context menu of its parent element. -->
+<div contextmenu="menu_5">
+    <div>
+        <button id="button_5" style="height: 100px; width: 100px;"></button>
+    </div>
+    <menu id="menu_5" type="popup">
+        <menuitem label="Item1">
+        <menuitem label="Item2">
+        <menuitem label="Item3">
+    </menu>
+</div>
 <script>
 if (!window.eventSender)
     debug("This test requires window.eventSender.")
@@ -136,6 +147,12 @@ eventSender.keyDown("escape");
 var button4 = document.getElementById("button_4");
 var items4 = contextClickAndGetMenuItems(button4);
 
+// Esc key to hide the context menu.
+eventSender.keyDown("escape");
+
+var button5 = document.getElementById("button_5");

[tkent, 2014/11/12 07:17:21]

Should have a test for button5.contextMenu IDL attribute value.

[pals, 2014/11/12 09:30:05]

Done.

+var items5 = contextClickAndGetMenuItems(button5);
+
 shouldBeEqualToNumber("itemsWithCustomContextMenu.length - items.length", 17);
 shouldBeEqualToString("itemsWithCustomContextMenu[0]", "Item1");
 shouldBeEqualToString("itemsWithCustomContextMenu[1]", "Item2");
@@ -158,5 +175,9 @@ shouldBeEqualToNumber("items1.length - items.length", 0);
 shouldBeEqualToNumber("items2.length - items.length", 0);
 shouldBeEqualToNumber("items3.length - items.length", 0);
 shouldBeEqualToNumber("items4.length - items.length", 0);
+shouldBeEqualToNumber("items5.length - items.length", 3);
+shouldBeEqualToString("items5[0]", "Item1");
+shouldBeEqualToString("items5[1]", "Item2");
+shouldBeEqualToString("items5[2]", "Item3");
 
 </script>