summaryrefslogtreecommitdiff
path: root/waterfox/mozilla-1389436.patch
diff options
context:
space:
mode:
authorB. Stack <bgstack15@gmail.com>2021-08-23 10:29:32 -0400
committerB. Stack <bgstack15@gmail.com>2021-08-23 10:29:32 -0400
commitcccc0785a577ffac38479ab63b9c9c24fd835f37 (patch)
tree5b038f97d41854d7875a047a914c7b680bf5f139 /waterfox/mozilla-1389436.patch
parentMerge branch 'freefilesync-bump' into 'master' (diff)
downloadstackrpms-cccc0785a577ffac38479ab63b9c9c24fd835f37.tar.gz
stackrpms-cccc0785a577ffac38479ab63b9c9c24fd835f37.tar.bz2
stackrpms-cccc0785a577ffac38479ab63b9c9c24fd835f37.zip
waterfox 2021.08
Diffstat (limited to 'waterfox/mozilla-1389436.patch')
-rw-r--r--waterfox/mozilla-1389436.patch41
1 files changed, 0 insertions, 41 deletions
diff --git a/waterfox/mozilla-1389436.patch b/waterfox/mozilla-1389436.patch
deleted file mode 100644
index b7a87d2..0000000
--- a/waterfox/mozilla-1389436.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-
-# HG changeset patch
-# User Mike Hommey <mh+mozilla@glandium.org>
-# Date 1502455819 -32400
-# Node ID 97dae871389b7f22a7096a020781b07a5a61de58
-# Parent c73f64ef71d2d87f36008f5ff661f4050692bd06
-Bug 1389436 - Explicitly instantiate gfxFont::GetShapedWord<uint8_t> for its use in gfxTextRun.cpp. r=jfkthame
-
-diff --git a/gfx/thebes/gfxFont.cpp b/gfx/thebes/gfxFont.cpp
---- a/gfx/thebes/gfxFont.cpp
-+++ b/gfx/thebes/gfxFont.cpp
-@@ -2634,16 +2634,28 @@ gfxFont::GetShapedWord(DrawTarget *aDraw
- ShapeText(aDrawTarget, aText, 0, aLength, aRunScript, aVertical,
- aRounding, sw);
-
- NS_WARNING_ASSERTION(ok, "failed to shape word - expect garbled text");
-
- return sw;
- }
-
-+template gfxShapedWord*
-+gfxFont::GetShapedWord(DrawTarget *aDrawTarget,
-+ const uint8_t *aText,
-+ uint32_t aLength,
-+ uint32_t aHash,
-+ Script aRunScript,
-+ bool aVertical,
-+ int32_t aAppUnitsPerDevUnit,
-+ gfx::ShapedTextFlags aFlags,
-+ RoundingFlags aRounding,
-+ gfxTextPerfMetrics *aTextPerf);
-+
- bool
- gfxFont::CacheHashEntry::KeyEquals(const KeyTypePointer aKey) const
- {
- const gfxShapedWord* sw = mShapedWord.get();
- if (!sw) {
- return false;
- }
- if (sw->GetLength() != aKey->mLength ||
-
bgstack15