From af6588f8d723931a298c995fa97259bb7f7deb55 Mon Sep 17 00:00:00 2001
From: Zeno Albisser <zeno.albisser@theqtcompany.com>
Date: Fri, 5 Dec 2014 15:04:29 +0100
Subject: BASELINE: Update chromium to 40.0.2214.28 and ninja to 1.5.3.

Change-Id: I759465284fd64d59ad120219cbe257f7402c4181
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
---
 chromium/third_party/jsoncpp/BUILD.gn                          |  2 +-
 chromium/third_party/jsoncpp/README.chromium                   |  6 +++++-
 .../third_party/jsoncpp/overrides/src/lib_json/json_reader.cpp | 10 +---------
 3 files changed, 7 insertions(+), 11 deletions(-)

(limited to 'chromium/third_party/jsoncpp')

diff --git a/chromium/third_party/jsoncpp/BUILD.gn b/chromium/third_party/jsoncpp/BUILD.gn
index 0e788115c5c..55189e7132b 100644
--- a/chromium/third_party/jsoncpp/BUILD.gn
+++ b/chromium/third_party/jsoncpp/BUILD.gn
@@ -27,7 +27,7 @@ source_set("jsoncpp") {
     "source/src/lib_json/json_writer.cpp",
   ]
 
-  direct_dependent_configs = [ ":jsoncpp_config" ]
+  public_configs = [ ":jsoncpp_config" ]
 
   defines = [
     "JSON_USE_EXCEPTION=0",
diff --git a/chromium/third_party/jsoncpp/README.chromium b/chromium/third_party/jsoncpp/README.chromium
index c2cb7d54a82..f632079fdd1 100644
--- a/chromium/third_party/jsoncpp/README.chromium
+++ b/chromium/third_party/jsoncpp/README.chromium
@@ -6,5 +6,9 @@ License File: LICENSE
 Security Critical: yes
 
 Description:
-The libjingle/webrtc/liblouis_nacl uses jsoncpp for signaling message serialization and deserialization.
+The libjingle/webrtc/liblouis_nacl uses jsoncpp for signaling message
+serialization and deserialization.
 
+Local modifications:
+The overrides are used to eliminate static initializers in json_value.cpp and
+json_reader.cpp adds includes for <string> and <istream> to build on libc++.
diff --git a/chromium/third_party/jsoncpp/overrides/src/lib_json/json_reader.cpp b/chromium/third_party/jsoncpp/overrides/src/lib_json/json_reader.cpp
index 1bc7429993b..f8cfad70510 100644
--- a/chromium/third_party/jsoncpp/overrides/src/lib_json/json_reader.cpp
+++ b/chromium/third_party/jsoncpp/overrides/src/lib_json/json_reader.cpp
@@ -14,16 +14,8 @@
 #include <cassert>
 #include <cstring>
 #include <stdexcept>
-#ifdef __pnacl__
-// This file uses the following headers (at least in Reader::parse), but
-// the upstream version doesn't include them because iostream pulls in
-// static initializers.  This breaks the PNaCl build because it uses
-// libc++ which declares getline in <string> (as per the C++ standard)
-// but defines it in <iostream>. The code therefore fails linking, which
-// these includes fix.
 #include <string>
-#include <iostream>
-#endif
+#include <istream>
 
 #if _MSC_VER >= 1400 // VC++ 8.0
 #pragma warning( disable : 4996 )   // disable warning about strdup being deprecated.
-- 
cgit v1.2.1