Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit d6c50a1

Browse files
dnfielddnfield
committed
merge
2 parents b05fac3 + 6d44559 commit d6c50a1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+494
-307
lines changed

‎DEPS‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ vars = {
2626
'skia_git': 'https://skia.googlesource.com',
2727
# OCMock is for testing only so there is no google clone
2828
'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
29-
'skia_revision': '8dd1e22f41309bdfec6b9b35727fe1e4e88cc100',
29+
'skia_revision': 'cc01311cfc965ebadc9c998e5af84ee2cbade67f',
3030

3131
# When updating the Dart revision, ensure that all entries that are
3232
# dependencies of Dart are also updated to match the entries in the
3333
# Dart SDK's DEPS file for that revision of Dart. The DEPS file for
3434
# Dart is: https://github.com/dart-lang/sdk/blob/master/DEPS.
3535
# You can use //tools/dart/create_updated_flutter_deps.py to produce
3636
# updated revision list of existing dependencies.
37-
'dart_revision': '9ae3e22f1e530e8234decd3fd5bb3498f46c26d1',
37+
'dart_revision': '6d15e04622c25d9430832d25f69dcee1cdd1d494',
3838

3939
# WARNING: DO NOT EDIT MANUALLY
4040
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py

‎ci/dev/README.md‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,25 @@ supported luci try/prod builders for engine. It follows format:
88
{
99
"builders":[
1010
{
11-
"name":"xxx",
12-
"repo":"engine"
13-
},
11+
"name":"yyy",
12+
"repo":"engine",
13+
"enabled":true
14+
}
15+
]
16+
}
17+
```
18+
for `try_builders.json`, and follows format:
19+
```json
20+
{
21+
"builders":[
1422
{
1523
"name":"yyy",
1624
"repo":"engine"
1725
}
1826
]
1927
}
2028
```
21-
This file will be mainly used in [`flutter/cocoon`](https://github.com/flutter/cocoon)
22-
to trigger/update engine luci tasks.
23-
29+
for `prod_builders.json`. `try_builders.json` will be mainly used in
30+
[`flutter/cocoon`](https://github.com/flutter/cocoon) to trigger/update pre-submit
31+
engine luci tasks, whereas `prod_builders.json` will be mainly used in `flutter/cocoon`
32+
to push luci task statuses to GitHub.

‎ci/dev/try_builders.json‎

Lines changed: 26 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,55 +2,68 @@
22
"builders":[
33
{
44
"name":"Linux Host Engine",
5-
"repo":"engine"
5+
"repo":"engine",
6+
"enabled": true
67
},
78
{
89
"name":"Linux Fuchsia",
9-
"repo":"engine"
10+
"repo":"engine",
11+
"enabled": true
1012
},
1113
{
1214
"name":"Linux Android AOT Engine",
13-
"repo":"engine"
15+
"repo":"engine",
16+
"enabled": true
1417
},
1518
{
1619
"name":"Linux Android Debug Engine",
17-
"repo":"engine"
20+
"repo":"engine",
21+
"enabled": true
1822
},
1923
{
2024
"name":"Linux Web Engine",
21-
"repo":"engine"
25+
"repo":"engine",
26+
"enabled": true
2227
},
2328
{
2429
"name":"Mac Host Engine",
25-
"repo":"engine"
30+
"repo":"engine",
31+
"enabled": true
2632
},
2733
{
2834
"name":"Mac Android AOT Engine",
29-
"repo":"engine"
35+
"repo":"engine",
36+
"enabled": true
3037
},
3138
{
3239
"name":"Mac Android Debug Engine",
33-
"repo":"engine"
40+
"repo":"engine",
41+
"enabled": true
3442
},
3543
{
3644
"name":"Mac iOS Engine",
37-
"repo":"engine"
45+
"repo":"engine",
46+
"enabled": true
3847
},
3948
{
4049
"name":"Windows Host Engine",
41-
"repo":"engine"
50+
"repo":"engine",
51+
"enabled": true
4252
},
4353
{
4454
"name":"Windows Android AOT Engine",
45-
"repo":"engine"
55+
"repo":"engine",
56+
"enabled": true
4657
},
4758
{
4859
"name":"Windows Web Engine",
49-
"repo":"engine"
60+
"repo":"engine",
61+
"enabled": true
5062
},
5163
{
5264
"name":"Mac Web Engine",
53-
"repo":"engine"
65+
"repo":"engine",
66+
"enabled": true
5467
}
5568
]
5669
}

‎ci/licenses_golden/licenses_flutter‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -926,6 +926,7 @@ FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterEngine.
926926
FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterEnginePlatformViewTest.mm
927927
FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterEngineTest.mm
928928
FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterEngine_Internal.h
929+
FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterEngine_Test.h
929930
FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterHeadlessDartRunner.mm
930931
FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterObservatoryPublisher.h
931932
FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/FlutterObservatoryPublisher.mm

‎ci/licenses_golden/licenses_skia‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 81d886b3f785a769019bd82dfeecf6ed
1+
Signature: e66791cdffb026d2f712973a8c257119
22

33
UNUSED LICENSES:
44

@@ -3980,7 +3980,10 @@ FILE: ../../../third_party/skia/src/gpu/glsl/GrGLSLUniformHandler.cpp
39803980
FILE: ../../../third_party/skia/src/gpu/vk/GrVkManagedResource.h
39813981
FILE: ../../../third_party/skia/src/image/SkRescaleAndReadPixels.cpp
39823982
FILE: ../../../third_party/skia/src/image/SkRescaleAndReadPixels.h
3983+
FILE: ../../../third_party/skia/src/ports/SkImageEncoder_NDK.cpp
39833984
FILE: ../../../third_party/skia/src/ports/SkImageGeneratorNDK.cpp
3985+
FILE: ../../../third_party/skia/src/ports/SkNDKConversions.cpp
3986+
FILE: ../../../third_party/skia/src/ports/SkNDKConversions.h
39843987
FILE: ../../../third_party/skia/src/sksl/SkSLAnalysis.h
39853988
FILE: ../../../third_party/skia/src/sksl/SkSLDehydrator.cpp
39863989
FILE: ../../../third_party/skia/src/sksl/SkSLDehydrator.h
@@ -5254,6 +5257,7 @@ FILE: ../../../third_party/skia/gm/widebuttcaps.cpp
52545257
FILE: ../../../third_party/skia/include/core/SkM44.h
52555258
FILE: ../../../third_party/skia/include/effects/SkStrokeAndFillPathEffect.h
52565259
FILE: ../../../third_party/skia/include/gpu/GrDirectContext.h
5260+
FILE: ../../../third_party/skia/include/ports/SkAudioPlayer.h
52575261
FILE: ../../../third_party/skia/include/private/SkOpts_spi.h
52585262
FILE: ../../../third_party/skia/modules/skottie/include/ExternalLayer.h
52595263
FILE: ../../../third_party/skia/modules/skottie/src/Adapter.h
@@ -5296,6 +5300,7 @@ FILE: ../../../third_party/skia/modules/skshaper/src/SkShaper_coretext.cpp
52965300
FILE: ../../../third_party/skia/modules/skshaper/src/SkUnicode.h
52975301
FILE: ../../../third_party/skia/modules/skshaper/src/SkUnicode_icu.cpp
52985302
FILE: ../../../third_party/skia/samplecode/Sample3D.cpp
5303+
FILE: ../../../third_party/skia/samplecode/SampleAudio.cpp
52995304
FILE: ../../../third_party/skia/samplecode/SampleFitCubicToCircle.cpp
53005305
FILE: ../../../third_party/skia/samplecode/SampleSimpleStroker.cpp
53015306
FILE: ../../../third_party/skia/src/core/SkColorFilterPriv.h
@@ -5338,6 +5343,9 @@ FILE: ../../../third_party/skia/src/gpu/tessellate/GrWangsFormula.h
53385343
FILE: ../../../third_party/skia/src/gpu/text/GrSDFTOptions.cpp
53395344
FILE: ../../../third_party/skia/src/gpu/text/GrSDFTOptions.h
53405345
FILE: ../../../third_party/skia/src/opts/SkOpts_skx.cpp
5346+
FILE: ../../../third_party/skia/src/ports/SkAudioPlayer.cpp
5347+
FILE: ../../../third_party/skia/src/ports/SkAudioPlayer_mac.mm
5348+
FILE: ../../../third_party/skia/src/ports/SkAudioPlayer_none.cpp
53415349
FILE: ../../../third_party/skia/src/ports/SkScalerContext_mac_ct.h
53425350
FILE: ../../../third_party/skia/src/ports/SkTypeface_mac_ct.h
53435351
FILE: ../../../third_party/skia/src/utils/mac/SkCGBase.h

‎lib/ui/painting/canvas.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -486,10 +486,10 @@ void Canvas::drawShadow(const CanvasPath* path,
486486
}
487487

488488
void Canvas::Invalidate() {
489+
canvas_ = nullptr;
489490
if (dart_wrapper()) {
490491
ClearDartWrapper();
491492
}
492-
canvas_ = nullptr;
493493
}
494494

495495
} // namespace flutter

‎lib/ui/painting/image.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ Dart_Handle CanvasImage::toByteData(int format, Dart_Handle callback) {
3737
}
3838

3939
void CanvasImage::dispose() {
40-
ClearDartWrapper();
4140
image_.reset();
41+
ClearDartWrapper();
4242
}
4343

4444
size_t CanvasImage::GetAllocationSize() const {

‎lib/ui/painting/picture.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ Dart_Handle Picture::toImage(uint32_t width,
5656
}
5757

5858
void Picture::dispose() {
59-
ClearDartWrapper();
6059
picture_.reset();
60+
ClearDartWrapper();
6161
}
6262

6363
size_t Picture::GetAllocationSize() const {

‎lib/ui/window.dart‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1056,23 +1056,19 @@ class Window {
10561056
///
10571057
/// ## Android
10581058
///
1059-
/// On Android, calling
1060-
/// [`FlutterView.setInitialRoute`](/javadoc/io/flutter/view/FlutterView.html#setInitialRoute-java.lang.String-)
1061-
/// will set this value. The value must be set sufficiently early, i.e. before
1062-
/// the [runApp] call is executed in Dart, for this to have any effect on the
1063-
/// framework. The `createFlutterView` method in your `FlutterActivity`
1064-
/// subclass is a suitable time to set the value. The application's
1065-
/// `AndroidManifest.xml` file must also be updated to have a suitable
1066-
/// [`<intent-filter>`](https://developer.android.com/guide/topics/manifest/intent-filter-element.html).
1059+
/// On Android, the initial route can be set on the [initialRoute](/javadoc/io/flutter/embedding/android/FlutterActivity.NewEngineIntentBuilder.html#initialRoute-java.lang.String-)
1060+
/// method of the [FlutterActivity](/javadoc/io/flutter/embedding/android/FlutterActivity.html)'s
1061+
/// intent builder.
1062+
///
1063+
/// On a standalone engine, see https://flutter.dev/docs/development/add-to-app/android/add-flutter-screen#initial-route-with-a-cached-engine.
10671064
///
10681065
/// ## iOS
10691066
///
1070-
/// On iOS, calling
1071-
/// [`FlutterViewController.setInitialRoute`](/objcdoc/Classes/FlutterViewController.html#/c:objc%28cs%29FlutterViewController%28im%29setInitialRoute:)
1072-
/// will set this value. The value must be set sufficiently early, i.e. before
1073-
/// the [runApp] call is executed in Dart, for this to have any effect on the
1074-
/// framework. The `application:didFinishLaunchingWithOptions:` method is a
1075-
/// suitable time to set this value.
1067+
/// On iOS, the initial route can be set on the `initialRoute`
1068+
/// parameter of the [FlutterViewController](/objcdoc/Classes/FlutterViewController.html)'s
1069+
/// initializer.
1070+
///
1071+
/// On a standalone engine, see https://flutter.dev/docs/development/add-to-app/ios/add-flutter-screen#route.
10761072
///
10771073
/// See also:
10781074
///

‎lib/web_ui/lib/src/engine/compositor/canvaskit_api.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ class CanvasKit {
7676
external SkGrContext MakeGrContext(int glContext);
7777
external SkSurface MakeOnScreenGLSurface(
7878
SkGrContext grContext,
79-
double width,
80-
double height,
79+
int width,
80+
int height,
8181
SkColorSpace colorSpace,
8282
);
8383
external SkSurface MakeSWCanvasSurface(html.CanvasElement canvas);

0 commit comments

Comments
 (0)