From 385fcd52a0285dcd6008b823d4be303a4c864046 Mon Sep 17 00:00:00 2001
From: zmiao <miao.zhao@mapbox.com>
Date: Wed, 19 Feb 2020 14:22:38 +0200
Subject: [PATCH] [test-runner] Add new metrics

---
 .../within/paint-line/metrics.json            | 35 +++++++++++++++++++
 .../within/paint-line/metrics.json            | 35 +++++++++++++++++++
 .../within/paint-line/metrics.json            | 35 +++++++++++++++++++
 .../within/paint-line/metrics.json            | 35 +++++++++++++++++++
 src/mbgl/style/expression/within.cpp          |  2 +-
 5 files changed, 141 insertions(+), 1 deletion(-)
 create mode 100644 metrics/android-render-test-runner/render-tests/within/paint-line/metrics.json
 create mode 100644 metrics/ios-render-test-runner/render-tests/within/paint-line/metrics.json
 create mode 100644 metrics/linux-clang8-release/render-tests/within/paint-line/metrics.json
 create mode 100644 metrics/linux-gcc8-release/render-tests/within/paint-line/metrics.json

diff --git a/metrics/android-render-test-runner/render-tests/within/paint-line/metrics.json b/metrics/android-render-test-runner/render-tests/within/paint-line/metrics.json
new file mode 100644
index 000000000..c32db503c
--- /dev/null
+++ b/metrics/android-render-test-runner/render-tests/within/paint-line/metrics.json
@@ -0,0 +1,35 @@
+{
+    "network": [
+        [
+            "probeNetwork - default - end",
+            0,
+            0
+        ],
+        [
+            "probeNetwork - default - start",
+            0,
+            0
+        ]
+    ],
+    "gfx": [
+        [
+            "probeGFX - default - end",
+            5,
+            4,
+            13,
+            1,
+            [
+                49152,
+                49152
+            ],
+            [
+                286,
+                286
+            ],
+            [
+                528,
+                528
+            ]
+        ]
+    ]
+}
\ No newline at end of file
diff --git a/metrics/ios-render-test-runner/render-tests/within/paint-line/metrics.json b/metrics/ios-render-test-runner/render-tests/within/paint-line/metrics.json
new file mode 100644
index 000000000..c32db503c
--- /dev/null
+++ b/metrics/ios-render-test-runner/render-tests/within/paint-line/metrics.json
@@ -0,0 +1,35 @@
+{
+    "network": [
+        [
+            "probeNetwork - default - end",
+            0,
+            0
+        ],
+        [
+            "probeNetwork - default - start",
+            0,
+            0
+        ]
+    ],
+    "gfx": [
+        [
+            "probeGFX - default - end",
+            5,
+            4,
+            13,
+            1,
+            [
+                49152,
+                49152
+            ],
+            [
+                286,
+                286
+            ],
+            [
+                528,
+                528
+            ]
+        ]
+    ]
+}
\ No newline at end of file
diff --git a/metrics/linux-clang8-release/render-tests/within/paint-line/metrics.json b/metrics/linux-clang8-release/render-tests/within/paint-line/metrics.json
new file mode 100644
index 000000000..c32db503c
--- /dev/null
+++ b/metrics/linux-clang8-release/render-tests/within/paint-line/metrics.json
@@ -0,0 +1,35 @@
+{
+    "network": [
+        [
+            "probeNetwork - default - end",
+            0,
+            0
+        ],
+        [
+            "probeNetwork - default - start",
+            0,
+            0
+        ]
+    ],
+    "gfx": [
+        [
+            "probeGFX - default - end",
+            5,
+            4,
+            13,
+            1,
+            [
+                49152,
+                49152
+            ],
+            [
+                286,
+                286
+            ],
+            [
+                528,
+                528
+            ]
+        ]
+    ]
+}
\ No newline at end of file
diff --git a/metrics/linux-gcc8-release/render-tests/within/paint-line/metrics.json b/metrics/linux-gcc8-release/render-tests/within/paint-line/metrics.json
new file mode 100644
index 000000000..c32db503c
--- /dev/null
+++ b/metrics/linux-gcc8-release/render-tests/within/paint-line/metrics.json
@@ -0,0 +1,35 @@
+{
+    "network": [
+        [
+            "probeNetwork - default - end",
+            0,
+            0
+        ],
+        [
+            "probeNetwork - default - start",
+            0,
+            0
+        ]
+    ],
+    "gfx": [
+        [
+            "probeGFX - default - end",
+            5,
+            4,
+            13,
+            1,
+            [
+                49152,
+                49152
+            ],
+            [
+                286,
+                286
+            ],
+            [
+                528,
+                528
+            ]
+        ]
+    ]
+}
\ No newline at end of file
diff --git a/src/mbgl/style/expression/within.cpp b/src/mbgl/style/expression/within.cpp
index 7dc55eda7..18d24b925 100644
--- a/src/mbgl/style/expression/within.cpp
+++ b/src/mbgl/style/expression/within.cpp
@@ -165,7 +165,7 @@ ParseResult Within::parse(const Convertible& value, ParsingContext& ctx) {
                 mbgl::Feature f(geometrySet);
                 PolygonFeature polyFeature(f, CanonicalTileID(0, 0, 0));
                 auto refinedGeoSet = convertGeometry(polyFeature, CanonicalTileID(0, 0, 0));
-                return ParseResult(std::make_unique<Within>(*parsedValue, refinedGeoSet));
+                return ParseResult(std::make_unique<Within>(*parsedValue, std::move(refinedGeoSet)));
             },
             [&ctx](const auto&) {
                 ctx.error("'within' expression requires geojson source that contains valid geometry data.");