Line
Link Here
|
0 |
-- /config.tests/xml2/xml2.cpp |
0 |
++ /config.tests/xml2/xml2.cpp |
Lines 27-35
Link Here
|
27 |
****************************************************************************/ |
27 |
****************************************************************************/ |
28 |
|
28 |
|
29 |
#include <libxml/xmlversion.h> |
29 |
#include <libxml/xmlversion.h> |
30 |
#if defined(LIBXML_CATALOG_ENABLED) |
|
|
31 |
#error "libxml catalog enabled" |
32 |
#endif |
33 |
#if !defined(LIBXML_ICU_ENABLED) |
30 |
#if !defined(LIBXML_ICU_ENABLED) |
34 |
#error "libxml icu not enabled" |
31 |
#error "libxml icu not enabled" |
35 |
#endif |
32 |
#endif |
36 |
-- /src/3rdparty/chromium/third_party/WebKit/Source/core/xml/parser/XMLDocumentParser.cpp |
33 |
++ /src/3rdparty/chromium/third_party/WebKit/Source/core/xml/parser/XMLDocumentParser.cpp |
Lines 28-33
Link Here
|
28 |
|
28 |
|
29 |
#include <libxml/parser.h> |
29 |
#include <libxml/parser.h> |
30 |
#include <libxml/parserInternals.h> |
30 |
#include <libxml/parserInternals.h> |
|
|
31 |
#include <libxml/xmlversion.h> |
32 |
#if defined(LIBXML_CATALOG_ENABLED) |
33 |
#include <libxml/catalog.h> |
34 |
#endif |
31 |
#include <libxslt/xslt.h> |
35 |
#include <libxslt/xslt.h> |
32 |
#include <memory> |
36 |
#include <memory> |
33 |
#include "core/css/StyleEngine.h" |
37 |
#include "core/css/StyleEngine.h" |
Lines 538-547
Link Here
|
538 |
static bool ShouldAllowExternalLoad(const KURL& url) { |
542 |
static bool ShouldAllowExternalLoad(const KURL& url) { |
539 |
String url_string = url.GetString(); |
543 |
String url_string = url.GetString(); |
540 |
|
544 |
|
541 |
// libxml should not be configured with catalogs enabled, so it |
|
|
542 |
// should not be asking to load default catalogs. |
543 |
CHECK(!IsLibxmlDefaultCatalogFile(url)); |
544 |
|
545 |
// The most common DTD. There isn't much point in hammering www.w3c.org by |
545 |
// The most common DTD. There isn't much point in hammering www.w3c.org by |
546 |
// requesting this URL for every XHTML document. |
546 |
// requesting this URL for every XHTML document. |
547 |
if (url_string.StartsWithIgnoringASCIICase("http://www.w3.org/TR/xhtml")) |
547 |
if (url_string.StartsWithIgnoringASCIICase("http://www.w3.org/TR/xhtml")) |
Lines 646-651
Link Here
|
646 |
if (did_init) |
646 |
if (did_init) |
647 |
return; |
647 |
return; |
648 |
|
648 |
|
|
|
649 |
#if defined(LIBXML_CATALOG_ENABLED) |
650 |
xmlCatalogSetDefaults(XML_CATA_ALLOW_NONE); |
651 |
#endif |
649 |
xmlInitParser(); |
652 |
xmlInitParser(); |
650 |
xmlRegisterInputCallbacks(MatchFunc, OpenFunc, ReadFunc, CloseFunc); |
653 |
xmlRegisterInputCallbacks(MatchFunc, OpenFunc, ReadFunc, CloseFunc); |
651 |
xmlRegisterOutputCallbacks(MatchFunc, OpenFunc, WriteFunc, CloseFunc); |
654 |
xmlRegisterOutputCallbacks(MatchFunc, OpenFunc, WriteFunc, CloseFunc); |