Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: flutter/flutter
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: fc19ecfc585a
Choose a base ref
...
head repository: flutter/flutter
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 32081aab69f8
Choose a head ref
  • 9 commits
  • 14 files changed
  • 7 contributors

Commits on Jun 7, 2024

  1. Reverts "Fix SegmentedButton clipping when drawing segments (#149739)…

    …" (#149927)
    
    Reverts: #149739
    Initiated by: QuncCccccc
    Reason for reverting: the newly-added unit test might cause the red tree
    Original PR Author: TahaTesser
    
    Reviewed By: {QuncCccccc}
    
    This change reverts the following previous change:
    fixes [`SegmentedButton` doesn't clip properly when one of the segments has `ColorFiltered`](#144990)
    
    ### Code sample
    
    <details>
    <summary>expand to view the code sample</summary> 
    
    ```dart
    import 'package:flutter/material.dart';
    
    void main() => runApp(const MyApp());
    
    class MyApp extends StatelessWidget {
      const MyApp({super.key});
    
      @OverRide
      Widget build(BuildContext context) {
        return MaterialApp(
          home: Scaffold(
            body: Center(
              child: SegmentedButton<int>(
                segments: const <ButtonSegment<int>>[
                  ButtonSegment<int>(
                    value: 0,
                    label: ColorFiltered(
                      colorFilter:
                          ColorFilter.mode(Colors.amber, BlendMode.colorBurn),
                      child: Text('Option 1'),
                    ),
                  ),
                  ButtonSegment<int>(
                    value: 1,
                    label: Text('Option 2'),
                  ),
                ],
                onSelectionChanged: (Set<int> selected) {},
                selected: const <int>{0},
              ),
            ),
          ),
        );
      }
    }
    ```
    
    </details>
    
    ### Before
    
    ![before](https://github.com/flutter/flutter/assets/48603081/b402fc51-d575-4208-8a71-f798ef2b2bf5)
    
    ### After
    
    ![after](https://github.com/flutter/flutter/assets/48603081/77a5cac2-ecef-4381-a043-dbb5c91407ec)
    auto-submit[bot] authored Jun 7, 2024
    Configuration menu
    Copy the full SHA
    b5697a0 View commit details
    Browse the repository at this point in the history
  2. Revert "Identify and re-throw our dependency checking errors in `flut…

    …ter.groovy` (#149609)" (#149918)
    
    This reverts commit 9d1de7b.
    
    Reverts due to log spam and crashing of the dependency version checker (which doesn't block the build but still isn't the desired outcome).
    gmackall authored Jun 7, 2024
    Configuration menu
    Copy the full SHA
    15307a9 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    6bdebcf View commit details
    Browse the repository at this point in the history
  4. PinnedHeaderSliver (#143196)

    A sliver that remains �pinned� to the top of the scroll view. Subsequent slivers scroll behind it. Typically the sliver is created as the first item in the list however it can be inserted anywhere and it will always stop at the top of the scroll view. When the scrolling axis is vertical, the PinnedHeaderSliver�s height is defined by its widget child. Multiple PinnedHeaderSlivers will layout one after the other, once they've scrolled to the top.
    
    This sliver is preferable to the general purpose SliverPersistentHeader - for its relatively narrow use case - because there's no need to create a [SliverPersistentHeaderDelegate] or to predict the header's size.
    
    Here's a [working demo in DartPad](https://dartpad.dev/?id=3b3f24c14fa201f752407a21ca9c9456).
    
    https://github.com/flutter/flutter/assets/1377460/943f2e02-8e73-48b7-90be-61168978ff71
    
    Related sliver utility PRs: #143538, #143325, #127340.
    HansMuller authored Jun 7, 2024
    Configuration menu
    Copy the full SHA
    9ce0a9e View commit details
    Browse the repository at this point in the history
  5. Remove zanderso from TESTOWNERS (#149935)

    Instead I've added @andrewkolos for tools tests and @jtmcdole for engine
    tests. This doesn't mean you have to investigate and solve the issues
    filed by the flake bot. Instead, an assignee is just the mechanism used
    by the flake bot to ensure that the issues are triaged at the
    appropriate team triage meetings.
    
    FYI @christopherfujino
    zanderso authored Jun 7, 2024
    Configuration menu
    Copy the full SHA
    47560fa View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    034c0d0 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2024

  1. Roll Flutter Engine from 1cdbebee1901 to 45cf05f7a580 (10 revisions) (#…

    …149944)
    
    flutter/engine@1cdbebe...45cf05f
    
    2024-06-07 [email protected] [web] add test for inefficient overlay allocation (flutter/engine#53284)
    2024-06-07 [email protected] Update Chrome to 125. (flutter/engine#53282)
    2024-06-07 [email protected] Roll Dart SDK from 4b693b16eec1 to d4f17e0bf28b (1 revision) (flutter/engine#53283)
    2024-06-07 [email protected] Fixes a few issues in flutter_js (flutter/engine#53231)
    2024-06-07 [email protected] Roll Fuchsia Linux SDK from aVohW_hnfDaE0smBX... to zpBZmUB_JC5AjG-f4... (flutter/engine#53279)
    2024-06-07 [email protected] Roll Dart SDK from 7b239d7f4578 to 4b693b16eec1 (1 revision) (flutter/engine#53277)
    2024-06-07 [email protected] Roll Skia from b7f51dfcc342 to ad3c9f203f4e (1 revision) (flutter/engine#53276)
    2024-06-07 [email protected] Roll Skia from 5fc83884a619 to b7f51dfcc342 (4 revisions) (flutter/engine#53275)
    2024-06-07 [email protected] Revert "Widen CPU affinity set." (flutter/engine#53274)
    2024-06-07 [email protected] Roll Skia from e36110f8b451 to 5fc83884a619 (1 revision) (flutter/engine#53273)
    
    Also rolling transitive DEPS:
      fuchsia/sdk/core/linux-amd64 from aVohW_hnfDaE to zpBZmUB_JC5A
    
    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 [email protected],[email protected],[email protected] 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
    engine-flutter-autoroll authored Jun 8, 2024
    Configuration menu
    Copy the full SHA
    f634098 View commit details
    Browse the repository at this point in the history
  2. Reverts "Roll Flutter Engine from 1cdbebee1901 to 45cf05f7a580 (10 re…

    …visions) (#149944)" (#149960)
    
    Reverts: #149944
    Initiated by: jason-simmons
    Reason for reverting: Regression affecting `integration_test/test/web_extension_test.dart`
    
    ```
      PathNotFoundException: Cannot open file, path = '/chromium/canvaskit.wasm' (OS Error: No such file or directory, errno = 2)
    ```
    
    (see https://logs.chromium.org/logs/flutter/buildbucket/cr-buildbucket/8745735238400976001/+/u/run_test.dart_for_web_long_running_tests_shard_and_subshard_1_5/stdout)
    
    It looks like the p
    Original PR Author: engine-flutter-autoroll
    
    Reviewed By: {fluttergithubbot}
    
    This change reverts the following previous change:
    
    flutter/engine@1cdbebe...45cf05f
    
    2024-06-07 [email protected] [web] add test for inefficient overlay allocation (flutter/engine#53284)
    2024-06-07 [email protected] Update Chrome to 125. (flutter/engine#53282)
    2024-06-07 [email protected] Roll Dart SDK from 4b693b16eec1 to d4f17e0bf28b (1 revision) (flutter/engine#53283)
    2024-06-07 [email protected] Fixes a few issues in flutter_js (flutter/engine#53231)
    2024-06-07 [email protected] Roll Fuchsia Linux SDK from aVohW_hnfDaE0smBX... to zpBZmUB_JC5AjG-f4... (flutter/engine#53279)
    2024-06-07 [email protected] Roll Dart SDK from 7b239d7f4578 to 4b693b16eec1 (1 revision) (flutter/engine#53277)
    2024-06-07 [email protected] Roll Skia from b7f51dfcc342 to ad3c9f203f4e (1 revision) (flutter/engine#53276)
    2024-06-07 [email protected] Roll Skia from 5fc83884a619 to b7f51dfcc342 (4 revisions) (flutter/engine#53275)
    2024-06-07 [email protected] Revert "Widen CPU affinity set." (flutter/engine#53274)
    2024-06-07 [email protected] Roll Skia from e36110f8b451 to 5fc83884a619 (1 revision) (flutter/engine#53273)
    
    Also rolling transitive DEPS:
      fuchsia/sdk/core/linux-amd64 from aVohW_hnfDaE to zpBZmUB_JC5A
    
    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 [email protected],[email protected],[email protected] 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
    auto-submit[bot] authored Jun 8, 2024
    Configuration menu
    Copy the full SHA
    f380842 View commit details
    Browse the repository at this point in the history
  3. [CupertinoActionSheet] Match colors to native (#149568)

    This PR matches the various colors of `CupertinoActionSheet` more closely with the native one. 
    
    The following colors are changed.
    * Sheet background color
    * Pressed button color
    * Cancel button color
    * Pressed cancel button color
    * Divider color
    * Content text color
    
    The resulting colors match with native one with deviation of at most 1 (in terms of 0~255 RGB).
    
    The following are comparison (left to right: Native, Flutter after PR, Flutter current)
    <img width="1295" alt="image" src="https://github.com/flutter/flutter/assets/1596656/3703a4a8-a856-42b1-9395-a6e14b1881ca">
    <img width="1268" alt="image" src="https://github.com/flutter/flutter/assets/1596656/1eb9964e-41f1-414a-99ae-0a2e7da8d3fd">
    _Note: The divider thickness is adjusted to `1/dpr` instead of 0.3 in both Flutter version to make them look more native, as will be proposed in #149636
    
    ### Derivation 
    All the colors are derived through color picker and calculation. The algorithm is as followed:
    * Assume all colors are translucent grey colors, i.e. having the same value `x` for R, G, and B, with an alpha `a`.
    * Given the barrier color is `x_B1=0` when the background is black, and `x_B2=204` when the background is white.
    * Pick the target color `x_t1` when the background is black, and `x_t2` when the background is white
    * Solve the following equations for `x` and `a`
    ```
    a * x + (1-a) * x_B1 = x_t1
    a * x + (1-a) * x_B2 = x_t2
    
    a = 1 - (x_t1 - x_t2) / (x_B1 - x_B2)
    x = (x_t1 - (1-a) * x_B1) / a
    ```
    
    These equations use a linear model for color composition, which might not be exact, but is close enough for an accuracy of (1/255).
    
    The full table is as follows:
    
    <img width="1091" alt="image" src="https://github.com/flutter/flutter/assets/1596656/0fb76291-c3cc-4bb5-aefa-03ac6ac9bf1f">
    
    * The first two columns are colors picked from XCode.
    * The 3~4 columns are the colors picked from the current Flutter. Notice the deviation, which is sometimes drastic.
    * The 5~6 columns are the colors picked from Flutter after this PR. The deviation is at most 1.
    * The last few columns are calculation.
      * There are two rows whose calculation is based on adjusted numbers, since the original results are not accurate enough, possibly due to the linear composition.
    
    During the calculation, I assumed these colors vary between light and dark modes, but it turns out that both modes use the same set of colors.
    
    ### Screenshots
    dkwingsmt authored Jun 8, 2024
    Configuration menu
    Copy the full SHA
    32081aa View commit details
    Browse the repository at this point in the history
Loading