Commit 286e0c92 authored by Andrea Marchesini's avatar Andrea Marchesini
Browse files

Bug 965860 - patch 2 - ConsoleAPI written in C++, r=bz

parent b1d122f7

addon-sdk/source/lib/sdk/console/plain-text.js

+0 −3
Original line number Diff line number Diff line
@@ -61,9 +61,6 @@ function PlainTextConsole(print) { 
  });



  // We defined the `__exposedProps__` in our console chrome object.

  // Although it seems redundant, because we use `createObjectIn` too, in

  // worker.js, we are following what `ConsoleAPI` does. See:

  // http://mxr.mozilla.org/mozilla-central/source/dom/base/ConsoleAPI.js#132

  //

  // Meanwhile we're investigating with the platform team if `__exposedProps__`

  // are needed, or are just a left-over.

addon-sdk/source/lib/sdk/content/sandbox.js

+1 −5
Original line number Diff line number Diff line
@@ -199,11 +199,7 @@ const WorkerSandbox = Class({ 
    if (!getTabForContentWindow(window)) {

      let win = getUnsafeWindow(window);



      // export our chrome console to content window, using the same approach

      // of `ConsoleAPI`:

      // http://mxr.mozilla.org/mozilla-central/source/dom/base/ConsoleAPI.js#150

      //

      // and described here:

      // export our chrome console to content window, as described here:

      // https://developer.mozilla.org/en-US/docs/Components.utils.createObjectIn

      let con = Cu.createObjectIn(win);

addon-sdk/source/lib/sdk/deprecated/traits-worker.js

+1 −5
Original line number Diff line number Diff line
@@ -278,11 +278,7 @@ const WorkerSandbox = EventEmitter.compose({ 
    if (!getTabForContentWindow(window)) {

      let win = window.wrappedJSObject ? window.wrappedJSObject : window;



      // export our chrome console to content window, using the same approach

      // of `ConsoleAPI`:

      // http://mxr.mozilla.org/mozilla-central/source/dom/base/ConsoleAPI.js#150

      //

      // and described here:

      // export our chrome console to content window as described here:

      // https://developer.mozilla.org/en-US/docs/Components.utils.createObjectIn

      let con = Cu.createObjectIn(win);

b2g/installer/package-manifest.in

+0 −1
Original line number Diff line number Diff line
@@ -339,7 +339,6 @@ 


; JavaScript components

@BINPATH@/components/ConsoleAPI.manifest

@BINPATH@/components/ConsoleAPI.js

@BINPATH@/components/ConsoleAPIStorage.js

@BINPATH@/components/BrowserElementParent.manifest

@BINPATH@/components/BrowserElementParent.js

browser/devtools/webconsole/test/browser_webconsole_bug_585956_console_trace.js

+4 −4
Original line number Diff line number Diff line
@@ -33,10 +33,10 @@ function test() { 


    // The expected stack trace object.

    let stacktrace = [

      { filename: TEST_URI, lineNumber: 9, functionName: "window.foobar585956c", language: 2 },

      { filename: TEST_URI, lineNumber: 14, functionName: "foobar585956b", language: 2 },

      { filename: TEST_URI, lineNumber: 18, functionName: "foobar585956a", language: 2 },

      { filename: TEST_URI, lineNumber: 21, functionName: null, language: 2 }

      { filename: TEST_URI, functionName: "window.foobar585956c", language: 2, lineNumber: 9 },

      { filename: TEST_URI, functionName: "foobar585956b", language: 2, lineNumber: 14 },

      { filename: TEST_URI, functionName: "foobar585956a", language: 2, lineNumber: 18 },

      { filename: TEST_URI, functionName: "", language: 2, lineNumber: 21 }

    ];



    ok(obj._stacktrace, "found stacktrace object");