commit a4e46804946c5f9554068ba7adfee7376697d77a
author Brian Osman <brianosman@google.com> Thu Jan 17 09:17:35 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Jan 17 14:52:30 2019 +0000
tree 8842042ea26cce15fcdcc7978bc19f5e57d9f0df
parent 33b4b4908b7acb9913707d1a4a9d8dfe83fb26fb

Fix variable shadowing in Viewer's ImGui code

This worked, but was confusing.

Bug: skia:
Change-Id: I9a387f2fc772277086e0f6ce532c834839b5e4dc
Reviewed-on: https://skia-review.googlesource.com/c/184800
Commit-Queue: Brian Osman <brianosman@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Auto-Submit: Brian Osman <brianosman@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>

tools/viewer/ImGuiLayer.cpp

diff --git a/tools/viewer/ImGuiLayer.cpp b/tools/viewer/ImGuiLayer.cpp
index 3ed94a0..c6a95b4 100644
--- a/tools/viewer/ImGuiLayer.cpp
+++ b/tools/viewer/ImGuiLayer.cpp
@@ -122,8 +122,8 @@
 
         // De-interleave all vertex data (sigh), convert to Skia types
         pos.rewind(); uv.rewind(); color.rewind();
-        for (int i = 0; i < drawList->VtxBuffer.size(); ++i) {
-            const ImDrawVert& vert = drawList->VtxBuffer[i];
+        for (int j = 0; j < drawList->VtxBuffer.size(); ++j) {
+            const ImDrawVert& vert = drawList->VtxBuffer[j];
             pos.push_back(SkPoint::Make(vert.pos.x, vert.pos.y));
             uv.push_back(SkPoint::Make(vert.uv.x, vert.uv.y));
             color.push_back(vert.col);