diff options
| -rw-r--r-- | dom/ipc/ContentChild.h | 4 | ||||
| -rw-r--r-- | image/imgFrame.cpp | 2 | ||||
| -rw-r--r-- | js/src/jit/StupidAllocator.cpp | 1 | ||||
| -rw-r--r-- | js/src/vm/ObjectGroup.cpp | 1 | ||||
| -rw-r--r-- | media/libcubeb/src/cubeb.c | 2 | ||||
| -rw-r--r-- | media/libcubeb/src/cubeb_audiounit.cpp | 2 | ||||
| -rw-r--r-- | security/manager/ssl/nsSiteSecurityService.cpp | 2 |
7 files changed, 6 insertions, 8 deletions
diff --git a/dom/ipc/ContentChild.h b/dom/ipc/ContentChild.h index f29d17e7f..4c8f15cc0 100644 --- a/dom/ipc/ContentChild.h +++ b/dom/ipc/ContentChild.h @@ -152,13 +152,13 @@ public: RecvInitRendering( Endpoint<PCompositorBridgeChild>&& aCompositor, Endpoint<PImageBridgeChild>&& aImageBridge, - Endpoint<PVideoDecoderManagerChild>&& aVideoManager); + Endpoint<PVideoDecoderManagerChild>&& aVideoManager) override; bool RecvReinitRendering( Endpoint<PCompositorBridgeChild>&& aCompositor, Endpoint<PImageBridgeChild>&& aImageBridge, - Endpoint<PVideoDecoderManagerChild>&& aVideoManager); + Endpoint<PVideoDecoderManagerChild>&& aVideoManager) override; PProcessHangMonitorChild* AllocPProcessHangMonitorChild(Transport* aTransport, diff --git a/image/imgFrame.cpp b/image/imgFrame.cpp index c9f44181d..d982c17c4 100644 --- a/image/imgFrame.cpp +++ b/image/imgFrame.cpp @@ -161,13 +161,13 @@ imgFrame::imgFrame() : mMonitor("imgFrame") , mDecoded(0, 0, 0, 0) , mLockCount(0) + , mHasNoAlpha(false) , mAborted(false) , mFinished(false) , mOptimizable(false) , mTimeout(FrameTimeout::FromRawMilliseconds(100)) , mDisposalMethod(DisposalMethod::NOT_SPECIFIED) , mBlendMethod(BlendMethod::OVER) - , mHasNoAlpha(false) , mPalettedImageData(nullptr) , mPaletteDepth(0) , mNonPremult(false) diff --git a/js/src/jit/StupidAllocator.cpp b/js/src/jit/StupidAllocator.cpp index 8e3ea6286..55431e8e0 100644 --- a/js/src/jit/StupidAllocator.cpp +++ b/js/src/jit/StupidAllocator.cpp @@ -407,7 +407,6 @@ StupidAllocator::allocateForDefinition(LInstruction* ins, LDefinition* def) { uint32_t vreg = def->virtualRegister(); - CodePosition from; if ((def->output()->isRegister() && def->policy() == LDefinition::FIXED) || def->policy() == LDefinition::MUST_REUSE_INPUT) { diff --git a/js/src/vm/ObjectGroup.cpp b/js/src/vm/ObjectGroup.cpp index 1fbf8976b..46159a972 100644 --- a/js/src/vm/ObjectGroup.cpp +++ b/js/src/vm/ObjectGroup.cpp @@ -495,7 +495,6 @@ ObjectGroup::defaultNewGroup(ExclusiveContext* cx, const Class* clasp, if (associated->is<JSFunction>()) { // Canonicalize new functions to use the original one associated with its script. - JSFunction* fun = &associated->as<JSFunction>(); associated = associated->as<JSFunction>().maybeCanonicalFunction(); // If we have previously cleared the 'new' script information for this diff --git a/media/libcubeb/src/cubeb.c b/media/libcubeb/src/cubeb.c index e0375c394..eb22a9b94 100644 --- a/media/libcubeb/src/cubeb.c +++ b/media/libcubeb/src/cubeb.c @@ -562,7 +562,7 @@ int cubeb_set_log_callback(cubeb_log_level log_level, void cubeb_crash() { - abort(); *((volatile int *) NULL) = 0; + abort(); } diff --git a/media/libcubeb/src/cubeb_audiounit.cpp b/media/libcubeb/src/cubeb_audiounit.cpp index f24dfbff2..9483c2795 100644 --- a/media/libcubeb/src/cubeb_audiounit.cpp +++ b/media/libcubeb/src/cubeb_audiounit.cpp @@ -1443,12 +1443,12 @@ audiounit_set_buffer_size(cubeb_stream * stm, uint32_t new_size_frames, set_buff buffer_size_changed_callback, stm); if (r != noErr) { - return CUBEB_ERROR; if (set_side == INPUT) { PRINT_ERROR_CODE("AudioUnitAddPropertyListener/input/kAudioDevicePropertyBufferFrameSize", r); } else { PRINT_ERROR_CODE("AudioUnitAddPropertyListener/output/kAudioDevicePropertyBufferFrameSize", r); } + return CUBEB_ERROR; } if (!stm->buffer_size_change_state && count >= 30) { diff --git a/security/manager/ssl/nsSiteSecurityService.cpp b/security/manager/ssl/nsSiteSecurityService.cpp index fc38f4e64..cfee79d8d 100644 --- a/security/manager/ssl/nsSiteSecurityService.cpp +++ b/security/manager/ssl/nsSiteSecurityService.cpp @@ -210,8 +210,8 @@ const uint64_t kSixtyDaysInSeconds = 60 * 24 * 60 * 60; nsSiteSecurityService::nsSiteSecurityService() : mMaxMaxAge(kSixtyDaysInSeconds) , mUsePreloadList(true) - , mPreloadListTimeOffset(0) , mUseStsService(true) + , mPreloadListTimeOffset(0) { } |