From 1a2d23648feeb49b06ec7baee90e3b8b2e867984 Mon Sep 17 00:00:00 2001 From: Joel Einbinder Date: Mon, 1 Nov 2021 08:48:33 -0400 Subject: [PATCH] browser(webkit): fix arm mac compilation due to integer cast (#9886) Co-authored-by: Max Schmitt --- browser_patches/webkit/BUILD_NUMBER | 4 ++-- browser_patches/webkit/patches/bootstrap.diff | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index 5193d9b2a5..3fe743ca3f 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1,2 +1,2 @@ -1569 -Changed: joel.einbinder@gmail.com Fri 29 Oct 2021 07:46:40 AM PDT +1570 +Changed: joel.einbinder@gmail.com Fri 29 Oct 2021 11:21:00 AM PDT diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index e995c1061c..0375a96bed 100644 --- a/browser_patches/webkit/patches/bootstrap.diff +++ b/browser_patches/webkit/patches/bootstrap.diff @@ -4348,7 +4348,7 @@ index 8f6fbcc293aebf8b9d5c945d2829a1527b74bc7f..34e6726d970400c28f1812cdf5ceddb3 std::unique_ptr m_frontendDispatcher; diff --git a/Source/WebCore/inspector/agents/InspectorPageAgent.cpp b/Source/WebCore/inspector/agents/InspectorPageAgent.cpp -index c894067585eb1e3dc79276d9d0e4f7562c84d801..49b0b3af9890d3b96ff8c9da28809e8510a5f1e5 100644 +index c894067585eb1e3dc79276d9d0e4f7562c84d801..ca8f975d99068ac471f624b421afdc6f83b8c35a 100644 --- a/Source/WebCore/inspector/agents/InspectorPageAgent.cpp +++ b/Source/WebCore/inspector/agents/InspectorPageAgent.cpp @@ -32,20 +32,28 @@ @@ -4874,12 +4874,12 @@ index c894067585eb1e3dc79276d9d0e4f7562c84d801..49b0b3af9890d3b96ff8c9da28809e85 + if (!frame.selection().selection().isContentEditable()) + return { }; + if (replacementStart) { -+ WebCore::CharacterRange range { *replacementStart, replacementLength ? *replacementLength : 0 }; ++ WebCore::CharacterRange range { static_cast(*replacementStart), replacementLength ? static_cast(*replacementLength) : 0 }; + auto* element = frame.selection().rootEditableElementOrDocumentElement(); + if (element) + frame.selection().setSelection(VisibleSelection(resolveCharacterRange(makeRangeSelectingNodeContents(*element), range))); + } -+ frame.editor().setComposition(text, { }, { }, selectionStart, selectionStart + selectionLength); ++ frame.editor().setComposition(text, { }, { }, static_cast(selectionStart), selectionStart + selectionLength); + return { }; +} +