зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1290214 - Stop asserting when we don't have enough information to use the servo backend. r=emilio
In practice I'm pretty sure these cases wouldn't have a content docshell anyway. We probably don't need more robust machinery here, since eventually we'll just make stylo pref-based for every new prescontext regardless of type.
This commit is contained in:
Родитель
97868e2577
Коммит
b92154b20a
|
@ -13439,6 +13439,10 @@ nsIDocument::UpdateStyleBackendType()
|
|||
{
|
||||
MOZ_ASSERT(mStyleBackendType == StyleBackendType(0),
|
||||
"no need to call UpdateStyleBackendType now");
|
||||
|
||||
// Assume Gecko by default.
|
||||
mStyleBackendType = StyleBackendType::Gecko;
|
||||
|
||||
#ifdef MOZ_STYLO
|
||||
// XXX For now we use a Servo-backed style set only for (X)HTML documents
|
||||
// in content docshells. This should let us avoid implementing XUL-specific
|
||||
|
@ -13447,15 +13451,11 @@ nsIDocument::UpdateStyleBackendType()
|
|||
// document before we have a pres shell (i.e. before we make the decision
|
||||
// here about whether to use a Gecko- or Servo-backed style system), so
|
||||
// we avoid Servo-backed style sets for SVG documents.
|
||||
NS_ASSERTION(mDocumentContainer, "stylo: calling UpdateStyleBackendType "
|
||||
"before we have a docshell");
|
||||
mStyleBackendType =
|
||||
nsLayoutUtils::SupportsServoStyleBackend(this) &&
|
||||
mDocumentContainer ?
|
||||
StyleBackendType::Servo :
|
||||
StyleBackendType::Gecko;
|
||||
#else
|
||||
mStyleBackendType = StyleBackendType::Gecko;
|
||||
if (!mDocumentContainer) {
|
||||
NS_WARNING("stylo: No docshell yet, assuming Gecko style system");
|
||||
} else if (nsLayoutUtils::SupportsServoStyleBackend(this)) {
|
||||
mStyleBackendType = StyleBackendType::Servo;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче