From 0ff15d35ae48dd5389eecdb12794ebe51ad5b62f Mon Sep 17 00:00:00 2001
From: Jordan Santell <jsantell@gmail.com>
Date: Wed, 3 Dec 2014 16:36:00 +0100
Subject: [PATCH 01/17] Bug 1077458 - Implement marker's waterfall view in new
 performance tool, with details view toggling between  waterfall and call tree
 views. r=vp

---
 browser/devtools/jar.mn                       |   1 +
 browser/devtools/performance/controller.js    |  29 +++-
 browser/devtools/performance/modules/front.js |  12 +-
 browser/devtools/performance/performance.xul  |  25 ++-
 browser/devtools/performance/test/browser.ini |   4 +
 ...rowser_perf-details-waterfall-render-01.js |  26 +++
 .../performance/test/browser_perf-details.js  |  46 ++++++
 .../performance/test/browser_perf-front.js    |  27 +++
 browser/devtools/performance/test/head.js     |  14 +-
 browser/devtools/performance/views/details.js |  61 +++++--
 .../devtools/performance/views/waterfall.js   | 116 +++++++++++++
 browser/devtools/timeline/timeline.js         |   6 +-
 .../timeline/widgets/marker-details.js        |   7 +-
 .../devtools/timeline/widgets/waterfall.js    |  17 +-
 .../shared/devtools/performance.inc.css       | 156 ++++++++++++++++++
 toolkit/devtools/server/actors/timeline.js    |   9 +-
 16 files changed, 521 insertions(+), 35 deletions(-)
 create mode 100644 browser/devtools/performance/test/browser_perf-details-waterfall-render-01.js
 create mode 100644 browser/devtools/performance/test/browser_perf-details.js
 create mode 100644 browser/devtools/performance/test/browser_perf-front.js
 create mode 100644 browser/devtools/performance/views/waterfall.js

diff --git a/browser/devtools/jar.mn b/browser/devtools/jar.mn
index b8999907a87e..55c1c4410675 100644
--- a/browser/devtools/jar.mn
+++ b/browser/devtools/jar.mn
@@ -93,6 +93,7 @@ browser.jar:
     content/browser/devtools/performance/views/overview.js             (performance/views/overview.js)
     content/browser/devtools/performance/views/details.js              (performance/views/details.js)
     content/browser/devtools/performance/views/call-tree.js            (performance/views/call-tree.js)
+    content/browser/devtools/performance/views/waterfall.js            (performance/views/waterfall.js)
 #endif
     content/browser/devtools/responsivedesign/resize-commands.js       (responsivedesign/resize-commands.js)
     content/browser/devtools/commandline.css                           (commandline/commandline.css)
diff --git a/browser/devtools/performance/controller.js b/browser/devtools/performance/controller.js
index b18b6e24ee77..c5e600776081 100644
--- a/browser/devtools/performance/controller.js
+++ b/browser/devtools/performance/controller.js
@@ -23,6 +23,10 @@ devtools.lazyRequireGetter(this, "L10N",
   "devtools/profiler/global", true);
 devtools.lazyImporter(this, "LineGraphWidget",
   "resource:///modules/devtools/Graphs.jsm");
+devtools.lazyRequireGetter(this, "Waterfall",
+  "devtools/timeline/waterfall", true);
+devtools.lazyRequireGetter(this, "MarkerDetails",
+  "devtools/timeline/marker-details", true);
 devtools.lazyRequireGetter(this, "CallView",
   "devtools/profiler/tree-view", true);
 devtools.lazyRequireGetter(this, "ThreadNode",
@@ -47,8 +51,14 @@ const EVENTS = {
   // Emitted by the OverviewView when a selection range has been removed
   OVERVIEW_RANGE_CLEARED: "Performance:UI:OverviewRangeCleared",
 
+  // Emitted by the DetailsView when a subview is selected
+  DETAILS_VIEW_SELECTED: "Performance:UI:DetailsViewSelected",
+
   // Emitted by the CallTreeView when a call tree has been rendered
-  CALL_TREE_RENDERED: "Performance:UI:CallTreeRendered"
+  CALL_TREE_RENDERED: "Performance:UI:CallTreeRendered",
+
+  // Emitted by the WaterfallView when it has been rendered
+  WATERFALL_RENDERED: "Performance:UI:WaterfallRendered"
 };
 
 /**
@@ -112,6 +122,7 @@ let PerformanceController = {
     PerformanceView.on(EVENTS.UI_START_RECORDING, this.startRecording);
     PerformanceView.on(EVENTS.UI_STOP_RECORDING, this.stopRecording);
     gFront.on("ticks", this._onTimelineData);
+    gFront.on("markers", this._onTimelineData);
   },
 
   /**
@@ -120,6 +131,8 @@ let PerformanceController = {
   destroy: function() {
     PerformanceView.off(EVENTS.UI_START_RECORDING, this.startRecording);
     PerformanceView.off(EVENTS.UI_STOP_RECORDING, this.stopRecording);
+    gFront.off("ticks", this._onTimelineData);
+    gFront.off("markers", this._onTimelineData);
   },
 
   /**
@@ -127,8 +140,12 @@ let PerformanceController = {
    * when the front is starting to record.
    */
   startRecording: Task.async(function *() {
-    yield gFront.startRecording();
-    this.emit(EVENTS.RECORDING_STARTED);
+    // Save local start time for use with faking the endTime
+    // if not returned from the timeline actor
+    this._localStartTime = performance.now();
+
+    let startTime = this._startTime = yield gFront.startRecording();
+    this.emit(EVENTS.RECORDING_STARTED, startTime);
   }),
 
   /**
@@ -137,6 +154,12 @@ let PerformanceController = {
    */
   stopRecording: Task.async(function *() {
     let results = yield gFront.stopRecording();
+    // If `endTime` is not yielded from timeline actor (< Fx36),
+    // fake an endTime
+    if (!results.endTime) {
+      this._endTime = results.endTime = this._startTime + (performance.now() - this._localStartTime);
+    }
+
     this.emit(EVENTS.RECORDING_STOPPED, results);
   }),
 
diff --git a/browser/devtools/performance/modules/front.js b/browser/devtools/performance/modules/front.js
index ffd1fda724d0..723008acf14e 100644
--- a/browser/devtools/performance/modules/front.js
+++ b/browser/devtools/performance/modules/front.js
@@ -237,7 +237,12 @@ PerformanceFront.prototype = {
     // The timeline actor is target-dependent, so just make sure
     // it's recording.
     let withMemory = showTimelineMemory();
-    yield this._request("timeline", "start", { withTicks: true, withMemory: withMemory });
+
+    // Return start time from timeline actor
+    let startTime = yield this._request("timeline", "start", { withTicks: true, withMemory: withMemory });
+    this._startTime = startTime;
+
+    return { startTime };
   }),
 
   /**
@@ -254,12 +259,13 @@ PerformanceFront.prototype = {
     filterSamples(profilerData, this._profilingStartTime);
     offsetSampleTimes(profilerData, this._profilingStartTime);
 
-    yield this._request("timeline", "stop");
+    let endTime = this._endTime = yield this._request("timeline", "stop");
 
     // Join all the acquired data and return it for outside consumers.
     return {
       recordingDuration: profilerData.currentTime - this._profilingStartTime,
-      profilerData: profilerData
+      profilerData: profilerData,
+      endTime: endTime
     };
   }),
 
diff --git a/browser/devtools/performance/performance.xul b/browser/devtools/performance/performance.xul
index e4759486596e..a6fbb7dc3085 100644
--- a/browser/devtools/performance/performance.xul
+++ b/browser/devtools/performance/performance.xul
@@ -19,6 +19,7 @@
   <script type="application/javascript" src="performance/views/overview.js"/>
   <script type="application/javascript" src="performance/views/details.js"/>
   <script type="application/javascript" src="performance/views/call-tree.js"/>
+  <script type="application/javascript" src="performance/views/waterfall.js"/>
 
   <vbox class="theme-body" flex="1">
     <toolbar id="performance-toolbar" class="devtools-toolbar">
@@ -44,10 +45,28 @@
       <vbox id="time-framerate" flex="1"/>
     </box>
     <splitter class="devtools-horizontal-splitter" />
-    <box id="details-pane"
+    <toolbar id="details-toolbar" class="devtools-toolbar">
+      <hbox class="devtools-toolbarbutton-group">
+        <toolbarbutton id="select-waterfall-view"
+                       class="devtools-toolbarbutton"
+                       tooltiptext="waterfall"
+                       data-view="waterfall" />
+        <toolbarbutton id="select-calltree-view"
+                       class="devtools-toolbarbutton"
+                       tooltiptext="calltree"
+                       data-view="calltree" />
+      </hbox>
+    </toolbar>
+    <deck id="details-pane"
          class="devtools-responsive-container"
          flex="1">
-      <vbox class="call-tree" flex="1">
+      <hbox id="waterfall-view" flex="1">
+        <vbox id="waterfall-graph" flex="1" />
+        <splitter class="devtools-side-splitter"/>
+        <vbox id="waterfall-details" class="theme-sidebar" width="150" height="150"/>
+      </hbox>
+
+      <vbox id="calltree-view" class="call-tree" flex="1">
         <hbox class="call-tree-headers-container">
           <label class="plain call-tree-header"
                  type="duration"
@@ -76,6 +95,6 @@
         </hbox>
         <vbox class="call-tree-cells-container" flex="1"/>
       </vbox>
-    </box>
+    </deck>
   </vbox>
 </window>
diff --git a/browser/devtools/performance/test/browser.ini b/browser/devtools/performance/test/browser.ini
index dff4fc49da20..6e568420a4c1 100644
--- a/browser/devtools/performance/test/browser.ini
+++ b/browser/devtools/performance/test/browser.ini
@@ -9,6 +9,7 @@ support-files =
 # that need to be moved over to performance tool
 
 [browser_perf-aaa-run-first-leaktest.js]
+[browser_perf-front.js]
 [browser_perf-front-basic-timeline-01.js]
 [browser_perf-front-basic-profiler-01.js]
 # bug 1077464
@@ -32,5 +33,8 @@ support-files =
 [browser_perf-overview-render-01.js]
 [browser_perf-overview-render-02.js]
 [browser_perf-overview-selection.js]
+
+[browser_perf-details.js]
 [browser_perf-details-calltree-render-01.js]
 [browser_perf-details-calltree-render-02.js]
+[browser_perf-details-waterfall-render-01.js]
diff --git a/browser/devtools/performance/test/browser_perf-details-waterfall-render-01.js b/browser/devtools/performance/test/browser_perf-details-waterfall-render-01.js
new file mode 100644
index 000000000000..571bfe80b738
--- /dev/null
+++ b/browser/devtools/performance/test/browser_perf-details-waterfall-render-01.js
@@ -0,0 +1,26 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Tests that the waterfall view renders content after recording.
+ */
+function spawnTest () {
+  let { panel } = yield initPerformance(SIMPLE_URL);
+  let { EVENTS, WaterfallView } = panel.panelWin;
+
+  yield startRecording(panel);
+
+  yield waitUntil(() => WaterfallView._markers.length);
+
+  let rendered = once(WaterfallView, EVENTS.WATERFALL_RENDERED);
+
+  yield stopRecording(panel);
+
+  yield rendered;
+  ok(true, "WaterfallView rendered after recording is stopped.");
+
+  ok(WaterfallView._markers.length, "WaterfallView contains markers");
+
+  yield teardown(panel);
+  finish();
+}
diff --git a/browser/devtools/performance/test/browser_perf-details.js b/browser/devtools/performance/test/browser_perf-details.js
new file mode 100644
index 000000000000..8dfc28951fa4
--- /dev/null
+++ b/browser/devtools/performance/test/browser_perf-details.js
@@ -0,0 +1,46 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Tests that the details view toggles subviews.
+ */
+function spawnTest () {
+  let { panel } = yield initPerformance(SIMPLE_URL);
+  let { EVENTS, $, DetailsView, document: doc } = panel.panelWin;
+
+  info("views on startup");
+  checkViews(DetailsView, doc, "waterfall");
+
+  // Select calltree view
+  let viewChanged = onceSpread(DetailsView, EVENTS.DETAILS_VIEW_SELECTED);
+  command($("toolbarbutton[data-view='calltree']"));
+  let [_, viewName] = yield viewChanged;
+  is(viewName, "calltree", "DETAILS_VIEW_SELECTED fired with view name");
+  checkViews(DetailsView, doc, "calltree");
+
+  // Select waterfall view
+  viewChanged = onceSpread(DetailsView, EVENTS.DETAILS_VIEW_SELECTED);
+  command($("toolbarbutton[data-view='waterfall']"));
+  [_, viewName] = yield viewChanged;
+  is(viewName, "waterfall", "DETAILS_VIEW_SELECTED fired with view name");
+  checkViews(DetailsView, doc, "waterfall");
+
+
+  yield teardown(panel);
+  finish();
+}
+
+function checkViews (DetailsView, doc, currentView) {
+  for (let viewName in DetailsView.views) {
+    let view = DetailsView.views[viewName].el;
+    let button = doc.querySelector("toolbarbutton[data-view='" + viewName + "']");
+
+    if (viewName === currentView) {
+      ok(!view.getAttribute("hidden"), view + " view displayed");
+      ok(button.getAttribute("checked"), view + " button checked");
+    } else {
+      ok(view.getAttribute("hidden"), view + " view hidden");
+      ok(!button.getAttribute("checked"), view + " button not checked");
+    }
+  }
+}
diff --git a/browser/devtools/performance/test/browser_perf-front.js b/browser/devtools/performance/test/browser_perf-front.js
new file mode 100644
index 000000000000..a39a5baea548
--- /dev/null
+++ b/browser/devtools/performance/test/browser_perf-front.js
@@ -0,0 +1,27 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Test basic functionality of PerformanceFront, emitting start and endtime values
+ */
+
+let WAIT = 1000;
+
+function spawnTest () {
+  let { target, front } = yield initBackend(SIMPLE_URL);
+
+  let { startTime } = yield front.startRecording();
+
+  ok(typeof startTime === "number", "front.startRecording() emits start time");
+
+  yield busyWait(WAIT);
+
+  let { endTime } = yield front.stopRecording();
+
+  ok(typeof endTime === "number", "front.stopRecording() emits end time");
+  ok(endTime > startTime, "endTime is after startTime");
+
+  yield removeTab(target.tab);
+  finish();
+
+}
diff --git a/browser/devtools/performance/test/head.js b/browser/devtools/performance/test/head.js
index b2f9498b0747..25ae10f0ed0b 100644
--- a/browser/devtools/performance/test/head.js
+++ b/browser/devtools/performance/test/head.js
@@ -211,8 +211,14 @@ function busyWait(time) {
   while (Date.now() - start < time) { stack = Components.stack; }
 }
 
-function idleWait(time) {
-  return DevToolsUtils.waitForTime(time);
+function command (button) {
+  let ev = button.ownerDocument.createEvent("XULCommandEvent");
+  ev.initCommandEvent("command", true, true, button.ownerDocument.defaultView, 0, false, false, false, false, null);
+  button.dispatchEvent(ev);
+}
+
+function click (win, button) {
+  EventUtils.sendMouseEvent({ type: "click" }, button, win);
 }
 
 function* startRecording(panel) {
@@ -227,7 +233,7 @@ function* startRecording(panel) {
   ok(!button.hasAttribute("locked"),
     "The record button should not be locked yet.");
 
-  EventUtils.sendMouseEvent({ type: "click" }, button, win);
+  click(win, button);
 
   yield clicked;
 
@@ -255,7 +261,7 @@ function* stopRecording(panel) {
   ok(!button.hasAttribute("locked"),
     "The record button should not be locked yet.");
 
-  EventUtils.sendMouseEvent({ type: "click" }, button, win);
+  click(win, button);
 
   yield clicked;
 
diff --git a/browser/devtools/performance/views/details.js b/browser/devtools/performance/views/details.js
index 4ba01d4f1e4a..9319c24bab37 100644
--- a/browser/devtools/performance/views/details.js
+++ b/browser/devtools/performance/views/details.js
@@ -3,34 +3,69 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
+const DEFAULT_DETAILS_SUBVIEW = "waterfall";
+
 /**
  * Details view containing profiler call tree. Manages
  * subviews and toggles visibility between them.
  */
 let DetailsView = {
+  /**
+   * Name to index mapping of subviews, used by selecting view.
+   */
+  viewIndexes: {
+    waterfall: 0,
+    calltree: 1
+  },
+
   /**
    * Sets up the view with event binding, initializes
    * subviews.
    */
-  initialize: function () {
-    this.views = {
-      callTree: CallTreeView
-    };
+  initialize: Task.async(function *() {
+    this.el = $("#details-pane");
 
-    // Initialize subviews
-    return promise.all([
-      CallTreeView.initialize()
-    ]);
+    this._onViewToggle = this._onViewToggle.bind(this);
+
+    for (let button of $$("toolbarbutton[data-view]", $("#details-toolbar"))) {
+      button.addEventListener("command", this._onViewToggle);
+    }
+
+    yield CallTreeView.initialize();
+    yield WaterfallView.initialize();
+    this.selectView(DEFAULT_DETAILS_SUBVIEW);
+  }),
+
+  /**
+   * Select one of the DetailView's subviews to be rendered,
+   * hiding the others.
+   *
+   * @params {String} selectedView
+   *         Name of the view to be shown.
+   */
+  selectView: function (selectedView) {
+    this.el.selectedIndex = this.viewIndexes[selectedView];
+    this.emit(EVENTS.DETAILS_VIEW_SELECTED, selectedView);
+  },
+
+  /**
+   * Called when a view button is clicked.
+   */
+  _onViewToggle: function (e) {
+    this.selectView(e.target.getAttribute("data-view"));
   },
 
   /**
    * Unbinds events, destroys subviews.
    */
-  destroy: function () {
-    return promise.all([
-      CallTreeView.destroy()
-    ]);
-  }
+  destroy: Task.async(function *() {
+    for (let button of $$("toolbarbutton[data-view]", $("#details-toolbar"))) {
+      button.removeEventListener("command", this._onViewToggle);
+    }
+
+    yield CallTreeView.destroy();
+    yield WaterfallView.destroy();
+  })
 };
 
 /**
diff --git a/browser/devtools/performance/views/waterfall.js b/browser/devtools/performance/views/waterfall.js
new file mode 100644
index 000000000000..9039f1247c8f
--- /dev/null
+++ b/browser/devtools/performance/views/waterfall.js
@@ -0,0 +1,116 @@
+/* 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/. */
+"use strict";
+
+/**
+ * Waterfall view controlled by DetailsView.
+ */
+let WaterfallView = {
+  _startTime: 0,
+  _endTime: 0,
+  _markers: [],
+
+  /**
+   * Sets up the view with event binding.
+   */
+  initialize: Task.async(function *() {
+    this.el = $("#waterfall-view");
+    this._stop = this._stop.bind(this);
+    this._start = this._start.bind(this);
+    this._onTimelineData = this._onTimelineData.bind(this);
+    this._onMarkerSelected = this._onMarkerSelected.bind(this);
+    this._onResize = this._onResize.bind(this);
+
+    this.graph = new Waterfall($("#waterfall-graph"), $("#details-pane"));
+    this.markerDetails = new MarkerDetails($("#waterfall-details"), $("#waterfall-view > splitter"));
+
+    this.graph.on("selected", this._onMarkerSelected);
+    this.graph.on("unselected", this._onMarkerSelected);
+    this.markerDetails.on("resize", this._onResize);
+
+    PerformanceController.on(EVENTS.RECORDING_STARTED, this._start);
+    PerformanceController.on(EVENTS.RECORDING_STOPPED, this._stop);
+    PerformanceController.on(EVENTS.TIMELINE_DATA, this._onTimelineData);
+    yield this.graph.recalculateBounds();
+  }),
+
+  /**
+   * Unbinds events.
+   */
+  destroy: function () {
+    this.graph.off("selected", this._onMarkerSelected);
+    this.graph.off("unselected", this._onMarkerSelected);
+    this.markerDetails.off("resize", this._onResize);
+
+    PerformanceController.off(EVENTS.RECORDING_STARTED, this._start);
+    PerformanceController.off(EVENTS.RECORDING_STOPPED, this._stop);
+    PerformanceController.off(EVENTS.TIMELINE_DATA, this._onTimelineData);
+  },
+
+  render: Task.async(function *() {
+    yield this.graph.recalculateBounds();
+    this.graph.setData(this._markers, this._startTime, this._startTime, this._endTime);
+    this.emit(EVENTS.WATERFALL_RENDERED);
+  }),
+
+  /**
+   * Event handlers
+   */
+
+  /**
+   * Called when recording starts.
+   */
+  _start: function (_, { startTime }) {
+    this._startTime = startTime;
+    this._endTime = startTime;
+    this.graph.clearView();
+  },
+
+  /**
+   * Called when recording stops.
+   */
+  _stop: Task.async(function *(_, { endTime }) {
+    this._endTime = endTime;
+    this._markers = this._markers.sort((a,b) => (a.start > b.start));
+    this.render();
+  }),
+
+  /**
+   * Called when a marker is selected in the waterfall view,
+   * updating the markers detail view.
+   */
+  _onMarkerSelected: function (event, marker) {
+    if (event === "selected") {
+      this.markerDetails.render(marker);
+    }
+    if (event === "unselected") {
+      this.markerDetails.empty();
+    }
+  },
+
+  /**
+   * Called when the marker details view is resized.
+   */
+  _onResize: function () {
+    this.render();
+  },
+
+  /**
+   * Called when the TimelineFront has new data for
+   * framerate, markers or memory, and stores the data
+   * to be plotted subsequently.
+   */
+  _onTimelineData: function (_, eventName, ...data) {
+    if (eventName === "markers") {
+      let [markers, endTime] = data;
+      Array.prototype.push.apply(this._markers, markers);
+    }
+  }
+};
+
+
+/**
+ * Convenient way of emitting events from the view.
+ */
+EventEmitter.decorate(WaterfallView);
diff --git a/browser/devtools/timeline/timeline.js b/browser/devtools/timeline/timeline.js
index 2324f855c7a9..73f67c001320 100644
--- a/browser/devtools/timeline/timeline.js
+++ b/browser/devtools/timeline/timeline.js
@@ -251,8 +251,8 @@ let TimelineView = {
    */
   initialize: Task.async(function*() {
     this.markersOverview = new MarkersOverview($("#markers-overview"));
-    this.waterfall = new Waterfall($("#timeline-waterfall"));
-    this.markerDetails = new MarkerDetails($("#timeline-waterfall-details"));
+    this.waterfall = new Waterfall($("#timeline-waterfall"), $("#timeline-pane"));
+    this.markerDetails = new MarkerDetails($("#timeline-waterfall-details"), $("#timeline-waterfall-container > splitter"));
 
     this._onSelecting = this._onSelecting.bind(this);
     this._onRefresh = this._onRefresh.bind(this);
@@ -273,8 +273,10 @@ let TimelineView = {
    */
   destroy: function() {
     this.markerDetails.off("resize", this._onRefresh);
+    this.markerDetails.destroy();
     this.waterfall.off("selected", this._onMarkerSelected);
     this.waterfall.off("unselected", this._onMarkerSelected);
+    this.waterfall.destroy();
     this.markersOverview.off("selecting", this._onSelecting);
     this.markersOverview.off("refresh", this._onRefresh);
     this.markersOverview.destroy();
diff --git a/browser/devtools/timeline/widgets/marker-details.js b/browser/devtools/timeline/widgets/marker-details.js
index 4972350146da..01cb44294c9f 100644
--- a/browser/devtools/timeline/widgets/marker-details.js
+++ b/browser/devtools/timeline/widgets/marker-details.js
@@ -22,12 +22,14 @@ loader.lazyRequireGetter(this, "EventEmitter",
  *
  * @param nsIDOMNode parent
  *        The parent node holding the view.
+ * @param nsIDOMNode splitter
+ *        The splitter node that the resize event is bound to.
  */
-function MarkerDetails(parent) {
+function MarkerDetails(parent, splitter) {
   EventEmitter.decorate(this);
   this._document = parent.ownerDocument;
   this._parent = parent;
-  this._splitter = this._document.querySelector("#timeline-waterfall-container > splitter");
+  this._splitter = splitter;
   this._splitter.addEventListener("mouseup", () => this.emit("resize"));
 }
 
@@ -35,6 +37,7 @@ MarkerDetails.prototype = {
   destroy: function() {
     this.empty();
     this._parent = null;
+    this._splitter = null;
   },
 
   /**
diff --git a/browser/devtools/timeline/widgets/waterfall.js b/browser/devtools/timeline/widgets/waterfall.js
index d0839ba48ebf..951d0e388dda 100644
--- a/browser/devtools/timeline/widgets/waterfall.js
+++ b/browser/devtools/timeline/widgets/waterfall.js
@@ -48,11 +48,14 @@ const WATERFALL_ROWCOUNT_ONPAGEUPDOWN = 10;
  *
  * @param nsIDOMNode parent
  *        The parent node holding the waterfall.
+ * @param nsIDOMNode container
+ *        The container node that key events should be bound to.
  */
-function Waterfall(parent) {
+function Waterfall(parent, container) {
   EventEmitter.decorate(this);
   this._parent = parent;
   this._document = parent.ownerDocument;
+  this._container = container;
   this._fragment = this._document.createDocumentFragment();
   this._outstandingMarkers = [];
 
@@ -78,9 +81,15 @@ function Waterfall(parent) {
   // Selected row index. By default, we want the first
   // row to be selected.
   this._selectedRowIdx = 0;
+
+  // Default rowCount
+  this.rowCount = WATERFALL_ROWCOUNT_ONPAGEUPDOWN;
 }
 
 Waterfall.prototype = {
+  destroy: function() {
+    this._parent = this._document = this._container = null;
+  },
   /**
    * Populates this view with the provided data source.
    *
@@ -110,7 +119,7 @@ Waterfall.prototype = {
    * Keybindings.
    */
   setupKeys: function() {
-    let pane = this._document.querySelector("#timeline-pane");
+    let pane = this._container;
     pane.parentNode.parentNode.addEventListener("keydown", e => {
       if (e.keyCode === Ci.nsIDOMKeyEvent.DOM_VK_UP) {
         e.preventDefault();
@@ -130,11 +139,11 @@ Waterfall.prototype = {
       }
       if (e.keyCode === Ci.nsIDOMKeyEvent.DOM_VK_PAGE_UP) {
         e.preventDefault();
-        this.selectNearestRow(this._selectedRowIdx - WATERFALL_ROWCOUNT_ONPAGEUPDOWN);
+        this.selectNearestRow(this._selectedRowIdx - this.rowCount);
       }
       if (e.keyCode === Ci.nsIDOMKeyEvent.DOM_VK_PAGE_DOWN) {
         e.preventDefault();
-        this.selectNearestRow(this._selectedRowIdx + WATERFALL_ROWCOUNT_ONPAGEUPDOWN);
+        this.selectNearestRow(this._selectedRowIdx + this.rowCount);
       }
     }, true);
   },
diff --git a/browser/themes/shared/devtools/performance.inc.css b/browser/themes/shared/devtools/performance.inc.css
index c059b8137daf..28a18e51855c 100644
--- a/browser/themes/shared/devtools/performance.inc.css
+++ b/browser/themes/shared/devtools/performance.inc.css
@@ -33,6 +33,17 @@
   pointer-events: none;
 }
 
+/* Details Panel */
+
+#select-waterfall-view {
+  list-style-image: url(performance-icons.svg#waterfall);
+}
+
+#select-calltree-view {
+  list-style-image: url(performance-icons.svg#call-tree);
+}
+
+
 /* Profile call tree */
 
 .theme-dark .call-tree-headers-container {
@@ -255,3 +266,148 @@
   transform: scale(0.75);
   transform-origin: center right;
 }
+
+/**
+ * Details Waterfall Styles
+ */
+
+.waterfall-list-contents {
+  /* Hack: force hardware acceleration */
+  transform: translateZ(1px);
+  overflow-x: hidden;
+  overflow-y: auto;
+}
+
+.waterfall-header-contents {
+  overflow-x: hidden;
+}
+
+.waterfall-background-ticks {
+  /* Background created on a <canvas> in js. */
+  /* @see browser/devtools/timeline/widgets/waterfall.js */
+  background-image: -moz-element(#waterfall-background);
+  background-repeat: repeat-y;
+  background-position: -1px center;
+}
+
+.waterfall-marker-container[is-spacer] {
+  pointer-events: none;
+}
+
+.theme-dark .waterfall-marker-container:not([is-spacer]):nth-child(2n) {
+  background-color: rgba(255,255,255,0.03);
+}
+
+.theme-light .waterfall-marker-container:not([is-spacer]):nth-child(2n) {
+  background-color: rgba(128,128,128,0.03);
+}
+
+.theme-dark .waterfall-marker-container:hover {
+  background-color: rgba(255,255,255,0.1) !important;
+}
+
+.theme-light .waterfall-marker-container:hover {
+  background-color: rgba(128,128,128,0.1) !important;
+}
+
+.waterfall-marker-item {
+  overflow: hidden;
+}
+
+.waterfall-sidebar {
+  -moz-border-end: 1px solid;
+}
+
+.theme-dark .waterfall-sidebar {
+  -moz-border-end-color: #000;
+}
+
+.theme-light .waterfall-sidebar {
+  -moz-border-end-color: #aaa;
+}
+
+.waterfall-marker-container:hover > .waterfall-sidebar {
+  background-color: transparent;
+}
+
+.waterfall-header-name {
+  padding: 4px;
+}
+
+.waterfall-header-tick {
+  width: 100px;
+  font-size: 9px;
+  transform-origin: left center;
+}
+
+.theme-dark .waterfall-header-tick {
+  color: #a9bacb;
+}
+
+.theme-light .waterfall-header-tick {
+  color: #292e33;
+}
+
+.waterfall-header-tick:not(:first-child) {
+  -moz-margin-start: -100px !important; /* Don't affect layout. */
+}
+
+.waterfall-marker-bullet {
+  width: 8px;
+  height: 8px;
+  -moz-margin-start: 8px;
+  -moz-margin-end: 6px;
+  border: 1px solid;
+  border-radius: 1px;
+}
+
+.waterfall-marker-name {
+  font-size: 95%;
+  padding-bottom: 1px !important;
+}
+
+.waterfall-marker-bar {
+  height: 9px;
+  border: 1px solid;
+  border-radius: 1px;
+  transform-origin: left center;
+}
+
+.theme-light .waterfall-marker-container.selected > .waterfall-sidebar,
+.theme-light .waterfall-marker-container.selected > .waterfall-marker-item {
+  background-color: #4c9ed9; /* Select Highlight Blue */
+  color: #f5f7fa; /* Light foreground text */
+}
+
+.theme-dark .waterfall-marker-container.selected > .waterfall-sidebar,
+.theme-dark .waterfall-marker-container.selected > .waterfall-marker-item {
+  background-color: #1d4f73; /* Select Highlight Blue */
+  color: #f5f7fa; /* Light foreground text */
+}
+
+.waterfall-marker-container.selected .waterfall-marker-bullet,
+.waterfall-marker-container.selected .waterfall-marker-bar {
+  border-color: initial!important;
+}
+
+#waterfall-details {
+  padding-top: 28px;
+  overflow: auto;
+}
+
+.marker-details-bullet {
+  width: 8px;
+  height: 8px;
+  margin: 0 8px;
+  border: 1px solid;
+  border-radius: 1px;
+}
+
+.marker-details-type {
+  font-size: 1.2em;
+  font-weight: bold;
+}
+
+.marker-details-duration {
+  font-weight: bold;
+}
diff --git a/toolkit/devtools/server/actors/timeline.js b/toolkit/devtools/server/actors/timeline.js
index f132c65d4fa7..a7b596c3f928 100644
--- a/toolkit/devtools/server/actors/timeline.js
+++ b/toolkit/devtools/server/actors/timeline.js
@@ -241,7 +241,14 @@ let TimelineActor = exports.TimelineActor = protocol.ActorClass({
     }
 
     clearTimeout(this._dataPullTimeout);
-  }, {}),
+    return this.docShells[0].now();
+  }, {
+    response: {
+      // Set as possibly nullable due to the end time possibly being
+      // undefined during destruction
+      value: RetVal("nullable:number")
+    }
+  }),
 
   /**
    * When a new window becomes available in the tabActor, start recording its

From d413eb7ba6c43784cc2c87c7dc53a0b75eff8aae Mon Sep 17 00:00:00 2001
From: "Tim P." <tim+bugzilla@tpillard.fr>
Date: Thu, 4 Dec 2014 16:34:47 -0800
Subject: [PATCH 02/17] Bug 1090874 - Avoid always re-creating the node when
 editing a tagname in the markup-view; r=pbrosset

---
 browser/devtools/markupview/markup-view.js    |  2 +-
 browser/devtools/markupview/test/browser.ini  |  1 +
 .../test/browser_markupview_tag_edit_11.js    | 36 +++++++++++++++++++
 3 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 browser/devtools/markupview/test/browser_markupview_tag_edit_11.js

diff --git a/browser/devtools/markupview/markup-view.js b/browser/devtools/markupview/markup-view.js
index fdf6a901361a..281976843f2a 100644
--- a/browser/devtools/markupview/markup-view.js
+++ b/browser/devtools/markupview/markup-view.js
@@ -2317,7 +2317,7 @@ ElementEditor.prototype = {
    * Called when the tag name editor has is done editing.
    */
   onTagEdit: function(newTagName, isCommit) {
-    if (!isCommit || newTagName == this.node.tagName ||
+    if (!isCommit || newTagName.toLowerCase() === this.node.tagName.toLowerCase() ||
         !("editTagName" in this.markup.walker)) {
       return;
     }
diff --git a/browser/devtools/markupview/test/browser.ini b/browser/devtools/markupview/test/browser.ini
index a9684efe7211..ebecc620f197 100644
--- a/browser/devtools/markupview/test/browser.ini
+++ b/browser/devtools/markupview/test/browser.ini
@@ -81,6 +81,7 @@ skip-if = e10s # Bug 1036409 - The last selected node isn't reselected
 [browser_markupview_tag_edit_08.js]
 [browser_markupview_tag_edit_09.js]
 [browser_markupview_tag_edit_10.js]
+[browser_markupview_tag_edit_11.js]
 [browser_markupview_textcontent_edit_01.js]
 [browser_markupview_toggle_01.js]
 [browser_markupview_toggle_02.js]
diff --git a/browser/devtools/markupview/test/browser_markupview_tag_edit_11.js b/browser/devtools/markupview/test/browser_markupview_tag_edit_11.js
new file mode 100644
index 000000000000..24d08beefc2f
--- /dev/null
+++ b/browser/devtools/markupview/test/browser_markupview_tag_edit_11.js
@@ -0,0 +1,36 @@
+/* vim: set ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+ http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+// Bug 1090874 - Tests that a node is not recreated when it's tagname editor
+// is blurred and no changes were done.
+
+const TEST_URL = "data:text/html;charset=utf-8,<div></div>";
+
+let test = asyncTest(function*() {
+  let isEditTagNameCalled = false;
+
+  let {toolbox, inspector} = yield addTab(TEST_URL).then(openInspector);
+
+  // Overriding the editTagName walkerActor method here to check that it isn't
+  // called when blurring the tagname field.
+  inspector.walker.editTagName = function() { isEditTagNameCalled = true; }
+
+  yield selectNode("div", inspector);
+  let container = yield getContainerForSelector("div", inspector);
+  let tagEditor = container.editor.tag;
+
+  info("Blurring the tagname field");
+  tagEditor.blur();
+  is(isEditTagNameCalled, false, "The editTagName method wasn't called");
+
+  info("Updating the tagname to uppercase");
+  setEditableFieldValue(tagEditor, "DIV", inspector);
+  is(isEditTagNameCalled, false, "The editTagName method wasn't called");
+
+  info("Updating the tagname to a different value");
+  setEditableFieldValue(tagEditor, "SPAN", inspector);
+  is(isEditTagNameCalled, true, "The editTagName method was called");
+});
\ No newline at end of file

From fafacc7fc1fb13abcc186d2b08c340e0d9f962e7 Mon Sep 17 00:00:00 2001
From: Heather Arthur <fayearthur@gmail.com>
Date: Thu, 4 Dec 2014 12:51:00 +0100
Subject: [PATCH 03/17] Bug 1105808 - Use ttf fonts in browser_fontinspector.js
 test. r=bgrins

---
 browser/devtools/fontinspector/test/browser.ini |   4 ++--
 .../test/browser_fontinspector.html             |   4 ++--
 .../fontinspector/test/browser_fontinspector.js |   4 ++--
 .../fontinspector/test/ostrich-black.ttf        | Bin 0 -> 12872 bytes
 .../fontinspector/test/ostrich-black.woff       | Bin 5084 -> 0 bytes
 .../fontinspector/test/ostrich-regular.ttf      | Bin 0 -> 12476 bytes
 .../fontinspector/test/ostrich-regular.woff     | Bin 4956 -> 0 bytes
 7 files changed, 6 insertions(+), 6 deletions(-)
 create mode 100755 browser/devtools/fontinspector/test/ostrich-black.ttf
 delete mode 100644 browser/devtools/fontinspector/test/ostrich-black.woff
 create mode 100755 browser/devtools/fontinspector/test/ostrich-regular.ttf
 delete mode 100644 browser/devtools/fontinspector/test/ostrich-regular.woff

diff --git a/browser/devtools/fontinspector/test/browser.ini b/browser/devtools/fontinspector/test/browser.ini
index 5c5ee0744705..1ef245a0ee65 100644
--- a/browser/devtools/fontinspector/test/browser.ini
+++ b/browser/devtools/fontinspector/test/browser.ini
@@ -2,8 +2,8 @@
 subsuite = devtools
 support-files =
   browser_fontinspector.html
-  ostrich-black.woff
-  ostrich-regular.woff
+  ostrich-black.ttf
+  ostrich-regular.ttf
   head.js
 
 [browser_fontinspector.js]
diff --git a/browser/devtools/fontinspector/test/browser_fontinspector.html b/browser/devtools/fontinspector/test/browser_fontinspector.html
index 3bfe9b9bfbe9..ae6139d4c58e 100644
--- a/browser/devtools/fontinspector/test/browser_fontinspector.html
+++ b/browser/devtools/fontinspector/test/browser_fontinspector.html
@@ -3,12 +3,12 @@
 <style>
   @font-face {
     font-family: bar;
-    src: url(bad/font/name.ttf), url(ostrich-regular.woff) format("woff");
+    src: url(bad/font/name.ttf), url(ostrich-regular.ttf) format("truetype");
   }
   @font-face {
     font-family: bar;
     font-weight: 800;
-    src: url(ostrich-black.woff);
+    src: url(ostrich-black.ttf);
   }
 
   body{
diff --git a/browser/devtools/fontinspector/test/browser_fontinspector.js b/browser/devtools/fontinspector/test/browser_fontinspector.js
index cd59acea8cbc..4b24cbda064a 100644
--- a/browser/devtools/fontinspector/test/browser_fontinspector.js
+++ b/browser/devtools/fontinspector/test/browser_fontinspector.js
@@ -47,10 +47,10 @@ function* testBodyFonts(inspector) {
   ok(s[0].classList.contains("is-remote"),
      "font 0: is remote");
   is(s[0].querySelector(".font-url").value,
-     "http://mochi.test:8888/browser/browser/devtools/fontinspector/test/ostrich-regular.woff",
+     "http://mochi.test:8888/browser/browser/devtools/fontinspector/test/ostrich-regular.ttf",
      "font 0: right url");
   is(s[0].querySelector(".font-format").textContent,
-     "woff", "font 0: right font format");
+     "truetype", "font 0: right font format");
   is(s[0].querySelector(".font-css-name").textContent,
      "bar", "font 0: right css name");
 
diff --git a/browser/devtools/fontinspector/test/ostrich-black.ttf b/browser/devtools/fontinspector/test/ostrich-black.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..a0ef8fe1c94243535eb22562bb7c3deb5c834217
GIT binary patch
literal 12872
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

literal 0
HcmV?d00001

diff --git a/browser/devtools/fontinspector/test/ostrich-black.woff b/browser/devtools/fontinspector/test/ostrich-black.woff
deleted file mode 100644
index 496c1d8837dbe5c790d956aee654bbbd18d34834..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5084
zcmV<26C><*Pew8T0RR9102AB*3;+NC05V7b027J;0RR9100000000000000000000
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

diff --git a/browser/devtools/fontinspector/test/ostrich-regular.ttf b/browser/devtools/fontinspector/test/ostrich-regular.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..9682c07350475eb2b757f0a20b141e90f2ee64bb
GIT binary patch
literal 12476
zcmeHN33wdEm44Nuxo^!a%}n<kn$a<bq_JjX$&w|@mn>Pn<pW=`Bwy$-lFx*IjWIZ2
zATgIY<Jbg9fP^IpWJ8uDuz`?^Y=A5fAmC(4AcQ4cNdS-bubQ#3H^A~`^X+c-qow})
zpRT*=)qAh1ix?4^Xg8^-ZQi1E{rSH>A``LMc)PZD`rKuk4~%sXsdf{opX(p)+wu!(
z%^D*8TD)7op>KQ(c}P!GdpqLWHVo}r|Iq%X$C2UpiORpRaj<XT&6VLh5cVV7*^PLi
zo-75Be+hm^Hx6&zdG{+S3x3~<`-!2^{=O%F^RuUkDt9CNmEpdfTj*@sfv`&aRz~`U
z2k*IXpOL6)3z4Q`%jo#l-S_WVMU*~-I8Nei!QH&^qDgD4Q{E)K>bH1955Ijr!ts1(
z#n&cYo_Io9B^||2JxTm6E~JrOna}_)o_LvD(khWtA*_Jg#hdN4oz&t5FX{A4#oE{#
z2rZGmC0&G|1BEAhhU)2U<V<QE-b%z<ep>1+yT-<;jg(NhScjv;TPxy7N2DX*3htlb
z<`;kBW-H0W(qv$hNXypZxr_`nOdd8JVH-)u;#9((MA$~svjK!JCL_{la2wfYNsXr#
zPqY~E_fNdbK0ommy9Rl$Lcbg#gA|;2nYEFFeHY<;1aBrS-AHESYhb$}F-yQ}$V>}R
zkKN=#Ts_^7a@&ganvQr`l--DXC(7+cd6P&-XOV^akhT$bnk>?V6YsFI$<2ODPUK~v
ztBN=0#hdL%Uh~P0HtIyXPigZ<YVQZNb$Ou;ydA|pG4MVW{m9EImaA%qw7<{I<GtVe
zzj(L#FVmw(`4}4bgBZWir+?B-pocUQ6X;7V&>+xAI&c%|fo6dgGJspj2($^blL@?(
z%s_`gCt1K<WCgkfddLRuB|Fe3u#8G4@>EU^pkH8soZvxn0cC*-xxqu^0fq%e$O|4N
zAFx7TjLN{{R1T~ZSVeyDY6<{rC<sglOp*+qA_bThSW6-BItl~p1!gERahxVm6xbjz
zOBLWbiUAu1PNq0`6IBA61x}$V@D{2DwhEj|HQ;TO0JaO9MoI7vN&%+}oIz>unN$m$
zC2%&?fp=0paE`z(%7Ay%q=|QFuD~8@0G~%$;Cz7#C<nff8i9*wGH|iLCDa7oOU=Ng
z0+-Pg@a5D3Tp{obY6V|OQ-P}luBJBdHPjAVE3l8Ifv=+uV86ftnhrilGbY}l^#V80
zOz@2~3%E((W||FtCUpXb1P;?2@Db_)jtbmD-QZ`@T;Q0%aq0ozO7no*1a7DK;5%pm
zaHqgsv=ICgv<Ub~S`0i};HPK__&L-&@iv_+a5pUl-$ToQ=Ly_P%fZj56~KK0FQ7BP
zFQk>g{Q^HttH3X!)xe7d9-uYgm(W_^r2;RbKJd@bI^bso9;ANo%V_|3g}^Im5d11y
z54;-qXF5b1fY;DQ;I#s;qfOw~(`Mie0&k=<!9Pbsz{3JRPs89xXasnaMu9g8`~qzO
zznRVg-Xic;8Uz0#jRU_V@HW~CemiXg-XZYIv>p5_v;%l2@K5v)v=ew2?E-#P;MeFA
z;9sXt0`C@h51kGE4f+)D9|eAs&H=xd&INu;;6KrB@cU>F@Y@2vL+62im-Yhh7x)03
z5B|@z5BNQS57GtT57C9d?+bjG_D}qgen6iF{*W#L{z%}D>0<Do&;j5h0)I-Efd30!
z3jCSCN9i)~$LKS_#|8eJJ`4V@bP)K2z$fW)@Tces;4cI|O;>_HLstQx75GcK8vHpr
z1bklLF}h~rE&3H*3;eaff1~TbU!d!OzY+Lbx&iz}x)J!2z~9m5z+a}rz~2jeg<$RI
z-{}bORe^t?qu{U6O~BXb3&1x7zDYNOzeTqI|0wWJbSpSU82Glpcj!wKZ_>MT8}PWm
zJlzgHL3aS5`U|%-y<pR!X;qxDFmCu9pyFZ@9{fJ_LZGUw+#d+at#A+`(TZ5SvZ}f!
zkxZp)>*_P>Cv9lRu3EjaM6J>4^ai8JY_ZzxrP~}%m)qm@ZO(1l*w`|)t$o^xj_EVb
zm^o{9=bWzYxjoC5&6~eq;iAQ7E*Tm=wX_fB@VCatMn5=Qgz$zE^)78{o;*d+4~D_B
zMrh62K3dm506zsiK`~O`8);xgnxUZ=LW7M#j~vEK`ZBAN9+I9>oQh8gDB(~T_KOg^
zlBPh5FQUyfelp&J(i4h9@hbik@gUJO@g3aoDku6U9-jE##3Wv==Q?l)pX>SMTns=A
zFY0l(;@*h6aBYXKBY4IqE)|u*R{ALb`zRysdf2E9uuxfO?bXoV+hBQ}u()pc#9mm~
z&9GRTkY6LL(o|}L4Vngx-+?;Mpfg|rmcfF|hmW%mZCDH~y#zXX7@Bwhntv^Pq<-k>
zbu<~R{J4kys~+Mr$Ar054u9E*F`!Juo~ie^U3RBd6VKFV8|;%}HSFB+@%izJiug^7
z+nbx)7fVNK6D#sRSdpleJ9}8RrxQcXgirRa$cG&Ej0+iwyXw(LAARjLX>a~nIsc3-
ziDeReVxm7IF8nx0AtJ{=BdT1CdY_0{%$HRoZVhS|j>k}=T$a}{z#<KkQc@&rkx*Ta
zJ5!&_w%}dHg}PrmyCM>)m_0ihRotO?X=!E19VnmNSROcdS2UVR^|Gl;6RA{Usm)f`
z6x8d3O?CP2cJU-#%aol<lc_>`m>cDye;gTmMEqs!8T(s`@+169M~<&%?fGv@NAmZv
zX^8JZo3e<nF7%?kE-RzC$5$6s6*D5tU1&oKLnVU}uW<u%M13#l2!~{6Flw(aE0aT^
zn#zS%YqG(wlfyIE@w{qbC0dU%uohxHg*q{nBcjssF1E7_>v`mn=zY@_1(OmL`eFWZ
zHgE7Hus!Tto(`)gra?ONdlf^9jH`}m@_FSLD)=cZTzMRXv8xfsjP|0jnR3Qkt%|5(
za`_#%`<3gxH%Q^*&mzSw((>c01rH+~*0C&sbbKs%It;!&qN-BLf2)+eD77C)58-Y{
ziguJE@p!BX@g4AjF`_By<cMMzEs`p%)tnqp1jS?5cr(>yk&0Ou%(Ci?Z*o~6P~Mme
z`2BuM<%~ww(wj=9l1uXsG|s5BNP97a`3Jf&l#w3RGB*+tWn%5iLMYQDMgW!MGLCMq
zVGUvsxR6)NyB5T7Em*N)S}@Smu|hhMNGw~HNXX$xcMtR)>aLl1p0y(%7kqS5$2E~t
z1roKkGEcld7teV3#EHiuC)&cisc=2&AC1nQ6^%xu_S<4*$;xt{zq}DL87P+<eRZj&
zXi6fPO!Vd-=uJyKt))4oqLa0BM?#^BIcQT1{e?OhvF-_DCGN)Rf*gfu5UY`R*Vl_i
zY2Bzpwt=_Fo_RB=Oq*iuLfg73Y+lE@4u23$>tdOj?tAZT>BxUiI<j=-iiE?YFAGO|
z=1tE(iLQbSGqwR`aCw7>;jbaYHXM;Z&(=vtmE-3~=P9TQml?)N5zj}I6C(*>=5pPN
zK?Su)mw3`~pAc+YH0YFlv07%1wr99ZbMe;s8<L!7+M^IV#`9#Gksp`E3`7q?$T~w`
z^nOvf@(SrFMCi!zFG~v%O~fVaNC<i5ag9twM+#|5=<>2Xdwf?a=k4+BITvYGOP$B>
z!Sf#R<m!qTRsqD;2$`UWgO`-Sj6yCYhYv?CI}o|?aOBd<B5VO$kbjIN@?Xh+1^5`!
zy@hlKkdDiJM#ZNHujR(*z4EuBx7>m`cU%6eY%W`p|0%0Q6j9h*#E0DHLatB)3pIpX
ztddpazrp1E(`<JBIT@N_Kn@(gmXEI<X)4hND&7lR^SGeW^gPPZ<KJ0V14V#2B+a2g
z<XMP=@Enw_LG~+(G-nwu#KDdXu@@1i99EYyIVeVPXSA6dZdXLykz7RUz?<&GfrIkF
zLy1uG(i){^=efai_ThO+Vu5^#d`!7P`4uiajvYJ3K6k?nXp;)_mzW9pH^DCVpr%2U
z%c;?7ppqI=s-lMTG^AKOrD}l6&Y_k;RZ(fjT|pLyq<9)EDn~2hdOUu!IV!uY)<C`N
zjLQz$;`Upl63HBq-9dlmly|BztJ`mO1s%HKiYlweZ(@ryPNg=YG&p0Lx;n`go}94R
zqN#Edd!0#4>kQRJrd3sH>gy$Iq^U*(8Krj^+gn!QE7iQH@`Nk%gX)${S=48PV~L3^
z#_SN<W=8K-!Lyo*_Bk=zV=ZhFjE~!;b;91j+)Tn8*SOU6n1(0AJw>a8S3FXKibdE>
zDQ<Rf@ALTmZnxj>VU^KjGFp*LE>)Wx7K_uQb_e`!Xa2P?v#|TCGMTDg0j_x5)yv`8
z`r@0a`ZEl!QlqidW$1NPR=Ok~pBQ3H0PGy_I*iGZf~{$o)GFm#S&olFR#?s;b75v`
zJ*`ZPl1A$cyF8J&M#TpNF`+sNX4PTAkP0&ux3H^cR#n={Bc-}hz1Hor>UFMk#;I3Z
zogVF8i$*cH*pz5><~ozzp;a5yvd-)@866gVX{qcnTY^b>RrSR>Yh7wqs6MXPbXJ`q
zmdg0TX?r~7tanA55&_-wu?3335F1EB_spIx`J6SCVWZljn=~U-<<)83)%ka=fl!s-
zR~Pfl`n}eSd7{N!*eM-`cS$)eX^<qe)}zr{82(*Ow<pLvZqEiuwtGB*a8N3Rgj#f#
z@^XvLtkGyC$zM^sZ^`=ex&o|RjWX=Y&i-{fWxGqOD?$Ed<bO^v|9F;nV^LUBERxCb
zym?m!?P{&sid?lOi`MF6%!cw(fru;>@|1V=*Uf85T0`D)sXVskHeQ?%G3?LX#h7#>
z_N0huJ=(Z7o{Q%^d_H>^>+AG(cX?;8HTKDUMyVyb(AC@PS{MyRH*AOo3+YXCJDbm5
z6+WCRf|-X|j?@`8|DbXZ|7^8*97Oim-FgDMNi|%$J={yGOUQENqD5R}u#eY{t+cf~
zOn6XrjJ@#&YnNq&!T&jtE>lRSC|nEibnqD249FYzFES8w76}Uh7CM)Uq|j%?RET58
zTsqx@gTd5lRAD?a^{|&0OjUwGxoxT}2Scr^SFfs1_Oi*n$-27q;`~F4)AiEcEAtOs
zbrqX@r6?P=i7r9DMJ;JZ-;K!1T<>~O_)x!dA1`0jU-&*)t%PbMF$uVc7p$|;M+JWp
z{s5$=Sz;R7@TW|svi1#LZ!+!nDzZFvN+dYeP$#V#w%L+%l+NbWJEue<a%iT_Hm|0p
zHZf!W`t;TXD2w|xC8!hDaSlGspfcjn8SwUmf69d?1}PP82W%vMK!2Q82d+WgkCaBH
zPi_qb6`v<r<1?H5R%ewp5GbvVcui(+VwHjpLU5$C)ahmo_V$MPt80@>Y&N(%aYuua
z%vu~)xip%KK_|wqu-TR*>$1u2Nz?4526#f;exRN%)KkN)7`HJHoSa?t$Ds1N-#y6t
z?<YaVM)E>#xSiwUm&P+<hxX&HH`nz4xoyyf#ZHwXEzI7`nChu;b4xgAvxHk(6<P7Q
zQwgux<aMVLUZ0{og+;+DnN(uYtjJVPE}dFrG<HYARn7)^)|`kEi?@|XQVF~5R2kx{
zT*y$YMTL2OauL8wwMYSWO5Nf`#l>}8u~ru}Pb-Th?7Siv*kFZI6K-ykQMu4{8fQgN
z)Xakl`WAJqVGqq-ma--)XIibziV|;{R^F9KC6{zY+q{kWwWW!8S+z5#baqEWm2q?n
z`jOb8f-GhV_B|41=KSMqZvOSKv{w!uKO6lnthHEE$mmUOQ`}sE6nawFNXP?!o^Vg&
zupjTqs>|s(DYpfIddz82l+essAw{t`1)nvO^ILt{tk>uBX0txu-NmO5@7Mx^vwHdR
zYB-romnNJBqk}(_N&e0e3x&cxJz;_Q>p|gnM)(WJ3-<#hv@eErwV1;vWx7>rfxRk-
z0ym8i4wabIS`DP6DD`3t_7!_R5Ory7=^%bV#uYiBwAJ{0LNp-To>a{oo2@+@isU+!
zZeMviv2@OYzM9I;wd~;yjV;pN%BpE|P_s%$R_Q}()XjpO#iS&i@R#7OLb+MEza(|%
zf8X8B<;RR&)xU^iR^Ton&cj=<O~d0n3?2B*;wW)Vhnwp`Xu|8{KfsCNWih6MZ&r&v
zjKU0uAr-d9gISDb!ur5Wz|@MF&HDh0R6d|8WcQNQYWJ2K)jG-PVY15Tv}sHRuhR@=
zQ<HN0AegPq>rtmIp5{ojAzr30(WpEl^HesQDmZ;=&aTtx-JygW%#_B$;W<|8f@J#m
zr@23fy<@esKspcmAKQp3JiJP9R-kDLCM%bPWe-X)iz@!EFkYxA>IDh(Wb1MsZLOt5
ztKs7%+y&vbA-Yz>O(^VMMZGY8S)M7DH7Ed)r5cC1W@w5#+h5hyX4j{qp@r$hlCD;_
ztyHZu8I!rmZkJ24#ymN%U#|@)IZMi}kt9i$)LOk(!%AE_ovkXa=nOiw&FpBL))kL-
zw$<t_xsK}fn+L1%FZ=ukqfMta>U6TR+HJI`G<Msl&mdQ*e7^KG1C!Up!U=<3<F5<*
zrglsZme&Lf8nxmvs{L|XixSqDN>n<l+UBp$q$_l8jb!pD&ax>jjjmvgSFO`UTbDI0
zzo@Frtx<xPsrAPC8ox)a(Rj=iWs^$n1^a<DJDUmFhmCW<#AO<pg&Vn|iDUTk^F03!
z%WbEcyY_YL*8C8=0s>e_&wX{i-sS1JP#GYZaMBU@k^K0N;OoQgd|(-WZCJrZEJM8w
zm>Jj?$~DwEGLA@`ua&BmhV{N{mDF9!7aV;_#l8-E!OqPe=IvF%&KGQp3+s-m_jDXg
z?}=r%g<)%{xI%TnL570HQuW6!8}?u3&QnI`V)d>oy=7i&xj#E~-n^+<e|hUX=q^WL
zIWFzRx_oKEU@?Tlb9*|DU*7>O70y2cJ<Rn~9CgN|DDEt9GZBPsz%(ovr;~dNLWNnR
zLq6;-@O=fo%b@rJS?nxee<2(2D|lPjVaUylTP*RJIbmTVk-7N?=0;K1ZkvtoIba;&
zBmGVG(BRAbzuOl>lRn=2l0M%1`g_^?`gl+4Z@s6**U?x*LNCKc@-GZ_zV_q>6sqAv
z*Pb7?F8!!`lm_^0HSpQ6a>$)njqyzlvCWZYh25#s))Lr&#<qvd_>LC;ln}+nRH(8v
z+w6<POm=IcDj2DpF)J2T@JS&X2znzitIeFKmZNc&s#$Ke*5i{xS4Xr?DOJNus%lAe
z*Jaa5d~4{g2v=3LN9)5_KB-;tDT%IhhO0-u9;1)??c~G0GyHGaKfa#)d-D}OtRMgH
z%M1jjctx=TJD(2VWW`<db9#-HFoiX;F?JPuLc)18X{NMNI$Js<-6?%vdP;g(<yT##
zdZA=>$)zRtl{{PWhFVhF)IoKvdZl`c`eyap8k=UJ=7{EQZK-yxc1(M|_A2c$-Dh-%
zb$9CS)BRL;O!ulTuQ%x{_3QOV^bhKvHh2xShQ)?0hVu+J8tyi{YIGWVjr)yv8Xq*i
zV3JH_rg~GGsmHX^w8eD4=?T*d=CHZdeD-O77nwi&?`hFenSBB?rEul&C~&^NlPhw3
zpTT$H!h03IH+L3!3HGYj7r7d`XjhSIaPsSdBG=+e_Msxz;Ty{jid+x=c##`W(sM<Q
zucgdW<R<V$k(;TWwHLVs@5hV06pM%b@Qzst_ETttU039cypq1i;YUiLB3Dt9lq~WR
zeAL@e<Z3FDE-7*iMWtJcTuTGe4~tw!ZdJO-_24s#+(09$Gm6|u)vAY!+ywr5k(+6t
zBv9lQsxH~nF^ZFxn>K9Rs#Nw@DfP8=b;`P3%Hmx^gJa6fO(Xqhrj+)fAw@(PSH=d%
z2gkM#4y5LdZynpzzfoD#H!?nVaA4E6;ks09ZEZ6@w%J?^<YCD|;HlA-!mHlFvGGl#
zBZ^4(ky0p|#+5#0>sa5w;BepAnab$;)9QIjoll{EW&1X6-MXbIo!+ryM{0cA*!a+{
zRR8Gk`@WpBZG5XTG`Lk69#qa88Qr05TCent3@AG`4vq~fyGFMu+r|f#O<P0CjFHWw
zyOgG?_s!;gdI-WkN?Rb#V>mFe0Y@gb5<lM2k7btvajwN@fI6^sh@s%9#4a3^7(`qJ
z2lqDNkVHQYPvA%)4p<D~PdO!*aq(*q2Sj-M?Z5%VoQL0AMXY|5rQrBQA95MT;XWR|
z30n`tC@+O_`CoIfX5(O|r#z7^d0NWT<Gh!<a$2ljQKNB`Hj1*9Q_4F%{ePzn1-bJc
z=)=w1+lST-qHTTPXX4!`l*tG8=ll2b`@j949X~D~TQMq4*nCXmSR(&Rp{3i<u5n1f
zF8u08>xP9SeYBW!keW+{B4mp{htXFG`e_6??Eu>(dW%cS0DkR2-dv`5oLz{q4Nsl}
z|Gf$Mgz%h!xSJ8irM3yO{L$+T%_<cP#KhOd$)v)MQ*k>ChlE%voS3Ra=GE9MNKg_@
zPm2jtPZ{j(H9*rhVz09a!aD`$kV@dWYVf5&hy8LRERGpFfmWO$w!?y)etPM>vrY=m
z{YJ3MI}PU$zlIZu_h7mj#3`nkI5XRcQ?gwU?Vi(4GcCdCrsX*8bOz2vt-^VxyKt&;
zDbB&p#yQ#;&JI`L)Zf!M?e|OAq33ZjP)3KfQyWfIt;XJ8A3X^_;6j`gyclOdaT-OP
U8re291g1jGCDfPU44CRa05FkAJpcdz

literal 0
HcmV?d00001

diff --git a/browser/devtools/fontinspector/test/ostrich-regular.woff b/browser/devtools/fontinspector/test/ostrich-regular.woff
deleted file mode 100644
index e23d4af391877f53b5f6f9ba04a77bb0e4809d04..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4956
zcmV-i6Qk^RPew8T0RR91025pQ3;+NC05H4&022rR0RR9100000000000000000000
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
aRk>8#vh%RmJm+AMg#hHe)XuT(?EnA<=voE<


From b2c70e84b783b2124d9dff16249c117d4f7dfa78 Mon Sep 17 00:00:00 2001
From: vivek <vivekb.balakrishnan@gmail.com>
Date: Thu, 4 Dec 2014 16:47:00 +0100
Subject: [PATCH 04/17] Bug 898613 - Back button behavior for url toolbar in
 display/editing mode. r=mcomella

---
 .../tests/components/ToolbarComponent.java    | 16 ++++++-
 mobile/android/base/tests/robocop.ini         |  1 +
 .../base/tests/testBackButtonInEditMode.java  | 47 +++++++++++++++++++
 3 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 mobile/android/base/tests/testBackButtonInEditMode.java

diff --git a/mobile/android/base/tests/components/ToolbarComponent.java b/mobile/android/base/tests/components/ToolbarComponent.java
index 2aa79eb42d33..62cc32cacd8e 100644
--- a/mobile/android/base/tests/components/ToolbarComponent.java
+++ b/mobile/android/base/tests/components/ToolbarComponent.java
@@ -76,6 +76,16 @@ public class ToolbarComponent extends BaseComponent {
         return this;
     }
 
+    public ToolbarComponent assertIsUrlEditTextSelected() {
+        fAssertTrue("The edit text is selected", isUrlEditTextSelected());
+        return this;
+    }
+
+    public ToolbarComponent assertIsUrlEditTextNotSelected() {
+        fAssertFalse("The edit text is not selected", isUrlEditTextSelected());
+        return this;
+    }
+
     /**
      * Returns the root View for the browser toolbar.
      */
@@ -192,7 +202,7 @@ public class ToolbarComponent extends BaseComponent {
                 urlEditText.isInputMethodTarget());
 
         mSolo.clearEditText(urlEditText);
-        mSolo.enterText(urlEditText, url);
+        mSolo.typeText(urlEditText, url);
 
         return this;
     }
@@ -246,4 +256,8 @@ public class ToolbarComponent extends BaseComponent {
             }
         });
     }
+
+    private boolean isUrlEditTextSelected() {
+        return getUrlEditText().isSelected();
+    }
 }
diff --git a/mobile/android/base/tests/robocop.ini b/mobile/android/base/tests/robocop.ini
index 150b40ca3f8f..742c6cea5a22 100644
--- a/mobile/android/base/tests/robocop.ini
+++ b/mobile/android/base/tests/robocop.ini
@@ -134,6 +134,7 @@ skip-if = android_version == "10"
 # disabled on Android 2.3; bug 946656
 skip-if = android_version == "10"
 [testAppMenuPathways]
+[testBackButtonInEditMode]
 [testEventDispatcher]
 [testGeckoRequest]
 [testInputConnection]
diff --git a/mobile/android/base/tests/testBackButtonInEditMode.java b/mobile/android/base/tests/testBackButtonInEditMode.java
new file mode 100644
index 000000000000..861b973a9947
--- /dev/null
+++ b/mobile/android/base/tests/testBackButtonInEditMode.java
@@ -0,0 +1,47 @@
+package org.mozilla.gecko.tests;
+
+import org.mozilla.gecko.tests.helpers.GeckoHelper;
+
+import android.view.View;
+
+/**
+ * Tests that verify the behavior of back button in edit mode.
+ */
+public class testBackButtonInEditMode extends UITest {
+    public void testBackButtonInEditMode() {
+        GeckoHelper.blockForReady();
+
+        // Verify back button behavior for edit mode.
+        mToolbar.enterEditingMode()
+                .assertIsUrlEditTextSelected();
+        testBackPressInEditMode();
+        testExitUsingBackButton();
+
+        // Verify back button behavior in edit mode after input.
+        mToolbar.enterEditingMode()
+                .enterUrl("dummy")
+                .assertIsUrlEditTextSelected();
+        testBackPressInEditMode();
+        testExitUsingBackButton();
+
+        // Verify the swipe behavior in edit mode.
+        mToolbar.enterEditingMode()
+                .assertIsUrlEditTextSelected();
+        mAboutHome.swipeToPanelOnLeft();
+        mToolbar.assertIsUrlEditTextNotSelected()
+                .assertIsEditing();
+        testExitUsingBackButton();
+    }
+
+    public void testBackPressInEditMode() {
+        // Press back button and verify URLEditText is not selected.
+        getSolo().goBack();
+        mToolbar.assertIsUrlEditTextNotSelected()
+                .assertIsEditing();
+    }
+
+    public void testExitUsingBackButton() {
+        getSolo().goBack();
+        mToolbar.assertIsNotEditing();
+    }
+}

From 60c77900141e708acc861e18b96cfa17ffff138e Mon Sep 17 00:00:00 2001
From: Victor Porof <vporof@mozilla.com>
Date: Fri, 5 Dec 2014 10:54:47 -0500
Subject: [PATCH 05/17] Bug 1106416 - Small UI fixes for the new performance
 tool, r=jsantell

---
 browser/devtools/performance/performance.xul | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/browser/devtools/performance/performance.xul b/browser/devtools/performance/performance.xul
index a6fbb7dc3085..8a17da909b6b 100644
--- a/browser/devtools/performance/performance.xul
+++ b/browser/devtools/performance/performance.xul
@@ -38,13 +38,10 @@
                        label="&profilerUI.importButton;"/>
       </hbox>
     </toolbar>
-    <splitter class="devtools-horizontal-splitter" />
     <box id="overview-pane"
-         class="devtools-responsive-container"
-         flex="1">
+         class="devtools-responsive-container">
       <vbox id="time-framerate" flex="1"/>
     </box>
-    <splitter class="devtools-horizontal-splitter" />
     <toolbar id="details-toolbar" class="devtools-toolbar">
       <hbox class="devtools-toolbarbutton-group">
         <toolbarbutton id="select-waterfall-view"

From 0f14aa53e52600abe1d01c5699ec96f1a9e96a7f Mon Sep 17 00:00:00 2001
From: Nicolas Perriault <nperriault@mozilla.com>
Date: Fri, 5 Dec 2014 09:39:09 -0800
Subject: [PATCH 06/17] Bug 1107210 - Fixed room name update not correctly
 reflected in Loop panel. r=Standard8

---
 browser/components/loop/content/js/panel.js   |  6 ++++++
 browser/components/loop/content/js/panel.jsx  |  6 ++++++
 .../loop/content/shared/js/activeRoomStore.js |  3 +--
 .../loop/test/desktop-local/panel_test.js     | 19 +++++++++++++++++++
 4 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/browser/components/loop/content/js/panel.js b/browser/components/loop/content/js/panel.js
index d34fbdacd63c..251964a33c6a 100644
--- a/browser/components/loop/content/js/panel.js
+++ b/browser/components/loop/content/js/panel.js
@@ -537,6 +537,12 @@ loop.panel = (function(_, mozL10n) {
       return {edit: false, text: this.props.text};
     },
 
+    componentWillReceiveProps: function(nextProps) {
+      if (nextProps.text !== this.props.text) {
+        this.setState({text: nextProps.text});
+      }
+    },
+
     handleTextClick: function(event) {
       event.stopPropagation();
       event.preventDefault();
diff --git a/browser/components/loop/content/js/panel.jsx b/browser/components/loop/content/js/panel.jsx
index aea56f241da2..0af032c7824c 100644
--- a/browser/components/loop/content/js/panel.jsx
+++ b/browser/components/loop/content/js/panel.jsx
@@ -537,6 +537,12 @@ loop.panel = (function(_, mozL10n) {
       return {edit: false, text: this.props.text};
     },
 
+    componentWillReceiveProps: function(nextProps) {
+      if (nextProps.text !== this.props.text) {
+        this.setState({text: nextProps.text});
+      }
+    },
+
     handleTextClick: function(event) {
       event.stopPropagation();
       event.preventDefault();
diff --git a/browser/components/loop/content/shared/js/activeRoomStore.js b/browser/components/loop/content/shared/js/activeRoomStore.js
index 50fd401824eb..abf819bcd66f 100644
--- a/browser/components/loop/content/shared/js/activeRoomStore.js
+++ b/browser/components/loop/content/shared/js/activeRoomStore.js
@@ -391,8 +391,7 @@ loop.store.ActiveRoomStore = (function() {
       this._leaveRoom(ROOM_STATES.CLOSING);
 
       // If we're closing the window, we can stop listening to updates.
-      this._mozLoop.rooms.off("update:" + this.getStoreState().roomToken,
-        this._handleRoomUpdate.bind(this));
+      this._mozLoop.rooms.off("update:" + this.getStoreState().roomToken);
     },
 
     /**
diff --git a/browser/components/loop/test/desktop-local/panel_test.js b/browser/components/loop/test/desktop-local/panel_test.js
index c5c2bab4e15d..b3e0477ce4ef 100644
--- a/browser/components/loop/test/desktop-local/panel_test.js
+++ b/browser/components/loop/test/desktop-local/panel_test.js
@@ -857,6 +857,25 @@ describe("loop.panel", function() {
           new sharedActions.OpenRoom({roomToken: roomData.roomToken}));
       });
     });
+
+    describe("Room name updated", function() {
+      it("should update room name", function() {
+        var roomEntry = mountRoomEntry({
+          dispatcher: dispatcher,
+          room: new loop.store.Room(roomData)
+        });
+        var updatedRoom = new loop.store.Room(_.extend({}, roomData, {
+          roomName: "New room name",
+          ctime: new Date().getTime()
+        }));
+
+        roomEntry.setProps({room: updatedRoom});
+
+        expect(
+          roomEntry.getDOMNode().querySelector(".edit-in-place").textContent)
+        .eql("New room name");
+      });
+    });
   });
 
   describe("loop.panel.RoomList", function() {

From 3c7965141f19e08bc7ad540e24d26e4556546e86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Fri, 5 Dec 2014 09:42:56 -0800
Subject: [PATCH 07/17] Bug 1059600 - Set the URI as the initial tab label for
 javascript links opened in new tabs. r=gijs

--HG--
extra : rebase_source : 3a28661f42daa9ec6243234d9d1eaf8b01055e32
---
 browser/base/content/tabbrowser.xml                    | 3 +++
 browser/base/content/test/general/browser_bug906190.js | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml
index 3a52b9f5db55..1b8a8fe27f6a 100644
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -1659,6 +1659,9 @@
             // allows the TabLabelModified event to be properly dispatched.
             if (!aURI || isBlankPageURL(aURI)) {
               t.label = this.mStringBundle.getString("tabs.emptyTabTitle");
+            } else if (aURI.toLowerCase().startsWith("javascript:")) {
+              // This can go away when bug 672618 or bug 55696 are fixed.
+              t.label = aURI;
             }
 
             this.tabContainer.updateVisibility();
diff --git a/browser/base/content/test/general/browser_bug906190.js b/browser/base/content/test/general/browser_bug906190.js
index 2c14dea78b76..ecf4b02ceaeb 100644
--- a/browser/base/content/test/general/browser_bug906190.js
+++ b/browser/base/content/test/general/browser_bug906190.js
@@ -121,7 +121,7 @@ function setUpTest(aTestName, aIDForNextTest, aFuncForNextTest, aChildTabLink) {
 
   mainTab = gTestWin.gBrowser.selectedTab;
   // get the link for the next test from the main page
-  let target = gTestWin.content.document.getElementById(aIDForNextTest);
+  let target = gTestWin.content.document.getElementById(aIDForNextTest).href;
   gTestWin.gBrowser.addTab(target);
   gTestWin.gBrowser.selectTabAtIndex(1);
   waitForSomeTabToLoad(checkPopUpNotification);

From 852ff68195b2163cdc2289895cfcd4beccd478d0 Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Thu, 4 Dec 2014 17:27:07 -0800
Subject: [PATCH 08/17] Bug 1101482 - fix e10s case for
 browser_988072_sidebar_events.js, r=intermittentisgone

--HG--
extra : rebase_source : b13a515434002d396f1077f1fc59f43db94f30e8
---
 browser/components/customizableui/test/browser.ini             | 1 -
 .../customizableui/test/browser_988072_sidebar_events.js       | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/browser/components/customizableui/test/browser.ini b/browser/components/customizableui/test/browser.ini
index 9ad4a22231ab..e436b162e032 100644
--- a/browser/components/customizableui/test/browser.ini
+++ b/browser/components/customizableui/test/browser.ini
@@ -130,7 +130,6 @@ skip-if = os == "linux"
 skip-if = e10s # bug 1090635
 [browser_981305_separator_insertion.js]
 [browser_988072_sidebar_events.js]
-skip-if = e10s # bug 1101482 - fails in --run-by-dir
 [browser_989338_saved_placements_not_resaved.js]
 [browser_989751_subviewbutton_class.js]
 [browser_987177_destroyWidget_xul.js]
diff --git a/browser/components/customizableui/test/browser_988072_sidebar_events.js b/browser/components/customizableui/test/browser_988072_sidebar_events.js
index a893bb53b8cb..332a2e23d44a 100644
--- a/browser/components/customizableui/test/browser_988072_sidebar_events.js
+++ b/browser/components/customizableui/test/browser_988072_sidebar_events.js
@@ -80,8 +80,7 @@ let showSidebarPopup = Task.async(function*() {
 
   let subviewShownPromise = subviewShown(subview);
   EventUtils.synthesizeMouseAtCenter(button, {});
-  yield subviewShownPromise;
-  return waitForCondition(() => !subview.panelMultiView.hasAttribute("transitioning"));
+  return subviewShownPromise;
 });
 
 // Check the sidebar widget shows the default items

From 855899f13d018274d7abb734188edfa1eb7d437a Mon Sep 17 00:00:00 2001
From: Michael Comella <michael.l.comella@gmail.com>
Date: Fri, 5 Dec 2014 10:09:40 -0800
Subject: [PATCH 09/17] Bug 1107698 - setAlpha after setColor in
 ResizablePathDrawable. r=lucasr

---
 .../base/widget/ResizablePathDrawable.java       | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/mobile/android/base/widget/ResizablePathDrawable.java b/mobile/android/base/widget/ResizablePathDrawable.java
index 7a9d800853d8..7fd53510a228 100644
--- a/mobile/android/base/widget/ResizablePathDrawable.java
+++ b/mobile/android/base/widget/ResizablePathDrawable.java
@@ -14,6 +14,10 @@ import android.graphics.drawable.ShapeDrawable;
 import android.graphics.drawable.shapes.Shape;
 
 public class ResizablePathDrawable extends ShapeDrawable {
+    // An attribute mirroring the super class' value. getAlpha() is only
+    // available in API 19+ so to use that alpha value, we have to mirror it.
+    private int alpha = 255;
+
     private final ColorStateList colorStateList;
     private int currentColor;
 
@@ -51,9 +55,21 @@ public class ResizablePathDrawable extends ShapeDrawable {
     @Override
     protected void onDraw(Shape shape, Canvas canvas, Paint paint) {
         paint.setColor(currentColor);
+        // setAlpha overrides the alpha value in set color. Since we just set the color,
+        // the alpha value is reset: override the alpha value with the old value.
+        //
+        // Note: We *should* be able to call Shape.setAlpha, rather than Paint.setAlpha, but
+        // then the opacity doesn't change - dunno why but probably not worth the time.
+        paint.setAlpha(alpha);
         super.onDraw(shape, canvas, paint);
     }
 
+    @Override
+    public void setAlpha(final int alpha) {
+        super.setAlpha(alpha);
+        this.alpha = alpha;
+    }
+
     @Override
     protected boolean onStateChange(int[] stateSet) {
         return updateColor(stateSet);

From b044fd9b6ea36a9bd1777eab5e4c34ea33d4feda Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Wed, 3 Dec 2014 16:20:48 -0800
Subject: [PATCH 10/17] Bug 1098371 - strings for improved sslv3 error,
 f=flod,r=mconley

--HG--
extra : rebase_source : 4edcb49f99d0d248612a1678777e417ca46dd72a
---
 browser/locales/en-US/chrome/overrides/netError.dtd | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/browser/locales/en-US/chrome/overrides/netError.dtd b/browser/locales/en-US/chrome/overrides/netError.dtd
index fe3d6bd6d4ff..d535da9de1ec 100644
--- a/browser/locales/en-US/chrome/overrides/netError.dtd
+++ b/browser/locales/en-US/chrome/overrides/netError.dtd
@@ -204,3 +204,12 @@ functionality specific to firefox. -->
 
 <!ENTITY remoteXUL.title "Remote XUL">
 <!ENTITY remoteXUL.longDesc "<p><ul><li>Please contact the website owners to inform them of this problem.</li></ul></p>">
+
+<!ENTITY oldSecurityProtocol.title "Unable to Connect Securely">
+<!-- LOCALIZATION NOTE (oldSecurityProtocol.longDesc) - Do not translate the
+     <span id='hostname'></span>. -->
+<!ENTITY oldSecurityProtocol.longDesc "Firefox cannot guarantee the safety of your data on <span id='hostname'></span> because it uses SSLv3, a broken security protocol.">
+<!-- LOCALIZATION NOTE (oldSecurityProtocol.advancedInfo) - Do not translate
+     the <span id='errorcode'></span>. -->
+<!ENTITY oldSecurityProtocol.advancedInfo "Advanced info: <span id='errorcode'></span>">
+<!ENTITY oldSecurityProtocol.learnMore "Learn More…">

From 7ade8622c08f5fa7522797b630a19dad15c4e4fb Mon Sep 17 00:00:00 2001
From: Luca Greco <luca.greco@alcacoop.it>
Date: Thu, 27 Nov 2014 05:51:00 -0500
Subject: [PATCH 11/17] Bug 980481 - Check for null __poolMap in the
 protocol.js unmanage method. r=ochameau

---
 toolkit/devtools/server/protocol.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolkit/devtools/server/protocol.js b/toolkit/devtools/server/protocol.js
index 5d67abd2e6ea..bd007e2b521f 100644
--- a/toolkit/devtools/server/protocol.js
+++ b/toolkit/devtools/server/protocol.js
@@ -770,7 +770,7 @@ let Pool = Class({
    * Remove an actor as a child of this pool.
    */
   unmanage: function(actor) {
-    this.__poolMap.delete(actor.actorID);
+    this.__poolMap && this.__poolMap.delete(actor.actorID);
   },
 
   // true if the given actor ID exists in the pool.

From e4d4dc78738cb67ede162097d50660eff25350e6 Mon Sep 17 00:00:00 2001
From: Luca Greco <luca.greco@alcacoop.it>
Date: Thu, 27 Nov 2014 05:52:00 -0500
Subject: [PATCH 12/17] Bug 980481 - RemoteDebuggerServer e10s setupParent
 helper. r=ochameau

Changes to the RemoteDebuggerServer main.js and child.js to provide hooks needed by modules which want to propagate their data lazily between the e10s parent and child processes.
---
 toolkit/devtools/server/child.js              |   6 +
 .../server/docs/lazy-actor-modules.md         | 116 ++++++++++++++++++
 toolkit/devtools/server/main.js               |  71 ++++++++++-
 3 files changed, 191 insertions(+), 2 deletions(-)
 create mode 100644 toolkit/devtools/server/docs/lazy-actor-modules.md

diff --git a/toolkit/devtools/server/child.js b/toolkit/devtools/server/child.js
index 34c743a5cc56..d5bd9a6af97f 100644
--- a/toolkit/devtools/server/child.js
+++ b/toolkit/devtools/server/child.js
@@ -21,6 +21,12 @@ let chromeGlobal = this;
 
   if (!DebuggerServer.initialized) {
     DebuggerServer.init();
+
+    // message manager helpers provided for actor module parent/child message exchange
+    DebuggerServer.parentMessageManager = {
+      sendSyncMessage: sendSyncMessage,
+      addMessageListener: addMessageListener
+    };
   }
 
   // In case of apps being loaded in parent process, DebuggerServer is already
diff --git a/toolkit/devtools/server/docs/lazy-actor-modules.md b/toolkit/devtools/server/docs/lazy-actor-modules.md
new file mode 100644
index 000000000000..e8d8410a60b2
--- /dev/null
+++ b/toolkit/devtools/server/docs/lazy-actor-modules.md
@@ -0,0 +1,116 @@
+Lazy Actor Modules and E10S setup
+---------------------------------
+
+The **DebuggerServer** loads and creates most of the actors lazily to keep
+the initial memory usage down (which is extremely important on lower end devices).
+
+## Register a lazy global/tab actor module
+
+register a global actor:
+
+```js
+    DebuggerServer.registerModule("devtools/server/actors/webapps", {
+      prefix: "webapps",
+      constructor: "WebappsActor",
+      type: { global: true }
+    });
+```
+
+register a tab actor:
+
+```js
+    DebuggerServer.registerModule("devtools/server/actors/webconsole", {
+      prefix: "console",
+      constructor: "WebConsoleActor",
+      type: { tab: true }
+    });
+```
+
+## E10S Setup
+
+Some of the actor modules needs to exchange messages between the parent and child processes.
+
+E.g. the **director-manager** needs to ask the list installed **director scripts** from
+the **director-registry** running in the parent process) and the parent/child setup
+is lazily directed by the **DebuggerServer**.
+
+When the actor is loaded for the first time in the the **DebuggerServer** running in the
+child process, it has the chances to run its setup procedure, e.g. in the **director-registry**:
+
+```js
+...
+const {DebuggerServer} = require("devtools/server/main");
+
+...
+
+// skip child setup if this actor module is not running in a child process
+if (DebuggerServer.isInChildProcess) {
+  setupChildProcess();
+}
+...
+```
+
+The above setupChildProcess helper will use the **DebuggerServer.setupInParent**
+to start a setup process in the parent process Debugger Server, e.g. in the the **director-registry**:
+
+```js
+function setupChildProcess() {
+  const { sendSyncMessage } = DebuggerServer.parentMessageManager;
+
+  DebuggerServer.setupInParent({
+    module: "devtools/server/actors/director-registry",
+    setupParent: "setupParentProcess"
+  });
+
+  ...
+```
+
+in the parent process, the **DebuggerServer** will require the requested module
+and call the **setupParent** exported helper with the **MessageManager**
+connected to the child process as parameter, e.g. in the **director-registry**:
+
+```js
+/**
+ * E10S parent/child setup helpers
+ */
+
+let gTrackedMessageManager = new Set();
+
+exports.setupParentProcess = function setupParentProcess({ mm, childID }) {
+  if (gTrackedMessageManager.has(mm)) { return; }
+  gTrackedMessageManager.add(mm);
+
+  // listen for director-script requests from the child process
+  mm.addMessageListener("debug:director-registry-request", handleChildRequest);
+
+  // time to unsubscribe from the disconnected message manager
+  DebuggerServer.once("disconnected-from-child:" + childID, handleMessageManagerDisconnected);
+
+  function handleMessageManagerDisconnected(evt, { mm: disconnected_mm }) {
+    ...
+  }
+```
+
+The DebuggerServer emits "disconnected-from-child:CHILDID" events to give the actor modules
+the chance to cleanup their handlers registered on the disconnected message manager.
+
+## E10S setup flow
+
+In the child process:
+- DebuggerServer loads an actor module
+  - the actor module check DebuggerServer.isInChildProcess 
+    - the actor module calls the DebuggerServer.setupInParent helper
+    - the DebuggerServer.setupInParent helper asks to the parent process
+      to run the required setup
+    - the actor module use the DebuggerServer.parentMessageManager.sendSyncMessage,
+      DebuggerServer.parentMessageManager.addMessageListener helpers to send requests
+      or to subscribe message handlers
+      
+In the parent process:
+- The DebuggerServer receives the DebuggerServer.setupInParent request
+- it tries to load the required module
+- it tries to call the **mod[setupParent]** method with the frame message manager and the childID
+  in the json parameter **{ mm, childID }**
+  - the module setupParent helper use the mm to subscribe the messagemanager events
+  - the module setupParent helper use the DebuggerServer object to subscribe *once* the
+    **"disconnected-from-child:CHILDID"** event (needed to unsubscribe the messagemanager events)
diff --git a/toolkit/devtools/server/main.js b/toolkit/devtools/server/main.js
index c82312565103..31b4bbda0039 100644
--- a/toolkit/devtools/server/main.js
+++ b/toolkit/devtools/server/main.js
@@ -137,7 +137,7 @@ function ModuleAPI() {
       }
       activeGlobalActors = null;
     }
-  }
+  };
 };
 
 /***
@@ -213,7 +213,7 @@ var DebuggerServer = {
     for (let id of Object.getOwnPropertyNames(gRegisteredModules)) {
       this.unregisterModule(id);
     }
-    gRegisteredModules = {};
+    gRegisteredModules = Object.create(null);
 
     this.closeAllListeners();
     this.globalActorFactories = {};
@@ -711,6 +711,39 @@ var DebuggerServer = {
     return deferred.promise;
   },
 
+  /**
+   * Check if the caller is running in a content child process.
+   *
+   * @return boolean
+   *         true if the caller is running in a content
+   */
+  get isInChildProcess() !!this.parentMessageManager,
+
+  /**
+   * In a content child process, ask the DebuggerServer in the parent process
+   * to execute a given module setup helper.
+   *
+   * @param module
+   *        The module to be required
+   * @param setupParent
+   *        The name of the setup helper exported by the above module
+   *        (setup helper signature: function ({mm}) { ... })
+   * @return boolean
+   *         true if the setup helper returned successfully
+   */
+  setupInParent: function({ module, setupParent }) {
+    if (!this.isInChildProcess) {
+      return false;
+    }
+
+    let { sendSyncMessage } = DebuggerServer.parentMessageManager;
+
+    return sendSyncMessage("debug:setup-in-parent", {
+      module: module,
+      setupParent: setupParent
+    });
+  },
+
   /**
    * Connect to a child process.
    *
@@ -736,6 +769,33 @@ var DebuggerServer = {
     let childID = null;
     let netMonitor = null;
 
+    // provides hook to actor modules that need to exchange messages
+    // between e10s parent and child processes
+    let onSetupInParent = function (msg) {
+      let { module, setupParent } = msg.json;
+      let m, fn;
+
+      try {
+        m = require(module);
+
+        if (!setupParent in m) {
+          dumpn("ERROR: module '" + module + "' does not export '" + setupParent + "'");
+          return false;
+        }
+
+        m[setupParent]({ mm: mm, childID: childID });
+
+        return true;
+      } catch(e) {
+        let error_msg = "exception during actor module setup running in the parent process: ";
+        DevToolsUtils.reportException(error_msg + e);
+        dumpn("ERROR: " + error_msg + " \n\t module: '" + module + "' \n\t setupParent: '" + setupParent + "'\n" +
+              DevToolsUtils.safeErrorString(e));
+        return false;
+      }
+    };
+    mm.addMessageListener("debug:setup-in-parent", onSetupInParent);
+
     let onActorCreated = DevToolsUtils.makeInfallible(function (msg) {
       mm.removeMessageListener("debug:actor", onActorCreated);
 
@@ -765,6 +825,13 @@ var DebuggerServer = {
     let onMessageManagerDisconnect = DevToolsUtils.makeInfallible(function (subject, topic, data) {
       if (subject == mm) {
         Services.obs.removeObserver(onMessageManagerDisconnect, topic);
+
+        // provides hook to actor modules that need to exchange messages
+        // between e10s parent and child processes
+        this.emit("disconnected-from-child:" + childID, { mm: mm, childID: childID });
+
+        mm.removeMessageListener("debug:setup-in-parent", onSetupInParent);
+
         if (childTransport) {
           // If we have a child transport, the actor has already
           // been created. We need to stop using this message manager.

From 019bfaa23ffe717d234e152d7d748df23cd000aa Mon Sep 17 00:00:00 2001
From: Brian Grinstead <bgrinstead@mozilla.com>
Date: Thu, 4 Dec 2014 16:11:00 -0500
Subject: [PATCH 13/17] Bug 989053 - Make box model regions on page content
 more visible. r=pbrosset

---
 browser/themes/shared/devtools/layoutview.css  | 18 ++++++++++++------
 toolkit/devtools/server/actors/highlighter.css | 10 +++++-----
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/browser/themes/shared/devtools/layoutview.css b/browser/themes/shared/devtools/layoutview.css
index 30bd731504ed..3e0ca8be5c34 100644
--- a/browser/themes/shared/devtools/layoutview.css
+++ b/browser/themes/shared/devtools/layoutview.css
@@ -10,11 +10,16 @@
   background-color: white;
   border-color: hsla(210,100%,85%,0.7);
   border-style: dotted;
-  color: hsl(210,53%,45%);
+  color: var(--theme-selection-color);
+}
+
+.margin,
+.size {
+  color: var(--theme-highlight-blue);
 }
 
 #content {
-  background-color: #80d4ff;
+  background-color: #87ceeb;
   border-color: hsl(210,100%,85%);
   border-style: dotted;
 }
@@ -26,18 +31,19 @@
 }
 
 #padding {
-  background-color: #66cc52;
+  background-color: #6a5acd;
 }
 
 #borders {
-  background-color: #ffe431;
+  background-color: #444444;
   border-style: dotted;
   border-color: hsl(210,100%,85%);
 }
 
 #margins {
-  background-color: #d89b28;
-  opacity: 0.6;
+  background-color: #edff64;
+  /* This opacity applies to all of the regions, since they are nested. */
+  opacity: .8;
 }
 
 .editable {
diff --git a/toolkit/devtools/server/actors/highlighter.css b/toolkit/devtools/server/actors/highlighter.css
index d734f80713af..cfc5bf9be1e8 100644
--- a/toolkit/devtools/server/actors/highlighter.css
+++ b/toolkit/devtools/server/actors/highlighter.css
@@ -27,23 +27,23 @@
 /* Box model highlighter */
 
 :-moz-native-anonymous .box-model-regions {
-  opacity: 0.4;
+  opacity: 0.6;
 }
 
 :-moz-native-anonymous .box-model-content {
-  fill: #80d4ff;
+  fill: #87ceeb;
 }
 
 :-moz-native-anonymous .box-model-padding {
-  fill: #66cc52;
+  fill: #6a5acd;
 }
 
 :-moz-native-anonymous .box-model-border {
-  fill: #ffe431;
+  fill: #444444;
 }
 
 :-moz-native-anonymous .box-model-margin {
-  fill: #d89b28;
+  fill: #edff64;
 }
 
 :-moz-native-anonymous .box-model-content,

From c04576c23cdfb8e0fc19cb8bf22e77c2345d1b58 Mon Sep 17 00:00:00 2001
From: Michael Comella <michael.l.comella@gmail.com>
Date: Fri, 5 Dec 2014 12:21:42 -0800
Subject: [PATCH 14/17] Bug 1105053 - Move LightweightTheme* to lwt/. r=vivek

--HG--
rename : mobile/android/base/LightweightTheme.java => mobile/android/base/lwt/LightweightTheme.java
rename : mobile/android/base/LightweightThemeDrawable.java => mobile/android/base/lwt/LightweightThemeDrawable.java
---
 mobile/android/base/GeckoApplication.java                   | 1 +
 mobile/android/base/{ => lwt}/LightweightTheme.java         | 3 ++-
 mobile/android/base/{ => lwt}/LightweightThemeDrawable.java | 2 +-
 mobile/android/base/moz.build                               | 4 ++--
 mobile/android/base/tabs/TabsPanel.java                     | 4 ++--
 mobile/android/base/toolbar/BrowserToolbar.java             | 2 +-
 mobile/android/base/toolbar/ShapedButton.java               | 4 ++--
 mobile/android/base/widget/ThemedEditText.java              | 2 +-
 mobile/android/base/widget/ThemedImageButton.java           | 2 +-
 mobile/android/base/widget/ThemedImageView.java             | 2 +-
 mobile/android/base/widget/ThemedLinearLayout.java          | 2 +-
 mobile/android/base/widget/ThemedRelativeLayout.java        | 2 +-
 mobile/android/base/widget/ThemedTextSwitcher.java          | 2 +-
 mobile/android/base/widget/ThemedTextView.java              | 2 +-
 mobile/android/base/widget/ThemedView.java                  | 2 +-
 15 files changed, 19 insertions(+), 17 deletions(-)
 rename mobile/android/base/{ => lwt}/LightweightTheme.java (99%)
 rename mobile/android/base/{ => lwt}/LightweightThemeDrawable.java (99%)

diff --git a/mobile/android/base/GeckoApplication.java b/mobile/android/base/GeckoApplication.java
index 86475079fb52..8ea73cd5766a 100644
--- a/mobile/android/base/GeckoApplication.java
+++ b/mobile/android/base/GeckoApplication.java
@@ -7,6 +7,7 @@ package org.mozilla.gecko;
 import org.mozilla.gecko.db.BrowserContract;
 import org.mozilla.gecko.db.BrowserDB;
 import org.mozilla.gecko.home.HomePanelsManager;
+import org.mozilla.gecko.lwt.LightweightTheme;
 import org.mozilla.gecko.mozglue.GeckoLoader;
 import org.mozilla.gecko.util.Clipboard;
 import org.mozilla.gecko.util.HardwareUtils;
diff --git a/mobile/android/base/LightweightTheme.java b/mobile/android/base/lwt/LightweightTheme.java
similarity index 99%
rename from mobile/android/base/LightweightTheme.java
rename to mobile/android/base/lwt/LightweightTheme.java
index e430aa4e44fc..57be92cc7036 100644
--- a/mobile/android/base/LightweightTheme.java
+++ b/mobile/android/base/lwt/LightweightTheme.java
@@ -3,13 +3,14 @@
  * 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/. */
 
-package org.mozilla.gecko;
+package org.mozilla.gecko.lwt;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.json.JSONObject;
 import org.mozilla.gecko.AppConstants.Versions;
+import org.mozilla.gecko.EventDispatcher;
 import org.mozilla.gecko.GeckoSharedPrefs;
 import org.mozilla.gecko.gfx.BitmapUtils;
 import org.mozilla.gecko.util.GeckoEventListener;
diff --git a/mobile/android/base/LightweightThemeDrawable.java b/mobile/android/base/lwt/LightweightThemeDrawable.java
similarity index 99%
rename from mobile/android/base/LightweightThemeDrawable.java
rename to mobile/android/base/lwt/LightweightThemeDrawable.java
index 23b5db3f62ba..c0ae6eaedf0a 100644
--- a/mobile/android/base/LightweightThemeDrawable.java
+++ b/mobile/android/base/lwt/LightweightThemeDrawable.java
@@ -3,7 +3,7 @@
  * 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/. */
 
-package org.mozilla.gecko;
+package org.mozilla.gecko.lwt;
 
 import android.content.res.Resources;
 import android.graphics.Bitmap;
diff --git a/mobile/android/base/moz.build b/mobile/android/base/moz.build
index 1f011ea74966..39ce60328fd2 100644
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -326,10 +326,10 @@ gbjar.sources += [
     'InputMethods.java',
     'IntentHelper.java',
     'JavaAddonManager.java',
-    'LightweightTheme.java',
-    'LightweightThemeDrawable.java',
     'LocaleAware.java',
     'LocaleManager.java',
+    'lwt/LightweightTheme.java',
+    'lwt/LightweightThemeDrawable.java',
     'MediaCastingBar.java',
     'MemoryMonitor.java',
     'menu/GeckoMenu.java',
diff --git a/mobile/android/base/tabs/TabsPanel.java b/mobile/android/base/tabs/TabsPanel.java
index 0e4d22f84e35..7ae330819267 100644
--- a/mobile/android/base/tabs/TabsPanel.java
+++ b/mobile/android/base/tabs/TabsPanel.java
@@ -9,14 +9,14 @@ import org.mozilla.gecko.AppConstants.Versions;
 import org.mozilla.gecko.GeckoApp;
 import org.mozilla.gecko.GeckoAppShell;
 import org.mozilla.gecko.GeckoApplication;
-import org.mozilla.gecko.LightweightTheme;
-import org.mozilla.gecko.LightweightThemeDrawable;
 import org.mozilla.gecko.NewTabletUI;
 import org.mozilla.gecko.R;
 import org.mozilla.gecko.Telemetry;
 import org.mozilla.gecko.TelemetryContract;
 import org.mozilla.gecko.animation.PropertyAnimator;
 import org.mozilla.gecko.animation.ViewHelper;
+import org.mozilla.gecko.lwt.LightweightTheme;
+import org.mozilla.gecko.lwt.LightweightThemeDrawable;
 import org.mozilla.gecko.util.HardwareUtils;
 import org.mozilla.gecko.widget.GeckoPopupMenu;
 import org.mozilla.gecko.widget.IconTabWidget;
diff --git a/mobile/android/base/toolbar/BrowserToolbar.java b/mobile/android/base/toolbar/BrowserToolbar.java
index 1fe0b31d241d..139e8eefa512 100644
--- a/mobile/android/base/toolbar/BrowserToolbar.java
+++ b/mobile/android/base/toolbar/BrowserToolbar.java
@@ -14,7 +14,6 @@ import org.mozilla.gecko.AppConstants.Versions;
 import org.mozilla.gecko.BrowserApp;
 import org.mozilla.gecko.GeckoAppShell;
 import org.mozilla.gecko.GeckoApplication;
-import org.mozilla.gecko.LightweightTheme;
 import org.mozilla.gecko.NewTabletUI;
 import org.mozilla.gecko.R;
 import org.mozilla.gecko.Tab;
@@ -24,6 +23,7 @@ import org.mozilla.gecko.TelemetryContract;
 import org.mozilla.gecko.animation.PropertyAnimator;
 import org.mozilla.gecko.animation.PropertyAnimator.PropertyAnimationListener;
 import org.mozilla.gecko.animation.ViewHelper;
+import org.mozilla.gecko.lwt.LightweightTheme;
 import org.mozilla.gecko.menu.GeckoMenu;
 import org.mozilla.gecko.menu.MenuPopup;
 import org.mozilla.gecko.tabs.TabHistoryController;
diff --git a/mobile/android/base/toolbar/ShapedButton.java b/mobile/android/base/toolbar/ShapedButton.java
index 0f837baf56a5..22819679bb3f 100644
--- a/mobile/android/base/toolbar/ShapedButton.java
+++ b/mobile/android/base/toolbar/ShapedButton.java
@@ -5,9 +5,9 @@
 package org.mozilla.gecko.toolbar;
 
 import org.mozilla.gecko.GeckoApplication;
-import org.mozilla.gecko.LightweightTheme;
-import org.mozilla.gecko.LightweightThemeDrawable;
 import org.mozilla.gecko.R;
+import org.mozilla.gecko.lwt.LightweightTheme;
+import org.mozilla.gecko.lwt.LightweightThemeDrawable;
 import org.mozilla.gecko.tabs.TabCurve;
 import org.mozilla.gecko.widget.ThemedImageButton;
 
diff --git a/mobile/android/base/widget/ThemedEditText.java b/mobile/android/base/widget/ThemedEditText.java
index 82ee89d8fc1b..66203abdce26 100644
--- a/mobile/android/base/widget/ThemedEditText.java
+++ b/mobile/android/base/widget/ThemedEditText.java
@@ -7,8 +7,8 @@
 package org.mozilla.gecko.widget;
 
 import org.mozilla.gecko.GeckoApplication;
-import org.mozilla.gecko.LightweightTheme;
 import org.mozilla.gecko.R;
+import org.mozilla.gecko.lwt.LightweightTheme;
 
 import android.content.Context;
 import android.content.res.TypedArray;
diff --git a/mobile/android/base/widget/ThemedImageButton.java b/mobile/android/base/widget/ThemedImageButton.java
index 34aeb060a427..005aa3745cca 100644
--- a/mobile/android/base/widget/ThemedImageButton.java
+++ b/mobile/android/base/widget/ThemedImageButton.java
@@ -7,8 +7,8 @@
 package org.mozilla.gecko.widget;
 
 import org.mozilla.gecko.GeckoApplication;
-import org.mozilla.gecko.LightweightTheme;
 import org.mozilla.gecko.R;
+import org.mozilla.gecko.lwt.LightweightTheme;
 
 import android.content.Context;
 import android.content.res.TypedArray;
diff --git a/mobile/android/base/widget/ThemedImageView.java b/mobile/android/base/widget/ThemedImageView.java
index 4c0b474c1e77..36502e7d0227 100644
--- a/mobile/android/base/widget/ThemedImageView.java
+++ b/mobile/android/base/widget/ThemedImageView.java
@@ -7,8 +7,8 @@
 package org.mozilla.gecko.widget;
 
 import org.mozilla.gecko.GeckoApplication;
-import org.mozilla.gecko.LightweightTheme;
 import org.mozilla.gecko.R;
+import org.mozilla.gecko.lwt.LightweightTheme;
 
 import android.content.Context;
 import android.content.res.TypedArray;
diff --git a/mobile/android/base/widget/ThemedLinearLayout.java b/mobile/android/base/widget/ThemedLinearLayout.java
index da7d7d76a8f8..29bbc7b254f9 100644
--- a/mobile/android/base/widget/ThemedLinearLayout.java
+++ b/mobile/android/base/widget/ThemedLinearLayout.java
@@ -7,8 +7,8 @@
 package org.mozilla.gecko.widget;
 
 import org.mozilla.gecko.GeckoApplication;
-import org.mozilla.gecko.LightweightTheme;
 import org.mozilla.gecko.R;
+import org.mozilla.gecko.lwt.LightweightTheme;
 
 import android.content.Context;
 import android.content.res.TypedArray;
diff --git a/mobile/android/base/widget/ThemedRelativeLayout.java b/mobile/android/base/widget/ThemedRelativeLayout.java
index 7d905b7c22e7..1f2b336d5b38 100644
--- a/mobile/android/base/widget/ThemedRelativeLayout.java
+++ b/mobile/android/base/widget/ThemedRelativeLayout.java
@@ -7,8 +7,8 @@
 package org.mozilla.gecko.widget;
 
 import org.mozilla.gecko.GeckoApplication;
-import org.mozilla.gecko.LightweightTheme;
 import org.mozilla.gecko.R;
+import org.mozilla.gecko.lwt.LightweightTheme;
 
 import android.content.Context;
 import android.content.res.TypedArray;
diff --git a/mobile/android/base/widget/ThemedTextSwitcher.java b/mobile/android/base/widget/ThemedTextSwitcher.java
index 75c24569546f..9a722246a90d 100644
--- a/mobile/android/base/widget/ThemedTextSwitcher.java
+++ b/mobile/android/base/widget/ThemedTextSwitcher.java
@@ -7,8 +7,8 @@
 package org.mozilla.gecko.widget;
 
 import org.mozilla.gecko.GeckoApplication;
-import org.mozilla.gecko.LightweightTheme;
 import org.mozilla.gecko.R;
+import org.mozilla.gecko.lwt.LightweightTheme;
 
 import android.content.Context;
 import android.content.res.TypedArray;
diff --git a/mobile/android/base/widget/ThemedTextView.java b/mobile/android/base/widget/ThemedTextView.java
index 09da6bdedd2b..d9ec5e6a9d6b 100644
--- a/mobile/android/base/widget/ThemedTextView.java
+++ b/mobile/android/base/widget/ThemedTextView.java
@@ -7,8 +7,8 @@
 package org.mozilla.gecko.widget;
 
 import org.mozilla.gecko.GeckoApplication;
-import org.mozilla.gecko.LightweightTheme;
 import org.mozilla.gecko.R;
+import org.mozilla.gecko.lwt.LightweightTheme;
 
 import android.content.Context;
 import android.content.res.TypedArray;
diff --git a/mobile/android/base/widget/ThemedView.java b/mobile/android/base/widget/ThemedView.java
index 80f733b6b9b7..d5dfe3c6986d 100644
--- a/mobile/android/base/widget/ThemedView.java
+++ b/mobile/android/base/widget/ThemedView.java
@@ -7,8 +7,8 @@
 package org.mozilla.gecko.widget;
 
 import org.mozilla.gecko.GeckoApplication;
-import org.mozilla.gecko.LightweightTheme;
 import org.mozilla.gecko.R;
+import org.mozilla.gecko.lwt.LightweightTheme;
 
 import android.content.Context;
 import android.content.res.TypedArray;

From fd58036eac5405576b5cb723181d42874cf50b52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Fri, 5 Dec 2014 12:37:42 -0800
Subject: [PATCH 15/17] Bug 1106239 - Fix up the styling for about:home's and
 about:newtab's search panel and about:newtab's customize panel. r=felipe

---
 browser/base/content/browser.css       | 23 ++++++-------------
 browser/base/content/browser.xul       |  2 +-
 browser/base/content/newtab/newTab.css | 31 ++++++++++----------------
 browser/base/content/newtab/newTab.xul |  2 +-
 4 files changed, 21 insertions(+), 37 deletions(-)

diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index dc07b4dd2aee..24c43bb5ddab 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -1221,27 +1221,18 @@ toolbarpaletteitem[place="palette"][hidden] {
   animation-duration: 2s;
 }
 
-#abouthome-search-panel .panel-arrowcontent {
-  -moz-padding-start: 0;
-  -moz-padding-end: 0;
-  padding-top: 0;
-  padding-bottom: 0;
-  background: rgb(248, 250, 251);
+#abouthome-search-panel > .panel-arrowcontainer > .panel-arrowcontent {
+  padding: 0;
   font-size: 110%;
 }
 
-.abouthome-search-panel-item {
-  -moz-box-align: center;
-  padding-top: 4px;
-  padding-bottom: 4px;
-  -moz-padding-start: 24px;
-  -moz-padding-end: 24px;
+#abouthome-search-panel-manage {
+  padding: 4px 24px;
 }
 
-.abouthome-search-panel-item > label {
-  -moz-padding-start: 0;
-  -moz-margin-start: 0;
-  color: rgb(130, 132, 133);
+#abouthome-search-panel-manage > label {
+  padding: 0;
+  margin: 0;
 }
 
 /* Combined context-menu items */
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 5201fd7cd4d7..0dbd35367516 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -278,7 +278,7 @@
 
     <panel id="abouthome-search-panel" orient="vertical" type="arrow" hidden="true"
            onclick="this.hidePopup()">
-      <hbox id="abouthome-search-panel-manage" class="abouthome-search-panel-item"
+      <hbox id="abouthome-search-panel-manage"
             onclick="openPreferences('paneSearch')">
         <label>&changeSearchSettings.button;</label>
       </hbox>
diff --git a/browser/base/content/newtab/newTab.css b/browser/base/content/newtab/newTab.css
index ab48914b6cdb..ba4c8376610d 100644
--- a/browser/base/content/newtab/newTab.css
+++ b/browser/base/content/newtab/newTab.css
@@ -454,27 +454,20 @@ input[type=button] {
   transition-duration: 0ms;
 }
 
-#newtab-customize-panel .panel-arrowcontent,
-#newtab-search-panel .panel-arrowcontent {
-  -moz-padding-start: 0;
-  -moz-padding-end: 0;
-  padding-top: 0;
-  padding-bottom: 0;
-  background: rgb(248, 250, 251);
+#newtab-customize-panel > .panel-arrowcontainer > .panel-arrowcontent,
+#newtab-search-panel > .panel-arrowcontainer > .panel-arrowcontent {
+  padding: 0;
 }
 
 .newtab-customize-panel-item,
-.newtab-search-panel-engine {
-  -moz-box-align: center;
-  padding-top: 4px;
-  padding-bottom: 4px;
-  -moz-padding-start: 24px;
-  -moz-padding-end: 24px;
+.newtab-search-panel-engine,
+#newtab-search-manage {
+  padding: 4px 24px;
 }
 
 .newtab-customize-panel-item:not(:last-child),
-.newtab-search-panel-engine:not(:last-child) {
-  border-bottom: 1px solid #ccc;
+.newtab-search-panel-engine {
+  border-bottom: 1px solid threedshadow;
 }
 
 .newtab-search-panel-engine > image {
@@ -485,10 +478,10 @@ input[type=button] {
 }
 
 .newtab-customize-panel-item > label,
-.newtab-search-panel-engine > label {
-  -moz-padding-start: 0;
-  -moz-margin-start: 0;
-  color: rgb(130, 132, 133);
+.newtab-search-panel-engine > label,
+#newtab-search-manage > label {
+  padding: 0;
+  margin: 0;
 }
 
 .newtab-customize-panel-item[selected],
diff --git a/browser/base/content/newtab/newTab.xul b/browser/base/content/newtab/newTab.xul
index 7790214db55a..ebde760b1ec4 100644
--- a/browser/base/content/newtab/newTab.xul
+++ b/browser/base/content/newtab/newTab.xul
@@ -29,7 +29,7 @@
 
   <xul:panel id="newtab-search-panel" orient="vertical" type="arrow"
              noautohide="true" hidden="true">
-    <xul:hbox id="newtab-search-manage" class="newtab-search-panel-engine">
+    <xul:hbox id="newtab-search-manage">
       <xul:label>&changeSearchSettings.button;</xul:label>
     </xul:hbox>
   </xul:panel>

From 49761c31005cff0370f61eab1d427496cb42e9c6 Mon Sep 17 00:00:00 2001
From: Tim Taubert <ttaubert@mozilla.com>
Date: Wed, 3 Dec 2014 14:14:23 -0800
Subject: [PATCH 16/17] Bug 1106936 - [e10s] Fix progress throbber for remote
 browsers r=billm

---
 toolkit/content/browser-child.js      | 17 +++++++++++++++++
 toolkit/modules/RemoteWebProgress.jsm |  5 +++++
 2 files changed, 22 insertions(+)

diff --git a/toolkit/content/browser-child.js b/toolkit/content/browser-child.js
index 3bc5701dd712..1c6e46d8141f 100644
--- a/toolkit/content/browser-child.js
+++ b/toolkit/content/browser-child.js
@@ -108,6 +108,19 @@ let WebProgressListener = {
   },
 
   onProgressChange: function onProgressChange(aWebProgress, aRequest, aCurSelf, aMaxSelf, aCurTotal, aMaxTotal) {
+    let json = this._setupJSON(aWebProgress, aRequest);
+    let objects = this._setupObjects(aWebProgress);
+
+    json.curSelf = aCurSelf;
+    json.maxSelf = aMaxSelf;
+    json.curTotal = aCurTotal;
+    json.maxTotal = aMaxTotal;
+
+    sendAsyncMessage("Content:ProgressChange", json, objects);
+  },
+
+  onProgressChange64: function onProgressChange(aWebProgress, aRequest, aCurSelf, aMaxSelf, aCurTotal, aMaxTotal) {
+    this.onProgressChange(aWebProgress, aRequest, aCurSelf, aMaxSelf, aCurTotal, aMaxTotal);
   },
 
   onLocationChange: function onLocationChange(aWebProgress, aRequest, aLocationURI, aFlags) {
@@ -151,8 +164,12 @@ let WebProgressListener = {
     sendAsyncMessage("Content:SecurityChange", json, objects);
   },
 
+  onRefreshAttempted: function onRefreshAttempted(aWebProgress, aURI, aDelay, aSameURI) {
+  },
+
   QueryInterface: function QueryInterface(aIID) {
     if (aIID.equals(Ci.nsIWebProgressListener) ||
+        aIID.equals(Ci.nsIWebProgressListener2) ||
         aIID.equals(Ci.nsISupportsWeakReference) ||
         aIID.equals(Ci.nsISupports)) {
         return this;
diff --git a/toolkit/modules/RemoteWebProgress.jsm b/toolkit/modules/RemoteWebProgress.jsm
index 4d6344a40940..3fdb731e28ef 100644
--- a/toolkit/modules/RemoteWebProgress.jsm
+++ b/toolkit/modules/RemoteWebProgress.jsm
@@ -76,6 +76,7 @@ function RemoteWebProgressManager (aBrowser) {
   this._browser.messageManager.addMessageListener("Content:LocationChange", this);
   this._browser.messageManager.addMessageListener("Content:SecurityChange", this);
   this._browser.messageManager.addMessageListener("Content:StatusChange", this);
+  this._browser.messageManager.addMessageListener("Content:ProgressChange", this);
 }
 
 RemoteWebProgressManager.prototype = {
@@ -208,6 +209,10 @@ RemoteWebProgressManager.prototype = {
     case "Content:StatusChange":
       this._callProgressListeners("onStatusChange", webProgress, request, json.status, json.message);
       break;
+
+    case "Content:ProgressChange":
+      this._callProgressListeners("onProgressChange", webProgress, request, json.curSelf, json.maxSelf, json.curTotal, json.maxTotal);
+      break;
     }
   }
 };

From de9c316b2015437d59f48c1b4fcffdc9924d42b9 Mon Sep 17 00:00:00 2001
From: Tim Taubert <ttaubert@mozilla.com>
Date: Fri, 5 Dec 2014 14:21:25 -0800
Subject: [PATCH 17/17] Backed out changeset 84c03250d7f6 (bug 1106936)

---
 toolkit/content/browser-child.js      | 17 -----------------
 toolkit/modules/RemoteWebProgress.jsm |  5 -----
 2 files changed, 22 deletions(-)

diff --git a/toolkit/content/browser-child.js b/toolkit/content/browser-child.js
index 1c6e46d8141f..3bc5701dd712 100644
--- a/toolkit/content/browser-child.js
+++ b/toolkit/content/browser-child.js
@@ -108,19 +108,6 @@ let WebProgressListener = {
   },
 
   onProgressChange: function onProgressChange(aWebProgress, aRequest, aCurSelf, aMaxSelf, aCurTotal, aMaxTotal) {
-    let json = this._setupJSON(aWebProgress, aRequest);
-    let objects = this._setupObjects(aWebProgress);
-
-    json.curSelf = aCurSelf;
-    json.maxSelf = aMaxSelf;
-    json.curTotal = aCurTotal;
-    json.maxTotal = aMaxTotal;
-
-    sendAsyncMessage("Content:ProgressChange", json, objects);
-  },
-
-  onProgressChange64: function onProgressChange(aWebProgress, aRequest, aCurSelf, aMaxSelf, aCurTotal, aMaxTotal) {
-    this.onProgressChange(aWebProgress, aRequest, aCurSelf, aMaxSelf, aCurTotal, aMaxTotal);
   },
 
   onLocationChange: function onLocationChange(aWebProgress, aRequest, aLocationURI, aFlags) {
@@ -164,12 +151,8 @@ let WebProgressListener = {
     sendAsyncMessage("Content:SecurityChange", json, objects);
   },
 
-  onRefreshAttempted: function onRefreshAttempted(aWebProgress, aURI, aDelay, aSameURI) {
-  },
-
   QueryInterface: function QueryInterface(aIID) {
     if (aIID.equals(Ci.nsIWebProgressListener) ||
-        aIID.equals(Ci.nsIWebProgressListener2) ||
         aIID.equals(Ci.nsISupportsWeakReference) ||
         aIID.equals(Ci.nsISupports)) {
         return this;
diff --git a/toolkit/modules/RemoteWebProgress.jsm b/toolkit/modules/RemoteWebProgress.jsm
index 3fdb731e28ef..4d6344a40940 100644
--- a/toolkit/modules/RemoteWebProgress.jsm
+++ b/toolkit/modules/RemoteWebProgress.jsm
@@ -76,7 +76,6 @@ function RemoteWebProgressManager (aBrowser) {
   this._browser.messageManager.addMessageListener("Content:LocationChange", this);
   this._browser.messageManager.addMessageListener("Content:SecurityChange", this);
   this._browser.messageManager.addMessageListener("Content:StatusChange", this);
-  this._browser.messageManager.addMessageListener("Content:ProgressChange", this);
 }
 
 RemoteWebProgressManager.prototype = {
@@ -209,10 +208,6 @@ RemoteWebProgressManager.prototype = {
     case "Content:StatusChange":
       this._callProgressListeners("onStatusChange", webProgress, request, json.status, json.message);
       break;
-
-    case "Content:ProgressChange":
-      this._callProgressListeners("onProgressChange", webProgress, request, json.curSelf, json.maxSelf, json.curTotal, json.maxTotal);
-      break;
     }
   }
 };