114514 2013-04-12 08:50:42 -0700 Widget should not depend on AXObjectCache 2013-04-21 03:06:30 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 21354 1 cgarcia webkit-unassigned andersca buildbot cfleizach commit-queue esprehn+autocc mifenton rniwa sam simon.fraser tkent oldest_to_newest 874767 0 cgarcia 2013-04-12 08:50:42 -0700 It's a layering violation that Widget depends on AXObjectCache. 874771 1 197855 cgarcia 2013-04-12 08:57:42 -0700 Created attachment 197855 Patch I'm not sure the patch is correct, because previously the scrollbars were removed from the cache on destruction, but I think scrollbars were leaked because the AXObject cache holds a reference, and they were only removed by the cache from the destructor. 874784 2 197855 buildbot 2013-04-12 09:14:26 -0700 Comment on attachment 197855 Patch Attachment 197855 did not pass mac-wk2-ews (mac-wk2): Output: http://webkit-queues.appspot.com/results/76144 874789 3 cgarcia 2013-04-12 09:19:57 -0700 (In reply to comment #2) > (From update of attachment 197855 [details]) > Attachment 197855 [details] did not pass mac-wk2-ews (mac-wk2): > Output: http://webkit-queues.appspot.com/results/76144 Right, maybe we don't even need didAddScrollbar helper function. I'll fix it. 874792 4 197859 cgarcia 2013-04-12 09:27:34 -0700 Created attachment 197859 Updated patch to fix the mac build 875291 5 197859 cfleizach 2013-04-13 23:33:54 -0700 Comment on attachment 197859 Updated patch to fix the mac build View in context: https://bugs.webkit.org/attachment.cgi?id=197859&action=review > Source/WebCore/page/FrameView.h:488 > + virtual void didAddVerticalScrollbar(Scrollbar*) OVERRIDE; Seems like we could make do with just two methods, something like... enum { VERTICAL, HORIZONTAL} ScrollbarType; virtual void addScrollbar(Scrollbar*, ScrollbarType) virtual void removeScrollbar(Scrollbar*, ScrollbarType) 875890 6 198133 cgarcia 2013-04-15 10:30:48 -0700 Created attachment 198133 Updated patch according to chris suggestion 875910 7 198133 buildbot 2013-04-15 11:07:02 -0700 Comment on attachment 198133 Updated patch according to chris suggestion Attachment 198133 did not pass mac-wk2-ews (mac-wk2): Output: http://webkit-queues.appspot.com/results/119167 875915 8 198133 buildbot 2013-04-15 11:17:35 -0700 Comment on attachment 198133 Updated patch according to chris suggestion Attachment 198133 did not pass mac-ews (mac): Output: http://webkit-queues.appspot.com/results/161165 875916 9 198138 cgarcia 2013-04-15 11:19:55 -0700 Created attachment 198138 Try to fix mac build 875931 10 198138 buildbot 2013-04-15 11:57:49 -0700 Comment on attachment 198138 Try to fix mac build Attachment 198138 did not pass mac-wk2-ews (mac-wk2): Output: http://webkit-queues.appspot.com/results/161173 875934 11 198138 buildbot 2013-04-15 12:07:24 -0700 Comment on attachment 198138 Try to fix mac build Attachment 198138 did not pass mac-ews (mac): Output: http://webkit-queues.appspot.com/results/119177 875935 12 198138 cgarcia 2013-04-15 12:12:37 -0700 Comment on attachment 198138 Try to fix mac build This is the wrong fix, I didn't noticed that what I changed is ScrollAnimator in mac, which api hasn't changed. The problem is with the exported symbols. so, the previous patch is good, just need to update the symbols. I don't know how the exported symbols files work in mac, so I'll need some help with this. 876587 13 198340 cgarcia 2013-04-16 10:01:33 -0700 Created attachment 198340 Another try to fix the mac build Updated the symbols in WebCore.exp.in 876611 14 198340 buildbot 2013-04-16 10:48:08 -0700 Comment on attachment 198340 Another try to fix the mac build Attachment 198340 did not pass mac-wk2-ews (mac-wk2): Output: http://webkit-queues.appspot.com/results/171067 876616 15 198340 buildbot 2013-04-16 10:56:44 -0700 Comment on attachment 198340 Another try to fix the mac build Attachment 198340 did not pass mac-ews (mac): Output: http://webkit-queues.appspot.com/results/25138 876625 16 198347 cgarcia 2013-04-16 11:18:02 -0700 Created attachment 198347 Try to fix WebKit2 build Forgot to git grep in WebKit2, fix a couple of cases where the old api was used. 878761 17 cgarcia 2013-04-20 05:55:57 -0700 All green now, could someone review this, please? 878844 18 cgarcia 2013-04-21 03:06:30 -0700 Committed r148823: <http://trac.webkit.org/changeset/148823> 197855 2013-04-12 08:57:42 -0700 2013-04-12 09:27:34 -0700 Patch wkcore-axobjectcache-violation.diff text/plain 8308 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAzZjQzODY1Li44NDY1ODdmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDAg QEAKKzIwMTMtMDQtMTIgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFdpZGdldCBzaG91bGQgbm90IGRlcGVuZCBvbiBBWE9iamVjdENhY2hlCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTQ1MTQKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3ZlIEFYT2Jq ZWN0Q2FjaGUgdXNhZ2UgZnJvbSBwbGF0Zm9ybSBmaWxlcyB0byBGcmFtZVZpZXcuCisKKyAgICAg ICAgKiBwYWdlL0ZyYW1lVmlldy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OmRp ZEFkZFNjcm9sbGJhcik6IEhlbHBlciBwcml2YXRlIGZ1bmN0aW9uIHRvCisgICAgICAgIGhhbmRs ZSBzY3JvbGxiYXIgdXBkYXRlcyBpbiBBWE9iamVjdENhY2hlLgorICAgICAgICAoV2ViQ29yZTo6 RnJhbWVWaWV3Ojp3aWxsUmVtb3ZlU2Nyb2xsYmFyKTogSGVscGVyIHByaXZhdGUgZnVuY3Rpb24K KyAgICAgICAgdG8gaGFuZGxlIHNjcm9sbGJhciB1cGRhdGVzIGluIEFYT2JqZWN0Q2FjaGUgYW5k IHJlbW92ZSB0aGUKKyAgICAgICAgc2Nyb2xsYmFyIGZyb20gdGhlIGNhY2hlLgorICAgICAgICAo V2ViQ29yZTo6RnJhbWVWaWV3OjpkaWRBZGRWZXJ0aWNhbFNjcm9sbGJhcik6IENhbGwKKyAgICAg ICAgZGlkQWRkU2Nyb2xsYmFyKCkgZm9yIHRoZSBnaXZlbiBzY3JvbGxiYXIuCisgICAgICAgIChX ZWJDb3JlOjpGcmFtZVZpZXc6OndpbGxSZW1vdmVWZXJ0aWNhbFNjcm9sbGJhcik6IENhbGwKKyAg ICAgICAgd2lsbFJlbW92ZVNjcm9sbGJhcigpIGZvciB0aGUgZ2l2ZW4gc2Nyb2xsYmFyLgorICAg ICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3OjpkaWRBZGRIb3Jpem9udGFsU2Nyb2xsYmFyKTogQ2Fs bAorICAgICAgICBkaWRBZGRTY3JvbGxiYXIoKSBmb3IgdGhlIGdpdmVuIHNjcm9sbGJhci4KKyAg ICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6d2lsbFJlbW92ZUhvcml6b250YWxTY3JvbGxiYXIp OiBDYWxsCisgICAgICAgIHdpbGxSZW1vdmVTY3JvbGxiYXIoKSBmb3IgdGhlIGdpdmVuIHNjcm9s bGJhci4KKyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5oOgorICAgICAgICAqIHBsYXRmb3JtL1Nj cm9sbFZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsVmlldzo6c2V0SGFzSG9yaXpv bnRhbFNjcm9sbGJhcik6IFJlbW92ZQorICAgICAgICBBWE9iamVjdENhY2hlIHVzYWdlLgorICAg ICAgICAoV2ViQ29yZTo6U2Nyb2xsVmlldzo6c2V0SGFzVmVydGljYWxTY3JvbGxiYXIpOiBEaXR0 by4KKyAgICAgICAgKiBwbGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5oOgorICAgICAgICAoU2Nyb2xs YWJsZUFyZWEpOiBNYWtlIGRpZEFkZFZlcnRpY2FsU2Nyb2xsYmFyIGFuZAorICAgICAgICB3aWxs UmVtb3ZlVmVydGljYWxTY3JvbGxiYXIgdmlydHVhbC4KKyAgICAgICAgKiBwbGF0Zm9ybS9TY3Jv bGxiYXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsYmFyOjp+U2Nyb2xsYmFyKTogUmVt b3ZlIEFYT2JqZWN0Q2FjaGUgdXNhZ2UuCisgICAgICAgICogcGxhdGZvcm0vU2Nyb2xsYmFyLmg6 CisgICAgICAgICogcGxhdGZvcm0vV2lkZ2V0Lmg6CisgICAgICAgIChXaWRnZXQpOiBSZW1vdmUg YXhPYmplY3RDYWNoZSgpIG1ldGhvZC4KKwogMjAxMy0wNC0xMSAgQWxleGV5IFByb3NrdXJ5YWtv diAgPGFwQGFwcGxlLmNvbT4KIAogICAgICAgICBNb3ZlIENhY2hlZFJhd1Jlc291cmNlQ2xpZW50 IGludG8gYSBzZXBhcmF0ZSBmaWxlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0Zy YW1lVmlldy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKaW5kZXggM2Nk MGQ2NS4uYTg1OWJhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcApAQCAtNDEwMiw0ICs0 MTAyLDQyIEBAIHZvaWQgRnJhbWVWaWV3OjpzZXRTY3JvbGxpbmdQZXJmb3JtYW5jZUxvZ2dpbmdF bmFibGVkKGJvb2wgZmxhZykKICNlbmRpZgogfQogCit2b2lkIEZyYW1lVmlldzo6ZGlkQWRkU2Ny b2xsYmFyKFNjcm9sbGJhciogc2Nyb2xsYmFyKQoreworICAgIGlmIChBWE9iamVjdENhY2hlKiBj YWNoZSA9IGF4T2JqZWN0Q2FjaGUoKSkKKyAgICAgICAgY2FjaGUtPmhhbmRsZVNjcm9sbGJhclVw ZGF0ZSh0aGlzKTsKK30KKwordm9pZCBGcmFtZVZpZXc6OndpbGxSZW1vdmVTY3JvbGxiYXIoU2Ny b2xsYmFyKiBzY3JvbGxiYXIpCit7CisgICAgaWYgKEFYT2JqZWN0Q2FjaGUqIGNhY2hlID0gYXhP YmplY3RDYWNoZSgpKSB7CisgICAgICAgIGNhY2hlLT5yZW1vdmUoc2Nyb2xsYmFyKTsKKyAgICAg ICAgY2FjaGUtPmhhbmRsZVNjcm9sbGJhclVwZGF0ZSh0aGlzKTsKKyAgICB9Cit9CisKK3ZvaWQg RnJhbWVWaWV3OjpkaWRBZGRWZXJ0aWNhbFNjcm9sbGJhcihTY3JvbGxiYXIqIHNjcm9sbGJhcikK K3sKKyAgICBTY3JvbGxhYmxlQXJlYTo6ZGlkQWRkVmVydGljYWxTY3JvbGxiYXIoc2Nyb2xsYmFy KTsKKyAgICBkaWRBZGRTY3JvbGxiYXIoc2Nyb2xsYmFyKTsKK30KKwordm9pZCBGcmFtZVZpZXc6 OndpbGxSZW1vdmVWZXJ0aWNhbFNjcm9sbGJhcihTY3JvbGxiYXIqIHNjcm9sbGJhcikKK3sKKyAg ICBTY3JvbGxhYmxlQXJlYTo6d2lsbFJlbW92ZVZlcnRpY2FsU2Nyb2xsYmFyKHNjcm9sbGJhcik7 CisgICAgd2lsbFJlbW92ZVNjcm9sbGJhcihzY3JvbGxiYXIpOworfQorCit2b2lkIEZyYW1lVmll dzo6ZGlkQWRkSG9yaXpvbnRhbFNjcm9sbGJhcihTY3JvbGxiYXIqIHNjcm9sbGJhcikKK3sKKyAg ICBTY3JvbGxhYmxlQXJlYTo6ZGlkQWRkSG9yaXpvbnRhbFNjcm9sbGJhcihzY3JvbGxiYXIpOwor ICAgIGRpZEFkZFNjcm9sbGJhcihzY3JvbGxiYXIpOworfQorCit2b2lkIEZyYW1lVmlldzo6d2ls bFJlbW92ZUhvcml6b250YWxTY3JvbGxiYXIoU2Nyb2xsYmFyKiBzY3JvbGxiYXIpCit7CisgICAg U2Nyb2xsYWJsZUFyZWE6OndpbGxSZW1vdmVIb3Jpem9udGFsU2Nyb2xsYmFyKHNjcm9sbGJhcik7 CisgICAgd2lsbFJlbW92ZVNjcm9sbGJhcihzY3JvbGxiYXIpOworfQorCiB9IC8vIG5hbWVzcGFj ZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oIGIv U291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaAppbmRleCBlZDhhZjQyLi4wNWYwNWNmIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgKQEAgLTQ4NCw2ICs0ODQsMTIgQEAgcHJpdmF0ZToKICNl bmRpZgogI2VuZGlmCiAKKyAgICAvLyBPdmVycmlkZSBzY3JvbGxiYXIgbm90aWZpY2F0aW9ucyB0 byB1cGRhdGUgdGhlIEFYT2JqZWN0IGNhY2hlLgorICAgIHZpcnR1YWwgdm9pZCBkaWRBZGRWZXJ0 aWNhbFNjcm9sbGJhcihTY3JvbGxiYXIqKSBPVkVSUklERTsKKyAgICB2aXJ0dWFsIHZvaWQgd2ls bFJlbW92ZVZlcnRpY2FsU2Nyb2xsYmFyKFNjcm9sbGJhciopIE9WRVJSSURFOworICAgIHZpcnR1 YWwgdm9pZCBkaWRBZGRIb3Jpem9udGFsU2Nyb2xsYmFyKFNjcm9sbGJhciopIE9WRVJSSURFOwor ICAgIHZpcnR1YWwgdm9pZCB3aWxsUmVtb3ZlSG9yaXpvbnRhbFNjcm9sbGJhcihTY3JvbGxiYXIq KSBPVkVSUklERTsKKwogICAgIHZvaWQgc2NoZWR1bGVSZXNpemVFdmVudCgpOwogICAgIHZvaWQg c2VuZFJlc2l6ZUV2ZW50KCk7CiAgICAgdm9pZCBkZWxheWVkUmVzaXplRXZlbnRUaW1lckZpcmVk KFRpbWVyPEZyYW1lVmlldz4qKTsKQEAgLTUxNCw2ICs1MjAsOSBAQCBwcml2YXRlOgogICAgIHZp cnR1YWwgQVhPYmplY3RDYWNoZSogYXhPYmplY3RDYWNoZSgpIGNvbnN0OwogICAgIHZvaWQgbm90 aWZ5V2lkZ2V0c0luQWxsRnJhbWVzKFdpZGdldE5vdGlmaWNhdGlvbik7CiAgICAgdm9pZCByZW1v dmVGcm9tQVhPYmplY3RDYWNoZSgpOworCisgICAgdm9pZCBkaWRBZGRTY3JvbGxiYXIoU2Nyb2xs YmFyKik7CisgICAgdm9pZCB3aWxsUmVtb3ZlU2Nyb2xsYmFyKFNjcm9sbGJhciopOwogICAgIAog ICAgIHN0YXRpYyBkb3VibGUgc0N1cnJlbnRQYWludFRpbWVTdGFtcDsgLy8gdXNlZCBmb3IgZGV0 ZWN0aW5nIGRlY29kZWQgcmVzb3VyY2UgdGhyYXNoIGluIHRoZSBjYWNoZQogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL1Njcm9sbFZpZXcuY3BwCmluZGV4IGZkOGM3ODIuLmI4MDBjMDAgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuY3BwCkBAIC0yNiw3ICsyNiw2IEBACiAjaW5jbHVk ZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiU2Nyb2xsVmlldy5oIgogCi0jaW5jbHVkZSAiQVhPYmpl Y3RDYWNoZS5oIgogI2luY2x1ZGUgIkdyYXBoaWNzQ29udGV4dC5oIgogI2luY2x1ZGUgIkdyYXBo aWNzTGF5ZXIuaCIKICNpbmNsdWRlICJIb3N0V2luZG93LmgiCkBAIC05OCw5ICs5Nyw2IEBAIHZv aWQgU2Nyb2xsVmlldzo6c2V0SGFzSG9yaXpvbnRhbFNjcm9sbGJhcihib29sIGhhc0JhcikKICAg ICAgICAgcmVtb3ZlQ2hpbGQobV9ob3Jpem9udGFsU2Nyb2xsYmFyLmdldCgpKTsKICAgICAgICAg bV9ob3Jpem9udGFsU2Nyb2xsYmFyID0gMDsKICAgICB9Ci0gICAgCi0gICAgaWYgKEFYT2JqZWN0 Q2FjaGUqIGNhY2hlID0gYXhPYmplY3RDYWNoZSgpKQotICAgICAgICBjYWNoZS0+aGFuZGxlU2Ny b2xsYmFyVXBkYXRlKHRoaXMpOwogfQogCiB2b2lkIFNjcm9sbFZpZXc6OnNldEhhc1ZlcnRpY2Fs U2Nyb2xsYmFyKGJvb2wgaGFzQmFyKQpAQCAtMTE2LDkgKzExMiw2IEBAIHZvaWQgU2Nyb2xsVmll dzo6c2V0SGFzVmVydGljYWxTY3JvbGxiYXIoYm9vbCBoYXNCYXIpCiAgICAgICAgIHJlbW92ZUNo aWxkKG1fdmVydGljYWxTY3JvbGxiYXIuZ2V0KCkpOwogICAgICAgICBtX3ZlcnRpY2FsU2Nyb2xs YmFyID0gMDsKICAgICB9Ci0gICAgCi0gICAgaWYgKEFYT2JqZWN0Q2FjaGUqIGNhY2hlID0gYXhP YmplY3RDYWNoZSgpKQotICAgICAgICBjYWNoZS0+aGFuZGxlU2Nyb2xsYmFyVXBkYXRlKHRoaXMp OwogfQogCiAjaWYgIVBMQVRGT1JNKEdUSykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL1Njcm9sbGFibGVBcmVhLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxh YmxlQXJlYS5oCmluZGV4IDQzMzRmY2UuLmZiMjczZDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL1Njcm9sbGFibGVBcmVhLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vU2Nyb2xsYWJsZUFyZWEuaApAQCAtODMsOCArODMsOCBAQCBwdWJsaWM6CiAKICAgICB2b2lk IGZpbmlzaEN1cnJlbnRTY3JvbGxBbmltYXRpb25zKCkgY29uc3Q7CiAKLSAgICB2b2lkIGRpZEFk ZFZlcnRpY2FsU2Nyb2xsYmFyKFNjcm9sbGJhciopOwotICAgIHZvaWQgd2lsbFJlbW92ZVZlcnRp Y2FsU2Nyb2xsYmFyKFNjcm9sbGJhciopOworICAgIHZpcnR1YWwgdm9pZCBkaWRBZGRWZXJ0aWNh bFNjcm9sbGJhcihTY3JvbGxiYXIqKTsKKyAgICB2aXJ0dWFsIHZvaWQgd2lsbFJlbW92ZVZlcnRp Y2FsU2Nyb2xsYmFyKFNjcm9sbGJhciopOwogICAgIHZpcnR1YWwgdm9pZCBkaWRBZGRIb3Jpem9u dGFsU2Nyb2xsYmFyKFNjcm9sbGJhciopOwogICAgIHZpcnR1YWwgdm9pZCB3aWxsUmVtb3ZlSG9y aXpvbnRhbFNjcm9sbGJhcihTY3JvbGxiYXIqKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vU2Nyb2xsYmFyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9s bGJhci5jcHAKaW5kZXggZGI5MjU1Mi4uNjY4YzEyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vU2Nyb2xsYmFyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9T Y3JvbGxiYXIuY3BwCkBAIC0zOCw4ICszOCw2IEBACiAjZW5kaWYKIAogLy8gRklYTUU6IFRoZSBm b2xsb3dpbmcgI2luY2x1ZGVzIGFyZSBhIGxheWVyaW5nIHZpb2xhdGlvbiBhbmQgc2hvdWxkIGJl IHJlbW92ZWQuCi0jaW5jbHVkZSAiQVhPYmplY3RDYWNoZS5oIgotI2luY2x1ZGUgIkFjY2Vzc2li aWxpdHlTY3JvbGxiYXIuaCIKICNpbmNsdWRlICJEb2N1bWVudC5oIgogI2luY2x1ZGUgIkV2ZW50 SGFuZGxlci5oIgogI2luY2x1ZGUgIkZyYW1lLmgiCkBAIC0xMTAsOSArMTA4LDYgQEAgU2Nyb2xs YmFyOjpTY3JvbGxiYXIoU2Nyb2xsYWJsZUFyZWEqIHNjcm9sbGFibGVBcmVhLCBTY3JvbGxiYXJP cmllbnRhdGlvbiBvcmllbnQKIAogU2Nyb2xsYmFyOjp+U2Nyb2xsYmFyKCkKIHsKLSAgICBpZiAo QVhPYmplY3RDYWNoZSogY2FjaGUgPSBleGlzdGluZ0FYT2JqZWN0Q2FjaGUoKSkKLSAgICAgICAg Y2FjaGUtPnJlbW92ZSh0aGlzKTsKLSAgICAKICAgICBzdG9wVGltZXJJZk5lZWRlZCgpOwogICAg IAogICAgIG1fdGhlbWUtPnVucmVnaXN0ZXJTY3JvbGxiYXIodGhpcyk7CkBAIC01NjcsMTQgKzU2 Miw2IEBAIGJvb2wgU2Nyb2xsYmFyOjppc1dpbmRvd0FjdGl2ZSgpIGNvbnN0CiAgICAgcmV0dXJu IG1fc2Nyb2xsYWJsZUFyZWEgJiYgbV9zY3JvbGxhYmxlQXJlYS0+aXNBY3RpdmUoKTsKIH0KIAot QVhPYmplY3RDYWNoZSogU2Nyb2xsYmFyOjpleGlzdGluZ0FYT2JqZWN0Q2FjaGUoKSBjb25zdAot ewotICAgIGlmICghcGFyZW50KCkpCi0gICAgICAgIHJldHVybiAwOwotICAgIAotICAgIHJldHVy biBwYXJlbnQoKS0+YXhPYmplY3RDYWNoZSgpOwotfQotCiB2b2lkIFNjcm9sbGJhcjo6aW52YWxp ZGF0ZVJlY3QoY29uc3QgSW50UmVjdCYgcmVjdCkKIHsKICAgICBpZiAoc3VwcHJlc3NJbnZhbGlk YXRpb24oKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGJhci5o IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYmFyLmgKaW5kZXggZDU3NGNjNi4uMDBj NzYxOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYmFyLmgKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYmFyLmgKQEAgLTIwNiw3ICsyMDYsNiBA QCBwcm90ZWN0ZWQ6CiAKIHByaXZhdGU6CiAgICAgdmlydHVhbCBib29sIGlzU2Nyb2xsYmFyKCkg Y29uc3QgeyByZXR1cm4gdHJ1ZTsgfQotICAgIHZpcnR1YWwgQVhPYmplY3RDYWNoZSogZXhpc3Rp bmdBWE9iamVjdENhY2hlKCkgY29uc3Q7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9XaWRnZXQuaCBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL1dpZGdldC5oCmluZGV4IGU3ZjFlNTkuLjFhZGZmODUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1dpZGdldC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL1dpZGdldC5oCkBAIC05Nyw3ICs5Nyw2IEBAIHR5cGVkZWYgUGxhdGZvcm1XaWRnZXQg UGxhdGZvcm1QYWdlQ2xpZW50OwogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLWNsYXNzIEFYT2Jq ZWN0Q2FjaGU7CiBjbGFzcyBDdXJzb3I7CiBjbGFzcyBFdmVudDsKIGNsYXNzIEZvbnQ7CkBAIC0y MzEsOSArMjMwLDYgQEAgcHVibGljOgogICAgIHZpcnR1YWwgSW50UG9pbnQgY29udmVydFRvQ29u dGFpbmluZ1ZpZXcoY29uc3QgSW50UG9pbnQmKSBjb25zdDsKICAgICB2aXJ0dWFsIEludFBvaW50 IGNvbnZlcnRGcm9tQ29udGFpbmluZ1ZpZXcoY29uc3QgSW50UG9pbnQmKSBjb25zdDsKIAotICAg IC8vIEEgbWVhbnMgdG8gYWNjZXNzIHRoZSBBWCBjYWNoZSB3aGVuIHRoaXMgb2JqZWN0IGNhbiBn ZXQgYSBwb2ludGVyIHRvIGl0LgotICAgIHZpcnR1YWwgQVhPYmplY3RDYWNoZSogYXhPYmplY3RD YWNoZSgpIGNvbnN0IHsgcmV0dXJuIDA7IH0KLSAgICAKIHByaXZhdGU6CiAgICAgdm9pZCBpbml0 KFBsYXRmb3JtV2lkZ2V0KTsgLy8gTXVzdCBiZSBjYWxsZWQgYnkgYWxsIFdpZGdldCBjb25zdHJ1 Y3RvcnMgdG8gaW5pdGlhbGl6ZSBjcm9zcy1wbGF0Zm9ybSBkYXRhLgogCg== 197859 2013-04-12 09:27:34 -0700 2013-04-15 10:30:48 -0700 Updated patch to fix the mac build wkcore-axobjectcache-violation2.diff text/plain 8090 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3ZDcwZWMxLi45YjE1NDIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzgg QEAKKzIwMTMtMDQtMTIgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFdpZGdldCBzaG91bGQgbm90IGRlcGVuZCBvbiBBWE9iamVjdENhY2hlCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTQ1MTQKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3ZlIEFYT2Jq ZWN0Q2FjaGUgdXNhZ2UgZnJvbSBwbGF0Zm9ybSBmaWxlcyB0byBGcmFtZVZpZXcuCisKKyAgICAg ICAgKiBwYWdlL0ZyYW1lVmlldy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6Ondp bGxSZW1vdmVTY3JvbGxiYXIpOiBIZWxwZXIgcHJpdmF0ZSBmdW5jdGlvbgorICAgICAgICB0byBo YW5kbGUgc2Nyb2xsYmFyIHVwZGF0ZXMgaW4gQVhPYmplY3RDYWNoZSBhbmQgcmVtb3ZlIHRoZQor ICAgICAgICBzY3JvbGxiYXIgZnJvbSB0aGUgY2FjaGUuCisgICAgICAgIChXZWJDb3JlOjpGcmFt ZVZpZXc6OmRpZEFkZFZlcnRpY2FsU2Nyb2xsYmFyKTogSGFuZGxlIHNjcm9sbGJhcgorICAgICAg ICB1cGRhdGVzIGluIEFYT2JqZWN0Q2FjaGUuCisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6 OndpbGxSZW1vdmVWZXJ0aWNhbFNjcm9sbGJhcik6IENhbGwKKyAgICAgICAgd2lsbFJlbW92ZVNj cm9sbGJhcigpIGZvciB0aGUgZ2l2ZW4gc2Nyb2xsYmFyLgorICAgICAgICAoV2ViQ29yZTo6RnJh bWVWaWV3OjpkaWRBZGRIb3Jpem9udGFsU2Nyb2xsYmFyKTogSGFuZGxlIHNjcm9sbGJhcgorICAg ICAgICB1cGRhdGVzIGluIEFYT2JqZWN0Q2FjaGUuCisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZp ZXc6OndpbGxSZW1vdmVIb3Jpem9udGFsU2Nyb2xsYmFyKTogQ2FsbAorICAgICAgICB3aWxsUmVt b3ZlU2Nyb2xsYmFyKCkgZm9yIHRoZSBnaXZlbiBzY3JvbGxiYXIuCisgICAgICAgICogcGFnZS9G cmFtZVZpZXcuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9TY3JvbGxWaWV3LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlNjcm9sbFZpZXc6OnNldEhhc0hvcml6b250YWxTY3JvbGxiYXIpOiBSZW1vdmUK KyAgICAgICAgQVhPYmplY3RDYWNoZSB1c2FnZS4KKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbFZp ZXc6OnNldEhhc1ZlcnRpY2FsU2Nyb2xsYmFyKTogRGl0dG8uCisgICAgICAgICogcGxhdGZvcm0v U2Nyb2xsYWJsZUFyZWEuaDoKKyAgICAgICAgKFNjcm9sbGFibGVBcmVhKTogTWFrZSBkaWRBZGRW ZXJ0aWNhbFNjcm9sbGJhciBhbmQKKyAgICAgICAgd2lsbFJlbW92ZVZlcnRpY2FsU2Nyb2xsYmFy IHZpcnR1YWwuCisgICAgICAgICogcGxhdGZvcm0vU2Nyb2xsYmFyLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlNjcm9sbGJhcjo6flNjcm9sbGJhcik6IFJlbW92ZSBBWE9iamVjdENhY2hlIHVzYWdl LgorICAgICAgICAqIHBsYXRmb3JtL1Njcm9sbGJhci5oOgorICAgICAgICAqIHBsYXRmb3JtL1dp ZGdldC5oOgorICAgICAgICAoV2lkZ2V0KTogUmVtb3ZlIGF4T2JqZWN0Q2FjaGUoKSBtZXRob2Qu CisKIDIwMTMtMDQtMTIgIEFsYmVydG8gR2FyY2lhICA8YWdhcmNpYUBpZ2FsaWEuY29tPgogCiAg ICAgICAgIFtCbGFja0JlcnJ5XSBVcHN0cmVhbSB0aGUgZmlsZXN5c3RlbSBjb2RlCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w YWdlL0ZyYW1lVmlldy5jcHAKaW5kZXggM2NkMGQ2NS4uYzY4NDc1OCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv RnJhbWVWaWV3LmNwcApAQCAtNDEwMiw0ICs0MTAyLDM4IEBAIHZvaWQgRnJhbWVWaWV3OjpzZXRT Y3JvbGxpbmdQZXJmb3JtYW5jZUxvZ2dpbmdFbmFibGVkKGJvb2wgZmxhZykKICNlbmRpZgogfQog Cit2b2lkIEZyYW1lVmlldzo6d2lsbFJlbW92ZVNjcm9sbGJhcihTY3JvbGxiYXIqIHNjcm9sbGJh cikKK3sKKyAgICBpZiAoQVhPYmplY3RDYWNoZSogY2FjaGUgPSBheE9iamVjdENhY2hlKCkpIHsK KyAgICAgICAgY2FjaGUtPnJlbW92ZShzY3JvbGxiYXIpOworICAgICAgICBjYWNoZS0+aGFuZGxl U2Nyb2xsYmFyVXBkYXRlKHRoaXMpOworICAgIH0KK30KKwordm9pZCBGcmFtZVZpZXc6OmRpZEFk ZFZlcnRpY2FsU2Nyb2xsYmFyKFNjcm9sbGJhciogc2Nyb2xsYmFyKQoreworICAgIFNjcm9sbGFi bGVBcmVhOjpkaWRBZGRWZXJ0aWNhbFNjcm9sbGJhcihzY3JvbGxiYXIpOworICAgIGlmIChBWE9i amVjdENhY2hlKiBjYWNoZSA9IGF4T2JqZWN0Q2FjaGUoKSkKKyAgICAgICAgY2FjaGUtPmhhbmRs ZVNjcm9sbGJhclVwZGF0ZSh0aGlzKTsKK30KKwordm9pZCBGcmFtZVZpZXc6OndpbGxSZW1vdmVW ZXJ0aWNhbFNjcm9sbGJhcihTY3JvbGxiYXIqIHNjcm9sbGJhcikKK3sKKyAgICBTY3JvbGxhYmxl QXJlYTo6d2lsbFJlbW92ZVZlcnRpY2FsU2Nyb2xsYmFyKHNjcm9sbGJhcik7CisgICAgd2lsbFJl bW92ZVNjcm9sbGJhcihzY3JvbGxiYXIpOworfQorCit2b2lkIEZyYW1lVmlldzo6ZGlkQWRkSG9y aXpvbnRhbFNjcm9sbGJhcihTY3JvbGxiYXIqIHNjcm9sbGJhcikKK3sKKyAgICBTY3JvbGxhYmxl QXJlYTo6ZGlkQWRkSG9yaXpvbnRhbFNjcm9sbGJhcihzY3JvbGxiYXIpOworICAgIGlmIChBWE9i amVjdENhY2hlKiBjYWNoZSA9IGF4T2JqZWN0Q2FjaGUoKSkKKyAgICAgICAgY2FjaGUtPmhhbmRs ZVNjcm9sbGJhclVwZGF0ZSh0aGlzKTsKK30KKwordm9pZCBGcmFtZVZpZXc6OndpbGxSZW1vdmVI b3Jpem9udGFsU2Nyb2xsYmFyKFNjcm9sbGJhciogc2Nyb2xsYmFyKQoreworICAgIFNjcm9sbGFi bGVBcmVhOjp3aWxsUmVtb3ZlSG9yaXpvbnRhbFNjcm9sbGJhcihzY3JvbGxiYXIpOworICAgIHdp bGxSZW1vdmVTY3JvbGxiYXIoc2Nyb2xsYmFyKTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29y ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaCBiL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgKaW5kZXggZWQ4YWY0Mi4uNjI3YzNlYyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w YWdlL0ZyYW1lVmlldy5oCkBAIC00ODQsNiArNDg0LDEyIEBAIHByaXZhdGU6CiAjZW5kaWYKICNl bmRpZgogCisgICAgLy8gT3ZlcnJpZGUgc2Nyb2xsYmFyIG5vdGlmaWNhdGlvbnMgdG8gdXBkYXRl IHRoZSBBWE9iamVjdCBjYWNoZS4KKyAgICB2aXJ0dWFsIHZvaWQgZGlkQWRkVmVydGljYWxTY3Jv bGxiYXIoU2Nyb2xsYmFyKikgT1ZFUlJJREU7CisgICAgdmlydHVhbCB2b2lkIHdpbGxSZW1vdmVW ZXJ0aWNhbFNjcm9sbGJhcihTY3JvbGxiYXIqKSBPVkVSUklERTsKKyAgICB2aXJ0dWFsIHZvaWQg ZGlkQWRkSG9yaXpvbnRhbFNjcm9sbGJhcihTY3JvbGxiYXIqKSBPVkVSUklERTsKKyAgICB2aXJ0 dWFsIHZvaWQgd2lsbFJlbW92ZUhvcml6b250YWxTY3JvbGxiYXIoU2Nyb2xsYmFyKikgT1ZFUlJJ REU7CisKICAgICB2b2lkIHNjaGVkdWxlUmVzaXplRXZlbnQoKTsKICAgICB2b2lkIHNlbmRSZXNp emVFdmVudCgpOwogICAgIHZvaWQgZGVsYXllZFJlc2l6ZUV2ZW50VGltZXJGaXJlZChUaW1lcjxG cmFtZVZpZXc+Kik7CkBAIC01MTQsNiArNTIwLDggQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIEFY T2JqZWN0Q2FjaGUqIGF4T2JqZWN0Q2FjaGUoKSBjb25zdDsKICAgICB2b2lkIG5vdGlmeVdpZGdl dHNJbkFsbEZyYW1lcyhXaWRnZXROb3RpZmljYXRpb24pOwogICAgIHZvaWQgcmVtb3ZlRnJvbUFY T2JqZWN0Q2FjaGUoKTsKKworICAgIHZvaWQgd2lsbFJlbW92ZVNjcm9sbGJhcihTY3JvbGxiYXIq KTsKICAgICAKICAgICBzdGF0aWMgZG91YmxlIHNDdXJyZW50UGFpbnRUaW1lU3RhbXA7IC8vIHVz ZWQgZm9yIGRldGVjdGluZyBkZWNvZGVkIHJlc291cmNlIHRocmFzaCBpbiB0aGUgY2FjaGUKIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmNwcAppbmRleCBmZDhjNzgyLi5iODAwYzAw IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmNwcApAQCAtMjYsNyArMjYsNiBA QAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIlNjcm9sbFZpZXcuaCIKIAotI2luY2x1 ZGUgIkFYT2JqZWN0Q2FjaGUuaCIKICNpbmNsdWRlICJHcmFwaGljc0NvbnRleHQuaCIKICNpbmNs dWRlICJHcmFwaGljc0xheWVyLmgiCiAjaW5jbHVkZSAiSG9zdFdpbmRvdy5oIgpAQCAtOTgsOSAr OTcsNiBAQCB2b2lkIFNjcm9sbFZpZXc6OnNldEhhc0hvcml6b250YWxTY3JvbGxiYXIoYm9vbCBo YXNCYXIpCiAgICAgICAgIHJlbW92ZUNoaWxkKG1faG9yaXpvbnRhbFNjcm9sbGJhci5nZXQoKSk7 CiAgICAgICAgIG1faG9yaXpvbnRhbFNjcm9sbGJhciA9IDA7CiAgICAgfQotICAgIAotICAgIGlm IChBWE9iamVjdENhY2hlKiBjYWNoZSA9IGF4T2JqZWN0Q2FjaGUoKSkKLSAgICAgICAgY2FjaGUt PmhhbmRsZVNjcm9sbGJhclVwZGF0ZSh0aGlzKTsKIH0KIAogdm9pZCBTY3JvbGxWaWV3OjpzZXRI YXNWZXJ0aWNhbFNjcm9sbGJhcihib29sIGhhc0JhcikKQEAgLTExNiw5ICsxMTIsNiBAQCB2b2lk IFNjcm9sbFZpZXc6OnNldEhhc1ZlcnRpY2FsU2Nyb2xsYmFyKGJvb2wgaGFzQmFyKQogICAgICAg ICByZW1vdmVDaGlsZChtX3ZlcnRpY2FsU2Nyb2xsYmFyLmdldCgpKTsKICAgICAgICAgbV92ZXJ0 aWNhbFNjcm9sbGJhciA9IDA7CiAgICAgfQotICAgIAotICAgIGlmIChBWE9iamVjdENhY2hlKiBj YWNoZSA9IGF4T2JqZWN0Q2FjaGUoKSkKLSAgICAgICAgY2FjaGUtPmhhbmRsZVNjcm9sbGJhclVw ZGF0ZSh0aGlzKTsKIH0KIAogI2lmICFQTEFURk9STShHVEspCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vU2Nyb2xsYWJsZUFyZWEuaAppbmRleCA0MzM0ZmNlLi5mYjI3M2Q0IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL1Njcm9sbGFibGVBcmVhLmgKQEAgLTgzLDggKzgzLDggQEAgcHVibGljOgog CiAgICAgdm9pZCBmaW5pc2hDdXJyZW50U2Nyb2xsQW5pbWF0aW9ucygpIGNvbnN0OwogCi0gICAg dm9pZCBkaWRBZGRWZXJ0aWNhbFNjcm9sbGJhcihTY3JvbGxiYXIqKTsKLSAgICB2b2lkIHdpbGxS ZW1vdmVWZXJ0aWNhbFNjcm9sbGJhcihTY3JvbGxiYXIqKTsKKyAgICB2aXJ0dWFsIHZvaWQgZGlk QWRkVmVydGljYWxTY3JvbGxiYXIoU2Nyb2xsYmFyKik7CisgICAgdmlydHVhbCB2b2lkIHdpbGxS ZW1vdmVWZXJ0aWNhbFNjcm9sbGJhcihTY3JvbGxiYXIqKTsKICAgICB2aXJ0dWFsIHZvaWQgZGlk QWRkSG9yaXpvbnRhbFNjcm9sbGJhcihTY3JvbGxiYXIqKTsKICAgICB2aXJ0dWFsIHZvaWQgd2ls bFJlbW92ZUhvcml6b250YWxTY3JvbGxiYXIoU2Nyb2xsYmFyKik7CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGJhci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9TY3JvbGxiYXIuY3BwCmluZGV4IGRiOTI1NTIuLjY2OGMxMmEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGJhci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vU2Nyb2xsYmFyLmNwcApAQCAtMzgsOCArMzgsNiBAQAogI2VuZGlmCiAKIC8vIEZJ WE1FOiBUaGUgZm9sbG93aW5nICNpbmNsdWRlcyBhcmUgYSBsYXllcmluZyB2aW9sYXRpb24gYW5k IHNob3VsZCBiZSByZW1vdmVkLgotI2luY2x1ZGUgIkFYT2JqZWN0Q2FjaGUuaCIKLSNpbmNsdWRl ICJBY2Nlc3NpYmlsaXR5U2Nyb2xsYmFyLmgiCiAjaW5jbHVkZSAiRG9jdW1lbnQuaCIKICNpbmNs dWRlICJFdmVudEhhbmRsZXIuaCIKICNpbmNsdWRlICJGcmFtZS5oIgpAQCAtMTEwLDkgKzEwOCw2 IEBAIFNjcm9sbGJhcjo6U2Nyb2xsYmFyKFNjcm9sbGFibGVBcmVhKiBzY3JvbGxhYmxlQXJlYSwg U2Nyb2xsYmFyT3JpZW50YXRpb24gb3JpZW50CiAKIFNjcm9sbGJhcjo6flNjcm9sbGJhcigpCiB7 Ci0gICAgaWYgKEFYT2JqZWN0Q2FjaGUqIGNhY2hlID0gZXhpc3RpbmdBWE9iamVjdENhY2hlKCkp Ci0gICAgICAgIGNhY2hlLT5yZW1vdmUodGhpcyk7Ci0gICAgCiAgICAgc3RvcFRpbWVySWZOZWVk ZWQoKTsKICAgICAKICAgICBtX3RoZW1lLT51bnJlZ2lzdGVyU2Nyb2xsYmFyKHRoaXMpOwpAQCAt NTY3LDE0ICs1NjIsNiBAQCBib29sIFNjcm9sbGJhcjo6aXNXaW5kb3dBY3RpdmUoKSBjb25zdAog ICAgIHJldHVybiBtX3Njcm9sbGFibGVBcmVhICYmIG1fc2Nyb2xsYWJsZUFyZWEtPmlzQWN0aXZl KCk7CiB9CiAKLUFYT2JqZWN0Q2FjaGUqIFNjcm9sbGJhcjo6ZXhpc3RpbmdBWE9iamVjdENhY2hl KCkgY29uc3QKLXsKLSAgICBpZiAoIXBhcmVudCgpKQotICAgICAgICByZXR1cm4gMDsKLSAgICAK LSAgICByZXR1cm4gcGFyZW50KCktPmF4T2JqZWN0Q2FjaGUoKTsKLX0KLQogdm9pZCBTY3JvbGxi YXI6OmludmFsaWRhdGVSZWN0KGNvbnN0IEludFJlY3QmIHJlY3QpCiB7CiAgICAgaWYgKHN1cHBy ZXNzSW52YWxpZGF0aW9uKCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9T Y3JvbGxiYXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGJhci5oCmluZGV4IGQ1 NzRjYzYuLjAwYzc2MTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9s bGJhci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGJhci5oCkBAIC0yMDYs NyArMjA2LDYgQEAgcHJvdGVjdGVkOgogCiBwcml2YXRlOgogICAgIHZpcnR1YWwgYm9vbCBpc1Nj cm9sbGJhcigpIGNvbnN0IHsgcmV0dXJuIHRydWU7IH0KLSAgICB2aXJ0dWFsIEFYT2JqZWN0Q2Fj aGUqIGV4aXN0aW5nQVhPYmplY3RDYWNoZSgpIGNvbnN0OwogfTsKIAogfSAvLyBuYW1lc3BhY2Ug V2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vV2lkZ2V0LmggYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9XaWRnZXQuaAppbmRleCBlN2YxZTU5Li4xYWRmZjg1IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9XaWRnZXQuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9XaWRnZXQuaApAQCAtOTcsNyArOTcsNiBAQCB0eXBlZGVmIFBsYXRm b3JtV2lkZ2V0IFBsYXRmb3JtUGFnZUNsaWVudDsKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1j bGFzcyBBWE9iamVjdENhY2hlOwogY2xhc3MgQ3Vyc29yOwogY2xhc3MgRXZlbnQ7CiBjbGFzcyBG b250OwpAQCAtMjMxLDkgKzIzMCw2IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIEludFBvaW50IGNv bnZlcnRUb0NvbnRhaW5pbmdWaWV3KGNvbnN0IEludFBvaW50JikgY29uc3Q7CiAgICAgdmlydHVh bCBJbnRQb2ludCBjb252ZXJ0RnJvbUNvbnRhaW5pbmdWaWV3KGNvbnN0IEludFBvaW50JikgY29u c3Q7CiAKLSAgICAvLyBBIG1lYW5zIHRvIGFjY2VzcyB0aGUgQVggY2FjaGUgd2hlbiB0aGlzIG9i amVjdCBjYW4gZ2V0IGEgcG9pbnRlciB0byBpdC4KLSAgICB2aXJ0dWFsIEFYT2JqZWN0Q2FjaGUq IGF4T2JqZWN0Q2FjaGUoKSBjb25zdCB7IHJldHVybiAwOyB9Ci0gICAgCiBwcml2YXRlOgogICAg IHZvaWQgaW5pdChQbGF0Zm9ybVdpZGdldCk7IC8vIE11c3QgYmUgY2FsbGVkIGJ5IGFsbCBXaWRn ZXQgY29uc3RydWN0b3JzIHRvIGluaXRpYWxpemUgY3Jvc3MtcGxhdGZvcm0gZGF0YS4KIAo= 198133 2013-04-15 10:30:48 -0700 2013-04-15 11:19:55 -0700 Updated patch according to chris suggestion wcore-axobject-cache-violation.diff text/plain 13259 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBkYjdiZjU5Li4yZGQwZWUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDQg QEAKKzIwMTMtMDQtMTUgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFdpZGdldCBzaG91bGQgbm90IGRlcGVuZCBvbiBBWE9iamVjdENhY2hlCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTQ1MTQKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3ZlIEFYT2Jq ZWN0Q2FjaGUgdXNhZ2UgZnJvbSBwbGF0Zm9ybSBmaWxlcyB0byBGcmFtZVZpZXcuCisKKyAgICAg ICAgKiBwYWdlL0ZyYW1lVmlldy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OmRp ZEFkZFNjcm9sbGJhcik6IEhhbmRsZSBzY3JvbGxiYXIgdXBkYXRlcyBpbgorICAgICAgICBBWE9i amVjdENhY2hlLgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3Ojp3aWxsUmVtb3ZlU2Nyb2xs YmFyKTogSGFuZGxlIHNjcm9sbGJhcgorICAgICAgICB1cGRhdGVzIGluIEFYT2JqZWN0Q2FjaGUg YW5kIHJlbW92ZSB0aGUgc2Nyb2xsYmFyIGZyb20gdGhlIGNhY2hlLgorICAgICAgICAqIHBhZ2Uv RnJhbWVWaWV3Lmg6CisgICAgICAgICogcGxhdGZvcm0vU2Nyb2xsVmlldy5jcHA6CisgICAgICAg IChXZWJDb3JlOjpTY3JvbGxWaWV3OjpzZXRIYXNIb3Jpem9udGFsU2Nyb2xsYmFyKTogVXNlCisg ICAgICAgIGRpZEFkZFNjcm9sbGJhci93aWxsUmVtb3ZlU2Nyb2xsYmFyCisgICAgICAgIChXZWJD b3JlOjpTY3JvbGxWaWV3OjpzZXRIYXNWZXJ0aWNhbFNjcm9sbGJhcik6IERpdHRvLgorICAgICAg ICAqIHBsYXRmb3JtL1Njcm9sbGFibGVBcmVhLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9s bGFibGVBcmVhOjpkaWRBZGRTY3JvbGxiYXIpOiBUaGlzIGlzIHRoZSBvbGQKKyAgICAgICAgZGlk QWRkVmVydGljYWxTY3JvbGxiYXIgYW5kIGRpZEFkZEhvcml6b250YWxTY3JvbGxiYXIgam9pbmVk IGluIGEKKyAgICAgICAgc2luZ2xlIG1ldGhvZCB0aGF0IHJlY2VpdmVzIGEgU2Nyb2xsYmFyT3Jp ZW50YXRpb24gcGFyYW1ldGVyLgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsYWJsZUFyZWE6Ondp bGxSZW1vdmVTY3JvbGxiYXIpOiBUaGlzIGlzIHRoZSBvbGQKKyAgICAgICAgd2lsbFJlbW92ZVZl cnRpY2FsU2Nyb2xsYmFyIGFuZAorICAgICAgICB3aWxsUmVtb3ZlSG9yaXpvbnRhbFNjcm9sbGJh clNjcm9sbGJhciBqb2luZWQgaW4gYSBzaW5nbGUgbWV0aG9kCisgICAgICAgIHRoYXQgcmVjZWl2 ZXMgYSBTY3JvbGxiYXJPcmllbnRhdGlvbiBwYXJhbWV0ZXIuCisgICAgICAgICogcGxhdGZvcm0v U2Nyb2xsYWJsZUFyZWEuaDoKKyAgICAgICAgKFNjcm9sbGFibGVBcmVhKToKKyAgICAgICAgKiBw bGF0Zm9ybS9TY3JvbGxiYXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsYmFyOjp+U2Ny b2xsYmFyKTogUmVtb3ZlIEFYT2JqZWN0Q2FjaGUgdXNhZ2UuCisgICAgICAgICogcGxhdGZvcm0v U2Nyb2xsYmFyLmg6CisgICAgICAgICogcGxhdGZvcm0vV2lkZ2V0Lmg6CisgICAgICAgIChXaWRn ZXQpOiBSZW1vdmUgYXhPYmplY3RDYWNoZSgpIG1ldGhvZC4KKyAgICAgICAgKiByZW5kZXJpbmcv UmVuZGVyTGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OmNyZWF0ZVNj cm9sbGJhcik6IFVzZSBkaWRBZGRTY3JvbGxiYXIuCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJM YXllcjo6ZGVzdHJveVNjcm9sbGJhcik6IFVzZSB3aWxsUmVtb3ZlU2Nyb2xsYmFyLgorICAgICAg ICAqIHJlbmRlcmluZy9SZW5kZXJMaXN0Qm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckxpc3RCb3g6OmNyZWF0ZVNjcm9sbGJhcik6IFVzZSBkaWRBZGRTY3JvbGxiYXIuCisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJMaXN0Qm94OjpkZXN0cm95U2Nyb2xsYmFyKTogVXNlIHdpbGxSZW1v dmVTY3JvbGxiYXIuCisKIDIwMTMtMDQtMTUgIFJvYiBCdWlzICA8cmJ1aXNAcmltLmNvbT4KIAog ICAgICAgICBGaXggc29tZSBjb21waWxlciB3YXJuaW5ncyAobWlzY2VsbGFuZW91cykKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvRnJhbWVWaWV3LmNwcAppbmRleCA1ZmI1MjQ0Li4zZTM5ZjZhIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFn ZS9GcmFtZVZpZXcuY3BwCkBAIC00MTE2LDQgKzQxMTYsMjAgQEAgdm9pZCBGcmFtZVZpZXc6OnNl dFNjcm9sbGluZ1BlcmZvcm1hbmNlTG9nZ2luZ0VuYWJsZWQoYm9vbCBmbGFnKQogI2VuZGlmCiB9 CiAKK3ZvaWQgRnJhbWVWaWV3OjpkaWRBZGRTY3JvbGxiYXIoU2Nyb2xsYmFyKiBzY3JvbGxiYXIs IFNjcm9sbGJhck9yaWVudGF0aW9uIG9yaWVudGF0aW9uKQoreworICAgIFNjcm9sbGFibGVBcmVh OjpkaWRBZGRTY3JvbGxiYXIoc2Nyb2xsYmFyLCBvcmllbnRhdGlvbik7CisgICAgaWYgKEFYT2Jq ZWN0Q2FjaGUqIGNhY2hlID0gYXhPYmplY3RDYWNoZSgpKQorICAgICAgICBjYWNoZS0+aGFuZGxl U2Nyb2xsYmFyVXBkYXRlKHRoaXMpOworfQorCit2b2lkIEZyYW1lVmlldzo6d2lsbFJlbW92ZVNj cm9sbGJhcihTY3JvbGxiYXIqIHNjcm9sbGJhciwgU2Nyb2xsYmFyT3JpZW50YXRpb24gb3JpZW50 YXRpb24pCit7CisgICAgU2Nyb2xsYWJsZUFyZWE6OndpbGxSZW1vdmVTY3JvbGxiYXIoc2Nyb2xs YmFyLCBvcmllbnRhdGlvbik7CisgICAgaWYgKEFYT2JqZWN0Q2FjaGUqIGNhY2hlID0gYXhPYmpl Y3RDYWNoZSgpKSB7CisgICAgICAgIGNhY2hlLT5yZW1vdmUoc2Nyb2xsYmFyKTsKKyAgICAgICAg Y2FjaGUtPmhhbmRsZVNjcm9sbGJhclVwZGF0ZSh0aGlzKTsKKyAgICB9Cit9CisKIH0gLy8gbmFt ZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3 LmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oCmluZGV4IDE4OTg5NjQuLjYzZDcx YTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaApAQCAtMzgsNiArMzgsNyBAQAogCiBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiAKK2NsYXNzIEFYT2JqZWN0Q2FjaGU7CiBjbGFzcyBFbGVtZW50OwogY2xh c3MgRXZlbnQ7CiBjbGFzcyBGbG9hdFNpemU7CkBAIC00ODQsNiArNDg1LDEwIEBAIHByaXZhdGU6 CiAjZW5kaWYKICNlbmRpZgogCisgICAgLy8gT3ZlcnJpZGUgc2Nyb2xsYmFyIG5vdGlmaWNhdGlv bnMgdG8gdXBkYXRlIHRoZSBBWE9iamVjdCBjYWNoZS4KKyAgICB2aXJ0dWFsIHZvaWQgZGlkQWRk U2Nyb2xsYmFyKFNjcm9sbGJhciosIFNjcm9sbGJhck9yaWVudGF0aW9uKSBPVkVSUklERTsKKyAg ICB2aXJ0dWFsIHZvaWQgd2lsbFJlbW92ZVNjcm9sbGJhcihTY3JvbGxiYXIqLCBTY3JvbGxiYXJP cmllbnRhdGlvbikgT1ZFUlJJREU7CisKICAgICB2b2lkIHNjaGVkdWxlUmVzaXplRXZlbnQoKTsK ICAgICB2b2lkIHNlbmRSZXNpemVFdmVudCgpOwogICAgIHZvaWQgZGVsYXllZFJlc2l6ZUV2ZW50 VGltZXJGaXJlZChUaW1lcjxGcmFtZVZpZXc+Kik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9s bFZpZXcuY3BwCmluZGV4IGZkOGM3ODIuLjdlNzljYmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L1Njcm9sbFZpZXcuY3BwCkBAIC0yNiw3ICsyNiw2IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAj aW5jbHVkZSAiU2Nyb2xsVmlldy5oIgogCi0jaW5jbHVkZSAiQVhPYmplY3RDYWNoZS5oIgogI2lu Y2x1ZGUgIkdyYXBoaWNzQ29udGV4dC5oIgogI2luY2x1ZGUgIkdyYXBoaWNzTGF5ZXIuaCIKICNp bmNsdWRlICJIb3N0V2luZG93LmgiCkBAIC05MSwxNiArOTAsMTMgQEAgdm9pZCBTY3JvbGxWaWV3 OjpzZXRIYXNIb3Jpem9udGFsU2Nyb2xsYmFyKGJvb2wgaGFzQmFyKQogICAgIGlmIChoYXNCYXIg JiYgIW1faG9yaXpvbnRhbFNjcm9sbGJhcikgewogICAgICAgICBtX2hvcml6b250YWxTY3JvbGxi YXIgPSBjcmVhdGVTY3JvbGxiYXIoSG9yaXpvbnRhbFNjcm9sbGJhcik7CiAgICAgICAgIGFkZENo aWxkKG1faG9yaXpvbnRhbFNjcm9sbGJhci5nZXQoKSk7Ci0gICAgICAgIGRpZEFkZEhvcml6b250 YWxTY3JvbGxiYXIobV9ob3Jpem9udGFsU2Nyb2xsYmFyLmdldCgpKTsKKyAgICAgICAgZGlkQWRk U2Nyb2xsYmFyKG1faG9yaXpvbnRhbFNjcm9sbGJhci5nZXQoKSwgSG9yaXpvbnRhbFNjcm9sbGJh cik7CiAgICAgICAgIG1faG9yaXpvbnRhbFNjcm9sbGJhci0+c3R5bGVDaGFuZ2VkKCk7CiAgICAg fSBlbHNlIGlmICghaGFzQmFyICYmIG1faG9yaXpvbnRhbFNjcm9sbGJhcikgewotICAgICAgICB3 aWxsUmVtb3ZlSG9yaXpvbnRhbFNjcm9sbGJhcihtX2hvcml6b250YWxTY3JvbGxiYXIuZ2V0KCkp OworICAgICAgICB3aWxsUmVtb3ZlU2Nyb2xsYmFyKG1faG9yaXpvbnRhbFNjcm9sbGJhci5nZXQo KSwgSG9yaXpvbnRhbFNjcm9sbGJhcik7CiAgICAgICAgIHJlbW92ZUNoaWxkKG1faG9yaXpvbnRh bFNjcm9sbGJhci5nZXQoKSk7CiAgICAgICAgIG1faG9yaXpvbnRhbFNjcm9sbGJhciA9IDA7CiAg ICAgfQotICAgIAotICAgIGlmIChBWE9iamVjdENhY2hlKiBjYWNoZSA9IGF4T2JqZWN0Q2FjaGUo KSkKLSAgICAgICAgY2FjaGUtPmhhbmRsZVNjcm9sbGJhclVwZGF0ZSh0aGlzKTsKIH0KIAogdm9p ZCBTY3JvbGxWaWV3OjpzZXRIYXNWZXJ0aWNhbFNjcm9sbGJhcihib29sIGhhc0JhcikKQEAgLTEw OSwxNiArMTA1LDEzIEBAIHZvaWQgU2Nyb2xsVmlldzo6c2V0SGFzVmVydGljYWxTY3JvbGxiYXIo Ym9vbCBoYXNCYXIpCiAgICAgaWYgKGhhc0JhciAmJiAhbV92ZXJ0aWNhbFNjcm9sbGJhcikgewog ICAgICAgICBtX3ZlcnRpY2FsU2Nyb2xsYmFyID0gY3JlYXRlU2Nyb2xsYmFyKFZlcnRpY2FsU2Ny b2xsYmFyKTsKICAgICAgICAgYWRkQ2hpbGQobV92ZXJ0aWNhbFNjcm9sbGJhci5nZXQoKSk7Ci0g ICAgICAgIGRpZEFkZFZlcnRpY2FsU2Nyb2xsYmFyKG1fdmVydGljYWxTY3JvbGxiYXIuZ2V0KCkp OworICAgICAgICBkaWRBZGRTY3JvbGxiYXIobV92ZXJ0aWNhbFNjcm9sbGJhci5nZXQoKSwgVmVy dGljYWxTY3JvbGxiYXIpOwogICAgICAgICBtX3ZlcnRpY2FsU2Nyb2xsYmFyLT5zdHlsZUNoYW5n ZWQoKTsKICAgICB9IGVsc2UgaWYgKCFoYXNCYXIgJiYgbV92ZXJ0aWNhbFNjcm9sbGJhcikgewot ICAgICAgICB3aWxsUmVtb3ZlVmVydGljYWxTY3JvbGxiYXIobV92ZXJ0aWNhbFNjcm9sbGJhci5n ZXQoKSk7CisgICAgICAgIHdpbGxSZW1vdmVTY3JvbGxiYXIobV92ZXJ0aWNhbFNjcm9sbGJhci5n ZXQoKSwgVmVydGljYWxTY3JvbGxiYXIpOwogICAgICAgICByZW1vdmVDaGlsZChtX3ZlcnRpY2Fs U2Nyb2xsYmFyLmdldCgpKTsKICAgICAgICAgbV92ZXJ0aWNhbFNjcm9sbGJhciA9IDA7CiAgICAg fQotICAgIAotICAgIGlmIChBWE9iamVjdENhY2hlKiBjYWNoZSA9IGF4T2JqZWN0Q2FjaGUoKSkK LSAgICAgICAgY2FjaGUtPmhhbmRsZVNjcm9sbGJhclVwZGF0ZSh0aGlzKTsKIH0KIAogI2lmICFQ TEFURk9STShHVEspCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxh YmxlQXJlYS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5jcHAK aW5kZXggMDhhNjI2Yi4uMDZlMzk2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vU2Nyb2xsYWJsZUFyZWEuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9s bGFibGVBcmVhLmNwcApAQCAtMjYxLDMwICsyNjEsMjMgQEAgdm9pZCBTY3JvbGxhYmxlQXJlYTo6 ZmluaXNoQ3VycmVudFNjcm9sbEFuaW1hdGlvbnMoKSBjb25zdAogICAgICAgICBzY3JvbGxBbmlt YXRvci0+ZmluaXNoQ3VycmVudFNjcm9sbEFuaW1hdGlvbnMoKTsKIH0KIAotdm9pZCBTY3JvbGxh YmxlQXJlYTo6ZGlkQWRkVmVydGljYWxTY3JvbGxiYXIoU2Nyb2xsYmFyKiBzY3JvbGxiYXIpCit2 b2lkIFNjcm9sbGFibGVBcmVhOjpkaWRBZGRTY3JvbGxiYXIoU2Nyb2xsYmFyKiBzY3JvbGxiYXIs IFNjcm9sbGJhck9yaWVudGF0aW9uIG9yaWVudGF0aW9uKQogewotICAgIHNjcm9sbEFuaW1hdG9y KCktPmRpZEFkZFZlcnRpY2FsU2Nyb2xsYmFyKHNjcm9sbGJhcik7Ci0KLSAgICAvLyA8cmRhcjov L3Byb2JsZW0vOTc5NzI1Mz4gQXBwS2l0IHJlc2V0cyB0aGUgc2Nyb2xsYmFyJ3Mgc3R5bGUgd2hl biB5b3UgYXR0YWNoIGEgc2Nyb2xsYmFyCi0gICAgc2V0U2Nyb2xsYmFyT3ZlcmxheVN0eWxlKHNj cm9sbGJhck92ZXJsYXlTdHlsZSgpKTsKLX0KLQotdm9pZCBTY3JvbGxhYmxlQXJlYTo6d2lsbFJl bW92ZVZlcnRpY2FsU2Nyb2xsYmFyKFNjcm9sbGJhciogc2Nyb2xsYmFyKQotewotICAgIHNjcm9s bEFuaW1hdG9yKCktPndpbGxSZW1vdmVWZXJ0aWNhbFNjcm9sbGJhcihzY3JvbGxiYXIpOwotfQot Ci12b2lkIFNjcm9sbGFibGVBcmVhOjpkaWRBZGRIb3Jpem9udGFsU2Nyb2xsYmFyKFNjcm9sbGJh ciogc2Nyb2xsYmFyKQotewotICAgIHNjcm9sbEFuaW1hdG9yKCktPmRpZEFkZEhvcml6b250YWxT Y3JvbGxiYXIoc2Nyb2xsYmFyKTsKKyAgICBpZiAob3JpZW50YXRpb24gPT0gVmVydGljYWxTY3Jv bGxiYXIpCisgICAgICAgIHNjcm9sbEFuaW1hdG9yKCktPmRpZEFkZFZlcnRpY2FsU2Nyb2xsYmFy KHNjcm9sbGJhcik7CisgICAgZWxzZQorICAgICAgICBzY3JvbGxBbmltYXRvcigpLT5kaWRBZGRI b3Jpem9udGFsU2Nyb2xsYmFyKHNjcm9sbGJhcik7CiAKICAgICAvLyA8cmRhcjovL3Byb2JsZW0v OTc5NzI1Mz4gQXBwS2l0IHJlc2V0cyB0aGUgc2Nyb2xsYmFyJ3Mgc3R5bGUgd2hlbiB5b3UgYXR0 YWNoIGEgc2Nyb2xsYmFyCiAgICAgc2V0U2Nyb2xsYmFyT3ZlcmxheVN0eWxlKHNjcm9sbGJhck92 ZXJsYXlTdHlsZSgpKTsKIH0KIAotdm9pZCBTY3JvbGxhYmxlQXJlYTo6d2lsbFJlbW92ZUhvcml6 b250YWxTY3JvbGxiYXIoU2Nyb2xsYmFyKiBzY3JvbGxiYXIpCit2b2lkIFNjcm9sbGFibGVBcmVh Ojp3aWxsUmVtb3ZlU2Nyb2xsYmFyKFNjcm9sbGJhciogc2Nyb2xsYmFyLCBTY3JvbGxiYXJPcmll bnRhdGlvbiBvcmllbnRhdGlvbikKIHsKLSAgICBzY3JvbGxBbmltYXRvcigpLT53aWxsUmVtb3Zl SG9yaXpvbnRhbFNjcm9sbGJhcihzY3JvbGxiYXIpOworICAgIGlmIChvcmllbnRhdGlvbiA9PSBW ZXJ0aWNhbFNjcm9sbGJhcikKKyAgICAgICAgc2Nyb2xsQW5pbWF0b3IoKS0+d2lsbFJlbW92ZVZl cnRpY2FsU2Nyb2xsYmFyKHNjcm9sbGJhcik7CisgICAgZWxzZQorICAgICAgICBzY3JvbGxBbmlt YXRvcigpLT53aWxsUmVtb3ZlSG9yaXpvbnRhbFNjcm9sbGJhcihzY3JvbGxiYXIpOwogfQogCiB2 b2lkIFNjcm9sbGFibGVBcmVhOjpjb250ZW50c1Jlc2l6ZWQoKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYWJsZUFyZWEuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL1Njcm9sbGFibGVBcmVhLmgKaW5kZXggNDMzNGZjZS4uYzdjYThjOSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYWJsZUFyZWEuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5oCkBAIC04MywxMCArODMsOCBAQCBwdWJsaWM6 CiAKICAgICB2b2lkIGZpbmlzaEN1cnJlbnRTY3JvbGxBbmltYXRpb25zKCkgY29uc3Q7CiAKLSAg ICB2b2lkIGRpZEFkZFZlcnRpY2FsU2Nyb2xsYmFyKFNjcm9sbGJhciopOwotICAgIHZvaWQgd2ls bFJlbW92ZVZlcnRpY2FsU2Nyb2xsYmFyKFNjcm9sbGJhciopOwotICAgIHZpcnR1YWwgdm9pZCBk aWRBZGRIb3Jpem9udGFsU2Nyb2xsYmFyKFNjcm9sbGJhciopOwotICAgIHZpcnR1YWwgdm9pZCB3 aWxsUmVtb3ZlSG9yaXpvbnRhbFNjcm9sbGJhcihTY3JvbGxiYXIqKTsKKyAgICB2aXJ0dWFsIHZv aWQgZGlkQWRkU2Nyb2xsYmFyKFNjcm9sbGJhciosIFNjcm9sbGJhck9yaWVudGF0aW9uKTsKKyAg ICB2aXJ0dWFsIHZvaWQgd2lsbFJlbW92ZVNjcm9sbGJhcihTY3JvbGxiYXIqLCBTY3JvbGxiYXJP cmllbnRhdGlvbik7CiAKICAgICB2aXJ0dWFsIHZvaWQgY29udGVudHNSZXNpemVkKCk7CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGJhci5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxiYXIuY3BwCmluZGV4IGRiOTI1NTIuLjBlMWIyZmIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGJhci5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYmFyLmNwcApAQCAtMzgsOSArMzgsNiBAQAogI2Vu ZGlmCiAKIC8vIEZJWE1FOiBUaGUgZm9sbG93aW5nICNpbmNsdWRlcyBhcmUgYSBsYXllcmluZyB2 aW9sYXRpb24gYW5kIHNob3VsZCBiZSByZW1vdmVkLgotI2luY2x1ZGUgIkFYT2JqZWN0Q2FjaGUu aCIKLSNpbmNsdWRlICJBY2Nlc3NpYmlsaXR5U2Nyb2xsYmFyLmgiCi0jaW5jbHVkZSAiRG9jdW1l bnQuaCIKICNpbmNsdWRlICJFdmVudEhhbmRsZXIuaCIKICNpbmNsdWRlICJGcmFtZS5oIgogI2lu Y2x1ZGUgIkZyYW1lVmlldy5oIgpAQCAtMTEwLDkgKzEwNyw2IEBAIFNjcm9sbGJhcjo6U2Nyb2xs YmFyKFNjcm9sbGFibGVBcmVhKiBzY3JvbGxhYmxlQXJlYSwgU2Nyb2xsYmFyT3JpZW50YXRpb24g b3JpZW50CiAKIFNjcm9sbGJhcjo6flNjcm9sbGJhcigpCiB7Ci0gICAgaWYgKEFYT2JqZWN0Q2Fj aGUqIGNhY2hlID0gZXhpc3RpbmdBWE9iamVjdENhY2hlKCkpCi0gICAgICAgIGNhY2hlLT5yZW1v dmUodGhpcyk7Ci0gICAgCiAgICAgc3RvcFRpbWVySWZOZWVkZWQoKTsKICAgICAKICAgICBtX3Ro ZW1lLT51bnJlZ2lzdGVyU2Nyb2xsYmFyKHRoaXMpOwpAQCAtNTY3LDE0ICs1NjEsNiBAQCBib29s IFNjcm9sbGJhcjo6aXNXaW5kb3dBY3RpdmUoKSBjb25zdAogICAgIHJldHVybiBtX3Njcm9sbGFi bGVBcmVhICYmIG1fc2Nyb2xsYWJsZUFyZWEtPmlzQWN0aXZlKCk7CiB9CiAKLUFYT2JqZWN0Q2Fj aGUqIFNjcm9sbGJhcjo6ZXhpc3RpbmdBWE9iamVjdENhY2hlKCkgY29uc3QKLXsKLSAgICBpZiAo IXBhcmVudCgpKQotICAgICAgICByZXR1cm4gMDsKLSAgICAKLSAgICByZXR1cm4gcGFyZW50KCkt PmF4T2JqZWN0Q2FjaGUoKTsKLX0KLQogdm9pZCBTY3JvbGxiYXI6OmludmFsaWRhdGVSZWN0KGNv bnN0IEludFJlY3QmIHJlY3QpCiB7CiAgICAgaWYgKHN1cHByZXNzSW52YWxpZGF0aW9uKCkpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxiYXIuaCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGJhci5oCmluZGV4IGQ1NzRjYzYuLjAwYzc2MTggMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGJhci5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGJhci5oCkBAIC0yMDYsNyArMjA2LDYgQEAgcHJvdGVjdGVk OgogCiBwcml2YXRlOgogICAgIHZpcnR1YWwgYm9vbCBpc1Njcm9sbGJhcigpIGNvbnN0IHsgcmV0 dXJuIHRydWU7IH0KLSAgICB2aXJ0dWFsIEFYT2JqZWN0Q2FjaGUqIGV4aXN0aW5nQVhPYmplY3RD YWNoZSgpIGNvbnN0OwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vV2lkZ2V0LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9XaWRnZXQuaAppbmRleCBlN2YxZTU5Li4xYWRmZjg1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9XaWRnZXQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9XaWRn ZXQuaApAQCAtOTcsNyArOTcsNiBAQCB0eXBlZGVmIFBsYXRmb3JtV2lkZ2V0IFBsYXRmb3JtUGFn ZUNsaWVudDsKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1jbGFzcyBBWE9iamVjdENhY2hlOwog Y2xhc3MgQ3Vyc29yOwogY2xhc3MgRXZlbnQ7CiBjbGFzcyBGb250OwpAQCAtMjMxLDkgKzIzMCw2 IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIEludFBvaW50IGNvbnZlcnRUb0NvbnRhaW5pbmdWaWV3 KGNvbnN0IEludFBvaW50JikgY29uc3Q7CiAgICAgdmlydHVhbCBJbnRQb2ludCBjb252ZXJ0RnJv bUNvbnRhaW5pbmdWaWV3KGNvbnN0IEludFBvaW50JikgY29uc3Q7CiAKLSAgICAvLyBBIG1lYW5z IHRvIGFjY2VzcyB0aGUgQVggY2FjaGUgd2hlbiB0aGlzIG9iamVjdCBjYW4gZ2V0IGEgcG9pbnRl ciB0byBpdC4KLSAgICB2aXJ0dWFsIEFYT2JqZWN0Q2FjaGUqIGF4T2JqZWN0Q2FjaGUoKSBjb25z dCB7IHJldHVybiAwOyB9Ci0gICAgCiBwcml2YXRlOgogICAgIHZvaWQgaW5pdChQbGF0Zm9ybVdp ZGdldCk7IC8vIE11c3QgYmUgY2FsbGVkIGJ5IGFsbCBXaWRnZXQgY29uc3RydWN0b3JzIHRvIGlu aXRpYWxpemUgY3Jvc3MtcGxhdGZvcm0gZGF0YS4KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJMYXllci5jcHAKaW5kZXggMTc5NGRlZC4uMjhlZjk2NyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCkBAIC0yODc4LDEwICsyODc4LDcgQEAgUGFzc1JlZlB0 cjxTY3JvbGxiYXI+IFJlbmRlckxheWVyOjpjcmVhdGVTY3JvbGxiYXIoU2Nyb2xsYmFyT3JpZW50 YXRpb24gb3JpZW50YXQKICAgICAgICAgd2lkZ2V0ID0gUmVuZGVyU2Nyb2xsYmFyOjpjcmVhdGVD dXN0b21TY3JvbGxiYXIodGhpcywgb3JpZW50YXRpb24sIGFjdHVhbFJlbmRlcmVyLT5ub2RlKCkp OwogICAgIGVsc2UgewogICAgICAgICB3aWRnZXQgPSBTY3JvbGxiYXI6OmNyZWF0ZU5hdGl2ZVNj cm9sbGJhcih0aGlzLCBvcmllbnRhdGlvbiwgUmVndWxhclNjcm9sbGJhcik7Ci0gICAgICAgIGlm IChvcmllbnRhdGlvbiA9PSBIb3Jpem9udGFsU2Nyb2xsYmFyKQotICAgICAgICAgICAgZGlkQWRk SG9yaXpvbnRhbFNjcm9sbGJhcih3aWRnZXQuZ2V0KCkpOwotICAgICAgICBlbHNlIAotICAgICAg ICAgICAgZGlkQWRkVmVydGljYWxTY3JvbGxiYXIod2lkZ2V0LmdldCgpKTsKKyAgICAgICAgZGlk QWRkU2Nyb2xsYmFyKHdpZGdldC5nZXQoKSwgb3JpZW50YXRpb24pOwogICAgIH0KICAgICByZW5k ZXJlcigpLT5kb2N1bWVudCgpLT52aWV3KCktPmFkZENoaWxkKHdpZGdldC5nZXQoKSk7ICAgICAg ICAKICAgICByZXR1cm4gd2lkZ2V0LnJlbGVhc2UoKTsKQEAgLTI4OTMsMTIgKzI4OTAsOCBAQCB2 b2lkIFJlbmRlckxheWVyOjpkZXN0cm95U2Nyb2xsYmFyKFNjcm9sbGJhck9yaWVudGF0aW9uIG9y aWVudGF0aW9uKQogICAgIGlmICghc2Nyb2xsYmFyKQogICAgICAgICByZXR1cm47CiAKLSAgICBp ZiAoIXNjcm9sbGJhci0+aXNDdXN0b21TY3JvbGxiYXIoKSkgewotICAgICAgICBpZiAob3JpZW50 YXRpb24gPT0gSG9yaXpvbnRhbFNjcm9sbGJhcikKLSAgICAgICAgICAgIHdpbGxSZW1vdmVIb3Jp em9udGFsU2Nyb2xsYmFyKHNjcm9sbGJhci5nZXQoKSk7Ci0gICAgICAgIGVsc2UKLSAgICAgICAg ICAgIHdpbGxSZW1vdmVWZXJ0aWNhbFNjcm9sbGJhcihzY3JvbGxiYXIuZ2V0KCkpOwotICAgIH0K KyAgICBpZiAoIXNjcm9sbGJhci0+aXNDdXN0b21TY3JvbGxiYXIoKSkKKyAgICAgICAgd2lsbFJl bW92ZVNjcm9sbGJhcihzY3JvbGxiYXIuZ2V0KCksIG9yaWVudGF0aW9uKTsKIAogICAgIHNjcm9s bGJhci0+cmVtb3ZlRnJvbVBhcmVudCgpOwogICAgIHNjcm9sbGJhci0+ZGlzY29ubmVjdEZyb21T Y3JvbGxhYmxlQXJlYSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckxpc3RCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RCb3gu Y3BwCmluZGV4IDRhM2Q4MGEuLjQ1OWE3MDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJMaXN0Qm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyTGlzdEJveC5jcHAKQEAgLTg0OSw3ICs4NDksNyBAQCBQYXNzUmVmUHRyPFNjcm9sbGJh cj4gUmVuZGVyTGlzdEJveDo6Y3JlYXRlU2Nyb2xsYmFyKCkKICAgICAgICAgd2lkZ2V0ID0gUmVu ZGVyU2Nyb2xsYmFyOjpjcmVhdGVDdXN0b21TY3JvbGxiYXIodGhpcywgVmVydGljYWxTY3JvbGxi YXIsIHRoaXMtPm5vZGUoKSk7CiAgICAgZWxzZSB7CiAgICAgICAgIHdpZGdldCA9IFNjcm9sbGJh cjo6Y3JlYXRlTmF0aXZlU2Nyb2xsYmFyKHRoaXMsIFZlcnRpY2FsU2Nyb2xsYmFyLCB0aGVtZSgp LT5zY3JvbGxiYXJDb250cm9sU2l6ZUZvclBhcnQoTGlzdGJveFBhcnQpKTsKLSAgICAgICAgZGlk QWRkVmVydGljYWxTY3JvbGxiYXIod2lkZ2V0LmdldCgpKTsKKyAgICAgICAgZGlkQWRkU2Nyb2xs YmFyKHdpZGdldC5nZXQoKSwgVmVydGljYWxTY3JvbGxiYXIpOwogICAgIH0KICAgICBkb2N1bWVu dCgpLT52aWV3KCktPmFkZENoaWxkKHdpZGdldC5nZXQoKSk7ICAgICAgICAKICAgICByZXR1cm4g d2lkZ2V0LnJlbGVhc2UoKTsKQEAgLTg2MSw3ICs4NjEsNyBAQCB2b2lkIFJlbmRlckxpc3RCb3g6 OmRlc3Ryb3lTY3JvbGxiYXIoKQogICAgICAgICByZXR1cm47CiAKICAgICBpZiAoIW1fdkJhci0+ aXNDdXN0b21TY3JvbGxiYXIoKSkKLSAgICAgICAgU2Nyb2xsYWJsZUFyZWE6OndpbGxSZW1vdmVW ZXJ0aWNhbFNjcm9sbGJhcihtX3ZCYXIuZ2V0KCkpOworICAgICAgICBTY3JvbGxhYmxlQXJlYTo6 d2lsbFJlbW92ZVNjcm9sbGJhcihtX3ZCYXIuZ2V0KCksIFZlcnRpY2FsU2Nyb2xsYmFyKTsKICAg ICBtX3ZCYXItPnJlbW92ZUZyb21QYXJlbnQoKTsKICAgICBtX3ZCYXItPmRpc2Nvbm5lY3RGcm9t U2Nyb2xsYWJsZUFyZWEoKTsKICAgICBtX3ZCYXIgPSAwOwo= 198138 2013-04-15 11:19:55 -0700 2013-04-16 10:01:33 -0700 Try to fix mac build wcore-axobject-cache-violation2.diff text/plain 19003 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBkYjdiZjU5Li4yMmE4MWM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNTQg QEAKKzIwMTMtMDQtMTUgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFdpZGdldCBzaG91bGQgbm90IGRlcGVuZCBvbiBBWE9iamVjdENhY2hlCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTQ1MTQKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3ZlIEFYT2Jq ZWN0Q2FjaGUgdXNhZ2UgZnJvbSBwbGF0Zm9ybSBmaWxlcyB0byBGcmFtZVZpZXcuCisKKyAgICAg ICAgKiBwYWdlL0ZyYW1lVmlldy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OmRp ZEFkZFNjcm9sbGJhcik6IEhhbmRsZSBzY3JvbGxiYXIgdXBkYXRlcyBpbgorICAgICAgICBBWE9i amVjdENhY2hlLgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3Ojp3aWxsUmVtb3ZlU2Nyb2xs YmFyKTogSGFuZGxlIHNjcm9sbGJhcgorICAgICAgICB1cGRhdGVzIGluIEFYT2JqZWN0Q2FjaGUg YW5kIHJlbW92ZSB0aGUgc2Nyb2xsYmFyIGZyb20gdGhlIGNhY2hlLgorICAgICAgICAqIHBhZ2Uv RnJhbWVWaWV3Lmg6CisgICAgICAgICogcGxhdGZvcm0vU2Nyb2xsVmlldy5jcHA6CisgICAgICAg IChXZWJDb3JlOjpTY3JvbGxWaWV3OjpzZXRIYXNIb3Jpem9udGFsU2Nyb2xsYmFyKTogVXNlCisg ICAgICAgIGRpZEFkZFNjcm9sbGJhci93aWxsUmVtb3ZlU2Nyb2xsYmFyCisgICAgICAgIChXZWJD b3JlOjpTY3JvbGxWaWV3OjpzZXRIYXNWZXJ0aWNhbFNjcm9sbGJhcik6IERpdHRvLgorICAgICAg ICAqIHBsYXRmb3JtL1Njcm9sbGFibGVBcmVhLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9s bGFibGVBcmVhOjpkaWRBZGRTY3JvbGxiYXIpOiBUaGlzIGlzIHRoZSBvbGQKKyAgICAgICAgZGlk QWRkVmVydGljYWxTY3JvbGxiYXIgYW5kIGRpZEFkZEhvcml6b250YWxTY3JvbGxiYXIgam9pbmVk IGluIGEKKyAgICAgICAgc2luZ2xlIG1ldGhvZCB0aGF0IHJlY2VpdmVzIGEgU2Nyb2xsYmFyT3Jp ZW50YXRpb24gcGFyYW1ldGVyLgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsYWJsZUFyZWE6Ondp bGxSZW1vdmVTY3JvbGxiYXIpOiBUaGlzIGlzIHRoZSBvbGQKKyAgICAgICAgd2lsbFJlbW92ZVZl cnRpY2FsU2Nyb2xsYmFyIGFuZAorICAgICAgICB3aWxsUmVtb3ZlSG9yaXpvbnRhbFNjcm9sbGJh clNjcm9sbGJhciBqb2luZWQgaW4gYSBzaW5nbGUgbWV0aG9kCisgICAgICAgIHRoYXQgcmVjZWl2 ZXMgYSBTY3JvbGxiYXJPcmllbnRhdGlvbiBwYXJhbWV0ZXIuCisgICAgICAgICogcGxhdGZvcm0v U2Nyb2xsYWJsZUFyZWEuaDoKKyAgICAgICAgKFNjcm9sbGFibGVBcmVhKToKKyAgICAgICAgKiBw bGF0Zm9ybS9TY3JvbGxiYXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsYmFyOjp+U2Ny b2xsYmFyKTogUmVtb3ZlIEFYT2JqZWN0Q2FjaGUgdXNhZ2UuCisgICAgICAgICogcGxhdGZvcm0v U2Nyb2xsYmFyLmg6CisgICAgICAgICogcGxhdGZvcm0vV2lkZ2V0Lmg6CisgICAgICAgIChXaWRn ZXQpOiBSZW1vdmUgYXhPYmplY3RDYWNoZSgpIG1ldGhvZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9t YWMvU2Nyb2xsQW5pbWF0b3JNYWMuaDoKKyAgICAgICAgKFNjcm9sbEFuaW1hdG9yTWFjKToKKyAg ICAgICAgKiBwbGF0Zm9ybS9tYWMvU2Nyb2xsQW5pbWF0b3JNYWMubW06CisgICAgICAgIChXZWJD b3JlOjpTY3JvbGxBbmltYXRvck1hYzo6ZGlkQWRkU2Nyb2xsYmFyKTogVGhpcyBpcyB0aGUgb2xk CisgICAgICAgIGRpZEFkZFZlcnRpY2FsU2Nyb2xsYmFyIGFuZCBkaWRBZGRIb3Jpem9udGFsU2Ny b2xsYmFyIGpvaW5lZCBpbiBhCisgICAgICAgIHNpbmdsZSBtZXRob2QgdGhhdCByZWNlaXZlcyBh IFNjcm9sbGJhck9yaWVudGF0aW9uIHBhcmFtZXRlci4KKyAgICAgICAgKFdlYkNvcmU6OlNjcm9s bEFuaW1hdG9yTWFjOjp3aWxsUmVtb3ZlU2Nyb2xsYmFyKTogVGhpcyBpcyB0aGUgb2xkCisgICAg ICAgIHdpbGxSZW1vdmVWZXJ0aWNhbFNjcm9sbGJhciBhbmQKKyAgICAgICAgd2lsbFJlbW92ZUhv cml6b250YWxTY3JvbGxiYXJTY3JvbGxiYXIgam9pbmVkIGluIGEgc2luZ2xlIG1ldGhvZAorICAg ICAgICB0aGF0IHJlY2VpdmVzIGEgU2Nyb2xsYmFyT3JpZW50YXRpb24gcGFyYW1ldGVyLgorICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJMYXllcjo6Y3JlYXRlU2Nyb2xsYmFyKTogVXNlIGRpZEFkZFNjcm9sbGJhci4KKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlckxheWVyOjpkZXN0cm95U2Nyb2xsYmFyKTogVXNlIHdpbGxSZW1vdmVT Y3JvbGxiYXIuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxpc3RCb3guY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyTGlzdEJveDo6Y3JlYXRlU2Nyb2xsYmFyKTogVXNlIGRpZEFkZFNj cm9sbGJhci4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxpc3RCb3g6OmRlc3Ryb3lTY3JvbGxi YXIpOiBVc2Ugd2lsbFJlbW92ZVNjcm9sbGJhci4KKwogMjAxMy0wNC0xNSAgUm9iIEJ1aXMgIDxy YnVpc0ByaW0uY29tPgogCiAgICAgICAgIEZpeCBzb21lIGNvbXBpbGVyIHdhcm5pbmdzIChtaXNj ZWxsYW5lb3VzKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3Bw IGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCmluZGV4IDVmYjUyNDQuLjNlMzlm NmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKQEAgLTQxMTYsNCArNDExNiwyMCBAQCB2 b2lkIEZyYW1lVmlldzo6c2V0U2Nyb2xsaW5nUGVyZm9ybWFuY2VMb2dnaW5nRW5hYmxlZChib29s IGZsYWcpCiAjZW5kaWYKIH0KIAordm9pZCBGcmFtZVZpZXc6OmRpZEFkZFNjcm9sbGJhcihTY3Jv bGxiYXIqIHNjcm9sbGJhciwgU2Nyb2xsYmFyT3JpZW50YXRpb24gb3JpZW50YXRpb24pCit7Cisg ICAgU2Nyb2xsYWJsZUFyZWE6OmRpZEFkZFNjcm9sbGJhcihzY3JvbGxiYXIsIG9yaWVudGF0aW9u KTsKKyAgICBpZiAoQVhPYmplY3RDYWNoZSogY2FjaGUgPSBheE9iamVjdENhY2hlKCkpCisgICAg ICAgIGNhY2hlLT5oYW5kbGVTY3JvbGxiYXJVcGRhdGUodGhpcyk7Cit9CisKK3ZvaWQgRnJhbWVW aWV3Ojp3aWxsUmVtb3ZlU2Nyb2xsYmFyKFNjcm9sbGJhciogc2Nyb2xsYmFyLCBTY3JvbGxiYXJP cmllbnRhdGlvbiBvcmllbnRhdGlvbikKK3sKKyAgICBTY3JvbGxhYmxlQXJlYTo6d2lsbFJlbW92 ZVNjcm9sbGJhcihzY3JvbGxiYXIsIG9yaWVudGF0aW9uKTsKKyAgICBpZiAoQVhPYmplY3RDYWNo ZSogY2FjaGUgPSBheE9iamVjdENhY2hlKCkpIHsKKyAgICAgICAgY2FjaGUtPnJlbW92ZShzY3Jv bGxiYXIpOworICAgICAgICBjYWNoZS0+aGFuZGxlU2Nyb2xsYmFyVXBkYXRlKHRoaXMpOworICAg IH0KK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGFnZS9GcmFtZVZpZXcuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgKaW5k ZXggMTg5ODk2NC4uNjNkNzFhOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFt ZVZpZXcuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oCkBAIC0zOCw2ICsz OCw3IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAorY2xhc3MgQVhPYmplY3RDYWNoZTsKIGNs YXNzIEVsZW1lbnQ7CiBjbGFzcyBFdmVudDsKIGNsYXNzIEZsb2F0U2l6ZTsKQEAgLTQ4NCw2ICs0 ODUsMTAgQEAgcHJpdmF0ZToKICNlbmRpZgogI2VuZGlmCiAKKyAgICAvLyBPdmVycmlkZSBzY3Jv bGxiYXIgbm90aWZpY2F0aW9ucyB0byB1cGRhdGUgdGhlIEFYT2JqZWN0IGNhY2hlLgorICAgIHZp cnR1YWwgdm9pZCBkaWRBZGRTY3JvbGxiYXIoU2Nyb2xsYmFyKiwgU2Nyb2xsYmFyT3JpZW50YXRp b24pIE9WRVJSSURFOworICAgIHZpcnR1YWwgdm9pZCB3aWxsUmVtb3ZlU2Nyb2xsYmFyKFNjcm9s bGJhciosIFNjcm9sbGJhck9yaWVudGF0aW9uKSBPVkVSUklERTsKKwogICAgIHZvaWQgc2NoZWR1 bGVSZXNpemVFdmVudCgpOwogICAgIHZvaWQgc2VuZFJlc2l6ZUV2ZW50KCk7CiAgICAgdm9pZCBk ZWxheWVkUmVzaXplRXZlbnRUaW1lckZpcmVkKFRpbWVyPEZyYW1lVmlldz4qKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuY3BwIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5jcHAKaW5kZXggZmQ4Yzc4Mi4uN2U3OWNiZCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5jcHAKQEAgLTI2LDcgKzI2LDYgQEAKICNpbmNs dWRlICJjb25maWcuaCIKICNpbmNsdWRlICJTY3JvbGxWaWV3LmgiCiAKLSNpbmNsdWRlICJBWE9i amVjdENhY2hlLmgiCiAjaW5jbHVkZSAiR3JhcGhpY3NDb250ZXh0LmgiCiAjaW5jbHVkZSAiR3Jh cGhpY3NMYXllci5oIgogI2luY2x1ZGUgIkhvc3RXaW5kb3cuaCIKQEAgLTkxLDE2ICs5MCwxMyBA QCB2b2lkIFNjcm9sbFZpZXc6OnNldEhhc0hvcml6b250YWxTY3JvbGxiYXIoYm9vbCBoYXNCYXIp CiAgICAgaWYgKGhhc0JhciAmJiAhbV9ob3Jpem9udGFsU2Nyb2xsYmFyKSB7CiAgICAgICAgIG1f aG9yaXpvbnRhbFNjcm9sbGJhciA9IGNyZWF0ZVNjcm9sbGJhcihIb3Jpem9udGFsU2Nyb2xsYmFy KTsKICAgICAgICAgYWRkQ2hpbGQobV9ob3Jpem9udGFsU2Nyb2xsYmFyLmdldCgpKTsKLSAgICAg ICAgZGlkQWRkSG9yaXpvbnRhbFNjcm9sbGJhcihtX2hvcml6b250YWxTY3JvbGxiYXIuZ2V0KCkp OworICAgICAgICBkaWRBZGRTY3JvbGxiYXIobV9ob3Jpem9udGFsU2Nyb2xsYmFyLmdldCgpLCBI b3Jpem9udGFsU2Nyb2xsYmFyKTsKICAgICAgICAgbV9ob3Jpem9udGFsU2Nyb2xsYmFyLT5zdHls ZUNoYW5nZWQoKTsKICAgICB9IGVsc2UgaWYgKCFoYXNCYXIgJiYgbV9ob3Jpem9udGFsU2Nyb2xs YmFyKSB7Ci0gICAgICAgIHdpbGxSZW1vdmVIb3Jpem9udGFsU2Nyb2xsYmFyKG1faG9yaXpvbnRh bFNjcm9sbGJhci5nZXQoKSk7CisgICAgICAgIHdpbGxSZW1vdmVTY3JvbGxiYXIobV9ob3Jpem9u dGFsU2Nyb2xsYmFyLmdldCgpLCBIb3Jpem9udGFsU2Nyb2xsYmFyKTsKICAgICAgICAgcmVtb3Zl Q2hpbGQobV9ob3Jpem9udGFsU2Nyb2xsYmFyLmdldCgpKTsKICAgICAgICAgbV9ob3Jpem9udGFs U2Nyb2xsYmFyID0gMDsKICAgICB9Ci0gICAgCi0gICAgaWYgKEFYT2JqZWN0Q2FjaGUqIGNhY2hl ID0gYXhPYmplY3RDYWNoZSgpKQotICAgICAgICBjYWNoZS0+aGFuZGxlU2Nyb2xsYmFyVXBkYXRl KHRoaXMpOwogfQogCiB2b2lkIFNjcm9sbFZpZXc6OnNldEhhc1ZlcnRpY2FsU2Nyb2xsYmFyKGJv b2wgaGFzQmFyKQpAQCAtMTA5LDE2ICsxMDUsMTMgQEAgdm9pZCBTY3JvbGxWaWV3OjpzZXRIYXNW ZXJ0aWNhbFNjcm9sbGJhcihib29sIGhhc0JhcikKICAgICBpZiAoaGFzQmFyICYmICFtX3ZlcnRp Y2FsU2Nyb2xsYmFyKSB7CiAgICAgICAgIG1fdmVydGljYWxTY3JvbGxiYXIgPSBjcmVhdGVTY3Jv bGxiYXIoVmVydGljYWxTY3JvbGxiYXIpOwogICAgICAgICBhZGRDaGlsZChtX3ZlcnRpY2FsU2Ny b2xsYmFyLmdldCgpKTsKLSAgICAgICAgZGlkQWRkVmVydGljYWxTY3JvbGxiYXIobV92ZXJ0aWNh bFNjcm9sbGJhci5nZXQoKSk7CisgICAgICAgIGRpZEFkZFNjcm9sbGJhcihtX3ZlcnRpY2FsU2Ny b2xsYmFyLmdldCgpLCBWZXJ0aWNhbFNjcm9sbGJhcik7CiAgICAgICAgIG1fdmVydGljYWxTY3Jv bGxiYXItPnN0eWxlQ2hhbmdlZCgpOwogICAgIH0gZWxzZSBpZiAoIWhhc0JhciAmJiBtX3ZlcnRp Y2FsU2Nyb2xsYmFyKSB7Ci0gICAgICAgIHdpbGxSZW1vdmVWZXJ0aWNhbFNjcm9sbGJhcihtX3Zl cnRpY2FsU2Nyb2xsYmFyLmdldCgpKTsKKyAgICAgICAgd2lsbFJlbW92ZVNjcm9sbGJhcihtX3Zl cnRpY2FsU2Nyb2xsYmFyLmdldCgpLCBWZXJ0aWNhbFNjcm9sbGJhcik7CiAgICAgICAgIHJlbW92 ZUNoaWxkKG1fdmVydGljYWxTY3JvbGxiYXIuZ2V0KCkpOwogICAgICAgICBtX3ZlcnRpY2FsU2Ny b2xsYmFyID0gMDsKICAgICB9Ci0gICAgCi0gICAgaWYgKEFYT2JqZWN0Q2FjaGUqIGNhY2hlID0g YXhPYmplY3RDYWNoZSgpKQotICAgICAgICBjYWNoZS0+aGFuZGxlU2Nyb2xsYmFyVXBkYXRlKHRo aXMpOwogfQogCiAjaWYgIVBMQVRGT1JNKEdUSykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL1Njcm9sbGFibGVBcmVhLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Nj cm9sbGFibGVBcmVhLmNwcAppbmRleCAwOGE2MjZiLi4wNmUzOTY4IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vU2Nyb2xsYWJsZUFyZWEuY3BwCkBAIC0yNjEsMzAgKzI2MSwyMyBAQCB2b2lk IFNjcm9sbGFibGVBcmVhOjpmaW5pc2hDdXJyZW50U2Nyb2xsQW5pbWF0aW9ucygpIGNvbnN0CiAg ICAgICAgIHNjcm9sbEFuaW1hdG9yLT5maW5pc2hDdXJyZW50U2Nyb2xsQW5pbWF0aW9ucygpOwog fQogCi12b2lkIFNjcm9sbGFibGVBcmVhOjpkaWRBZGRWZXJ0aWNhbFNjcm9sbGJhcihTY3JvbGxi YXIqIHNjcm9sbGJhcikKK3ZvaWQgU2Nyb2xsYWJsZUFyZWE6OmRpZEFkZFNjcm9sbGJhcihTY3Jv bGxiYXIqIHNjcm9sbGJhciwgU2Nyb2xsYmFyT3JpZW50YXRpb24gb3JpZW50YXRpb24pCiB7Ci0g ICAgc2Nyb2xsQW5pbWF0b3IoKS0+ZGlkQWRkVmVydGljYWxTY3JvbGxiYXIoc2Nyb2xsYmFyKTsK LQotICAgIC8vIDxyZGFyOi8vcHJvYmxlbS85Nzk3MjUzPiBBcHBLaXQgcmVzZXRzIHRoZSBzY3Jv bGxiYXIncyBzdHlsZSB3aGVuIHlvdSBhdHRhY2ggYSBzY3JvbGxiYXIKLSAgICBzZXRTY3JvbGxi YXJPdmVybGF5U3R5bGUoc2Nyb2xsYmFyT3ZlcmxheVN0eWxlKCkpOwotfQotCi12b2lkIFNjcm9s bGFibGVBcmVhOjp3aWxsUmVtb3ZlVmVydGljYWxTY3JvbGxiYXIoU2Nyb2xsYmFyKiBzY3JvbGxi YXIpCi17Ci0gICAgc2Nyb2xsQW5pbWF0b3IoKS0+d2lsbFJlbW92ZVZlcnRpY2FsU2Nyb2xsYmFy KHNjcm9sbGJhcik7Ci19Ci0KLXZvaWQgU2Nyb2xsYWJsZUFyZWE6OmRpZEFkZEhvcml6b250YWxT Y3JvbGxiYXIoU2Nyb2xsYmFyKiBzY3JvbGxiYXIpCi17Ci0gICAgc2Nyb2xsQW5pbWF0b3IoKS0+ ZGlkQWRkSG9yaXpvbnRhbFNjcm9sbGJhcihzY3JvbGxiYXIpOworICAgIGlmIChvcmllbnRhdGlv biA9PSBWZXJ0aWNhbFNjcm9sbGJhcikKKyAgICAgICAgc2Nyb2xsQW5pbWF0b3IoKS0+ZGlkQWRk VmVydGljYWxTY3JvbGxiYXIoc2Nyb2xsYmFyKTsKKyAgICBlbHNlCisgICAgICAgIHNjcm9sbEFu aW1hdG9yKCktPmRpZEFkZEhvcml6b250YWxTY3JvbGxiYXIoc2Nyb2xsYmFyKTsKIAogICAgIC8v IDxyZGFyOi8vcHJvYmxlbS85Nzk3MjUzPiBBcHBLaXQgcmVzZXRzIHRoZSBzY3JvbGxiYXIncyBz dHlsZSB3aGVuIHlvdSBhdHRhY2ggYSBzY3JvbGxiYXIKICAgICBzZXRTY3JvbGxiYXJPdmVybGF5 U3R5bGUoc2Nyb2xsYmFyT3ZlcmxheVN0eWxlKCkpOwogfQogCi12b2lkIFNjcm9sbGFibGVBcmVh Ojp3aWxsUmVtb3ZlSG9yaXpvbnRhbFNjcm9sbGJhcihTY3JvbGxiYXIqIHNjcm9sbGJhcikKK3Zv aWQgU2Nyb2xsYWJsZUFyZWE6OndpbGxSZW1vdmVTY3JvbGxiYXIoU2Nyb2xsYmFyKiBzY3JvbGxi YXIsIFNjcm9sbGJhck9yaWVudGF0aW9uIG9yaWVudGF0aW9uKQogewotICAgIHNjcm9sbEFuaW1h dG9yKCktPndpbGxSZW1vdmVIb3Jpem9udGFsU2Nyb2xsYmFyKHNjcm9sbGJhcik7CisgICAgaWYg KG9yaWVudGF0aW9uID09IFZlcnRpY2FsU2Nyb2xsYmFyKQorICAgICAgICBzY3JvbGxBbmltYXRv cigpLT53aWxsUmVtb3ZlVmVydGljYWxTY3JvbGxiYXIoc2Nyb2xsYmFyKTsKKyAgICBlbHNlCisg ICAgICAgIHNjcm9sbEFuaW1hdG9yKCktPndpbGxSZW1vdmVIb3Jpem9udGFsU2Nyb2xsYmFyKHNj cm9sbGJhcik7CiB9CiAKIHZvaWQgU2Nyb2xsYWJsZUFyZWE6OmNvbnRlbnRzUmVzaXplZCgpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5oIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYWJsZUFyZWEuaAppbmRleCA0MzM0ZmNlLi5jN2Nh OGM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGFibGVBcmVhLmgKQEAgLTgzLDEw ICs4Myw4IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgZmluaXNoQ3VycmVudFNjcm9sbEFuaW1hdGlv bnMoKSBjb25zdDsKIAotICAgIHZvaWQgZGlkQWRkVmVydGljYWxTY3JvbGxiYXIoU2Nyb2xsYmFy Kik7Ci0gICAgdm9pZCB3aWxsUmVtb3ZlVmVydGljYWxTY3JvbGxiYXIoU2Nyb2xsYmFyKik7Ci0g ICAgdmlydHVhbCB2b2lkIGRpZEFkZEhvcml6b250YWxTY3JvbGxiYXIoU2Nyb2xsYmFyKik7Ci0g ICAgdmlydHVhbCB2b2lkIHdpbGxSZW1vdmVIb3Jpem9udGFsU2Nyb2xsYmFyKFNjcm9sbGJhciop OworICAgIHZpcnR1YWwgdm9pZCBkaWRBZGRTY3JvbGxiYXIoU2Nyb2xsYmFyKiwgU2Nyb2xsYmFy T3JpZW50YXRpb24pOworICAgIHZpcnR1YWwgdm9pZCB3aWxsUmVtb3ZlU2Nyb2xsYmFyKFNjcm9s bGJhciosIFNjcm9sbGJhck9yaWVudGF0aW9uKTsKIAogICAgIHZpcnR1YWwgdm9pZCBjb250ZW50 c1Jlc2l6ZWQoKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xs YmFyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGJhci5jcHAKaW5kZXggZGI5 MjU1Mi4uMGUxYjJmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xs YmFyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxiYXIuY3BwCkBAIC0z OCw5ICszOCw2IEBACiAjZW5kaWYKIAogLy8gRklYTUU6IFRoZSBmb2xsb3dpbmcgI2luY2x1ZGVz IGFyZSBhIGxheWVyaW5nIHZpb2xhdGlvbiBhbmQgc2hvdWxkIGJlIHJlbW92ZWQuCi0jaW5jbHVk ZSAiQVhPYmplY3RDYWNoZS5oIgotI2luY2x1ZGUgIkFjY2Vzc2liaWxpdHlTY3JvbGxiYXIuaCIK LSNpbmNsdWRlICJEb2N1bWVudC5oIgogI2luY2x1ZGUgIkV2ZW50SGFuZGxlci5oIgogI2luY2x1 ZGUgIkZyYW1lLmgiCiAjaW5jbHVkZSAiRnJhbWVWaWV3LmgiCkBAIC0xMTAsOSArMTA3LDYgQEAg U2Nyb2xsYmFyOjpTY3JvbGxiYXIoU2Nyb2xsYWJsZUFyZWEqIHNjcm9sbGFibGVBcmVhLCBTY3Jv bGxiYXJPcmllbnRhdGlvbiBvcmllbnQKIAogU2Nyb2xsYmFyOjp+U2Nyb2xsYmFyKCkKIHsKLSAg ICBpZiAoQVhPYmplY3RDYWNoZSogY2FjaGUgPSBleGlzdGluZ0FYT2JqZWN0Q2FjaGUoKSkKLSAg ICAgICAgY2FjaGUtPnJlbW92ZSh0aGlzKTsKLSAgICAKICAgICBzdG9wVGltZXJJZk5lZWRlZCgp OwogICAgIAogICAgIG1fdGhlbWUtPnVucmVnaXN0ZXJTY3JvbGxiYXIodGhpcyk7CkBAIC01Njcs MTQgKzU2MSw2IEBAIGJvb2wgU2Nyb2xsYmFyOjppc1dpbmRvd0FjdGl2ZSgpIGNvbnN0CiAgICAg cmV0dXJuIG1fc2Nyb2xsYWJsZUFyZWEgJiYgbV9zY3JvbGxhYmxlQXJlYS0+aXNBY3RpdmUoKTsK IH0KIAotQVhPYmplY3RDYWNoZSogU2Nyb2xsYmFyOjpleGlzdGluZ0FYT2JqZWN0Q2FjaGUoKSBj b25zdAotewotICAgIGlmICghcGFyZW50KCkpCi0gICAgICAgIHJldHVybiAwOwotICAgIAotICAg IHJldHVybiBwYXJlbnQoKS0+YXhPYmplY3RDYWNoZSgpOwotfQotCiB2b2lkIFNjcm9sbGJhcjo6 aW52YWxpZGF0ZVJlY3QoY29uc3QgSW50UmVjdCYgcmVjdCkKIHsKICAgICBpZiAoc3VwcHJlc3NJ bnZhbGlkYXRpb24oKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9s bGJhci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYmFyLmgKaW5kZXggZDU3NGNj Ni4uMDBjNzYxOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYmFy LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYmFyLmgKQEAgLTIwNiw3ICsy MDYsNiBAQCBwcm90ZWN0ZWQ6CiAKIHByaXZhdGU6CiAgICAgdmlydHVhbCBib29sIGlzU2Nyb2xs YmFyKCkgY29uc3QgeyByZXR1cm4gdHJ1ZTsgfQotICAgIHZpcnR1YWwgQVhPYmplY3RDYWNoZSog ZXhpc3RpbmdBWE9iamVjdENhY2hlKCkgY29uc3Q7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJD b3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9XaWRnZXQuaCBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL1dpZGdldC5oCmluZGV4IGU3ZjFlNTkuLjFhZGZmODUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1dpZGdldC5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL1dpZGdldC5oCkBAIC05Nyw3ICs5Nyw2IEBAIHR5cGVkZWYgUGxhdGZvcm1X aWRnZXQgUGxhdGZvcm1QYWdlQ2xpZW50OwogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLWNsYXNz IEFYT2JqZWN0Q2FjaGU7CiBjbGFzcyBDdXJzb3I7CiBjbGFzcyBFdmVudDsKIGNsYXNzIEZvbnQ7 CkBAIC0yMzEsOSArMjMwLDYgQEAgcHVibGljOgogICAgIHZpcnR1YWwgSW50UG9pbnQgY29udmVy dFRvQ29udGFpbmluZ1ZpZXcoY29uc3QgSW50UG9pbnQmKSBjb25zdDsKICAgICB2aXJ0dWFsIElu dFBvaW50IGNvbnZlcnRGcm9tQ29udGFpbmluZ1ZpZXcoY29uc3QgSW50UG9pbnQmKSBjb25zdDsK IAotICAgIC8vIEEgbWVhbnMgdG8gYWNjZXNzIHRoZSBBWCBjYWNoZSB3aGVuIHRoaXMgb2JqZWN0 IGNhbiBnZXQgYSBwb2ludGVyIHRvIGl0LgotICAgIHZpcnR1YWwgQVhPYmplY3RDYWNoZSogYXhP YmplY3RDYWNoZSgpIGNvbnN0IHsgcmV0dXJuIDA7IH0KLSAgICAKIHByaXZhdGU6CiAgICAgdm9p ZCBpbml0KFBsYXRmb3JtV2lkZ2V0KTsgLy8gTXVzdCBiZSBjYWxsZWQgYnkgYWxsIFdpZGdldCBj b25zdHJ1Y3RvcnMgdG8gaW5pdGlhbGl6ZSBjcm9zcy1wbGF0Zm9ybSBkYXRhLgogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsQW5pbWF0b3JNYWMuaCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TY3JvbGxBbmltYXRvck1hYy5oCmluZGV4IGE2YTg3 MDYuLjY0YmVmMDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TY3Jv bGxBbmltYXRvck1hYy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TY3JvbGxB bmltYXRvck1hYy5oCkBAIC0xMTUsMTAgKzExNSw4IEBAIHByaXZhdGU6CiAKICAgICB2aXJ0dWFs IHZvaWQgZmluaXNoQ3VycmVudFNjcm9sbEFuaW1hdGlvbnMoKTsKIAotICAgIHZpcnR1YWwgdm9p ZCBkaWRBZGRWZXJ0aWNhbFNjcm9sbGJhcihTY3JvbGxiYXIqKTsKLSAgICB2aXJ0dWFsIHZvaWQg d2lsbFJlbW92ZVZlcnRpY2FsU2Nyb2xsYmFyKFNjcm9sbGJhciopOwotICAgIHZpcnR1YWwgdm9p ZCBkaWRBZGRIb3Jpem9udGFsU2Nyb2xsYmFyKFNjcm9sbGJhciopOwotICAgIHZpcnR1YWwgdm9p ZCB3aWxsUmVtb3ZlSG9yaXpvbnRhbFNjcm9sbGJhcihTY3JvbGxiYXIqKTsKKyAgICB2aXJ0dWFs IHZvaWQgZGlkQWRkU2Nyb2xsYmFyKFNjcm9sbGJhciosIFNjcm9sbGJhck9yaWVudGF0aW9uKTsK KyAgICB2aXJ0dWFsIHZvaWQgd2lsbFJlbW92ZVNjcm9sbGJhcihTY3JvbGxiYXIqLCBTY3JvbGxi YXJPcmllbnRhdGlvbik7CiAKICAgICB2aXJ0dWFsIGJvb2wgc2hvdWxkU2Nyb2xsYmFyUGFydGlj aXBhdGVJbkhpdFRlc3RpbmcoU2Nyb2xsYmFyKik7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL21hYy9TY3JvbGxBbmltYXRvck1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL21hYy9TY3JvbGxBbmltYXRvck1hYy5tbQppbmRleCBjMGJhODc0Li43NTM4MzdlIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsQW5pbWF0b3JNYWMu bW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Njcm9sbEFuaW1hdG9yTWFjLm1t CkBAIC04ODYsNyArODg2LDcgQEAgdm9pZCBTY3JvbGxBbmltYXRvck1hYzo6ZmluaXNoQ3VycmVu dFNjcm9sbEFuaW1hdGlvbnMoKQogICAgIH0KIH0KIAotdm9pZCBTY3JvbGxBbmltYXRvck1hYzo6 ZGlkQWRkVmVydGljYWxTY3JvbGxiYXIoU2Nyb2xsYmFyKiBzY3JvbGxiYXIpCit2b2lkIFNjcm9s bEFuaW1hdG9yTWFjOjpkaWRBZGRTY3JvbGxiYXIoU2Nyb2xsYmFyKiBzY3JvbGxiYXIsIFNjcm9s bGJhck9yaWVudGF0aW9uIG9yaWVudGF0aW9uKQogewogICAgIGlmICghaXNTY3JvbGxiYXJPdmVy bGF5QVBJQXZhaWxhYmxlKCkpCiAgICAgICAgIHJldHVybjsKQEAgLTg5NSw1MSArODk1LDI1IEBA IHZvaWQgU2Nyb2xsQW5pbWF0b3JNYWM6OmRpZEFkZFZlcnRpY2FsU2Nyb2xsYmFyKFNjcm9sbGJh ciogc2Nyb2xsYmFyKQogICAgIGlmICghcGFpbnRlcikKICAgICAgICAgcmV0dXJuOwogCi0gICAg QVNTRVJUKCFtX3ZlcnRpY2FsU2Nyb2xsYmFyUGFpbnRlckRlbGVnYXRlKTsKLSAgICBtX3ZlcnRp Y2FsU2Nyb2xsYmFyUGFpbnRlckRlbGVnYXRlLmFkb3B0TlMoW1tXZWJTY3JvbGxiYXJQYWludGVy RGVsZWdhdGUgYWxsb2NdIGluaXRXaXRoU2Nyb2xsYmFyOnNjcm9sbGJhcl0pOworICAgIGlmIChv cmllbnRhdGlvbiA9PSBWZXJ0aWNhbFNjcm9sbGJhcikgeworICAgICAgICBBU1NFUlQoIW1fdmVy dGljYWxTY3JvbGxiYXJQYWludGVyRGVsZWdhdGUpOworICAgICAgICBtX3ZlcnRpY2FsU2Nyb2xs YmFyUGFpbnRlckRlbGVnYXRlLmFkb3B0TlMoW1tXZWJTY3JvbGxiYXJQYWludGVyRGVsZWdhdGUg YWxsb2NdIGluaXRXaXRoU2Nyb2xsYmFyOnNjcm9sbGJhcl0pOwogCi0gICAgW3BhaW50ZXIgc2V0 RGVsZWdhdGU6bV92ZXJ0aWNhbFNjcm9sbGJhclBhaW50ZXJEZWxlZ2F0ZS5nZXQoKV07Ci0gICAg W21fc2Nyb2xsYmFyUGFpbnRlckNvbnRyb2xsZXIuZ2V0KCkgc2V0VmVydGljYWxTY3JvbGxlcklt cDpwYWludGVyXTsKLSAgICBpZiAoc2Nyb2xsYWJsZUFyZWEoKS0+aW5MaXZlUmVzaXplKCkpCi0g ICAgICAgIFtwYWludGVyIHNldEtub2JBbHBoYToxXTsKLX0KLQotdm9pZCBTY3JvbGxBbmltYXRv ck1hYzo6d2lsbFJlbW92ZVZlcnRpY2FsU2Nyb2xsYmFyKFNjcm9sbGJhciogc2Nyb2xsYmFyKQot ewotICAgIGlmICghaXNTY3JvbGxiYXJPdmVybGF5QVBJQXZhaWxhYmxlKCkpCi0gICAgICAgIHJl dHVybjsKLQotICAgIFNjcm9sbGJhclBhaW50ZXIgcGFpbnRlciA9IHNjcm9sbGJhclBhaW50ZXJG b3JTY3JvbGxiYXIoc2Nyb2xsYmFyKTsKLSAgICBpZiAoIXBhaW50ZXIpCi0gICAgICAgIHJldHVy bjsKLQotICAgIEFTU0VSVChtX3ZlcnRpY2FsU2Nyb2xsYmFyUGFpbnRlckRlbGVnYXRlKTsKLSAg ICBbbV92ZXJ0aWNhbFNjcm9sbGJhclBhaW50ZXJEZWxlZ2F0ZS5nZXQoKSBpbnZhbGlkYXRlXTsK LSAgICBtX3ZlcnRpY2FsU2Nyb2xsYmFyUGFpbnRlckRlbGVnYXRlID0gbnVsbHB0cjsKLQotICAg IFtwYWludGVyIHNldERlbGVnYXRlOm5pbF07Ci0gICAgW21fc2Nyb2xsYmFyUGFpbnRlckNvbnRy b2xsZXIuZ2V0KCkgc2V0VmVydGljYWxTY3JvbGxlckltcDpuaWxdOwotfQotCi12b2lkIFNjcm9s bEFuaW1hdG9yTWFjOjpkaWRBZGRIb3Jpem9udGFsU2Nyb2xsYmFyKFNjcm9sbGJhciogc2Nyb2xs YmFyKQotewotICAgIGlmICghaXNTY3JvbGxiYXJPdmVybGF5QVBJQXZhaWxhYmxlKCkpCi0gICAg ICAgIHJldHVybjsKLQotICAgIFNjcm9sbGJhclBhaW50ZXIgcGFpbnRlciA9IHNjcm9sbGJhclBh aW50ZXJGb3JTY3JvbGxiYXIoc2Nyb2xsYmFyKTsKLSAgICBpZiAoIXBhaW50ZXIpCi0gICAgICAg IHJldHVybjsKKyAgICAgICAgW3BhaW50ZXIgc2V0RGVsZWdhdGU6bV92ZXJ0aWNhbFNjcm9sbGJh clBhaW50ZXJEZWxlZ2F0ZS5nZXQoKV07CisgICAgICAgIFttX3Njcm9sbGJhclBhaW50ZXJDb250 cm9sbGVyLmdldCgpIHNldFZlcnRpY2FsU2Nyb2xsZXJJbXA6cGFpbnRlcl07CisgICAgfSBlbHNl IHsKKyAgICAgICAgQVNTRVJUKCFtX2hvcml6b250YWxTY3JvbGxiYXJQYWludGVyRGVsZWdhdGUp OworICAgICAgICBtX2hvcml6b250YWxTY3JvbGxiYXJQYWludGVyRGVsZWdhdGUuYWRvcHROUyhb W1dlYlNjcm9sbGJhclBhaW50ZXJEZWxlZ2F0ZSBhbGxvY10gaW5pdFdpdGhTY3JvbGxiYXI6c2Ny b2xsYmFyXSk7CiAKLSAgICBBU1NFUlQoIW1faG9yaXpvbnRhbFNjcm9sbGJhclBhaW50ZXJEZWxl Z2F0ZSk7Ci0gICAgbV9ob3Jpem9udGFsU2Nyb2xsYmFyUGFpbnRlckRlbGVnYXRlLmFkb3B0TlMo W1tXZWJTY3JvbGxiYXJQYWludGVyRGVsZWdhdGUgYWxsb2NdIGluaXRXaXRoU2Nyb2xsYmFyOnNj cm9sbGJhcl0pOworICAgICAgICBbcGFpbnRlciBzZXREZWxlZ2F0ZTptX2hvcml6b250YWxTY3Jv bGxiYXJQYWludGVyRGVsZWdhdGUuZ2V0KCldOworICAgICAgICBbbV9zY3JvbGxiYXJQYWludGVy Q29udHJvbGxlci5nZXQoKSBzZXRIb3Jpem9udGFsU2Nyb2xsZXJJbXA6cGFpbnRlcl07CisgICAg fQogCi0gICAgW3BhaW50ZXIgc2V0RGVsZWdhdGU6bV9ob3Jpem9udGFsU2Nyb2xsYmFyUGFpbnRl ckRlbGVnYXRlLmdldCgpXTsKLSAgICBbbV9zY3JvbGxiYXJQYWludGVyQ29udHJvbGxlci5nZXQo KSBzZXRIb3Jpem9udGFsU2Nyb2xsZXJJbXA6cGFpbnRlcl07CiAgICAgaWYgKHNjcm9sbGFibGVB cmVhKCktPmluTGl2ZVJlc2l6ZSgpKQogICAgICAgICBbcGFpbnRlciBzZXRLbm9iQWxwaGE6MV07 CiB9CiAKLXZvaWQgU2Nyb2xsQW5pbWF0b3JNYWM6OndpbGxSZW1vdmVIb3Jpem9udGFsU2Nyb2xs YmFyKFNjcm9sbGJhciogc2Nyb2xsYmFyKQordm9pZCBTY3JvbGxBbmltYXRvck1hYzo6d2lsbFJl bW92ZVNjcm9sbGJhcihTY3JvbGxiYXIqIHNjcm9sbGJhciwgU2Nyb2xsYmFyT3JpZW50YXRpb24g b3JpZW50YXRpb24pCiB7CiAgICAgaWYgKCFpc1Njcm9sbGJhck92ZXJsYXlBUElBdmFpbGFibGUo KSkKICAgICAgICAgcmV0dXJuOwpAQCAtOTQ4LDEyICs5MjIsMjEgQEAgdm9pZCBTY3JvbGxBbmlt YXRvck1hYzo6d2lsbFJlbW92ZUhvcml6b250YWxTY3JvbGxiYXIoU2Nyb2xsYmFyKiBzY3JvbGxi YXIpCiAgICAgaWYgKCFwYWludGVyKQogICAgICAgICByZXR1cm47CiAKLSAgICBBU1NFUlQobV9o b3Jpem9udGFsU2Nyb2xsYmFyUGFpbnRlckRlbGVnYXRlKTsKLSAgICBbbV9ob3Jpem9udGFsU2Ny b2xsYmFyUGFpbnRlckRlbGVnYXRlLmdldCgpIGludmFsaWRhdGVdOwotICAgIG1faG9yaXpvbnRh bFNjcm9sbGJhclBhaW50ZXJEZWxlZ2F0ZSA9IG51bGxwdHI7CisgICAgaWYgKG9yaWVudGF0aW9u ID09IFZlcnRpY2FsU2Nyb2xsYmFyKSB7CisgICAgICAgIEFTU0VSVChtX3ZlcnRpY2FsU2Nyb2xs YmFyUGFpbnRlckRlbGVnYXRlKTsKKyAgICAgICAgW21fdmVydGljYWxTY3JvbGxiYXJQYWludGVy RGVsZWdhdGUuZ2V0KCkgaW52YWxpZGF0ZV07CisgICAgICAgIG1fdmVydGljYWxTY3JvbGxiYXJQ YWludGVyRGVsZWdhdGUgPSBudWxscHRyOwogCi0gICAgW3BhaW50ZXIgc2V0RGVsZWdhdGU6bmls XTsKLSAgICBbbV9zY3JvbGxiYXJQYWludGVyQ29udHJvbGxlci5nZXQoKSBzZXRIb3Jpem9udGFs U2Nyb2xsZXJJbXA6bmlsXTsKKyAgICAgICAgW3BhaW50ZXIgc2V0RGVsZWdhdGU6bmlsXTsKKyAg ICAgICAgW21fc2Nyb2xsYmFyUGFpbnRlckNvbnRyb2xsZXIuZ2V0KCkgc2V0VmVydGljYWxTY3Jv bGxlckltcDpuaWxdOworICAgIH0gZWxzZSB7CisgICAgICAgIEFTU0VSVChtX2hvcml6b250YWxT Y3JvbGxiYXJQYWludGVyRGVsZWdhdGUpOworICAgICAgICBbbV9ob3Jpem9udGFsU2Nyb2xsYmFy UGFpbnRlckRlbGVnYXRlLmdldCgpIGludmFsaWRhdGVdOworICAgICAgICBtX2hvcml6b250YWxT Y3JvbGxiYXJQYWludGVyRGVsZWdhdGUgPSBudWxscHRyOworCisgICAgICAgIFtwYWludGVyIHNl dERlbGVnYXRlOm5pbF07CisgICAgICAgIFttX3Njcm9sbGJhclBhaW50ZXJDb250cm9sbGVyLmdl dCgpIHNldEhvcml6b250YWxTY3JvbGxlckltcDpuaWxdOworICAgIH0KIH0KIAogYm9vbCBTY3Jv bGxBbmltYXRvck1hYzo6c2hvdWxkU2Nyb2xsYmFyUGFydGljaXBhdGVJbkhpdFRlc3RpbmcoU2Ny b2xsYmFyKiBzY3JvbGxiYXIpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyTGF5ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNw cAppbmRleCAxNzk0ZGVkLi4yOGVmOTY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJMYXllci5jcHAKQEAgLTI4NzgsMTAgKzI4NzgsNyBAQCBQYXNzUmVmUHRyPFNjcm9sbGJhcj4g UmVuZGVyTGF5ZXI6OmNyZWF0ZVNjcm9sbGJhcihTY3JvbGxiYXJPcmllbnRhdGlvbiBvcmllbnRh dAogICAgICAgICB3aWRnZXQgPSBSZW5kZXJTY3JvbGxiYXI6OmNyZWF0ZUN1c3RvbVNjcm9sbGJh cih0aGlzLCBvcmllbnRhdGlvbiwgYWN0dWFsUmVuZGVyZXItPm5vZGUoKSk7CiAgICAgZWxzZSB7 CiAgICAgICAgIHdpZGdldCA9IFNjcm9sbGJhcjo6Y3JlYXRlTmF0aXZlU2Nyb2xsYmFyKHRoaXMs IG9yaWVudGF0aW9uLCBSZWd1bGFyU2Nyb2xsYmFyKTsKLSAgICAgICAgaWYgKG9yaWVudGF0aW9u ID09IEhvcml6b250YWxTY3JvbGxiYXIpCi0gICAgICAgICAgICBkaWRBZGRIb3Jpem9udGFsU2Ny b2xsYmFyKHdpZGdldC5nZXQoKSk7Ci0gICAgICAgIGVsc2UgCi0gICAgICAgICAgICBkaWRBZGRW ZXJ0aWNhbFNjcm9sbGJhcih3aWRnZXQuZ2V0KCkpOworICAgICAgICBkaWRBZGRTY3JvbGxiYXIo d2lkZ2V0LmdldCgpLCBvcmllbnRhdGlvbik7CiAgICAgfQogICAgIHJlbmRlcmVyKCktPmRvY3Vt ZW50KCktPnZpZXcoKS0+YWRkQ2hpbGQod2lkZ2V0LmdldCgpKTsgICAgICAgIAogICAgIHJldHVy biB3aWRnZXQucmVsZWFzZSgpOwpAQCAtMjg5MywxMiArMjg5MCw4IEBAIHZvaWQgUmVuZGVyTGF5 ZXI6OmRlc3Ryb3lTY3JvbGxiYXIoU2Nyb2xsYmFyT3JpZW50YXRpb24gb3JpZW50YXRpb24pCiAg ICAgaWYgKCFzY3JvbGxiYXIpCiAgICAgICAgIHJldHVybjsKIAotICAgIGlmICghc2Nyb2xsYmFy LT5pc0N1c3RvbVNjcm9sbGJhcigpKSB7Ci0gICAgICAgIGlmIChvcmllbnRhdGlvbiA9PSBIb3Jp em9udGFsU2Nyb2xsYmFyKQotICAgICAgICAgICAgd2lsbFJlbW92ZUhvcml6b250YWxTY3JvbGxi YXIoc2Nyb2xsYmFyLmdldCgpKTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgd2lsbFJlbW92 ZVZlcnRpY2FsU2Nyb2xsYmFyKHNjcm9sbGJhci5nZXQoKSk7Ci0gICAgfQorICAgIGlmICghc2Ny b2xsYmFyLT5pc0N1c3RvbVNjcm9sbGJhcigpKQorICAgICAgICB3aWxsUmVtb3ZlU2Nyb2xsYmFy KHNjcm9sbGJhci5nZXQoKSwgb3JpZW50YXRpb24pOwogCiAgICAgc2Nyb2xsYmFyLT5yZW1vdmVG cm9tUGFyZW50KCk7CiAgICAgc2Nyb2xsYmFyLT5kaXNjb25uZWN0RnJvbVNjcm9sbGFibGVBcmVh KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlzdEJveC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlzdEJveC5jcHAKaW5kZXggNGEz ZDgwYS4uNDU5YTcwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckxpc3RCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaXN0Qm94 LmNwcApAQCAtODQ5LDcgKzg0OSw3IEBAIFBhc3NSZWZQdHI8U2Nyb2xsYmFyPiBSZW5kZXJMaXN0 Qm94OjpjcmVhdGVTY3JvbGxiYXIoKQogICAgICAgICB3aWRnZXQgPSBSZW5kZXJTY3JvbGxiYXI6 OmNyZWF0ZUN1c3RvbVNjcm9sbGJhcih0aGlzLCBWZXJ0aWNhbFNjcm9sbGJhciwgdGhpcy0+bm9k ZSgpKTsKICAgICBlbHNlIHsKICAgICAgICAgd2lkZ2V0ID0gU2Nyb2xsYmFyOjpjcmVhdGVOYXRp dmVTY3JvbGxiYXIodGhpcywgVmVydGljYWxTY3JvbGxiYXIsIHRoZW1lKCktPnNjcm9sbGJhckNv bnRyb2xTaXplRm9yUGFydChMaXN0Ym94UGFydCkpOwotICAgICAgICBkaWRBZGRWZXJ0aWNhbFNj cm9sbGJhcih3aWRnZXQuZ2V0KCkpOworICAgICAgICBkaWRBZGRTY3JvbGxiYXIod2lkZ2V0Lmdl dCgpLCBWZXJ0aWNhbFNjcm9sbGJhcik7CiAgICAgfQogICAgIGRvY3VtZW50KCktPnZpZXcoKS0+ YWRkQ2hpbGQod2lkZ2V0LmdldCgpKTsgICAgICAgIAogICAgIHJldHVybiB3aWRnZXQucmVsZWFz ZSgpOwpAQCAtODYxLDcgKzg2MSw3IEBAIHZvaWQgUmVuZGVyTGlzdEJveDo6ZGVzdHJveVNjcm9s bGJhcigpCiAgICAgICAgIHJldHVybjsKIAogICAgIGlmICghbV92QmFyLT5pc0N1c3RvbVNjcm9s bGJhcigpKQotICAgICAgICBTY3JvbGxhYmxlQXJlYTo6d2lsbFJlbW92ZVZlcnRpY2FsU2Nyb2xs YmFyKG1fdkJhci5nZXQoKSk7CisgICAgICAgIFNjcm9sbGFibGVBcmVhOjp3aWxsUmVtb3ZlU2Ny b2xsYmFyKG1fdkJhci5nZXQoKSwgVmVydGljYWxTY3JvbGxiYXIpOwogICAgIG1fdkJhci0+cmVt b3ZlRnJvbVBhcmVudCgpOwogICAgIG1fdkJhci0+ZGlzY29ubmVjdEZyb21TY3JvbGxhYmxlQXJl YSgpOwogICAgIG1fdkJhciA9IDA7Cg== 198340 2013-04-16 10:01:33 -0700 2013-04-16 11:18:02 -0700 Another try to fix the mac build wcore-axobject-cache-violations.diff text/plain 15272 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBjOTY2MzY1Li5kNDZkN2U1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDcg QEAKKzIwMTMtMDQtMTYgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFdpZGdldCBzaG91bGQgbm90IGRlcGVuZCBvbiBBWE9iamVjdENhY2hlCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTQ1MTQKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3ZlIEFYT2Jq ZWN0Q2FjaGUgdXNhZ2UgZnJvbSBwbGF0Zm9ybSBmaWxlcyB0byBGcmFtZVZpZXcuCisKKyAgICAg ICAgKiBXZWJDb3JlLmV4cC5pbjogVXBkYXRlIHN5bWJvbHMuCisgICAgICAgICogcGFnZS9GcmFt ZVZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3OjpkaWRBZGRTY3JvbGxiYXIp OiBIYW5kbGUgc2Nyb2xsYmFyIHVwZGF0ZXMgaW4KKyAgICAgICAgQVhPYmplY3RDYWNoZS4KKyAg ICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6d2lsbFJlbW92ZVNjcm9sbGJhcik6IEhhbmRsZSBz Y3JvbGxiYXIKKyAgICAgICAgdXBkYXRlcyBpbiBBWE9iamVjdENhY2hlIGFuZCByZW1vdmUgdGhl IHNjcm9sbGJhciBmcm9tIHRoZSBjYWNoZS4KKyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5oOgor ICAgICAgICAqIHBsYXRmb3JtL1Njcm9sbFZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Ny b2xsVmlldzo6c2V0SGFzSG9yaXpvbnRhbFNjcm9sbGJhcik6IFVzZQorICAgICAgICBkaWRBZGRT Y3JvbGxiYXIvd2lsbFJlbW92ZVNjcm9sbGJhcgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsVmll dzo6c2V0SGFzVmVydGljYWxTY3JvbGxiYXIpOiBEaXR0by4KKyAgICAgICAgKiBwbGF0Zm9ybS9T Y3JvbGxhYmxlQXJlYS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxhYmxlQXJlYTo6ZGlk QWRkU2Nyb2xsYmFyKTogVGhpcyBpcyB0aGUgb2xkCisgICAgICAgIGRpZEFkZFZlcnRpY2FsU2Ny b2xsYmFyIGFuZCBkaWRBZGRIb3Jpem9udGFsU2Nyb2xsYmFyIGpvaW5lZCBpbiBhCisgICAgICAg IHNpbmdsZSBtZXRob2QgdGhhdCByZWNlaXZlcyBhIFNjcm9sbGJhck9yaWVudGF0aW9uIHBhcmFt ZXRlci4KKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGFibGVBcmVhOjp3aWxsUmVtb3ZlU2Nyb2xs YmFyKTogVGhpcyBpcyB0aGUgb2xkCisgICAgICAgIHdpbGxSZW1vdmVWZXJ0aWNhbFNjcm9sbGJh ciBhbmQKKyAgICAgICAgd2lsbFJlbW92ZUhvcml6b250YWxTY3JvbGxiYXJTY3JvbGxiYXIgam9p bmVkIGluIGEgc2luZ2xlIG1ldGhvZAorICAgICAgICB0aGF0IHJlY2VpdmVzIGEgU2Nyb2xsYmFy T3JpZW50YXRpb24gcGFyYW1ldGVyLgorICAgICAgICAqIHBsYXRmb3JtL1Njcm9sbGFibGVBcmVh Lmg6CisgICAgICAgIChTY3JvbGxhYmxlQXJlYSk6CisgICAgICAgICogcGxhdGZvcm0vU2Nyb2xs YmFyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGJhcjo6flNjcm9sbGJhcik6IFJlbW92 ZSBBWE9iamVjdENhY2hlIHVzYWdlLgorICAgICAgICAqIHBsYXRmb3JtL1Njcm9sbGJhci5oOgor ICAgICAgICAqIHBsYXRmb3JtL1dpZGdldC5oOgorICAgICAgICAoV2lkZ2V0KTogUmVtb3ZlIGF4 T2JqZWN0Q2FjaGUoKSBtZXRob2QuCisgICAgICAgICogcGxhdGZvcm0vbWFjL1Njcm9sbEFuaW1h dG9yTWFjLmg6CisgICAgICAgIChTY3JvbGxBbmltYXRvck1hYyk6CisgICAgICAgICogcmVuZGVy aW5nL1JlbmRlckxheWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpjcmVh dGVTY3JvbGxiYXIpOiBVc2UgZGlkQWRkU2Nyb2xsYmFyLgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyTGF5ZXI6OmRlc3Ryb3lTY3JvbGxiYXIpOiBVc2Ugd2lsbFJlbW92ZVNjcm9sbGJhci4KKyAg ICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGlzdEJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJMaXN0Qm94OjpjcmVhdGVTY3JvbGxiYXIpOiBVc2UgZGlkQWRkU2Nyb2xsYmFyLgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyTGlzdEJveDo6ZGVzdHJveVNjcm9sbGJhcik6IFVzZSB3aWxs UmVtb3ZlU2Nyb2xsYmFyLgorCiAyMDEzLTA0LTEzICBBbmRyZWFzIEtsaW5nICA8YWtsaW5nQGFw cGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OKHIxNDgxMjgpOiB3aW5kb3cucmVzaXplVG8g ZG9lc24ndCB3b3JrIGZyb20gU2FmYXJpIGFkZHJlc3MgYmFyLgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvV2ViQ29yZS5leHAuaW4gYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgpp bmRleCAyM2MxZTI3Li40ZDVjZTQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3Jl LmV4cC5pbgorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgpAQCAtMzY1LDE5ICsz NjUsMTcgQEAgX19aTjdXZWJDb3JlMTRTY2hlbWVSZWdpc3RyeTU3cmVtb3ZlVVJMU2NoZW1lUmVn aXN0ZXJlZEFzQnlwYXNzaW5nQ29udGVudFNlY3VyaXQKIF9fWk43V2ViQ29yZTE0U2NoZW1lUmVn aXN0cnk1OHJlZ2lzdGVyVVJMU2NoZW1lQXNBbGxvd2luZ0RhdGFiYXNlQWNjZXNzSW5Qcml2YXRl QnJvd3NpbmdFUktOM1dURjZTdHJpbmdFCiBfX1pON1dlYkNvcmUxNFNjaGVtZVJlZ2lzdHJ5NjJy ZWdpc3RlclVSTFNjaGVtZUFzQWxsb3dpbmdMb2NhbFN0b3JhZ2VBY2Nlc3NJblByaXZhdGVCcm93 c2luZ0VSS04zV1RGNlN0cmluZ0UKIF9fWk43V2ViQ29yZTE0U2Nyb2xsYWJsZUFyZWExNWNvbnRl bnRzUmVzaXplZEV2CitfX1pON1dlYkNvcmUxNFNjcm9sbGFibGVBcmVhMTVkaWRBZGRTY3JvbGxi YXJFUE5TXzlTY3JvbGxiYXJFTlNfMjBTY3JvbGxiYXJPcmllbnRhdGlvbkUKIF9fWk43V2ViQ29y ZTE0U2Nyb2xsYWJsZUFyZWExNmhhbmRsZVdoZWVsRXZlbnRFUktOU18xOFBsYXRmb3JtV2hlZWxF dmVudEUKIF9fWk43V2ViQ29yZTE0U2Nyb2xsYWJsZUFyZWExN3dpbGxFbmRMaXZlUmVzaXplRXYK K19fWk43V2ViQ29yZTE0U2Nyb2xsYWJsZUFyZWExOXdpbGxSZW1vdmVTY3JvbGxiYXJFUE5TXzlT Y3JvbGxiYXJFTlNfMjBTY3JvbGxiYXJPcmllbnRhdGlvbkUKIF9fWk43V2ViQ29yZTE0U2Nyb2xs YWJsZUFyZWExOXdpbGxTdGFydExpdmVSZXNpemVFdgogX19aTjdXZWJDb3JlMTRTY3JvbGxhYmxl QXJlYTE5aW52YWxpZGF0ZVNjcm9sbGJhckVQTlNfOVNjcm9sbGJhckVSS05TXzdJbnRSZWN0RQog X19aTks3V2ViQ29yZTE0U2Nyb2xsYWJsZUFyZWEyMW1vdXNlRW50ZXJlZFNjcm9sbGJhckVQTlNf OVNjcm9sbGJhckUKIF9fWk43V2ViQ29yZTE0U2Nyb2xsYWJsZUFyZWEyMmludmFsaWRhdGVTY3Jv bGxDb3JuZXJFUktOU183SW50UmVjdEUKLV9fWk43V2ViQ29yZTE0U2Nyb2xsYWJsZUFyZWEyM2Rp ZEFkZFZlcnRpY2FsU2Nyb2xsYmFyRVBOU185U2Nyb2xsYmFyRQogX19aTjdXZWJDb3JlMTRTY3Jv bGxhYmxlQXJlYTI0c2V0U2Nyb2xsYmFyT3ZlcmxheVN0eWxlRU5TXzIxU2Nyb2xsYmFyT3Zlcmxh eVN0eWxlRQotX19aTjdXZWJDb3JlMTRTY3JvbGxhYmxlQXJlYTI1ZGlkQWRkSG9yaXpvbnRhbFNj cm9sbGJhckVQTlNfOVNjcm9sbGJhckUKLV9fWk43V2ViQ29yZTE0U2Nyb2xsYWJsZUFyZWEyN3dp bGxSZW1vdmVWZXJ0aWNhbFNjcm9sbGJhckVQTlNfOVNjcm9sbGJhckUKIF9fWk43V2ViQ29yZTE0 U2Nyb2xsYWJsZUFyZWEyN25vdGlmeVNjcm9sbFBvc2l0aW9uQ2hhbmdlZEVSS05TXzhJbnRQb2lu dEUKIF9fWk43V2ViQ29yZTE0U2Nyb2xsYWJsZUFyZWEyOHNldFNjcm9sbE9mZnNldEZyb21JbnRl cm5hbHNFUktOU184SW50UG9pbnRFCi1fX1pON1dlYkNvcmUxNFNjcm9sbGFibGVBcmVhMjl3aWxs UmVtb3ZlSG9yaXpvbnRhbFNjcm9sbGJhckVQTlNfOVNjcm9sbGJhckUKIF9fWk43V2ViQ29yZTE0 U2Nyb2xsYWJsZUFyZWEzMHNjcm9sbFRvT2Zmc2V0V2l0aG91dEFuaW1hdGlvbkVSS05TXzEwRmxv YXRQb2ludEUKIF9fWk43V2ViQ29yZTE0U2Nyb2xsYWJsZUFyZWE2c2Nyb2xsRU5TXzE1U2Nyb2xs RGlyZWN0aW9uRU5TXzE3U2Nyb2xsR3JhbnVsYXJpdHlFZgogX19aTjdXZWJDb3JlMTRTY3JvbGxh YmxlQXJlYUMyRXYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAppbmRleCAwMzZiMzQyLi44ZGY3 NTQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCkBAIC00MTI2LDQgKzQxMjYsMjAgQEAg dm9pZCBGcmFtZVZpZXc6OnNldFNjcm9sbGluZ1BlcmZvcm1hbmNlTG9nZ2luZ0VuYWJsZWQoYm9v bCBmbGFnKQogI2VuZGlmCiB9CiAKK3ZvaWQgRnJhbWVWaWV3OjpkaWRBZGRTY3JvbGxiYXIoU2Ny b2xsYmFyKiBzY3JvbGxiYXIsIFNjcm9sbGJhck9yaWVudGF0aW9uIG9yaWVudGF0aW9uKQorewor ICAgIFNjcm9sbGFibGVBcmVhOjpkaWRBZGRTY3JvbGxiYXIoc2Nyb2xsYmFyLCBvcmllbnRhdGlv bik7CisgICAgaWYgKEFYT2JqZWN0Q2FjaGUqIGNhY2hlID0gYXhPYmplY3RDYWNoZSgpKQorICAg ICAgICBjYWNoZS0+aGFuZGxlU2Nyb2xsYmFyVXBkYXRlKHRoaXMpOworfQorCit2b2lkIEZyYW1l Vmlldzo6d2lsbFJlbW92ZVNjcm9sbGJhcihTY3JvbGxiYXIqIHNjcm9sbGJhciwgU2Nyb2xsYmFy T3JpZW50YXRpb24gb3JpZW50YXRpb24pCit7CisgICAgU2Nyb2xsYWJsZUFyZWE6OndpbGxSZW1v dmVTY3JvbGxiYXIoc2Nyb2xsYmFyLCBvcmllbnRhdGlvbik7CisgICAgaWYgKEFYT2JqZWN0Q2Fj aGUqIGNhY2hlID0gYXhPYmplY3RDYWNoZSgpKSB7CisgICAgICAgIGNhY2hlLT5yZW1vdmUoc2Ny b2xsYmFyKTsKKyAgICAgICAgY2FjaGUtPmhhbmRsZVNjcm9sbGJhclVwZGF0ZSh0aGlzKTsKKyAg ICB9Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BhZ2UvRnJhbWVWaWV3LmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oCmlu ZGV4IDE4OTg5NjQuLjYzZDcxYTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJh bWVWaWV3LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaApAQCAtMzgsNiAr MzgsNyBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKK2NsYXNzIEFYT2JqZWN0Q2FjaGU7CiBj bGFzcyBFbGVtZW50OwogY2xhc3MgRXZlbnQ7CiBjbGFzcyBGbG9hdFNpemU7CkBAIC00ODQsNiAr NDg1LDEwIEBAIHByaXZhdGU6CiAjZW5kaWYKICNlbmRpZgogCisgICAgLy8gT3ZlcnJpZGUgc2Ny b2xsYmFyIG5vdGlmaWNhdGlvbnMgdG8gdXBkYXRlIHRoZSBBWE9iamVjdCBjYWNoZS4KKyAgICB2 aXJ0dWFsIHZvaWQgZGlkQWRkU2Nyb2xsYmFyKFNjcm9sbGJhciosIFNjcm9sbGJhck9yaWVudGF0 aW9uKSBPVkVSUklERTsKKyAgICB2aXJ0dWFsIHZvaWQgd2lsbFJlbW92ZVNjcm9sbGJhcihTY3Jv bGxiYXIqLCBTY3JvbGxiYXJPcmllbnRhdGlvbikgT1ZFUlJJREU7CisKICAgICB2b2lkIHNjaGVk dWxlUmVzaXplRXZlbnQoKTsKICAgICB2b2lkIHNlbmRSZXNpemVFdmVudCgpOwogICAgIHZvaWQg ZGVsYXllZFJlc2l6ZUV2ZW50VGltZXJGaXJlZChUaW1lcjxGcmFtZVZpZXc+Kik7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmNwcCBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuY3BwCmluZGV4IGZkOGM3ODIuLjdlNzljYmQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuY3BwCkBAIC0yNiw3ICsyNiw2IEBACiAjaW5j bHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiU2Nyb2xsVmlldy5oIgogCi0jaW5jbHVkZSAiQVhP YmplY3RDYWNoZS5oIgogI2luY2x1ZGUgIkdyYXBoaWNzQ29udGV4dC5oIgogI2luY2x1ZGUgIkdy YXBoaWNzTGF5ZXIuaCIKICNpbmNsdWRlICJIb3N0V2luZG93LmgiCkBAIC05MSwxNiArOTAsMTMg QEAgdm9pZCBTY3JvbGxWaWV3OjpzZXRIYXNIb3Jpem9udGFsU2Nyb2xsYmFyKGJvb2wgaGFzQmFy KQogICAgIGlmIChoYXNCYXIgJiYgIW1faG9yaXpvbnRhbFNjcm9sbGJhcikgewogICAgICAgICBt X2hvcml6b250YWxTY3JvbGxiYXIgPSBjcmVhdGVTY3JvbGxiYXIoSG9yaXpvbnRhbFNjcm9sbGJh cik7CiAgICAgICAgIGFkZENoaWxkKG1faG9yaXpvbnRhbFNjcm9sbGJhci5nZXQoKSk7Ci0gICAg ICAgIGRpZEFkZEhvcml6b250YWxTY3JvbGxiYXIobV9ob3Jpem9udGFsU2Nyb2xsYmFyLmdldCgp KTsKKyAgICAgICAgZGlkQWRkU2Nyb2xsYmFyKG1faG9yaXpvbnRhbFNjcm9sbGJhci5nZXQoKSwg SG9yaXpvbnRhbFNjcm9sbGJhcik7CiAgICAgICAgIG1faG9yaXpvbnRhbFNjcm9sbGJhci0+c3R5 bGVDaGFuZ2VkKCk7CiAgICAgfSBlbHNlIGlmICghaGFzQmFyICYmIG1faG9yaXpvbnRhbFNjcm9s bGJhcikgewotICAgICAgICB3aWxsUmVtb3ZlSG9yaXpvbnRhbFNjcm9sbGJhcihtX2hvcml6b250 YWxTY3JvbGxiYXIuZ2V0KCkpOworICAgICAgICB3aWxsUmVtb3ZlU2Nyb2xsYmFyKG1faG9yaXpv bnRhbFNjcm9sbGJhci5nZXQoKSwgSG9yaXpvbnRhbFNjcm9sbGJhcik7CiAgICAgICAgIHJlbW92 ZUNoaWxkKG1faG9yaXpvbnRhbFNjcm9sbGJhci5nZXQoKSk7CiAgICAgICAgIG1faG9yaXpvbnRh bFNjcm9sbGJhciA9IDA7CiAgICAgfQotICAgIAotICAgIGlmIChBWE9iamVjdENhY2hlKiBjYWNo ZSA9IGF4T2JqZWN0Q2FjaGUoKSkKLSAgICAgICAgY2FjaGUtPmhhbmRsZVNjcm9sbGJhclVwZGF0 ZSh0aGlzKTsKIH0KIAogdm9pZCBTY3JvbGxWaWV3OjpzZXRIYXNWZXJ0aWNhbFNjcm9sbGJhcihi b29sIGhhc0JhcikKQEAgLTEwOSwxNiArMTA1LDEzIEBAIHZvaWQgU2Nyb2xsVmlldzo6c2V0SGFz VmVydGljYWxTY3JvbGxiYXIoYm9vbCBoYXNCYXIpCiAgICAgaWYgKGhhc0JhciAmJiAhbV92ZXJ0 aWNhbFNjcm9sbGJhcikgewogICAgICAgICBtX3ZlcnRpY2FsU2Nyb2xsYmFyID0gY3JlYXRlU2Ny b2xsYmFyKFZlcnRpY2FsU2Nyb2xsYmFyKTsKICAgICAgICAgYWRkQ2hpbGQobV92ZXJ0aWNhbFNj cm9sbGJhci5nZXQoKSk7Ci0gICAgICAgIGRpZEFkZFZlcnRpY2FsU2Nyb2xsYmFyKG1fdmVydGlj YWxTY3JvbGxiYXIuZ2V0KCkpOworICAgICAgICBkaWRBZGRTY3JvbGxiYXIobV92ZXJ0aWNhbFNj cm9sbGJhci5nZXQoKSwgVmVydGljYWxTY3JvbGxiYXIpOwogICAgICAgICBtX3ZlcnRpY2FsU2Ny b2xsYmFyLT5zdHlsZUNoYW5nZWQoKTsKICAgICB9IGVsc2UgaWYgKCFoYXNCYXIgJiYgbV92ZXJ0 aWNhbFNjcm9sbGJhcikgewotICAgICAgICB3aWxsUmVtb3ZlVmVydGljYWxTY3JvbGxiYXIobV92 ZXJ0aWNhbFNjcm9sbGJhci5nZXQoKSk7CisgICAgICAgIHdpbGxSZW1vdmVTY3JvbGxiYXIobV92 ZXJ0aWNhbFNjcm9sbGJhci5nZXQoKSwgVmVydGljYWxTY3JvbGxiYXIpOwogICAgICAgICByZW1v dmVDaGlsZChtX3ZlcnRpY2FsU2Nyb2xsYmFyLmdldCgpKTsKICAgICAgICAgbV92ZXJ0aWNhbFNj cm9sbGJhciA9IDA7CiAgICAgfQotICAgIAotICAgIGlmIChBWE9iamVjdENhY2hlKiBjYWNoZSA9 IGF4T2JqZWN0Q2FjaGUoKSkKLSAgICAgICAgY2FjaGUtPmhhbmRsZVNjcm9sbGJhclVwZGF0ZSh0 aGlzKTsKIH0KIAogI2lmICFQTEFURk9STShHVEspCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9T Y3JvbGxhYmxlQXJlYS5jcHAKaW5kZXggMDhhNjI2Yi4uMDZlMzk2OCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYWJsZUFyZWEuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL1Njcm9sbGFibGVBcmVhLmNwcApAQCAtMjYxLDMwICsyNjEsMjMgQEAgdm9p ZCBTY3JvbGxhYmxlQXJlYTo6ZmluaXNoQ3VycmVudFNjcm9sbEFuaW1hdGlvbnMoKSBjb25zdAog ICAgICAgICBzY3JvbGxBbmltYXRvci0+ZmluaXNoQ3VycmVudFNjcm9sbEFuaW1hdGlvbnMoKTsK IH0KIAotdm9pZCBTY3JvbGxhYmxlQXJlYTo6ZGlkQWRkVmVydGljYWxTY3JvbGxiYXIoU2Nyb2xs YmFyKiBzY3JvbGxiYXIpCit2b2lkIFNjcm9sbGFibGVBcmVhOjpkaWRBZGRTY3JvbGxiYXIoU2Ny b2xsYmFyKiBzY3JvbGxiYXIsIFNjcm9sbGJhck9yaWVudGF0aW9uIG9yaWVudGF0aW9uKQogewot ICAgIHNjcm9sbEFuaW1hdG9yKCktPmRpZEFkZFZlcnRpY2FsU2Nyb2xsYmFyKHNjcm9sbGJhcik7 Ci0KLSAgICAvLyA8cmRhcjovL3Byb2JsZW0vOTc5NzI1Mz4gQXBwS2l0IHJlc2V0cyB0aGUgc2Ny b2xsYmFyJ3Mgc3R5bGUgd2hlbiB5b3UgYXR0YWNoIGEgc2Nyb2xsYmFyCi0gICAgc2V0U2Nyb2xs YmFyT3ZlcmxheVN0eWxlKHNjcm9sbGJhck92ZXJsYXlTdHlsZSgpKTsKLX0KLQotdm9pZCBTY3Jv bGxhYmxlQXJlYTo6d2lsbFJlbW92ZVZlcnRpY2FsU2Nyb2xsYmFyKFNjcm9sbGJhciogc2Nyb2xs YmFyKQotewotICAgIHNjcm9sbEFuaW1hdG9yKCktPndpbGxSZW1vdmVWZXJ0aWNhbFNjcm9sbGJh cihzY3JvbGxiYXIpOwotfQotCi12b2lkIFNjcm9sbGFibGVBcmVhOjpkaWRBZGRIb3Jpem9udGFs U2Nyb2xsYmFyKFNjcm9sbGJhciogc2Nyb2xsYmFyKQotewotICAgIHNjcm9sbEFuaW1hdG9yKCkt PmRpZEFkZEhvcml6b250YWxTY3JvbGxiYXIoc2Nyb2xsYmFyKTsKKyAgICBpZiAob3JpZW50YXRp b24gPT0gVmVydGljYWxTY3JvbGxiYXIpCisgICAgICAgIHNjcm9sbEFuaW1hdG9yKCktPmRpZEFk ZFZlcnRpY2FsU2Nyb2xsYmFyKHNjcm9sbGJhcik7CisgICAgZWxzZQorICAgICAgICBzY3JvbGxB bmltYXRvcigpLT5kaWRBZGRIb3Jpem9udGFsU2Nyb2xsYmFyKHNjcm9sbGJhcik7CiAKICAgICAv LyA8cmRhcjovL3Byb2JsZW0vOTc5NzI1Mz4gQXBwS2l0IHJlc2V0cyB0aGUgc2Nyb2xsYmFyJ3Mg c3R5bGUgd2hlbiB5b3UgYXR0YWNoIGEgc2Nyb2xsYmFyCiAgICAgc2V0U2Nyb2xsYmFyT3Zlcmxh eVN0eWxlKHNjcm9sbGJhck92ZXJsYXlTdHlsZSgpKTsKIH0KIAotdm9pZCBTY3JvbGxhYmxlQXJl YTo6d2lsbFJlbW92ZUhvcml6b250YWxTY3JvbGxiYXIoU2Nyb2xsYmFyKiBzY3JvbGxiYXIpCit2 b2lkIFNjcm9sbGFibGVBcmVhOjp3aWxsUmVtb3ZlU2Nyb2xsYmFyKFNjcm9sbGJhciogc2Nyb2xs YmFyLCBTY3JvbGxiYXJPcmllbnRhdGlvbiBvcmllbnRhdGlvbikKIHsKLSAgICBzY3JvbGxBbmlt YXRvcigpLT53aWxsUmVtb3ZlSG9yaXpvbnRhbFNjcm9sbGJhcihzY3JvbGxiYXIpOworICAgIGlm IChvcmllbnRhdGlvbiA9PSBWZXJ0aWNhbFNjcm9sbGJhcikKKyAgICAgICAgc2Nyb2xsQW5pbWF0 b3IoKS0+d2lsbFJlbW92ZVZlcnRpY2FsU2Nyb2xsYmFyKHNjcm9sbGJhcik7CisgICAgZWxzZQor ICAgICAgICBzY3JvbGxBbmltYXRvcigpLT53aWxsUmVtb3ZlSG9yaXpvbnRhbFNjcm9sbGJhcihz Y3JvbGxiYXIpOwogfQogCiB2b2lkIFNjcm9sbGFibGVBcmVhOjpjb250ZW50c1Jlc2l6ZWQoKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYWJsZUFyZWEuaCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGFibGVBcmVhLmgKaW5kZXggNDMzNGZjZS4uYzdj YThjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYWJsZUFyZWEu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5oCkBAIC04Mywx MCArODMsOCBAQCBwdWJsaWM6CiAKICAgICB2b2lkIGZpbmlzaEN1cnJlbnRTY3JvbGxBbmltYXRp b25zKCkgY29uc3Q7CiAKLSAgICB2b2lkIGRpZEFkZFZlcnRpY2FsU2Nyb2xsYmFyKFNjcm9sbGJh ciopOwotICAgIHZvaWQgd2lsbFJlbW92ZVZlcnRpY2FsU2Nyb2xsYmFyKFNjcm9sbGJhciopOwot ICAgIHZpcnR1YWwgdm9pZCBkaWRBZGRIb3Jpem9udGFsU2Nyb2xsYmFyKFNjcm9sbGJhciopOwot ICAgIHZpcnR1YWwgdm9pZCB3aWxsUmVtb3ZlSG9yaXpvbnRhbFNjcm9sbGJhcihTY3JvbGxiYXIq KTsKKyAgICB2aXJ0dWFsIHZvaWQgZGlkQWRkU2Nyb2xsYmFyKFNjcm9sbGJhciosIFNjcm9sbGJh ck9yaWVudGF0aW9uKTsKKyAgICB2aXJ0dWFsIHZvaWQgd2lsbFJlbW92ZVNjcm9sbGJhcihTY3Jv bGxiYXIqLCBTY3JvbGxiYXJPcmllbnRhdGlvbik7CiAKICAgICB2aXJ0dWFsIHZvaWQgY29udGVu dHNSZXNpemVkKCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9s bGJhci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxiYXIuY3BwCmluZGV4IGRi OTI1NTIuLjBlMWIyZmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9s bGJhci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYmFyLmNwcApAQCAt MzgsOSArMzgsNiBAQAogI2VuZGlmCiAKIC8vIEZJWE1FOiBUaGUgZm9sbG93aW5nICNpbmNsdWRl cyBhcmUgYSBsYXllcmluZyB2aW9sYXRpb24gYW5kIHNob3VsZCBiZSByZW1vdmVkLgotI2luY2x1 ZGUgIkFYT2JqZWN0Q2FjaGUuaCIKLSNpbmNsdWRlICJBY2Nlc3NpYmlsaXR5U2Nyb2xsYmFyLmgi Ci0jaW5jbHVkZSAiRG9jdW1lbnQuaCIKICNpbmNsdWRlICJFdmVudEhhbmRsZXIuaCIKICNpbmNs dWRlICJGcmFtZS5oIgogI2luY2x1ZGUgIkZyYW1lVmlldy5oIgpAQCAtMTEwLDkgKzEwNyw2IEBA IFNjcm9sbGJhcjo6U2Nyb2xsYmFyKFNjcm9sbGFibGVBcmVhKiBzY3JvbGxhYmxlQXJlYSwgU2Ny b2xsYmFyT3JpZW50YXRpb24gb3JpZW50CiAKIFNjcm9sbGJhcjo6flNjcm9sbGJhcigpCiB7Ci0g ICAgaWYgKEFYT2JqZWN0Q2FjaGUqIGNhY2hlID0gZXhpc3RpbmdBWE9iamVjdENhY2hlKCkpCi0g ICAgICAgIGNhY2hlLT5yZW1vdmUodGhpcyk7Ci0gICAgCiAgICAgc3RvcFRpbWVySWZOZWVkZWQo KTsKICAgICAKICAgICBtX3RoZW1lLT51bnJlZ2lzdGVyU2Nyb2xsYmFyKHRoaXMpOwpAQCAtNTY3 LDE0ICs1NjEsNiBAQCBib29sIFNjcm9sbGJhcjo6aXNXaW5kb3dBY3RpdmUoKSBjb25zdAogICAg IHJldHVybiBtX3Njcm9sbGFibGVBcmVhICYmIG1fc2Nyb2xsYWJsZUFyZWEtPmlzQWN0aXZlKCk7 CiB9CiAKLUFYT2JqZWN0Q2FjaGUqIFNjcm9sbGJhcjo6ZXhpc3RpbmdBWE9iamVjdENhY2hlKCkg Y29uc3QKLXsKLSAgICBpZiAoIXBhcmVudCgpKQotICAgICAgICByZXR1cm4gMDsKLSAgICAKLSAg ICByZXR1cm4gcGFyZW50KCktPmF4T2JqZWN0Q2FjaGUoKTsKLX0KLQogdm9pZCBTY3JvbGxiYXI6 OmludmFsaWRhdGVSZWN0KGNvbnN0IEludFJlY3QmIHJlY3QpCiB7CiAgICAgaWYgKHN1cHByZXNz SW52YWxpZGF0aW9uKCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3Jv bGxiYXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGJhci5oCmluZGV4IGQ1NzRj YzYuLjAwYzc2MTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGJh ci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGJhci5oCkBAIC0yMDYsNyAr MjA2LDYgQEAgcHJvdGVjdGVkOgogCiBwcml2YXRlOgogICAgIHZpcnR1YWwgYm9vbCBpc1Njcm9s bGJhcigpIGNvbnN0IHsgcmV0dXJuIHRydWU7IH0KLSAgICB2aXJ0dWFsIEFYT2JqZWN0Q2FjaGUq IGV4aXN0aW5nQVhPYmplY3RDYWNoZSgpIGNvbnN0OwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2Vi Q29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vV2lkZ2V0LmggYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9XaWRnZXQuaAppbmRleCBlN2YxZTU5Li4xYWRmZjg1IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9XaWRnZXQuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9XaWRnZXQuaApAQCAtOTcsNyArOTcsNiBAQCB0eXBlZGVmIFBsYXRmb3Jt V2lkZ2V0IFBsYXRmb3JtUGFnZUNsaWVudDsKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1jbGFz cyBBWE9iamVjdENhY2hlOwogY2xhc3MgQ3Vyc29yOwogY2xhc3MgRXZlbnQ7CiBjbGFzcyBGb250 OwpAQCAtMjMxLDkgKzIzMCw2IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIEludFBvaW50IGNvbnZl cnRUb0NvbnRhaW5pbmdWaWV3KGNvbnN0IEludFBvaW50JikgY29uc3Q7CiAgICAgdmlydHVhbCBJ bnRQb2ludCBjb252ZXJ0RnJvbUNvbnRhaW5pbmdWaWV3KGNvbnN0IEludFBvaW50JikgY29uc3Q7 CiAKLSAgICAvLyBBIG1lYW5zIHRvIGFjY2VzcyB0aGUgQVggY2FjaGUgd2hlbiB0aGlzIG9iamVj dCBjYW4gZ2V0IGEgcG9pbnRlciB0byBpdC4KLSAgICB2aXJ0dWFsIEFYT2JqZWN0Q2FjaGUqIGF4 T2JqZWN0Q2FjaGUoKSBjb25zdCB7IHJldHVybiAwOyB9Ci0gICAgCiBwcml2YXRlOgogICAgIHZv aWQgaW5pdChQbGF0Zm9ybVdpZGdldCk7IC8vIE11c3QgYmUgY2FsbGVkIGJ5IGFsbCBXaWRnZXQg Y29uc3RydWN0b3JzIHRvIGluaXRpYWxpemUgY3Jvc3MtcGxhdGZvcm0gZGF0YS4KIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKaW5kZXggMTc5NGRlZC4uMjhlZjk2NyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCkBAIC0yODc4LDEwICsy ODc4LDcgQEAgUGFzc1JlZlB0cjxTY3JvbGxiYXI+IFJlbmRlckxheWVyOjpjcmVhdGVTY3JvbGxi YXIoU2Nyb2xsYmFyT3JpZW50YXRpb24gb3JpZW50YXQKICAgICAgICAgd2lkZ2V0ID0gUmVuZGVy U2Nyb2xsYmFyOjpjcmVhdGVDdXN0b21TY3JvbGxiYXIodGhpcywgb3JpZW50YXRpb24sIGFjdHVh bFJlbmRlcmVyLT5ub2RlKCkpOwogICAgIGVsc2UgewogICAgICAgICB3aWRnZXQgPSBTY3JvbGxi YXI6OmNyZWF0ZU5hdGl2ZVNjcm9sbGJhcih0aGlzLCBvcmllbnRhdGlvbiwgUmVndWxhclNjcm9s bGJhcik7Ci0gICAgICAgIGlmIChvcmllbnRhdGlvbiA9PSBIb3Jpem9udGFsU2Nyb2xsYmFyKQot ICAgICAgICAgICAgZGlkQWRkSG9yaXpvbnRhbFNjcm9sbGJhcih3aWRnZXQuZ2V0KCkpOwotICAg ICAgICBlbHNlIAotICAgICAgICAgICAgZGlkQWRkVmVydGljYWxTY3JvbGxiYXIod2lkZ2V0Lmdl dCgpKTsKKyAgICAgICAgZGlkQWRkU2Nyb2xsYmFyKHdpZGdldC5nZXQoKSwgb3JpZW50YXRpb24p OwogICAgIH0KICAgICByZW5kZXJlcigpLT5kb2N1bWVudCgpLT52aWV3KCktPmFkZENoaWxkKHdp ZGdldC5nZXQoKSk7ICAgICAgICAKICAgICByZXR1cm4gd2lkZ2V0LnJlbGVhc2UoKTsKQEAgLTI4 OTMsMTIgKzI4OTAsOCBAQCB2b2lkIFJlbmRlckxheWVyOjpkZXN0cm95U2Nyb2xsYmFyKFNjcm9s bGJhck9yaWVudGF0aW9uIG9yaWVudGF0aW9uKQogICAgIGlmICghc2Nyb2xsYmFyKQogICAgICAg ICByZXR1cm47CiAKLSAgICBpZiAoIXNjcm9sbGJhci0+aXNDdXN0b21TY3JvbGxiYXIoKSkgewot ICAgICAgICBpZiAob3JpZW50YXRpb24gPT0gSG9yaXpvbnRhbFNjcm9sbGJhcikKLSAgICAgICAg ICAgIHdpbGxSZW1vdmVIb3Jpem9udGFsU2Nyb2xsYmFyKHNjcm9sbGJhci5nZXQoKSk7Ci0gICAg ICAgIGVsc2UKLSAgICAgICAgICAgIHdpbGxSZW1vdmVWZXJ0aWNhbFNjcm9sbGJhcihzY3JvbGxi YXIuZ2V0KCkpOwotICAgIH0KKyAgICBpZiAoIXNjcm9sbGJhci0+aXNDdXN0b21TY3JvbGxiYXIo KSkKKyAgICAgICAgd2lsbFJlbW92ZVNjcm9sbGJhcihzY3JvbGxiYXIuZ2V0KCksIG9yaWVudGF0 aW9uKTsKIAogICAgIHNjcm9sbGJhci0+cmVtb3ZlRnJvbVBhcmVudCgpOwogICAgIHNjcm9sbGJh ci0+ZGlzY29ubmVjdEZyb21TY3JvbGxhYmxlQXJlYSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckxpc3RCb3guY3BwCmluZGV4IDRhM2Q4MGEuLjQ1OWE3MDMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaXN0Qm94LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlzdEJveC5jcHAKQEAgLTg0OSw3ICs4NDksNyBAQCBQ YXNzUmVmUHRyPFNjcm9sbGJhcj4gUmVuZGVyTGlzdEJveDo6Y3JlYXRlU2Nyb2xsYmFyKCkKICAg ICAgICAgd2lkZ2V0ID0gUmVuZGVyU2Nyb2xsYmFyOjpjcmVhdGVDdXN0b21TY3JvbGxiYXIodGhp cywgVmVydGljYWxTY3JvbGxiYXIsIHRoaXMtPm5vZGUoKSk7CiAgICAgZWxzZSB7CiAgICAgICAg IHdpZGdldCA9IFNjcm9sbGJhcjo6Y3JlYXRlTmF0aXZlU2Nyb2xsYmFyKHRoaXMsIFZlcnRpY2Fs U2Nyb2xsYmFyLCB0aGVtZSgpLT5zY3JvbGxiYXJDb250cm9sU2l6ZUZvclBhcnQoTGlzdGJveFBh cnQpKTsKLSAgICAgICAgZGlkQWRkVmVydGljYWxTY3JvbGxiYXIod2lkZ2V0LmdldCgpKTsKKyAg ICAgICAgZGlkQWRkU2Nyb2xsYmFyKHdpZGdldC5nZXQoKSwgVmVydGljYWxTY3JvbGxiYXIpOwog ICAgIH0KICAgICBkb2N1bWVudCgpLT52aWV3KCktPmFkZENoaWxkKHdpZGdldC5nZXQoKSk7ICAg ICAgICAKICAgICByZXR1cm4gd2lkZ2V0LnJlbGVhc2UoKTsKQEAgLTg2MSw3ICs4NjEsNyBAQCB2 b2lkIFJlbmRlckxpc3RCb3g6OmRlc3Ryb3lTY3JvbGxiYXIoKQogICAgICAgICByZXR1cm47CiAK ICAgICBpZiAoIW1fdkJhci0+aXNDdXN0b21TY3JvbGxiYXIoKSkKLSAgICAgICAgU2Nyb2xsYWJs ZUFyZWE6OndpbGxSZW1vdmVWZXJ0aWNhbFNjcm9sbGJhcihtX3ZCYXIuZ2V0KCkpOworICAgICAg ICBTY3JvbGxhYmxlQXJlYTo6d2lsbFJlbW92ZVNjcm9sbGJhcihtX3ZCYXIuZ2V0KCksIFZlcnRp Y2FsU2Nyb2xsYmFyKTsKICAgICBtX3ZCYXItPnJlbW92ZUZyb21QYXJlbnQoKTsKICAgICBtX3ZC YXItPmRpc2Nvbm5lY3RGcm9tU2Nyb2xsYWJsZUFyZWEoKTsKICAgICBtX3ZCYXIgPSAwOwo= 198347 2013-04-16 11:18:02 -0700 2013-04-20 23:36:47 -0700 Try to fix WebKit2 build wcore-axobject-cache-violations2.diff text/plain 18401 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBjOTY2MzY1Li5kNDZkN2U1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDcg QEAKKzIwMTMtMDQtMTYgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFdpZGdldCBzaG91bGQgbm90IGRlcGVuZCBvbiBBWE9iamVjdENhY2hlCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTQ1MTQKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3ZlIEFYT2Jq ZWN0Q2FjaGUgdXNhZ2UgZnJvbSBwbGF0Zm9ybSBmaWxlcyB0byBGcmFtZVZpZXcuCisKKyAgICAg ICAgKiBXZWJDb3JlLmV4cC5pbjogVXBkYXRlIHN5bWJvbHMuCisgICAgICAgICogcGFnZS9GcmFt ZVZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3OjpkaWRBZGRTY3JvbGxiYXIp OiBIYW5kbGUgc2Nyb2xsYmFyIHVwZGF0ZXMgaW4KKyAgICAgICAgQVhPYmplY3RDYWNoZS4KKyAg ICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6d2lsbFJlbW92ZVNjcm9sbGJhcik6IEhhbmRsZSBz Y3JvbGxiYXIKKyAgICAgICAgdXBkYXRlcyBpbiBBWE9iamVjdENhY2hlIGFuZCByZW1vdmUgdGhl IHNjcm9sbGJhciBmcm9tIHRoZSBjYWNoZS4KKyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5oOgor ICAgICAgICAqIHBsYXRmb3JtL1Njcm9sbFZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Ny b2xsVmlldzo6c2V0SGFzSG9yaXpvbnRhbFNjcm9sbGJhcik6IFVzZQorICAgICAgICBkaWRBZGRT Y3JvbGxiYXIvd2lsbFJlbW92ZVNjcm9sbGJhcgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsVmll dzo6c2V0SGFzVmVydGljYWxTY3JvbGxiYXIpOiBEaXR0by4KKyAgICAgICAgKiBwbGF0Zm9ybS9T Y3JvbGxhYmxlQXJlYS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxhYmxlQXJlYTo6ZGlk QWRkU2Nyb2xsYmFyKTogVGhpcyBpcyB0aGUgb2xkCisgICAgICAgIGRpZEFkZFZlcnRpY2FsU2Ny b2xsYmFyIGFuZCBkaWRBZGRIb3Jpem9udGFsU2Nyb2xsYmFyIGpvaW5lZCBpbiBhCisgICAgICAg IHNpbmdsZSBtZXRob2QgdGhhdCByZWNlaXZlcyBhIFNjcm9sbGJhck9yaWVudGF0aW9uIHBhcmFt ZXRlci4KKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGFibGVBcmVhOjp3aWxsUmVtb3ZlU2Nyb2xs YmFyKTogVGhpcyBpcyB0aGUgb2xkCisgICAgICAgIHdpbGxSZW1vdmVWZXJ0aWNhbFNjcm9sbGJh ciBhbmQKKyAgICAgICAgd2lsbFJlbW92ZUhvcml6b250YWxTY3JvbGxiYXJTY3JvbGxiYXIgam9p bmVkIGluIGEgc2luZ2xlIG1ldGhvZAorICAgICAgICB0aGF0IHJlY2VpdmVzIGEgU2Nyb2xsYmFy T3JpZW50YXRpb24gcGFyYW1ldGVyLgorICAgICAgICAqIHBsYXRmb3JtL1Njcm9sbGFibGVBcmVh Lmg6CisgICAgICAgIChTY3JvbGxhYmxlQXJlYSk6CisgICAgICAgICogcGxhdGZvcm0vU2Nyb2xs YmFyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGJhcjo6flNjcm9sbGJhcik6IFJlbW92 ZSBBWE9iamVjdENhY2hlIHVzYWdlLgorICAgICAgICAqIHBsYXRmb3JtL1Njcm9sbGJhci5oOgor ICAgICAgICAqIHBsYXRmb3JtL1dpZGdldC5oOgorICAgICAgICAoV2lkZ2V0KTogUmVtb3ZlIGF4 T2JqZWN0Q2FjaGUoKSBtZXRob2QuCisgICAgICAgICogcGxhdGZvcm0vbWFjL1Njcm9sbEFuaW1h dG9yTWFjLmg6CisgICAgICAgIChTY3JvbGxBbmltYXRvck1hYyk6CisgICAgICAgICogcmVuZGVy aW5nL1JlbmRlckxheWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpjcmVh dGVTY3JvbGxiYXIpOiBVc2UgZGlkQWRkU2Nyb2xsYmFyLgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyTGF5ZXI6OmRlc3Ryb3lTY3JvbGxiYXIpOiBVc2Ugd2lsbFJlbW92ZVNjcm9sbGJhci4KKyAg ICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGlzdEJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJMaXN0Qm94OjpjcmVhdGVTY3JvbGxiYXIpOiBVc2UgZGlkQWRkU2Nyb2xsYmFyLgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyTGlzdEJveDo6ZGVzdHJveVNjcm9sbGJhcik6IFVzZSB3aWxs UmVtb3ZlU2Nyb2xsYmFyLgorCiAyMDEzLTA0LTEzICBBbmRyZWFzIEtsaW5nICA8YWtsaW5nQGFw cGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OKHIxNDgxMjgpOiB3aW5kb3cucmVzaXplVG8g ZG9lc24ndCB3b3JrIGZyb20gU2FmYXJpIGFkZHJlc3MgYmFyLgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvV2ViQ29yZS5leHAuaW4gYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgpp bmRleCAyM2MxZTI3Li40ZDVjZTQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3Jl LmV4cC5pbgorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgpAQCAtMzY1LDE5ICsz NjUsMTcgQEAgX19aTjdXZWJDb3JlMTRTY2hlbWVSZWdpc3RyeTU3cmVtb3ZlVVJMU2NoZW1lUmVn aXN0ZXJlZEFzQnlwYXNzaW5nQ29udGVudFNlY3VyaXQKIF9fWk43V2ViQ29yZTE0U2NoZW1lUmVn aXN0cnk1OHJlZ2lzdGVyVVJMU2NoZW1lQXNBbGxvd2luZ0RhdGFiYXNlQWNjZXNzSW5Qcml2YXRl QnJvd3NpbmdFUktOM1dURjZTdHJpbmdFCiBfX1pON1dlYkNvcmUxNFNjaGVtZVJlZ2lzdHJ5NjJy ZWdpc3RlclVSTFNjaGVtZUFzQWxsb3dpbmdMb2NhbFN0b3JhZ2VBY2Nlc3NJblByaXZhdGVCcm93 c2luZ0VSS04zV1RGNlN0cmluZ0UKIF9fWk43V2ViQ29yZTE0U2Nyb2xsYWJsZUFyZWExNWNvbnRl bnRzUmVzaXplZEV2CitfX1pON1dlYkNvcmUxNFNjcm9sbGFibGVBcmVhMTVkaWRBZGRTY3JvbGxi YXJFUE5TXzlTY3JvbGxiYXJFTlNfMjBTY3JvbGxiYXJPcmllbnRhdGlvbkUKIF9fWk43V2ViQ29y ZTE0U2Nyb2xsYWJsZUFyZWExNmhhbmRsZVdoZWVsRXZlbnRFUktOU18xOFBsYXRmb3JtV2hlZWxF dmVudEUKIF9fWk43V2ViQ29yZTE0U2Nyb2xsYWJsZUFyZWExN3dpbGxFbmRMaXZlUmVzaXplRXYK K19fWk43V2ViQ29yZTE0U2Nyb2xsYWJsZUFyZWExOXdpbGxSZW1vdmVTY3JvbGxiYXJFUE5TXzlT Y3JvbGxiYXJFTlNfMjBTY3JvbGxiYXJPcmllbnRhdGlvbkUKIF9fWk43V2ViQ29yZTE0U2Nyb2xs YWJsZUFyZWExOXdpbGxTdGFydExpdmVSZXNpemVFdgogX19aTjdXZWJDb3JlMTRTY3JvbGxhYmxl QXJlYTE5aW52YWxpZGF0ZVNjcm9sbGJhckVQTlNfOVNjcm9sbGJhckVSS05TXzdJbnRSZWN0RQog X19aTks3V2ViQ29yZTE0U2Nyb2xsYWJsZUFyZWEyMW1vdXNlRW50ZXJlZFNjcm9sbGJhckVQTlNf OVNjcm9sbGJhckUKIF9fWk43V2ViQ29yZTE0U2Nyb2xsYWJsZUFyZWEyMmludmFsaWRhdGVTY3Jv bGxDb3JuZXJFUktOU183SW50UmVjdEUKLV9fWk43V2ViQ29yZTE0U2Nyb2xsYWJsZUFyZWEyM2Rp ZEFkZFZlcnRpY2FsU2Nyb2xsYmFyRVBOU185U2Nyb2xsYmFyRQogX19aTjdXZWJDb3JlMTRTY3Jv bGxhYmxlQXJlYTI0c2V0U2Nyb2xsYmFyT3ZlcmxheVN0eWxlRU5TXzIxU2Nyb2xsYmFyT3Zlcmxh eVN0eWxlRQotX19aTjdXZWJDb3JlMTRTY3JvbGxhYmxlQXJlYTI1ZGlkQWRkSG9yaXpvbnRhbFNj cm9sbGJhckVQTlNfOVNjcm9sbGJhckUKLV9fWk43V2ViQ29yZTE0U2Nyb2xsYWJsZUFyZWEyN3dp bGxSZW1vdmVWZXJ0aWNhbFNjcm9sbGJhckVQTlNfOVNjcm9sbGJhckUKIF9fWk43V2ViQ29yZTE0 U2Nyb2xsYWJsZUFyZWEyN25vdGlmeVNjcm9sbFBvc2l0aW9uQ2hhbmdlZEVSS05TXzhJbnRQb2lu dEUKIF9fWk43V2ViQ29yZTE0U2Nyb2xsYWJsZUFyZWEyOHNldFNjcm9sbE9mZnNldEZyb21JbnRl cm5hbHNFUktOU184SW50UG9pbnRFCi1fX1pON1dlYkNvcmUxNFNjcm9sbGFibGVBcmVhMjl3aWxs UmVtb3ZlSG9yaXpvbnRhbFNjcm9sbGJhckVQTlNfOVNjcm9sbGJhckUKIF9fWk43V2ViQ29yZTE0 U2Nyb2xsYWJsZUFyZWEzMHNjcm9sbFRvT2Zmc2V0V2l0aG91dEFuaW1hdGlvbkVSS05TXzEwRmxv YXRQb2ludEUKIF9fWk43V2ViQ29yZTE0U2Nyb2xsYWJsZUFyZWE2c2Nyb2xsRU5TXzE1U2Nyb2xs RGlyZWN0aW9uRU5TXzE3U2Nyb2xsR3JhbnVsYXJpdHlFZgogX19aTjdXZWJDb3JlMTRTY3JvbGxh YmxlQXJlYUMyRXYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAppbmRleCAwMzZiMzQyLi44ZGY3 NTQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCkBAIC00MTI2LDQgKzQxMjYsMjAgQEAg dm9pZCBGcmFtZVZpZXc6OnNldFNjcm9sbGluZ1BlcmZvcm1hbmNlTG9nZ2luZ0VuYWJsZWQoYm9v bCBmbGFnKQogI2VuZGlmCiB9CiAKK3ZvaWQgRnJhbWVWaWV3OjpkaWRBZGRTY3JvbGxiYXIoU2Ny b2xsYmFyKiBzY3JvbGxiYXIsIFNjcm9sbGJhck9yaWVudGF0aW9uIG9yaWVudGF0aW9uKQorewor ICAgIFNjcm9sbGFibGVBcmVhOjpkaWRBZGRTY3JvbGxiYXIoc2Nyb2xsYmFyLCBvcmllbnRhdGlv bik7CisgICAgaWYgKEFYT2JqZWN0Q2FjaGUqIGNhY2hlID0gYXhPYmplY3RDYWNoZSgpKQorICAg ICAgICBjYWNoZS0+aGFuZGxlU2Nyb2xsYmFyVXBkYXRlKHRoaXMpOworfQorCit2b2lkIEZyYW1l Vmlldzo6d2lsbFJlbW92ZVNjcm9sbGJhcihTY3JvbGxiYXIqIHNjcm9sbGJhciwgU2Nyb2xsYmFy T3JpZW50YXRpb24gb3JpZW50YXRpb24pCit7CisgICAgU2Nyb2xsYWJsZUFyZWE6OndpbGxSZW1v dmVTY3JvbGxiYXIoc2Nyb2xsYmFyLCBvcmllbnRhdGlvbik7CisgICAgaWYgKEFYT2JqZWN0Q2Fj aGUqIGNhY2hlID0gYXhPYmplY3RDYWNoZSgpKSB7CisgICAgICAgIGNhY2hlLT5yZW1vdmUoc2Ny b2xsYmFyKTsKKyAgICAgICAgY2FjaGUtPmhhbmRsZVNjcm9sbGJhclVwZGF0ZSh0aGlzKTsKKyAg ICB9Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BhZ2UvRnJhbWVWaWV3LmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oCmlu ZGV4IDE4OTg5NjQuLjYzZDcxYTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJh bWVWaWV3LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaApAQCAtMzgsNiAr MzgsNyBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKK2NsYXNzIEFYT2JqZWN0Q2FjaGU7CiBj bGFzcyBFbGVtZW50OwogY2xhc3MgRXZlbnQ7CiBjbGFzcyBGbG9hdFNpemU7CkBAIC00ODQsNiAr NDg1LDEwIEBAIHByaXZhdGU6CiAjZW5kaWYKICNlbmRpZgogCisgICAgLy8gT3ZlcnJpZGUgc2Ny b2xsYmFyIG5vdGlmaWNhdGlvbnMgdG8gdXBkYXRlIHRoZSBBWE9iamVjdCBjYWNoZS4KKyAgICB2 aXJ0dWFsIHZvaWQgZGlkQWRkU2Nyb2xsYmFyKFNjcm9sbGJhciosIFNjcm9sbGJhck9yaWVudGF0 aW9uKSBPVkVSUklERTsKKyAgICB2aXJ0dWFsIHZvaWQgd2lsbFJlbW92ZVNjcm9sbGJhcihTY3Jv bGxiYXIqLCBTY3JvbGxiYXJPcmllbnRhdGlvbikgT1ZFUlJJREU7CisKICAgICB2b2lkIHNjaGVk dWxlUmVzaXplRXZlbnQoKTsKICAgICB2b2lkIHNlbmRSZXNpemVFdmVudCgpOwogICAgIHZvaWQg ZGVsYXllZFJlc2l6ZUV2ZW50VGltZXJGaXJlZChUaW1lcjxGcmFtZVZpZXc+Kik7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmNwcCBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuY3BwCmluZGV4IGZkOGM3ODIuLjdlNzljYmQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuY3BwCkBAIC0yNiw3ICsyNiw2IEBACiAjaW5j bHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiU2Nyb2xsVmlldy5oIgogCi0jaW5jbHVkZSAiQVhP YmplY3RDYWNoZS5oIgogI2luY2x1ZGUgIkdyYXBoaWNzQ29udGV4dC5oIgogI2luY2x1ZGUgIkdy YXBoaWNzTGF5ZXIuaCIKICNpbmNsdWRlICJIb3N0V2luZG93LmgiCkBAIC05MSwxNiArOTAsMTMg QEAgdm9pZCBTY3JvbGxWaWV3OjpzZXRIYXNIb3Jpem9udGFsU2Nyb2xsYmFyKGJvb2wgaGFzQmFy KQogICAgIGlmIChoYXNCYXIgJiYgIW1faG9yaXpvbnRhbFNjcm9sbGJhcikgewogICAgICAgICBt X2hvcml6b250YWxTY3JvbGxiYXIgPSBjcmVhdGVTY3JvbGxiYXIoSG9yaXpvbnRhbFNjcm9sbGJh cik7CiAgICAgICAgIGFkZENoaWxkKG1faG9yaXpvbnRhbFNjcm9sbGJhci5nZXQoKSk7Ci0gICAg ICAgIGRpZEFkZEhvcml6b250YWxTY3JvbGxiYXIobV9ob3Jpem9udGFsU2Nyb2xsYmFyLmdldCgp KTsKKyAgICAgICAgZGlkQWRkU2Nyb2xsYmFyKG1faG9yaXpvbnRhbFNjcm9sbGJhci5nZXQoKSwg SG9yaXpvbnRhbFNjcm9sbGJhcik7CiAgICAgICAgIG1faG9yaXpvbnRhbFNjcm9sbGJhci0+c3R5 bGVDaGFuZ2VkKCk7CiAgICAgfSBlbHNlIGlmICghaGFzQmFyICYmIG1faG9yaXpvbnRhbFNjcm9s bGJhcikgewotICAgICAgICB3aWxsUmVtb3ZlSG9yaXpvbnRhbFNjcm9sbGJhcihtX2hvcml6b250 YWxTY3JvbGxiYXIuZ2V0KCkpOworICAgICAgICB3aWxsUmVtb3ZlU2Nyb2xsYmFyKG1faG9yaXpv bnRhbFNjcm9sbGJhci5nZXQoKSwgSG9yaXpvbnRhbFNjcm9sbGJhcik7CiAgICAgICAgIHJlbW92 ZUNoaWxkKG1faG9yaXpvbnRhbFNjcm9sbGJhci5nZXQoKSk7CiAgICAgICAgIG1faG9yaXpvbnRh bFNjcm9sbGJhciA9IDA7CiAgICAgfQotICAgIAotICAgIGlmIChBWE9iamVjdENhY2hlKiBjYWNo ZSA9IGF4T2JqZWN0Q2FjaGUoKSkKLSAgICAgICAgY2FjaGUtPmhhbmRsZVNjcm9sbGJhclVwZGF0 ZSh0aGlzKTsKIH0KIAogdm9pZCBTY3JvbGxWaWV3OjpzZXRIYXNWZXJ0aWNhbFNjcm9sbGJhcihi b29sIGhhc0JhcikKQEAgLTEwOSwxNiArMTA1LDEzIEBAIHZvaWQgU2Nyb2xsVmlldzo6c2V0SGFz VmVydGljYWxTY3JvbGxiYXIoYm9vbCBoYXNCYXIpCiAgICAgaWYgKGhhc0JhciAmJiAhbV92ZXJ0 aWNhbFNjcm9sbGJhcikgewogICAgICAgICBtX3ZlcnRpY2FsU2Nyb2xsYmFyID0gY3JlYXRlU2Ny b2xsYmFyKFZlcnRpY2FsU2Nyb2xsYmFyKTsKICAgICAgICAgYWRkQ2hpbGQobV92ZXJ0aWNhbFNj cm9sbGJhci5nZXQoKSk7Ci0gICAgICAgIGRpZEFkZFZlcnRpY2FsU2Nyb2xsYmFyKG1fdmVydGlj YWxTY3JvbGxiYXIuZ2V0KCkpOworICAgICAgICBkaWRBZGRTY3JvbGxiYXIobV92ZXJ0aWNhbFNj cm9sbGJhci5nZXQoKSwgVmVydGljYWxTY3JvbGxiYXIpOwogICAgICAgICBtX3ZlcnRpY2FsU2Ny b2xsYmFyLT5zdHlsZUNoYW5nZWQoKTsKICAgICB9IGVsc2UgaWYgKCFoYXNCYXIgJiYgbV92ZXJ0 aWNhbFNjcm9sbGJhcikgewotICAgICAgICB3aWxsUmVtb3ZlVmVydGljYWxTY3JvbGxiYXIobV92 ZXJ0aWNhbFNjcm9sbGJhci5nZXQoKSk7CisgICAgICAgIHdpbGxSZW1vdmVTY3JvbGxiYXIobV92 ZXJ0aWNhbFNjcm9sbGJhci5nZXQoKSwgVmVydGljYWxTY3JvbGxiYXIpOwogICAgICAgICByZW1v dmVDaGlsZChtX3ZlcnRpY2FsU2Nyb2xsYmFyLmdldCgpKTsKICAgICAgICAgbV92ZXJ0aWNhbFNj cm9sbGJhciA9IDA7CiAgICAgfQotICAgIAotICAgIGlmIChBWE9iamVjdENhY2hlKiBjYWNoZSA9 IGF4T2JqZWN0Q2FjaGUoKSkKLSAgICAgICAgY2FjaGUtPmhhbmRsZVNjcm9sbGJhclVwZGF0ZSh0 aGlzKTsKIH0KIAogI2lmICFQTEFURk9STShHVEspCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9T Y3JvbGxhYmxlQXJlYS5jcHAKaW5kZXggMDhhNjI2Yi4uMDZlMzk2OCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYWJsZUFyZWEuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL1Njcm9sbGFibGVBcmVhLmNwcApAQCAtMjYxLDMwICsyNjEsMjMgQEAgdm9p ZCBTY3JvbGxhYmxlQXJlYTo6ZmluaXNoQ3VycmVudFNjcm9sbEFuaW1hdGlvbnMoKSBjb25zdAog ICAgICAgICBzY3JvbGxBbmltYXRvci0+ZmluaXNoQ3VycmVudFNjcm9sbEFuaW1hdGlvbnMoKTsK IH0KIAotdm9pZCBTY3JvbGxhYmxlQXJlYTo6ZGlkQWRkVmVydGljYWxTY3JvbGxiYXIoU2Nyb2xs YmFyKiBzY3JvbGxiYXIpCit2b2lkIFNjcm9sbGFibGVBcmVhOjpkaWRBZGRTY3JvbGxiYXIoU2Ny b2xsYmFyKiBzY3JvbGxiYXIsIFNjcm9sbGJhck9yaWVudGF0aW9uIG9yaWVudGF0aW9uKQogewot ICAgIHNjcm9sbEFuaW1hdG9yKCktPmRpZEFkZFZlcnRpY2FsU2Nyb2xsYmFyKHNjcm9sbGJhcik7 Ci0KLSAgICAvLyA8cmRhcjovL3Byb2JsZW0vOTc5NzI1Mz4gQXBwS2l0IHJlc2V0cyB0aGUgc2Ny b2xsYmFyJ3Mgc3R5bGUgd2hlbiB5b3UgYXR0YWNoIGEgc2Nyb2xsYmFyCi0gICAgc2V0U2Nyb2xs YmFyT3ZlcmxheVN0eWxlKHNjcm9sbGJhck92ZXJsYXlTdHlsZSgpKTsKLX0KLQotdm9pZCBTY3Jv bGxhYmxlQXJlYTo6d2lsbFJlbW92ZVZlcnRpY2FsU2Nyb2xsYmFyKFNjcm9sbGJhciogc2Nyb2xs YmFyKQotewotICAgIHNjcm9sbEFuaW1hdG9yKCktPndpbGxSZW1vdmVWZXJ0aWNhbFNjcm9sbGJh cihzY3JvbGxiYXIpOwotfQotCi12b2lkIFNjcm9sbGFibGVBcmVhOjpkaWRBZGRIb3Jpem9udGFs U2Nyb2xsYmFyKFNjcm9sbGJhciogc2Nyb2xsYmFyKQotewotICAgIHNjcm9sbEFuaW1hdG9yKCkt PmRpZEFkZEhvcml6b250YWxTY3JvbGxiYXIoc2Nyb2xsYmFyKTsKKyAgICBpZiAob3JpZW50YXRp b24gPT0gVmVydGljYWxTY3JvbGxiYXIpCisgICAgICAgIHNjcm9sbEFuaW1hdG9yKCktPmRpZEFk ZFZlcnRpY2FsU2Nyb2xsYmFyKHNjcm9sbGJhcik7CisgICAgZWxzZQorICAgICAgICBzY3JvbGxB bmltYXRvcigpLT5kaWRBZGRIb3Jpem9udGFsU2Nyb2xsYmFyKHNjcm9sbGJhcik7CiAKICAgICAv LyA8cmRhcjovL3Byb2JsZW0vOTc5NzI1Mz4gQXBwS2l0IHJlc2V0cyB0aGUgc2Nyb2xsYmFyJ3Mg c3R5bGUgd2hlbiB5b3UgYXR0YWNoIGEgc2Nyb2xsYmFyCiAgICAgc2V0U2Nyb2xsYmFyT3Zlcmxh eVN0eWxlKHNjcm9sbGJhck92ZXJsYXlTdHlsZSgpKTsKIH0KIAotdm9pZCBTY3JvbGxhYmxlQXJl YTo6d2lsbFJlbW92ZUhvcml6b250YWxTY3JvbGxiYXIoU2Nyb2xsYmFyKiBzY3JvbGxiYXIpCit2 b2lkIFNjcm9sbGFibGVBcmVhOjp3aWxsUmVtb3ZlU2Nyb2xsYmFyKFNjcm9sbGJhciogc2Nyb2xs YmFyLCBTY3JvbGxiYXJPcmllbnRhdGlvbiBvcmllbnRhdGlvbikKIHsKLSAgICBzY3JvbGxBbmlt YXRvcigpLT53aWxsUmVtb3ZlSG9yaXpvbnRhbFNjcm9sbGJhcihzY3JvbGxiYXIpOworICAgIGlm IChvcmllbnRhdGlvbiA9PSBWZXJ0aWNhbFNjcm9sbGJhcikKKyAgICAgICAgc2Nyb2xsQW5pbWF0 b3IoKS0+d2lsbFJlbW92ZVZlcnRpY2FsU2Nyb2xsYmFyKHNjcm9sbGJhcik7CisgICAgZWxzZQor ICAgICAgICBzY3JvbGxBbmltYXRvcigpLT53aWxsUmVtb3ZlSG9yaXpvbnRhbFNjcm9sbGJhcihz Y3JvbGxiYXIpOwogfQogCiB2b2lkIFNjcm9sbGFibGVBcmVhOjpjb250ZW50c1Jlc2l6ZWQoKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYWJsZUFyZWEuaCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGFibGVBcmVhLmgKaW5kZXggNDMzNGZjZS4uYzdj YThjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYWJsZUFyZWEu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5oCkBAIC04Mywx MCArODMsOCBAQCBwdWJsaWM6CiAKICAgICB2b2lkIGZpbmlzaEN1cnJlbnRTY3JvbGxBbmltYXRp b25zKCkgY29uc3Q7CiAKLSAgICB2b2lkIGRpZEFkZFZlcnRpY2FsU2Nyb2xsYmFyKFNjcm9sbGJh ciopOwotICAgIHZvaWQgd2lsbFJlbW92ZVZlcnRpY2FsU2Nyb2xsYmFyKFNjcm9sbGJhciopOwot ICAgIHZpcnR1YWwgdm9pZCBkaWRBZGRIb3Jpem9udGFsU2Nyb2xsYmFyKFNjcm9sbGJhciopOwot ICAgIHZpcnR1YWwgdm9pZCB3aWxsUmVtb3ZlSG9yaXpvbnRhbFNjcm9sbGJhcihTY3JvbGxiYXIq KTsKKyAgICB2aXJ0dWFsIHZvaWQgZGlkQWRkU2Nyb2xsYmFyKFNjcm9sbGJhciosIFNjcm9sbGJh ck9yaWVudGF0aW9uKTsKKyAgICB2aXJ0dWFsIHZvaWQgd2lsbFJlbW92ZVNjcm9sbGJhcihTY3Jv bGxiYXIqLCBTY3JvbGxiYXJPcmllbnRhdGlvbik7CiAKICAgICB2aXJ0dWFsIHZvaWQgY29udGVu dHNSZXNpemVkKCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9s bGJhci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxiYXIuY3BwCmluZGV4IGRi OTI1NTIuLjBlMWIyZmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9s bGJhci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYmFyLmNwcApAQCAt MzgsOSArMzgsNiBAQAogI2VuZGlmCiAKIC8vIEZJWE1FOiBUaGUgZm9sbG93aW5nICNpbmNsdWRl cyBhcmUgYSBsYXllcmluZyB2aW9sYXRpb24gYW5kIHNob3VsZCBiZSByZW1vdmVkLgotI2luY2x1 ZGUgIkFYT2JqZWN0Q2FjaGUuaCIKLSNpbmNsdWRlICJBY2Nlc3NpYmlsaXR5U2Nyb2xsYmFyLmgi Ci0jaW5jbHVkZSAiRG9jdW1lbnQuaCIKICNpbmNsdWRlICJFdmVudEhhbmRsZXIuaCIKICNpbmNs dWRlICJGcmFtZS5oIgogI2luY2x1ZGUgIkZyYW1lVmlldy5oIgpAQCAtMTEwLDkgKzEwNyw2IEBA IFNjcm9sbGJhcjo6U2Nyb2xsYmFyKFNjcm9sbGFibGVBcmVhKiBzY3JvbGxhYmxlQXJlYSwgU2Ny b2xsYmFyT3JpZW50YXRpb24gb3JpZW50CiAKIFNjcm9sbGJhcjo6flNjcm9sbGJhcigpCiB7Ci0g ICAgaWYgKEFYT2JqZWN0Q2FjaGUqIGNhY2hlID0gZXhpc3RpbmdBWE9iamVjdENhY2hlKCkpCi0g ICAgICAgIGNhY2hlLT5yZW1vdmUodGhpcyk7Ci0gICAgCiAgICAgc3RvcFRpbWVySWZOZWVkZWQo KTsKICAgICAKICAgICBtX3RoZW1lLT51bnJlZ2lzdGVyU2Nyb2xsYmFyKHRoaXMpOwpAQCAtNTY3 LDE0ICs1NjEsNiBAQCBib29sIFNjcm9sbGJhcjo6aXNXaW5kb3dBY3RpdmUoKSBjb25zdAogICAg IHJldHVybiBtX3Njcm9sbGFibGVBcmVhICYmIG1fc2Nyb2xsYWJsZUFyZWEtPmlzQWN0aXZlKCk7 CiB9CiAKLUFYT2JqZWN0Q2FjaGUqIFNjcm9sbGJhcjo6ZXhpc3RpbmdBWE9iamVjdENhY2hlKCkg Y29uc3QKLXsKLSAgICBpZiAoIXBhcmVudCgpKQotICAgICAgICByZXR1cm4gMDsKLSAgICAKLSAg ICByZXR1cm4gcGFyZW50KCktPmF4T2JqZWN0Q2FjaGUoKTsKLX0KLQogdm9pZCBTY3JvbGxiYXI6 OmludmFsaWRhdGVSZWN0KGNvbnN0IEludFJlY3QmIHJlY3QpCiB7CiAgICAgaWYgKHN1cHByZXNz SW52YWxpZGF0aW9uKCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3Jv bGxiYXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGJhci5oCmluZGV4IGQ1NzRj YzYuLjAwYzc2MTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGJh ci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbGJhci5oCkBAIC0yMDYsNyAr MjA2LDYgQEAgcHJvdGVjdGVkOgogCiBwcml2YXRlOgogICAgIHZpcnR1YWwgYm9vbCBpc1Njcm9s bGJhcigpIGNvbnN0IHsgcmV0dXJuIHRydWU7IH0KLSAgICB2aXJ0dWFsIEFYT2JqZWN0Q2FjaGUq IGV4aXN0aW5nQVhPYmplY3RDYWNoZSgpIGNvbnN0OwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2Vi Q29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vV2lkZ2V0LmggYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9XaWRnZXQuaAppbmRleCBlN2YxZTU5Li4xYWRmZjg1IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9XaWRnZXQuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9XaWRnZXQuaApAQCAtOTcsNyArOTcsNiBAQCB0eXBlZGVmIFBsYXRmb3Jt V2lkZ2V0IFBsYXRmb3JtUGFnZUNsaWVudDsKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1jbGFz cyBBWE9iamVjdENhY2hlOwogY2xhc3MgQ3Vyc29yOwogY2xhc3MgRXZlbnQ7CiBjbGFzcyBGb250 OwpAQCAtMjMxLDkgKzIzMCw2IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIEludFBvaW50IGNvbnZl cnRUb0NvbnRhaW5pbmdWaWV3KGNvbnN0IEludFBvaW50JikgY29uc3Q7CiAgICAgdmlydHVhbCBJ bnRQb2ludCBjb252ZXJ0RnJvbUNvbnRhaW5pbmdWaWV3KGNvbnN0IEludFBvaW50JikgY29uc3Q7 CiAKLSAgICAvLyBBIG1lYW5zIHRvIGFjY2VzcyB0aGUgQVggY2FjaGUgd2hlbiB0aGlzIG9iamVj dCBjYW4gZ2V0IGEgcG9pbnRlciB0byBpdC4KLSAgICB2aXJ0dWFsIEFYT2JqZWN0Q2FjaGUqIGF4 T2JqZWN0Q2FjaGUoKSBjb25zdCB7IHJldHVybiAwOyB9Ci0gICAgCiBwcml2YXRlOgogICAgIHZv aWQgaW5pdChQbGF0Zm9ybVdpZGdldCk7IC8vIE11c3QgYmUgY2FsbGVkIGJ5IGFsbCBXaWRnZXQg Y29uc3RydWN0b3JzIHRvIGluaXRpYWxpemUgY3Jvc3MtcGxhdGZvcm0gZGF0YS4KIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKaW5kZXggMTc5NGRlZC4uMjhlZjk2NyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCkBAIC0yODc4LDEwICsy ODc4LDcgQEAgUGFzc1JlZlB0cjxTY3JvbGxiYXI+IFJlbmRlckxheWVyOjpjcmVhdGVTY3JvbGxi YXIoU2Nyb2xsYmFyT3JpZW50YXRpb24gb3JpZW50YXQKICAgICAgICAgd2lkZ2V0ID0gUmVuZGVy U2Nyb2xsYmFyOjpjcmVhdGVDdXN0b21TY3JvbGxiYXIodGhpcywgb3JpZW50YXRpb24sIGFjdHVh bFJlbmRlcmVyLT5ub2RlKCkpOwogICAgIGVsc2UgewogICAgICAgICB3aWRnZXQgPSBTY3JvbGxi YXI6OmNyZWF0ZU5hdGl2ZVNjcm9sbGJhcih0aGlzLCBvcmllbnRhdGlvbiwgUmVndWxhclNjcm9s bGJhcik7Ci0gICAgICAgIGlmIChvcmllbnRhdGlvbiA9PSBIb3Jpem9udGFsU2Nyb2xsYmFyKQot ICAgICAgICAgICAgZGlkQWRkSG9yaXpvbnRhbFNjcm9sbGJhcih3aWRnZXQuZ2V0KCkpOwotICAg ICAgICBlbHNlIAotICAgICAgICAgICAgZGlkQWRkVmVydGljYWxTY3JvbGxiYXIod2lkZ2V0Lmdl dCgpKTsKKyAgICAgICAgZGlkQWRkU2Nyb2xsYmFyKHdpZGdldC5nZXQoKSwgb3JpZW50YXRpb24p OwogICAgIH0KICAgICByZW5kZXJlcigpLT5kb2N1bWVudCgpLT52aWV3KCktPmFkZENoaWxkKHdp ZGdldC5nZXQoKSk7ICAgICAgICAKICAgICByZXR1cm4gd2lkZ2V0LnJlbGVhc2UoKTsKQEAgLTI4 OTMsMTIgKzI4OTAsOCBAQCB2b2lkIFJlbmRlckxheWVyOjpkZXN0cm95U2Nyb2xsYmFyKFNjcm9s bGJhck9yaWVudGF0aW9uIG9yaWVudGF0aW9uKQogICAgIGlmICghc2Nyb2xsYmFyKQogICAgICAg ICByZXR1cm47CiAKLSAgICBpZiAoIXNjcm9sbGJhci0+aXNDdXN0b21TY3JvbGxiYXIoKSkgewot ICAgICAgICBpZiAob3JpZW50YXRpb24gPT0gSG9yaXpvbnRhbFNjcm9sbGJhcikKLSAgICAgICAg ICAgIHdpbGxSZW1vdmVIb3Jpem9udGFsU2Nyb2xsYmFyKHNjcm9sbGJhci5nZXQoKSk7Ci0gICAg ICAgIGVsc2UKLSAgICAgICAgICAgIHdpbGxSZW1vdmVWZXJ0aWNhbFNjcm9sbGJhcihzY3JvbGxi YXIuZ2V0KCkpOwotICAgIH0KKyAgICBpZiAoIXNjcm9sbGJhci0+aXNDdXN0b21TY3JvbGxiYXIo KSkKKyAgICAgICAgd2lsbFJlbW92ZVNjcm9sbGJhcihzY3JvbGxiYXIuZ2V0KCksIG9yaWVudGF0 aW9uKTsKIAogICAgIHNjcm9sbGJhci0+cmVtb3ZlRnJvbVBhcmVudCgpOwogICAgIHNjcm9sbGJh ci0+ZGlzY29ubmVjdEZyb21TY3JvbGxhYmxlQXJlYSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckxpc3RCb3guY3BwCmluZGV4IDRhM2Q4MGEuLjQ1OWE3MDMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaXN0Qm94LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlzdEJveC5jcHAKQEAgLTg0OSw3ICs4NDksNyBAQCBQ YXNzUmVmUHRyPFNjcm9sbGJhcj4gUmVuZGVyTGlzdEJveDo6Y3JlYXRlU2Nyb2xsYmFyKCkKICAg ICAgICAgd2lkZ2V0ID0gUmVuZGVyU2Nyb2xsYmFyOjpjcmVhdGVDdXN0b21TY3JvbGxiYXIodGhp cywgVmVydGljYWxTY3JvbGxiYXIsIHRoaXMtPm5vZGUoKSk7CiAgICAgZWxzZSB7CiAgICAgICAg IHdpZGdldCA9IFNjcm9sbGJhcjo6Y3JlYXRlTmF0aXZlU2Nyb2xsYmFyKHRoaXMsIFZlcnRpY2Fs U2Nyb2xsYmFyLCB0aGVtZSgpLT5zY3JvbGxiYXJDb250cm9sU2l6ZUZvclBhcnQoTGlzdGJveFBh cnQpKTsKLSAgICAgICAgZGlkQWRkVmVydGljYWxTY3JvbGxiYXIod2lkZ2V0LmdldCgpKTsKKyAg ICAgICAgZGlkQWRkU2Nyb2xsYmFyKHdpZGdldC5nZXQoKSwgVmVydGljYWxTY3JvbGxiYXIpOwog ICAgIH0KICAgICBkb2N1bWVudCgpLT52aWV3KCktPmFkZENoaWxkKHdpZGdldC5nZXQoKSk7ICAg ICAgICAKICAgICByZXR1cm4gd2lkZ2V0LnJlbGVhc2UoKTsKQEAgLTg2MSw3ICs4NjEsNyBAQCB2 b2lkIFJlbmRlckxpc3RCb3g6OmRlc3Ryb3lTY3JvbGxiYXIoKQogICAgICAgICByZXR1cm47CiAK ICAgICBpZiAoIW1fdkJhci0+aXNDdXN0b21TY3JvbGxiYXIoKSkKLSAgICAgICAgU2Nyb2xsYWJs ZUFyZWE6OndpbGxSZW1vdmVWZXJ0aWNhbFNjcm9sbGJhcihtX3ZCYXIuZ2V0KCkpOworICAgICAg ICBTY3JvbGxhYmxlQXJlYTo6d2lsbFJlbW92ZVNjcm9sbGJhcihtX3ZCYXIuZ2V0KCksIFZlcnRp Y2FsU2Nyb2xsYmFyKTsKICAgICBtX3ZCYXItPnJlbW92ZUZyb21QYXJlbnQoKTsKICAgICBtX3ZC YXItPmRpc2Nvbm5lY3RGcm9tU2Nyb2xsYWJsZUFyZWEoKTsKICAgICBtX3ZCYXIgPSAwOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCmluZGV4IDRlOTQ5NWEuLjE2MmFlMDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAor MjAxMy0wNC0xNiAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisK KyAgICAgICAgV2lkZ2V0IHNob3VsZCBub3QgZGVwZW5kIG9uIEFYT2JqZWN0Q2FjaGUKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNDUxNAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVwZGF0ZSB0byBBUEkg Y2hhbmdlcy4KKworICAgICAgICAqIFdlYlByb2Nlc3MvUGx1Z2lucy9QREYvUERGUGx1Z2luLm1t OgorICAgICAgICAoV2ViS2l0OjpQREZQbHVnaW46OmNyZWF0ZVNjcm9sbGJhcik6CisgICAgICAg ICogV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9TaW1wbGVQREZQbHVnaW4ubW06CisgICAgICAgIChX ZWJLaXQ6OlNpbXBsZVBERlBsdWdpbjo6Y3JlYXRlU2Nyb2xsYmFyKToKKyAgICAgICAgKFdlYktp dDo6U2ltcGxlUERGUGx1Z2luOjpkZXN0cm95U2Nyb2xsYmFyKToKKwogMjAxMy0wNC0xNiAgQW5k cmVhcyBLbGluZyAgPGFrbGluZ0BhcHBsZS5jb20+CiAKICAgICAgICAgRml4IHJlbGVhc2UgYnVp bGRzIHdpdGggIUxPR19ESVNBQkxFRC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvUGx1Z2lucy9QREYvUERGUGx1Z2luLm1tIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9QbHVnaW5zL1BERi9QREZQbHVnaW4ubW0KaW5kZXggNGNmZjU5NS4uZTliYWEwNCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9QREZQbHVnaW4ubW0K KysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9QREZQbHVnaW4ubW0K QEAgLTI3MCwxNCArMjcwLDExIEBAIFBhc3NSZWZQdHI8U2Nyb2xsYmFyPiBQREZQbHVnaW46OmNy ZWF0ZVNjcm9sbGJhcihTY3JvbGxiYXJPcmllbnRhdGlvbiBvcmllbnRhdGlvCiAgICAgaWYgKG9y aWVudGF0aW9uID09IEhvcml6b250YWxTY3JvbGxiYXIpIHsKICAgICAgICAgbV9ob3Jpem9udGFs U2Nyb2xsYmFyTGF5ZXIuYWRvcHROUyhbW1dLUERGUGx1Z2luU2Nyb2xsYmFyTGF5ZXIgYWxsb2Nd IGluaXRXaXRoUERGUGx1Z2luOnRoaXNdKTsKICAgICAgICAgW21fY29udGFpbmVyTGF5ZXIuZ2V0 KCkgYWRkU3VibGF5ZXI6bV9ob3Jpem9udGFsU2Nyb2xsYmFyTGF5ZXIuZ2V0KCldOwotICAgICAg ICAKLSAgICAgICAgZGlkQWRkSG9yaXpvbnRhbFNjcm9sbGJhcih3aWRnZXQuZ2V0KCkpOwogICAg IH0gZWxzZSB7CiAgICAgICAgIG1fdmVydGljYWxTY3JvbGxiYXJMYXllci5hZG9wdE5TKFtbV0tQ REZQbHVnaW5TY3JvbGxiYXJMYXllciBhbGxvY10gaW5pdFdpdGhQREZQbHVnaW46dGhpc10pOwog ICAgICAgICBbbV9jb250YWluZXJMYXllci5nZXQoKSBhZGRTdWJsYXllcjptX3ZlcnRpY2FsU2Ny b2xsYmFyTGF5ZXIuZ2V0KCldOwotICAgICAgICAKLSAgICAgICAgZGlkQWRkVmVydGljYWxTY3Jv bGxiYXIod2lkZ2V0LmdldCgpKTsKICAgICB9CisgICAgZGlkQWRkU2Nyb2xsYmFyKHdpZGdldC5n ZXQoKSwgb3JpZW50YXRpb24pOwogICAgIHBsdWdpblZpZXcoKS0+ZnJhbWUoKS0+dmlldygpLT5h ZGRDaGlsZCh3aWRnZXQuZ2V0KCkpOwogICAgIHJldHVybiB3aWRnZXQucmVsZWFzZSgpOwogfQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9TaW1wbGVQ REZQbHVnaW4ubW0gYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUERGL1NpbXBs ZVBERlBsdWdpbi5tbQppbmRleCAyYmQyZThiLi45MDFjNDA2IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUERGL1NpbXBsZVBERlBsdWdpbi5tbQorKysgYi9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUERGL1NpbXBsZVBERlBsdWdpbi5tbQpA QCAtMjYwLDEwICsyNjAsNyBAQCB2b2lkIFNpbXBsZVBERlBsdWdpbjo6dXBkYXRlU2Nyb2xsYmFy cygpCiBQYXNzUmVmUHRyPFNjcm9sbGJhcj4gU2ltcGxlUERGUGx1Z2luOjpjcmVhdGVTY3JvbGxi YXIoU2Nyb2xsYmFyT3JpZW50YXRpb24gb3JpZW50YXRpb24pCiB7CiAgICAgUmVmUHRyPFNjcm9s bGJhcj4gd2lkZ2V0ID0gU2Nyb2xsYmFyOjpjcmVhdGVOYXRpdmVTY3JvbGxiYXIodGhpcywgb3Jp ZW50YXRpb24sIFJlZ3VsYXJTY3JvbGxiYXIpOwotICAgIGlmIChvcmllbnRhdGlvbiA9PSBIb3Jp em9udGFsU2Nyb2xsYmFyKQotICAgICAgICBkaWRBZGRIb3Jpem9udGFsU2Nyb2xsYmFyKHdpZGdl dC5nZXQoKSk7Ci0gICAgZWxzZSAKLSAgICAgICAgZGlkQWRkVmVydGljYWxTY3JvbGxiYXIod2lk Z2V0LmdldCgpKTsKKyAgICBkaWRBZGRTY3JvbGxiYXIod2lkZ2V0LmdldCgpLCBvcmllbnRhdGlv bik7CiAgICAgcGx1Z2luVmlldygpLT5mcmFtZSgpLT52aWV3KCktPmFkZENoaWxkKHdpZGdldC5n ZXQoKSk7CiAgICAgcmV0dXJuIHdpZGdldC5yZWxlYXNlKCk7CiB9CkBAIC0yNzQsMTEgKzI3MSw3 IEBAIHZvaWQgU2ltcGxlUERGUGx1Z2luOjpkZXN0cm95U2Nyb2xsYmFyKFNjcm9sbGJhck9yaWVu dGF0aW9uIG9yaWVudGF0aW9uKQogICAgIGlmICghc2Nyb2xsYmFyKQogICAgICAgICByZXR1cm47 CiAKLSAgICBpZiAob3JpZW50YXRpb24gPT0gSG9yaXpvbnRhbFNjcm9sbGJhcikKLSAgICAgICAg d2lsbFJlbW92ZUhvcml6b250YWxTY3JvbGxiYXIoc2Nyb2xsYmFyLmdldCgpKTsKLSAgICBlbHNl Ci0gICAgICAgIHdpbGxSZW1vdmVWZXJ0aWNhbFNjcm9sbGJhcihzY3JvbGxiYXIuZ2V0KCkpOwot CisgICAgd2lsbFJlbW92ZVNjcm9sbGJhcihzY3JvbGxiYXIuZ2V0KCksIG9yaWVudGF0aW9uKTsK ICAgICBzY3JvbGxiYXItPnJlbW92ZUZyb21QYXJlbnQoKTsKICAgICBzY3JvbGxiYXItPmRpc2Nv bm5lY3RGcm9tU2Nyb2xsYWJsZUFyZWEoKTsKICAgICBzY3JvbGxiYXIgPSAwOwo=