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.

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

browser(webkit): rebase to 06/12/22 (r295478) #14815

Merged
merged 1 commit into from
Jun 14, 2022

Conversation

dpino
Copy link
Contributor

@dpino dpino commented Jun 13, 2022

Rebase to r295478. Changes:

I'm not sure why export.sh webkit updated also these other files:

  • webkit/embedder/Playwright/Playwright.xcodeproj/project.pbxproj
  • webkit/embedder/Playwright/win/Playwright.rc
  • webkit/embedder/Playwright/win/PlaywrightLib.rc

@yury-s
Copy link
Member

yury-s commented Jun 13, 2022

I'm not sure why export.sh webkit updated also these other files:

@aslushnikov ^^

@yury-s
Copy link
Member

yury-s commented Jun 13, 2022

  • webkit/embedder/Playwright/win/Playwright.rc
  • webkit/embedder/Playwright/win/PlaywrightLib.rc

These are whitespace only (you can make github UI show it properly1). Perhaps you and @aslushnikov used different editors to open/save the files?

Footnotes

  1. image

Copy link
Member

@yury-s yury-s left a comment

Choose a reason for hiding this comment

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

In any case it should be safe to revert all changes in browser_patches/webkit/embedder/ (if you didn't modify them intentionally, they should not be affected by the roll).

browser_patches/webkit/patches/bootstrap.diff Show resolved Hide resolved
@yury-s
Copy link
Member

yury-s commented Jun 14, 2022

The .rc files are windows-specific so it's probably your git settings or editor that replace \r\n with \n.

@dpino dpino force-pushed the rebase-to-06/12/22-r295478 branch from 1c3c97c to 36f661c Compare June 14, 2022 01:50
@dpino
Copy link
Contributor Author

dpino commented Jun 14, 2022

I skipped the Windows specific files this time. I added an extra commit to fix dependencies update in Ubuntu 18.04.

All changes in this PR:

@yury-s yury-s merged commit 6a78500 into microsoft:main Jun 14, 2022
@dpino dpino deleted the rebase-to-06/12/22-r295478 branch September 9, 2022 09:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants