зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1398376 part 2: Remove formerly-MOZILLA_INTERNAL_API-guarded FooExternal() functions from nsIPresShell and nsPresContext. r=mats
These functions are now dead code. And really, they were already dead code even before this patch-stack -- they were only called in never-evaluated (and now-deleted) #else clauses. MozReview-Commit-ID: AeY6Z3ybmsv --HG-- extra : rebase_source : deb51373f4d32580ab2ffb71c5c078132e4a76a6
This commit is contained in:
Родитель
8a68df9e64
Коммит
c6e12c7a35
|
@ -656,12 +656,6 @@ nsIPresShell::SetVerifyReflowEnable(bool aEnabled)
|
||||||
gVerifyReflowEnabled = aEnabled;
|
gVerifyReflowEnabled = aEnabled;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* virtual */ void
|
|
||||||
nsIPresShell::AddAutoWeakFrameExternal(AutoWeakFrame* aWeakFrame)
|
|
||||||
{
|
|
||||||
AddAutoWeakFrameInternal(aWeakFrame);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
void
|
||||||
nsIPresShell::AddAutoWeakFrameInternal(AutoWeakFrame* aWeakFrame)
|
nsIPresShell::AddAutoWeakFrameInternal(AutoWeakFrame* aWeakFrame)
|
||||||
{
|
{
|
||||||
|
@ -672,12 +666,6 @@ nsIPresShell::AddAutoWeakFrameInternal(AutoWeakFrame* aWeakFrame)
|
||||||
mAutoWeakFrames = aWeakFrame;
|
mAutoWeakFrames = aWeakFrame;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* virtual */ void
|
|
||||||
nsIPresShell::AddWeakFrameExternal(WeakFrame* aWeakFrame)
|
|
||||||
{
|
|
||||||
AddWeakFrameInternal(aWeakFrame);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
void
|
||||||
nsIPresShell::AddWeakFrameInternal(WeakFrame* aWeakFrame)
|
nsIPresShell::AddWeakFrameInternal(WeakFrame* aWeakFrame)
|
||||||
{
|
{
|
||||||
|
@ -688,12 +676,6 @@ nsIPresShell::AddWeakFrameInternal(WeakFrame* aWeakFrame)
|
||||||
mWeakFrames.PutEntry(aWeakFrame);
|
mWeakFrames.PutEntry(aWeakFrame);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* virtual */ void
|
|
||||||
nsIPresShell::RemoveAutoWeakFrameExternal(AutoWeakFrame* aWeakFrame)
|
|
||||||
{
|
|
||||||
RemoveAutoWeakFrameInternal(aWeakFrame);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
void
|
||||||
nsIPresShell::RemoveAutoWeakFrameInternal(AutoWeakFrame* aWeakFrame)
|
nsIPresShell::RemoveAutoWeakFrameInternal(AutoWeakFrame* aWeakFrame)
|
||||||
{
|
{
|
||||||
|
@ -710,12 +692,6 @@ nsIPresShell::RemoveAutoWeakFrameInternal(AutoWeakFrame* aWeakFrame)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* virtual */ void
|
|
||||||
nsIPresShell::RemoveWeakFrameExternal(WeakFrame* aWeakFrame)
|
|
||||||
{
|
|
||||||
RemoveWeakFrameInternal(aWeakFrame);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
void
|
||||||
nsIPresShell::RemoveWeakFrameInternal(WeakFrame* aWeakFrame)
|
nsIPresShell::RemoveWeakFrameInternal(WeakFrame* aWeakFrame)
|
||||||
{
|
{
|
||||||
|
@ -2475,12 +2451,6 @@ PresShell::CheckVisibilityContent(nsIContent* aNode, int16_t aStartOffset,
|
||||||
|
|
||||||
//end implementations nsISelectionController
|
//end implementations nsISelectionController
|
||||||
|
|
||||||
nsIFrame*
|
|
||||||
nsIPresShell::GetRootFrameExternal() const
|
|
||||||
{
|
|
||||||
return mFrameConstructor->GetRootFrame();
|
|
||||||
}
|
|
||||||
|
|
||||||
nsIFrame*
|
nsIFrame*
|
||||||
nsIPresShell::GetRootScrollFrame() const
|
nsIPresShell::GetRootScrollFrame() const
|
||||||
{
|
{
|
||||||
|
@ -9832,13 +9802,6 @@ nsIPresShell::AddRefreshObserverInternal(nsARefreshObserver* aObserver,
|
||||||
presContext->RefreshDriver()->AddRefreshObserver(aObserver, aFlushType);
|
presContext->RefreshDriver()->AddRefreshObserver(aObserver, aFlushType);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* virtual */ bool
|
|
||||||
nsIPresShell::AddRefreshObserverExternal(nsARefreshObserver* aObserver,
|
|
||||||
FlushType aFlushType)
|
|
||||||
{
|
|
||||||
return AddRefreshObserverInternal(aObserver, aFlushType);
|
|
||||||
}
|
|
||||||
|
|
||||||
bool
|
bool
|
||||||
nsIPresShell::RemoveRefreshObserverInternal(nsARefreshObserver* aObserver,
|
nsIPresShell::RemoveRefreshObserverInternal(nsARefreshObserver* aObserver,
|
||||||
FlushType aFlushType)
|
FlushType aFlushType)
|
||||||
|
@ -9848,13 +9811,6 @@ nsIPresShell::RemoveRefreshObserverInternal(nsARefreshObserver* aObserver,
|
||||||
presContext->RefreshDriver()->RemoveRefreshObserver(aObserver, aFlushType);
|
presContext->RefreshDriver()->RemoveRefreshObserver(aObserver, aFlushType);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* virtual */ bool
|
|
||||||
nsIPresShell::RemoveRefreshObserverExternal(nsARefreshObserver* aObserver,
|
|
||||||
FlushType aFlushType)
|
|
||||||
{
|
|
||||||
return RemoveRefreshObserverInternal(aObserver, aFlushType);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* virtual */ bool
|
/* virtual */ bool
|
||||||
nsIPresShell::AddPostRefreshObserver(nsAPostRefreshObserver* aObserver)
|
nsIPresShell::AddPostRefreshObserver(nsAPostRefreshObserver* aObserver)
|
||||||
{
|
{
|
||||||
|
|
|
@ -388,7 +388,6 @@ public:
|
||||||
/**
|
/**
|
||||||
* This calls through to the frame manager to get the root frame.
|
* This calls through to the frame manager to get the root frame.
|
||||||
*/
|
*/
|
||||||
virtual nsIFrame* GetRootFrameExternal() const;
|
|
||||||
nsIFrame* GetRootFrame() const {
|
nsIFrame* GetRootFrame() const {
|
||||||
return mFrameManager->GetRootFrame();
|
return mFrameManager->GetRootFrame();
|
||||||
}
|
}
|
||||||
|
@ -1155,9 +1154,7 @@ public:
|
||||||
uint32_t aFlags) = 0;
|
uint32_t aFlags) = 0;
|
||||||
|
|
||||||
void AddAutoWeakFrameInternal(AutoWeakFrame* aWeakFrame);
|
void AddAutoWeakFrameInternal(AutoWeakFrame* aWeakFrame);
|
||||||
virtual void AddAutoWeakFrameExternal(AutoWeakFrame* aWeakFrame);
|
|
||||||
void AddWeakFrameInternal(WeakFrame* aWeakFrame);
|
void AddWeakFrameInternal(WeakFrame* aWeakFrame);
|
||||||
virtual void AddWeakFrameExternal(WeakFrame* aWeakFrame);
|
|
||||||
|
|
||||||
void AddAutoWeakFrame(AutoWeakFrame* aWeakFrame)
|
void AddAutoWeakFrame(AutoWeakFrame* aWeakFrame)
|
||||||
{
|
{
|
||||||
|
@ -1169,9 +1166,7 @@ public:
|
||||||
}
|
}
|
||||||
|
|
||||||
void RemoveAutoWeakFrameInternal(AutoWeakFrame* aWeakFrame);
|
void RemoveAutoWeakFrameInternal(AutoWeakFrame* aWeakFrame);
|
||||||
virtual void RemoveAutoWeakFrameExternal(AutoWeakFrame* aWeakFrame);
|
|
||||||
void RemoveWeakFrameInternal(WeakFrame* aWeakFrame);
|
void RemoveWeakFrameInternal(WeakFrame* aWeakFrame);
|
||||||
virtual void RemoveWeakFrameExternal(WeakFrame* aWeakFrame);
|
|
||||||
|
|
||||||
void RemoveAutoWeakFrame(AutoWeakFrame* aWeakFrame)
|
void RemoveAutoWeakFrame(AutoWeakFrame* aWeakFrame)
|
||||||
{
|
{
|
||||||
|
@ -1655,12 +1650,8 @@ public:
|
||||||
* Refresh observer management.
|
* Refresh observer management.
|
||||||
*/
|
*/
|
||||||
protected:
|
protected:
|
||||||
virtual bool AddRefreshObserverExternal(nsARefreshObserver* aObserver,
|
|
||||||
mozilla::FlushType aFlushType);
|
|
||||||
bool AddRefreshObserverInternal(nsARefreshObserver* aObserver,
|
bool AddRefreshObserverInternal(nsARefreshObserver* aObserver,
|
||||||
mozilla::FlushType aFlushType);
|
mozilla::FlushType aFlushType);
|
||||||
virtual bool RemoveRefreshObserverExternal(nsARefreshObserver* aObserver,
|
|
||||||
mozilla::FlushType aFlushType);
|
|
||||||
bool RemoveRefreshObserverInternal(nsARefreshObserver* aObserver,
|
bool RemoveRefreshObserverInternal(nsARefreshObserver* aObserver,
|
||||||
mozilla::FlushType aFlushType);
|
mozilla::FlushType aFlushType);
|
||||||
|
|
||||||
|
|
|
@ -1340,12 +1340,6 @@ nsPresContext::SetImageAnimationModeInternal(uint16_t aMode)
|
||||||
mImageAnimationMode = aMode;
|
mImageAnimationMode = aMode;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
|
||||||
nsPresContext::SetImageAnimationModeExternal(uint16_t aMode)
|
|
||||||
{
|
|
||||||
SetImageAnimationModeInternal(aMode);
|
|
||||||
}
|
|
||||||
|
|
||||||
already_AddRefed<nsIAtom>
|
already_AddRefed<nsIAtom>
|
||||||
nsPresContext::GetContentLanguage() const
|
nsPresContext::GetContentLanguage() const
|
||||||
{
|
{
|
||||||
|
@ -1611,12 +1605,6 @@ nsPresContext::GetContainerWeakInternal() const
|
||||||
return static_cast<nsIDocShell*>(mContainer);
|
return static_cast<nsIDocShell*>(mContainer);
|
||||||
}
|
}
|
||||||
|
|
||||||
nsISupports*
|
|
||||||
nsPresContext::GetContainerWeakExternal() const
|
|
||||||
{
|
|
||||||
return GetContainerWeakInternal();
|
|
||||||
}
|
|
||||||
|
|
||||||
nsIDocShell*
|
nsIDocShell*
|
||||||
nsPresContext::GetDocShell() const
|
nsPresContext::GetDocShell() const
|
||||||
{
|
{
|
||||||
|
@ -1630,12 +1618,6 @@ nsPresContext::Detach()
|
||||||
SetLinkHandler(nullptr);
|
SetLinkHandler(nullptr);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool
|
|
||||||
nsPresContext::BidiEnabledExternal() const
|
|
||||||
{
|
|
||||||
return BidiEnabledInternal();
|
|
||||||
}
|
|
||||||
|
|
||||||
bool
|
bool
|
||||||
nsPresContext::BidiEnabledInternal() const
|
nsPresContext::BidiEnabledInternal() const
|
||||||
{
|
{
|
||||||
|
|
|
@ -317,7 +317,6 @@ public:
|
||||||
* Access the image animation mode for this context
|
* Access the image animation mode for this context
|
||||||
*/
|
*/
|
||||||
uint16_t ImageAnimationMode() const { return mImageAnimationMode; }
|
uint16_t ImageAnimationMode() const { return mImageAnimationMode; }
|
||||||
virtual void SetImageAnimationModeExternal(uint16_t aMode);
|
|
||||||
void SetImageAnimationModeInternal(uint16_t aMode);
|
void SetImageAnimationModeInternal(uint16_t aMode);
|
||||||
void SetImageAnimationMode(uint16_t aMode)
|
void SetImageAnimationMode(uint16_t aMode)
|
||||||
{ SetImageAnimationModeInternal(aMode); }
|
{ SetImageAnimationModeInternal(aMode); }
|
||||||
|
@ -422,7 +421,6 @@ public:
|
||||||
|
|
||||||
void SetContainer(nsIDocShell* aContainer);
|
void SetContainer(nsIDocShell* aContainer);
|
||||||
|
|
||||||
virtual nsISupports* GetContainerWeakExternal() const;
|
|
||||||
nsISupports* GetContainerWeakInternal() const;
|
nsISupports* GetContainerWeakInternal() const;
|
||||||
nsISupports* GetContainerWeak() const
|
nsISupports* GetContainerWeak() const
|
||||||
{ return GetContainerWeakInternal(); }
|
{ return GetContainerWeakInternal(); }
|
||||||
|
@ -769,7 +767,6 @@ public:
|
||||||
* @lina 07/12/2000
|
* @lina 07/12/2000
|
||||||
*/
|
*/
|
||||||
bool BidiEnabled() const { return BidiEnabledInternal(); }
|
bool BidiEnabled() const { return BidiEnabledInternal(); }
|
||||||
virtual bool BidiEnabledExternal() const;
|
|
||||||
bool BidiEnabledInternal() const;
|
bool BidiEnabledInternal() const;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Загрузка…
Ссылка в новой задаче