Bug 1196047 - Move shared/shared perf files to server/performance. r=jsantell

--HG--
rename : devtools/shared/shared/framerate.js => devtools/server/performance/framerate.js
rename : devtools/shared/shared/memory.js => devtools/server/performance/memory.js
rename : devtools/shared/shared/profiler.js => devtools/server/performance/profiler.js

devtools/server/actors/common.js

@@ -527,7 +527,7 @@ exports.expectState = expectState;
  * place, usable by other modules/actors on the server, but a separate
  * module defining the actor/RDP definition.
  *
- * @see Framerate implementation: devtools/shared/shared/framerate.js
+ * @see Framerate implementation: devtools/server/performance/framerate.js
  * @see Framerate actor definition: devtools/server/actors/framerate.js
  */
 function actorBridge (methodName, definition={}) {

devtools/server/actors/framerate.js

@@ -7,13 +7,13 @@ const protocol = require("devtools/server/protocol");
 const { actorBridge } = require("devtools/server/actors/common");
 const { method, custom, Arg, Option, RetVal } = protocol;
 const { on, once, off, emit } = require("sdk/event/core");
-const { Framerate } = require("devtools/shared/shared/framerate");
+const { Framerate } = require("devtools/server/performance/framerate");
 
 /**
  * An actor wrapper around Framerate. Uses exposed
  * methods via bridge and provides RDP definitions.
  *
- * @see devtools/shared/shared/framerate.js for documentation.
+ * @see devtools/server/performance/framerate.js for documentation.
  */
 var FramerateActor = exports.FramerateActor = protocol.ActorClass({
   typeName: "framerate",

devtools/server/actors/memory.js

@@ -7,7 +7,7 @@
 const { Cc, Ci, Cu, components } = require("chrome");
 const protocol = require("devtools/server/protocol");
 const { method, RetVal, Arg, types } = protocol;
-const { Memory } = require("devtools/shared/shared/memory");
+const { Memory } = require("devtools/server/performance/memory");
 const { actorBridge } = require("devtools/server/actors/common");
 loader.lazyRequireGetter(this, "events", "sdk/event/core");
 loader.lazyRequireGetter(this, "StackFrameCache",
@@ -38,10 +38,10 @@ types.addDictType("AllocationsRecordingOptions", {
  * parent tab. A global-scoped instance however, will measure the memory
  * footprint of the chrome window referenced by the root actor.
  *
- * This actor wraps the Memory module at devtools/shared/shared/memory.js
+ * This actor wraps the Memory module at devtools/server/performance/memory.js
  * and provides RDP definitions.
  *
- * @see devtools/shared/shared/memory.js for documentation.
+ * @see devtools/server/performance/memory.js for documentation.
  */
 var MemoryActor = exports.MemoryActor = protocol.ActorClass({
   typeName: "memory",

devtools/server/actors/profiler.js

@@ -7,7 +7,7 @@
 const { Cu } = require("chrome");
 const protocol = require("devtools/server/protocol");
 const { custom, method, RetVal, Arg, Option, types } = protocol;
-const { Profiler } = require("devtools/shared/shared/profiler");
+const { Profiler } = require("devtools/server/performance/profiler");
 const { actorBridge } = require("devtools/server/actors/common");
 
 loader.lazyRequireGetter(this, "events", "sdk/event/core");
@@ -30,10 +30,10 @@ types.addType("profiler-data", {
 });
 
 /**
- * This actor wraps the Profiler module at devtools/shared/shared/profiler.js
+ * This actor wraps the Profiler module at devtools/server/performance/profiler.js
  * and provides RDP definitions.
  *
- * @see devtools/shared/shared/profiler.js for documentation.
+ * @see devtools/server/performance/profiler.js for documentation.
  */
 var ProfilerActor = exports.ProfilerActor = protocol.ActorClass({
   typeName: "profiler",

devtools/server/actors/timeline.js

@@ -9,17 +9,17 @@
  * has a name, start and end timestamps. Markers are stored in docShells.
  *
  * This actor exposes this tracking mechanism to the devtools protocol.
- * Most of the logic is handled in devtools/shared/shared/timeline.js
+ * Most of the logic is handled in devtools/server/performance/timeline.js
  * This just wraps that module up and exposes it via RDP.
  *
  * For more documentation:
- * @see devtools/shared/shared/timeline.js
+ * @see devtools/server/performance/timeline.js
  */
 
 const protocol = require("devtools/server/protocol");
 const { method, Arg, RetVal, Option } = protocol;
 const events = require("sdk/event/core");
-const { Timeline } = require("devtools/shared/shared/timeline");
+const { Timeline } = require("devtools/server/performance/timeline");
 const { actorBridge } = require("devtools/server/actors/common");
 
 /**

devtools/server/performance/moz.build

@@ -5,5 +5,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DevToolsModules(
+    'framerate.js',
+    'memory.js',
+    'profiler.js',
     'recorder.js',
+    'timeline.js',
 )

devtools/server/performance/recorder.js

@@ -18,11 +18,11 @@ loader.lazyRequireGetter(this, "events",
   "sdk/event/core");
 
 loader.lazyRequireGetter(this, "Memory",
-  "devtools/shared/shared/memory", true);
+  "devtools/server/performance/memory", true);
 loader.lazyRequireGetter(this, "Timeline",
-  "devtools/shared/shared/timeline", true);
+  "devtools/server/performance/timeline", true);
 loader.lazyRequireGetter(this, "Profiler",
-  "devtools/shared/shared/profiler", true);
+  "devtools/server/performance/profiler", true);
 loader.lazyRequireGetter(this, "PerformanceRecordingActor",
   "devtools/server/actors/performance-recording", true);
 loader.lazyRequireGetter(this, "PerformanceRecordingFront",

devtools/server/performance/timeline.js

@@ -27,8 +27,8 @@ const { Class } = require("sdk/core/heritage");
 loader.lazyRequireGetter(this, "events", "sdk/event/core");
 loader.lazyRequireGetter(this, "Timers", "sdk/timers");
 loader.lazyRequireGetter(this, "Task", "resource://gre/modules/Task.jsm", true);
-loader.lazyRequireGetter(this, "Memory", "devtools/shared/shared/memory", true);
-loader.lazyRequireGetter(this, "Framerate", "devtools/shared/shared/framerate", true);
+loader.lazyRequireGetter(this, "Memory", "devtools/server/performance/memory", true);
+loader.lazyRequireGetter(this, "Framerate", "devtools/server/performance/framerate", true);
 loader.lazyRequireGetter(this, "StackFrameCache", "devtools/server/actors/utils/stack", true);
 loader.lazyRequireGetter(this, "EventTarget", "sdk/event/target", true);
 

devtools/shared/moz.build

@@ -20,7 +20,6 @@ DIRS += [
     'qrcode',
     'security',
     'sourcemap',
-    'shared',
     'shims',
     'styleinspector',
     'tern',

devtools/shared/shared/moz.build

@@ -1,12 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# 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/.
-
-DevToolsModules(
-  'framerate.js',
-  'memory.js',
-  'profiler.js',
-  'timeline.js',
-)