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

Cleanup Skia includes in image_generator/descriptor#38775

Merged
flar merged 2 commits into
flutter-team-archive:mainfrom
kjlubick:private-includes
Jan 11, 2023
Merged

Cleanup Skia includes in image_generator/descriptor#38775
flar merged 2 commits into
flutter-team-archive:mainfrom
kjlubick:private-includes

Conversation

@kjlubick

@kjlubick kjlubick commented Jan 11, 2023

Copy link
Copy Markdown
Contributor

third_party/skia/src/codec/SkCodecImageGenerator.h is not an official part of the Skia public API (yet?) and as of https://skia-review.googlesource.com/c/skia/+/627988 the Skia gn rules differentiate between public and private sources.

Because Flutter directly uses Skia's GN rules, we need to disable gn check for this one include (all other uses of private API are already guarded by // nogncheck

One of the two places that included SkCodecImageGenerator.h appeared not to need it. I cleaned up the Skia includes in both of those files.

$ git grep '#include "third_party/skia/src'
impeller/typographer/backends/skia/text_frame_skia.cc:#include "third_party/skia/src/core/SkStrikeSpec.h"    // nogncheck
impeller/typographer/backends/skia/text_frame_skia.cc:#include "third_party/skia/src/core/SkTextBlobPriv.h"  // nogncheck
impeller/typographer/backends/skia/text_render_context_skia.cc:#include "third_party/skia/src/core/SkIPoint16.h"   // nogncheck
impeller/typographer/backends/skia/text_render_context_skia.cc:#include "third_party/skia/src/gpu/GrRectanizer.h"  // nogncheck
lib/ui/painting/image_generator.h:#include "third_party/skia/src/codec/SkCodecImageGenerator.h"  // nogncheck

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 commented Jan 11, 2023

Copy link
Copy Markdown

It looks like this pull request may not have tests. Please make sure to add tests before merging. If you need an exemption to this rule, contact Hixie on the #hackers channel in Chat (don't just cc him here, he won't see it! He's on Discord!).

If you are not sure if you need tests, consider this rule of thumb: the purpose of a test is to make sure someone doesn't accidentally revert the fix. Ask yourself, is there anything in your PR that you feel it is important we not accidentally revert back to how it was before your fix?

Reviewers: Read the Tree Hygiene page and make sure this patch meets those guidelines before LGTMing.

flar
flar approved these changes Jan 11, 2023
View reviewed changes

@flar flar left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

@flar flar added the autosubmit Merge PR when tree becomes green via auto submit App label Jan 11, 2023
@auto-submit auto-submit Bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Jan 11, 2023
@auto-submit

auto-submit Bot commented Jan 11, 2023

Copy link
Copy Markdown
Contributor

auto label is removed for flutter/engine, pr: 38775, due to - Please get at least one approved review if you are already a member or two member reviews if you are not a member before re-applying this label. Reviewers: If you left a comment approving, please use the "approve" review action instead.

@auto-submit

auto-submit Bot commented Jan 11, 2023

Copy link
Copy Markdown
Contributor

auto label is removed for flutter/engine, pr: 38775, due to Validations Fail.

@flar flar added the autosubmit Merge PR when tree becomes green via auto submit App label Jan 11, 2023
@auto-submit auto-submit Bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Jan 11, 2023
@auto-submit

auto-submit Bot commented Jan 11, 2023

Copy link
Copy Markdown
Contributor

auto label is removed for flutter/engine, pr: 38775, due to - Please get at least one approved review if you are already a member or two member reviews if you are not a member before re-applying this label. Reviewers: If you left a comment approving, please use the "approve" review action instead.

@auto-submit

auto-submit Bot commented Jan 11, 2023

Copy link
Copy Markdown
Contributor

auto label is removed for flutter/engine, pr: 38775, due to Validations Fail.

@flar flar merged commit ee76ab7 into flutter-team-archive:main Jan 11, 2023
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Jan 11, 2023
Merged
@flar flar mentioned this pull request Jan 11, 2023
Closed
This was referenced Jan 12, 2023
Merged
Merged
@kjlubick kjlubick deleted the private-includes branch August 3, 2023 18:18
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

1 more reviewer
@flar flar flar approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

needs tests

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@kjlubick @flar