зеркало из https://github.com/mozilla/gecko-dev.git
Merge inbound to mozilla-central. a=merge
This commit is contained in:
Коммит
21b5725e3c
|
@ -1804,7 +1804,8 @@ nsDocShell::AddWeakPrivacyTransitionObserver(
|
|||
if (!weakObs) {
|
||||
return NS_ERROR_NOT_AVAILABLE;
|
||||
}
|
||||
return mPrivacyObservers.AppendElement(weakObs) ? NS_OK : NS_ERROR_FAILURE;
|
||||
mPrivacyObservers.AppendElement(weakObs);
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
|
@ -1814,7 +1815,8 @@ nsDocShell::AddWeakReflowObserver(nsIReflowObserver* aObserver)
|
|||
if (!weakObs) {
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
return mReflowObservers.AppendElement(weakObs) ? NS_OK : NS_ERROR_FAILURE;
|
||||
mReflowObservers.AppendElement(weakObs);
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
|
@ -2515,7 +2517,8 @@ nsDocShell::AddWeakScrollObserver(nsIScrollObserver* aObserver)
|
|||
if (!weakObs) {
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
return mScrollObservers.AppendElement(weakObs) ? NS_OK : NS_ERROR_FAILURE;
|
||||
mScrollObservers.AppendElement(weakObs);
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
|
|
|
@ -782,8 +782,8 @@ nsSHistory::AddSHistoryListener(nsISHistoryListener* aListener)
|
|||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
return mListeners.AppendElementUnlessExists(listener) ?
|
||||
NS_OK : NS_ERROR_OUT_OF_MEMORY;
|
||||
mListeners.AppendElementUnlessExists(listener);
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
|
|
|
@ -2100,9 +2100,7 @@ nsDocument::Init()
|
|||
// subclasses currently do, other don't). This is because the code in
|
||||
// nsNodeUtils always notifies the first observer first, expecting the
|
||||
// first observer to be the document.
|
||||
NS_ENSURE_TRUE(slots->mMutationObservers.PrependElementUnlessExists(static_cast<nsIMutationObserver*>(this)),
|
||||
NS_ERROR_OUT_OF_MEMORY);
|
||||
|
||||
slots->mMutationObservers.PrependElementUnlessExists(static_cast<nsIMutationObserver*>(this));
|
||||
|
||||
mOnloadBlocker = new nsOnloadBlocker();
|
||||
mCSSLoader = new mozilla::css::Loader(this);
|
||||
|
|
|
@ -88,9 +88,7 @@ CoalescedMouseMoveFlusher::StartObserver()
|
|||
RemoveObserver();
|
||||
if (refreshDriver) {
|
||||
mRefreshDriver = refreshDriver;
|
||||
DebugOnly<bool> success =
|
||||
mRefreshDriver->AddRefreshObserver(this, FlushType::Event);
|
||||
MOZ_ASSERT(success);
|
||||
mRefreshDriver->AddRefreshObserver(this, FlushType::Event);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -319,8 +319,8 @@ nsXMLContentSink::DidBuildModel(bool aTerminated)
|
|||
|
||||
// We're pretty-printing now. See whether we should wait up on
|
||||
// stylesheet loads
|
||||
if (mDocument->CSSLoader()->HasPendingLoads() &&
|
||||
NS_SUCCEEDED(mDocument->CSSLoader()->AddObserver(this))) {
|
||||
if (mDocument->CSSLoader()->HasPendingLoads()) {
|
||||
mDocument->CSSLoader()->AddObserver(this);
|
||||
// wait for those sheets to load
|
||||
startLayout = false;
|
||||
}
|
||||
|
|
|
@ -5563,12 +5563,8 @@ void PresShell::SynthesizeMouseMove(bool aFromScroll)
|
|||
RefPtr<nsSynthMouseMoveEvent> ev =
|
||||
new nsSynthMouseMoveEvent(this, aFromScroll);
|
||||
|
||||
if (!GetPresContext()->RefreshDriver()
|
||||
->AddRefreshObserver(ev, FlushType::Display)) {
|
||||
NS_WARNING("failed to dispatch nsSynthMouseMoveEvent");
|
||||
return;
|
||||
}
|
||||
|
||||
GetPresContext()->RefreshDriver()
|
||||
->AddRefreshObserver(ev, FlushType::Display);
|
||||
mSynthMouseMoveEvent = std::move(ev);
|
||||
}
|
||||
}
|
||||
|
@ -9416,8 +9412,11 @@ nsIPresShell::AddRefreshObserver(nsARefreshObserver* aObserver,
|
|||
FlushType aFlushType)
|
||||
{
|
||||
nsPresContext* presContext = GetPresContext();
|
||||
return presContext &&
|
||||
presContext->RefreshDriver()->AddRefreshObserver(aObserver, aFlushType);
|
||||
if (MOZ_UNLIKELY(!presContext)) {
|
||||
return false;
|
||||
}
|
||||
presContext->RefreshDriver()->AddRefreshObserver(aObserver, aFlushType);
|
||||
return true;
|
||||
}
|
||||
|
||||
bool
|
||||
|
|
|
@ -1204,14 +1204,13 @@ nsRefreshDriver::MostRecentRefresh() const
|
|||
return mMostRecentRefresh;
|
||||
}
|
||||
|
||||
bool
|
||||
void
|
||||
nsRefreshDriver::AddRefreshObserver(nsARefreshObserver* aObserver,
|
||||
FlushType aFlushType)
|
||||
{
|
||||
ObserverArray& array = ArrayFor(aFlushType);
|
||||
bool success = array.AppendElement(aObserver) != nullptr;
|
||||
array.AppendElement(aObserver);
|
||||
EnsureTimerStarted();
|
||||
return success;
|
||||
}
|
||||
|
||||
bool
|
||||
|
@ -1222,21 +1221,20 @@ nsRefreshDriver::RemoveRefreshObserver(nsARefreshObserver* aObserver,
|
|||
return array.RemoveElement(aObserver);
|
||||
}
|
||||
|
||||
bool
|
||||
void
|
||||
nsRefreshDriver::AddTimerAdjustmentObserver(
|
||||
nsATimerAdjustmentObserver *aObserver)
|
||||
nsATimerAdjustmentObserver* aObserver)
|
||||
{
|
||||
MOZ_ASSERT(!mTimerAdjustmentObservers.Contains(aObserver));
|
||||
|
||||
return mTimerAdjustmentObservers.AppendElement(aObserver) != nullptr;
|
||||
mTimerAdjustmentObservers.AppendElement(aObserver);
|
||||
}
|
||||
|
||||
bool
|
||||
void
|
||||
nsRefreshDriver::RemoveTimerAdjustmentObserver(
|
||||
nsATimerAdjustmentObserver *aObserver)
|
||||
nsATimerAdjustmentObserver* aObserver)
|
||||
{
|
||||
MOZ_ASSERT(mTimerAdjustmentObservers.Contains(aObserver));
|
||||
return mTimerAdjustmentObservers.RemoveElement(aObserver);
|
||||
mTimerAdjustmentObservers.RemoveElement(aObserver);
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
@ -120,8 +120,8 @@ public:
|
|||
mozilla::TimeStamp MostRecentRefresh() const;
|
||||
|
||||
/**
|
||||
* Add / remove refresh observers. Returns whether the operation
|
||||
* succeeded.
|
||||
* Add / remove refresh observers.
|
||||
* RemoveRefreshObserver returns true if aObserver was found.
|
||||
*
|
||||
* The flush type affects:
|
||||
* + the order in which the observers are notified (lowest flush
|
||||
|
@ -137,16 +137,16 @@ public:
|
|||
*
|
||||
* The observer will be called even if there is no other activity.
|
||||
*/
|
||||
bool AddRefreshObserver(nsARefreshObserver *aObserver,
|
||||
void AddRefreshObserver(nsARefreshObserver* aObserver,
|
||||
mozilla::FlushType aFlushType);
|
||||
bool RemoveRefreshObserver(nsARefreshObserver *aObserver,
|
||||
bool RemoveRefreshObserver(nsARefreshObserver* aObserver,
|
||||
mozilla::FlushType aFlushType);
|
||||
/**
|
||||
* Add / remove an observer wants to know the time when the refresh driver
|
||||
* updated the most recent refresh time due to its active timer changes.
|
||||
*/
|
||||
bool AddTimerAdjustmentObserver(nsATimerAdjustmentObserver *aObserver);
|
||||
bool RemoveTimerAdjustmentObserver(nsATimerAdjustmentObserver *aObserver);
|
||||
void AddTimerAdjustmentObserver(nsATimerAdjustmentObserver* aObserver);
|
||||
void RemoveTimerAdjustmentObserver(nsATimerAdjustmentObserver* aObserver);
|
||||
|
||||
void PostScrollEvent(mozilla::Runnable* aScrollEvent);
|
||||
void DispatchScrollEvents();
|
||||
|
|
|
@ -1841,17 +1841,12 @@ public:
|
|||
/*
|
||||
* Set a refresh observer for smooth scroll iterations (and start observing).
|
||||
* Should be used at most once during the lifetime of this object.
|
||||
* Return value: true on success, false otherwise.
|
||||
*/
|
||||
bool SetRefreshObserver(ScrollFrameHelper *aCallee) {
|
||||
void SetRefreshObserver(ScrollFrameHelper* aCallee) {
|
||||
NS_ASSERTION(aCallee && !mCallee, "AsyncSmoothMSDScroll::SetRefreshObserver - Invalid usage.");
|
||||
|
||||
if (!RefreshDriver(aCallee)->AddRefreshObserver(this, FlushType::Style)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
RefreshDriver(aCallee)->AddRefreshObserver(this, FlushType::Style);
|
||||
mCallee = aCallee;
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -1954,20 +1949,15 @@ public:
|
|||
/*
|
||||
* Set a refresh observer for smooth scroll iterations (and start observing).
|
||||
* Should be used at most once during the lifetime of this object.
|
||||
* Return value: true on success, false otherwise.
|
||||
*/
|
||||
bool SetRefreshObserver(ScrollFrameHelper *aCallee) {
|
||||
void SetRefreshObserver(ScrollFrameHelper* aCallee) {
|
||||
NS_ASSERTION(aCallee && !mCallee, "AsyncScroll::SetRefreshObserver - Invalid usage.");
|
||||
|
||||
if (!RefreshDriver(aCallee)->AddRefreshObserver(this, FlushType::Style)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
RefreshDriver(aCallee)->AddRefreshObserver(this, FlushType::Style);
|
||||
mCallee = aCallee;
|
||||
nsIPresShell* shell = mCallee->mOuter->PresShell();
|
||||
MOZ_ASSERT(shell);
|
||||
shell->SuppressDisplayport(true);
|
||||
return true;
|
||||
}
|
||||
|
||||
virtual void WillRefresh(mozilla::TimeStamp aTime) override {
|
||||
|
@ -2470,11 +2460,7 @@ ScrollFrameHelper::ScrollToWithOrigin(nsPoint aScrollPosition,
|
|||
currentVelocity, GetScrollRangeForClamping(),
|
||||
now, presContext);
|
||||
|
||||
if (!mAsyncSmoothMSDScroll->SetRefreshObserver(this)) {
|
||||
// Observer setup failed. Scroll the normal way.
|
||||
CompleteAsyncScroll(range, aOrigin);
|
||||
return;
|
||||
}
|
||||
mAsyncSmoothMSDScroll->SetRefreshObserver(this);
|
||||
} else {
|
||||
// A previous smooth MSD scroll is still in progress, so we just need to
|
||||
// update its range and destination.
|
||||
|
@ -2493,11 +2479,7 @@ ScrollFrameHelper::ScrollToWithOrigin(nsPoint aScrollPosition,
|
|||
|
||||
if (!mAsyncScroll) {
|
||||
mAsyncScroll = new AsyncScroll();
|
||||
if (!mAsyncScroll->SetRefreshObserver(this)) {
|
||||
// Observer setup failed. Scroll the normal way.
|
||||
CompleteAsyncScroll(range, aOrigin);
|
||||
return;
|
||||
}
|
||||
mAsyncScroll->SetRefreshObserver(this);
|
||||
}
|
||||
|
||||
if (isSmoothScroll) {
|
||||
|
|
|
@ -2570,15 +2570,11 @@ Loader::HasPendingLoads()
|
|||
mDatasToNotifyOn != 0;
|
||||
}
|
||||
|
||||
nsresult
|
||||
void
|
||||
Loader::AddObserver(nsICSSLoaderObserver* aObserver)
|
||||
{
|
||||
MOZ_ASSERT(aObserver, "Must have observer");
|
||||
if (mObservers.AppendElementUnlessExists(aObserver)) {
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
mObservers.AppendElementUnlessExists(aObserver);
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
@ -429,7 +429,7 @@ public:
|
|||
*
|
||||
* aObserver must not be null.
|
||||
*/
|
||||
nsresult AddObserver(nsICSSLoaderObserver* aObserver);
|
||||
void AddObserver(nsICSSLoaderObserver* aObserver);
|
||||
|
||||
/**
|
||||
* Remove an observer added via AddObserver.
|
||||
|
|
|
@ -2316,11 +2316,7 @@ History::RegisterVisitedCallback(nsIURI* aURI,
|
|||
"Already tracking this Link object!");
|
||||
|
||||
// Start tracking our Link.
|
||||
if (!observers.AppendElement(aLink)) {
|
||||
// Curses - unregister and return failure.
|
||||
(void)UnregisterVisitedCallback(aURI, aLink);
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
}
|
||||
observers.AppendElement(aLink);
|
||||
|
||||
// If this link has already been visited, we cannot synchronously mark
|
||||
// ourselves as visited, so instead we fire a runnable into our docgroup,
|
||||
|
|
|
@ -643,11 +643,8 @@ nsresult nsDocLoader::RemoveChildLoader(nsDocLoader* aChild)
|
|||
|
||||
nsresult nsDocLoader::AddChildLoader(nsDocLoader* aChild)
|
||||
{
|
||||
nsresult rv = mChildList.AppendElement(aChild) ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
|
||||
if (NS_SUCCEEDED(rv)) {
|
||||
rv = aChild->SetDocLoaderParent(this);
|
||||
}
|
||||
return rv;
|
||||
mChildList.AppendElement(aChild);
|
||||
return aChild->SetDocLoaderParent(this);
|
||||
}
|
||||
|
||||
NS_IMETHODIMP nsDocLoader::GetDocumentChannel(nsIChannel ** aChannel)
|
||||
|
@ -883,8 +880,8 @@ nsDocLoader::AddProgressListener(nsIWebProgressListener *aListener,
|
|||
return NS_ERROR_INVALID_ARG;
|
||||
}
|
||||
|
||||
return mListenerInfoList.AppendElement(nsListenerInfo(listener, aNotifyMask)) ?
|
||||
NS_OK : NS_ERROR_OUT_OF_MEMORY;
|
||||
mListenerInfoList.AppendElement(nsListenerInfo(listener, aNotifyMask));
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
|
|
|
@ -175,13 +175,11 @@ public:
|
|||
// Insert a given element at the given index.
|
||||
// @param aIndex The index at which to insert item.
|
||||
// @param aItem The item to insert,
|
||||
// @return A pointer to the newly inserted element, or a null on DOM
|
||||
template<class Item>
|
||||
elem_type* InsertElementAt(index_type aIndex, const Item& aItem)
|
||||
void InsertElementAt(index_type aIndex, const Item& aItem)
|
||||
{
|
||||
elem_type* item = mArray.InsertElementAt(aIndex, aItem);
|
||||
mArray.InsertElementAt(aIndex, aItem);
|
||||
AdjustIterators(aIndex, 1);
|
||||
return item;
|
||||
}
|
||||
|
||||
// Same as above but without copy constructing.
|
||||
|
@ -196,26 +194,21 @@ public:
|
|||
// Prepend an element to the array unless it already exists in the array.
|
||||
// 'operator==' must be defined for elem_type.
|
||||
// @param aItem The item to prepend.
|
||||
// @return true if the element was found, or inserted successfully.
|
||||
template<class Item>
|
||||
bool PrependElementUnlessExists(const Item& aItem)
|
||||
void PrependElementUnlessExists(const Item& aItem)
|
||||
{
|
||||
if (Contains(aItem)) {
|
||||
return true;
|
||||
if (!Contains(aItem)) {
|
||||
mArray.InsertElementAt(0, aItem);
|
||||
AdjustIterators(0, 1);
|
||||
}
|
||||
|
||||
bool inserted = mArray.InsertElementAt(0, aItem) != nullptr;
|
||||
AdjustIterators(0, 1);
|
||||
return inserted;
|
||||
}
|
||||
|
||||
// Append an element to the array.
|
||||
// @param aItem The item to append.
|
||||
// @return A pointer to the newly appended element, or null on OOM.
|
||||
template<class Item>
|
||||
elem_type* AppendElement(const Item& aItem)
|
||||
void AppendElement(const Item& aItem)
|
||||
{
|
||||
return mArray.AppendElement(aItem);
|
||||
mArray.AppendElement(aItem);
|
||||
}
|
||||
|
||||
// Same as above, but without copy-constructing. This is useful to avoid
|
||||
|
@ -228,11 +221,12 @@ public:
|
|||
// Append an element to the array unless it already exists in the array.
|
||||
// 'operator==' must be defined for elem_type.
|
||||
// @param aItem The item to append.
|
||||
// @return true if the element was found, or inserted successfully.
|
||||
template<class Item>
|
||||
bool AppendElementUnlessExists(const Item& aItem)
|
||||
void AppendElementUnlessExists(const Item& aItem)
|
||||
{
|
||||
return Contains(aItem) || AppendElement(aItem) != nullptr;
|
||||
if (!Contains(aItem)) {
|
||||
mArray.AppendElement(aItem);
|
||||
}
|
||||
}
|
||||
|
||||
// Remove an element from the array.
|
||||
|
|
Загрузка…
Ссылка в новой задаче