139731 2014-12-17 09:22:27 -0800 Purge PassRefPtr from Frame. 2014-12-17 11:38:38 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kling kling commit-queue japhet kling oldest_to_newest 1056340 0 kling 2014-12-17 09:22:27 -0800 Yep. 1056342 1 243438 kling 2014-12-17 09:25:11 -0800 Created attachment 243438 Patch 1056343 2 243438 andersca 2014-12-17 09:27:51 -0800 Comment on attachment 243438 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=243438&action=review > Source/WebCore/page/Frame.cpp:210 > ASSERT(page); > ASSERT(client); Looks like these would be good candidates for turning into references. > Source/WebKit/mac/WebView/WebFrame.mm:324 > + Ref<Frame> coreFrame(Frame::create(page, ownerElement, new WebFrameLoaderClient(frame))); auto coreFrame = > Source/WebKit2/WebProcess/WebPage/WebFrame.cpp:126 > + Ref<Frame> coreFrame(Frame::create(page->corePage(), ownerElement, frame->m_frameLoaderClient.get())); auto coreFrame = 1056346 3 243439 kling 2014-12-17 09:36:43 -0800 Created attachment 243439 Patch for landing 1056365 4 commit-queue 2014-12-17 10:22:02 -0800 The commit-queue encountered the following flaky tests while processing attachment 243439: transitions/default-timing-function.html bug 138901 (author: simon.fraser@apple.com) The commit-queue is continuing to process your patch. 1056366 5 commit-queue 2014-12-17 10:22:06 -0800 The commit-queue encountered the following flaky tests while processing attachment 243439: The commit-queue is continuing to process your patch. 1056382 6 commit-queue 2014-12-17 11:02:49 -0800 The commit-queue encountered the following flaky tests while processing attachment 243439: transitions/default-timing-function.html bug 138901 (author: simon.fraser@apple.com) The commit-queue is continuing to process your patch. 1056383 7 commit-queue 2014-12-17 11:02:52 -0800 The commit-queue encountered the following flaky tests while processing attachment 243439: The commit-queue is continuing to process your patch. 1056484 8 243439 commit-queue 2014-12-17 11:38:35 -0800 Comment on attachment 243439 Patch for landing Clearing flags on attachment: 243439 Committed r177450: <http://trac.webkit.org/changeset/177450> 1056485 9 commit-queue 2014-12-17 11:38:38 -0800 All reviewed patches have been landed. Closing bug. 243438 2014-12-17 09:25:11 -0800 2014-12-17 09:36:43 -0800 Patch bug-139731.diff text/plain 15530 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmMTYyMzFjLi5kODYzNzM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYg QEAKKzIwMTQtMTItMTcgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgorCisgICAg ICAgIFB1cmdlIFBhc3NSZWZQdHIgZnJvbSBGcmFtZS4KKyAgICAgICAgPGh0dHBzOi8vd2Via2l0 Lm9yZy9iLzEzOTczMT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBSZW1vdmUgYWxsIHVzZSBvZiBQYXNzUmVmUHRyIGZyb20gdGhlIEZyYW1lIGNsYXNz LCBpbnN0ZWFkIHVzaW5nCisgICAgICAgIFJlZiBvciBSZWZQdHIgYXMgYXBwcm9wcmlhdGUuCisK KyAgICAgICAgKiBXZWJDb3JlLmV4cC5pbjoKKyAgICAgICAgKiBsb2FkZXIvRG9jdW1lbnRXcml0 ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnRXcml0ZXI6OmJlZ2luKToKKyAgICAg ICAgKiBwYWdlL0ZyYW1lLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lOjpjcmVhdGUpOgor ICAgICAgICAoV2ViQ29yZTo6RnJhbWU6OnNldFZpZXcpOgorICAgICAgICAoV2ViQ29yZTo6RnJh bWU6OnNldERvY3VtZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lOjpyYW5nZUZvclBvaW50 KToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lOjpjcmVhdGVWaWV3KToKKyAgICAgICAgKiBwYWdl L0ZyYW1lLmg6CisgICAgICAgICogeG1sL1hTTFRQcm9jZXNzb3IuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6WFNMVFByb2Nlc3Nvcjo6Y3JlYXRlRG9jdW1lbnRGcm9tU291cmNlKToKKwogMjAxNC0x Mi0xNiAgQW5kcmVhcyBLbGluZyAgPGFrbGluZ0BhcHBsZS5jb20+CiAKICAgICAgICAgVXNlIFJl ZiBmb3IgU2VjdXJpdHlPcmlnaW4uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3Jl LmV4cC5pbiBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCmluZGV4IGZmNjZiYzguLjZh OGUyNGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCisrKyBiL1Nv dXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCkBAIC0xMjE2LDcgKzEyMTYsNyBAQCBfX1pON1dl YkNvcmU1RnJhbWUyNHNlYXJjaEZvckxhYmVsc0Fib3ZlQ2VsbEVSS04zSlNDNFlhcnIxN1JlZ3Vs YXJFeHByZXNzaW9uRVBOUwogX19aTjdXZWJDb3JlNUZyYW1lMjVzZXRQYWdlQW5kVGV4dFpvb21G YWN0b3JzRWZmCiBfX1pON1dlYkNvcmU1RnJhbWUyN3Jlc2l6ZVBhZ2VSZWN0c0tlZXBpbmdSYXRp b0VSS05TXzlGbG9hdFNpemVFUzNfCiBfX1pON1dlYkNvcmU1RnJhbWU2Y3JlYXRlRVBOU180UGFn ZUVQTlNfMjFIVE1MRnJhbWVPd25lckVsZW1lbnRFUE5TXzE3RnJhbWVMb2FkZXJDbGllbnRFCi1f X1pON1dlYkNvcmU1RnJhbWU3c2V0Vmlld0VOM1dURjEwUGFzc1JlZlB0cklOU185RnJhbWVWaWV3 RUVFCitfX1pON1dlYkNvcmU1RnJhbWU3c2V0Vmlld0VPTjNXVEY2UmVmUHRySU5TXzlGcmFtZVZp ZXdFRUUKIF9fWk43V2ViQ29yZTVGcmFtZUQxRXYKIF9fWk43V2ViQ29yZTVJbWFnZTEyc3VwcG9y dHNUeXBlRVJLTjNXVEY2U3RyaW5nRQogX19aTjdXZWJDb3JlNUltYWdlMjBsb2FkUGxhdGZvcm1S ZXNvdXJjZUVQS2MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudFdy aXRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRXcml0ZXIuY3BwCmluZGV4 IDIwMGMwZTMuLjE1YjJlNjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1 bWVudFdyaXRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50V3JpdGVy LmNwcApAQCAtMTQ0LDcgKzE0NCw3IEBAIHZvaWQgRG9jdW1lbnRXcml0ZXI6OmJlZ2luKGNvbnN0 IFVSTCYgdXJsUmVmZXJlbmNlLCBib29sIGRpc3BhdGNoLCBEb2N1bWVudCogb3duCiAgICAgICAg IG1fZnJhbWUtPnNjcmlwdCgpLnVwZGF0ZVBsYXRmb3JtU2NyaXB0T2JqZWN0cygpOwogCiAgICAg bV9mcmFtZS0+bG9hZGVyKCkuc2V0T3V0Z29pbmdSZWZlcnJlcih1cmwpOwotICAgIG1fZnJhbWUt PnNldERvY3VtZW50KGRvY3VtZW50KTsKKyAgICBtX2ZyYW1lLT5zZXREb2N1bWVudChkb2N1bWVu dC5jb3B5UmVmKCkpOwogCiAgICAgaWYgKG1fZGVjb2RlcikKICAgICAgICAgZG9jdW1lbnQtPnNl dERlY29kZXIobV9kZWNvZGVyLmdldCgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvRnJhbWUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5jcHAKaW5kZXggNDk4YmQ2 ZC4uNjQzZmFlZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5jcHAKQEAgLTIwNCwxMSArMjA0LDExIEBAIEZy YW1lOjpGcmFtZShQYWdlJiBwYWdlLCBIVE1MRnJhbWVPd25lckVsZW1lbnQqIG93bmVyRWxlbWVu dCwgRnJhbWVMb2FkZXJDbGllbnQmCiAjZW5kaWYKIH0KIAotUGFzc1JlZlB0cjxGcmFtZT4gRnJh bWU6OmNyZWF0ZShQYWdlKiBwYWdlLCBIVE1MRnJhbWVPd25lckVsZW1lbnQqIG93bmVyRWxlbWVu dCwgRnJhbWVMb2FkZXJDbGllbnQqIGNsaWVudCkKK1JlZjxGcmFtZT4gRnJhbWU6OmNyZWF0ZShQ YWdlKiBwYWdlLCBIVE1MRnJhbWVPd25lckVsZW1lbnQqIG93bmVyRWxlbWVudCwgRnJhbWVMb2Fk ZXJDbGllbnQqIGNsaWVudCkKIHsKICAgICBBU1NFUlQocGFnZSk7CiAgICAgQVNTRVJUKGNsaWVu dCk7Ci0gICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBGcmFtZSgqcGFnZSwgb3duZXJFbGVtZW50LCAq Y2xpZW50KSk7CisgICAgcmV0dXJuIGFkb3B0UmVmKCpuZXcgRnJhbWUoKnBhZ2UsIG93bmVyRWxl bWVudCwgKmNsaWVudCkpOwogfQogCiBGcmFtZTo6fkZyYW1lKCkKQEAgLTI0MSw3ICsyNDEsNyBA QCB2b2lkIEZyYW1lOjpyZW1vdmVEZXN0cnVjdGlvbk9ic2VydmVyKEZyYW1lRGVzdHJ1Y3Rpb25P YnNlcnZlciogb2JzZXJ2ZXIpCiAgICAgbV9kZXN0cnVjdGlvbk9ic2VydmVycy5yZW1vdmUob2Jz ZXJ2ZXIpOwogfQogCi12b2lkIEZyYW1lOjpzZXRWaWV3KFBhc3NSZWZQdHI8RnJhbWVWaWV3PiB2 aWV3KQordm9pZCBGcmFtZTo6c2V0VmlldyhSZWZQdHI8RnJhbWVWaWV3PiYmIHZpZXcpCiB7CiAg ICAgLy8gV2UgdGhlIGN1c3RvbSBzY3JvbGwgYmFycyBhcyBlYXJseSBhcyBwb3NzaWJsZSB0byBw cmV2ZW50IG1fZG9jLT5kZXRhY2goKQogICAgIC8vIGZyb20gbWVzc2luZyB3aXRoIHRoZSB2aWV3 IHN1Y2ggdGhhdCBpdHMgc2Nyb2xsIGJhcnMgd29uJ3QgYmUgdG9ybiBkb3duLgpAQCAtMjYwLDcg KzI2MCw3IEBAIHZvaWQgRnJhbWU6OnNldFZpZXcoUGFzc1JlZlB0cjxGcmFtZVZpZXc+IHZpZXcp CiAgICAgCiAgICAgZXZlbnRIYW5kbGVyKCkuY2xlYXIoKTsKIAotICAgIG1fdmlldyA9IHZpZXc7 CisgICAgbV92aWV3ID0gV1RGOjptb3ZlKHZpZXcpOwogCiAgICAgLy8gT25seSBvbmUgZm9ybSBz dWJtaXNzaW9uIGlzIGFsbG93ZWQgcGVyIHZpZXcgb2YgYSBwYXJ0LgogICAgIC8vIFNpbmNlIHRo aXMgcGFydCBtYXkgYmUgZ2V0dGluZyByZXVzZWQgYXMgYSByZXN1bHQgb2YgYmVpbmcKQEAgLTI2 OCwxNCArMjY4LDE0IEBAIHZvaWQgRnJhbWU6OnNldFZpZXcoUGFzc1JlZlB0cjxGcmFtZVZpZXc+ IHZpZXcpCiAgICAgbG9hZGVyKCkucmVzZXRNdWx0aXBsZUZvcm1TdWJtaXNzaW9uUHJvdGVjdGlv bigpOwogfQogCi12b2lkIEZyYW1lOjpzZXREb2N1bWVudChQYXNzUmVmUHRyPERvY3VtZW50PiBu ZXdEb2N1bWVudCkKK3ZvaWQgRnJhbWU6OnNldERvY3VtZW50KFJlZlB0cjxEb2N1bWVudD4mJiBu ZXdEb2N1bWVudCkKIHsKICAgICBBU1NFUlQoIW5ld0RvY3VtZW50IHx8IG5ld0RvY3VtZW50LT5m cmFtZSgpID09IHRoaXMpOwogCiAgICAgaWYgKG1fZG9jICYmICFtX2RvYy0+aW5QYWdlQ2FjaGUo KSkKICAgICAgICAgbV9kb2MtPnByZXBhcmVGb3JEZXN0cnVjdGlvbigpOwogCi0gICAgbV9kb2Mg PSBuZXdEb2N1bWVudC5nZXQoKTsKKyAgICBtX2RvYyA9IG5ld0RvY3VtZW50LmNvcHlSZWYoKTsK ICAgICBBU1NFUlQoIW1fZG9jIHx8IG1fZG9jLT5kb21XaW5kb3coKSk7CiAgICAgQVNTRVJUKCFt X2RvYyB8fCBtX2RvYy0+ZG9tV2luZG93KCktPmZyYW1lKCkgPT0gdGhpcyk7CiAKQEAgLTg1NCwy OCArODU0LDI4IEBAIERvY3VtZW50KiBGcmFtZTo6ZG9jdW1lbnRBdFBvaW50KGNvbnN0IEludFBv aW50JiBwb2ludCkKICAgICByZXR1cm4gcmVzdWx0LmlubmVyTm9kZSgpID8gJnJlc3VsdC5pbm5l ck5vZGUoKS0+ZG9jdW1lbnQoKSA6IDA7CiB9CiAKLVBhc3NSZWZQdHI8UmFuZ2U+IEZyYW1lOjpy YW5nZUZvclBvaW50KGNvbnN0IEludFBvaW50JiBmcmFtZVBvaW50KQorUmVmUHRyPFJhbmdlPiBG cmFtZTo6cmFuZ2VGb3JQb2ludChjb25zdCBJbnRQb2ludCYgZnJhbWVQb2ludCkKIHsKICAgICBW aXNpYmxlUG9zaXRpb24gcG9zaXRpb24gPSB2aXNpYmxlUG9zaXRpb25Gb3JQb2ludChmcmFtZVBv aW50KTsKICAgICBpZiAocG9zaXRpb24uaXNOdWxsKCkpCi0gICAgICAgIHJldHVybiAwOworICAg ICAgICByZXR1cm4gbnVsbHB0cjsKIAogICAgIFZpc2libGVQb3NpdGlvbiBwcmV2aW91cyA9IHBv c2l0aW9uLnByZXZpb3VzKCk7CiAgICAgaWYgKHByZXZpb3VzLmlzTm90TnVsbCgpKSB7CiAgICAg ICAgIFJlZlB0cjxSYW5nZT4gcHJldmlvdXNDaGFyYWN0ZXJSYW5nZSA9IG1ha2VSYW5nZShwcmV2 aW91cywgcG9zaXRpb24pOwogICAgICAgICBMYXlvdXRSZWN0IHJlY3QgPSBlZGl0b3IoKS5maXJz dFJlY3RGb3JSYW5nZShwcmV2aW91c0NoYXJhY3RlclJhbmdlLmdldCgpKTsKICAgICAgICAgaWYg KHJlY3QuY29udGFpbnMoZnJhbWVQb2ludCkpCi0gICAgICAgICAgICByZXR1cm4gcHJldmlvdXND aGFyYWN0ZXJSYW5nZS5yZWxlYXNlKCk7CisgICAgICAgICAgICByZXR1cm4gcHJldmlvdXNDaGFy YWN0ZXJSYW5nZTsKICAgICB9CiAKICAgICBWaXNpYmxlUG9zaXRpb24gbmV4dCA9IHBvc2l0aW9u Lm5leHQoKTsKICAgICBpZiAoUmVmUHRyPFJhbmdlPiBuZXh0Q2hhcmFjdGVyUmFuZ2UgPSBtYWtl UmFuZ2UocG9zaXRpb24sIG5leHQpKSB7CiAgICAgICAgIExheW91dFJlY3QgcmVjdCA9IGVkaXRv cigpLmZpcnN0UmVjdEZvclJhbmdlKG5leHRDaGFyYWN0ZXJSYW5nZS5nZXQoKSk7CiAgICAgICAg IGlmIChyZWN0LmNvbnRhaW5zKGZyYW1lUG9pbnQpKQotICAgICAgICAgICAgcmV0dXJuIG5leHRD aGFyYWN0ZXJSYW5nZS5yZWxlYXNlKCk7CisgICAgICAgICAgICByZXR1cm4gbmV4dENoYXJhY3Rl clJhbmdlOwogICAgIH0KIAotICAgIHJldHVybiAwOworICAgIHJldHVybiBudWxscHRyOwogfQog CiB2b2lkIEZyYW1lOjpjcmVhdGVWaWV3KGNvbnN0IEludFNpemUmIHZpZXdwb3J0U2l6ZSwgY29u c3QgQ29sb3ImIGJhY2tncm91bmRDb2xvciwgYm9vbCB0cmFuc3BhcmVudCwKQEAgLTkwOCw3ICs5 MDgsNyBAQCB2b2lkIEZyYW1lOjpjcmVhdGVWaWV3KGNvbnN0IEludFNpemUmIHZpZXdwb3J0U2l6 ZSwgY29uc3QgQ29sb3ImIGJhY2tncm91bmRDb2xvcgogCiAgICAgZnJhbWVWaWV3LT5zZXRTY3Jv bGxiYXJNb2Rlcyhob3Jpem9udGFsU2Nyb2xsYmFyTW9kZSwgdmVydGljYWxTY3JvbGxiYXJNb2Rl LCBob3Jpem9udGFsTG9jaywgdmVydGljYWxMb2NrKTsKIAotICAgIHNldFZpZXcoZnJhbWVWaWV3 KTsKKyAgICBzZXRWaWV3KGZyYW1lVmlldy5jb3B5UmVmKCkpOwogCiAgICAgaWYgKGJhY2tncm91 bmRDb2xvci5pc1ZhbGlkKCkpCiAgICAgICAgIGZyYW1lVmlldy0+dXBkYXRlQmFja2dyb3VuZFJl Y3Vyc2l2ZWx5KGJhY2tncm91bmRDb2xvciwgdHJhbnNwYXJlbnQpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5oCmlu ZGV4IGVhMTZhYWQuLmNhNzgwMWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJh bWUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lLmgKQEAgLTExNSwxNCArMTE1LDE0 IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAgIGNsYXNzIEZyYW1lIDogcHVibGljIFJlZkNv dW50ZWQ8RnJhbWU+IHsKICAgICBwdWJsaWM6Ci0gICAgICAgIFdFQkNPUkVfRVhQT1JUIHN0YXRp YyBQYXNzUmVmUHRyPEZyYW1lPiBjcmVhdGUoUGFnZSosIEhUTUxGcmFtZU93bmVyRWxlbWVudCos IEZyYW1lTG9hZGVyQ2xpZW50Kik7CisgICAgICAgIFdFQkNPUkVfRVhQT1JUIHN0YXRpYyBSZWY8 RnJhbWU+IGNyZWF0ZShQYWdlKiwgSFRNTEZyYW1lT3duZXJFbGVtZW50KiwgRnJhbWVMb2FkZXJD bGllbnQqKTsKIAogICAgICAgICB2b2lkIGluaXQoKTsKICNpZiBQTEFURk9STShJT1MpCiAgICAg ICAgIC8vIENyZWF0ZXMgPGh0bWw+PGJvZHkgc3R5bGU9Ii4uLiI+PC9ib2R5PjwvaHRtbD4gZG9p bmcgbWluaW1hbCBhbW91bnQgb2Ygd29yay4KICAgICAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBp bml0V2l0aFNpbXBsZUhUTUxEb2N1bWVudChjb25zdCBTdHJpbmcmIHN0eWxlLCBjb25zdCBVUkwm KTsKICNlbmRpZgotICAgICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHNldFZpZXcoUGFzc1JlZlB0 cjxGcmFtZVZpZXc+KTsKKyAgICAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBzZXRWaWV3KFJlZlB0 cjxGcmFtZVZpZXc+JiYpOwogICAgICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIGNyZWF0ZVZpZXco Y29uc3QgSW50U2l6ZSYsIGNvbnN0IENvbG9yJiwgYm9vbCwKICAgICAgICAgICAgIGNvbnN0IElu dFNpemUmIGZpeGVkTGF5b3V0U2l6ZSA9IEludFNpemUoKSwgY29uc3QgSW50UmVjdCYgZml4ZWRW aXNpYmxlQ29udGVudFJlY3QgPSBJbnRSZWN0KCksCiAgICAgICAgICAgICBib29sIHVzZUZpeGVk TGF5b3V0ID0gZmFsc2UsIFNjcm9sbGJhck1vZGUgPSBTY3JvbGxiYXJBdXRvLCBib29sIGhvcml6 b250YWxMb2NrID0gZmFsc2UsCkBAIC0xNzMsNyArMTczLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUg ewogICAgICAgICBib29sIHNob3VsZFVzZVByaW50aW5nTGF5b3V0KCkgY29uc3Q7CiAgICAgICAg IFdFQkNPUkVfRVhQT1JUIEZsb2F0U2l6ZSByZXNpemVQYWdlUmVjdHNLZWVwaW5nUmF0aW8oY29u c3QgRmxvYXRTaXplJiBvcmlnaW5hbFNpemUsIGNvbnN0IEZsb2F0U2l6ZSYgZXhwZWN0ZWRTaXpl KTsKIAotICAgICAgICB2b2lkIHNldERvY3VtZW50KFBhc3NSZWZQdHI8RG9jdW1lbnQ+KTsKKyAg ICAgICAgdm9pZCBzZXREb2N1bWVudChSZWZQdHI8RG9jdW1lbnQ+JiYpOwogCiAgICAgICAgIFdF QkNPUkVfRVhQT1JUIHZvaWQgc2V0UGFnZVpvb21GYWN0b3IoZmxvYXQpOwogICAgICAgICBmbG9h dCBwYWdlWm9vbUZhY3RvcigpIGNvbnN0IHsgcmV0dXJuIG1fcGFnZVpvb21GYWN0b3I7IH0KQEAg LTIyNSw3ICsyMjUsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKICAgICAgICAgV0VCQ09SRV9F WFBPUlQgVmlzaWJsZVBvc2l0aW9uIHZpc2libGVQb3NpdGlvbkZvclBvaW50KGNvbnN0IEludFBv aW50JiBmcmFtZVBvaW50KTsKICAgICAgICAgRG9jdW1lbnQqIGRvY3VtZW50QXRQb2ludChjb25z dCBJbnRQb2ludCYgd2luZG93UG9pbnQpOwotICAgICAgICBXRUJDT1JFX0VYUE9SVCBQYXNzUmVm UHRyPFJhbmdlPiByYW5nZUZvclBvaW50KGNvbnN0IEludFBvaW50JiBmcmFtZVBvaW50KTsKKyAg ICAgICAgV0VCQ09SRV9FWFBPUlQgUmVmUHRyPFJhbmdlPiByYW5nZUZvclBvaW50KGNvbnN0IElu dFBvaW50JiBmcmFtZVBvaW50KTsKIAogICAgICAgICBXRUJDT1JFX0VYUE9SVCBTdHJpbmcgc2Vh cmNoRm9yTGFiZWxzQWJvdmVDZWxsKGNvbnN0IEpTQzo6WWFycjo6UmVndWxhckV4cHJlc3Npb24m LCBIVE1MVGFibGVDZWxsRWxlbWVudCosIHNpemVfdCogcmVzdWx0RGlzdGFuY2VGcm9tU3RhcnRP ZkNlbGwpOwogICAgICAgICBTdHJpbmcgc2VhcmNoRm9yTGFiZWxzQmVmb3JlRWxlbWVudChjb25z dCBWZWN0b3I8U3RyaW5nPiYgbGFiZWxzLCBFbGVtZW50Kiwgc2l6ZV90KiByZXN1bHREaXN0YW5j ZSwgYm9vbCogcmVzdWx0SXNJbkNlbGxBYm92ZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS94bWwvWFNMVFByb2Nlc3Nvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS94bWwvWFNMVFByb2Nlc3Nv ci5jcHAKaW5kZXggZjEwYzBlZi4uNDZhMjliMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv eG1sL1hTTFRQcm9jZXNzb3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3htbC9YU0xUUHJvY2Vz c29yLmNwcApAQCAtOTYsNyArOTYsNyBAQCBQYXNzUmVmUHRyPERvY3VtZW50PiBYU0xUUHJvY2Vz c29yOjpjcmVhdGVEb2N1bWVudEZyb21Tb3VyY2UoY29uc3QgU3RyaW5nJiBzb3VyYwogICAgICAg ICAgICAgcmVzdWx0LT5jb250ZW50U2VjdXJpdHlQb2xpY3koKS0+Y29weVN0YXRlRnJvbShvbGRE b2N1bWVudC0+Y29udGVudFNlY3VyaXR5UG9saWN5KCkpOwogICAgICAgICB9CiAKLSAgICAgICAg ZnJhbWUtPnNldERvY3VtZW50KHJlc3VsdCk7CisgICAgICAgIGZyYW1lLT5zZXREb2N1bWVudChy ZXN1bHQuY29weVJlZigpKTsKICAgICB9CiAKICAgICBSZWZQdHI8VGV4dFJlc291cmNlRGVjb2Rl cj4gZGVjb2RlciA9IFRleHRSZXNvdXJjZURlY29kZXI6OmNyZWF0ZShzb3VyY2VNSU1FVHlwZSk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0 L21hYy9DaGFuZ2VMb2cKaW5kZXggNjc3N2VlNi4uMDA1ZWMzZSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9tYWMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpA QCAtMSwzICsxLDE3IEBACisyMDE0LTEyLTE3ICBBbmRyZWFzIEtsaW5nICA8YWtsaW5nQGFwcGxl LmNvbT4KKworICAgICAgICBQdXJnZSBQYXNzUmVmUHRyIGZyb20gRnJhbWUuCisgICAgICAgIDxo dHRwczovL3dlYmtpdC5vcmcvYi8xMzk3MzE+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVu dC5tbToKKyAgICAgICAgKFdlYkZyYW1lTG9hZGVyQ2xpZW50Ojp0cmFuc2l0aW9uVG9Db21taXR0 ZWRGb3JOZXdQYWdlKToKKyAgICAgICAgKiBXZWJWaWV3L1dlYkZyYW1lLm1tOgorICAgICAgICAo K1tXZWJGcmFtZSBfY3JlYXRlRnJhbWVXaXRoUGFnZTpmcmFtZU5hbWU6ZnJhbWVWaWV3Om93bmVy RWxlbWVudDpdKToKKyAgICAgICAgKCtbV2ViRnJhbWUgX2NyZWF0ZVN1YmZyYW1lV2l0aE93bmVy RWxlbWVudDpmcmFtZU5hbWU6ZnJhbWVWaWV3Ol0pOgorICAgICAgICAqIFdlYlZpZXcvV2ViRnJh bWVJbnRlcm5hbC5oOgorCiAyMDE0LTEyLTE2ICBBbmRyZWFzIEtsaW5nICA8YWtsaW5nQGFwcGxl LmNvbT4KIAogICAgICAgICBVc2UgUmVmIGZvciBTZWN1cml0eU9yaWdpbi4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50Lm1t IGIvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQu bW0KaW5kZXggOTU0ZjFlOC4uOTljNDI3YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMv V2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQubW0KKysrIGIvU291cmNlL1dlYktp dC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQubW0KQEAgLTE0MjksOSAr MTQyOSw5IEBAIHZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OnRyYW5zaXRpb25Ub0NvbW1pdHRl ZEZvck5ld1BhZ2UoKQogICAgIGJvb2wgaXNNYWluRnJhbWUgPSBjb3JlRnJhbWUtPmlzTWFpbkZy YW1lKCk7CiAgICAgaWYgKGlzTWFpbkZyYW1lICYmIGNvcmVGcmFtZS0+dmlldygpKQogICAgICAg ICBjb3JlRnJhbWUtPnZpZXcoKS0+c2V0UGFyZW50VmlzaWJsZShmYWxzZSk7Ci0gICAgY29yZUZy YW1lLT5zZXRWaWV3KDApOworICAgIGNvcmVGcmFtZS0+c2V0VmlldyhudWxscHRyKTsKICAgICBS ZWZQdHI8RnJhbWVWaWV3PiBjb3JlVmlldyA9IEZyYW1lVmlldzo6Y3JlYXRlKCpjb3JlRnJhbWUp OwotICAgIGNvcmVGcmFtZS0+c2V0Vmlldyhjb3JlVmlldyk7CisgICAgY29yZUZyYW1lLT5zZXRW aWV3KGNvcmVWaWV3LmNvcHlSZWYoKSk7CiAKICAgICBbbV93ZWJGcmFtZS5nZXQoKSBfdXBkYXRl QmFja2dyb3VuZEFuZFVwZGF0ZXNXaGlsZU9mZnNjcmVlbl07CiAgICAgW21fd2ViRnJhbWUtPl9w cml2YXRlLT53ZWJGcmFtZVZpZXcgX2luc3RhbGxdOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9tYWMvV2ViVmlldy9XZWJGcmFtZS5tbSBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2Vi RnJhbWUubW0KaW5kZXggZWViZDYyOS4uOTVmZTM2MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9tYWMvV2ViVmlldy9XZWJGcmFtZS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3 L1dlYkZyYW1lLm1tCkBAIC0zMTYsMjYgKzMxNiwyNiBAQCBXZWJWaWV3ICpnZXRXZWJWaWV3KFdl YkZyYW1lICp3ZWJGcmFtZSkKICAgICByZXR1cm4ga2l0KGNvcmVGcmFtZS0+cGFnZSgpKTsKIH0K IAotKyAoUGFzc1JlZlB0cjxGcmFtZT4pX2NyZWF0ZUZyYW1lV2l0aFBhZ2U6KFBhZ2UqKXBhZ2Ug ZnJhbWVOYW1lOihjb25zdCBTdHJpbmcmKW5hbWUgZnJhbWVWaWV3OihXZWJGcmFtZVZpZXcgKilm cmFtZVZpZXcgb3duZXJFbGVtZW50OihIVE1MRnJhbWVPd25lckVsZW1lbnQqKW93bmVyRWxlbWVu dAorKyAoUmVmPFdlYkNvcmU6OkZyYW1lPilfY3JlYXRlRnJhbWVXaXRoUGFnZTooUGFnZSopcGFn ZSBmcmFtZU5hbWU6KGNvbnN0IFN0cmluZyYpbmFtZSBmcmFtZVZpZXc6KFdlYkZyYW1lVmlldyAq KWZyYW1lVmlldyBvd25lckVsZW1lbnQ6KEhUTUxGcmFtZU93bmVyRWxlbWVudCopb3duZXJFbGVt ZW50CiB7CiAgICAgV2ViVmlldyAqd2ViVmlldyA9IGtpdChwYWdlKTsKIAogICAgIFdlYkZyYW1l ICpmcmFtZSA9IFtbc2VsZiBhbGxvY10gX2luaXRXaXRoV2ViRnJhbWVWaWV3OmZyYW1lVmlldyB3 ZWJWaWV3OndlYlZpZXddOwotICAgIFJlZlB0cjxGcmFtZT4gY29yZUZyYW1lID0gRnJhbWU6OmNy ZWF0ZShwYWdlLCBvd25lckVsZW1lbnQsIG5ldyBXZWJGcmFtZUxvYWRlckNsaWVudChmcmFtZSkp OworICAgIFJlZjxGcmFtZT4gY29yZUZyYW1lKEZyYW1lOjpjcmVhdGUocGFnZSwgb3duZXJFbGVt ZW50LCBuZXcgV2ViRnJhbWVMb2FkZXJDbGllbnQoZnJhbWUpKSk7CiAgICAgW2ZyYW1lIHJlbGVh c2VdOwotICAgIGZyYW1lLT5fcHJpdmF0ZS0+Y29yZUZyYW1lID0gY29yZUZyYW1lLmdldCgpOwor ICAgIGZyYW1lLT5fcHJpdmF0ZS0+Y29yZUZyYW1lID0gY29yZUZyYW1lLnB0cigpOwogCi0gICAg Y29yZUZyYW1lLT50cmVlKCkuc2V0TmFtZShuYW1lKTsKKyAgICBjb3JlRnJhbWUuZ2V0KCkudHJl ZSgpLnNldE5hbWUobmFtZSk7CiAgICAgaWYgKG93bmVyRWxlbWVudCkgewogICAgICAgICBBU1NF UlQob3duZXJFbGVtZW50LT5kb2N1bWVudCgpLmZyYW1lKCkpOwotICAgICAgICBvd25lckVsZW1l bnQtPmRvY3VtZW50KCkuZnJhbWUoKS0+dHJlZSgpLmFwcGVuZENoaWxkKGNvcmVGcmFtZS5nZXQo KSk7CisgICAgICAgIG93bmVyRWxlbWVudC0+ZG9jdW1lbnQoKS5mcmFtZSgpLT50cmVlKCkuYXBw ZW5kQ2hpbGQoY29yZUZyYW1lLnB0cigpKTsKICAgICB9CiAKLSAgICBjb3JlRnJhbWUtPmluaXQo KTsKKyAgICBjb3JlRnJhbWUuZ2V0KCkuaW5pdCgpOwogCiAgICAgW3dlYlZpZXcgX3NldFpvb21N dWx0aXBsaWVyOlt3ZWJWaWV3IF9yZWFsWm9vbU11bHRpcGxpZXJdIGlzVGV4dE9ubHk6W3dlYlZp ZXcgX3JlYWxab29tTXVsdGlwbGllcklzVGV4dE9ubHldXTsKIAotICAgIHJldHVybiBjb3JlRnJh bWUucmVsZWFzZSgpOworICAgIHJldHVybiBjb3JlRnJhbWU7CiB9CiAKICsgKHZvaWQpX2NyZWF0 ZU1haW5GcmFtZVdpdGhQYWdlOihQYWdlKilwYWdlIGZyYW1lTmFtZTooY29uc3QgU3RyaW5nJilu YW1lIGZyYW1lVmlldzooV2ViRnJhbWVWaWV3ICopZnJhbWVWaWV3CkBAIC0zNTMsNyArMzUzLDcg QEAgV2ViVmlldyAqZ2V0V2ViVmlldyhXZWJGcmFtZSAqd2ViRnJhbWUpCiAgICAgW3dlYlZpZXcg X3NldFpvb21NdWx0aXBsaWVyOlt3ZWJWaWV3IF9yZWFsWm9vbU11bHRpcGxpZXJdIGlzVGV4dE9u bHk6W3dlYlZpZXcgX3JlYWxab29tTXVsdGlwbGllcklzVGV4dE9ubHldXTsKIH0KIAotKyAoUGFz c1JlZlB0cjxXZWJDb3JlOjpGcmFtZT4pX2NyZWF0ZVN1YmZyYW1lV2l0aE93bmVyRWxlbWVudDoo SFRNTEZyYW1lT3duZXJFbGVtZW50Kilvd25lckVsZW1lbnQgZnJhbWVOYW1lOihjb25zdCBTdHJp bmcmKW5hbWUgZnJhbWVWaWV3OihXZWJGcmFtZVZpZXcgKilmcmFtZVZpZXcKKysgKFJlZjxXZWJD b3JlOjpGcmFtZT4pX2NyZWF0ZVN1YmZyYW1lV2l0aE93bmVyRWxlbWVudDooSFRNTEZyYW1lT3du ZXJFbGVtZW50Kilvd25lckVsZW1lbnQgZnJhbWVOYW1lOihjb25zdCBTdHJpbmcmKW5hbWUgZnJh bWVWaWV3OihXZWJGcmFtZVZpZXcgKilmcmFtZVZpZXcKIHsKICAgICByZXR1cm4gW3NlbGYgX2Ny ZWF0ZUZyYW1lV2l0aFBhZ2U6b3duZXJFbGVtZW50LT5kb2N1bWVudCgpLmZyYW1lKCktPnBhZ2Uo KSBmcmFtZU5hbWU6bmFtZSBmcmFtZVZpZXc6ZnJhbWVWaWV3IG93bmVyRWxlbWVudDpvd25lckVs ZW1lbnRdOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJGcmFt ZUludGVybmFsLmggYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYkZyYW1lSW50ZXJuYWwu aAppbmRleCBkZjllZmFkLi4yZjQ1OWJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9X ZWJWaWV3L1dlYkZyYW1lSW50ZXJuYWwuaAorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3 L1dlYkZyYW1lSW50ZXJuYWwuaApAQCAtMTAzLDcgKzEwMyw3IEBAIFdlYlZpZXcgKmdldFdlYlZp ZXcoV2ViRnJhbWUgKndlYkZyYW1lKTsKIEBpbnRlcmZhY2UgV2ViRnJhbWUgKFdlYkludGVybmFs KQogCiArICh2b2lkKV9jcmVhdGVNYWluRnJhbWVXaXRoUGFnZTooV2ViQ29yZTo6UGFnZSopcGFn ZSBmcmFtZU5hbWU6KGNvbnN0IFdURjo6U3RyaW5nJiluYW1lIGZyYW1lVmlldzooV2ViRnJhbWVW aWV3ICopZnJhbWVWaWV3OwotKyAoUGFzc1JlZlB0cjxXZWJDb3JlOjpGcmFtZT4pX2NyZWF0ZVN1 YmZyYW1lV2l0aE93bmVyRWxlbWVudDooV2ViQ29yZTo6SFRNTEZyYW1lT3duZXJFbGVtZW50Kilv d25lckVsZW1lbnQgZnJhbWVOYW1lOihjb25zdCBXVEY6OlN0cmluZyYpbmFtZSBmcmFtZVZpZXc6 KFdlYkZyYW1lVmlldyAqKWZyYW1lVmlldzsKKysgKFJlZjxXZWJDb3JlOjpGcmFtZT4pX2NyZWF0 ZVN1YmZyYW1lV2l0aE93bmVyRWxlbWVudDooV2ViQ29yZTo6SFRNTEZyYW1lT3duZXJFbGVtZW50 Kilvd25lckVsZW1lbnQgZnJhbWVOYW1lOihjb25zdCBXVEY6OlN0cmluZyYpbmFtZSBmcmFtZVZp ZXc6KFdlYkZyYW1lVmlldyAqKWZyYW1lVmlldzsKIC0gKGlkKV9pbml0V2l0aFdlYkZyYW1lVmll dzooV2ViRnJhbWVWaWV3ICopd2ViRnJhbWVWaWV3IHdlYlZpZXc6KFdlYlZpZXcgKil3ZWJWaWV3 OwogCiAtICh2b2lkKV9jbGVhckNvcmVGcmFtZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCAwNWMxYmVlLi5hNTg0 YWRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl YktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTQtMTItMTcgIEFuZHJlYXMgS2xp bmcgIDxha2xpbmdAYXBwbGUuY29tPgorCisgICAgICAgIFB1cmdlIFBhc3NSZWZQdHIgZnJvbSBG cmFtZS4KKyAgICAgICAgPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzEzOTczMT4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFn ZS9XZWJGcmFtZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkZyYW1lOjpjcmVhdGVTdWJmcmFt ZSk6CisKIDIwMTQtMTItMTYgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgogCiAg ICAgICAgIFVzZSBSZWYgZm9yIFNlY3VyaXR5T3JpZ2luLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkZyYW1lLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViUGFnZS9XZWJGcmFtZS5jcHAKaW5kZXggODI3YzA2MC4uMTAxZWQ4NyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkZyYW1lLmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViRnJhbWUuY3BwCkBAIC0x MjMsMTIgKzEyMywxMiBAQCBQYXNzUmVmUHRyPFdlYkZyYW1lPiBXZWJGcmFtZTo6Y3JlYXRlU3Vi ZnJhbWUoV2ViUGFnZSogcGFnZSwgY29uc3QgU3RyaW5nJiBmcmFtZQogICAgIFJlZlB0cjxXZWJG cmFtZT4gZnJhbWUgPSBjcmVhdGUoc3RkOjptYWtlX3VuaXF1ZTxXZWJGcmFtZUxvYWRlckNsaWVu dD4oKSk7CiAgICAgcGFnZS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRDcmVhdGVT dWJmcmFtZShmcmFtZS0+ZnJhbWVJRCgpKSwgcGFnZS0+cGFnZUlEKCksIElQQzo6RGlzcGF0Y2hN ZXNzYWdlRXZlbldoZW5XYWl0aW5nRm9yU3luY1JlcGx5KTsKIAotICAgIFJlZlB0cjxGcmFtZT4g Y29yZUZyYW1lID0gRnJhbWU6OmNyZWF0ZShwYWdlLT5jb3JlUGFnZSgpLCBvd25lckVsZW1lbnQs IGZyYW1lLT5tX2ZyYW1lTG9hZGVyQ2xpZW50LmdldCgpKTsKLSAgICBmcmFtZS0+bV9jb3JlRnJh bWUgPSBjb3JlRnJhbWUuZ2V0KCk7CisgICAgUmVmPEZyYW1lPiBjb3JlRnJhbWUoRnJhbWU6OmNy ZWF0ZShwYWdlLT5jb3JlUGFnZSgpLCBvd25lckVsZW1lbnQsIGZyYW1lLT5tX2ZyYW1lTG9hZGVy Q2xpZW50LmdldCgpKSk7CisgICAgZnJhbWUtPm1fY29yZUZyYW1lID0gY29yZUZyYW1lLnB0cigp OwogICAgIGZyYW1lLT5tX2NvcmVGcmFtZS0+dHJlZSgpLnNldE5hbWUoZnJhbWVOYW1lKTsKICAg ICBpZiAob3duZXJFbGVtZW50KSB7CiAgICAgICAgIEFTU0VSVChvd25lckVsZW1lbnQtPmRvY3Vt ZW50KCkuZnJhbWUoKSk7Ci0gICAgICAgIG93bmVyRWxlbWVudC0+ZG9jdW1lbnQoKS5mcmFtZSgp LT50cmVlKCkuYXBwZW5kQ2hpbGQoY29yZUZyYW1lLnJlbGVhc2UoKSk7CisgICAgICAgIG93bmVy RWxlbWVudC0+ZG9jdW1lbnQoKS5mcmFtZSgpLT50cmVlKCkuYXBwZW5kQ2hpbGQoV1RGOjptb3Zl KGNvcmVGcmFtZSkpOwogICAgIH0KICAgICBmcmFtZS0+bV9jb3JlRnJhbWUtPmluaXQoKTsKICAg ICByZXR1cm4gZnJhbWUucmVsZWFzZSgpOwo= 243439 2014-12-17 09:36:43 -0800 2014-12-17 11:38:35 -0800 Patch for landing bug-139731-land.diff text/plain 15553 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmMTYyMzFjLi5kODAxNjE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYg QEAKKzIwMTQtMTItMTcgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgorCisgICAg ICAgIFB1cmdlIFBhc3NSZWZQdHIgZnJvbSBGcmFtZS4KKyAgICAgICAgPGh0dHBzOi8vd2Via2l0 Lm9yZy9iLzEzOTczMT4KKworICAgICAgICBSZXZpZXdlZCBieSBBbmRlcnMgQ2FybHNzb24uCisK KyAgICAgICAgUmVtb3ZlIGFsbCB1c2Ugb2YgUGFzc1JlZlB0ciBmcm9tIHRoZSBGcmFtZSBjbGFz cywgaW5zdGVhZCB1c2luZworICAgICAgICBSZWYgb3IgUmVmUHRyIGFzIGFwcHJvcHJpYXRlLgor CisgICAgICAgICogV2ViQ29yZS5leHAuaW46CisgICAgICAgICogbG9hZGVyL0RvY3VtZW50V3Jp dGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50V3JpdGVyOjpiZWdpbik6CisgICAg ICAgICogcGFnZS9GcmFtZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZTo6Y3JlYXRlKToK KyAgICAgICAgKFdlYkNvcmU6OkZyYW1lOjpzZXRWaWV3KToKKyAgICAgICAgKFdlYkNvcmU6OkZy YW1lOjpzZXREb2N1bWVudCk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZTo6cmFuZ2VGb3JQb2lu dCk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZTo6Y3JlYXRlVmlldyk6CisgICAgICAgICogcGFn ZS9GcmFtZS5oOgorICAgICAgICAqIHhtbC9YU0xUUHJvY2Vzc29yLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlhTTFRQcm9jZXNzb3I6OmNyZWF0ZURvY3VtZW50RnJvbVNvdXJjZSk6CisKIDIwMTQt MTItMTYgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgogCiAgICAgICAgIFVzZSBS ZWYgZm9yIFNlY3VyaXR5T3JpZ2luLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvV2ViQ29y ZS5leHAuaW4gYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgppbmRleCBmZjY2YmM4Li42 YThlMjRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgorKysgYi9T b3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgpAQCAtMTIxNiw3ICsxMjE2LDcgQEAgX19aTjdX ZWJDb3JlNUZyYW1lMjRzZWFyY2hGb3JMYWJlbHNBYm92ZUNlbGxFUktOM0pTQzRZYXJyMTdSZWd1 bGFyRXhwcmVzc2lvbkVQTlMKIF9fWk43V2ViQ29yZTVGcmFtZTI1c2V0UGFnZUFuZFRleHRab29t RmFjdG9yc0VmZgogX19aTjdXZWJDb3JlNUZyYW1lMjdyZXNpemVQYWdlUmVjdHNLZWVwaW5nUmF0 aW9FUktOU185RmxvYXRTaXplRVMzXwogX19aTjdXZWJDb3JlNUZyYW1lNmNyZWF0ZUVQTlNfNFBh Z2VFUE5TXzIxSFRNTEZyYW1lT3duZXJFbGVtZW50RVBOU18xN0ZyYW1lTG9hZGVyQ2xpZW50RQot X19aTjdXZWJDb3JlNUZyYW1lN3NldFZpZXdFTjNXVEYxMFBhc3NSZWZQdHJJTlNfOUZyYW1lVmll d0VFRQorX19aTjdXZWJDb3JlNUZyYW1lN3NldFZpZXdFT04zV1RGNlJlZlB0cklOU185RnJhbWVW aWV3RUVFCiBfX1pON1dlYkNvcmU1RnJhbWVEMUV2CiBfX1pON1dlYkNvcmU1SW1hZ2UxMnN1cHBv cnRzVHlwZUVSS04zV1RGNlN0cmluZ0UKIF9fWk43V2ViQ29yZTVJbWFnZTIwbG9hZFBsYXRmb3Jt UmVzb3VyY2VFUEtjCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRX cml0ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50V3JpdGVyLmNwcAppbmRl eCAyMDBjMGUzLi4xNWIyZTY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9j dW1lbnRXcml0ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudFdyaXRl ci5jcHAKQEAgLTE0NCw3ICsxNDQsNyBAQCB2b2lkIERvY3VtZW50V3JpdGVyOjpiZWdpbihjb25z dCBVUkwmIHVybFJlZmVyZW5jZSwgYm9vbCBkaXNwYXRjaCwgRG9jdW1lbnQqIG93bgogICAgICAg ICBtX2ZyYW1lLT5zY3JpcHQoKS51cGRhdGVQbGF0Zm9ybVNjcmlwdE9iamVjdHMoKTsKIAogICAg IG1fZnJhbWUtPmxvYWRlcigpLnNldE91dGdvaW5nUmVmZXJyZXIodXJsKTsKLSAgICBtX2ZyYW1l LT5zZXREb2N1bWVudChkb2N1bWVudCk7CisgICAgbV9mcmFtZS0+c2V0RG9jdW1lbnQoZG9jdW1l bnQuY29weVJlZigpKTsKIAogICAgIGlmIChtX2RlY29kZXIpCiAgICAgICAgIGRvY3VtZW50LT5z ZXREZWNvZGVyKG1fZGVjb2Rlci5nZXQoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL0ZyYW1lLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWUuY3BwCmluZGV4IDQ5OGJk NmQuLjY0M2ZhZWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWUuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWUuY3BwCkBAIC0yMDQsMTEgKzIwNCwxMSBAQCBG cmFtZTo6RnJhbWUoUGFnZSYgcGFnZSwgSFRNTEZyYW1lT3duZXJFbGVtZW50KiBvd25lckVsZW1l bnQsIEZyYW1lTG9hZGVyQ2xpZW50JgogI2VuZGlmCiB9CiAKLVBhc3NSZWZQdHI8RnJhbWU+IEZy YW1lOjpjcmVhdGUoUGFnZSogcGFnZSwgSFRNTEZyYW1lT3duZXJFbGVtZW50KiBvd25lckVsZW1l bnQsIEZyYW1lTG9hZGVyQ2xpZW50KiBjbGllbnQpCitSZWY8RnJhbWU+IEZyYW1lOjpjcmVhdGUo UGFnZSogcGFnZSwgSFRNTEZyYW1lT3duZXJFbGVtZW50KiBvd25lckVsZW1lbnQsIEZyYW1lTG9h ZGVyQ2xpZW50KiBjbGllbnQpCiB7CiAgICAgQVNTRVJUKHBhZ2UpOwogICAgIEFTU0VSVChjbGll bnQpOwotICAgIHJldHVybiBhZG9wdFJlZihuZXcgRnJhbWUoKnBhZ2UsIG93bmVyRWxlbWVudCwg KmNsaWVudCkpOworICAgIHJldHVybiBhZG9wdFJlZigqbmV3IEZyYW1lKCpwYWdlLCBvd25lckVs ZW1lbnQsICpjbGllbnQpKTsKIH0KIAogRnJhbWU6On5GcmFtZSgpCkBAIC0yNDEsNyArMjQxLDcg QEAgdm9pZCBGcmFtZTo6cmVtb3ZlRGVzdHJ1Y3Rpb25PYnNlcnZlcihGcmFtZURlc3RydWN0aW9u T2JzZXJ2ZXIqIG9ic2VydmVyKQogICAgIG1fZGVzdHJ1Y3Rpb25PYnNlcnZlcnMucmVtb3ZlKG9i c2VydmVyKTsKIH0KIAotdm9pZCBGcmFtZTo6c2V0VmlldyhQYXNzUmVmUHRyPEZyYW1lVmlldz4g dmlldykKK3ZvaWQgRnJhbWU6OnNldFZpZXcoUmVmUHRyPEZyYW1lVmlldz4mJiB2aWV3KQogewog ICAgIC8vIFdlIHRoZSBjdXN0b20gc2Nyb2xsIGJhcnMgYXMgZWFybHkgYXMgcG9zc2libGUgdG8g cHJldmVudCBtX2RvYy0+ZGV0YWNoKCkKICAgICAvLyBmcm9tIG1lc3Npbmcgd2l0aCB0aGUgdmll dyBzdWNoIHRoYXQgaXRzIHNjcm9sbCBiYXJzIHdvbid0IGJlIHRvcm4gZG93bi4KQEAgLTI2MCw3 ICsyNjAsNyBAQCB2b2lkIEZyYW1lOjpzZXRWaWV3KFBhc3NSZWZQdHI8RnJhbWVWaWV3PiB2aWV3 KQogICAgIAogICAgIGV2ZW50SGFuZGxlcigpLmNsZWFyKCk7CiAKLSAgICBtX3ZpZXcgPSB2aWV3 OworICAgIG1fdmlldyA9IFdURjo6bW92ZSh2aWV3KTsKIAogICAgIC8vIE9ubHkgb25lIGZvcm0g c3VibWlzc2lvbiBpcyBhbGxvd2VkIHBlciB2aWV3IG9mIGEgcGFydC4KICAgICAvLyBTaW5jZSB0 aGlzIHBhcnQgbWF5IGJlIGdldHRpbmcgcmV1c2VkIGFzIGEgcmVzdWx0IG9mIGJlaW5nCkBAIC0y NjgsMTQgKzI2OCwxNCBAQCB2b2lkIEZyYW1lOjpzZXRWaWV3KFBhc3NSZWZQdHI8RnJhbWVWaWV3 PiB2aWV3KQogICAgIGxvYWRlcigpLnJlc2V0TXVsdGlwbGVGb3JtU3VibWlzc2lvblByb3RlY3Rp b24oKTsKIH0KIAotdm9pZCBGcmFtZTo6c2V0RG9jdW1lbnQoUGFzc1JlZlB0cjxEb2N1bWVudD4g bmV3RG9jdW1lbnQpCit2b2lkIEZyYW1lOjpzZXREb2N1bWVudChSZWZQdHI8RG9jdW1lbnQ+JiYg bmV3RG9jdW1lbnQpCiB7CiAgICAgQVNTRVJUKCFuZXdEb2N1bWVudCB8fCBuZXdEb2N1bWVudC0+ ZnJhbWUoKSA9PSB0aGlzKTsKIAogICAgIGlmIChtX2RvYyAmJiAhbV9kb2MtPmluUGFnZUNhY2hl KCkpCiAgICAgICAgIG1fZG9jLT5wcmVwYXJlRm9yRGVzdHJ1Y3Rpb24oKTsKIAotICAgIG1fZG9j ID0gbmV3RG9jdW1lbnQuZ2V0KCk7CisgICAgbV9kb2MgPSBuZXdEb2N1bWVudC5jb3B5UmVmKCk7 CiAgICAgQVNTRVJUKCFtX2RvYyB8fCBtX2RvYy0+ZG9tV2luZG93KCkpOwogICAgIEFTU0VSVCgh bV9kb2MgfHwgbV9kb2MtPmRvbVdpbmRvdygpLT5mcmFtZSgpID09IHRoaXMpOwogCkBAIC04NTQs MjggKzg1NCwyOCBAQCBEb2N1bWVudCogRnJhbWU6OmRvY3VtZW50QXRQb2ludChjb25zdCBJbnRQ b2ludCYgcG9pbnQpCiAgICAgcmV0dXJuIHJlc3VsdC5pbm5lck5vZGUoKSA/ICZyZXN1bHQuaW5u ZXJOb2RlKCktPmRvY3VtZW50KCkgOiAwOwogfQogCi1QYXNzUmVmUHRyPFJhbmdlPiBGcmFtZTo6 cmFuZ2VGb3JQb2ludChjb25zdCBJbnRQb2ludCYgZnJhbWVQb2ludCkKK1JlZlB0cjxSYW5nZT4g RnJhbWU6OnJhbmdlRm9yUG9pbnQoY29uc3QgSW50UG9pbnQmIGZyYW1lUG9pbnQpCiB7CiAgICAg VmlzaWJsZVBvc2l0aW9uIHBvc2l0aW9uID0gdmlzaWJsZVBvc2l0aW9uRm9yUG9pbnQoZnJhbWVQ b2ludCk7CiAgICAgaWYgKHBvc2l0aW9uLmlzTnVsbCgpKQotICAgICAgICByZXR1cm4gMDsKKyAg ICAgICAgcmV0dXJuIG51bGxwdHI7CiAKICAgICBWaXNpYmxlUG9zaXRpb24gcHJldmlvdXMgPSBw b3NpdGlvbi5wcmV2aW91cygpOwogICAgIGlmIChwcmV2aW91cy5pc05vdE51bGwoKSkgewogICAg ICAgICBSZWZQdHI8UmFuZ2U+IHByZXZpb3VzQ2hhcmFjdGVyUmFuZ2UgPSBtYWtlUmFuZ2UocHJl dmlvdXMsIHBvc2l0aW9uKTsKICAgICAgICAgTGF5b3V0UmVjdCByZWN0ID0gZWRpdG9yKCkuZmly c3RSZWN0Rm9yUmFuZ2UocHJldmlvdXNDaGFyYWN0ZXJSYW5nZS5nZXQoKSk7CiAgICAgICAgIGlm IChyZWN0LmNvbnRhaW5zKGZyYW1lUG9pbnQpKQotICAgICAgICAgICAgcmV0dXJuIHByZXZpb3Vz Q2hhcmFjdGVyUmFuZ2UucmVsZWFzZSgpOworICAgICAgICAgICAgcmV0dXJuIHByZXZpb3VzQ2hh cmFjdGVyUmFuZ2U7CiAgICAgfQogCiAgICAgVmlzaWJsZVBvc2l0aW9uIG5leHQgPSBwb3NpdGlv bi5uZXh0KCk7CiAgICAgaWYgKFJlZlB0cjxSYW5nZT4gbmV4dENoYXJhY3RlclJhbmdlID0gbWFr ZVJhbmdlKHBvc2l0aW9uLCBuZXh0KSkgewogICAgICAgICBMYXlvdXRSZWN0IHJlY3QgPSBlZGl0 b3IoKS5maXJzdFJlY3RGb3JSYW5nZShuZXh0Q2hhcmFjdGVyUmFuZ2UuZ2V0KCkpOwogICAgICAg ICBpZiAocmVjdC5jb250YWlucyhmcmFtZVBvaW50KSkKLSAgICAgICAgICAgIHJldHVybiBuZXh0 Q2hhcmFjdGVyUmFuZ2UucmVsZWFzZSgpOworICAgICAgICAgICAgcmV0dXJuIG5leHRDaGFyYWN0 ZXJSYW5nZTsKICAgICB9CiAKLSAgICByZXR1cm4gMDsKKyAgICByZXR1cm4gbnVsbHB0cjsKIH0K IAogdm9pZCBGcmFtZTo6Y3JlYXRlVmlldyhjb25zdCBJbnRTaXplJiB2aWV3cG9ydFNpemUsIGNv bnN0IENvbG9yJiBiYWNrZ3JvdW5kQ29sb3IsIGJvb2wgdHJhbnNwYXJlbnQsCkBAIC05MDgsNyAr OTA4LDcgQEAgdm9pZCBGcmFtZTo6Y3JlYXRlVmlldyhjb25zdCBJbnRTaXplJiB2aWV3cG9ydFNp emUsIGNvbnN0IENvbG9yJiBiYWNrZ3JvdW5kQ29sb3IKIAogICAgIGZyYW1lVmlldy0+c2V0U2Ny b2xsYmFyTW9kZXMoaG9yaXpvbnRhbFNjcm9sbGJhck1vZGUsIHZlcnRpY2FsU2Nyb2xsYmFyTW9k ZSwgaG9yaXpvbnRhbExvY2ssIHZlcnRpY2FsTG9jayk7CiAKLSAgICBzZXRWaWV3KGZyYW1lVmll dyk7CisgICAgc2V0VmlldyhmcmFtZVZpZXcuY29weVJlZigpKTsKIAogICAgIGlmIChiYWNrZ3Jv dW5kQ29sb3IuaXNWYWxpZCgpKQogICAgICAgICBmcmFtZVZpZXctPnVwZGF0ZUJhY2tncm91bmRS ZWN1cnNpdmVseShiYWNrZ3JvdW5kQ29sb3IsIHRyYW5zcGFyZW50KTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWUuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWUuaApp bmRleCBlYTE2YWFkLi5jYTc4MDFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0Zy YW1lLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5oCkBAIC0xMTUsMTQgKzExNSwx NCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKICAgICBjbGFzcyBGcmFtZSA6IHB1YmxpYyBSZWZD b3VudGVkPEZyYW1lPiB7CiAgICAgcHVibGljOgotICAgICAgICBXRUJDT1JFX0VYUE9SVCBzdGF0 aWMgUGFzc1JlZlB0cjxGcmFtZT4gY3JlYXRlKFBhZ2UqLCBIVE1MRnJhbWVPd25lckVsZW1lbnQq LCBGcmFtZUxvYWRlckNsaWVudCopOworICAgICAgICBXRUJDT1JFX0VYUE9SVCBzdGF0aWMgUmVm PEZyYW1lPiBjcmVhdGUoUGFnZSosIEhUTUxGcmFtZU93bmVyRWxlbWVudCosIEZyYW1lTG9hZGVy Q2xpZW50Kik7CiAKICAgICAgICAgdm9pZCBpbml0KCk7CiAjaWYgUExBVEZPUk0oSU9TKQogICAg ICAgICAvLyBDcmVhdGVzIDxodG1sPjxib2R5IHN0eWxlPSIuLi4iPjwvYm9keT48L2h0bWw+IGRv aW5nIG1pbmltYWwgYW1vdW50IG9mIHdvcmsuCiAgICAgICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQg aW5pdFdpdGhTaW1wbGVIVE1MRG9jdW1lbnQoY29uc3QgU3RyaW5nJiBzdHlsZSwgY29uc3QgVVJM Jik7CiAjZW5kaWYKLSAgICAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBzZXRWaWV3KFBhc3NSZWZQ dHI8RnJhbWVWaWV3Pik7CisgICAgICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgc2V0VmlldyhSZWZQ dHI8RnJhbWVWaWV3PiYmKTsKICAgICAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBjcmVhdGVWaWV3 KGNvbnN0IEludFNpemUmLCBjb25zdCBDb2xvciYsIGJvb2wsCiAgICAgICAgICAgICBjb25zdCBJ bnRTaXplJiBmaXhlZExheW91dFNpemUgPSBJbnRTaXplKCksIGNvbnN0IEludFJlY3QmIGZpeGVk VmlzaWJsZUNvbnRlbnRSZWN0ID0gSW50UmVjdCgpLAogICAgICAgICAgICAgYm9vbCB1c2VGaXhl ZExheW91dCA9IGZhbHNlLCBTY3JvbGxiYXJNb2RlID0gU2Nyb2xsYmFyQXV0bywgYm9vbCBob3Jp em9udGFsTG9jayA9IGZhbHNlLApAQCAtMTczLDcgKzE3Myw3IEBAIG5hbWVzcGFjZSBXZWJDb3Jl IHsKICAgICAgICAgYm9vbCBzaG91bGRVc2VQcmludGluZ0xheW91dCgpIGNvbnN0OwogICAgICAg ICBXRUJDT1JFX0VYUE9SVCBGbG9hdFNpemUgcmVzaXplUGFnZVJlY3RzS2VlcGluZ1JhdGlvKGNv bnN0IEZsb2F0U2l6ZSYgb3JpZ2luYWxTaXplLCBjb25zdCBGbG9hdFNpemUmIGV4cGVjdGVkU2l6 ZSk7CiAKLSAgICAgICAgdm9pZCBzZXREb2N1bWVudChQYXNzUmVmUHRyPERvY3VtZW50Pik7Cisg ICAgICAgIHZvaWQgc2V0RG9jdW1lbnQoUmVmUHRyPERvY3VtZW50PiYmKTsKIAogICAgICAgICBX RUJDT1JFX0VYUE9SVCB2b2lkIHNldFBhZ2Vab29tRmFjdG9yKGZsb2F0KTsKICAgICAgICAgZmxv YXQgcGFnZVpvb21GYWN0b3IoKSBjb25zdCB7IHJldHVybiBtX3BhZ2Vab29tRmFjdG9yOyB9CkBA IC0yMjUsNyArMjI1LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiAgICAgICAgIFdFQkNPUkVf RVhQT1JUIFZpc2libGVQb3NpdGlvbiB2aXNpYmxlUG9zaXRpb25Gb3JQb2ludChjb25zdCBJbnRQ b2ludCYgZnJhbWVQb2ludCk7CiAgICAgICAgIERvY3VtZW50KiBkb2N1bWVudEF0UG9pbnQoY29u c3QgSW50UG9pbnQmIHdpbmRvd1BvaW50KTsKLSAgICAgICAgV0VCQ09SRV9FWFBPUlQgUGFzc1Jl ZlB0cjxSYW5nZT4gcmFuZ2VGb3JQb2ludChjb25zdCBJbnRQb2ludCYgZnJhbWVQb2ludCk7Cisg ICAgICAgIFdFQkNPUkVfRVhQT1JUIFJlZlB0cjxSYW5nZT4gcmFuZ2VGb3JQb2ludChjb25zdCBJ bnRQb2ludCYgZnJhbWVQb2ludCk7CiAKICAgICAgICAgV0VCQ09SRV9FWFBPUlQgU3RyaW5nIHNl YXJjaEZvckxhYmVsc0Fib3ZlQ2VsbChjb25zdCBKU0M6OllhcnI6OlJlZ3VsYXJFeHByZXNzaW9u JiwgSFRNTFRhYmxlQ2VsbEVsZW1lbnQqLCBzaXplX3QqIHJlc3VsdERpc3RhbmNlRnJvbVN0YXJ0 T2ZDZWxsKTsKICAgICAgICAgU3RyaW5nIHNlYXJjaEZvckxhYmVsc0JlZm9yZUVsZW1lbnQoY29u c3QgVmVjdG9yPFN0cmluZz4mIGxhYmVscywgRWxlbWVudCosIHNpemVfdCogcmVzdWx0RGlzdGFu Y2UsIGJvb2wqIHJlc3VsdElzSW5DZWxsQWJvdmUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUveG1sL1hTTFRQcm9jZXNzb3IuY3BwIGIvU291cmNlL1dlYkNvcmUveG1sL1hTTFRQcm9jZXNz b3IuY3BwCmluZGV4IGYxMGMwZWYuLjQ2YTI5YjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3htbC9YU0xUUHJvY2Vzc29yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS94bWwvWFNMVFByb2Nl c3Nvci5jcHAKQEAgLTk2LDcgKzk2LDcgQEAgUGFzc1JlZlB0cjxEb2N1bWVudD4gWFNMVFByb2Nl c3Nvcjo6Y3JlYXRlRG9jdW1lbnRGcm9tU291cmNlKGNvbnN0IFN0cmluZyYgc291cmMKICAgICAg ICAgICAgIHJlc3VsdC0+Y29udGVudFNlY3VyaXR5UG9saWN5KCktPmNvcHlTdGF0ZUZyb20ob2xk RG9jdW1lbnQtPmNvbnRlbnRTZWN1cml0eVBvbGljeSgpKTsKICAgICAgICAgfQogCi0gICAgICAg IGZyYW1lLT5zZXREb2N1bWVudChyZXN1bHQpOworICAgICAgICBmcmFtZS0+c2V0RG9jdW1lbnQo cmVzdWx0LmNvcHlSZWYoKSk7CiAgICAgfQogCiAgICAgUmVmUHRyPFRleHRSZXNvdXJjZURlY29k ZXI+IGRlY29kZXIgPSBUZXh0UmVzb3VyY2VEZWNvZGVyOjpjcmVhdGUoc291cmNlTUlNRVR5cGUp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktp dC9tYWMvQ2hhbmdlTG9nCmluZGV4IDY3NzdlZTYuLmJlN2YwM2QgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvbWFjL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cK QEAgLTEsMyArMSwxNyBAQAorMjAxNC0xMi0xNyAgQW5kcmVhcyBLbGluZyAgPGFrbGluZ0BhcHBs ZS5jb20+CisKKyAgICAgICAgUHVyZ2UgUGFzc1JlZlB0ciBmcm9tIEZyYW1lLgorICAgICAgICA8 aHR0cHM6Ly93ZWJraXQub3JnL2IvMTM5NzMxPgorCisgICAgICAgIFJldmlld2VkIGJ5IEFuZGVy cyBDYXJsc3Nvbi4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xp ZW50Lm1tOgorICAgICAgICAoV2ViRnJhbWVMb2FkZXJDbGllbnQ6OnRyYW5zaXRpb25Ub0NvbW1p dHRlZEZvck5ld1BhZ2UpOgorICAgICAgICAqIFdlYlZpZXcvV2ViRnJhbWUubW06CisgICAgICAg ICgrW1dlYkZyYW1lIF9jcmVhdGVGcmFtZVdpdGhQYWdlOmZyYW1lTmFtZTpmcmFtZVZpZXc6b3du ZXJFbGVtZW50Ol0pOgorICAgICAgICAoK1tXZWJGcmFtZSBfY3JlYXRlU3ViZnJhbWVXaXRoT3du ZXJFbGVtZW50OmZyYW1lTmFtZTpmcmFtZVZpZXc6XSk6CisgICAgICAgICogV2ViVmlldy9XZWJG cmFtZUludGVybmFsLmg6CisKIDIwMTQtMTItMTYgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBw bGUuY29tPgogCiAgICAgICAgIFVzZSBSZWYgZm9yIFNlY3VyaXR5T3JpZ2luLgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQu bW0gYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVu dC5tbQppbmRleCA5NTRmMWU4Li45OWM0MjdhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21h Yy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5tbQorKysgYi9Tb3VyY2UvV2Vi S2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5tbQpAQCAtMTQyOSw5 ICsxNDI5LDkgQEAgdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6dHJhbnNpdGlvblRvQ29tbWl0 dGVkRm9yTmV3UGFnZSgpCiAgICAgYm9vbCBpc01haW5GcmFtZSA9IGNvcmVGcmFtZS0+aXNNYWlu RnJhbWUoKTsKICAgICBpZiAoaXNNYWluRnJhbWUgJiYgY29yZUZyYW1lLT52aWV3KCkpCiAgICAg ICAgIGNvcmVGcmFtZS0+dmlldygpLT5zZXRQYXJlbnRWaXNpYmxlKGZhbHNlKTsKLSAgICBjb3Jl RnJhbWUtPnNldFZpZXcoMCk7CisgICAgY29yZUZyYW1lLT5zZXRWaWV3KG51bGxwdHIpOwogICAg IFJlZlB0cjxGcmFtZVZpZXc+IGNvcmVWaWV3ID0gRnJhbWVWaWV3OjpjcmVhdGUoKmNvcmVGcmFt ZSk7Ci0gICAgY29yZUZyYW1lLT5zZXRWaWV3KGNvcmVWaWV3KTsKKyAgICBjb3JlRnJhbWUtPnNl dFZpZXcoY29yZVZpZXcuY29weVJlZigpKTsKIAogICAgIFttX3dlYkZyYW1lLmdldCgpIF91cGRh dGVCYWNrZ3JvdW5kQW5kVXBkYXRlc1doaWxlT2Zmc2NyZWVuXTsKICAgICBbbV93ZWJGcmFtZS0+ X3ByaXZhdGUtPndlYkZyYW1lVmlldyBfaW5zdGFsbF07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L21hYy9XZWJWaWV3L1dlYkZyYW1lLm1tIGIvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9X ZWJGcmFtZS5tbQppbmRleCBlZWJkNjI5Li4xNzBiZjhkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L21hYy9XZWJWaWV3L1dlYkZyYW1lLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZp ZXcvV2ViRnJhbWUubW0KQEAgLTMxNiwyNiArMzE2LDI2IEBAIFdlYlZpZXcgKmdldFdlYlZpZXco V2ViRnJhbWUgKndlYkZyYW1lKQogICAgIHJldHVybiBraXQoY29yZUZyYW1lLT5wYWdlKCkpOwog fQogCi0rIChQYXNzUmVmUHRyPEZyYW1lPilfY3JlYXRlRnJhbWVXaXRoUGFnZTooUGFnZSopcGFn ZSBmcmFtZU5hbWU6KGNvbnN0IFN0cmluZyYpbmFtZSBmcmFtZVZpZXc6KFdlYkZyYW1lVmlldyAq KWZyYW1lVmlldyBvd25lckVsZW1lbnQ6KEhUTUxGcmFtZU93bmVyRWxlbWVudCopb3duZXJFbGVt ZW50CisrIChSZWY8V2ViQ29yZTo6RnJhbWU+KV9jcmVhdGVGcmFtZVdpdGhQYWdlOihQYWdlKilw YWdlIGZyYW1lTmFtZTooY29uc3QgU3RyaW5nJiluYW1lIGZyYW1lVmlldzooV2ViRnJhbWVWaWV3 ICopZnJhbWVWaWV3IG93bmVyRWxlbWVudDooSFRNTEZyYW1lT3duZXJFbGVtZW50Kilvd25lckVs ZW1lbnQKIHsKICAgICBXZWJWaWV3ICp3ZWJWaWV3ID0ga2l0KHBhZ2UpOwogCiAgICAgV2ViRnJh bWUgKmZyYW1lID0gW1tzZWxmIGFsbG9jXSBfaW5pdFdpdGhXZWJGcmFtZVZpZXc6ZnJhbWVWaWV3 IHdlYlZpZXc6d2ViVmlld107Ci0gICAgUmVmUHRyPEZyYW1lPiBjb3JlRnJhbWUgPSBGcmFtZTo6 Y3JlYXRlKHBhZ2UsIG93bmVyRWxlbWVudCwgbmV3IFdlYkZyYW1lTG9hZGVyQ2xpZW50KGZyYW1l KSk7CisgICAgUmVmPFdlYkNvcmU6OkZyYW1lPiBjb3JlRnJhbWUgPSBGcmFtZTo6Y3JlYXRlKHBh Z2UsIG93bmVyRWxlbWVudCwgbmV3IFdlYkZyYW1lTG9hZGVyQ2xpZW50KGZyYW1lKSk7CiAgICAg W2ZyYW1lIHJlbGVhc2VdOwotICAgIGZyYW1lLT5fcHJpdmF0ZS0+Y29yZUZyYW1lID0gY29yZUZy YW1lLmdldCgpOworICAgIGZyYW1lLT5fcHJpdmF0ZS0+Y29yZUZyYW1lID0gY29yZUZyYW1lLnB0 cigpOwogCi0gICAgY29yZUZyYW1lLT50cmVlKCkuc2V0TmFtZShuYW1lKTsKKyAgICBjb3JlRnJh bWUuZ2V0KCkudHJlZSgpLnNldE5hbWUobmFtZSk7CiAgICAgaWYgKG93bmVyRWxlbWVudCkgewog ICAgICAgICBBU1NFUlQob3duZXJFbGVtZW50LT5kb2N1bWVudCgpLmZyYW1lKCkpOwotICAgICAg ICBvd25lckVsZW1lbnQtPmRvY3VtZW50KCkuZnJhbWUoKS0+dHJlZSgpLmFwcGVuZENoaWxkKGNv cmVGcmFtZS5nZXQoKSk7CisgICAgICAgIG93bmVyRWxlbWVudC0+ZG9jdW1lbnQoKS5mcmFtZSgp LT50cmVlKCkuYXBwZW5kQ2hpbGQoY29yZUZyYW1lLnB0cigpKTsKICAgICB9CiAKLSAgICBjb3Jl RnJhbWUtPmluaXQoKTsKKyAgICBjb3JlRnJhbWUuZ2V0KCkuaW5pdCgpOwogCiAgICAgW3dlYlZp ZXcgX3NldFpvb21NdWx0aXBsaWVyOlt3ZWJWaWV3IF9yZWFsWm9vbU11bHRpcGxpZXJdIGlzVGV4 dE9ubHk6W3dlYlZpZXcgX3JlYWxab29tTXVsdGlwbGllcklzVGV4dE9ubHldXTsKIAotICAgIHJl dHVybiBjb3JlRnJhbWUucmVsZWFzZSgpOworICAgIHJldHVybiBjb3JlRnJhbWU7CiB9CiAKICsg KHZvaWQpX2NyZWF0ZU1haW5GcmFtZVdpdGhQYWdlOihQYWdlKilwYWdlIGZyYW1lTmFtZTooY29u c3QgU3RyaW5nJiluYW1lIGZyYW1lVmlldzooV2ViRnJhbWVWaWV3ICopZnJhbWVWaWV3CkBAIC0z NTMsNyArMzUzLDcgQEAgV2ViVmlldyAqZ2V0V2ViVmlldyhXZWJGcmFtZSAqd2ViRnJhbWUpCiAg ICAgW3dlYlZpZXcgX3NldFpvb21NdWx0aXBsaWVyOlt3ZWJWaWV3IF9yZWFsWm9vbU11bHRpcGxp ZXJdIGlzVGV4dE9ubHk6W3dlYlZpZXcgX3JlYWxab29tTXVsdGlwbGllcklzVGV4dE9ubHldXTsK IH0KIAotKyAoUGFzc1JlZlB0cjxXZWJDb3JlOjpGcmFtZT4pX2NyZWF0ZVN1YmZyYW1lV2l0aE93 bmVyRWxlbWVudDooSFRNTEZyYW1lT3duZXJFbGVtZW50Kilvd25lckVsZW1lbnQgZnJhbWVOYW1l Oihjb25zdCBTdHJpbmcmKW5hbWUgZnJhbWVWaWV3OihXZWJGcmFtZVZpZXcgKilmcmFtZVZpZXcK KysgKFJlZjxXZWJDb3JlOjpGcmFtZT4pX2NyZWF0ZVN1YmZyYW1lV2l0aE93bmVyRWxlbWVudDoo SFRNTEZyYW1lT3duZXJFbGVtZW50Kilvd25lckVsZW1lbnQgZnJhbWVOYW1lOihjb25zdCBTdHJp bmcmKW5hbWUgZnJhbWVWaWV3OihXZWJGcmFtZVZpZXcgKilmcmFtZVZpZXcKIHsKICAgICByZXR1 cm4gW3NlbGYgX2NyZWF0ZUZyYW1lV2l0aFBhZ2U6b3duZXJFbGVtZW50LT5kb2N1bWVudCgpLmZy YW1lKCktPnBhZ2UoKSBmcmFtZU5hbWU6bmFtZSBmcmFtZVZpZXc6ZnJhbWVWaWV3IG93bmVyRWxl bWVudDpvd25lckVsZW1lbnRdOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvV2Vi Vmlldy9XZWJGcmFtZUludGVybmFsLmggYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYkZy YW1lSW50ZXJuYWwuaAppbmRleCBkZjllZmFkLi4yZjQ1OWJhIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L21hYy9XZWJWaWV3L1dlYkZyYW1lSW50ZXJuYWwuaAorKysgYi9Tb3VyY2UvV2ViS2l0 L21hYy9XZWJWaWV3L1dlYkZyYW1lSW50ZXJuYWwuaApAQCAtMTAzLDcgKzEwMyw3IEBAIFdlYlZp ZXcgKmdldFdlYlZpZXcoV2ViRnJhbWUgKndlYkZyYW1lKTsKIEBpbnRlcmZhY2UgV2ViRnJhbWUg KFdlYkludGVybmFsKQogCiArICh2b2lkKV9jcmVhdGVNYWluRnJhbWVXaXRoUGFnZTooV2ViQ29y ZTo6UGFnZSopcGFnZSBmcmFtZU5hbWU6KGNvbnN0IFdURjo6U3RyaW5nJiluYW1lIGZyYW1lVmll dzooV2ViRnJhbWVWaWV3ICopZnJhbWVWaWV3OwotKyAoUGFzc1JlZlB0cjxXZWJDb3JlOjpGcmFt ZT4pX2NyZWF0ZVN1YmZyYW1lV2l0aE93bmVyRWxlbWVudDooV2ViQ29yZTo6SFRNTEZyYW1lT3du ZXJFbGVtZW50Kilvd25lckVsZW1lbnQgZnJhbWVOYW1lOihjb25zdCBXVEY6OlN0cmluZyYpbmFt ZSBmcmFtZVZpZXc6KFdlYkZyYW1lVmlldyAqKWZyYW1lVmlldzsKKysgKFJlZjxXZWJDb3JlOjpG cmFtZT4pX2NyZWF0ZVN1YmZyYW1lV2l0aE93bmVyRWxlbWVudDooV2ViQ29yZTo6SFRNTEZyYW1l T3duZXJFbGVtZW50Kilvd25lckVsZW1lbnQgZnJhbWVOYW1lOihjb25zdCBXVEY6OlN0cmluZyYp bmFtZSBmcmFtZVZpZXc6KFdlYkZyYW1lVmlldyAqKWZyYW1lVmlldzsKIC0gKGlkKV9pbml0V2l0 aFdlYkZyYW1lVmlldzooV2ViRnJhbWVWaWV3ICopd2ViRnJhbWVWaWV3IHdlYlZpZXc6KFdlYlZp ZXcgKil3ZWJWaWV3OwogCiAtICh2b2lkKV9jbGVhckNvcmVGcmFtZTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCAw NWMxYmVlLi4zNTZiYmE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysr IGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTQtMTItMTcg IEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgorCisgICAgICAgIFB1cmdlIFBhc3NS ZWZQdHIgZnJvbSBGcmFtZS4KKyAgICAgICAgPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzEzOTczMT4K KworICAgICAgICBSZXZpZXdlZCBieSBBbmRlcnMgQ2FybHNzb24uCisKKyAgICAgICAgKiBXZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViRnJhbWUuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZTo6 Y3JlYXRlU3ViZnJhbWUpOgorCiAyMDE0LTEyLTE2ICBBbmRyZWFzIEtsaW5nICA8YWtsaW5nQGFw cGxlLmNvbT4KIAogICAgICAgICBVc2UgUmVmIGZvciBTZWN1cml0eU9yaWdpbi4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJGcmFtZS5jcHAgYi9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViRnJhbWUuY3BwCmluZGV4IDgyN2MwNjAu LmZjNGVjMDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9X ZWJGcmFtZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkZy YW1lLmNwcApAQCAtMTIzLDEyICsxMjMsMTIgQEAgUGFzc1JlZlB0cjxXZWJGcmFtZT4gV2ViRnJh bWU6OmNyZWF0ZVN1YmZyYW1lKFdlYlBhZ2UqIHBhZ2UsIGNvbnN0IFN0cmluZyYgZnJhbWUKICAg ICBSZWZQdHI8V2ViRnJhbWU+IGZyYW1lID0gY3JlYXRlKHN0ZDo6bWFrZV91bmlxdWU8V2ViRnJh bWVMb2FkZXJDbGllbnQ+KCkpOwogICAgIHBhZ2UtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94 eTo6RGlkQ3JlYXRlU3ViZnJhbWUoZnJhbWUtPmZyYW1lSUQoKSksIHBhZ2UtPnBhZ2VJRCgpLCBJ UEM6OkRpc3BhdGNoTWVzc2FnZUV2ZW5XaGVuV2FpdGluZ0ZvclN5bmNSZXBseSk7CiAKLSAgICBS ZWZQdHI8RnJhbWU+IGNvcmVGcmFtZSA9IEZyYW1lOjpjcmVhdGUocGFnZS0+Y29yZVBhZ2UoKSwg b3duZXJFbGVtZW50LCBmcmFtZS0+bV9mcmFtZUxvYWRlckNsaWVudC5nZXQoKSk7Ci0gICAgZnJh bWUtPm1fY29yZUZyYW1lID0gY29yZUZyYW1lLmdldCgpOworICAgIFJlZjxXZWJDb3JlOjpGcmFt ZT4gY29yZUZyYW1lID0gRnJhbWU6OmNyZWF0ZShwYWdlLT5jb3JlUGFnZSgpLCBvd25lckVsZW1l bnQsIGZyYW1lLT5tX2ZyYW1lTG9hZGVyQ2xpZW50LmdldCgpKTsKKyAgICBmcmFtZS0+bV9jb3Jl RnJhbWUgPSBjb3JlRnJhbWUucHRyKCk7CiAgICAgZnJhbWUtPm1fY29yZUZyYW1lLT50cmVlKCku c2V0TmFtZShmcmFtZU5hbWUpOwogICAgIGlmIChvd25lckVsZW1lbnQpIHsKICAgICAgICAgQVNT RVJUKG93bmVyRWxlbWVudC0+ZG9jdW1lbnQoKS5mcmFtZSgpKTsKLSAgICAgICAgb3duZXJFbGVt ZW50LT5kb2N1bWVudCgpLmZyYW1lKCktPnRyZWUoKS5hcHBlbmRDaGlsZChjb3JlRnJhbWUucmVs ZWFzZSgpKTsKKyAgICAgICAgb3duZXJFbGVtZW50LT5kb2N1bWVudCgpLmZyYW1lKCktPnRyZWUo KS5hcHBlbmRDaGlsZChXVEY6Om1vdmUoY29yZUZyYW1lKSk7CiAgICAgfQogICAgIGZyYW1lLT5t X2NvcmVGcmFtZS0+aW5pdCgpOwogICAgIHJldHVybiBmcmFtZS5yZWxlYXNlKCk7Cg==