46743 2010-09-28 11:57:17 -0700 Event dispatching in XMLHttpRequestProgressEventThrottle should go through XMLHttpRequestProgressEventThrottle::dispatchEvent 2012-03-22 10:02:08 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 81506 0 adauria adauria allan.jensen ap darin ddkilzer eric.carlson eric jchaffraix joepeck webkit.review.bot oldest_to_newest 286421 0 adauria 2010-09-28 11:57:17 -0700 In XMLHttpRequestProgressEventThrottle, we should dispatch events through XMLHttpRequestProgressEventThrottle::dispatchEvents, instead of calling m_target->dispatchEvent in various places. This makes it easy to add multiple event queuing (currently, one progress event can be queued on suspend(), if progress events have been throttled). 286425 1 69081 adauria 2010-09-28 12:03:38 -0700 Created attachment 69081 [PATCH] Refactor XMLHttpRequestProgressEventThrottle event dispatching In preparation for platform-specific queuing of XMLHttpRequest events, this patch changes all calls to m_target->dispatchEvent to XMLHttpRequestProgressEventThrottle::dispatchEvent. Currently, we queue up only a progress event on suspend() if we have throttled progress events. We should be able to queue all XHR events that can be generated after suspend(), if the platform network layer continues to receive data. XMLHttpRequest uses XMLHttpRequestProgressEventThrottle to dispatch only download events, so this doesn't change behavior of upload events, which aren't throttled or queued. 286459 2 69088 adauria 2010-09-28 12:41:19 -0700 Created attachment 69088 [PATCH] Refactor XMLHttpRequestProgressEventThrottle event dispatching (with ChangeLog) Added ChangeLog 286712 3 ap 2010-09-28 19:49:05 -0700 I still question the need to queue multiple events in XMLHttpRequest. 287571 4 ap 2010-09-30 08:55:30 -0700 This makes control flow a little confusing. If XMLHttpRequestProgressEventThrottle::dispatchEvent() is called with FlushProgressEvent action, it will call flushProgressEvent(), which will now call XMLHttpRequestProgressEventThrottle::dispatchEvent() back recursively. 293825 5 69088 darin 2010-10-13 17:09:16 -0700 Comment on attachment 69088 [PATCH] Refactor XMLHttpRequestProgressEventThrottle event dispatching (with ChangeLog) I do not like the ProgressEventAction design here. It seems if we want to do two things we should call two functions, or we can have a function that does two things, but having function with a passed parameter that tells it to either do two things or one thing seems unnecessarily confusing. 293826 6 darin 2010-10-13 17:09:51 -0700 (In reply to comment #4) > This makes control flow a little confusing. If XMLHttpRequestProgressEventThrottle::dispatchEvent() is called with FlushProgressEvent action, it will call flushProgressEvent(), which will now call XMLHttpRequestProgressEventThrottle::dispatchEvent() back recursively. I agree that it makes the control flow confusing. Despite that, I said review+. My ProgressEventAction comment might help, though. 293827 7 darin 2010-10-13 17:10:15 -0700 Alexey, if you had said review- I would not have done a review+. I didn’t notice your comments until afterward. 293836 8 69088 ap 2010-10-13 17:17:49 -0700 Comment on attachment 69088 [PATCH] Refactor XMLHttpRequestProgressEventThrottle event dispatching (with ChangeLog) My understanding is that Anton wanted to look into whether the change was needed for his project again, so I'll set cq- for now. Please feel free to flip it back if necessary. 322268 9 eric 2010-12-14 15:14:52 -0800 Ping? Should this bug be closed or is this still for landing? 324838 10 eric 2010-12-20 22:59:17 -0800 Looks like this was never landed. I expect the patch has rotten by now. 584475 11 133091 allan.jensen 2012-03-21 12:17:19 -0700 Created attachment 133091 Patch 585262 12 133091 jchaffraix 2012-03-22 07:39:06 -0700 Comment on attachment 133091 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=133091&action=review > Source/WebCore/ChangeLog:8 > + Please add some details about your change and most importantly *why* you are doing it (as a stepping stone to implement event queuing in XMLHttpRequestProgressEventThrottle). The original ChangeLog had a very nice description: In preparation for platform-specific queuing of XMLHttpRequest events, this patch changes all calls to m_target->dispatchEvent to XMLHttpRequestProgressEventThrottle::dispatchEvent. Currently, we queue up only a progress event on suspend() if we have throttled progress events. We should be able to queue all XHR events that can be generated after suspend(), if the platform network layer continues to receive data. XMLHttpRequest uses XMLHttpRequestProgressEventThrottle to dispatch only download events, so this doesn't change behavior of upload events, which aren't throttled or queued. 585292 13 133265 allan.jensen 2012-03-22 08:06:04 -0700 Created attachment 133265 Patch for landing 585418 14 133265 webkit.review.bot 2012-03-22 10:02:03 -0700 Comment on attachment 133265 Patch for landing Clearing flags on attachment: 133265 Committed r111717: <http://trac.webkit.org/changeset/111717> 585419 15 webkit.review.bot 2012-03-22 10:02:08 -0700 All reviewed patches have been landed. Closing bug. 69081 2010-09-28 12:03:38 -0700 2010-09-28 12:41:19 -0700 [PATCH] Refactor XMLHttpRequestProgressEventThrottle event dispatching XHR_events_via_dispatchEvent.patch text/plain 1937 adauria SW4gcHJlcGFyYXRpb24gZm9yIHBsYXRmb3JtLXNwZWNpZmljIHF1ZXVpbmcgb2YgWE1MSHR0cFJl cXVlc3QgZXZlbnRzLAp0aGlzIHBhdGNoIGNoYW5nZXMgYWxsIGNhbGxzIHRvIG1fdGFyZ2V0LT5k aXNwYXRjaEV2ZW50IHRvClhNTEh0dHBSZXF1ZXN0UHJvZ3Jlc3NFdmVudFRocm90dGxlOjpkaXNw YXRjaEV2ZW50LiBDdXJyZW50bHksCndlIHF1ZXVlIHVwIG9ubHkgYSBwcm9ncmVzcyBldmVudCBv biBzdXNwZW5kKCkgaWYgd2UgaGF2ZSB0aHJvdHRsZWQKcHJvZ3Jlc3MgZXZlbnRzLiBXZSBzaG91 bGQgYmUgYWJsZSB0byBxdWV1ZSBhbGwgWEhSIGV2ZW50cyB0aGF0IApjYW4gYmUgZ2VuZXJhdGVk IGFmdGVyIHN1c3BlbmQoKSwgaWYgdGhlIHBsYXRmb3JtIG5ldHdvcmsgbGF5ZXIgY29udGludWVz CnRvIHJlY2VpdmUgZGF0YS4gWE1MSHR0cFJlcXVlc3QgdXNlcyBYTUxIdHRwUmVxdWVzdFByb2dy ZXNzRXZlbnRUaHJvdHRsZQp0byBkaXNwYXRjaCBvbmx5IGRvd25sb2FkIGV2ZW50cywgc28gdGhp cyBkb2Vzbid0IGNoYW5nZSBiZWhhdmlvciBvZiB1cGxvYWQKZXZlbnRzLCB3aGljaCBhcmVuJ3Qg dGhyb3R0bGVkIG9yIHF1ZXVlZC4KCi0tLQogLi4uL3htbC9YTUxIdHRwUmVxdWVzdFByb2dyZXNz RXZlbnRUaHJvdHRsZS5jcHAgICAgfCAgICA2ICsrKy0tLQogMSBmaWxlcyBjaGFuZ2VkLCAzIGlu c2VydGlvbnMoKyksIDMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS94bWwvWE1M SHR0cFJlcXVlc3RQcm9ncmVzc0V2ZW50VGhyb3R0bGUuY3BwIGIvV2ViQ29yZS94bWwvWE1MSHR0 cFJlcXVlc3RQcm9ncmVzc0V2ZW50VGhyb3R0bGUuY3BwCmluZGV4IDBlYjYzOTguLmU5YWE0MzUg MTAwNjQ0Ci0tLSBhL1dlYkNvcmUveG1sL1hNTEh0dHBSZXF1ZXN0UHJvZ3Jlc3NFdmVudFRocm90 dGxlLmNwcAorKysgYi9XZWJDb3JlL3htbC9YTUxIdHRwUmVxdWVzdFByb2dyZXNzRXZlbnRUaHJv dHRsZS5jcHAKQEAgLTkzLDcgKzkzLDcgQEAgdm9pZCBYTUxIdHRwUmVxdWVzdFByb2dyZXNzRXZl bnRUaHJvdHRsZTo6Zmx1c2hQcm9ncmVzc0V2ZW50KCkKICAgICAvLyBXZSBzdG9wIHRoZSB0aW1l ciBhcyB0aGlzIGlzIGNhbGxlZCB3aGVuIG5vIG1vcmUgZXZlbnRzIGFyZSBzdXBwb3NlZCB0byBv Y2N1ci4KICAgICBzdG9wKCk7CiAKLSAgICBtX3RhcmdldC0+ZGlzcGF0Y2hFdmVudChldmVudCk7 CisgICAgZGlzcGF0Y2hFdmVudChldmVudCk7CiB9CiAKIHZvaWQgWE1MSHR0cFJlcXVlc3RQcm9n cmVzc0V2ZW50VGhyb3R0bGU6OmRpc3BhdGNoUGF1c2VkRXZlbnQoKQpAQCAtMTAyLDcgKzEwMiw3 IEBAIHZvaWQgWE1MSHR0cFJlcXVlc3RQcm9ncmVzc0V2ZW50VGhyb3R0bGU6OmRpc3BhdGNoUGF1 c2VkRXZlbnQoKQogICAgIGlmICghbV9wYXVzZWRFdmVudCkKICAgICAgICAgcmV0dXJuOwogCi0g ICAgbV90YXJnZXQtPmRpc3BhdGNoRXZlbnQobV9wYXVzZWRFdmVudCk7CisgICAgZGlzcGF0Y2hF dmVudChtX3BhdXNlZEV2ZW50KTsKICAgICBtX3BhdXNlZEV2ZW50ID0gMDsKIH0KIApAQCAtMTE3 LDcgKzExNyw3IEBAIHZvaWQgWE1MSHR0cFJlcXVlc3RQcm9ncmVzc0V2ZW50VGhyb3R0bGU6OmZp cmVkKCkKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIG1fdGFyZ2V0LT5kaXNwYXRjaEV2 ZW50KFhNTEh0dHBSZXF1ZXN0UHJvZ3Jlc3NFdmVudDo6Y3JlYXRlKGV2ZW50TmFtZXMoKS5wcm9n cmVzc0V2ZW50LCBtX2xlbmd0aENvbXB1dGFibGUsIG1fbG9hZGVkLCBtX3RvdGFsKSk7CisgICAg ZGlzcGF0Y2hFdmVudChYTUxIdHRwUmVxdWVzdFByb2dyZXNzRXZlbnQ6OmNyZWF0ZShldmVudE5h bWVzKCkucHJvZ3Jlc3NFdmVudCwgbV9sZW5ndGhDb21wdXRhYmxlLCBtX2xvYWRlZCwgbV90b3Rh bCkpOwogICAgIG1fdG90YWwgPSAwOwogICAgIG1fbG9hZGVkID0gMDsKIH0KLS0gCjEuNi4yCgo= 69088 2010-09-28 12:41:19 -0700 2012-03-21 12:17:11 -0700 [PATCH] Refactor XMLHttpRequestProgressEventThrottle event dispatching (with ChangeLog) XHR_events_via_dispatchEvent text/plain 3477 adauria Y29tbWl0IDc1ZTg2Mzg5MjY3ZjgyNWVmMzNlNzJmODUxMDYwYTg2MjNlMDM1NmMKQXV0aG9yOiBB bnRvbiBEJ0F1cmlhIDxhbnRvbkBhbnRvbi5hcHBsZS5jb20+CkRhdGU6ICAgVHVlIFNlcCAyOCAx MjoxOToyNyAyMDEwIC0wNzAwCgogICAgSW4gcHJlcGFyYXRpb24gZm9yIHBsYXRmb3JtLXNwZWNp ZmljIHF1ZXVpbmcgb2YgWE1MSHR0cFJlcXVlc3QgZXZlbnRzLAogICAgdGhpcyBwYXRjaCBjaGFu Z2VzIGFsbCBjYWxscyB0byBtX3RhcmdldC0+ZGlzcGF0Y2hFdmVudCB0bwogICAgWE1MSHR0cFJl cXVlc3RQcm9ncmVzc0V2ZW50VGhyb3R0bGU6OmRpc3BhdGNoRXZlbnQuIEN1cnJlbnRseSwKICAg IHdlIHF1ZXVlIHVwIG9ubHkgYSBwcm9ncmVzcyBldmVudCBvbiBzdXNwZW5kKCkgaWYgd2UgaGF2 ZSB0aHJvdHRsZWQKICAgIHByb2dyZXNzIGV2ZW50cy4gV2Ugc2hvdWxkIGJlIGFibGUgdG8gcXVl dWUgYWxsIFhIUiBldmVudHMgdGhhdAogICAgY2FuIGJlIGdlbmVyYXRlZCBhZnRlciBzdXNwZW5k KCksIGlmIHRoZSBwbGF0Zm9ybSBuZXR3b3JrIGxheWVyIGNvbnRpbnVlcwogICAgdG8gcmVjZWl2 ZSBkYXRhLiBYTUxIdHRwUmVxdWVzdCB1c2VzIFhNTEh0dHBSZXF1ZXN0UHJvZ3Jlc3NFdmVudFRo cm90dGxlCiAgICB0byBkaXNwYXRjaCBvbmx5IGRvd25sb2FkIGV2ZW50cywgc28gdGhpcyBkb2Vz bid0IGNoYW5nZSBiZWhhdmlvciBvZiB1cGxvYWQKICAgIGV2ZW50cywgd2hpY2ggYXJlbid0IHRo cm90dGxlZCBvciBxdWV1ZWQuCgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJD b3JlL0NoYW5nZUxvZwppbmRleCAzNTdjMDQ0Li42NDg3NjBiIDEwMDY0NAotLS0gYS9XZWJDb3Jl L0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEw LTA5LTI4ICBBbnRvbiBEJ0F1cmlhICA8YW50b25AYW50b24uYXBwbGUuY29tPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEV2ZW50IGRpc3BhdGNoaW5n IGluIFhNTEh0dHBSZXF1ZXN0UHJvZ3Jlc3NFdmVudFRocm90dGxlIHNob3VsZCBnbyB0aHJvdWdo CisgICAgICAgIFhNTEh0dHBSZXF1ZXN0UHJvZ3Jlc3NFdmVudFRocm90dGxlOjpkaXNwYXRjaEV2 ZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00Njc0 MworCisgICAgICAgIEluIHByZXBhcmF0aW9uIGZvciBwbGF0Zm9ybS1zcGVjaWZpYyBxdWV1aW5n IG9mIFhNTEh0dHBSZXF1ZXN0IGV2ZW50cywKKyAgICAgICAgdGhpcyBwYXRjaCBjaGFuZ2VzIGFs bCBjYWxscyB0byBtX3RhcmdldC0+ZGlzcGF0Y2hFdmVudCB0bworICAgICAgICBYTUxIdHRwUmVx dWVzdFByb2dyZXNzRXZlbnRUaHJvdHRsZTo6ZGlzcGF0Y2hFdmVudC4gQ3VycmVudGx5LAorICAg ICAgICB3ZSBxdWV1ZSB1cCBvbmx5IGEgcHJvZ3Jlc3MgZXZlbnQgb24gc3VzcGVuZCgpIGlmIHdl IGhhdmUgdGhyb3R0bGVkCisgICAgICAgIHByb2dyZXNzIGV2ZW50cy4gV2Ugc2hvdWxkIGJlIGFi bGUgdG8gcXVldWUgYWxsIFhIUiBldmVudHMgdGhhdAorICAgICAgICBjYW4gYmUgZ2VuZXJhdGVk IGFmdGVyIHN1c3BlbmQoKSwgaWYgdGhlIHBsYXRmb3JtIG5ldHdvcmsgbGF5ZXIgY29udGludWVz CisgICAgICAgIHRvIHJlY2VpdmUgZGF0YS4gWE1MSHR0cFJlcXVlc3QgdXNlcyBYTUxIdHRwUmVx dWVzdFByb2dyZXNzRXZlbnRUaHJvdHRsZQorICAgICAgICB0byBkaXNwYXRjaCBvbmx5IGRvd25s b2FkIGV2ZW50cywgc28gdGhpcyBkb2Vzbid0IGNoYW5nZSBiZWhhdmlvciBvZiB1cGxvYWQKKyAg ICAgICAgZXZlbnRzLCB3aGljaCBhcmVuJ3QgdGhyb3R0bGVkIG9yIHF1ZXVlZC4KKworICAgICAg ICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICogeG1sL1hNTEh0dHBSZXF1 ZXN0UHJvZ3Jlc3NFdmVudFRocm90dGxlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlhNTEh0dHBS ZXF1ZXN0UHJvZ3Jlc3NFdmVudFRocm90dGxlOjpmbHVzaFByb2dyZXNzRXZlbnQpOgorICAgICAg ICAoV2ViQ29yZTo6WE1MSHR0cFJlcXVlc3RQcm9ncmVzc0V2ZW50VGhyb3R0bGU6OmRpc3BhdGNo UGF1c2VkRXZlbnQpOgorICAgICAgICAoV2ViQ29yZTo6WE1MSHR0cFJlcXVlc3RQcm9ncmVzc0V2 ZW50VGhyb3R0bGU6OmZpcmVkKToKKwogMjAxMC0wOS0yOCAgSmlhIFB1ICA8anB1QGFwcGxlLmNv bT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYW4gQmVybnN0ZWluLgpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS94bWwvWE1MSHR0cFJlcXVlc3RQcm9ncmVzc0V2ZW50VGhyb3R0bGUuY3BwIGIvV2ViQ29y ZS94bWwvWE1MSHR0cFJlcXVlc3RQcm9ncmVzc0V2ZW50VGhyb3R0bGUuY3BwCmluZGV4IDBlYjYz OTguLmU5YWE0MzUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUveG1sL1hNTEh0dHBSZXF1ZXN0UHJvZ3Jl c3NFdmVudFRocm90dGxlLmNwcAorKysgYi9XZWJDb3JlL3htbC9YTUxIdHRwUmVxdWVzdFByb2dy ZXNzRXZlbnRUaHJvdHRsZS5jcHAKQEAgLTkzLDcgKzkzLDcgQEAgdm9pZCBYTUxIdHRwUmVxdWVz dFByb2dyZXNzRXZlbnRUaHJvdHRsZTo6Zmx1c2hQcm9ncmVzc0V2ZW50KCkKICAgICAvLyBXZSBz dG9wIHRoZSB0aW1lciBhcyB0aGlzIGlzIGNhbGxlZCB3aGVuIG5vIG1vcmUgZXZlbnRzIGFyZSBz dXBwb3NlZCB0byBvY2N1ci4KICAgICBzdG9wKCk7CiAKLSAgICBtX3RhcmdldC0+ZGlzcGF0Y2hF dmVudChldmVudCk7CisgICAgZGlzcGF0Y2hFdmVudChldmVudCk7CiB9CiAKIHZvaWQgWE1MSHR0 cFJlcXVlc3RQcm9ncmVzc0V2ZW50VGhyb3R0bGU6OmRpc3BhdGNoUGF1c2VkRXZlbnQoKQpAQCAt MTAyLDcgKzEwMiw3IEBAIHZvaWQgWE1MSHR0cFJlcXVlc3RQcm9ncmVzc0V2ZW50VGhyb3R0bGU6 OmRpc3BhdGNoUGF1c2VkRXZlbnQoKQogICAgIGlmICghbV9wYXVzZWRFdmVudCkKICAgICAgICAg cmV0dXJuOwogCi0gICAgbV90YXJnZXQtPmRpc3BhdGNoRXZlbnQobV9wYXVzZWRFdmVudCk7Cisg ICAgZGlzcGF0Y2hFdmVudChtX3BhdXNlZEV2ZW50KTsKICAgICBtX3BhdXNlZEV2ZW50ID0gMDsK IH0KIApAQCAtMTE3LDcgKzExNyw3IEBAIHZvaWQgWE1MSHR0cFJlcXVlc3RQcm9ncmVzc0V2ZW50 VGhyb3R0bGU6OmZpcmVkKCkKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIG1fdGFyZ2V0 LT5kaXNwYXRjaEV2ZW50KFhNTEh0dHBSZXF1ZXN0UHJvZ3Jlc3NFdmVudDo6Y3JlYXRlKGV2ZW50 TmFtZXMoKS5wcm9ncmVzc0V2ZW50LCBtX2xlbmd0aENvbXB1dGFibGUsIG1fbG9hZGVkLCBtX3Rv dGFsKSk7CisgICAgZGlzcGF0Y2hFdmVudChYTUxIdHRwUmVxdWVzdFByb2dyZXNzRXZlbnQ6OmNy ZWF0ZShldmVudE5hbWVzKCkucHJvZ3Jlc3NFdmVudCwgbV9sZW5ndGhDb21wdXRhYmxlLCBtX2xv YWRlZCwgbV90b3RhbCkpOwogICAgIG1fdG90YWwgPSAwOwogICAgIG1fbG9hZGVkID0gMDsKIH0K 133091 2012-03-21 12:17:19 -0700 2012-03-22 08:06:04 -0700 Patch bug-46743-20120321201716.patch text/plain 5353 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTExNTcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmJmOTY5OTA2ZmY2NGM2 NmJmNGJjMDlkNjA0N2Y2YWRiMTU1NGUwNy4uYzVlYTE5ZmM1NTJiZWM4MGMzNDY3OWJhYWI5Njc3 MTRkNjBhZWNlOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTAzLTIxICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5Abm9raWEuY29tPgorCisgICAgICAgIEV2 ZW50IGRpc3BhdGNoaW5nIGluIFhNTEh0dHBSZXF1ZXN0UHJvZ3Jlc3NFdmVudFRocm90dGxlIHNo b3VsZCBnbyB0aHJvdWdoIFhNTEh0dHBSZXF1ZXN0UHJvZ3Jlc3NFdmVudFRocm90dGxlOjpkaXNw YXRjaEV2ZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD00Njc0MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICBC YXNlZCBvbiBvcmlnaW5hbCBwYXRjaCBieSBBbnRvbiBEJ0F1cmlhCisKKyAgICAgICAgKiB4bWwv WE1MSHR0cFJlcXVlc3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6WE1MSHR0cFJlcXVlc3Q6OmNh bGxSZWFkeVN0YXRlQ2hhbmdlTGlzdGVuZXIpOgorICAgICAgICAqIHhtbC9YTUxIdHRwUmVxdWVz dFByb2dyZXNzRXZlbnRUaHJvdHRsZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpYTUxIdHRwUmVx dWVzdFByb2dyZXNzRXZlbnRUaHJvdHRsZTo6ZGlzcGF0Y2hSZWFkeVN0YXRlQ2hhbmdlRXZlbnQp OgorICAgICAgICAoV2ViQ29yZTo6WE1MSHR0cFJlcXVlc3RQcm9ncmVzc0V2ZW50VGhyb3R0bGU6 OmRpc3BhdGNoRXZlbnQpOgorICAgICAgICAoV2ViQ29yZTo6WE1MSHR0cFJlcXVlc3RQcm9ncmVz c0V2ZW50VGhyb3R0bGU6OmZsdXNoUHJvZ3Jlc3NFdmVudCk6CisgICAgICAgIChXZWJDb3JlOjpY TUxIdHRwUmVxdWVzdFByb2dyZXNzRXZlbnRUaHJvdHRsZTo6ZGlzcGF0Y2hQYXVzZWRFdmVudCk6 CisgICAgICAgIChXZWJDb3JlOjpYTUxIdHRwUmVxdWVzdFByb2dyZXNzRXZlbnRUaHJvdHRsZTo6 ZmlyZWQpOgorICAgICAgICAqIHhtbC9YTUxIdHRwUmVxdWVzdFByb2dyZXNzRXZlbnRUaHJvdHRs ZS5oOgorICAgICAgICAoWE1MSHR0cFJlcXVlc3RQcm9ncmVzc0V2ZW50VGhyb3R0bGUpOgorCiAy MDEyLTAzLTIxICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgogCiAgICAgICAg IFJlbW92ZSBvYnNvbGV0ZSBGaWxlIGF0dHJpYnV0ZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3htbC9YTUxIdHRwUmVxdWVzdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS94bWwvWE1MSHR0cFJl cXVlc3QuY3BwCmluZGV4IGUzZmI5ZDFjMDAzYTYzZTA1M2YyODBlZGY4MTU5OWY5YjExOWE4OTQu LjcxMjIwMGNlNjkzYzlkNWRhYjE4MGEwNzE1ZmViN2ExZjlmNjM1MzMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3htbC9YTUxIdHRwUmVxdWVzdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv eG1sL1hNTEh0dHBSZXF1ZXN0LmNwcApAQCAtMzg5LDcgKzM4OSw3IEBAIHZvaWQgWE1MSHR0cFJl cXVlc3Q6OmNhbGxSZWFkeVN0YXRlQ2hhbmdlTGlzdGVuZXIoKQogICAgIEluc3BlY3Rvckluc3Ry dW1lbnRhdGlvbkNvb2tpZSBjb29raWUgPSBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OndpbGxD aGFuZ2VYSFJSZWFkeVN0YXRlKHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKSwgdGhpcyk7CiAKICAg ICBpZiAobV9hc3luYyB8fCAobV9zdGF0ZSA8PSBPUEVORUQgfHwgbV9zdGF0ZSA9PSBET05FKSkK LSAgICAgICAgbV9wcm9ncmVzc0V2ZW50VGhyb3R0bGUuZGlzcGF0Y2hFdmVudChYTUxIdHRwUmVx dWVzdFByb2dyZXNzRXZlbnQ6OmNyZWF0ZShldmVudE5hbWVzKCkucmVhZHlzdGF0ZWNoYW5nZUV2 ZW50KSwgbV9zdGF0ZSA9PSBET05FID8gRmx1c2hQcm9ncmVzc0V2ZW50IDogRG9Ob3RGbHVzaFBy b2dyZXNzRXZlbnQpOworICAgICAgICBtX3Byb2dyZXNzRXZlbnRUaHJvdHRsZS5kaXNwYXRjaFJl YWR5U3RhdGVDaGFuZ2VFdmVudChYTUxIdHRwUmVxdWVzdFByb2dyZXNzRXZlbnQ6OmNyZWF0ZShl dmVudE5hbWVzKCkucmVhZHlzdGF0ZWNoYW5nZUV2ZW50KSwgbV9zdGF0ZSA9PSBET05FID8gRmx1 c2hQcm9ncmVzc0V2ZW50IDogRG9Ob3RGbHVzaFByb2dyZXNzRXZlbnQpOwogCiAgICAgSW5zcGVj dG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRDaGFuZ2VYSFJSZWFkeVN0YXRlKGNvb2tpZSk7CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3htbC9YTUxIdHRwUmVxdWVzdFByb2dyZXNzRXZlbnRU aHJvdHRsZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS94bWwvWE1MSHR0cFJlcXVlc3RQcm9ncmVzc0V2 ZW50VGhyb3R0bGUuY3BwCmluZGV4IDNiYzhjMzAxYjQ2MDZkYTA3MTEwOWM5MGI5M2Q1NGY0MGE2 NmIzMjEuLjdiYjI3ZmY4NDAzOGIzZmUyZDc5N2QzMmU0YTA3YjJmZWU0M2U2ZTIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3htbC9YTUxIdHRwUmVxdWVzdFByb2dyZXNzRXZlbnRUaHJvdHRs ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUveG1sL1hNTEh0dHBSZXF1ZXN0UHJvZ3Jlc3NFdmVu dFRocm90dGxlLmNwcApAQCAtNjksMTUgKzY5LDIwIEBAIHZvaWQgWE1MSHR0cFJlcXVlc3RQcm9n cmVzc0V2ZW50VGhyb3R0bGU6OmRpc3BhdGNoUHJvZ3Jlc3NFdmVudChib29sIGxlbmd0aENvbXB1 CiAgICAgbV90b3RhbCA9IHRvdGFsOwogfQogCi12b2lkIFhNTEh0dHBSZXF1ZXN0UHJvZ3Jlc3NF dmVudFRocm90dGxlOjpkaXNwYXRjaEV2ZW50KFBhc3NSZWZQdHI8RXZlbnQ+IGV2ZW50LCBQcm9n cmVzc0V2ZW50QWN0aW9uIHByb2dyZXNzRXZlbnRBY3Rpb24pCit2b2lkIFhNTEh0dHBSZXF1ZXN0 UHJvZ3Jlc3NFdmVudFRocm90dGxlOjpkaXNwYXRjaFJlYWR5U3RhdGVDaGFuZ2VFdmVudChQYXNz UmVmUHRyPEV2ZW50PiBldmVudCwgUHJvZ3Jlc3NFdmVudEFjdGlvbiBwcm9ncmVzc0V2ZW50QWN0 aW9uKQoreworICAgIGlmIChwcm9ncmVzc0V2ZW50QWN0aW9uID09IEZsdXNoUHJvZ3Jlc3NFdmVu dCkKKyAgICAgICAgZmx1c2hQcm9ncmVzc0V2ZW50KCk7CisKKyAgICBkaXNwYXRjaEV2ZW50KGV2 ZW50KTsKK30KKwordm9pZCBYTUxIdHRwUmVxdWVzdFByb2dyZXNzRXZlbnRUaHJvdHRsZTo6ZGlz cGF0Y2hFdmVudChQYXNzUmVmUHRyPEV2ZW50PiBldmVudCkKIHsKICAgICBBU1NFUlQoIXN1c3Bl bmRlZCgpKTsKICAgICAvLyBXZSBzaG91bGQgbm90IGhhdmUgYW55IHBlbmRpbmcgZXZlbnRzIGZy b20gYSBwcmV2aW91cyByZXN1bWUuCiAgICAgQVNTRVJUKCFtX3BhdXNlZEV2ZW50KTsKIAotICAg IGlmIChwcm9ncmVzc0V2ZW50QWN0aW9uID09IEZsdXNoUHJvZ3Jlc3NFdmVudCkKLSAgICAgICAg Zmx1c2hQcm9ncmVzc0V2ZW50KCk7Ci0KICAgICBtX3RhcmdldC0+ZGlzcGF0Y2hFdmVudChldmVu dCk7CiB9CiAKQEAgLTEwMSw3ICsxMDYsNyBAQCB2b2lkIFhNTEh0dHBSZXF1ZXN0UHJvZ3Jlc3NF dmVudFRocm90dGxlOjpmbHVzaFByb2dyZXNzRXZlbnQoKQogICAgIC8vIFdlIHN0b3AgdGhlIHRp bWVyIGFzIHRoaXMgaXMgY2FsbGVkIHdoZW4gbm8gbW9yZSBldmVudHMgYXJlIHN1cHBvc2VkIHRv IG9jY3VyLgogICAgIHN0b3AoKTsKIAotICAgIG1fdGFyZ2V0LT5kaXNwYXRjaEV2ZW50KGV2ZW50 KTsKKyAgICBkaXNwYXRjaEV2ZW50KGV2ZW50KTsKIH0KIAogdm9pZCBYTUxIdHRwUmVxdWVzdFBy b2dyZXNzRXZlbnRUaHJvdHRsZTo6ZGlzcGF0Y2hQYXVzZWRFdmVudCgpCkBAIC0xMTAsNyArMTE1 LDcgQEAgdm9pZCBYTUxIdHRwUmVxdWVzdFByb2dyZXNzRXZlbnRUaHJvdHRsZTo6ZGlzcGF0Y2hQ YXVzZWRFdmVudCgpCiAgICAgaWYgKCFtX3BhdXNlZEV2ZW50KQogICAgICAgICByZXR1cm47CiAK LSAgICBtX3RhcmdldC0+ZGlzcGF0Y2hFdmVudChtX3BhdXNlZEV2ZW50KTsKKyAgICBkaXNwYXRj aEV2ZW50KG1fcGF1c2VkRXZlbnQpOwogICAgIG1fcGF1c2VkRXZlbnQgPSAwOwogfQogCkBAIC0x MjUsNyArMTMwLDcgQEAgdm9pZCBYTUxIdHRwUmVxdWVzdFByb2dyZXNzRXZlbnRUaHJvdHRsZTo6 ZmlyZWQoKQogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgbV90YXJnZXQtPmRpc3BhdGNo RXZlbnQoWE1MSHR0cFJlcXVlc3RQcm9ncmVzc0V2ZW50OjpjcmVhdGUoZXZlbnROYW1lcygpLnBy b2dyZXNzRXZlbnQsIG1fbGVuZ3RoQ29tcHV0YWJsZSwgbV9sb2FkZWQsIG1fdG90YWwpKTsKKyAg ICBkaXNwYXRjaEV2ZW50KFhNTEh0dHBSZXF1ZXN0UHJvZ3Jlc3NFdmVudDo6Y3JlYXRlKGV2ZW50 TmFtZXMoKS5wcm9ncmVzc0V2ZW50LCBtX2xlbmd0aENvbXB1dGFibGUsIG1fbG9hZGVkLCBtX3Rv dGFsKSk7CiAgICAgbV90b3RhbCA9IDA7CiAgICAgbV9sb2FkZWQgPSAwOwogfQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUveG1sL1hNTEh0dHBSZXF1ZXN0UHJvZ3Jlc3NFdmVudFRocm90dGxl LmggYi9Tb3VyY2UvV2ViQ29yZS94bWwvWE1MSHR0cFJlcXVlc3RQcm9ncmVzc0V2ZW50VGhyb3R0 bGUuaAppbmRleCA0MmNlZWJmZWU0M2Q4YTMzYTdlMDhiODEzMGYyNjAxMTVhNDhmYzg5Li40MWYz NzQ3MzEzY2I3ZmRkOTY3YzI4OTBhYjViZGI3MDZlZTE1MmQ1IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS94bWwvWE1MSHR0cFJlcXVlc3RQcm9ncmVzc0V2ZW50VGhyb3R0bGUuaAorKysgYi9T b3VyY2UvV2ViQ29yZS94bWwvWE1MSHR0cFJlcXVlc3RQcm9ncmVzc0V2ZW50VGhyb3R0bGUuaApA QCAtNDksNyArNDksOCBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB+WE1MSHR0cFJlcXVlc3RQcm9n cmVzc0V2ZW50VGhyb3R0bGUoKTsKIAogICAgIHZvaWQgZGlzcGF0Y2hQcm9ncmVzc0V2ZW50KGJv b2wgbGVuZ3RoQ29tcHV0YWJsZSwgdW5zaWduZWQgbG9uZyBsb25nIGxvYWRlZCwgdW5zaWduZWQg bG9uZyBsb25nIHRvdGFsKTsKLSAgICB2b2lkIGRpc3BhdGNoRXZlbnQoUGFzc1JlZlB0cjxFdmVu dD4sIFByb2dyZXNzRXZlbnRBY3Rpb24gPSBEb05vdEZsdXNoUHJvZ3Jlc3NFdmVudCk7CisgICAg dm9pZCBkaXNwYXRjaFJlYWR5U3RhdGVDaGFuZ2VFdmVudChQYXNzUmVmUHRyPEV2ZW50PiwgUHJv Z3Jlc3NFdmVudEFjdGlvbiA9IERvTm90Rmx1c2hQcm9ncmVzc0V2ZW50KTsKKyAgICB2b2lkIGRp c3BhdGNoRXZlbnQoUGFzc1JlZlB0cjxFdmVudD4pOwogICAgIHZvaWQgZGlzcGF0Y2hFdmVudEFu ZExvYWRFbmQoUGFzc1JlZlB0cjxFdmVudD4pOwogCiAgICAgdm9pZCBzdXNwZW5kKCk7Cg== 133265 2012-03-22 08:06:04 -0700 2012-03-22 10:02:03 -0700 Patch for landing Patch text/plain 5789 allan.jensen ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA1MjBjOTlkLi4yNTFlY2U3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMg QEAKKzIwMTItMDMtMjEgIEFsbGFuIFNhbmRmZWxkIEplbnNlbiAgPGFsbGFuLmplbnNlbkBub2tp YS5jb20+CisKKyAgICAgICAgRXZlbnQgZGlzcGF0Y2hpbmcgaW4gWE1MSHR0cFJlcXVlc3RQcm9n cmVzc0V2ZW50VGhyb3R0bGUgc2hvdWxkIGdvIHRocm91Z2ggWE1MSHR0cFJlcXVlc3RQcm9ncmVz c0V2ZW50VGhyb3R0bGU6OmRpc3BhdGNoRXZlbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTQ2NzQzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgSnVsaWVu IENoYWZmcmFpeAorICAgICAgICBCYXNlZCBvbiBvcmlnaW5hbCBwYXRjaCBieSBBbnRvbiBEJ0F1 cmlhCisKKyAgICAgICAgSW4gcHJlcGFyYXRpb24gZm9yIHBsYXRmb3JtLXNwZWNpZmljIHF1ZXVp bmcgb2YgWE1MSHR0cFJlcXVlc3QgZXZlbnRzLAorICAgICAgICB0aGlzIHBhdGNoIGNoYW5nZXMg YWxsIGNhbGxzIHRvIG1fdGFyZ2V0LT5kaXNwYXRjaEV2ZW50IHRvCisgICAgICAgIFhNTEh0dHBS ZXF1ZXN0UHJvZ3Jlc3NFdmVudFRocm90dGxlOjpkaXNwYXRjaEV2ZW50LgorICAgICAgICBDdXJy ZW50bHksIHdlIHF1ZXVlIG9ubHkgb25lIHByb2dyZXNzIGV2ZW50IG9uIHN1c3BlbmQoKSBpZiB3 ZSBoYXZlCisgICAgICAgIHRocm90dGxlZCBwcm9ncmVzcyBldmVudHMuIFdlIHNob3VsZCBiZSBh YmxlIHRvIHF1ZXVlIGFsbCBYSFIgZXZlbnRzCisgICAgICAgIHRoYXQgY2FuIGJlIGdlbmVyYXRl ZCBhZnRlciBzdXNwZW5kKCksIGlmIHRoZSBwbGF0Zm9ybSBuZXR3b3JrIGxheWVyCisgICAgICAg IGNvbnRpbnVlcyB0byByZWNlaXZlIGRhdGEuCisgICAgICAgIFhNTEh0dHBSZXF1ZXN0IHVzZXMg WE1MSHR0cFJlcXVlc3RQcm9ncmVzc0V2ZW50VGhyb3R0bGUgdG8gZGlzcGF0Y2ggb25seQorICAg ICAgICBkb3dubG9hZCBldmVudHMsIHNvIHRoaXMgZG9lc24ndCBjaGFuZ2UgYmVoYXZpb3Igb2Yg dXBsb2FkIGV2ZW50cywgd2hpY2gKKyAgICAgICAgYXJlbid0IHRocm90dGxlZCBvciBxdWV1ZWQu CisKKyAgICAgICAgKiB4bWwvWE1MSHR0cFJlcXVlc3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 WE1MSHR0cFJlcXVlc3Q6OmNhbGxSZWFkeVN0YXRlQ2hhbmdlTGlzdGVuZXIpOgorICAgICAgICAq IHhtbC9YTUxIdHRwUmVxdWVzdFByb2dyZXNzRXZlbnRUaHJvdHRsZS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpYTUxIdHRwUmVxdWVzdFByb2dyZXNzRXZlbnRUaHJvdHRsZTo6ZGlzcGF0Y2hSZWFk eVN0YXRlQ2hhbmdlRXZlbnQpOgorICAgICAgICAoV2ViQ29yZTo6WE1MSHR0cFJlcXVlc3RQcm9n cmVzc0V2ZW50VGhyb3R0bGU6OmRpc3BhdGNoRXZlbnQpOgorICAgICAgICAoV2ViQ29yZTo6WE1M SHR0cFJlcXVlc3RQcm9ncmVzc0V2ZW50VGhyb3R0bGU6OmZsdXNoUHJvZ3Jlc3NFdmVudCk6Cisg ICAgICAgIChXZWJDb3JlOjpYTUxIdHRwUmVxdWVzdFByb2dyZXNzRXZlbnRUaHJvdHRsZTo6ZGlz cGF0Y2hQYXVzZWRFdmVudCk6CisgICAgICAgIChXZWJDb3JlOjpYTUxIdHRwUmVxdWVzdFByb2dy ZXNzRXZlbnRUaHJvdHRsZTo6ZmlyZWQpOgorICAgICAgICAqIHhtbC9YTUxIdHRwUmVxdWVzdFBy b2dyZXNzRXZlbnRUaHJvdHRsZS5oOgorICAgICAgICAoWE1MSHR0cFJlcXVlc3RQcm9ncmVzc0V2 ZW50VGhyb3R0bGUpOgorCiAyMDEyLTAzLTIyICBLZW50IFRhbXVyYSAgPHRrZW50QGNocm9taXVt Lm9yZz4KIAogICAgICAgICBFeHBhbmQgUmVuZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5lOjpjb250 cm9sQ2xpcFJlY3QoKSB0byBjb250YWluIGNvbnRlbnRSZWN0KCkuCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS94bWwvWE1MSHR0cFJlcXVlc3QuY3BwIGIvU291cmNlL1dlYkNvcmUveG1sL1hN TEh0dHBSZXF1ZXN0LmNwcAppbmRleCBlM2ZiOWQxLi43MTIyMDBjIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS94bWwvWE1MSHR0cFJlcXVlc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3ht bC9YTUxIdHRwUmVxdWVzdC5jcHAKQEAgLTM4OSw3ICszODksNyBAQCB2b2lkIFhNTEh0dHBSZXF1 ZXN0OjpjYWxsUmVhZHlTdGF0ZUNoYW5nZUxpc3RlbmVyKCkKICAgICBJbnNwZWN0b3JJbnN0cnVt ZW50YXRpb25Db29raWUgY29va2llID0gSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjp3aWxsQ2hh bmdlWEhSUmVhZHlTdGF0ZShzY3JpcHRFeGVjdXRpb25Db250ZXh0KCksIHRoaXMpOwogCiAgICAg aWYgKG1fYXN5bmMgfHwgKG1fc3RhdGUgPD0gT1BFTkVEIHx8IG1fc3RhdGUgPT0gRE9ORSkpCi0g ICAgICAgIG1fcHJvZ3Jlc3NFdmVudFRocm90dGxlLmRpc3BhdGNoRXZlbnQoWE1MSHR0cFJlcXVl c3RQcm9ncmVzc0V2ZW50OjpjcmVhdGUoZXZlbnROYW1lcygpLnJlYWR5c3RhdGVjaGFuZ2VFdmVu dCksIG1fc3RhdGUgPT0gRE9ORSA/IEZsdXNoUHJvZ3Jlc3NFdmVudCA6IERvTm90Rmx1c2hQcm9n cmVzc0V2ZW50KTsKKyAgICAgICAgbV9wcm9ncmVzc0V2ZW50VGhyb3R0bGUuZGlzcGF0Y2hSZWFk eVN0YXRlQ2hhbmdlRXZlbnQoWE1MSHR0cFJlcXVlc3RQcm9ncmVzc0V2ZW50OjpjcmVhdGUoZXZl bnROYW1lcygpLnJlYWR5c3RhdGVjaGFuZ2VFdmVudCksIG1fc3RhdGUgPT0gRE9ORSA/IEZsdXNo UHJvZ3Jlc3NFdmVudCA6IERvTm90Rmx1c2hQcm9ncmVzc0V2ZW50KTsKIAogICAgIEluc3BlY3Rv ckluc3RydW1lbnRhdGlvbjo6ZGlkQ2hhbmdlWEhSUmVhZHlTdGF0ZShjb29raWUpOwogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS94bWwvWE1MSHR0cFJlcXVlc3RQcm9ncmVzc0V2ZW50VGhy b3R0bGUuY3BwIGIvU291cmNlL1dlYkNvcmUveG1sL1hNTEh0dHBSZXF1ZXN0UHJvZ3Jlc3NFdmVu dFRocm90dGxlLmNwcAppbmRleCAzYmM4YzMwLi43YmIyN2ZmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS94bWwvWE1MSHR0cFJlcXVlc3RQcm9ncmVzc0V2ZW50VGhyb3R0bGUuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3htbC9YTUxIdHRwUmVxdWVzdFByb2dyZXNzRXZlbnRUaHJvdHRsZS5j cHAKQEAgLTY5LDE1ICs2OSwyMCBAQCB2b2lkIFhNTEh0dHBSZXF1ZXN0UHJvZ3Jlc3NFdmVudFRo cm90dGxlOjpkaXNwYXRjaFByb2dyZXNzRXZlbnQoYm9vbCBsZW5ndGhDb21wdQogICAgIG1fdG90 YWwgPSB0b3RhbDsKIH0KIAotdm9pZCBYTUxIdHRwUmVxdWVzdFByb2dyZXNzRXZlbnRUaHJvdHRs ZTo6ZGlzcGF0Y2hFdmVudChQYXNzUmVmUHRyPEV2ZW50PiBldmVudCwgUHJvZ3Jlc3NFdmVudEFj dGlvbiBwcm9ncmVzc0V2ZW50QWN0aW9uKQordm9pZCBYTUxIdHRwUmVxdWVzdFByb2dyZXNzRXZl bnRUaHJvdHRsZTo6ZGlzcGF0Y2hSZWFkeVN0YXRlQ2hhbmdlRXZlbnQoUGFzc1JlZlB0cjxFdmVu dD4gZXZlbnQsIFByb2dyZXNzRXZlbnRBY3Rpb24gcHJvZ3Jlc3NFdmVudEFjdGlvbikKK3sKKyAg ICBpZiAocHJvZ3Jlc3NFdmVudEFjdGlvbiA9PSBGbHVzaFByb2dyZXNzRXZlbnQpCisgICAgICAg IGZsdXNoUHJvZ3Jlc3NFdmVudCgpOworCisgICAgZGlzcGF0Y2hFdmVudChldmVudCk7Cit9CisK K3ZvaWQgWE1MSHR0cFJlcXVlc3RQcm9ncmVzc0V2ZW50VGhyb3R0bGU6OmRpc3BhdGNoRXZlbnQo UGFzc1JlZlB0cjxFdmVudD4gZXZlbnQpCiB7CiAgICAgQVNTRVJUKCFzdXNwZW5kZWQoKSk7CiAg ICAgLy8gV2Ugc2hvdWxkIG5vdCBoYXZlIGFueSBwZW5kaW5nIGV2ZW50cyBmcm9tIGEgcHJldmlv dXMgcmVzdW1lLgogICAgIEFTU0VSVCghbV9wYXVzZWRFdmVudCk7CiAKLSAgICBpZiAocHJvZ3Jl c3NFdmVudEFjdGlvbiA9PSBGbHVzaFByb2dyZXNzRXZlbnQpCi0gICAgICAgIGZsdXNoUHJvZ3Jl c3NFdmVudCgpOwotCiAgICAgbV90YXJnZXQtPmRpc3BhdGNoRXZlbnQoZXZlbnQpOwogfQogCkBA IC0xMDEsNyArMTA2LDcgQEAgdm9pZCBYTUxIdHRwUmVxdWVzdFByb2dyZXNzRXZlbnRUaHJvdHRs ZTo6Zmx1c2hQcm9ncmVzc0V2ZW50KCkKICAgICAvLyBXZSBzdG9wIHRoZSB0aW1lciBhcyB0aGlz IGlzIGNhbGxlZCB3aGVuIG5vIG1vcmUgZXZlbnRzIGFyZSBzdXBwb3NlZCB0byBvY2N1ci4KICAg ICBzdG9wKCk7CiAKLSAgICBtX3RhcmdldC0+ZGlzcGF0Y2hFdmVudChldmVudCk7CisgICAgZGlz cGF0Y2hFdmVudChldmVudCk7CiB9CiAKIHZvaWQgWE1MSHR0cFJlcXVlc3RQcm9ncmVzc0V2ZW50 VGhyb3R0bGU6OmRpc3BhdGNoUGF1c2VkRXZlbnQoKQpAQCAtMTEwLDcgKzExNSw3IEBAIHZvaWQg WE1MSHR0cFJlcXVlc3RQcm9ncmVzc0V2ZW50VGhyb3R0bGU6OmRpc3BhdGNoUGF1c2VkRXZlbnQo KQogICAgIGlmICghbV9wYXVzZWRFdmVudCkKICAgICAgICAgcmV0dXJuOwogCi0gICAgbV90YXJn ZXQtPmRpc3BhdGNoRXZlbnQobV9wYXVzZWRFdmVudCk7CisgICAgZGlzcGF0Y2hFdmVudChtX3Bh dXNlZEV2ZW50KTsKICAgICBtX3BhdXNlZEV2ZW50ID0gMDsKIH0KIApAQCAtMTI1LDcgKzEzMCw3 IEBAIHZvaWQgWE1MSHR0cFJlcXVlc3RQcm9ncmVzc0V2ZW50VGhyb3R0bGU6OmZpcmVkKCkKICAg ICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIG1fdGFyZ2V0LT5kaXNwYXRjaEV2ZW50KFhNTEh0 dHBSZXF1ZXN0UHJvZ3Jlc3NFdmVudDo6Y3JlYXRlKGV2ZW50TmFtZXMoKS5wcm9ncmVzc0V2ZW50 LCBtX2xlbmd0aENvbXB1dGFibGUsIG1fbG9hZGVkLCBtX3RvdGFsKSk7CisgICAgZGlzcGF0Y2hF dmVudChYTUxIdHRwUmVxdWVzdFByb2dyZXNzRXZlbnQ6OmNyZWF0ZShldmVudE5hbWVzKCkucHJv Z3Jlc3NFdmVudCwgbV9sZW5ndGhDb21wdXRhYmxlLCBtX2xvYWRlZCwgbV90b3RhbCkpOwogICAg IG1fdG90YWwgPSAwOwogICAgIG1fbG9hZGVkID0gMDsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3htbC9YTUxIdHRwUmVxdWVzdFByb2dyZXNzRXZlbnRUaHJvdHRsZS5oIGIvU291cmNl L1dlYkNvcmUveG1sL1hNTEh0dHBSZXF1ZXN0UHJvZ3Jlc3NFdmVudFRocm90dGxlLmgKaW5kZXgg NDJjZWViZi4uNDFmMzc0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUveG1sL1hNTEh0dHBS ZXF1ZXN0UHJvZ3Jlc3NFdmVudFRocm90dGxlLmgKKysrIGIvU291cmNlL1dlYkNvcmUveG1sL1hN TEh0dHBSZXF1ZXN0UHJvZ3Jlc3NFdmVudFRocm90dGxlLmgKQEAgLTQ5LDcgKzQ5LDggQEAgcHVi bGljOgogICAgIHZpcnR1YWwgflhNTEh0dHBSZXF1ZXN0UHJvZ3Jlc3NFdmVudFRocm90dGxlKCk7 CiAKICAgICB2b2lkIGRpc3BhdGNoUHJvZ3Jlc3NFdmVudChib29sIGxlbmd0aENvbXB1dGFibGUs IHVuc2lnbmVkIGxvbmcgbG9uZyBsb2FkZWQsIHVuc2lnbmVkIGxvbmcgbG9uZyB0b3RhbCk7Ci0g ICAgdm9pZCBkaXNwYXRjaEV2ZW50KFBhc3NSZWZQdHI8RXZlbnQ+LCBQcm9ncmVzc0V2ZW50QWN0 aW9uID0gRG9Ob3RGbHVzaFByb2dyZXNzRXZlbnQpOworICAgIHZvaWQgZGlzcGF0Y2hSZWFkeVN0 YXRlQ2hhbmdlRXZlbnQoUGFzc1JlZlB0cjxFdmVudD4sIFByb2dyZXNzRXZlbnRBY3Rpb24gPSBE b05vdEZsdXNoUHJvZ3Jlc3NFdmVudCk7CisgICAgdm9pZCBkaXNwYXRjaEV2ZW50KFBhc3NSZWZQ dHI8RXZlbnQ+KTsKICAgICB2b2lkIGRpc3BhdGNoRXZlbnRBbmRMb2FkRW5kKFBhc3NSZWZQdHI8 RXZlbnQ+KTsKIAogICAgIHZvaWQgc3VzcGVuZCgpOwo=