Attachment 345983 Details for Bug 188099 – Patch

[patch] Patch

bug-188099-20180727181930.patch (text/plain), 2.63 KB, created by Myles C. Maxfield on 2018-07-27 18:19:31 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Myles C. Maxfield

Created: 2018-07-27 18:19:31 PDT

Size: 2.63 KB

patch

obsolete

>Subversion Revision: 234341
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 7ce6cac3ba68f58ce0c062a47b36064bab887269..c77d1c8923655787ee42d0d75d928b29b6fbd01a 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,19 @@
>+2018-07-27  Myles C. Maxfield  <mmaxfield@apple.com>
>+
>+        [WIN] Fix tests for text with initial advances
>+        https://bugs.webkit.org/show_bug.cgi?id=188099
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Fixup after r234318.
>+
>+        Tests: fast/text/complex-first-glyph-with-initial-advance.html
>+               fast/text/initial-advance-in-intermediate-run-complex.html
>+
>+        * platform/graphics/ComplexTextController.cpp:
>+        * platform/graphics/FontCascade.cpp:
>+        (WebCore::FontCascade::drawGlyphBuffer const):
>+
> 2018-07-27  Simon Fraser  <simon.fraser@apple.com>
> 
>         Adjust the color matrix for the inverse apple-invert-lightness() transformation
>diff --git a/Source/WebCore/platform/graphics/ComplexTextController.cpp b/Source/WebCore/platform/graphics/ComplexTextController.cpp
>index 2e2bbbe2ea5c4e362dbe878549c07bc25797598c..bbb019bcb9e7baa80e3a921c48e826f996ebfe93 100644
>--- a/Source/WebCore/platform/graphics/ComplexTextController.cpp
>+++ b/Source/WebCore/platform/graphics/ComplexTextController.cpp
>@@ -25,6 +25,8 @@
> #include "config.h"
> #include "ComplexTextController.h"
> 
>+#if !PLATFORM(WIN)
>+
> #include "CharacterProperties.h"
> #include "FloatSize.h"
> #include "FontCascade.h"
>@@ -886,3 +888,5 @@ ComplexTextController::ComplexTextRun::ComplexTextRun(const Vector<FloatSize>& a
> }
> 
> } // namespace WebCore
>+
>+#endif
>diff --git a/Source/WebCore/platform/graphics/FontCascade.cpp b/Source/WebCore/platform/graphics/FontCascade.cpp
>index 932789461acf36a12dd158a8306bdf945505881a..d74db0afba50943f272e1d3f3e85994ed7a78cf8 100644
>--- a/Source/WebCore/platform/graphics/FontCascade.cpp
>+++ b/Source/WebCore/platform/graphics/FontCascade.cpp
>@@ -1432,8 +1432,12 @@ void FontCascade::drawGlyphBuffer(GraphicsContext& context, const GlyphBuffer& g
> {
>     // Draw each contiguous run of glyphs that use the same font data.
>     const Font* fontData = glyphBuffer.fontAt(0);
>+#if PLATFORM(WIN)
>+    FloatPoint startPoint(point.x() + glyphBuffer.initialAdvance().width(), point.y() + glyphBuffer.initialAdvance().height());
>+#else
>     // FIXME: Why do we subtract the initial advance's height but not its width???
>     FloatPoint startPoint(point.x(), point.y() - glyphBuffer.initialAdvance().height());
>+#endif
>     float nextX = startPoint.x() + glyphBuffer.advanceAt(0).width();
>     float nextY = startPoint.y() + glyphBuffer.advanceAt(0).height();
>     unsigned lastFrom = 0;

Actions: View | Formatted Diff | Diff

Attachments on bug 188099: 345931 | 345961 | 345983 | 345988 | 345995 | 346007 | 346027 | 346184