mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
f32bf3ebba
- Bug 1268976 - Assert that the micro-task queues are empty upon destruction of CycleCollectedJSRuntime; r=mccr8 (a459a4af91) - Bug 1191354 part 1 - Clean up nsHTMLEditRules::GetHighestInlineParent; r=ehsan (a2f401887c) - Bug 1191354 part 2 - Clean up nsHTMLEditRules::CheckInterlinePosition; r=ehsan (75d3829eec) - Bug 1191354 part 3 - Clean up nsHTMLEditRules::InsertMozBRIfNeeded; r=ehsan (bedbba7c14) - Bug 772796 - Handle newlines correctly when joining <div> and <pre>. r=roc (323eaf4fe9) - Bug 1258085 - Avoid empty whitespace nodes when editing (b77825fb31) - Bug 1156062 part 4 - Clean up ns*EditRules::WillInsert; r=ehsan (f351557776) - Bug 1156062 part 5 - Make CreateBR return regular pointer; r=ehsan (8720917dee) - Bug 1156062 part 6 - Clean up nsHTMLEditRules::WillInsertBreak; r=ehsan (d71bca568f) - Bug 1156062 part 7 - Clean up nsHTMLEditRules::StandardBreakImpl; r=ehsan (625db32c02) - Bug 1156062 part 8 - Clean up nsHTMLEditRules::JoinBlocks; r=ehsan (266b6c5150) - Bug 1156062 part 9 - Clean up nsHTMLEditRules::WillAlign; r=masayuki (a6e3227001) - Bug 1156062 part 10 - Clean up MarginPropertyAtomForIndent; r=masayuki (28612e062c) - Bug 1184665 - Remove a spammy editor warning (a2db555918) - Bug 1156062 part 11 - Clean up nsHTMLEditRules::Before/AfterEdit; r=masayuki (6be722082e) - Bug 1156062 part 12 - Clean up nsHTMLEditRules::GetAlignment; r=masayuki (350be10ee8) - Bug 1190172 part 1 - Clean up nsHTMLEditor::SplitStyleAbovePoint; r=ehsan (ce5e360af6) - Bug 1145395 - Introduce an overload of nsHTMLEditor::SelElementPosition that takes an Element; r=ehsan (7ca9dfd2f8) - Bug 1190172 part 2 - Clean up nsHTMLEditor::ClearStyle; r=ehsan (84334514ad) - Bug 1190172 part 3 - Remove old method variants; r=ehsan (e042bd64d5) - Bug 1190172 part 4 - Remove unused nsHTMLEditor::HasAttr; r=ehsan (a4f1563465) - Bug 1190172 part 5 - Clean up nsHTMLEditor::NodeIsProperty; r=ehsan (98afb84bd4) - Bug 1190172 part 6 - Clean up nsHTMLEditor::RelativeFontChangeOnTextNode; r=ehsan (0bf036d206) - Bug 1190172 part 7 - Clean up nsHTMLEditor::PromoteInlineRange; r=ehsan (0a21347500) - Bug 1190172 part 8 - Clean up nsHTMLEditor::PromoteRangeIfStartsOrEndsInNamedAnchor; r=ehsan (78cf619036) - Bug 1190172 part 9 - Clean up nsHTMLEditor::ReturnInHeader; r=ehsan (1d8d151ff1) - Bug 1190172 part 10 - Clean up nsHTMLEditor::ReturnInListItem; r=ehsan (0ce94d3cb1) - Bug 1190172 part 11 - Clean up nsHTMLEditRules::IsEmptyBlock; r=ehsan (a8dc5092f8) - Bug 1190172 part 12 - Clean up nsHTMLEditRules::ExpandSelectionForDeletion; r=ehsan (3d4a87a56d) - Bug 1191354 part 4 - Clean up nsHTMLEditRules::AlignBlock; r=ehsan (b39372d726) - Bug 1191354 part 5 - Clean up nsHTMLEditRules::IsEmptyInline; r=ehsan (0b8ab19fd1) - Bug 1191354 part 6 - Clean up IsBlockNode/IsInlineNode in nsHTMLEditRules.cpp; r=ehsan (8ba8047e12) - Bug 1191354 part 7 - Clean up nsHTMLEditRules::CheckForInvisibleBR; r=ehsan (0bc61269bd) - Bug 1191354 part 8 - Typedefs in headers for readability; r=ehsan (50b43dc3e9) - Bug 1191354 part 9 - Remove old nsHTMLEditRules::ConvertListType variant; r=ehsan (871f1b30a5) - Bug 1191354 part 10 - More features for OwningNonNull; r=froydnj (8e365d079a) - Bug 1191354 part 11 - Clean up nsHTMLEditRules::WillOutdent; r=ehsan (0c59a81c10) - Bug 1191354 part 12 - Clean up nsHTMLEditRules::OutdentPartOfBlock; r=ehsan (243d7ab42f) - Bug 1191354 part 13 - Clean up nsHTMLEditRules::SplitBlock; r=ehsan (c1141ab04d) - Bug 1191356 part 1 - Clean up nsHTMLEditRules::RemoveListStructure; r=ehsan (1d2ad5faa6) - Bug 1191356 part 2 - Clean up nsHTMLEditor::RemoveBlockContainer; r=ehsan (a9d140f511) - Bug 1191356 part 3 - Clean up nsHTMLEditRules::MoveBlock; r=ehsan (6bc14cd40c) - Bug 1191356 part 4 - Clean up nsHTMLEditRules::MoveNodeSmart, MoveContents; r=ehsan (00e6536e47) - Bug 1191356 part 5 - Clean up nsHTMLEditRules::RelativeChangeIndentationOfElementNode; r=ehsan (c3139c7d90) - Bug 1191356 part 6 - Clean up nsHTMLEditRules::WillMakeBasicBlock; r=ehsan (b3f73c2e12) - Bug 1191356 part 7 - Clean up nsHTMLEditor::GetSelectionContainer; r=ehsan (091e999587) - Bug 1191356 part 8 - Clean up nsHTMLEditRules::WillAbsolutePosition; r=ehsan (9982c65a99) - Bug 1208884 - Fix a few null check ordering bugs in nsHTMLEditRules::SplitParagraph; r=roc (d04eece297) - Bug 1209037 - Eliminate some unneeded null checks; r=jdm (b35d5308c5) - Bug 1191356 part 9 - Convert nsHTMLEditRules::mNewBlock to Element; r=ehsan (f374780e22) - Bug 1253734 - Add some more editor things to CC traversal. r=mccr8. (94a0c77bb1) - Bug 1193762 part 1 - Remove nsEditor::IsBlockNode(nsIDOMNode*); r=ehsan (5e107cbdbb) - Bug 1193762 part 2 - Remove nsHTMLEditor::IsVisBreak(nsIDOMNode*); r=ehsan (5e61c27d21) - Bug 1193762 part 3 - Remove nsEditor::IsDescendantOfEditorRoot(nsIDOMNode*); r=ehsan (022a37d442) - Bug 1193762 part 4 - Avoid nsCOMPtr in ternary operator; r=froydnj (e4bc35cbe0) - Bug 1193762 part 5 - Convert DecodePool::threads to nsTArray; r=froydnj (c61f063f4d) - Bug 1193762 part 6 - Return raw pointer, not nsCOMPtr; r=froydnj (a43c30f92e) - Bug 1193762 part 7 - Use .get() when assigning to variables; r=froydnj (a61ad819f0) - Bug 1193762 part 8 - Fix things that will break; r=froydnj (40a76db662) - Bug 1193762 part 9 - Delete nsCOMPtr<T>::operator T*()&&; r=froydnj (022c1f0dba) - Bug 1168223 - Fix a crash caused by unexpected flushes under nsIEditor::SetFlags. r=ehsan (cc49d468b8) - Bug 1158837 - Ensure the start and end nodes are non-null before using them. r=roc (7c28121aa7) - Bug 1269047 - Remove chained ENSURE calls from GetStartNodeAndOffset. r=ehsan (f36c1c67aa) - Bug 1248078 - Remove the dedicated scroll acknowledgement message. r=botond (500b8d7574) - Bug 1260806: Remove some more dead MessageLoop code. r=jld (1c223cafe8) - Bug 1266595: Replace Chromium Task with Runnable. r=froydnj (5c1c056c83) - Bug 1242343 - p1. ConstructSystem32Path from LoadLibrarySystem32 - r=jimm (b28fcbc0c4) - Bug 1242343 - p2. Blacklist msmpeg2vdec.dll 12.0.9200.16426 & .17037 - r=cpearce (9a71795ab0) - Bug 1253395 - Disable msmpeg2vdec.dll blackslisting - r=cpearce (e1d4dc47be) - Bug 1242456 - Create RAIIs to manage HGLOBAL and printer HANDLE in ShowNativePrintDialog and CreateGlobalDevModeAndInit. r=jimm, r=bobowen (a22cecaebd) - Bug 1262399 - remove Impl suffixes from nsSupports* implementations; r=mccr8 (6733db9394) - Bug 1268772 (part 1) - Remove nsCheapSet::Put()'s return value. r=erahm. (5f3f553e84) - Bug 1268772 (part 2) - Make infallible nsVariant methods return |void| instead of |nsresult|. r=erahm. (22ae74fdaf) - Bug 1268772 (part 3) - Remove NS_NewWindowsRegKey()'s return value. r=erahm. (dc32bd698e) - Bug 1268772 (part 4) - Use MOZ_MUST_USE with NS_NewISupportsArray(). r=erahm. (e51ecfdf9f) - Bug 1268772 (part 5) - Use MOZ_MUST_USE in other parts of xpcom/ds/. r=erahm. (4d8a5183eb) - Bug 1266027 part 1 - make the MediaDecoderReaderWrapper as a proxy of requesting media data; r=jwwang (fbaa79019d) - Bug 1195601 - Remove MediaDecoderStateMachine::mLogicallySeeking. r=kinetik. (5ab1ff1ca0) - Bug 1266027 part 2 - make MDSM and SeekTask to adopt new MediaDecoderReaderWrapper API; r=jwwang (1961e26e80) - add mac specific dupes (4e4ff4b123) - Bug 1269262 - Unbreak build without NO_EXPAND_LIBS in js/src/moz.build after bug 1239083. r=ted (46d2dec64a) - Bug 1253215 - Initialize RequestSyncService only if its pref is enabled, r=ehsan (aec1b2f889) - Bug 1269303 - Remove RequestSync API, r=fabrice (f774336e34)
196 lines
5.5 KiB
C++
196 lines
5.5 KiB
C++
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim:set ts=2 sw=2 sts=2 et: */
|
|
/* 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/. */
|
|
|
|
#include "TestHarness.h"
|
|
#include "nsIFile.h"
|
|
#include "nsIDirectoryService.h"
|
|
#include "nsDirectoryServiceDefs.h"
|
|
#include "nsCOMArray.h"
|
|
#include "nsArrayEnumerator.h"
|
|
#include "nsXULAppAPI.h"
|
|
#include "nsIComponentRegistrar.h"
|
|
|
|
#define SERVICE_A_CONTRACT_ID "@mozilla.org/RegTestServiceA;1"
|
|
#define SERVICE_B_CONTRACT_ID "@mozilla.org/RegTestServiceB;1"
|
|
|
|
// {56ab1cd4-ac44-4f86-8104-171f8b8f2fc7}
|
|
#define CORE_SERVICE_A_CID \
|
|
{ 0x56ab1cd4, 0xac44, 0x4f86, \
|
|
{ 0x81, 0x04, 0x17, 0x1f, 0x8b, 0x8f, 0x2f, 0xc7} }
|
|
NS_DEFINE_CID(kCoreServiceA_CID, CORE_SERVICE_A_CID);
|
|
|
|
// {fe64efb7-c5ab-41a6-b639-e6c0f483181e}
|
|
#define EXT_SERVICE_A_CID \
|
|
{ 0xfe64efb7, 0xc5ab, 0x41a6, \
|
|
{ 0xb6, 0x39, 0xe6, 0xc0, 0xf4, 0x83, 0x18, 0x1e} }
|
|
NS_DEFINE_CID(kExtServiceA_CID, EXT_SERVICE_A_CID);
|
|
|
|
// {d04d1298-6dac-459b-a13b-bcab235730a0}
|
|
#define CORE_SERVICE_B_CID \
|
|
{ 0xd04d1298, 0x6dac, 0x459b, \
|
|
{ 0xa1, 0x3b, 0xbc, 0xab, 0x23, 0x57, 0x30, 0xa0 } }
|
|
NS_DEFINE_CID(kCoreServiceB_CID, CORE_SERVICE_B_CID);
|
|
|
|
// {e93dadeb-a6f6-4667-bbbc-ac8c6d440b20}
|
|
#define EXT_SERVICE_B_CID \
|
|
{ 0xe93dadeb, 0xa6f6, 0x4667, \
|
|
{ 0xbb, 0xbc, 0xac, 0x8c, 0x6d, 0x44, 0x0b, 0x20 } }
|
|
NS_DEFINE_CID(kExtServiceB_CID, EXT_SERVICE_B_CID);
|
|
|
|
nsresult execRegOrderTest(const char *aTestName, const char *aContractID,
|
|
const nsCID &aCoreCID, const nsCID &aExtCID)
|
|
{
|
|
// Make sure the core service loaded (it won't be found using contract ID).
|
|
nsresult rv = NS_ERROR_FAILURE;
|
|
nsCOMPtr<nsISupports> coreService = do_CreateInstance(aCoreCID, &rv);
|
|
#ifdef DEBUG_brade
|
|
if (rv) fprintf(stderr, "rv: %d (%x)\n", rv, rv);
|
|
fprintf(stderr, "coreService: %p\n", coreService.get());
|
|
#endif
|
|
if (NS_FAILED(rv))
|
|
{
|
|
fail("%s FAILED - cannot create core service\n", aTestName);
|
|
return rv;
|
|
}
|
|
|
|
// Get the extension service.
|
|
nsCOMPtr<nsISupports> extService = do_CreateInstance(aExtCID, &rv);
|
|
#ifdef DEBUG_brade
|
|
if (rv) fprintf(stderr, "rv: %d (%x)\n", rv, rv);
|
|
fprintf(stderr, "extService: %p\n", extService.get());
|
|
#endif
|
|
if (NS_FAILED(rv))
|
|
{
|
|
fail("%s FAILED - cannot create extension service\n", aTestName);
|
|
return rv;
|
|
}
|
|
|
|
/*
|
|
* Get the service by contract ID and make sure it is the extension
|
|
* service (it should be, since the extension directory was registered
|
|
* after the core one).
|
|
*/
|
|
nsCOMPtr<nsISupports> service = do_CreateInstance(aContractID, &rv);
|
|
#ifdef DEBUG_brade
|
|
if (rv) fprintf(stderr, "rv: %d (%x)\n", rv, rv);
|
|
fprintf(stderr, "service: %p\n", service.get());
|
|
#endif
|
|
if (NS_FAILED(rv))
|
|
{
|
|
fail("%s FAILED - cannot create service\n", aTestName);
|
|
return rv;
|
|
}
|
|
|
|
if (service != extService)
|
|
{
|
|
fail("%s FAILED - wrong service registered\n", aTestName);
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
passed(aTestName);
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult TestRegular()
|
|
{
|
|
return execRegOrderTest("TestRegular", SERVICE_A_CONTRACT_ID,
|
|
kCoreServiceA_CID, kExtServiceA_CID);
|
|
}
|
|
|
|
nsresult TestJar()
|
|
{
|
|
return execRegOrderTest("TestJar", SERVICE_B_CONTRACT_ID,
|
|
kCoreServiceB_CID, kExtServiceB_CID);
|
|
}
|
|
|
|
bool TestContractFirst()
|
|
{
|
|
nsCOMPtr<nsIComponentRegistrar> r;
|
|
NS_GetComponentRegistrar(getter_AddRefs(r));
|
|
|
|
nsCID* cid = nullptr;
|
|
nsresult rv = r->ContractIDToCID("@mozilla.org/RegTestOrderC;1", &cid);
|
|
if (NS_FAILED(rv)) {
|
|
fail("RegTestOrderC: contract not registered");
|
|
return false;
|
|
}
|
|
|
|
nsCID goodcid;
|
|
goodcid.Parse("{ada15884-bb89-473c-8b50-dcfbb8447ff4}");
|
|
|
|
if (!goodcid.Equals(*cid)) {
|
|
fail("RegTestOrderC: CID doesn't match");
|
|
return false;
|
|
}
|
|
|
|
passed("RegTestOrderC");
|
|
return true;
|
|
}
|
|
|
|
static already_AddRefed<nsIFile>
|
|
GetRegDirectory(const char* basename, const char* dirname, const char* leafname)
|
|
{
|
|
nsCOMPtr<nsIFile> f;
|
|
nsresult rv = NS_NewNativeLocalFile(nsDependentCString(basename), true,
|
|
getter_AddRefs(f));
|
|
if (NS_FAILED(rv))
|
|
return nullptr;
|
|
|
|
f->AppendNative(nsDependentCString(dirname));
|
|
if (leafname)
|
|
f->AppendNative(nsDependentCString(leafname));
|
|
return f.forget();
|
|
}
|
|
|
|
|
|
|
|
int main(int argc, char** argv)
|
|
{
|
|
if (argc < 2)
|
|
{
|
|
fprintf(stderr, "not enough arguments -- need registration dir path\n");
|
|
return 1;
|
|
}
|
|
|
|
ScopedLogging logging;
|
|
|
|
#ifdef XP_WIN
|
|
// On Windows, convert to backslashes
|
|
size_t regPathLen = strlen(argv[1]);
|
|
char* regPath = new char[regPathLen + 1];
|
|
for (size_t i = 0; i < regPathLen; i++) {
|
|
char curr = argv[1][i];
|
|
regPath[i] = (curr == '/') ? '\\' : curr;
|
|
}
|
|
regPath[regPathLen] = '\0';
|
|
#else
|
|
const char *regPath = argv[1];
|
|
#endif
|
|
|
|
nsCOMPtr<nsIFile> file =
|
|
GetRegDirectory(regPath, "core", "component.manifest");
|
|
XRE_AddManifestLocation(NS_EXTENSION_LOCATION, file);
|
|
file = GetRegDirectory(regPath, "extension", "extComponent.manifest");
|
|
XRE_AddManifestLocation(NS_EXTENSION_LOCATION, file);
|
|
file = GetRegDirectory(regPath, "extension2.jar", nullptr);
|
|
XRE_AddJarManifestLocation(NS_EXTENSION_LOCATION, file);
|
|
ScopedXPCOM xpcom("RegistrationOrder");
|
|
if (xpcom.failed())
|
|
return 1;
|
|
|
|
int rv = 0;
|
|
if (NS_FAILED(TestRegular()))
|
|
rv = 1;
|
|
|
|
if (NS_FAILED(TestJar()))
|
|
rv = 1;
|
|
|
|
if (!TestContractFirst())
|
|
rv = 1;
|
|
|
|
return rv;
|
|
}
|