mirror of
https://github.com/electron/electron.git
synced 2026-01-06 22:24:03 -05:00
471a14432f
* chore: bump chromium in DEPS to 143.0.7469.0 * 7021651: [//gpu] Fold handle creation into D3DImageBackingFactory Refs https://chromium-review.googlesource.com/c/chromium/src/+/7021651 * 7013047: Fix various C++23 build errors in //chrome Refs https://chromium-review.googlesource.com/c/chromium/src/+/7013047 * 7010850: [//ui] Port screen_mac.mm's calls to DisplayColorSpaces Refs https://chromium-review.googlesource.com/c/chromium/src/+/7010850 * 7007933: Remove superfluous mojom includes in //content/public headers Refs https://chromium-review.googlesource.com/c/chromium/src/+/7007933 * 7023196: Trim os_crypt/sync visibility list Refs https://chromium-review.googlesource.com/c/chromium/src/+/7023196 * 7008912: Remove GURL::*_piece() method Refs https://chromium-review.googlesource.com/c/chromium/src/+/7008912 * 7003989: Add wrapper struct for CopyFromSurface output Refs https://chromium-review.googlesource.com/c/chromium/src/+/7003989 * 7017889: [MemoryPressureListener] Remove type aliases Refs https://chromium-review.googlesource.com/c/chromium/src/+/7017889 * 7027780: Delete viz::ResourceSizes Refs https://chromium-review.googlesource.com/c/chromium/src/+/7027780 Refs https://chromium-review.googlesource.com/c/chromium/src/+/6989572 * 6495189: [api] Delete old String::Write* APIs Refs https://chromium-review.googlesource.com/c/v8/v8/+/6495189 * chore: update patches * chore: run script/gen-libc++-filenames.js --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: David Sanders <dsanders11@ucsbalum.com>
151 lines
6.3 KiB
Diff
151 lines
6.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Lemire <daniel@lemire.me>
|
|
Date: Thu, 12 Sep 2024 12:07:08 -0400
|
|
Subject: src: simplify string_bytes with views
|
|
|
|
PR-URL: https://github.com/nodejs/node/pull/54876
|
|
Reviewed-By: James M Snell <jasnell@gmail.com>
|
|
Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
|
|
Reviewed-By: Minwoo Jung <nodecorelab@gmail.com>
|
|
|
|
diff --git a/src/string_bytes.cc b/src/string_bytes.cc
|
|
index addb7e21ba6a3bbabf3ff5f32240a5e428d176ee..f0fbf496dcfdec2c522508c61ae24fb20b1eb081 100644
|
|
--- a/src/string_bytes.cc
|
|
+++ b/src/string_bytes.cc
|
|
@@ -246,6 +246,7 @@ size_t StringBytes::Write(Isolate* isolate,
|
|
|
|
CHECK(val->IsString() == true);
|
|
Local<String> str = val.As<String>();
|
|
+ String::ValueView input_view(isolate, str);
|
|
|
|
int flags = String::HINT_MANY_WRITES_EXPECTED |
|
|
String::NO_NULL_TERMINATION |
|
|
@@ -254,10 +255,9 @@ size_t StringBytes::Write(Isolate* isolate,
|
|
switch (encoding) {
|
|
case ASCII:
|
|
case LATIN1:
|
|
- if (str->IsExternalOneByte()) {
|
|
- auto ext = str->GetExternalOneByteStringResource();
|
|
- nbytes = std::min(buflen, ext->length());
|
|
- memcpy(buf, ext->data(), nbytes);
|
|
+ if (input_view.is_one_byte()) {
|
|
+ nbytes = std::min(buflen, static_cast<size_t>(input_view.length()));
|
|
+ memcpy(buf, input_view.data8(), nbytes);
|
|
} else {
|
|
uint8_t* const dst = reinterpret_cast<uint8_t*>(buf);
|
|
nbytes = str->WriteOneByte(isolate, dst, 0, buflen, flags);
|
|
@@ -282,31 +282,11 @@ size_t StringBytes::Write(Isolate* isolate,
|
|
}
|
|
|
|
case BASE64URL:
|
|
- if (str->IsExternalOneByte()) { // 8-bit case
|
|
- auto ext = str->GetExternalOneByteStringResource();
|
|
+ if (input_view.is_one_byte()) { // 8-bit case
|
|
size_t written_len = buflen;
|
|
auto result = simdutf::base64_to_binary_safe(
|
|
- ext->data(), ext->length(), buf, written_len, simdutf::base64_url);
|
|
- if (result.error == simdutf::error_code::SUCCESS) {
|
|
- nbytes = written_len;
|
|
- } else {
|
|
- // The input does not follow the WHATWG forgiving-base64 specification
|
|
- // adapted for base64url
|
|
- // https://infra.spec.whatwg.org/#forgiving-base64-decode
|
|
- nbytes =
|
|
- nbytes::Base64Decode(buf, buflen, ext->data(), ext->length());
|
|
- }
|
|
- } else if (str->IsOneByte()) {
|
|
- MaybeStackBuffer<uint8_t> stack_buf(str->Length());
|
|
- str->WriteOneByte(isolate,
|
|
- stack_buf.out(),
|
|
- 0,
|
|
- str->Length(),
|
|
- String::NO_NULL_TERMINATION);
|
|
- size_t written_len = buflen;
|
|
- auto result = simdutf::base64_to_binary_safe(
|
|
- reinterpret_cast<const char*>(*stack_buf),
|
|
- stack_buf.length(),
|
|
+ reinterpret_cast<const char*>(input_view.data8()),
|
|
+ input_view.length(),
|
|
buf,
|
|
written_len,
|
|
simdutf::base64_url);
|
|
@@ -316,8 +296,11 @@ size_t StringBytes::Write(Isolate* isolate,
|
|
// The input does not follow the WHATWG forgiving-base64 specification
|
|
// (adapted for base64url with + and / replaced by - and _).
|
|
// https://infra.spec.whatwg.org/#forgiving-base64-decode
|
|
- nbytes =
|
|
- nbytes::Base64Decode(buf, buflen, *stack_buf, stack_buf.length());
|
|
+ nbytes = nbytes::Base64Decode(
|
|
+ buf,
|
|
+ buflen,
|
|
+ reinterpret_cast<const char*>(input_view.data8()),
|
|
+ input_view.length());
|
|
}
|
|
} else {
|
|
String::Value value(isolate, str);
|
|
@@ -340,40 +323,23 @@ size_t StringBytes::Write(Isolate* isolate,
|
|
break;
|
|
|
|
case BASE64: {
|
|
- if (str->IsExternalOneByte()) { // 8-bit case
|
|
- auto ext = str->GetExternalOneByteStringResource();
|
|
+ if (input_view.is_one_byte()) { // 8-bit case
|
|
size_t written_len = buflen;
|
|
auto result = simdutf::base64_to_binary_safe(
|
|
- ext->data(), ext->length(), buf, written_len);
|
|
- if (result.error == simdutf::error_code::SUCCESS) {
|
|
- nbytes = written_len;
|
|
- } else {
|
|
- // The input does not follow the WHATWG forgiving-base64 specification
|
|
- // https://infra.spec.whatwg.org/#forgiving-base64-decode
|
|
- nbytes =
|
|
- nbytes::Base64Decode(buf, buflen, ext->data(), ext->length());
|
|
- }
|
|
- } else if (str->IsOneByte()) {
|
|
- MaybeStackBuffer<uint8_t> stack_buf(str->Length());
|
|
- str->WriteOneByte(isolate,
|
|
- stack_buf.out(),
|
|
- 0,
|
|
- str->Length(),
|
|
- String::NO_NULL_TERMINATION);
|
|
- size_t written_len = buflen;
|
|
- auto result = simdutf::base64_to_binary_safe(
|
|
- reinterpret_cast<const char*>(*stack_buf),
|
|
- stack_buf.length(),
|
|
+ reinterpret_cast<const char*>(input_view.data8()),
|
|
+ input_view.length(),
|
|
buf,
|
|
written_len);
|
|
if (result.error == simdutf::error_code::SUCCESS) {
|
|
nbytes = written_len;
|
|
} else {
|
|
// The input does not follow the WHATWG forgiving-base64 specification
|
|
- // (adapted for base64url with + and / replaced by - and _).
|
|
// https://infra.spec.whatwg.org/#forgiving-base64-decode
|
|
- nbytes =
|
|
- nbytes::Base64Decode(buf, buflen, *stack_buf, stack_buf.length());
|
|
+ nbytes = nbytes::Base64Decode(
|
|
+ buf,
|
|
+ buflen,
|
|
+ reinterpret_cast<const char*>(input_view.data8()),
|
|
+ input_view.length());
|
|
}
|
|
} else {
|
|
String::Value value(isolate, str);
|
|
@@ -394,9 +360,12 @@ size_t StringBytes::Write(Isolate* isolate,
|
|
break;
|
|
}
|
|
case HEX:
|
|
- if (str->IsExternalOneByte()) {
|
|
- auto ext = str->GetExternalOneByteStringResource();
|
|
- nbytes = nbytes::HexDecode(buf, buflen, ext->data(), ext->length());
|
|
+ if (input_view.is_one_byte()) {
|
|
+ nbytes =
|
|
+ nbytes::HexDecode(buf,
|
|
+ buflen,
|
|
+ reinterpret_cast<const char*>(input_view.data8()),
|
|
+ input_view.length());
|
|
} else {
|
|
String::Value value(isolate, str);
|
|
nbytes = nbytes::HexDecode(buf, buflen, *value, value.length());
|