Skip to content

F
Front-End
Unverified Commit 0d4b73b2 authored by Yegor's avatar Yegor Committed by GitHub
Browse files
Options

[web] roll Chromium dep to 96.2 (#99725)

parent 9b818d2b
Hide whitespace changes
Inline Side-by-side
Showing with 65 additions and 73 deletions
.ci.yaml
View file @ 0d4b73b2
......@@ -163,7 +163,7 @@ platform_properties:
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "certs"},
{"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"}
]
os: Windows-10
......@@ -192,7 +192,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"}
{"dependency": "chrome_and_driver", "version": "version:96.2"}
]
tags: >
["devicelab","hostonly"]
......@@ -211,7 +211,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"},
{"dependency": "goldctl"},
{"dependency": "clang"},
......@@ -231,7 +231,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"},
{"dependency": "goldctl"},
{"dependency": "clang"},
......@@ -462,7 +462,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"}
{"dependency": "chrome_and_driver", "version": "version:96.2"}
]
tags: >
["devicelab","hostonly"]
......@@ -484,7 +484,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"}
{"dependency": "chrome_and_driver", "version": "version:96.2"}
]
tags: >
["devicelab","hostonly"]
......@@ -506,7 +506,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"}
{"dependency": "chrome_and_driver", "version": "version:96.2"}
]
tags: >
["devicelab","hostonly"]
......@@ -528,7 +528,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"}
{"dependency": "chrome_and_driver", "version": "version:96.2"}
]
tags: >
["devicelab","hostonly"]
......@@ -550,7 +550,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"}
{"dependency": "chrome_and_driver", "version": "version:96.2"}
]
tags: >
["devicelab","hostonly"]
......@@ -572,7 +572,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"}
{"dependency": "chrome_and_driver", "version": "version:96.2"}
]
tags: >
["devicelab","hostonly"]
......@@ -595,7 +595,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"}
{"dependency": "chrome_and_driver", "version": "version:96.2"}
]
tags: >
["devicelab","hostonly"]
......@@ -618,7 +618,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"}
{"dependency": "chrome_and_driver", "version": "version:96.2"}
]
tags: >
["devicelab","hostonly"]
......@@ -641,7 +641,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"}
{"dependency": "chrome_and_driver", "version": "version:96.2"}
]
tags: >
["devicelab","hostonly"]
......@@ -664,7 +664,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"}
{"dependency": "chrome_and_driver", "version": "version:96.2"}
]
tags: >
["devicelab","hostonly"]
......@@ -707,7 +707,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"}
{"dependency": "chrome_and_driver", "version": "version:96.2"}
]
tags: >
["devicelab","hostonly"]
......@@ -734,7 +734,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "clang"},
{"dependency": "open_jdk"},
{"dependency": "goldctl"}
......@@ -759,7 +759,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "clang"},
{"dependency": "open_jdk"},
{"dependency": "goldctl"}
......@@ -784,7 +784,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "clang"},
{"dependency": "open_jdk"},
{"dependency": "goldctl"}
......@@ -809,7 +809,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "clang"},
{"dependency": "open_jdk"},
{"dependency": "goldctl"}
......@@ -880,7 +880,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"}
{"dependency": "chrome_and_driver", "version": "version:96.2"}
]
tags: >
["devicelab","hostonly"]
......@@ -898,7 +898,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"}
{"dependency": "chrome_and_driver", "version": "version:96.2"}
]
tags: >
["devicelab"]
......@@ -916,7 +916,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "goldctl"}
]
shard: web_long_running_tests
......@@ -937,7 +937,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "goldctl"}
]
shard: web_long_running_tests
......@@ -958,7 +958,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "goldctl"}
]
shard: web_long_running_tests
......@@ -979,7 +979,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "goldctl"}
]
shard: web_long_running_tests
......@@ -1000,7 +1000,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "goldctl"}
]
shard: web_long_running_tests
......@@ -1021,7 +1021,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "goldctl"}
]
shard: web_tests
......@@ -1042,7 +1042,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "goldctl"}
]
shard: web_tests
......@@ -1063,7 +1063,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "goldctl"}
]
shard: web_tests
......@@ -1084,7 +1084,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "goldctl"}
]
shard: web_tests
......@@ -1105,7 +1105,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "goldctl"}
]
shard: web_tests
......@@ -1126,7 +1126,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "goldctl"}
]
shard: web_tests
......@@ -1147,7 +1147,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "goldctl"}
]
shard: web_tests
......@@ -1168,7 +1168,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "goldctl"}
]
shard: web_tests
......@@ -1349,7 +1349,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"},
{"dependency": "goldctl"}
]
......@@ -3731,7 +3731,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"}
]
tags: >
......@@ -3752,7 +3752,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"},
{"dependency": "goldctl"},
{"dependency": "vs_build", "version": "version:vs2019"}
......@@ -3771,7 +3771,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"},
{"dependency": "goldctl"},
{"dependency": "vs_build", "version": "version:vs2019"}
......@@ -3790,7 +3790,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"},
{"dependency": "goldctl"},
{"dependency": "vs_build", "version": "version:vs2019"}
......@@ -3904,7 +3904,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"}
]
tags: >
......@@ -3928,7 +3928,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"}
]
tags: >
......@@ -3948,7 +3948,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"}
]
tags: >
......@@ -3986,7 +3986,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"}
]
tags: >
......@@ -4010,7 +4010,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"}
]
tags: >
......@@ -4035,7 +4035,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"}
]
tags: >
......@@ -4059,7 +4059,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"}
]
tags: >
......@@ -4083,7 +4083,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"}
]
tags: >
......@@ -4104,7 +4104,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"},
{"dependency": "goldctl"},
{"dependency": "vs_build", "version": "version:vs2019"}
......@@ -4129,7 +4129,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"},
{"dependency": "goldctl"},
{"dependency": "vs_build", "version": "version:vs2019"}
......@@ -4154,7 +4154,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"},
{"dependency": "goldctl"},
{"dependency": "vs_build", "version": "version:vs2019"}
......@@ -4179,7 +4179,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"},
{"dependency": "goldctl"},
{"dependency": "vs_build", "version": "version:vs2019"}
......@@ -4204,7 +4204,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"},
{"dependency": "goldctl"},
{"dependency": "vs_build", "version": "version:vs2019"}
......@@ -4229,7 +4229,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"},
{"dependency": "goldctl"},
{"dependency": "vs_build", "version": "version:vs2019"}
......@@ -4295,7 +4295,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"},
{"dependency": "goldctl"}
]
......
examples/hello_world/test_driver/smoke_web_engine_test.dart
View file @ 0d4b73b2
......@@ -38,25 +38,11 @@ void main() {
// TODO(ianh): this delay violates our style guide. We should instead wait for a triggering event.
await Future<void>.delayed(const Duration(seconds: 2));
// A flutter web app may be rendered directly on the body of the page, or
// inside the shadow root of the flt-glass-pane (after Flutter 2.4). To
// make this test backwards compatible, we first need to locate the correct
// root for the app.
//
// It's either the shadowRoot within flt-glass-pane, or [driver.webDriver].
final SearchContext appRoot = await driver.webDriver.execute(
'return document.querySelector("flt-glass-pane")?.shadowRoot;',
final WebElement? fltSemantics = await driver.webDriver.execute(
'return document.querySelector("flt-glass-pane")?.shadowRoot.querySelector("flt-semantics")',
<dynamic>[],
) as SearchContext? ?? driver.webDriver;
// Elements with tag "flt-semantics" would show up after enabling
// accessibility.
//
// The tag used here is based on
// https://github.com/flutter/engine/blob/master/lib/web_ui/lib/src/engine/semantics/semantics.dart#L534
final WebElement element = await appRoot.findElement(const By.cssSelector('flt-semantics'));
expect(element, isNotNull);
) as WebElement?;
expect(fltSemantics, isNotNull);
});
});
}
packages/flutter/test/cupertino/dialog_test.dart
View file @ 0d4b73b2
......@@ -10,6 +10,7 @@ import 'dart:math';
import 'dart:ui';
import 'package:flutter/cupertino.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
......@@ -324,7 +325,12 @@ void main() {
// Visually the "Cancel" button and "OK" button are the same height when using the
// regular font. However, when using the test font, "Cancel" becomes 2 lines which
// is why the height we're verifying for "Cancel" is larger than "OK".
expect(tester.getSize(find.text('The Title')), equals(const Size(270.0, 132.0)));
// TODO(yjbanov): https://github.com/flutter/flutter/issues/99933
// A bug in the HTML renderer and/or Chrome 96+ causes a
// discrepancy in the paragraph height.
const bool hasIssue99933 = kIsWeb && !bool.fromEnvironment('FLUTTER_WEB_USE_SKIA');
expect(tester.getSize(find.text('The Title')), equals(const Size(270.0, hasIssue99933 ? 133 : 132.0)));
expect(tester.getTopLeft(find.text('The Title')), equals(const Offset(265.0, 80.0 + 24.0)));
expect(tester.getSize(find.widgetWithText(CupertinoDialogAction, 'Cancel')), equals(const Size(310.0, 148.0)));
expect(tester.getSize(find.widgetWithText(CupertinoDialogAction, 'OK')), equals(const Size(310.0, 98.0)));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

HIAST - GitLab