Attachment 349119 Details for Bug 189399 – Patch

[patch] Patch

bug-189399-20180907164613.patch (text/plain), 2.16 KB, created by Fujii Hironori on 2018-09-07 00:46:14 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Fujii Hironori

Created: 2018-09-07 00:46:14 PDT

Size: 2.16 KB

patch

obsolete

>Subversion Revision: 235722
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 79bb5925029d404addd1c46bcfc010b480b78307..e86dbc01775bc0a9cd893d258b03ca4dcd6d6a31 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,20 @@
>+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 NOBODY (OOPS!).
>+
>+        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-05  Youenn Fablet  <youenn@apple.com>
> 
>         Move ownership of outgoing source to RTCRtpSender backend
>diff --git a/Source/WebCore/platform/graphics/win/UniscribeController.cpp b/Source/WebCore/platform/graphics/win/UniscribeController.cpp
>index a0147734475a3d25f72662a8c8a87c8be58065d6..0b61626d453ab7d1ac8ea82421b116c0f5d556c1 100644
>--- a/Source/WebCore/platform/graphics/win/UniscribeController.cpp
>+++ b/Source/WebCore/platform/graphics/win/UniscribeController.cpp
>@@ -369,8 +369,8 @@ bool UniscribeController::shapeAndPlaceItem(const UChar* cp, unsigned i, const F
>                 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);

Actions: View | Formatted Diff | Diff

Attachments on bug 189399: 349119