Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make ParagraphConstraints have const constructor #7346

Merged
merged 1 commit into from
Jan 7, 2019
Merged

Conversation

dnfield
Copy link
Contributor

@dnfield dnfield commented Jan 2, 2019

Looks like something that got overlooked.

@dnfield
Copy link
Contributor Author

dnfield commented Jan 2, 2019

Looking at the history, it looks like the assert was originally in the body of the constructor (as opposed to the initializer list where it is now), which would have prevented it from being const.

@dnfield dnfield requested a review from GaryQian January 3, 2019 21:58
Copy link
Contributor

@GaryQian GaryQian left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@dnfield dnfield merged commit 5965f90 into master Jan 7, 2019
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jan 7, 2019
@dnfield dnfield deleted the dnfield-patch-1 branch January 7, 2019 19:34
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jan 7, 2019
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jan 7, 2019
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jan 7, 2019
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jan 7, 2019
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jan 8, 2019
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jan 8, 2019
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jan 8, 2019
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jan 8, 2019
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jan 8, 2019
bkonyi added a commit to flutter/flutter that referenced this pull request Jan 8, 2019
flutter/engine@7112b72...e5ec3cf

git log
7112b72..e5ec3cf
--no-merges --oneline
e5ec3cf Dart SDK roll for 2019-01-08
08c95d2 Roll src/third_party/skia 55ff5d3ba881..1337f5b85978 (10
commits) (flutter/engine#7407)
e385f5c Roll src/third_party/skia 26d173fee72b..55ff5d3ba881 (12
commits) (flutter/engine#7406)
0f8273b Dart SDK roll for 2019-01-07
4036b26 Reset ParagraphBuilder after build() (flutter/engine#7401)
4820cbe Dart SDK roll for 2019-01-07
8eccb86 Add onStart hook to FlutterFragmentActivity
(flutter/engine#6719)
f2ea838 Roll src/third_party/skia b2fdcbf3033f..26d173fee72b (10
commits) (flutter/engine#7400)
5ca8aad Announce in/out of list (flutter/engine#6918)
4487d39 Replace Java code with equivalent, more concise code.
(flutter/engine#7398)
395b785 Roll src/third_party/skia 46ee3f7a8ff5..b2fdcbf3033f (11
commits) (flutter/engine#7394)
5965f90 Make `ParagraphConstraints` have const constructor
(flutter/engine#7346)
e02dd41 Roll src/third_party/skia a47eb455360f..46ee3f7a8ff5 (2
commits) (flutter/engine#7390)
f0038b3 Roll src/third_party/skia 3ac3a4053f86..a47eb455360f (2
commits) (flutter/engine#7389)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jan 8, 2019
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jan 8, 2019
bkonyi added a commit to flutter/flutter that referenced this pull request Jan 9, 2019
flutter/engine@7112b72...e5ec3cf

git log
7112b72..e5ec3cf
--no-merges --oneline
e5ec3cf Dart SDK roll for 2019-01-08
08c95d2 Roll src/third_party/skia 55ff5d3ba881..1337f5b85978 (10
commits) (flutter/engine#7407)
e385f5c Roll src/third_party/skia 26d173fee72b..55ff5d3ba881 (12
commits) (flutter/engine#7406)
0f8273b Dart SDK roll for 2019-01-07
4036b26 Reset ParagraphBuilder after build() (flutter/engine#7401)
4820cbe Dart SDK roll for 2019-01-07
8eccb86 Add onStart hook to FlutterFragmentActivity
(flutter/engine#6719)
f2ea838 Roll src/third_party/skia b2fdcbf3033f..26d173fee72b (10
commits) (flutter/engine#7400)
5ca8aad Announce in/out of list (flutter/engine#6918)
4487d39 Replace Java code with equivalent, more concise code.
(flutter/engine#7398)
395b785 Roll src/third_party/skia 46ee3f7a8ff5..b2fdcbf3033f (11
commits) (flutter/engine#7394)
5965f90 Make `ParagraphConstraints` have const constructor
(flutter/engine#7346)
e02dd41 Roll src/third_party/skia a47eb455360f..46ee3f7a8ff5 (2
commits) (flutter/engine#7390)
f0038b3 Roll src/third_party/skia 3ac3a4053f86..a47eb455360f (2
commits) (flutter/engine#7389)
cbracken added a commit to cbracken/flutter that referenced this pull request Jan 10, 2019
Usages of ParagraphConstraints (from dart:ui) whose constructor could be
const as of flutter/engine#7346 are currently marked //
ignore:prefer_const_constructors in the framework until all
Google-internal embedders have been updated to an engine version that
includes the above change. These were initially updated in engine roll
flutter#26252, but broke internal embedders.

We should re-enable use of the const constructor in those cases once
internal embedders are updated.

See: flutter#26390
cbracken added a commit to flutter/flutter that referenced this pull request Jan 11, 2019
Usages of ParagraphConstraints (from dart:ui) whose constructor could be
const as of flutter/engine#7346 are currently marked //
ignore:prefer_const_constructors in the framework until all
Google-internal embedders have been updated to an engine version that
includes the above change. These were initially updated in engine roll
#26252, but broke internal embedders.

We should re-enable use of the const constructor in those cases once
internal embedders are updated.

See: #26390
cbracken added a commit to flutter/flutter that referenced this pull request Jan 24, 2019
All embedders of Flutter within Google have all been updated to an
engine version that includes the const constructor added in
flutter/engine#7346 and rolled into the framework in
#26252.

This reverts commit 88b77a7.

This fixes #26390.
gamebox pushed a commit to gamebox/flutter that referenced this pull request Jan 28, 2019
flutter/engine@7112b72...e5ec3cf

git log
7112b72..e5ec3cf
--no-merges --oneline
e5ec3cf Dart SDK roll for 2019-01-08
08c95d2 Roll src/third_party/skia 55ff5d3ba881..1337f5b85978 (10
commits) (flutter/engine#7407)
e385f5c Roll src/third_party/skia 26d173fee72b..55ff5d3ba881 (12
commits) (flutter/engine#7406)
0f8273b Dart SDK roll for 2019-01-07
4036b26 Reset ParagraphBuilder after build() (flutter/engine#7401)
4820cbe Dart SDK roll for 2019-01-07
8eccb86 Add onStart hook to FlutterFragmentActivity
(flutter/engine#6719)
f2ea838 Roll src/third_party/skia b2fdcbf3033f..26d173fee72b (10
commits) (flutter/engine#7400)
5ca8aad Announce in/out of list (flutter/engine#6918)
4487d39 Replace Java code with equivalent, more concise code.
(flutter/engine#7398)
395b785 Roll src/third_party/skia 46ee3f7a8ff5..b2fdcbf3033f (11
commits) (flutter/engine#7394)
5965f90 Make `ParagraphConstraints` have const constructor
(flutter/engine#7346)
e02dd41 Roll src/third_party/skia a47eb455360f..46ee3f7a8ff5 (2
commits) (flutter/engine#7390)
f0038b3 Roll src/third_party/skia 3ac3a4053f86..a47eb455360f (2
commits) (flutter/engine#7389)
kangwang1988 pushed a commit to XianyuTech/flutter that referenced this pull request Feb 12, 2019
flutter/engine@7112b72...e5ec3cf

git log
7112b72..e5ec3cf
--no-merges --oneline
e5ec3cf Dart SDK roll for 2019-01-08
08c95d2 Roll src/third_party/skia 55ff5d3ba881..1337f5b85978 (10
commits) (flutter/engine#7407)
e385f5c Roll src/third_party/skia 26d173fee72b..55ff5d3ba881 (12
commits) (flutter/engine#7406)
0f8273b Dart SDK roll for 2019-01-07
4036b26 Reset ParagraphBuilder after build() (flutter/engine#7401)
4820cbe Dart SDK roll for 2019-01-07
8eccb86 Add onStart hook to FlutterFragmentActivity
(flutter/engine#6719)
f2ea838 Roll src/third_party/skia b2fdcbf3033f..26d173fee72b (10
commits) (flutter/engine#7400)
5ca8aad Announce in/out of list (flutter/engine#6918)
4487d39 Replace Java code with equivalent, more concise code.
(flutter/engine#7398)
395b785 Roll src/third_party/skia 46ee3f7a8ff5..b2fdcbf3033f (11
commits) (flutter/engine#7394)
5965f90 Make `ParagraphConstraints` have const constructor
(flutter/engine#7346)
e02dd41 Roll src/third_party/skia a47eb455360f..46ee3f7a8ff5 (2
commits) (flutter/engine#7390)
f0038b3 Roll src/third_party/skia 3ac3a4053f86..a47eb455360f (2
commits) (flutter/engine#7389)
kangwang1988 pushed a commit to XianyuTech/flutter that referenced this pull request Feb 12, 2019
Usages of ParagraphConstraints (from dart:ui) whose constructor could be
const as of flutter/engine#7346 are currently marked //
ignore:prefer_const_constructors in the framework until all
Google-internal embedders have been updated to an engine version that
includes the above change. These were initially updated in engine roll
flutter#26252, but broke internal embedders.

We should re-enable use of the const constructor in those cases once
internal embedders are updated.

See: flutter#26390
kangwang1988 pushed a commit to XianyuTech/flutter that referenced this pull request Feb 12, 2019
All embedders of Flutter within Google have all been updated to an
engine version that includes the const constructor added in
flutter/engine#7346 and rolled into the framework in
flutter#26252.

This reverts commit 88b77a7.

This fixes flutter#26390.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants