Merge mozilla-central and fx-team

browser/devtools/framework/toolbox.js

@@ -744,7 +744,7 @@ Toolbox.prototype = {
     gDevTools.off("tool-registered", this._toolRegistered);
     gDevTools.off("tool-unregistered", this._toolUnregistered);
 
-    // Revert docShell.allowJavascript back to it's original value if it was
+    // Revert docShell.allowJavascript back to its original value if it was
     // changed via the Disable JS option.
     if (typeof this._origAllowJavascript != "undefined") {
       let docShell = this._host.hostTab.linkedBrowser.docShell;
@@ -755,7 +755,12 @@ Toolbox.prototype = {
     let outstanding = [];
 
     for (let [id, panel] of this._toolPanels) {
-      outstanding.push(panel.destroy());
+      try {
+        outstanding.push(panel.destroy());
+      } catch(e) {
+        // We don't want to stop here if any panel fail to close.
+        console.error(e);
+      }
     }
 
     let container = this.doc.getElementById("toolbox-buttons");

browser/devtools/inspector/highlighter.js

@@ -229,6 +229,13 @@ Highlighter.prototype = {
    */
   invalidateSize: function Highlighter_invalidateSize()
   {
+    let canHiglightNode = this.selection.isNode() &&
+                          this.selection.isConnected() &&
+                          this.selection.isElementNode();
+
+    if (!canHiglightNode)
+      return;
+
     // The highlighter runs locally while the selection runs remotely,
     // so we can't quite trust the selection's isConnected to protect us
     // here, do the check manually.
@@ -238,13 +245,6 @@ Highlighter.prototype = {
       return;
     }
 
-    let canHiglightNode = this.selection.isNode() &&
-                          this.selection.isConnected() &&
-                          this.selection.isElementNode();
-
-    if (!canHiglightNode)
-      return;
-
     let clientRect = this.selection.node.getBoundingClientRect();
     let rect = LayoutHelpers.getDirtyRect(this.selection.node);
     this.highlightRectangle(rect);

browser/devtools/inspector/test/Makefile.in

@@ -43,6 +43,7 @@ MOCHITEST_BROWSER_FILES := \
 		browser_inspector_bug_831693_search_suggestions.html \
 		browser_inspector_bug_835722_infobar_reappears.js \
 		browser_inspector_bug_840156_destroy_after_navigation.js \
+		browser_inspector_reload.js \
 		head.js \
 		$(NULL)
 

browser/devtools/inspector/test/browser_inspector_reload.js

@@ -0,0 +1,51 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+function test() {
+  let inspector, toolbox;
+
+  waitForExplicitFinish();
+
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function onload() {
+    gBrowser.selectedBrowser.removeEventListener("load", onload, true);
+    waitForFocus(function() {
+      let target = TargetFactory.forTab(gBrowser.selectedTab);
+      gDevTools.showToolbox(target, "inspector").then(function(toolbox) {
+        startInspectorTests(toolbox);
+      }).then(null, console.error);
+    }, content);
+  }, true);
+
+  content.location = "data:text/html,<p>p</p>";
+
+  function startInspectorTests(aToolbox)
+  {
+    toolbox = aToolbox;
+    inspector = toolbox.getCurrentPanel();
+    info("Inspector started");
+    let p = content.document.querySelector("p");
+    inspector.selection.setNode(p);
+    inspector.once("inspector-updated", () => {
+      is(inspector.selection.node, p, "Node selected.");
+      inspector.once("markuploaded", onReload);
+      content.location.reload();
+    });
+  }
+
+  function onReload() {
+    info("Page reloaded");
+    let p = content.document.querySelector("p");
+    inspector.selection.setNode(p);
+    inspector.once("inspector-updated", () => {
+      is(inspector.selection.node, p, "Node re-selected.");
+      toolbox.destroy();
+      gBrowser.removeCurrentTab();
+      finish();
+    });
+  }
+}

browser/devtools/markupview/markup-view.js

@@ -668,7 +668,11 @@ MarkupView.prototype = {
     delete this._observer;
 
     if (this._rootNode) {
-      this._rootNode.removeEventListener("load", this, true);
+      try {
+        this._rootNode.removeEventListener("load", this, true);
+      } catch(e) {
+        // this._rootNode might be a dead object.
+      }
       delete this._rootNode;
     }
   },

browser/devtools/netmonitor/netmonitor-controller.js

@@ -23,8 +23,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "NetworkHelper",
   "resource://gre/modules/devtools/NetworkHelper.jsm");
 
 XPCOMUtils.defineLazyServiceGetter(this, "clipboardHelper",
-                                   "@mozilla.org/widget/clipboardhelper;1",
-                                   "nsIClipboardHelper");
+  "@mozilla.org/widget/clipboardhelper;1", "nsIClipboardHelper");
 
 const NET_STRINGS_URI = "chrome://browser/locale/devtools/netmonitor.properties";
 const LISTENERS = [ "NetworkActivity" ];

browser/devtools/netmonitor/netmonitor-view.js

@@ -368,7 +368,7 @@ RequestsMenuView.prototype = Heritage.extend(WidgetMethods, {
   copyUrl: function() {
     let selected = this.selectedItem.attachment;
 
-    clipboardHelper.copyString(selected.url, this.document);
+    clipboardHelper.copyString(selected.url, document);
   },
 
   /**

browser/devtools/netmonitor/test/browser_net_copy_url.js

@@ -12,21 +12,25 @@ function test() {
     let { NetMonitorView } = aMonitor.panelWin;
     let { RequestsMenu } = NetMonitorView;
 
-    RequestsMenu.lazyUpdate = false;
-
     waitForNetworkEvents(aMonitor, 1).then(() => {
-      let imageRequest = RequestsMenu.getItemAtIndex(0);
-      RequestsMenu.selectedItem = imageRequest;
+      let requestItem = RequestsMenu.getItemAtIndex(0);
+      RequestsMenu.selectedItem = requestItem;
 
-      waitForClipboard(RequestsMenu.selectedItem.attachment.url, function(){ RequestsMenu.copyUrl() } , cleanUp, cleanUp);
+      waitForClipboard(requestItem.attachment.url, function setup() {
+        RequestsMenu.copyUrl();
+      }, function onSuccess() {
+        ok(true, "Clipboard contains the currently selected item's url.");
+        cleanUp();
+      }, function onFailure() {
+        ok(false, "Copying the currently selected item's url was unsuccessful.");
+        cleanUp();
+      });
     });
 
     aDebuggee.performRequests(1);
 
     function cleanUp(){
-      teardown(aMonitor);
-      finish();
+      teardown(aMonitor).then(finish);
     }
   });
 }
-

browser/devtools/responsivedesign/responsivedesign.jsm

@@ -146,7 +146,7 @@ function ResponsiveUI(aWindow, aTab)
     this.customPreset.width = bbox.width - 40; // horizontal padding of the container
     this.customPreset.height = bbox.height - 80; // vertical padding + toolbar height
 
-    this.currentPresetKey = this.customPreset.key;
+    this.currentPresetKey = this.presets[1].key; // most common preset
   }
 
   this.container.setAttribute("responsivemode", "true");
@@ -171,6 +171,12 @@ function ResponsiveUI(aWindow, aTab)
   this.buildUI();
   this.checkMenus();
 
+  this.docShell = this.browser.contentWindow.QueryInterface(Ci.nsIInterfaceRequestor)
+                      .getInterface(Ci.nsIWebNavigation)
+                      .QueryInterface(Ci.nsIDocShell);
+
+  this.docShell.deviceSizeIsPageSize = true;
+
   try {
     if (Services.prefs.getBoolPref("devtools.responsiveUI.rotate")) {
       this.rotate();
@@ -208,6 +214,8 @@ ResponsiveUI.prototype = {
       return;
     this.closing = true;
 
+    this.docShell.deviceSizeIsPageSize = false;
+
     if (this._floatingScrollbars)
       switchToNativeScrollbars(this.tab);
 
@@ -241,6 +249,7 @@ ResponsiveUI.prototype = {
     this.container.removeAttribute("responsivemode");
     this.stack.removeAttribute("responsivemode");
 
+    delete this.docShell;
     delete this.tab.__responsiveUI;
     this._telemetry.toolClosed("responsive");
     ResponsiveUIManager.emit("off", this.tab, this);

browser/devtools/responsivedesign/test/Makefile.in

@@ -16,6 +16,7 @@ MOCHITEST_BROWSER_FILES := \
 		browser_responsiveruleview.js \
 		browser_responsive_cmd.js \
 		browser_responsivecomputedview.js \
+		browser_responsive_devicewidth.js \
 		head.js \
 		$(NULL)
 

browser/devtools/responsivedesign/test/browser_responsive_devicewidth.js

@@ -0,0 +1,61 @@
+/* Any copyright is dedicated to the Public Domain.
+http://creativecommons.org/publicdomain/zero/1.0/ */
+
+function test() {
+  let instance;
+  let mgr = ResponsiveUI.ResponsiveUIManager;
+
+  waitForExplicitFinish();
+
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function onload() {
+    gBrowser.selectedBrowser.removeEventListener("load", onload, true);
+    waitForFocus(startTest, content);
+  }, true);
+
+  content.location = "data:text/html,mop";
+
+  function startTest() {
+    mgr.once("on", function() {executeSoon(onUIOpen)});
+    document.getElementById("Tools:ResponsiveUI").doCommand();
+  }
+
+  function onUIOpen() {
+    instance = gBrowser.selectedTab.__responsiveUI;
+    instance.stack.setAttribute("notransition", "true");
+    ok(instance, "instance of the module is attached to the tab.");
+
+    let mql = content.matchMedia("(max-device-width:100px)")
+
+    ok(!mql.matches, "media query doesn't match.");
+
+    mql.addListener(onMediaChange);
+    instance.setSize(90, 500);
+  }
+
+  function onMediaChange(mql) {
+    mql.removeListener(onMediaChange);
+    ok(mql.matches, "media query matches.");
+    ok(window.screen.width != content.screen.width, "screen.width is not the size of the screen.");
+    is(content.screen.width, 90, "screen.width is the width of the page.");
+    is(content.screen.height, 500, "screen.height is the height of the page.");
+
+
+    let docShell = content.QueryInterface(Ci.nsIInterfaceRequestor)
+                          .getInterface(Ci.nsIWebNavigation)
+                          .QueryInterface(Ci.nsIDocShell);
+
+    mql.addListener(onMediaChange2);
+    docShell.deviceSizeIsPageSize = false;
+  }
+
+  function onMediaChange2(mql) {
+    mql.removeListener(onMediaChange);
+    ok(!mql.matches, "media query has been re-evaluated.");
+    ok(window.screen.width == content.screen.width, "screen.width is not the size of the screen.");
+    instance.stack.removeAttribute("notransition");
+    document.getElementById("Tools:ResponsiveUI").doCommand();
+    gBrowser.removeCurrentTab();
+    finish();
+  }
+}

browser/devtools/responsivedesign/test/browser_responsiveui.js

@@ -137,7 +137,8 @@ function test() {
       info("XXX BUG 851296: 'on' received.");
       executeSoon(onUIOpen2);
     });
-    synthesizeKeyFromKeyTag("key_responsiveUI");
+    //XXX BUG 851296: synthesizeKeyFromKeyTag("key_responsiveUI");
+    mgr.toggle(window, gBrowser.selectedTab);
     info("XXX BUG 851296: restart() finished.");
   }
 

browser/themes/shared/devtools/dark-theme.css

@@ -44,7 +44,7 @@
 }
 
 .theme-selected {
-  background: #26384E;
+  background: #26394D;
 }
 
 .theme-bg-darker {

browser/themes/shared/devtools/light-theme.css

@@ -44,7 +44,7 @@
 }
 
 .theme-selected {
-  background-color: hsl(0,0%,90%);
+  background-color: #CCC;
 }
 
 .theme-bg-darker {

browser/themes/shared/devtools/markup-view.css

@@ -11,10 +11,6 @@
   cursor: pointer;
 }
 
