Bug 614392: Use [noscript, notxpcom] instead of "%{C++" for convenience method imgIContainer::GetType. r=joe sr=bz a=blocking-beta9+

This commit is contained in:
Daniel Holbert 2010-12-07 10:38:21 -08:00
parent d6b50ba309
commit 0ade119807
3 changed files with 47 additions and 4 deletions

View File

@ -106,10 +106,7 @@ interface imgIContainer : nsISupports
/**
* Direct C++ accessor for 'type' attribute, for convenience.
*/
%{C++
virtual PRUint16 GetType() = 0;
%}
[noscript, notxpcom] PRUint16 GetType();
/**
* Whether this image is animated. You can only be guaranteed that querying

View File

@ -73,6 +73,7 @@ _TEST_FILES = imgutils.js \
bug497665.sjs \
test_bug553982.html \
test_bug601470.html \
test_bug614392.html \
$(NULL)
# Tests disabled due to intermittent orange

View File

@ -0,0 +1,45 @@
<!DOCTYPE HTML>
<html>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=614392
-->
<head>
<title>Test for Bug 614392</title>
<script type="application/javascript" src="/MochiKit/packed.js"></script>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
</head>
<body>
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=614392">Mozilla Bug 614392</a>
<p id="display"></p>
<div id="content" style="display: none">
<img src="damon.jpg">
</div>
<pre id="test">
<script type="application/javascript">
/** Test for Bug 614392**/
SimpleTest.waitForExplicitFinish();
window.onload = function() {
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
var img = document.getElementsByTagName("img")[0];
var container = img
.QueryInterface(Components.interfaces.nsIImageLoadingContent)
.getRequest(Components.interfaces.nsIImageLoadingContent.CURRENT_REQUEST)
.image;
container.animationMode =
Components.interfaces.imgIContainer.kDontAnimMode;
is(container.animationMode,
Components.interfaces.imgIContainer.kDontAnimMode,
"yay, our animationMode tweak took effect (and we didn't crash!)");
SimpleTest.finish();
}
</script>
</pre>
</body>
</html>