131618 2014-04-14 08:52:07 -0700 [WK2 iOS] Scrolling to anchor links is broken 2014-04-14 13:26:47 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser andersca bdakin benjamin berto bunhere cgarcia cmarcelo commit-queue gustavo jamesr luiz mrobinson noam sergio simon.fraser thorton tonikitoo zeno oldest_to_newest 1000495 0 simon.fraser 2014-04-14 08:52:07 -0700 [WK2 iOS] Scrolling to anchor links is broken 1000496 1 229285 simon.fraser 2014-04-14 08:57:11 -0700 Created attachment 229285 Patch 1000561 2 229296 simon.fraser 2014-04-14 12:04:57 -0700 Created attachment 229296 Patch 1000564 3 commit-queue 2014-04-14 12:05:59 -0700 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1000575 4 229296 thorton 2014-04-14 12:37:11 -0700 Comment on attachment 229296 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=229296&action=review > Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm:549 > + WebCore::FloatPoint scaledOffset = contentOffset; Can we have a better modifier than "scaled 1000578 5 simon.fraser 2014-04-14 12:50:54 -0700 https://trac.webkit.org/r167262 1000585 6 229296 benjamin 2014-04-14 13:26:47 -0700 Comment on attachment 229296 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=229296&action=review I would have preferred a unified scrolling code :( > Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm:554 > + UIEdgeInsets inset = [_scrollView contentInset]; > + scaledOffset += WebCore::FloatSize(-inset.left, -inset.top); The top-left is relative to the obscuredInsets, not the contentInsets. 229285 2014-04-14 08:57:11 -0700 2014-04-14 12:04:50 -0700 Patch bug-131618-20140414085650.patch text/plain 18423 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTY3MTMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjU5Njk5NzVhMGVhYzkz MGUxMDdjMTE1MTlmNTgyODEwNzNiYjQxNy4uMjk2Yzc0NjExYmE1OTQ5ZTJlMzkxZjA5YzcxODVi Mjg2NTcxNjUzZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE0LTA0LTE0ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFtXSzIgaU9TXSBT Y3JvbGxpbmcgdG8gYW5jaG9yIGxpbmtzIGlzIGJyb2tlbgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMxNjE4CisgICAgICAgIDxyZGFyOi8vcHJvYmxl bS8xNjU5OTE0ND4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBIYXZlIFNjcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlIHBhc3MgUmVxdWVzdGVkU2Nyb2xs UG9zaXRpb24gdXBkYXRlcworICAgICAgICB0byB0aGUgc2Nyb2xsaW5nIHRyZWUsIHNvIHRoYXQg dGhlIHNjcm9sbGluZyB0cmVlIGNhbiBoYXZlIGN1c3RvbSBiZWhhdmlvcgorICAgICAgICBmb3Ig dGhlbSBpZiBuZWNlc3NhcnkuCisKKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdU cmVlLmg6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdUcmVlOjpzY3JvbGxpbmdUcmVlTm9k ZVJlcXVlc3RzU2Nyb2xsKToKKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVl U2Nyb2xsaW5nTm9kZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdUcmVlU2Nyb2xs aW5nTm9kZTo6dXBkYXRlQWZ0ZXJDaGlsZHJlbik6CisgICAgICAgICogcGFnZS9zY3JvbGxpbmcv U2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGUuaDoKKwogMjAxNC0wNC0xMSAgQmVhciBUcmF2aXMg IDxiZXRyYXZpc0BhZG9iZS5jb20+CiAKICAgICAgICAgW0NTUyBTaGFwZXNdIGluc2V0IGFyZ3Mg YW5kIHJhZGlhbCBhcmdzIHNob3VsZCBzZXJpYWxpemUgdG8gdGhlIHNpbXBsZXN0IGZvcm0KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwppbmRleCAwZDQxNDUwNTk5MTBjZjQyMTFmZmJhYWM1ZTA0MzBkOGQ1NTFjOWZjLi5jY2Fj ODFkZGUyOGRjM2MyNGQ4MjE4OTBiNDYzYjg0OTE1NmU5ZWIwIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsNDIgQEAKKzIwMTQtMDQtMTQgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5j b20+CisKKyAgICAgICAgW1dLMiBpT1NdIFNjcm9sbGluZyB0byBhbmNob3IgbGlua3MgaXMgYnJv a2VuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzE2 MTgKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE2NTk5MTQ0PgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAgVGhlIFJlbW90ZVNjcm9sbGlu Z1RyZWUgaW1wbGVtZW50cyBzY3JvbGxpbmdUcmVlTm9kZVJlcXVlc3RzU2Nyb2xsCisgICAgICAg IHRvIGdldCBpbmZvcm1lZCBhYm91dCByZXF1ZXN0ZWQgc2Nyb2xsIHBvc2l0aW9uIHVwZGF0ZXMs IGFuZCBwYXNzZXMKKyAgICAgICAgdGhlbSBhbG9uZyB2aWEgdGhlIFJlbW90ZVNjcm9sbGluZ0Nv b3JkaW5hdG9yUHJveHksIFdlYlBhZ2VQcm94eSBhbmQgUGFnZUNsaWVudAorICAgICAgICB0byB0 aGUgV0tXZWJWaWV3LCB3aGljaCBwZXJmb3JtcyBhIHNjcm9sbC4KKworICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tOgorICAgICAgICAoLVtXS1dlYlZpZXcgX3Njcm9s bFRvQ29udGVudE9mZnNldDpXZWJDb3JlOjpdKTogU2Nyb2xsIHRvIGNvbnRlbnQgb2Zmc2V0LAor ICAgICAgICB0YWtpbmcgcGFnZSBzY2FsZSBhbmQgaW5zZXRzIGludG8gYWNjb3VudC4KKyAgICAg ICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld0ludGVybmFsLmg6CisgICAgICAgICog VUlQcm9jZXNzL0Nvb3JkaW5hdGVkR3JhcGhpY3MvV2ViVmlldy5jcHA6CisgICAgICAgIChXZWJL aXQ6OldlYlZpZXc6OnJlcXVlc3RTY3JvbGwpOgorICAgICAgICAqIFVJUHJvY2Vzcy9Db29yZGlu YXRlZEdyYXBoaWNzL1dlYlZpZXcuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvUGFnZUNsaWVudC5o OgorICAgICAgICAqIFVJUHJvY2Vzcy9TY3JvbGxpbmcvUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0 b3JQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9y UHJveHk6OnNjcm9sbGluZ1RyZWVOb2RlUmVxdWVzdHNTY3JvbGwpOgorICAgICAgICBQYXNzIHNj cm9sbHMgYWxvbmcgdG8gdGhlIFdlYlBhZ2VQcm94eSBmb3IgdGhlIHJvb3Qgbm9kZS4gV2Ugd2ls bCBhbHNvIG5lZWQKKyAgICAgICAgdG8gaGFuZGxlIHByb2dyYW1tYXRpYyBzY3JvbGxzIGZvciBv dmVyZmxvdyBzb29uLgorICAgICAgICAqIFVJUHJvY2Vzcy9TY3JvbGxpbmcvUmVtb3RlU2Nyb2xs aW5nQ29vcmRpbmF0b3JQcm94eS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9TY3JvbGxpbmcvUmVt b3RlU2Nyb2xsaW5nVHJlZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZVNjcm9sbGluZ1Ry ZWU6OnNjcm9sbGluZ1RyZWVOb2RlUmVxdWVzdHNTY3JvbGwpOgorICAgICAgICAqIFVJUHJvY2Vz cy9TY3JvbGxpbmcvUmVtb3RlU2Nyb2xsaW5nVHJlZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9X ZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnJlcXVlc3RT Y3JvbGwpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKiBV SVByb2Nlc3MvaW9zL1BhZ2VDbGllbnRJbXBsSU9TLmg6CisgICAgICAgICogVUlQcm9jZXNzL2lv cy9QYWdlQ2xpZW50SW1wbElPUy5tbToKKyAgICAgICAgKFdlYktpdDo6UGFnZUNsaWVudEltcGw6 OmNhblNjcm9sbFZpZXcpOgorICAgICAgICAoV2ViS2l0OjpQYWdlQ2xpZW50SW1wbDo6cmVxdWVz dFNjcm9sbCk6CisgICAgICAgICogVUlQcm9jZXNzL21hYy9QYWdlQ2xpZW50SW1wbC5tbToKKyAg ICAgICAgKFdlYktpdDo6UGFnZUNsaWVudEltcGw6OnJlcXVlc3RTY3JvbGwpOgorCiAyMDE0LTA0 LTExICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgogCiAgICAgICAgIFtNYWNd IFByZXZlbnQgY3Jhc2ggd2hlbiBleGl0aW5nIGZ1bGxzY3JlZW4gbW9kZQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZS5oIGIvU291cmNlL1dl YkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZS5oCmluZGV4IGFjYTY0ZmQxYTI4OTg3 NWM0Zjk0ZmFlYWIzZmQ5ODM3MGQxOTM0NGIuLjJmNDdhNmFjNWEzOGYyYzQyZjZiM2E2MGFiOTMx M2M0MDNhYjliNGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Nj cm9sbGluZ1RyZWUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxp bmdUcmVlLmgKQEAgLTc1LDYgKzc1LDkgQEAgcHVibGljOgogICAgIC8vIFVwZGF0ZXMgRnJhbWVW aWV3L1JlbmRlckxheWVyIHNjcm9sbGluZyBzdGF0ZSBhbmQgR3JhcGhpY3NMYXllcnMuCiAgICAg dmlydHVhbCB2b2lkIHNjcm9sbGluZ1RyZWVOb2RlRGlkU2Nyb2xsKFNjcm9sbGluZ05vZGVJRCwg Y29uc3QgRmxvYXRQb2ludCYgc2Nyb2xsUG9zaXRpb24sIFNldE9yU3luY1Njcm9sbGluZ0xheWVy UG9zaXRpb24gPSBTeW5jU2Nyb2xsaW5nTGF5ZXJQb3NpdGlvbikgPSAwOwogCisgICAgLy8gQ2Fs bGVkIGZvciByZXF1ZXN0ZWQgc2Nyb2xsIHBvc2l0aW9uIHVwZGF0ZXMuCisgICAgdmlydHVhbCB2 b2lkIHNjcm9sbGluZ1RyZWVOb2RlUmVxdWVzdHNTY3JvbGwoU2Nyb2xsaW5nTm9kZUlELCBjb25z dCBGbG9hdFBvaW50JiAvKnNjcm9sbFBvc2l0aW9uKi8sIGJvb2wgLypyZXByZXNlbnRzUHJvZ3Jh bW1hdGljU2Nyb2xsKi8pIHsgfQorCiAgICAgLy8gRGVsZWdhdGVkIHNjcm9sbGluZy96b29taW5n IGhhcyBjYXVzZWQgdGhlIHZpZXdwb3J0IHRvIGNoYW5nZSwgc28gdXBkYXRlIHZpZXdwb3J0LWNv bnN0cmFpbmVkIGxheWVycwogICAgIC8vIChidXQgZG9uJ3QgY2F1c2Ugc2Nyb2xsIGV2ZW50cyB0 byBiZSBmaXJlZCkuCiAgICAgdmlydHVhbCB2b2lkIHZpZXdwb3J0Q2hhbmdlZFZpYURlbGVnYXRl ZFNjcm9sbGluZyhTY3JvbGxpbmdOb2RlSUQsIGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYgdmll d3BvcnRSZWN0LCBkb3VibGUgc2NhbGUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFn ZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGUuY3BwIGIvU291cmNlL1dlYkNv cmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGUuY3BwCmluZGV4IGY4 NDEzOTdhODczNmU1ODQxMDk0YTVjMzNjNDYzMTU2MDZhNDk1NjMuLmY1ZDhiM2FmZDdhMWRkYmQy N2QwNjJlZWU0ZmUyNzAxNjM1OWJlNTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv c2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZS5jcHAKQEAgLTg3 LDYgKzg3LDEzIEBAIHZvaWQgU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGU6OnVwZGF0ZUJlZm9y ZUNoaWxkcmVuKGNvbnN0IFNjcm9sbGluZ1N0YXRlTm9kZSYKICAgICAgICAgbV9iZWhhdmlvckZv ckZpeGVkID0gc3RhdGUuc2Nyb2xsQmVoYXZpb3JGb3JGaXhlZEVsZW1lbnRzKCk7CiB9CiAKK3Zv aWQgU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGU6OnVwZGF0ZUFmdGVyQ2hpbGRyZW4oY29uc3Qg U2Nyb2xsaW5nU3RhdGVOb2RlJiBzdGF0ZU5vZGUpCit7CisgICAgY29uc3QgU2Nyb2xsaW5nU3Rh dGVTY3JvbGxpbmdOb2RlJiBzY3JvbGxpbmdTdGF0ZU5vZGUgPSB0b1Njcm9sbGluZ1N0YXRlU2Ny b2xsaW5nTm9kZShzdGF0ZU5vZGUpOworICAgIGlmIChzY3JvbGxpbmdTdGF0ZU5vZGUuaGFzQ2hh bmdlZFByb3BlcnR5KFNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZTo6UmVxdWVzdGVkU2Nyb2xs UG9zaXRpb24pKQorICAgICAgICBzY3JvbGxpbmdUcmVlKCkuc2Nyb2xsaW5nVHJlZU5vZGVSZXF1 ZXN0c1Njcm9sbChzY3JvbGxpbmdOb2RlSUQoKSwgc2Nyb2xsaW5nU3RhdGVOb2RlLnJlcXVlc3Rl ZFNjcm9sbFBvc2l0aW9uKCksIHNjcm9sbGluZ1N0YXRlTm9kZS5yZXF1ZXN0ZWRTY3JvbGxQb3Np dGlvblJlcHJlc2VudHNQcm9ncmFtbWF0aWNTY3JvbGwoKSk7Cit9CisKIH0gLy8gbmFtZXNwYWNl IFdlYkNvcmUKIAogI2VuZGlmIC8vIEVOQUJMRShBU1lOQ19TQ1JPTExJTkcpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9k ZS5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZVNjcm9sbGlu Z05vZGUuaAppbmRleCAyYzcyYmZkNDVlZjI4MTc2N2EwNGIwNTE2NmUyOGNkMTNiYmFlYzBlLi4x ZjE4MTViZTgyM2FhZWNhZDk2NDEwZjgyMTBhOWJhM2UwYjEzZDAwIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZS5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWVTY3JvbGxpbmdO b2RlLmgKQEAgLTQ1LDYgKzQ1LDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgflNjcm9sbGluZ1Ry ZWVTY3JvbGxpbmdOb2RlKCk7CiAKICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlQmVmb3JlQ2hpbGRy ZW4oY29uc3QgU2Nyb2xsaW5nU3RhdGVOb2RlJikgb3ZlcnJpZGU7CisgICAgdmlydHVhbCB2b2lk IHVwZGF0ZUFmdGVyQ2hpbGRyZW4oY29uc3QgU2Nyb2xsaW5nU3RhdGVOb2RlJikgb3ZlcnJpZGU7 CiAKICAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIGltcGxlbWVudCB0aGlzIHdoZW4gd2Ugc3VwcG9y dCBTY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZXMgYXMgY2hpbGRyZW4uCiAgICAgdmlydHVhbCB2 b2lkIHBhcmVudFNjcm9sbFBvc2l0aW9uRGlkQ2hhbmdlKGNvbnN0IEZsb2F0UmVjdCYgLyp2aWV3 cG9ydFJlY3QqLywgY29uc3QgRmxvYXRTaXplJiAvKmN1bXVsYXRpdmVEZWx0YSovKSBvdmVycmlk ZSB7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tX ZWJWaWV3Lm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcu bW0KaW5kZXggMmFkNDZmN2Q2NjVmYzA1MmM1NzkyMWEzYmMxNmMwZWM3NTUzNWVjZi4uMjFlYjIw NTFjYjA3OWY3NDBmZWNmZmRhYzIwYjE4YTQ2NTk1ZTEwZSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KQEAgLTU0NCw2ICs1NDQsMTggQEAg c3RhdGljIFdlYkNvcmU6OkZsb2F0UG9pbnQgY29uc3RyYWluQ29udGVudE9mZnNldChXZWJDb3Jl OjpGbG9hdFBvaW50IGNvbnRlbnRPZmYKICAgICByZXR1cm4gY29udGVudE9mZnNldDsKIH0KIAor LSAodm9pZClfc2Nyb2xsVG9Db250ZW50T2Zmc2V0OihXZWJDb3JlOjpGbG9hdFBvaW50KWNvbnRl bnRPZmZzZXQKK3sKKyAgICBXZWJDb3JlOjpGbG9hdFBvaW50IHNjYWxlZE9mZnNldCA9IGNvbnRl bnRPZmZzZXQ7CisgICAgQ0dGbG9hdCB6b29tU2NhbGUgPSBjb250ZW50Wm9vbVNjYWxlKHNlbGYp OworICAgIHNjYWxlZE9mZnNldC5zY2FsZSh6b29tU2NhbGUsIHpvb21TY2FsZSk7CisKKyAgICBV SUVkZ2VJbnNldHMgaW5zZXQgPSBbX3Njcm9sbFZpZXcgY29udGVudEluc2V0XTsKKyAgICBzY2Fs ZWRPZmZzZXQgKz0gV2ViQ29yZTo6RmxvYXRTaXplKC1pbnNldC5sZWZ0LCAtaW5zZXQudG9wKTsK KworICAgIFtfc2Nyb2xsVmlldyBzZXRDb250ZW50T2Zmc2V0OnNjYWxlZE9mZnNldF07Cit9CisK IC0gKEJPT0wpX3Njcm9sbFRvUmVjdDooV2ViQ29yZTo6RmxvYXRSZWN0KXRhcmdldFJlY3Qgb3Jp Z2luOihXZWJDb3JlOjpGbG9hdFBvaW50KW9yaWdpbiBtaW5pbXVtU2Nyb2xsRGlzdGFuY2U6KGZs b2F0KW1pbmltdW1TY3JvbGxEaXN0YW5jZQogewogICAgIFdlYkNvcmU6OkZsb2F0UmVjdCB1bm9i c2N1cmVkQ29udGVudFJlY3QoW3NlbGYgX2NvbnRlbnRSZWN0Rm9yVXNlckludGVyYWN0aW9uXSk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmll d0ludGVybmFsLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmll d0ludGVybmFsLmgKaW5kZXggNmY5ZDJiMzhmZDQ0YTQ1MDk1ZjFmMjQzMDVhZDA3YWMzYzUxMGJl Ny4uNWNmOTFlMjQ3M2UwYmVjYzgyZDU4YWM2ZDllN2Q5M2RjNWYwM2E1ZSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdJbnRlcm5hbC5oCisr KyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3SW50ZXJuYWwu aApAQCAtNjQsNiArNjQsNyBAQCBjbGFzcyBXZWJQYWdlUHJveHk7CiAKIC0gKFJldGFpblB0cjxD R0ltYWdlUmVmPilfdGFrZVZpZXdTbmFwc2hvdDsKIAorLSAodm9pZClfc2Nyb2xsVG9Db250ZW50 T2Zmc2V0OihXZWJDb3JlOjpGbG9hdFBvaW50KWNvbnRlbnRPZmZzZXQ7CiAtIChCT09MKV9zY3Jv bGxUb1JlY3Q6KFdlYkNvcmU6OkZsb2F0UmVjdCl0YXJnZXRSZWN0IG9yaWdpbjooV2ViQ29yZTo6 RmxvYXRQb2ludClvcmlnaW4gbWluaW11bVNjcm9sbERpc3RhbmNlOihmbG9hdCltaW5pbXVtU2Ny b2xsRGlzdGFuY2U7CiAtIChCT09MKV96b29tVG9SZWN0OihXZWJDb3JlOjpGbG9hdFJlY3QpdGFy Z2V0UmVjdCB3aXRoT3JpZ2luOihXZWJDb3JlOjpGbG9hdFBvaW50KW9yaWdpbiBmaXRFbnRpcmVS ZWN0OihCT09MKWZpdEVudGlyZVJlY3QgbWluaW11bVNjYWxlOihkb3VibGUpbWluaW11bVNjYWxl IG1heGltdW1TY2FsZTooZG91YmxlKW1heGltdW1TY2FsZSBtaW5pbXVtU2Nyb2xsRGlzdGFuY2U6 KGZsb2F0KW1pbmltdW1TY3JvbGxEaXN0YW5jZTsKIC0gKHZvaWQpX3pvb21PdXRXaXRoT3JpZ2lu OihXZWJDb3JlOjpGbG9hdFBvaW50KW9yaWdpbjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9Db29yZGluYXRlZEdyYXBoaWNzL1dlYlZpZXcuY3BwIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0Nvb3JkaW5hdGVkR3JhcGhpY3MvV2ViVmlldy5jcHAKaW5kZXggZTYxN2Rm MTI5M2NhMmIwY2VmYTljNDk2NTA0ZTU4NDVhNjc1OTgyNi4uNjE0NGFiYTI0YzcxNzhjNDg3YmEw MGE2ZjBhZjFkMjFmMTg1Yjk1NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0Nvb3JkaW5hdGVkR3JhcGhpY3MvV2ViVmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0Nvb3JkaW5hdGVkR3JhcGhpY3MvV2ViVmlldy5jcHAKQEAgLTMwNCw2ICszMDQsMTEg QEAgdm9pZCBXZWJWaWV3OjpzY3JvbGxWaWV3KGNvbnN0IFdlYkNvcmU6OkludFJlY3QmIHNjcm9s bFJlY3QsIGNvbnN0IFdlYkNvcmU6OkludFMKICAgICBzZXRWaWV3TmVlZHNEaXNwbGF5KHNjcm9s bFJlY3QpOwogfQogCit2b2lkIFdlYlZpZXc6OnJlcXVlc3RTY3JvbGwoY29uc3QgV2ViQ29yZTo6 RmxvYXRQb2ludCYsIGJvb2wpCit7CisgICAgbm90SW1wbGVtZW50ZWQoKTsKK30KKwogV2ViQ29y ZTo6SW50U2l6ZSBXZWJWaWV3Ojp2aWV3U2l6ZSgpCiB7CiAgICAgcmV0dXJuIHJvdW5kZWRJbnRT aXplKGRpcFNpemUoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29v cmRpbmF0ZWRHcmFwaGljcy9XZWJWaWV3LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29v cmRpbmF0ZWRHcmFwaGljcy9XZWJWaWV3LmgKaW5kZXggYzQ0MTk3NDFkNDc4NGE0ZWYwNWEzMWJh YmFjMDMzZDU0OTI1YTUyMi4uNzU0ZmEyYWRjMTExZDI4ZjhkNzM0OTgzZTE5MmRkMjg2MmYyNmI3 ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0Nvb3JkaW5hdGVkR3JhcGhp Y3MvV2ViVmlldy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db29yZGluYXRlZEdy YXBoaWNzL1dlYlZpZXcuaApAQCAtMTMxLDYgKzEzMSw3IEBAIHByb3RlY3RlZDoKIAogICAgIHZp cnR1YWwgYm9vbCBjYW5TY3JvbGxWaWV3KCkgb3ZlcnJpZGUgeyByZXR1cm4gZmFsc2U7IH0KICAg ICB2aXJ0dWFsIHZvaWQgc2Nyb2xsVmlldyhjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiwgY29uc3Qg V2ViQ29yZTo6SW50U2l6ZSYpIG92ZXJyaWRlOworICAgIHZpcnR1YWwgdm9pZCByZXF1ZXN0U2Ny b2xsKGNvbnN0IFdlYkNvcmU6OkZsb2F0UG9pbnQmLCBib29sKSBvdmVycmlkZTsKIAogICAgIHZp cnR1YWwgV2ViQ29yZTo6SW50U2l6ZSB2aWV3U2l6ZSgpIG92ZXJyaWRlOwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZUNsaWVudC5oIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1BhZ2VDbGllbnQuaAppbmRleCBmODk0ZDY1NjE0MjJiMWFmMTViYzcwNjMzMzBh MjA5NDMyZjY4MDczLi43MWJiNTkwZmZhODJhN2M4YmZjYTg5YWEzNDZmZTNlMGUzZTA2MTZmIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZUNsaWVudC5oCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QYWdlQ2xpZW50LmgKQEAgLTkzLDYgKzkzLDggQEAgcHVi bGljOgogICAgIHZpcnR1YWwgYm9vbCBjYW5TY3JvbGxWaWV3KCkgPSAwOwogICAgIC8vIFRlbGwg dGhlIHZpZXcgdG8gc2Nyb2xsIHNjcm9sbFJlY3QgYnkgc2Nyb2xsT2Zmc2V0LgogICAgIHZpcnR1 YWwgdm9pZCBzY3JvbGxWaWV3KGNvbnN0IFdlYkNvcmU6OkludFJlY3QmIHNjcm9sbFJlY3QsIGNv bnN0IFdlYkNvcmU6OkludFNpemUmIHNjcm9sbE9mZnNldCkgPSAwOworICAgIC8vIFRlbGwgdGhl IHZpZXcgdG8gc2Nyb2xsIHRvIHRoZSBnaXZlbiBwb3NpdGlvbiwgYW5kIHdoZXRoZXIgdGhpcyB3 YXMgYSBwcm9ncmFtbWF0aWMgc2Nyb2xsLgorICAgIHZpcnR1YWwgdm9pZCByZXF1ZXN0U2Nyb2xs KGNvbnN0IFdlYkNvcmU6OkZsb2F0UG9pbnQmIHNjcm9sbFBvc2l0aW9uLCBib29sIGlzUHJvZ3Jh bW1hdGljU2Nyb2xsKSA9IDA7CiAKICAgICAvLyBSZXR1cm4gdGhlIHNpemUgb2YgdGhlIHZpZXcg dGhlIHBhZ2UgaXMgYXNzb2NpYXRlZCB3aXRoLgogICAgIHZpcnR1YWwgV2ViQ29yZTo6SW50U2l6 ZSB2aWV3U2l6ZSgpID0gMDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9T Y3JvbGxpbmcvUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3JQcm94eS5jcHAgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvU2Nyb2xsaW5nL1JlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHku Y3BwCmluZGV4IDEwYTBmNDhjYzlhZTBlNTcyNDAzOTMxMGZhYTM0MWMyNzZhMmY5NzEuLjk0YjE0 YWQ5Yzg1YzliMzNiYWZmZWE4Y2RhNWIwMzEzYThhNmFiMWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9TY3JvbGxpbmcvUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3JQcm94 eS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1Njcm9sbGluZy9SZW1vdGVTY3Jv bGxpbmdDb29yZGluYXRvclByb3h5LmNwcApAQCAtMTYwLDYgKzE2MCwxMiBAQCB2b2lkIFJlbW90 ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHk6OnNjcm9sbGluZ1RyZWVOb2RlRGlkU2Nyb2xsKFdl YkNvcmU6OlNjcm9sbAogICAgIG1fd2ViUGFnZVByb3h5LnNlbmQoTWVzc2FnZXM6OlJlbW90ZVNj cm9sbGluZ0Nvb3JkaW5hdG9yOjpTY3JvbGxQb3NpdGlvbkNoYW5nZWRGb3JOb2RlKHNjcm9sbGVk Tm9kZUlELCBuZXdTY3JvbGxQb3NpdGlvbikpOwogfQogCit2b2lkIFJlbW90ZVNjcm9sbGluZ0Nv b3JkaW5hdG9yUHJveHk6OnNjcm9sbGluZ1RyZWVOb2RlUmVxdWVzdHNTY3JvbGwoU2Nyb2xsaW5n Tm9kZUlEIHNjcm9sbGVkTm9kZUlELCBjb25zdCBGbG9hdFBvaW50JiBzY3JvbGxQb3NpdGlvbiwg Ym9vbCByZXByZXNlbnRzUHJvZ3JhbW1hdGljU2Nyb2xsKQoreworICAgIGlmIChzY3JvbGxlZE5v ZGVJRCA9PSByb290U2Nyb2xsaW5nTm9kZUlEKCkpCisgICAgICAgIG1fd2ViUGFnZVByb3h5LnJl cXVlc3RTY3JvbGwoc2Nyb2xsUG9zaXRpb24sIHJlcHJlc2VudHNQcm9ncmFtbWF0aWNTY3JvbGwp OworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKIAogI2VuZGlmIC8vIEVOQUJMRShBU1lOQ19T Q1JPTExJTkcpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU2Nyb2xsaW5n L1JlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9TY3JvbGxpbmcvUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3JQcm94eS5oCmluZGV4IDE2 YzhkNDg3ZDc3MGE4YjVlYzkxMTRkZWZiYjVjZmI2MGNlMWM2YjIuLmI3M2FhZjFlNGUyMThlNzNk YzBjZGMxYjQzZmQ1YTUyOGU1Mjg5ODggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9TY3JvbGxpbmcvUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3JQcm94eS5oCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TY3JvbGxpbmcvUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0 b3JQcm94eS5oCkBAIC01Myw2ICs1Myw3IEBAIHB1YmxpYzoKICAgICAKICAgICAvLyBJbmZvcm0g dGhlIHdlYiBwcm9jZXNzIHRoYXQgdGhlIHNjcm9sbCBwb3NpdGlvbiBjaGFuZ2VkIChjYWxsZWQg ZnJvbSB0aGUgc2Nyb2xsaW5nIHRyZWUpCiAgICAgdm9pZCBzY3JvbGxpbmdUcmVlTm9kZURpZFNj cm9sbChXZWJDb3JlOjpTY3JvbGxpbmdOb2RlSUQsIGNvbnN0IFdlYkNvcmU6OkZsb2F0UG9pbnQm IG5ld1Njcm9sbFBvc2l0aW9uKTsKKyAgICB2b2lkIHNjcm9sbGluZ1RyZWVOb2RlUmVxdWVzdHNT Y3JvbGwoV2ViQ29yZTo6U2Nyb2xsaW5nTm9kZUlELCBjb25zdCBXZWJDb3JlOjpGbG9hdFBvaW50 JiBzY3JvbGxQb3NpdGlvbiwgYm9vbCByZXByZXNlbnRzUHJvZ3JhbW1hdGljU2Nyb2xsKTsKIAog ICAgIGJvb2wgaXNQb2ludEluTm9uRmFzdFNjcm9sbGFibGVSZWdpb24oY29uc3QgV2ViQ29yZTo6 SW50UG9pbnQmKSBjb25zdDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1Njcm9sbGluZy9SZW1vdGVTY3JvbGxpbmdUcmVlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9TY3JvbGxpbmcvUmVtb3RlU2Nyb2xsaW5nVHJlZS5jcHAKaW5kZXggZjhjOTVjYjZkYTg1 ZmI3ZmNmNzk5NzdhZDg3NTRiMDYxMDcyM2UyMy4uZmIwZGYzNzJjNjNkMjM1NTI0MzRmZjlhZWQ2 ZDMwOTI1ZGRmMWVjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1Njcm9s bGluZy9SZW1vdGVTY3JvbGxpbmdUcmVlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvU2Nyb2xsaW5nL1JlbW90ZVNjcm9sbGluZ1RyZWUuY3BwCkBAIC04Miw2ICs4MiwxMSBAQCB2 b2lkIFJlbW90ZVNjcm9sbGluZ1RyZWU6OnNjcm9sbGluZ1RyZWVOb2RlRGlkU2Nyb2xsKFNjcm9s bGluZ05vZGVJRCBub2RlSUQsIGNvbgogICAgIG1fc2Nyb2xsaW5nQ29vcmRpbmF0b3JQcm94eS5z Y3JvbGxpbmdUcmVlTm9kZURpZFNjcm9sbChub2RlSUQsIHNjcm9sbFBvc2l0aW9uKTsKIH0KIAor dm9pZCBSZW1vdGVTY3JvbGxpbmdUcmVlOjpzY3JvbGxpbmdUcmVlTm9kZVJlcXVlc3RzU2Nyb2xs KFNjcm9sbGluZ05vZGVJRCBub2RlSUQsIGNvbnN0IEZsb2F0UG9pbnQmIHNjcm9sbFBvc2l0aW9u LCBib29sIHJlcHJlc2VudHNQcm9ncmFtbWF0aWNTY3JvbGwpCit7CisgICAgbV9zY3JvbGxpbmdD b29yZGluYXRvclByb3h5LnNjcm9sbGluZ1RyZWVOb2RlUmVxdWVzdHNTY3JvbGwobm9kZUlELCBz Y3JvbGxQb3NpdGlvbiwgcmVwcmVzZW50c1Byb2dyYW1tYXRpY1Njcm9sbCk7Cit9CisKIFBhc3NP d25QdHI8U2Nyb2xsaW5nVHJlZU5vZGU+IFJlbW90ZVNjcm9sbGluZ1RyZWU6OmNyZWF0ZU5vZGUo U2Nyb2xsaW5nTm9kZVR5cGUgbm9kZVR5cGUsIFNjcm9sbGluZ05vZGVJRCBub2RlSUQpCiB7CiAg ICAgc3dpdGNoIChub2RlVHlwZSkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1Njcm9sbGluZy9SZW1vdGVTY3JvbGxpbmdUcmVlLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvU2Nyb2xsaW5nL1JlbW90ZVNjcm9sbGluZ1RyZWUuaAppbmRleCA1MWYwYWRmNGFmMTM1 Y2M2NGM2NmYwY2U3ODU1ZTU1MjVkMGFkNzI4Li5iY2Q3NTFkM2E4Zjc4MzUzNThhMDI4ODE5MGUz ODBlYTljNWE1MWEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU2Nyb2xs aW5nL1JlbW90ZVNjcm9sbGluZ1RyZWUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv U2Nyb2xsaW5nL1JlbW90ZVNjcm9sbGluZ1RyZWUuaApAQCAtNDcsNiArNDcsNyBAQCBwdWJsaWM6 CiAgICAgY29uc3QgUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3JQcm94eSYgc2Nyb2xsaW5nQ29v cmRpbmF0b3JQcm94eSgpIGNvbnN0IHsgcmV0dXJuIG1fc2Nyb2xsaW5nQ29vcmRpbmF0b3JQcm94 eTsgfQogCiAgICAgdmlydHVhbCB2b2lkIHNjcm9sbGluZ1RyZWVOb2RlRGlkU2Nyb2xsKFdlYkNv cmU6OlNjcm9sbGluZ05vZGVJRCwgY29uc3QgV2ViQ29yZTo6RmxvYXRQb2ludCYgc2Nyb2xsUG9z aXRpb24sIFdlYkNvcmU6OlNldE9yU3luY1Njcm9sbGluZ0xheWVyUG9zaXRpb24gPSBXZWJDb3Jl OjpTeW5jU2Nyb2xsaW5nTGF5ZXJQb3NpdGlvbikgb3ZlcnJpZGU7CisgICAgdmlydHVhbCB2b2lk IHNjcm9sbGluZ1RyZWVOb2RlUmVxdWVzdHNTY3JvbGwoV2ViQ29yZTo6U2Nyb2xsaW5nTm9kZUlE LCBjb25zdCBXZWJDb3JlOjpGbG9hdFBvaW50JiBzY3JvbGxQb3NpdGlvbiwgYm9vbCByZXByZXNl bnRzUHJvZ3JhbW1hdGljU2Nyb2xsKSBvdmVycmlkZTsKIAogcHJpdmF0ZToKICAgICBleHBsaWNp dCBSZW1vdGVTY3JvbGxpbmdUcmVlKFJlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHkmKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggNzM0MDk1Yjll ZDQ1ZWUzN2EyMDI2OTljYzJjY2M3ODNkZDBkYjI1OC4uOTg3MWVlZjJlYTYyZDg5NjIzNDYzMTIy NWNhZDdjMDk5YzIyMjI2MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dl YlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5jcHAKQEAgLTEwMDYsNiArMTAwNiwxMSBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6c2Nyb2xsVmll dyhjb25zdCBJbnRSZWN0JiBzY3JvbGxSZWN0LCBjb25zdCBJbnRTaXplJiBzY3JvbGxPZgogICAg IG1fcGFnZUNsaWVudC5zY3JvbGxWaWV3KHNjcm9sbFJlY3QsIHNjcm9sbE9mZnNldCk7CiB9CiAK K3ZvaWQgV2ViUGFnZVByb3h5OjpyZXF1ZXN0U2Nyb2xsKGNvbnN0IEZsb2F0UG9pbnQmIHNjcm9s bFBvc2l0aW9uLCBib29sIGlzUHJvZ3JhbW1hdGljU2Nyb2xsKQoreworICAgIG1fcGFnZUNsaWVu dC5yZXF1ZXN0U2Nyb2xsKHNjcm9sbFBvc2l0aW9uLCBpc1Byb2dyYW1tYXRpY1Njcm9sbCk7Cit9 CisKIHZvaWQgV2ViUGFnZVByb3h5Ojp1cGRhdGVWaWV3U3RhdGUoVmlld1N0YXRlOjpGbGFncyBm bGFnc1RvVXBkYXRlKQogewogICAgIG1fdmlld1N0YXRlICY9IH5mbGFnc1RvVXBkYXRlOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCmluZGV4IGRmM2I1ZTA4MDU0M2ZjMTJk YzZhOWY3YTZmOTRkZGEzMDIxOTg5N2MuLjRmMjhhYjYyZDEyYWM2YmQ5ZDAyYzUwYmY0NzI3ODkw ZWNmZTM3ODQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKQEAgLTU0 NSw3ICs1NDUsOCBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRWaWV3TmVlZHNEaXNwbGF5KGNvbnN0 IFdlYkNvcmU6OkludFJlY3QmKTsKICAgICB2b2lkIGRpc3BsYXlWaWV3KCk7CiAgICAgYm9vbCBj YW5TY3JvbGxWaWV3KCk7Ci0gICAgdm9pZCBzY3JvbGxWaWV3KGNvbnN0IFdlYkNvcmU6OkludFJl Y3QmIHNjcm9sbFJlY3QsIGNvbnN0IFdlYkNvcmU6OkludFNpemUmIHNjcm9sbE9mZnNldCk7Cisg ICAgdm9pZCBzY3JvbGxWaWV3KGNvbnN0IFdlYkNvcmU6OkludFJlY3QmIHNjcm9sbFJlY3QsIGNv bnN0IFdlYkNvcmU6OkludFNpemUmIHNjcm9sbE9mZnNldCk7IC8vIEZJWE1FOiBDb29yZGluYXRl ZEdyYXBoaWNzIHNob3VsZCB1c2UgcmVxdWVzdFNjcm9sbCgpLgorICAgIHZvaWQgcmVxdWVzdFNj cm9sbChjb25zdCBXZWJDb3JlOjpGbG9hdFBvaW50JiBzY3JvbGxQb3NpdGlvbiwgYm9vbCBpc1By b2dyYW1tYXRpY1Njcm9sbCk7CiAgICAgCiAgICAgdm9pZCBzZXREZWxlZ2F0ZXNTY3JvbGxpbmco Ym9vbCBkZWxlZ2F0ZXNTY3JvbGxpbmcpIHsgbV9kZWxlZ2F0ZXNTY3JvbGxpbmcgPSBkZWxlZ2F0 ZXNTY3JvbGxpbmc7IH0KICAgICBib29sIGRlbGVnYXRlc1Njcm9sbGluZygpIGNvbnN0IHsgcmV0 dXJuIG1fZGVsZWdhdGVzU2Nyb2xsaW5nOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvaW9zL1BhZ2VDbGllbnRJbXBsSU9TLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvaW9zL1BhZ2VDbGllbnRJbXBsSU9TLmgKaW5kZXggMDAyZmRkOTNmMWIyMGJkYzM1ZmZmMmRm ZWVlYjMwOGQ3ZGYwYTc3YS4uY2U3OGVlODFiMzYyZmExMzg2OTQ4OWFjMmE2ODNiNWQ0M2UyOTU5 OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9QYWdlQ2xpZW50SW1w bElPUy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvUGFnZUNsaWVudEltcGxJ T1MuaApAQCAtNTMsNiArNTMsNyBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgdm9pZCBkaXNwbGF5 VmlldygpIG92ZXJyaWRlOwogICAgIHZpcnR1YWwgYm9vbCBjYW5TY3JvbGxWaWV3KCkgb3ZlcnJp ZGU7CiAgICAgdmlydHVhbCB2b2lkIHNjcm9sbFZpZXcoY29uc3QgV2ViQ29yZTo6SW50UmVjdCYg c2Nyb2xsUmVjdCwgY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYgc2Nyb2xsT2Zmc2V0KSBvdmVycmlk ZTsKKyAgICB2aXJ0dWFsIHZvaWQgcmVxdWVzdFNjcm9sbChjb25zdCBXZWJDb3JlOjpGbG9hdFBv aW50JiBzY3JvbGxQb3NpdGlvbiwgYm9vbCBpc1Byb2dyYW1tYXRpY1Njcm9sbCkgb3ZlcnJpZGU7 CiAgICAgdmlydHVhbCBXZWJDb3JlOjpJbnRTaXplIHZpZXdTaXplKCkgb3ZlcnJpZGU7CiAgICAg dmlydHVhbCBib29sIGlzVmlld1dpbmRvd0FjdGl2ZSgpIG92ZXJyaWRlOwogICAgIHZpcnR1YWwg Ym9vbCBpc1ZpZXdGb2N1c2VkKCkgb3ZlcnJpZGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvaW9zL1BhZ2VDbGllbnRJbXBsSU9TLm1tIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL2lvcy9QYWdlQ2xpZW50SW1wbElPUy5tbQppbmRleCA1ZjdjZmIyOTc0OGY2NTQxOTI4 MzRjM2E4MDljY2Y4Y2NhMDMzYjA5Li4yYTNmODY3OTViNmNmOTk1MDQ0YjZhOTMzMDY3OTg4OTgz ODJjZTQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1BhZ2VDbGll bnRJbXBsSU9TLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvUGFnZUNsaWVu dEltcGxJT1MubW0KQEAgLTgyLDE1ICs4MiwyMSBAQCB2b2lkIFBhZ2VDbGllbnRJbXBsOjpkaXNw bGF5VmlldygpCiAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiB9CiAKK2Jvb2wgUGFnZUNsaWVu dEltcGw6OmNhblNjcm9sbFZpZXcoKQoreworICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAgcmV0 dXJuIGZhbHNlOworfQorCiB2b2lkIFBhZ2VDbGllbnRJbXBsOjpzY3JvbGxWaWV3KGNvbnN0IElu dFJlY3QmLCBjb25zdCBJbnRTaXplJikKIHsKICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKIH0K IAotYm9vbCBQYWdlQ2xpZW50SW1wbDo6Y2FuU2Nyb2xsVmlldygpCit2b2lkIFBhZ2VDbGllbnRJ bXBsOjpyZXF1ZXN0U2Nyb2xsKGNvbnN0IEZsb2F0UG9pbnQmIHNjcm9sbFBvc2l0aW9uLCBib29s IGlzUHJvZ3JhbW1hdGljU2Nyb2xsKQogewotICAgIG5vdEltcGxlbWVudGVkKCk7Ci0gICAgcmV0 dXJuIGZhbHNlOworICAgIFVOVVNFRF9QQVJBTShpc1Byb2dyYW1tYXRpY1Njcm9sbCk7CisgICAg W21fd2ViVmlldyBfc2Nyb2xsVG9Db250ZW50T2Zmc2V0OnNjcm9sbFBvc2l0aW9uXTsKIH0KIAog SW50U2l6ZSBQYWdlQ2xpZW50SW1wbDo6dmlld1NpemUoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL21hYy9QYWdlQ2xpZW50SW1wbC5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9tYWMvUGFnZUNsaWVudEltcGwubW0KaW5kZXggMTliNjM4YTZhN2EzMzNjZjI2N2Nk ZjVkNzEwMjczZWUxYzNkZmQ4Mi4uNmI3YjFjMGVlOWVkNGQ1YjllYTdhODU4M2FhY2YwYzFjNjI4 OGZkMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9QYWdlQ2xpZW50 SW1wbC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1BhZ2VDbGllbnRJbXBs Lm1tCkBAIC0xNzAsNiArMTcwLDExIEBAIHZvaWQgUGFnZUNsaWVudEltcGw6OnNjcm9sbFZpZXco Y29uc3QgSW50UmVjdCYgc2Nyb2xsUmVjdCwgY29uc3QgSW50U2l6ZSYgc2Nyb2xsCiAgICAgQVNT RVJUX05PVF9SRUFDSEVEKCk7CiB9CiAKK3ZvaWQgUGFnZUNsaWVudEltcGw6OnJlcXVlc3RTY3Jv bGwoY29uc3QgRmxvYXRQb2ludCYgc2Nyb2xsUG9zaXRpb24sIGJvb2wgaXNQcm9ncmFtbWF0aWNT Y3JvbGwpCit7CisgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Cit9CisKIEludFNpemUgUGFnZUNs aWVudEltcGw6OnZpZXdTaXplKCkKIHsKICAgICByZXR1cm4gSW50U2l6ZShbbV93a1ZpZXcgYm91 bmRzXS5zaXplKTsK 229296 2014-04-14 12:04:57 -0700 2014-04-14 13:26:47 -0700 Patch bug-131618-20140414120435.patch text/plain 19917 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTY3MTMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjU5Njk5NzVhMGVhYzkz MGUxMDdjMTE1MTlmNTgyODEwNzNiYjQxNy4uMjk2Yzc0NjExYmE1OTQ5ZTJlMzkxZjA5YzcxODVi Mjg2NTcxNjUzZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE0LTA0LTE0ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFtXSzIgaU9TXSBT Y3JvbGxpbmcgdG8gYW5jaG9yIGxpbmtzIGlzIGJyb2tlbgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMxNjE4CisgICAgICAgIDxyZGFyOi8vcHJvYmxl bS8xNjU5OTE0ND4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBIYXZlIFNjcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlIHBhc3MgUmVxdWVzdGVkU2Nyb2xs UG9zaXRpb24gdXBkYXRlcworICAgICAgICB0byB0aGUgc2Nyb2xsaW5nIHRyZWUsIHNvIHRoYXQg dGhlIHNjcm9sbGluZyB0cmVlIGNhbiBoYXZlIGN1c3RvbSBiZWhhdmlvcgorICAgICAgICBmb3Ig dGhlbSBpZiBuZWNlc3NhcnkuCisKKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdU cmVlLmg6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdUcmVlOjpzY3JvbGxpbmdUcmVlTm9k ZVJlcXVlc3RzU2Nyb2xsKToKKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVl U2Nyb2xsaW5nTm9kZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdUcmVlU2Nyb2xs aW5nTm9kZTo6dXBkYXRlQWZ0ZXJDaGlsZHJlbik6CisgICAgICAgICogcGFnZS9zY3JvbGxpbmcv U2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGUuaDoKKwogMjAxNC0wNC0xMSAgQmVhciBUcmF2aXMg IDxiZXRyYXZpc0BhZG9iZS5jb20+CiAKICAgICAgICAgW0NTUyBTaGFwZXNdIGluc2V0IGFyZ3Mg YW5kIHJhZGlhbCBhcmdzIHNob3VsZCBzZXJpYWxpemUgdG8gdGhlIHNpbXBsZXN0IGZvcm0KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwppbmRleCAwZDQxNDUwNTk5MTBjZjQyMTFmZmJhYWM1ZTA0MzBkOGQ1NTFjOWZjLi5jY2Fj ODFkZGUyOGRjM2MyNGQ4MjE4OTBiNDYzYjg0OTE1NmU5ZWIwIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsNDIgQEAKKzIwMTQtMDQtMTQgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5j b20+CisKKyAgICAgICAgW1dLMiBpT1NdIFNjcm9sbGluZyB0byBhbmNob3IgbGlua3MgaXMgYnJv a2VuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzE2 MTgKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE2NTk5MTQ0PgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAgVGhlIFJlbW90ZVNjcm9sbGlu Z1RyZWUgaW1wbGVtZW50cyBzY3JvbGxpbmdUcmVlTm9kZVJlcXVlc3RzU2Nyb2xsCisgICAgICAg IHRvIGdldCBpbmZvcm1lZCBhYm91dCByZXF1ZXN0ZWQgc2Nyb2xsIHBvc2l0aW9uIHVwZGF0ZXMs IGFuZCBwYXNzZXMKKyAgICAgICAgdGhlbSBhbG9uZyB2aWEgdGhlIFJlbW90ZVNjcm9sbGluZ0Nv b3JkaW5hdG9yUHJveHksIFdlYlBhZ2VQcm94eSBhbmQgUGFnZUNsaWVudAorICAgICAgICB0byB0 aGUgV0tXZWJWaWV3LCB3aGljaCBwZXJmb3JtcyBhIHNjcm9sbC4KKworICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tOgorICAgICAgICAoLVtXS1dlYlZpZXcgX3Njcm9s bFRvQ29udGVudE9mZnNldDpXZWJDb3JlOjpdKTogU2Nyb2xsIHRvIGNvbnRlbnQgb2Zmc2V0LAor ICAgICAgICB0YWtpbmcgcGFnZSBzY2FsZSBhbmQgaW5zZXRzIGludG8gYWNjb3VudC4KKyAgICAg ICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld0ludGVybmFsLmg6CisgICAgICAgICog VUlQcm9jZXNzL0Nvb3JkaW5hdGVkR3JhcGhpY3MvV2ViVmlldy5jcHA6CisgICAgICAgIChXZWJL aXQ6OldlYlZpZXc6OnJlcXVlc3RTY3JvbGwpOgorICAgICAgICAqIFVJUHJvY2Vzcy9Db29yZGlu YXRlZEdyYXBoaWNzL1dlYlZpZXcuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvUGFnZUNsaWVudC5o OgorICAgICAgICAqIFVJUHJvY2Vzcy9TY3JvbGxpbmcvUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0 b3JQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9y UHJveHk6OnNjcm9sbGluZ1RyZWVOb2RlUmVxdWVzdHNTY3JvbGwpOgorICAgICAgICBQYXNzIHNj cm9sbHMgYWxvbmcgdG8gdGhlIFdlYlBhZ2VQcm94eSBmb3IgdGhlIHJvb3Qgbm9kZS4gV2Ugd2ls bCBhbHNvIG5lZWQKKyAgICAgICAgdG8gaGFuZGxlIHByb2dyYW1tYXRpYyBzY3JvbGxzIGZvciBv dmVyZmxvdyBzb29uLgorICAgICAgICAqIFVJUHJvY2Vzcy9TY3JvbGxpbmcvUmVtb3RlU2Nyb2xs aW5nQ29vcmRpbmF0b3JQcm94eS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9TY3JvbGxpbmcvUmVt b3RlU2Nyb2xsaW5nVHJlZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZVNjcm9sbGluZ1Ry ZWU6OnNjcm9sbGluZ1RyZWVOb2RlUmVxdWVzdHNTY3JvbGwpOgorICAgICAgICAqIFVJUHJvY2Vz cy9TY3JvbGxpbmcvUmVtb3RlU2Nyb2xsaW5nVHJlZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9X ZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnJlcXVlc3RT Y3JvbGwpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKiBV SVByb2Nlc3MvaW9zL1BhZ2VDbGllbnRJbXBsSU9TLmg6CisgICAgICAgICogVUlQcm9jZXNzL2lv cy9QYWdlQ2xpZW50SW1wbElPUy5tbToKKyAgICAgICAgKFdlYktpdDo6UGFnZUNsaWVudEltcGw6 OmNhblNjcm9sbFZpZXcpOgorICAgICAgICAoV2ViS2l0OjpQYWdlQ2xpZW50SW1wbDo6cmVxdWVz dFNjcm9sbCk6CisgICAgICAgICogVUlQcm9jZXNzL21hYy9QYWdlQ2xpZW50SW1wbC5tbToKKyAg ICAgICAgKFdlYktpdDo6UGFnZUNsaWVudEltcGw6OnJlcXVlc3RTY3JvbGwpOgorCiAyMDE0LTA0 LTExICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgogCiAgICAgICAgIFtNYWNd IFByZXZlbnQgY3Jhc2ggd2hlbiBleGl0aW5nIGZ1bGxzY3JlZW4gbW9kZQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZS5oIGIvU291cmNlL1dl YkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZS5oCmluZGV4IGFjYTY0ZmQxYTI4OTg3 NWM0Zjk0ZmFlYWIzZmQ5ODM3MGQxOTM0NGIuLjJmNDdhNmFjNWEzOGYyYzQyZjZiM2E2MGFiOTMx M2M0MDNhYjliNGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Nj cm9sbGluZ1RyZWUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxp bmdUcmVlLmgKQEAgLTc1LDYgKzc1LDkgQEAgcHVibGljOgogICAgIC8vIFVwZGF0ZXMgRnJhbWVW aWV3L1JlbmRlckxheWVyIHNjcm9sbGluZyBzdGF0ZSBhbmQgR3JhcGhpY3NMYXllcnMuCiAgICAg dmlydHVhbCB2b2lkIHNjcm9sbGluZ1RyZWVOb2RlRGlkU2Nyb2xsKFNjcm9sbGluZ05vZGVJRCwg Y29uc3QgRmxvYXRQb2ludCYgc2Nyb2xsUG9zaXRpb24sIFNldE9yU3luY1Njcm9sbGluZ0xheWVy UG9zaXRpb24gPSBTeW5jU2Nyb2xsaW5nTGF5ZXJQb3NpdGlvbikgPSAwOwogCisgICAgLy8gQ2Fs bGVkIGZvciByZXF1ZXN0ZWQgc2Nyb2xsIHBvc2l0aW9uIHVwZGF0ZXMuCisgICAgdmlydHVhbCB2 b2lkIHNjcm9sbGluZ1RyZWVOb2RlUmVxdWVzdHNTY3JvbGwoU2Nyb2xsaW5nTm9kZUlELCBjb25z dCBGbG9hdFBvaW50JiAvKnNjcm9sbFBvc2l0aW9uKi8sIGJvb2wgLypyZXByZXNlbnRzUHJvZ3Jh bW1hdGljU2Nyb2xsKi8pIHsgfQorCiAgICAgLy8gRGVsZWdhdGVkIHNjcm9sbGluZy96b29taW5n IGhhcyBjYXVzZWQgdGhlIHZpZXdwb3J0IHRvIGNoYW5nZSwgc28gdXBkYXRlIHZpZXdwb3J0LWNv bnN0cmFpbmVkIGxheWVycwogICAgIC8vIChidXQgZG9uJ3QgY2F1c2Ugc2Nyb2xsIGV2ZW50cyB0 byBiZSBmaXJlZCkuCiAgICAgdmlydHVhbCB2b2lkIHZpZXdwb3J0Q2hhbmdlZFZpYURlbGVnYXRl ZFNjcm9sbGluZyhTY3JvbGxpbmdOb2RlSUQsIGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYgdmll d3BvcnRSZWN0LCBkb3VibGUgc2NhbGUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFn ZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGUuY3BwIGIvU291cmNlL1dlYkNv cmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGUuY3BwCmluZGV4IGY4 NDEzOTdhODczNmU1ODQxMDk0YTVjMzNjNDYzMTU2MDZhNDk1NjMuLmY1ZDhiM2FmZDdhMWRkYmQy N2QwNjJlZWU0ZmUyNzAxNjM1OWJlNTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv c2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZS5jcHAKQEAgLTg3 LDYgKzg3LDEzIEBAIHZvaWQgU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGU6OnVwZGF0ZUJlZm9y ZUNoaWxkcmVuKGNvbnN0IFNjcm9sbGluZ1N0YXRlTm9kZSYKICAgICAgICAgbV9iZWhhdmlvckZv ckZpeGVkID0gc3RhdGUuc2Nyb2xsQmVoYXZpb3JGb3JGaXhlZEVsZW1lbnRzKCk7CiB9CiAKK3Zv aWQgU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGU6OnVwZGF0ZUFmdGVyQ2hpbGRyZW4oY29uc3Qg U2Nyb2xsaW5nU3RhdGVOb2RlJiBzdGF0ZU5vZGUpCit7CisgICAgY29uc3QgU2Nyb2xsaW5nU3Rh dGVTY3JvbGxpbmdOb2RlJiBzY3JvbGxpbmdTdGF0ZU5vZGUgPSB0b1Njcm9sbGluZ1N0YXRlU2Ny b2xsaW5nTm9kZShzdGF0ZU5vZGUpOworICAgIGlmIChzY3JvbGxpbmdTdGF0ZU5vZGUuaGFzQ2hh bmdlZFByb3BlcnR5KFNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZTo6UmVxdWVzdGVkU2Nyb2xs UG9zaXRpb24pKQorICAgICAgICBzY3JvbGxpbmdUcmVlKCkuc2Nyb2xsaW5nVHJlZU5vZGVSZXF1 ZXN0c1Njcm9sbChzY3JvbGxpbmdOb2RlSUQoKSwgc2Nyb2xsaW5nU3RhdGVOb2RlLnJlcXVlc3Rl ZFNjcm9sbFBvc2l0aW9uKCksIHNjcm9sbGluZ1N0YXRlTm9kZS5yZXF1ZXN0ZWRTY3JvbGxQb3Np dGlvblJlcHJlc2VudHNQcm9ncmFtbWF0aWNTY3JvbGwoKSk7Cit9CisKIH0gLy8gbmFtZXNwYWNl IFdlYkNvcmUKIAogI2VuZGlmIC8vIEVOQUJMRShBU1lOQ19TQ1JPTExJTkcpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9k ZS5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZVNjcm9sbGlu Z05vZGUuaAppbmRleCAyYzcyYmZkNDVlZjI4MTc2N2EwNGIwNTE2NmUyOGNkMTNiYmFlYzBlLi4x ZjE4MTViZTgyM2FhZWNhZDk2NDEwZjgyMTBhOWJhM2UwYjEzZDAwIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZS5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWVTY3JvbGxpbmdO b2RlLmgKQEAgLTQ1LDYgKzQ1LDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgflNjcm9sbGluZ1Ry ZWVTY3JvbGxpbmdOb2RlKCk7CiAKICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlQmVmb3JlQ2hpbGRy ZW4oY29uc3QgU2Nyb2xsaW5nU3RhdGVOb2RlJikgb3ZlcnJpZGU7CisgICAgdmlydHVhbCB2b2lk IHVwZGF0ZUFmdGVyQ2hpbGRyZW4oY29uc3QgU2Nyb2xsaW5nU3RhdGVOb2RlJikgb3ZlcnJpZGU7 CiAKICAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIGltcGxlbWVudCB0aGlzIHdoZW4gd2Ugc3VwcG9y dCBTY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZXMgYXMgY2hpbGRyZW4uCiAgICAgdmlydHVhbCB2 b2lkIHBhcmVudFNjcm9sbFBvc2l0aW9uRGlkQ2hhbmdlKGNvbnN0IEZsb2F0UmVjdCYgLyp2aWV3 cG9ydFJlY3QqLywgY29uc3QgRmxvYXRTaXplJiAvKmN1bXVsYXRpdmVEZWx0YSovKSBvdmVycmlk ZSB7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tX ZWJWaWV3Lm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcu bW0KaW5kZXggMmFkNDZmN2Q2NjVmYzA1MmM1NzkyMWEzYmMxNmMwZWM3NTUzNWVjZi4uMjFlYjIw NTFjYjA3OWY3NDBmZWNmZmRhYzIwYjE4YTQ2NTk1ZTEwZSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KQEAgLTU0NCw2ICs1NDQsMTggQEAg c3RhdGljIFdlYkNvcmU6OkZsb2F0UG9pbnQgY29uc3RyYWluQ29udGVudE9mZnNldChXZWJDb3Jl OjpGbG9hdFBvaW50IGNvbnRlbnRPZmYKICAgICByZXR1cm4gY29udGVudE9mZnNldDsKIH0KIAor LSAodm9pZClfc2Nyb2xsVG9Db250ZW50T2Zmc2V0OihXZWJDb3JlOjpGbG9hdFBvaW50KWNvbnRl bnRPZmZzZXQKK3sKKyAgICBXZWJDb3JlOjpGbG9hdFBvaW50IHNjYWxlZE9mZnNldCA9IGNvbnRl bnRPZmZzZXQ7CisgICAgQ0dGbG9hdCB6b29tU2NhbGUgPSBjb250ZW50Wm9vbVNjYWxlKHNlbGYp OworICAgIHNjYWxlZE9mZnNldC5zY2FsZSh6b29tU2NhbGUsIHpvb21TY2FsZSk7CisKKyAgICBV SUVkZ2VJbnNldHMgaW5zZXQgPSBbX3Njcm9sbFZpZXcgY29udGVudEluc2V0XTsKKyAgICBzY2Fs ZWRPZmZzZXQgKz0gV2ViQ29yZTo6RmxvYXRTaXplKC1pbnNldC5sZWZ0LCAtaW5zZXQudG9wKTsK KworICAgIFtfc2Nyb2xsVmlldyBzZXRDb250ZW50T2Zmc2V0OnNjYWxlZE9mZnNldF07Cit9CisK IC0gKEJPT0wpX3Njcm9sbFRvUmVjdDooV2ViQ29yZTo6RmxvYXRSZWN0KXRhcmdldFJlY3Qgb3Jp Z2luOihXZWJDb3JlOjpGbG9hdFBvaW50KW9yaWdpbiBtaW5pbXVtU2Nyb2xsRGlzdGFuY2U6KGZs b2F0KW1pbmltdW1TY3JvbGxEaXN0YW5jZQogewogICAgIFdlYkNvcmU6OkZsb2F0UmVjdCB1bm9i c2N1cmVkQ29udGVudFJlY3QoW3NlbGYgX2NvbnRlbnRSZWN0Rm9yVXNlckludGVyYWN0aW9uXSk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmll d0ludGVybmFsLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmll d0ludGVybmFsLmgKaW5kZXggNmY5ZDJiMzhmZDQ0YTQ1MDk1ZjFmMjQzMDVhZDA3YWMzYzUxMGJl Ny4uNWNmOTFlMjQ3M2UwYmVjYzgyZDU4YWM2ZDllN2Q5M2RjNWYwM2E1ZSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdJbnRlcm5hbC5oCisr KyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3SW50ZXJuYWwu aApAQCAtNjQsNiArNjQsNyBAQCBjbGFzcyBXZWJQYWdlUHJveHk7CiAKIC0gKFJldGFpblB0cjxD R0ltYWdlUmVmPilfdGFrZVZpZXdTbmFwc2hvdDsKIAorLSAodm9pZClfc2Nyb2xsVG9Db250ZW50 T2Zmc2V0OihXZWJDb3JlOjpGbG9hdFBvaW50KWNvbnRlbnRPZmZzZXQ7CiAtIChCT09MKV9zY3Jv bGxUb1JlY3Q6KFdlYkNvcmU6OkZsb2F0UmVjdCl0YXJnZXRSZWN0IG9yaWdpbjooV2ViQ29yZTo6 RmxvYXRQb2ludClvcmlnaW4gbWluaW11bVNjcm9sbERpc3RhbmNlOihmbG9hdCltaW5pbXVtU2Ny b2xsRGlzdGFuY2U7CiAtIChCT09MKV96b29tVG9SZWN0OihXZWJDb3JlOjpGbG9hdFJlY3QpdGFy Z2V0UmVjdCB3aXRoT3JpZ2luOihXZWJDb3JlOjpGbG9hdFBvaW50KW9yaWdpbiBmaXRFbnRpcmVS ZWN0OihCT09MKWZpdEVudGlyZVJlY3QgbWluaW11bVNjYWxlOihkb3VibGUpbWluaW11bVNjYWxl IG1heGltdW1TY2FsZTooZG91YmxlKW1heGltdW1TY2FsZSBtaW5pbXVtU2Nyb2xsRGlzdGFuY2U6 KGZsb2F0KW1pbmltdW1TY3JvbGxEaXN0YW5jZTsKIC0gKHZvaWQpX3pvb21PdXRXaXRoT3JpZ2lu OihXZWJDb3JlOjpGbG9hdFBvaW50KW9yaWdpbjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZ3RrL1BhZ2VDbGllbnRJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZ3RrL1BhZ2VDbGllbnRJbXBsLmNwcAppbmRleCA5MWZhYzA4YWFlYWU1NmI0 M2VjNjA0Y2FmZmY0ZGZiNDY2N2FhY2Q2Li5jNmZjNjEwZGQ3MGMwMTAyOGIxZjhiZDIxNDYxOTNi MTU2NGQ3YTNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9Q YWdlQ2xpZW50SW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsv UGFnZUNsaWVudEltcGwuY3BwCkBAIC04Myw2ICs4MywxMSBAQCB2b2lkIFBhZ2VDbGllbnRJbXBs OjpzY3JvbGxWaWV3KGNvbnN0IFdlYkNvcmU6OkludFJlY3QmIHNjcm9sbFJlY3QsIGNvbnN0IFdl YkNvcgogICAgIHNldFZpZXdOZWVkc0Rpc3BsYXkoc2Nyb2xsUmVjdCk7CiB9CiAKK3ZvaWQgUGFn ZUNsaWVudEltcGw6OnJlcXVlc3RTY3JvbGwoY29uc3QgV2ViQ29yZTo6RmxvYXRQb2ludCYsIGJv b2wpCit7CisgICAgbm90SW1wbGVtZW50ZWQoKTsKK30KKwogV2ViQ29yZTo6SW50U2l6ZSBQYWdl Q2xpZW50SW1wbDo6dmlld1NpemUoKQogewogICAgIGlmICghZ3RrX3dpZGdldF9nZXRfcmVhbGl6 ZWQobV92aWV3V2lkZ2V0KSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZ3RrL1BhZ2VDbGllbnRJbXBsLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0 ay9QYWdlQ2xpZW50SW1wbC5oCmluZGV4IDUyMDkyMDgyNzkxMTllOGQ3ZjE3YmNkNTYzZGEwN2M3 MTVkNzJhZDAuLmE0MTQyZmFiNDVhNDdlZGYxZmIxMzZmNjFlNWU2N2NlYjRiZjhjYWYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1BhZ2VDbGllbnRJbXBsLmgK KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNsaWVudEltcGwuaApA QCAtNjUsNiArNjUsNyBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgdm9pZCBkaXNwbGF5Vmlldygp IG92ZXJyaWRlOwogICAgIHZpcnR1YWwgYm9vbCBjYW5TY3JvbGxWaWV3KCkgb3ZlcnJpZGUgeyBy ZXR1cm4gZmFsc2U7IH0KICAgICB2aXJ0dWFsIHZvaWQgc2Nyb2xsVmlldyhjb25zdCBXZWJDb3Jl OjpJbnRSZWN0JiBzY3JvbGxSZWN0LCBjb25zdCBXZWJDb3JlOjpJbnRTaXplJiBzY3JvbGxPZmZz ZXQpIG92ZXJyaWRlOworICAgIHZpcnR1YWwgdm9pZCByZXF1ZXN0U2Nyb2xsKGNvbnN0IFdlYkNv cmU6OkZsb2F0UG9pbnQmIHNjcm9sbFBvc2l0aW9uLCBib29sIGlzUHJvZ3JhbW1hdGljU2Nyb2xs KSBvdmVycmlkZTsKICAgICB2aXJ0dWFsIFdlYkNvcmU6OkludFNpemUgdmlld1NpemUoKSBvdmVy cmlkZTsKICAgICB2aXJ0dWFsIGJvb2wgaXNWaWV3V2luZG93QWN0aXZlKCkgb3ZlcnJpZGU7CiAg ICAgdmlydHVhbCBib29sIGlzVmlld0ZvY3VzZWQoKSBvdmVycmlkZTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db29yZGluYXRlZEdyYXBoaWNzL1dlYlZpZXcuY3BwIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0Nvb3JkaW5hdGVkR3JhcGhpY3MvV2ViVmlldy5jcHAK aW5kZXggZTYxN2RmMTI5M2NhMmIwY2VmYTljNDk2NTA0ZTU4NDVhNjc1OTgyNi4uNjE0NGFiYTI0 YzcxNzhjNDg3YmEwMGE2ZjBhZjFkMjFmMTg1Yjk1NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0Nvb3JkaW5hdGVkR3JhcGhpY3MvV2ViVmlldy5jcHAKKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0Nvb3JkaW5hdGVkR3JhcGhpY3MvV2ViVmlldy5jcHAKQEAgLTMw NCw2ICszMDQsMTEgQEAgdm9pZCBXZWJWaWV3OjpzY3JvbGxWaWV3KGNvbnN0IFdlYkNvcmU6Oklu dFJlY3QmIHNjcm9sbFJlY3QsIGNvbnN0IFdlYkNvcmU6OkludFMKICAgICBzZXRWaWV3TmVlZHNE aXNwbGF5KHNjcm9sbFJlY3QpOwogfQogCit2b2lkIFdlYlZpZXc6OnJlcXVlc3RTY3JvbGwoY29u c3QgV2ViQ29yZTo6RmxvYXRQb2ludCYsIGJvb2wpCit7CisgICAgbm90SW1wbGVtZW50ZWQoKTsK K30KKwogV2ViQ29yZTo6SW50U2l6ZSBXZWJWaWV3Ojp2aWV3U2l6ZSgpCiB7CiAgICAgcmV0dXJu IHJvdW5kZWRJbnRTaXplKGRpcFNpemUoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQ29vcmRpbmF0ZWRHcmFwaGljcy9XZWJWaWV3LmggYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQ29vcmRpbmF0ZWRHcmFwaGljcy9XZWJWaWV3LmgKaW5kZXggYzQ0MTk3NDFkNDc4 NGE0ZWYwNWEzMWJhYmFjMDMzZDU0OTI1YTUyMi4uNzU0ZmEyYWRjMTExZDI4ZjhkNzM0OTgzZTE5 MmRkMjg2MmYyNmI3ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0Nvb3Jk aW5hdGVkR3JhcGhpY3MvV2ViVmlldy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9D b29yZGluYXRlZEdyYXBoaWNzL1dlYlZpZXcuaApAQCAtMTMxLDYgKzEzMSw3IEBAIHByb3RlY3Rl ZDoKIAogICAgIHZpcnR1YWwgYm9vbCBjYW5TY3JvbGxWaWV3KCkgb3ZlcnJpZGUgeyByZXR1cm4g ZmFsc2U7IH0KICAgICB2aXJ0dWFsIHZvaWQgc2Nyb2xsVmlldyhjb25zdCBXZWJDb3JlOjpJbnRS ZWN0JiwgY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYpIG92ZXJyaWRlOworICAgIHZpcnR1YWwgdm9p ZCByZXF1ZXN0U2Nyb2xsKGNvbnN0IFdlYkNvcmU6OkZsb2F0UG9pbnQmLCBib29sKSBvdmVycmlk ZTsKIAogICAgIHZpcnR1YWwgV2ViQ29yZTo6SW50U2l6ZSB2aWV3U2l6ZSgpIG92ZXJyaWRlOwog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZUNsaWVudC5oIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BhZ2VDbGllbnQuaAppbmRleCBmODk0ZDY1NjE0MjJiMWFm MTViYzcwNjMzMzBhMjA5NDMyZjY4MDczLi43MWJiNTkwZmZhODJhN2M4YmZjYTg5YWEzNDZmZTNl MGUzZTA2MTZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZUNsaWVu dC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QYWdlQ2xpZW50LmgKQEAgLTkzLDYg KzkzLDggQEAgcHVibGljOgogICAgIHZpcnR1YWwgYm9vbCBjYW5TY3JvbGxWaWV3KCkgPSAwOwog ICAgIC8vIFRlbGwgdGhlIHZpZXcgdG8gc2Nyb2xsIHNjcm9sbFJlY3QgYnkgc2Nyb2xsT2Zmc2V0 LgogICAgIHZpcnR1YWwgdm9pZCBzY3JvbGxWaWV3KGNvbnN0IFdlYkNvcmU6OkludFJlY3QmIHNj cm9sbFJlY3QsIGNvbnN0IFdlYkNvcmU6OkludFNpemUmIHNjcm9sbE9mZnNldCkgPSAwOworICAg IC8vIFRlbGwgdGhlIHZpZXcgdG8gc2Nyb2xsIHRvIHRoZSBnaXZlbiBwb3NpdGlvbiwgYW5kIHdo ZXRoZXIgdGhpcyB3YXMgYSBwcm9ncmFtbWF0aWMgc2Nyb2xsLgorICAgIHZpcnR1YWwgdm9pZCBy ZXF1ZXN0U2Nyb2xsKGNvbnN0IFdlYkNvcmU6OkZsb2F0UG9pbnQmIHNjcm9sbFBvc2l0aW9uLCBi b29sIGlzUHJvZ3JhbW1hdGljU2Nyb2xsKSA9IDA7CiAKICAgICAvLyBSZXR1cm4gdGhlIHNpemUg b2YgdGhlIHZpZXcgdGhlIHBhZ2UgaXMgYXNzb2NpYXRlZCB3aXRoLgogICAgIHZpcnR1YWwgV2Vi Q29yZTo6SW50U2l6ZSB2aWV3U2l6ZSgpID0gMDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9TY3JvbGxpbmcvUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3JQcm94eS5jcHAg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU2Nyb2xsaW5nL1JlbW90ZVNjcm9sbGluZ0Nvb3Jk aW5hdG9yUHJveHkuY3BwCmluZGV4IDEwYTBmNDhjYzlhZTBlNTcyNDAzOTMxMGZhYTM0MWMyNzZh MmY5NzEuLjk0YjE0YWQ5Yzg1YzliMzNiYWZmZWE4Y2RhNWIwMzEzYThhNmFiMWYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TY3JvbGxpbmcvUmVtb3RlU2Nyb2xsaW5nQ29v cmRpbmF0b3JQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1Njcm9sbGlu Zy9SZW1vdGVTY3JvbGxpbmdDb29yZGluYXRvclByb3h5LmNwcApAQCAtMTYwLDYgKzE2MCwxMiBA QCB2b2lkIFJlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHk6OnNjcm9sbGluZ1RyZWVOb2Rl RGlkU2Nyb2xsKFdlYkNvcmU6OlNjcm9sbAogICAgIG1fd2ViUGFnZVByb3h5LnNlbmQoTWVzc2Fn ZXM6OlJlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yOjpTY3JvbGxQb3NpdGlvbkNoYW5nZWRGb3JO b2RlKHNjcm9sbGVkTm9kZUlELCBuZXdTY3JvbGxQb3NpdGlvbikpOwogfQogCit2b2lkIFJlbW90 ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHk6OnNjcm9sbGluZ1RyZWVOb2RlUmVxdWVzdHNTY3Jv bGwoU2Nyb2xsaW5nTm9kZUlEIHNjcm9sbGVkTm9kZUlELCBjb25zdCBGbG9hdFBvaW50JiBzY3Jv bGxQb3NpdGlvbiwgYm9vbCByZXByZXNlbnRzUHJvZ3JhbW1hdGljU2Nyb2xsKQoreworICAgIGlm IChzY3JvbGxlZE5vZGVJRCA9PSByb290U2Nyb2xsaW5nTm9kZUlEKCkpCisgICAgICAgIG1fd2Vi UGFnZVByb3h5LnJlcXVlc3RTY3JvbGwoc2Nyb2xsUG9zaXRpb24sIHJlcHJlc2VudHNQcm9ncmFt bWF0aWNTY3JvbGwpOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKIAogI2VuZGlmIC8vIEVO QUJMRShBU1lOQ19TQ1JPTExJTkcpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvU2Nyb2xsaW5nL1JlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHkuaCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9TY3JvbGxpbmcvUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3JQcm94 eS5oCmluZGV4IDE2YzhkNDg3ZDc3MGE4YjVlYzkxMTRkZWZiYjVjZmI2MGNlMWM2YjIuLmI3M2Fh ZjFlNGUyMThlNzNkYzBjZGMxYjQzZmQ1YTUyOGU1Mjg5ODggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9TY3JvbGxpbmcvUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3JQcm94 eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TY3JvbGxpbmcvUmVtb3RlU2Nyb2xs aW5nQ29vcmRpbmF0b3JQcm94eS5oCkBAIC01Myw2ICs1Myw3IEBAIHB1YmxpYzoKICAgICAKICAg ICAvLyBJbmZvcm0gdGhlIHdlYiBwcm9jZXNzIHRoYXQgdGhlIHNjcm9sbCBwb3NpdGlvbiBjaGFu Z2VkIChjYWxsZWQgZnJvbSB0aGUgc2Nyb2xsaW5nIHRyZWUpCiAgICAgdm9pZCBzY3JvbGxpbmdU cmVlTm9kZURpZFNjcm9sbChXZWJDb3JlOjpTY3JvbGxpbmdOb2RlSUQsIGNvbnN0IFdlYkNvcmU6 OkZsb2F0UG9pbnQmIG5ld1Njcm9sbFBvc2l0aW9uKTsKKyAgICB2b2lkIHNjcm9sbGluZ1RyZWVO b2RlUmVxdWVzdHNTY3JvbGwoV2ViQ29yZTo6U2Nyb2xsaW5nTm9kZUlELCBjb25zdCBXZWJDb3Jl OjpGbG9hdFBvaW50JiBzY3JvbGxQb3NpdGlvbiwgYm9vbCByZXByZXNlbnRzUHJvZ3JhbW1hdGlj U2Nyb2xsKTsKIAogICAgIGJvb2wgaXNQb2ludEluTm9uRmFzdFNjcm9sbGFibGVSZWdpb24oY29u c3QgV2ViQ29yZTo6SW50UG9pbnQmKSBjb25zdDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1Njcm9sbGluZy9SZW1vdGVTY3JvbGxpbmdUcmVlLmNwcCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9TY3JvbGxpbmcvUmVtb3RlU2Nyb2xsaW5nVHJlZS5jcHAKaW5kZXgg ZjhjOTVjYjZkYTg1ZmI3ZmNmNzk5NzdhZDg3NTRiMDYxMDcyM2UyMy4uZmIwZGYzNzJjNjNkMjM1 NTI0MzRmZjlhZWQ2ZDMwOTI1ZGRmMWVjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1Njcm9sbGluZy9SZW1vdGVTY3JvbGxpbmdUcmVlLmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvU2Nyb2xsaW5nL1JlbW90ZVNjcm9sbGluZ1RyZWUuY3BwCkBAIC04Miw2 ICs4MiwxMSBAQCB2b2lkIFJlbW90ZVNjcm9sbGluZ1RyZWU6OnNjcm9sbGluZ1RyZWVOb2RlRGlk U2Nyb2xsKFNjcm9sbGluZ05vZGVJRCBub2RlSUQsIGNvbgogICAgIG1fc2Nyb2xsaW5nQ29vcmRp bmF0b3JQcm94eS5zY3JvbGxpbmdUcmVlTm9kZURpZFNjcm9sbChub2RlSUQsIHNjcm9sbFBvc2l0 aW9uKTsKIH0KIAordm9pZCBSZW1vdGVTY3JvbGxpbmdUcmVlOjpzY3JvbGxpbmdUcmVlTm9kZVJl cXVlc3RzU2Nyb2xsKFNjcm9sbGluZ05vZGVJRCBub2RlSUQsIGNvbnN0IEZsb2F0UG9pbnQmIHNj cm9sbFBvc2l0aW9uLCBib29sIHJlcHJlc2VudHNQcm9ncmFtbWF0aWNTY3JvbGwpCit7CisgICAg bV9zY3JvbGxpbmdDb29yZGluYXRvclByb3h5LnNjcm9sbGluZ1RyZWVOb2RlUmVxdWVzdHNTY3Jv bGwobm9kZUlELCBzY3JvbGxQb3NpdGlvbiwgcmVwcmVzZW50c1Byb2dyYW1tYXRpY1Njcm9sbCk7 Cit9CisKIFBhc3NPd25QdHI8U2Nyb2xsaW5nVHJlZU5vZGU+IFJlbW90ZVNjcm9sbGluZ1RyZWU6 OmNyZWF0ZU5vZGUoU2Nyb2xsaW5nTm9kZVR5cGUgbm9kZVR5cGUsIFNjcm9sbGluZ05vZGVJRCBu b2RlSUQpCiB7CiAgICAgc3dpdGNoIChub2RlVHlwZSkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1Njcm9sbGluZy9SZW1vdGVTY3JvbGxpbmdUcmVlLmggYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvU2Nyb2xsaW5nL1JlbW90ZVNjcm9sbGluZ1RyZWUuaAppbmRleCA1 MWYwYWRmNGFmMTM1Y2M2NGM2NmYwY2U3ODU1ZTU1MjVkMGFkNzI4Li5iY2Q3NTFkM2E4Zjc4MzUz NThhMDI4ODE5MGUzODBlYTljNWE1MWEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvU2Nyb2xsaW5nL1JlbW90ZVNjcm9sbGluZ1RyZWUuaAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvU2Nyb2xsaW5nL1JlbW90ZVNjcm9sbGluZ1RyZWUuaApAQCAtNDcsNiArNDcs NyBAQCBwdWJsaWM6CiAgICAgY29uc3QgUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3JQcm94eSYg c2Nyb2xsaW5nQ29vcmRpbmF0b3JQcm94eSgpIGNvbnN0IHsgcmV0dXJuIG1fc2Nyb2xsaW5nQ29v cmRpbmF0b3JQcm94eTsgfQogCiAgICAgdmlydHVhbCB2b2lkIHNjcm9sbGluZ1RyZWVOb2RlRGlk U2Nyb2xsKFdlYkNvcmU6OlNjcm9sbGluZ05vZGVJRCwgY29uc3QgV2ViQ29yZTo6RmxvYXRQb2lu dCYgc2Nyb2xsUG9zaXRpb24sIFdlYkNvcmU6OlNldE9yU3luY1Njcm9sbGluZ0xheWVyUG9zaXRp b24gPSBXZWJDb3JlOjpTeW5jU2Nyb2xsaW5nTGF5ZXJQb3NpdGlvbikgb3ZlcnJpZGU7CisgICAg dmlydHVhbCB2b2lkIHNjcm9sbGluZ1RyZWVOb2RlUmVxdWVzdHNTY3JvbGwoV2ViQ29yZTo6U2Ny b2xsaW5nTm9kZUlELCBjb25zdCBXZWJDb3JlOjpGbG9hdFBvaW50JiBzY3JvbGxQb3NpdGlvbiwg Ym9vbCByZXByZXNlbnRzUHJvZ3JhbW1hdGljU2Nyb2xsKSBvdmVycmlkZTsKIAogcHJpdmF0ZToK ICAgICBleHBsaWNpdCBSZW1vdGVTY3JvbGxpbmdUcmVlKFJlbW90ZVNjcm9sbGluZ0Nvb3JkaW5h dG9yUHJveHkmKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5k ZXggNzM0MDk1YjllZDQ1ZWUzN2EyMDI2OTljYzJjY2M3ODNkZDBkYjI1OC4uOTg3MWVlZjJlYTYy ZDg5NjIzNDYzMTIyNWNhZDdjMDk5YzIyMjI2MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5jcHAKQEAgLTEwMDYsNiArMTAwNiwxMSBAQCB2b2lkIFdlYlBhZ2VQcm94 eTo6c2Nyb2xsVmlldyhjb25zdCBJbnRSZWN0JiBzY3JvbGxSZWN0LCBjb25zdCBJbnRTaXplJiBz Y3JvbGxPZgogICAgIG1fcGFnZUNsaWVudC5zY3JvbGxWaWV3KHNjcm9sbFJlY3QsIHNjcm9sbE9m ZnNldCk7CiB9CiAKK3ZvaWQgV2ViUGFnZVByb3h5OjpyZXF1ZXN0U2Nyb2xsKGNvbnN0IEZsb2F0 UG9pbnQmIHNjcm9sbFBvc2l0aW9uLCBib29sIGlzUHJvZ3JhbW1hdGljU2Nyb2xsKQoreworICAg IG1fcGFnZUNsaWVudC5yZXF1ZXN0U2Nyb2xsKHNjcm9sbFBvc2l0aW9uLCBpc1Byb2dyYW1tYXRp Y1Njcm9sbCk7Cit9CisKIHZvaWQgV2ViUGFnZVByb3h5Ojp1cGRhdGVWaWV3U3RhdGUoVmlld1N0 YXRlOjpGbGFncyBmbGFnc1RvVXBkYXRlKQogewogICAgIG1fdmlld1N0YXRlICY9IH5mbGFnc1Rv VXBkYXRlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCmluZGV4IGRmM2I1 ZTA4MDU0M2ZjMTJkYzZhOWY3YTZmOTRkZGEzMDIxOTg5N2MuLjRmMjhhYjYyZDEyYWM2YmQ5ZDAy YzUwYmY0NzI3ODkwZWNmZTM3ODQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJQYWdlUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVBy b3h5LmgKQEAgLTU0NSw3ICs1NDUsOCBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRWaWV3TmVlZHNE aXNwbGF5KGNvbnN0IFdlYkNvcmU6OkludFJlY3QmKTsKICAgICB2b2lkIGRpc3BsYXlWaWV3KCk7 CiAgICAgYm9vbCBjYW5TY3JvbGxWaWV3KCk7Ci0gICAgdm9pZCBzY3JvbGxWaWV3KGNvbnN0IFdl YkNvcmU6OkludFJlY3QmIHNjcm9sbFJlY3QsIGNvbnN0IFdlYkNvcmU6OkludFNpemUmIHNjcm9s bE9mZnNldCk7CisgICAgdm9pZCBzY3JvbGxWaWV3KGNvbnN0IFdlYkNvcmU6OkludFJlY3QmIHNj cm9sbFJlY3QsIGNvbnN0IFdlYkNvcmU6OkludFNpemUmIHNjcm9sbE9mZnNldCk7IC8vIEZJWE1F OiBDb29yZGluYXRlZEdyYXBoaWNzIHNob3VsZCB1c2UgcmVxdWVzdFNjcm9sbCgpLgorICAgIHZv aWQgcmVxdWVzdFNjcm9sbChjb25zdCBXZWJDb3JlOjpGbG9hdFBvaW50JiBzY3JvbGxQb3NpdGlv biwgYm9vbCBpc1Byb2dyYW1tYXRpY1Njcm9sbCk7CiAgICAgCiAgICAgdm9pZCBzZXREZWxlZ2F0 ZXNTY3JvbGxpbmcoYm9vbCBkZWxlZ2F0ZXNTY3JvbGxpbmcpIHsgbV9kZWxlZ2F0ZXNTY3JvbGxp bmcgPSBkZWxlZ2F0ZXNTY3JvbGxpbmc7IH0KICAgICBib29sIGRlbGVnYXRlc1Njcm9sbGluZygp IGNvbnN0IHsgcmV0dXJuIG1fZGVsZWdhdGVzU2Nyb2xsaW5nOyB9CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1BhZ2VDbGllbnRJbXBsSU9TLmggYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvaW9zL1BhZ2VDbGllbnRJbXBsSU9TLmgKaW5kZXggMDAyZmRkOTNmMWIy MGJkYzM1ZmZmMmRmZWVlYjMwOGQ3ZGYwYTc3YS4uY2U3OGVlODFiMzYyZmExMzg2OTQ4OWFjMmE2 ODNiNWQ0M2UyOTU5OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9Q YWdlQ2xpZW50SW1wbElPUy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvUGFn ZUNsaWVudEltcGxJT1MuaApAQCAtNTMsNiArNTMsNyBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwg dm9pZCBkaXNwbGF5VmlldygpIG92ZXJyaWRlOwogICAgIHZpcnR1YWwgYm9vbCBjYW5TY3JvbGxW aWV3KCkgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCB2b2lkIHNjcm9sbFZpZXcoY29uc3QgV2ViQ29y ZTo6SW50UmVjdCYgc2Nyb2xsUmVjdCwgY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYgc2Nyb2xsT2Zm c2V0KSBvdmVycmlkZTsKKyAgICB2aXJ0dWFsIHZvaWQgcmVxdWVzdFNjcm9sbChjb25zdCBXZWJD b3JlOjpGbG9hdFBvaW50JiBzY3JvbGxQb3NpdGlvbiwgYm9vbCBpc1Byb2dyYW1tYXRpY1Njcm9s bCkgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCBXZWJDb3JlOjpJbnRTaXplIHZpZXdTaXplKCkgb3Zl cnJpZGU7CiAgICAgdmlydHVhbCBib29sIGlzVmlld1dpbmRvd0FjdGl2ZSgpIG92ZXJyaWRlOwog ICAgIHZpcnR1YWwgYm9vbCBpc1ZpZXdGb2N1c2VkKCkgb3ZlcnJpZGU7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1BhZ2VDbGllbnRJbXBsSU9TLm1tIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL2lvcy9QYWdlQ2xpZW50SW1wbElPUy5tbQppbmRleCA1ZjdjZmIy OTc0OGY2NTQxOTI4MzRjM2E4MDljY2Y4Y2NhMDMzYjA5Li4yYTNmODY3OTViNmNmOTk1MDQ0YjZh OTMzMDY3OTg4OTgzODJjZTQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv aW9zL1BhZ2VDbGllbnRJbXBsSU9TLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9p b3MvUGFnZUNsaWVudEltcGxJT1MubW0KQEAgLTgyLDE1ICs4MiwyMSBAQCB2b2lkIFBhZ2VDbGll bnRJbXBsOjpkaXNwbGF5VmlldygpCiAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiB9CiAKK2Jv b2wgUGFnZUNsaWVudEltcGw6OmNhblNjcm9sbFZpZXcoKQoreworICAgIG5vdEltcGxlbWVudGVk KCk7CisgICAgcmV0dXJuIGZhbHNlOworfQorCiB2b2lkIFBhZ2VDbGllbnRJbXBsOjpzY3JvbGxW aWV3KGNvbnN0IEludFJlY3QmLCBjb25zdCBJbnRTaXplJikKIHsKICAgICBBU1NFUlRfTk9UX1JF QUNIRUQoKTsKIH0KIAotYm9vbCBQYWdlQ2xpZW50SW1wbDo6Y2FuU2Nyb2xsVmlldygpCit2b2lk IFBhZ2VDbGllbnRJbXBsOjpyZXF1ZXN0U2Nyb2xsKGNvbnN0IEZsb2F0UG9pbnQmIHNjcm9sbFBv c2l0aW9uLCBib29sIGlzUHJvZ3JhbW1hdGljU2Nyb2xsKQogewotICAgIG5vdEltcGxlbWVudGVk KCk7Ci0gICAgcmV0dXJuIGZhbHNlOworICAgIFVOVVNFRF9QQVJBTShpc1Byb2dyYW1tYXRpY1Nj cm9sbCk7CisgICAgW21fd2ViVmlldyBfc2Nyb2xsVG9Db250ZW50T2Zmc2V0OnNjcm9sbFBvc2l0 aW9uXTsKIH0KIAogSW50U2l6ZSBQYWdlQ2xpZW50SW1wbDo6dmlld1NpemUoKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9QYWdlQ2xpZW50SW1wbC5tbSBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvUGFnZUNsaWVudEltcGwubW0KaW5kZXggMTliNjM4YTZh N2EzMzNjZjI2N2NkZjVkNzEwMjczZWUxYzNkZmQ4Mi4uNmI3YjFjMGVlOWVkNGQ1YjllYTdhODU4 M2FhY2YwYzFjNjI4OGZkMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21h Yy9QYWdlQ2xpZW50SW1wbC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1Bh Z2VDbGllbnRJbXBsLm1tCkBAIC0xNzAsNiArMTcwLDExIEBAIHZvaWQgUGFnZUNsaWVudEltcGw6 OnNjcm9sbFZpZXcoY29uc3QgSW50UmVjdCYgc2Nyb2xsUmVjdCwgY29uc3QgSW50U2l6ZSYgc2Ny b2xsCiAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiB9CiAKK3ZvaWQgUGFnZUNsaWVudEltcGw6 OnJlcXVlc3RTY3JvbGwoY29uc3QgRmxvYXRQb2ludCYgc2Nyb2xsUG9zaXRpb24sIGJvb2wgaXNQ cm9ncmFtbWF0aWNTY3JvbGwpCit7CisgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Cit9CisKIElu dFNpemUgUGFnZUNsaWVudEltcGw6OnZpZXdTaXplKCkKIHsKICAgICByZXR1cm4gSW50U2l6ZShb bV93a1ZpZXcgYm91bmRzXS5zaXplKTsK