-.selected {
-  background-color: hsl(0,0%,90%);
-}
-
 /* Give some padding to focusable elements to match the editor input
  * that will replace them. */
 span[tabindex] {

docshell/base/nsDocShell.cpp

@@ -771,6 +771,7 @@ nsDocShell::nsDocShell():
     mIsAppTab(false),
     mUseGlobalHistory(false),
     mInPrivateBrowsing(false),
+    mDeviceSizeIsPageSize(false),
     mFiredUnloadEvent(false),
     mEODForCurrentDocument(false),
     mURIResultedInDocument(false),
@@ -3930,6 +3931,27 @@ nsDocShell::GetCurrentSHEntry(nsISHEntry** aEntry, bool* aOSHE)
     return NS_OK;
 }
 
+NS_IMETHODIMP
+nsDocShell::SetDeviceSizeIsPageSize(bool aValue)
+{
+    if (mDeviceSizeIsPageSize != aValue) {
+      mDeviceSizeIsPageSize = aValue;
+      nsRefPtr<nsPresContext> presContext;
+      GetPresContext(getter_AddRefs(presContext));
+      if (presContext) {
+          presContext->MediaFeatureValuesChanged(presContext->eAlwaysRebuildStyle);
+      }
+    }
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDocShell::GetDeviceSizeIsPageSize(bool* aValue)
+{
+    *aValue = mDeviceSizeIsPageSize;
+    return NS_OK;
+}
+
 void
 nsDocShell::ClearFrameHistory(nsISHEntry* aEntry)
 {

docshell/base/nsDocShell.h

@@ -824,6 +824,7 @@ protected:
     bool                       mIsAppTab;
     bool                       mUseGlobalHistory;
     bool                       mInPrivateBrowsing;
+    bool                       mDeviceSizeIsPageSize;
 
     // This boolean is set to true right before we fire pagehide and generally
     // unset when we embed a new content viewer.  While it's true no navigation

docshell/base/nsIDocShell.idl

@@ -873,4 +873,12 @@ interface nsIDocShell : nsIDocShellTreeItem
    * Returns false for mLSHE, true for mOSHE
    */
   boolean getCurrentSHEntry(out nsISHEntry aEntry);
+
+  /**
+   * If deviceSizeIsPageSize is set to true, device-width/height media queries
+   * will be calculated from the page size, not the device size.
+   *
+   * Used by the Responsive Design View.
+   */
+  [infallible] attribute boolean deviceSizeIsPageSize;
 };

dom/base/nsScreen.cpp

@@ -387,6 +387,19 @@ nsScreen::SlowMozUnlockOrientation()
   return NS_OK;
 }
 
