199195 2019-06-25 11:18:10 -0700 Perform less work when a pre-warmed WebProcess is suspended or resumed. 2019-12-17 10:14:35 -0800 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 pvollan pvollan bfulgham cdumez commit-queue darin dean_johnson ggaren sam webkit-bug-importer oldest_to_newest 1547744 0 pvollan 2019-06-25 11:18:10 -0700 This is a confirmed improvement in page load time. 1547745 1 372848 pvollan 2019-06-25 11:21:34 -0700 Created attachment 372848 Patch 1547767 2 372853 pvollan 2019-06-25 13:05:26 -0700 Created attachment 372853 Patch 1548019 3 372853 bfulgham 2019-06-26 07:42:46 -0700 Comment on attachment 372853 Patch R=me 1548020 4 372853 cdumez 2019-06-26 07:43:29 -0700 Comment on attachment 372853 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=372853&action=review > Source/WebKit/WebProcess/WebProcess.cpp:1476 > + return; Seems like it should do something like this before returning: if (shouldAcknowledgeWhenReadyToSuspend == ShouldAcknowledgeWhenReadyToSuspend::Yes) { RELEASE_LOG(ProcessSuspension, "%p - WebProcess::actualPrepareToSuspend() Sending ProcessReadyToSuspend IPC message", this); parentProcessConnection()->send(Messages::WebProcessProxy::ProcessReadyToSuspend(), 0); } > Source/WebKit/WebProcess/WebProcess.cpp:1536 > + ASSERT(m_processType != ProcessType::PrewarmedWebContent); I am not convinced this assert is correct. Why do you think it is? 1548023 5 372853 cdumez 2019-06-26 07:45:46 -0700 Comment on attachment 372853 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=372853&action=review > Source/WebKit/ChangeLog:8 > + Return early from WebProcess::actualPrepareToSuspend and WebProcess::processDidResume Have you tried not doing the IPC round trip altogether? 1548070 6 pvollan 2019-06-26 11:21:28 -0700 (In reply to Chris Dumez from comment #5) > Comment on attachment 372853 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=372853&action=review > > > Source/WebKit/ChangeLog:8 > > + Return early from WebProcess::actualPrepareToSuspend and WebProcess::processDidResume > > Have you tried not doing the IPC round trip altogether? I will try that. Thanks for reviewing, everyone! 1548881 7 373132 pvollan 2019-06-28 11:00:31 -0700 Created attachment 373132 Patch 1548883 8 pvollan 2019-06-28 11:03:29 -0700 (In reply to Chris Dumez from comment #5) > Comment on attachment 372853 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=372853&action=review > > > Source/WebKit/ChangeLog:8 > > + Return early from WebProcess::actualPrepareToSuspend and WebProcess::processDidResume > > Have you tried not doing the IPC round trip altogether? I am still evaluating a patch for this, and might propose a patch later on depending on the results. Perhaps we also could consider suspending the pre-warmed process after some timeout, instead of an immediate suspension? 1548886 9 373134 pvollan 2019-06-28 11:09:51 -0700 Created attachment 373134 Patch 1548931 10 webkit-bug-importer 2019-06-28 13:43:58 -0700 <rdar://problem/52349969> 1548990 11 pvollan 2019-06-28 16:37:58 -0700 It seems the performance benefit of not doing the IPC roundtrip is comparable to the approach in the current patch, so I think we can stick with this approach. 1549026 12 373134 sam 2019-06-29 09:48:06 -0700 Comment on attachment 373134 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=373134&action=review > Source/WebKit/WebProcess/WebProcess.cpp:1474 > +#if PLATFORM(COCOA) What makes this cocoa specific? Can this have a more specific conditional? #if SUPPORTS(...). 1549030 13 pvollan 2019-06-29 12:53:54 -0700 (In reply to Sam Weinig from comment #12) > Comment on attachment 373134 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=373134&action=review > > > Source/WebKit/WebProcess/WebProcess.cpp:1474 > > +#if PLATFORM(COCOA) > > What makes this cocoa specific? Can this have a more specific conditional? > #if SUPPORTS(...). Currently, m_processType is only declared for cocoa platforms. Perhaps we could declare it for all platforms, and let it have the default value 'ProcessType::WebContent' for platforms not supporting pre-warming? 1549057 14 sam 2019-06-29 21:24:14 -0700 (In reply to Per Arne Vollan from comment #13) > (In reply to Sam Weinig from comment #12) > > Comment on attachment 373134 [details] > > Patch > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=373134&action=review > > > > > Source/WebKit/WebProcess/WebProcess.cpp:1474 > > > +#if PLATFORM(COCOA) > > > > What makes this cocoa specific? Can this have a more specific conditional? > > #if SUPPORTS(...). > > Currently, m_processType is only declared for cocoa platforms. Perhaps we > could declare it for all platforms, and let it have the default value > 'ProcessType::WebContent' for platforms not supporting pre-warming? Declaring it for all platforms would be fine and/or guarding it with a more specific conditional. PLATFORM(COCOA) should only be used for conditions that are really Cocoa specific (e.g. requires NSColor). 1549062 15 pvollan 2019-06-29 21:38:43 -0700 (In reply to Sam Weinig from comment #14) > (In reply to Per Arne Vollan from comment #13) > > (In reply to Sam Weinig from comment #12) > > > Comment on attachment 373134 [details] > > > Patch > > > > > > View in context: > > > https://bugs.webkit.org/attachment.cgi?id=373134&action=review > > > > > > > Source/WebKit/WebProcess/WebProcess.cpp:1474 > > > > +#if PLATFORM(COCOA) > > > > > > What makes this cocoa specific? Can this have a more specific conditional? > > > #if SUPPORTS(...). > > > > Currently, m_processType is only declared for cocoa platforms. Perhaps we > > could declare it for all platforms, and let it have the default value > > 'ProcessType::WebContent' for platforms not supporting pre-warming? > > Declaring it for all platforms would be fine and/or guarding it with a more > specific conditional. PLATFORM(COCOA) should only be used for conditions > that are really Cocoa specific (e.g. requires NSColor). Sounds good! I will update the patch. Thanks for reviewing! 1549065 16 373186 pvollan 2019-06-29 21:47:13 -0700 Created attachment 373186 Patch 1549093 17 373186 darin 2019-06-30 13:14:14 -0700 Comment on attachment 373186 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=373186&action=review > Source/WebKit/WebProcess/WebProcess.h:-552 > -#if PLATFORM(COCOA) > enum class ProcessType { Inspector, ServiceWorker, PrewarmedWebContent, CachedWebContent, WebContent }; > ProcessType m_processType { ProcessType::WebContent }; > -#endif What motivates this change? The rest of the m_processType code is inside #if PLATFORM(MAC/COCOA/IOS_FAMILY) conditionals. That includes code in WebProcess functions initializeWebProcess, setIsInProcessCache, and markIsNoLongerPrewarmed. Why the change in strategy only for this newly written code? We could have removed some of those other conditionals too if we are deciding to change our conditionals strategy. Typically I would suggest staying with the #if PLATFORM(COCOA) or remove more of it, not leave it mixed. 1549209 18 pvollan 2019-07-01 07:37:34 -0700 (In reply to Darin Adler from comment #17) > Comment on attachment 373186 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=373186&action=review > > > Source/WebKit/WebProcess/WebProcess.h:-552 > > -#if PLATFORM(COCOA) > > enum class ProcessType { Inspector, ServiceWorker, PrewarmedWebContent, CachedWebContent, WebContent }; > > ProcessType m_processType { ProcessType::WebContent }; > > -#endif > > What motivates this change? The rest of the m_processType code is inside #if > PLATFORM(MAC/COCOA/IOS_FAMILY) conditionals. That includes code in > WebProcess functions initializeWebProcess, setIsInProcessCache, and > markIsNoLongerPrewarmed. Why the change in strategy only for this newly > written code? We could have removed some of those other conditionals too if > we are deciding to change our conditionals strategy. > > Typically I would suggest staying with the #if PLATFORM(COCOA) or remove > more of it, not leave it mixed. I will add '#if PLATFORM(COCOA)' back for consistency. I created https://bugs.webkit.org/show_bug.cgi?id=199362 to declare m_processType for all platforms, since I think the related code could be cross platform. Thanks for reviewing! 1549211 19 373234 pvollan 2019-07-01 07:42:12 -0700 Created attachment 373234 Patch 1549226 20 373234 commit-queue 2019-07-01 08:34:22 -0700 Comment on attachment 373234 Patch Clearing flags on attachment: 373234 Committed r247009: <https://trac.webkit.org/changeset/247009> 372848 2019-06-25 11:21:34 -0700 2019-06-25 13:05:25 -0700 Patch bug-199195-20190625112133.patch text/plain 2035 pvollan SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNDY3OTcpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE5LTA2LTI1ICBQZXIgQXJuZSBW b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBQZXJmb3JtIGxlc3Mgd29yayB3 aGVuIGEgcHJlLXdhcm1lZCBXZWJQcm9jZXNzIGlzIHN1c3BlbmRlZCBvciByZXN1bWVkLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk5MTk1CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmV0dXJuIGVhcmx5 IGZyb20gV2ViUHJvY2Vzczo6YWN0dWFsUHJlcGFyZVRvU3VzcGVuZCBhbmQgV2ViUHJvY2Vzczo6 cHJvY2Vzc0RpZFJlc3VtZQorICAgICAgICBpZiB0aGlzIGlzIGEgcHJlLXdhcm1lZCBwcm9jZXNz LiBUaGlzIGlzIGEgY29uZmlybWVkIGltcHJvdmVtZW50IGluIHBhZ2UgbG9hZCB0aW1lLgorCisg ICAgICAgICogV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2Vi UHJvY2Vzczo6YWN0dWFsUHJlcGFyZVRvU3VzcGVuZCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBy b2Nlc3M6OmNhbmNlbFByZXBhcmVUb1N1c3BlbmQpOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9j ZXNzOjpwcm9jZXNzRGlkUmVzdW1lKToKKwogMjAxOS0wNi0yNSAgWW91ZW5uIEZhYmxldCAgPHlv dWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgQ2xvc2Ugc29ja2V0cyB3aXRoIHRvbyBoaWdoIGZp bGUgZGVzY3JpcHRvcgpJbmRleDogU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3Mu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNw cAkocmV2aXNpb24gMjQ2Nzk0KQorKysgU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nl c3MuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNDcxLDYgKzE0NzEsOSBAQCB2b2lkIFdlYlByb2Nl c3M6OmFjdHVhbFByZXBhcmVUb1N1c3BlbmQoCiAgICAgU2V0Rm9yU2NvcGU8Ym9vbD4gc3VzcGVu c2lvblNjb3BlKG1faXNTdXNwZW5kaW5nLCB0cnVlKTsKICAgICBtX3Byb2Nlc3NJc1N1c3BlbmRl ZCA9IHRydWU7CiAKKyAgICBpZiAobV9wcm9jZXNzVHlwZSA9PSBQcm9jZXNzVHlwZTo6UHJld2Fy bWVkV2ViQ29udGVudCkKKyAgICAgICAgcmV0dXJuOworCiAjaWYgRU5BQkxFKFZJREVPKQogICAg IHN1c3BlbmRBbGxNZWRpYUJ1ZmZlcmluZygpOwogICAgIGlmIChhdXRvKiBwbGF0Zm9ybU1lZGlh U2Vzc2lvbk1hbmFnZXIgPSBQbGF0Zm9ybU1lZGlhU2Vzc2lvbk1hbmFnZXI6OnNoYXJlZE1hbmFn ZXJJZkV4aXN0cygpKQpAQCAtMTUyNyw2ICsxNTMwLDggQEAgdm9pZCBXZWJQcm9jZXNzOjpjYW5j ZWxQcmVwYXJlVG9TdXNwZW5kKAogCiAgICAgbV9wcm9jZXNzSXNTdXNwZW5kZWQgPSBmYWxzZTsK IAorICAgIFJFTEVBU0VfQVNTRVJUKG1fcHJvY2Vzc1R5cGUgIT0gUHJvY2Vzc1R5cGU6OlByZXdh cm1lZFdlYkNvbnRlbnQpOworCiAgICAgdW5mcmVlemVBbGxMYXllclRyZWVzKCk7CiAKICNpZiBQ TEFURk9STShJT1NfRkFNSUxZKQpAQCAtMTYwMyw2ICsxNjA4LDkgQEAgdm9pZCBXZWJQcm9jZXNz Ojpwcm9jZXNzRGlkUmVzdW1lKCkKIAogICAgIG1fcHJvY2Vzc0lzU3VzcGVuZGVkID0gZmFsc2U7 CiAKKyAgICBpZiAobV9wcm9jZXNzVHlwZSA9PSBQcm9jZXNzVHlwZTo6UHJld2FybWVkV2ViQ29u dGVudCkKKyAgICAgICAgcmV0dXJuOworCiAgICAgY2FuY2VsTWFya0FsbExheWVyc1ZvbGF0aWxl KCk7CiAgICAgdW5mcmVlemVBbGxMYXllclRyZWVzKCk7CiAgICAgCg== 372853 2019-06-25 13:05:26 -0700 2019-06-28 11:00:28 -0700 Patch bug-199195-20190625130525.patch text/plain 2117 pvollan SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNDY3OTcpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE5LTA2LTI1ICBQZXIgQXJuZSBW b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBQZXJmb3JtIGxlc3Mgd29yayB3 aGVuIGEgcHJlLXdhcm1lZCBXZWJQcm9jZXNzIGlzIHN1c3BlbmRlZCBvciByZXN1bWVkLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk5MTk1CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmV0dXJuIGVhcmx5 IGZyb20gV2ViUHJvY2Vzczo6YWN0dWFsUHJlcGFyZVRvU3VzcGVuZCBhbmQgV2ViUHJvY2Vzczo6 cHJvY2Vzc0RpZFJlc3VtZQorICAgICAgICBpZiB0aGlzIGlzIGEgcHJlLXdhcm1lZCBwcm9jZXNz LiBUaGlzIGlzIGEgY29uZmlybWVkIGltcHJvdmVtZW50IGluIHBhZ2UgbG9hZCB0aW1lLgorCisg ICAgICAgICogV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2Vi UHJvY2Vzczo6YWN0dWFsUHJlcGFyZVRvU3VzcGVuZCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBy b2Nlc3M6OmNhbmNlbFByZXBhcmVUb1N1c3BlbmQpOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9j ZXNzOjpwcm9jZXNzRGlkUmVzdW1lKToKKwogMjAxOS0wNi0yNSAgWW91ZW5uIEZhYmxldCAgPHlv dWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgQ2xvc2Ugc29ja2V0cyB3aXRoIHRvbyBoaWdoIGZp bGUgZGVzY3JpcHRvcgpJbmRleDogU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3Mu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNw cAkocmV2aXNpb24gMjQ2Nzk0KQorKysgU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nl c3MuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNDcxLDYgKzE0NzEsMTEgQEAgdm9pZCBXZWJQcm9j ZXNzOjphY3R1YWxQcmVwYXJlVG9TdXNwZW5kKAogICAgIFNldEZvclNjb3BlPGJvb2w+IHN1c3Bl bnNpb25TY29wZShtX2lzU3VzcGVuZGluZywgdHJ1ZSk7CiAgICAgbV9wcm9jZXNzSXNTdXNwZW5k ZWQgPSB0cnVlOwogCisjaWYgUExBVEZPUk0oQ09DT0EpCisgICAgaWYgKG1fcHJvY2Vzc1R5cGUg PT0gUHJvY2Vzc1R5cGU6OlByZXdhcm1lZFdlYkNvbnRlbnQpCisgICAgICAgIHJldHVybjsKKyNl bmRpZgorCiAjaWYgRU5BQkxFKFZJREVPKQogICAgIHN1c3BlbmRBbGxNZWRpYUJ1ZmZlcmluZygp OwogICAgIGlmIChhdXRvKiBwbGF0Zm9ybU1lZGlhU2Vzc2lvbk1hbmFnZXIgPSBQbGF0Zm9ybU1l ZGlhU2Vzc2lvbk1hbmFnZXI6OnNoYXJlZE1hbmFnZXJJZkV4aXN0cygpKQpAQCAtMTUyNyw2ICsx NTMyLDEwIEBAIHZvaWQgV2ViUHJvY2Vzczo6Y2FuY2VsUHJlcGFyZVRvU3VzcGVuZCgKIAogICAg IG1fcHJvY2Vzc0lzU3VzcGVuZGVkID0gZmFsc2U7CiAKKyNpZiBQTEFURk9STShDT0NPQSkKKyAg ICBBU1NFUlQobV9wcm9jZXNzVHlwZSAhPSBQcm9jZXNzVHlwZTo6UHJld2FybWVkV2ViQ29udGVu dCk7CisjZW5kaWYKKwogICAgIHVuZnJlZXplQWxsTGF5ZXJUcmVlcygpOwogCiAjaWYgUExBVEZP Uk0oSU9TX0ZBTUlMWSkKQEAgLTE2MDMsNiArMTYxMiwxMSBAQCB2b2lkIFdlYlByb2Nlc3M6OnBy b2Nlc3NEaWRSZXN1bWUoKQogCiAgICAgbV9wcm9jZXNzSXNTdXNwZW5kZWQgPSBmYWxzZTsKIAor I2lmIFBMQVRGT1JNKENPQ09BKQorICAgIGlmIChtX3Byb2Nlc3NUeXBlID09IFByb2Nlc3NUeXBl OjpQcmV3YXJtZWRXZWJDb250ZW50KQorICAgICAgICByZXR1cm47CisjZW5kaWYKKwogICAgIGNh bmNlbE1hcmtBbGxMYXllcnNWb2xhdGlsZSgpOwogICAgIHVuZnJlZXplQWxsTGF5ZXJUcmVlcygp OwogICAgIAo= 373132 2019-06-28 11:00:31 -0700 2019-06-28 11:09:49 -0700 Patch bug-199195-20190628110030.patch text/plain 2412 pvollan SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNDY5MjgpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE5LTA2LTI4ICBQZXIgQXJuZSBW b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBQZXJmb3JtIGxlc3Mgd29yayB3 aGVuIGEgcHJlLXdhcm1lZCBXZWJQcm9jZXNzIGlzIHN1c3BlbmRlZCBvciByZXN1bWVkLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk5MTk1CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmV0dXJuIGVhcmx5 IGZyb20gV2ViUHJvY2Vzczo6YWN0dWFsUHJlcGFyZVRvU3VzcGVuZCBhbmQgV2ViUHJvY2Vzczo6 cHJvY2Vzc0RpZFJlc3VtZQorICAgICAgICBpZiB0aGlzIGlzIGEgcHJlLXdhcm1lZCBwcm9jZXNz LiBUaGlzIGlzIGEgY29uZmlybWVkIGltcHJvdmVtZW50IGluIHBhZ2UgbG9hZCB0aW1lLgorCisg ICAgICAgICogV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2Vi UHJvY2Vzczo6YWN0dWFsUHJlcGFyZVRvU3VzcGVuZCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBy b2Nlc3M6OmNhbmNlbFByZXBhcmVUb1N1c3BlbmQpOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9j ZXNzOjpwcm9jZXNzRGlkUmVzdW1lKToKKwogMjAxOS0wNi0yOCAgSmVyIE5vYmxlICA8amVyLm5v YmxlQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgbmV3IC1bV0tXZWJWaWV3IF9jbG9zZUFsbE1l ZGlhUHJlc2VudGF0aW9uc10gU1BJCkluZGV4OiBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2Vi UHJvY2Vzcy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBy b2Nlc3MuY3BwCShyZXZpc2lvbiAyNDY4MDkpCisrKyBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv V2ViUHJvY2Vzcy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE0NzEsNiArMTQ3MSwxNCBAQCB2b2lk IFdlYlByb2Nlc3M6OmFjdHVhbFByZXBhcmVUb1N1c3BlbmQoCiAgICAgU2V0Rm9yU2NvcGU8Ym9v bD4gc3VzcGVuc2lvblNjb3BlKG1faXNTdXNwZW5kaW5nLCB0cnVlKTsKICAgICBtX3Byb2Nlc3NJ c1N1c3BlbmRlZCA9IHRydWU7CiAKKyAgICBpZiAobV9wcm9jZXNzVHlwZSA9PSBQcm9jZXNzVHlw ZTo6UHJld2FybWVkV2ViQ29udGVudCkgeworICAgICAgICBpZiAoc2hvdWxkQWNrbm93bGVkZ2VX aGVuUmVhZHlUb1N1c3BlbmQgPT0gU2hvdWxkQWNrbm93bGVkZ2VXaGVuUmVhZHlUb1N1c3BlbmQ6 OlllcykgeworICAgICAgICAgICAgUkVMRUFTRV9MT0coUHJvY2Vzc1N1c3BlbnNpb24sICIlcCAt IFdlYlByb2Nlc3M6OmFjdHVhbFByZXBhcmVUb1N1c3BlbmQoKSBTZW5kaW5nIFByb2Nlc3NSZWFk eVRvU3VzcGVuZCBJUEMgbWVzc2FnZSIsIHRoaXMpOworICAgICAgICAgICAgcGFyZW50UHJvY2Vz c0Nvbm5lY3Rpb24oKS0+c2VuZChNZXNzYWdlczo6V2ViUHJvY2Vzc1Byb3h5OjpQcm9jZXNzUmVh ZHlUb1N1c3BlbmQoKSwgMCk7CisgICAgICAgIH0KKyAgICAgICAgcmV0dXJuOworICAgIH0KKwog I2lmIEVOQUJMRShWSURFTykKICAgICBzdXNwZW5kQWxsTWVkaWFCdWZmZXJpbmcoKTsKICAgICBp ZiAoYXV0byogcGxhdGZvcm1NZWRpYVNlc3Npb25NYW5hZ2VyID0gUGxhdGZvcm1NZWRpYVNlc3Np b25NYW5hZ2VyOjpzaGFyZWRNYW5hZ2VySWZFeGlzdHMoKSkKQEAgLTE1MjcsNiArMTUzNSw5IEBA IHZvaWQgV2ViUHJvY2Vzczo6Y2FuY2VsUHJlcGFyZVRvU3VzcGVuZCgKIAogICAgIG1fcHJvY2Vz c0lzU3VzcGVuZGVkID0gZmFsc2U7CiAKKyAgICBpZiAobV9wcm9jZXNzVHlwZSA9PSBQcm9jZXNz VHlwZTo6UHJld2FybWVkV2ViQ29udGVudCkKKyAgICAgICAgcmV0dXJuOworICAgIAogICAgIHVu ZnJlZXplQWxsTGF5ZXJUcmVlcygpOwogCiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKQEAgLTE2 MDMsNiArMTYxNCw5IEBAIHZvaWQgV2ViUHJvY2Vzczo6cHJvY2Vzc0RpZFJlc3VtZSgpCiAKICAg ICBtX3Byb2Nlc3NJc1N1c3BlbmRlZCA9IGZhbHNlOwogCisgICAgaWYgKG1fcHJvY2Vzc1R5cGUg PT0gUHJvY2Vzc1R5cGU6OlByZXdhcm1lZFdlYkNvbnRlbnQpCisgICAgICAgIHJldHVybjsKKyAg ICAKICAgICBjYW5jZWxNYXJrQWxsTGF5ZXJzVm9sYXRpbGUoKTsKICAgICB1bmZyZWV6ZUFsbExh eWVyVHJlZXMoKTsKICAgICAK 373134 2019-06-28 11:09:51 -0700 2019-06-29 21:47:11 -0700 Patch bug-199195-20190628110950.patch text/plain 2493 pvollan SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNDY5MjgpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE5LTA2LTI4ICBQZXIgQXJuZSBW b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBQZXJmb3JtIGxlc3Mgd29yayB3 aGVuIGEgcHJlLXdhcm1lZCBXZWJQcm9jZXNzIGlzIHN1c3BlbmRlZCBvciByZXN1bWVkLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk5MTk1CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmV0dXJuIGVhcmx5 IGZyb20gV2ViUHJvY2Vzczo6YWN0dWFsUHJlcGFyZVRvU3VzcGVuZCBhbmQgV2ViUHJvY2Vzczo6 cHJvY2Vzc0RpZFJlc3VtZQorICAgICAgICBpZiB0aGlzIGlzIGEgcHJlLXdhcm1lZCBwcm9jZXNz LiBUaGlzIGlzIGEgY29uZmlybWVkIGltcHJvdmVtZW50IGluIHBhZ2UgbG9hZCB0aW1lLgorCisg ICAgICAgICogV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2Vi UHJvY2Vzczo6YWN0dWFsUHJlcGFyZVRvU3VzcGVuZCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBy b2Nlc3M6OmNhbmNlbFByZXBhcmVUb1N1c3BlbmQpOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9j ZXNzOjpwcm9jZXNzRGlkUmVzdW1lKToKKwogMjAxOS0wNi0yOCAgSmVyIE5vYmxlICA8amVyLm5v YmxlQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgbmV3IC1bV0tXZWJWaWV3IF9jbG9zZUFsbE1l ZGlhUHJlc2VudGF0aW9uc10gU1BJCkluZGV4OiBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2Vi UHJvY2Vzcy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBy b2Nlc3MuY3BwCShyZXZpc2lvbiAyNDY4MDkpCisrKyBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv V2ViUHJvY2Vzcy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE0NzEsNiArMTQ3MSwxNiBAQCB2b2lk IFdlYlByb2Nlc3M6OmFjdHVhbFByZXBhcmVUb1N1c3BlbmQoCiAgICAgU2V0Rm9yU2NvcGU8Ym9v bD4gc3VzcGVuc2lvblNjb3BlKG1faXNTdXNwZW5kaW5nLCB0cnVlKTsKICAgICBtX3Byb2Nlc3NJ c1N1c3BlbmRlZCA9IHRydWU7CiAKKyNpZiBQTEFURk9STShDT0NPQSkKKyAgICBpZiAobV9wcm9j ZXNzVHlwZSA9PSBQcm9jZXNzVHlwZTo6UHJld2FybWVkV2ViQ29udGVudCkgeworICAgICAgICBp ZiAoc2hvdWxkQWNrbm93bGVkZ2VXaGVuUmVhZHlUb1N1c3BlbmQgPT0gU2hvdWxkQWNrbm93bGVk Z2VXaGVuUmVhZHlUb1N1c3BlbmQ6OlllcykgeworICAgICAgICAgICAgUkVMRUFTRV9MT0coUHJv Y2Vzc1N1c3BlbnNpb24sICIlcCAtIFdlYlByb2Nlc3M6OmFjdHVhbFByZXBhcmVUb1N1c3BlbmQo KSBTZW5kaW5nIFByb2Nlc3NSZWFkeVRvU3VzcGVuZCBJUEMgbWVzc2FnZSIsIHRoaXMpOworICAg ICAgICAgICAgcGFyZW50UHJvY2Vzc0Nvbm5lY3Rpb24oKS0+c2VuZChNZXNzYWdlczo6V2ViUHJv Y2Vzc1Byb3h5OjpQcm9jZXNzUmVhZHlUb1N1c3BlbmQoKSwgMCk7CisgICAgICAgIH0KKyAgICAg ICAgcmV0dXJuOworICAgIH0KKyNlbmRpZgorCiAjaWYgRU5BQkxFKFZJREVPKQogICAgIHN1c3Bl bmRBbGxNZWRpYUJ1ZmZlcmluZygpOwogICAgIGlmIChhdXRvKiBwbGF0Zm9ybU1lZGlhU2Vzc2lv bk1hbmFnZXIgPSBQbGF0Zm9ybU1lZGlhU2Vzc2lvbk1hbmFnZXI6OnNoYXJlZE1hbmFnZXJJZkV4 aXN0cygpKQpAQCAtMTUyNyw2ICsxNTM3LDExIEBAIHZvaWQgV2ViUHJvY2Vzczo6Y2FuY2VsUHJl cGFyZVRvU3VzcGVuZCgKIAogICAgIG1fcHJvY2Vzc0lzU3VzcGVuZGVkID0gZmFsc2U7CiAKKyNp ZiBQTEFURk9STShDT0NPQSkKKyAgICBpZiAobV9wcm9jZXNzVHlwZSA9PSBQcm9jZXNzVHlwZTo6 UHJld2FybWVkV2ViQ29udGVudCkKKyAgICAgICAgcmV0dXJuOworI2VuZGlmCisKICAgICB1bmZy ZWV6ZUFsbExheWVyVHJlZXMoKTsKIAogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCkBAIC0xNjAz LDYgKzE2MTgsMTEgQEAgdm9pZCBXZWJQcm9jZXNzOjpwcm9jZXNzRGlkUmVzdW1lKCkKIAogICAg IG1fcHJvY2Vzc0lzU3VzcGVuZGVkID0gZmFsc2U7CiAKKyNpZiBQTEFURk9STShDT0NPQSkKKyAg ICBpZiAobV9wcm9jZXNzVHlwZSA9PSBQcm9jZXNzVHlwZTo6UHJld2FybWVkV2ViQ29udGVudCkK KyAgICAgICAgcmV0dXJuOworI2VuZGlmCisKICAgICBjYW5jZWxNYXJrQWxsTGF5ZXJzVm9sYXRp bGUoKTsKICAgICB1bmZyZWV6ZUFsbExheWVyVHJlZXMoKTsKICAgICAK 373186 2019-06-29 21:47:13 -0700 2019-06-30 13:14:14 -0700 Patch bug-199195-20190629214712.patch text/plain 3001 pvollan SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNDY5NTIpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE5LTA2LTI5ICBQZXIgQXJuZSBW b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBQZXJmb3JtIGxlc3Mgd29yayB3 aGVuIGEgcHJlLXdhcm1lZCBXZWJQcm9jZXNzIGlzIHN1c3BlbmRlZCBvciByZXN1bWVkLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk5MTk1CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmV0dXJuIGVhcmx5 IGZyb20gV2ViUHJvY2Vzczo6YWN0dWFsUHJlcGFyZVRvU3VzcGVuZCBhbmQgV2ViUHJvY2Vzczo6 cHJvY2Vzc0RpZFJlc3VtZQorICAgICAgICBpZiB0aGlzIGlzIGEgcHJlLXdhcm1lZCBwcm9jZXNz LiBUaGlzIGlzIGEgY29uZmlybWVkIGltcHJvdmVtZW50IGluIHBhZ2UgbG9hZCB0aW1lLgorCisg ICAgICAgICogV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2Vi UHJvY2Vzczo6YWN0dWFsUHJlcGFyZVRvU3VzcGVuZCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBy b2Nlc3M6OmNhbmNlbFByZXBhcmVUb1N1c3BlbmQpOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9j ZXNzOjpwcm9jZXNzRGlkUmVzdW1lKToKKwogMjAxOS0wNi0yOCAgQnJlbnQgRnVsZ2hhbSAgPGJm dWxnaGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpc2UgV2ViQ29udGVudCBzYW5kYm94IGJh c2VkIG9uIHNlZWQgZmVlZGJhY2sKSW5kZXg6IFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQ cm9jZXNzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJv Y2Vzcy5jcHAJKHJldmlzaW9uIDI0Njk1MikKKysrIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9X ZWJQcm9jZXNzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTQ3MSw2ICsxNDcxLDE0IEBAIHZvaWQg V2ViUHJvY2Vzczo6YWN0dWFsUHJlcGFyZVRvU3VzcGVuZCgKICAgICBTZXRGb3JTY29wZTxib29s PiBzdXNwZW5zaW9uU2NvcGUobV9pc1N1c3BlbmRpbmcsIHRydWUpOwogICAgIG1fcHJvY2Vzc0lz U3VzcGVuZGVkID0gdHJ1ZTsKIAorICAgIGlmIChtX3Byb2Nlc3NUeXBlID09IFByb2Nlc3NUeXBl OjpQcmV3YXJtZWRXZWJDb250ZW50KSB7CisgICAgICAgIGlmIChzaG91bGRBY2tub3dsZWRnZVdo ZW5SZWFkeVRvU3VzcGVuZCA9PSBTaG91bGRBY2tub3dsZWRnZVdoZW5SZWFkeVRvU3VzcGVuZDo6 WWVzKSB7CisgICAgICAgICAgICBSRUxFQVNFX0xPRyhQcm9jZXNzU3VzcGVuc2lvbiwgIiVwIC0g V2ViUHJvY2Vzczo6YWN0dWFsUHJlcGFyZVRvU3VzcGVuZCgpIFNlbmRpbmcgUHJvY2Vzc1JlYWR5 VG9TdXNwZW5kIElQQyBtZXNzYWdlIiwgdGhpcyk7CisgICAgICAgICAgICBwYXJlbnRQcm9jZXNz Q29ubmVjdGlvbigpLT5zZW5kKE1lc3NhZ2VzOjpXZWJQcm9jZXNzUHJveHk6OlByb2Nlc3NSZWFk eVRvU3VzcGVuZCgpLCAwKTsKKyAgICAgICAgfQorICAgICAgICByZXR1cm47CisgICAgfQorCiAj aWYgRU5BQkxFKFZJREVPKQogICAgIHN1c3BlbmRBbGxNZWRpYUJ1ZmZlcmluZygpOwogICAgIGlm IChhdXRvKiBwbGF0Zm9ybU1lZGlhU2Vzc2lvbk1hbmFnZXIgPSBQbGF0Zm9ybU1lZGlhU2Vzc2lv bk1hbmFnZXI6OnNoYXJlZE1hbmFnZXJJZkV4aXN0cygpKQpAQCAtMTUyNyw2ICsxNTM1LDkgQEAg dm9pZCBXZWJQcm9jZXNzOjpjYW5jZWxQcmVwYXJlVG9TdXNwZW5kKAogCiAgICAgbV9wcm9jZXNz SXNTdXNwZW5kZWQgPSBmYWxzZTsKIAorICAgIGlmIChtX3Byb2Nlc3NUeXBlID09IFByb2Nlc3NU eXBlOjpQcmV3YXJtZWRXZWJDb250ZW50KQorICAgICAgICByZXR1cm47CisKICAgICB1bmZyZWV6 ZUFsbExheWVyVHJlZXMoKTsKIAogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCkBAIC0xNjAzLDYg KzE2MTQsOSBAQCB2b2lkIFdlYlByb2Nlc3M6OnByb2Nlc3NEaWRSZXN1bWUoKQogCiAgICAgbV9w cm9jZXNzSXNTdXNwZW5kZWQgPSBmYWxzZTsKIAorICAgIGlmIChtX3Byb2Nlc3NUeXBlID09IFBy b2Nlc3NUeXBlOjpQcmV3YXJtZWRXZWJDb250ZW50KQorICAgICAgICByZXR1cm47CisKICAgICBj YW5jZWxNYXJrQWxsTGF5ZXJzVm9sYXRpbGUoKTsKICAgICB1bmZyZWV6ZUFsbExheWVyVHJlZXMo KTsKICAgICAKSW5kZXg6IFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuaAkocmV2aXNp b24gMjQ2OTUyKQorKysgU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuaAkod29y a2luZyBjb3B5KQpAQCAtNTQ2LDEwICs1NDYsOCBAQCBwcml2YXRlOgogICAgIFdlYkNvcmU6OlJl Z2lzdHJhYmxlRG9tYWluIG1fcmVnaXN0cmFibGVEb21haW47CiAjZW5kaWYKIAotI2lmIFBMQVRG T1JNKENPQ09BKQogICAgIGVudW0gY2xhc3MgUHJvY2Vzc1R5cGUgeyBJbnNwZWN0b3IsIFNlcnZp Y2VXb3JrZXIsIFByZXdhcm1lZFdlYkNvbnRlbnQsIENhY2hlZFdlYkNvbnRlbnQsIFdlYkNvbnRl bnQgfTsKICAgICBQcm9jZXNzVHlwZSBtX3Byb2Nlc3NUeXBlIHsgUHJvY2Vzc1R5cGU6OldlYkNv bnRlbnQgfTsKLSNlbmRpZgogCiAgICAgSGFzaE1hcDxXZWJDb3JlOjpVc2VyR2VzdHVyZVRva2Vu ICosIHVpbnQ2NF90PiBtX3VzZXJHZXN0dXJlVG9rZW5zOwogCg== 373234 2019-07-01 07:42:12 -0700 2019-07-01 08:34:22 -0700 Patch bug-199195-20190701074211.patch text/plain 2534 pvollan SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNDcwMDgpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE5LTA2LTI5ICBQZXIgQXJuZSBW b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBQZXJmb3JtIGxlc3Mgd29yayB3 aGVuIGEgcHJlLXdhcm1lZCBXZWJQcm9jZXNzIGlzIHN1c3BlbmRlZCBvciByZXN1bWVkLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk5MTk1CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCisKKyAgICAgICAgUmV0dXJuIGVhcmx5IGZy b20gV2ViUHJvY2Vzczo6YWN0dWFsUHJlcGFyZVRvU3VzcGVuZCBhbmQgV2ViUHJvY2Vzczo6cHJv Y2Vzc0RpZFJlc3VtZQorICAgICAgICBpZiB0aGlzIGlzIGEgcHJlLXdhcm1lZCBwcm9jZXNzLiBU aGlzIGlzIGEgY29uZmlybWVkIGltcHJvdmVtZW50IGluIHBhZ2UgbG9hZCB0aW1lLgorCisgICAg ICAgICogV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUHJv Y2Vzczo6YWN0dWFsUHJlcGFyZVRvU3VzcGVuZCk6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nl c3M6OmNhbmNlbFByZXBhcmVUb1N1c3BlbmQpOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNz Ojpwcm9jZXNzRGlkUmVzdW1lKToKKwogMjAxOS0wNy0wMSAgQ2FybG9zIEdhcmNpYSBDYW1wb3Mg IDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgV2ViU29ja2V0czogYWRkIHN1cHBvcnQg Zm9yIHNlbmRpbmcgYmxvYiBtZXNzYWdlcyB3aGVuIHVzaW5nIHdlYiBzb2NrZXRzIHBsYXRmb3Jt IEFQSXMKSW5kZXg6IFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAJKHJldmlz aW9uIDI0NzAwOCkKKysrIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMTQ3MSw2ICsxNDcxLDE2IEBAIHZvaWQgV2ViUHJvY2Vzczo6YWN0 dWFsUHJlcGFyZVRvU3VzcGVuZCgKICAgICBTZXRGb3JTY29wZTxib29sPiBzdXNwZW5zaW9uU2Nv cGUobV9pc1N1c3BlbmRpbmcsIHRydWUpOwogICAgIG1fcHJvY2Vzc0lzU3VzcGVuZGVkID0gdHJ1 ZTsKIAorI2lmIFBMQVRGT1JNKENPQ09BKQorICAgIGlmIChtX3Byb2Nlc3NUeXBlID09IFByb2Nl c3NUeXBlOjpQcmV3YXJtZWRXZWJDb250ZW50KSB7CisgICAgICAgIGlmIChzaG91bGRBY2tub3ds ZWRnZVdoZW5SZWFkeVRvU3VzcGVuZCA9PSBTaG91bGRBY2tub3dsZWRnZVdoZW5SZWFkeVRvU3Vz cGVuZDo6WWVzKSB7CisgICAgICAgICAgICBSRUxFQVNFX0xPRyhQcm9jZXNzU3VzcGVuc2lvbiwg IiVwIC0gV2ViUHJvY2Vzczo6YWN0dWFsUHJlcGFyZVRvU3VzcGVuZCgpIFNlbmRpbmcgUHJvY2Vz c1JlYWR5VG9TdXNwZW5kIElQQyBtZXNzYWdlIiwgdGhpcyk7CisgICAgICAgICAgICBwYXJlbnRQ cm9jZXNzQ29ubmVjdGlvbigpLT5zZW5kKE1lc3NhZ2VzOjpXZWJQcm9jZXNzUHJveHk6OlByb2Nl c3NSZWFkeVRvU3VzcGVuZCgpLCAwKTsKKyAgICAgICAgfQorICAgICAgICByZXR1cm47CisgICAg fQorI2VuZGlmCisKICNpZiBFTkFCTEUoVklERU8pCiAgICAgc3VzcGVuZEFsbE1lZGlhQnVmZmVy aW5nKCk7CiAgICAgaWYgKGF1dG8qIHBsYXRmb3JtTWVkaWFTZXNzaW9uTWFuYWdlciA9IFBsYXRm b3JtTWVkaWFTZXNzaW9uTWFuYWdlcjo6c2hhcmVkTWFuYWdlcklmRXhpc3RzKCkpCkBAIC0xNTI3 LDYgKzE1MzcsMTEgQEAgdm9pZCBXZWJQcm9jZXNzOjpjYW5jZWxQcmVwYXJlVG9TdXNwZW5kKAog CiAgICAgbV9wcm9jZXNzSXNTdXNwZW5kZWQgPSBmYWxzZTsKIAorI2lmIFBMQVRGT1JNKENPQ09B KQorICAgIGlmIChtX3Byb2Nlc3NUeXBlID09IFByb2Nlc3NUeXBlOjpQcmV3YXJtZWRXZWJDb250 ZW50KQorICAgICAgICByZXR1cm47CisjZW5kaWYKKwogICAgIHVuZnJlZXplQWxsTGF5ZXJUcmVl cygpOwogCiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKQEAgLTE2MDMsNiArMTYxOCwxMSBAQCB2 b2lkIFdlYlByb2Nlc3M6OnByb2Nlc3NEaWRSZXN1bWUoKQogCiAgICAgbV9wcm9jZXNzSXNTdXNw ZW5kZWQgPSBmYWxzZTsKIAorI2lmIFBMQVRGT1JNKENPQ09BKQorICAgIGlmIChtX3Byb2Nlc3NU eXBlID09IFByb2Nlc3NUeXBlOjpQcmV3YXJtZWRXZWJDb250ZW50KQorICAgICAgICByZXR1cm47 CisjZW5kaWYKKwogICAgIGNhbmNlbE1hcmtBbGxMYXllcnNWb2xhdGlsZSgpOwogICAgIHVuZnJl ZXplQWxsTGF5ZXJUcmVlcygpOwogICAgIAo=