mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Merge back out of changeset b4fcd21cb6e5 (bug 553359) to try to fix tsvg_opacity regression.
This commit is contained in:
commit
c24322509e
@ -2415,12 +2415,6 @@ nsDocShell::SetItemType(PRInt32 aItemType)
|
||||
// disable auth prompting for anything but content
|
||||
mAllowAuth = mItemType == typeContent;
|
||||
|
||||
nsRefPtr<nsPresContext> presContext = nsnull;
|
||||
GetPresContext(getter_AddRefs(presContext));
|
||||
if (presContext) {
|
||||
presContext->UpdateIsChromeCache();
|
||||
}
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
@ -1335,7 +1335,6 @@ nsPresContext::SetContainer(nsISupports* aHandler)
|
||||
if (mContainer) {
|
||||
GetDocumentColorPreferences();
|
||||
}
|
||||
UpdateIsChromeCacheInternal();
|
||||
}
|
||||
|
||||
already_AddRefed<nsISupports>
|
||||
@ -1625,8 +1624,8 @@ nsPresContext::CountReflows(const char * aName, nsIFrame * aFrame)
|
||||
}
|
||||
#endif
|
||||
|
||||
void
|
||||
nsPresContext::UpdateIsChromeCacheInternal()
|
||||
PRBool
|
||||
nsPresContext::IsChrome() const
|
||||
{
|
||||
PRBool isChrome = PR_FALSE;
|
||||
nsCOMPtr<nsISupports> container = GetContainer();
|
||||
@ -1641,13 +1640,7 @@ nsPresContext::UpdateIsChromeCacheInternal()
|
||||
}
|
||||
}
|
||||
}
|
||||
mIsChrome = isChrome;
|
||||
}
|
||||
|
||||
void
|
||||
nsPresContext::UpdateIsChromeCacheExternal()
|
||||
{
|
||||
UpdateIsChromeCacheInternal();
|
||||
return isChrome;
|
||||
}
|
||||
|
||||
/* virtual */ PRBool
|
||||
|
@ -810,17 +810,7 @@ public:
|
||||
mType == eContext_PrintPreview); }
|
||||
|
||||
// Is this presentation in a chrome docshell?
|
||||
PRBool IsChrome() const { return mIsChrome; }
|
||||
|
||||
virtual void UpdateIsChromeCacheExternal();
|
||||
void UpdateIsChromeCacheInternal();
|
||||
#ifdef _IMPL_NS_LAYOUT
|
||||
void UpdateIsChromeCache()
|
||||
{ UpdateIsChromeCacheInternal(); }
|
||||
#else
|
||||
void UpdateIsChromeCache()
|
||||
{ UpdateIsChromeCacheExternal(); }
|
||||
#endif
|
||||
PRBool IsChrome() const;
|
||||
|
||||
// Public API for native theme code to get style internals.
|
||||
virtual PRBool HasAuthorSpecifiedRules(nsIFrame *aFrame, PRUint32 ruleTypeMask) const;
|
||||
@ -1125,9 +1115,6 @@ protected:
|
||||
unsigned mProcessingRestyles : 1;
|
||||
unsigned mProcessingAnimationStyleChange : 1;
|
||||
|
||||
// Cache whether we are chrome or not because it is expensive.
|
||||
unsigned mIsChrome : 1;
|
||||
|
||||
#ifdef DEBUG
|
||||
PRBool mInitialized;
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user