зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1292281: Convert the error from nsPresContext::HasAuthorSpecifiedRules in a warning in nsRuleNode. r=bholley
MozReview-Commit-ID: 7ue0MYP3Jdb Signed-off-by: Emilio Cobos Álvarez <ecoal95@gmail.com>
This commit is contained in:
Родитель
8c13a9fd49
Коммит
9d37bfeecc
|
@ -2040,12 +2040,6 @@ nsPresContext::UpdateIsChrome()
|
|||
nsPresContext::HasAuthorSpecifiedRules(const nsIFrame *aFrame,
|
||||
uint32_t ruleTypeMask) const
|
||||
{
|
||||
#ifdef MOZ_STYLO
|
||||
if (!mShell || mShell->StyleSet()->IsServo()) {
|
||||
NS_ERROR("stylo: nsPresContext::HasAuthorSpecifiedRules not implemented");
|
||||
return true;
|
||||
}
|
||||
#endif
|
||||
return
|
||||
nsRuleNode::HasAuthorSpecifiedRules(aFrame->StyleContext(),
|
||||
ruleTypeMask,
|
||||
|
|
|
@ -10394,6 +10394,13 @@ nsRuleNode::HasAuthorSpecifiedRules(nsStyleContext* aStyleContext,
|
|||
uint32_t ruleTypeMask,
|
||||
bool aAuthorColorsAllowed)
|
||||
{
|
||||
#ifdef MOZ_STYLO
|
||||
if (aStyleContext->StyleSource().IsServoComputedValues()) {
|
||||
NS_WARNING("stylo: nsRuleNode::HasAuthorSpecifiedRules not implemented");
|
||||
return true;
|
||||
}
|
||||
#endif
|
||||
|
||||
uint32_t inheritBits = 0;
|
||||
if (ruleTypeMask & NS_AUTHOR_SPECIFIED_BACKGROUND)
|
||||
inheritBits |= NS_STYLE_INHERIT_BIT(Background);
|
||||
|
|
Загрузка…
Ссылка в новой задаче