+bool
+nsScreen::IsDeviceSizePageSize()
+{
+  nsPIDOMWindow* owner = GetOwner();
+  if (owner) {
+    nsIDocShell* docShell = owner->GetDocShell();
+    if (docShell) {
+      return docShell->GetDeviceSizeIsPageSize();
+    }
+  }
+  return false;
+}
+
 /* virtual */
 JSObject*
 nsScreen::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)

dom/base/nsScreen.h

@@ -56,6 +56,15 @@ public:
   int32_t GetWidth(ErrorResult& aRv)
   {
     nsRect rect;
+    if (IsDeviceSizePageSize()) {
+      nsCOMPtr<nsPIDOMWindow> owner = GetOwner();
+      if (owner) {
+        int32_t innerWidth = 0;
+        aRv = owner->GetInnerWidth(&innerWidth);
+        return innerWidth;
+      }
+    }
+
     aRv = GetRect(rect);
     return rect.width;
   }
@@ -63,6 +72,15 @@ public:
   int32_t GetHeight(ErrorResult& aRv)
   {
     nsRect rect;
+    if (IsDeviceSizePageSize()) {
+      nsCOMPtr<nsPIDOMWindow> owner = GetOwner();
+      if (owner) {
+        int32_t innerHeight = 0;
+        aRv = owner->GetInnerHeight(&innerHeight);
+        return innerHeight;
+      }
+    }
+
     aRv = GetRect(rect);
     return rect.height;
   }
