wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out 2 changesets (bug 841579) on a CLOSED TREE

Browse Source 
Backed out changeset d21d144e3db9 (bug 841579)
Backed out changeset 0222cb048028 (bug 841579)
This commit is contained in:
Joe Drew 2013-03-04 17:27:51 -05:00
parent 85222ec900
commit 1a859ec168
7 changed files with 11 additions and 312 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
content/base/src/nsImageLoadingContent.cpp
View File

@ -83,7 +83,6 @@ nsImageLoadingContent::nsImageLoadingContent()
mBroken(true),
mUserDisabled(false),
mSuppressed(false),
mFireEventsOnDecode(false),
mNewRequestsWillNeedAnimationReset(false),
mStateChangerDepth(0),
mCurrentRequestRegistered(false),
@ -162,20 +161,6 @@ nsImageLoadingContent::Notify(imgIRequest* aRequest,
return OnStopRequest(aRequest, status);
}
if (aType == imgINotificationObserver::DECODE_COMPLETE && mFireEventsOnDecode) {
mFireEventsOnDecode = false;
uint32_t reqStatus;
aRequest->GetImageStatus(&reqStatus);
if (reqStatus & imgIRequest::STATUS_ERROR) {
FireEvent(NS_LITERAL_STRING("error"));
} else {
FireEvent(NS_LITERAL_STRING("load"));
}
UpdateImageState(true);
}
return NS_OK;
}
@ -228,34 +213,19 @@ nsImageLoadingContent::OnStopRequest(imgIRequest* aRequest,
// XXXkhuey should this be GetOurCurrentDoc? Decoding if we're not in
// the document seems silly.
bool startedDecoding = false;
nsIDocument* doc = GetOurOwnerDoc();
nsIPresShell* shell = doc ? doc->GetShell() : nullptr;
if (shell && shell->IsVisible() &&
(!shell->DidInitialize() || shell->IsPaintingSuppressed())) {
if (NS_SUCCEEDED(mCurrentRequest->StartDecoding())) {
startedDecoding = true;
}
mCurrentRequest->StartDecoding();
}
// We want to give the decoder a chance to find errors. If we haven't found
// an error yet and we've started decoding, either from the above
// StartDecoding or from some other place, we must only fire these events
// after we finish decoding.
uint32_t reqStatus;
aRequest->GetImageStatus(&reqStatus);
if (NS_SUCCEEDED(aStatus) && !(reqStatus & imgIRequest::STATUS_ERROR) &&
(reqStatus & imgIRequest::STATUS_DECODE_STARTED ||
(startedDecoding && !(reqStatus & imgIRequest::STATUS_DECODE_COMPLETE)))) {
mFireEventsOnDecode = true;
// Fire the appropriate DOM event.
if (NS_SUCCEEDED(aStatus)) {
FireEvent(NS_LITERAL_STRING("load"));
} else {
// Fire the appropriate DOM event.
if (NS_SUCCEEDED(aStatus)) {
FireEvent(NS_LITERAL_STRING("load"));
} else {
FireEvent(NS_LITERAL_STRING("error"));
}
FireEvent(NS_LITERAL_STRING("error"));
}
nsCOMPtr<nsINode> thisNode = do_QueryInterface(static_cast<nsIImageLoadingContent*>(this));

1
content/base/src/nsImageLoadingContent.h
View File

@ -397,7 +397,6 @@ private:
bool mBroken : 1;
bool mUserDisabled : 1;
bool mSuppressed : 1;
bool mFireEventsOnDecode : 1;
protected:
/**

8
image/public/imgIRequest.idl
View File

@ -55,9 +55,6 @@ interface imgIRequest : nsIRequest
*
* STATUS_ERROR: An error occurred loading the image.
*
* STATUS_DECODE_STARTED: The decoding process has begun, but not yet
* finished.
*
* STATUS_FRAME_COMPLETE: The first frame has been
* completely decoded.
*
@ -69,9 +66,8 @@ interface imgIRequest : nsIRequest
const long STATUS_LOAD_PARTIAL = 0x2;
const long STATUS_LOAD_COMPLETE = 0x4;
const long STATUS_ERROR = 0x8;
const long STATUS_DECODE_STARTED = 0x10;
const long STATUS_FRAME_COMPLETE = 0x20;
const long STATUS_DECODE_COMPLETE = 0x40;
const long STATUS_FRAME_COMPLETE = 0x10;
const long STATUS_DECODE_COMPLETE = 0x20;
//@}
/**

15
image/src/imgStatusTracker.cpp
View File

@ -476,7 +476,6 @@ imgStatusTracker::RecordDecoded()
NS_ABORT_IF_FALSE(mImage, "RecordDecoded called before we have an Image");
mState |= stateDecodeStarted | stateDecodeStopped | stateFrameStopped;
mImageStatus |= imgIRequest::STATUS_FRAME_COMPLETE | imgIRequest::STATUS_DECODE_COMPLETE;
mImageStatus &= ~imgIRequest::STATUS_DECODE_STARTED;
}
void
@ -484,7 +483,6 @@ imgStatusTracker::RecordStartDecode()
{
NS_ABORT_IF_FALSE(mImage, "RecordStartDecode without an Image");
mState |= stateDecodeStarted;
mImageStatus |= imgIRequest::STATUS_DECODE_STARTED;
}
void
@ -552,13 +550,11 @@ imgStatusTracker::RecordStopDecode(nsresult aStatus)
"RecordStopDecode called before we have an Image");
mState |= stateDecodeStopped;
if (NS_SUCCEEDED(aStatus) && mImageStatus != imgIRequest::STATUS_ERROR) {
if (NS_SUCCEEDED(aStatus) && mImageStatus != imgIRequest::STATUS_ERROR)
mImageStatus |= imgIRequest::STATUS_DECODE_COMPLETE;
mImageStatus &= ~imgIRequest::STATUS_DECODE_STARTED;
// If we weren't successful, clear all success status bits and set error.
} else {
else
mImageStatus = imgIRequest::STATUS_ERROR;
}
}
void
@ -579,9 +575,8 @@ imgStatusTracker::RecordDiscard()
mState &= ~stateBitsToClear;
// Clear the status bits we no longer deserve.
uint32_t statusBitsToClear = imgIRequest::STATUS_DECODE_STARTED |
imgIRequest::STATUS_FRAME_COMPLETE |
imgIRequest::STATUS_DECODE_COMPLETE;
uint32_t statusBitsToClear = imgIRequest::STATUS_FRAME_COMPLETE
| imgIRequest::STATUS_DECODE_COMPLETE;
mImageStatus &= ~statusBitsToClear;
}
@ -650,8 +645,6 @@ imgStatusTracker::RecordStartRequest()
mImageStatus &= ~imgIRequest::STATUS_LOAD_PARTIAL;
mImageStatus &= ~imgIRequest::STATUS_LOAD_COMPLETE;
mImageStatus &= ~imgIRequest::STATUS_FRAME_COMPLETE;
mImageStatus &= ~imgIRequest::STATUS_DECODE_STARTED;
mImageStatus &= ~imgIRequest::STATUS_DECODE_COMPLETE;
mState &= ~stateRequestStarted;
mState &= ~stateDecodeStarted;
mState &= ~stateDecodeStopped;

7
image/test/mochitest/Makefile.in
View File

@ -101,13 +101,6 @@ MOCHITEST_CHROME_FILES = imgutils.js \
test_net_failedtoprocess.html \
invalid.jpg \
damon.jpg \
test_removal_onload.html \
test_removal_ondecode.html \
invalid.jpg \
bad.jpg \
rillybad.jpg \
red.png \
lime100x100.svg \
$(NULL)
include $(topsrcdir)/config/rules.mk

126
image/test/mochitest/test_removal_ondecode.html
View File

@ -1,126 +0,0 @@
<!DOCTYPE HTML>
<html>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=841579
-->
<head>
<title>Test for Bug 841579</title>
<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/WindowSnapshot.js"></script>
<script type="application/javascript" src="imgutils.js"></script>
<link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css" />
</head>
<body>
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=841579">Mozilla Bug 841579</a>
<p id="display"></p>
<div id="content">
</div>
<pre id="test">
<script type="application/javascript;version=1.8">
/** Test for Bug 841579**/
SimpleTest.waitForExplicitFinish();
const FAILURE_TIMEOUT = 120000; // Fail early after 120 seconds (2 minutes)
const Cc = Components.classes;
const Ci = Components.interfaces;
const gContent = document.getElementById("content");
var gImg;
var gMyDecoderObserver;
var gIsTestFinished = false;
var gFiles;
var gNotifications = 0;
var gLoads = 0;
function fileToLoad() {
yield "red.png";
yield "invalid.jpg";
yield "lime100x100.svg";
yield "bad.jpg";
yield "rillybad.jpg";
}
function onSizeAvailable(aRequest) {
ok(true, "AfterLoad.onSizeAvailable called for " + gImg.src);
}
function onLoadComplete(aRequest) {
ok(true, "AfterLoad.onLoadComplete called for " + gImg.src);
gLoads++;
}
function onDecodeComplete(aRequest) {
ok(true, "AfterLoad.onDecodeComplete called for " + gImg.src);
SimpleTest.executeSoon(function() {
try {
gContent.removeChild(gImg);
}
catch (e) {}
});
}
function failTest() {
ok(false, "timing out after " + FAILURE_TIMEOUT + "ms. " +
"currently displaying " + gImg.src);
cleanUpAndFinish();
}
function onNotification()
{
gNotifications++;
try {
gImg.src = gFiles.next();
gContent.appendChild(gImg);
} catch(e) {
cleanUpAndFinish();
}
}
function cleanUpAndFinish() {
// On the off chance that failTest and myOnStopFrame are triggered
// back-to-back, use a flag to prevent multiple calls to SimpleTest.finish.
if (gIsTestFinished) {
return;
}
let imgLoadingContent = gImg.QueryInterface(Ci.nsIImageLoadingContent);
imgLoadingContent.removeObserver(gMyDecoderObserver);
ok(gNotifications == gLoads, "Should be notified the same number of times as loads");
SimpleTest.finish();
gIsTestFinished = true;
}
function main() {
gFiles = fileToLoad();
gImg = new Image();
gImg.onload = onNotification;
gImg.onerror = onNotification;
// Create, customize & attach decoder observer
observer = new ImageDecoderObserverStub();
observer.sizeAvailable = onSizeAvailable;
observer.loadComplete = onLoadComplete;
observer.decodeComplete = onDecodeComplete;
gMyDecoderObserver =
Cc["@mozilla.org/image/tools;1"].getService(Ci.imgITools)
.createScriptedObserver(observer);
let imgLoadingContent = gImg.QueryInterface(Ci.nsIImageLoadingContent);
imgLoadingContent.addObserver(gMyDecoderObserver);
// We want to test the cold loading behavior, so clear cache in case an
// earlier test got our image in there already.
clearImageCache();
// kick off image-loading! myOnStopFrame handles the rest.
gImg.setAttribute("src", gFiles.next());
// In case something goes wrong, fail earlier than mochitest timeout,
// and with more information.
setTimeout(failTest, FAILURE_TIMEOUT);
}
window.onload = main;
</script>
</pre>
</body>
</html>

126
image/test/mochitest/test_removal_onload.html
View File

@ -1,126 +0,0 @@
<!DOCTYPE HTML>
<html>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=841579
-->
<head>
<title>Test for Bug 841579</title>
<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/WindowSnapshot.js"></script>
<script type="application/javascript" src="imgutils.js"></script>
<link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css" />
</head>
<body>
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=841579">Mozilla Bug 841579</a>
<p id="display"></p>
<div id="content">
</div>
<pre id="test">
<script type="application/javascript;version=1.8">
/** Test for Bug 841579**/
SimpleTest.waitForExplicitFinish();
const FAILURE_TIMEOUT = 120000; // Fail early after 120 seconds (2 minutes)
const Cc = Components.classes;
const Ci = Components.interfaces;
const gContent = document.getElementById("content");
var gImg;
var gMyDecoderObserver;
var gIsTestFinished = false;
var gFiles;
var gNotifications = 0;
var gLoads = 0;
function fileToLoad() {
yield "red.png";
yield "invalid.jpg";
yield "lime100x100.svg";
yield "bad.jpg";
yield "rillybad.jpg";
}
function onSizeAvailable(aRequest) {
ok(true, "AfterLoad.onSizeAvailable called for " + gImg.src);
}
function onLoadComplete(aRequest) {
ok(true, "AfterLoad.onLoadComplete called for " + gImg.src);
gLoads++;
SimpleTest.executeSoon(function() {
try {
gContent.removeChild(gImg);
}
catch (e) {}
});
}
function onDecodeComplete(aRequest) {
ok(true, "AfterLoad.onDecodeComplete called for " + gImg.src);
}
function failTest() {
ok(false, "timing out after " + FAILURE_TIMEOUT + "ms. " +
"currently displaying " + gImg.src);
cleanUpAndFinish();
}
function onNotification()
{
gNotifications++;
try {
gImg.src = gFiles.next();
gContent.appendChild(gImg);
} catch(e) {
cleanUpAndFinish();
}
}
function cleanUpAndFinish() {
// On the off chance that failTest and myOnStopFrame are triggered
// back-to-back, use a flag to prevent multiple calls to SimpleTest.finish.
if (gIsTestFinished) {
return;
}
let imgLoadingContent = gImg.QueryInterface(Ci.nsIImageLoadingContent);
imgLoadingContent.removeObserver(gMyDecoderObserver);
ok(gNotifications == gLoads, "Should be notified the same number of times as loads");
SimpleTest.finish();
gIsTestFinished = true;
}
function main() {
gFiles = fileToLoad();
gImg = new Image();
gImg.onload = onNotification;
gImg.onerror = onNotification;
// Create, customize & attach decoder observer
observer = new ImageDecoderObserverStub();
observer.sizeAvailable = onSizeAvailable;
observer.loadComplete = onLoadComplete;
observer.decodeComplete = onDecodeComplete;
gMyDecoderObserver =
Cc["@mozilla.org/image/tools;1"].getService(Ci.imgITools)
.createScriptedObserver(observer);
let imgLoadingContent = gImg.QueryInterface(Ci.nsIImageLoadingContent);
imgLoadingContent.addObserver(gMyDecoderObserver);
// We want to test the cold loading behavior, so clear cache in case an
// earlier test got our image in there already.
clearImageCache();
// kick off image-loading! myOnStopFrame handles the rest.
gImg.setAttribute("src", gFiles.next());
// In case something goes wrong, fail earlier than mochitest timeout,
// and with more information.
setTimeout(failTest, FAILURE_TIMEOUT);
}
window.onload = main;
</script>
</pre>
</body>
</html>