BASELINE: Update Chromium to 47.0.2526.14

Also adding in sources needed for spellchecking.

Change-Id: Idd44170fa1616f26315188970a8d5ba7d472b18a
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>

4 files changed, 26 insertions, 6 deletions

diff --git a/chromium/third_party/libxslt/BUILD.gn b/chromium/third_party/libxslt/BUILD.gn
index 24325b03c40..3f27c5de5e6 100644
--- a/chromium/third_party/libxslt/BUILD.gn
+++ b/chromium/third_party/libxslt/BUILD.gn
@@ -7,6 +7,19 @@ config("libxslt_config") {
   include_dirs = [ "." ]
 }
 
+config("libxslt_warnings") {
+  if (is_clang) {
+    cflags = [
+      # libxslt stores a char[3] in a `const unsigned char*`.
+      "-Wno-pointer-sign",
+
+      # xsltDefaultRegion and xsltCalibrateTimestamps are only
+      # used with certain preprocessor defines set.
+      "-Wno-unused-function",
+    ]
+  }
+}
+
 static_library("libxslt") {
   sources = [
     "libxslt/attributes.c",
@@ -60,7 +73,12 @@ static_library("libxslt") {
   ]
 
   configs -= [ "//build/config/compiler:chromium_code" ]
-  configs += [ "//build/config/compiler:no_chromium_code" ]
+  configs += [
+    "//build/config/compiler:no_chromium_code",
+
+    # Must be after no_chromium_code for warning flags to be ordered correctly.
+    ":libxslt_warnings",
+  ]
   public_configs = [ ":libxslt_config" ]
 
   cflags = []
@@ -73,10 +91,6 @@ static_library("libxslt") {
     include_dirs = [ "mac" ]
   }
 
-  if (is_clang) {
-    cflags += [ "-Wno-pointer-sign" ]
-  }
-
   deps = [
     "//third_party/libxml",
   ]
diff --git a/chromium/third_party/libxslt/README.chromium b/chromium/third_party/libxslt/README.chromium
index d0eadda741b..138e4eed582 100644
--- a/chromium/third_party/libxslt/README.chromium
+++ b/chromium/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/chromium/third_party/libxslt/libxslt.gyp b/chromium/third_party/libxslt/libxslt.gyp
index 32a570318f7..b543659b40d 100644
--- a/chromium/third_party/libxslt/libxslt.gyp
+++ b/chromium/third_party/libxslt/libxslt.gyp
@@ -114,6 +114,9 @@
             'clang_warning_flags': [
               # libxslt stores a char[3] in a `const unsigned char*`.
               '-Wno-pointer-sign',
+              # xsltDefaultRegion and xsltCalibrateTimestamps are only
+              # used with certain preprocessor defines set.
+              '-Wno-unused-function',
             ],
           },
           'conditions': [
diff --git a/chromium/third_party/libxslt/libxslt/xslt.c b/chromium/third_party/libxslt/libxslt/xslt.c
index 58d138674e5..972a38eabe1 100644
--- a/chromium/third_party/libxslt/libxslt/xslt.c
+++ b/chromium/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) &&