Changeset 235820 in webkit

Timestamp:

Sep 7, 2018 4:47:20 PM (6 years ago)

Author:

Fujii Hironori

Message:

[Win][Clang] duplicated variable name advance in UniscribeController::shapeAndPlaceItem
​https://bugs.webkit.org/show_bug.cgi?id=189399

Reviewed by Myles C. Maxfield.

Clang reports the following compilation error:

UniscribeController.cpp(372,56): error: invalid operands to binary expression ('float' and 'WebCore::GlyphBufferAdvance' (aka 'WebCore::FloatSize'))

GlyphBufferAdvance advance(-origin.width() + advance, -origin.height());

~ ^~

No new tests (No behavior change).

• platform/graphics/win/UniscribeController.cpp:

(WebCore::UniscribeController::shapeAndPlaceItem): Replaced the second variable named advance with glyphAdvance.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/win/UniscribeController.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-09-07  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [Win][Clang] duplicated variable name `advance` in UniscribeController::shapeAndPlaceItem
+        https://bugs.webkit.org/show_bug.cgi?id=189399
+
+        Reviewed by Myles C. Maxfield.
+
+        Clang reports the following compilation error:
+
+        UniscribeController.cpp(372,56):  error: invalid operands to binary expression ('float' and 'WebCore::GlyphBufferAdvance' (aka 'WebCore::FloatSize'))
+             GlyphBufferAdvance advance(-origin.width() + advance, -origin.height());
+                                        ~~~~~~~~~~~~~~~ ^ ~~~~~~~
+        No new tests (No behavior change).
+
+        * platform/graphics/win/UniscribeController.cpp:
+        (WebCore::UniscribeController::shapeAndPlaceItem): Replaced the second variable named `advance` with `glyphAdvance`.
+
 2018-09-07  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/platform/graphics/win/UniscribeController.cpp

@@ -370 +370 @@
             else
                 glyphBuffer->expandLastAdvance(origin);
-            GlyphBufferAdvance advance(-origin.width() + advance, -origin.height());
-            glyphBuffer->add(glyph, fontData, advance);
+            GlyphBufferAdvance glyphAdvance(-origin.width() + advance, -origin.height());
+            glyphBuffer->add(glyph, fontData, glyphAdvance);
         }