summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-03 21:44:45 +0000
committercevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-03 21:44:45 +0000
commit1e53f1bed6e58dcfe871a2a1b0626776cc22a873 (patch)
treee9300d769bfec7920887ac73b8af8695aef8d98b
parentc977df39e13461bf38ac3834e90f72742d6fd111 (diff)
downloadchromium_src-1e53f1bed6e58dcfe871a2a1b0626776cc22a873.zip
chromium_src-1e53f1bed6e58dcfe871a2a1b0626776cc22a873.tar.gz
chromium_src-1e53f1bed6e58dcfe871a2a1b0626776cc22a873.tar.bz2
Fix namespace vs. node type issue in a generic way.
BUG=138673 Review URL: https://chromiumcodereview.appspot.com/10824157 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149930 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--third_party/libxml/README.chromium2
-rw-r--r--third_party/libxml/src/include/libxml/tree.h1
2 files changed, 3 insertions, 0 deletions
diff --git a/third_party/libxml/README.chromium b/third_party/libxml/README.chromium
index dde991b..d103977 100644
--- a/third_party/libxml/README.chromium
+++ b/third_party/libxml/README.chromium
@@ -28,6 +28,8 @@ Modifications:
- Add a fix for proper escaping of xpointer expressions, commit upstream is pending.
- Add helper classes in chromium/libxml_utils.cc and chromium/include/libxml/libxml_utils.h.
- Add a tweak to limit problems caused by excessive strings and buffers.
+- Change the xmlNs struct a little bit, so it looks like it has no children
+if treated as a generic xmlNode object.
To import a new snapshot of libxml:
diff --git a/third_party/libxml/src/include/libxml/tree.h b/third_party/libxml/src/include/libxml/tree.h
index b733589..8d93cba 100644
--- a/third_party/libxml/src/include/libxml/tree.h
+++ b/third_party/libxml/src/include/libxml/tree.h
@@ -351,6 +351,7 @@ struct _xmlNs {
struct _xmlNs *next; /* next Ns link for this node */
xmlNsType type; /* global or local */
const xmlChar *href; /* URL for the namespace */
+ const char* dummy_children; /* lines up with node->children */
const xmlChar *prefix; /* prefix for the namespace */
void *_private; /* application data */
struct _xmlDoc *context; /* normally an xmlDoc */