From 566a741a749c0102d1fc905b4db7a5c100b61601 Mon Sep 17 00:00:00 2001 From: Jason Orendorff Date: Thu, 25 Aug 2011 18:32:35 -0500 Subject: [PATCH] Back out changeset 28dd46b9ee31 (bug 679031) because the test is failing on all the buildbots. --- js/ductwork/Makefile.in | 49 -------- js/ductwork/debugger/IJSDebugger.idl | 52 -------- js/ductwork/debugger/JSDebugger.cpp | 111 ------------------ js/ductwork/debugger/JSDebugger.h | 62 ---------- js/ductwork/debugger/Makefile.in | 75 ------------ js/ductwork/debugger/jsdebugger.jsm | 55 --------- js/ductwork/debugger/tests/head_dbg.js | 17 --- .../debugger/tests/test_nativewrappers.js | 29 ----- js/ductwork/debugger/tests/xpcshell.ini | 5 - testing/xpcshell/xpcshell.ini | 1 - toolkit/library/libxul-config.mk | 1 - toolkit/library/nsStaticXULComponents.cpp | 1 - toolkit/toolkit-makefiles.sh | 7 -- toolkit/toolkit-tiers.mk | 2 - 14 files changed, 467 deletions(-) delete mode 100644 js/ductwork/Makefile.in delete mode 100644 js/ductwork/debugger/IJSDebugger.idl delete mode 100644 js/ductwork/debugger/JSDebugger.cpp delete mode 100644 js/ductwork/debugger/JSDebugger.h delete mode 100644 js/ductwork/debugger/Makefile.in delete mode 100644 js/ductwork/debugger/jsdebugger.jsm delete mode 100644 js/ductwork/debugger/tests/head_dbg.js delete mode 100644 js/ductwork/debugger/tests/test_nativewrappers.js delete mode 100644 js/ductwork/debugger/tests/xpcshell.ini diff --git a/js/ductwork/Makefile.in b/js/ductwork/Makefile.in deleted file mode 100644 index 73e048aab41..00000000000 --- a/js/ductwork/Makefile.in +++ /dev/null @@ -1,49 +0,0 @@ -# ***** BEGIN LICENSE BLOCK ***** -# Version: MPL 1.1/GPL 2.0/LGPL 2.1 -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# The Original Code is the Mozilla Browser code. -# -# The Initial Developer of the Original Code is -# Netscape Communications Corporation. -# Portions created by the Initial Developer are Copyright (C) 2011 -# the Initial Developer. All Rights Reserved. -# -# Contributor(s): -# Jason Orendorff -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 2 or later (the "GPL"), or -# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -# in which case the provisions of the GPL or the LGPL are applicable instead -# of those above. If you wish to allow use of your version of this file only -# under the terms of either the GPL or the LGPL, and not to allow others to -# use your version of this file under the terms of the MPL, indicate your -# decision by deleting the provisions above and replace them with the notice -# and other provisions required by the GPL or the LGPL. If you do not delete -# the provisions above, a recipient may use your version of this file under -# the terms of any one of the MPL, the GPL or the LGPL. -# -# ***** END LICENSE BLOCK ***** - -DEPTH = ../.. -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(topsrcdir)/config/config.mk - -PARALLEL_DIRS += \ - debugger \ - $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/js/ductwork/debugger/IJSDebugger.idl b/js/ductwork/debugger/IJSDebugger.idl deleted file mode 100644 index 228af9609e9..00000000000 --- a/js/ductwork/debugger/IJSDebugger.idl +++ /dev/null @@ -1,52 +0,0 @@ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is mozilla.org code. - * - * The Initial Developer of the Original Code is - * Mozilla Foundation - * Portions created by the Initial Developer are Copyright (C) 2011 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * Dave Camp - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -#include "nsISupports.idl" - -/** - * Do not use this interface. Instead, write: - * Components.utils.import("resource://gre/modules/jsdebugger.jsm"); - */ -[scriptable, uuid(2fc14cc6-4ed0-4bbf-a7dd-e535bf088eb5)] -interface IJSDebugger : nsISupports -{ - /** - * Define the global Debugger constructor. - */ - [implicit_jscontext] - void addClass(); -}; diff --git a/js/ductwork/debugger/JSDebugger.cpp b/js/ductwork/debugger/JSDebugger.cpp deleted file mode 100644 index ed2032be99a..00000000000 --- a/js/ductwork/debugger/JSDebugger.cpp +++ /dev/null @@ -1,111 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2; -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is mozilla.org code. - * - * The Initial Developer of the Original Code is - * The Mozilla Foundation . - * Portions created by the Initial Developer are Copyright (C) 2011 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * Dave Camp - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -#include "JSDebugger.h" -#include "nsIXPConnect.h" -#include "nsThreadUtils.h" -#include "jsapi.h" -#include "jsobj.h" -#include "jsgc.h" -#include "jsfriendapi.h" -#include "jsdbgapi.h" -#include "mozilla/ModuleUtils.h" -#include "nsServiceManagerUtils.h" -#include "nsMemory.h" - -#define JSDEBUGGER_CONTRACTID \ - "@mozilla.org/jsdebugger;1" - -#define JSDEBUGGER_CID \ -{ 0x0365cbd5, 0xd46e, 0x4e94, { 0xa3, 0x9f, 0x83, 0xb6, 0x3c, 0xd1, 0xa9, 0x63 } } - -namespace mozilla { -namespace jsdebugger { - -NS_GENERIC_FACTORY_CONSTRUCTOR(JSDebugger) - -NS_IMPL_ISUPPORTS1(JSDebugger, IJSDebugger) - -JSDebugger::JSDebugger() -{ -} - -JSDebugger::~JSDebugger() -{ -} - -NS_IMETHODIMP -JSDebugger::AddClass(JSContext *cx) -{ - nsresult rv; - nsCOMPtr xpc = do_GetService(nsIXPConnect::GetCID(), &rv); - - JSObject* global = JS_GetGlobalForScopeChain(cx); - if (!global) { - return NS_ERROR_NOT_AVAILABLE; - } - - if (!JS_DefineDebuggerObject(cx, global)) { - return NS_ERROR_FAILURE; - } - - return NS_OK; -} - -} -} - -NS_DEFINE_NAMED_CID(JSDEBUGGER_CID); - -static const mozilla::Module::CIDEntry kJSDebuggerCIDs[] = { - { &kJSDEBUGGER_CID, false, NULL, mozilla::jsdebugger::JSDebuggerConstructor }, - { NULL } -}; - -static const mozilla::Module::ContractIDEntry kJSDebuggerContracts[] = { - { JSDEBUGGER_CONTRACTID, &kJSDEBUGGER_CID }, - { NULL } -}; - -static const mozilla::Module kJSDebuggerModule = { - mozilla::Module::kVersion, - kJSDebuggerCIDs, - kJSDebuggerContracts -}; - -NSMODULE_DEFN(jsdebugger) = &kJSDebuggerModule; diff --git a/js/ductwork/debugger/JSDebugger.h b/js/ductwork/debugger/JSDebugger.h deleted file mode 100644 index e7874f1f0ce..00000000000 --- a/js/ductwork/debugger/JSDebugger.h +++ /dev/null @@ -1,62 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2; -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is mozilla.org code. - * - * The Initial Developer of the Original Code is - * The Mozilla Foundation . - * Portions created by the Initial Developer are Copyright (C) 2011 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * Dave Camp - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -#ifndef COMPONENTS_JSDEBUGGER_H -#define COMPONENTS_JSDEBUGGER_H - -#include "IJSDebugger.h" - -namespace mozilla { -namespace jsdebugger { - -class JSDebugger : public IJSDebugger -{ -public: - NS_DECL_ISUPPORTS - NS_DECL_IJSDEBUGGER - - JSDebugger(); - -private: - ~JSDebugger(); -}; - -} -} - -#endif diff --git a/js/ductwork/debugger/Makefile.in b/js/ductwork/debugger/Makefile.in deleted file mode 100644 index f1715c66274..00000000000 --- a/js/ductwork/debugger/Makefile.in +++ /dev/null @@ -1,75 +0,0 @@ -# ***** BEGIN LICENSE BLOCK ***** -# Version: MPL 1.1/GPL 2.0/LGPL 2.1 -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# The Original Code is mozilla.org code. -# -# The Initial Developer of the Original Code is -# The Mozilla Foundation . -# Portions created by the Initial Developer are Copyright (C) 2011 -# the Initial Developer. All Rights Reserved. -# -# Contributor(s): -# Dave Camp -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 2 or later (the "GPL"), or -# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -# in which case the provisions of the GPL or the LGPL are applicable instead -# of those above. If you wish to allow use of your version of this file only -# under the terms of either the GPL or the LGPL, and not to allow others to -# use your version of this file under the terms of the MPL, indicate your -# decision by deleting the provisions above and replace them with the notice -# and other provisions required by the GPL or the LGPL. If you do not delete -# the provisions above, a recipient may use your version of this file under -# the terms of any one of the MPL, the GPL or the LGPL. -# -# ***** END LICENSE BLOCK ***** - -DEPTH = ../../.. -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = js/ductwork/debugger - -include $(DEPTH)/config/autoconf.mk - -MODULE = jsdebugger -MODULE_NAME = jsdebugger -GRE_MODULE = 1 - -LIBRARY_NAME = jsdebugger -XPIDL_MODULE = jsdebugger -LIBXUL_LIBRARY = 1 -EXPORT_LIBRARY = 1 -IS_COMPONENT = 1 - -CPPSRCS = \ - JSDebugger.cpp \ - $(NULL) - -EXTRA_DSO_LDOPTS += \ - $(MOZ_COMPONENT_LIBS) \ - $(MOZ_JS_LIBS) \ - $(NULL) - -EXTRA_JS_MODULES = \ - jsdebugger.jsm \ - $(NULL) - -XPIDLSRCS = \ - IJSDebugger.idl \ - $(NULL) - -XPCSHELL_TESTS = tests - -include $(topsrcdir)/config/rules.mk diff --git a/js/ductwork/debugger/jsdebugger.jsm b/js/ductwork/debugger/jsdebugger.jsm deleted file mode 100644 index fd74c589927..00000000000 --- a/js/ductwork/debugger/jsdebugger.jsm +++ /dev/null @@ -1,55 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2; -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is js-ctypes. - * - * The Initial Developer of the Original Code is - * The Mozilla Foundation . - * Portions created by the Initial Developer are Copyright (C) 2011 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * Jason Orendorff - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -let EXPORTED_SYMBOLS = [ "Debugger" ]; - -/* - * This is the js module for Debugger. Import it like so: - * Components.utils.import("resource://gre/modules/jsdebugger.jsm"); - * - * This will create a 'Debugger' object, which provides an interface to debug - * JavaScript code running in other compartments in the same process, on the - * same thread. - * - * For documentation on the API, see: - * https://wiki.mozilla.org/Debugger - */ - -// Initialize the Debugger object. You do not need to do this yourself. -const init = Components.classes["@mozilla.org/jsdebugger;1"].createInstance(Components.interfaces.IJSDebugger); -init.addClass(); diff --git a/js/ductwork/debugger/tests/head_dbg.js b/js/ductwork/debugger/tests/head_dbg.js deleted file mode 100644 index 0ffeed26bd7..00000000000 --- a/js/ductwork/debugger/tests/head_dbg.js +++ /dev/null @@ -1,17 +0,0 @@ -/* Any copyright is dedicated to the Public Domain. - http://creativecommons.org/publicdomain/zero/1.0/ */ - -"use strict"; -const Cc = Components.classes; -const Ci = Components.interfaces; -const Cu = Components.utils; -const Cr = Components.results; - -function testGlobal(aName) { - let systemPrincipal = Cc["@mozilla.org/systemprincipal;1"] - .createInstance(Ci.nsIPrincipal); - - let sandbox = Cu.Sandbox(systemPrincipal); - Cu.evalInSandbox("this.__name = '" + aName + "'", sandbox); - return sandbox; -} diff --git a/js/ductwork/debugger/tests/test_nativewrappers.js b/js/ductwork/debugger/tests/test_nativewrappers.js deleted file mode 100644 index 07b126ed532..00000000000 --- a/js/ductwork/debugger/tests/test_nativewrappers.js +++ /dev/null @@ -1,29 +0,0 @@ -function run_test() -{ - Components.utils.import("resource://gre/modules/jsdebugger.jsm"); - var g = testGlobal("test1"); - - var dbg = new Debugger(); - dbg.addDebuggee(g); - dbg.onDebuggerStatement = function(aFrame) { - let args = aFrame["arguments"]; - try { - args[0]; - do_check_true(true); - } catch(ex) { - do_check_true(false); - } - }; - - g.eval("function stopMe(arg) {debugger;}"); - - g2 = testGlobal("test2"); - g2.g = g; - g2.eval("(" + function createBadEvent() { - let parser = Components.classes["@mozilla.org/xmlextras/domparser;1"].createInstance(Components.interfaces.nsIDOMParser); - let doc = parser.parseFromString("", "text/xml"); - g.stopMe(doc.createEvent("MouseEvent")); - } + ")()"); - - dbg.enabled = false; -} diff --git a/js/ductwork/debugger/tests/xpcshell.ini b/js/ductwork/debugger/tests/xpcshell.ini deleted file mode 100644 index f6e5987e2bc..00000000000 --- a/js/ductwork/debugger/tests/xpcshell.ini +++ /dev/null @@ -1,5 +0,0 @@ -[DEFAULT] -head = head_dbg.js -tail = - -[test_nativewrappers.js] diff --git a/testing/xpcshell/xpcshell.ini b/testing/xpcshell/xpcshell.ini index 544acd3c691..1b01a00a3ea 100644 --- a/testing/xpcshell/xpcshell.ini +++ b/testing/xpcshell/xpcshell.ini @@ -46,7 +46,6 @@ skip-if = os == "android" [include:intl/uconv/tests/unit/xpcshell.ini] [include:netwerk/test/unit/xpcshell.ini] [include:netwerk/test/httpserver/test/xpcshell.ini] -[include:js/ductwork/debugger/tests/xpcshell.ini] [include:js/jetpack/tests/unit/xpcshell.ini] [include:js/src/xpconnect/tests/unit/xpcshell.ini] [include:modules/libjar/test/unit/xpcshell.ini] diff --git a/toolkit/library/libxul-config.mk b/toolkit/library/libxul-config.mk index 1fbf005d67e..a7c0f2a2534 100644 --- a/toolkit/library/libxul-config.mk +++ b/toolkit/library/libxul-config.mk @@ -142,7 +142,6 @@ COMPONENT_LIBS += \ composer \ jetpack_s \ telemetry \ - jsdebugger \ storagecomps \ $(NULL) diff --git a/toolkit/library/nsStaticXULComponents.cpp b/toolkit/library/nsStaticXULComponents.cpp index 5ac253e400c..a3cf5d9ddc7 100644 --- a/toolkit/library/nsStaticXULComponents.cpp +++ b/toolkit/library/nsStaticXULComponents.cpp @@ -273,7 +273,6 @@ SERVICES_CRYPTO_MODULE \ MOZ_APP_COMPONENT_MODULES \ MODULE(nsTelemetryModule) \ - MODULE(jsdebugger) \ /* end of list */ #define MODULE(_name) \ diff --git a/toolkit/toolkit-makefiles.sh b/toolkit/toolkit-makefiles.sh index d40a404bd50..cebe5f6a1b0 100644 --- a/toolkit/toolkit-makefiles.sh +++ b/toolkit/toolkit-makefiles.sh @@ -683,12 +683,6 @@ MAKEFILES_jsreflect=" toolkit/components/reflect/Makefile " -MAKEFILES_jsductwork=" - js/ductwork/Makefile - js/ductwork/debugger/Makefile - js/ductwork/debugger/tests/Makefile -" - MAKEFILES_libpr0n=" modules/libpr0n/Makefile modules/libpr0n/build/Makefile @@ -756,7 +750,6 @@ add_makefiles " $MAKEFILES_jsdebugger $MAKEFILES_jsctypes $MAKEFILES_jsreflect - $MAKEFILES_jsductwork $MAKEFILES_content $MAKEFILES_layout $MAKEFILES_libimg diff --git a/toolkit/toolkit-tiers.mk b/toolkit/toolkit-tiers.mk index 09b9de84ac0..d3b30ccb0a4 100644 --- a/toolkit/toolkit-tiers.mk +++ b/toolkit/toolkit-tiers.mk @@ -224,8 +224,6 @@ tier_platform_dirs += services/crypto/component tier_platform_dirs += startupcache -tier_platform_dirs += js/ductwork - ifdef APP_LIBXUL_STATICDIRS # Applications can cheat and ask for code to be # built before libxul so libxul can be linked against it.