From 03a598358fbf921034b0fa8bd3ad52a4b989bebe Mon Sep 17 00:00:00 2001 From: Vyacheslav Egorov Date: Wed, 14 Feb 2018 19:07:05 +0100 Subject: [PATCH] Make Paragraph methods really return List if they are declared as such. (#4676) Changed methods _getPositionForOffset and getWordBoundary to use Dart_NewListOf(Dart_CoreType_Int, ...). --- lib/ui/text/paragraph_impl_blink.cc | 4 ++-- lib/ui/text/paragraph_impl_txt.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/ui/text/paragraph_impl_blink.cc b/lib/ui/text/paragraph_impl_blink.cc index f6a16ecf6..c7752c0a7 100644 --- a/lib/ui/text/paragraph_impl_blink.cc +++ b/lib/ui/text/paragraph_impl_blink.cc @@ -145,7 +145,7 @@ int ParagraphImplBlink::absoluteOffsetForPosition( Dart_Handle ParagraphImplBlink::getPositionForOffset(double dx, double dy) { LayoutPoint point(dx, dy); PositionWithAffinity position = m_renderView->positionForPoint(point); - Dart_Handle result = Dart_NewList(2); + Dart_Handle result = Dart_NewListOf(Dart_CoreType_Int, 2); Dart_ListSetAt(result, 0, ToDart(absoluteOffsetForPosition(position))); Dart_ListSetAt(result, 1, ToDart(static_cast(position.affinity()))); return result; @@ -171,7 +171,7 @@ Dart_Handle ParagraphImplBlink::getWordBoundary(unsigned offset) { start = it->previous(); } - Dart_Handle result = Dart_NewList(2); + Dart_Handle result = Dart_NewListOf(Dart_CoreType_Int, 2); Dart_ListSetAt(result, 0, ToDart(start)); Dart_ListSetAt(result, 1, ToDart(end)); return result; diff --git a/lib/ui/text/paragraph_impl_txt.cc b/lib/ui/text/paragraph_impl_txt.cc index 565b63f54..de8d8ff0b 100644 --- a/lib/ui/text/paragraph_impl_txt.cc +++ b/lib/ui/text/paragraph_impl_txt.cc @@ -74,7 +74,7 @@ std::vector ParagraphImplTxt::getRectsForRange(unsigned start, } Dart_Handle ParagraphImplTxt::getPositionForOffset(double dx, double dy) { - Dart_Handle result = Dart_NewList(2); + Dart_Handle result = Dart_NewListOf(Dart_CoreType_Int, 2); txt::Paragraph::PositionWithAffinity pos = m_paragraph->GetGlyphPositionAtCoordinate(dx, dy); Dart_ListSetAt(result, 0, ToDart(pos.position)); @@ -84,7 +84,7 @@ Dart_Handle ParagraphImplTxt::getPositionForOffset(double dx, double dy) { Dart_Handle ParagraphImplTxt::getWordBoundary(unsigned offset) { txt::Paragraph::Range point = m_paragraph->GetWordBoundary(offset); - Dart_Handle result = Dart_NewList(2); + Dart_Handle result = Dart_NewListOf(Dart_CoreType_Int, 2); Dart_ListSetAt(result, 0, ToDart(point.start)); Dart_ListSetAt(result, 1, ToDart(point.end)); return result; -- GitLab