198741 2019-06-10 21:58:38 -0700 waitForNavigationToComplete may be called before WebPageProxy knows it's loading 2019-06-14 20:20:51 -0700 1 1 1 Unclassified WebKit WebDriver WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 hi hi achristensen bburg beidson cgarcia commit-queue hi joepeck koivisto timothy webkit-bug-importer oldest_to_newest 1543596 0 hi 2019-06-10 21:58:38 -0700 If the timing of the communications to the `WebPageProxy` about the fact that it's actually `PageLoadingState::isLoading` is too "slow" or happens after `WebAutomationSession::waitForNavigationToCompleteOnPage` is called, the automation session will continue running commands, which can lead to a JavaScript error ("Callback was not called before the unload event") as any injected scripts will be cleared by the impending navigation, leaving the script evaluation callbacks "dangling". 1543597 1 hi 2019-06-10 21:58:55 -0700 <rdar://problem/31164316> 1543599 2 371820 hi 2019-06-10 22:05:03 -0700 Created attachment 371820 Patch 1543602 3 371820 hi 2019-06-10 22:09:53 -0700 Comment on attachment 371820 Patch I'm not 100% sure what exactly the difference is between `m_committedState` and `m_uncommittedState`, but it makes sense when I think about it, and it worked when testing locally. Another thing I thought of was to have `WebAutomationProxy` become a subclass of `PageLoadState::Observer` and more "eagerly" fire `waitForNavigationToComplete` callbacks `didChangeIsLoading` is called and `isLoading` is false at that time. I figured I'd wait to get some feedback to see if this is even the right direction before trying that. 1543816 4 371820 joepeck 2019-06-11 13:32:33 -0700 Comment on attachment 371820 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=371820&action=review Makes sense to me. r=me > Source/WebKit/ChangeLog:12 > + If the timing of the communications to the `WebPageProxy` about the fact that it's actually > + `PageLoadingState::isLoading` is too "slow" or happens after > + `WebAutomationSession::waitForNavigationToCompleteOnPage` is called, the automation session > + will continue running commands, which can lead to a JavaScript error ("Callback was not This seems a bit complex. It just sounds like there is a race between waitForNavigationToCompleteOnPage and PageLoadingState isLoading in provisional loads, and this better addresses it. > Source/WebKit/UIProcess/PageLoadState.h:128 > + bool isLoadingUncommitted() const; I wonder if a better name might be `isPerfomingProvisionalLoad()` or just a general `isPerformingLoad` which checks committed / uncommitted. Maybe the networking guys have a better suggestion given they work in this area more often. 1544673 5 372102 hi 2019-06-13 20:42:44 -0700 Created attachment 372102 Patch 1544690 6 372102 joepeck 2019-06-13 22:32:55 -0700 Comment on attachment 372102 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=372102&action=review > Source/WebKit/UIProcess/PageLoadState.cpp:175 > +bool PageLoadState::hasPendingLoad() const I'd have expected a name like this to check both committed and uncommitted. If the name was `hasPendingProvisionalLoad` I'd expect it to check uncommitted. 1544722 7 372102 hi 2019-06-14 01:38:22 -0700 Comment on attachment 372102 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=372102&action=review >> Source/WebKit/UIProcess/PageLoadState.cpp:175 >> +bool PageLoadState::hasPendingLoad() const > > I'd have expected a name like this to check both committed and uncommitted. > If the name was `hasPendingProvisionalLoad` I'd expect it to check uncommitted. I'd rather not use "provisional", as I think that has a different meaning in this context. Both `m_committedState` and `m_uncommittedState` have a `provisionalURL` member. Looking back at the commit history (<https://trac.webkit.org/r160405>), it's been referred to as the "uncommitted" state ("pending" was the closest word I could think of at the time). Including a check for `isLoading` (which checks `m_comittedState`) in this function would be weird with the current name, as `isLoading(m_committedState)` isn't really "pending" (it's been committed). If we keep the name as is, I'd prefer to not include `m_committedState`, but if we change it to something more "inclusive" then I have no objection. 1544942 8 372169 hi 2019-06-14 19:37:49 -0700 Created attachment 372169 Patch 1544947 9 372169 commit-queue 2019-06-14 20:20:49 -0700 Comment on attachment 372169 Patch Clearing flags on attachment: 372169 Committed r246456: <https://trac.webkit.org/changeset/246456> 1544948 10 commit-queue 2019-06-14 20:20:51 -0700 All reviewed patches have been landed. Closing bug. 371820 2019-06-10 22:05:03 -0700 2019-06-13 20:42:41 -0700 Patch bug-198741-20190610220502.patch text/plain 4340 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggZjZiN2YwNDI0MTkwNTE4NzJkYmNlZGU4YTIyZmE2OGI0YjBiN2MxYi4uMDY1 MTdkMmQ4MTdkNjc4NzgxNTU4Zjk2OTQ1ZThlMjJlM2NkM2IzYyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwzMyBAQAorMjAxOS0wNi0xMCAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CisK KyAgICAgICAgd2FpdEZvck5hdmlnYXRpb25Ub0NvbXBsZXRlIG1heSBiZSBjYWxsZWQgYmVmb3Jl IFdlYlBhZ2VQcm94eSBrbm93cyBpdCdzIGxvYWRpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5ODc0MQorICAgICAgICA8cmRhcjovL3Byb2JsZW0v MzExNjQzMTY+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgSWYgdGhlIHRpbWluZyBvZiB0aGUgY29tbXVuaWNhdGlvbnMgdG8gdGhlIGBXZWJQYWdlUHJv eHlgIGFib3V0IHRoZSBmYWN0IHRoYXQgaXQncyBhY3R1YWxseQorICAgICAgICBgUGFnZUxvYWRp bmdTdGF0ZTo6aXNMb2FkaW5nYCBpcyB0b28gInNsb3ciIG9yIGhhcHBlbnMgYWZ0ZXIKKyAgICAg ICAgYFdlYkF1dG9tYXRpb25TZXNzaW9uOjp3YWl0Rm9yTmF2aWdhdGlvblRvQ29tcGxldGVPblBh Z2VgIGlzIGNhbGxlZCwgdGhlIGF1dG9tYXRpb24gc2Vzc2lvbgorICAgICAgICB3aWxsIGNvbnRp bnVlIHJ1bm5pbmcgY29tbWFuZHMsIHdoaWNoIGNhbiBsZWFkIHRvIGEgSmF2YVNjcmlwdCBlcnJv ciAoIkNhbGxiYWNrIHdhcyBub3QKKyAgICAgICAgY2FsbGVkIGJlZm9yZSB0aGUgdW5sb2FkIGV2 ZW50IikgYXMgYW55IGluamVjdGVkIHNjcmlwdHMgd2lsbCBiZSBjbGVhcmVkIGJ5IHRoZSBpbXBl bmRpbmcKKyAgICAgICAgbmF2aWdhdGlvbiwgbGVhdmluZyB0aGUgc2NyaXB0IGV2YWx1YXRpb24g Y2FsbGJhY2tzICJkYW5nbGluZyIuCisKKyAgICAgICAgRXhwb3NlIG1vcmUgaW5mb3JtYXRpb24g ZnJvbSBgUGFnZUxvYWRTdGF0ZWAgYWJvdXQgd2hldGhlciBpdCB0aGlua3MgdGhlcmUncyBhIG5h dmlnYXRpb24KKyAgICAgICAgY3VycmVudGx5IGhhcHBlbmluZywgaW4gYWRkaXRpb24gdG8gdGhl IGV4aXN0aW5nICJ3ZSd2ZSBjb21taXR0ZWQgdG8gYSBuYXZpZ2F0aW9uIi4gSWYgYQorICAgICAg ICBuYXZpZ2F0aW9uICJtaWdodCIgYmUgaGFwcGVuaW5nLCBzdGlsbCB3YWl0IGZvciBpdCB0byBj b21wbGV0ZSBiZWZvcmUgY29udGludWluZy4KKworICAgICAgICBJbiB0aGUgYmVzdCBjYXNlLCBu byBuYXZpZ2F0aW9ucyBhcmUgIm1pc3NlZCIuCisKKyAgICAgICAgSW4gdGhlIHdvcnN0IGNhc2Us IHRoZSBhdXRvbWF0aW9uIHNlc3Npb24gd2lsbCB3YWl0IGBwYWdlTG9hZFRpbWVvdXRgIGJlZm9y ZSBjb250aW51aW5nLgorCisgICAgICAgICogVUlQcm9jZXNzL0F1dG9tYXRpb24vV2ViQXV0b21h dGlvblNlc3Npb24uY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6 d2FpdEZvck5hdmlnYXRpb25Ub0NvbXBsZXRlT25QYWdlKToKKworICAgICAgICAqIFVJUHJvY2Vz cy9QYWdlTG9hZFN0YXRlLmg6CisgICAgICAgICogVUlQcm9jZXNzL1BhZ2VMb2FkU3RhdGUuY3Bw OgorICAgICAgICAoV2ViS2l0OjpQYWdlTG9hZFN0YXRlOjppc0xvYWRpbmdVbmNvbW1pdHRlZCBj b25zdCk6IEFkZGVkLgorCiAyMDE5LTA2LTEwICBTYW0gV2VpbmlnICA8d2VpbmlnQGFwcGxlLmNv bT4KIAogICAgICAgICBSZW1vdmUgRGFzaGJvYXJkIHN1cHBvcnQKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0F1dG9tYXRpb24vV2ViQXV0b21hdGlvblNlc3Npb24uY3BwIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV0b21hdGlvbi9XZWJBdXRvbWF0aW9uU2Vzc2lvbi5j cHAKaW5kZXggMmY5Y2ZlOTQyNDAyNjE3MmQ5MDZkYmQxYTAzYzRjZDAxNTQ0YmI4Yi4uODI4OWRk ODkwNTI5NjdjYTNjOGFhZGEyMzY2NzVjN2VhZjg0ZmZjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQXV0b21hdGlvbi9XZWJBdXRvbWF0aW9uU2Vzc2lvbi5jcHAKKysrIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV0b21hdGlvbi9XZWJBdXRvbWF0aW9uU2Vzc2lvbi5j cHAKQEAgLTQ4NCw3ICs0ODQsNyBAQCB2b2lkIFdlYkF1dG9tYXRpb25TZXNzaW9uOjp3YWl0Rm9y TmF2aWdhdGlvblRvQ29tcGxldGUoY29uc3QgU3RyaW5nJiBicm93c2luZ0Nvbgogdm9pZCBXZWJB dXRvbWF0aW9uU2Vzc2lvbjo6d2FpdEZvck5hdmlnYXRpb25Ub0NvbXBsZXRlT25QYWdlKFdlYlBh Z2VQcm94eSYgcGFnZSwgSW5zcGVjdG9yOjpQcm90b2NvbDo6QXV0b21hdGlvbjo6UGFnZUxvYWRT dHJhdGVneSBsb2FkU3RyYXRlZ3ksIFNlY29uZHMgdGltZW91dCwgUmVmPEluc3BlY3Rvcjo6QmFj a2VuZERpc3BhdGNoZXI6OkNhbGxiYWNrQmFzZT4mJiBjYWxsYmFjaykKIHsKICAgICBBU1NFUlQo IW1fbG9hZFRpbWVyLmlzQWN0aXZlKCkpOwotICAgIGlmIChsb2FkU3RyYXRlZ3kgPT0gSW5zcGVj dG9yOjpQcm90b2NvbDo6QXV0b21hdGlvbjo6UGFnZUxvYWRTdHJhdGVneTo6Tm9uZSB8fCAhcGFn ZS5wYWdlTG9hZFN0YXRlKCkuaXNMb2FkaW5nKCkpIHsKKyAgICBpZiAobG9hZFN0cmF0ZWd5ID09 IEluc3BlY3Rvcjo6UHJvdG9jb2w6OkF1dG9tYXRpb246OlBhZ2VMb2FkU3RyYXRlZ3k6Ok5vbmUg fHwgKCFwYWdlLnBhZ2VMb2FkU3RhdGUoKS5pc0xvYWRpbmcoKSAmJiAhcGFnZS5wYWdlTG9hZFN0 YXRlKCkuaXNMb2FkaW5nVW5jb21taXR0ZWQoKSkpIHsKICAgICAgICAgY2FsbGJhY2stPnNlbmRT dWNjZXNzKEpTT046Ok9iamVjdDo6Y3JlYXRlKCkpOwogICAgICAgICByZXR1cm47CiAgICAgfQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUGFnZUxvYWRTdGF0ZS5jcHAgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9QYWdlTG9hZFN0YXRlLmNwcAppbmRleCBkMTAxNDhiYWNi N2Y0N2YyOTg3ZGZmYTE5NmJlNjkwNzkyMTQ0OGUyLi5jM2FmYzMxYmE1ODZiNDk2MDEyZWE0MmE5 OGU3NWMxNjZlNGJhODRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9QYWdl TG9hZFN0YXRlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9QYWdlTG9hZFN0YXRl LmNwcApAQCAtMTcyLDYgKzE3MiwxMSBAQCBib29sIFBhZ2VMb2FkU3RhdGU6OmlzTG9hZGluZygp IGNvbnN0CiAgICAgcmV0dXJuIGlzTG9hZGluZyhtX2NvbW1pdHRlZFN0YXRlKTsKIH0KIAorYm9v bCBQYWdlTG9hZFN0YXRlOjppc0xvYWRpbmdVbmNvbW1pdHRlZCgpIGNvbnN0Cit7CisgICAgcmV0 dXJuIGlzTG9hZGluZyhtX3VuY29tbWl0dGVkU3RhdGUpOworfQorCiBTdHJpbmcgUGFnZUxvYWRT dGF0ZTo6YWN0aXZlVVJMKGNvbnN0IERhdGEmIGRhdGEpCiB7CiAgICAgLy8gSWYgdGhlcmUgaXMg YSBjdXJyZW50bHkgcGVuZGluZyBVUkwsIGl0IGlzIHRoZSBhY3RpdmUgVVJMLApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUGFnZUxvYWRTdGF0ZS5oIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvUGFnZUxvYWRTdGF0ZS5oCmluZGV4IDY1MmQzNjBmODNiMWViYzRjYWNmNmJj OTRhNDE4ZDA5ZDE5ZjFjMWMuLjY5MTZlNmMzNTMwZmM4ZGFkMDUyZmI3YTExN2Y2YTZlNTBiMTEy ZjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1BhZ2VMb2FkU3RhdGUuaAor KysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9QYWdlTG9hZFN0YXRlLmgKQEAgLTEyNSw2ICsx MjUsOCBAQCBwdWJsaWM6CiAgICAgYm9vbCBpc0NvbW1pdHRlZCgpIGNvbnN0IHsgcmV0dXJuIG1f Y29tbWl0dGVkU3RhdGUuc3RhdGUgPT0gU3RhdGU6OkNvbW1pdHRlZDsgfQogICAgIGJvb2wgaXNG aW5pc2hlZCgpIGNvbnN0IHsgcmV0dXJuIG1fY29tbWl0dGVkU3RhdGUuc3RhdGUgPT0gU3RhdGU6 OkZpbmlzaGVkOyB9CiAKKyAgICBib29sIGlzTG9hZGluZ1VuY29tbWl0dGVkKCkgY29uc3Q7CisK ICAgICBjb25zdCBTdHJpbmcmIHByb3Zpc2lvbmFsVVJMKCkgY29uc3QgeyByZXR1cm4gbV9jb21t aXR0ZWRTdGF0ZS5wcm92aXNpb25hbFVSTDsgfQogICAgIGNvbnN0IFN0cmluZyYgdXJsKCkgY29u c3QgeyByZXR1cm4gbV9jb21taXR0ZWRTdGF0ZS51cmw7IH0KICAgICBjb25zdCBTdHJpbmcmIHVu cmVhY2hhYmxlVVJMKCkgY29uc3QgeyByZXR1cm4gbV9jb21taXR0ZWRTdGF0ZS51bnJlYWNoYWJs ZVVSTDsgfQo= 372102 2019-06-13 20:42:44 -0700 2019-06-14 19:37:47 -0700 Patch bug-198741-20190613204243.patch text/plain 4360 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggMGQ5OTAwOWY0NjQ0NGNlMDk0NWNkODAzYjcxNmQ2YWExYjExNTYzOS4uZWFk MGNkODAyNmI0NzEzNTlhNGQxOGVjZWE1NTlhN2Y2NWVmNjJkZCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwzMyBAQAorMjAxOS0wNi0xMyAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CisK KyAgICAgICAgd2FpdEZvck5hdmlnYXRpb25Ub0NvbXBsZXRlIG1heSBiZSBjYWxsZWQgYmVmb3Jl IFdlYlBhZ2VQcm94eSBrbm93cyBpdCdzIGxvYWRpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5ODc0MQorICAgICAgICA8cmRhcjovL3Byb2JsZW0v MzExNjQzMTY+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgSm9zZXBoIFBlY29yYXJvLgorCisgICAg ICAgIFRoZXJlJ3MgYSBwb3RlbnRpYWwgcmFjZSBpbiBgV2ViQXV0b21hdGlvblNlc3Npb246Ondh aXRGb3JOYXZpZ2F0aW9uVG9Db21wbGV0ZU9uUGFnZWAgd2hlbgorICAgICAgICBxdWVyeWluZyBm b3IgdGhlIGBXZWJQYWdlUHJveHlgJ3MgbG9hZGluZyBzdGF0ZSAodmlhIGBQYWdlTG9hZGluZ1N0 YXRlOjppc0xvYWRpbmdgKSwgaW4gdGhhdAorICAgICAgICBhIHBlbmRpbmcgbG9hZCBtYXkgYmUg Y29tbWl0dGVkIF9hZnRlcl8gdGhlIGBXZWJBdXRvbWF0aW9uU2Vzc2lvbmAgY2hlY2tzIGl0J3Mg dmFsdWUuIFRoaXMKKyAgICAgICAgbWFrZXMgdGhlIGF1dG9tYXRpb24gc2Vzc2lvbiB0aGluayB0 aGF0IGl0IGlzbid0IGxvYWRpbmcsIHNvIGl0IHdpbGwgY29udGludWUgcnVubmluZworICAgICAg ICBjb21tYW5kcywgd2hpY2ggY2FuIGxlYWQgdG8gYSBKYXZhU2NyaXB0IGVycm9yICgiQ2FsbGJh Y2sgd2FzIG5vdCBjYWxsZWQgYmVmb3JlIHRoZSB1bmxvYWQKKyAgICAgICAgZXZlbnQiKSBhcyBh bnkgaW5qZWN0ZWQgc2NyaXB0cyB3aWxsIGJlIGNsZWFyZWQgYnkgdGhlIGltcGVuZGluZyBuYXZp Z2F0aW9uLCBsZWF2aW5nIHRoZQorICAgICAgICBzY3JpcHQgZXZhbHVhdGlvbiBjYWxsYmFja3Mg ImRhbmdsaW5nIi4KKworICAgICAgICBFeHBvc2UgbW9yZSBpbmZvcm1hdGlvbiBmcm9tIGBQYWdl TG9hZFN0YXRlYCBhYm91dCB3aGV0aGVyIGl0IHRoaW5rcyB0aGVyZSBfbWF5XyBiZSBhCisgICAg ICAgIG5hdmlnYXRpb24gY3VycmVudGx5IGhhcHBlbmluZywgd2hpY2ggdGhlIGBXZWJBdXRvbWF0 aW9uU2Vzc2lvbmAgY2FuIHVzZSB0byBkZWxheSBjb21tYW5kcy4KKworICAgICAgICBJbiB0aGUg YmVzdCBjYXNlLCBubyBuYXZpZ2F0aW9ucyBhcmUgIm1pc3NlZCIuCisKKyAgICAgICAgSW4gdGhl IHdvcnN0IGNhc2UsIHRoZSBhdXRvbWF0aW9uIHNlc3Npb24gd2lsbCB3YWl0IGBwYWdlTG9hZFRp bWVvdXRgIGJlZm9yZSBjb250aW51aW5nLgorCisgICAgICAgICogVUlQcm9jZXNzL0F1dG9tYXRp b24vV2ViQXV0b21hdGlvblNlc3Npb24uY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJBdXRvbWF0 aW9uU2Vzc2lvbjo6d2FpdEZvck5hdmlnYXRpb25Ub0NvbXBsZXRlT25QYWdlKToKKworICAgICAg ICAqIFVJUHJvY2Vzcy9QYWdlTG9hZFN0YXRlLmg6CisgICAgICAgICogVUlQcm9jZXNzL1BhZ2VM b2FkU3RhdGUuY3BwOgorICAgICAgICAoV2ViS2l0OjpQYWdlTG9hZFN0YXRlOjppc0xvYWRpbmdV bmNvbW1pdHRlZCBjb25zdCk6IEFkZGVkLgorCiAyMDE5LTA2LTEyICBBbnRvaW5lIFF1aW50ICA8 Z3Jhb3V0c0BhcHBsZS5jb20+CiAKICAgICAgICAgU2hvdyB0aGUgd2ViIHBhZ2UgVVJMIHdoZW4g c2hhcmluZyBhbiBBUiBtb2RlbApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QXV0b21hdGlvbi9XZWJBdXRvbWF0aW9uU2Vzc2lvbi5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BdXRvbWF0aW9uL1dlYkF1dG9tYXRpb25TZXNzaW9uLmNwcAppbmRleCAyZjljZmU5NDI0 MDI2MTcyZDkwNmRiZDFhMDNjNGNkMDE1NDRiYjhiLi5iOTMxMDc3MjZlNjMxM2Y5YmQxNmJlMjNh YmExZGMyMDgwNzM0NTdmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BdXRv bWF0aW9uL1dlYkF1dG9tYXRpb25TZXNzaW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BdXRvbWF0aW9uL1dlYkF1dG9tYXRpb25TZXNzaW9uLmNwcApAQCAtNDg0LDcgKzQ4NCw3 IEBAIHZvaWQgV2ViQXV0b21hdGlvblNlc3Npb246OndhaXRGb3JOYXZpZ2F0aW9uVG9Db21wbGV0 ZShjb25zdCBTdHJpbmcmIGJyb3dzaW5nQ29uCiB2b2lkIFdlYkF1dG9tYXRpb25TZXNzaW9uOjp3 YWl0Rm9yTmF2aWdhdGlvblRvQ29tcGxldGVPblBhZ2UoV2ViUGFnZVByb3h5JiBwYWdlLCBJbnNw ZWN0b3I6OlByb3RvY29sOjpBdXRvbWF0aW9uOjpQYWdlTG9hZFN0cmF0ZWd5IGxvYWRTdHJhdGVn eSwgU2Vjb25kcyB0aW1lb3V0LCBSZWY8SW5zcGVjdG9yOjpCYWNrZW5kRGlzcGF0Y2hlcjo6Q2Fs bGJhY2tCYXNlPiYmIGNhbGxiYWNrKQogewogICAgIEFTU0VSVCghbV9sb2FkVGltZXIuaXNBY3Rp dmUoKSk7Ci0gICAgaWYgKGxvYWRTdHJhdGVneSA9PSBJbnNwZWN0b3I6OlByb3RvY29sOjpBdXRv bWF0aW9uOjpQYWdlTG9hZFN0cmF0ZWd5OjpOb25lIHx8ICFwYWdlLnBhZ2VMb2FkU3RhdGUoKS5p c0xvYWRpbmcoKSkgeworICAgIGlmIChsb2FkU3RyYXRlZ3kgPT0gSW5zcGVjdG9yOjpQcm90b2Nv bDo6QXV0b21hdGlvbjo6UGFnZUxvYWRTdHJhdGVneTo6Tm9uZSB8fCAoIXBhZ2UucGFnZUxvYWRT dGF0ZSgpLmlzTG9hZGluZygpICYmICFwYWdlLnBhZ2VMb2FkU3RhdGUoKS5oYXNQZW5kaW5nTG9h ZCgpKSkgewogICAgICAgICBjYWxsYmFjay0+c2VuZFN1Y2Nlc3MoSlNPTjo6T2JqZWN0OjpjcmVh dGUoKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9QYWdlTG9hZFN0YXRlLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Bh Z2VMb2FkU3RhdGUuY3BwCmluZGV4IGQxMDE0OGJhY2I3ZjQ3ZjI5ODdkZmZhMTk2YmU2OTA3OTIx NDQ4ZTIuLjExMWM2YmQzNjE0MDBhZjAwNGFlZmUxYjc0MTg5YjJiMDMxNDE1MGQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1BhZ2VMb2FkU3RhdGUuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1BhZ2VMb2FkU3RhdGUuY3BwCkBAIC0xNzIsNiArMTcyLDExIEBA IGJvb2wgUGFnZUxvYWRTdGF0ZTo6aXNMb2FkaW5nKCkgY29uc3QKICAgICByZXR1cm4gaXNMb2Fk aW5nKG1fY29tbWl0dGVkU3RhdGUpOwogfQogCitib29sIFBhZ2VMb2FkU3RhdGU6Omhhc1BlbmRp bmdMb2FkKCkgY29uc3QKK3sKKyAgICByZXR1cm4gaXNMb2FkaW5nKG1fdW5jb21taXR0ZWRTdGF0 ZSk7Cit9CisKIFN0cmluZyBQYWdlTG9hZFN0YXRlOjphY3RpdmVVUkwoY29uc3QgRGF0YSYgZGF0 YSkKIHsKICAgICAvLyBJZiB0aGVyZSBpcyBhIGN1cnJlbnRseSBwZW5kaW5nIFVSTCwgaXQgaXMg dGhlIGFjdGl2ZSBVUkwsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9QYWdl TG9hZFN0YXRlLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9QYWdlTG9hZFN0YXRlLmgKaW5k ZXggNjUyZDM2MGY4M2IxZWJjNGNhY2Y2YmM5NGE0MThkMDlkMTlmMWMxYy4uYWNlYWU1YzEwMmU4 MmE2NzJkOTExNmYxZGVlYmJmNDg0MDVkMmIxMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvUGFnZUxvYWRTdGF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Bh Z2VMb2FkU3RhdGUuaApAQCAtMTI1LDYgKzEyNSw4IEBAIHB1YmxpYzoKICAgICBib29sIGlzQ29t bWl0dGVkKCkgY29uc3QgeyByZXR1cm4gbV9jb21taXR0ZWRTdGF0ZS5zdGF0ZSA9PSBTdGF0ZTo6 Q29tbWl0dGVkOyB9CiAgICAgYm9vbCBpc0ZpbmlzaGVkKCkgY29uc3QgeyByZXR1cm4gbV9jb21t aXR0ZWRTdGF0ZS5zdGF0ZSA9PSBTdGF0ZTo6RmluaXNoZWQ7IH0KIAorICAgIGJvb2wgaGFzUGVu ZGluZ0xvYWQoKSBjb25zdDsKKwogICAgIGNvbnN0IFN0cmluZyYgcHJvdmlzaW9uYWxVUkwoKSBj b25zdCB7IHJldHVybiBtX2NvbW1pdHRlZFN0YXRlLnByb3Zpc2lvbmFsVVJMOyB9CiAgICAgY29u c3QgU3RyaW5nJiB1cmwoKSBjb25zdCB7IHJldHVybiBtX2NvbW1pdHRlZFN0YXRlLnVybDsgfQog ICAgIGNvbnN0IFN0cmluZyYgdW5yZWFjaGFibGVVUkwoKSBjb25zdCB7IHJldHVybiBtX2NvbW1p dHRlZFN0YXRlLnVucmVhY2hhYmxlVVJMOyB9Cg== 372169 2019-06-14 19:37:49 -0700 2019-06-14 20:20:49 -0700 Patch bug-198741-20190614193748.patch text/plain 4415 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggZjA0ZTFiZjUxNjBiM2VhMDkyZDYyMzYwYzFmOTlkYTY1NGQwNWIzYi4uZTk1 NzA2OTMzYjY3NTI3ZTI1YzM0YmU0NTlmZWI0NjZjMTMwMTE5OCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwzMyBAQAorMjAxOS0wNi0xNCAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CisK KyAgICAgICAgd2FpdEZvck5hdmlnYXRpb25Ub0NvbXBsZXRlIG1heSBiZSBjYWxsZWQgYmVmb3Jl IFdlYlBhZ2VQcm94eSBrbm93cyBpdCdzIGxvYWRpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5ODc0MQorICAgICAgICA8cmRhcjovL3Byb2JsZW0v MzExNjQzMTY+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgSm9zZXBoIFBlY29yYXJvLgorCisgICAg ICAgIFRoZXJlJ3MgYSBwb3RlbnRpYWwgcmFjZSBpbiBgV2ViQXV0b21hdGlvblNlc3Npb246Ondh aXRGb3JOYXZpZ2F0aW9uVG9Db21wbGV0ZU9uUGFnZWAgd2hlbgorICAgICAgICBxdWVyeWluZyBm b3IgdGhlIGBXZWJQYWdlUHJveHlgJ3MgbG9hZGluZyBzdGF0ZSAodmlhIGBQYWdlTG9hZGluZ1N0 YXRlOjppc0xvYWRpbmdgKSwgaW4gdGhhdAorICAgICAgICBhIHBlbmRpbmcgbG9hZCBtYXkgYmUg Y29tbWl0dGVkIF9hZnRlcl8gdGhlIGBXZWJBdXRvbWF0aW9uU2Vzc2lvbmAgY2hlY2tzIGl0J3Mg dmFsdWUuIFRoaXMKKyAgICAgICAgbWFrZXMgdGhlIGF1dG9tYXRpb24gc2Vzc2lvbiB0aGluayB0 aGF0IGl0IGlzbid0IGxvYWRpbmcsIHNvIGl0IHdpbGwgY29udGludWUgcnVubmluZworICAgICAg ICBjb21tYW5kcywgd2hpY2ggY2FuIGxlYWQgdG8gYSBKYXZhU2NyaXB0IGVycm9yICgiQ2FsbGJh Y2sgd2FzIG5vdCBjYWxsZWQgYmVmb3JlIHRoZSB1bmxvYWQKKyAgICAgICAgZXZlbnQiKSBhcyBh bnkgaW5qZWN0ZWQgc2NyaXB0cyB3aWxsIGJlIGNsZWFyZWQgYnkgdGhlIGltcGVuZGluZyBuYXZp Z2F0aW9uLCBsZWF2aW5nIHRoZQorICAgICAgICBzY3JpcHQgZXZhbHVhdGlvbiBjYWxsYmFja3Mg ImRhbmdsaW5nIi4KKworICAgICAgICBFeHBvc2UgbW9yZSBpbmZvcm1hdGlvbiBmcm9tIGBQYWdl TG9hZFN0YXRlYCBhYm91dCB3aGV0aGVyIGl0IHRoaW5rcyB0aGVyZSBfbWF5XyBiZSBhCisgICAg ICAgIG5hdmlnYXRpb24gY3VycmVudGx5IGhhcHBlbmluZywgd2hpY2ggdGhlIGBXZWJBdXRvbWF0 aW9uU2Vzc2lvbmAgY2FuIHVzZSB0byBkZWxheSBjb21tYW5kcy4KKworICAgICAgICBJbiB0aGUg YmVzdCBjYXNlLCBubyBuYXZpZ2F0aW9ucyBhcmUgIm1pc3NlZCIuCisKKyAgICAgICAgSW4gdGhl IHdvcnN0IGNhc2UsIHRoZSBhdXRvbWF0aW9uIHNlc3Npb24gd2lsbCB3YWl0IGBwYWdlTG9hZFRp bWVvdXRgIGJlZm9yZSBjb250aW51aW5nLgorCisgICAgICAgICogVUlQcm9jZXNzL0F1dG9tYXRp b24vV2ViQXV0b21hdGlvblNlc3Npb24uY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJBdXRvbWF0 aW9uU2Vzc2lvbjo6d2FpdEZvck5hdmlnYXRpb25Ub0NvbXBsZXRlT25QYWdlKToKKworICAgICAg ICAqIFVJUHJvY2Vzcy9QYWdlTG9hZFN0YXRlLmg6CisgICAgICAgICogVUlQcm9jZXNzL1BhZ2VM b2FkU3RhdGUuY3BwOgorICAgICAgICAoV2ViS2l0OjpQYWdlTG9hZFN0YXRlOjpoYXNVbmNvbW1p dHRlZExvYWQgY29uc3QpOiBBZGRlZC4KKwogMjAxOS0wNi0xNCAgWW91ZW5uIEZhYmxldCAgPHlv dWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgV2ViUHJvY2Vzc1Bvb2w6OmNsZWFyV2ViUHJvY2Vz c0hhc1VwbG9hZHMgY2Fubm90IGFzc3VtZSBpdHMgZ2l2ZW4gcHJvY2Vzc0lkZW50aWZpZXIgaXMg dmFsaWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0F1dG9tYXRpb24vV2Vi QXV0b21hdGlvblNlc3Npb24uY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV0b21hdGlv bi9XZWJBdXRvbWF0aW9uU2Vzc2lvbi5jcHAKaW5kZXggMmY5Y2ZlOTQyNDAyNjE3MmQ5MDZkYmQx YTAzYzRjZDAxNTQ0YmI4Yi4uMDYyMjZlYTJkZGIyNGEwYTE5MzBmOTNmN2MxOGU0ZDhkOTk1MWZj NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV0b21hdGlvbi9XZWJBdXRv bWF0aW9uU2Vzc2lvbi5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV0b21hdGlv bi9XZWJBdXRvbWF0aW9uU2Vzc2lvbi5jcHAKQEAgLTQ4NCw3ICs0ODQsNyBAQCB2b2lkIFdlYkF1 dG9tYXRpb25TZXNzaW9uOjp3YWl0Rm9yTmF2aWdhdGlvblRvQ29tcGxldGUoY29uc3QgU3RyaW5n JiBicm93c2luZ0Nvbgogdm9pZCBXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6d2FpdEZvck5hdmlnYXRp b25Ub0NvbXBsZXRlT25QYWdlKFdlYlBhZ2VQcm94eSYgcGFnZSwgSW5zcGVjdG9yOjpQcm90b2Nv bDo6QXV0b21hdGlvbjo6UGFnZUxvYWRTdHJhdGVneSBsb2FkU3RyYXRlZ3ksIFNlY29uZHMgdGlt ZW91dCwgUmVmPEluc3BlY3Rvcjo6QmFja2VuZERpc3BhdGNoZXI6OkNhbGxiYWNrQmFzZT4mJiBj YWxsYmFjaykKIHsKICAgICBBU1NFUlQoIW1fbG9hZFRpbWVyLmlzQWN0aXZlKCkpOwotICAgIGlm IChsb2FkU3RyYXRlZ3kgPT0gSW5zcGVjdG9yOjpQcm90b2NvbDo6QXV0b21hdGlvbjo6UGFnZUxv YWRTdHJhdGVneTo6Tm9uZSB8fCAhcGFnZS5wYWdlTG9hZFN0YXRlKCkuaXNMb2FkaW5nKCkpIHsK KyAgICBpZiAobG9hZFN0cmF0ZWd5ID09IEluc3BlY3Rvcjo6UHJvdG9jb2w6OkF1dG9tYXRpb246 OlBhZ2VMb2FkU3RyYXRlZ3k6Ok5vbmUgfHwgKCFwYWdlLnBhZ2VMb2FkU3RhdGUoKS5pc0xvYWRp bmcoKSAmJiAhcGFnZS5wYWdlTG9hZFN0YXRlKCkuaGFzVW5jb21taXR0ZWRMb2FkKCkpKSB7CiAg ICAgICAgIGNhbGxiYWNrLT5zZW5kU3VjY2VzcyhKU09OOjpPYmplY3Q6OmNyZWF0ZSgpKTsKICAg ICAgICAgcmV0dXJuOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1BhZ2VMb2FkU3RhdGUuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUGFnZUxvYWRTdGF0 ZS5jcHAKaW5kZXggZDEwMTQ4YmFjYjdmNDdmMjk4N2RmZmExOTZiZTY5MDc5MjE0NDhlMi4uMTAx ODVhNDY3NzY0OTAyZDAwNGY4MGM4Mzc2N2ExMDY5NTEwZTNhNSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvUGFnZUxvYWRTdGF0ZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvUGFnZUxvYWRTdGF0ZS5jcHAKQEAgLTE3Miw2ICsxNzIsMTEgQEAgYm9vbCBQYWdl TG9hZFN0YXRlOjppc0xvYWRpbmcoKSBjb25zdAogICAgIHJldHVybiBpc0xvYWRpbmcobV9jb21t aXR0ZWRTdGF0ZSk7CiB9CiAKK2Jvb2wgUGFnZUxvYWRTdGF0ZTo6aGFzVW5jb21taXR0ZWRMb2Fk KCkgY29uc3QKK3sKKyAgICByZXR1cm4gaXNMb2FkaW5nKG1fdW5jb21taXR0ZWRTdGF0ZSk7Cit9 CisKIFN0cmluZyBQYWdlTG9hZFN0YXRlOjphY3RpdmVVUkwoY29uc3QgRGF0YSYgZGF0YSkKIHsK ICAgICAvLyBJZiB0aGVyZSBpcyBhIGN1cnJlbnRseSBwZW5kaW5nIFVSTCwgaXQgaXMgdGhlIGFj dGl2ZSBVUkwsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9QYWdlTG9hZFN0 YXRlLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9QYWdlTG9hZFN0YXRlLmgKaW5kZXggNjUy ZDM2MGY4M2IxZWJjNGNhY2Y2YmM5NGE0MThkMDlkMTlmMWMxYy4uZGJlYWE5YTE3NDRhMmNkOTBi NThjNDU3ZjgxNmFlNTk4OWQ0N2Y3ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvUGFnZUxvYWRTdGF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1BhZ2VMb2Fk U3RhdGUuaApAQCAtMTI1LDYgKzEyNSw4IEBAIHB1YmxpYzoKICAgICBib29sIGlzQ29tbWl0dGVk KCkgY29uc3QgeyByZXR1cm4gbV9jb21taXR0ZWRTdGF0ZS5zdGF0ZSA9PSBTdGF0ZTo6Q29tbWl0 dGVkOyB9CiAgICAgYm9vbCBpc0ZpbmlzaGVkKCkgY29uc3QgeyByZXR1cm4gbV9jb21taXR0ZWRT dGF0ZS5zdGF0ZSA9PSBTdGF0ZTo6RmluaXNoZWQ7IH0KIAorICAgIGJvb2wgaGFzVW5jb21taXR0 ZWRMb2FkKCkgY29uc3Q7CisKICAgICBjb25zdCBTdHJpbmcmIHByb3Zpc2lvbmFsVVJMKCkgY29u c3QgeyByZXR1cm4gbV9jb21taXR0ZWRTdGF0ZS5wcm92aXNpb25hbFVSTDsgfQogICAgIGNvbnN0 IFN0cmluZyYgdXJsKCkgY29uc3QgeyByZXR1cm4gbV9jb21taXR0ZWRTdGF0ZS51cmw7IH0KICAg ICBjb25zdCBTdHJpbmcmIHVucmVhY2hhYmxlVVJMKCkgY29uc3QgeyByZXR1cm4gbV9jb21taXR0 ZWRTdGF0ZS51bnJlYWNoYWJsZVVSTDsgfQo=