mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-10 20:05:49 +00:00
Backout changeset b59fde84e97f (bug 539356) because of performance and correctness regressions
This commit is contained in:
parent
8538d26c24
commit
8861f4f48e
@ -864,21 +864,6 @@ nsImageFrame::Reflow(nsPresContext* aPresContext,
|
||||
}
|
||||
|
||||
aMetrics.SetOverflowAreasToDesiredBounds();
|
||||
nsEventStates contentState = mContent->AsElement()->State();
|
||||
bool imageOK = IMAGE_OK(contentState, true);
|
||||
|
||||
// Determine if the size is available
|
||||
bool haveSize = false;
|
||||
if (loadStatus & imgIRequest::STATUS_SIZE_AVAILABLE) {
|
||||
haveSize = true;
|
||||
}
|
||||
|
||||
if (!imageOK || !haveSize) {
|
||||
nsRect altFeedbackSize(0, 0,
|
||||
2*(nsPresContext::CSSPixelsToAppUnits(ICON_SIZE+ICON_PADDING+ALT_BORDER_WIDTH)),
|
||||
2*(nsPresContext::CSSPixelsToAppUnits(ICON_SIZE+ICON_PADDING+ALT_BORDER_WIDTH)));
|
||||
aMetrics.mOverflowAreas.UnionAllWith(altFeedbackSize);
|
||||
}
|
||||
FinishAndStoreOverflow(&aMetrics);
|
||||
|
||||
NS_FRAME_TRACE(NS_FRAME_TRACE_CALLS,
|
||||
|
@ -2,12 +2,11 @@
|
||||
<html class="reftest-wait">
|
||||
<head>
|
||||
<script>
|
||||
function doTest() {
|
||||
window.onload = function() {
|
||||
window.frames[0].document.body.innerHTML =
|
||||
"<img src='passouter.png' " +
|
||||
"onload='window.parent.document.documentElement.className = ""'>";
|
||||
}
|
||||
document.addEventListener("MozReftestInvalidate", doTest, false);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
|
@ -2,12 +2,11 @@
|
||||
<html class="reftest-wait">
|
||||
<head>
|
||||
<script>
|
||||
function doTest() {
|
||||
window.onload = function() {
|
||||
window.frames[0].document.body.innerHTML =
|
||||
"<img src='passouter.png' " +
|
||||
"onload='window.parent.document.documentElement.className = ""'>";
|
||||
}
|
||||
document.addEventListener("MozReftestInvalidate", doTest, false);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
|
@ -2,7 +2,7 @@
|
||||
<html class="reftest-wait">
|
||||
<head>
|
||||
<script>
|
||||
function doTest() {
|
||||
window.onload = function() {
|
||||
window.frames[0].location =
|
||||
'javascript:document.write(""); document.close(); ' +
|
||||
'parent.continueTest();'
|
||||
@ -16,7 +16,6 @@
|
||||
"onload='window.parent.document.documentElement.className = ""'>";
|
||||
}, 0);
|
||||
}
|
||||
document.addEventListener("MozReftestInvalidate", doTest, false);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
|
@ -2,7 +2,7 @@
|
||||
<html class="reftest-wait">
|
||||
<head>
|
||||
<script>
|
||||
function doTest() {
|
||||
window.onload = function() {
|
||||
window.frames[0].location =
|
||||
'javascript:document.write(""); document.close(); ' +
|
||||
'parent.continueTest();'
|
||||
@ -16,7 +16,6 @@
|
||||
"onload='window.parent.document.documentElement.className = ""'>";
|
||||
}, 0);
|
||||
}
|
||||
document.addEventListener("MozReftestInvalidate", doTest, false);
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
|
Loading…
Reference in New Issue
Block a user