зеркало из https://github.com/mozilla/gecko-dev.git
Don't stop looking for converters just because the first one
failed. This will be necessary for plugin converters.
This commit is contained in:
Родитель
7d559f60cc
Коммит
52a4f7a5e8
|
@ -235,10 +235,15 @@ NET_StreamBuilder (FO_Present_Types format_out,
|
||||||
if(format_out == cs_ptr->format_out)
|
if(format_out == cs_ptr->format_out)
|
||||||
if(net_compare_mime_types(URL_s->content_type, cs_ptr->format_in))
|
if(net_compare_mime_types(URL_s->content_type, cs_ptr->format_in))
|
||||||
{
|
{
|
||||||
|
NET_StreamClass *ret_str;
|
||||||
net_ConverterElement *elem = XP_ListPeekTopObject(cs_ptr->converter_stack);
|
net_ConverterElement *elem = XP_ListPeekTopObject(cs_ptr->converter_stack);
|
||||||
PR_ASSERT(elem != (net_ConverterElement *)0);
|
PR_ASSERT(elem != (net_ConverterElement *)0);
|
||||||
return( (NET_StreamClass *) (*elem->converter) (format_out,
|
ret_str = (NET_StreamClass *) (*elem->converter) (format_out,
|
||||||
elem->data_obj, URL_s, context));
|
elem->data_obj, URL_s, context);
|
||||||
|
if (ret_str != NULL)
|
||||||
|
{
|
||||||
|
return(ret_str);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче