This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Expose more methods on ui.Paragraph: lines
#46125
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
LongCatIsLooong
force-pushed
the
paragraph-api-lines
branch
from
8693e6a to
cf02536
Compare
LongCatIsLooong
force-pushed
the
paragraph-api-lines
branch
from
439dca8 to
7f1329e
Compare
LongCatIsLooong
changed the title
ui.Paragraph: lines
LongCatIsLooong
requested review from
mdebbar,
jason-simmons and
eyebrowsoffire
mdebbar
reviewed
Oct 11, 2023
Comment on lines
+256
to
+267
| int? _findLine(int codeUnitOffset, int startLine, int endLine) { | ||
| if (endLine <= startLine || codeUnitOffset < lines[startLine].startIndex || lines[endLine - 1].endIndex <= codeUnitOffset) { | ||
| return null; | ||
| } | ||
| if (endLine == startLine + 1) { | ||
| return startLine; | ||
| } | ||
| // endLine >= startLine + 2 thus we have | ||
| // startLine + 1 <= midIndex <= endLine - 1 | ||
| final int midIndex = (startLine + endLine) ~/ 2; | ||
| return _findLine(codeUnitOffset, midIndex, endLine) ?? _findLine(codeUnitOffset, startLine, midIndex); | ||
| } |
There was a problem hiding this comment.
There's code here that does the same thing:
engine/lib/web_ui/lib/src/engine/text/canvas_paragraph.dart
Lines 226 to 232 in 85e1dd9
Yours seems to be more performant (because binary search), so it would be nice to use it in getLineBoundary().
eyebrowsoffire
suggested changes
Oct 19, 2023
lib/web_ui/skwasm/text/paragraph.cpp
Outdated
| auto metrics = new LineMetrics(); | ||
| paragraph->getLineMetricsAt(index, metrics); | ||
| return metrics; | ||
| return paragraph->getLineMetricsAt(lineNumber, metrics) ? metrics : nullptr; |
There was a problem hiding this comment.
You need to delete metrics; in the case where you're returning a nullptr, otherwise this will leak.
lib/ui/text/paragraph.cc
Outdated
| }; | ||
|
|
||
| Dart_Handle handle = Dart_InvokeClosure( | ||
| constructor, sizeof(arguments) / sizeof(Dart_Handle), arguments); |
There was a problem hiding this comment.
Use a std::array for arguments and call size() here
|
hi @eyebrowsoffire I've addressed the comment, could you take another look? |
eyebrowsoffire
approved these changes
Nov 1, 2023
jason-simmons
approved these changes
Nov 2, 2023
LongCatIsLooong
added
the
autosubmit
LongCatIsLooong
added
the
revert
8 tasks
auto-submit bot
pushed a commit
that referenced
this pull request
Nov 2, 2023
This reverts commit 2805f09.
auto-submit
bot
removed
the
revert
auto-submit bot
added a commit
that referenced
this pull request
Nov 2, 2023
Reverts #46125 Initiated by: LongCatIsLooong This change reverts the following previous change: Original Description: [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/flutter
that referenced
this pull request
Nov 2, 2023
auto-submit bot
pushed a commit
to flutter/flutter
that referenced
this pull request
Nov 2, 2023
…137743) flutter/engine@eec2ae4...d92ccb9 2023-11-02 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Expose more methods on `ui.Paragraph`: lines" (flutter/engine#47584) 2023-11-02 31859944+LongCatIsLooong@users.noreply.github.com Expose more methods on `ui.Paragraph`: lines (flutter/engine#46125) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-engine-flutter-autoroll Please CC rmistry@google.com,zra@google.com on the revert to ensure that a human is aware of the problem. To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pre-launch Checklist
///).If you need help, consider asking for advice on the #hackers-new channel on Discord.