Backed out 1 changesets (bug 1198522) for gij20 test failures
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Fri, 11 Sep 2015 14:14:11 +0200
changeset 294550 bd613b5b2e23ad32941232aaf659023b3a055cf0
parent 294549 e99274f9d1a58149193562b534160052358f046f
child 294551 c12f87bdce99d4eecb889489b03e68303b1ebb78
push id5245
push userraliiev@mozilla.com
push dateThu, 29 Oct 2015 11:30:51 +0000
treeherdermozilla-beta@dac831dc1bd0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1198522
milestone43.0a1
backs outb0c1649e39d2a3cf468f2c9098288aaf177f44ec
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out 1 changesets (bug 1198522) for gij20 test failures Backed out changeset b0c1649e39d2 (bug 1198522)
dom/browser-element/BrowserElementChildPreload.js
dom/browser-element/mochitest/browserElement_ContextmenuEvents.js
--- a/dom/browser-element/BrowserElementChildPreload.js
+++ b/dom/browser-element/BrowserElementChildPreload.js
@@ -1253,17 +1253,17 @@ BrowserElementChild.prototype = {
       this._ctxHandlers = {};
     } else {
       // We silently ignore if the embedder uses an incorrect id in the callback
       debug("Ignored invalid contextmenu invocation");
     }
   },
 
   _buildMenuObj: function(menu, idPrefix, copyableElements) {
-    var menuObj = {type: 'menu', items: [], sysItems: []};
+    var menuObj = {type: 'menu', items: []};
     // Customized context menu
     if (menu) {
       this._maybeCopyAttribute(menu, menuObj, 'label');
 
       for (var i = 0, child; child = menu.children[i++];) {
         if (child.nodeName === 'MENU') {
           menuObj.items.push(this._buildMenuObj(child, idPrefix + i + '_', false));
         } else if (child.nodeName === 'MENUITEM') {
@@ -1275,21 +1275,21 @@ BrowserElementChild.prototype = {
           menuObj.items.push(menuitem);
         }
       }
     }
     // Note: Display "Copy Link" first in order to make sure "Copy Image" is
     //       put together with other image options if elem is an image link.
     // "Copy Link" menu item
     if (copyableElements.link) {
-      menuObj.sysItems.push({id: 'copy-link'});
+      menuObj.items.push({id: 'copy-link'});
     }
     // "Copy Image" menu item
     if (copyableElements.image) {
-      menuObj.sysItems.push({id: 'copy-image'});
+      menuObj.items.push({id: 'copy-image'});
     }
 
     return menuObj;
   },
 
   _recvSetVisible: function(data) {
     debug("Received setVisible message: (" + data.json.visible + ")");
     if (this._forcedVisible == data.json.visible) {
--- a/dom/browser-element/mochitest/browserElement_ContextmenuEvents.js
+++ b/dom/browser-element/mochitest/browserElement_ContextmenuEvents.js
@@ -19,22 +19,17 @@ function checkEmptyContextMenu() {
 
     checkInnerContextMenu();
   });
 }
 
 function checkInnerContextMenu() {
   sendContextMenuTo('#inner-link', function onContextMenu(detail) {
     is(detail.systemTargets.length, 1, 'Includes anchor data');
-    is(detail.contextmenu.items.length, 2, 'Inner clicks trigger correct customized menu');
-    is(detail.contextmenu.items[0].label, 'foo', 'Customized menu has a "foo" menu item');
-    is(detail.contextmenu.items[1].label, 'bar', 'Customized menu has a "bar" menu item');
-    is(detail.contextmenu.sysItems.length, 1, 'Inner clicks trigger correct sys cmd menu');
-    is(detail.contextmenu.sysItems[0].id, 'copy-link', '#inner-link has a copy-link menu item');
-
+    is(detail.contextmenu.items.length, 3, 'Inner clicks trigger correct menu');
     var target = detail.systemTargets[0];
     is(target.nodeName, 'A', 'Reports correct nodeName');
     is(target.data.uri, 'foo.html', 'Reports correct uri');
     is(target.data.text, 'Menu 1', 'Reports correct link text');
 
     checkCustomContextMenu();
   });
 }
@@ -47,26 +42,19 @@ function checkCustomContextMenu() {
   });
 }
 
 function checkNestedContextMenu() {
   sendContextMenuTo('#menu2-trigger', function onContextMenu(detail) {
     var innerMenu = detail.contextmenu.items.filter(function(x) {
       return x.type === 'menu';
     });
-    is(detail.systemTargets.length, 2, 'Includes two systemTargets');
-    is(detail.systemTargets[0].nodeName, 'IMG', 'Includes "IMG" node');
-    is(detail.systemTargets[0].data.uri, 'example.png', 'Img data has the correct uri');
-    is(detail.systemTargets[1].nodeName, 'A', 'Includes "A" node');
-    is(detail.systemTargets[1].data.uri, 'bar.html', 'Anchor has the correct uri');
+    is(detail.systemTargets.length, 2, 'Includes anchor and img data');
     ok(innerMenu.length > 0, 'Menu contains a nested menu');
 
-    is(detail.contextmenu.sysItems.length, 2, 'Sys cmd menu has the correct # of menu items')
-    is(detail.contextmenu.sysItems[0].id, 'copy-link', 'Has a copy-link menu item');
-    is(detail.contextmenu.sysItems[1].id, 'copy-image', 'Has a copy-image menu item');
     checkPreviousContextMenuHandler();
   });
 }
 
  // Finished testing the data passed to the contextmenu handler,
  // now we start selecting contextmenu items
 function checkPreviousContextMenuHandler() {
   // This is previously triggered contextmenu data, since we have
@@ -138,18 +126,16 @@ function checkCallbackWithoutPreventDefa
   }, /* ignorePreventDefault */ true);
 }
 
 function checkImageContextMenu() {
   sendContextMenuTo('#menu3-trigger', function onContextMenu(detail) {
     var target = detail.systemTargets[0];
     is(target.nodeName, 'IMG', 'Reports correct nodeName');
     is(target.data.uri, 'example.png', 'Reports correct uri');
-    is(detail.contextmenu.sysItems.length, 1, 'Reports correct # of sys cmd menu items');
-    is(detail.contextmenu.sysItems[0].id, 'copy-image', 'IMG has a copy-image menu item');
 
     checkVideoContextMenu();
   }, /* ignorePreventDefault */ true);
 }
 
 function checkVideoContextMenu() {
   sendContextMenuTo('#menu4-trigger', function onContextMenu(detail) {
     var target = detail.systemTargets[0];