Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix shader mask for text and shader bounds origin #27600

Merged
merged 5 commits into from
Jul 21, 2021
Merged

Fix shader mask for text and shader bounds origin #27600

merged 5 commits into from
Jul 21, 2021

Conversation

ferhatb
Copy link
Contributor

@ferhatb ferhatb commented Jul 20, 2021

  • Fixes shader mask text failure on Safari due to svg filter not applying to canvas element.
  • Fixes shader mask origin.

Related issue:
flutter/flutter#85140

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.

@ferhatb ferhatb requested a review from yjbanov July 20, 2021 21:33
@flutter-dashboard flutter-dashboard bot added the platform-web Code specifically for the web engine label Jul 20, 2021
@google-cla google-cla bot added the cla: yes label Jul 20, 2021
@ferhatb ferhatb mentioned this pull request Jul 20, 2021
Merged
yjbanov
yjbanov approved these changes Jul 21, 2021
View reviewed changes
Copy link
Contributor

@yjbanov yjbanov left a comment

Choose a reason for hiding this comment

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

lgtm

lib/web_ui/lib/src/engine/html/bitmap_canvas.dart Outdated
/// check isInsideSvgFilterTree to make sure dom node doesn't have any
/// parents that apply one.
if (paragraph.drawOnCanvas && _childOverdraw == false &&
_renderStrategy.isInsideSvgFilterTree == false) {
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: !_renderStrategy.isInsideSvgFilterTree instead of == false. !_childOverdraw too.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

@ferhatb ferhatb merged commit 37ece32 into flutter:master Jul 21, 2021
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Jul 21, 2021
Merged
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 21, 2021
@engine-flutter-autoroll
37ece32 Fix shader mask for text and shader bounds origin (flutter/en…
7c81e36 
…gine#27600)
naudzghebre pushed a commit to naudzghebre/engine that referenced this pull request Sep 2, 2021
@ferhatb
Fix shader mask for text and shader bounds origin (flutter#27600)
290756e
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yjbanov yjbanov yjbanov approved these changes

Assignees
No one assigned
Labels
cla: yes platform-web Code specifically for the web engine
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ferhatb @yjbanov