Facebook/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove use of folly::hash from attributedstring module (#39512)

Browse Source 
Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/39512

changelog: [internal]

Reviewed By: cipolleschi

Differential Revision: D49349658

fbshipit-source-id: 2b1e3ce2051e995fe5a29a8021c221c69df28ce2
This commit is contained in:
Samuel Susla
2023-09-22 05:53:13 -07:00
committed by Facebook GitHub Bot
parent bf186471d3
commit 43eb18b1ae
3 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/react-native/ReactCommon/react/renderer/attributedstring/AttributedString.h
+3 -5
View File
@@ -7,15 +7,14 @@
#pragma once
#include <functional>
#include <memory>
#include <folly/Hash.h>
#include <react/renderer/attributedstring/TextAttributes.h>
#include <react/renderer/core/Sealable.h>
#include <react/renderer/core/ShadowNode.h>
#include <react/renderer/debug/DebugStringConvertible.h>
#include <react/renderer/mounting/ShadowView.h>
#include <react/utils/hash_combine.h>
namespace facebook::react {
@@ -123,8 +122,7 @@ template <>
struct hash<facebook::react::AttributedString::Fragment> {
size_t operator()(
const facebook::react::AttributedString::Fragment& fragment) const {
return folly::hash::hash_combine(
0,
return facebook::react::hash_combine(
fragment.string,
fragment.textAttributes,
fragment.parentShadowView,
@@ -139,7 +137,7 @@ struct hash<facebook::react::AttributedString> {
auto seed = size_t{0};
for (const auto& fragment : attributedString.getFragments()) {
seed = folly::hash::hash_combine(seed, fragment);
facebook::react::hash_combine(seed, fragment);
}
return seed;
packages/react-native/ReactCommon/react/renderer/attributedstring/ParagraphAttributes.h
+2 -3
View File
@@ -9,10 +9,10 @@
#include <limits>
#include <folly/Hash.h>
#include <react/renderer/attributedstring/primitives.h>
#include <react/renderer/debug/DebugStringConvertible.h>
#include <react/renderer/graphics/Float.h>
#include <react/utils/hash_combine.h>
namespace facebook::react {
@@ -88,8 +88,7 @@ template <>
struct hash<facebook::react::ParagraphAttributes> {
size_t operator()(
const facebook::react::ParagraphAttributes& attributes) const {
return folly::hash::hash_combine(
0,
return facebook::react::hash_combine(
attributes.maximumNumberOfLines,
attributes.ellipsizeMode,
attributes.textBreakStrategy,
packages/react-native/ReactCommon/react/renderer/components/text/ParagraphLayoutManager.cpp
+2 -2
View File
@@ -6,8 +6,8 @@
*/
#include "ParagraphLayoutManager.h"
#include <folly/Hash.h>
#include <react/utils/CoreFeatures.h>
#include <react/utils/hash_combine.h>
namespace facebook::react {
@@ -43,7 +43,7 @@ bool ParagraphLayoutManager::shoudMeasureString(
const ParagraphAttributes& paragraphAttributes,
LayoutConstraints layoutConstraints) const {
size_t newParagraphInputHash =
folly::hash::hash_combine(0, attributedString, paragraphAttributes);
hash_combine(attributedString, paragraphAttributes);
if (newParagraphInputHash != paragraphInputHash_) {
// AttributedString or ParagraphAttributes have changed.