137911 2014-10-21 00:24:51 -0700 Const-ify static s_resourceType members in RenderSVGResource* classes 2014-11-02 05:42:16 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zan zan commit-queue darin dino d-r esprehn+autocc fmalita glenn gyuyoung.kim kondapallykalyan pdr schenney sergio oldest_to_newest 1043124 0 zan 2014-10-21 00:24:51 -0700 Const-ify static s_resourceType members in RenderSVGResource* classes 1043125 1 240191 zan 2014-10-21 00:29:40 -0700 Created attachment 240191 Patch 1043271 2 240191 kling 2014-10-21 13:58:30 -0700 Comment on attachment 240191 Patch r=me 1043737 3 240341 zan 2014-10-23 04:04:38 -0700 Created attachment 240341 Patch for landing Running through the EWS once more. 1043739 4 240341 zan 2014-10-23 04:06:00 -0700 Comment on attachment 240341 Patch for landing Removing the r? flag since this was already reviewed. 1043746 5 240341 zan 2014-10-23 05:20:41 -0700 Comment on attachment 240341 Patch for landing Clearing flags on attachment: 240341 Committed r175117: <http://trac.webkit.org/changeset/175117> 1043747 6 zan 2014-10-23 05:20:54 -0700 All reviewed patches have been landed. Closing bug. 1044495 7 240341 darin 2014-10-28 09:21:18 -0700 Comment on attachment 240341 Patch for landing View in context: https://bugs.webkit.org/attachment.cgi?id=240341&action=review > Source/WebCore/rendering/svg/RenderSVGResourceClipper.h:57 > + static const RenderSVGResourceType s_resourceType = ClipperResourceType; Is s_resourceType needed? One way to get rid of it would be to make the virtual function final, or the entire class final. Then, despite the fact that it’s virtual, calling the inline final function would be just as efficient as getting at a data member with a similar name and we could omit the data member entirely. If we didn't make the resourceType function final, then we’d want to make it private to help prevent clients from accidentally calling a virtual function to get something that’s known at compile time. I don’t think the s_ prefix is not something we should be using in WebKit. Annoys me that we were using it here. 1045597 8 zan 2014-11-02 05:42:16 -0800 (In reply to comment #7) > Comment on attachment 240341 [details] > Patch for landing > > View in context: > https://bugs.webkit.org/attachment.cgi?id=240341&action=review > > > Source/WebCore/rendering/svg/RenderSVGResourceClipper.h:57 > > + static const RenderSVGResourceType s_resourceType = ClipperResourceType; > > Is s_resourceType needed? One way to get rid of it would be to make the > virtual function final, or the entire class final. Then, despite the fact > that it’s virtual, calling the inline final function would be just as > efficient as getting at a data member with a similar name and we could omit > the data member entirely. > The s_resourceType constant is only ever referenced in this template: https://trac.webkit.org/browser/trunk/Source/WebCore/rendering/svg/RenderSVGResource.h#L70 I think it should be possible to remove these constants and this cast<>() template in favor of downcast<>(). I created bug #138290 for that. 240191 2014-10-21 00:29:40 -0700 2014-10-23 04:04:25 -0700 Patch bug-137911-20141021003014.patch text/plain 14884 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMTc0OTI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTcxMDllOWQ1ZmRhNDBm MjkwMTFlODM3NmUxNWUxZjIyNWM5MGYzNC4uMmJjZmRiZmRiNzY0NDkyM2E2ZTUyOWNmMWUzZmUx OTc4NjA2YTE1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDE0LTEwLTIxICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBDb25zdC1pZnkgc3Rh dGljIHNfcmVzb3VyY2VUeXBlIG1lbWJlcnMgaW4gUmVuZGVyU1ZHUmVzb3VyY2UqIGNsYXNzZXMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNzkxMQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1ha2Ugc19y ZXNvdXJjZVR5cGUgc3RhdGljIG1lbWJlcnMgaW4gUmVuZGVyU1ZHUmVzb3VyY2UqIGNsYXNzZXMg Y29uc3QuCisgICAgICAgIEFsc28gdXBkYXRlIHRoZSByZXNvdXJjZVR5cGUoKSBtZXRob2RzIHdo ZXJlIG5lY2Vzc2FyeSwgbWFya2luZyB0aGVtIGFzCisgICAgICAgIG92ZXJyaWRpbmcgdGhlIGJh c2UgY2xhc3MnIG1ldGhvZCBhbmQgcmV0dXJuaW5nIHRoZSBzX3Jlc291cmNlVHlwZSBjb25zdGFu dC4KKworICAgICAgICAqIHJlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VDbGlwcGVyLmNw cDoKKyAgICAgICAgKiByZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlQ2xpcHBlci5oOgor ICAgICAgICAqIHJlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VGaWx0ZXIuY3BwOgorICAg ICAgICAqIHJlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VGaWx0ZXIuaDoKKyAgICAgICAg KiByZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlTGluZWFyR3JhZGllbnQuY3BwOgorICAg ICAgICAqIHJlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VMaW5lYXJHcmFkaWVudC5oOgor ICAgICAgICAqIHJlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VNYXJrZXIuY3BwOgorICAg ICAgICAqIHJlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VNYXJrZXIuaDoKKyAgICAgICAg KiByZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlTWFza2VyLmNwcDoKKyAgICAgICAgKiBy ZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlTWFza2VyLmg6CisgICAgICAgICogcmVuZGVy aW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZVBhdHRlcm4uY3BwOgorICAgICAgICAqIHJlbmRlcmlu Zy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VQYXR0ZXJuLmg6CisgICAgICAgICogcmVuZGVyaW5nL3N2 Zy9SZW5kZXJTVkdSZXNvdXJjZVJhZGlhbEdyYWRpZW50LmNwcDoKKyAgICAgICAgKiByZW5kZXJp bmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlUmFkaWFsR3JhZGllbnQuaDoKKyAgICAgICAgKiByZW5k ZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlU29saWRDb2xvci5jcHA6CisgICAgICAgICogcmVu ZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZVNvbGlkQ29sb3IuaDoKKwogMjAxNC0xMC0yMCAg WW9uZ0dlb2wgSnVuZyAgPHlnNDguanVuZ0BzYW1zdW5nLmNvbT4KIAogICAgICAgICBbQ29vcmRp bmF0ZWQgR3JhcGhpY3NdICctd2Via2l0LW1hc2staW1hZ2U6IC13ZWJraXQtZ3JhZGllbnQnIGRv ZXNuJ3Qgd29yayBmb3IgQUMgbGF5ZXIuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlQ2xpcHBlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlQ2xpcHBlci5jcHAKaW5kZXggMzAyYmJmOWZl YjNhODIyMTVhOGNlODcxNTIwNDE4MWZkYjc0YzgxZC4uMWFlMDkzNDdlOGNiZTdiZWY5NWZlMjcw ZGZlMTkxOWUzMjZhZmI0ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2 Zy9SZW5kZXJTVkdSZXNvdXJjZUNsaXBwZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VDbGlwcGVyLmNwcApAQCAtNDAsOCArNDAsNiBAQAog CiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLVJlbmRlclNWR1Jlc291cmNlVHlwZSBSZW5kZXJTVkdS ZXNvdXJjZUNsaXBwZXI6OnNfcmVzb3VyY2VUeXBlID0gQ2xpcHBlclJlc291cmNlVHlwZTsKLQog UmVuZGVyU1ZHUmVzb3VyY2VDbGlwcGVyOjpSZW5kZXJTVkdSZXNvdXJjZUNsaXBwZXIoU1ZHQ2xp cFBhdGhFbGVtZW50JiBlbGVtZW50LCBQYXNzUmVmPFJlbmRlclN0eWxlPiBzdHlsZSkKICAgICA6 IFJlbmRlclNWR1Jlc291cmNlQ29udGFpbmVyKGVsZW1lbnQsIFdURjo6bW92ZShzdHlsZSkpCiB7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291 cmNlQ2xpcHBlci5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNv dXJjZUNsaXBwZXIuaAppbmRleCBlMDA4MGUwZDUyOTQwZDkxOGEwOTk2NDlmNjQwYTNlNDE5Zjky YzU3Li5hMjZiYTAyYWI4M2JkNzE0YjczNmI2YjI1MTE5MTA3ZmM2ODMzODUzIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlQ2xpcHBlci5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VDbGlw cGVyLmgKQEAgLTU0LDEzICs1NCwxMyBAQCBwdWJsaWM6CiAgICAgYm9vbCBhcHBseUNsaXBwaW5n VG9Db250ZXh0KFJlbmRlckVsZW1lbnQmLCBjb25zdCBGbG9hdFJlY3QmLCBjb25zdCBGbG9hdFJl Y3QmLCBHcmFwaGljc0NvbnRleHQqKTsKICAgICB2aXJ0dWFsIEZsb2F0UmVjdCByZXNvdXJjZUJv dW5kaW5nQm94KGNvbnN0IFJlbmRlck9iamVjdCYpIG92ZXJyaWRlOwogCi0gICAgdmlydHVhbCBS ZW5kZXJTVkdSZXNvdXJjZVR5cGUgcmVzb3VyY2VUeXBlKCkgY29uc3QgeyByZXR1cm4gQ2xpcHBl clJlc291cmNlVHlwZTsgfQorICAgIHN0YXRpYyBjb25zdCBSZW5kZXJTVkdSZXNvdXJjZVR5cGUg c19yZXNvdXJjZVR5cGUgPSBDbGlwcGVyUmVzb3VyY2VUeXBlOworICAgIHZpcnR1YWwgUmVuZGVy U1ZHUmVzb3VyY2VUeXBlIHJlc291cmNlVHlwZSgpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIHNf cmVzb3VyY2VUeXBlOyB9CiAgICAgCiAgICAgYm9vbCBoaXRUZXN0Q2xpcENvbnRlbnQoY29uc3Qg RmxvYXRSZWN0JiwgY29uc3QgRmxvYXRQb2ludCYpOwogCiAgICAgU1ZHVW5pdFR5cGVzOjpTVkdV bml0VHlwZSBjbGlwUGF0aFVuaXRzKCkgY29uc3QgeyByZXR1cm4gY2xpcFBhdGhFbGVtZW50KCku Y2xpcFBhdGhVbml0cygpOyB9CiAKLSAgICBzdGF0aWMgUmVuZGVyU1ZHUmVzb3VyY2VUeXBlIHNf cmVzb3VyY2VUeXBlOwogcHJpdmF0ZToKICAgICB2b2lkIGVsZW1lbnQoKSBjb25zdCA9IGRlbGV0 ZTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdS ZXNvdXJjZUZpbHRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNW R1Jlc291cmNlRmlsdGVyLmNwcAppbmRleCBhZDVmY2MzNmM4MWJiNDBmNjA4N2I4ZTJhZDI3Yzg0 MDYxMGJhM2JjLi5lYzcyZTU3NTcwZTcyNTBkNWQwMDkwM2NiOTlhNThlZjE2OTFkZmZhIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlRmls dGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291 cmNlRmlsdGVyLmNwcApAQCAtNDQsOCArNDQsNiBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAK LVJlbmRlclNWR1Jlc291cmNlVHlwZSBSZW5kZXJTVkdSZXNvdXJjZUZpbHRlcjo6c19yZXNvdXJj ZVR5cGUgPSBGaWx0ZXJSZXNvdXJjZVR5cGU7Ci0KIFJlbmRlclNWR1Jlc291cmNlRmlsdGVyOjpS ZW5kZXJTVkdSZXNvdXJjZUZpbHRlcihTVkdGaWx0ZXJFbGVtZW50JiBlbGVtZW50LCBQYXNzUmVm PFJlbmRlclN0eWxlPiBzdHlsZSkKICAgICA6IFJlbmRlclNWR1Jlc291cmNlQ29udGFpbmVyKGVs ZW1lbnQsIFdURjo6bW92ZShzdHlsZSkpCiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlRmlsdGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlRmlsdGVyLmgKaW5kZXggZTg1Yzc5NDQwMWQw OWU0ODcwY2IxMmExNjViZDdjNmExZTU3NDkyZS4uODYwMTVjOTZmMDViODYxNTg3M2VlMjY4NDg4 M2Q5ZWQ4YTJjZjk1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9S ZW5kZXJTVkdSZXNvdXJjZUZpbHRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9z dmcvUmVuZGVyU1ZHUmVzb3VyY2VGaWx0ZXIuaApAQCAtODIsOCArODIsOCBAQCBwdWJsaWM6CiAK ICAgICB2b2lkIHByaW1pdGl2ZUF0dHJpYnV0ZUNoYW5nZWQoUmVuZGVyT2JqZWN0KiwgY29uc3Qg UXVhbGlmaWVkTmFtZSYpOwogCi0gICAgdmlydHVhbCBSZW5kZXJTVkdSZXNvdXJjZVR5cGUgcmVz b3VyY2VUeXBlKCkgY29uc3QgeyByZXR1cm4gc19yZXNvdXJjZVR5cGU7IH0KLSAgICBzdGF0aWMg UmVuZGVyU1ZHUmVzb3VyY2VUeXBlIHNfcmVzb3VyY2VUeXBlOworICAgIHN0YXRpYyBjb25zdCBS ZW5kZXJTVkdSZXNvdXJjZVR5cGUgc19yZXNvdXJjZVR5cGUgPSBGaWx0ZXJSZXNvdXJjZVR5cGU7 CisgICAgdmlydHVhbCBSZW5kZXJTVkdSZXNvdXJjZVR5cGUgcmVzb3VyY2VUeXBlKCkgY29uc3Qg b3ZlcnJpZGUgeyByZXR1cm4gc19yZXNvdXJjZVR5cGU7IH0KIAogICAgIEZsb2F0UmVjdCBkcmF3 aW5nUmVnaW9uKFJlbmRlck9iamVjdCopIGNvbnN0OwogcHJpdmF0ZToKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VMaW5lYXJHcmFkaWVu dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlTGlu ZWFyR3JhZGllbnQuY3BwCmluZGV4IGZkZmM5NjgxYmM3YTY2ZGNiMmI1OThhZGMzNDRmZTgzYWNk YThhNmUuLmFhNmYzMjA4YzkxOTBlZDY0NzZmNTY3ZTU2MGI4NDY5MzNhMWU2OWUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VMaW5lYXJH cmFkaWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdS ZXNvdXJjZUxpbmVhckdyYWRpZW50LmNwcApAQCAtMjQsOCArMjQsNiBAQAogCiBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAKLVJlbmRlclNWR1Jlc291cmNlVHlwZSBSZW5kZXJTVkdSZXNvdXJjZUxpbmVh ckdyYWRpZW50OjpzX3Jlc291cmNlVHlwZSA9IExpbmVhckdyYWRpZW50UmVzb3VyY2VUeXBlOwot CiBSZW5kZXJTVkdSZXNvdXJjZUxpbmVhckdyYWRpZW50OjpSZW5kZXJTVkdSZXNvdXJjZUxpbmVh ckdyYWRpZW50KFNWR0xpbmVhckdyYWRpZW50RWxlbWVudCYgZWxlbWVudCwgUGFzc1JlZjxSZW5k ZXJTdHlsZT4gc3R5bGUpCiAgICAgOiBSZW5kZXJTVkdSZXNvdXJjZUdyYWRpZW50KGVsZW1lbnQs IFdURjo6bW92ZShzdHlsZSkpCiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlTGluZWFyR3JhZGllbnQuaCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VMaW5lYXJHcmFkaWVudC5oCmluZGV4IGMx ZjUyYjdkY2RlNTFiN2Q0Y2VmM2ZkZjlkOGNkZWQ2OWI0MTEzZjEuLjI3ZmEzNDBmZmYzODkyYjAy OWEyMTM5ZWZiYTllNDlkNDhlMTE4MDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VMaW5lYXJHcmFkaWVudC5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VMaW5lYXJHcmFkaWVudC5oCkBA IC0zNCw4ICszNCw4IEBAIHB1YmxpYzoKIAogICAgIFNWR0xpbmVhckdyYWRpZW50RWxlbWVudCYg bGluZWFyR3JhZGllbnRFbGVtZW50KCkgY29uc3QgeyByZXR1cm4gZG93bmNhc3Q8U1ZHTGluZWFy R3JhZGllbnRFbGVtZW50PihSZW5kZXJTVkdSZXNvdXJjZUdyYWRpZW50OjpncmFkaWVudEVsZW1l bnQoKSk7IH0KIAotICAgIHZpcnR1YWwgUmVuZGVyU1ZHUmVzb3VyY2VUeXBlIHJlc291cmNlVHlw ZSgpIGNvbnN0IHsgcmV0dXJuIHNfcmVzb3VyY2VUeXBlOyB9Ci0gICAgc3RhdGljIFJlbmRlclNW R1Jlc291cmNlVHlwZSBzX3Jlc291cmNlVHlwZTsKKyAgICBzdGF0aWMgY29uc3QgUmVuZGVyU1ZH UmVzb3VyY2VUeXBlIHNfcmVzb3VyY2VUeXBlID0gTGluZWFyR3JhZGllbnRSZXNvdXJjZVR5cGU7 CisgICAgdmlydHVhbCBSZW5kZXJTVkdSZXNvdXJjZVR5cGUgcmVzb3VyY2VUeXBlKCkgY29uc3Qg b3ZlcnJpZGUgeyByZXR1cm4gc19yZXNvdXJjZVR5cGU7IH0KIAogICAgIHZpcnR1YWwgU1ZHVW5p dFR5cGVzOjpTVkdVbml0VHlwZSBncmFkaWVudFVuaXRzKCkgY29uc3QgeyByZXR1cm4gbV9hdHRy aWJ1dGVzLmdyYWRpZW50VW5pdHMoKTsgfQogICAgIHZpcnR1YWwgdm9pZCBjYWxjdWxhdGVHcmFk aWVudFRyYW5zZm9ybShBZmZpbmVUcmFuc2Zvcm0mIHRyYW5zZm9ybSkgeyB0cmFuc2Zvcm0gPSBt X2F0dHJpYnV0ZXMuZ3JhZGllbnRUcmFuc2Zvcm0oKTsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZU1hcmtlci5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlTWFya2VyLmNwcAppbmRleCBh MjgyMThkOGVmNDBkMGU4MjMzOGYzYzE5MTFhOGVjMGZhZmU5NGQ4Li4zZjcxODI2NTlkZjdjMjgw OGFlYTg2OGEzZjk2NGU0M2ZhYzU4NzZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlTWFya2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlTWFya2VyLmNwcApAQCAtMjgsOCArMjgs NiBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLVJlbmRlclNWR1Jlc291cmNlVHlwZSBSZW5k ZXJTVkdSZXNvdXJjZU1hcmtlcjo6c19yZXNvdXJjZVR5cGUgPSBNYXJrZXJSZXNvdXJjZVR5cGU7 Ci0KIFJlbmRlclNWR1Jlc291cmNlTWFya2VyOjpSZW5kZXJTVkdSZXNvdXJjZU1hcmtlcihTVkdN YXJrZXJFbGVtZW50JiBlbGVtZW50LCBQYXNzUmVmPFJlbmRlclN0eWxlPiBzdHlsZSkKICAgICA6 IFJlbmRlclNWR1Jlc291cmNlQ29udGFpbmVyKGVsZW1lbnQsIFdURjo6bW92ZShzdHlsZSkpCiB7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291 cmNlTWFya2VyLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291 cmNlTWFya2VyLmgKaW5kZXggNjM2YTM0ZWNiOTJlZDg3OWIyNmIxOWI5MDkzMjljYTliYmIyZWYy Mi4uZDk4NTdiODgxYjk4YjY4NjEzODUyOTc4NjQ2NmEwNmM5ZWY4ZmExYiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZU1hcmtlci5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VNYXJrZXIu aApAQCAtNTksOCArNTksOCBAQCBwdWJsaWM6CiAgICAgZmxvYXQgYW5nbGUoKSBjb25zdDsKICAg ICBTVkdNYXJrZXJVbml0c1R5cGUgbWFya2VyVW5pdHMoKSBjb25zdCB7IHJldHVybiBtYXJrZXJF bGVtZW50KCkubWFya2VyVW5pdHMoKTsgfQogCi0gICAgdmlydHVhbCBSZW5kZXJTVkdSZXNvdXJj ZVR5cGUgcmVzb3VyY2VUeXBlKCkgY29uc3QgeyByZXR1cm4gc19yZXNvdXJjZVR5cGU7IH0KLSAg ICBzdGF0aWMgUmVuZGVyU1ZHUmVzb3VyY2VUeXBlIHNfcmVzb3VyY2VUeXBlOworICAgIHN0YXRp YyBjb25zdCBSZW5kZXJTVkdSZXNvdXJjZVR5cGUgc19yZXNvdXJjZVR5cGUgPSBNYXJrZXJSZXNv dXJjZVR5cGU7CisgICAgdmlydHVhbCBSZW5kZXJTVkdSZXNvdXJjZVR5cGUgcmVzb3VyY2VUeXBl KCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gc19yZXNvdXJjZVR5cGU7IH0KIAogcHJpdmF0ZToK ICAgICB2b2lkIGVsZW1lbnQoKSBjb25zdCA9IGRlbGV0ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VNYXNrZXIuY3BwIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZU1hc2tlci5jcHAKaW5kZXgg NzE4YTA5ZjcwOGQwOGU0ZTU1MDZiZjAyZjM2N2ViN2QyMWMzZTRmZS4uMzdmMmMwOWM3MzYyMWUw ZGVlMTkzMGRhNDYyY2E1ZjVhODI3NjZkYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZU1hc2tlci5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZU1hc2tlci5jcHAKQEAgLTI5LDggKzI5 LDYgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1SZW5kZXJTVkdSZXNvdXJjZVR5cGUgUmVu ZGVyU1ZHUmVzb3VyY2VNYXNrZXI6OnNfcmVzb3VyY2VUeXBlID0gTWFza2VyUmVzb3VyY2VUeXBl OwotCiBSZW5kZXJTVkdSZXNvdXJjZU1hc2tlcjo6UmVuZGVyU1ZHUmVzb3VyY2VNYXNrZXIoU1ZH TWFza0VsZW1lbnQmIGVsZW1lbnQsIFBhc3NSZWY8UmVuZGVyU3R5bGU+IHN0eWxlKQogICAgIDog UmVuZGVyU1ZHUmVzb3VyY2VDb250YWluZXIoZWxlbWVudCwgV1RGOjptb3ZlKHN0eWxlKSkKIHsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3Vy Y2VNYXNrZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3Vy Y2VNYXNrZXIuaAppbmRleCBhNTI3MjZlYjkyMTJjZTAwZGU0ZTVlZjc2MmI3ZjJmN2Y5YjNmOWRm Li42NTljNjY0N2Q0YTNjZjJjZGY0NzA3MGYyYjk0OTc1NDE1ZTMyMDA3IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlTWFza2VyLmgKKysr IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZU1hc2tlci5o CkBAIC01MCw4ICs1MCw4IEBAIHB1YmxpYzoKICAgICBTVkdVbml0VHlwZXM6OlNWR1VuaXRUeXBl IG1hc2tVbml0cygpIGNvbnN0IHsgcmV0dXJuIG1hc2tFbGVtZW50KCkubWFza1VuaXRzKCk7IH0K ICAgICBTVkdVbml0VHlwZXM6OlNWR1VuaXRUeXBlIG1hc2tDb250ZW50VW5pdHMoKSBjb25zdCB7 IHJldHVybiBtYXNrRWxlbWVudCgpLm1hc2tDb250ZW50VW5pdHMoKTsgfQogCi0gICAgdmlydHVh bCBSZW5kZXJTVkdSZXNvdXJjZVR5cGUgcmVzb3VyY2VUeXBlKCkgY29uc3QgeyByZXR1cm4gc19y ZXNvdXJjZVR5cGU7IH0KLSAgICBzdGF0aWMgUmVuZGVyU1ZHUmVzb3VyY2VUeXBlIHNfcmVzb3Vy Y2VUeXBlOworICAgIHN0YXRpYyBjb25zdCBSZW5kZXJTVkdSZXNvdXJjZVR5cGUgc19yZXNvdXJj ZVR5cGUgPSBNYXNrZXJSZXNvdXJjZVR5cGU7CisgICAgdmlydHVhbCBSZW5kZXJTVkdSZXNvdXJj ZVR5cGUgcmVzb3VyY2VUeXBlKCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gc19yZXNvdXJjZVR5 cGU7IH0KIAogcHJpdmF0ZToKICAgICB2b2lkIGVsZW1lbnQoKSBjb25zdCA9IGRlbGV0ZTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VQ YXR0ZXJuLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3Vy Y2VQYXR0ZXJuLmNwcAppbmRleCBiMDI0OGM0NDBhM2UyNzNiNDg0NjdkZWQyYzMwNjcwY2U0MTZh ZmVhLi43YzA2MTNjYzE1NjQ5NTNjMTIzMDJhMDFkNDNkODBiNmJlMTc3NDlhIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlUGF0dGVybi5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZVBh dHRlcm4uY3BwCkBAIC0zMCw4ICszMCw2IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotUmVu ZGVyU1ZHUmVzb3VyY2VUeXBlIFJlbmRlclNWR1Jlc291cmNlUGF0dGVybjo6c19yZXNvdXJjZVR5 cGUgPSBQYXR0ZXJuUmVzb3VyY2VUeXBlOwotCiBSZW5kZXJTVkdSZXNvdXJjZVBhdHRlcm46OlJl bmRlclNWR1Jlc291cmNlUGF0dGVybihTVkdQYXR0ZXJuRWxlbWVudCYgZWxlbWVudCwgUGFzc1Jl ZjxSZW5kZXJTdHlsZT4gc3R5bGUpCiAgICAgOiBSZW5kZXJTVkdSZXNvdXJjZUNvbnRhaW5lcihl bGVtZW50LCBXVEY6Om1vdmUoc3R5bGUpKQogICAgICwgbV9zaG91bGRDb2xsZWN0UGF0dGVybkF0 dHJpYnV0ZXModHJ1ZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcv UmVuZGVyU1ZHUmVzb3VyY2VQYXR0ZXJuLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3Zn L1JlbmRlclNWR1Jlc291cmNlUGF0dGVybi5oCmluZGV4IGY2NmQ1NTViNzViN2FjN2Q2NWI1YzQw YzNlZDY0YjY5NTE2OGVlNGYuLjMyNWMzNjBiYjVmMGEyNTQ2ZmFhMmZhNTdkMGEyNGY5YWE5YzI0 ZDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVz b3VyY2VQYXR0ZXJuLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJT VkdSZXNvdXJjZVBhdHRlcm4uaApAQCAtNTEsOCArNTEsOCBAQCBwdWJsaWM6CiAgICAgdmlydHVh bCB2b2lkIHBvc3RBcHBseVJlc291cmNlKFJlbmRlckVsZW1lbnQmLCBHcmFwaGljc0NvbnRleHQq JiwgdW5zaWduZWQgc2hvcnQgcmVzb3VyY2VNb2RlLCBjb25zdCBQYXRoKiwgY29uc3QgUmVuZGVy U1ZHU2hhcGUqKSBvdmVycmlkZTsKICAgICB2aXJ0dWFsIEZsb2F0UmVjdCByZXNvdXJjZUJvdW5k aW5nQm94KGNvbnN0IFJlbmRlck9iamVjdCYpIG92ZXJyaWRlIHsgcmV0dXJuIEZsb2F0UmVjdCgp OyB9CiAKLSAgICB2aXJ0dWFsIFJlbmRlclNWR1Jlc291cmNlVHlwZSByZXNvdXJjZVR5cGUoKSBj b25zdCB7IHJldHVybiBzX3Jlc291cmNlVHlwZTsgfQotICAgIHN0YXRpYyBSZW5kZXJTVkdSZXNv dXJjZVR5cGUgc19yZXNvdXJjZVR5cGU7CisgICAgc3RhdGljIGNvbnN0IFJlbmRlclNWR1Jlc291 cmNlVHlwZSBzX3Jlc291cmNlVHlwZSA9IFBhdHRlcm5SZXNvdXJjZVR5cGU7CisgICAgdmlydHVh bCBSZW5kZXJTVkdSZXNvdXJjZVR5cGUgcmVzb3VyY2VUeXBlKCkgY29uc3Qgb3ZlcnJpZGUgeyBy ZXR1cm4gc19yZXNvdXJjZVR5cGU7IH0KIAogcHJpdmF0ZToKICAgICB2b2lkIGVsZW1lbnQoKSBj b25zdCA9IGRlbGV0ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcv UmVuZGVyU1ZHUmVzb3VyY2VSYWRpYWxHcmFkaWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlUmFkaWFsR3JhZGllbnQuY3BwCmluZGV4IDZkYjA3 YzRjYmRjNjQ2NmJlNjYyZTg0OTI2MmVhZjJmZWFmODhmYWIuLjFkODhkMmI3NDI5MTI5ZTkyYjM2 Njc4ZDMwMjM3ZTZiZjRjMjM5MTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VSYWRpYWxHcmFkaWVudC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZVJhZGlhbEdyYWRpZW50LmNwcApA QCAtMjQsOCArMjQsNiBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLVJlbmRlclNWR1Jlc291 cmNlVHlwZSBSZW5kZXJTVkdSZXNvdXJjZVJhZGlhbEdyYWRpZW50OjpzX3Jlc291cmNlVHlwZSA9 IFJhZGlhbEdyYWRpZW50UmVzb3VyY2VUeXBlOwotCiBSZW5kZXJTVkdSZXNvdXJjZVJhZGlhbEdy YWRpZW50OjpSZW5kZXJTVkdSZXNvdXJjZVJhZGlhbEdyYWRpZW50KFNWR1JhZGlhbEdyYWRpZW50 RWxlbWVudCYgZWxlbWVudCwgUGFzc1JlZjxSZW5kZXJTdHlsZT4gc3R5bGUpCiAgICAgOiBSZW5k ZXJTVkdSZXNvdXJjZUdyYWRpZW50KGVsZW1lbnQsIFdURjo6bW92ZShzdHlsZSkpCiB7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlUmFk aWFsR3JhZGllbnQuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVz b3VyY2VSYWRpYWxHcmFkaWVudC5oCmluZGV4IDk2MjAzMjg5N2YzNDc3NDkyZWNlMTA0YTNhNmNk MjBhNTM0OTM1MDQuLmUzZGM5Y2FhZDNkMDY5NmU1Nzg1Mzc2ZjNiMTZlNDBkZWQ2NTlhMTMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VS YWRpYWxHcmFkaWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVy U1ZHUmVzb3VyY2VSYWRpYWxHcmFkaWVudC5oCkBAIC0zNiw4ICszNiw4IEBAIHB1YmxpYzoKIAog ICAgIFNWR1JhZGlhbEdyYWRpZW50RWxlbWVudCYgcmFkaWFsR3JhZGllbnRFbGVtZW50KCkgY29u c3QgeyByZXR1cm4gZG93bmNhc3Q8U1ZHUmFkaWFsR3JhZGllbnRFbGVtZW50PihSZW5kZXJTVkdS ZXNvdXJjZUdyYWRpZW50OjpncmFkaWVudEVsZW1lbnQoKSk7IH0KIAotICAgIHZpcnR1YWwgUmVu ZGVyU1ZHUmVzb3VyY2VUeXBlIHJlc291cmNlVHlwZSgpIGNvbnN0IHsgcmV0dXJuIHNfcmVzb3Vy Y2VUeXBlOyB9Ci0gICAgc3RhdGljIFJlbmRlclNWR1Jlc291cmNlVHlwZSBzX3Jlc291cmNlVHlw ZTsKKyAgICBzdGF0aWMgY29uc3QgUmVuZGVyU1ZHUmVzb3VyY2VUeXBlIHNfcmVzb3VyY2VUeXBl ID0gUmFkaWFsR3JhZGllbnRSZXNvdXJjZVR5cGU7CisgICAgdmlydHVhbCBSZW5kZXJTVkdSZXNv dXJjZVR5cGUgcmVzb3VyY2VUeXBlKCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gc19yZXNvdXJj ZVR5cGU7IH0KIAogICAgIHZpcnR1YWwgU1ZHVW5pdFR5cGVzOjpTVkdVbml0VHlwZSBncmFkaWVu dFVuaXRzKCkgY29uc3QgeyByZXR1cm4gbV9hdHRyaWJ1dGVzLmdyYWRpZW50VW5pdHMoKTsgfQog ICAgIHZpcnR1YWwgdm9pZCBjYWxjdWxhdGVHcmFkaWVudFRyYW5zZm9ybShBZmZpbmVUcmFuc2Zv cm0mIHRyYW5zZm9ybSkgeyB0cmFuc2Zvcm0gPSBtX2F0dHJpYnV0ZXMuZ3JhZGllbnRUcmFuc2Zv cm0oKTsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJT VkdSZXNvdXJjZVNvbGlkQ29sb3IuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9S ZW5kZXJTVkdSZXNvdXJjZVNvbGlkQ29sb3IuY3BwCmluZGV4IDQ2YjAwZDY0YjY3OTk1ODAyYzUy NWVlM2ExZDY4ZjJmOWNhZGJiZTMuLmY1MDFhYmY0NGIyMTQxNjc5YTZiN2E2OThlZmIxNzE4NWJl NTcwMjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZH UmVzb3VyY2VTb2xpZENvbG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3Zn L1JlbmRlclNWR1Jlc291cmNlU29saWRDb2xvci5jcHAKQEAgLTI4LDggKzI4LDYgQEAKIAogbmFt ZXNwYWNlIFdlYkNvcmUgewogCi1SZW5kZXJTVkdSZXNvdXJjZVR5cGUgUmVuZGVyU1ZHUmVzb3Vy Y2VTb2xpZENvbG9yOjpzX3Jlc291cmNlVHlwZSA9IFNvbGlkQ29sb3JSZXNvdXJjZVR5cGU7Ci0K IFJlbmRlclNWR1Jlc291cmNlU29saWRDb2xvcjo6UmVuZGVyU1ZHUmVzb3VyY2VTb2xpZENvbG9y KCkKIHsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVy U1ZHUmVzb3VyY2VTb2xpZENvbG9yLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1Jl bmRlclNWR1Jlc291cmNlU29saWRDb2xvci5oCmluZGV4IGI3M2ViNTY2YmM4MThjN2E0MzNkM2Y1 MjViNDI2ZThmZmQwNjI3YTYuLmI5YjQ0MTAxZDU5ZjdjMmUwYjI5OThhYmVlZWE5Yzc3ZDQxOGM2 NTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVz b3VyY2VTb2xpZENvbG9yLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5k ZXJTVkdSZXNvdXJjZVNvbGlkQ29sb3IuaApAQCAtMzcsOCArMzcsOCBAQCBwdWJsaWM6CiAgICAg dmlydHVhbCB2b2lkIHBvc3RBcHBseVJlc291cmNlKFJlbmRlckVsZW1lbnQmLCBHcmFwaGljc0Nv bnRleHQqJiwgdW5zaWduZWQgc2hvcnQgcmVzb3VyY2VNb2RlLCBjb25zdCBQYXRoKiwgY29uc3Qg UmVuZGVyU1ZHU2hhcGUqKSBvdmVycmlkZTsKICAgICB2aXJ0dWFsIEZsb2F0UmVjdCByZXNvdXJj ZUJvdW5kaW5nQm94KGNvbnN0IFJlbmRlck9iamVjdCYpIG92ZXJyaWRlIHsgcmV0dXJuIEZsb2F0 UmVjdCgpOyB9CiAKKyAgICBzdGF0aWMgY29uc3QgUmVuZGVyU1ZHUmVzb3VyY2VUeXBlIHNfcmVz b3VyY2VUeXBlID0gU29saWRDb2xvclJlc291cmNlVHlwZTsKICAgICB2aXJ0dWFsIFJlbmRlclNW R1Jlc291cmNlVHlwZSByZXNvdXJjZVR5cGUoKSBjb25zdCBvdmVycmlkZSB7IHJldHVybiBzX3Jl c291cmNlVHlwZTsgfQotICAgIHN0YXRpYyBSZW5kZXJTVkdSZXNvdXJjZVR5cGUgc19yZXNvdXJj ZVR5cGU7CiAKICAgICBjb25zdCBDb2xvciYgY29sb3IoKSBjb25zdCB7IHJldHVybiBtX2NvbG9y OyB9CiAgICAgdm9pZCBzZXRDb2xvcihjb25zdCBDb2xvciYgY29sb3IpIHsgbV9jb2xvciA9IGNv bG9yOyB9Cg== 240341 2014-10-23 04:04:38 -0700 2014-10-23 04:06:00 -0700 Patch for landing bug-137911-20141023040513.patch text/plain 13250 zan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3NTExNSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBACisyMDE0LTEwLTIzICBaYW4gRG9i ZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBDb25zdC1pZnkgc3RhdGlj IHNfcmVzb3VyY2VUeXBlIG1lbWJlcnMgaW4gUmVuZGVyU1ZHUmVzb3VyY2UqIGNsYXNzZXMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNzkxMQorCisg ICAgICAgIFJldmlld2VkIGJ5IEFuZHJlYXMgS2xpbmcuCisKKyAgICAgICAgTWFrZSBzX3Jlc291 cmNlVHlwZSBzdGF0aWMgbWVtYmVycyBpbiBSZW5kZXJTVkdSZXNvdXJjZSogY2xhc3NlcyBjb25z dC4KKyAgICAgICAgQWxzbyB1cGRhdGUgdGhlIHJlc291cmNlVHlwZSgpIG1ldGhvZHMsIHdoZXJl IG5lY2Vzc2FyeSwgc28gdGhhdCB0aGV5CisgICAgICAgIHJldHVybiB0aGUgc19yZXNvdXJjZVR5 cGUgY29uc3RhbnQuCisKKyAgICAgICAgKiByZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNl Q2xpcHBlci5jcHA6CisgICAgICAgICogcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZUNs aXBwZXIuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlRmlsdGVy LmNwcDoKKyAgICAgICAgKiByZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlRmlsdGVyLmg6 CisgICAgICAgICogcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZUxpbmVhckdyYWRpZW50 LmNwcDoKKyAgICAgICAgKiByZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlTGluZWFyR3Jh ZGllbnQuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlTWFya2Vy LmNwcDoKKyAgICAgICAgKiByZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlTWFya2VyLmg6 CisgICAgICAgICogcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZU1hc2tlci5jcHA6Cisg ICAgICAgICogcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZU1hc2tlci5oOgorICAgICAg ICAqIHJlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VQYXR0ZXJuLmNwcDoKKyAgICAgICAg KiByZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlUGF0dGVybi5oOgorICAgICAgICAqIHJl bmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VSYWRpYWxHcmFkaWVudC5jcHA6CisgICAgICAg ICogcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZVJhZGlhbEdyYWRpZW50Lmg6CisgICAg ICAgICogcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZVNvbGlkQ29sb3IuY3BwOgorICAg ICAgICAqIHJlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VTb2xpZENvbG9yLmg6CisKIDIw MTQtMTAtMjMgIEtyenlzenRvZiBDemVjaCAgPGsuY3plY2hAc2Ftc3VuZy5jb20+CiAKICAgICAg ICAgQVg6IERvIHRoZSBlYXJseSByZXR1cm4gd2hlbiByb2xlIGlzIGRpZmZlcmVudCB0aGFuIFVu a25vd25Sb2xlCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jl c291cmNlQ2xpcHBlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L3N2Zy9SZW5kZXJTVkdSZXNvdXJjZUNsaXBwZXIuY3BwCShyZXZpc2lvbiAxNzUxMTUpCisrKyBT b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlQ2xpcHBlci5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTQwLDggKzQwLDYgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewog Ci1SZW5kZXJTVkdSZXNvdXJjZVR5cGUgUmVuZGVyU1ZHUmVzb3VyY2VDbGlwcGVyOjpzX3Jlc291 cmNlVHlwZSA9IENsaXBwZXJSZXNvdXJjZVR5cGU7Ci0KIFJlbmRlclNWR1Jlc291cmNlQ2xpcHBl cjo6UmVuZGVyU1ZHUmVzb3VyY2VDbGlwcGVyKFNWR0NsaXBQYXRoRWxlbWVudCYgZWxlbWVudCwg UGFzc1JlZjxSZW5kZXJTdHlsZT4gc3R5bGUpCiAgICAgOiBSZW5kZXJTVkdSZXNvdXJjZUNvbnRh aW5lcihlbGVtZW50LCBXVEY6Om1vdmUoc3R5bGUpKQogewpJbmRleDogU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZUNsaXBwZXIuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlQ2xpcHBlci5oCShy ZXZpc2lvbiAxNzUxMTUpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNW R1Jlc291cmNlQ2xpcHBlci5oCSh3b3JraW5nIGNvcHkpCkBAIC01NCwxMyArNTQsMTMgQEAgcHVi bGljOgogICAgIGJvb2wgYXBwbHlDbGlwcGluZ1RvQ29udGV4dChSZW5kZXJFbGVtZW50JiwgY29u c3QgRmxvYXRSZWN0JiwgY29uc3QgRmxvYXRSZWN0JiwgR3JhcGhpY3NDb250ZXh0Kik7CiAgICAg dmlydHVhbCBGbG9hdFJlY3QgcmVzb3VyY2VCb3VuZGluZ0JveChjb25zdCBSZW5kZXJPYmplY3Qm KSBvdmVycmlkZTsKIAotICAgIHZpcnR1YWwgUmVuZGVyU1ZHUmVzb3VyY2VUeXBlIHJlc291cmNl VHlwZSgpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIENsaXBwZXJSZXNvdXJjZVR5cGU7IH0KKyAg ICBzdGF0aWMgY29uc3QgUmVuZGVyU1ZHUmVzb3VyY2VUeXBlIHNfcmVzb3VyY2VUeXBlID0gQ2xp cHBlclJlc291cmNlVHlwZTsKKyAgICB2aXJ0dWFsIFJlbmRlclNWR1Jlc291cmNlVHlwZSByZXNv dXJjZVR5cGUoKSBjb25zdCBvdmVycmlkZSB7IHJldHVybiBzX3Jlc291cmNlVHlwZTsgfQogICAg IAogICAgIGJvb2wgaGl0VGVzdENsaXBDb250ZW50KGNvbnN0IEZsb2F0UmVjdCYsIGNvbnN0IEZs b2F0UG9pbnQmKTsKIAogICAgIFNWR1VuaXRUeXBlczo6U1ZHVW5pdFR5cGUgY2xpcFBhdGhVbml0 cygpIGNvbnN0IHsgcmV0dXJuIGNsaXBQYXRoRWxlbWVudCgpLmNsaXBQYXRoVW5pdHMoKTsgfQog Ci0gICAgc3RhdGljIFJlbmRlclNWR1Jlc291cmNlVHlwZSBzX3Jlc291cmNlVHlwZTsKIHByaXZh dGU6CiAgICAgdm9pZCBlbGVtZW50KCkgY29uc3QgPSBkZWxldGU7CiAKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VGaWx0ZXIuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VGaWx0 ZXIuY3BwCShyZXZpc2lvbiAxNzUxMTUpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3Zn L1JlbmRlclNWR1Jlc291cmNlRmlsdGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDQsOCArNDQs NiBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLVJlbmRlclNWR1Jlc291cmNlVHlwZSBSZW5k ZXJTVkdSZXNvdXJjZUZpbHRlcjo6c19yZXNvdXJjZVR5cGUgPSBGaWx0ZXJSZXNvdXJjZVR5cGU7 Ci0KIFJlbmRlclNWR1Jlc291cmNlRmlsdGVyOjpSZW5kZXJTVkdSZXNvdXJjZUZpbHRlcihTVkdG aWx0ZXJFbGVtZW50JiBlbGVtZW50LCBQYXNzUmVmPFJlbmRlclN0eWxlPiBzdHlsZSkKICAgICA6 IFJlbmRlclNWR1Jlc291cmNlQ29udGFpbmVyKGVsZW1lbnQsIFdURjo6bW92ZShzdHlsZSkpCiB7 CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlRmls dGVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJT VkdSZXNvdXJjZUZpbHRlci5oCShyZXZpc2lvbiAxNzUxMTUpCisrKyBTb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlRmlsdGVyLmgJKHdvcmtpbmcgY29weSkKQEAg LTgyLDggKzgyLDggQEAgcHVibGljOgogCiAgICAgdm9pZCBwcmltaXRpdmVBdHRyaWJ1dGVDaGFu Z2VkKFJlbmRlck9iamVjdCosIGNvbnN0IFF1YWxpZmllZE5hbWUmKTsKIAorICAgIHN0YXRpYyBj b25zdCBSZW5kZXJTVkdSZXNvdXJjZVR5cGUgc19yZXNvdXJjZVR5cGUgPSBGaWx0ZXJSZXNvdXJj ZVR5cGU7CiAgICAgdmlydHVhbCBSZW5kZXJTVkdSZXNvdXJjZVR5cGUgcmVzb3VyY2VUeXBlKCkg Y29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gc19yZXNvdXJjZVR5cGU7IH0KLSAgICBzdGF0aWMgUmVu ZGVyU1ZHUmVzb3VyY2VUeXBlIHNfcmVzb3VyY2VUeXBlOwogCiAgICAgRmxvYXRSZWN0IGRyYXdp bmdSZWdpb24oUmVuZGVyT2JqZWN0KikgY29uc3Q7CiBwcml2YXRlOgpJbmRleDogU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZUxpbmVhckdyYWRpZW50LmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291 cmNlTGluZWFyR3JhZGllbnQuY3BwCShyZXZpc2lvbiAxNzUxMTUpCisrKyBTb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlTGluZWFyR3JhZGllbnQuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0yNCw4ICsyNCw2IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotUmVu ZGVyU1ZHUmVzb3VyY2VUeXBlIFJlbmRlclNWR1Jlc291cmNlTGluZWFyR3JhZGllbnQ6OnNfcmVz b3VyY2VUeXBlID0gTGluZWFyR3JhZGllbnRSZXNvdXJjZVR5cGU7Ci0KIFJlbmRlclNWR1Jlc291 cmNlTGluZWFyR3JhZGllbnQ6OlJlbmRlclNWR1Jlc291cmNlTGluZWFyR3JhZGllbnQoU1ZHTGlu ZWFyR3JhZGllbnRFbGVtZW50JiBlbGVtZW50LCBQYXNzUmVmPFJlbmRlclN0eWxlPiBzdHlsZSkK ICAgICA6IFJlbmRlclNWR1Jlc291cmNlR3JhZGllbnQoZWxlbWVudCwgV1RGOjptb3ZlKHN0eWxl KSkKIHsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3Vy Y2VMaW5lYXJHcmFkaWVudC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VMaW5lYXJHcmFkaWVudC5oCShyZXZpc2lvbiAxNzUxMTUp CisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlTGluZWFy R3JhZGllbnQuaAkod29ya2luZyBjb3B5KQpAQCAtMzQsOCArMzQsOCBAQCBwdWJsaWM6CiAKICAg ICBTVkdMaW5lYXJHcmFkaWVudEVsZW1lbnQmIGxpbmVhckdyYWRpZW50RWxlbWVudCgpIGNvbnN0 IHsgcmV0dXJuIGRvd25jYXN0PFNWR0xpbmVhckdyYWRpZW50RWxlbWVudD4oUmVuZGVyU1ZHUmVz b3VyY2VHcmFkaWVudDo6Z3JhZGllbnRFbGVtZW50KCkpOyB9CiAKKyAgICBzdGF0aWMgY29uc3Qg UmVuZGVyU1ZHUmVzb3VyY2VUeXBlIHNfcmVzb3VyY2VUeXBlID0gTGluZWFyR3JhZGllbnRSZXNv dXJjZVR5cGU7CiAgICAgdmlydHVhbCBSZW5kZXJTVkdSZXNvdXJjZVR5cGUgcmVzb3VyY2VUeXBl KCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gc19yZXNvdXJjZVR5cGU7IH0KLSAgICBzdGF0aWMg UmVuZGVyU1ZHUmVzb3VyY2VUeXBlIHNfcmVzb3VyY2VUeXBlOwogCiAgICAgdmlydHVhbCBTVkdV bml0VHlwZXM6OlNWR1VuaXRUeXBlIGdyYWRpZW50VW5pdHMoKSBjb25zdCBvdmVycmlkZSB7IHJl dHVybiBtX2F0dHJpYnV0ZXMuZ3JhZGllbnRVbml0cygpOyB9CiAgICAgdmlydHVhbCB2b2lkIGNh bGN1bGF0ZUdyYWRpZW50VHJhbnNmb3JtKEFmZmluZVRyYW5zZm9ybSYgdHJhbnNmb3JtKSBvdmVy cmlkZSB7IHRyYW5zZm9ybSA9IG1fYXR0cmlidXRlcy5ncmFkaWVudFRyYW5zZm9ybSgpOyB9Cklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlTWFya2Vy LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNW R1Jlc291cmNlTWFya2VyLmNwcAkocmV2aXNpb24gMTc1MTE1KQorKysgU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZU1hcmtlci5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTI4LDggKzI4LDYgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1SZW5kZXJTVkdSZXNv dXJjZVR5cGUgUmVuZGVyU1ZHUmVzb3VyY2VNYXJrZXI6OnNfcmVzb3VyY2VUeXBlID0gTWFya2Vy UmVzb3VyY2VUeXBlOwotCiBSZW5kZXJTVkdSZXNvdXJjZU1hcmtlcjo6UmVuZGVyU1ZHUmVzb3Vy Y2VNYXJrZXIoU1ZHTWFya2VyRWxlbWVudCYgZWxlbWVudCwgUGFzc1JlZjxSZW5kZXJTdHlsZT4g c3R5bGUpCiAgICAgOiBSZW5kZXJTVkdSZXNvdXJjZUNvbnRhaW5lcihlbGVtZW50LCBXVEY6Om1v dmUoc3R5bGUpKQogewpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJT VkdSZXNvdXJjZU1hcmtlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VNYXJrZXIuaAkocmV2aXNpb24gMTc1MTE1KQorKysgU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZU1hcmtlci5oCSh3b3Jr aW5nIGNvcHkpCkBAIC01OSw4ICs1OSw4IEBAIHB1YmxpYzoKICAgICBmbG9hdCBhbmdsZSgpIGNv bnN0OwogICAgIFNWR01hcmtlclVuaXRzVHlwZSBtYXJrZXJVbml0cygpIGNvbnN0IHsgcmV0dXJu IG1hcmtlckVsZW1lbnQoKS5tYXJrZXJVbml0cygpOyB9CiAKKyAgICBzdGF0aWMgY29uc3QgUmVu ZGVyU1ZHUmVzb3VyY2VUeXBlIHNfcmVzb3VyY2VUeXBlID0gTWFya2VyUmVzb3VyY2VUeXBlOwog ICAgIHZpcnR1YWwgUmVuZGVyU1ZHUmVzb3VyY2VUeXBlIHJlc291cmNlVHlwZSgpIGNvbnN0IG92 ZXJyaWRlIHsgcmV0dXJuIHNfcmVzb3VyY2VUeXBlOyB9Ci0gICAgc3RhdGljIFJlbmRlclNWR1Jl c291cmNlVHlwZSBzX3Jlc291cmNlVHlwZTsKIAogcHJpdmF0ZToKICAgICB2b2lkIGVsZW1lbnQo KSBjb25zdCA9IGRlbGV0ZTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVu ZGVyU1ZHUmVzb3VyY2VNYXNrZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VNYXNrZXIuY3BwCShyZXZpc2lvbiAxNzUxMTUp CisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlTWFza2Vy LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjksOCArMjksNiBAQAogCiBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAKLVJlbmRlclNWR1Jlc291cmNlVHlwZSBSZW5kZXJTVkdSZXNvdXJjZU1hc2tlcjo6c19y ZXNvdXJjZVR5cGUgPSBNYXNrZXJSZXNvdXJjZVR5cGU7Ci0KIFJlbmRlclNWR1Jlc291cmNlTWFz a2VyOjpSZW5kZXJTVkdSZXNvdXJjZU1hc2tlcihTVkdNYXNrRWxlbWVudCYgZWxlbWVudCwgUGFz c1JlZjxSZW5kZXJTdHlsZT4gc3R5bGUpCiAgICAgOiBSZW5kZXJTVkdSZXNvdXJjZUNvbnRhaW5l cihlbGVtZW50LCBXVEY6Om1vdmUoc3R5bGUpKQogewpJbmRleDogU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZU1hc2tlci5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VNYXNrZXIuaAkocmV2aXNp b24gMTc1MTE1KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNv dXJjZU1hc2tlci5oCSh3b3JraW5nIGNvcHkpCkBAIC01MCw4ICs1MCw4IEBAIHB1YmxpYzoKICAg ICBTVkdVbml0VHlwZXM6OlNWR1VuaXRUeXBlIG1hc2tVbml0cygpIGNvbnN0IHsgcmV0dXJuIG1h c2tFbGVtZW50KCkubWFza1VuaXRzKCk7IH0KICAgICBTVkdVbml0VHlwZXM6OlNWR1VuaXRUeXBl IG1hc2tDb250ZW50VW5pdHMoKSBjb25zdCB7IHJldHVybiBtYXNrRWxlbWVudCgpLm1hc2tDb250 ZW50VW5pdHMoKTsgfQogCisgICAgc3RhdGljIGNvbnN0IFJlbmRlclNWR1Jlc291cmNlVHlwZSBz X3Jlc291cmNlVHlwZSA9IE1hc2tlclJlc291cmNlVHlwZTsKICAgICB2aXJ0dWFsIFJlbmRlclNW R1Jlc291cmNlVHlwZSByZXNvdXJjZVR5cGUoKSBjb25zdCBvdmVycmlkZSB7IHJldHVybiBzX3Jl c291cmNlVHlwZTsgfQotICAgIHN0YXRpYyBSZW5kZXJTVkdSZXNvdXJjZVR5cGUgc19yZXNvdXJj ZVR5cGU7CiAKIHByaXZhdGU6CiAgICAgdm9pZCBlbGVtZW50KCkgY29uc3QgPSBkZWxldGU7Cklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlUGF0dGVy bi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJT VkdSZXNvdXJjZVBhdHRlcm4uY3BwCShyZXZpc2lvbiAxNzUxMTUpCisrKyBTb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlUGF0dGVybi5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTMwLDggKzMwLDYgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1SZW5kZXJTVkdS ZXNvdXJjZVR5cGUgUmVuZGVyU1ZHUmVzb3VyY2VQYXR0ZXJuOjpzX3Jlc291cmNlVHlwZSA9IFBh dHRlcm5SZXNvdXJjZVR5cGU7Ci0KIFJlbmRlclNWR1Jlc291cmNlUGF0dGVybjo6UmVuZGVyU1ZH UmVzb3VyY2VQYXR0ZXJuKFNWR1BhdHRlcm5FbGVtZW50JiBlbGVtZW50LCBQYXNzUmVmPFJlbmRl clN0eWxlPiBzdHlsZSkKICAgICA6IFJlbmRlclNWR1Jlc291cmNlQ29udGFpbmVyKGVsZW1lbnQs IFdURjo6bW92ZShzdHlsZSkpCiAgICAgLCBtX3Nob3VsZENvbGxlY3RQYXR0ZXJuQXR0cmlidXRl cyh0cnVlKQpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNv dXJjZVBhdHRlcm4uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3Zn L1JlbmRlclNWR1Jlc291cmNlUGF0dGVybi5oCShyZXZpc2lvbiAxNzUxMTUpCisrKyBTb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlUGF0dGVybi5oCSh3b3JraW5n IGNvcHkpCkBAIC01MSw4ICs1MSw4IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgcG9zdEFw cGx5UmVzb3VyY2UoUmVuZGVyRWxlbWVudCYsIEdyYXBoaWNzQ29udGV4dComLCB1bnNpZ25lZCBz aG9ydCByZXNvdXJjZU1vZGUsIGNvbnN0IFBhdGgqLCBjb25zdCBSZW5kZXJTVkdTaGFwZSopIG92 ZXJyaWRlOwogICAgIHZpcnR1YWwgRmxvYXRSZWN0IHJlc291cmNlQm91bmRpbmdCb3goY29uc3Qg UmVuZGVyT2JqZWN0Jikgb3ZlcnJpZGUgeyByZXR1cm4gRmxvYXRSZWN0KCk7IH0KIAorICAgIHN0 YXRpYyBjb25zdCBSZW5kZXJTVkdSZXNvdXJjZVR5cGUgc19yZXNvdXJjZVR5cGUgPSBQYXR0ZXJu UmVzb3VyY2VUeXBlOwogICAgIHZpcnR1YWwgUmVuZGVyU1ZHUmVzb3VyY2VUeXBlIHJlc291cmNl VHlwZSgpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIHNfcmVzb3VyY2VUeXBlOyB9Ci0gICAgc3Rh dGljIFJlbmRlclNWR1Jlc291cmNlVHlwZSBzX3Jlc291cmNlVHlwZTsKIAogcHJpdmF0ZToKICAg ICB2b2lkIGVsZW1lbnQoKSBjb25zdCA9IGRlbGV0ZTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VSYWRpYWxHcmFkaWVudC5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZVJhZGlh bEdyYWRpZW50LmNwcAkocmV2aXNpb24gMTc1MTE1KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZVJhZGlhbEdyYWRpZW50LmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMjQsOCArMjQsNiBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLVJlbmRlclNWR1Jl c291cmNlVHlwZSBSZW5kZXJTVkdSZXNvdXJjZVJhZGlhbEdyYWRpZW50OjpzX3Jlc291cmNlVHlw ZSA9IFJhZGlhbEdyYWRpZW50UmVzb3VyY2VUeXBlOwotCiBSZW5kZXJTVkdSZXNvdXJjZVJhZGlh bEdyYWRpZW50OjpSZW5kZXJTVkdSZXNvdXJjZVJhZGlhbEdyYWRpZW50KFNWR1JhZGlhbEdyYWRp ZW50RWxlbWVudCYgZWxlbWVudCwgUGFzc1JlZjxSZW5kZXJTdHlsZT4gc3R5bGUpCiAgICAgOiBS ZW5kZXJTVkdSZXNvdXJjZUdyYWRpZW50KGVsZW1lbnQsIFdURjo6bW92ZShzdHlsZSkpCiB7Cklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlUmFkaWFs R3JhZGllbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1Jl bmRlclNWR1Jlc291cmNlUmFkaWFsR3JhZGllbnQuaAkocmV2aXNpb24gMTc1MTE1KQorKysgU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZVJhZGlhbEdyYWRpZW50 LmgJKHdvcmtpbmcgY29weSkKQEAgLTM2LDggKzM2LDggQEAgcHVibGljOgogCiAgICAgU1ZHUmFk aWFsR3JhZGllbnRFbGVtZW50JiByYWRpYWxHcmFkaWVudEVsZW1lbnQoKSBjb25zdCB7IHJldHVy biBkb3duY2FzdDxTVkdSYWRpYWxHcmFkaWVudEVsZW1lbnQ+KFJlbmRlclNWR1Jlc291cmNlR3Jh ZGllbnQ6OmdyYWRpZW50RWxlbWVudCgpKTsgfQogCisgICAgc3RhdGljIGNvbnN0IFJlbmRlclNW R1Jlc291cmNlVHlwZSBzX3Jlc291cmNlVHlwZSA9IFJhZGlhbEdyYWRpZW50UmVzb3VyY2VUeXBl OwogICAgIHZpcnR1YWwgUmVuZGVyU1ZHUmVzb3VyY2VUeXBlIHJlc291cmNlVHlwZSgpIGNvbnN0 IG92ZXJyaWRlIHsgcmV0dXJuIHNfcmVzb3VyY2VUeXBlOyB9Ci0gICAgc3RhdGljIFJlbmRlclNW R1Jlc291cmNlVHlwZSBzX3Jlc291cmNlVHlwZTsKIAogICAgIHZpcnR1YWwgU1ZHVW5pdFR5cGVz OjpTVkdVbml0VHlwZSBncmFkaWVudFVuaXRzKCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gbV9h dHRyaWJ1dGVzLmdyYWRpZW50VW5pdHMoKTsgfQogICAgIHZpcnR1YWwgdm9pZCBjYWxjdWxhdGVH cmFkaWVudFRyYW5zZm9ybShBZmZpbmVUcmFuc2Zvcm0mIHRyYW5zZm9ybSkgb3ZlcnJpZGUgeyB0 cmFuc2Zvcm0gPSBtX2F0dHJpYnV0ZXMuZ3JhZGllbnRUcmFuc2Zvcm0oKTsgfQpJbmRleDogU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZVNvbGlkQ29sb3IuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVz b3VyY2VTb2xpZENvbG9yLmNwcAkocmV2aXNpb24gMTc1MTE1KQorKysgU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZVNvbGlkQ29sb3IuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0yOCw4ICsyOCw2IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotUmVuZGVyU1ZH UmVzb3VyY2VUeXBlIFJlbmRlclNWR1Jlc291cmNlU29saWRDb2xvcjo6c19yZXNvdXJjZVR5cGUg PSBTb2xpZENvbG9yUmVzb3VyY2VUeXBlOwotCiBSZW5kZXJTVkdSZXNvdXJjZVNvbGlkQ29sb3I6 OlJlbmRlclNWR1Jlc291cmNlU29saWRDb2xvcigpCiB7CiB9CkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlU29saWRDb2xvci5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVzb3VyY2VTb2xpZENv bG9yLmgJKHJldmlzaW9uIDE3NTExNSkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcv UmVuZGVyU1ZHUmVzb3VyY2VTb2xpZENvbG9yLmgJKHdvcmtpbmcgY29weSkKQEAgLTM3LDggKzM3 LDggQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBwb3N0QXBwbHlSZXNvdXJjZShSZW5kZXJF bGVtZW50JiwgR3JhcGhpY3NDb250ZXh0KiYsIHVuc2lnbmVkIHNob3J0IHJlc291cmNlTW9kZSwg Y29uc3QgUGF0aCosIGNvbnN0IFJlbmRlclNWR1NoYXBlKikgb3ZlcnJpZGU7CiAgICAgdmlydHVh bCBGbG9hdFJlY3QgcmVzb3VyY2VCb3VuZGluZ0JveChjb25zdCBSZW5kZXJPYmplY3QmKSBvdmVy cmlkZSB7IHJldHVybiBGbG9hdFJlY3QoKTsgfQogCisgICAgc3RhdGljIGNvbnN0IFJlbmRlclNW R1Jlc291cmNlVHlwZSBzX3Jlc291cmNlVHlwZSA9IFNvbGlkQ29sb3JSZXNvdXJjZVR5cGU7CiAg ICAgdmlydHVhbCBSZW5kZXJTVkdSZXNvdXJjZVR5cGUgcmVzb3VyY2VUeXBlKCkgY29uc3Qgb3Zl cnJpZGUgeyByZXR1cm4gc19yZXNvdXJjZVR5cGU7IH0KLSAgICBzdGF0aWMgUmVuZGVyU1ZHUmVz b3VyY2VUeXBlIHNfcmVzb3VyY2VUeXBlOwogCiAgICAgY29uc3QgQ29sb3ImIGNvbG9yKCkgY29u c3QgeyByZXR1cm4gbV9jb2xvcjsgfQogICAgIHZvaWQgc2V0Q29sb3IoY29uc3QgQ29sb3ImIGNv bG9yKSB7IG1fY29sb3IgPSBjb2xvcjsgfQo=