@@ -145,6 +163,8 @@ private:
 
   LockPermission GetLockOrientationPermission() const;
 
+  bool IsDeviceSizePageSize();
+
   nsRefPtr<FullScreenEventListener> mEventListener;
 };
 

layout/base/nsPresContext.cpp

@@ -2586,6 +2586,17 @@ nsPresContext::IsCrossProcessRootContentDocument()
   return (tabChild && tabChild->IsRootContentDocument());
 }
 
+bool
+nsPresContext::IsDeviceSizePageSize()
+{
+  bool isDeviceSizePageSize = false;
+  nsCOMPtr<nsIDocShell> docShell(do_QueryReferent(mContainer));
+  if (docShell) {
+    isDeviceSizePageSize = docShell->GetDeviceSizeIsPageSize();
+  }
+  return isDeviceSizePageSize;
+}
+
 nsRootPresContext::nsRootPresContext(nsIDocument* aDocument,
                                      nsPresContextType aType)
   : nsPresContext(aDocument, aType),

layout/base/nsPresContext.h

@@ -1006,6 +1006,8 @@ public:
     mExistThrottledUpdates = aExistThrottledUpdates;
   }
 
+  bool IsDeviceSizePageSize();
+
 protected:
   friend class nsRunnableMethod<nsPresContext>;
   NS_HIDDEN_(void) ThemeChangedInternal();

layout/style/nsMediaFeatures.cpp

@@ -109,14 +109,19 @@ static nsSize
 GetDeviceSize(nsPresContext* aPresContext)
 {
     nsSize size;
-    if (aPresContext->IsRootPaginatedDocument())
+
+    if (aPresContext->IsDeviceSizePageSize()) {
+        size = GetSize(aPresContext);
+    } else if (aPresContext->IsRootPaginatedDocument()) {
         // We want the page size, including unprintable areas and margins.
         // XXX The spec actually says we want the "page sheet size", but
         // how is that different?
         size = aPresContext->GetPageSize();
-    else
+    } else {
         GetDeviceContextFor(aPresContext)->
             GetDeviceSurfaceDimensions(size.width, size.height);
+    }
+
     return size;
 }