forked from pool/nodejs-electron
Bruno Pitrus
7b259750d2
- Update to 25.8.0
* ABI break: NODE_MODULE_VERSION is now 116
* Chromium 114.0.5735.289
* Node 18.15.0
* V8 11.4
* Removed BrowserWindow scroll-touch-* events (since Electron 23)
* Removed webContents.{de,in}crementCapturerCount(stayHidden, stayAwake) (since Electron 23)
* Removed JXL image format support (since Electron 23)
* API Changed: nativeImage.createThumbnailFromPath(path, size) (since Electron 24)
- Use bundled vpx on Fedora ≤37 and Leap
- Use bundled aom on Fedora and Leap
- Drop support for Fedora 36 which is EOL
- Drop upstreamed patches
* CVE-2022-43548.patch
* aggregatable_attribution_utils-do-not-assume-abseil-ABI.patch
* angle-ShaderVars-missing-uint32_t.patch
* blink-gcc13-missing-headers.patch
* bluetooth_uuid-missing-uint8_t.patch
* broker_file_permission-missing-uint64_t.patch
* chromium-108-abseil-shims.patch
* components-gcc13-missing-headers.patch
* crashpad-elf_image_reader-ProgramHeaderTableSpecific-expected-unqualified-id.patch
* d0aa9ad.patch
* document_loader-private-DecodedBodyData.patch
* effect_paint_property_node-Wchanges-meaning.patch
* electron_serial_delegate-ambiguous-Observer.patch
* extensions-gcc13-missing-headers.patch
* first_party_set_parser-IssueWithMetadata-no-known-conversion.patch
* gpu_feature_info-missing-uint32_t.patch
* half_float-Wstrict-aliasing.patch
* ipcz-buffer_id-Wnarrowing.patch
* ipcz-safe_math-Wuninitialized.patch
* net-gcc13-missing-headers.patch
* net-third_party-quiche-gcc13-missing-headers.patch
* one_writer_seqlock-missing-uintptr_t.patch
* openscreen-gcc13-missing-headers.patch
* passwords_counter-Wsubobject-linkage.patch
* perfetto-uuid-missing-uint8_t.patch
* print_dialog_gtk-no-kEnableOopPrintDriversJobPrint.patch
* profiler-missing-uintptr_t.patch
* reproducible-config.gypi.patch
* select_file_dialog_linux_kde-Wodr.patch
* shim_headers-fix-ninja.patch
* static_constructors-Wstrict-aliasing.patch
* string_hasher-type-pun-UB-causes-heap-corruption.patch
* swiftshader-Constants-Wstrict-aliasing.patch
* swiftshader-Half-Wstrict-aliasing.patch
* swiftshader-LRUCache-missing-uint64_t.patch
* target_property-missing-uint32_t.patch
* ui-gcc13-missing-headers.patch
* unzip-Wsubobject-linkage.patch
* v8_initializer-PageAllocator-fpermissive.patch
* vector_math_impl-Wstrict-aliasing.patch
* web_contents_impl-Wsubobject-linkage.patch
* webgl_image_conversion-Wstrict-aliasing.patch
* webrtc-base64-missing-uint8_t.patch
* xr_cube_map-Wstrict-aliasing.patch
- Drop no longer relevant patches`
* chromium-norar.patch
* electron-13-fix-sql-virtualcursor-type.patch
* enable-jxl.patch
* system-jsoncpp.patch
- Add patches to build with system libs
* abseil-remove-unused-targets.patch
* highway.gn
* system-wayland.patch
- Add patches to fix build errors
* absl-uint128-do-not-assume-abi.patch
* cpu-missing-uint8_t.patch
* electron-24-components-missing-headers.patch
* electron_api_app-GetPathConstant-non-constexpr.patch
* electron_browser_context-missing-variant.patch
* mojo_ukm_recorder-missing-WrapUnique.patch
- Conditionally reverse upstream changes to build against stable avif
* avif_image_decoder-repetitionCount-clli.patch
- …and harfbuzz 4
* harfbuzz-replace-HbScopedPointer.patch
- …and icu 69
* v8-regexp-parser-UCHAR_BASIC_EMOJI.patch
- …and wayland 19
* wayland-WL-SINCE-VERSION.patch
* wayland_data_drag_controller-WL_SURFACE_OFFSET_SINCE_VERSION.patch
- Add backported chrome-gpu-does-not-load.patch
OBS-URL: https://build.opensuse.org/request/show/1110783
OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/nodejs-electron?expand=0&rev=89
99 lines
3.7 KiB
Diff
99 lines
3.7 KiB
Diff
From 5fcaeafcab5460ea65e4a7bdee6589002adf74d2 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Dominik=20R=C3=B6ttsches?= <drott@chromium.org>
|
|
Date: Mon, 13 Feb 2023 13:26:16 +0000
|
|
Subject: [PATCH] Use hb::unique_ptr instead of custom HbScopedPointer
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
This was an earlier local RAII implementation that we no longer need now
|
|
that HarfBuzz provides helpers for this.
|
|
|
|
Change-Id: Idc47ce2717c75556acb03e2ccccb50ec87ed3cca
|
|
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4239980
|
|
Reviewed-by: Munira Tursunova <moonira@google.com>
|
|
Commit-Queue: Dominik Röttsches <drott@chromium.org>
|
|
Cr-Commit-Position: refs/heads/main@{#1104453}
|
|
---
|
|
.../platform/fonts/shaping/harfbuzz_shaper.cc | 39 ++++---------------
|
|
1 file changed, 7 insertions(+), 32 deletions(-)
|
|
|
|
diff --git a/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_shaper.cc b/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_shaper.cc
|
|
index c165a1703395a..dc1377a90a9f7 100644
|
|
--- a/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_shaper.cc
|
|
+++ b/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_shaper.cc
|
|
@@ -35,6 +35,7 @@
|
|
#include <unicode/uchar.h>
|
|
#include <unicode/uscript.h>
|
|
#include <algorithm>
|
|
+#include <hb-cplusplus.hh>
|
|
#include <memory>
|
|
#include <utility>
|
|
|
|
@@ -190,32 +191,6 @@ struct ReshapeQueueItem {
|
|
: action_(action), start_index_(start), num_characters_(num) {}
|
|
};
|
|
|
|
-template <typename T>
|
|
-class HarfBuzzScopedPtr {
|
|
- STACK_ALLOCATED();
|
|
-
|
|
- public:
|
|
- typedef void (*DestroyFunction)(T*);
|
|
-
|
|
- HarfBuzzScopedPtr(T* ptr, DestroyFunction destroy)
|
|
- : ptr_(ptr), destroy_(destroy) {
|
|
- DCHECK(destroy_);
|
|
- }
|
|
- HarfBuzzScopedPtr(const HarfBuzzScopedPtr&) = delete;
|
|
- HarfBuzzScopedPtr& operator=(const HarfBuzzScopedPtr&) = delete;
|
|
- ~HarfBuzzScopedPtr() {
|
|
- if (ptr_)
|
|
- (*destroy_)(ptr_);
|
|
- }
|
|
-
|
|
- T* Get() { return ptr_; }
|
|
- void Set(T* ptr) { ptr_ = ptr; }
|
|
-
|
|
- private:
|
|
- T* ptr_;
|
|
- DestroyFunction destroy_;
|
|
-};
|
|
-
|
|
struct RangeData {
|
|
STACK_ALLOCATED();
|
|
|
|
@@ -908,8 +883,8 @@ scoped_refptr<ShapeResult> HarfBuzzShaper::Shape(const Font* font,
|
|
scoped_refptr<ShapeResult> result =
|
|
ShapeResult::Create(font, start, length, direction);
|
|
|
|
- HarfBuzzScopedPtr<hb_buffer_t> buffer(hb_buffer_create(), hb_buffer_destroy);
|
|
- RangeData range_data = CreateRangeData(font, direction, buffer.Get());
|
|
+ hb::unique_ptr<hb_buffer_t> buffer(hb_buffer_create());
|
|
+ RangeData range_data = CreateRangeData(font, direction, buffer.get());
|
|
range_data.start = start;
|
|
range_data.end = end;
|
|
|
|
@@ -965,8 +940,8 @@ scoped_refptr<ShapeResult> HarfBuzzShaper::Shape(
|
|
scoped_refptr<ShapeResult> result =
|
|
ShapeResult::Create(font, start, length, direction);
|
|
|
|
- HarfBuzzScopedPtr<hb_buffer_t> buffer(hb_buffer_create(), hb_buffer_destroy);
|
|
- RangeData range_data = CreateRangeData(font, direction, buffer.Get());
|
|
+ hb::unique_ptr<hb_buffer_t> buffer(hb_buffer_create());
|
|
+ RangeData range_data = CreateRangeData(font, direction, buffer.get());
|
|
|
|
for (const RunSegmenter::RunSegmenterRange& segmented_range : ranges) {
|
|
DCHECK_GE(segmented_range.end, segmented_range.start);
|
|
@@ -1001,8 +976,8 @@ scoped_refptr<ShapeResult> HarfBuzzShaper::Shape(
|
|
scoped_refptr<ShapeResult> result =
|
|
ShapeResult::Create(font, start, length, direction);
|
|
|
|
- HarfBuzzScopedPtr<hb_buffer_t> buffer(hb_buffer_create(), hb_buffer_destroy);
|
|
- RangeData range_data = CreateRangeData(font, direction, buffer.Get());
|
|
+ hb::unique_ptr<hb_buffer_t> buffer(hb_buffer_create());
|
|
+ RangeData range_data = CreateRangeData(font, direction, buffer.get());
|
|
range_data.start = start;
|
|
range_data.end = end;
|
|
|