Prepare for JsonCpp roll in Chromium

This patch is the first of a multistep process to upgrade JsonCpp from its current legacy version to the latest version. A minor fix to how Json::Value is used is included, as well as properly pulling in the jsoncpp_config where jsoncpp is used, allowing for us to roll Chromium while Angle uses the deprecated Reader/Writer classes. After this patch is landed, the Angle dependency in Chromium can be rolled as part of rolling JsonCpp, then Angle can update to the new StreamWriter/CharReader classes. Bug: 961513 Change-Id: Idd1d61270aa0a7e4a91983b4c22a24e2fdaafe49 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1682815Reviewed-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>

Prepare for JsonCpp roll in Chromium
b5a13bec · Jordan Bayles · Commit Bot · 2afc3398 · b5a13bec · b5a13bec
Commit b5a13bec authored Jun 28, 2019 by Jordan Bayles Committed by Commit Bot Jul 02, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

BUILD.gn src/tests/BUILD.gn +2 -0

ANGLEPerfTest.cpp src/tests/perf_tests/ANGLEPerfTest.cpp +2 -2

No files found.
--- a/src/tests/BUILD.gn
+++ b/src/tests/BUILD.gn
@@ -272,6 +272,7 @@ if (is_win || is_linux || is_android || is_mac) {
    }
    configs += [
+      "${angle_jsoncpp_dir}:jsoncpp_config",
      "${angle_root}:libANGLE_config",
      "${angle_root}:library_name_config",
    ]
@@ -306,6 +307,7 @@ if (is_win || is_linux || is_android || is_mac || is_fuchsia) {
    ]
    configs += [
+      "${angle_jsoncpp_dir}:jsoncpp_config",
      "${angle_root}:libANGLE_config",
      "${angle_root}:library_name_config",
    ]

--- a/src/tests/perf_tests/ANGLEPerfTest.cpp
+++ b/src/tests/perf_tests/ANGLEPerfTest.cpp
@@ -132,8 +132,8 @@ void DumpTraceEventsToJSONFile(const std::vector<TraceEvent> &traceEvents,
        std::stringstream phaseName;
        phaseName << traceEvent.phase;
-        unsigned long long microseconds =
+        const auto microseconds =
-            static_cast<unsigned long long>(traceEvent.timestamp * 1000.0 * 1000.0);
+            static_cast<Json::LargestInt>(traceEvent.timestamp * 1000.0 * 1000.0);
        value["name"] = traceEvent.name;
        value["cat"]  = traceEvent.categoryName;