Title: [235820] trunk/Source/WebCore
- Revision
- 235820
- Author
- [email protected]
- Date
- 2018-09-07 16:47:20 -0700 (Fri, 07 Sep 2018)
Log 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`.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (235819 => 235820)
--- trunk/Source/WebCore/ChangeLog 2018-09-07 23:13:32 UTC (rev 235819)
+++ trunk/Source/WebCore/ChangeLog 2018-09-07 23:47:20 UTC (rev 235820)
@@ -1,3 +1,20 @@
+2018-09-07 Fujii Hironori <[email protected]>
+
+ [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 <[email protected]>
RTCRtpReceiver::track should return a MediaStreamTrack reference
Modified: trunk/Source/WebCore/platform/graphics/win/UniscribeController.cpp (235819 => 235820)
--- trunk/Source/WebCore/platform/graphics/win/UniscribeController.cpp 2018-09-07 23:13:32 UTC (rev 235819)
+++ trunk/Source/WebCore/platform/graphics/win/UniscribeController.cpp 2018-09-07 23:47:20 UTC (rev 235820)
@@ -369,8 +369,8 @@
glyphBuffer->setInitialAdvance(origin);
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);
}
FloatRect glyphBounds = fontData->boundsForGlyph(glyph);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
