Avoid shadowing variabels in new font code

I'm trying to remove variable shadowing in some Chromium
code to maybe make the code a bit more robust, and two functions
in blink/platform/fonts/shaping used several instances of |i|.

Bug: 925310
Change-Id: I3e09f7772a7865ec7f73976a57af355070b6ad4f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1578538
Commit-Queue: Dominik Röttsches <drott@chromium.org>
Auto-Submit: Daniel Bratell <bratell@opera.com>
Reviewed-by: Dominik Röttsches <drott@chromium.org>
Cr-Commit-Position: refs/heads/master@{#653164}
diff --git a/third_party/blink/renderer/platform/fonts/shaping/shape_result.cc b/third_party/blink/renderer/platform/fonts/shaping/shape_result.cc
index 0321a82..ea5f234 100644
--- a/third_party/blink/renderer/platform/fonts/shaping/shape_result.cc
+++ b/third_party/blink/renderer/platform/fonts/shaping/shape_result.cc
@@ -1768,12 +1768,12 @@
 #endif
 
   GlyphBoundsAccumulator bounds(run_advance);
-  for (unsigned i = 0; i < num_glyphs; ++i) {
-    const HarfBuzzRunGlyphData& glyph_data = run.glyph_data_[i];
+  for (unsigned j = 0; j < num_glyphs; ++j) {
+    const HarfBuzzRunGlyphData& glyph_data = run.glyph_data_[j];
 #if defined(OS_MACOSX)
     FloatRect glyph_bounds = current_font_data.BoundsForGlyph(glyph_data.glyph);
 #else
-    FloatRect glyph_bounds(bounds_list[i]);
+    FloatRect glyph_bounds(bounds_list[j]);
 #endif
     bounds.Unite<is_horizontal_run>(glyph_data, glyph_bounds);
     bounds.origin += glyph_data.advance;
diff --git a/third_party/blink/renderer/platform/fonts/shaping/shape_result_view.cc b/third_party/blink/renderer/platform/fonts/shaping/shape_result_view.cc
index 16fea1e..eaedff6 100644
--- a/third_party/blink/renderer/platform/fonts/shaping/shape_result_view.cc
+++ b/third_party/blink/renderer/platform/fonts/shaping/shape_result_view.cc
@@ -527,12 +527,12 @@
 #endif
 
   GlyphBoundsAccumulator bounds(run_advance);
-  for (unsigned i = 0; i < num_glyphs; ++i) {
-    const HarfBuzzRunGlyphData& glyph_data = part.GlyphAt(i);
+  for (unsigned j = 0; j < num_glyphs; ++j) {
+    const HarfBuzzRunGlyphData& glyph_data = part.GlyphAt(j);
 #if defined(OS_MACOSX)
     FloatRect glyph_bounds = current_font_data.BoundsForGlyph(glyph_data.glyph);
 #else
-    FloatRect glyph_bounds(bounds_list[i]);
+    FloatRect glyph_bounds(bounds_list[j]);
 #endif
     bounds.Unite<is_horizontal_run>(glyph_data, glyph_bounds);
     bounds.origin += glyph_data.advance;