From a835e2cdbd8c4ff14012b4a0e82e8db7c3db4a6c Mon Sep 17 00:00:00 2001 From: seppiofish Date: Mon, 1 Jul 2019 23:36:28 +0200 Subject: Removed old patch Removed patch needed for building chromium against harfbuzz 2.0 since it has been included in ungoogled-chromium patches. --- chromium-harfbuzz-2.0.patch | 55 --------------------------------------------- 1 file changed, 55 deletions(-) delete mode 100644 chromium-harfbuzz-2.0.patch diff --git a/chromium-harfbuzz-2.0.patch b/chromium-harfbuzz-2.0.patch deleted file mode 100644 index bbf4d3d..0000000 --- a/chromium-harfbuzz-2.0.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- a/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc -+++ a/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc -@@ -139,7 +139,7 @@ static hb_position_t HarfBuzzGetGlyphHorizontalAdvance(hb_font_t* hb_font, - static void HarfBuzzGetGlyphHorizontalAdvances(hb_font_t* font, - void* font_data, - unsigned count, -- hb_codepoint_t* first_glyph, -+ const hb_codepoint_t* first_glyph, - unsigned int glyph_stride, - hb_position_t* first_advance, - unsigned int advance_stride, ---- a/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc -+++ a/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc -@@ -18,6 +18,11 @@ T* advance_by_byte_size(T* p, unsigned byte_size) { - return reinterpret_cast(reinterpret_cast(p) + byte_size); - } - -+template -+T* advance_by_byte_size_const(T* p, unsigned byte_size) { -+ return reinterpret_cast(reinterpret_cast(p) + byte_size); -+} -+ - } // namespace - - SkiaTextMetrics::SkiaTextMetrics(const SkPaint* paint) : paint_(paint) { -@@ -39,7 +44,7 @@ void SkiaTextMetrics::GetGlyphWidthForHarfBuzz(hb_codepoint_t codepoint, - } - - void SkiaTextMetrics::GetGlyphWidthForHarfBuzz(unsigned count, -- hb_codepoint_t* glyphs, -+ const hb_codepoint_t* glyphs, - unsigned glyph_stride, - hb_position_t* advances, - unsigned advance_stride) { -@@ -48,7 +53,7 @@ void SkiaTextMetrics::GetGlyphWidthForHarfBuzz(unsigned count, - // array that copy them to a regular array. - Vector glyph_array(count); - for (unsigned i = 0; i < count; -- i++, glyphs = advance_by_byte_size(glyphs, glyph_stride)) { -+ i++, glyphs = advance_by_byte_size_const(glyphs, glyph_stride)) { - glyph_array[i] = *glyphs; - } - Vector sk_width_array(count); ---- a/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h -+++ a/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h -@@ -19,7 +19,7 @@ class SkiaTextMetrics final { - - void GetGlyphWidthForHarfBuzz(hb_codepoint_t, hb_position_t* width); - void GetGlyphWidthForHarfBuzz(unsigned count, -- hb_codepoint_t* first_glyph, -+ const hb_codepoint_t* first_glyph, - unsigned glyph_stride, - hb_position_t* first_advance, - unsigned advance_stride); --- -- cgit v1.2.3