mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-10 11:55:49 +00:00
Backed out changeset 3f5093da5ab2 because of Md2 leaks
This commit is contained in:
parent
5bf6b59abb
commit
54d2ce8abd
@ -191,13 +191,10 @@ private:
|
|||||||
|
|
||||||
static nsresult
|
static nsresult
|
||||||
LookupFunction(const char *aContractID, nsIAtom* aName, nsIID &aIID,
|
LookupFunction(const char *aContractID, nsIAtom* aName, nsIID &aIID,
|
||||||
PRUint16 &aMethodIndex, nsISupports **aHelper)
|
PRUint16 &aMethodIndex)
|
||||||
{
|
{
|
||||||
nsresult rv;
|
nsresult rv;
|
||||||
nsCOMPtr<nsISupports> helper = do_GetService(aContractID, &rv);
|
nsCOMPtr<nsIClassInfo> classInfo = do_GetClassObject(aContractID, &rv);
|
||||||
NS_ENSURE_SUCCESS(rv, rv);
|
|
||||||
|
|
||||||
nsCOMPtr<nsIClassInfo> classInfo = do_QueryInterface(helper, &rv);
|
|
||||||
NS_ENSURE_SUCCESS(rv, rv);
|
NS_ENSURE_SUCCESS(rv, rv);
|
||||||
|
|
||||||
nsCOMPtr<nsIInterfaceInfoManager> iim =
|
nsCOMPtr<nsIInterfaceInfoManager> iim =
|
||||||
@ -255,7 +252,8 @@ LookupFunction(const char *aContractID, nsIAtom* aName, nsIID &aIID,
|
|||||||
|
|
||||||
aIID = *iid;
|
aIID = *iid;
|
||||||
aMethodIndex = methodIndex;
|
aMethodIndex = methodIndex;
|
||||||
return helper->QueryInterface(aIID, (void**)aHelper);
|
|
||||||
|
return NS_OK;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -270,10 +268,11 @@ TX_ResolveFunctionCallXPCOM(const nsCString &aContractID, PRInt32 aNamespaceID,
|
|||||||
{
|
{
|
||||||
nsIID iid;
|
nsIID iid;
|
||||||
PRUint16 methodIndex;
|
PRUint16 methodIndex;
|
||||||
nsCOMPtr<nsISupports> helper;
|
nsresult rv = LookupFunction(aContractID.get(), aName, iid, methodIndex);
|
||||||
|
NS_ENSURE_SUCCESS(rv, rv);
|
||||||
|
|
||||||
nsresult rv = LookupFunction(aContractID.get(), aName, iid, methodIndex,
|
nsCOMPtr<nsISupports> helper;
|
||||||
getter_AddRefs(helper));
|
rv = CallGetService(aContractID.get(), iid, getter_AddRefs(helper));
|
||||||
NS_ENSURE_SUCCESS(rv, rv);
|
NS_ENSURE_SUCCESS(rv, rv);
|
||||||
|
|
||||||
if (!aFunction) {
|
if (!aFunction) {
|
||||||
|
@ -50,31 +50,22 @@ function txEXSLTRegExFunctions()
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var SingletonInstance = null;
|
||||||
|
|
||||||
txEXSLTRegExFunctions.prototype = {
|
txEXSLTRegExFunctions.prototype = {
|
||||||
classID: EXSLT_REGEXP_CID,
|
classID: Components.ID("{18a03189-067b-4978-b4f1-bafe35292ed6}"),
|
||||||
|
|
||||||
QueryInterface: XPCOMUtils.generateQI([Ci.txIEXSLTRegExFunctions,
|
QueryInterface: function(iid) {
|
||||||
Ci.nsIClassInfo]),
|
if (iid.equals(Ci.nsISupports) ||
|
||||||
|
iid.equals(Ci.txIEXSLTRegExFunctions))
|
||||||
|
return this;
|
||||||
|
|
||||||
// nsIClassInfo
|
if (iid.equals(Ci.nsIClassInfo))
|
||||||
getInterfaces: function(countRef) {
|
return txEXSLTRegExModule.factory
|
||||||
var interfaces = [
|
|
||||||
Ci.txIEXSLTRegExFunctions
|
|
||||||
];
|
|
||||||
countRef.value = interfaces.length;
|
|
||||||
|
|
||||||
return interfaces;
|
throw Components.results.NS_ERROR_NO_INTERFACE;
|
||||||
},
|
},
|
||||||
|
|
||||||
getHelperForLanguage: function(language) {
|
|
||||||
return null;
|
|
||||||
},
|
|
||||||
|
|
||||||
implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
|
|
||||||
flags: 0,
|
|
||||||
|
|
||||||
|
|
||||||
// txIEXSLTRegExFunctions
|
|
||||||
match: function(context, str, regex, flags) {
|
match: function(context, str, regex, flags) {
|
||||||
var nodeset = Components.classes[NODESET_CONTRACTID]
|
var nodeset = Components.classes[NODESET_CONTRACTID]
|
||||||
.createInstance(Ci.txINodeSet);
|
.createInstance(Ci.txINodeSet);
|
||||||
@ -110,6 +101,38 @@ txEXSLTRegExFunctions.prototype = {
|
|||||||
var re = new RegExp(regex, flags);
|
var re = new RegExp(regex, flags);
|
||||||
|
|
||||||
return re.test(str);
|
return re.test(str);
|
||||||
|
},
|
||||||
|
|
||||||
|
_xpcom_factory: {
|
||||||
|
QueryInterface: XPCOMUtils.generateQI([Ci.nsIFactory,
|
||||||
|
Ci.nsIClassInfo]),
|
||||||
|
|
||||||
|
createInstance: function(outer, iid) {
|
||||||
|
if (outer != null)
|
||||||
|
throw Components.results.NS_ERROR_NO_AGGREGATION;
|
||||||
|
|
||||||
|
if (SingletonInstance == null)
|
||||||
|
SingletonInstance = new txEXSLTRegExFunctions();
|
||||||
|
|
||||||
|
return SingletonInstance.QueryInterface(iid);
|
||||||
|
},
|
||||||
|
|
||||||
|
getInterfaces: function(countRef) {
|
||||||
|
var interfaces = [
|
||||||
|
Ci.txIEXSLTRegExFunctions
|
||||||
|
];
|
||||||
|
countRef.value = interfaces.length;
|
||||||
|
|
||||||
|
return interfaces;
|
||||||
|
},
|
||||||
|
|
||||||
|
getHelperForLanguage: function(language) {
|
||||||
|
return null;
|
||||||
|
},
|
||||||
|
|
||||||
|
classID: EXSLT_REGEXP_CID,
|
||||||
|
implementationLanguage: Ci.nsIProgrammingLanguage.JAVASCRIPT,
|
||||||
|
flags: Ci.nsIClassInfo.SINGLETON
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -52,7 +52,6 @@ _TEST_FILES = test_bug319374.xhtml \
|
|||||||
test_bug511487.html \
|
test_bug511487.html \
|
||||||
test_bug551412.html \
|
test_bug551412.html \
|
||||||
test_bug551654.html \
|
test_bug551654.html \
|
||||||
test_exslt_regex.html \
|
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
libs:: $(_TEST_FILES)
|
libs:: $(_TEST_FILES)
|
||||||
|
@ -1,61 +0,0 @@
|
|||||||
<!DOCTYPE HTML>
|
|
||||||
<html>
|
|
||||||
<!--
|
|
||||||
Test EXSLT Regular Expression Extension
|
|
||||||
http://www.exslt.org/regexp/index.html
|
|
||||||
-->
|
|
||||||
<head>
|
|
||||||
<title>Test for EXSLT Regular Expression Extensions</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>
|
|
||||||
<p id="display"></p>
|
|
||||||
<div id="content" style="display: none"></div>
|
|
||||||
<pre id="test">
|
|
||||||
<script type="application/javascript">
|
|
||||||
var tests = [
|
|
||||||
{ descr: "Testing regexp:test",
|
|
||||||
expr: "regexp:test('XSLT is great', 'XSLT', '')",
|
|
||||||
expResult: "true" },
|
|
||||||
|
|
||||||
{ descr: "Testing regexp:match",
|
|
||||||
expr: "regexp:match('XSLT is great', 'XSL.', '')[1]",
|
|
||||||
expResult: "XSLT" },
|
|
||||||
|
|
||||||
{ descr: "Testing regexp:replace",
|
|
||||||
expr: "regexp:replace('Food is great', 'Fo.d', '', 'XSLT')",
|
|
||||||
expResult: "XSLT is great" }
|
|
||||||
];
|
|
||||||
|
|
||||||
for each(test in tests) {
|
|
||||||
var style =
|
|
||||||
'<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" ' +
|
|
||||||
'xmlns:regexp="http://exslt.org/regular-expressions" '+
|
|
||||||
'version="1.0">' +
|
|
||||||
'<xsl:output method="html"/>' +
|
|
||||||
'<xsl:template match="/">' +
|
|
||||||
'<xsl:value-of select="'+test.expr+'" /> ' +
|
|
||||||
'</xsl:template>' +
|
|
||||||
'</xsl:stylesheet>';
|
|
||||||
var styleDoc = new DOMParser().parseFromString (style, "text/xml");
|
|
||||||
|
|
||||||
var data = '<root/>';
|
|
||||||
var originalDoc = new DOMParser().parseFromString(data, "text/xml");
|
|
||||||
|
|
||||||
var processor = new XSLTProcessor();
|
|
||||||
processor.importStylesheet(styleDoc);
|
|
||||||
|
|
||||||
var fragment = processor.transformToFragment(originalDoc, document);
|
|
||||||
var content = document.getElementById("content");
|
|
||||||
content.appendChild(fragment);
|
|
||||||
is(content.innerHTML, test.expResult, test.descr);
|
|
||||||
|
|
||||||
content.innerHTML = '';
|
|
||||||
}
|
|
||||||
|
|
||||||
</script>
|
|
||||||
</pre>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
Loading…
Reference in New Issue
Block a user