159280 2016-06-29 15:54:07 -0700 [iOS] Process suspension is prevented for 30 seconds after closing a tab 2016-06-30 13:17:59 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 159284 1 cdumez cdumez andersca barraclough beidson commit-queue webkit-bug-importer oldest_to_newest 1206530 0 cdumez 2016-06-29 15:54:07 -0700 Process suspension is prevented for 30 seconds after closing a tab due to ConnectionTerminationWatchdog holding a background assertion. 1206531 1 cdumez 2016-06-29 15:54:27 -0700 <rdar://problem/27014867> 1206539 2 282385 cdumez 2016-06-29 16:11:30 -0700 Created attachment 282385 Patch 1206542 3 commit-queue 2016-06-29 16:13:48 -0700 Attachment 282385 did not pass style-queue: ERROR: Source/WebKit2/UIProcess/ios/ProcessAssertionIOS.mm:156: Place brace on its own line for function definitions. [whitespace/braces] [4] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 1206564 4 282392 cdumez 2016-06-29 17:00:47 -0700 Created attachment 282392 Patch 1206565 5 commit-queue 2016-06-29 17:01:46 -0700 Attachment 282392 did not pass style-queue: ERROR: Source/WebKit2/UIProcess/ios/ProcessAssertionIOS.mm:156: Place brace on its own line for function definitions. [whitespace/braces] [4] Total errors found: 1 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 1206604 6 282407 cdumez 2016-06-29 18:59:32 -0700 Created attachment 282407 Patch without Gavin's refactoring 1206605 7 commit-queue 2016-06-29 19:00:56 -0700 Attachment 282407 did not pass style-queue: ERROR: Source/WebKit2/UIProcess/ios/ProcessAssertionIOS.mm:157: Place brace on its own line for function definitions. [whitespace/braces] [4] Total errors found: 1 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 1206608 8 cdumez 2016-06-29 19:01:22 -0700 The patch fixes the issue. However, I will need to rebaseline after Gavin lands his refactoring patch in Bug 159284. 1206612 9 282409 cdumez 2016-06-29 19:34:41 -0700 Created attachment 282409 Patch with Gavin's refactoring 1206613 10 commit-queue 2016-06-29 19:36:03 -0700 Attachment 282409 did not pass style-queue: ERROR: Source/WebKit2/UIProcess/ios/ProcessAssertionIOS.mm:158: Place brace on its own line for function definitions. [whitespace/braces] [4] Total errors found: 1 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 1206785 11 282409 barraclough 2016-06-30 11:18:22 -0700 Comment on attachment 282409 Patch with Gavin's refactoring View in context: https://bugs.webkit.org/attachment.cgi?id=282409&action=review > Source/WebKit2/UIProcess/ProcessAssertion.h:63 > + bool isValid() const { return m_isValid; } Suggestion – make this an enum with three states – one for uninitialized. Currently while uninitialized this enum disagrees with the state of BKSProcessAssertion. > Source/WebKit2/UIProcess/ios/ProcessAssertionIOS.mm:158 > + m_assertion.get().invalidationHandler = ^() { I'm worried about the lifetime of this callback – I think you should reset this in the destructor. 1206805 12 282455 cdumez 2016-06-30 12:26:07 -0700 Created attachment 282455 Patch 1206806 13 commit-queue 2016-06-30 12:27:49 -0700 Attachment 282455 did not pass style-queue: ERROR: Source/WebKit2/UIProcess/ios/ProcessAssertionIOS.mm:158: Place brace on its own line for function definitions. [whitespace/braces] [4] Total errors found: 1 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 1206821 14 282455 commit-queue 2016-06-30 13:17:54 -0700 Comment on attachment 282455 Patch Clearing flags on attachment: 282455 Committed r202696: <http://trac.webkit.org/changeset/202696> 1206823 15 commit-queue 2016-06-30 13:17:59 -0700 All reviewed patches have been landed. Closing bug. 282385 2016-06-29 16:11:30 -0700 2016-06-29 17:00:44 -0700 Patch bug-159280-20160629161110.patch text/plain 4949 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjAyNjIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMTljNGQ0YzBhZTZmNzU4 NDE4NmJlODdiMDk3ZTVhZTk5NTQ4ZGFkNS4uMzJhOGZmNGRmNTFlOWRkMjJkM2E0NTZlZTFkNjQ3 OTQ2YzhjYmY5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDE2LTA2LTI5ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gUHJvY2VzcyBzdXNw ZW5zaW9uIGlzIHByZXZlbnRlZCBmb3IgMzAgc2Vjb25kcyBhZnRlciBjbG9zaW5nIGEgdGFiCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTkyODAKKyAg ICAgICAgPHJkYXI6Ly9wcm9ibGVtLzI3MDE0ODY3PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFdoZW4gY2xvc2luZyBhIHRhYiwgQ29ubmVjdGlvblRl cm1pbmF0aW9uV2F0Y2hkb2cgdGFrZXMgYSBiYWNrZ3JvdW5kCisgICAgICAgIGFzc2VydGlvbiBv biBiZWhhbGYgb2YgdGhlIFdlYkNvbnRlbnQgcHJvY2VzcyBhbmQgb25seSByZWxlYXNlcyBpdAor ICAgICAgICBhZnRlciAzMCBzZWNvbmRzLCBhbGxvd2luZyBmb3IgdGhlIFdlYkNvbnRlbnQgcHJv Y2VzcyB0byBleGl0IGNsZWFubHkKKyAgICAgICAgd2l0aG91dCB3b3JyeWluZyBhYm91dCBnZXR0 aW5nIHN1c3BlbmRlZCB0b28gZWFybHkuCisKKyAgICAgICAgSG93ZXZlciwgdGhlIGNoaWxkIHBy b2Nlc3Mgbm9ybWFsbHkgZXhpdHMgbXVjaCBzb29uZXIgdGhhbiB0aGlzIGFuZAorICAgICAgICB3 ZSBlbmQgdXAgaG9sZGluZyBhIHByb2Nlc3MgYXNzZXJ0aW9uIGZvciBubyByZWFzb24gZm9yIGEg ZnVsbCAzMAorICAgICAgICBzZWNvbmRzIGFueXdheS4gVGhpcyBwYXRjaCBhZGRyZXNzZXMgdGhl IGlzc3VlIGJ5IHJlZ2lzdGVyaW5nIGFuCisgICAgICAgIGludmFsaWRhdGlvbiBoYW5kbGVyIHdp dGggdGhlIEJLU1Byb2Nlc3NBc3NlcnRpb24gYW5kIHJlbGVhc2luZyBvdXIKKyAgICAgICAgb3Vy IGFzc2VydGlvbiBpbiBzdWNoIGNhc2UuIFRoZSBpbnZhbGlkYXRpb24gaGFuZGxlciBnZXRzIGNh bGxlZAorICAgICAgICBhcyBzb29uIGFzIHRoZSBjaGlsZCBwcm9jZXNzIGV4aXRzLgorCisgICAg ICAgICogVUlQcm9jZXNzL1Byb2Nlc3NBc3NlcnRpb24uY3BwOgorICAgICAgICAoV2ViS2l0OjpQ cm9jZXNzQXNzZXJ0aW9uOjpQcm9jZXNzQXNzZXJ0aW9uKToKKyAgICAgICAgKiBVSVByb2Nlc3Mv UHJvY2Vzc0Fzc2VydGlvbi5oOgorICAgICAgICAoV2ViS2l0OjpQcm9jZXNzQXNzZXJ0aW9uOjpQ cm9jZXNzQXNzZXJ0aW9uKToKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1Byb2Nlc3NBc3NlcnRp b25JT1MubW06CisgICAgICAgIChXZWJLaXQ6OlByb2Nlc3NBc3NlcnRpb246OlByb2Nlc3NBc3Nl cnRpb24pOgorICAgICAgICAoV2ViS2l0OjpQcm9jZXNzQW5kVUlBc3NlcnRpb246OlByb2Nlc3NB bmRVSUFzc2VydGlvbik6CisKIDIwMTYtMDYtMjkgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dh cmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFRvbyBtdWNoIGR1cGxpY2F0ZWQgY29kZSBpbiBM YXllclRyZWVIb3N0cyBpbXBsZW1lbnRhdGlvbnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9Qcm9jZXNzQXNzZXJ0aW9uLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9Qcm9jZXNzQXNzZXJ0aW9uLmNwcAppbmRleCBlMDI3OWJkOGEzOTJjZjNjYjAyZTI3N2U4Y2Fk MDI1OTY1ZTYwZTUyLi5hNWU2YjBlNTE1YjU4MWQ1ZTdmZDBmMTMyNGQ3MDExN2M1NmU1MWMwIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUHJvY2Vzc0Fzc2VydGlvbi5jcHAK KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1Byb2Nlc3NBc3NlcnRpb24uY3BwCkBAIC0z MCw3ICszMCw3IEBACiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCi1Qcm9jZXNzQXNzZXJ0aW9uOjpQ cm9jZXNzQXNzZXJ0aW9uKHBpZF90LCBBc3NlcnRpb25TdGF0ZSBhc3NlcnRpb25TdGF0ZSkKK1By b2Nlc3NBc3NlcnRpb246OlByb2Nlc3NBc3NlcnRpb24ocGlkX3QsIEFzc2VydGlvblN0YXRlIGFz c2VydGlvblN0YXRlLCBzdGQ6OmZ1bmN0aW9uPHZvaWQoKT4pCiAgICAgOiBtX2Fzc2VydGlvblN0 YXRlKGFzc2VydGlvblN0YXRlKQogewogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1Byb2Nlc3NBc3NlcnRpb24uaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Qcm9j ZXNzQXNzZXJ0aW9uLmgKaW5kZXggOTVjOTdjMTNlNmI3MjY3NDczMDBlOWRmYzY0NDAyYzQyYTUz YjFjMy4uNWNhOGFlYjQ3YWFiNGNmODU0NzY2NzUyMjFkMmIwN2FjM2JlNjZmMCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1Byb2Nlc3NBc3NlcnRpb24uaAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvUHJvY2Vzc0Fzc2VydGlvbi5oCkBAIC0yNiw2ICsyNiw4IEBA CiAjaWZuZGVmIFByb2Nlc3NBc3NlcnRpb25faAogI2RlZmluZSBQcm9jZXNzQXNzZXJ0aW9uX2gK IAorI2luY2x1ZGUgPGZ1bmN0aW9uYWw+CisKICNpZiBQTEFURk9STShJT1MpICYmICFQTEFURk9S TShJT1NfU0lNVUxBVE9SKQogI2luY2x1ZGUgPHd0Zi9SZXRhaW5QdHIuaD4KIE9CSkNfQ0xBU1Mg QktTUHJvY2Vzc0Fzc2VydGlvbjsKQEAgLTQ3LDcgKzQ5LDcgQEAgcHVibGljOgogCiBjbGFzcyBQ cm9jZXNzQXNzZXJ0aW9uIHsKIHB1YmxpYzoKLSAgICBQcm9jZXNzQXNzZXJ0aW9uKHBpZF90LCBB c3NlcnRpb25TdGF0ZSk7CisgICAgUHJvY2Vzc0Fzc2VydGlvbihwaWRfdCwgQXNzZXJ0aW9uU3Rh dGUsIHN0ZDo6ZnVuY3Rpb248dm9pZCgpPiBpbnZhbGlkYXRpb25DYWxsYmFjayA9IHsgfSk7CiAg ICAgflByb2Nlc3NBc3NlcnRpb24oKTsKIAogICAgIHZvaWQgc2V0Q2xpZW50KFByb2Nlc3NBc3Nl cnRpb25DbGllbnQmIGNsaWVudCkgeyBtX2NsaWVudCA9ICZjbGllbnQ7IH0KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvUHJvY2Vzc0Fzc2VydGlvbklPUy5tbSBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvUHJvY2Vzc0Fzc2VydGlvbklPUy5tbQppbmRleCBh ZGY1ZWJlOTRmZGY5Njg5YzA0NzdhYmIyMWU0YmM5ZmY5Nzk0YzRjLi5iNTEyYjNjM2RjNzQ3NDMy MjZiZTdjYjA4ODUyYWJjYmMxMzFkOTY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvaW9zL1Byb2Nlc3NBc3NlcnRpb25JT1MubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL2lvcy9Qcm9jZXNzQXNzZXJ0aW9uSU9TLm1tCkBAIC0xNDMsMTAgKzE0Myw5IEBAIHN0 YXRpYyBCS1NQcm9jZXNzQXNzZXJ0aW9uRmxhZ3MgZmxhZ3NGb3JTdGF0ZShBc3NlcnRpb25TdGF0 ZSBhc3NlcnRpb25TdGF0ZSkKICAgICB9CiB9CiAKLVByb2Nlc3NBc3NlcnRpb246OlByb2Nlc3NB c3NlcnRpb24ocGlkX3QgcGlkLCBBc3NlcnRpb25TdGF0ZSBhc3NlcnRpb25TdGF0ZSkKK1Byb2Nl c3NBc3NlcnRpb246OlByb2Nlc3NBc3NlcnRpb24ocGlkX3QgcGlkLCBBc3NlcnRpb25TdGF0ZSBh c3NlcnRpb25TdGF0ZSwgc3RkOjpmdW5jdGlvbjx2b2lkKCk+IGludmFsaWRhdGlvbkNhbGxiYWNr KQorICAgIDogbV9hc3NlcnRpb25TdGF0ZShhc3NlcnRpb25TdGF0ZSkKIHsKLSAgICBtX2Fzc2Vy dGlvblN0YXRlID0gYXNzZXJ0aW9uU3RhdGU7Ci0gICAgCiAgICAgQktTUHJvY2Vzc0Fzc2VydGlv bkFjcXVpc2l0aW9uSGFuZGxlciBoYW5kbGVyID0gXihCT09MIGFjcXVpcmVkKSB7CiAgICAgICAg IGlmICghYWNxdWlyZWQpIHsKICAgICAgICAgICAgIExPR19FUlJPUigiVW5hYmxlIHRvIGFjcXVp cmUgYXNzZXJ0aW9uIGZvciBwcm9jZXNzICVkIiwgcGlkKTsKQEAgLTE1NCw2ICsxNTMsOSBAQCBQ cm9jZXNzQXNzZXJ0aW9uOjpQcm9jZXNzQXNzZXJ0aW9uKHBpZF90IHBpZCwgQXNzZXJ0aW9uU3Rh dGUgYXNzZXJ0aW9uU3RhdGUpCiAgICAgICAgIH0KICAgICB9OwogICAgIG1fYXNzZXJ0aW9uID0g YWRvcHROUyhbW0JLU1Byb2Nlc3NBc3NlcnRpb24gYWxsb2NdIGluaXRXaXRoUElEOnBpZCBmbGFn czpmbGFnc0ZvclN0YXRlKGFzc2VydGlvblN0YXRlKSByZWFzb246QktTUHJvY2Vzc0Fzc2VydGlv blJlYXNvbkV4dGVuc2lvbiBuYW1lOkAiV2ViIGNvbnRlbnQgdmlzaWJsZSIgd2l0aEhhbmRsZXI6 aGFuZGxlcl0pOworICAgIG1fYXNzZXJ0aW9uLmdldCgpLmludmFsaWRhdGlvbkhhbmRsZXIgPSBe KCkgeworICAgICAgICBpbnZhbGlkYXRpb25DYWxsYmFjaygpOworICAgIH07CiB9CiAKIFByb2Nl c3NBc3NlcnRpb246On5Qcm9jZXNzQXNzZXJ0aW9uKCkKQEAgLTE3Myw3ICsxNzUsNyBAQCB2b2lk IFByb2Nlc3NBc3NlcnRpb246OnNldFN0YXRlKEFzc2VydGlvblN0YXRlIGFzc2VydGlvblN0YXRl KQogfQogCiBQcm9jZXNzQW5kVUlBc3NlcnRpb246OlByb2Nlc3NBbmRVSUFzc2VydGlvbihwaWRf dCBwaWQsIEFzc2VydGlvblN0YXRlIGFzc2VydGlvblN0YXRlKQotICAgIDogUHJvY2Vzc0Fzc2Vy dGlvbihwaWQsIGFzc2VydGlvblN0YXRlKQorICAgIDogUHJvY2Vzc0Fzc2VydGlvbihwaWQsIGFz c2VydGlvblN0YXRlLCBbdGhpc10geyBzZXRTdGF0ZShBc3NlcnRpb25TdGF0ZTo6U3VzcGVuZGVk KTsgfSkKIHsKICAgICBpZiAoYXNzZXJ0aW9uU3RhdGUgIT0gQXNzZXJ0aW9uU3RhdGU6OlN1c3Bl bmRlZCkKICAgICAgICAgW1tXS1Byb2Nlc3NBc3NlcnRpb25CYWNrZ3JvdW5kVGFza01hbmFnZXIg c2hhcmVkXSBpbmNyZW1lbnROZWVkc1RvUnVuSW5CYWNrZ3JvdW5kQ291bnRdOwo= 282392 2016-06-29 17:00:47 -0700 2016-06-29 18:59:28 -0700 Patch bug-159280-20160629170028.patch text/plain 6430 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjAyNjIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMTljNGQ0YzBhZTZmNzU4 NDE4NmJlODdiMDk3ZTVhZTk5NTQ4ZGFkNS4uMWZjNDAzY2JlOWYzNWI4OTQ2YmFjOWFiMWRhMTJj YzE1MTFmMGEyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDE2LTA2LTI5ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gUHJvY2VzcyBzdXNw ZW5zaW9uIGlzIHByZXZlbnRlZCBmb3IgMzAgc2Vjb25kcyBhZnRlciBjbG9zaW5nIGEgdGFiCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTkyODAKKyAg ICAgICAgPHJkYXI6Ly9wcm9ibGVtLzI3MDE0ODY3PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFdoZW4gY2xvc2luZyBhIHRhYiwgQ29ubmVjdGlvblRl cm1pbmF0aW9uV2F0Y2hkb2cgdGFrZXMgYSBiYWNrZ3JvdW5kCisgICAgICAgIGFzc2VydGlvbiBv biBiZWhhbGYgb2YgdGhlIFdlYkNvbnRlbnQgcHJvY2VzcyBhbmQgb25seSByZWxlYXNlcyBpdAor ICAgICAgICBhZnRlciAzMCBzZWNvbmRzLCBhbGxvd2luZyBmb3IgdGhlIFdlYkNvbnRlbnQgcHJv Y2VzcyB0byBleGl0IGNsZWFubHkKKyAgICAgICAgd2l0aG91dCB3b3JyeWluZyBhYm91dCBnZXR0 aW5nIHN1c3BlbmRlZCB0b28gZWFybHkuCisKKyAgICAgICAgSG93ZXZlciwgdGhlIGNoaWxkIHBy b2Nlc3Mgbm9ybWFsbHkgZXhpdHMgbXVjaCBzb29uZXIgdGhhbiB0aGlzIGFuZAorICAgICAgICB3 ZSBlbmQgdXAgaG9sZGluZyBhIHByb2Nlc3MgYXNzZXJ0aW9uIGZvciBubyByZWFzb24gZm9yIGEg ZnVsbCAzMAorICAgICAgICBzZWNvbmRzIGFueXdheS4gVGhpcyBwYXRjaCBhZGRyZXNzZXMgdGhl IGlzc3VlIGJ5IHJlZ2lzdGVyaW5nIGFuCisgICAgICAgIGludmFsaWRhdGlvbiBoYW5kbGVyIHdp dGggdGhlIEJLU1Byb2Nlc3NBc3NlcnRpb24gYW5kIHJlbGVhc2luZyBvdXIKKyAgICAgICAgb3Vy IGFzc2VydGlvbiBpbiBzdWNoIGNhc2UuIFRoZSBpbnZhbGlkYXRpb24gaGFuZGxlciBnZXRzIGNh bGxlZAorICAgICAgICBhcyBzb29uIGFzIHRoZSBjaGlsZCBwcm9jZXNzIGV4aXRzLgorCisgICAg ICAgICogUGxhdGZvcm0vc3BpL2lvcy9Bc3NlcnRpb25TZXJ2aWNlc1NQSS5oOgorICAgICAgICAq IFVJUHJvY2Vzcy9Qcm9jZXNzQXNzZXJ0aW9uLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UHJvY2Vz c0Fzc2VydGlvbjo6UHJvY2Vzc0Fzc2VydGlvbik6CisgICAgICAgICogVUlQcm9jZXNzL1Byb2Nl c3NBc3NlcnRpb24uaDoKKyAgICAgICAgKFdlYktpdDo6UHJvY2Vzc0Fzc2VydGlvbjo6UHJvY2Vz c0Fzc2VydGlvbik6CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9Qcm9jZXNzQXNzZXJ0aW9uSU9T Lm1tOgorICAgICAgICAoV2ViS2l0OjpQcm9jZXNzQXNzZXJ0aW9uOjpQcm9jZXNzQXNzZXJ0aW9u KToKKyAgICAgICAgKFdlYktpdDo6UHJvY2Vzc0FuZFVJQXNzZXJ0aW9uOjpQcm9jZXNzQW5kVUlB c3NlcnRpb24pOgorCiAyMDE2LTA2LTI5ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFA aWdhbGlhLmNvbT4KIAogICAgICAgICBUb28gbXVjaCBkdXBsaWNhdGVkIGNvZGUgaW4gTGF5ZXJU cmVlSG9zdHMgaW1wbGVtZW50YXRpb25zCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9QbGF0 Zm9ybS9zcGkvaW9zL0Fzc2VydGlvblNlcnZpY2VzU1BJLmggYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0 Zm9ybS9zcGkvaW9zL0Fzc2VydGlvblNlcnZpY2VzU1BJLmgKaW5kZXggOTE0NTMxNzAwM2FhMmJl YjUzN2Y4ZjI2ODYxMjY1MDU3MWM4Y2E3MS4uZTJmY2VhMGY0NjMyMmQ5ZDZmYmQ3NmZhYmQzNDk1 NjM5Y2U3NjJhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vc3BpL2lvcy9B c3NlcnRpb25TZXJ2aWNlc1NQSS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL3NwaS9p b3MvQXNzZXJ0aW9uU2VydmljZXNTUEkuaApAQCAtNzIsNiArNzIsNyBAQCBlbnVtIHsKIH07CiB0 eXBlZGVmIHVpbnQzMl90IEJLU1Byb2Nlc3NBc3NlcnRpb25SZWFzb247CiAKK3R5cGVkZWYgdm9p ZCAoXkJLU1Byb2Nlc3NBc3NlcnRpb25JbnZhbGlkYXRpb25IYW5kbGVyKSh2b2lkKTsKIHR5cGVk ZWYgdm9pZCAoXkJLU1Byb2Nlc3NBc3NlcnRpb25BY3F1aXNpdGlvbkhhbmRsZXIpKEJPT0wgYWNx dWlyZWQpOwogCiBAaW50ZXJmYWNlIEJLU1Byb2Nlc3NBc3NlcnRpb24gOiBOU09iamVjdApAQCAt ODAsNiArODEsOCBAQCB0eXBlZGVmIHZvaWQgKF5CS1NQcm9jZXNzQXNzZXJ0aW9uQWNxdWlzaXRp b25IYW5kbGVyKShCT09MIGFjcXVpcmVkKTsKIEBpbnRlcmZhY2UgQktTUHJvY2Vzc0Fzc2VydGlv biAoKQogQHByb3BlcnR5IChub25hdG9taWMsIGFzc2lnbikgQktTUHJvY2Vzc0Fzc2VydGlvbkZs YWdzIGZsYWdzOwogLSAoaWQpaW5pdFdpdGhQSUQ6KHBpZF90KXBpZCBmbGFnczooQktTUHJvY2Vz c0Fzc2VydGlvbkZsYWdzKWZsYWdzIHJlYXNvbjooQktTUHJvY2Vzc0Fzc2VydGlvblJlYXNvbily ZWFzb24gbmFtZTooTlNTdHJpbmcgKiluYW1lIHdpdGhIYW5kbGVyOihCS1NQcm9jZXNzQXNzZXJ0 aW9uQWNxdWlzaXRpb25IYW5kbGVyKWhhbmRsZXI7CisKK0Bwcm9wZXJ0eSAobm9uYXRvbWljLCBj b3B5KSBCS1NQcm9jZXNzQXNzZXJ0aW9uSW52YWxpZGF0aW9uSGFuZGxlciBpbnZhbGlkYXRpb25I YW5kbGVyOwogLSAodm9pZClpbnZhbGlkYXRlOwogQGVuZAogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvUHJvY2Vzc0Fzc2VydGlvbi5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvUHJvY2Vzc0Fzc2VydGlvbi5jcHAKaW5kZXggZTAyNzliZDhhMzkyY2YzY2IwMmUy NzdlOGNhZDAyNTk2NWU2MGU1Mi4uYTVlNmIwZTUxNWI1ODFkNWU3ZmQwZjEzMjRkNzAxMTdjNTZl NTFjMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1Byb2Nlc3NBc3NlcnRp b24uY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Qcm9jZXNzQXNzZXJ0aW9uLmNw cApAQCAtMzAsNyArMzAsNyBAQAogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAotUHJvY2Vzc0Fzc2Vy dGlvbjo6UHJvY2Vzc0Fzc2VydGlvbihwaWRfdCwgQXNzZXJ0aW9uU3RhdGUgYXNzZXJ0aW9uU3Rh dGUpCitQcm9jZXNzQXNzZXJ0aW9uOjpQcm9jZXNzQXNzZXJ0aW9uKHBpZF90LCBBc3NlcnRpb25T dGF0ZSBhc3NlcnRpb25TdGF0ZSwgc3RkOjpmdW5jdGlvbjx2b2lkKCk+KQogICAgIDogbV9hc3Nl cnRpb25TdGF0ZShhc3NlcnRpb25TdGF0ZSkKIHsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9Qcm9jZXNzQXNzZXJ0aW9uLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvUHJvY2Vzc0Fzc2VydGlvbi5oCmluZGV4IDk1Yzk3YzEzZTZiNzI2NzQ3MzAwZTlkZmM2NDQw MmM0MmE1M2IxYzMuLjVjYThhZWI0N2FhYjRjZjg1NDc2Njc1MjIxZDJiMDdhYzNiZTY2ZjAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Qcm9jZXNzQXNzZXJ0aW9uLmgKKysr IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1Byb2Nlc3NBc3NlcnRpb24uaApAQCAtMjYsNiAr MjYsOCBAQAogI2lmbmRlZiBQcm9jZXNzQXNzZXJ0aW9uX2gKICNkZWZpbmUgUHJvY2Vzc0Fzc2Vy dGlvbl9oCiAKKyNpbmNsdWRlIDxmdW5jdGlvbmFsPgorCiAjaWYgUExBVEZPUk0oSU9TKSAmJiAh UExBVEZPUk0oSU9TX1NJTVVMQVRPUikKICNpbmNsdWRlIDx3dGYvUmV0YWluUHRyLmg+CiBPQkpD X0NMQVNTIEJLU1Byb2Nlc3NBc3NlcnRpb247CkBAIC00Nyw3ICs0OSw3IEBAIHB1YmxpYzoKIAog Y2xhc3MgUHJvY2Vzc0Fzc2VydGlvbiB7CiBwdWJsaWM6Ci0gICAgUHJvY2Vzc0Fzc2VydGlvbihw aWRfdCwgQXNzZXJ0aW9uU3RhdGUpOworICAgIFByb2Nlc3NBc3NlcnRpb24ocGlkX3QsIEFzc2Vy dGlvblN0YXRlLCBzdGQ6OmZ1bmN0aW9uPHZvaWQoKT4gaW52YWxpZGF0aW9uQ2FsbGJhY2sgPSB7 IH0pOwogICAgIH5Qcm9jZXNzQXNzZXJ0aW9uKCk7CiAKICAgICB2b2lkIHNldENsaWVudChQcm9j ZXNzQXNzZXJ0aW9uQ2xpZW50JiBjbGllbnQpIHsgbV9jbGllbnQgPSAmY2xpZW50OyB9CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1Byb2Nlc3NBc3NlcnRpb25JT1Mu bW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1Byb2Nlc3NBc3NlcnRpb25JT1MubW0K aW5kZXggYWRmNWViZTk0ZmRmOTY4OWMwNDc3YWJiMjFlNGJjOWZmOTc5NGM0Yy4uZTk4OTBhMzc4 MDA4OTVlOTdiNmQ3OTUzNmEzNzE3YmVmYzMwNGEwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL2lvcy9Qcm9jZXNzQXNzZXJ0aW9uSU9TLm1tCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9pb3MvUHJvY2Vzc0Fzc2VydGlvbklPUy5tbQpAQCAtMTQzLDEwICsxNDMs OSBAQCBzdGF0aWMgQktTUHJvY2Vzc0Fzc2VydGlvbkZsYWdzIGZsYWdzRm9yU3RhdGUoQXNzZXJ0 aW9uU3RhdGUgYXNzZXJ0aW9uU3RhdGUpCiAgICAgfQogfQogCi1Qcm9jZXNzQXNzZXJ0aW9uOjpQ cm9jZXNzQXNzZXJ0aW9uKHBpZF90IHBpZCwgQXNzZXJ0aW9uU3RhdGUgYXNzZXJ0aW9uU3RhdGUp CitQcm9jZXNzQXNzZXJ0aW9uOjpQcm9jZXNzQXNzZXJ0aW9uKHBpZF90IHBpZCwgQXNzZXJ0aW9u U3RhdGUgYXNzZXJ0aW9uU3RhdGUsIHN0ZDo6ZnVuY3Rpb248dm9pZCgpPiBpbnZhbGlkYXRpb25D YWxsYmFjaykKKyAgICA6IG1fYXNzZXJ0aW9uU3RhdGUoYXNzZXJ0aW9uU3RhdGUpCiB7Ci0gICAg bV9hc3NlcnRpb25TdGF0ZSA9IGFzc2VydGlvblN0YXRlOwotICAgIAogICAgIEJLU1Byb2Nlc3NB c3NlcnRpb25BY3F1aXNpdGlvbkhhbmRsZXIgaGFuZGxlciA9IF4oQk9PTCBhY3F1aXJlZCkgewog ICAgICAgICBpZiAoIWFjcXVpcmVkKSB7CiAgICAgICAgICAgICBMT0dfRVJST1IoIlVuYWJsZSB0 byBhY3F1aXJlIGFzc2VydGlvbiBmb3IgcHJvY2VzcyAlZCIsIHBpZCk7CkBAIC0xNTQsNiArMTUz LDkgQEAgUHJvY2Vzc0Fzc2VydGlvbjo6UHJvY2Vzc0Fzc2VydGlvbihwaWRfdCBwaWQsIEFzc2Vy dGlvblN0YXRlIGFzc2VydGlvblN0YXRlKQogICAgICAgICB9CiAgICAgfTsKICAgICBtX2Fzc2Vy dGlvbiA9IGFkb3B0TlMoW1tCS1NQcm9jZXNzQXNzZXJ0aW9uIGFsbG9jXSBpbml0V2l0aFBJRDpw aWQgZmxhZ3M6ZmxhZ3NGb3JTdGF0ZShhc3NlcnRpb25TdGF0ZSkgcmVhc29uOkJLU1Byb2Nlc3NB c3NlcnRpb25SZWFzb25FeHRlbnNpb24gbmFtZTpAIldlYiBjb250ZW50IHZpc2libGUiIHdpdGhI YW5kbGVyOmhhbmRsZXJdKTsKKyAgICBtX2Fzc2VydGlvbi5nZXQoKS5pbnZhbGlkYXRpb25IYW5k bGVyID0gXigpIHsKKyAgICAgICAgaW52YWxpZGF0aW9uQ2FsbGJhY2soKTsKKyAgICB9OwogfQog CiBQcm9jZXNzQXNzZXJ0aW9uOjp+UHJvY2Vzc0Fzc2VydGlvbigpCkBAIC0xNzMsNyArMTc1LDcg QEAgdm9pZCBQcm9jZXNzQXNzZXJ0aW9uOjpzZXRTdGF0ZShBc3NlcnRpb25TdGF0ZSBhc3NlcnRp b25TdGF0ZSkKIH0KIAogUHJvY2Vzc0FuZFVJQXNzZXJ0aW9uOjpQcm9jZXNzQW5kVUlBc3NlcnRp b24ocGlkX3QgcGlkLCBBc3NlcnRpb25TdGF0ZSBhc3NlcnRpb25TdGF0ZSkKLSAgICA6IFByb2Nl c3NBc3NlcnRpb24ocGlkLCBhc3NlcnRpb25TdGF0ZSkKKyAgICA6IFByb2Nlc3NBc3NlcnRpb24o cGlkLCBhc3NlcnRpb25TdGF0ZSwgW3RoaXNdIHsgc2V0U3RhdGUoQXNzZXJ0aW9uU3RhdGU6OlN1 c3BlbmRlZCk7IH0pCiB7CiAgICAgaWYgKGFzc2VydGlvblN0YXRlICE9IEFzc2VydGlvblN0YXRl OjpTdXNwZW5kZWQpCiAgICAgICAgIFtbV0tQcm9jZXNzQXNzZXJ0aW9uQmFja2dyb3VuZFRhc2tN YW5hZ2VyIHNoYXJlZF0gaW5jcmVtZW50TmVlZHNUb1J1bkluQmFja2dyb3VuZENvdW50XTsKQEAg LTIwOSw3ICsyMTEsNyBAQCB2b2lkIFByb2Nlc3NBbmRVSUFzc2VydGlvbjo6c2V0Q2xpZW50KFBy b2Nlc3NBc3NlcnRpb25DbGllbnQmIG5ld0NsaWVudCkKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAK LVByb2Nlc3NBc3NlcnRpb246OlByb2Nlc3NBc3NlcnRpb24ocGlkX3QsIEFzc2VydGlvblN0YXRl IGFzc2VydGlvblN0YXRlKQorUHJvY2Vzc0Fzc2VydGlvbjo6UHJvY2Vzc0Fzc2VydGlvbihwaWRf dCwgQXNzZXJ0aW9uU3RhdGUgYXNzZXJ0aW9uU3RhdGUsIHN0ZDo6ZnVuY3Rpb248dm9pZCgpPikK ICAgICA6IG1fYXNzZXJ0aW9uU3RhdGUoYXNzZXJ0aW9uU3RhdGUpCiB7CiB9Cg== 282407 2016-06-29 18:59:32 -0700 2016-06-30 12:26:00 -0700 Patch without Gavin's refactoring bug-159280-20160629185912.patch text/plain 6380 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjAyNjQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNWE0M2E4NmJlZmJiMmY1 ZjNmNDllMjRlMWNhYzEyOTk3OGM4ZmUwMC4uYTE2OTY1YjVhNjZmZjRjMjUzYjZjZTU2Y2UyNjlh M2U0ODUyYzk5MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDE2LTA2LTI5ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gUHJvY2VzcyBzdXNw ZW5zaW9uIGlzIHByZXZlbnRlZCBmb3IgMzAgc2Vjb25kcyBhZnRlciBjbG9zaW5nIGEgdGFiCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTkyODAKKyAg ICAgICAgPHJkYXI6Ly9wcm9ibGVtLzI3MDE0ODY3PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFdoZW4gY2xvc2luZyBhIHRhYiwgQ29ubmVjdGlvblRl cm1pbmF0aW9uV2F0Y2hkb2cgdGFrZXMgYSBiYWNrZ3JvdW5kCisgICAgICAgIGFzc2VydGlvbiBv biBiZWhhbGYgb2YgdGhlIFdlYkNvbnRlbnQgcHJvY2VzcyBhbmQgb25seSByZWxlYXNlcyBpdAor ICAgICAgICBhZnRlciAzMCBzZWNvbmRzLCBhbGxvd2luZyBmb3IgdGhlIFdlYkNvbnRlbnQgcHJv Y2VzcyB0byBleGl0IGNsZWFubHkKKyAgICAgICAgd2l0aG91dCB3b3JyeWluZyBhYm91dCBnZXR0 aW5nIHN1c3BlbmRlZCB0b28gZWFybHkuCisKKyAgICAgICAgSG93ZXZlciwgdGhlIGNoaWxkIHBy b2Nlc3Mgbm9ybWFsbHkgZXhpdHMgbXVjaCBzb29uZXIgdGhhbiB0aGlzIGFuZAorICAgICAgICB3 ZSBlbmQgdXAgaG9sZGluZyBhIHByb2Nlc3MgYXNzZXJ0aW9uIGZvciBubyByZWFzb24gZm9yIGEg ZnVsbCAzMAorICAgICAgICBzZWNvbmRzIGFueXdheS4gVGhpcyBwYXRjaCBhZGRyZXNzZXMgdGhl IGlzc3VlIGJ5IHJlZ2lzdGVyaW5nIGFuCisgICAgICAgIGludmFsaWRhdGlvbiBoYW5kbGVyIHdp dGggdGhlIEJLU1Byb2Nlc3NBc3NlcnRpb24gYW5kIHJlbGVhc2luZyBvdXIKKyAgICAgICAgb3Vy IGFzc2VydGlvbiBpbiBzdWNoIGNhc2UuIFRoZSBpbnZhbGlkYXRpb24gaGFuZGxlciBnZXRzIGNh bGxlZAorICAgICAgICBhcyBzb29uIGFzIHRoZSBjaGlsZCBwcm9jZXNzIGV4aXRzLgorCisgICAg ICAgICogUGxhdGZvcm0vc3BpL2lvcy9Bc3NlcnRpb25TZXJ2aWNlc1NQSS5oOgorICAgICAgICAq IFVJUHJvY2Vzcy9Qcm9jZXNzQXNzZXJ0aW9uLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UHJvY2Vz c0Fzc2VydGlvbjo6UHJvY2Vzc0Fzc2VydGlvbik6CisgICAgICAgICogVUlQcm9jZXNzL1Byb2Nl c3NBc3NlcnRpb24uaDoKKyAgICAgICAgKFdlYktpdDo6UHJvY2Vzc0Fzc2VydGlvbjo6UHJvY2Vz c0Fzc2VydGlvbik6CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9Qcm9jZXNzQXNzZXJ0aW9uSU9T Lm1tOgorICAgICAgICAoV2ViS2l0OjpQcm9jZXNzQXNzZXJ0aW9uOjpQcm9jZXNzQXNzZXJ0aW9u KToKKyAgICAgICAgKFdlYktpdDo6UHJvY2Vzc0FuZFVJQXNzZXJ0aW9uOjpQcm9jZXNzQW5kVUlB c3NlcnRpb24pOgorCiAyMDE2LTA2LTI5ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBs ZS5jb20+CiAKICAgICAgICAgUmVuYW1lIGFkZHJlc3NGaWVsZHMgdG8gY29udGFjdEZpZWxkcwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vc3BpL2lvcy9Bc3NlcnRpb25TZXJ2 aWNlc1NQSS5oIGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vc3BpL2lvcy9Bc3NlcnRpb25TZXJ2 aWNlc1NQSS5oCmluZGV4IDkxNDUzMTcwMDNhYTJiZWI1MzdmOGYyNjg2MTI2NTA1NzFjOGNhNzEu LmUyZmNlYTBmNDYzMjJkOWQ2ZmJkNzZmYWJkMzQ5NTYzOWNlNzYyYTQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1BsYXRmb3JtL3NwaS9pb3MvQXNzZXJ0aW9uU2VydmljZXNTUEkuaAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9zcGkvaW9zL0Fzc2VydGlvblNlcnZpY2VzU1BJLmgK QEAgLTcyLDYgKzcyLDcgQEAgZW51bSB7CiB9OwogdHlwZWRlZiB1aW50MzJfdCBCS1NQcm9jZXNz QXNzZXJ0aW9uUmVhc29uOwogCit0eXBlZGVmIHZvaWQgKF5CS1NQcm9jZXNzQXNzZXJ0aW9uSW52 YWxpZGF0aW9uSGFuZGxlcikodm9pZCk7CiB0eXBlZGVmIHZvaWQgKF5CS1NQcm9jZXNzQXNzZXJ0 aW9uQWNxdWlzaXRpb25IYW5kbGVyKShCT09MIGFjcXVpcmVkKTsKIAogQGludGVyZmFjZSBCS1NQ cm9jZXNzQXNzZXJ0aW9uIDogTlNPYmplY3QKQEAgLTgwLDYgKzgxLDggQEAgdHlwZWRlZiB2b2lk ICheQktTUHJvY2Vzc0Fzc2VydGlvbkFjcXVpc2l0aW9uSGFuZGxlcikoQk9PTCBhY3F1aXJlZCk7 CiBAaW50ZXJmYWNlIEJLU1Byb2Nlc3NBc3NlcnRpb24gKCkKIEBwcm9wZXJ0eSAobm9uYXRvbWlj LCBhc3NpZ24pIEJLU1Byb2Nlc3NBc3NlcnRpb25GbGFncyBmbGFnczsKIC0gKGlkKWluaXRXaXRo UElEOihwaWRfdClwaWQgZmxhZ3M6KEJLU1Byb2Nlc3NBc3NlcnRpb25GbGFncylmbGFncyByZWFz b246KEJLU1Byb2Nlc3NBc3NlcnRpb25SZWFzb24pcmVhc29uIG5hbWU6KE5TU3RyaW5nICopbmFt ZSB3aXRoSGFuZGxlcjooQktTUHJvY2Vzc0Fzc2VydGlvbkFjcXVpc2l0aW9uSGFuZGxlciloYW5k bGVyOworCitAcHJvcGVydHkgKG5vbmF0b21pYywgY29weSkgQktTUHJvY2Vzc0Fzc2VydGlvbklu dmFsaWRhdGlvbkhhbmRsZXIgaW52YWxpZGF0aW9uSGFuZGxlcjsKIC0gKHZvaWQpaW52YWxpZGF0 ZTsKIEBlbmQKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1Byb2Nlc3NB c3NlcnRpb24uY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1Byb2Nlc3NBc3NlcnRpb24u Y3BwCmluZGV4IGUwMjc5YmQ4YTM5MmNmM2NiMDJlMjc3ZThjYWQwMjU5NjVlNjBlNTIuLmE1ZTZi MGU1MTViNTgxZDVlN2ZkMGYxMzI0ZDcwMTE3YzU2ZTUxYzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9Qcm9jZXNzQXNzZXJ0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvUHJvY2Vzc0Fzc2VydGlvbi5jcHAKQEAgLTMwLDcgKzMwLDcgQEAKIAogbmFt ZXNwYWNlIFdlYktpdCB7CiAKLVByb2Nlc3NBc3NlcnRpb246OlByb2Nlc3NBc3NlcnRpb24ocGlk X3QsIEFzc2VydGlvblN0YXRlIGFzc2VydGlvblN0YXRlKQorUHJvY2Vzc0Fzc2VydGlvbjo6UHJv Y2Vzc0Fzc2VydGlvbihwaWRfdCwgQXNzZXJ0aW9uU3RhdGUgYXNzZXJ0aW9uU3RhdGUsIHN0ZDo6 ZnVuY3Rpb248dm9pZCgpPikKICAgICA6IG1fYXNzZXJ0aW9uU3RhdGUoYXNzZXJ0aW9uU3RhdGUp CiB7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUHJvY2Vzc0Fzc2Vy dGlvbi5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1Byb2Nlc3NBc3NlcnRpb24uaAppbmRl eCA5NWM5N2MxM2U2YjcyNjc0NzMwMGU5ZGZjNjQ0MDJjNDJhNTNiMWMzLi41Y2E4YWViNDdhYWI0 Y2Y4NTQ3NjY3NTIyMWQyYjA3YWMzYmU2NmYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvUHJvY2Vzc0Fzc2VydGlvbi5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9Qcm9jZXNzQXNzZXJ0aW9uLmgKQEAgLTI2LDYgKzI2LDggQEAKICNpZm5kZWYgUHJvY2Vzc0Fz c2VydGlvbl9oCiAjZGVmaW5lIFByb2Nlc3NBc3NlcnRpb25faAogCisjaW5jbHVkZSA8ZnVuY3Rp b25hbD4KKwogI2lmIFBMQVRGT1JNKElPUykgJiYgIVBMQVRGT1JNKElPU19TSU1VTEFUT1IpCiAj aW5jbHVkZSA8d3RmL1JldGFpblB0ci5oPgogT0JKQ19DTEFTUyBCS1NQcm9jZXNzQXNzZXJ0aW9u OwpAQCAtNDcsNyArNDksNyBAQCBwdWJsaWM6CiAKIGNsYXNzIFByb2Nlc3NBc3NlcnRpb24gewog cHVibGljOgotICAgIFByb2Nlc3NBc3NlcnRpb24ocGlkX3QsIEFzc2VydGlvblN0YXRlKTsKKyAg ICBQcm9jZXNzQXNzZXJ0aW9uKHBpZF90LCBBc3NlcnRpb25TdGF0ZSwgc3RkOjpmdW5jdGlvbjx2 b2lkKCk+IGludmFsaWRhdGlvbkNhbGxiYWNrID0geyB9KTsKICAgICB+UHJvY2Vzc0Fzc2VydGlv bigpOwogCiAgICAgdm9pZCBzZXRDbGllbnQoUHJvY2Vzc0Fzc2VydGlvbkNsaWVudCYgY2xpZW50 KSB7IG1fY2xpZW50ID0gJmNsaWVudDsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL2lvcy9Qcm9jZXNzQXNzZXJ0aW9uSU9TLm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL2lvcy9Qcm9jZXNzQXNzZXJ0aW9uSU9TLm1tCmluZGV4IGFkZjVlYmU5NGZkZjk2ODljMDQ3 N2FiYjIxZTRiYzlmZjk3OTRjNGMuLjY4ZTRhNzgyNDU2NzdlMWUwOTNhYTNiZGIxOTU4NzVjM2Qx Y2U2MzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvUHJvY2Vzc0Fz c2VydGlvbklPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1Byb2Nlc3NB c3NlcnRpb25JT1MubW0KQEAgLTE0MywxNyArMTQzLDIwIEBAIHN0YXRpYyBCS1NQcm9jZXNzQXNz ZXJ0aW9uRmxhZ3MgZmxhZ3NGb3JTdGF0ZShBc3NlcnRpb25TdGF0ZSBhc3NlcnRpb25TdGF0ZSkK ICAgICB9CiB9CiAKLVByb2Nlc3NBc3NlcnRpb246OlByb2Nlc3NBc3NlcnRpb24ocGlkX3QgcGlk LCBBc3NlcnRpb25TdGF0ZSBhc3NlcnRpb25TdGF0ZSkKK1Byb2Nlc3NBc3NlcnRpb246OlByb2Nl c3NBc3NlcnRpb24ocGlkX3QgcGlkLCBBc3NlcnRpb25TdGF0ZSBhc3NlcnRpb25TdGF0ZSwgc3Rk OjpmdW5jdGlvbjx2b2lkKCk+IGludmFsaWRhdGlvbkNhbGxiYWNrKQorICAgIDogbV9hc3NlcnRp b25TdGF0ZShhc3NlcnRpb25TdGF0ZSkKIHsKLSAgICBtX2Fzc2VydGlvblN0YXRlID0gYXNzZXJ0 aW9uU3RhdGU7Ci0gICAgCiAgICAgQktTUHJvY2Vzc0Fzc2VydGlvbkFjcXVpc2l0aW9uSGFuZGxl ciBoYW5kbGVyID0gXihCT09MIGFjcXVpcmVkKSB7CiAgICAgICAgIGlmICghYWNxdWlyZWQpIHsK ICAgICAgICAgICAgIExPR19FUlJPUigiVW5hYmxlIHRvIGFjcXVpcmUgYXNzZXJ0aW9uIGZvciBw cm9jZXNzICVkIiwgcGlkKTsKICAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAg ICAgICAgICAgaW52YWxpZGF0aW9uQ2FsbGJhY2soKTsKICAgICAgICAgfQogICAgIH07CiAgICAg bV9hc3NlcnRpb24gPSBhZG9wdE5TKFtbQktTUHJvY2Vzc0Fzc2VydGlvbiBhbGxvY10gaW5pdFdp dGhQSUQ6cGlkIGZsYWdzOmZsYWdzRm9yU3RhdGUoYXNzZXJ0aW9uU3RhdGUpIHJlYXNvbjpCS1NQ cm9jZXNzQXNzZXJ0aW9uUmVhc29uRXh0ZW5zaW9uIG5hbWU6QCJXZWIgY29udGVudCB2aXNpYmxl IiB3aXRoSGFuZGxlcjpoYW5kbGVyXSk7CisgICAgbV9hc3NlcnRpb24uZ2V0KCkuaW52YWxpZGF0 aW9uSGFuZGxlciA9IF4oKSB7CisgICAgICAgIGludmFsaWRhdGlvbkNhbGxiYWNrKCk7CisgICAg fTsKIH0KIAogUHJvY2Vzc0Fzc2VydGlvbjo6flByb2Nlc3NBc3NlcnRpb24oKQpAQCAtMTczLDcg KzE3Niw3IEBAIHZvaWQgUHJvY2Vzc0Fzc2VydGlvbjo6c2V0U3RhdGUoQXNzZXJ0aW9uU3RhdGUg YXNzZXJ0aW9uU3RhdGUpCiB9CiAKIFByb2Nlc3NBbmRVSUFzc2VydGlvbjo6UHJvY2Vzc0FuZFVJ QXNzZXJ0aW9uKHBpZF90IHBpZCwgQXNzZXJ0aW9uU3RhdGUgYXNzZXJ0aW9uU3RhdGUpCi0gICAg OiBQcm9jZXNzQXNzZXJ0aW9uKHBpZCwgYXNzZXJ0aW9uU3RhdGUpCisgICAgOiBQcm9jZXNzQXNz ZXJ0aW9uKHBpZCwgYXNzZXJ0aW9uU3RhdGUsIFt0aGlzXSB7IHNldFN0YXRlKEFzc2VydGlvblN0 YXRlOjpTdXNwZW5kZWQpOyB9KQogewogICAgIGlmIChhc3NlcnRpb25TdGF0ZSAhPSBBc3NlcnRp b25TdGF0ZTo6U3VzcGVuZGVkKQogICAgICAgICBbW1dLUHJvY2Vzc0Fzc2VydGlvbkJhY2tncm91 bmRUYXNrTWFuYWdlciBzaGFyZWRdIGluY3JlbWVudE5lZWRzVG9SdW5JbkJhY2tncm91bmRDb3Vu dF07CkBAIC0yMDksNyArMjEyLDcgQEAgdm9pZCBQcm9jZXNzQW5kVUlBc3NlcnRpb246OnNldENs aWVudChQcm9jZXNzQXNzZXJ0aW9uQ2xpZW50JiBuZXdDbGllbnQpCiAKIG5hbWVzcGFjZSBXZWJL aXQgewogCi1Qcm9jZXNzQXNzZXJ0aW9uOjpQcm9jZXNzQXNzZXJ0aW9uKHBpZF90LCBBc3NlcnRp b25TdGF0ZSBhc3NlcnRpb25TdGF0ZSkKK1Byb2Nlc3NBc3NlcnRpb246OlByb2Nlc3NBc3NlcnRp b24ocGlkX3QsIEFzc2VydGlvblN0YXRlIGFzc2VydGlvblN0YXRlLCBzdGQ6OmZ1bmN0aW9uPHZv aWQoKT4pCiAgICAgOiBtX2Fzc2VydGlvblN0YXRlKGFzc2VydGlvblN0YXRlKQogewogfQo= 282409 2016-06-29 19:34:41 -0700 2016-06-30 12:26:03 -0700 Patch with Gavin's refactoring bug-159280-20160629193421.patch text/plain 8700 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjAyNjQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNWE0M2E4NmJlZmJiMmY1 ZjNmNDllMjRlMWNhYzEyOTk3OGM4ZmUwMC4uYTA2MzQyOTJkMDhmZjQ1OTg2OGQ4OWJiZGEzZjIy YTJiMjYxNmUzYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDE2LTA2LTI5ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gUHJvY2VzcyBzdXNw ZW5zaW9uIGlzIHByZXZlbnRlZCBmb3IgMzAgc2Vjb25kcyBhZnRlciBjbG9zaW5nIGEgdGFiCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTkyODAKKyAg ICAgICAgPHJkYXI6Ly9wcm9ibGVtLzI3MDE0ODY3PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFdoZW4gY2xvc2luZyBhIHRhYiwgQ29ubmVjdGlvblRl cm1pbmF0aW9uV2F0Y2hkb2cgdGFrZXMgYSBiYWNrZ3JvdW5kCisgICAgICAgIGFzc2VydGlvbiBv biBiZWhhbGYgb2YgdGhlIFdlYkNvbnRlbnQgcHJvY2VzcyBhbmQgb25seSByZWxlYXNlcyBpdAor ICAgICAgICBhZnRlciAzMCBzZWNvbmRzLCBhbGxvd2luZyBmb3IgdGhlIFdlYkNvbnRlbnQgcHJv Y2VzcyB0byBleGl0IGNsZWFubHkKKyAgICAgICAgd2l0aG91dCB3b3JyeWluZyBhYm91dCBnZXR0 aW5nIHN1c3BlbmRlZCB0b28gZWFybHkuCisKKyAgICAgICAgSG93ZXZlciwgdGhlIGNoaWxkIHBy b2Nlc3Mgbm9ybWFsbHkgZXhpdHMgbXVjaCBzb29uZXIgdGhhbiB0aGlzIGFuZAorICAgICAgICB3 ZSBlbmQgdXAgaG9sZGluZyBhIHByb2Nlc3MgYXNzZXJ0aW9uIGZvciBubyByZWFzb24gZm9yIGEg ZnVsbCAzMAorICAgICAgICBzZWNvbmRzIGFueXdheS4gVGhpcyBwYXRjaCBhZGRyZXNzZXMgdGhl IGlzc3VlIGJ5IHJlZ2lzdGVyaW5nIGFuCisgICAgICAgIGludmFsaWRhdGlvbiBoYW5kbGVyIHdp dGggdGhlIEJLU1Byb2Nlc3NBc3NlcnRpb24gYW5kIHJlbGVhc2luZyBvdXIKKyAgICAgICAgb3Vy IGFzc2VydGlvbiBpbiBzdWNoIGNhc2UuIFRoZSBpbnZhbGlkYXRpb24gaGFuZGxlciBnZXRzIGNh bGxlZAorICAgICAgICBhcyBzb29uIGFzIHRoZSBjaGlsZCBwcm9jZXNzIGV4aXRzLgorCisgICAg ICAgIFRoaXMgcGF0Y2ggaW5jbHVkZXMgR2F2aW4ncyByZWZhY3RvcmluZyBmcm9tIEJ1ZyAxNTky ODQuCisKKyAgICAgICAgKiBQbGF0Zm9ybS9zcGkvaW9zL0Fzc2VydGlvblNlcnZpY2VzU1BJLmg6 CisgICAgICAgICogVUlQcm9jZXNzL1Byb2Nlc3NBc3NlcnRpb24uY3BwOgorICAgICAgICAoV2Vi S2l0OjpQcm9jZXNzQXNzZXJ0aW9uOjpQcm9jZXNzQXNzZXJ0aW9uKToKKyAgICAgICAgKiBVSVBy b2Nlc3MvUHJvY2Vzc0Fzc2VydGlvbi5oOgorICAgICAgICAoV2ViS2l0OjpQcm9jZXNzQXNzZXJ0 aW9uOjpQcm9jZXNzQXNzZXJ0aW9uKToKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1Byb2Nlc3NB c3NlcnRpb25JT1MubW06CisgICAgICAgIChXZWJLaXQ6OlByb2Nlc3NBc3NlcnRpb246OlByb2Nl c3NBc3NlcnRpb24pOgorICAgICAgICAoV2ViS2l0OjpQcm9jZXNzQW5kVUlBc3NlcnRpb246OlBy b2Nlc3NBbmRVSUFzc2VydGlvbik6CisKIDIwMTYtMDYtMjkgIEFuZGVycyBDYXJsc3NvbiAgPGFu ZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW5hbWUgYWRkcmVzc0ZpZWxkcyB0byBjb250 YWN0RmllbGRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9zcGkvaW9zL0Fz c2VydGlvblNlcnZpY2VzU1BJLmggYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9zcGkvaW9zL0Fz c2VydGlvblNlcnZpY2VzU1BJLmgKaW5kZXggOTE0NTMxNzAwM2FhMmJlYjUzN2Y4ZjI2ODYxMjY1 MDU3MWM4Y2E3MS4uZTJmY2VhMGY0NjMyMmQ5ZDZmYmQ3NmZhYmQzNDk1NjM5Y2U3NjJhNCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vc3BpL2lvcy9Bc3NlcnRpb25TZXJ2aWNl c1NQSS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL3NwaS9pb3MvQXNzZXJ0aW9uU2Vy dmljZXNTUEkuaApAQCAtNzIsNiArNzIsNyBAQCBlbnVtIHsKIH07CiB0eXBlZGVmIHVpbnQzMl90 IEJLU1Byb2Nlc3NBc3NlcnRpb25SZWFzb247CiAKK3R5cGVkZWYgdm9pZCAoXkJLU1Byb2Nlc3NB c3NlcnRpb25JbnZhbGlkYXRpb25IYW5kbGVyKSh2b2lkKTsKIHR5cGVkZWYgdm9pZCAoXkJLU1By b2Nlc3NBc3NlcnRpb25BY3F1aXNpdGlvbkhhbmRsZXIpKEJPT0wgYWNxdWlyZWQpOwogCiBAaW50 ZXJmYWNlIEJLU1Byb2Nlc3NBc3NlcnRpb24gOiBOU09iamVjdApAQCAtODAsNiArODEsOCBAQCB0 eXBlZGVmIHZvaWQgKF5CS1NQcm9jZXNzQXNzZXJ0aW9uQWNxdWlzaXRpb25IYW5kbGVyKShCT09M IGFjcXVpcmVkKTsKIEBpbnRlcmZhY2UgQktTUHJvY2Vzc0Fzc2VydGlvbiAoKQogQHByb3BlcnR5 IChub25hdG9taWMsIGFzc2lnbikgQktTUHJvY2Vzc0Fzc2VydGlvbkZsYWdzIGZsYWdzOwogLSAo aWQpaW5pdFdpdGhQSUQ6KHBpZF90KXBpZCBmbGFnczooQktTUHJvY2Vzc0Fzc2VydGlvbkZsYWdz KWZsYWdzIHJlYXNvbjooQktTUHJvY2Vzc0Fzc2VydGlvblJlYXNvbilyZWFzb24gbmFtZTooTlNT dHJpbmcgKiluYW1lIHdpdGhIYW5kbGVyOihCS1NQcm9jZXNzQXNzZXJ0aW9uQWNxdWlzaXRpb25I YW5kbGVyKWhhbmRsZXI7CisKK0Bwcm9wZXJ0eSAobm9uYXRvbWljLCBjb3B5KSBCS1NQcm9jZXNz QXNzZXJ0aW9uSW52YWxpZGF0aW9uSGFuZGxlciBpbnZhbGlkYXRpb25IYW5kbGVyOwogLSAodm9p ZClpbnZhbGlkYXRlOwogQGVuZAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvUHJvY2Vzc0Fzc2VydGlvbi5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUHJvY2Vz c0Fzc2VydGlvbi5jcHAKaW5kZXggZTAyNzliZDhhMzkyY2YzY2IwMmUyNzdlOGNhZDAyNTk2NWU2 MGU1Mi4uYTVlNmIwZTUxNWI1ODFkNWU3ZmQwZjEzMjRkNzAxMTdjNTZlNTFjMCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1Byb2Nlc3NBc3NlcnRpb24uY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Qcm9jZXNzQXNzZXJ0aW9uLmNwcApAQCAtMzAsNyArMzAs NyBAQAogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAotUHJvY2Vzc0Fzc2VydGlvbjo6UHJvY2Vzc0Fz c2VydGlvbihwaWRfdCwgQXNzZXJ0aW9uU3RhdGUgYXNzZXJ0aW9uU3RhdGUpCitQcm9jZXNzQXNz ZXJ0aW9uOjpQcm9jZXNzQXNzZXJ0aW9uKHBpZF90LCBBc3NlcnRpb25TdGF0ZSBhc3NlcnRpb25T dGF0ZSwgc3RkOjpmdW5jdGlvbjx2b2lkKCk+KQogICAgIDogbV9hc3NlcnRpb25TdGF0ZShhc3Nl cnRpb25TdGF0ZSkKIHsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Q cm9jZXNzQXNzZXJ0aW9uLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUHJvY2Vzc0Fzc2Vy dGlvbi5oCmluZGV4IDk1Yzk3YzEzZTZiNzI2NzQ3MzAwZTlkZmM2NDQwMmM0MmE1M2IxYzMuLjZm Njk3OTBlZjNkMmUzZGY5NDA3NzQyZWJhZDFiNWQzODFkYjAxODYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9Qcm9jZXNzQXNzZXJ0aW9uLmgKKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1Byb2Nlc3NBc3NlcnRpb24uaApAQCAtMjYsNiArMjYsOCBAQAogI2lmbmRl ZiBQcm9jZXNzQXNzZXJ0aW9uX2gKICNkZWZpbmUgUHJvY2Vzc0Fzc2VydGlvbl9oCiAKKyNpbmNs dWRlIDxmdW5jdGlvbmFsPgorCiAjaWYgUExBVEZPUk0oSU9TKSAmJiAhUExBVEZPUk0oSU9TX1NJ TVVMQVRPUikKICNpbmNsdWRlIDx3dGYvUmV0YWluUHRyLmg+CiBPQkpDX0NMQVNTIEJLU1Byb2Nl c3NBc3NlcnRpb247CkBAIC00Nyw3ICs0OSw3IEBAIHB1YmxpYzoKIAogY2xhc3MgUHJvY2Vzc0Fz c2VydGlvbiB7CiBwdWJsaWM6Ci0gICAgUHJvY2Vzc0Fzc2VydGlvbihwaWRfdCwgQXNzZXJ0aW9u U3RhdGUpOworICAgIFByb2Nlc3NBc3NlcnRpb24ocGlkX3QsIEFzc2VydGlvblN0YXRlLCBzdGQ6 OmZ1bmN0aW9uPHZvaWQoKT4gaW52YWxpZGF0aW9uQ2FsbGJhY2sgPSB7IH0pOwogICAgIH5Qcm9j ZXNzQXNzZXJ0aW9uKCk7CiAKICAgICB2b2lkIHNldENsaWVudChQcm9jZXNzQXNzZXJ0aW9uQ2xp ZW50JiBjbGllbnQpIHsgbV9jbGllbnQgPSAmY2xpZW50OyB9CkBAIC01Niw5ICs1OCwxNSBAQCBw dWJsaWM6CiAgICAgQXNzZXJ0aW9uU3RhdGUgc3RhdGUoKSBjb25zdCB7IHJldHVybiBtX2Fzc2Vy dGlvblN0YXRlOyB9CiAgICAgdm9pZCBzZXRTdGF0ZShBc3NlcnRpb25TdGF0ZSk7CiAKKyNpZiBQ TEFURk9STShJT1MpICYmICFQTEFURk9STShJT1NfU0lNVUxBVE9SKQorcHJvdGVjdGVkOgorICAg IGJvb2wgaXNWYWxpZCgpIGNvbnN0IHsgcmV0dXJuIG1faXNWYWxpZDsgfQorI2VuZGlmCisKIHBy aXZhdGU6CiAjaWYgUExBVEZPUk0oSU9TKSAmJiAhUExBVEZPUk0oSU9TX1NJTVVMQVRPUikKICAg ICBSZXRhaW5QdHI8QktTUHJvY2Vzc0Fzc2VydGlvbj4gbV9hc3NlcnRpb247CisgICAgYm9vbCBt X2lzVmFsaWQgeyB0cnVlIH07CiAjZW5kaWYKICAgICBBc3NlcnRpb25TdGF0ZSBtX2Fzc2VydGlv blN0YXRlOwogICAgIFByb2Nlc3NBc3NlcnRpb25DbGllbnQqIG1fY2xpZW50IHsgbnVsbHB0ciB9 OwpAQCAtNzIsNiArODAsMTMgQEAgcHVibGljOgogICAgIHZvaWQgc2V0Q2xpZW50KFByb2Nlc3NB c3NlcnRpb25DbGllbnQmKTsKIAogICAgIHZvaWQgc2V0U3RhdGUoQXNzZXJ0aW9uU3RhdGUpOwor CisjaWYgUExBVEZPUk0oSU9TKSAmJiAhUExBVEZPUk0oSU9TX1NJTVVMQVRPUikKK3ByaXZhdGU6 CisgICAgdm9pZCB1cGRhdGVSdW5JbkJhY2tncm91bmRDb3VudCgpOworCisgICAgYm9vbCBtX2lz SG9sZGluZ0JhY2tncm91bmRBc3NlcnRpb24geyBmYWxzZSB9OworI2VuZGlmCiB9OwogICAgIAog fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9Qcm9jZXNzQXNzZXJ0 aW9uSU9TLm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9Qcm9jZXNzQXNzZXJ0aW9u SU9TLm1tCmluZGV4IGFkZjVlYmU5NGZkZjk2ODljMDQ3N2FiYjIxZTRiYzlmZjk3OTRjNGMuLjNh MGU5NGNhNjlhMzk3ZWYyMjhhOWUzYmJmYjhkMjZkZTdiNjU0YjcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvUHJvY2Vzc0Fzc2VydGlvbklPUy5tbQorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1Byb2Nlc3NBc3NlcnRpb25JT1MubW0KQEAgLTE0Mywx NyArMTQzLDIyIEBAIHN0YXRpYyBCS1NQcm9jZXNzQXNzZXJ0aW9uRmxhZ3MgZmxhZ3NGb3JTdGF0 ZShBc3NlcnRpb25TdGF0ZSBhc3NlcnRpb25TdGF0ZSkKICAgICB9CiB9CiAKLVByb2Nlc3NBc3Nl cnRpb246OlByb2Nlc3NBc3NlcnRpb24ocGlkX3QgcGlkLCBBc3NlcnRpb25TdGF0ZSBhc3NlcnRp b25TdGF0ZSkKK1Byb2Nlc3NBc3NlcnRpb246OlByb2Nlc3NBc3NlcnRpb24ocGlkX3QgcGlkLCBB c3NlcnRpb25TdGF0ZSBhc3NlcnRpb25TdGF0ZSwgc3RkOjpmdW5jdGlvbjx2b2lkKCk+IGludmFs aWRhdGlvbkNhbGxiYWNrKQorICAgIDogbV9hc3NlcnRpb25TdGF0ZShhc3NlcnRpb25TdGF0ZSkK IHsKLSAgICBtX2Fzc2VydGlvblN0YXRlID0gYXNzZXJ0aW9uU3RhdGU7Ci0gICAgCiAgICAgQktT UHJvY2Vzc0Fzc2VydGlvbkFjcXVpc2l0aW9uSGFuZGxlciBoYW5kbGVyID0gXihCT09MIGFjcXVp cmVkKSB7CiAgICAgICAgIGlmICghYWNxdWlyZWQpIHsKLSAgICAgICAgICAgIExPR19FUlJPUigi VW5hYmxlIHRvIGFjcXVpcmUgYXNzZXJ0aW9uIGZvciBwcm9jZXNzICVkIiwgcGlkKTsKKyAgICAg ICAgICAgIExPR19BTFdBWVNfRVJST1IodHJ1ZSwgIlVuYWJsZSB0byBhY3F1aXJlIGFzc2VydGlv biBmb3IgcHJvY2VzcyAlZCIsIHBpZCk7CiAgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQo KTsKKyAgICAgICAgICAgIG1faXNWYWxpZCA9IGZhbHNlOworICAgICAgICAgICAgaW52YWxpZGF0 aW9uQ2FsbGJhY2soKTsKICAgICAgICAgfQogICAgIH07CiAgICAgbV9hc3NlcnRpb24gPSBhZG9w dE5TKFtbQktTUHJvY2Vzc0Fzc2VydGlvbiBhbGxvY10gaW5pdFdpdGhQSUQ6cGlkIGZsYWdzOmZs YWdzRm9yU3RhdGUoYXNzZXJ0aW9uU3RhdGUpIHJlYXNvbjpCS1NQcm9jZXNzQXNzZXJ0aW9uUmVh c29uRXh0ZW5zaW9uIG5hbWU6QCJXZWIgY29udGVudCB2aXNpYmxlIiB3aXRoSGFuZGxlcjpoYW5k bGVyXSk7CisgICAgbV9hc3NlcnRpb24uZ2V0KCkuaW52YWxpZGF0aW9uSGFuZGxlciA9IF4oKSB7 CisgICAgICAgIG1faXNWYWxpZCA9IGZhbHNlOworICAgICAgICBpbnZhbGlkYXRpb25DYWxsYmFj aygpOworICAgIH07CiB9CiAKIFByb2Nlc3NBc3NlcnRpb246On5Qcm9jZXNzQXNzZXJ0aW9uKCkK QEAgLTE3MywyNiArMTc4LDMzIEBAIHZvaWQgUHJvY2Vzc0Fzc2VydGlvbjo6c2V0U3RhdGUoQXNz ZXJ0aW9uU3RhdGUgYXNzZXJ0aW9uU3RhdGUpCiB9CiAKIFByb2Nlc3NBbmRVSUFzc2VydGlvbjo6 UHJvY2Vzc0FuZFVJQXNzZXJ0aW9uKHBpZF90IHBpZCwgQXNzZXJ0aW9uU3RhdGUgYXNzZXJ0aW9u U3RhdGUpCi0gICAgOiBQcm9jZXNzQXNzZXJ0aW9uKHBpZCwgYXNzZXJ0aW9uU3RhdGUpCisgICAg OiBQcm9jZXNzQXNzZXJ0aW9uKHBpZCwgYXNzZXJ0aW9uU3RhdGUsIFt0aGlzXSB7IHVwZGF0ZVJ1 bkluQmFja2dyb3VuZENvdW50KCk7IH0pCiB7Ci0gICAgaWYgKGFzc2VydGlvblN0YXRlICE9IEFz c2VydGlvblN0YXRlOjpTdXNwZW5kZWQpCi0gICAgICAgIFtbV0tQcm9jZXNzQXNzZXJ0aW9uQmFj a2dyb3VuZFRhc2tNYW5hZ2VyIHNoYXJlZF0gaW5jcmVtZW50TmVlZHNUb1J1bkluQmFja2dyb3Vu ZENvdW50XTsKKyAgICB1cGRhdGVSdW5JbkJhY2tncm91bmRDb3VudCgpOwogfQogCiBQcm9jZXNz QW5kVUlBc3NlcnRpb246On5Qcm9jZXNzQW5kVUlBc3NlcnRpb24oKQogewotICAgIGlmIChzdGF0 ZSgpICE9IEFzc2VydGlvblN0YXRlOjpTdXNwZW5kZWQpCisgICAgaWYgKG1faXNIb2xkaW5nQmFj a2dyb3VuZEFzc2VydGlvbikKICAgICAgICAgW1tXS1Byb2Nlc3NBc3NlcnRpb25CYWNrZ3JvdW5k VGFza01hbmFnZXIgc2hhcmVkXSBkZWNyZW1lbnROZWVkc1RvUnVuSW5CYWNrZ3JvdW5kQ291bnRd OwogfQogCiB2b2lkIFByb2Nlc3NBbmRVSUFzc2VydGlvbjo6c2V0U3RhdGUoQXNzZXJ0aW9uU3Rh dGUgYXNzZXJ0aW9uU3RhdGUpCiB7Ci0gICAgaWYgKChzdGF0ZSgpID09IEFzc2VydGlvblN0YXRl OjpTdXNwZW5kZWQpICYmIChhc3NlcnRpb25TdGF0ZSAhPSBBc3NlcnRpb25TdGF0ZTo6U3VzcGVu ZGVkKSkKKyAgICBQcm9jZXNzQXNzZXJ0aW9uOjpzZXRTdGF0ZShhc3NlcnRpb25TdGF0ZSk7Cisg ICAgdXBkYXRlUnVuSW5CYWNrZ3JvdW5kQ291bnQoKTsKK30KKwordm9pZCBQcm9jZXNzQW5kVUlB c3NlcnRpb246OnVwZGF0ZVJ1bkluQmFja2dyb3VuZENvdW50KCkKK3sKKyAgICBib29sIHNob3Vs ZEhvbGRCYWNrZ3JvdW5kQXNzZXJ0aW9uID0gaXNWYWxpZCgpICYmIHN0YXRlKCkgIT0gQXNzZXJ0 aW9uU3RhdGU6OlN1c3BlbmRlZDsKKworICAgIGlmICghbV9pc0hvbGRpbmdCYWNrZ3JvdW5kQXNz ZXJ0aW9uICYmIHNob3VsZEhvbGRCYWNrZ3JvdW5kQXNzZXJ0aW9uKQogICAgICAgICBbW1dLUHJv Y2Vzc0Fzc2VydGlvbkJhY2tncm91bmRUYXNrTWFuYWdlciBzaGFyZWRdIGluY3JlbWVudE5lZWRz VG9SdW5JbkJhY2tncm91bmRDb3VudF07Ci0gICAgaWYgKChzdGF0ZSgpICE9IEFzc2VydGlvblN0 YXRlOjpTdXNwZW5kZWQpICYmIChhc3NlcnRpb25TdGF0ZSA9PSBBc3NlcnRpb25TdGF0ZTo6U3Vz cGVuZGVkKSkKKyAgICBlbHNlIGlmIChtX2lzSG9sZGluZ0JhY2tncm91bmRBc3NlcnRpb24gJiYg IXNob3VsZEhvbGRCYWNrZ3JvdW5kQXNzZXJ0aW9uKQogICAgICAgICBbW1dLUHJvY2Vzc0Fzc2Vy dGlvbkJhY2tncm91bmRUYXNrTWFuYWdlciBzaGFyZWRdIGRlY3JlbWVudE5lZWRzVG9SdW5JbkJh Y2tncm91bmRDb3VudF07CiAKLSAgICBQcm9jZXNzQXNzZXJ0aW9uOjpzZXRTdGF0ZShhc3NlcnRp b25TdGF0ZSk7CisgICAgbV9pc0hvbGRpbmdCYWNrZ3JvdW5kQXNzZXJ0aW9uID0gc2hvdWxkSG9s ZEJhY2tncm91bmRBc3NlcnRpb247CiB9CiAKIHZvaWQgUHJvY2Vzc0FuZFVJQXNzZXJ0aW9uOjpz ZXRDbGllbnQoUHJvY2Vzc0Fzc2VydGlvbkNsaWVudCYgbmV3Q2xpZW50KQpAQCAtMjA5LDcgKzIy MSw3IEBAIHZvaWQgUHJvY2Vzc0FuZFVJQXNzZXJ0aW9uOjpzZXRDbGllbnQoUHJvY2Vzc0Fzc2Vy dGlvbkNsaWVudCYgbmV3Q2xpZW50KQogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAotUHJvY2Vzc0Fz c2VydGlvbjo6UHJvY2Vzc0Fzc2VydGlvbihwaWRfdCwgQXNzZXJ0aW9uU3RhdGUgYXNzZXJ0aW9u U3RhdGUpCitQcm9jZXNzQXNzZXJ0aW9uOjpQcm9jZXNzQXNzZXJ0aW9uKHBpZF90LCBBc3NlcnRp b25TdGF0ZSBhc3NlcnRpb25TdGF0ZSwgc3RkOjpmdW5jdGlvbjx2b2lkKCk+KQogICAgIDogbV9h c3NlcnRpb25TdGF0ZShhc3NlcnRpb25TdGF0ZSkKIHsKIH0K 282455 2016-06-30 12:26:07 -0700 2016-06-30 13:17:54 -0700 Patch bug-159280-20160630122546.patch text/plain 7865 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjAyNjkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNTVhN2M0NTFmNTZjNzYw NzkzN2QwNWEzYzcyYzI1YTIyMTVmNjA5ZC4uODk1ZWQ3N2ViNzI1MjVkMWRkYjVjYzBjYTkyMzg0 ZDU0NGY2M2UyNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDE2LTA2LTMwICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gUHJvY2VzcyBzdXNw ZW5zaW9uIGlzIHByZXZlbnRlZCBmb3IgMzAgc2Vjb25kcyBhZnRlciBjbG9zaW5nIGEgdGFiCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTkyODAKKyAg ICAgICAgPHJkYXI6Ly9wcm9ibGVtLzI3MDE0ODY3PgorCisgICAgICAgIFJldmlld2VkIGJ5IEdh dmluIEJhcnJhY2xvdWdoLgorCisgICAgICAgIFdoZW4gY2xvc2luZyBhIHRhYiwgQ29ubmVjdGlv blRlcm1pbmF0aW9uV2F0Y2hkb2cgdGFrZXMgYSBiYWNrZ3JvdW5kCisgICAgICAgIGFzc2VydGlv biBvbiBiZWhhbGYgb2YgdGhlIFdlYkNvbnRlbnQgcHJvY2VzcyBhbmQgb25seSByZWxlYXNlcyBp dAorICAgICAgICBhZnRlciAzMCBzZWNvbmRzLCBhbGxvd2luZyBmb3IgdGhlIFdlYkNvbnRlbnQg cHJvY2VzcyB0byBleGl0IGNsZWFubHkKKyAgICAgICAgd2l0aG91dCB3b3JyeWluZyBhYm91dCBn ZXR0aW5nIHN1c3BlbmRlZCB0b28gZWFybHkuCisKKyAgICAgICAgSG93ZXZlciwgdGhlIGNoaWxk IHByb2Nlc3Mgbm9ybWFsbHkgZXhpdHMgbXVjaCBzb29uZXIgdGhhbiB0aGlzIGFuZAorICAgICAg ICB3ZSBlbmQgdXAgaG9sZGluZyBhIHByb2Nlc3MgYXNzZXJ0aW9uIGZvciBubyByZWFzb24gZm9y IGEgZnVsbCAzMAorICAgICAgICBzZWNvbmRzIGFueXdheS4gVGhpcyBwYXRjaCBhZGRyZXNzZXMg dGhlIGlzc3VlIGJ5IHJlZ2lzdGVyaW5nIGFuCisgICAgICAgIGludmFsaWRhdGlvbiBoYW5kbGVy IHdpdGggdGhlIEJLU1Byb2Nlc3NBc3NlcnRpb24gYW5kIHJlbGVhc2luZyBvdXIKKyAgICAgICAg b3VyIGFzc2VydGlvbiBpbiBzdWNoIGNhc2UuIFRoZSBpbnZhbGlkYXRpb24gaGFuZGxlciBnZXRz IGNhbGxlZAorICAgICAgICBhcyBzb29uIGFzIHRoZSBjaGlsZCBwcm9jZXNzIGV4aXRzLgorCisg ICAgICAgICogUGxhdGZvcm0vc3BpL2lvcy9Bc3NlcnRpb25TZXJ2aWNlc1NQSS5oOgorICAgICAg ICAqIFVJUHJvY2Vzcy9Qcm9jZXNzQXNzZXJ0aW9uLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UHJv Y2Vzc0Fzc2VydGlvbjo6UHJvY2Vzc0Fzc2VydGlvbik6CisgICAgICAgICogVUlQcm9jZXNzL1By b2Nlc3NBc3NlcnRpb24uaDoKKyAgICAgICAgKFdlYktpdDo6UHJvY2Vzc0Fzc2VydGlvbjo6UHJv Y2Vzc0Fzc2VydGlvbik6CisgICAgICAgIChXZWJLaXQ6OlByb2Nlc3NBc3NlcnRpb246OnZhbGlk aXR5KToKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1Byb2Nlc3NBc3NlcnRpb25JT1MubW06Cisg ICAgICAgIChXZWJLaXQ6OlByb2Nlc3NBc3NlcnRpb246OlByb2Nlc3NBc3NlcnRpb24pOgorICAg ICAgICAoV2ViS2l0OjpQcm9jZXNzQXNzZXJ0aW9uOjp+UHJvY2Vzc0Fzc2VydGlvbik6CisgICAg ICAgIChXZWJLaXQ6OlByb2Nlc3NBbmRVSUFzc2VydGlvbjo6dXBkYXRlUnVuSW5CYWNrZ3JvdW5k Q291bnQpOgorICAgICAgICAoV2ViS2l0OjpQcm9jZXNzQW5kVUlBc3NlcnRpb246OlByb2Nlc3NB bmRVSUFzc2VydGlvbik6CisgICAgICAgIChXZWJLaXQ6OlByb2Nlc3NBc3NlcnRpb246OnNldFN0 YXRlKTogRGVsZXRlZC4KKwogMjAxNi0wNi0yOSAgR2F2aW4gQmFycmFjbG91Z2ggIDxiYXJyYWNs b3VnaEBhcHBsZS5jb20+CiAKICAgICAgICAgQ2xlYW51cCBQcm9jZXNzQXNzZXJ0aW9uIFJ1bklu QmFja2dyb3VuZCBtYW5hZ2VtZW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9y bS9zcGkvaW9zL0Fzc2VydGlvblNlcnZpY2VzU1BJLmggYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9y bS9zcGkvaW9zL0Fzc2VydGlvblNlcnZpY2VzU1BJLmgKaW5kZXggOTE0NTMxNzAwM2FhMmJlYjUz N2Y4ZjI2ODYxMjY1MDU3MWM4Y2E3MS4uZTJmY2VhMGY0NjMyMmQ5ZDZmYmQ3NmZhYmQzNDk1NjM5 Y2U3NjJhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vc3BpL2lvcy9Bc3Nl cnRpb25TZXJ2aWNlc1NQSS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL3NwaS9pb3Mv QXNzZXJ0aW9uU2VydmljZXNTUEkuaApAQCAtNzIsNiArNzIsNyBAQCBlbnVtIHsKIH07CiB0eXBl ZGVmIHVpbnQzMl90IEJLU1Byb2Nlc3NBc3NlcnRpb25SZWFzb247CiAKK3R5cGVkZWYgdm9pZCAo XkJLU1Byb2Nlc3NBc3NlcnRpb25JbnZhbGlkYXRpb25IYW5kbGVyKSh2b2lkKTsKIHR5cGVkZWYg dm9pZCAoXkJLU1Byb2Nlc3NBc3NlcnRpb25BY3F1aXNpdGlvbkhhbmRsZXIpKEJPT0wgYWNxdWly ZWQpOwogCiBAaW50ZXJmYWNlIEJLU1Byb2Nlc3NBc3NlcnRpb24gOiBOU09iamVjdApAQCAtODAs NiArODEsOCBAQCB0eXBlZGVmIHZvaWQgKF5CS1NQcm9jZXNzQXNzZXJ0aW9uQWNxdWlzaXRpb25I YW5kbGVyKShCT09MIGFjcXVpcmVkKTsKIEBpbnRlcmZhY2UgQktTUHJvY2Vzc0Fzc2VydGlvbiAo KQogQHByb3BlcnR5IChub25hdG9taWMsIGFzc2lnbikgQktTUHJvY2Vzc0Fzc2VydGlvbkZsYWdz IGZsYWdzOwogLSAoaWQpaW5pdFdpdGhQSUQ6KHBpZF90KXBpZCBmbGFnczooQktTUHJvY2Vzc0Fz c2VydGlvbkZsYWdzKWZsYWdzIHJlYXNvbjooQktTUHJvY2Vzc0Fzc2VydGlvblJlYXNvbilyZWFz b24gbmFtZTooTlNTdHJpbmcgKiluYW1lIHdpdGhIYW5kbGVyOihCS1NQcm9jZXNzQXNzZXJ0aW9u QWNxdWlzaXRpb25IYW5kbGVyKWhhbmRsZXI7CisKK0Bwcm9wZXJ0eSAobm9uYXRvbWljLCBjb3B5 KSBCS1NQcm9jZXNzQXNzZXJ0aW9uSW52YWxpZGF0aW9uSGFuZGxlciBpbnZhbGlkYXRpb25IYW5k bGVyOwogLSAodm9pZClpbnZhbGlkYXRlOwogQGVuZAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvUHJvY2Vzc0Fzc2VydGlvbi5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvUHJvY2Vzc0Fzc2VydGlvbi5jcHAKaW5kZXggZTAyNzliZDhhMzkyY2YzY2IwMmUyNzdl OGNhZDAyNTk2NWU2MGU1Mi4uYTVlNmIwZTUxNWI1ODFkNWU3ZmQwZjEzMjRkNzAxMTdjNTZlNTFj MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1Byb2Nlc3NBc3NlcnRpb24u Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Qcm9jZXNzQXNzZXJ0aW9uLmNwcApA QCAtMzAsNyArMzAsNyBAQAogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAotUHJvY2Vzc0Fzc2VydGlv bjo6UHJvY2Vzc0Fzc2VydGlvbihwaWRfdCwgQXNzZXJ0aW9uU3RhdGUgYXNzZXJ0aW9uU3RhdGUp CitQcm9jZXNzQXNzZXJ0aW9uOjpQcm9jZXNzQXNzZXJ0aW9uKHBpZF90LCBBc3NlcnRpb25TdGF0 ZSBhc3NlcnRpb25TdGF0ZSwgc3RkOjpmdW5jdGlvbjx2b2lkKCk+KQogICAgIDogbV9hc3NlcnRp b25TdGF0ZShhc3NlcnRpb25TdGF0ZSkKIHsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9Qcm9jZXNzQXNzZXJ0aW9uLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv UHJvY2Vzc0Fzc2VydGlvbi5oCmluZGV4IDdmZDNmMzlkOWQ4MjI2NzIyOTIzOTE3ZjU1MTlkNzNm ODYxYzc5MzguLjIzYmZmN2I3MzQ3MGQ0OWQ5ZjFmOWIwMjY2OTU1N2I1ZDNlZDAxMzAgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Qcm9jZXNzQXNzZXJ0aW9uLmgKKysrIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1Byb2Nlc3NBc3NlcnRpb24uaApAQCAtMjYsNiArMjYs OCBAQAogI2lmbmRlZiBQcm9jZXNzQXNzZXJ0aW9uX2gKICNkZWZpbmUgUHJvY2Vzc0Fzc2VydGlv bl9oCiAKKyNpbmNsdWRlIDxmdW5jdGlvbmFsPgorCiAjaWYgUExBVEZPUk0oSU9TKSAmJiAhUExB VEZPUk0oSU9TX1NJTVVMQVRPUikKICNpbmNsdWRlIDx3dGYvUmV0YWluUHRyLmg+CiBPQkpDX0NM QVNTIEJLU1Byb2Nlc3NBc3NlcnRpb247CkBAIC00Nyw3ICs0OSw3IEBAIHB1YmxpYzoKIAogY2xh c3MgUHJvY2Vzc0Fzc2VydGlvbiB7CiBwdWJsaWM6Ci0gICAgUHJvY2Vzc0Fzc2VydGlvbihwaWRf dCwgQXNzZXJ0aW9uU3RhdGUpOworICAgIFByb2Nlc3NBc3NlcnRpb24ocGlkX3QsIEFzc2VydGlv blN0YXRlLCBzdGQ6OmZ1bmN0aW9uPHZvaWQoKT4gaW52YWxpZGF0aW9uQ2FsbGJhY2sgPSB7IH0p OwogICAgIH5Qcm9jZXNzQXNzZXJ0aW9uKCk7CiAKICAgICB2b2lkIHNldENsaWVudChQcm9jZXNz QXNzZXJ0aW9uQ2xpZW50JiBjbGllbnQpIHsgbV9jbGllbnQgPSAmY2xpZW50OyB9CkBAIC01Niw5 ICs1OCwxNiBAQCBwdWJsaWM6CiAgICAgQXNzZXJ0aW9uU3RhdGUgc3RhdGUoKSBjb25zdCB7IHJl dHVybiBtX2Fzc2VydGlvblN0YXRlOyB9CiAgICAgdm9pZCBzZXRTdGF0ZShBc3NlcnRpb25TdGF0 ZSk7CiAKKyNpZiBQTEFURk9STShJT1MpICYmICFQTEFURk9STShJT1NfU0lNVUxBVE9SKQorcHJv dGVjdGVkOgorICAgIGVudW0gY2xhc3MgVmFsaWRpdHkgeyBObywgWWVzLCBVbnNldCB9OworICAg IFZhbGlkaXR5IHZhbGlkaXR5KCkgY29uc3QgeyByZXR1cm4gbV92YWxpZGl0eTsgfQorI2VuZGlm CisKIHByaXZhdGU6CiAjaWYgUExBVEZPUk0oSU9TKSAmJiAhUExBVEZPUk0oSU9TX1NJTVVMQVRP UikKICAgICBSZXRhaW5QdHI8QktTUHJvY2Vzc0Fzc2VydGlvbj4gbV9hc3NlcnRpb247CisgICAg VmFsaWRpdHkgbV92YWxpZGl0eSB7IFZhbGlkaXR5OjpVbnNldCB9OwogI2VuZGlmCiAgICAgQXNz ZXJ0aW9uU3RhdGUgbV9hc3NlcnRpb25TdGF0ZTsKICAgICBQcm9jZXNzQXNzZXJ0aW9uQ2xpZW50 KiBtX2NsaWVudCB7IG51bGxwdHIgfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9pb3MvUHJvY2Vzc0Fzc2VydGlvbklPUy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9pb3MvUHJvY2Vzc0Fzc2VydGlvbklPUy5tbQppbmRleCBmOTgyNzFiYmVjZWNjN2IxMDQxNTMw ODcyNmU4YzA5ZTI4YTllZTRkLi4zZDgzZTkxNzY3YjllYWFhZjdjNDkxMjdlMzg4OTg1NmI0NjYz ZTI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1Byb2Nlc3NBc3Nl cnRpb25JT1MubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9Qcm9jZXNzQXNz ZXJ0aW9uSU9TLm1tCkBAIC0xNDMsMjEgKzE0MywyOCBAQCBzdGF0aWMgQktTUHJvY2Vzc0Fzc2Vy dGlvbkZsYWdzIGZsYWdzRm9yU3RhdGUoQXNzZXJ0aW9uU3RhdGUgYXNzZXJ0aW9uU3RhdGUpCiAg ICAgfQogfQogCi1Qcm9jZXNzQXNzZXJ0aW9uOjpQcm9jZXNzQXNzZXJ0aW9uKHBpZF90IHBpZCwg QXNzZXJ0aW9uU3RhdGUgYXNzZXJ0aW9uU3RhdGUpCitQcm9jZXNzQXNzZXJ0aW9uOjpQcm9jZXNz QXNzZXJ0aW9uKHBpZF90IHBpZCwgQXNzZXJ0aW9uU3RhdGUgYXNzZXJ0aW9uU3RhdGUsIHN0ZDo6 ZnVuY3Rpb248dm9pZCgpPiBpbnZhbGlkYXRpb25DYWxsYmFjaykKKyAgICA6IG1fYXNzZXJ0aW9u U3RhdGUoYXNzZXJ0aW9uU3RhdGUpCiB7Ci0gICAgbV9hc3NlcnRpb25TdGF0ZSA9IGFzc2VydGlv blN0YXRlOwotICAgIAogICAgIEJLU1Byb2Nlc3NBc3NlcnRpb25BY3F1aXNpdGlvbkhhbmRsZXIg aGFuZGxlciA9IF4oQk9PTCBhY3F1aXJlZCkgewogICAgICAgICBpZiAoIWFjcXVpcmVkKSB7Ci0g ICAgICAgICAgICBMT0dfRVJST1IoIlVuYWJsZSB0byBhY3F1aXJlIGFzc2VydGlvbiBmb3IgcHJv Y2VzcyAlZCIsIHBpZCk7CisgICAgICAgICAgICBMT0dfQUxXQVlTX0VSUk9SKHRydWUsICJVbmFi bGUgdG8gYWNxdWlyZSBhc3NlcnRpb24gZm9yIHByb2Nlc3MgJWQiLCBwaWQpOwogICAgICAgICAg ICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgICAgICAgICBtX3ZhbGlkaXR5ID0gVmFsaWRp dHk6Ok5vOworICAgICAgICAgICAgaW52YWxpZGF0aW9uQ2FsbGJhY2soKTsKICAgICAgICAgfQog ICAgIH07CiAgICAgbV9hc3NlcnRpb24gPSBhZG9wdE5TKFtbQktTUHJvY2Vzc0Fzc2VydGlvbiBh bGxvY10gaW5pdFdpdGhQSUQ6cGlkIGZsYWdzOmZsYWdzRm9yU3RhdGUoYXNzZXJ0aW9uU3RhdGUp IHJlYXNvbjpCS1NQcm9jZXNzQXNzZXJ0aW9uUmVhc29uRXh0ZW5zaW9uIG5hbWU6QCJXZWIgY29u dGVudCB2aXNpYmxlIiB3aXRoSGFuZGxlcjpoYW5kbGVyXSk7CisgICAgbV9hc3NlcnRpb24uZ2V0 KCkuaW52YWxpZGF0aW9uSGFuZGxlciA9IF4oKSB7CisgICAgICAgIG1fdmFsaWRpdHkgPSBWYWxp ZGl0eTo6Tm87CisgICAgICAgIGludmFsaWRhdGlvbkNhbGxiYWNrKCk7CisgICAgfTsKIH0KIAog UHJvY2Vzc0Fzc2VydGlvbjo6flByb2Nlc3NBc3NlcnRpb24oKQogeworICAgIG1fYXNzZXJ0aW9u LmdldCgpLmludmFsaWRhdGlvbkhhbmRsZXIgPSBuaWw7CisKICAgICBpZiAoUHJvY2Vzc0Fzc2Vy dGlvbkNsaWVudCogY2xpZW50ID0gdGhpcy0+Y2xpZW50KCkpCiAgICAgICAgIFtbV0tQcm9jZXNz QXNzZXJ0aW9uQmFja2dyb3VuZFRhc2tNYW5hZ2VyIHNoYXJlZF0gcmVtb3ZlQ2xpZW50OipjbGll bnRdOwogICAgIFttX2Fzc2VydGlvbiBpbnZhbGlkYXRlXTsKQEAgLTE3NCw3ICsxODEsNyBAQCB2 b2lkIFByb2Nlc3NBc3NlcnRpb246OnNldFN0YXRlKEFzc2VydGlvblN0YXRlIGFzc2VydGlvblN0 YXRlKQogCiB2b2lkIFByb2Nlc3NBbmRVSUFzc2VydGlvbjo6dXBkYXRlUnVuSW5CYWNrZ3JvdW5k Q291bnQoKQogewotICAgIGJvb2wgc2hvdWxkSG9sZEJhY2tncm91bmRBc3NlcnRpb24gPSBzdGF0 ZSgpICE9IEFzc2VydGlvblN0YXRlOjpTdXNwZW5kZWQ7CisgICAgYm9vbCBzaG91bGRIb2xkQmFj a2dyb3VuZEFzc2VydGlvbiA9IHZhbGlkaXR5KCkgIT0gVmFsaWRpdHk6Ok5vICYmIHN0YXRlKCkg IT0gQXNzZXJ0aW9uU3RhdGU6OlN1c3BlbmRlZDsKIAogICAgIGlmIChzaG91bGRIb2xkQmFja2dy b3VuZEFzc2VydGlvbikgewogICAgICAgICBpZiAoIW1faXNIb2xkaW5nQmFja2dyb3VuZEFzc2Vy dGlvbikKQEAgLTE4OCw3ICsxOTUsNyBAQCB2b2lkIFByb2Nlc3NBbmRVSUFzc2VydGlvbjo6dXBk YXRlUnVuSW5CYWNrZ3JvdW5kQ291bnQoKQogfQogCiBQcm9jZXNzQW5kVUlBc3NlcnRpb246OlBy b2Nlc3NBbmRVSUFzc2VydGlvbihwaWRfdCBwaWQsIEFzc2VydGlvblN0YXRlIGFzc2VydGlvblN0 YXRlKQotICAgIDogUHJvY2Vzc0Fzc2VydGlvbihwaWQsIGFzc2VydGlvblN0YXRlKQorICAgIDog UHJvY2Vzc0Fzc2VydGlvbihwaWQsIGFzc2VydGlvblN0YXRlLCBbdGhpc10geyB1cGRhdGVSdW5J bkJhY2tncm91bmRDb3VudCgpOyB9KQogewogICAgIHVwZGF0ZVJ1bkluQmFja2dyb3VuZENvdW50 KCk7CiB9CkBAIC0yMTksNyArMjI2LDcgQEAgdm9pZCBQcm9jZXNzQW5kVUlBc3NlcnRpb246OnNl dENsaWVudChQcm9jZXNzQXNzZXJ0aW9uQ2xpZW50JiBuZXdDbGllbnQpCiAKIG5hbWVzcGFjZSBX ZWJLaXQgewogCi1Qcm9jZXNzQXNzZXJ0aW9uOjpQcm9jZXNzQXNzZXJ0aW9uKHBpZF90LCBBc3Nl cnRpb25TdGF0ZSBhc3NlcnRpb25TdGF0ZSkKK1Byb2Nlc3NBc3NlcnRpb246OlByb2Nlc3NBc3Nl cnRpb24ocGlkX3QsIEFzc2VydGlvblN0YXRlIGFzc2VydGlvblN0YXRlLCBzdGQ6OmZ1bmN0aW9u PHZvaWQoKT4pCiAgICAgOiBtX2Fzc2VydGlvblN0YXRlKGFzc2VydGlvblN0YXRlKQogewogfQo=