Bug 1125391 - Re-enable bug 931668 optimizations. r=dbaron

This commit is contained in:
Cameron McCormack 2015-02-18 09:28:53 +11:00
Родитель 372a8a591d
Коммит c11c432b20
1 изменённых файлов: 2 добавлений и 4 удалений

Просмотреть файл

@ -3025,7 +3025,7 @@ ElementRestyler::RestyleSelf(nsIFrame* aSelf,
RestyleResult result; RestyleResult result;
if (aRestyleHint || true /* XXX bug 1092363 */) { if (aRestyleHint) {
result = eRestyleResult_Continue; result = eRestyleResult_Continue;
} else { } else {
result = ComputeRestyleResultFromFrame(aSelf); result = ComputeRestyleResultFromFrame(aSelf);
@ -3316,9 +3316,7 @@ ElementRestyler::RestyleSelf(nsIFrame* aSelf,
// previous continuation, so newContext == oldContext. // previous continuation, so newContext == oldContext.
if (result != eRestyleResult_Stop) { if (result != eRestyleResult_Stop) {
if (true) { if (copyFromContinuation) {
// XXX bug 1092363
} else if (copyFromContinuation) {
LOG_RESTYLE("not swapping style structs, since we copied from a " LOG_RESTYLE("not swapping style structs, since we copied from a "
"continuation"); "continuation");
} else if (oldContext->IsShared() && newContext->IsShared()) { } else if (oldContext->IsShared() && newContext->IsShared()) {