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

removed forbidden skia include #38761

Merged
gaaclarke merged 2 commits into from
Jan 11, 2023
Merged

removed forbidden skia include #38761

gaaclarke merged 2 commits into from
Jan 11, 2023

Conversation

@gaaclarke
Copy link
Member

@gaaclarke gaaclarke commented Jan 11, 2023

fixes flutter/flutter#118280

Pre-launch Checklist

  • I read the Contributor Guide and followed the process outlined there for submitting PRs.
  • I read the Tree Hygiene wiki page, which explains my responsibilities.
  • I read and followed the Flutter Style Guide and the C++, Objective-C, Java style guides.
  • I listed at least one issue that this PR fixes in the description above.
  • I added new tests to check the change I am making or feature I am adding, or Hixie said the PR is test-exempt. See testing the engine for instructions on writing and running engine tests.
  • I updated/added relevant documentation (doc comments with ///).
  • I signed the CLA.
  • All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel on Discord.

@flutter-dashboard flutter-dashboard bot added the embedder Related to the embedder API label Jan 11, 2023
jason-simmons
jason-simmons reviewed Jan 11, 2023
View reviewed changes
shell/platform/embedder/tests/embedder_gl_unittests.cc Outdated
#include "flutter/testing/assertions_skia.h"
#include "flutter/testing/test_gl_surface.h"
#include "flutter/testing/testing.h"
#include "impeller/renderer/backend/gles/gles.h"
Copy link
Member

@jason-simmons jason-simmons Jan 11, 2023

Choose a reason for hiding this comment

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

Can this be included directly from a GLES header instead of going through an Impeller internal header?

Copy link
Member Author

@gaaclarke gaaclarke Jan 11, 2023

Choose a reason for hiding this comment

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

Yep done. I thought there would be magic for opengl es vs opengl. This works too.

@gaaclarke gaaclarke merged commit 9ade91c into flutter:main Jan 11, 2023
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Jan 11, 2023
Merged
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jan 11, 2023
@engine-flutter-autoroll
9ade91c8b removed forbidden skia include (flutter/engine#38761)
e18d0c4
auto-submit bot pushed a commit to flutter/flutter that referenced this pull request Jan 11, 2023
@engine-flutter-autoroll
9ade91c8b removed forbidden skia include (flutter/engine#38761) (#118296
a40fb9b 
)
sourcegraph-bot pushed a commit to sgtest/megarepo that referenced this pull request Jan 11, 2023
flutter: 9ade91c8b removed forbidden skia include (flutter/engine#38761…
2168f70 
…) (#118296)

Commit: a40fb9bdd76a5d8a3f135feaedc3b41b8996d482
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Jan 11, 2023
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jan 11, 2023
@engine-flutter-autoroll
a40fb9b 9ade91c8b removed forbidden skia include (flutter/engine#38761)…
2bfe844 
… (flutter/flutter#118296)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Jan 11, 2023
Merged
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jan 11, 2023
@engine-flutter-autoroll
a40fb9b 9ade91c8b removed forbidden skia include (flutter/engine#38761)…
259e5f9 
… (flutter/flutter#118296)
auto-submit bot pushed a commit to flutter/packages that referenced this pull request Jan 11, 2023
@engine-flutter-autoroll
Roll Flutter from f2c088b to f10965f (18 revisions) (#3039)
d09151d 
* 669a3d2 Roll Plugins from 0a0e3d205ca3 to 9fdc899b72ca (8 revisions) (flutter/flutter#118253)

* cb62cfd Manually mark Windows run_debug_test_windows as unflaky (flutter/flutter#118112)

* 0cd8d84 Marks Mac_arm64_android run_debug_test_android to be unflaky (flutter/flutter#117469)

* 3cee38e Marks Mac_arm64_ios run_debug_test_macos to be unflaky (flutter/flutter#117990)

* 1d2e62b remove unsound mode web test (flutter/flutter#118256)

* 3d3f8e8 Update `CupertinoPicker` example (flutter/flutter#118248)

* 594333b roll packages (flutter/flutter#118117)

* a6f17e6 Add option for opting out of enter route snapshotting. (flutter/flutter#118086)

* 01583b7 roll packages (flutter/flutter#118272)

* cf529ec Roll Flutter Engine from 687e3cb0fbe2 to c1d61cf11da8 (6 revisions) (flutter/flutter#118274)

* b7881e5 Align `flutter pub get/upgrade/add/remove/downgrade` (flutter/flutter#117896)

* 12b43ed ae9e181e3 Roll Dart SDK from 5e344de60564 to 7b4d49402252 (1 revision) (flutter/engine#38756) (flutter/flutter#118287)

* b13f83a Fix Finnish TimeOfDate format (flutter/flutter#118204)

* 55e3894 Roll Flutter Engine from ae9e181e30c2 to 53bd4bbf9646 (3 revisions) (flutter/flutter#118289)

* a40fb9b 9ade91c8b removed forbidden skia include (flutter/engine#38761) (flutter/flutter#118296)

* 32b1ea3 8d7beac82 Roll Dart SDK from 7b4d49402252 to 23cbd61a1327 (1 revision) (flutter/engine#38764) (flutter/flutter#118297)

* 957781a 6256f05db Roll Fuchsia Mac SDK from 6xysoRPCXJ3cJX12x... to a9NpYJbjhDRX9P9u4... (flutter/engine#38767) (flutter/flutter#118300)

* f10965f FIX: UnderlineInputBorder hashCode and equality by including borderRadius (flutter/flutter#118284)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Jan 12, 2023
Merged
engine-flutter-autoroll added a commit to engine-flutter-autoroll/plugins that referenced this pull request Jan 12, 2023
@engine-flutter-autoroll
a40fb9b 9ade91c8b removed forbidden skia include (flutter/engine#38761)…
cb1aabb 
… (flutter/flutter#118296)
auto-submit bot pushed a commit to flutter/plugins that referenced this pull request Jan 12, 2023
@engine-flutter-autoroll
Roll Flutter from 7ddf42e to 0d91c03 (58 revisions) (#6948)
b89e4fc 
* 5335a96 0a0e3d2 Roll Flutter from 43b9120 to 5070620 (9 revisions) (#6919) (flutter/flutter#118183)

* 6c225dd Roll Flutter Engine from 33d7f8a1b307 to 03609b420beb (6 revisions) (flutter/flutter#118125)

* 478d1da remove the unused check in selectable_text (flutter/flutter#117716)

* c87cfd7 Roll Flutter Engine from 03609b420beb to b5513d7a442a (2 revisions) (flutter/flutter#118186)

* 234452f Roll Flutter Engine from b5513d7a442a to 5bdb04f33f99 (2 revisions) (flutter/flutter#118187)

* 78416d8 51baed6e0 [fuchsia][scenic] Use infinite hit region (flutter/engine#38647) (flutter/flutter#118189)

* a02b9d2 Update to Xcode 14.2 (flutter/flutter#117507)

* eaaacdc Allow iOS and macOS plugins to share darwin directory (flutter/flutter#115337)

* 5bf6357 Roll Flutter Engine from 51baed6e01b8 to 5df0072a0e63 (3 revisions) (flutter/flutter#118192)

* 46e48ba Use program during attach if provided (flutter/flutter#118130)

* 31da712 eb5c6f0b4 iOS FlutterTextureRegistry should be a proxy, not the engine itself (flutter/engine#37666) (flutter/flutter#118197)

* fa1a4ee Update `ListTile` to support Material 3 (flutter/flutter#117965)

* 02a8bbf 3a7d8862f Re-enable UIA text/range provider unit tests (flutter/engine#38718) (flutter/flutter#118201)

* e9bbb11 Fix path for require.js (flutter/flutter#118120)

* 851611b ee0c4d26b Roll flutter/packages to 25454e (flutter/engine#38685) (flutter/flutter#118205)

* 00a9db8 Roll Flutter Engine from ee0c4d26b0fa to 264aa032cf75 (2 revisions) (flutter/flutter#118208)

* d6cd9c0 9c0b187a1 Roll Dart SDK from 853eff8b0faa to 418bee5da2e2 (4 revisions) (flutter/engine#38727) (flutter/flutter#118210)

* 4205357 add closed/open focus traversal; use open on web (flutter/flutter#115961)

* 466cb54 Roll Flutter Engine from 9c0b187a1139 to 716bb9172c0d (3 revisions) (flutter/flutter#118220)

* ad7322d Hide InkWell hover highlight when an hovered InkWell is disabled (flutter/flutter#118026)

* 583a812  Allow select cases to be numbers (flutter/flutter#116625)

* 700fe3d [Impeller Scene] Add SceneC asset importing (flutter/flutter#118157)

* 07bc245 Add a comment about repeat event + fix typos (flutter/flutter#118095)

* 5d96d61 Add  MaterialStateProperty `overlayColor` & `mouseCursor` and fix hovering on thumbs behavior (flutter/flutter#116894)

* f2c088b Roll Flutter Engine from 716bb9172c0d to 687e3cb0fbe2 (2 revisions) (flutter/flutter#118242)

* 669a3d2 Roll Plugins from 0a0e3d2 to 9fdc899 (8 revisions) (flutter/flutter#118253)

* cb62cfd Manually mark Windows run_debug_test_windows as unflaky (flutter/flutter#118112)

* 0cd8d84 Marks Mac_arm64_android run_debug_test_android to be unflaky (flutter/flutter#117469)

* 3cee38e Marks Mac_arm64_ios run_debug_test_macos to be unflaky (flutter/flutter#117990)

* 1d2e62b remove unsound mode web test (flutter/flutter#118256)

* 3d3f8e8 Update `CupertinoPicker` example (flutter/flutter#118248)

* 594333b roll packages (flutter/flutter#118117)

* a6f17e6 Add option for opting out of enter route snapshotting. (flutter/flutter#118086)

* 01583b7 roll packages (flutter/flutter#118272)

* cf529ec Roll Flutter Engine from 687e3cb0fbe2 to c1d61cf11da8 (6 revisions) (flutter/flutter#118274)

* b7881e5 Align `flutter pub get/upgrade/add/remove/downgrade` (flutter/flutter#117896)

* 12b43ed ae9e181e3 Roll Dart SDK from 5e344de60564 to 7b4d49402252 (1 revision) (flutter/engine#38756) (flutter/flutter#118287)

* b13f83a Fix Finnish TimeOfDate format (flutter/flutter#118204)

* 55e3894 Roll Flutter Engine from ae9e181e30c2 to 53bd4bbf9646 (3 revisions) (flutter/flutter#118289)

* a40fb9b 9ade91c8b removed forbidden skia include (flutter/engine#38761) (flutter/flutter#118296)

* 32b1ea3 8d7beac82 Roll Dart SDK from 7b4d49402252 to 23cbd61a1327 (1 revision) (flutter/engine#38764) (flutter/flutter#118297)

* 957781a 6256f05db Roll Fuchsia Mac SDK from 6xysoRPCXJ3cJX12x... to a9NpYJbjhDRX9P9u4... (flutter/engine#38767) (flutter/flutter#118300)

* f10965f FIX: UnderlineInputBorder hashCode and equality by including borderRadius (flutter/flutter#118284)

* 33c71be Bump actions/upload-artifact from 3.1.1 to 3.1.2 (flutter/flutter#118116)

* 2e0849e Bump actions/checkout from 3.1.0 to 3.3.0 (flutter/flutter#118052)

* aabf146 Bump github/codeql-action from 2.1.35 to 2.1.37 (flutter/flutter#117104)

* a50e2c8 6048f9110 Roll Dart SDK from 23cbd61a1327 to 22fa50e09ee8 (3 revisions) (flutter/engine#38776) (flutter/flutter#118320)

* e697805 Roll Plugins from 9fdc899 to 620a059 (4 revisions) (flutter/flutter#118317)

* b4a07de ee76ab71e Cleanup Skia includes in image_generator/descriptor (flutter/engine#38775) (flutter/flutter#118335)

* c6be43a Roll Flutter Engine from ee76ab71e0a6 to cccaae2f3d8b (3 revisions) (flutter/flutter#118349)

* 4b2d3eb 764a9e012 Roll Skia from e1f3980272f3 to dfb838747295 (48 revisions) (flutter/engine#38790) (flutter/flutter#118355)

* b2b4050 Roll Flutter Engine from 764a9e01204d to 4a8d6866a1c0 (2 revisions) (flutter/flutter#118357)

* 727e860 Marks Mac_ios complex_layout_scroll_perf_bad_ios__timeline_summary to be unflaky (flutter/flutter#111570)

* 13ebde6 Marks Mac channels_integration_test to be unflaky (flutter/flutter#111571)

* f8628b5 Marks Mac_ios platform_views_scroll_perf_non_intersecting_impeller_ios__timeline_summary to be unflaky (flutter/flutter#116668)

* 44f5403 Fix `SliverAppBar.large` and `SliverAppBar.medium` do not use `foregroundColor` (flutter/flutter#118322)

* 51c2af5 docs: update docs about color property in material card (flutter/flutter#117263)

* 0d91c03 Fix M3 `Drawer` default shape in RTL (flutter/flutter#118185)
esouthren pushed a commit to esouthren/flutter that referenced this pull request Jan 15, 2023
@engine-flutter-autoroll
9ade91c8b removed forbidden skia include (flutter/engine#38761) (flut…
9546a5e 
…ter#118296)
fluttermirroringbot pushed a commit to flutter/flutter that referenced this pull request Jan 16, 2023
@guidezpl @engine-flutter-autoroll
@Jasguerrero @darrenaustin @asashour @goderbauer @gnprice @CicadaCinema @thkim1011 @Renzo-Olivares @srawlins @peixinli @moffatman @mraleph @christopherfujino @fluttergithubbot @camsim99 @LongCatIsLooong @drewroengoogle @jason-simmons @nehalvpatel @gmackall @M97Chahboun @a-wallen @morriskurz @LucasXu0 @jmagman @helin24 @TahaTesser @nshahan @yjbanov @bleroux @bdero @loic-sharma @Time1ess @sigurdm @rydmike @dependabot @SuhwanCha @andrewkolos @QuncCccccc @joshualitt @awesometic @parlough @IvoB1987 @godofredoc @bernaferrari @IchordeDionysos @HansMuller @vashworth