136410 2014-08-30 23:59:56 -0700 REGRESSION (r168217): Images are cropped out during animation at jetblue.com 2014-12-15 12:24:32 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED http://www.jetblue.com/flying-on-jetblue/mint/ InRadar, Regression P1 Normal --- 139632 1 mitz simon.fraser commit-queue dino esprehn+autocc kangil.han simon.fraser thorton oldest_to_newest 1032377 0 mitz 2014-08-30 23:59:56 -0700 To reproduce: navigate to the URL and scroll down to the “Sweet seats” section, and click one of the horizontal arrow buttons. As the content scrolls in, the image is partially cropped out during the transition, and the missing part only pops in at the end. This was caused by <http://trac.webkit.org/r168217>, the fix for bug 132507. 1032379 1 mitz 2014-08-31 00:00:45 -0700 <rdar://problem/18188533> 1055197 2 243215 simon.fraser 2014-12-12 14:23:13 -0800 Created attachment 243215 Patch 1055297 3 simon.fraser 2014-12-12 14:52:40 -0800 https://trac.webkit.org/r177238 1055307 4 simon.fraser 2014-12-12 15:33:48 -0800 Reopening to attach new patch. 1055308 5 243222 simon.fraser 2014-12-12 15:33:49 -0800 Created attachment 243222 Patch 1055312 6 simon.fraser 2014-12-12 15:45:24 -0800 https://trac.webkit.org/r177244 1055530 7 ap 2014-12-14 18:44:19 -0800 r177238 introduced memory corruption on a regression test. Will roll out. run-webkit-tests -g transitions/transition-end-event-destroy-iframe.html Thread 0 Crashed:: Dispatch queue: com.apple.main-thread 0 com.apple.WebCore 0x000000010760af00 WebCore::AnimationControllerPrivate::endAnimationUpdate() + 16 1 com.apple.WebCore 0x00000001076186b8 WebCore::AnimationPrivateUpdateBlock::~AnimationPrivateUpdateBlock() + 24 2 com.apple.WebCore 0x000000010760d065 WebCore::AnimationPrivateUpdateBlock::~AnimationPrivateUpdateBlock() + 21 3 com.apple.WebCore 0x00000001076098b4 WebCore::AnimationControllerPrivate::animationTimerFired() + 68 4 com.apple.WebCore 0x0000000107616303 std::__1::__function::__func<std::__1::__bind<void (WebCore::AnimationControllerPrivate::*&)(), WebCore::AnimationControllerPrivate*>, std::__1::allocator<std::__1::__bind<void (WebCore::AnimationControllerPrivate::*&)(), WebCore::AnimationControllerPrivate*> >, void ()>::operator()() + 259 5 com.apple.WebCore 0x00000001075dcb4a std::__1::function<void ()>::operator()() const + 26 6 com.apple.WebCore 0x00000001075dcafc WebCore::Timer::fired() + 28 1055532 8 commit-queue 2014-12-14 18:46:04 -0800 Re-opened since this is blocked by bug 139632 1055697 9 243303 simon.fraser 2014-12-15 12:03:39 -0800 Created attachment 243303 Patch 1055700 10 simon.fraser 2014-12-15 12:24:32 -0800 Re-landed in https://trac.webkit.org/r177302 243215 2014-12-12 14:23:13 -0800 2014-12-12 15:33:44 -0800 Patch bug-136410-20141212142357.patch text/plain 14185 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3MjI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzc4ZGVkOTNmOGI0YTBm ZTBlZGRlOTU4NDJlZjhmZWEzNWUwNjZhNC4uMzZlM2NlYjMyNGU5OWFkNzJmYWExNDZkZWFiNjE2 NDBmNGVlYWVhZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDU4IEBACisyMDE0LTEyLTEyICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT04g KHIxNjgyMTcpOiBJbWFnZXMgYXJlIGNyb3BwZWQgb3V0IGR1cmluZyBhbmltYXRpb24gYXQgamV0 Ymx1ZS5jb20KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEzNjQxMAorICAgICAgICByZGFyOi8vcHJvYmxlbS8xODE4ODUzMworCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAgRHVyaW5nIEdyYXBoaWNz TGF5ZXIgZmx1c2hpbmcsIGZvciB0aWxlZCBsYXllcnMgd2UgY2FuIGNvbXB1dGUgYSB2aXNpYmxl IHJlY3QgdXNpbmcKKyAgICAgICAgdGhlIGN1cnJlbnQgc3RhdGUgb2YgYW4gYW5pbWF0aW9uLCB3 aGljaCBpcyBvYnRhaW5lZCB2aWEgdGhlIEFuaW1hdGlvbkNvbnRyb2xsZXIuCisgICAgICAgIElm IHRoYXQgYW5pbWF0aW9uIHdhcyBydW5uaW5nIGluIGEgc3ViZnJhbWUsIEFuaW1hdGlvbkNvbnRy b2xsZXIgY291bGQgdXNlIGEgc3RhbGUKKyAgICAgICAgYmVnaW5BbmltYXRpb25VcGRhdGVUaW1l IHNpbmNlIG5vLW9uZSBjYWxsZWQgaXRzIGJlZ2luQW5pbWF0aW9uVXBkYXRlKCkuIFRoYXQKKyAg ICAgICAgcmVzdWx0ZWQgaW4gYW4gaW5jb3JyZWN0IGNvbXB1dGF0aW9uIG9mIHRoZSB2aXNpYmxl IHJlY3QsIHJlc3VsdGluZyBpbiBtaXNzaW5nIHRpbGVzLgorICAgICAgICAKKyAgICAgICAgVGhl cmUgYXJlIHR3byBwYXJ0cyB0byB0aGlzIGZpeC4gRmlyc3QsIGFkZCBhbiBhc3NlcnRpb24gdGhh dCBiZWdpbkFuaW1hdGlvblVwZGF0ZVRpbWUoKQorICAgICAgICBpcyBiZWluZyBjYWxsZWQgaW5z aWRlIGFuIGFuaW1hdGlvbiB1cGRhdGUgYmxvY2suIFRoaXMgcmVxdWlyZWQgbW92aW5nIG1fYmVn aW5BbmltYXRpb25VcGRhdGVDb3VudAorICAgICAgICBpbnRvIEFuaW1hdGlvbkNvbnRyb2xsZXJQ cml2YXRlLCBhbmQgY2hhbmdlcyB0byBlbmRBbmltYXRpb25VcGRhdGUoKS4KKyAgICAgICAgCisg ICAgICAgIFRoZSBzZWNvbmQgaXMgYWRkaW5nIGEgQW5pbWF0aW9uVXBkYXRlQmxvY2sgdG8gZ2V0 QW5pbWF0ZWRTdHlsZUZvclJlbmRlcmVyKCksIHdoaWNoCisgICAgICAgIGNhbiBiZSBjYWxsZWQg b3V0c2lkZSBvZiBzdHlsZSByZXNvbHV0aW9uLiBXZSBhbHNvIG5lZWQgc29tZSBpbiBvdGhlciBB UEkgZnVuY3Rpb25zLgorICAgICAgICAKKyAgICAgICAgVGVzdGluZyByZXZlYWxlZCB0aGF0IGxh eW91dCBjYW4gY2FsbCB2aWEgbGF5b3V0T3ZlcmZsb3dSZWN0Rm9yUHJvcGFnYXRpb24oKSwgc3Vn Z2VzdGluZworICAgICAgICB0aGF0IHdlIHNob3VsZCBoYXZlIGFuIGFuaW1hdGlvbiBiYXRjaCBp bnNpZGUgRnJhbWVWaWV3OjpsYXlvdXQoKS4gSW4gYWRkaXRpb24sIGEgc2luZ2xlCisgICAgICAg IHJlc29sdmVTdHlsZS9sYXlvdXQgc2hvdWxkIHVzZSB0aGUgc2FtZSBhbmltYXRpb25CZWdpblRp bWUsIHNvIHdlIGFkZCBhIGJhdGNoIHRvIAorICAgICAgICB1cGRhdGVMYXlvdXRBbmRTdHlsZUlm TmVlZGVkUmVjdXJzaXZlKCkuCisgICAgICAgIAorICAgICAgICBObyB0ZXN0IGJlY2F1c2UgaXQn cyB0aW1pbmctZGVwZW5kZW50LiBFeGlzdGluZyB0ZXN0cyBleGVyY2lzZSB0aGUgbmV3IGFzc2Vy dGlvbi4KKworICAgICAgICAqIGNzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3BwOgor ICAgICAgICAoV2ViQ29yZTo6Y29tcHV0ZVJlbmRlclN0eWxlRm9yUHJvcGVydHkpOgorICAgICAg ICAqIHBhZ2UvRnJhbWVWaWV3LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6bGF5 b3V0KToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6dXBkYXRlTGF5b3V0QW5kU3R5bGVJ Zk5lZWRlZFJlY3Vyc2l2ZSk6CisgICAgICAgICogcGFnZS9hbmltYXRpb24vQW5pbWF0aW9uQ29u dHJvbGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBbmltYXRpb25Qcml2YXRlVXBkYXRlQmxv Y2s6OkFuaW1hdGlvblByaXZhdGVVcGRhdGVCbG9jayk6CisgICAgICAgIChXZWJDb3JlOjpBbmlt YXRpb25Qcml2YXRlVXBkYXRlQmxvY2s6On5BbmltYXRpb25Qcml2YXRlVXBkYXRlQmxvY2spOgor ICAgICAgICAoV2ViQ29yZTo6QW5pbWF0aW9uQ29udHJvbGxlclByaXZhdGU6OkFuaW1hdGlvbkNv bnRyb2xsZXJQcml2YXRlKToKKyAgICAgICAgKFdlYkNvcmU6OkFuaW1hdGlvbkNvbnRyb2xsZXJQ cml2YXRlOjphbmltYXRpb25UaW1lckZpcmVkKToKKyAgICAgICAgKFdlYkNvcmU6OkFuaW1hdGlv bkNvbnRyb2xsZXJQcml2YXRlOjpzdXNwZW5kQW5pbWF0aW9uc0ZvckRvY3VtZW50KToKKyAgICAg ICAgKFdlYkNvcmU6OkFuaW1hdGlvbkNvbnRyb2xsZXJQcml2YXRlOjpyZXN1bWVBbmltYXRpb25z Rm9yRG9jdW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6QW5pbWF0aW9uQ29udHJvbGxlclByaXZh dGU6OmJlZ2luQW5pbWF0aW9uVXBkYXRlVGltZSk6CisgICAgICAgIChXZWJDb3JlOjpBbmltYXRp b25Db250cm9sbGVyUHJpdmF0ZTo6YmVnaW5BbmltYXRpb25VcGRhdGUpOgorICAgICAgICAoV2Vi Q29yZTo6QW5pbWF0aW9uQ29udHJvbGxlclByaXZhdGU6OmVuZEFuaW1hdGlvblVwZGF0ZSk6Cisg ICAgICAgIChXZWJDb3JlOjpBbmltYXRpb25Db250cm9sbGVyUHJpdmF0ZTo6Z2V0QW5pbWF0ZWRT dHlsZUZvclJlbmRlcmVyKToKKyAgICAgICAgKFdlYkNvcmU6OkFuaW1hdGlvbkNvbnRyb2xsZXI6 OkFuaW1hdGlvbkNvbnRyb2xsZXIpOgorICAgICAgICAoV2ViQ29yZTo6QW5pbWF0aW9uQ29udHJv bGxlcjo6bm90aWZ5QW5pbWF0aW9uU3RhcnRlZCk6CisgICAgICAgIChXZWJDb3JlOjpBbmltYXRp b25Db250cm9sbGVyOjpwYXVzZUFuaW1hdGlvbkF0VGltZSk6CisgICAgICAgIChXZWJDb3JlOjpB bmltYXRpb25Db250cm9sbGVyOjpwYXVzZVRyYW5zaXRpb25BdFRpbWUpOgorICAgICAgICAoV2Vi Q29yZTo6QW5pbWF0aW9uQ29udHJvbGxlcjo6cmVzdW1lQW5pbWF0aW9uc0ZvckRvY3VtZW50KToK KyAgICAgICAgKFdlYkNvcmU6OkFuaW1hdGlvbkNvbnRyb2xsZXI6OnN0YXJ0QW5pbWF0aW9uc0lm Tm90U3VzcGVuZGVkKToKKyAgICAgICAgKFdlYkNvcmU6OkFuaW1hdGlvbkNvbnRyb2xsZXI6OmJl Z2luQW5pbWF0aW9uVXBkYXRlKToKKyAgICAgICAgKFdlYkNvcmU6OkFuaW1hdGlvbkNvbnRyb2xs ZXI6OmVuZEFuaW1hdGlvblVwZGF0ZSk6CisgICAgICAgICogcGFnZS9hbmltYXRpb24vQW5pbWF0 aW9uQ29udHJvbGxlci5oOgorICAgICAgICAqIHBhZ2UvYW5pbWF0aW9uL0FuaW1hdGlvbkNvbnRy b2xsZXJQcml2YXRlLmg6CisKIDIwMTQtMTItMTIgIFJhZHUgU3RhdmlsYSAgPHN0YXZpbGFAYWRv YmUuY29tPgogCiAgICAgICAgIFtTVkcgTWFza2luZ10gRW5hYmxlIHRoZSB1c2Ugb2YgPG1hc2s+ IGVsZW1lbnRzIGZvciAtd2Via2l0LW1hc2staW1hZ2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2Nzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3BwIGIvU291cmNlL1dlYkNvcmUv Y3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHAKaW5kZXggZmVhYzE3OWE2MDU1MTIw OWVjZGZjNWQzMjlhNDE2YzIwNTM1OWZjNi4uMmM1ZGJjMTJhZmIyODRlZGE4NDlmMTQwYzY1Y2Rh MThiMmExNzI2NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5 bGVEZWNsYXJhdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5 bGVEZWNsYXJhdGlvbi5jcHAKQEAgLTE3MDUsNyArMTcwNSw2IEBAIHN0YXRpYyBpbmxpbmUgUGFz c1JlZlB0cjxSZW5kZXJTdHlsZT4gY29tcHV0ZVJlbmRlclN0eWxlRm9yUHJvcGVydHkoTm9kZSog c3R5bGVkCiAgICAgUmVuZGVyT2JqZWN0KiByZW5kZXJlciA9IHN0eWxlZE5vZGUtPnJlbmRlcmVy KCk7CiAKICAgICBpZiAocmVuZGVyZXIgJiYgcmVuZGVyZXItPmlzQ29tcG9zaXRlZCgpICYmIEFu aW1hdGlvbkNvbnRyb2xsZXI6OnN1cHBvcnRzQWNjZWxlcmF0ZWRBbmltYXRpb25PZlByb3BlcnR5 KHByb3BlcnR5SUQpKSB7Ci0gICAgICAgIEFuaW1hdGlvblVwZGF0ZUJsb2NrIGFuaW1hdGlvblVw ZGF0ZUJsb2NrKCZyZW5kZXJlci0+YW5pbWF0aW9uKCkpOwogICAgICAgICBSZWZQdHI8UmVuZGVy U3R5bGU+IHN0eWxlID0gcmVuZGVyZXItPmFuaW1hdGlvbigpLmdldEFuaW1hdGVkU3R5bGVGb3JS ZW5kZXJlcihkb3duY2FzdDxSZW5kZXJFbGVtZW50PigqcmVuZGVyZXIpKTsKICAgICAgICAgaWYg KHBzZXVkb0VsZW1lbnRTcGVjaWZpZXIgJiYgIXN0eWxlZE5vZGUtPmlzUHNldWRvRWxlbWVudCgp KSB7CiAgICAgICAgICAgICAvLyBGSVhNRTogVGhpcyBjYWNoZWQgcHNldWRvIHN0eWxlIHdpbGwg b25seSBleGlzdCBpZiB0aGUgYW5pbWF0aW9uIGhhcyBiZWVuIHJ1biBhdCBsZWFzdCBvbmNlLgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwIGIvU291cmNlL1dl YkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCmluZGV4IDljZTg1ZGI4ZWIwY2M1NTZkYmY5ZjUzZjRj MDNiN2NjOGVhNmNhMzMuLmZmODQ1ODU5ZWEwOWNhNDM0ZTk1NjRkMDAwODU1NTkwMDk0MzMxZjkg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKQEAgLTExNTMsNyArMTE1Myw4IEBAIHZvaWQg RnJhbWVWaWV3OjpsYXlvdXQoYm9vbCBhbGxvd1N1YnRyZWUpCiAgICAgICAgIHJldHVybjsKIAog ICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbkNvb2tpZSBjb29raWUgPSBJbnNwZWN0b3JJbnN0 cnVtZW50YXRpb246OndpbGxMYXlvdXQoJmZyYW1lKCkpOwotCisgICAgQW5pbWF0aW9uVXBkYXRl QmxvY2sgYW5pbWF0aW9uVXBkYXRlQmxvY2soJmZyYW1lKCkuYW5pbWF0aW9uKCkpOworICAgIAog ICAgIGlmICghYWxsb3dTdWJ0cmVlICYmIG1fbGF5b3V0Um9vdCkgewogICAgICAgICBtX2xheW91 dFJvb3QtPm1hcmtDb250YWluaW5nQmxvY2tzRm9yTGF5b3V0KGZhbHNlKTsKICAgICAgICAgbV9s YXlvdXRSb290ID0gMDsKQEAgLTM5MzcsNiArMzkzOCw4IEBAIHZvaWQgRnJhbWVWaWV3Ojp1cGRh dGVMYXlvdXRBbmRTdHlsZUlmTmVlZGVkUmVjdXJzaXZlKCkKICAgICAvLyByZWdpb24gYnV0IHRo ZW4gYmVjb21lIGluY2x1ZGVkIGxhdGVyIGJ5IHRoZSBzZWNvbmQgZnJhbWUgYWRkaW5nIHJlY3Rz IHRvIHRoZSBkaXJ0eSByZWdpb24KICAgICAvLyB3aGVuIGl0IGxheXMgb3V0LgogCisgICAgQW5p bWF0aW9uVXBkYXRlQmxvY2sgYW5pbWF0aW9uVXBkYXRlQmxvY2soJmZyYW1lKCkuYW5pbWF0aW9u KCkpOworCiAgICAgZnJhbWUoKS5kb2N1bWVudCgpLT51cGRhdGVTdHlsZUlmTmVlZGVkKCk7CiAK ICAgICBpZiAobmVlZHNMYXlvdXQoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv YW5pbWF0aW9uL0FuaW1hdGlvbkNvbnRyb2xsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9h bmltYXRpb24vQW5pbWF0aW9uQ29udHJvbGxlci5jcHAKaW5kZXggNzNiYTM2MTNjNGNkNWM4YzZh OGE2NWNlZDQ2NDlkMjE4Mzg5YzM0Ny4uNDZhZWE2ZWU3M2M4NTZjMzY3OGUzYWVjY2U4YjBlMDMx MjY3OGFhNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9hbmltYXRpb24vQW5pbWF0 aW9uQ29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9hbmltYXRpb24vQW5p bWF0aW9uQ29udHJvbGxlci5jcHAKQEAgLTUxLDYgKzUxLDIyIEBAIG5hbWVzcGFjZSBXZWJDb3Jl IHsKIHN0YXRpYyBjb25zdCBkb3VibGUgY0FuaW1hdGlvblRpbWVyRGVsYXkgPSAwLjAyNTsKIHN0 YXRpYyBjb25zdCBkb3VibGUgY0JlZ2luQW5pbWF0aW9uVXBkYXRlVGltZU5vdFNldCA9IC0xOwog CitjbGFzcyBBbmltYXRpb25Qcml2YXRlVXBkYXRlQmxvY2sgeworcHVibGljOgorICAgIEFuaW1h dGlvblByaXZhdGVVcGRhdGVCbG9jayhBbmltYXRpb25Db250cm9sbGVyUHJpdmF0ZSYgYW5pbWF0 aW9uQ29udHJvbGxlcikKKyAgICAgICAgOiBtX2FuaW1hdGlvbkNvbnRyb2xsZXIoYW5pbWF0aW9u Q29udHJvbGxlcikKKyAgICB7CisgICAgICAgIG1fYW5pbWF0aW9uQ29udHJvbGxlci5iZWdpbkFu aW1hdGlvblVwZGF0ZSgpOworICAgIH0KKyAgICAKKyAgICB+QW5pbWF0aW9uUHJpdmF0ZVVwZGF0 ZUJsb2NrKCkKKyAgICB7CisgICAgICAgIG1fYW5pbWF0aW9uQ29udHJvbGxlci5lbmRBbmltYXRp b25VcGRhdGUoKTsKKyAgICB9CisgICAgCisgICAgQW5pbWF0aW9uQ29udHJvbGxlclByaXZhdGUm IG1fYW5pbWF0aW9uQ29udHJvbGxlcjsKK307CisKIEFuaW1hdGlvbkNvbnRyb2xsZXJQcml2YXRl OjpBbmltYXRpb25Db250cm9sbGVyUHJpdmF0ZShGcmFtZSYgZnJhbWUpCiAgICAgOiBtX2FuaW1h dGlvblRpbWVyKCp0aGlzLCAmQW5pbWF0aW9uQ29udHJvbGxlclByaXZhdGU6OmFuaW1hdGlvblRp bWVyRmlyZWQpCiAgICAgLCBtX3VwZGF0ZVN0eWxlSWZOZWVkZWREaXNwYXRjaGVyKCp0aGlzLCAm QW5pbWF0aW9uQ29udHJvbGxlclByaXZhdGU6OnVwZGF0ZVN0eWxlSWZOZWVkZWREaXNwYXRjaGVy RmlyZWQpCkBAIC01OCw2ICs3NCw3IEBAIEFuaW1hdGlvbkNvbnRyb2xsZXJQcml2YXRlOjpBbmlt YXRpb25Db250cm9sbGVyUHJpdmF0ZShGcmFtZSYgZnJhbWUpCiAgICAgLCBtX2JlZ2luQW5pbWF0 aW9uVXBkYXRlVGltZShjQmVnaW5BbmltYXRpb25VcGRhdGVUaW1lTm90U2V0KQogICAgICwgbV9h bmltYXRpb25zV2FpdGluZ0ZvclN0eWxlKCkKICAgICAsIG1fYW5pbWF0aW9uc1dhaXRpbmdGb3JT dGFydFRpbWVSZXNwb25zZSgpCisgICAgLCBtX2JlZ2luQW5pbWF0aW9uVXBkYXRlQ291bnQoMCkK ICAgICAsIG1fd2FpdGluZ0ZvckFzeW5jU3RhcnROb3RpZmljYXRpb24oZmFsc2UpCiAgICAgLCBt X2lzU3VzcGVuZGVkKGZhbHNlKQogICAgICwgbV9hbGxvd3NOZXdBbmltYXRpb25zV2hpbGVTdXNw ZW5kZWQoZmFsc2UpCkBAIC0yMzAsNyArMjQ3LDcgQEAgdm9pZCBBbmltYXRpb25Db250cm9sbGVy UHJpdmF0ZTo6YW5pbWF0aW9uVGltZXJGaXJlZCgpCiB7CiAgICAgLy8gTWFrZSBzdXJlIGFuaW1h dGlvblVwZGF0ZVRpbWUgaXMgdXBkYXRlZCwgc28gdGhhdCBpdCBpcyBjdXJyZW50IGV2ZW4gaWYg bm8KICAgICAvLyBzdHlsZUNoYW5nZSBoYXMgaGFwcGVuZWQgKGUuZy4gYWNjZWxlcmF0ZWQgYW5p bWF0aW9ucykKLSAgICBzZXRCZWdpbkFuaW1hdGlvblVwZGF0ZVRpbWUoY0JlZ2luQW5pbWF0aW9u VXBkYXRlVGltZU5vdFNldCk7CisgICAgQW5pbWF0aW9uUHJpdmF0ZVVwZGF0ZUJsb2NrIHVwZGF0 ZUJsb2NrKCp0aGlzKTsKIAogICAgIC8vIFdoZW4gdGhlIHRpbWVyIGZpcmVzLCBhbGwgd2UgZG8g aXMgY2FsbCBzZXRDaGFuZ2VkIG9uIGFsbCBET00gbm9kZXMgd2l0aCBydW5uaW5nIGFuaW1hdGlv bnMgYW5kIHRoZW4gZG8gYW4gaW1tZWRpYXRlCiAgICAgLy8gdXBkYXRlU3R5bGVJZk5lZWRlZC4g IEl0IHdpbGwgdGhlbiBjYWxsIGJhY2sgdG8gdXMgd2l0aCBuZXcgaW5mb3JtYXRpb24uCkBAIC0y ODcsNyArMzA0LDcgQEAgdm9pZCBBbmltYXRpb25Db250cm9sbGVyUHJpdmF0ZTo6cmVzdW1lQW5p bWF0aW9ucygpCiAKIHZvaWQgQW5pbWF0aW9uQ29udHJvbGxlclByaXZhdGU6OnN1c3BlbmRBbmlt YXRpb25zRm9yRG9jdW1lbnQoRG9jdW1lbnQqIGRvY3VtZW50KQogewotICAgIHNldEJlZ2luQW5p bWF0aW9uVXBkYXRlVGltZShjQmVnaW5BbmltYXRpb25VcGRhdGVUaW1lTm90U2V0KTsKKyAgICBB bmltYXRpb25Qcml2YXRlVXBkYXRlQmxvY2sgdXBkYXRlQmxvY2soKnRoaXMpOwogCiAgICAgZm9y IChhdXRvIGl0ID0gbV9jb21wb3NpdGVBbmltYXRpb25zLmJlZ2luKCksIGVuZCA9IG1fY29tcG9z aXRlQW5pbWF0aW9ucy5lbmQoKTsgaXQgIT0gZW5kOyArK2l0KSB7CiAgICAgICAgIGlmICgmaXQt PmtleS0+ZG9jdW1lbnQoKSA9PSBkb2N1bWVudCkKQEAgLTI5OSw3ICszMTYsNyBAQCB2b2lkIEFu aW1hdGlvbkNvbnRyb2xsZXJQcml2YXRlOjpzdXNwZW5kQW5pbWF0aW9uc0ZvckRvY3VtZW50KERv Y3VtZW50KiBkb2N1bWVudAogCiB2b2lkIEFuaW1hdGlvbkNvbnRyb2xsZXJQcml2YXRlOjpyZXN1 bWVBbmltYXRpb25zRm9yRG9jdW1lbnQoRG9jdW1lbnQqIGRvY3VtZW50KQogewotICAgIHNldEJl Z2luQW5pbWF0aW9uVXBkYXRlVGltZShjQmVnaW5BbmltYXRpb25VcGRhdGVUaW1lTm90U2V0KTsK KyAgICBBbmltYXRpb25Qcml2YXRlVXBkYXRlQmxvY2sgdXBkYXRlQmxvY2soKnRoaXMpOwogCiAg ICAgZm9yIChhdXRvIGl0ID0gbV9jb21wb3NpdGVBbmltYXRpb25zLmJlZ2luKCksIGVuZCA9IG1f Y29tcG9zaXRlQW5pbWF0aW9ucy5lbmQoKTsgaXQgIT0gZW5kOyArK2l0KSB7CiAgICAgICAgIGlm ICgmaXQtPmtleS0+ZG9jdW1lbnQoKSA9PSBkb2N1bWVudCkKQEAgLTM1MiwxNiArMzY5LDI5IEBA IGJvb2wgQW5pbWF0aW9uQ29udHJvbGxlclByaXZhdGU6OnBhdXNlVHJhbnNpdGlvbkF0VGltZShS ZW5kZXJFbGVtZW50KiByZW5kZXJlciwKIAogZG91YmxlIEFuaW1hdGlvbkNvbnRyb2xsZXJQcml2 YXRlOjpiZWdpbkFuaW1hdGlvblVwZGF0ZVRpbWUoKQogeworICAgIEFTU0VSVChtX2JlZ2luQW5p bWF0aW9uVXBkYXRlQ291bnQpOwogICAgIGlmIChtX2JlZ2luQW5pbWF0aW9uVXBkYXRlVGltZSA9 PSBjQmVnaW5BbmltYXRpb25VcGRhdGVUaW1lTm90U2V0KQogICAgICAgICBtX2JlZ2luQW5pbWF0 aW9uVXBkYXRlVGltZSA9IG1vbm90b25pY2FsbHlJbmNyZWFzaW5nVGltZSgpOworCiAgICAgcmV0 dXJuIG1fYmVnaW5BbmltYXRpb25VcGRhdGVUaW1lOwogfQogCit2b2lkIEFuaW1hdGlvbkNvbnRy b2xsZXJQcml2YXRlOjpiZWdpbkFuaW1hdGlvblVwZGF0ZSgpCit7CisgICAgaWYgKCFtX2JlZ2lu QW5pbWF0aW9uVXBkYXRlQ291bnQpCisgICAgICAgIHNldEJlZ2luQW5pbWF0aW9uVXBkYXRlVGlt ZShjQmVnaW5BbmltYXRpb25VcGRhdGVUaW1lTm90U2V0KTsKKyAgICArK21fYmVnaW5BbmltYXRp b25VcGRhdGVDb3VudDsKK30KKwogdm9pZCBBbmltYXRpb25Db250cm9sbGVyUHJpdmF0ZTo6ZW5k QW5pbWF0aW9uVXBkYXRlKCkKIHsKLSAgICBzdHlsZUF2YWlsYWJsZSgpOwotICAgIGlmICghbV93 YWl0aW5nRm9yQXN5bmNTdGFydE5vdGlmaWNhdGlvbikKLSAgICAgICAgc3RhcnRUaW1lUmVzcG9u c2UoYmVnaW5BbmltYXRpb25VcGRhdGVUaW1lKCkpOworICAgIEFTU0VSVChtX2JlZ2luQW5pbWF0 aW9uVXBkYXRlQ291bnQgPiAwKTsKKyAgICBpZiAobV9iZWdpbkFuaW1hdGlvblVwZGF0ZUNvdW50 ID09IDEpIHsKKyAgICAgICAgc3R5bGVBdmFpbGFibGUoKTsKKyAgICAgICAgaWYgKCFtX3dhaXRp bmdGb3JBc3luY1N0YXJ0Tm90aWZpY2F0aW9uKQorICAgICAgICAgICAgc3RhcnRUaW1lUmVzcG9u c2UoYmVnaW5BbmltYXRpb25VcGRhdGVUaW1lKCkpOworICAgIH0KKyAgICAtLW1fYmVnaW5Bbmlt YXRpb25VcGRhdGVDb3VudDsKIH0KIAogdm9pZCBBbmltYXRpb25Db250cm9sbGVyUHJpdmF0ZTo6 cmVjZWl2ZWRTdGFydFRpbWVSZXNwb25zZShkb3VibGUgdGltZSkKQEAgLTM3Miw2ICs0MDIsOCBA QCB2b2lkIEFuaW1hdGlvbkNvbnRyb2xsZXJQcml2YXRlOjpyZWNlaXZlZFN0YXJ0VGltZVJlc3Bv bnNlKGRvdWJsZSB0aW1lKQogCiBQYXNzUmVmUHRyPFJlbmRlclN0eWxlPiBBbmltYXRpb25Db250 cm9sbGVyUHJpdmF0ZTo6Z2V0QW5pbWF0ZWRTdHlsZUZvclJlbmRlcmVyKFJlbmRlckVsZW1lbnQm IHJlbmRlcmVyKQogeworICAgIEFuaW1hdGlvblByaXZhdGVVcGRhdGVCbG9jayBhbmltYXRpb25V cGRhdGVCbG9jaygqdGhpcyk7CisKICAgICBBU1NFUlQocmVuZGVyZXIuaXNDU1NBbmltYXRpbmco KSk7CiAgICAgQVNTRVJUKG1fY29tcG9zaXRlQW5pbWF0aW9ucy5jb250YWlucygmcmVuZGVyZXIp KTsKICAgICBjb25zdCBDb21wb3NpdGVBbmltYXRpb24mIHJlbmRlcmVyQW5pbWF0aW9ucyA9ICpt X2NvbXBvc2l0ZUFuaW1hdGlvbnMuZ2V0KCZyZW5kZXJlcik7CkBAIC00NjksNyArNTAxLDYgQEAg dm9pZCBBbmltYXRpb25Db250cm9sbGVyUHJpdmF0ZTo6YW5pbWF0aW9uV2lsbEJlUmVtb3ZlZChB bmltYXRpb25CYXNlKiBhbmltYXRpb24KIAogQW5pbWF0aW9uQ29udHJvbGxlcjo6QW5pbWF0aW9u Q29udHJvbGxlcihGcmFtZSYgZnJhbWUpCiAgICAgOiBtX2RhdGEoc3RkOjptYWtlX3VuaXF1ZTxB bmltYXRpb25Db250cm9sbGVyUHJpdmF0ZT4oZnJhbWUpKQotICAgICwgbV9iZWdpbkFuaW1hdGlv blVwZGF0ZUNvdW50KDApCiB7CiB9CiAKQEAgLTU0NSwxMSArNTc2LDEzIEBAIFBhc3NSZWZQdHI8 UmVuZGVyU3R5bGU+IEFuaW1hdGlvbkNvbnRyb2xsZXI6OmdldEFuaW1hdGVkU3R5bGVGb3JSZW5k ZXJlcihSZW5kZXJFCiAKIHZvaWQgQW5pbWF0aW9uQ29udHJvbGxlcjo6bm90aWZ5QW5pbWF0aW9u U3RhcnRlZChSZW5kZXJFbGVtZW50JiwgZG91YmxlIHN0YXJ0VGltZSkKIHsKKyAgICBBbmltYXRp b25VcGRhdGVCbG9jayBhbmltYXRpb25VcGRhdGVCbG9jayh0aGlzKTsKICAgICBtX2RhdGEtPnJl Y2VpdmVkU3RhcnRUaW1lUmVzcG9uc2Uoc3RhcnRUaW1lKTsKIH0KIAogYm9vbCBBbmltYXRpb25D b250cm9sbGVyOjpwYXVzZUFuaW1hdGlvbkF0VGltZShSZW5kZXJFbGVtZW50KiByZW5kZXJlciwg Y29uc3QgQXRvbWljU3RyaW5nJiBuYW1lLCBkb3VibGUgdCkKIHsKKyAgICBBbmltYXRpb25VcGRh dGVCbG9jayBhbmltYXRpb25VcGRhdGVCbG9jayh0aGlzKTsKICAgICByZXR1cm4gbV9kYXRhLT5w YXVzZUFuaW1hdGlvbkF0VGltZShyZW5kZXJlciwgbmFtZSwgdCk7CiB9CiAKQEAgLTU2MCw2ICs1 OTMsNyBAQCB1bnNpZ25lZCBBbmltYXRpb25Db250cm9sbGVyOjpudW1iZXJPZkFjdGl2ZUFuaW1h dGlvbnMoRG9jdW1lbnQqIGRvY3VtZW50KSBjb25zdAogCiBib29sIEFuaW1hdGlvbkNvbnRyb2xs ZXI6OnBhdXNlVHJhbnNpdGlvbkF0VGltZShSZW5kZXJFbGVtZW50KiByZW5kZXJlciwgY29uc3Qg U3RyaW5nJiBwcm9wZXJ0eSwgZG91YmxlIHQpCiB7CisgICAgQW5pbWF0aW9uVXBkYXRlQmxvY2sg YW5pbWF0aW9uVXBkYXRlQmxvY2sodGhpcyk7CiAgICAgcmV0dXJuIG1fZGF0YS0+cGF1c2VUcmFu c2l0aW9uQXRUaW1lKHJlbmRlcmVyLCBwcm9wZXJ0eSwgdCk7CiB9CiAKQEAgLTYxNiwyOCArNjUw LDI2IEBAIHZvaWQgQW5pbWF0aW9uQ29udHJvbGxlcjo6c3VzcGVuZEFuaW1hdGlvbnNGb3JEb2N1 bWVudChEb2N1bWVudCogZG9jdW1lbnQpCiB2b2lkIEFuaW1hdGlvbkNvbnRyb2xsZXI6OnJlc3Vt ZUFuaW1hdGlvbnNGb3JEb2N1bWVudChEb2N1bWVudCogZG9jdW1lbnQpCiB7CiAgICAgTE9HKEFu aW1hdGlvbnMsICJyZXN1bWluZyBhbmltYXRpb25zIGZvciBkb2N1bWVudCAlcCIsIGRvY3VtZW50 KTsKKyAgICBBbmltYXRpb25VcGRhdGVCbG9jayBhbmltYXRpb25VcGRhdGVCbG9jayh0aGlzKTsK ICAgICBtX2RhdGEtPnJlc3VtZUFuaW1hdGlvbnNGb3JEb2N1bWVudChkb2N1bWVudCk7CiB9CiAK IHZvaWQgQW5pbWF0aW9uQ29udHJvbGxlcjo6c3RhcnRBbmltYXRpb25zSWZOb3RTdXNwZW5kZWQo RG9jdW1lbnQqIGRvY3VtZW50KQogewogICAgIExPRyhBbmltYXRpb25zLCAiYW5pbWF0aW9ucyBt YXkgc3RhcnQgZm9yIGRvY3VtZW50ICVwIiwgZG9jdW1lbnQpOworCisgICAgQW5pbWF0aW9uVXBk YXRlQmxvY2sgYW5pbWF0aW9uVXBkYXRlQmxvY2sodGhpcyk7CiAgICAgbV9kYXRhLT5zdGFydEFu aW1hdGlvbnNJZk5vdFN1c3BlbmRlZChkb2N1bWVudCk7CiB9CiAKIHZvaWQgQW5pbWF0aW9uQ29u dHJvbGxlcjo6YmVnaW5BbmltYXRpb25VcGRhdGUoKQogewotICAgIGlmICghbV9iZWdpbkFuaW1h dGlvblVwZGF0ZUNvdW50KQotICAgICAgICBtX2RhdGEtPnNldEJlZ2luQW5pbWF0aW9uVXBkYXRl VGltZShjQmVnaW5BbmltYXRpb25VcGRhdGVUaW1lTm90U2V0KTsKLSAgICArK21fYmVnaW5Bbmlt YXRpb25VcGRhdGVDb3VudDsKKyAgICBtX2RhdGEtPmJlZ2luQW5pbWF0aW9uVXBkYXRlKCk7CiB9 CiAKIHZvaWQgQW5pbWF0aW9uQ29udHJvbGxlcjo6ZW5kQW5pbWF0aW9uVXBkYXRlKCkKIHsKLSAg ICBBU1NFUlQobV9iZWdpbkFuaW1hdGlvblVwZGF0ZUNvdW50ID4gMCk7Ci0gICAgLS1tX2JlZ2lu QW5pbWF0aW9uVXBkYXRlQ291bnQ7Ci0gICAgaWYgKCFtX2JlZ2luQW5pbWF0aW9uVXBkYXRlQ291 bnQpCi0gICAgICAgIG1fZGF0YS0+ZW5kQW5pbWF0aW9uVXBkYXRlKCk7CisgICAgbV9kYXRhLT5l bmRBbmltYXRpb25VcGRhdGUoKTsKIH0KIAogYm9vbCBBbmltYXRpb25Db250cm9sbGVyOjpzdXBw b3J0c0FjY2VsZXJhdGVkQW5pbWF0aW9uT2ZQcm9wZXJ0eShDU1NQcm9wZXJ0eUlEIHByb3BlcnR5 KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9hbmltYXRpb24vQW5pbWF0aW9uQ29u dHJvbGxlci5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9hbmltYXRpb24vQW5pbWF0aW9uQ29udHJv bGxlci5oCmluZGV4IDQ1YWJkMjU4ZWM1MTk5ZGI2MzJhY2JiNGZiMmU1M2M2ODc3ZWI1NGMuLjk4 M2IzMjM3NjMxZDIyNjk2ZTRhODAyM2NkZjBhZTdiY2NlNTdlYjggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0FuaW1hdGlvbkNvbnRyb2xsZXIuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9BbmltYXRpb25Db250cm9sbGVyLmgKQEAgLTgyLDcg KzgyLDYgQEAgcHVibGljOgogCiBwcml2YXRlOgogICAgIGNvbnN0IHN0ZDo6dW5pcXVlX3B0cjxB bmltYXRpb25Db250cm9sbGVyUHJpdmF0ZT4gbV9kYXRhOwotICAgIGludCBtX2JlZ2luQW5pbWF0 aW9uVXBkYXRlQ291bnQ7CiB9OwogCiBjbGFzcyBBbmltYXRpb25VcGRhdGVCbG9jayB7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9BbmltYXRpb25Db250cm9sbGVy UHJpdmF0ZS5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9hbmltYXRpb24vQW5pbWF0aW9uQ29udHJv bGxlclByaXZhdGUuaAppbmRleCBlZjFlZGQzZmUyMjhiZDk2MGFmZDliYzVkYWY1ZjVhZTY2OGM4 MGIyLi44NTg2ZGI4NTc5MzZhZDhmOTYyYjkzN2Y0NTA0ZGY5NDQ5M2MwZjkxIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9BbmltYXRpb25Db250cm9sbGVyUHJpdmF0 ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0FuaW1hdGlvbkNvbnRyb2xs ZXJQcml2YXRlLmgKQEAgLTk3LDYgKzk3LDggQEAgcHVibGljOgogCiAgICAgZG91YmxlIGJlZ2lu QW5pbWF0aW9uVXBkYXRlVGltZSgpOwogICAgIHZvaWQgc2V0QmVnaW5BbmltYXRpb25VcGRhdGVU aW1lKGRvdWJsZSB0KSB7IG1fYmVnaW5BbmltYXRpb25VcGRhdGVUaW1lID0gdDsgfQorICAgIAor ICAgIHZvaWQgYmVnaW5BbmltYXRpb25VcGRhdGUoKTsKICAgICB2b2lkIGVuZEFuaW1hdGlvblVw ZGF0ZSgpOwogICAgIHZvaWQgcmVjZWl2ZWRTdGFydFRpbWVSZXNwb25zZShkb3VibGUpOwogICAg IApAQCAtMTQxLDYgKzE0Myw5IEBAIHByaXZhdGU6CiAgICAgdHlwZWRlZiBIYXNoU2V0PFJlZlB0 cjxBbmltYXRpb25CYXNlPj4gV2FpdGluZ0FuaW1hdGlvbnNTZXQ7CiAgICAgV2FpdGluZ0FuaW1h dGlvbnNTZXQgbV9hbmltYXRpb25zV2FpdGluZ0ZvclN0eWxlOwogICAgIFdhaXRpbmdBbmltYXRp b25zU2V0IG1fYW5pbWF0aW9uc1dhaXRpbmdGb3JTdGFydFRpbWVSZXNwb25zZTsKKworICAgIGlu dCBtX2JlZ2luQW5pbWF0aW9uVXBkYXRlQ291bnQ7CisKICAgICBib29sIG1fd2FpdGluZ0ZvckFz eW5jU3RhcnROb3RpZmljYXRpb247CiAgICAgYm9vbCBtX2lzU3VzcGVuZGVkOwogCg== 243222 2014-12-12 15:33:49 -0800 2014-12-15 12:03:35 -0800 Patch bug-136410-20141212153434.patch text/plain 2092 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3MjM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTk0ZDRkMTQzMGQ5MmIz YWM4ZmUyZjMyN2I1YTVkZjc0NTY5OWE2NC4uMjkxOWE4NmRiOGU2YTFkMzhhYTY1Y2RhY2I0YTg2 YjZjMDY3OGQ4YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMiw2ICsyLDIxIEBACiAKICAgICAgICAgUkVHUkVT U0lPTiAocjE2ODIxNyk6IEltYWdlcyBhcmUgY3JvcHBlZCBvdXQgZHVyaW5nIGFuaW1hdGlvbiBh dCBqZXRibHVlLmNvbQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTM2NDEwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgV2Ugd2VyZSBoaXR0aW5nIHRoZSBuZXcgYXNzZXJ0aW9uIHVuZGVyIFBhZ2U6OnNldFBh Z2VTY2FsZUZhY3RvcigpLCB3aGljaAorICAgICAgICBjYWxscyByZWNhbGNTdHlsZSgpLCBzbyBt b3ZlIHRoZSBBbmltYXRpb25VcGRhdGVCbG9jayBmcm9tIHVwZGF0ZVN0eWxlSWZOZWVkZWQoKQor ICAgICAgICB0byByZWNhbGNTdHlsZSgpLgorCisgICAgICAgICogZG9tL0RvY3VtZW50LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50OjpyZWNhbGNTdHlsZSk6CisgICAgICAgIChXZWJD b3JlOjpEb2N1bWVudDo6dXBkYXRlU3R5bGVJZk5lZWRlZCk6CisKKzIwMTQtMTItMTIgIFNpbW9u IEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTiAo cjE2ODIxNyk6IEltYWdlcyBhcmUgY3JvcHBlZCBvdXQgZHVyaW5nIGFuaW1hdGlvbiBhdCBqZXRi bHVlLmNvbQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTM2NDEwCiAgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzE4MTg4NTMzCiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgRGVhbiBKYWNrc29uLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3Vt ZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKaW5kZXggMjllMGNkNWY5 OWRkYmE0YjY3YjQ2YWViYjRkN2EyODI4MjdmMDFkZC4uNzFkMjEyN2I2OTk1MzhmMGRiYTFiMTEy NTY5NmFmY2RmM2ZlMmY5MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCkBAIC0xNzY1LDYgKzE3 NjUsNyBAQCB2b2lkIERvY3VtZW50OjpyZWNhbGNTdHlsZShTdHlsZTo6Q2hhbmdlIGNoYW5nZSkK ICAgICAgICAgcmV0dXJuOyAvLyBHdWFyZCBhZ2FpbnN0IHJlLWVudHJhbmN5LiAtZHdoCiAKICAg ICBSZW5kZXJWaWV3OjpSZXBhaW50UmVnaW9uQWNjdW11bGF0b3IgcmVwYWludFJlZ2lvbkFjY3Vt dWxhdG9yKHJlbmRlclZpZXcoKSk7CisgICAgQW5pbWF0aW9uVXBkYXRlQmxvY2sgYW5pbWF0aW9u VXBkYXRlQmxvY2soJm1fZnJhbWUtPmFuaW1hdGlvbigpKTsKIAogICAgIC8vIEZJWE1FOiBXZSBz aG91bGQgdXBkYXRlIHN0eWxlIG9uIG91ciBhbmNlc3RvciBjaGFpbiBiZWZvcmUgcHJvY2VlZGlu ZyAoZXNwZWNpYWxseSBmb3Igc2VhbWxlc3MpLAogICAgIC8vIGhvd2V2ZXIgZG9pbmcgc28gY3Vy cmVudGx5IGNhdXNlcyBzZXZlcmFsIHRlc3RzIHRvIGNyYXNoLCBhcyBGcmFtZTo6c2V0RG9jdW1l bnQgY2FsbHMgRG9jdW1lbnQ6OmF0dGFjaApAQCAtMTgzNyw3ICsxODM4LDYgQEAgdm9pZCBEb2N1 bWVudDo6dXBkYXRlU3R5bGVJZk5lZWRlZCgpCiAgICAgaWYgKCghbV9wZW5kaW5nU3R5bGVSZWNh bGNTaG91bGRGb3JjZSAmJiAhY2hpbGROZWVkc1N0eWxlUmVjYWxjKCkpIHx8IGluUGFnZUNhY2hl KCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIEFuaW1hdGlvblVwZGF0ZUJsb2NrIGFuaW1hdGlv blVwZGF0ZUJsb2NrKG1fZnJhbWUgPyAmbV9mcmFtZS0+YW5pbWF0aW9uKCkgOiBudWxscHRyKTsK ICAgICByZWNhbGNTdHlsZShTdHlsZTo6Tm9DaGFuZ2UpOwogfQogCg== 243303 2014-12-15 12:03:39 -0800 2014-12-15 12:07:38 -0800 Patch bug-136410-20141215120427.patch text/plain 16324 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3Mjg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzE5N2YzNWYwOWYzY2Nk YjZkZjJiOTViMjMxMzNmNmEyYmI1MGE1YS4uZTBiODI5NjUwOTc5ODNhZjJmMjNkYzEzMjVmNjdl MmEzMjczZmIzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDc4IEBACisyMDE0LTEyLTEyICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT04g KHIxNjgyMTcpOiBJbWFnZXMgYXJlIGNyb3BwZWQgb3V0IGR1cmluZyBhbmltYXRpb24gYXQgamV0 Ymx1ZS5jb20KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEzNjQxMAorICAgICAgICByZGFyOi8vcHJvYmxlbS8xODE4ODUzMworCisgICAgICAgIFJldmll d2VkIGJ5IERlYW4gSmFja3Nvbi4KKyAgICAgICAgCisgICAgICAgIER1cmluZyBHcmFwaGljc0xh eWVyIGZsdXNoaW5nLCBmb3IgdGlsZWQgbGF5ZXJzIHdlIGNhbiBjb21wdXRlIGEgdmlzaWJsZSBy ZWN0IHVzaW5nCisgICAgICAgIHRoZSBjdXJyZW50IHN0YXRlIG9mIGFuIGFuaW1hdGlvbiwgd2hp Y2ggaXMgb2J0YWluZWQgdmlhIHRoZSBBbmltYXRpb25Db250cm9sbGVyLgorICAgICAgICBJZiB0 aGF0IGFuaW1hdGlvbiB3YXMgcnVubmluZyBpbiBhIHN1YmZyYW1lLCBBbmltYXRpb25Db250cm9s bGVyIGNvdWxkIHVzZSBhIHN0YWxlCisgICAgICAgIGJlZ2luQW5pbWF0aW9uVXBkYXRlVGltZSBz aW5jZSBuby1vbmUgY2FsbGVkIGl0cyBiZWdpbkFuaW1hdGlvblVwZGF0ZSgpLiBUaGF0CisgICAg ICAgIHJlc3VsdGVkIGluIGFuIGluY29ycmVjdCBjb21wdXRhdGlvbiBvZiB0aGUgdmlzaWJsZSBy ZWN0LCByZXN1bHRpbmcgaW4gbWlzc2luZyB0aWxlcy4KKyAgICAgICAgCisgICAgICAgIFRoZXJl IGFyZSB0d28gcGFydHMgdG8gdGhpcyBmaXguIEZpcnN0LCBhZGQgYW4gYXNzZXJ0aW9uIHRoYXQg YmVnaW5BbmltYXRpb25VcGRhdGVUaW1lKCkKKyAgICAgICAgaXMgYmVpbmcgY2FsbGVkIGluc2lk ZSBhbiBhbmltYXRpb24gdXBkYXRlIGJsb2NrLiBUaGlzIHJlcXVpcmVkIG1vdmluZyBtX2JlZ2lu QW5pbWF0aW9uVXBkYXRlQ291bnQKKyAgICAgICAgaW50byBBbmltYXRpb25Db250cm9sbGVyUHJp dmF0ZSwgYW5kIGNoYW5nZXMgdG8gZW5kQW5pbWF0aW9uVXBkYXRlKCkuCisgICAgICAgIAorICAg ICAgICBUaGUgc2Vjb25kIGlzIGFkZGluZyBhIEFuaW1hdGlvblVwZGF0ZUJsb2NrIHRvIGdldEFu aW1hdGVkU3R5bGVGb3JSZW5kZXJlcigpLCB3aGljaAorICAgICAgICBjYW4gYmUgY2FsbGVkIG91 dHNpZGUgb2Ygc3R5bGUgcmVzb2x1dGlvbi4gV2UgYWxzbyBuZWVkIHNvbWUgaW4gb3RoZXIgQVBJ IGZ1bmN0aW9ucy4KKyAgICAgICAgCisgICAgICAgIFRlc3RpbmcgcmV2ZWFsZWQgdGhhdCBsYXlv dXQgY2FuIGNhbGwgdmlhIGxheW91dE92ZXJmbG93UmVjdEZvclByb3BhZ2F0aW9uKCksIHN1Z2dl c3RpbmcKKyAgICAgICAgdGhhdCB3ZSBzaG91bGQgaGF2ZSBhbiBhbmltYXRpb24gYmF0Y2ggaW5z aWRlIEZyYW1lVmlldzo6bGF5b3V0KCkuIEluIGFkZGl0aW9uLCBhIHNpbmdsZQorICAgICAgICBy ZXNvbHZlU3R5bGUvbGF5b3V0IHNob3VsZCB1c2UgdGhlIHNhbWUgYW5pbWF0aW9uQmVnaW5UaW1l LCBzbyB3ZSBhZGQgYSBiYXRjaCB0byAKKyAgICAgICAgdXBkYXRlTGF5b3V0QW5kU3R5bGVJZk5l ZWRlZFJlY3Vyc2l2ZSgpLgorICAgICAgICAKKyAgICAgICAgSWRlbnRpY2FsIHRvIHRoZSBwYXRj aCB0aGF0IHdhcyByb2xsZWQgb3V0IGluIHIxNzcyNjkgd2l0aCB0aGUgYWRkaXRpb24gb2YgYSAK KyAgICAgICAgUmVmPEZyYW1lPiBwcm90ZWN0b3IobV9mcmFtZSkgaW4gQW5pbWF0aW9uQ29udHJv bGxlclByaXZhdGU6OmFuaW1hdGlvblRpbWVyRmlyZWQoKQorICAgICAgICB0aGF0IGVuc3VyZXMg dGhhdCB0aGUgQW5pbWF0aW9uQ29udHJvbGxlclByaXZhdGUgaXMga2VwdCBhbGl2ZSBmb3IgdGhl IHNjb3BlIG9mCisgICAgICAgIHRoZSBBbmltYXRpb25Qcml2YXRlVXBkYXRlQmxvY2ssIHdoZW4g YSB0cmFuc2l0aW9uRW5kIGV2ZW50IGRlc3Ryb3lzIGFuIGlmcmFtZS4KKyAgICAgICAgCisgICAg ICAgIE5vIHRlc3QgYmVjYXVzZSBpdCdzIHRpbWluZy1kZXBlbmRlbnQuIEV4aXN0aW5nIHRlc3Rz IGV4ZXJjaXNlIHRoZSBuZXcgYXNzZXJ0aW9uLgorCisgICAgICAgICogY3NzL0NTU0NvbXB1dGVk U3R5bGVEZWNsYXJhdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjb21wdXRlUmVuZGVyU3R5 bGVGb3JQcm9wZXJ0eSk6CisgICAgICAgICogcGFnZS9GcmFtZVZpZXcuY3BwOgorICAgICAgICAo V2ViQ29yZTo6RnJhbWVWaWV3OjpsYXlvdXQpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3 Ojp1cGRhdGVMYXlvdXRBbmRTdHlsZUlmTmVlZGVkUmVjdXJzaXZlKToKKyAgICAgICAgKiBwYWdl L2FuaW1hdGlvbi9BbmltYXRpb25Db250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFu aW1hdGlvblByaXZhdGVVcGRhdGVCbG9jazo6QW5pbWF0aW9uUHJpdmF0ZVVwZGF0ZUJsb2NrKToK KyAgICAgICAgKFdlYkNvcmU6OkFuaW1hdGlvblByaXZhdGVVcGRhdGVCbG9jazo6fkFuaW1hdGlv blByaXZhdGVVcGRhdGVCbG9jayk6CisgICAgICAgIChXZWJDb3JlOjpBbmltYXRpb25Db250cm9s bGVyUHJpdmF0ZTo6QW5pbWF0aW9uQ29udHJvbGxlclByaXZhdGUpOgorICAgICAgICAoV2ViQ29y ZTo6QW5pbWF0aW9uQ29udHJvbGxlclByaXZhdGU6OmFuaW1hdGlvblRpbWVyRmlyZWQpOgorICAg ICAgICAoV2ViQ29yZTo6QW5pbWF0aW9uQ29udHJvbGxlclByaXZhdGU6OnN1c3BlbmRBbmltYXRp b25zRm9yRG9jdW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6QW5pbWF0aW9uQ29udHJvbGxlclBy aXZhdGU6OnJlc3VtZUFuaW1hdGlvbnNGb3JEb2N1bWVudCk6CisgICAgICAgIChXZWJDb3JlOjpB bmltYXRpb25Db250cm9sbGVyUHJpdmF0ZTo6YmVnaW5BbmltYXRpb25VcGRhdGVUaW1lKToKKyAg ICAgICAgKFdlYkNvcmU6OkFuaW1hdGlvbkNvbnRyb2xsZXJQcml2YXRlOjpiZWdpbkFuaW1hdGlv blVwZGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpBbmltYXRpb25Db250cm9sbGVyUHJpdmF0ZTo6 ZW5kQW5pbWF0aW9uVXBkYXRlKToKKyAgICAgICAgKFdlYkNvcmU6OkFuaW1hdGlvbkNvbnRyb2xs ZXJQcml2YXRlOjpnZXRBbmltYXRlZFN0eWxlRm9yUmVuZGVyZXIpOgorICAgICAgICAoV2ViQ29y ZTo6QW5pbWF0aW9uQ29udHJvbGxlcjo6QW5pbWF0aW9uQ29udHJvbGxlcik6CisgICAgICAgIChX ZWJDb3JlOjpBbmltYXRpb25Db250cm9sbGVyOjpub3RpZnlBbmltYXRpb25TdGFydGVkKToKKyAg ICAgICAgKFdlYkNvcmU6OkFuaW1hdGlvbkNvbnRyb2xsZXI6OnBhdXNlQW5pbWF0aW9uQXRUaW1l KToKKyAgICAgICAgKFdlYkNvcmU6OkFuaW1hdGlvbkNvbnRyb2xsZXI6OnBhdXNlVHJhbnNpdGlv bkF0VGltZSk6CisgICAgICAgIChXZWJDb3JlOjpBbmltYXRpb25Db250cm9sbGVyOjpyZXN1bWVB bmltYXRpb25zRm9yRG9jdW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6QW5pbWF0aW9uQ29udHJv bGxlcjo6c3RhcnRBbmltYXRpb25zSWZOb3RTdXNwZW5kZWQpOgorICAgICAgICAoV2ViQ29yZTo6 QW5pbWF0aW9uQ29udHJvbGxlcjo6YmVnaW5BbmltYXRpb25VcGRhdGUpOgorICAgICAgICAoV2Vi Q29yZTo6QW5pbWF0aW9uQ29udHJvbGxlcjo6ZW5kQW5pbWF0aW9uVXBkYXRlKToKKyAgICAgICAg KiBwYWdlL2FuaW1hdGlvbi9BbmltYXRpb25Db250cm9sbGVyLmg6CisgICAgICAgICogcGFnZS9h bmltYXRpb24vQW5pbWF0aW9uQ29udHJvbGxlclByaXZhdGUuaDoKKworMjAxNC0xMi0xMiAgU2lt b24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9O IChyMTY4MjE3KTogSW1hZ2VzIGFyZSBjcm9wcGVkIG91dCBkdXJpbmcgYW5pbWF0aW9uIGF0IGpl dGJsdWUuY29tCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMzY0MTAKKworICAgICAgICBSZXZpZXdlZCBieSBEZWFuIEphY2tzb24uCisKKyAgICAgICAg V2Ugd2VyZSBoaXR0aW5nIHRoZSBuZXcgYXNzZXJ0aW9uIHVuZGVyIFBhZ2U6OnNldFBhZ2VTY2Fs ZUZhY3RvcigpLCB3aGljaAorICAgICAgICBjYWxscyByZWNhbGNTdHlsZSgpLCBzbyBtb3ZlIHRo ZSBBbmltYXRpb25VcGRhdGVCbG9jayBmcm9tIHVwZGF0ZVN0eWxlSWZOZWVkZWQoKQorICAgICAg ICB0byByZWNhbGNTdHlsZSgpLgorCisgICAgICAgICogZG9tL0RvY3VtZW50LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkRvY3VtZW50OjpyZWNhbGNTdHlsZSk6CisgICAgICAgIChXZWJDb3JlOjpE b2N1bWVudDo6dXBkYXRlU3R5bGVJZk5lZWRlZCk6CisKIDIwMTQtMTItMTUgIE9saXZlciBIdW50 ICA8b2xpdmVyQGFwcGxlLmNvbT4KIAogICAgICAgICBNYWtlIHN1cmUgcmFuZ2UgYmFzZWQgaXRl cmF0aW9uIG9mIFZlY3Rvcjw+IHN0aWxsIHJlY2VpdmVzIGJvdW5kcyBjaGVja2luZwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcAppbmRl eCA0OGE4ZDg1YWVhZTUxMzIyNjNiY2IyMTYxZjJiMmQyZWNjYzBjNzE3Li5hNjg3MmZmNWU0ZjQ2 ODJjNWZkODE1NGViYTg4Yjk4YWM1OWYzMzcyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9j c3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9j c3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcApAQCAtMTcwNSw3ICsxNzA1LDYgQEAg c3RhdGljIGlubGluZSBQYXNzUmVmUHRyPFJlbmRlclN0eWxlPiBjb21wdXRlUmVuZGVyU3R5bGVG b3JQcm9wZXJ0eShOb2RlKiBzdHlsZWQKICAgICBSZW5kZXJPYmplY3QqIHJlbmRlcmVyID0gc3R5 bGVkTm9kZS0+cmVuZGVyZXIoKTsKIAogICAgIGlmIChyZW5kZXJlciAmJiByZW5kZXJlci0+aXND b21wb3NpdGVkKCkgJiYgQW5pbWF0aW9uQ29udHJvbGxlcjo6c3VwcG9ydHNBY2NlbGVyYXRlZEFu aW1hdGlvbk9mUHJvcGVydHkocHJvcGVydHlJRCkpIHsKLSAgICAgICAgQW5pbWF0aW9uVXBkYXRl QmxvY2sgYW5pbWF0aW9uVXBkYXRlQmxvY2soJnJlbmRlcmVyLT5hbmltYXRpb24oKSk7CiAgICAg ICAgIFJlZlB0cjxSZW5kZXJTdHlsZT4gc3R5bGUgPSByZW5kZXJlci0+YW5pbWF0aW9uKCkuZ2V0 QW5pbWF0ZWRTdHlsZUZvclJlbmRlcmVyKGRvd25jYXN0PFJlbmRlckVsZW1lbnQ+KCpyZW5kZXJl cikpOwogICAgICAgICBpZiAocHNldWRvRWxlbWVudFNwZWNpZmllciAmJiAhc3R5bGVkTm9kZS0+ aXNQc2V1ZG9FbGVtZW50KCkpIHsKICAgICAgICAgICAgIC8vIEZJWE1FOiBUaGlzIGNhY2hlZCBw c2V1ZG8gc3R5bGUgd2lsbCBvbmx5IGV4aXN0IGlmIHRoZSBhbmltYXRpb24gaGFzIGJlZW4gcnVu IGF0IGxlYXN0IG9uY2UuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQu Y3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAppbmRleCA2MzM3MzdmNzk2OTQ5 OWE4M2Q0NTE4MWQwNTcyN2UzMGUzZDEwYjM4Li5kNjQ2ODA2ODA5ZGM1MWY2NWUyZTdiYzA1YmU1 MzYxMTljYWJlZjg1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKQEAgLTE3NjUsNiArMTc2NSw3 IEBAIHZvaWQgRG9jdW1lbnQ6OnJlY2FsY1N0eWxlKFN0eWxlOjpDaGFuZ2UgY2hhbmdlKQogICAg ICAgICByZXR1cm47IC8vIEd1YXJkIGFnYWluc3QgcmUtZW50cmFuY3kuIC1kd2gKIAogICAgIFJl bmRlclZpZXc6OlJlcGFpbnRSZWdpb25BY2N1bXVsYXRvciByZXBhaW50UmVnaW9uQWNjdW11bGF0 b3IocmVuZGVyVmlldygpKTsKKyAgICBBbmltYXRpb25VcGRhdGVCbG9jayBhbmltYXRpb25VcGRh dGVCbG9jaygmbV9mcmFtZS0+YW5pbWF0aW9uKCkpOwogCiAgICAgLy8gRklYTUU6IFdlIHNob3Vs ZCB1cGRhdGUgc3R5bGUgb24gb3VyIGFuY2VzdG9yIGNoYWluIGJlZm9yZSBwcm9jZWVkaW5nIChl c3BlY2lhbGx5IGZvciBzZWFtbGVzcyksCiAgICAgLy8gaG93ZXZlciBkb2luZyBzbyBjdXJyZW50 bHkgY2F1c2VzIHNldmVyYWwgdGVzdHMgdG8gY3Jhc2gsIGFzIEZyYW1lOjpzZXREb2N1bWVudCBj YWxscyBEb2N1bWVudDo6YXR0YWNoCkBAIC0xODM3LDcgKzE4MzgsNiBAQCB2b2lkIERvY3VtZW50 Ojp1cGRhdGVTdHlsZUlmTmVlZGVkKCkKICAgICBpZiAoKCFtX3BlbmRpbmdTdHlsZVJlY2FsY1No b3VsZEZvcmNlICYmICFjaGlsZE5lZWRzU3R5bGVSZWNhbGMoKSkgfHwgaW5QYWdlQ2FjaGUoKSkK ICAgICAgICAgcmV0dXJuOwogCi0gICAgQW5pbWF0aW9uVXBkYXRlQmxvY2sgYW5pbWF0aW9uVXBk YXRlQmxvY2sobV9mcmFtZSA/ICZtX2ZyYW1lLT5hbmltYXRpb24oKSA6IG51bGxwdHIpOwogICAg IHJlY2FsY1N0eWxlKFN0eWxlOjpOb0NoYW5nZSk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3 LmNwcAppbmRleCA4MTE3MTYxMjc5ZDk1OTA3NzU4YWNlMzBkZDFkOGJjYzJkOWE0YzliLi4wYjZh YjhlYWVkOTdjMTg3NWQ3NWFkZDUyNGFiMDgzMDBmNWMxOGIxIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFt ZVZpZXcuY3BwCkBAIC0xMTUzLDcgKzExNTMsOCBAQCB2b2lkIEZyYW1lVmlldzo6bGF5b3V0KGJv b2wgYWxsb3dTdWJ0cmVlKQogICAgICAgICByZXR1cm47CiAKICAgICBJbnNwZWN0b3JJbnN0cnVt ZW50YXRpb25Db29raWUgY29va2llID0gSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjp3aWxsTGF5 b3V0KCZmcmFtZSgpKTsKLQorICAgIEFuaW1hdGlvblVwZGF0ZUJsb2NrIGFuaW1hdGlvblVwZGF0 ZUJsb2NrKCZmcmFtZSgpLmFuaW1hdGlvbigpKTsKKyAgICAKICAgICBpZiAoIWFsbG93U3VidHJl ZSAmJiBtX2xheW91dFJvb3QpIHsKICAgICAgICAgbV9sYXlvdXRSb290LT5tYXJrQ29udGFpbmlu Z0Jsb2Nrc0ZvckxheW91dChmYWxzZSk7CiAgICAgICAgIG1fbGF5b3V0Um9vdCA9IDA7CkBAIC0z OTM4LDYgKzM5MzksOCBAQCB2b2lkIEZyYW1lVmlldzo6dXBkYXRlTGF5b3V0QW5kU3R5bGVJZk5l ZWRlZFJlY3Vyc2l2ZSgpCiAgICAgLy8gcmVnaW9uIGJ1dCB0aGVuIGJlY29tZSBpbmNsdWRlZCBs YXRlciBieSB0aGUgc2Vjb25kIGZyYW1lIGFkZGluZyByZWN0cyB0byB0aGUgZGlydHkgcmVnaW9u CiAgICAgLy8gd2hlbiBpdCBsYXlzIG91dC4KIAorICAgIEFuaW1hdGlvblVwZGF0ZUJsb2NrIGFu aW1hdGlvblVwZGF0ZUJsb2NrKCZmcmFtZSgpLmFuaW1hdGlvbigpKTsKKwogICAgIGZyYW1lKCku ZG9jdW1lbnQoKS0+dXBkYXRlU3R5bGVJZk5lZWRlZCgpOwogCiAgICAgaWYgKG5lZWRzTGF5b3V0 KCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9BbmltYXRpb25D b250cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0FuaW1hdGlvbkNv bnRyb2xsZXIuY3BwCmluZGV4IGJjNDkwNDc1YzkyYmNkY2RiOGUxMzdhODNkMjBkZTllYWM2ZGVl YTkuLjUwNTg3ZTFmM2E0NDZiYTU4ZmEyZGJiZmZhZTVkMzY5ZThiMWM0ZWQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0FuaW1hdGlvbkNvbnRyb2xsZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0FuaW1hdGlvbkNvbnRyb2xsZXIuY3Bw CkBAIC01MSw2ICs1MSwyMiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiBzdGF0aWMgY29uc3QgZG91 YmxlIGNBbmltYXRpb25UaW1lckRlbGF5ID0gMC4wMjU7CiBzdGF0aWMgY29uc3QgZG91YmxlIGNC ZWdpbkFuaW1hdGlvblVwZGF0ZVRpbWVOb3RTZXQgPSAtMTsKIAorY2xhc3MgQW5pbWF0aW9uUHJp dmF0ZVVwZGF0ZUJsb2NrIHsKK3B1YmxpYzoKKyAgICBBbmltYXRpb25Qcml2YXRlVXBkYXRlQmxv Y2soQW5pbWF0aW9uQ29udHJvbGxlclByaXZhdGUmIGFuaW1hdGlvbkNvbnRyb2xsZXIpCisgICAg ICAgIDogbV9hbmltYXRpb25Db250cm9sbGVyKGFuaW1hdGlvbkNvbnRyb2xsZXIpCisgICAgewor ICAgICAgICBtX2FuaW1hdGlvbkNvbnRyb2xsZXIuYmVnaW5BbmltYXRpb25VcGRhdGUoKTsKKyAg ICB9CisgICAgCisgICAgfkFuaW1hdGlvblByaXZhdGVVcGRhdGVCbG9jaygpCisgICAgeworICAg ICAgICBtX2FuaW1hdGlvbkNvbnRyb2xsZXIuZW5kQW5pbWF0aW9uVXBkYXRlKCk7CisgICAgfQor ICAgIAorICAgIEFuaW1hdGlvbkNvbnRyb2xsZXJQcml2YXRlJiBtX2FuaW1hdGlvbkNvbnRyb2xs ZXI7Cit9OworCiBBbmltYXRpb25Db250cm9sbGVyUHJpdmF0ZTo6QW5pbWF0aW9uQ29udHJvbGxl clByaXZhdGUoRnJhbWUmIGZyYW1lKQogICAgIDogbV9hbmltYXRpb25UaW1lcigqdGhpcywgJkFu aW1hdGlvbkNvbnRyb2xsZXJQcml2YXRlOjphbmltYXRpb25UaW1lckZpcmVkKQogICAgICwgbV91 cGRhdGVTdHlsZUlmTmVlZGVkRGlzcGF0Y2hlcigqdGhpcywgJkFuaW1hdGlvbkNvbnRyb2xsZXJQ cml2YXRlOjp1cGRhdGVTdHlsZUlmTmVlZGVkRGlzcGF0Y2hlckZpcmVkKQpAQCAtNTgsNiArNzQs NyBAQCBBbmltYXRpb25Db250cm9sbGVyUHJpdmF0ZTo6QW5pbWF0aW9uQ29udHJvbGxlclByaXZh dGUoRnJhbWUmIGZyYW1lKQogICAgICwgbV9iZWdpbkFuaW1hdGlvblVwZGF0ZVRpbWUoY0JlZ2lu QW5pbWF0aW9uVXBkYXRlVGltZU5vdFNldCkKICAgICAsIG1fYW5pbWF0aW9uc1dhaXRpbmdGb3JT dHlsZSgpCiAgICAgLCBtX2FuaW1hdGlvbnNXYWl0aW5nRm9yU3RhcnRUaW1lUmVzcG9uc2UoKQor ICAgICwgbV9iZWdpbkFuaW1hdGlvblVwZGF0ZUNvdW50KDApCiAgICAgLCBtX3dhaXRpbmdGb3JB c3luY1N0YXJ0Tm90aWZpY2F0aW9uKGZhbHNlKQogICAgICwgbV9pc1N1c3BlbmRlZChmYWxzZSkK ICAgICAsIG1fYWxsb3dzTmV3QW5pbWF0aW9uc1doaWxlU3VzcGVuZGVkKGZhbHNlKQpAQCAtMjI4 LDkgKzI0NSwxMiBAQCB2b2lkIEFuaW1hdGlvbkNvbnRyb2xsZXJQcml2YXRlOjphbmltYXRpb25G cmFtZUNhbGxiYWNrRmlyZWQoKQogCiB2b2lkIEFuaW1hdGlvbkNvbnRyb2xsZXJQcml2YXRlOjph bmltYXRpb25UaW1lckZpcmVkKCkKIHsKKyAgICAvLyBXZSBuZWVkIHRvIGtlZXAgdGhlIGZyYW1l IGFsaXZlLCBzaW5jZSBpdCBvd25zIHVzLgorICAgIFJlZjxGcmFtZT4gcHJvdGVjdG9yKG1fZnJh bWUpOworCiAgICAgLy8gTWFrZSBzdXJlIGFuaW1hdGlvblVwZGF0ZVRpbWUgaXMgdXBkYXRlZCwg c28gdGhhdCBpdCBpcyBjdXJyZW50IGV2ZW4gaWYgbm8KICAgICAvLyBzdHlsZUNoYW5nZSBoYXMg aGFwcGVuZWQgKGUuZy4gYWNjZWxlcmF0ZWQgYW5pbWF0aW9ucykKLSAgICBzZXRCZWdpbkFuaW1h dGlvblVwZGF0ZVRpbWUoY0JlZ2luQW5pbWF0aW9uVXBkYXRlVGltZU5vdFNldCk7CisgICAgQW5p bWF0aW9uUHJpdmF0ZVVwZGF0ZUJsb2NrIHVwZGF0ZUJsb2NrKCp0aGlzKTsKIAogICAgIC8vIFdo ZW4gdGhlIHRpbWVyIGZpcmVzLCBhbGwgd2UgZG8gaXMgY2FsbCBzZXRDaGFuZ2VkIG9uIGFsbCBE T00gbm9kZXMgd2l0aCBydW5uaW5nIGFuaW1hdGlvbnMgYW5kIHRoZW4gZG8gYW4gaW1tZWRpYXRl CiAgICAgLy8gdXBkYXRlU3R5bGVJZk5lZWRlZC4gIEl0IHdpbGwgdGhlbiBjYWxsIGJhY2sgdG8g dXMgd2l0aCBuZXcgaW5mb3JtYXRpb24uCkBAIC0yODcsNyArMzA3LDcgQEAgdm9pZCBBbmltYXRp b25Db250cm9sbGVyUHJpdmF0ZTo6cmVzdW1lQW5pbWF0aW9ucygpCiAKIHZvaWQgQW5pbWF0aW9u Q29udHJvbGxlclByaXZhdGU6OnN1c3BlbmRBbmltYXRpb25zRm9yRG9jdW1lbnQoRG9jdW1lbnQq IGRvY3VtZW50KQogewotICAgIHNldEJlZ2luQW5pbWF0aW9uVXBkYXRlVGltZShjQmVnaW5Bbmlt YXRpb25VcGRhdGVUaW1lTm90U2V0KTsKKyAgICBBbmltYXRpb25Qcml2YXRlVXBkYXRlQmxvY2sg dXBkYXRlQmxvY2soKnRoaXMpOwogCiAgICAgZm9yIChhdXRvIGl0ID0gbV9jb21wb3NpdGVBbmlt YXRpb25zLmJlZ2luKCksIGVuZCA9IG1fY29tcG9zaXRlQW5pbWF0aW9ucy5lbmQoKTsgaXQgIT0g ZW5kOyArK2l0KSB7CiAgICAgICAgIGlmICgmaXQtPmtleS0+ZG9jdW1lbnQoKSA9PSBkb2N1bWVu dCkKQEAgLTI5OSw3ICszMTksNyBAQCB2b2lkIEFuaW1hdGlvbkNvbnRyb2xsZXJQcml2YXRlOjpz dXNwZW5kQW5pbWF0aW9uc0ZvckRvY3VtZW50KERvY3VtZW50KiBkb2N1bWVudAogCiB2b2lkIEFu aW1hdGlvbkNvbnRyb2xsZXJQcml2YXRlOjpyZXN1bWVBbmltYXRpb25zRm9yRG9jdW1lbnQoRG9j dW1lbnQqIGRvY3VtZW50KQogewotICAgIHNldEJlZ2luQW5pbWF0aW9uVXBkYXRlVGltZShjQmVn aW5BbmltYXRpb25VcGRhdGVUaW1lTm90U2V0KTsKKyAgICBBbmltYXRpb25Qcml2YXRlVXBkYXRl QmxvY2sgdXBkYXRlQmxvY2soKnRoaXMpOwogCiAgICAgZm9yIChhdXRvIGl0ID0gbV9jb21wb3Np dGVBbmltYXRpb25zLmJlZ2luKCksIGVuZCA9IG1fY29tcG9zaXRlQW5pbWF0aW9ucy5lbmQoKTsg aXQgIT0gZW5kOyArK2l0KSB7CiAgICAgICAgIGlmICgmaXQtPmtleS0+ZG9jdW1lbnQoKSA9PSBk b2N1bWVudCkKQEAgLTM1MiwxNiArMzcyLDI5IEBAIGJvb2wgQW5pbWF0aW9uQ29udHJvbGxlclBy aXZhdGU6OnBhdXNlVHJhbnNpdGlvbkF0VGltZShSZW5kZXJFbGVtZW50KiByZW5kZXJlciwKIAog ZG91YmxlIEFuaW1hdGlvbkNvbnRyb2xsZXJQcml2YXRlOjpiZWdpbkFuaW1hdGlvblVwZGF0ZVRp bWUoKQogeworICAgIEFTU0VSVChtX2JlZ2luQW5pbWF0aW9uVXBkYXRlQ291bnQpOwogICAgIGlm IChtX2JlZ2luQW5pbWF0aW9uVXBkYXRlVGltZSA9PSBjQmVnaW5BbmltYXRpb25VcGRhdGVUaW1l Tm90U2V0KQogICAgICAgICBtX2JlZ2luQW5pbWF0aW9uVXBkYXRlVGltZSA9IG1vbm90b25pY2Fs bHlJbmNyZWFzaW5nVGltZSgpOworCiAgICAgcmV0dXJuIG1fYmVnaW5BbmltYXRpb25VcGRhdGVU aW1lOwogfQogCit2b2lkIEFuaW1hdGlvbkNvbnRyb2xsZXJQcml2YXRlOjpiZWdpbkFuaW1hdGlv blVwZGF0ZSgpCit7CisgICAgaWYgKCFtX2JlZ2luQW5pbWF0aW9uVXBkYXRlQ291bnQpCisgICAg ICAgIHNldEJlZ2luQW5pbWF0aW9uVXBkYXRlVGltZShjQmVnaW5BbmltYXRpb25VcGRhdGVUaW1l Tm90U2V0KTsKKyAgICArK21fYmVnaW5BbmltYXRpb25VcGRhdGVDb3VudDsKK30KKwogdm9pZCBB bmltYXRpb25Db250cm9sbGVyUHJpdmF0ZTo6ZW5kQW5pbWF0aW9uVXBkYXRlKCkKIHsKLSAgICBz dHlsZUF2YWlsYWJsZSgpOwotICAgIGlmICghbV93YWl0aW5nRm9yQXN5bmNTdGFydE5vdGlmaWNh dGlvbikKLSAgICAgICAgc3RhcnRUaW1lUmVzcG9uc2UoYmVnaW5BbmltYXRpb25VcGRhdGVUaW1l KCkpOworICAgIEFTU0VSVChtX2JlZ2luQW5pbWF0aW9uVXBkYXRlQ291bnQgPiAwKTsKKyAgICBp ZiAobV9iZWdpbkFuaW1hdGlvblVwZGF0ZUNvdW50ID09IDEpIHsKKyAgICAgICAgc3R5bGVBdmFp bGFibGUoKTsKKyAgICAgICAgaWYgKCFtX3dhaXRpbmdGb3JBc3luY1N0YXJ0Tm90aWZpY2F0aW9u KQorICAgICAgICAgICAgc3RhcnRUaW1lUmVzcG9uc2UoYmVnaW5BbmltYXRpb25VcGRhdGVUaW1l KCkpOworICAgIH0KKyAgICAtLW1fYmVnaW5BbmltYXRpb25VcGRhdGVDb3VudDsKIH0KIAogdm9p ZCBBbmltYXRpb25Db250cm9sbGVyUHJpdmF0ZTo6cmVjZWl2ZWRTdGFydFRpbWVSZXNwb25zZShk b3VibGUgdGltZSkKQEAgLTM3Miw2ICs0MDUsOCBAQCB2b2lkIEFuaW1hdGlvbkNvbnRyb2xsZXJQ cml2YXRlOjpyZWNlaXZlZFN0YXJ0VGltZVJlc3BvbnNlKGRvdWJsZSB0aW1lKQogCiBQYXNzUmVm UHRyPFJlbmRlclN0eWxlPiBBbmltYXRpb25Db250cm9sbGVyUHJpdmF0ZTo6Z2V0QW5pbWF0ZWRT dHlsZUZvclJlbmRlcmVyKFJlbmRlckVsZW1lbnQmIHJlbmRlcmVyKQogeworICAgIEFuaW1hdGlv blByaXZhdGVVcGRhdGVCbG9jayBhbmltYXRpb25VcGRhdGVCbG9jaygqdGhpcyk7CisKICAgICBB U1NFUlQocmVuZGVyZXIuaXNDU1NBbmltYXRpbmcoKSk7CiAgICAgQVNTRVJUKG1fY29tcG9zaXRl QW5pbWF0aW9ucy5jb250YWlucygmcmVuZGVyZXIpKTsKICAgICBjb25zdCBDb21wb3NpdGVBbmlt YXRpb24mIHJlbmRlcmVyQW5pbWF0aW9ucyA9ICptX2NvbXBvc2l0ZUFuaW1hdGlvbnMuZ2V0KCZy ZW5kZXJlcik7CkBAIC00NjksNyArNTA0LDYgQEAgdm9pZCBBbmltYXRpb25Db250cm9sbGVyUHJp dmF0ZTo6YW5pbWF0aW9uV2lsbEJlUmVtb3ZlZChBbmltYXRpb25CYXNlKiBhbmltYXRpb24KIAog QW5pbWF0aW9uQ29udHJvbGxlcjo6QW5pbWF0aW9uQ29udHJvbGxlcihGcmFtZSYgZnJhbWUpCiAg ICAgOiBtX2RhdGEoc3RkOjptYWtlX3VuaXF1ZTxBbmltYXRpb25Db250cm9sbGVyUHJpdmF0ZT4o ZnJhbWUpKQotICAgICwgbV9iZWdpbkFuaW1hdGlvblVwZGF0ZUNvdW50KDApCiB7CiB9CiAKQEAg LTU0NSwxMSArNTc5LDEzIEBAIFBhc3NSZWZQdHI8UmVuZGVyU3R5bGU+IEFuaW1hdGlvbkNvbnRy b2xsZXI6OmdldEFuaW1hdGVkU3R5bGVGb3JSZW5kZXJlcihSZW5kZXJFCiAKIHZvaWQgQW5pbWF0 aW9uQ29udHJvbGxlcjo6bm90aWZ5QW5pbWF0aW9uU3RhcnRlZChSZW5kZXJFbGVtZW50JiwgZG91 YmxlIHN0YXJ0VGltZSkKIHsKKyAgICBBbmltYXRpb25VcGRhdGVCbG9jayBhbmltYXRpb25VcGRh dGVCbG9jayh0aGlzKTsKICAgICBtX2RhdGEtPnJlY2VpdmVkU3RhcnRUaW1lUmVzcG9uc2Uoc3Rh cnRUaW1lKTsKIH0KIAogYm9vbCBBbmltYXRpb25Db250cm9sbGVyOjpwYXVzZUFuaW1hdGlvbkF0 VGltZShSZW5kZXJFbGVtZW50KiByZW5kZXJlciwgY29uc3QgQXRvbWljU3RyaW5nJiBuYW1lLCBk b3VibGUgdCkKIHsKKyAgICBBbmltYXRpb25VcGRhdGVCbG9jayBhbmltYXRpb25VcGRhdGVCbG9j ayh0aGlzKTsKICAgICByZXR1cm4gbV9kYXRhLT5wYXVzZUFuaW1hdGlvbkF0VGltZShyZW5kZXJl ciwgbmFtZSwgdCk7CiB9CiAKQEAgLTU2MCw2ICs1OTYsNyBAQCB1bnNpZ25lZCBBbmltYXRpb25D b250cm9sbGVyOjpudW1iZXJPZkFjdGl2ZUFuaW1hdGlvbnMoRG9jdW1lbnQqIGRvY3VtZW50KSBj b25zdAogCiBib29sIEFuaW1hdGlvbkNvbnRyb2xsZXI6OnBhdXNlVHJhbnNpdGlvbkF0VGltZShS ZW5kZXJFbGVtZW50KiByZW5kZXJlciwgY29uc3QgU3RyaW5nJiBwcm9wZXJ0eSwgZG91YmxlIHQp CiB7CisgICAgQW5pbWF0aW9uVXBkYXRlQmxvY2sgYW5pbWF0aW9uVXBkYXRlQmxvY2sodGhpcyk7 CiAgICAgcmV0dXJuIG1fZGF0YS0+cGF1c2VUcmFuc2l0aW9uQXRUaW1lKHJlbmRlcmVyLCBwcm9w ZXJ0eSwgdCk7CiB9CiAKQEAgLTYxNiwyOCArNjUzLDI2IEBAIHZvaWQgQW5pbWF0aW9uQ29udHJv bGxlcjo6c3VzcGVuZEFuaW1hdGlvbnNGb3JEb2N1bWVudChEb2N1bWVudCogZG9jdW1lbnQpCiB2 b2lkIEFuaW1hdGlvbkNvbnRyb2xsZXI6OnJlc3VtZUFuaW1hdGlvbnNGb3JEb2N1bWVudChEb2N1 bWVudCogZG9jdW1lbnQpCiB7CiAgICAgTE9HKEFuaW1hdGlvbnMsICJyZXN1bWluZyBhbmltYXRp b25zIGZvciBkb2N1bWVudCAlcCIsIGRvY3VtZW50KTsKKyAgICBBbmltYXRpb25VcGRhdGVCbG9j ayBhbmltYXRpb25VcGRhdGVCbG9jayh0aGlzKTsKICAgICBtX2RhdGEtPnJlc3VtZUFuaW1hdGlv bnNGb3JEb2N1bWVudChkb2N1bWVudCk7CiB9CiAKIHZvaWQgQW5pbWF0aW9uQ29udHJvbGxlcjo6 c3RhcnRBbmltYXRpb25zSWZOb3RTdXNwZW5kZWQoRG9jdW1lbnQqIGRvY3VtZW50KQogewogICAg IExPRyhBbmltYXRpb25zLCAiYW5pbWF0aW9ucyBtYXkgc3RhcnQgZm9yIGRvY3VtZW50ICVwIiwg ZG9jdW1lbnQpOworCisgICAgQW5pbWF0aW9uVXBkYXRlQmxvY2sgYW5pbWF0aW9uVXBkYXRlQmxv Y2sodGhpcyk7CiAgICAgbV9kYXRhLT5zdGFydEFuaW1hdGlvbnNJZk5vdFN1c3BlbmRlZChkb2N1 bWVudCk7CiB9CiAKIHZvaWQgQW5pbWF0aW9uQ29udHJvbGxlcjo6YmVnaW5BbmltYXRpb25VcGRh dGUoKQogewotICAgIGlmICghbV9iZWdpbkFuaW1hdGlvblVwZGF0ZUNvdW50KQotICAgICAgICBt X2RhdGEtPnNldEJlZ2luQW5pbWF0aW9uVXBkYXRlVGltZShjQmVnaW5BbmltYXRpb25VcGRhdGVU aW1lTm90U2V0KTsKLSAgICArK21fYmVnaW5BbmltYXRpb25VcGRhdGVDb3VudDsKKyAgICBtX2Rh dGEtPmJlZ2luQW5pbWF0aW9uVXBkYXRlKCk7CiB9CiAKIHZvaWQgQW5pbWF0aW9uQ29udHJvbGxl cjo6ZW5kQW5pbWF0aW9uVXBkYXRlKCkKIHsKLSAgICBBU1NFUlQobV9iZWdpbkFuaW1hdGlvblVw ZGF0ZUNvdW50ID4gMCk7Ci0gICAgLS1tX2JlZ2luQW5pbWF0aW9uVXBkYXRlQ291bnQ7Ci0gICAg aWYgKCFtX2JlZ2luQW5pbWF0aW9uVXBkYXRlQ291bnQpCi0gICAgICAgIG1fZGF0YS0+ZW5kQW5p bWF0aW9uVXBkYXRlKCk7CisgICAgbV9kYXRhLT5lbmRBbmltYXRpb25VcGRhdGUoKTsKIH0KIAog Ym9vbCBBbmltYXRpb25Db250cm9sbGVyOjpzdXBwb3J0c0FjY2VsZXJhdGVkQW5pbWF0aW9uT2ZQ cm9wZXJ0eShDU1NQcm9wZXJ0eUlEIHByb3BlcnR5KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGFnZS9hbmltYXRpb24vQW5pbWF0aW9uQ29udHJvbGxlci5oIGIvU291cmNlL1dlYkNvcmUv cGFnZS9hbmltYXRpb24vQW5pbWF0aW9uQ29udHJvbGxlci5oCmluZGV4IDM5NTgxYTIxODUwNWNk OWZhMDI2OWVmMDhiNzZhNTRiODRkNGVjY2EuLjVlZTMzNzQxZjUzZDYyNWFhYTZmMjZmNzExODZi MGMwMjU0MTFiYWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0Fu aW1hdGlvbkNvbnRyb2xsZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9B bmltYXRpb25Db250cm9sbGVyLmgKQEAgLTgyLDcgKzgyLDYgQEAgcHVibGljOgogCiBwcml2YXRl OgogICAgIGNvbnN0IHN0ZDo6dW5pcXVlX3B0cjxBbmltYXRpb25Db250cm9sbGVyUHJpdmF0ZT4g bV9kYXRhOwotICAgIGludCBtX2JlZ2luQW5pbWF0aW9uVXBkYXRlQ291bnQ7CiB9OwogCiBjbGFz cyBBbmltYXRpb25VcGRhdGVCbG9jayB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L2FuaW1hdGlvbi9BbmltYXRpb25Db250cm9sbGVyUHJpdmF0ZS5oIGIvU291cmNlL1dlYkNvcmUv cGFnZS9hbmltYXRpb24vQW5pbWF0aW9uQ29udHJvbGxlclByaXZhdGUuaAppbmRleCBkYjAyMTcy OWNlNTViMWE5OTM5YTViOWE0NTE2NjFmZjU5ZjIwNjM0Li45OTBhZTg2ZTgzNDFkZTFkYmNmNDFl NmRlYjY4ZDQ3OTg2YjdhOGUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2FuaW1h dGlvbi9BbmltYXRpb25Db250cm9sbGVyUHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvYW5pbWF0aW9uL0FuaW1hdGlvbkNvbnRyb2xsZXJQcml2YXRlLmgKQEAgLTk3LDYgKzk3LDgg QEAgcHVibGljOgogCiAgICAgZG91YmxlIGJlZ2luQW5pbWF0aW9uVXBkYXRlVGltZSgpOwogICAg IHZvaWQgc2V0QmVnaW5BbmltYXRpb25VcGRhdGVUaW1lKGRvdWJsZSB0KSB7IG1fYmVnaW5Bbmlt YXRpb25VcGRhdGVUaW1lID0gdDsgfQorICAgIAorICAgIHZvaWQgYmVnaW5BbmltYXRpb25VcGRh dGUoKTsKICAgICB2b2lkIGVuZEFuaW1hdGlvblVwZGF0ZSgpOwogICAgIHZvaWQgcmVjZWl2ZWRT dGFydFRpbWVSZXNwb25zZShkb3VibGUpOwogICAgIApAQCAtMTQxLDYgKzE0Myw5IEBAIHByaXZh dGU6CiAgICAgdHlwZWRlZiBIYXNoU2V0PFJlZlB0cjxBbmltYXRpb25CYXNlPj4gV2FpdGluZ0Fu aW1hdGlvbnNTZXQ7CiAgICAgV2FpdGluZ0FuaW1hdGlvbnNTZXQgbV9hbmltYXRpb25zV2FpdGlu Z0ZvclN0eWxlOwogICAgIFdhaXRpbmdBbmltYXRpb25zU2V0IG1fYW5pbWF0aW9uc1dhaXRpbmdG b3JTdGFydFRpbWVSZXNwb25zZTsKKworICAgIGludCBtX2JlZ2luQW5pbWF0aW9uVXBkYXRlQ291 bnQ7CisKICAgICBib29sIG1fd2FpdGluZ0ZvckFzeW5jU3RhcnROb3RpZmljYXRpb247CiAgICAg Ym9vbCBtX2lzU3VzcGVuZGVkOwogCg==