Reversion for roll #22984
Merged
Reversion for roll #22984
Conversation
This file contains hidden or 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
added 2 commits
October 11, 2018 15:30
…lutter#22919)" This reverts commit a023323.
…s colorScheme (flutter#22827)" This reverts commit 655bf6a.
matthew-carroll
requested review from
HansMuller,
gspencergoog,
jonahwilliams and
tvolkert
This reverts commit a590940.
matthew-carroll
force-pushed
the
reversion_for_roll
branch
from
7fa86a2 to
4060dcc
Compare
added 2 commits
October 11, 2018 16:13
…flutter#22330)" This reverts commit 8bfb4b3.
…uttons (flutter#22013)" This reverts commit eea3465.
matthew-carroll
force-pushed
the
reversion_for_roll
branch
from
4060dcc to
17b79cd
Compare
matthew-carroll
force-pushed
the
reversion_for_roll
branch
from
17b79cd to
b7aeec8
Compare
matthew-carroll
pushed a commit
to matthew-carroll/flutter
that referenced
this pull request
Oct 12, 2018
This reverts commit 80f80ab.
matthew-carroll
added a commit
that referenced
this pull request
Oct 12, 2018
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/flutter
that referenced
this pull request
Dec 11, 2020
dnfield
pushed a commit
that referenced
this pull request
Dec 11, 2020
* 3a30ae3 Fix ios voiceover (for safari >13.4) (flutter/engine#22965) * 4338849 Replace g_object_weak_ref with g_object_add_weak_pointer * 3b9937a Load macOS dart bundle by URL fallback (flutter/engine#22979) * 96927bb add ffi_struct_patch.dart to libraries.yaml (flutter/engine#23000) * 2efc7c1 Set SkPath::setIsVolatile based on whether the path survives at least two frames (flutter/engine#22620) * bb81b95 Allow Tile mode for blur filter and add new decal TileMode (flutter/engine#22982) * 9df2157 Load iOS dart bundle by URL fallback (flutter/engine#22997) * 7647fdb Roll Skia from 22f80a60b17f to 6b07e0eb497c (26 revisions) (flutter/engine#23005) * 062cbd8 Freiling warmup memory (flutter/engine#22984) * 1646966 Revert "Freiling warmup memory (#22984)" (flutter/engine#23007) * 50d830a [web] Do not reset 'cursor' in PersistedPlatformView. (flutter/engine#22977) * 6ebf5c3 Roll Dart SDK from e4c9b06267d3 to a4e6fe145bf7 (2 revisions) (flutter/engine#23006) * 14c8c24 [web] Fix regression in foreground style (flutter/engine#22999) * 6678efa Implement SystemSound.play * fb769a4 Roll Fuchsia Linux SDK from rnN_X2o75... to ESzmO-yOF... (flutter/engine#23010) * b424356 Roll Skia from 6b07e0eb497c to f7cce2b243b2 (6 revisions) (flutter/engine#23018) * 56035c7 Roll Fuchsia Linux SDK from ESzmO-yOF... to K4cPd0-Xd... (flutter/engine#23020) * cb4a2ef Roll Skia from f7cce2b243b2 to b0cb8372c1ef (3 revisions) (flutter/engine#23021) * cc8c9d4 Roll Skia from b0cb8372c1ef to 5284e96599a8 (2 revisions) (flutter/engine#23023) * 8e9a943 Roll Dart SDK from a4e6fe145bf7 to c287db6bf232 (2 revisions) (flutter/engine#23024) * 714b543 Roll Fuchsia Mac SDK from OUQEzH1oE... to a9yuHfriB... (flutter/engine#23025) * d50cdda Roll Dart SDK from c287db6bf232 to 2553a84fe438 (1 revision) (flutter/engine#23026) * 4794d04 Roll Skia from 5284e96599a8 to f7fdf1aa2911 (1 revision) (flutter/engine#23027)
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/flutter
that referenced
this pull request
Dec 14, 2020
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/flutter
that referenced
this pull request
Dec 14, 2020
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/flutter
that referenced
this pull request
Dec 14, 2020
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/flutter
that referenced
this pull request
Dec 15, 2020
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
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.
This reverts the following 5 commits from @HansMuller so that we can proceed with the G3 roll:
"Added ColorScheme, updated ThemeData, ButtonTheme, material buttons (#22013)"
eea3465
"Bring TextTheme into alignment with the current Material spec (#22330)"
8bfb4b3.
""ButtonTheme.of().colorScheme defers to Theme (#22880)"
a590940
"Update uses of ButtonTheme.bar: pass along the current Theme's colorScheme (#22827)"
655bf6a
"MaterialButton must honor its minWidth and height parameters (#22919)"
a023323
The final reversion of "Added ColorScheme, updated ThemeData, ButtonTheme, material buttons (#22013)" had merge conflicts that I resolved as best I could.