Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 21:05:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1398376 part 3: Collapse formerly-MOZILLA_INTERNAL_API-guarded Foo()/FooInternal() functions together in nsIPresShell and nsPresContext. r=mats

Browse Source 
This is just simplifying things by eliminating a layer of now-unnecessary
abstraction.

MozReview-Commit-ID: 1MBagjYXbCD

--HG--
extra : rebase_source : a0e7e78ef4925efd00eac969ae126d1ba3f4f607
This commit is contained in:
Daniel Holbert 2017-09-08 16:25:03 -07:00
parent c6e12c7a35
commit 1c67d21eda
4 changed files with 20 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
layout/base/PresShell.cpp
View File

@ -657,7 +657,7 @@ nsIPresShell::SetVerifyReflowEnable(bool aEnabled)
}
void
nsIPresShell::AddAutoWeakFrameInternal(AutoWeakFrame* aWeakFrame)
nsIPresShell::AddAutoWeakFrame(AutoWeakFrame* aWeakFrame)
{
if (aWeakFrame->GetFrame()) {
aWeakFrame->GetFrame()->AddStateBits(NS_FRAME_EXTERNAL_REFERENCE);
@ -667,7 +667,7 @@ nsIPresShell::AddAutoWeakFrameInternal(AutoWeakFrame* aWeakFrame)
}
void
nsIPresShell::AddWeakFrameInternal(WeakFrame* aWeakFrame)
nsIPresShell::AddWeakFrame(WeakFrame* aWeakFrame)
{
if (aWeakFrame->GetFrame()) {
aWeakFrame->GetFrame()->AddStateBits(NS_FRAME_EXTERNAL_REFERENCE);
@ -677,7 +677,7 @@ nsIPresShell::AddWeakFrameInternal(WeakFrame* aWeakFrame)
}
void
nsIPresShell::RemoveAutoWeakFrameInternal(AutoWeakFrame* aWeakFrame)
nsIPresShell::RemoveAutoWeakFrame(AutoWeakFrame* aWeakFrame)
{
if (mAutoWeakFrames == aWeakFrame) {
mAutoWeakFrames = aWeakFrame->GetPreviousWeakFrame();
@ -693,7 +693,7 @@ nsIPresShell::RemoveAutoWeakFrameInternal(AutoWeakFrame* aWeakFrame)
}
void
nsIPresShell::RemoveWeakFrameInternal(WeakFrame* aWeakFrame)
nsIPresShell::RemoveWeakFrame(WeakFrame* aWeakFrame)
{
MOZ_ASSERT(mWeakFrames.GetEntry(aWeakFrame));
mWeakFrames.RemoveEntry(aWeakFrame);
@ -9794,8 +9794,8 @@ PresShell::Observe(nsISupports* aSubject,
}
bool
nsIPresShell::AddRefreshObserverInternal(nsARefreshObserver* aObserver,
FlushType aFlushType)
nsIPresShell::AddRefreshObserver(nsARefreshObserver* aObserver,
FlushType aFlushType)
{
nsPresContext* presContext = GetPresContext();
return presContext &&
@ -9803,8 +9803,8 @@ nsIPresShell::AddRefreshObserverInternal(nsARefreshObserver* aObserver,
}
bool
nsIPresShell::RemoveRefreshObserverInternal(nsARefreshObserver* aObserver,
FlushType aFlushType)
nsIPresShell::RemoveRefreshObserver(nsARefreshObserver* aObserver,
FlushType aFlushType)
{
nsPresContext* presContext = GetPresContext();
return presContext &&

40
layout/base/nsIPresShell.h
View File

@ -1153,29 +1153,11 @@ public:
mozilla::LayoutDeviceIntRect* aScreenRect,
uint32_t aFlags) = 0;
void AddAutoWeakFrameInternal(AutoWeakFrame* aWeakFrame);
void AddWeakFrameInternal(WeakFrame* aWeakFrame);
void AddAutoWeakFrame(AutoWeakFrame* aWeakFrame);
void AddWeakFrame(WeakFrame* aWeakFrame);
void AddAutoWeakFrame(AutoWeakFrame* aWeakFrame)
{
AddAutoWeakFrameInternal(aWeakFrame);
}
void AddWeakFrame(WeakFrame* aWeakFrame)
{
AddWeakFrameInternal(aWeakFrame);
}
void RemoveAutoWeakFrameInternal(AutoWeakFrame* aWeakFrame);
void RemoveWeakFrameInternal(WeakFrame* aWeakFrame);
void RemoveAutoWeakFrame(AutoWeakFrame* aWeakFrame)
{
RemoveAutoWeakFrameInternal(aWeakFrame);
}
void RemoveWeakFrame(WeakFrame* aWeakFrame)
{
RemoveWeakFrameInternal(aWeakFrame);
}
void RemoveAutoWeakFrame(AutoWeakFrame* aWeakFrame);
void RemoveWeakFrame(WeakFrame* aWeakFrame);
#ifdef DEBUG
nsIFrame* GetDrawEventTargetFrame() { return mDrawEventTargetFrame; }
@ -1650,11 +1632,6 @@ public:
* Refresh observer management.
*/
protected:
bool AddRefreshObserverInternal(nsARefreshObserver* aObserver,
mozilla::FlushType aFlushType);
bool RemoveRefreshObserverInternal(nsARefreshObserver* aObserver,
mozilla::FlushType aFlushType);
void DoObserveStyleFlushes();
void DoObserveLayoutFlushes();
@ -1692,14 +1669,9 @@ protected:
public:
bool AddRefreshObserver(nsARefreshObserver* aObserver,
mozilla::FlushType aFlushType) {
return AddRefreshObserverInternal(aObserver, aFlushType);
}
mozilla::FlushType aFlushType);
bool RemoveRefreshObserver(nsARefreshObserver* aObserver,
mozilla::FlushType aFlushType) {
return RemoveRefreshObserverInternal(aObserver, aFlushType);
}
mozilla::FlushType aFlushType);
virtual bool AddPostRefreshObserver(nsAPostRefreshObserver* aObserver);
virtual bool RemovePostRefreshObserver(nsAPostRefreshObserver* aObserver);

6
layout/base/nsPresContext.cpp
View File

@ -1312,7 +1312,7 @@ nsPresContext::SetSMILAnimations(nsIDocument *aDoc, uint16_t aNewMode,
}
void
nsPresContext::SetImageAnimationModeInternal(uint16_t aMode)
nsPresContext::SetImageAnimationMode(uint16_t aMode)
{
NS_ASSERTION(aMode == imgIContainer::kNormalAnimMode ||
aMode == imgIContainer::kDontAnimMode ||
@ -1600,7 +1600,7 @@ nsPresContext::SetContainer(nsIDocShell* aDocShell)
}
nsISupports*
nsPresContext::GetContainerWeakInternal() const
nsPresContext::GetContainerWeak() const
{
return static_cast<nsIDocShell*>(mContainer);
}
@ -1619,7 +1619,7 @@ nsPresContext::Detach()
}
bool
nsPresContext::BidiEnabledInternal() const
nsPresContext::BidiEnabled() const
{
return Document()->GetBidiEnabled();
}

11
layout/base/nsPresContext.h
View File

@ -317,9 +317,7 @@ public:
* Access the image animation mode for this context
*/
uint16_t ImageAnimationMode() const { return mImageAnimationMode; }
void SetImageAnimationModeInternal(uint16_t aMode);
void SetImageAnimationMode(uint16_t aMode)
{ SetImageAnimationModeInternal(aMode); }
void SetImageAnimationMode(uint16_t aMode);
/**
* Get medium of presentation
@ -421,9 +419,7 @@ public:
void SetContainer(nsIDocShell* aContainer);
nsISupports* GetContainerWeakInternal() const;
nsISupports* GetContainerWeak() const
{ return GetContainerWeakInternal(); }
nsISupports* GetContainerWeak() const;
nsIDocShell* GetDocShell() const;
@ -766,8 +762,7 @@ public:
*
* @lina 07/12/2000
*/
bool BidiEnabled() const { return BidiEnabledInternal(); }
bool BidiEnabledInternal() const;
bool BidiEnabled() const;
/**
* Set bidi enabled. This means we should apply the Unicode Bidi Algorithm