Attachment 345806 Details for Bug 188032 – Patch

[patch] Patch

bug-188032-20180725173957.patch (text/plain), 3.26 KB, created by Myles C. Maxfield on 2018-07-25 17:39:57 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Myles C. Maxfield

Created: 2018-07-25 17:39:57 PDT

Size: 3.26 KB

patch

obsolete

>Subversion Revision: 234091
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 6cc423a2801a1fe793aaacfa64ac97e609d9ebaa..29f77157882260fb01255e9c8d4bf9ef9219ef98 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,18 @@
>+2018-07-25  Myles C. Maxfield  <mmaxfield@apple.com>
>+
>+        [WIN] Regression(r213614): Crash when trying to access store pages
>+        https://bugs.webkit.org/show_bug.cgi?id=188032
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Windows shouldn't use ComplexTextController because it's not ready yet. Instead,
>+        it should use UniscribeController.
>+
>+        * platform/graphics/ComplexTextController.cpp:
>+        (WebCore::ComplexTextController::ComplexTextController):
>+        * platform/graphics/FontCascade.cpp:
>+        (WebCore::FontCascade::widthOfTextRange const):
>+
> 2018-07-22  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC][IFC] Add center/right/justify line alignment support.
>diff --git a/Source/WebCore/platform/graphics/ComplexTextController.cpp b/Source/WebCore/platform/graphics/ComplexTextController.cpp
>index f9f18a80fbd97ed33d2d609c3094ea5e15762649..df778a5128237b44d3e99cc5e5111c62e7150885 100644
>--- a/Source/WebCore/platform/graphics/ComplexTextController.cpp
>+++ b/Source/WebCore/platform/graphics/ComplexTextController.cpp
>@@ -144,6 +144,8 @@ ComplexTextController::ComplexTextController(const FontCascade& font, const Text
>     , m_mayUseNaturalWritingDirection(mayUseNaturalWritingDirection)
>     , m_forTextEmphasis(forTextEmphasis)
> {
>+    ASSERT(!PLATFORM(WIN));
>+
>     computeExpansionOpportunity();
> 
>     collectComplexTextRuns();
>diff --git a/Source/WebCore/platform/graphics/FontCascade.cpp b/Source/WebCore/platform/graphics/FontCascade.cpp
>index 5462209d7502764f9cde6ea8957b7cdc2add7787..72bb4792f3f0113803705d8b53a1e10f2237426c 100644
>--- a/Source/WebCore/platform/graphics/FontCascade.cpp
>+++ b/Source/WebCore/platform/graphics/FontCascade.cpp
>@@ -41,6 +41,10 @@
> #include <wtf/text/AtomicStringHash.h>
> #include <wtf/text/StringBuilder.h>
> 
>+#if PLATFORM(WIN)
>+#include "UniscribeController.h"
>+#endif
>+
> namespace WebCore {
> using namespace WTF;
> using namespace Unicode;
>@@ -343,6 +347,15 @@ float FontCascade::widthOfTextRange(const TextRun& run, unsigned from, unsigned
> 
>     auto codePathToUse = codePath(run);
>     if (codePathToUse == Complex) {
>+#if PLATFORM(WIN)
>+        UniscribeController it(this, run);
>+        it.advance(from);
>+        offsetBeforeRange = it.runWidthSoFar();
>+        it.advance(to);
>+        offsetAfterRange = it.runWidthSoFar();
>+        it.advance(to);
>+        totalWidth = it.runWidthSoFar();
>+#else
>         ComplexTextController complexIterator(*this, run, false, fallbackFonts);
>         complexIterator.advance(from, nullptr, IncludePartialGlyphs, fallbackFonts);
>         offsetBeforeRange = complexIterator.runWidthSoFar();
>@@ -350,6 +363,7 @@ float FontCascade::widthOfTextRange(const TextRun& run, unsigned from, unsigned
>         offsetAfterRange = complexIterator.runWidthSoFar();
>         complexIterator.advance(run.length(), nullptr, IncludePartialGlyphs, fallbackFonts);
>         totalWidth = complexIterator.runWidthSoFar();
>+#endif
>     } else {
>         WidthIterator simpleIterator(this, run, fallbackFonts);
>         simpleIterator.advance(from, nullptr);

Actions: View | Formatted Diff | Diff

Attachments on bug 188032: 345806 | 345838 | 345897 | 345902 | 345917 | 345930