merge m-c to fx-team

Author: Tim Taubert

browser/base/content/browser.js

@@ -1335,6 +1335,14 @@ var gBrowserInit = {
 
     var isLoadingBlank = isBlankPageURL(uriToLoad);
 
+    // This pageshow listener needs to be registered before we may call
+    // swapBrowsersAndCloseOther() to receive pageshow events fired by that.
+    gBrowser.addEventListener("pageshow", function(event) {
+      // Filter out events that are not about the document load we are interested in
+      if (content && event.target == content.document)
+        setTimeout(pageShowEventHandlers, 0, event);
+    }, true);
+
     if (uriToLoad && uriToLoad != "about:blank") {
       if (uriToLoad instanceof Ci.nsISupportsArray) {
         let count = uriToLoad.Count();
@@ -1393,12 +1401,6 @@ var gBrowserInit = {
     AddonManager.addAddonListener(AddonsMgrListener);
     WebrtcIndicator.init();
 
-    gBrowser.addEventListener("pageshow", function(event) {
-      // Filter out events that are not about the document load we are interested in
-      if (content && event.target == content.document)
-        setTimeout(pageShowEventHandlers, 0, event.persisted);
-    }, true);
-
     // Ensure login manager is up and running.
     Services.logins;
 

browser/base/content/newtab/newTab.xul

@@ -31,7 +31,7 @@
                       label="&newtab.undo.restoreButton;"
                       class="newtab-undo-button" />
           <xul:toolbarbutton id="newtab-undo-close-button" tabindex="-1"
-                             title="&newtab.undo.closeTooltip;" />
+                             tooltiptext="&newtab.undo.closeTooltip;" />
         </div>
       </div>
 

browser/base/content/tabbrowser.xml

@@ -3896,13 +3896,17 @@
             this.tabbrowser.pinTab(newTab);
           this.tabbrowser.moveTabTo(newTab, newIndex);
 
+          // We need to select the tab before calling swapBrowsersAndCloseOther
+          // so that window.content in chrome windows points to the right tab
+          // when pagehide/show events are fired.
+          this.tabbrowser.selectedTab = newTab;
+
           draggedTab.parentNode._finishAnimateTabMove();
           this.tabbrowser.swapBrowsersAndCloseOther(newTab, draggedTab);
 
-          // We need to select the tab after we've done
-          // swapBrowsersAndCloseOther, so that the updateCurrentBrowser
-          // it triggers will correctly update our URL bar.
-          this.tabbrowser.selectedTab = newTab;
+          // Call updateCurrentBrowser to make sure the URL bar is up to date
+          // for our new tab after we've done swapBrowsersAndCloseOther.
+          this.updateCurrentBrowser(true);
         } else {
           // Pass true to disallow dropping javascript: or data: urls
           let url;

browser/base/content/test/Makefile.in

@@ -183,6 +183,7 @@ _BROWSER_FILES = \
                  browser_pluginnotification.js \
                  browser_plugins_added_dynamically.js \
                  browser_CTPScriptPlugin.js \
+                 browser_CTP_drag_drop.js \
                  browser_pluginplaypreview.js \
                  browser_pluginplaypreview2.js \
                  browser_private_browsing_window.js \

browser/base/content/test/browser_CTPScriptPlugin.js

@@ -144,7 +144,10 @@ function testExpectPopupPart1() {
   var notification = PopupNotifications.getNotification("click-to-play-plugins", gTestBrowser);
   ok(notification, "should have a click-to-play notification (" + getCurrentTestLocation() + ")");
 
-  var condition = function() !notification.dismissed;
+  var condition = function() {
+    var notification = PopupNotifications.getNotification("click-to-play-plugins", gTestBrowser);
+    return !notification.dismissed;
+  };
   waitForCondition(condition, testExpectPopupPart2, "waited too long for popup notification to show (" + getCurrentTestLocation() + ")");
 }
 

browser/base/content/test/browser_CTP_drag_drop.js

@@ -0,0 +1,56 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+let gHttpTestRoot = getRootDirectory(gTestPath).replace("chrome://mochitests/content/", "http://127.0.0.1:8888/");
+
+let gNextTest = null;
+let gNewWindow = null;
+
+Components.utils.import("resource://gre/modules/Services.jsm");
+
+function test() {
+  waitForExplicitFinish();
+  registerCleanupFunction(function() { Services.prefs.clearUserPref("plugins.click_to_play"); });
+  Services.prefs.setBoolPref("plugins.click_to_play", true);
+
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("PluginBindingAttached", handleEvent, true, true);
+  gNextTest = part1;
+  gBrowser.selectedBrowser.contentDocument.location = gHttpTestRoot + "plugin_test.html";
+}
+
+function handleEvent() {
+  gNextTest();
+}
+
+function part1() {
+  gBrowser.selectedBrowser.removeEventListener("PluginBindingAttached", handleEvent);
+  ok(PopupNotifications.getNotification("click-to-play-plugins", gBrowser.selectedBrowser), "Should have a click-to-play notification in the initial tab");
+
+  gNextTest = part2;
+  gNewWindow = gBrowser.replaceTabWithWindow(gBrowser.selectedTab);
+  gNewWindow.addEventListener("load", handleEvent, true);
+}
+
+function part2() {
+  gNewWindow.removeEventListener("load", handleEvent);
+  let condition = function() PopupNotifications.getNotification("click-to-play-plugins", gNewWindow.gBrowser.selectedBrowser);
+  waitForCondition(condition, part3, "Waited too long for click-to-play notification");
+}
+
+function part3() {
+  ok(PopupNotifications.getNotification("click-to-play-plugins", gNewWindow.gBrowser.selectedBrowser), "Should have a click-to-play notification in the tab in the new window");
+  ok(!PopupNotifications.getNotification("click-to-play-plugins", gBrowser.selectedBrowser), "Should not have a click-to-play notification in the old window now");
+
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.swapBrowsersAndCloseOther(gBrowser.selectedTab, gNewWindow.gBrowser.selectedTab);
+  let condition = function() PopupNotifications.getNotification("click-to-play-plugins", gBrowser.selectedBrowser);
+  waitForCondition(condition, part4, "Waited too long for click-to-play notification");
+}
+
+function part4() {
+  ok(PopupNotifications.getNotification("click-to-play-plugins", gBrowser.selectedBrowser), "Should have a click-to-play notification in the initial tab again");
+
+  gBrowser.removeCurrentTab();
+  finish();
+}

browser/devtools/debugger/debugger-panes.js

@@ -104,8 +104,8 @@ create({ constructor: SourcesView, proto: MenuContainer.prototype }, {
    */
   addSource: function DVS_addSource(aSource, aOptions = {}) {
     let url = aSource.url;
-    let label = SourceUtils.getSourceLabel(url);
-    let group = SourceUtils.getSourceGroup(url);
+    let label = SourceUtils.getSourceLabel(url.split(" -> ").pop());
+    let group = SourceUtils.getSourceGroup(url.split(" -> ").pop());
 
     // Append a source item to this container.
     let sourceItem = this.push([label, url, group], {

toolkit/devtools/debugger/server/dbg-script-actors.js

@@ -520,105 +520,97 @@ ThreadActor.prototype = {
    *        The location of the breakpoint as specified in the protocol.
    */
   _setBreakpoint: function TA__setBreakpoint(aLocation) {
-    // Fetch the list of scripts in that url.
-    let scripts = this._scripts[aLocation.url];
-    // Fetch the outermost script in that list.
-    let script = null;
-    for (let i = 0; i <= aLocation.line; i++) {
-      // Stop when the first script that contains this location is found.
-      if (scripts[i]) {
-        // If that first script does not contain the line specified, it's no
-        // good. Note that |i === scripts[i].startLine| in this case, so the
-        // following check makes sure we are not considering a script that does
-        // not include |aLocation.line|.
-        if (i + scripts[i].lineCount < aLocation.line) {
-          continue;
-        }
-        script = scripts[i];
-        break;
-      }
-    }
+    let breakpoints = this._breakpointStore[aLocation.url];
 
-    let location = { url: aLocation.url, line: aLocation.line };
-    // Get the list of cached breakpoints in this URL.
-    let scriptBreakpoints = this._breakpointStore[location.url];
-    let bpActor;
-    if (scriptBreakpoints &&
-        scriptBreakpoints[location.line] &&
-        scriptBreakpoints[location.line].actor) {
-      bpActor = scriptBreakpoints[location.line].actor;
-    }
-    if (!bpActor) {
-      bpActor = new BreakpointActor(this, location);
-      this._hooks.addToParentPool(bpActor);
-      if (scriptBreakpoints[location.line]) {
-        scriptBreakpoints[location.line].actor = bpActor;
-      }
+    let actor;
+    if (breakpoints[aLocation.line].actor) {
+      actor = breakpoints[aLocation.line].actor;
+    } else {
+      actor = breakpoints[aLocation.line].actor = new BreakpointActor(this, {
+        url: aLocation.url,
+        line: aLocation.line
+      });
+      this._hooks.addToParentPool(actor);
     }
 
-    if (!script) {
-      return { error: "noScript", actor: bpActor.actorID };
+    let scripts = this.dbg.findScripts(aLocation);
+    if (scripts.length == 0) {
+      return {
+        error: "noScript",
+        actor: actor.actorID
+      };
     }
 
-    let inner, codeFound = false;
-    // We need to set the breakpoint in every script that has bytecode in the
-    // specified line.
-    for (let s of this._getContainers(script, aLocation.line)) {
-      // The first result of the iteration is the innermost script.
-      if (!inner) {
-        inner = s;
-      }
-
-      let offsets = s.getLineOffsets(aLocation.line);
-      if (offsets.length) {
-        bpActor.addScript(s, this);
-        for (let i = 0; i < offsets.length; i++) {
-          s.setBreakpoint(offsets[i], bpActor);
-          codeFound = true;
+    let found = false;
+    for (let script of scripts) {
+      let offsets = script.getLineOffsets(aLocation.line);
+      if (offsets.length > 0) {
+        for (let offset of offsets) {
+          script.setBreakpoint(offset, actor);
         }
+        actor.addScript(script, this);
+        found = true;
       }
     }
+    if (found) {
+      return {
+        actor: actor.actorID
+      };
+    }
+
+    let scripts = this.dbg.findScripts({
+      url: aLocation.url,
+      line: aLocation.line,
+      innermost: true
+    });
 
     let actualLocation;
-    if (!codeFound) {
-      // No code at that line in any script, skipping forward in the innermost
-      // script.
-      let lines = inner.getAllOffsets();
-      let oldLine = aLocation.line;
-      for (let line = oldLine; line < lines.length; ++line) {
-        if (lines[line]) {
-          for (let i = 0; i < lines[line].length; i++) {
-            inner.setBreakpoint(lines[line][i], bpActor);
-            codeFound = true;
+    let found = false;
+    for (let script of scripts) {
+      let offsets = script.getAllOffsets();
+      for (let line = aLocation.line; line < offsets.length; ++line) {
+        if (offsets[line]) {
+          for (let offset of offsets[line]) {
+            script.setBreakpoint(offset, actor);
           }
-          bpActor.addScript(inner, this);
-          actualLocation = {
-            url: aLocation.url,
-            line: line,
-            column: aLocation.column
-          };
-          // If there wasn't already a breakpoint at that line, update the cache
-          // as well.
-          if (scriptBreakpoints[line] && scriptBreakpoints[line].actor) {
-            let existing = scriptBreakpoints[line].actor;
-            bpActor.onDelete();
-            delete scriptBreakpoints[oldLine];
-            return { actor: existing.actorID, actualLocation: actualLocation };
+          actor.addScript(script, this);
+          if (!actualLocation) {
+            actualLocation = {
+              url: aLocation.url,
+              line: line,
+              column: aLocation.column
+            };
           }
-          bpActor.location = actualLocation;
-          scriptBreakpoints[line] = scriptBreakpoints[oldLine];
-          scriptBreakpoints[line].line = line;
-          delete scriptBreakpoints[oldLine];
+          found = true;
           break;
         }
       }
     }
-
-    if (!codeFound) {
-      return  { error: "noCodeAtLineColumn", actor: bpActor.actorID };
+    if (found) {
+      if (breakpoints[actualLocation.line] &&
+          breakpoints[actualLocation.line].actor) {
+        actor.onDelete();
+        delete breakpoints[aLocation.line];
+        return {
+          actor: breakpoints[actualLocation.line].actor.actorID,
+          actualLocation: actualLocation
+        };
+      } else {
+        actor.location = actualLocation;
+        breakpoints[actualLocation.line] = breakpoints[aLocation.line];
+        breakpoints[actualLocation.line].line = actualLocation.line;
+        delete breakpoints[aLocation.line];
+        return {
+          actor: actor.actorID,
+          actualLocation: actualLocation
+        };
+      }
     }
 
-    return { actor: bpActor.actorID, actualLocation: actualLocation };
+    return {
+      error: "noCodeAtLineColumn",
+      actor: actor.actorID
+    };
   },
 
   /**
@@ -1488,7 +1480,7 @@ SourceActor.prototype = {
   _loadSource: function SA__loadSource() {
     let deferred = defer();
     let scheme;
-    let url = this._url;
+    let url = this._url.split(" -> ").pop();
 
     try {
       scheme = Services.io.extractScheme(url);

toolkit/devtools/debugger/tests/unit/test_breakpoint-02.js

@@ -27,13 +27,13 @@ function run_test()
 
 function test_breakpoint_running()
 {
-  let path = getFilePath('test_breakpoint-02.js');
-  let location = { url: path, line: gDebuggee.line0 + 2};
-
   gDebuggee.eval("var line0 = Error().lineNumber;\n" +
                  "var a = 1;\n" +  // line0 + 1
                  "var b = 2;\n");  // line0 + 2
 
+  let path = getFilePath('test_breakpoint-02.js');
+  let location = { url: path, line: gDebuggee.line0 + 2};
+
   // Setting the breakpoint later should interrupt the debuggee.
   gThreadClient.addOneTimeListener("paused", function (aEvent, aPacket) {
     do_check_eq(aPacket.type, "paused");
@@ -43,7 +43,7 @@ function test_breakpoint_running()
   gThreadClient.setBreakpoint(location, function(aResponse) {
     // Eval scripts don't stick around long enough for the breakpoint to be set,
     // so just make sure we got the expected response from the actor.
-    do_check_eq(aResponse.error, "noScript");
+    do_check_neq(aResponse.error, "noScript");
 
     do_execute_soon(function() {
       finishClient(gClient);