204592 2019-11-25 13:47:29 -0800 [Win] Ensure MiniBrowser can be built with !ENABLE(WEBKIT_LEGACY) 2019-11-25 18:57:17 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ross.kirsling ross.kirsling achristensen annulen bfulgham commit-queue don.olmstead ews-watchlist fujii gyuyoung.kim pvollan ryuan.choi sergio webkit-bug-importer oldest_to_newest 1593500 0 ross.kirsling 2019-11-25 13:47:29 -0800 [Win] Ensure MiniBrowser can be built with !ENABLE(WEBKIT_LEGACY) 1593501 1 384315 ross.kirsling 2019-11-25 13:47:52 -0800 Created attachment 384315 Patch 1593502 2 ross.kirsling 2019-11-25 13:50:30 -0800 Here's an alternative to bug 204483 which should hopefully be more palatable. 1593517 3 384315 don.olmstead 2019-11-25 14:20:54 -0800 Comment on attachment 384315 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=384315&action=review Fix the nits and we can merge assuming Apple folks have no complaints. > Tools/MiniBrowser/win/WinMain.cpp:46 > +#include "WebKitLegacyBrowserWindow.h" Know this is copy pasta but any reason why this isn't angle brackets? > Tools/PlatformWin.cmake:6 > +if (ENABLE_WEBKIT OR ENABLE_WEBKIT_LEGACY) > + add_subdirectory(MiniBrowser/win) > +endif () > + You can probably just `add_subdirectory` here since its always going to be true. 1593520 4 ross.kirsling 2019-11-25 14:30:13 -0800 (In reply to Don Olmstead from comment #3) > > Tools/MiniBrowser/win/WinMain.cpp:46 > > +#include "WebKitLegacyBrowserWindow.h" > > Know this is copy pasta but any reason why this isn't angle brackets? It's just a local file and not part of Source/WebKitLegacy. > > Tools/PlatformWin.cmake:6 > > +if (ENABLE_WEBKIT OR ENABLE_WEBKIT_LEGACY) > > + add_subdirectory(MiniBrowser/win) > > +endif () > > + > > You can probably just `add_subdirectory` here since its always going to be > true. I originally did, but since there's some logic for the "both" case, I thought this might be a nice assertion that the "neither" case is not a thing. Could go either way though, I suppose. 1593534 5 384315 fujii 2019-11-25 17:33:01 -0800 Comment on attachment 384315 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=384315&action=review > Tools/ChangeLog:7 > + What is the motivation? Why do you want to disable WebKit1? Disabling only WinCairo WebKit1 doesn't reduce the maintenance cost, but increases because we can't break AppleWin WebKit1. We should accelerate FTW port in order to deprecate AppleWin WebKit1. > Tools/MiniBrowser/win/WinMain.cpp:118 > IWebKitMessageLoopPtr messageLoop; I think IWebKitMessageLoop is problematic because we can't customize the message loop. 1. We can't use IsDialogMessage in the message loop for implementing modal dialogs 2. I have an issue of TranslateAccelerator. We can't customize how to call TranslateAccelerator in the message loop like this https://stackoverflow.com/a/20138696 I'm going to file another bug. 1593535 6 ross.kirsling 2019-11-25 17:41:24 -0800 (In reply to Fujii Hironori from comment #5) > Comment on attachment 384315 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=384315&action=review > > > Tools/ChangeLog:7 > > + > > What is the motivation? > Why do you want to disable WebKit1? > Disabling only WinCairo WebKit1 doesn't reduce the maintenance cost, but > increases because we can't break AppleWin WebKit1. > We should accelerate FTW port in order to deprecate AppleWin WebKit1. This patch doesn't in itself deprecate anything though, it simply ensures that Win MiniBrowser (and thus the full WinCairo build) doesn't require WKL in order to function. This should be independently desirable; I had even assumed that it was already the case prior to investigating this last week. 1593541 7 fujii 2019-11-25 17:59:07 -0800 It's obvious, but I don't object to land this patch if you insist. 1593543 8 ross.kirsling 2019-11-25 18:13:09 -0800 (In reply to Fujii Hironori from comment #7) > It's obvious, but I don't object to land this patch if you insist. Thanks. 1593547 9 384315 commit-queue 2019-11-25 18:56:41 -0800 Comment on attachment 384315 Patch Clearing flags on attachment: 384315 Committed r252872: <https://trac.webkit.org/changeset/252872> 1593548 10 commit-queue 2019-11-25 18:56:43 -0800 All reviewed patches have been landed. Closing bug. 1593549 11 webkit-bug-importer 2019-11-25 18:57:17 -0800 <rdar://problem/57480701> 384315 2019-11-25 13:47:52 -0800 2019-11-25 18:56:41 -0800 Patch bug-204592-20191125134752.patch text/plain 9309 ross.kirsling U3VidmVyc2lvbiBSZXZpc2lvbjogMjUyODY2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZWZmMTNkZDI4ZWUzM2QwOTE0YTExMjE3ZmZkZGUyNTVj ZDM4OTQ2Ni4uNzc3ODQ5ODRhOGE4NjVmYjNlMDRiZmZmMzgzNDg5NjRkNTRlODczZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIx IEBACisyMDE5LTExLTI1ICBSb3NzIEtpcnNsaW5nICA8cm9zcy5raXJzbGluZ0Bzb255LmNvbT4K KworICAgICAgICBbV2luXSBFbnN1cmUgTWluaUJyb3dzZXIgY2FuIGJlIGJ1aWx0IHdpdGggIUVO QUJMRShXRUJLSVRfTEVHQUNZKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjA0NTkyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBNaW5pQnJvd3Nlci93aW4vQ01ha2VMaXN0cy50eHQ6CisgICAgICAgICog TWluaUJyb3dzZXIvd2luL0NvbW1vbi5jcHA6CisgICAgICAgIChwYXJzZUNvbW1hbmRMaW5lKToK KyAgICAgICAgKiBNaW5pQnJvd3Nlci93aW4vQ29tbW9uLmg6CisgICAgICAgICogTWluaUJyb3dz ZXIvd2luL01haW5XaW5kb3cuY3BwOgorICAgICAgICAoTWFpbldpbmRvdzo6aW5pdCk6CisgICAg ICAgIChNYWluV2luZG93OjpXbmRQcm9jKToKKyAgICAgICAgKiBNaW5pQnJvd3Nlci93aW4vV2lu TWFpbi5jcHA6CisgICAgICAgICh3V2luTWFpbik6CisgICAgICAgICogUGxhdGZvcm1XaW4uY21h a2U6CisKIDIwMTktMTEtMjUgIFBoaWxpcHBlIE5vcm1hbmQgIDxwbm9ybWFuZEBpZ2FsaWEuY29t PgogCiAgICAgICAgIFtKSEJ1aWxkXSB4c2VydmVyIGJ1aWxkIGZhaWxzCmRpZmYgLS1naXQgYS9U b29scy9NaW5pQnJvd3Nlci93aW4vQ01ha2VMaXN0cy50eHQgYi9Ub29scy9NaW5pQnJvd3Nlci93 aW4vQ01ha2VMaXN0cy50eHQKaW5kZXggNjMxOTA3YTUxNDMzZTBmMWRjMDVkOThhYjgwYWFjMGI0 MGUzMGViZi4uN2ZiZDJmZmMwM2NhM2ViYmZjOWU4ZjI5MWY4MjhiNmU4OTc3NDljYiAxMDA2NDQK LS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL0NNYWtlTGlzdHMudHh0CisrKyBiL1Rvb2xzL01p bmlCcm93c2VyL3dpbi9DTWFrZUxpc3RzLnR4dApAQCAtMSwyMiArMSwxMyBAQAogc2V0KE1pbmlC cm93c2VyX0lOQ0xVREVfRElSRUNUT1JJRVMKICAgICAke1BBTF9GUkFNRVdPUktfSEVBREVSU19E SVJ9CiAgICAgJHtXZWJDb3JlX1BSSVZBVEVfRlJBTUVXT1JLX0hFQURFUlNfRElSfQotICAgICR7 V2ViS2l0TGVnYWN5X0ZSQU1FV09SS19IRUFERVJTX0RJUn0KLSAgICAke1dlYktpdF9GUkFNRVdP UktfSEVBREVSU19ESVJ9Ci0gICAgJHtXZWJLaXRfUFJJVkFURV9GUkFNRVdPUktfSEVBREVSU19E SVJ9CiApCiAKIHNldChNaW5pQnJvd3Nlcl9TT1VSQ0VTCi0gICAgQWNjZXNzaWJpbGl0eURlbGVn YXRlLmNwcAogICAgIEJyb3dzZXJXaW5kb3cuY3BwCiAgICAgQ29tbW9uLmNwcAogICAgIE1haW5X aW5kb3cuY3BwCi0gICAgUHJpbnRXZWJVSURlbGVnYXRlLmNwcAotICAgIFJlc291cmNlTG9hZERl bGVnYXRlLmNwcAotICAgIFdlYkRvd25sb2FkRGVsZWdhdGUuY3BwCiAgICAgTWluaUJyb3dzZXJM aWIucmMKLSAgICBNaW5pQnJvd3NlcldlYkhvc3QuY3BwCi0gICAgV2ViS2l0TGVnYWN5QnJvd3Nl cldpbmRvdy5jcHAKICAgICBXaW5NYWluLmNwcAogICAgIHN0ZGFmeC5jcHAKICkKQEAgLTI0LDgg KzE1LDYgQEAgc2V0KE1pbmlCcm93c2VyX1NPVVJDRVMKIHNldChNaW5pQnJvd3Nlcl9MSUJSQVJJ RVMKICAgICBEYmdIZWxwCiAgICAgV2ViS2l0OjpXVEYKLSAgICBXZWJLaXRMZWdhY3kKLSAgICBX ZWJLaXRMZWdhY3lHVUlECiAgICAgY29tY3RsMzIKICAgICBjb21zdXBwCiAgICAgY29tc3VwcHcK QEAgLTM4LDEyICsyNywzNyBAQCBpZiAoVVNFX0NGKQogICAgICkKIGVuZGlmICgpCiAKK2lmIChF TkFCTEVfV0VCS0lUX0xFR0FDWSkKKyAgICBhZGRfZGVmaW5pdGlvbnMoLURFTkFCTEVfV0VCS0lU X0xFR0FDWSkKKyAgICBsaXN0KEFQUEVORCBNaW5pQnJvd3Nlcl9JTkNMVURFX0RJUkVDVE9SSUVT CisgICAgICAgICR7V2ViS2l0TGVnYWN5X0ZSQU1FV09SS19IRUFERVJTX0RJUn0KKyAgICApCisg ICAgbGlzdChBUFBFTkQgTWluaUJyb3dzZXJfU09VUkNFUworICAgICAgICBBY2Nlc3NpYmlsaXR5 RGVsZWdhdGUuY3BwCisgICAgICAgIE1pbmlCcm93c2VyV2ViSG9zdC5jcHAKKyAgICAgICAgUHJp bnRXZWJVSURlbGVnYXRlLmNwcAorICAgICAgICBSZXNvdXJjZUxvYWREZWxlZ2F0ZS5jcHAKKyAg ICAgICAgV2ViRG93bmxvYWREZWxlZ2F0ZS5jcHAKKyAgICAgICAgV2ViS2l0TGVnYWN5QnJvd3Nl cldpbmRvdy5jcHAKKyAgICApCisgICAgbGlzdChBUFBFTkQgTWluaUJyb3dzZXJfTElCUkFSSUVT CisgICAgICAgIFdlYktpdExlZ2FjeQorICAgICAgICBXZWJLaXRMZWdhY3lHVUlECisgICAgKQor ZW5kaWYgKCkKKwogaWYgKEVOQUJMRV9XRUJLSVQpCiAgICAgYWRkX2RlZmluaXRpb25zKC1ERU5B QkxFX1dFQktJVCkKKyAgICBsaXN0KEFQUEVORCBNaW5pQnJvd3Nlcl9JTkNMVURFX0RJUkVDVE9S SUVTCisgICAgICAgICR7V2ViS2l0X0ZSQU1FV09SS19IRUFERVJTX0RJUn0KKyAgICAgICAgJHtX ZWJLaXRfUFJJVkFURV9GUkFNRVdPUktfSEVBREVSU19ESVJ9CisgICAgKQogICAgIGxpc3QoQVBQ RU5EIE1pbmlCcm93c2VyX1NPVVJDRVMKICAgICAgICAgV2ViS2l0QnJvd3NlcldpbmRvdy5jcHAK ICAgICApCi0gICAgbGlzdChBUFBFTkQgTWluaUJyb3dzZXJfTElCUkFSSUVTIFdlYktpdCkKKyAg ICBsaXN0KEFQUEVORCBNaW5pQnJvd3Nlcl9MSUJSQVJJRVMKKyAgICAgICAgV2ViS2l0CisgICAg KQogZW5kaWYgKCkKIAogc2V0KENNQUtFX1NIQVJFRF9MSU5LRVJfRkxBR1MgIiR7Q01BS0VfU0hB UkVEX0xJTktFUl9GTEFHU30gJHtNU1ZDX1JVTlRJTUVfTElOS0VSX0ZMQUdTfSIpCmRpZmYgLS1n aXQgYS9Ub29scy9NaW5pQnJvd3Nlci93aW4vQ29tbW9uLmNwcCBiL1Rvb2xzL01pbmlCcm93c2Vy L3dpbi9Db21tb24uY3BwCmluZGV4IGY4ZWY2YzA2YTg2MmNmM2Y4MjRlMTUzNmUzYjM4MzM0Y2Jm NzAzYmUuLjg3ZmRlOTI4YzEyYTkxZjEzYTRmOGJjMmYyZGMyNDA5N2U0MmYyZDAgMTAwNjQ0Ci0t LSBhL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9Db21tb24uY3BwCisrKyBiL1Rvb2xzL01pbmlCcm93 c2VyL3dpbi9Db21tb24uY3BwCkBAIC0yNzEsOCArMjcxLDEwIEBAIENvbW1hbmRMaW5lT3B0aW9u cyBwYXJzZUNvbW1hbmRMaW5lKCkKICAgICAgICAgICAgIG9wdGlvbnMudXNlc0xheWVyZWRXZWJW aWV3ID0gdHJ1ZTsKICAgICAgICAgZWxzZSBpZiAoIXdjc2ljbXAoYXJndltpXSwgTCItLWRlc2t0 b3AiKSkKICAgICAgICAgICAgIG9wdGlvbnMudXNlRnVsbERlc2t0b3AgPSB0cnVlOworI2lmIEVO QUJMRShXRUJLSVRfTEVHQUNZKQogICAgICAgICBlbHNlIGlmICghd2NzaWNtcChhcmd2W2ldLCBM Ii0td2sxIikgfHwgIXdjc2ljbXAoYXJndltpXSwgTCItLWxlZ2FjeSIpKQogICAgICAgICAgICAg b3B0aW9ucy53aW5kb3dUeXBlID0gQnJvd3NlcldpbmRvd1R5cGU6OldlYktpdExlZ2FjeTsKKyNl bmRpZgogI2lmIEVOQUJMRShXRUJLSVQpCiAgICAgICAgIGVsc2UgaWYgKCF3Y3NpY21wKGFyZ3Zb aV0sIEwiLS13azIiKSB8fCAhd2NzaWNtcChhcmd2W2ldLCBMIi0td2Via2l0IikpCiAgICAgICAg ICAgICBvcHRpb25zLndpbmRvd1R5cGUgPSBCcm93c2VyV2luZG93VHlwZTo6V2ViS2l0OwpkaWZm IC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL0NvbW1vbi5oIGIvVG9vbHMvTWluaUJyb3dz ZXIvd2luL0NvbW1vbi5oCmluZGV4IGY5OTllMTM1MjJkNGVkODRkMWI5ZmNjYmM0ZjE5OTgzMTNk NDk4YjQuLmQ5OTZmZWI2NGUwMmQ3Mzk5ZjJlZDBiMzRkM2QwZGQwMzEzM2Y4MjQgMTAwNjQ0Ci0t LSBhL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9Db21tb24uaAorKysgYi9Ub29scy9NaW5pQnJvd3Nl ci93aW4vQ29tbW9uLmgKQEAgLTI3LDcgKzI3LDYgQEAKIAogI2luY2x1ZGUgInN0ZGFmeC5oIgog I2luY2x1ZGUgIk1haW5XaW5kb3cuaCIKLSNpbmNsdWRlICJXZWJLaXRMZWdhY3lCcm93c2VyV2lu ZG93LmgiCiAKIGVudW0gY2xhc3MgQnJvd3NlcldpbmRvd1R5cGUgewogICAgIFdlYktpdCwKZGlm ZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9NYWluV2luZG93LmNwcCBiL1Rvb2xzL01p bmlCcm93c2VyL3dpbi9NYWluV2luZG93LmNwcAppbmRleCBiNTZkMTRkMzM2YmJhNjM5NGE0Y2I0 OGU1MWZlOTg4NmE1Y2ZmNjljLi44MmQyOGJiZDQyODJjMmI2YjNkMTQ0MWU4MjJiNGZhNDFlNjk5 ZTc4IDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci93aW4vTWFpbldpbmRvdy5jcHAKKysr IGIvVG9vbHMvTWluaUJyb3dzZXIvd2luL01haW5XaW5kb3cuY3BwCkBAIC0yOCwxNCArMjgsMjAg QEAKIAogI2luY2x1ZGUgIkNvbW1vbi5oIgogI2luY2x1ZGUgIk1pbmlCcm93c2VyTGliUmVzb3Vy Y2UuaCIKLSNpbmNsdWRlICJXZWJLaXRMZWdhY3lCcm93c2VyV2luZG93LmgiCi0jaW5jbHVkZSA8 Q29yZUZvdW5kYXRpb24vQ29yZUZvdW5kYXRpb24uaD4KICNpbmNsdWRlIDxzc3RyZWFtPgogCisj aWYgVVNFKENGKQorI2luY2x1ZGUgPENvcmVGb3VuZGF0aW9uL0NvcmVGb3VuZGF0aW9uLmg+Cisj ZW5kaWYKKwogI2lmIEVOQUJMRShXRUJLSVQpCiAjaW5jbHVkZSAiV2ViS2l0QnJvd3NlcldpbmRv dy5oIgogI2VuZGlmCiAKKyNpZiBFTkFCTEUoV0VCS0lUX0xFR0FDWSkKKyNpbmNsdWRlICJXZWJL aXRMZWdhY3lCcm93c2VyV2luZG93LmgiCisjZW5kaWYKKwogbmFtZXNwYWNlIFdlYkNvcmUgewog ZmxvYXQgZGV2aWNlU2NhbGVGYWN0b3JGb3JXaW5kb3coSFdORCk7CiB9CkBAIC0xMTUsNiArMTIx LDkgQEAgYm9vbCBNYWluV2luZG93Ojppbml0KEJyb3dzZXJXaW5kb3dGYWN0b3J5IGZhY3Rvcnks IEhJTlNUQU5DRSBoSW5zdGFuY2UsIGJvb2wgdXMKICNpZiAhRU5BQkxFKFdFQktJVCkKICAgICBF bmFibGVNZW51SXRlbShHZXRNZW51KG1faE1haW5XbmQpLCBJRE1fTkVXX1dFQktJVF9XSU5ET1cs IE1GX0dSQVlFRCk7CiAjZW5kaWYKKyNpZiAhRU5BQkxFKFdFQktJVF9MRUdBQ1kpCisgICAgRW5h YmxlTWVudUl0ZW0oR2V0TWVudShtX2hNYWluV25kKSwgSURNX05FV19XRUJLSVRMRUdBQ1lfV0lO RE9XLCBNRl9HUkFZRUQpOworI2VuZGlmCiAKICAgICBtX2hCYWNrQnV0dG9uV25kID0gQ3JlYXRl V2luZG93KEwiQlVUVE9OIiwgTCI8IiwgV1NfQ0hJTEQgfCBXU19WSVNJQkxFICB8IEJTX1RFWFQs IDAsIDAsIDAsIDAsIG1faE1haW5XbmQsIHJlaW50ZXJwcmV0X2Nhc3Q8SE1FTlU+KElETV9ISVNU T1JZX0JBQ0tXQVJEKSwgaEluc3RhbmNlLCAwKTsKICAgICBtX2hGb3J3YXJkQnV0dG9uV25kID0g Q3JlYXRlV2luZG93KEwiQlVUVE9OIiwgTCI+IiwgV1NfQ0hJTEQgfCBXU19WSVNJQkxFIHwgQlNf VEVYVCwgMCwgMCwgMCwgMCwgbV9oTWFpblduZCwgcmVpbnRlcnByZXRfY2FzdDxITUVOVT4oSURN X0hJU1RPUllfRk9SV0FSRCksIGhJbnN0YW5jZSwgMCk7CkBAIC0xOTMsMTIgKzIwMiwxNCBAQCBM UkVTVUxUIENBTExCQUNLIE1haW5XaW5kb3c6OlduZFByb2MoSFdORCBoV25kLCBVSU5UIG1lc3Nh Z2UsIFdQQVJBTSB3UGFyYW0sIExQQQogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KICNl bmRpZgorI2lmIEVOQUJMRShXRUJLSVRfTEVHQUNZKQogICAgICAgICBjYXNlIElETV9ORVdfV0VC S0lUTEVHQUNZX1dJTkRPVzogewogICAgICAgICAgICAgYXV0byYgbmV3V2luZG93ID0gTWFpbldp bmRvdzo6Y3JlYXRlKCkubGVha1JlZigpOwogICAgICAgICAgICAgbmV3V2luZG93LmluaXQoV2Vi S2l0TGVnYWN5QnJvd3NlcldpbmRvdzo6Y3JlYXRlLCBoSW5zdCk7CiAgICAgICAgICAgICBTaG93 V2luZG93KG5ld1dpbmRvdy5od25kKCksIFNXX1NIT1cpOwogICAgICAgICAgICAgYnJlYWs7CiAg ICAgICAgIH0KKyNlbmRpZgogICAgICAgICBjYXNlIElETV9DTE9TRV9XSU5ET1c6CiAgICAgICAg ICAgICBQb3N0TWVzc2FnZShoV25kLCBXTV9DTE9TRSwgMCwgMCk7CiAgICAgICAgICAgICBicmVh azsKZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9XaW5NYWluLmNwcCBiL1Rvb2xz L01pbmlCcm93c2VyL3dpbi9XaW5NYWluLmNwcAppbmRleCBjYjRhYzhmMzA3YzY1ZWM5ZThmYjdm M2IyZmRlMGM4Yzg5NDI1NGZmLi5iMWQxN2U4OGRlNjFhNmYxOTY4MzBmNjI2MDRlNDE3NDU2NDUw NmJkIDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci93aW4vV2luTWFpbi5jcHAKKysrIGIv VG9vbHMvTWluaUJyb3dzZXIvd2luL1dpbk1haW4uY3BwCkBAIC0zMiwxNCArMzIsMjEgQEAKICNp bmNsdWRlICJDb21tb24uaCIKICNpbmNsdWRlICJNaW5pQnJvd3NlckxpYlJlc291cmNlLmgiCiAj aW5jbHVkZSAiTWluaUJyb3dzZXJSZXBsYWNlLmgiCi0jaW5jbHVkZSAiV2ViS2l0TGVnYWN5QnJv d3NlcldpbmRvdy5oIgotI2luY2x1ZGUgPFdlYktpdExlZ2FjeS9XZWJLaXRDT01BUEkuaD4KICNp bmNsdWRlIDx3dGYvd2luL1NvZnRMaW5raW5nLmg+CiAKKyNpZiBVU0UoQ0YpCisjaW5jbHVkZSA8 Q29yZUZvdW5kYXRpb24vQ29yZUZvdW5kYXRpb24uaD4KKyNlbmRpZgorCiAjaWYgRU5BQkxFKFdF QktJVCkKICNpbmNsdWRlICJXZWJLaXRCcm93c2VyV2luZG93LmgiCiAjZW5kaWYKIAorI2lmIEVO QUJMRShXRUJLSVRfTEVHQUNZKQorI2luY2x1ZGUgIldlYktpdExlZ2FjeUJyb3dzZXJXaW5kb3cu aCIKKyNpbmNsdWRlIDxXZWJLaXRMZWdhY3kvV2ViS2l0Q09NQVBJLmg+CisjZW5kaWYKKwogU09G VF9MSU5LX0xJQlJBUlkodXNlcjMyKTsKIFNPRlRfTElOS19PUFRJT05BTCh1c2VyMzIsIFNldFBy b2Nlc3NEcGlBd2FyZW5lc3NDb250ZXh0LCBCT09MLCBTVERBUElDQUxMVFlQRSwgKERQSV9BV0FS RU5FU1NfQ09OVEVYVCkpOwogCkBAIC03MiwxMCArNzksMTIgQEAgaW50IFdJTkFQSSB3V2luTWFp bihfSW5fIEhJTlNUQU5DRSBoSW5zdGFuY2UsIF9Jbl9vcHRfIEhJTlNUQU5DRSBoUHJldkluc3Rh bmNlLAogICAgIGVsc2UKICAgICAgICAgOjpTZXRQcm9jZXNzRFBJQXdhcmUoKTsKIAorI2lmICFF TkFCTEUoV0VCS0lUX0xFR0FDWSkKKyAgICBhdXRvIGZhY3RvcnkgPSBXZWJLaXRCcm93c2VyV2lu ZG93OjpjcmVhdGU7CisjZWxpZiAhRU5BQkxFKFdFQktJVCkKICAgICBhdXRvIGZhY3RvcnkgPSBX ZWJLaXRMZWdhY3lCcm93c2VyV2luZG93OjpjcmVhdGU7Ci0jaWYgRU5BQkxFKFdFQktJVCkKLSAg ICBpZiAob3B0aW9ucy53aW5kb3dUeXBlID09IEJyb3dzZXJXaW5kb3dUeXBlOjpXZWJLaXQpCi0g ICAgICAgIGZhY3RvcnkgPSBXZWJLaXRCcm93c2VyV2luZG93OjpjcmVhdGU7CisjZWxzZQorICAg IGF1dG8gZmFjdG9yeSA9IG9wdGlvbnMud2luZG93VHlwZSA9PSBCcm93c2VyV2luZG93VHlwZTo6 V2ViS2l0ID8gV2ViS2l0QnJvd3NlcldpbmRvdzo6Y3JlYXRlIDogV2ViS2l0TGVnYWN5QnJvd3Nl cldpbmRvdzo6Y3JlYXRlOwogI2VuZGlmCiAgICAgYXV0byYgbWFpbldpbmRvdyA9IE1haW5XaW5k b3c6OmNyZWF0ZSgpLmxlYWtSZWYoKTsKICAgICBIUkVTVUxUIGhyID0gbWFpbldpbmRvdy5pbml0 KGZhY3RvcnksIGhJbnN0LCBvcHRpb25zLnVzZXNMYXllcmVkV2ViVmlldyk7CkBAIC05NSw2ICsx MDQsMTcgQEAgaW50IFdJTkFQSSB3V2luTWFpbihfSW5fIEhJTlNUQU5DRSBoSW5zdGFuY2UsIF9J bl9vcHRfIEhJTlNUQU5DRSBoUHJldkluc3RhbmNlLAogCiAgICAgLy8gTWFpbiBtZXNzYWdlIGxv b3A6CiAgICAgX190cnkgeworI2lmIEVOQUJMRShXRUJLSVQpCisgICAgICAgIHdoaWxlIChHZXRN ZXNzYWdlKCZtc2csIG51bGxwdHIsIDAsIDApKSB7CisjaWYgVVNFKENGKQorICAgICAgICAgICAg Q0ZSdW5Mb29wUnVuSW5Nb2RlKGtDRlJ1bkxvb3BEZWZhdWx0TW9kZSwgMCwgdHJ1ZSk7CisjZW5k aWYKKyAgICAgICAgICAgIGlmICghVHJhbnNsYXRlQWNjZWxlcmF0b3IobXNnLmh3bmQsIGhBY2Nl bFRhYmxlLCAmbXNnKSkgeworICAgICAgICAgICAgICAgIFRyYW5zbGF0ZU1lc3NhZ2UoJm1zZyk7 CisgICAgICAgICAgICAgICAgRGlzcGF0Y2hNZXNzYWdlKCZtc2cpOworICAgICAgICAgICAgfQor ICAgICAgICB9CisjZWxzZQogICAgICAgICBJV2ViS2l0TWVzc2FnZUxvb3BQdHIgbWVzc2FnZUxv b3A7CiAKICAgICAgICAgaHIgPSBXZWJLaXRDcmVhdGVJbnN0YW5jZShDTFNJRF9XZWJLaXRNZXNz YWdlTG9vcCwgMCwgSUlEX0lXZWJLaXRNZXNzYWdlTG9vcCwgcmVpbnRlcnByZXRfY2FzdDx2b2lk Kio+KCZtZXNzYWdlTG9vcC5HZXRJbnRlcmZhY2VQdHIoKSkpOwpAQCAtMTAyLDExICsxMjIsMTMg QEAgaW50IFdJTkFQSSB3V2luTWFpbihfSW5fIEhJTlNUQU5DRSBoSW5zdGFuY2UsIF9Jbl9vcHRf IEhJTlNUQU5DRSBoUHJldkluc3RhbmNlLAogICAgICAgICAgICAgZ290byBleGl0OwogCiAgICAg ICAgIG1lc3NhZ2VMb29wLT5ydW4oaEFjY2VsVGFibGUpOwotCisjZW5kaWYKICAgICB9IF9fZXhj ZXB0KGNyZWF0ZUNyYXNoUmVwb3J0KEdldEV4Y2VwdGlvbkluZm9ybWF0aW9uKCkpLCBFWENFUFRJ T05fRVhFQ1VURV9IQU5ETEVSKSB7IH0KIAogZXhpdDoKKyNpZiAhRU5BQkxFKFdFQktJVCkKICAg ICBzaHV0RG93bldlYktpdCgpOworI2VuZGlmCiAjaWZkZWYgX0NSVERCR19NQVBfQUxMT0MKICAg ICBfQ3J0RHVtcE1lbW9yeUxlYWtzKCk7CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1Rvb2xzL1BsYXRm b3JtV2luLmNtYWtlIGIvVG9vbHMvUGxhdGZvcm1XaW4uY21ha2UKaW5kZXggYmRkOGE3NDYwYjg4 NWFkYmJhZmI5YmZjMGVkYmEzY2M4OGEyNWM5Ny4uNDQzMDFkNWZlZjljOTc3ZGMwMjI4YjlkZTFh ZTc1MjYzZWZkOTAxNCAxMDA2NDQKLS0tIGEvVG9vbHMvUGxhdGZvcm1XaW4uY21ha2UKKysrIGIv VG9vbHMvUGxhdGZvcm1XaW4uY21ha2UKQEAgLTEsOCArMSwxMSBAQAogYWRkX3N1YmRpcmVjdG9y eShJbWFnZURpZmYpCiAKK2lmIChFTkFCTEVfV0VCS0lUIE9SIEVOQUJMRV9XRUJLSVRfTEVHQUNZ KQorICAgIGFkZF9zdWJkaXJlY3RvcnkoTWluaUJyb3dzZXIvd2luKQorZW5kaWYgKCkKKwogaWYg KEVOQUJMRV9XRUJLSVRfTEVHQUNZKQogICAgIGFkZF9zdWJkaXJlY3RvcnkoRHVtcFJlbmRlclRy ZWUpCi0gICAgYWRkX3N1YmRpcmVjdG9yeShNaW5pQnJvd3Nlci93aW4pCiBlbmRpZiAoKQogCiBp ZiAoRU5BQkxFX1dFQktJVCkK