Bug 1265730 - Fix test failures from previous commit;r=me CLOSED TREE
authorEddy Bruel <ejpbruel@mozilla.com>
Thu, 26 May 2016 12:39:08 +0200
changeset 299186 02517c2c78bd6da0d0433b6b549c09e9a43a9895
parent 299185 ebf96465a8de20345f7b8d176d827ec538ecbd09
child 299188 b0096c5c727749ad3e79cbdf20d2e96bd179c213
child 299235 a33592050e2465ea62f9d62c42623c9c88b9808f
push id77464
push userryanvm@gmail.com
push dateThu, 26 May 2016 15:22:37 +0000
treeherdermozilla-inbound@49beae179207 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1265730
milestone49.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1265730 - Fix test failures from previous commit;r=me CLOSED TREE
devtools/server/actors/styleeditor.js
--- a/devtools/server/actors/styleeditor.js
+++ b/devtools/server/actors/styleeditor.js
@@ -317,86 +317,16 @@ var OldStyleSheetActor = protocol.ActorC
       this.rawSheet.deleteRule(this.rawSheet.cssRules.length - 1);
     }
 
     events.emit(this, "style-applied");
   }
 });
 
 /**
-<<<<<<< 6db477279f016462d0b622691e95b0dd02c4ff4a
- * StyleSheetFront is the client-side counterpart to a StyleSheetActor.
- */
-var OldStyleSheetFront = protocol.FrontClass(OldStyleSheetActor, {
-  initialize: function (conn, form, ctx, detail) {
-    protocol.Front.prototype.initialize.call(this, conn, form, ctx, detail);
-
-    this._onPropertyChange = this._onPropertyChange.bind(this);
-    events.on(this, "property-change", this._onPropertyChange);
-  },
-
-  destroy: function () {
-    events.off(this, "property-change", this._onPropertyChange);
-
-    protocol.Front.prototype.destroy.call(this);
-  },
-
-  _onPropertyChange: function (property, value) {
-    this._form[property] = value;
-  },
-
-  form: function (form, detail) {
-    if (detail === "actorid") {
-      this.actorID = form;
-      return;
-    }
-    this.actorID = form.actor;
-    this._form = form;
-  },
-
-  getText: function () {
-    let deferred = promise.defer();
-
-    events.once(this, "source-load", (source) => {
-      let longStr = new ShortLongString(source);
-      deferred.resolve(longStr);
-    });
-    this.fetchSource();
-
-    return deferred.promise;
-  },
-
-  getOriginalSources: function () {
-    return promise.resolve([]);
-  },
-
-  get href() {
-    return this._form.href;
-  },
-  get nodeHref() {
-    return this._form.nodeHref;
-  },
-  get disabled() {
-    return !!this._form.disabled;
-  },
-  get title() {
-    return this._form.title;
-  },
-  get isSystem() {
-    return this._form.system;
-  },
-  get styleSheetIndex() {
-    return this._form.styleSheetIndex;
-  },
-  get ruleCount() {
-    return this._form.ruleCount;
-  }
-});
-
-/**
  * Creates a StyleEditorActor. StyleEditorActor provides remote access to the
  * stylesheets of a document.
  */
 var StyleEditorActor = exports.StyleEditorActor = protocol.ActorClass({
   typeName: "styleeditor",
 
   /**
    * The window we work with, taken from the parent actor.