mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-07-07 23:59:10 +00:00
1367963d3d
- Bug 1198124 - Enable -Wshadow in directories that have no -Wshadow warnings. r=glandium (d03cfc1bb6) - Bug 1204403 - Fix -Wshadow warnings in xpcom. r=mccr8 (3247b5b146) - Bug 1140120 - Remove a couple of unused test functions on ServiceWorkerContainer; r=baku (efe1119749) - Bug 1180148 - Clear service workers registered for a site when clearing the cookies and stored data is not working in b2g. r=baku (7fb1d522ff) - Bug 1162333 - Add stronger assertions to PromiseWorkerProxy in debug builds. r=catalinb (0005a76252) - Bug 1190672 - Fix use of AutoReleasePromiseWorkerProxy in PushManager. r=catalinb (18f7358163) - Bug 1191495 - Relax PushManager callback assertions. r=kitcambridge (8a3822969f) - Bug 1189543 - pushManager.getSubscription() should return null for nonexistent push subscriptions in workers. r=nsm (b990083262) - spacing (44b87017a7) - Bug 1180295 - Rip out the Fennec code to set the screen render offset. r=rbarker (67183ae8bf) - Bug 1187804 - Un-adjust fixed layers by the async transform of the scroll frame that they're fixed with respect to, not of the nearest ancestor scroll frame. r=kats (7c5e7ac29c) - Bug 1131359 - Fix an include-what-you-use error in AsyncCompositionManager.cpp. r=kats (fe04815939) - Bug 1187804 - When a layer is scrolled by multiple scroll frames, do an AlignFixedAndStickyLayers pass on its subtree for each of the scroll frames. r=kats (031a5686f1) - Bug 1180295 - Stop clipping the content while the toolbar is in the process of sliding off. r=rbarker (9d806870e4) - Bug 1186968 - Fix Compositor::SetScreenRotation() call r=nical (e554c4b4a2) - Bug 1180295 - Implement seamless snapping to the stable state. r=rbarker (d1e7978eb7) - Bug 1131470 - Part 1: Rename existing use of ScreenOrientation to ScreenOrientationInternal. r=baku (63f0cb994b) - Bug 1131470 - Part 2: Update screen configuration HAL to report orientation angle. r=snorp,mwu (39b537f008) - Bug 1167597 - Mark PromiseReportRejectFeature::mPromise as MOZ_NON_OWNING_REF. r=ehsan (3ad520790a) - Bug 1086627 - Rename Promise constructs to more closely match the specification. r=nsm,jst (cea1d71cb1) - Bug 1086627 - Rename ThenableResolverTask to PromiseResolveThenableJob to more closely match Promise spec. r=nsm (e7102fe506) - Bug 1164725 - Convert flags in nsIDocument into bit fields. r=smaug (9f5d5f352d) - Bug 1192467 - Formalize precondition that SetDisplayDocument must not be called with null. - r=peterv (1aa8e91d14) - Bug 1153841 - Remove the 'it must be 2D' restriction for transforms on fixed-pos layers. r=BenWa,mattwoodrow (5bab86ec6a) - Bug 1173521 - Properly handle unapplying 3D projective transforms to rectangles in APZ code. r=botond (45c9850d5c) - Bug 1166301 - When applying an async adjustment to a fixed layer, only adjust its mask layer under the same circumstances as its clip rect. r=mattwoodrow (2801c48fe9) - Bug 1166301 - Update an old comment in AsyncCompositionManager::AlignFixedAndStickyLayers. r=kats (7e1d5c97d0) - Bug 1166301 - Allow async scrolling to move the clip rects of fixed background layers. r=mattwoodrow (edd889ec2b) - Bug 1200399 - Only send the RCD's metrics to Java-land for fennec-apz. r=rbarker (3b36a52f3a) - Bug 1201625 - Special-case B2GDroid since it doesn't have a root content document. r=rbarker (4fcdda1b0a) - Bug 1201529 - Fall back to rootmost metrics if there is no root content document metrics. r=botond (615c2ee727) - Bug 1201581 - Extract a helper method. r=rbarker (f2cccb8666) - Bug 1201581 - Hook up the syncFrameMetrics call to sync metrics info from the compositor to Java-land on each composite. r=rbarker (48e15bbde8) - Bug 1203760 P1 Allow pipe to wake up multiple streams at the same time. r=froydnj (5baed00637) - Bug 1203760 P2 Add gtests for nsPipeInputStream AsyncRead(). r=froydnj (52e5129dc8) - Bug 1201889 - When adjusting fixed and sticky layers in AsyncCompsitionManager, unapply all async transforms on the path from the fixed layer to the layer it's fixed with respect to. r=kats (dbb203178e) - Bug 1165536. Don't include resolution compensation when adjusting the cliprect of ancestors of scrollbars. r=botond (3bef5f2c18) - Fix async transforms on scrollbars not including any existing shadow transform. (bug 1128740 part 2, r=botond) (af12d76775) - missing of Bug 943728 - Replace double quotes with single quotes in Makefiles (e11470540f) - Bug 1188766 - Avoid exporting UPLOAD_EXTRA_FILES from mozconfig. r=mshal (4241b9e80b) - Fixup for bug 1188766 for valgrind bustage on a CLOSED TREE. r=me (4401dedf06) - Bug 1077622 - Fixes cp missing operand message if no .mozconfig found r=glandium (6eca1e5214) - Bug 1200523 - Remove leftover debugging code from js/src/Makefile.in; r=ted (414b72c74e) - spacing (99cda3f8a7)
312 lines
7.4 KiB
C++
312 lines
7.4 KiB
C++
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/* 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 "nsIFactory.h"
|
|
#include "mozilla/Module.h"
|
|
#include "nsXULAppAPI.h"
|
|
#include "nsIThread.h"
|
|
#include "nsIComponentRegistrar.h"
|
|
|
|
#include "nsAutoPtr.h"
|
|
#include "nsThreadUtils.h"
|
|
#include "nsXPCOMCIDInternal.h"
|
|
#include "pratom.h"
|
|
#include "prmon.h"
|
|
#include "mozilla/Attributes.h"
|
|
|
|
#include "mozilla/ReentrantMonitor.h"
|
|
using namespace mozilla;
|
|
|
|
#ifdef DEBUG
|
|
#define TEST_ASSERTION(_test, _msg) \
|
|
NS_ASSERTION(_test, _msg);
|
|
#else
|
|
#define TEST_ASSERTION(_test, _msg) \
|
|
PR_BEGIN_MACRO \
|
|
if (!(_test)) { \
|
|
NS_DebugBreak(NS_DEBUG_ABORT, _msg, #_test, __FILE__, __LINE__); \
|
|
} \
|
|
PR_END_MACRO
|
|
#endif
|
|
|
|
/* f93f6bdc-88af-42d7-9d64-1b43c649a3e5 */
|
|
#define FACTORY_CID1 \
|
|
{ \
|
|
0xf93f6bdc, \
|
|
0x88af, \
|
|
0x42d7, \
|
|
{ 0x9d, 0x64, 0x1b, 0x43, 0xc6, 0x49, 0xa3, 0xe5 } \
|
|
}
|
|
NS_DEFINE_CID(kFactoryCID1, FACTORY_CID1);
|
|
|
|
/* ef38ad65-6595-49f0-8048-e819f81d15e2 */
|
|
#define FACTORY_CID2 \
|
|
{ \
|
|
0xef38ad65, \
|
|
0x6595, \
|
|
0x49f0, \
|
|
{ 0x80, 0x48, 0xe8, 0x19, 0xf8, 0x1d, 0x15, 0xe2 } \
|
|
}
|
|
NS_DEFINE_CID(kFactoryCID2, FACTORY_CID2);
|
|
|
|
#define FACTORY_CONTRACTID \
|
|
"TestRacingThreadManager/factory;1"
|
|
|
|
int32_t gComponent1Count = 0;
|
|
int32_t gComponent2Count = 0;
|
|
|
|
ReentrantMonitor* gReentrantMonitor = nullptr;
|
|
|
|
bool gCreateInstanceCalled = false;
|
|
bool gMainThreadWaiting = false;
|
|
|
|
class AutoCreateAndDestroyReentrantMonitor
|
|
{
|
|
public:
|
|
explicit AutoCreateAndDestroyReentrantMonitor(ReentrantMonitor** aReentrantMonitorPtr)
|
|
: mReentrantMonitorPtr(aReentrantMonitorPtr) {
|
|
*aReentrantMonitorPtr =
|
|
new ReentrantMonitor("TestRacingServiceManager::AutoMon");
|
|
TEST_ASSERTION(*aReentrantMonitorPtr, "Out of memory!");
|
|
}
|
|
|
|
~AutoCreateAndDestroyReentrantMonitor() {
|
|
if (*mReentrantMonitorPtr) {
|
|
delete *mReentrantMonitorPtr;
|
|
*mReentrantMonitorPtr = nullptr;
|
|
}
|
|
}
|
|
|
|
private:
|
|
ReentrantMonitor** mReentrantMonitorPtr;
|
|
};
|
|
|
|
class Factory final : public nsIFactory
|
|
{
|
|
~Factory() {}
|
|
|
|
public:
|
|
NS_DECL_THREADSAFE_ISUPPORTS
|
|
|
|
Factory() : mFirstComponentCreated(false) { }
|
|
|
|
NS_IMETHOD CreateInstance(nsISupports* aDelegate,
|
|
const nsIID& aIID,
|
|
void** aResult) override;
|
|
|
|
NS_IMETHOD LockFactory(bool aLock) override {
|
|
return NS_OK;
|
|
}
|
|
|
|
bool mFirstComponentCreated;
|
|
};
|
|
|
|
NS_IMPL_ISUPPORTS(Factory, nsIFactory)
|
|
|
|
class Component1 final : public nsISupports
|
|
{
|
|
~Component1() {}
|
|
|
|
public:
|
|
NS_DECL_THREADSAFE_ISUPPORTS
|
|
|
|
Component1() {
|
|
// This is the real test - make sure that only one instance is ever created.
|
|
int32_t count = PR_AtomicIncrement(&gComponent1Count);
|
|
TEST_ASSERTION(count == 1, "Too many components created!");
|
|
}
|
|
};
|
|
|
|
NS_IMPL_ADDREF(Component1)
|
|
NS_IMPL_RELEASE(Component1)
|
|
|
|
NS_INTERFACE_MAP_BEGIN(Component1)
|
|
NS_INTERFACE_MAP_ENTRY(nsISupports)
|
|
NS_INTERFACE_MAP_END
|
|
|
|
class Component2 final : public nsISupports
|
|
{
|
|
~Component2() {}
|
|
|
|
public:
|
|
NS_DECL_THREADSAFE_ISUPPORTS
|
|
|
|
Component2() {
|
|
// This is the real test - make sure that only one instance is ever created.
|
|
int32_t count = PR_AtomicIncrement(&gComponent2Count);
|
|
TEST_ASSERTION(count == 1, "Too many components created!");
|
|
}
|
|
};
|
|
|
|
NS_IMPL_ADDREF(Component2)
|
|
NS_IMPL_RELEASE(Component2)
|
|
|
|
NS_INTERFACE_MAP_BEGIN(Component2)
|
|
NS_INTERFACE_MAP_ENTRY(nsISupports)
|
|
NS_INTERFACE_MAP_END
|
|
|
|
NS_IMETHODIMP
|
|
Factory::CreateInstance(nsISupports* aDelegate,
|
|
const nsIID& aIID,
|
|
void** aResult)
|
|
{
|
|
// Make sure that the second thread beat the main thread to the getService
|
|
// call.
|
|
TEST_ASSERTION(!NS_IsMainThread(), "Wrong thread!");
|
|
|
|
{
|
|
ReentrantMonitorAutoEnter mon(*gReentrantMonitor);
|
|
|
|
gCreateInstanceCalled = true;
|
|
mon.Notify();
|
|
|
|
mon.Wait(PR_MillisecondsToInterval(3000));
|
|
}
|
|
|
|
NS_ENSURE_FALSE(aDelegate, NS_ERROR_NO_AGGREGATION);
|
|
NS_ENSURE_ARG_POINTER(aResult);
|
|
|
|
nsCOMPtr<nsISupports> instance;
|
|
|
|
if (!mFirstComponentCreated) {
|
|
instance = new Component1();
|
|
}
|
|
else {
|
|
instance = new Component2();
|
|
}
|
|
NS_ENSURE_TRUE(instance, NS_ERROR_OUT_OF_MEMORY);
|
|
|
|
nsresult rv = instance->QueryInterface(aIID, aResult);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
class Runnable : public nsRunnable
|
|
{
|
|
public:
|
|
NS_DECL_NSIRUNNABLE
|
|
|
|
Runnable() : mFirstRunnableDone(false) { }
|
|
|
|
bool mFirstRunnableDone;
|
|
};
|
|
|
|
NS_IMETHODIMP
|
|
Runnable::Run()
|
|
{
|
|
{
|
|
ReentrantMonitorAutoEnter mon(*gReentrantMonitor);
|
|
|
|
while (!gMainThreadWaiting) {
|
|
mon.Wait();
|
|
}
|
|
}
|
|
|
|
nsresult rv;
|
|
nsCOMPtr<nsISupports> component;
|
|
|
|
if (!mFirstRunnableDone) {
|
|
component = do_GetService(kFactoryCID1, &rv);
|
|
}
|
|
else {
|
|
component = do_GetService(FACTORY_CONTRACTID, &rv);
|
|
}
|
|
TEST_ASSERTION(NS_SUCCEEDED(rv), "GetService failed!");
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
static Factory* gFactory;
|
|
|
|
static already_AddRefed<nsIFactory>
|
|
CreateFactory(const mozilla::Module& module, const mozilla::Module::CIDEntry& entry)
|
|
{
|
|
if (!gFactory) {
|
|
gFactory = new Factory();
|
|
NS_ADDREF(gFactory);
|
|
}
|
|
nsCOMPtr<nsIFactory> ret = gFactory;
|
|
return ret.forget();
|
|
}
|
|
|
|
static const mozilla::Module::CIDEntry kLocalCIDs[] = {
|
|
{ &kFactoryCID1, false, CreateFactory, nullptr },
|
|
{ &kFactoryCID2, false, CreateFactory, nullptr },
|
|
{ nullptr }
|
|
};
|
|
|
|
static const mozilla::Module::ContractIDEntry kLocalContracts[] = {
|
|
{ FACTORY_CONTRACTID, &kFactoryCID2 },
|
|
{ nullptr }
|
|
};
|
|
|
|
static const mozilla::Module kLocalModule = {
|
|
mozilla::Module::kVersion,
|
|
kLocalCIDs,
|
|
kLocalContracts
|
|
};
|
|
|
|
int main(int argc, char** argv)
|
|
{
|
|
nsresult rv;
|
|
XRE_AddStaticComponent(&kLocalModule);
|
|
|
|
ScopedXPCOM xpcom("RacingServiceManager");
|
|
NS_ENSURE_FALSE(xpcom.failed(), 1);
|
|
|
|
AutoCreateAndDestroyReentrantMonitor mon1(&gReentrantMonitor);
|
|
|
|
nsRefPtr<Runnable> runnable = new Runnable();
|
|
NS_ENSURE_TRUE(runnable, 1);
|
|
|
|
// Run the classID test
|
|
nsCOMPtr<nsIThread> newThread;
|
|
rv = NS_NewThread(getter_AddRefs(newThread), runnable);
|
|
NS_ENSURE_SUCCESS(rv, 1);
|
|
|
|
{
|
|
ReentrantMonitorAutoEnter mon2(*gReentrantMonitor);
|
|
|
|
gMainThreadWaiting = true;
|
|
mon2.Notify();
|
|
|
|
while (!gCreateInstanceCalled) {
|
|
mon2.Wait();
|
|
}
|
|
}
|
|
|
|
nsCOMPtr<nsISupports> component(do_GetService(kFactoryCID1, &rv));
|
|
NS_ENSURE_SUCCESS(rv, 1);
|
|
|
|
// Reset for the contractID test
|
|
gMainThreadWaiting = gCreateInstanceCalled = false;
|
|
gFactory->mFirstComponentCreated = runnable->mFirstRunnableDone = true;
|
|
component = nullptr;
|
|
|
|
rv = newThread->Dispatch(runnable, NS_DISPATCH_NORMAL);
|
|
NS_ENSURE_SUCCESS(rv, 1);
|
|
|
|
{
|
|
ReentrantMonitorAutoEnter mon3(*gReentrantMonitor);
|
|
|
|
gMainThreadWaiting = true;
|
|
mon3.Notify();
|
|
|
|
while (!gCreateInstanceCalled) {
|
|
mon3.Wait();
|
|
}
|
|
}
|
|
|
|
component = do_GetService(FACTORY_CONTRACTID, &rv);
|
|
NS_ENSURE_SUCCESS(rv, 1);
|
|
|
|
NS_RELEASE(gFactory);
|
|
|
|
return 0;
|
|
}
|