diff options
| author | scottmg <scottmg@chromium.org> | 2015-09-16 12:52:09 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-16 19:53:26 +0000 |
| commit | 2ef6a940f303d1af0c46f5e4d07cfce8cbe0c9f4 (patch) | |
| tree | 37a5ae78223dc532dbc92cba754306b61f1c2069 /third_party | |
| parent | cf78ded8ae7f64968789c3bac48ea6e69df08d29 (diff) | |
| download | chromium_src-2ef6a940f303d1af0c46f5e4d07cfce8cbe0c9f4.zip chromium_src-2ef6a940f303d1af0c46f5e4d07cfce8cbe0c9f4.tar.gz chromium_src-2ef6a940f303d1af0c46f5e4d07cfce8cbe0c9f4.tar.bz2 | |
Cherry-pick xslt linebreak fix
We're currently using libxslt-1.1.28 which is the most recent tagged
version. Cherry-pick this fix that's not yet released, identified by
git bisect, and confirmed that it fixes the bug in Blink.
Added layout test in Blink to be landed after this lands here:
https://codereview.chromium.org/1344243002
R=thakis@chromium.org
BUG=530587, 463958, 502468
Review URL: https://codereview.chromium.org/1347873002
Cr-Commit-Position: refs/heads/master@{#349196}
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/libxslt/README.chromium | 3 | ||||
| -rw-r--r-- | third_party/libxslt/libxslt/xslt.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/third_party/libxslt/README.chromium b/third_party/libxslt/README.chromium index d0eadda..138e4ee 100644 --- a/third_party/libxslt/README.chromium +++ b/third_party/libxslt/README.chromium @@ -12,6 +12,9 @@ libxslt from libxml.org. Modifications: - GetFileAttributes -> GetFileAttributesA in libxslt\security.c +- Cherry-pick + https://git.gnome.org/browse/libxslt/commit/?id=7cb08dacadf7e1cf88ee2f45815251b61bffcde6 + to fix http://crbug.com/530587. To import a new version: diff --git a/third_party/libxslt/libxslt/xslt.c b/third_party/libxslt/libxslt/xslt.c index 58d1386..972a38e 100644 --- a/third_party/libxslt/libxslt/xslt.c +++ b/third_party/libxslt/libxslt/xslt.c @@ -3553,7 +3553,7 @@ xsltPrecomputeStylesheet(xsltStylesheetPtr style, xmlNodePtr cur) } } else if (cur->type == XML_TEXT_NODE) { if (IS_BLANK_NODE(cur)) { - if (xmlNodeGetSpacePreserve(cur) != 1) { + if (xmlNodeGetSpacePreserve(cur->parent) != 1) { deleteNode = cur; } } else if ((cur->content != NULL) && (internalize) && |