128293 2014-02-05 20:28:44 -0800 Transfer the non-fast-scrollable region to the UI process for iOS 2014-02-06 00:53:02 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 128299 1 simon.fraser simon.fraser andersca benjamin cmarcelo commit-queue jamesr luiz ossy sam simon.fraser tonikitoo oldest_to_newest 977212 0 simon.fraser 2014-02-05 20:28:44 -0800 Transfer the non-fast-scrollable region to the UI process for iOS 977214 1 223297 simon.fraser 2014-02-05 20:36:46 -0800 Created attachment 223297 Patch 977215 2 commit-queue 2014-02-05 20:37:58 -0800 Attachment 223297 did not pass style-queue: ERROR: Source/WebCore/page/scrolling/ScrollingTree.cpp:148: One line control clauses should not use braces. [whitespace/braces] [4] Total errors found: 1 in 14 files If any of these errors are false positives, please file a bug against check-webkit-style. 977219 3 223297 benjamin 2014-02-05 20:45:43 -0800 Comment on attachment 223297 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=223297&action=review That is great, thanks a lot for fixing this! > Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h:81 > + virtual void frameViewNonFastScrollableRegionChanged(FrameView*); Missing override here. > Source/WebKit2/UIProcess/WebPageProxy.cpp:1387 > if (m_needTouchEvents && !m_isPageSuspended) { I think you can nuke m_needTouchEvents. 977255 4 simon.fraser 2014-02-05 22:53:00 -0800 https://trac.webkit.org/r163516 977256 5 simon.fraser 2014-02-05 22:53:00 -0800 https://trac.webkit.org/r163516 977281 6 ossy 2014-02-06 00:53:02 -0800 (In reply to comment #5) > https://trac.webkit.org/r163516 It broke the !ENABLE(ASYNC_SCROLLING) builds, fix is in https://bugs.webkit.org/show_bug.cgi?id=128299 223297 2014-02-05 20:36:46 -0800 2014-02-05 20:45:43 -0800 Patch bug-128293-20140205203636.patch text/plain 19509 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTYzNTA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGRiYTRlNDZlYzNmN2E1 YjAzZDEzODUzOTM5Y2E5Mjg5OGZiYTVjMS4uYzJjOWI3MzI1MmE1ZjE5YjE1NDRkYTk3ZTRhMDI2 YTNjZjgwNGE3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQwIEBACiAyMDE0LTAyLTA1ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCisgICAgICAgIFRyYW5zZmVyIHRo ZSBub24tZmFzdC1zY3JvbGxhYmxlIHJlZ2lvbiB0byB0aGUgVUkgcHJvY2VzcyBmb3IgaU9TCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjgyOTMKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUd28gbWFpbiBj aGFuZ2VzIHRvIHN1cHBvcnQgc2VuZGluZyB0aGUgbm9uLWZhc3Qgc2Nyb2xsYWJsZSByZWdpb24K KyAgICAgICAgdG8gdGhlIFVJIHByb2Nlc3MgZm9yIGlPUzoKKyAgICAgICAgCisgICAgICAgIDEu IEFkZCBTY3JvbGxpbmdDb29yZGluYXRvcjo6ZnJhbWVWaWV3Tm9uRmFzdFNjcm9sbGFibGVSZWdp b25DaGFuZ2VkKCksCisgICAgICAgIHdoaWNoIGlzIGNhbGxlZCB3aGVuIHdlJ3ZlIHVwZGF0ZWQg dGhlIHRvdWNoIGV2ZW50IHJlZ2lvbiAodGhpcyBjYW4gaGFwcGVuCisgICAgICAgIGluZGVwZW5k ZW5seSBvZiBsYXlvdXQpLiBXaGVuIGNhbGxlZCB3ZSBqdXN0IHNjaGVkdWxlZCBhIHNjcm9sbGlu ZyB0cmVlCisgICAgICAgIGNvbW1pdCB3aXRoIHRoZSBuZXcgcmVnaW9uLgorICAgICAgICAKKyAg ICAgICAgMi4gQXZvaWQgdGhpbmtpbmcgdGhhdCB3ZSBoYXZlIGEgbmV3IHJvb3Qgbm9kZSB3aXRo IGV2ZXJ5IHJlbW90ZSBzY3JvbGxpbmcKKyAgICAgICAgdHJhbnNhY3Rpb24uIFRoaXMgd2FzIGEg c2lkZS1lZmZlY3Qgb2YgcmVjb25zdHJ1Y3RpbmcgdGhlIHNjcm9sbGluZyBzdGF0ZQorICAgICAg ICB0cmVlIGluIHRoZSBVSSBwcm9jZXNzLCBhbmQgY2F1c2VkIHVzIHRvIHRyeSB0byBncmFiIGEg bm9uRmFzdFNjcm9sbGFibGVSZWdpb24KKyAgICAgICAgZnJvbSBhIG5vZGUgd2hpY2ggbmV2ZXIg aGFkIG9uZSBzZXQuCisKKyAgICAgICAgKiBXZWJDb3JlLmV4cC5pbjoKKyAgICAgICAgKiBwYWdl L3Njcm9sbGluZy9Bc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkFzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3I6OmZyYW1lVmlld05vbkZhc3RTY3JvbGxhYmxl UmVnaW9uQ2hhbmdlZCk6CisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvQXN5bmNTY3JvbGxpbmdD b29yZGluYXRvci5oOgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ0Nvb3JkaW5h dG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ0Nvb3JkaW5hdG9yOjpjb21wdXRl Tm9uRmFzdFNjcm9sbGFibGVSZWdpb24pOgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL1Njcm9s bGluZ0Nvb3JkaW5hdG9yLmg6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdDb29yZGluYXRv cjo6ZnJhbWVWaWV3Tm9uRmFzdFNjcm9sbGFibGVSZWdpb25DaGFuZ2VkKToKKyAgICAgICAgKiBw YWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZVRyZWUuaDoKKyAgICAgICAgKFdlYkNvcmU6OlNj cm9sbGluZ1N0YXRlVHJlZTo6c2V0SGFzTmV3Um9vdFN0YXRlTm9kZSk6CisgICAgICAgICogcGFn ZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxp bmdUcmVlOjpjb21taXROZXdUcmVlU3RhdGUpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5n VHJlZTo6aXNQb2ludEluTm9uRmFzdFNjcm9sbGFibGVSZWdpb24pOgorICAgICAgICAqIHBhZ2Uv c2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWUuaDoKKworMjAxNC0wMi0wNSAgU2ltb24gRnJhc2VyICA8 c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKwogICAgICAgICBTdXBwb3J0IGVuY29kaW5nIGFuZCBk ZWNvZGluZyBvZiBSZWdpb25zCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMjgyODQKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9n IGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IDY0NGIzZDgwY2UxZTljNzdmNGRjNjQ5 Njk3MGJjOGM5NDgwNWVkYmUuLjBjODEyNGJmNDRiNzBlNDZlZmQzYmQ2MmZjNjc2MDkxY2M0ZGRm YWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSw0MyBAQAogMjAxNC0wMi0wNSAgU2ltb24gRnJhc2Vy ICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAorICAgICAgICBUcmFuc2ZlciB0aGUgbm9uLWZh c3Qtc2Nyb2xsYWJsZSByZWdpb24gdG8gdGhlIFVJIHByb2Nlc3MgZm9yIGlPUworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI4MjkzCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVHdvIG1haW4gY2hhbmdlcyB0 byBzdXBwb3J0IHNlbmRpbmcgdGhlIG5vbi1mYXN0IHNjcm9sbGFibGUgcmVnaW9uCisgICAgICAg IHRvIHRoZSBVSSBwcm9jZXNzIGZvciBpT1M6CisgICAgICAgIAorICAgICAgICAxLiBBZGQgU2Ny b2xsaW5nQ29vcmRpbmF0b3I6OmZyYW1lVmlld05vbkZhc3RTY3JvbGxhYmxlUmVnaW9uQ2hhbmdl ZCgpLAorICAgICAgICB3aGljaCBpcyBjYWxsZWQgd2hlbiB3ZSd2ZSB1cGRhdGVkIHRoZSB0b3Vj aCBldmVudCByZWdpb24gKHRoaXMgY2FuIGhhcHBlbgorICAgICAgICBpbmRlcGVuZGVubHkgb2Yg bGF5b3V0KS4gV2hlbiBjYWxsZWQgd2UganVzdCBzY2hlZHVsZWQgYSBzY3JvbGxpbmcgdHJlZQor ICAgICAgICBjb21taXQgd2l0aCB0aGUgbmV3IHJlZ2lvbi4KKyAgICAgICAgCisgICAgICAgIDIu IEF2b2lkIHRoaW5raW5nIHRoYXQgd2UgaGF2ZSBhIG5ldyByb290IG5vZGUgd2l0aCBldmVyeSBy ZW1vdGUgc2Nyb2xsaW5nCisgICAgICAgIHRyYW5zYWN0aW9uLiBUaGlzIHdhcyBhIHNpZGUtZWZm ZWN0IG9mIHJlY29uc3RydWN0aW5nIHRoZSBzY3JvbGxpbmcgc3RhdGUKKyAgICAgICAgdHJlZSBp biB0aGUgVUkgcHJvY2VzcywgYW5kIGNhdXNlZCB1cyB0byB0cnkgdG8gZ3JhYiBhIG5vbkZhc3RT Y3JvbGxhYmxlUmVnaW9uCisgICAgICAgIGZyb20gYSBub2RlIHdoaWNoIG5ldmVyIGhhZCBvbmUg c2V0LgorICAgICAgICAKKyAgICAgICAgTm93IHRoYXQgd2UgaGF2ZSB0aGUgbm9uLWZhc3Qgc2Ny b2xsYWJsZSByZWdpb24gaW4gdGhlIFVJIHByb2Nlc3MsIHdlIGNhbgorICAgICAgICB1c2UgaXQg dG8gYXZvaWQgc2VuZGluZyBzeW5jIG1lc3NhZ2VzIHRvIHRoZSB3ZWIgcHJvY2Vzcy4KKyAgICAg ICAgCisgICAgICAgICogU2hhcmVkL1Njcm9sbGluZy9SZW1vdGVTY3JvbGxpbmdDb29yZGluYXRv clRyYW5zYWN0aW9uLmNwcDoKKyAgICAgICAgKEFyZ3VtZW50Q29kZXI8U2Nyb2xsaW5nU3RhdGVT Y3JvbGxpbmdOb2RlPjo6ZW5jb2RlKTogRW5jb2RlIGhhc05ld1Jvb3ROb2RlLgorICAgICAgICAo QXJndW1lbnRDb2RlcjxTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU+OjpkZWNvZGUpOiBEZWNv ZGUgaGFzTmV3Um9vdE5vZGUgYW5kIHNldCBpdCBvbgorICAgICAgICB0aGUgc3RhdGUgdHJlZS4K KyAgICAgICAgKFdlYktpdDo6UmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3JUcmFuc2FjdGlvbjo6 ZW5jb2RlKTogRW5jb2RlIHRoZSBub25GYXN0U2Nyb2xsYWJsZVJlZ2lvbgorICAgICAgICBub3cg dGhhdCB3ZSBjYW4gZW5jb2RlIFJlZ2lvbnMuCisgICAgICAgIChXZWJLaXQ6OlJlbW90ZVNjcm9s bGluZ0Nvb3JkaW5hdG9yVHJhbnNhY3Rpb246OmRlY29kZSk6IERlY29kZSB0aGUgbm9uRmFzdFNj cm9sbGFibGVSZWdpb24KKyAgICAgICAgbm93IHRoYXQgd2UgY2FuIGRlY29kZSBSZWdpb25zLgor ICAgICAgICAqIFVJUHJvY2Vzcy9TY3JvbGxpbmcvUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3JQ cm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJv eHk6OmlzUG9pbnRJbk5vbkZhc3RTY3JvbGxhYmxlUmVnaW9uKToKKyAgICAgICAgKiBVSVByb2Nl c3MvU2Nyb2xsaW5nL1JlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHkuaDoKKyAgICAgICAg KiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVBy b3h5OjpoYW5kbGVUb3VjaEV2ZW50KTogSWYgd2UncmUgbm90IGluIHRoZSBub24tZmFzdCBzY3Jv bGxhYmxlIHJlZ2lvbiwKKyAgICAgICAgZG9uJ3QgYm90aCBzZW5kaW5nIHRvdWNoIGV2ZW50cyB0 byB0aGUgd2ViIHByb2Nlc3MuCisKKzIwMTQtMDItMDUgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZy YXNlckBhcHBsZS5jb20+CisKICAgICAgICAgU3VwcG9ydCBlbmNvZGluZyBhbmQgZGVjb2Rpbmcg b2YgUmVnaW9ucwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTI4Mjg0CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluIGIv U291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KaW5kZXggYmZmYTc4OTI0MzUwNWU1NzQ1ODk2 ZTUyZDAxNmVmZmM2NDZlYjcxYS4uM2EzOWU5YzQxMWQwYmZlZjY1M2RiOGFmMWI2MjMyNTIxYTFj MWEwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KKysrIGIvU291 cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KQEAgLTExMjEsNiArMTEyMSw4IEBAIF9fWk43V2Vi Q29yZTZFZGl0b3I3Q29tbWFuZEMxRXYKIF9fWk43V2ViQ29yZTZFZGl0b3I3Y29tbWFuZEVSS04z V1RGNlN0cmluZ0UKIF9fWk43V2ViQ29yZTZFZGl0b3I3b3V0ZGVudEV2CiBfX1pON1dlYkNvcmU2 SlNOb2RlNnNfaW5mb0UKK19fWk43V2ViQ29yZTZSZWdpb24yMXVwZGF0ZUJvdW5kc0Zyb21TaGFw ZUV2CitfX1pOSzdXZWJDb3JlNlJlZ2lvbjVTaGFwZTdpc1ZhbGlkRXYKIF9fWk43V2ViQ29yZTZS ZWdpb241dW5pdGVFUktTMF8KIF9fWk43V2ViQ29yZTZSZWdpb244c3VidHJhY3RFUktTMF8KIF9f Wk43V2ViQ29yZTZSZWdpb245aW50ZXJzZWN0RVJLUzBfCkBAIC0yOTg1LDYgKzI5ODcsNyBAQCBf X1pON1dlYkNvcmUxM1Njcm9sbGluZ1RyZWUxNmhhbmRsZVdoZWVsRXZlbnRFUktOU18xOFBsYXRm b3JtV2hlZWxFdmVudEUKIF9fWk43V2ViQ29yZTEzU2Nyb2xsaW5nVHJlZTE4Y29tbWl0TmV3VHJl ZVN0YXRlRU4zV1RGMTBQYXNzT3duUHRySU5TXzE4U2Nyb2xsaW5nU3RhdGVUcmVlRUVFCiBfX1pO N1dlYkNvcmUxM1Njcm9sbGluZ1RyZWUyMXNldENhblJ1YmJlckJhbmRTdGF0ZUViYmJiCiBfX1pO N1dlYkNvcmUxM1Njcm9sbGluZ1RyZWUzMXdpbGxXaGVlbEV2ZW50U3RhcnRTd2lwZUdlc3R1cmVF UktOU18xOFBsYXRmb3JtV2hlZWxFdmVudEUKK19fWk43V2ViQ29yZTEzU2Nyb2xsaW5nVHJlZTMy aXNQb2ludEluTm9uRmFzdFNjcm9sbGFibGVSZWdpb25FTlNfOEludFBvaW50RQogX19aTjdXZWJD b3JlMTNTY3JvbGxpbmdUcmVlMzVzaG91bGRIYW5kbGVXaGVlbEV2ZW50U3luY2hyb25vdXNseUVS S05TXzE4UGxhdGZvcm1XaGVlbEV2ZW50RQogX19aTjdXZWJDb3JlMTNTY3JvbGxpbmdUcmVlMzdz ZXRTY3JvbGxpbmdQZXJmb3JtYW5jZUxvZ2dpbmdFbmFibGVkRWIKIF9fWk43V2ViQ29yZTEzU2Ny b2xsaW5nVHJlZTQyc2Nyb2xsUG9zaXRpb25DaGFuZ2VkVmlhRGVsZWdhdGVkU2Nyb2xsaW5nRXlS S05TXzhJbnRQb2ludEUKQEAgLTMwMzMsNiArMzAzNiw3IEBAIF9fWk43V2ViQ29yZTI3U2Nyb2xs aW5nU3RhdGVTY3JvbGxpbmdOb2RlMTlzZXRGcmFtZVNjYWxlRmFjdG9yRWYKIF9fWk43V2ViQ29y ZTI3U2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlMjBzZXRUb3RhbENvbnRlbnRzU2l6ZUVSS05T XzdJbnRTaXplRQogX19aTjdXZWJDb3JlMjdTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGUyNHNl dENvdW50ZXJTY3JvbGxpbmdMYXllckVSS05TXzE5TGF5ZXJSZXByZXNlbnRhdGlvbkUKIF9fWk43 V2ViQ29yZTI3U2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlMjVzZXRXaGVlbEV2ZW50SGFuZGxl ckNvdW50RWoKK19fWk43V2ViQ29yZTI3U2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlMjZzZXRO b25GYXN0U2Nyb2xsYWJsZVJlZ2lvbkVSS05TXzZSZWdpb25FCiBfX1pON1dlYkNvcmUyN1Njcm9s bGluZ1N0YXRlU2Nyb2xsaW5nTm9kZTI3c2V0U2Nyb2xsYWJsZUFyZWFQYXJhbWV0ZXJzRVJLTlNf MjRTY3JvbGxhYmxlQXJlYVBhcmFtZXRlcnNFCiBfX1pON1dlYkNvcmUyN1Njcm9sbGluZ1N0YXRl U2Nyb2xsaW5nTm9kZTMwc2V0U3luY2hyb25vdXNTY3JvbGxpbmdSZWFzb25zRWoKIF9fWk43V2Vi Q29yZTI3U2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlMzNzZXRTY3JvbGxCZWhhdmlvckZvckZp eGVkRWxlbWVudHNFTlNfMzBTY3JvbGxCZWhhdmlvckZvckZpeGVkRWxlbWVudHNFCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9Bc3luY1Njcm9sbGluZ0Nvb3JkaW5h dG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL0FzeW5jU2Nyb2xsaW5nQ29v cmRpbmF0b3IuY3BwCmluZGV4IDY3ZDcxMDkwNDI3NmVhM2ZhNWJkMTAyY2M4MDlkM2VkZjk1NzZj NTAuLmZjNzU5NmRkM2RiMjIwMzZmYzAzNjMxNWEyNGM0ZWE5YWYyMzViYjIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL0FzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3Iu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL0FzeW5jU2Nyb2xsaW5nQ29v cmRpbmF0b3IuY3BwCkBAIC0xMDUsNiArMTA1LDE1IEBAIHZvaWQgQXN5bmNTY3JvbGxpbmdDb29y ZGluYXRvcjo6ZnJhbWVWaWV3TGF5b3V0VXBkYXRlZChGcmFtZVZpZXcqIGZyYW1lVmlldykKICAg ICBub2RlLT5zZXRTY3JvbGxhYmxlQXJlYVBhcmFtZXRlcnMoc2Nyb2xsUGFyYW1ldGVycyk7CiB9 CiAKK3ZvaWQgQXN5bmNTY3JvbGxpbmdDb29yZGluYXRvcjo6ZnJhbWVWaWV3Tm9uRmFzdFNjcm9s bGFibGVSZWdpb25DaGFuZ2VkKEZyYW1lVmlldyopCit7CisgICAgaWYgKCFtX3Njcm9sbGluZ1N0 YXRlVHJlZS0+cm9vdFN0YXRlTm9kZSgpKQorICAgICAgICByZXR1cm47CisKKyAgICBSZWdpb24g bm9uRmFzdFNjcm9sbGFibGVSZWdpb24gPSBjb21wdXRlTm9uRmFzdFNjcm9sbGFibGVSZWdpb24o Jm1fcGFnZS0+bWFpbkZyYW1lKCksIEludFBvaW50KCkpOworICAgIHNldE5vbkZhc3RTY3JvbGxh YmxlUmVnaW9uRm9yTm9kZShub25GYXN0U2Nyb2xsYWJsZVJlZ2lvbiwgbV9zY3JvbGxpbmdTdGF0 ZVRyZWUtPnJvb3RTdGF0ZU5vZGUoKSk7Cit9CisKIHZvaWQgQXN5bmNTY3JvbGxpbmdDb29yZGlu YXRvcjo6ZnJhbWVWaWV3Um9vdExheWVyRGlkQ2hhbmdlKEZyYW1lVmlldyogZnJhbWVWaWV3KQog ewogICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wYWdlL3Njcm9sbGluZy9Bc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmggYi9Tb3VyY2UvV2Vi Q29yZS9wYWdlL3Njcm9sbGluZy9Bc3luY1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmgKaW5kZXggNDk1 MTdhZjMyNTg4MTFhNTc5MzkzY2RkNWFjODE2ODFjZWIxMjNmYS4uMDg3M2JkODI5OThjMmQ1YWI0 ZDdiN2Y1NzEyZGI5YTMzOTBhNmRmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9z Y3JvbGxpbmcvQXN5bmNTY3JvbGxpbmdDb29yZGluYXRvci5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BhZ2Uvc2Nyb2xsaW5nL0FzeW5jU2Nyb2xsaW5nQ29vcmRpbmF0b3IuaApAQCAtNzgsNiArNzgs NyBAQCBwcml2YXRlOgogCiAgICAgdmlydHVhbCB2b2lkIGZyYW1lVmlld0xheW91dFVwZGF0ZWQo RnJhbWVWaWV3Kikgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCB2b2lkIGZyYW1lVmlld1Jvb3RMYXll ckRpZENoYW5nZShGcmFtZVZpZXcqKSBvdmVycmlkZTsKKyAgICB2aXJ0dWFsIHZvaWQgZnJhbWVW aWV3Tm9uRmFzdFNjcm9sbGFibGVSZWdpb25DaGFuZ2VkKEZyYW1lVmlldyopOwogCiAgICAgdmly dHVhbCBib29sIHJlcXVlc3RTY3JvbGxQb3NpdGlvblVwZGF0ZShGcmFtZVZpZXcqLCBjb25zdCBJ bnRQb2ludCYpIG92ZXJyaWRlOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Nj cm9sbGluZy9TY3JvbGxpbmdDb29yZGluYXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Nj cm9sbGluZy9TY3JvbGxpbmdDb29yZGluYXRvci5jcHAKaW5kZXggOGUzMjU2ZWIzM2JmZGM5M2Jj MGQ2MzIyOTgzNGQzZjU1YjJhYWIwYy4uOGJlYjg3NTMxNjg4ZjliMDUxNDI2YzA5MGYzZDAxMDdj ZWMyNmZkNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xs aW5nQ29vcmRpbmF0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Nj cm9sbGluZ0Nvb3JkaW5hdG9yLmNwcApAQCAtOTQsNiArOTQsMjQgQEAgYm9vbCBTY3JvbGxpbmdD b29yZGluYXRvcjo6Y29vcmRpbmF0ZXNTY3JvbGxpbmdGb3JGcmFtZVZpZXcoRnJhbWVWaWV3KiBm cmFtZVZpZXcKIAogUmVnaW9uIFNjcm9sbGluZ0Nvb3JkaW5hdG9yOjpjb21wdXRlTm9uRmFzdFNj cm9sbGFibGVSZWdpb24oY29uc3QgRnJhbWUqIGZyYW1lLCBjb25zdCBJbnRQb2ludCYgZnJhbWVM b2NhdGlvbikgY29uc3QKIHsKKyNpZiBQTEFURk9STShJT1MpCisgICAgLy8gT24gaU9TLCB3ZSB1 c2Ugbm9uRmFzdFNjcm9sbGFibGVSZWdpb24gdG8gcmVwcmVzZW50IHRoZSByZWdpb24gY292ZXJl ZCBieSBlbGVtZW50cyB3aXRoIHRvdWNoIGV2ZW50IGhhbmRsZXJzLgorICAgIEFTU0VSVChmcmFt ZS0+aXNNYWluRnJhbWUoKSk7CisgICAgVU5VU0VEX1BBUkFNKGZyYW1lTG9jYXRpb24pOworCisg ICAgRG9jdW1lbnQqIGRvY3VtZW50ID0gZnJhbWUtPmRvY3VtZW50KCk7CisgICAgaWYgKCFkb2N1 bWVudCkKKyAgICAgICAgcmV0dXJuIFJlZ2lvbigpOworCisgICAgVmVjdG9yPEludFJlY3Q+IHRv dWNoUmVjdHM7CisgICAgZG9jdW1lbnQtPmdldFRvdWNoUmVjdHModG91Y2hSZWN0cyk7CisgICAg CisgICAgUmVnaW9uIHRvdWNoUmVnaW9uOworICAgIGZvciAoYXV0byByZWN0IDogdG91Y2hSZWN0 cykKKyAgICAgICAgdG91Y2hSZWdpb24udW5pdGUocmVjdCk7CisKKyAgICByZXR1cm4gdG91Y2hS ZWdpb247CisjZWxzZQogICAgIFJlZ2lvbiBub25GYXN0U2Nyb2xsYWJsZVJlZ2lvbjsKICAgICBG cmFtZVZpZXcqIGZyYW1lVmlldyA9IGZyYW1lLT52aWV3KCk7CiAgICAgaWYgKCFmcmFtZVZpZXcp CkBAIC0xMjYsNiArMTQ0LDcgQEAgUmVnaW9uIFNjcm9sbGluZ0Nvb3JkaW5hdG9yOjpjb21wdXRl Tm9uRmFzdFNjcm9sbGFibGVSZWdpb24oY29uc3QgRnJhbWUqIGZyYW1lLAogICAgICAgICBub25G YXN0U2Nyb2xsYWJsZVJlZ2lvbi51bml0ZShjb21wdXRlTm9uRmFzdFNjcm9sbGFibGVSZWdpb24o c3ViZnJhbWUsIG9mZnNldCkpOwogCiAgICAgcmV0dXJuIG5vbkZhc3RTY3JvbGxhYmxlUmVnaW9u OworI2VuZGlmCiB9CiAKIHVuc2lnbmVkIFNjcm9sbGluZ0Nvb3JkaW5hdG9yOjpjb21wdXRlQ3Vy cmVudFdoZWVsRXZlbnRIYW5kbGVyQ291bnQoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3IuaCBiL1NvdXJjZS9XZWJDb3JlL3Bh Z2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmgKaW5kZXggYmRjNDZmYzM0MjVjOTJh ZjA3OWRjYzVlNTdkNGNiYjFiMzZjMDcxYi4uNjAwYjczZThmMzk4MzllMWFmMDAyNGJhYTNiMzU2 MjUyMDczNGM1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Ny b2xsaW5nQ29vcmRpbmF0b3IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9T Y3JvbGxpbmdDb29yZGluYXRvci5oCkBAIC0xMjUsNiArMTI1LDkgQEAgcHVibGljOgogICAgIC8v IFNob3VsZCBiZSBjYWxsZWQgd2hlbmV2ZXIgdGhlIHNldCBvZiBmaXhlZCBvYmplY3RzIGNoYW5n ZXMuCiAgICAgdm9pZCBmcmFtZVZpZXdGaXhlZE9iamVjdHNEaWRDaGFuZ2UoRnJhbWVWaWV3Kik7 CiAKKyAgICAvLyBDYWxsZWQgd2hlbmV2ZXIgdGhlIG5vbi1mYXN0IHNjcm9sbGFibGUgcmVnaW9u IGNoYW5nZXMgZm9yIHJlYXNvbnMgb3RoZXIgdGhhbiBsYXlvdXQuCisgICAgdmlydHVhbCB2b2lk IGZyYW1lVmlld05vbkZhc3RTY3JvbGxhYmxlUmVnaW9uQ2hhbmdlZChGcmFtZVZpZXcqKSB7IH0K KwogICAgIC8vIFNob3VsZCBiZSBjYWxsZWQgd2hlbmV2ZXIgdGhlIHJvb3QgbGF5ZXIgZm9yIHRo ZSBnaXZlbiBmcmFtZSB2aWV3IGNoYW5nZXMuCiAgICAgdmlydHVhbCB2b2lkIGZyYW1lVmlld1Jv b3RMYXllckRpZENoYW5nZShGcmFtZVZpZXcqKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nU3RhdGVUcmVlLmggYi9Tb3VyY2UvV2ViQ29yZS9w YWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZVRyZWUuaAppbmRleCA1OTY1OWU1MzQ5MTMxOGQy MWUzMzVhYzQzY2IzMjRlOWE3Y2VkYzRhLi4xN2Q1NGIxYjU1ZWJlNDJhYWQyMjE5MDQ4YWQ1YTEw YmUwNDEzM2U5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3Jv bGxpbmdTdGF0ZVRyZWUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3Jv bGxpbmdTdGF0ZVRyZWUuaApAQCAtNjYsNiArNjYsNyBAQCBwdWJsaWM6CiAgICAgYm9vbCBoYXND aGFuZ2VkUHJvcGVydGllcygpIGNvbnN0IHsgcmV0dXJuIG1faGFzQ2hhbmdlZFByb3BlcnRpZXM7 IH0KIAogICAgIGJvb2wgaGFzTmV3Um9vdFN0YXRlTm9kZSgpIGNvbnN0IHsgcmV0dXJuIG1faGFz TmV3Um9vdFN0YXRlTm9kZTsgfQorICAgIHZvaWQgc2V0SGFzTmV3Um9vdFN0YXRlTm9kZShib29s IGhhc05ld1Jvb3QpIHsgbV9oYXNOZXdSb290U3RhdGVOb2RlID0gaGFzTmV3Um9vdDsgfQogICAg IAogICAgIGludCBub2RlQ291bnQoKSBjb25zdCB7IHJldHVybiBtX3N0YXRlTm9kZU1hcC5zaXpl KCk7IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xs aW5nVHJlZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVl LmNwcAppbmRleCA2YzQ1MmJjNTFlYjk1MDFlMTdkODIyMTc4YjczYWM2MjQ0YzRiMjNmLi4xZjk5 M2MyNDE0NjhlZmRlYzJkNWU1MTgxODBmMmY4MTEzNTQ2NWNjIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlLmNwcApAQCAtMTQzLDggKzE0Myw5IEBA IHZvaWQgU2Nyb2xsaW5nVHJlZTo6Y29tbWl0TmV3VHJlZVN0YXRlKFBhc3NPd25QdHI8U2Nyb2xs aW5nU3RhdGVUcmVlPiBzY3JvbGxpbmdTCiAgICAgICAgICAgICBtX21haW5GcmFtZVNjcm9sbFBv c2l0aW9uID0gRmxvYXRQb2ludCgpOwogICAgICAgICBpZiAocm9vdFN0YXRlTm9kZUNoYW5nZWQg fHwgcm9vdE5vZGUtPmhhc0NoYW5nZWRQcm9wZXJ0eShTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05v ZGU6OldoZWVsRXZlbnRIYW5kbGVyQ291bnQpKQogICAgICAgICAgICAgbV9oYXNXaGVlbEV2ZW50 SGFuZGxlcnMgPSBzY3JvbGxpbmdTdGF0ZVRyZWUtPnJvb3RTdGF0ZU5vZGUoKS0+d2hlZWxFdmVu dEhhbmRsZXJDb3VudCgpOwotICAgICAgICBpZiAocm9vdFN0YXRlTm9kZUNoYW5nZWQgfHwgcm9v dE5vZGUtPmhhc0NoYW5nZWRQcm9wZXJ0eShTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU6Ok5v bkZhc3RTY3JvbGxhYmxlUmVnaW9uKSkKKyAgICAgICAgaWYgKHJvb3RTdGF0ZU5vZGVDaGFuZ2Vk IHx8IHJvb3ROb2RlLT5oYXNDaGFuZ2VkUHJvcGVydHkoU2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdO b2RlOjpOb25GYXN0U2Nyb2xsYWJsZVJlZ2lvbikpIHsKICAgICAgICAgICAgIG1fbm9uRmFzdFNj cm9sbGFibGVSZWdpb24gPSBzY3JvbGxpbmdTdGF0ZVRyZWUtPnJvb3RTdGF0ZU5vZGUoKS0+bm9u RmFzdFNjcm9sbGFibGVSZWdpb24oKTsKKyAgICAgICAgfQogICAgIH0KICAgICAKICAgICBib29s IHNjcm9sbFJlcXVlc3RJc1Byb2dhbW1hdGljID0gcm9vdE5vZGUgPyByb290Tm9kZS0+cmVxdWVz dGVkU2Nyb2xsUG9zaXRpb25SZXByZXNlbnRzUHJvZ3JhbW1hdGljU2Nyb2xsKCkgOiBmYWxzZTsK QEAgLTI1NCw2ICsyNTUsMTMgQEAgdm9pZCBTY3JvbGxpbmdUcmVlOjpzZXRNYWluRnJhbWVTY3Jv bGxQb3NpdGlvbihGbG9hdFBvaW50IHBvc2l0aW9uKQogICAgIG1fbWFpbkZyYW1lU2Nyb2xsUG9z aXRpb24gPSBwb3NpdGlvbjsKIH0KIAorYm9vbCBTY3JvbGxpbmdUcmVlOjppc1BvaW50SW5Ob25G YXN0U2Nyb2xsYWJsZVJlZ2lvbihJbnRQb2ludCBwKQoreworICAgIE11dGV4TG9ja2VyIGxvY2so bV9tdXRleCk7CisgICAgCisgICAgcmV0dXJuIG1fbm9uRmFzdFNjcm9sbGFibGVSZWdpb24uY29u dGFpbnMocCk7Cit9CisKIGJvb2wgU2Nyb2xsaW5nVHJlZTo6aXNSdWJiZXJCYW5kSW5Qcm9ncmVz cygpCiB7CiAgICAgTXV0ZXhMb2NrZXIgbG9jayhtX211dGV4KTsgICAgCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlLmggYi9Tb3VyY2UvV2Vi Q29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlLmgKaW5kZXggZTg4ZjY0YWEzOWQyNjk1 NWI1MDVmZmY4ODg4MTFiMzBjZDVhODU3Zi4uYTk4ODJhMjgwNTY2MWVkNDVlN2ExMmUyZDlmNzJj M2U0ZWM4ODNkZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Ny b2xsaW5nVHJlZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGlu Z1RyZWUuaApAQCAtNzYsNiArNzYsOCBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHNjcm9s bGluZ1RyZWVOb2RlRGlkU2Nyb2xsKFNjcm9sbGluZ05vZGVJRCwgY29uc3QgRmxvYXRQb2ludCYg c2Nyb2xsUG9zaXRpb24sIFNldE9yU3luY1Njcm9sbGluZ0xheWVyUG9zaXRpb24gPSBTeW5jU2Ny b2xsaW5nTGF5ZXJQb3NpdGlvbikgPSAwOwogICAgIEZsb2F0UG9pbnQgbWFpbkZyYW1lU2Nyb2xs UG9zaXRpb24oKTsKIAorICAgIGJvb2wgaXNQb2ludEluTm9uRmFzdFNjcm9sbGFibGVSZWdpb24o SW50UG9pbnQpOworICAgIAogI2lmIFBMQVRGT1JNKE1BQykgJiYgIVBMQVRGT1JNKElPUykKICAg ICB2aXJ0dWFsIHZvaWQgaGFuZGxlV2hlZWxFdmVudFBoYXNlKFBsYXRmb3JtV2hlZWxFdmVudFBo YXNlKSA9IDA7CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9TY3Jv bGxpbmcvUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3JUcmFuc2FjdGlvbi5jcHAgYi9Tb3VyY2Uv V2ViS2l0Mi9TaGFyZWQvU2Nyb2xsaW5nL1JlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yVHJhbnNh Y3Rpb24uY3BwCmluZGV4IDdlMTU3NzM4NWE4MGUzY2I2MmNjMzE2ZmVmNzdiZmU1ODk2NGUzYmQu Ljk2YjMxMzJmZWEzZjMzMjc3OTA4OWQxNjBmODBjZjE4ODc5NDNhOTMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1NoYXJlZC9TY3JvbGxpbmcvUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3JU cmFuc2FjdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1Njcm9sbGluZy9SZW1v dGVTY3JvbGxpbmdDb29yZGluYXRvclRyYW5zYWN0aW9uLmNwcApAQCAtMTEzLDcgKzExMyw3IEBA IHZvaWQgQXJndW1lbnRDb2RlcjxTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU+OjplbmNvZGUo QXJndW1lbnRFbmNvZGVyJiBlbmNvZGVyCiAgICAgU0NST0xMSU5HX05PREVfRU5DT0RFKFNjcm9s bFBvc2l0aW9uLCBzY3JvbGxQb3NpdGlvbikKICAgICBTQ1JPTExJTkdfTk9ERV9FTkNPREUoU2Ny b2xsT3JpZ2luLCBzY3JvbGxPcmlnaW4pCiAgICAgU0NST0xMSU5HX05PREVfRU5DT0RFKEZyYW1l U2NhbGVGYWN0b3IsIGZyYW1lU2NhbGVGYWN0b3IpCi0vLyAgICBTQ1JPTExJTkdfTk9ERV9FTkNP REUoTm9uRmFzdFNjcm9sbGFibGVSZWdpb24sIG5vbkZhc3RTY3JvbGxhYmxlUmVnaW9uKSAvLyBG SVhNRTogbm8gZW5jb2RlciBzdXBwb3J0IGZvciBSZWdpb24KKyAgICBTQ1JPTExJTkdfTk9ERV9F TkNPREUoTm9uRmFzdFNjcm9sbGFibGVSZWdpb24sIG5vbkZhc3RTY3JvbGxhYmxlUmVnaW9uKQog ICAgIFNDUk9MTElOR19OT0RFX0VOQ09ERShXaGVlbEV2ZW50SGFuZGxlckNvdW50LCB3aGVlbEV2 ZW50SGFuZGxlckNvdW50KQogICAgIFNDUk9MTElOR19OT0RFX0VOQ09ERShSZWFzb25zRm9yU3lu Y2hyb25vdXNTY3JvbGxpbmcsIHN5bmNocm9ub3VzU2Nyb2xsaW5nUmVhc29ucykKICAgICBTQ1JP TExJTkdfTk9ERV9FTkNPREUoU2Nyb2xsYWJsZUFyZWFQYXJhbXMsIHNjcm9sbGFibGVBcmVhUGFy YW1ldGVycykKQEAgLTE0OSw3ICsxNDksNyBAQCBib29sIEFyZ3VtZW50Q29kZXI8U2Nyb2xsaW5n U3RhdGVTY3JvbGxpbmdOb2RlPjo6ZGVjb2RlKEFyZ3VtZW50RGVjb2RlciYgZGVjb2RlcgogICAg IFNDUk9MTElOR19OT0RFX0RFQ09ERShTY3JvbGxQb3NpdGlvbiwgRmxvYXRQb2ludCwgc2V0U2Ny b2xsUG9zaXRpb24pOwogICAgIFNDUk9MTElOR19OT0RFX0RFQ09ERShTY3JvbGxPcmlnaW4sIElu dFBvaW50LCBzZXRTY3JvbGxPcmlnaW4pOwogICAgIFNDUk9MTElOR19OT0RFX0RFQ09ERShGcmFt ZVNjYWxlRmFjdG9yLCBmbG9hdCwgc2V0RnJhbWVTY2FsZUZhY3Rvcik7Ci0vLyAgICBTQ1JPTExJ TkdfTk9ERV9ERUNPREUoTm9uRmFzdFNjcm9sbGFibGVSZWdpb24sIFJlZ2lvbiwgc2V0Tm9uRmFz dFNjcm9sbGFibGVSZWdpb24pOyAvLyBGSVhNRTogbm8gZGVjb2RlciBzdXBwb3J0IGZvciBSZWdp b24uCisgICAgU0NST0xMSU5HX05PREVfREVDT0RFKE5vbkZhc3RTY3JvbGxhYmxlUmVnaW9uLCBS ZWdpb24sIHNldE5vbkZhc3RTY3JvbGxhYmxlUmVnaW9uKTsKICAgICBTQ1JPTExJTkdfTk9ERV9E RUNPREUoV2hlZWxFdmVudEhhbmRsZXJDb3VudCwgaW50LCBzZXRXaGVlbEV2ZW50SGFuZGxlckNv dW50KTsKICAgICBTQ1JPTExJTkdfTk9ERV9ERUNPREUoUmVhc29uc0ZvclN5bmNocm9ub3VzU2Ny b2xsaW5nLCBTeW5jaHJvbm91c1Njcm9sbGluZ1JlYXNvbnMsIHNldFN5bmNocm9ub3VzU2Nyb2xs aW5nUmVhc29ucyk7CiAgICAgU0NST0xMSU5HX05PREVfREVDT0RFKFNjcm9sbGFibGVBcmVhUGFy YW1zLCBTY3JvbGxhYmxlQXJlYVBhcmFtZXRlcnMsIHNldFNjcm9sbGFibGVBcmVhUGFyYW1ldGVy cyk7CkBAIC0yMzYsNiArMjM2LDkgQEAgdm9pZCBSZW1vdGVTY3JvbGxpbmdDb29yZGluYXRvclRy YW5zYWN0aW9uOjplbmNvZGUoSVBDOjpBcmd1bWVudEVuY29kZXImIGVuY29kZXIKIHsKICAgICBp bnQgbnVtTm9kZXMgPSBtX3Njcm9sbGluZ1N0YXRlVHJlZSA/IG1fc2Nyb2xsaW5nU3RhdGVUcmVl LT5ub2RlQ291bnQoKSA6IDA7CiAgICAgZW5jb2RlciA8PCBudW1Ob2RlczsKKyAgICAKKyAgICBi b29sIGhhc05ld1Jvb3ROb2RlID0gbV9zY3JvbGxpbmdTdGF0ZVRyZWUgPyBtX3Njcm9sbGluZ1N0 YXRlVHJlZS0+aGFzTmV3Um9vdFN0YXRlTm9kZSgpIDogZmFsc2U7CisgICAgZW5jb2RlciA8PCBo YXNOZXdSb290Tm9kZTsKIAogICAgIGlmIChtX3Njcm9sbGluZ1N0YXRlVHJlZSkgewogICAgICAg ICBpZiAoY29uc3QgU2Nyb2xsaW5nU3RhdGVOb2RlKiByb290Tm9kZSA9IG1fc2Nyb2xsaW5nU3Rh dGVUcmVlLT5yb290U3RhdGVOb2RlKCkpCkBAIC0yNTcsNiArMjYwLDEwIEBAIGJvb2wgUmVtb3Rl U2Nyb2xsaW5nQ29vcmRpbmF0b3JUcmFuc2FjdGlvbjo6ZGVjb2RlKElQQzo6QXJndW1lbnREZWNv ZGVyJiBkZWNvZGVyCiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShudW1Ob2RlcykpCiAgICAgICAg IHJldHVybiBmYWxzZTsKIAorICAgIGJvb2wgaGFzTmV3Um9vdE5vZGU7CisgICAgaWYgKCFkZWNv ZGVyLmRlY29kZShoYXNOZXdSb290Tm9kZSkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAK ICAgICBtX3Njcm9sbGluZ1N0YXRlVHJlZSA9IFNjcm9sbGluZ1N0YXRlVHJlZTo6Y3JlYXRlKCk7 CiAgICAgCiAgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBudW1Ob2RlczsgKytpKSB7CkBAIC0yOTMs NiArMzAwLDggQEAgYm9vbCBSZW1vdGVTY3JvbGxpbmdDb29yZGluYXRvclRyYW5zYWN0aW9uOjpk ZWNvZGUoSVBDOjpBcmd1bWVudERlY29kZXImIGRlY29kZXIKICAgICAgICAgfQogICAgIH0KIAor ICAgIG1fc2Nyb2xsaW5nU3RhdGVUcmVlLT5zZXRIYXNOZXdSb290U3RhdGVOb2RlKGhhc05ld1Jv b3ROb2RlKTsKKwogICAgIC8vIFJlbW92ZWQgbm9kZXMKICAgICBWZWN0b3I8U2Nyb2xsaW5nTm9k ZUlEPiByZW1vdmVkTm9kZXM7CiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZW1vdmVkTm9kZXMp KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1Njcm9sbGluZy9SZW1vdGVT Y3JvbGxpbmdDb29yZGluYXRvclByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9T Y3JvbGxpbmcvUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3JQcm94eS5jcHAKaW5kZXggOTRjZDBm YjhjMzAwZmFjZmQwYTk5ZmYyMmY2Y2M5YzJkNGRiYzdkZC4uMzczMGNiY2QyMjU1YmNiMmQ3ZDE2 ZGU0MjdlNjRkYmRjMTU1YTFmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1Njcm9sbGluZy9SZW1vdGVTY3JvbGxpbmdDb29yZGluYXRvclByb3h5LmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvU2Nyb2xsaW5nL1JlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9y UHJveHkuY3BwCkBAIC0xMjksNiArMTI5LDExIEBAIGJvb2wgUmVtb3RlU2Nyb2xsaW5nQ29vcmRp bmF0b3JQcm94eTo6aGFuZGxlV2hlZWxFdmVudChjb25zdCBQbGF0Zm9ybVdoZWVsRXZlbnQmCiAg ICAgcmV0dXJuIHJlc3VsdCA9PSBTY3JvbGxpbmdUcmVlOjpEaWRIYW5kbGVFdmVudDsgLy8gRklY TUU6IGhhbmRsZSBvdGhlciB2YWx1ZXMuCiB9CiAKK2Jvb2wgUmVtb3RlU2Nyb2xsaW5nQ29vcmRp bmF0b3JQcm94eTo6aXNQb2ludEluTm9uRmFzdFNjcm9sbGFibGVSZWdpb24oY29uc3QgV2ViQ29y ZTo6SW50UG9pbnQmIHApIGNvbnN0Cit7CisgICAgcmV0dXJuIG1fc2Nyb2xsaW5nVHJlZS0+aXNQ b2ludEluTm9uRmFzdFNjcm9sbGFibGVSZWdpb24ocCk7Cit9CisKIHZvaWQgUmVtb3RlU2Nyb2xs aW5nQ29vcmRpbmF0b3JQcm94eTo6c2Nyb2xsUG9zaXRpb25DaGFuZ2VkVmlhRGVsZWdhdGVkU2Ny b2xsaW5nKFNjcm9sbGluZ05vZGVJRCBub2RlSUQsIGNvbnN0IEludFBvaW50JiBvZmZzZXQpCiB7 CiAgICAgbV9zY3JvbGxpbmdUcmVlLT5zY3JvbGxQb3NpdGlvbkNoYW5nZWRWaWFEZWxlZ2F0ZWRT Y3JvbGxpbmcobm9kZUlELCBvZmZzZXQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1Njcm9sbGluZy9SZW1vdGVTY3JvbGxpbmdDb29yZGluYXRvclByb3h5LmggYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvU2Nyb2xsaW5nL1JlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9y UHJveHkuaAppbmRleCBkMzJkYTcwZDFhMzRkMWE2YjQ2YThlZTcxYjExNTQwMTI2ODcxYzQyLi5h NmI3ZTQzODQ4MGFiNjg0NjdkNTliNWViNGViYTc2ZmNhYzIyZGZlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvU2Nyb2xsaW5nL1JlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9y UHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU2Nyb2xsaW5nL1JlbW90ZVNj cm9sbGluZ0Nvb3JkaW5hdG9yUHJveHkuaApAQCAtNTQsNiArNTQsOCBAQCBwdWJsaWM6CiAgICAg Ly8gSW5mb3JtIHRoZSB3ZWIgcHJvY2VzcyB0aGF0IHRoZSBzY3JvbGwgcG9zaXRpb24gY2hhbmdl ZCAoY2FsbGVkIGZyb20gdGhlIHNjcm9sbGluZyB0cmVlKQogICAgIHZvaWQgc2Nyb2xsUG9zaXRp b25DaGFuZ2VkKFdlYkNvcmU6OlNjcm9sbGluZ05vZGVJRCwgY29uc3QgV2ViQ29yZTo6RmxvYXRQ b2ludCYgbmV3U2Nyb2xsUG9zaXRpb24pOwogCisgICAgYm9vbCBpc1BvaW50SW5Ob25GYXN0U2Ny b2xsYWJsZVJlZ2lvbihjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYpIGNvbnN0OworCiAgICAgLy8g Q2FsbGVkIGV4dGVybmFsbHkgd2hlbiBuYXRpdmUgdmlld3MgbW92ZSBhcm91bmQuCiAgICAgdm9p ZCBzY3JvbGxQb3NpdGlvbkNoYW5nZWRWaWFEZWxlZ2F0ZWRTY3JvbGxpbmcoV2ViQ29yZTo6U2Ny b2xsaW5nTm9kZUlELCBjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYpOwogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCmluZGV4IDg0NWEyOGZiYjI2M2RhZTUxM2VjOTQ4 NDVhMmI5NDU1NzIzYjZiZGMuLjUyZTE4MTBmNzkyOTMxMzZkZTUxNmEzM2M2MGMwOGE3NGQ0YTUx OTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCkBAIC0xMzg1 LDYgKzEzODUsMTAgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmhhbmRsZVRvdWNoRXZlbnQoY29uc3Qg TmF0aXZlV2ViVG91Y2hFdmVudCYgZXZlbnQpCiAgICAgLy8gYW5kIGFuaW1hdGlvbiBvbiB0aGUg cGFnZSBpdHNlbGYgKGtpbmV0aWMgc2Nyb2xsaW5nLCB0YXAgdG8gem9vbSkgZXRjLCB0aGVuCiAg ICAgLy8gd2UgZG8gbm90IHNlbmQgYW55IG9mIHRoZSBldmVudHMgdG8gdGhlIHBhZ2UgZXZlbiBp ZiBpcyBoYXMgbGlzdGVuZXJzLgogICAgIGlmIChtX25lZWRUb3VjaEV2ZW50cyAmJiAhbV9pc1Bh Z2VTdXNwZW5kZWQpIHsKKyAgICAgICAgLy8gRklYTUU6IHdlIHNob3VsZCBvbmx5IGRvIHRoaXMg Y2hlY2sgZm9yIHRoZSBzdGFydCBvZiBhIHRvdWNoIGdlc3R1cmUuCisgICAgICAgIGlmICghbV9z Y3JvbGxpbmdDb29yZGluYXRvclByb3h5LT5pc1BvaW50SW5Ob25GYXN0U2Nyb2xsYWJsZVJlZ2lv bihldmVudC5wb3NpdGlvbigpKSkKKyAgICAgICAgICAgIHJldHVybjsKKwogICAgICAgICBtX3Rv dWNoRXZlbnRRdWV1ZS5hcHBlbmQoZXZlbnQpOwogICAgICAgICBtX3Byb2Nlc3MtPnJlc3BvbnNp dmVuZXNzVGltZXIoKS0+c3RhcnQoKTsKICAgICAgICAgaWYgKG1fc2hvdWxkU2VuZEV2ZW50c1N5 bmNocm9ub3VzbHkpIHsK