mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1519636 - Reformat recent changes to the Google coding style r=Ehsan 

Please note that it is the first reformat with clang-format 9
I only saw a fix in the .mm file

# ignore-this-changeset

Differential Revision: https://phabricator.services.mozilla.com/D49056

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Sylvestre Ledru 2019-10-21 14:13:44 +00:00
Родитель 6a912db249
Коммит 7c309095ea
57 изменённых файлов: 354 добавлений и 336 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
accessible/base/AccIterator.cpp
Просмотреть файл

@ -69,13 +69,11 @@ AccIterator::IteratorState::IteratorState(const Accessible* aParent,
RelatedAccIterator::RelatedAccIterator(DocAccessible* aDocument,
nsIContent* aDependentContent,
nsAtom* aRelAttr)
: mDocument(aDocument),
mRelAttr(aRelAttr),
mProviders(nullptr),
mIndex(0) {
: mDocument(aDocument), mRelAttr(aRelAttr), mProviders(nullptr), mIndex(0) {
nsAutoString id;
if (aDependentContent->IsElement() &&
aDependentContent->AsElement()->GetAttr(kNameSpaceID_None, nsGkAtoms::id, id)) {
aDependentContent->AsElement()->GetAttr(kNameSpaceID_None, nsGkAtoms::id,
id)) {
mProviders = mDocument->GetRelProviders(aDependentContent->AsElement(), id);
}
}

36
accessible/ipc/win/HandlerProvider.cpp
Просмотреть файл

@ -103,11 +103,12 @@ void HandlerProvider::GetAndSerializePayload(
IA2Payload payload{};
if (!mscom::InvokeOnMainThread("HandlerProvider::BuildInitialIA2Data", this,
&HandlerProvider::BuildInitialIA2Data,
std::forward<NotNull<mscom::IInterceptor*>>(aInterceptor),
std::forward<StaticIA2Data*>(&payload.mStaticData),
std::forward<DynamicIA2Data*>(&payload.mDynamicData)) ||
if (!mscom::InvokeOnMainThread(
"HandlerProvider::BuildInitialIA2Data", this,
&HandlerProvider::BuildInitialIA2Data,
std::forward<NotNull<mscom::IInterceptor*>>(aInterceptor),
std::forward<StaticIA2Data*>(&payload.mStaticData),
std::forward<DynamicIA2Data*>(&payload.mDynamicData)) ||
!payload.mDynamicData.mUniqueId) {
return;
}
@ -634,8 +635,7 @@ HandlerProvider::get_AllTextInfo(BSTR* aText,
std::forward<IAccessibleHyperlink***>(aHyperlinks),
std::forward<long*>(aNHyperlinks),
std::forward<IA2TextSegment**>(aAttribRuns),
std::forward<long*>(aNAttribRuns),
std::forward<HRESULT*>(&hr))) {
std::forward<long*>(aNAttribRuns), std::forward<HRESULT*>(&hr))) {
return E_FAIL;
}
@ -700,12 +700,11 @@ HandlerProvider::get_RelationsInfo(IARelationData** aRelations,
}
HRESULT hr;
if (!mscom::InvokeOnMainThread("HandlerProvider::GetRelationsInfoMainThread",
this,
&HandlerProvider::GetRelationsInfoMainThread,
std::forward<IARelationData**>(aRelations),
std::forward<long*>(aNRelations),
std::forward<HRESULT*>(&hr))) {
if (!mscom::InvokeOnMainThread(
"HandlerProvider::GetRelationsInfoMainThread", this,
&HandlerProvider::GetRelationsInfoMainThread,
std::forward<IARelationData**>(aRelations),
std::forward<long*>(aNRelations), std::forward<HRESULT*>(&hr))) {
return E_FAIL;
}
@ -843,12 +842,11 @@ HandlerProvider::get_AllChildren(AccChildData** aChildren, ULONG* aNChildren) {
MOZ_ASSERT(mscom::IsCurrentThreadMTA());
HRESULT hr;
if (!mscom::InvokeOnMainThread("HandlerProvider::GetAllChildrenMainThread",
this,
&HandlerProvider::GetAllChildrenMainThread,
std::forward<AccChildData**>(aChildren),
std::forward<ULONG*>(aNChildren),
std::forward<HRESULT*>(&hr))) {
if (!mscom::InvokeOnMainThread(
"HandlerProvider::GetAllChildrenMainThread", this,
&HandlerProvider::GetAllChildrenMainThread,
std::forward<AccChildData**>(aChildren),
std::forward<ULONG*>(aNChildren), std::forward<HRESULT*>(&hr))) {
return E_FAIL;
}

4
accessible/mac/mozAccessible.mm
Просмотреть файл

@ -90,9 +90,9 @@ static inline NSMutableArray* ConvertToNSArray(nsTArray<ProxyAccessible*>& aArra
if ((self = [super init])) {
mGeckoAccessible = aGeckoAccessible;
if (aGeckoAccessible & IS_PROXY)
mRole = [self getProxyAccessible] -> Role();
mRole = [self getProxyAccessible]->Role();
else
mRole = [self getGeckoAccessible] -> Role();
mRole = [self getGeckoAccessible]->Role();
}
return self;

4
accessible/mac/mozActionElements.mm
Просмотреть файл

@ -284,13 +284,13 @@ enum CheckboxValue {
- (NSArray*)children {
if (![self getGeckoAccessible]) return nil;
nsDeckFrame* deckFrame = do_QueryFrame([self getGeckoAccessible] -> GetFrame());
nsDeckFrame* deckFrame = do_QueryFrame([self getGeckoAccessible]->GetFrame());
nsIFrame* selectedFrame = deckFrame ? deckFrame->GetSelectedBox() : nullptr;
Accessible* selectedAcc = nullptr;
if (selectedFrame) {
nsINode* node = selectedFrame->GetContent();
selectedAcc = [self getGeckoAccessible] -> Document() -> GetAccessible(node);
selectedAcc = [self getGeckoAccessible]->Document() -> GetAccessible(node);
}
if (selectedAcc) {

4
accessible/xul/XULComboboxAccessible.cpp
Просмотреть файл

@ -28,9 +28,7 @@ XULComboboxAccessible::XULComboboxAccessible(nsIContent* aContent,
mGenericTypes |= eCombobox;
}
role XULComboboxAccessible::NativeRole() const {
return roles::COMBOBOX;
}
role XULComboboxAccessible::NativeRole() const { return roles::COMBOBOX; }
uint64_t XULComboboxAccessible::NativeState() const {
// As a nsComboboxAccessible we can have the following states:

3
caps/nsJSPrincipals.cpp
Просмотреть файл

@ -389,5 +389,6 @@ bool nsJSPrincipals::write(JSContext* aCx, JSStructuredCloneWriter* aWriter) {
}
bool nsJSPrincipals::isSystemOrAddonPrincipal() {
return this->IsSystemPrincipal() || this->GetIsAddonOrExpandedAddonPrincipal();
return this->IsSystemPrincipal() ||
this->GetIsAddonOrExpandedAddonPrincipal();
}

3
dom/base/SerializedStackHolder.cpp
Просмотреть файл

@ -81,7 +81,8 @@ JSObject* SerializedStackHolder::ReadStack(JSContext* aCx) {
set.emplace(mWorkerRef->Private()->GetPrincipal());
}
mHolder.Read(xpc::CurrentNativeGlobal(aCx), aCx, &stackValue, IgnoreErrors());
mHolder.Read(xpc::CurrentNativeGlobal(aCx), aCx, &stackValue,
IgnoreErrors());
}
return stackValue.isObject() ? &stackValue.toObject() : nullptr;

2
dom/base/nsMappedAttributes.cpp
Просмотреть файл

@ -87,7 +87,7 @@ void* nsMappedAttributes::operator new(size_t aSize,
// if we have zero attributes. The zero attribute case only happens
// for <body>'s mapped attributes
if (aAttrCount != 0) {
size -= sizeof(void * [1]);
size -= sizeof(void* [1]);
}
if (sCachedMappedAttributeAllocations) {

12
dom/base/test/gtest/TestContentUtils.cpp
Просмотреть файл

@ -14,9 +14,9 @@
TEST(DOM_Base_ContentUtils, StringifyJSON_EmptyValue)
{
JS::RootedObject globalObject(
mozilla::dom::RootingCx(),
mozilla::dom::SimpleGlobalObject::Create(
mozilla::dom::SimpleGlobalObject::GlobalType::BindingDetail));
mozilla::dom::RootingCx(),
mozilla::dom::SimpleGlobalObject::Create(
mozilla::dom::SimpleGlobalObject::GlobalType::BindingDetail));
mozilla::dom::AutoJSAPI jsAPI;
ASSERT_TRUE(jsAPI.Init(globalObject));
JSContext* cx = jsAPI.cx();
@ -31,9 +31,9 @@ TEST(DOM_Base_ContentUtils, StringifyJSON_EmptyValue)
TEST(DOM_Base_ContentUtils, StringifyJSON_Object)
{
JS::RootedObject globalObject(
mozilla::dom::RootingCx(),
mozilla::dom::SimpleGlobalObject::Create(
mozilla::dom::SimpleGlobalObject::GlobalType::BindingDetail));
mozilla::dom::RootingCx(),
mozilla::dom::SimpleGlobalObject::Create(
mozilla::dom::SimpleGlobalObject::GlobalType::BindingDetail));
mozilla::dom::AutoJSAPI jsAPI;
ASSERT_TRUE(jsAPI.Init(globalObject));
JSContext* cx = jsAPI.cx();

4
dom/bindings/BindingUtils.h
Просмотреть файл

@ -1528,8 +1528,8 @@ static inline JSObject* WrapNativeISupports(JSContext* cx, T* p,
JS::Rooted<JSObject*> scope(cx, JS::CurrentGlobalOrNull(cx));
JS::Rooted<JS::Value> v(cx);
retval = XPCOMObjectToJsval(cx, scope, helper, nullptr, false, &v)
? v.toObjectOrNull()
: nullptr;
? v.toObjectOrNull()
: nullptr;
}
return retval;
}

16
dom/canvas/WebGLTexelConversions.h
Просмотреть файл

@ -26,16 +26,16 @@
*/
#ifndef WEBGLTEXELCONVERSIONS_H_
# define WEBGLTEXELCONVERSIONS_H_
#define WEBGLTEXELCONVERSIONS_H_
# ifdef __SUNPRO_CC
# define __restrict
# endif
#ifdef __SUNPRO_CC
# define __restrict
#endif
# include "WebGLTypes.h"
# include <stdint.h>
# include "mozilla/Attributes.h"
# include "mozilla/Casting.h"
#include "WebGLTypes.h"
#include <stdint.h>
#include "mozilla/Attributes.h"
#include "mozilla/Casting.h"
namespace mozilla {

4
dom/events/EventStateManager.h
Просмотреть файл

@ -1079,8 +1079,8 @@ class EventStateManager : public nsSupportsWeakReference, public nsIObserver {
bool DoDefaultDragStart(nsPresContext* aPresContext,
WidgetDragEvent* aDragEvent,
dom::DataTransfer* aDataTransfer,
bool aAllowEmptyDataTransfer,
nsIContent* aDragTarget, dom::Selection* aSelection,
bool aAllowEmptyDataTransfer, nsIContent* aDragTarget,
dom::Selection* aSelection,
dom::RemoteDragStartData* aDragStartData,
nsIPrincipal* aPrincipal,
nsIContentSecurityPolicy* aCsp);

5
dom/media/ForwardedInputTrack.cpp
Просмотреть файл

@ -86,8 +86,9 @@ void ForwardedInputTrack::SetInput(MediaInputPort* aPort) {
}
void ForwardedInputTrack::ProcessInputImpl(MediaTrack* aSource,
MediaSegment* aSegment, GraphTime aFrom,
GraphTime aTo, uint32_t aFlags) {
MediaSegment* aSegment,
GraphTime aFrom, GraphTime aTo,
uint32_t aFlags) {
GraphTime next;
for (GraphTime t = aFrom; t < aTo; t = next) {
MediaInputPort::InputInterval interval =

5
dom/media/Tracing.h
Просмотреть файл

@ -55,9 +55,10 @@ void StartAudioCallbackTracing();
1, AutoTracer::EventType::BUDGET, aFrames, aSampleRate);
# define TRACE_AUDIO_CALLBACK_COMMENT(aFmt, ...) \
AutoTracer trace(gAudioCallbackTraceLogger, FUNCTION_SIGNATURE, getpid(), \
0, AutoTracer::EventType::DURATION, aFmt, ## __VA_ARGS__);
0, AutoTracer::EventType::DURATION, aFmt, ##__VA_ARGS__);
# define TRACE() \
AutoTracer trace(gAudioCallbackTraceLogger, FUNCTION_SIGNATURE, getpid(),\
AutoTracer trace( \
gAudioCallbackTraceLogger, FUNCTION_SIGNATURE, getpid(), \
std::hash<std::thread::id>{}(std::this_thread::get_id()));
# define TRACE_COMMENT(aFmt, ...) \
AutoTracer trace(gAudioCallbackTraceLogger, FUNCTION_SIGNATURE, getpid(), \

4
dom/media/VideoFrameContainer.cpp
Просмотреть файл

@ -7,7 +7,7 @@
#include "VideoFrameContainer.h"
#ifdef MOZ_WIDGET_ANDROID
#include "GLImages.h" // for SurfaceTextureImage
# include "GLImages.h" // for SurfaceTextureImage
#endif
#include "MediaDecoderOwner.h"
#include "mozilla/Telemetry.h"
@ -102,7 +102,7 @@ void VideoFrameContainer::SetCurrentFrame(const gfx::IntSize& aIntrinsicSize,
Image* aImage,
const TimeStamp& aTargetTime) {
#ifdef MOZ_WIDGET_ANDROID
NotifySetCurrent(aImage);
NotifySetCurrent(aImage);
#endif
if (aImage) {
MutexAutoLock lock(mMutex);

1
dom/media/ipc/RemoteAudioDecoder.h
Просмотреть файл

@ -35,6 +35,7 @@ class RemoteAudioDecoderParent final : public RemoteDecoderParent {
protected:
MediaResult ProcessDecodedData(const MediaDataDecoder::DecodedData& aData,
DecodedOutputIPDL& aDecodedData) override;
private:
// Can only be accessed from the manager thread
// Note: we can't keep a reference to the original AudioInfo here

3
dom/media/webrtc/MediaEngineTabVideoSource.cpp
Просмотреть файл

@ -243,8 +243,7 @@ nsresult MediaEngineTabVideoSource::Start() {
AssertIsOnOwningThread();
MOZ_ASSERT(mState == kAllocated);
NS_DispatchToMainThread(
new StartRunnable(this, mTrack, mPrincipalHandle));
NS_DispatchToMainThread(new StartRunnable(this, mTrack, mPrincipalHandle));
mState = kStarted;
return NS_OK;

62
dom/plugins/base/nptypes.h
Просмотреть файл

@ -4,14 +4,14 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef nptypes_h_
# define nptypes_h_
#define nptypes_h_
/*
* Header file for ensuring that C99 types ([u]int32_t, [u]int64_t and bool) and
* true/false macros are available.
*/
# if defined(WIN32)
#if defined(WIN32)
/*
* Win32 and OS/2 don't know C99, so define [u]int_16/32/64 here. The bool
* is predefined tho, both in C and C++.
@ -22,68 +22,68 @@ typedef int int32_t;
typedef unsigned int uint32_t;
typedef long long int64_t;
typedef unsigned long long uint64_t;
# elif defined(_AIX) || defined(__sun) || defined(__osf__) || \
defined(IRIX) || defined(HPUX)
#elif defined(_AIX) || defined(__sun) || defined(__osf__) || defined(IRIX) || \
defined(HPUX)
/*
* AIX and SunOS ship a inttypes.h header that defines [u]int32_t,
* but not bool for C.
*/
# include <inttypes.h>
# include <inttypes.h>
# ifndef __cplusplus
# ifndef __cplusplus
typedef int bool;
# define true 1
# define false 0
# endif
# elif defined(bsdi) || defined(FREEBSD) || defined(OPENBSD)
# define true 1
# define false 0
# endif
#elif defined(bsdi) || defined(FREEBSD) || defined(OPENBSD)
/*
* BSD/OS, FreeBSD, and OpenBSD ship sys/types.h that define int32_t and
* u_int32_t.
*/
# include <sys/types.h>
# include <sys/types.h>
/*
* BSD/OS ships no header that defines uint32_t, nor bool (for C)
*/
# if defined(bsdi)
# if defined(bsdi)
typedef u_int32_t uint32_t;
typedef u_int64_t uint64_t;
# if !defined(__cplusplus)
# if !defined(__cplusplus)
typedef int bool;
# define true 1
# define false 0
# endif
# else
# define true 1
# define false 0
# endif
# else
/*
* FreeBSD and OpenBSD define uint32_t and bool.
*/
# include <inttypes.h>
# include <stdbool.h>
# endif
# elif defined(BEOS)
# include <inttypes.h>
# else
# include <stdbool.h>
# endif
#elif defined(BEOS)
# include <inttypes.h>
#else
/*
* For those that ship a standard C99 stdint.h header file, include
* it. Can't do the same for stdbool.h tho, since some systems ship
* with a stdbool.h file that doesn't compile!
*/
# include <stdint.h>
# include <stdint.h>
# ifndef __cplusplus
# if !defined(__GNUC__) || (__GNUC__ > 2 || __GNUC_MINOR__ > 95)
# include <stdbool.h>
# else
# ifndef __cplusplus
# if !defined(__GNUC__) || (__GNUC__ > 2 || __GNUC_MINOR__ > 95)
# include <stdbool.h>
# else
/*
* GCC 2.91 can't deal with a typedef for bool, but a #define
* works.
*/
# define bool int
# define true 1
# define false 0
# endif
# define bool int
# define true 1
# define false 0
# endif
# endif
#endif
#endif /* nptypes_h_ */

4
dom/serviceworkers/ServiceWorkerPrivateImpl.cpp
Просмотреть файл

@ -65,8 +65,8 @@ ServiceWorkerPrivateImpl::RAIIActorPtrHolder::~RAIIActorPtrHolder() {
mActor->MaybeSendDelete();
}
RemoteWorkerControllerChild* ServiceWorkerPrivateImpl::RAIIActorPtrHolder::
operator->() const {
RemoteWorkerControllerChild*
ServiceWorkerPrivateImpl::RAIIActorPtrHolder::operator->() const {
AssertIsOnMainThread();
return get();

10
dom/serviceworkers/ServiceWorkerRegistrationDescriptor.cpp
Просмотреть файл

@ -67,8 +67,9 @@ ServiceWorkerRegistrationDescriptor::ServiceWorkerRegistrationDescriptor(
operator=(aRight);
}
ServiceWorkerRegistrationDescriptor& ServiceWorkerRegistrationDescriptor::
operator=(const ServiceWorkerRegistrationDescriptor& aRight) {
ServiceWorkerRegistrationDescriptor&
ServiceWorkerRegistrationDescriptor::operator=(
const ServiceWorkerRegistrationDescriptor& aRight) {
if (this == &aRight) {
return *this;
}
@ -84,8 +85,9 @@ ServiceWorkerRegistrationDescriptor::ServiceWorkerRegistrationDescriptor(
MOZ_DIAGNOSTIC_ASSERT(IsValid());
}
ServiceWorkerRegistrationDescriptor& ServiceWorkerRegistrationDescriptor::
operator=(ServiceWorkerRegistrationDescriptor&& aRight) {
ServiceWorkerRegistrationDescriptor&
ServiceWorkerRegistrationDescriptor::operator=(
ServiceWorkerRegistrationDescriptor&& aRight) {
mData.reset();
mData = std::move(aRight.mData);
MOZ_DIAGNOSTIC_ASSERT(IsValid());

21
gfx/2d/Swizzle.cpp
Просмотреть файл

@ -154,16 +154,18 @@ void SwizzleRow_SSE2(const uint8_t*, uint8_t*, int32_t);
template <bool aSwapRB>
void UnpackRowRGB24_SSSE3(const uint8_t*, uint8_t*, int32_t);
#define UNPACK_ROW_RGB_SSSE3(aDstFormat) \
FORMAT_CASE_ROW(SurfaceFormat::R8G8B8, aDstFormat, \
UnpackRowRGB24_SSSE3<ShouldSwapRB(SurfaceFormat::R8G8B8, aDstFormat)>)
# define UNPACK_ROW_RGB_SSSE3(aDstFormat) \
FORMAT_CASE_ROW( \
SurfaceFormat::R8G8B8, aDstFormat, \
UnpackRowRGB24_SSSE3<ShouldSwapRB(SurfaceFormat::R8G8B8, aDstFormat)>)
template <bool aSwapRB>
void UnpackRowRGB24_AVX2(const uint8_t*, uint8_t*, int32_t);
#define UNPACK_ROW_RGB_AVX2(aDstFormat) \
FORMAT_CASE_ROW(SurfaceFormat::R8G8B8, aDstFormat, \
UnpackRowRGB24_AVX2<ShouldSwapRB(SurfaceFormat::R8G8B8, aDstFormat)>)
# define UNPACK_ROW_RGB_AVX2(aDstFormat) \
FORMAT_CASE_ROW( \
SurfaceFormat::R8G8B8, aDstFormat, \
UnpackRowRGB24_AVX2<ShouldSwapRB(SurfaceFormat::R8G8B8, aDstFormat)>)
#endif
@ -891,9 +893,10 @@ void UnpackRowRGB24(const uint8_t* aSrc, uint8_t* aDst, int32_t aLength) {
template void UnpackRowRGB24<false>(const uint8_t*, uint8_t*, int32_t);
template void UnpackRowRGB24<true>(const uint8_t*, uint8_t*, int32_t);
#define UNPACK_ROW_RGB(aDstFormat) \
FORMAT_CASE_ROW(SurfaceFormat::R8G8B8, aDstFormat, \
UnpackRowRGB24<ShouldSwapRB(SurfaceFormat::R8G8B8, aDstFormat)>)
#define UNPACK_ROW_RGB(aDstFormat) \
FORMAT_CASE_ROW( \
SurfaceFormat::R8G8B8, aDstFormat, \
UnpackRowRGB24<ShouldSwapRB(SurfaceFormat::R8G8B8, aDstFormat)>)
bool SwizzleData(const uint8_t* aSrc, int32_t aSrcStride,
SurfaceFormat aSrcFormat, uint8_t* aDst, int32_t aDstStride,

9
gfx/2d/Swizzle.h
Просмотреть файл

@ -45,17 +45,20 @@ GFX2D_API bool SwizzleData(const uint8_t* aSrc, int32_t aSrcStride,
* Swizzles source and writes it to destination. Source and destination may be
* the same to swizzle in-place.
*/
typedef void (*SwizzleRowFn)(const uint8_t* aSrc, uint8_t* aDst, int32_t aLength);
typedef void (*SwizzleRowFn)(const uint8_t* aSrc, uint8_t* aDst,
int32_t aLength);
/**
* Get a function pointer to perform premultiplication between two formats.
*/
GFX2D_API SwizzleRowFn PremultiplyRow(SurfaceFormat aSrcFormat, SurfaceFormat aDstFormat);
GFX2D_API SwizzleRowFn PremultiplyRow(SurfaceFormat aSrcFormat,
SurfaceFormat aDstFormat);
/**
* Get a function pointer to perform swizzling between two formats.
*/
GFX2D_API SwizzleRowFn SwizzleRow(SurfaceFormat aSrcFormat, SurfaceFormat aDstFormat);
GFX2D_API SwizzleRowFn SwizzleRow(SurfaceFormat aSrcFormat,
SurfaceFormat aDstFormat);
} // namespace gfx
} // namespace mozilla

3
gfx/2d/SwizzleNEON.cpp
Просмотреть файл

@ -353,8 +353,7 @@ void Swizzle_NEON(const uint8_t* aSrc, int32_t aSrcGap, uint8_t* aDst,
aDstGap += 4 * remainder;
for (int32_t height = aSize.height; height > 0; height--) {
SwizzleChunk_NEON<aSwapRB, aOpaqueAlpha>(aSrc, aDst, alignedRow,
remainder);
SwizzleChunk_NEON<aSwapRB, aOpaqueAlpha>(aSrc, aDst, alignedRow, remainder);
aSrc += aSrcGap;
aDst += aDstGap;
}

8
gfx/layers/wr/WebRenderCommandBuilder.cpp
Просмотреть файл

@ -575,9 +575,8 @@ struct DIGroup {
GP("\n\n");
GP("Begin EndGroup\n");
mVisibleRect = mVisibleRect.Intersect(
ViewAs<LayerPixel>(mActualBounds,
PixelCastJustification::LayerIsImage));
mVisibleRect = mVisibleRect.Intersect(ViewAs<LayerPixel>(
mActualBounds, PixelCastJustification::LayerIsImage));
if (mVisibleRect.IsEmpty()) {
return;
@ -785,7 +784,8 @@ struct DIGroup {
dirty = false;
BlobItemData* data = GetBlobItemData(item);
if (data->mInvalid) {
gfxCriticalError() << "DisplayItem" << item->Name() << "-should be invalid";
gfxCriticalError()
<< "DisplayItem" << item->Name() << "-should be invalid";
}
// if the item is invalid it needs to be fully contained
MOZ_RELEASE_ASSERT(!data->mInvalid);

27
gfx/tests/gtest/TestSwizzle.cpp
Просмотреть файл

@ -64,7 +64,7 @@ TEST(Moz2D, PremultiplyRow)
};
SwizzleRowFn func =
PremultiplyRow(SurfaceFormat::B8G8R8A8, SurfaceFormat::B8G8R8A8);
PremultiplyRow(SurfaceFormat::B8G8R8A8, SurfaceFormat::B8G8R8A8);
func(in_bgra, out, 5);
EXPECT_TRUE(ArrayEqual(out, check_bgra));
@ -203,26 +203,25 @@ TEST(Moz2D, SwizzleRow)
// check unpacking
uint8_t out_unpack[16 * 4];
const uint8_t in_rgb[16 * 3] = {
0, 254, 253, 255, 0, 0, 0, 0, 0, 3, 2, 1,
9, 0, 127, 4, 5, 6, 9, 8, 7, 10, 11, 12,
13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
0, 254, 253, 255, 0, 0, 0, 0, 0, 3, 2, 1, 9, 0, 127, 4,
5, 6, 9, 8, 7, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
};
const uint8_t check_unpack_rgbx[16 * 4] = {
0, 254, 253, 255, 255, 0, 0, 255, 0, 0, 0, 255, 3, 2, 1, 255,
9, 0, 127, 255, 4, 5, 6, 255, 9, 8, 7, 255, 10, 11, 12, 255,
13, 14, 15, 255, 16, 17, 18, 255, 19, 20, 21, 255, 22, 23, 24, 255,
25, 26, 27, 255, 28, 29, 30, 255, 31, 32, 33, 255, 34, 35, 36, 255,
0, 254, 253, 255, 255, 0, 0, 255, 0, 0, 0, 255, 3, 2, 1, 255,
9, 0, 127, 255, 4, 5, 6, 255, 9, 8, 7, 255, 10, 11, 12, 255,
13, 14, 15, 255, 16, 17, 18, 255, 19, 20, 21, 255, 22, 23, 24, 255,
25, 26, 27, 255, 28, 29, 30, 255, 31, 32, 33, 255, 34, 35, 36, 255,
};
const uint8_t check_unpack_bgrx[16 * 4] = {
253, 254, 0, 255, 0, 0, 255, 255, 0, 0, 0, 255, 1, 2, 3, 255,
127, 0, 9, 255, 6, 5, 4, 255, 7, 8, 9, 255, 12, 11, 10, 255,
15, 14, 13, 255, 18, 17, 16, 255, 21, 20, 19, 255, 24, 23, 22, 255,
27, 26, 25, 255, 30, 29, 28, 255, 33, 32, 31, 255, 36, 35, 34, 255,
253, 254, 0, 255, 0, 0, 255, 255, 0, 0, 0, 255, 1, 2, 3, 255,
127, 0, 9, 255, 6, 5, 4, 255, 7, 8, 9, 255, 12, 11, 10, 255,
15, 14, 13, 255, 18, 17, 16, 255, 21, 20, 19, 255, 24, 23, 22, 255,
27, 26, 25, 255, 30, 29, 28, 255, 33, 32, 31, 255, 36, 35, 34, 255,
};
SwizzleRowFn func =
SwizzleRow(SurfaceFormat::B8G8R8A8, SurfaceFormat::R8G8B8A8);
SwizzleRow(SurfaceFormat::B8G8R8A8, SurfaceFormat::R8G8B8A8);
func(in_bgra, out, 5);
EXPECT_TRUE(ArrayEqual(out, check_rgba));

19
gfx/thebes/gfxDWriteFontList.cpp
Просмотреть файл

@ -940,12 +940,15 @@ gfxFontEntry* gfxDWriteFontList::CreateFontEntry(
mSystemFonts;
#endif
RefPtr<IDWriteFontFamily> family;
HRESULT hr = collection->GetFontFamily(aFamily->Index(), getter_AddRefs(family));
// Check that the family name is what we expected; if not, fall back to search by name.
// It's sad we have to do this, but it is possible for Windows to have given different versions
// of the system font collection to the parent and child processes.
HRESULT hr =
collection->GetFontFamily(aFamily->Index(), getter_AddRefs(family));
// Check that the family name is what we expected; if not, fall back to search
// by name. It's sad we have to do this, but it is possible for Windows to
// have given different versions of the system font collection to the parent
// and child processes.
bool foundFamily = false;
const nsCString& familyName = aFamily->DisplayName().AsString(SharedFontList());
const nsCString& familyName =
aFamily->DisplayName().AsString(SharedFontList());
if (SUCCEEDED(hr) && family) {
RefPtr<IDWriteLocalizedStrings> names;
hr = family->GetFamilyNames(getter_AddRefs(names));
@ -957,11 +960,13 @@ gfxFontEntry* gfxDWriteFontList::CreateFontEntry(
}
}
if (!foundFamily) {
// Try to get family by name instead of index (to deal with the case of collection mismatch).
// Try to get family by name instead of index (to deal with the case of
// collection mismatch).
UINT32 index;
BOOL exists;
NS_ConvertUTF8toUTF16 name16(familyName);
hr = collection->FindFamilyName(reinterpret_cast<const WCHAR*>(name16.BeginReading()), &index, &exists);
hr = collection->FindFamilyName(
reinterpret_cast<const WCHAR*>(name16.BeginReading()), &index, &exists);
if (SUCCEEDED(hr) && exists && index != UINT_MAX) {
hr = collection->GetFontFamily(index, getter_AddRefs(family));
if (FAILED(hr) || !family) {

3
ipc/mscom/MainThreadInvoker.h
Просмотреть файл

@ -40,7 +40,8 @@ class MainThreadInvoker {
template <typename Class, typename... Args>
inline bool InvokeOnMainThread(const char* aName, Class* aObject,
void (Class::*aMethod)(Args...), Args&&... aArgs) {
void (Class::*aMethod)(Args...),
Args&&... aArgs) {
nsCOMPtr<nsIRunnable> runnable(NewNonOwningRunnableMethod<Args...>(
aName, aObject, aMethod, std::forward<Args>(aArgs)...));

3
ipc/mscom/oop/Factory.h
Просмотреть файл

@ -37,7 +37,8 @@ class MOZ_NONHEAP_CLASS Factory : public IClassFactory {
}
template <typename... Args>
HRESULT DoCreate(HRESULT (*aFnPtr)(IUnknown*, REFIID, void**), Args&&... args) {
HRESULT DoCreate(HRESULT (*aFnPtr)(IUnknown*, REFIID, void**),
Args&&... args) {
return aFnPtr(std::forward<Args>(args)...);
}

6
js/src/builtin/Promise.cpp
Просмотреть файл

@ -2281,11 +2281,7 @@ static MOZ_MUST_USE bool PerformPromiseRace(
JSContext* cx, PromiseForOfIterator& iterator, HandleObject C,
Handle<PromiseCapability> resultCapability, bool* done);
enum class IterationMode {
All,
AllSettled,
Race
};
enum class IterationMode { All, AllSettled, Race };
// ES2020 draft rev dc1e21c454bd316810be1c0e7af0131a2d7f38e9
//

74
js/src/jit/mips-shared/Assembler-mips-shared.cpp
Просмотреть файл

@ -880,16 +880,14 @@ BufferOffset AssemblerMIPSShared::as_sdr(Register rd, Register rs,
return writeInst(InstImm(op_sdr, rs, rd, Imm16(off)).encode());
}
BufferOffset
AssemblerMIPSShared::as_seleqz(Register rd, Register rs, Register rt)
{
BufferOffset AssemblerMIPSShared::as_seleqz(Register rd, Register rs,
Register rt) {
spew("seleqz %3s,%3s,%3s", rd.name(), rs.name(), rt.name());
return writeInst(InstReg(op_special, rs, rt, rd, 0x0, ff_seleqz).encode());
}
BufferOffset
AssemblerMIPSShared::as_selnez(Register rd, Register rs, Register rt)
{
BufferOffset AssemblerMIPSShared::as_selnez(Register rd, Register rs,
Register rt) {
spew("selnez %3s,%3s,%3s", rd.name(), rs.name(), rt.name());
return writeInst(InstReg(op_special, rs, rt, rd, 0x0, ff_selnez).encode());
}
@ -1532,8 +1530,8 @@ BufferOffset AssemblerMIPSShared::as_cf(FloatFormat fmt, FloatRegister fs,
spew("c.f.d FCC%d,%3s,%3s", fcc, fs.name(), ft.name());
#ifdef MIPSR6
return writeInst(
InstReg(op_cop1, rs_d_r6, ft, fs, FloatRegisters::f24,
ff_c_f_fmt).encode());
InstReg(op_cop1, rs_d_r6, ft, fs, FloatRegisters::f24, ff_c_f_fmt)
.encode());
#else
return writeInst(
InstReg(op_cop1, rs_d, ft, fs, fcc << FccShift, ff_c_f_fmt).encode());
@ -1542,8 +1540,8 @@ BufferOffset AssemblerMIPSShared::as_cf(FloatFormat fmt, FloatRegister fs,
spew("c.f.s FCC%d,%3s,%3s", fcc, fs.name(), ft.name());
#ifdef MIPSR6
return writeInst(
InstReg(op_cop1, rs_s_r6, ft, fs, FloatRegisters::f24,
ff_c_f_fmt).encode());
InstReg(op_cop1, rs_s_r6, ft, fs, FloatRegisters::f24, ff_c_f_fmt)
.encode());
#else
return writeInst(
InstReg(op_cop1, rs_s, ft, fs, fcc << FccShift, ff_c_f_fmt).encode());
@ -1557,8 +1555,8 @@ BufferOffset AssemblerMIPSShared::as_cun(FloatFormat fmt, FloatRegister fs,
spew("c.un.d FCC%d,%3s,%3s", fcc, fs.name(), ft.name());
#ifdef MIPSR6
return writeInst(
InstReg(op_cop1, rs_d_r6, ft, fs, FloatRegisters::f24,
ff_c_un_fmt).encode());
InstReg(op_cop1, rs_d_r6, ft, fs, FloatRegisters::f24, ff_c_un_fmt)
.encode());
#else
return writeInst(
InstReg(op_cop1, rs_d, ft, fs, fcc << FccShift, ff_c_un_fmt).encode());
@ -1567,8 +1565,8 @@ BufferOffset AssemblerMIPSShared::as_cun(FloatFormat fmt, FloatRegister fs,
spew("c.un.s FCC%d,%3s,%3s", fcc, fs.name(), ft.name());
#ifdef MIPSR6
return writeInst(
InstReg(op_cop1, rs_s_r6, ft, fs, FloatRegisters::f24,
ff_c_un_fmt).encode());
InstReg(op_cop1, rs_s_r6, ft, fs, FloatRegisters::f24, ff_c_un_fmt)
.encode());
#else
return writeInst(
InstReg(op_cop1, rs_s, ft, fs, fcc << FccShift, ff_c_un_fmt).encode());
@ -1582,8 +1580,8 @@ BufferOffset AssemblerMIPSShared::as_ceq(FloatFormat fmt, FloatRegister fs,
spew("c.eq.d FCC%d,%3s,%3s", fcc, fs.name(), ft.name());
#ifdef MIPSR6
return writeInst(
InstReg(op_cop1, rs_d_r6, ft, fs, FloatRegisters::f24,
ff_c_eq_fmt).encode());
InstReg(op_cop1, rs_d_r6, ft, fs, FloatRegisters::f24, ff_c_eq_fmt)
.encode());
#else
return writeInst(
InstReg(op_cop1, rs_d, ft, fs, fcc << FccShift, ff_c_eq_fmt).encode());
@ -1592,8 +1590,8 @@ BufferOffset AssemblerMIPSShared::as_ceq(FloatFormat fmt, FloatRegister fs,
spew("c.eq.s FCC%d,%3s,%3s", fcc, fs.name(), ft.name());
#ifdef MIPSR6
return writeInst(
InstReg(op_cop1, rs_s_r6, ft, fs, FloatRegisters::f24,
ff_c_eq_fmt).encode());
InstReg(op_cop1, rs_s_r6, ft, fs, FloatRegisters::f24, ff_c_eq_fmt)
.encode());
#else
return writeInst(
InstReg(op_cop1, rs_s, ft, fs, fcc << FccShift, ff_c_eq_fmt).encode());
@ -1608,8 +1606,8 @@ BufferOffset AssemblerMIPSShared::as_cueq(FloatFormat fmt, FloatRegister fs,
spew("c.ueq.d FCC%d,%3s,%3s", fcc, fs.name(), ft.name());
#ifdef MIPSR6
return writeInst(
InstReg(op_cop1, rs_d_r6, ft, fs, FloatRegisters::f24,
ff_c_ueq_fmt).encode());
InstReg(op_cop1, rs_d_r6, ft, fs, FloatRegisters::f24, ff_c_ueq_fmt)
.encode());
#else
return writeInst(
InstReg(op_cop1, rs_d, ft, fs, fcc << FccShift, ff_c_ueq_fmt).encode());
@ -1618,8 +1616,8 @@ BufferOffset AssemblerMIPSShared::as_cueq(FloatFormat fmt, FloatRegister fs,
spew("c.ueq.s FCC%d,%3s,%3s", fcc, fs.name(), ft.name());
#ifdef MIPSR6
return writeInst(
InstReg(op_cop1, rs_s_r6, ft, fs, FloatRegisters::f24,
ff_c_ueq_fmt).encode());
InstReg(op_cop1, rs_s_r6, ft, fs, FloatRegisters::f24, ff_c_ueq_fmt)
.encode());
#else
return writeInst(
InstReg(op_cop1, rs_s, ft, fs, fcc << FccShift, ff_c_ueq_fmt).encode());
@ -1634,8 +1632,8 @@ BufferOffset AssemblerMIPSShared::as_colt(FloatFormat fmt, FloatRegister fs,
spew("c.olt.d FCC%d,%3s,%3s", fcc, fs.name(), ft.name());
#ifdef MIPSR6
return writeInst(
InstReg(op_cop1, rs_d_r6, ft, fs, FloatRegisters::f24,
ff_c_olt_fmt).encode());
InstReg(op_cop1, rs_d_r6, ft, fs, FloatRegisters::f24, ff_c_olt_fmt)
.encode());
#else
return writeInst(
InstReg(op_cop1, rs_d, ft, fs, fcc << FccShift, ff_c_olt_fmt).encode());
@ -1644,8 +1642,8 @@ BufferOffset AssemblerMIPSShared::as_colt(FloatFormat fmt, FloatRegister fs,
spew("c.olt.s FCC%d,%3s,%3s", fcc, fs.name(), ft.name());
#ifdef MIPSR6
return writeInst(
InstReg(op_cop1, rs_s_r6, ft, fs, FloatRegisters::f24,
ff_c_olt_fmt).encode());
InstReg(op_cop1, rs_s_r6, ft, fs, FloatRegisters::f24, ff_c_olt_fmt)
.encode());
#else
return writeInst(
InstReg(op_cop1, rs_s, ft, fs, fcc << FccShift, ff_c_olt_fmt).encode());
@ -1660,8 +1658,8 @@ BufferOffset AssemblerMIPSShared::as_cult(FloatFormat fmt, FloatRegister fs,
spew("c.ult.d FCC%d,%3s,%3s", fcc, fs.name(), ft.name());
#ifdef MIPSR6
return writeInst(
InstReg(op_cop1, rs_d_r6, ft, fs, FloatRegisters::f24,
ff_c_ult_fmt).encode());
InstReg(op_cop1, rs_d_r6, ft, fs, FloatRegisters::f24, ff_c_ult_fmt)
.encode());
#else
return writeInst(
InstReg(op_cop1, rs_d, ft, fs, fcc << FccShift, ff_c_ult_fmt).encode());
@ -1670,8 +1668,8 @@ BufferOffset AssemblerMIPSShared::as_cult(FloatFormat fmt, FloatRegister fs,
spew("c.ult.s FCC%d,%3s,%3s", fcc, fs.name(), ft.name());
#ifdef MIPSR6
return writeInst(
InstReg(op_cop1, rs_s_r6, ft, fs, FloatRegisters::f24,
ff_c_ult_fmt).encode());
InstReg(op_cop1, rs_s_r6, ft, fs, FloatRegisters::f24, ff_c_ult_fmt)
.encode());
#else
return writeInst(
InstReg(op_cop1, rs_s, ft, fs, fcc << FccShift, ff_c_ult_fmt).encode());
@ -1686,8 +1684,8 @@ BufferOffset AssemblerMIPSShared::as_cole(FloatFormat fmt, FloatRegister fs,
spew("c.ole.d FCC%d,%3s,%3s", fcc, fs.name(), ft.name());
#ifdef MIPSR6
return writeInst(
InstReg(op_cop1, rs_d_r6, ft, fs, FloatRegisters::f24,
ff_c_ole_fmt).encode());
InstReg(op_cop1, rs_d_r6, ft, fs, FloatRegisters::f24, ff_c_ole_fmt)
.encode());
#else
return writeInst(
InstReg(op_cop1, rs_d, ft, fs, fcc << FccShift, ff_c_ole_fmt).encode());
@ -1696,8 +1694,8 @@ BufferOffset AssemblerMIPSShared::as_cole(FloatFormat fmt, FloatRegister fs,
spew("c.ole.s FCC%d,%3s,%3s", fcc, fs.name(), ft.name());
#ifdef MIPSR6
return writeInst(
InstReg(op_cop1, rs_s_r6, ft, fs, FloatRegisters::f24,
ff_c_ole_fmt).encode());
InstReg(op_cop1, rs_s_r6, ft, fs, FloatRegisters::f24, ff_c_ole_fmt)
.encode());
#else
return writeInst(
InstReg(op_cop1, rs_s, ft, fs, fcc << FccShift, ff_c_ole_fmt).encode());
@ -1712,8 +1710,8 @@ BufferOffset AssemblerMIPSShared::as_cule(FloatFormat fmt, FloatRegister fs,
spew("c.ule.d FCC%d,%3s,%3s", fcc, fs.name(), ft.name());
#ifdef MIPSR6
return writeInst(
InstReg(op_cop1, rs_d_r6, ft, fs, FloatRegisters::f24,
ff_c_ule_fmt).encode());
InstReg(op_cop1, rs_d_r6, ft, fs, FloatRegisters::f24, ff_c_ule_fmt)
.encode());
#else
return writeInst(
InstReg(op_cop1, rs_d, ft, fs, fcc << FccShift, ff_c_ule_fmt).encode());
@ -1722,8 +1720,8 @@ BufferOffset AssemblerMIPSShared::as_cule(FloatFormat fmt, FloatRegister fs,
spew("c.ule.s FCC%d,%3s,%3s", fcc, fs.name(), ft.name());
#ifdef MIPSR6
return writeInst(
InstReg(op_cop1, rs_s_r6, ft, fs, FloatRegisters::f24,
ff_c_ule_fmt).encode());
InstReg(op_cop1, rs_s_r6, ft, fs, FloatRegisters::f24, ff_c_ule_fmt)
.encode());
#else
return writeInst(
InstReg(op_cop1, rs_s, ft, fs, fcc << FccShift, ff_c_ule_fmt).encode());

6
js/src/jit/mips64/Assembler-mips64.cpp
Просмотреть файл

@ -207,7 +207,8 @@ void Assembler::bind(InstImm* inst, uintptr_t branch, uintptr_t target) {
Assembler::WriteLoad64Instructions(inst, ScratchRegister,
LabelBase::INVALID_OFFSET);
#ifdef MIPSR6
inst[4] = InstReg(op_special, ScratchRegister, zero, zero, ff_jalr).encode();
inst[4] =
InstReg(op_special, ScratchRegister, zero, zero, ff_jalr).encode();
#else
inst[4] = InstReg(op_special, ScratchRegister, zero, zero, ff_jr).encode();
#endif
@ -220,7 +221,8 @@ void Assembler::bind(InstImm* inst, uintptr_t branch, uintptr_t target) {
Assembler::WriteLoad64Instructions(&inst[1], ScratchRegister,
LabelBase::INVALID_OFFSET);
#ifdef MIPSR6
inst[5] = InstReg(op_special, ScratchRegister, zero, zero, ff_jalr).encode();
inst[5] =
InstReg(op_special, ScratchRegister, zero, zero, ff_jalr).encode();
#else
inst[5] = InstReg(op_special, ScratchRegister, zero, zero, ff_jr).encode();
#endif

8
js/src/jit/mips64/MacroAssembler-mips64.cpp
Просмотреть файл

@ -343,11 +343,11 @@ void MacroAssemblerMIPS64::ma_dctz(Register rd, Register rs) {
ma_dnegu(SecondScratchReg, rd);
ma_daddu(SecondScratchReg, Imm32(0x3f));
#ifdef MIPS64
as_selnez(SecondScratchReg, SecondScratchReg, ScratchRegister);
as_seleqz(rd, rd, ScratchRegister);
as_or(rd, rd, SecondScratchReg);
as_selnez(SecondScratchReg, SecondScratchReg, ScratchRegister);
as_seleqz(rd, rd, ScratchRegister);
as_or(rd, rd, SecondScratchReg);
#else
as_movn(rd, SecondScratchReg, ScratchRegister);
as_movn(rd, SecondScratchReg, ScratchRegister);
#endif
}

3
js/src/jsexn.cpp
Просмотреть файл

@ -764,8 +764,7 @@ static JSString* ErrorReportToString(JSContext* cx, JSErrorReport* reportp) {
return ConcatStrings<CanGC>(cx, str, message);
}
ErrorReport::ErrorReport(JSContext* cx)
: reportp(nullptr), exnObject(cx) {}
ErrorReport::ErrorReport(JSContext* cx) : reportp(nullptr), exnObject(cx) {}
ErrorReport::~ErrorReport() = default;

4
js/xpconnect/loader/IOBuffers.h
Просмотреть файл

@ -142,7 +142,7 @@ class InputBuffer {
size_t cursor_ = 0;
};
} // namespace loader
} // namespace mozilla
} // namespace loader
} // namespace mozilla
#endif // IOBuffers_h

19
js/xpconnect/loader/mozJSSubScriptLoader.cpp
Просмотреть файл

@ -242,10 +242,12 @@ static bool EvalScript(JSContext* cx, HandleObject targetObj,
return true;
}
bool mozJSSubScriptLoader::ReadScript(
JS::MutableHandle<JSScript*> script,
nsIURI* uri, JSContext* cx, HandleObject targetObj, const char* uriStr,
nsIIOService* serv, bool wantReturnValue, bool useCompilationScope) {
bool mozJSSubScriptLoader::ReadScript(JS::MutableHandle<JSScript*> script,
nsIURI* uri, JSContext* cx,
HandleObject targetObj,
const char* uriStr, nsIIOService* serv,
bool wantReturnValue,
bool useCompilationScope) {
// We create a channel and call SetContentType, to avoid expensive MIME type
// lookups (bug 632490).
nsCOMPtr<nsIChannel> chan;
@ -302,8 +304,8 @@ bool mozJSSubScriptLoader::ReadScript(
ar.emplace(cx, xpc::CompilationScope());
}
JSScript* ret = PrepareScript(uri, cx, JS_IsGlobalObject(targetObj), uriStr, buf.get(),
len, wantReturnValue);
JSScript* ret = PrepareScript(uri, cx, JS_IsGlobalObject(targetObj), uriStr,
buf.get(), len, wantReturnValue);
if (!ret) {
return false;
}
@ -472,8 +474,9 @@ nsresult mozJSSubScriptLoader::DoLoadSubScriptWithOptions(
// |back there.
cache = nullptr;
} else {
if (!ReadScript(&script, uri, cx, targetObj, static_cast<const char*>(uriStr.get()),
serv, options.wantReturnValue, useCompilationScope)) {
if (!ReadScript(&script, uri, cx, targetObj,
static_cast<const char*>(uriStr.get()), serv,
options.wantReturnValue, useCompilationScope)) {
return NS_OK;
}
}

8
js/xpconnect/loader/mozJSSubScriptLoader.h
Просмотреть файл

@ -31,10 +31,10 @@ class mozJSSubScriptLoader : public mozIJSSubScriptLoader {
private:
virtual ~mozJSSubScriptLoader();
bool ReadScript(JS::MutableHandle<JSScript*> script,
nsIURI* uri, JSContext* cx, JS::HandleObject targetObj,
const char* uriStr, nsIIOService* serv,
bool wantReturnValue, bool useCompilationScope);
bool ReadScript(JS::MutableHandle<JSScript*> script, nsIURI* uri,
JSContext* cx, JS::HandleObject targetObj, const char* uriStr,
nsIIOService* serv, bool wantReturnValue,
bool useCompilationScope);
nsresult ReadScriptAsync(nsIURI* uri, JS::HandleObject targetObj,
JS::HandleObject loadScope, nsIIOService* serv,

2
js/xpconnect/src/XPCWrappedNativeJSOps.cpp
Просмотреть файл

@ -194,7 +194,7 @@ static JSObject* GetDoubleWrappedJSObject(XPCCallContext& ccx,
RootedObject obj(ccx);
{
nsCOMPtr<nsIXPConnectWrappedJS> underware =
do_QueryInterface(wrapper->GetIdentityObject());
do_QueryInterface(wrapper->GetIdentityObject());
if (!underware) {
return nullptr;
}

2
layout/generic/nsGfxScrollFrame.cpp
Просмотреть файл

@ -1708,7 +1708,7 @@ NS_QUERYFRAME_HEAD(nsXULScrollFrame)
NS_QUERYFRAME_ENTRY(nsIScrollbarMediator)
NS_QUERYFRAME_TAIL_INHERITING(nsBoxFrame)
//-------------------- Helper ----------------------
//-------------------- Helper ----------------------
// AsyncSmoothMSDScroll has ref counting.
class ScrollFrameHelper::AsyncSmoothMSDScroll final

20
layout/generic/nsLineBox.h
Просмотреть файл

@ -1617,23 +1617,27 @@ inline nsLineList_const_iterator& nsLineList_const_iterator::operator=(
ASSIGN_FROM(aOther)
}
inline nsLineList_const_reverse_iterator& nsLineList_const_reverse_iterator::
operator=(const nsLineList_iterator& aOther) {
inline nsLineList_const_reverse_iterator&
nsLineList_const_reverse_iterator::operator=(
const nsLineList_iterator& aOther) {
ASSIGN_FROM(aOther)
}
inline nsLineList_const_reverse_iterator& nsLineList_const_reverse_iterator::
operator=(const nsLineList_reverse_iterator& aOther) {
inline nsLineList_const_reverse_iterator&
nsLineList_const_reverse_iterator::operator=(
const nsLineList_reverse_iterator& aOther) {
ASSIGN_FROM(aOther)
}
inline nsLineList_const_reverse_iterator& nsLineList_const_reverse_iterator::
operator=(const nsLineList_const_iterator& aOther) {
inline nsLineList_const_reverse_iterator&
nsLineList_const_reverse_iterator::operator=(
const nsLineList_const_iterator& aOther) {
ASSIGN_FROM(aOther)
}
inline nsLineList_const_reverse_iterator& nsLineList_const_reverse_iterator::
operator=(const nsLineList_const_reverse_iterator& aOther) {
inline nsLineList_const_reverse_iterator&
nsLineList_const_reverse_iterator::operator=(
const nsLineList_const_reverse_iterator& aOther) {
ASSIGN_FROM(aOther)
}

3
layout/mathml/nsMathMLmencloseFrame.cpp
Просмотреть файл

@ -107,7 +107,8 @@ nsresult nsMathMLmencloseFrame::AddNotation(const nsAString& aNotation) {
mNotationsToDraw += NOTATION_TOP;
} else if (aNotation.EqualsLiteral("radical")) {
if (!StaticPrefs::mathml_deprecated_menclose_notation_radical_disabled()) {
mContent->OwnerDoc()->WarnOnceAbout(dom::Document::eMathML_DeprecatedMencloseNotationRadical);
mContent->OwnerDoc()->WarnOnceAbout(
dom::Document::eMathML_DeprecatedMencloseNotationRadical);
rv = AllocateMathMLChar(NOTATION_RADICAL);
NS_ENSURE_SUCCESS(rv, rv);
mNotationsToDraw += NOTATION_RADICAL;

104
mfbt/Types.h
Просмотреть файл

@ -7,7 +7,7 @@
/* mfbt foundational types and macros. */
#ifndef mozilla_Types_h
# define mozilla_Types_h
#define mozilla_Types_h
/*
* This header must be valid C and C++, includable by code embedding either
@ -15,8 +15,8 @@
*/
/* Expose all <stdint.h> types and size_t. */
# include <stddef.h>
# include <stdint.h>
#include <stddef.h>
#include <stdint.h>
/* Implement compiler and linker macros needed for APIs. */
@ -37,17 +37,17 @@
* These macros are designed for use by library interfaces -- not for normal
* methods or data used cross-file.
*/
# if defined(WIN32)
# define MOZ_EXPORT __declspec(dllexport)
# else /* Unix */
# ifdef HAVE_VISIBILITY_ATTRIBUTE
# define MOZ_EXPORT __attribute__((visibility("default")))
# elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
# define MOZ_EXPORT __global
# else
# define MOZ_EXPORT /* nothing */
# endif
#if defined(WIN32)
# define MOZ_EXPORT __declspec(dllexport)
#else /* Unix */
# ifdef HAVE_VISIBILITY_ATTRIBUTE
# define MOZ_EXPORT __attribute__((visibility("default")))
# elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
# define MOZ_EXPORT __global
# else
# define MOZ_EXPORT /* nothing */
# endif
#endif
/*
* Whereas implementers use MOZ_EXPORT to declare and define library symbols,
@ -56,37 +56,37 @@
* the export or import version of the macro, depending upon the compilation
* mode.
*/
# ifdef _WIN32
# if defined(__MWERKS__)
# define MOZ_IMPORT_API /* nothing */
# else
# define MOZ_IMPORT_API __declspec(dllimport)
# endif
#ifdef _WIN32
# if defined(__MWERKS__)
# define MOZ_IMPORT_API /* nothing */
# else
# define MOZ_IMPORT_API MOZ_EXPORT
# define MOZ_IMPORT_API __declspec(dllimport)
# endif
#else
# define MOZ_IMPORT_API MOZ_EXPORT
#endif
# if defined(_WIN32) && !defined(__MWERKS__)
# define MOZ_IMPORT_DATA __declspec(dllimport)
# else
# define MOZ_IMPORT_DATA MOZ_EXPORT
# endif
#if defined(_WIN32) && !defined(__MWERKS__)
# define MOZ_IMPORT_DATA __declspec(dllimport)
#else
# define MOZ_IMPORT_DATA MOZ_EXPORT
#endif
/*
* Consistent with the above comment, the MFBT_API and MFBT_DATA macros expose
* export mfbt declarations when building mfbt, and they expose import mfbt
* declarations when using mfbt.
*/
# if defined(IMPL_MFBT) || \
(defined(JS_STANDALONE) && !defined(MOZ_MEMORY) && \
(defined(EXPORT_JS_API) || defined(STATIC_EXPORTABLE_JS_API)))
# define MFBT_API MOZ_EXPORT
# define MFBT_DATA MOZ_EXPORT
#if defined(IMPL_MFBT) || \
(defined(JS_STANDALONE) && !defined(MOZ_MEMORY) && \
(defined(EXPORT_JS_API) || defined(STATIC_EXPORTABLE_JS_API)))
# define MFBT_API MOZ_EXPORT
# define MFBT_DATA MOZ_EXPORT
#else
# if defined(JS_STANDALONE) && !defined(MOZ_MEMORY) && defined(STATIC_JS_API)
# define MFBT_API
# define MFBT_DATA
# else
# if defined(JS_STANDALONE) && !defined(MOZ_MEMORY) && defined(STATIC_JS_API)
# define MFBT_API
# define MFBT_DATA
# else
/*
* On linux mozglue is linked in the program and we link libxul.so with
* -z,defs. Normally that causes the linker to reject undefined references in
@ -94,15 +94,15 @@
* symbols. We add the weak attribute to the import version of the MFBT API
* macros to exploit this.
*/
# if defined(MOZ_GLUE_IN_PROGRAM)
# define MFBT_API __attribute__((weak)) MOZ_IMPORT_API
# define MFBT_DATA __attribute__((weak)) MOZ_IMPORT_DATA
# else
# define MFBT_API MOZ_IMPORT_API
# define MFBT_DATA MOZ_IMPORT_DATA
# endif
# if defined(MOZ_GLUE_IN_PROGRAM)
# define MFBT_API __attribute__((weak)) MOZ_IMPORT_API
# define MFBT_DATA __attribute__((weak)) MOZ_IMPORT_DATA
# else
# define MFBT_API MOZ_IMPORT_API
# define MFBT_DATA MOZ_IMPORT_DATA
# endif
# endif
#endif
/*
* C symbols in C++ code must be declared immediately within |extern "C"|
@ -121,20 +121,20 @@
* This said, it is preferable to just use |extern "C"| in C++ header files for
* its greater clarity.
*/
# ifdef __cplusplus
# define MOZ_BEGIN_EXTERN_C extern "C" {
# define MOZ_END_EXTERN_C }
# else
# define MOZ_BEGIN_EXTERN_C
# define MOZ_END_EXTERN_C
# endif
#ifdef __cplusplus
# define MOZ_BEGIN_EXTERN_C extern "C" {
# define MOZ_END_EXTERN_C }
#else
# define MOZ_BEGIN_EXTERN_C
# define MOZ_END_EXTERN_C
#endif
/*
* GCC's typeof is available when decltype is not.
*/
# if defined(__GNUC__) && defined(__cplusplus) && \
!defined(__GXX_EXPERIMENTAL_CXX0X__) && __cplusplus < 201103L
# define decltype __typeof__
# endif
#if defined(__GNUC__) && defined(__cplusplus) && \
!defined(__GXX_EXPERIMENTAL_CXX0X__) && __cplusplus < 201103L
# define decltype __typeof__
#endif
#endif /* mozilla_Types_h */

4
netwerk/base/LoadInfo.h
Просмотреть файл

@ -135,8 +135,8 @@ class LoadInfo final : public nsILoadInfo {
const Maybe<mozilla::dom::ServiceWorkerDescriptor>& aController,
nsSecurityFlags aSecurityFlags,
nsContentPolicyType aContentPolicyType, LoadTainting aTainting,
bool aBlockAllMixedContent,
bool aUpgradeInsecureRequests, bool aBrowserUpgradeInsecureRequests,
bool aBlockAllMixedContent, bool aUpgradeInsecureRequests,
bool aBrowserUpgradeInsecureRequests,
bool aBrowserWouldUpgradeInsecureRequests, bool aForceAllowDataURI,
bool aAllowInsecureRedirectToDataURI, bool aBypassCORSChecks,
bool aSkipContentPolicyCheckForWebRequest,

4
netwerk/test/fuzz/FuzzingStreamListener.h
Просмотреть файл

@ -23,9 +23,7 @@ class FuzzingStreamListener final : public nsIStreamListener {
SpinEventLoopUntil([&]() { return mChannelDone; });
}
bool isDone() {
return mChannelDone;
}
bool isDone() { return mChannelDone; }
private:
~FuzzingStreamListener() = default;

2
netwerk/test/fuzz/TestFtpFuzzing.cpp
Просмотреть файл

@ -47,7 +47,7 @@ static int FuzzingRunNetworkFtp(const uint8_t* data, size_t size) {
// If we have more than 1024 bytes, we use the excess for
// an optional data connection.
addNetworkFuzzingBuffer(data, 1024, true);
addNetworkFuzzingBuffer(data+1024, size-1024, true, true);
addNetworkFuzzingBuffer(data + 1024, size - 1024, true, true);
} else {
addNetworkFuzzingBuffer(data, size, true);
}

3
netwerk/test/gtest/TestMozURL.cpp
Просмотреть файл

@ -354,7 +354,8 @@ TEST(TestMozURL, UrlTestData)
Json::Value root;
Json::CharReaderBuilder builder;
std::unique_ptr<Json::CharReader> const reader(builder.newCharReader());
ASSERT_TRUE(reader->parse(data.BeginReading(), data.EndReading(), &root, nullptr));
ASSERT_TRUE(
reader->parse(data.BeginReading(), data.EndReading(), &root, nullptr));
ASSERT_TRUE(root.isArray());
for (uint32_t index = 0; index < root.size(); index++) {

4
toolkit/components/places/History.cpp
Просмотреть файл

@ -227,8 +227,8 @@ already_AddRefed<nsIURI> GetJSValueAsURI(JSContext* aCtx,
nsCOMPtr<nsIXPConnectWrappedNative> wrappedObj;
JS::Rooted<JSObject*> obj(aCtx, aValue.toObjectOrNull());
nsresult rv = xpc->GetWrappedNativeOfJSObject(aCtx, obj,
getter_AddRefs(wrappedObj));
nsresult rv =
xpc->GetWrappedNativeOfJSObject(aCtx, obj, getter_AddRefs(wrappedObj));
NS_ENSURE_SUCCESS(rv, nullptr);
nsCOMPtr<nsIURI> uri = do_QueryInterface(wrappedObj->Native());
return uri.forget();

9
toolkit/components/satchel/nsFormFillController.cpp
Просмотреть файл

@ -67,8 +67,8 @@ static nsIFormAutoComplete* GetFormAutoComplete() {
}
NS_IMPL_CYCLE_COLLECTION(nsFormFillController, mController, mLoginManagerAC,
mLoginReputationService, mFocusedPopup,
mPopups, mLastListener, mLastFormAutoComplete)
mLoginReputationService, mFocusedPopup, mPopups,
mLastListener, mLastFormAutoComplete)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsFormFillController)
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIFormFillController)
@ -211,8 +211,9 @@ void nsFormFillController::MaybeRemoveMutationObserver(nsINode* aNode) {
NS_IMETHODIMP
nsFormFillController::AttachToDocument(Document* aDocument,
nsIAutoCompletePopup* aPopup) {
MOZ_LOG(sLogger, LogLevel::Debug,
("AttachToDocument for document %p with popup %p", aDocument, aPopup));
MOZ_LOG(
sLogger, LogLevel::Debug,
("AttachToDocument for document %p with popup %p", aDocument, aPopup));
NS_ENSURE_TRUE(aDocument && aPopup, NS_ERROR_ILLEGAL_VALUE);
mPopups.Put(aDocument, aPopup);

4
toolkit/components/satchel/nsFormFillController.h
Просмотреть файл

@ -116,7 +116,9 @@ class nsFormFillController final : public nsIFormFillController,
nsINode* mListNode;
nsCOMPtr<nsIAutoCompletePopup> mFocusedPopup;
nsInterfaceHashtable<nsRefPtrHashKey<mozilla::dom::Document>, nsIAutoCompletePopup> mPopups;
nsInterfaceHashtable<nsRefPtrHashKey<mozilla::dom::Document>,
nsIAutoCompletePopup>
mPopups;
// The observer passed to StartSearch. It will be notified when the search is
// complete or the data from a datalist changes.

6
toolkit/components/telemetry/geckoview/TelemetryGeckoViewPersistence.cpp
Просмотреть файл

@ -243,8 +243,10 @@ void MainThreadParsePersistedProbes(const nsACString& aProbeData) {
ANDROID_LOG("MainThreadParsePersistedProbes");
// We need a JS context to run the parsing stuff in.
JS::Rooted<JSObject*> cleanGlobal(mozilla::dom::RootingCx(),
SimpleGlobalObject::Create(SimpleGlobalObject::GlobalType::BindingDetail));
JS::Rooted<JSObject*> cleanGlobal(
mozilla::dom::RootingCx(),
SimpleGlobalObject::Create(
SimpleGlobalObject::GlobalType::BindingDetail));
if (!cleanGlobal) {
ANDROID_LOG(
"MainThreadParsePersistedProbes - Failed to create a JS global object");

4
toolkit/mozapps/update/updater/updater.cpp
Просмотреть файл

@ -2976,8 +2976,8 @@ int NS_main(int argc, NS_tchar** argv) {
NS_T("%s\\update.log"), gPatchDirPath);
}
#else
NS_tsnprintf(logFilePath, sizeof(logFilePath) / sizeof(logFilePath[0]),
NS_T("%s/update.log"), gPatchDirPath);
NS_tsnprintf(logFilePath, sizeof(logFilePath) / sizeof(logFilePath[0]),
NS_T("%s/update.log"), gPatchDirPath);
#endif
LogInit(logFilePath);

18
toolkit/xre/glxtest.cpp
Просмотреть файл

@ -356,21 +356,19 @@ void glxtest() {
int screenCount = ScreenCount(dpy);
int defaultScreen = DefaultScreen(dpy);
if (screenCount != 0)
{
if (screenCount != 0) {
length += snprintf(buf + length, bufsize - length, "SCREEN_INFO\n");
if (length >= bufsize)
fatal_error("Screen Info strings length too large for buffer size");
for (int idx = 0; idx < screenCount; idx++)
{
fatal_error("Screen Info strings length too large for buffer size");
for (int idx = 0; idx < screenCount; idx++) {
Screen* scrn = ScreenOfDisplay(dpy, idx);
int current_height = scrn->height;
int current_width = scrn->width;
int current_width = scrn->width;
length += snprintf(buf + length, bufsize - length, "%dx%d%s%s",
current_width, current_height,
idx == defaultScreen ? " default" : "",
idx == screenCount -1 ? ";\n" : ";");
length +=
snprintf(buf + length, bufsize - length, "%dx%d%s%s", current_width,
current_height, idx == defaultScreen ? " default" : "",
idx == screenCount - 1 ? ";\n" : ";");
if (length >= bufsize)
fatal_error("Screen Info strings length too large for buffer size");
}

7
widget/GfxInfoX11.cpp
Просмотреть файл

@ -296,14 +296,13 @@ void GfxInfo::GetData() {
if (!screenInfo.IsEmpty()) {
PRInt32 start = 0;
PRInt32 loc = screenInfo.Find(";", PR_FALSE, start);
while (loc != kNotFound)
{
while (loc != kNotFound) {
nsCString line(screenInfo.get() + start, loc - start);
nsString value;
CopyASCIItoUTF16(line, value);
mScreenInfo.AppendElement(value);
start = loc+1;
start = loc + 1;
loc = screenInfo.Find(";", PR_FALSE, start);
}
}
@ -605,7 +604,7 @@ GfxInfo::GetAdapterSubsysID2(nsAString& aAdapterSubsysID) {
NS_IMETHODIMP
GfxInfo::GetDisplayInfo(nsTArray<nsString>& aDisplayInfo) {
GetData();
if (!mScreenInfo.IsEmpty()){
if (!mScreenInfo.IsEmpty()) {
aDisplayInfo = mScreenInfo;
return NS_OK;

6
widget/android/AndroidBridge.cpp
Просмотреть файл

@ -298,12 +298,12 @@ void AndroidBridge::GetExtensionFromMimeType(const nsACString& aMimeType,
}
}
gfx::Rect AndroidBridge::getScreenSize()
{
gfx::Rect AndroidBridge::getScreenSize() {
ALOG_BRIDGE("AndroidBridge::getScreenSize");
java::sdk::Rect::LocalRef screenrect = GeckoAppShell::GetScreenSize();
gfx::Rect screensize(screenrect->Left(), screenrect->Top(), screenrect->Width(), screenrect->Height());
gfx::Rect screensize(screenrect->Left(), screenrect->Top(),
screenrect->Width(), screenrect->Height());
return screensize;
}

7
widget/android/GfxInfo.h
Просмотреть файл

@ -78,9 +78,10 @@ class GfxInfo : public GfxInfoBase {
virtual const nsTArray<GfxDriverInfo>& GetGfxDriverInfo() override;
private:
struct ScreenInfo {
gfx::Rect mScreenDimensions;
};
struct ScreenInfo {
gfx::Rect mScreenDimensions;
};
private:
void AddCrashReportAnnotations();
int32_t WebRtcHwVp8EncodeSupported();

9
widget/cocoa/GfxInfo.mm
Просмотреть файл

@ -225,14 +225,11 @@ GfxInfo::GetAdapterSubsysID2(nsAString& aAdapterSubsysID) { return NS_ERROR_FAIL
/* readonly attribute Array<DOMString> displayInfo; */
NS_IMETHODIMP
GfxInfo::GetDisplayInfo(nsTArray<nsString>& aDisplayInfo) {
for (NSScreen* screen in [NSScreen screens]) {
for (NSScreen* screen in [NSScreen screens]) {
NSRect rect = [screen frame];
nsString desc;
desc.AppendPrintf(
"%dx%d scale:%f",
(int32_t)rect.size.width, (int32_t)rect.size.height,
nsCocoaUtils::GetBackingScaleFactor(screen)
);
desc.AppendPrintf("%dx%d scale:%f", (int32_t)rect.size.width, (int32_t)rect.size.height,
nsCocoaUtils::GetBackingScaleFactor(screen));
aDisplayInfo.AppendElement(desc);
}

45
widget/windows/GfxInfo.cpp
Просмотреть файл

@ -905,11 +905,9 @@ NS_IMETHODIMP
GfxInfo::GetDisplayInfo(nsTArray<nsString>& aDisplayInfo) {
for (auto displayInfo : mDisplayInfo) {
nsString value;
value.AppendPrintf(
"%dx%d@%dHz %s",
displayInfo.mScreenWidth, displayInfo.mScreenHeight,
displayInfo.mRefreshRate, displayInfo.mIsPseudoDisplay ? "Pseudo Display" : ""
);
value.AppendPrintf("%dx%d@%dHz %s", displayInfo.mScreenWidth,
displayInfo.mScreenHeight, displayInfo.mRefreshRate,
displayInfo.mIsPseudoDisplay ? "Pseudo Display" : "");
aDisplayInfo.AppendElement(value);
}
@ -1800,33 +1798,36 @@ const nsTArray<GfxDriverInfo>& GfxInfo::GetGfxDriverInfo() {
(nsAString&)GfxDriverInfo::GetDeviceVendor(VendorIntel),
(nsAString&)GfxDriverInfo::GetDriverVendor(DriverVendorAll),
GfxDriverInfo::allDevices, nsIGfxInfo::FEATURE_WEBRENDER,
nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION,
DRIVER_BETWEEN_INCLUSIVE, V(10, 18, 15, 4256), V(10, 18, 15, 4281),
"FEATURE_FAILURE_WEBRENDER_INTEL_BAD_DRIVER", "Intel driver >= 21.20.16.4590");
nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION, DRIVER_BETWEEN_INCLUSIVE,
V(10, 18, 15, 4256), V(10, 18, 15, 4281),
"FEATURE_FAILURE_WEBRENDER_INTEL_BAD_DRIVER",
"Intel driver >= 21.20.16.4590");
APPEND_TO_DRIVER_BLOCKLIST_RANGE(
OperatingSystem::Windows,
(nsAString&)GfxDriverInfo::GetDeviceVendor(VendorIntel),
(nsAString&)GfxDriverInfo::GetDriverVendor(DriverVendorAll),
GfxDriverInfo::allDevices, nsIGfxInfo::FEATURE_WEBRENDER,
nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION,
DRIVER_BETWEEN_INCLUSIVE, V(20, 19, 15, 4285), V(20, 19, 15, 4835),
"FEATURE_FAILURE_WEBRENDER_INTEL_BAD_DRIVER", "Intel driver >= 21.20.16.4590");
nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION, DRIVER_BETWEEN_INCLUSIVE,
V(20, 19, 15, 4285), V(20, 19, 15, 4835),
"FEATURE_FAILURE_WEBRENDER_INTEL_BAD_DRIVER",
"Intel driver >= 21.20.16.4590");
APPEND_TO_DRIVER_BLOCKLIST_RANGE(
OperatingSystem::Windows,
(nsAString&)GfxDriverInfo::GetDeviceVendor(VendorIntel),
(nsAString&)GfxDriverInfo::GetDriverVendor(DriverVendorAll),
GfxDriverInfo::allDevices, nsIGfxInfo::FEATURE_WEBRENDER,
nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION,
DRIVER_BETWEEN_INCLUSIVE, V(21, 20, 16, 4471), V(21, 20, 16, 4565),
"FEATURE_FAILURE_WEBRENDER_INTEL_BAD_DRIVER", "Intel driver >= 21.20.16.4590");
nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION, DRIVER_BETWEEN_INCLUSIVE,
V(21, 20, 16, 4471), V(21, 20, 16, 4565),
"FEATURE_FAILURE_WEBRENDER_INTEL_BAD_DRIVER",
"Intel driver >= 21.20.16.4590");
#else
APPEND_TO_DRIVER_BLOCKLIST2(
OperatingSystem::Windows,
(nsAString&)GfxDriverInfo::GetDeviceVendor(VendorIntel),
(nsAString&)GfxDriverInfo::GetDriverVendor(DriverVendorAll),
GfxDriverInfo::allDevices, nsIGfxInfo::FEATURE_WEBRENDER,
nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION,
DRIVER_LESS_THAN, V(21, 20, 16, 4590), "Intel driver >= 21.20.16.4590");
nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION, DRIVER_LESS_THAN,
V(21, 20, 16, 4590), "Intel driver >= 21.20.16.4590");
#endif
}
return *sDriverInfo;
@ -1908,16 +1909,20 @@ nsresult GfxInfo::FindMonitors(JSContext* aCx, JS::HandleObject aOutArray) {
for (auto displayInfo : mDisplayInfo) {
JS::Rooted<JSObject*> obj(aCx, JS_NewPlainObject(aCx));
JS::Rooted<JS::Value> screenWidth(aCx, JS::Int32Value(displayInfo.mScreenWidth));
JS::Rooted<JS::Value> screenWidth(aCx,
JS::Int32Value(displayInfo.mScreenWidth));
JS_SetProperty(aCx, obj, "screenWidth", screenWidth);
JS::Rooted<JS::Value> screenHeight(aCx, JS::Int32Value(displayInfo.mScreenHeight));
JS::Rooted<JS::Value> screenHeight(
aCx, JS::Int32Value(displayInfo.mScreenHeight));
JS_SetProperty(aCx, obj, "screenHeight", screenHeight);
JS::Rooted<JS::Value> refreshRate(aCx, JS::Int32Value(displayInfo.mRefreshRate));
JS::Rooted<JS::Value> refreshRate(aCx,
JS::Int32Value(displayInfo.mRefreshRate));
JS_SetProperty(aCx, obj, "refreshRate", refreshRate);
JS::Rooted<JS::Value> pseudoDisplay(aCx, JS::BooleanValue(displayInfo.mIsPseudoDisplay));
JS::Rooted<JS::Value> pseudoDisplay(
aCx, JS::BooleanValue(displayInfo.mIsPseudoDisplay));
JS_SetProperty(aCx, obj, "pseudoDisplay", pseudoDisplay);
JS::Rooted<JS::Value> element(aCx, JS::ObjectValue(*obj));

12
widget/windows/GfxInfo.h
Просмотреть файл

@ -71,12 +71,12 @@ class GfxInfo : public GfxInfoBase {
void DescribeFeatures(JSContext* cx, JS::Handle<JSObject*> aOut) override;
private:
struct DisplayInfo {
uint32_t mScreenWidth;
uint32_t mScreenHeight;
uint32_t mRefreshRate;
bool mIsPseudoDisplay;
};
struct DisplayInfo {
uint32_t mScreenWidth;
uint32_t mScreenHeight;
uint32_t mRefreshRate;
bool mIsPseudoDisplay;
};
private:
void AddCrashReportAnnotations();