97300 2012-09-20 23:52:26 -0700 [Forms] DateTimeEditElement::layout() should take date time format as a parameter 2012-09-21 03:05:49 -0700 1 1 1 Unclassified WebKit Forms 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 97299 1 yosin yosin mifenton tkent webkit.review.bot oldest_to_newest 725204 0 yosin 2012-09-20 23:52:26 -0700 To use DateTimeEditElement other than "time" input type, such as "date", "datetime", "month", or "week", DateTimeEditElement::layout() should take date time format as a parameter instead of calling Localizer::timeFormat(). 725213 1 165059 yosin 2012-09-21 00:07:16 -0700 Created attachment 165059 Patch 1 725214 2 165059 yosin 2012-09-21 00:08:53 -0700 Comment on attachment 165059 Patch 1 Could you review this patch? Thanks in advance. 725272 3 165059 tkent 2012-09-21 01:42:37 -0700 Comment on attachment 165059 Patch 1 View in context: https://bugs.webkit.org/attachment.cgi?id=165059&action=review > Source/WebCore/html/TimeInputType.cpp:311 > + bool const hasValue = parseToDateComponents(element()->value(), &date); We usually put "const" followed by a type name. const bool hasValue ... > Source/WebCore/html/shadow/DateTimeEditElement.cpp:410 > +bool DateTimeEditElement::shouldHaveSecondField(const LayoutParameters& layoutParameters) This should be a member of LayoutParameters. 725329 4 165097 yosin 2012-09-21 02:52:31 -0700 Created attachment 165097 Patch 2 725331 5 165097 yosin 2012-09-21 02:54:05 -0700 Comment on attachment 165097 Patch 2 Could you review this patch? Thanks in advance. = Changes since the last review = * Fix position of "const". * Move shouldHaveSecondField to LayoutParameters. 725334 6 165097 tkent 2012-09-21 02:56:15 -0700 Comment on attachment 165097 Patch 2 ok 725348 7 165097 yosin 2012-09-21 03:05:44 -0700 Comment on attachment 165097 Patch 2 Clearing flags on attachment: 165097 Committed r129206: <http://trac.webkit.org/changeset/129206> 725349 8 yosin 2012-09-21 03:05:49 -0700 All reviewed patches have been landed. Closing bug. 165059 2012-09-21 00:07:16 -0700 2012-09-21 02:52:27 -0700 Patch 1 bug-97300-20120921160640.patch text/plain 12414 yosin U3VidmVyc2lvbiBSZXZpc2lvbjogMTI5MTkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjE5YzJkMjhhNmUxYWYx ZmU3NjA0MGRhNGZmM2E2NWU5ZWIzZDdjNy4uMmQ2ZTg0ODA3ZmQ2OWExNjU3NDE1OGMxMTFmODc4 NjdmMDlkYTg0YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM5IEBACiAyMDEyLTA5LTIwICBZb3No aWZ1bWkgSW5vdWUgIDx5b3NpbkBjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgW0Zvcm1zXSBEYXRl VGltZUVkaXRFbGVtZW50OjpsYXlvdXQoKSBzaG91bGQgdGFrZSBkYXRlIHRpbWUgZm9ybWF0IGFz IGEgcGFyYW1ldGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD05NzMwMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFRoaXMgcGF0Y2ggaW50cm9kdWNlcyBEYXRlVGltZUVkaXRFbGVtZW50OjpMYXlvdXRQYXJh bWV0ZXJzIHN0cnVjdCBmb3IKKyAgICAgICAgcGFzc2luZyBmb3VyIHBhcmFtZXRlcnMgdG8gRGF0 ZVRpbWVFZGl0RWxlbWVudDo6bGF5b3V0KCkgZm9yIHBhc3NpbmcKKyAgICAgICAgZGF0ZSB0aW1l IGZvcm1hdCBmcm9tIGNsaWVudCBvZiBEYXRlVGltZUVkaXRFbGVtZW50IGluc3RlYWQgb2YKKyAg ICAgICAgRGF0ZVRpbWVFZGl0RWxlbWVudDo6bGF5b3V0KCkgdGFrZXMgdGltZSBvciBzaG9ydCB0 aW1lIGZvcm1hdC4KKworICAgICAgICBUaGlzIHBhdGNoIGlzIGEgcGFydCBvZiBwcmVwYXJhdGlv biBvZiBpbnRyb2R1Y2luZyBtdWx0aXBsZSBmaWVsZHMKKyAgICAgICAgZGF0ZS9kYXRldGltZS9t b250aC93ZWVrIGlucHV0IFVJLgorCisgICAgICAgIFRoaXMgcGF0Y2ggYWZmZWN0cyBwb3J0cyB3 aGljaCBlbmFibGUgYm90aCBFTkFCTEVfSU5QVVRfVFlQRV9USU1FIGFuZAorICAgICAgICBFTkFC TEVfSU5QVVRfVFlQRV9USU1FX01VTFRJUExFX0ZJRUxEUy4KKworICAgICAgICBObyBuZXcgdGVz dHMuIFRoaXMgcGF0Y2ggZG9lc24ndCBjaGFuZ2UgYmVoYXZpb3IuCisKKyAgICAgICAgKiBodG1s L1RpbWVJbnB1dFR5cGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VGltZUlucHV0VHlwZTo6dXBk YXRlSW5uZXJUZXh0VmFsdWUpOiBDaGFuZ2VkIHRvIHVzZSBMYXlvdXRQYXJtZXRlcnMuCisgICAg ICAgICogaHRtbC9zaGFkb3cvRGF0ZVRpbWVFZGl0RWxlbWVudC5jcHA6IFJlbW92ZWQgdW5zZXVk IGluY2x1ZGUgZmlsZXMsIExvY2FsaXplZERhdGUuaCBhbmQgTG9jYWxpemVkTnVtYmVyLmguCisg ICAgICAgIChXZWJDb3JlOjpEYXRlVGltZUVkaXRCdWlsZGVyOjpEYXRlVGltZUVkaXRCdWlsZGVy KTogQ2hhbmdlZCBwYXJhbWV0ZXJzLgorICAgICAgICAoV2ViQ29yZTo6RGF0ZVRpbWVFZGl0QnVp bGRlcjo6bmVlZE1pbnV0ZUZpZWxkKTogUmVtb3ZlZCB1bnVzZWQgZnVuY3Rpb24uCisgICAgICAg IChXZWJDb3JlOjpEYXRlVGltZUVkaXRCdWlsZGVyOjpuZWVkU2Vjb25kRmllbGQpOiBNb3ZlZCBp bXBsZW1lbnRlbnRhdGlvbiB0byBEYXRlVGltZUVkaXRFbGVtZW50OjpzaG91bGRIYXZlU2Vjb25k RmllbGQoKS4KKyAgICAgICAgKFdlYkNvcmU6OkRhdGVUaW1lRWRpdEVsZW1lbnQ6OmxheW91dCk6 IENoYW5nZWQgdG8gdGFrZSBMYXlvdXRQYXJhbWV0ZXJzLgorICAgICAgICAoV2ViQ29yZTo6RGF0 ZVRpbWVFZGl0RWxlbWVudDo6c2V0VmFsdWVBc0RhdGUpOiBkaXR0by4KKyAgICAgICAgKFdlYkNv cmU6OkRhdGVUaW1lRWRpdEVsZW1lbnQ6OnNldEVtcHR5VmFsdWUpOiBkaXR0by4KKyAgICAgICAg KFdlYkNvcmU6OkRhdGVUaW1lRWRpdEVsZW1lbnQ6OnNob3VsZEhhdmVTZWNvbmRGaWVsZCk6IE1v dmVkIGZyb20gRGF0ZVRpbWVFZGl0QnVpbGRlcjo6bmVlZFNlY29uZEZpZWxkKCkuCisgICAgICAg ICogaHRtbC9zaGFkb3cvRGF0ZVRpbWVFZGl0RWxlbWVudC5oOgorICAgICAgICAoTGF5b3V0UGFy YW1ldGVycyk6IEFkZGVkIHRvIGJ1bmRsZSBwYXJhbWV0ZXJzIGZvciBsYXlvdXQoKS4KKyAgICAg ICAgKFdlYkNvcmU6OkRhdGVUaW1lRWRpdEVsZW1lbnQ6OkxheW91dFBhcmFtZXRlcnM6OkxheW91 dFBhcmFtZXRlcnMpOiBBZGRlZC4KKworMjAxMi0wOS0yMCAgWW9zaGlmdW1pIElub3VlICA8eW9z aW5AY2hyb21pdW0ub3JnPgorCiAgICAgICAgIFtQbGF0Zm9ybV0gVGhlcmUgYXJlIG1lbW9yeSBs ZWFrIGluIExvY2FsZUlDVQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9OTcyODkKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9UaW1lSW5w dXRUeXBlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvVGltZUlucHV0VHlwZS5jcHAKaW5kZXgg YzE1OTdlY2JiYWJkYzY2ODQ5NzIxODE1NjNkMzBlNjBmYjA1OTEzZi4uNDc1MDFjZjVkMGQ0OWJj OTEyYjg5MmNiMjdmYzJhNDNhYWZjY2UyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRt bC9UaW1lSW5wdXRUeXBlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL1RpbWVJbnB1dFR5 cGUuY3BwCkBAIC00Niw2ICs0Niw3IEBACiAjaW5jbHVkZSAiRWxlbWVudFNoYWRvdy5oIgogI2lu Y2x1ZGUgIkZvcm1Db250cm9sbGVyLmgiCiAjaW5jbHVkZSAiS2V5Ym9hcmRFdmVudC5oIgorI2lu Y2x1ZGUgIkxvY2FsaXplci5oIgogI2luY2x1ZGUgIlNoYWRvd1Jvb3QuaCIKICNlbmRpZgogCkBA IC0zMDQsMTQgKzMwNSwyNSBAQCB2b2lkIFRpbWVJbnB1dFR5cGU6OnVwZGF0ZUlubmVyVGV4dFZh bHVlKCkKICAgICAgICAgcmV0dXJuOwogCiAgICAgTG9jYWxpemVyJiBsb2NhbGl6ZXIgPSBlbGVt ZW50KCktPmRvY3VtZW50KCktPmdldExvY2FsaXplcihlbGVtZW50KCktPmNvbXB1dGVJbmhlcml0 ZWRMYW5ndWFnZSgpKTsKLSAgICBjb25zdCBTdGVwUmFuZ2Ugc3RlcFJhbmdlKGNyZWF0ZVN0ZXBS YW5nZShBbnlJc0RlZmF1bHRTdGVwKSk7CisgICAgRGF0ZVRpbWVFZGl0RWxlbWVudDo6TGF5b3V0 UGFyYW1ldGVycyBsYXlvdXRQYXJhbWV0ZXJzKGxvY2FsaXplciwgY3JlYXRlU3RlcFJhbmdlKEFu eUlzRGVmYXVsdFN0ZXApKTsKKwogICAgIERhdGVDb21wb25lbnRzIGRhdGU7Ci0gICAgaWYgKHBh cnNlVG9EYXRlQ29tcG9uZW50cyhlbGVtZW50KCktPnZhbHVlKCksICZkYXRlKSkKLSAgICAgICAg bV9kYXRlVGltZUVkaXRFbGVtZW50LT5zZXRWYWx1ZUFzRGF0ZShzdGVwUmFuZ2UsIGRhdGUsIGxv Y2FsaXplcik7Ci0gICAgZWxzZSB7Ci0gICAgICAgIHNldE1pbGxpc2Vjb25kVG9EYXRlQ29tcG9u ZW50cyhzdGVwUmFuZ2UubWluaW11bSgpLnRvRG91YmxlKCksICZkYXRlKTsKLSAgICAgICAgbV9k YXRlVGltZUVkaXRFbGVtZW50LT5zZXRFbXB0eVZhbHVlKHN0ZXBSYW5nZSwgZGF0ZSwgbG9jYWxp emVyKTsKKyAgICBib29sIGNvbnN0IGhhc1ZhbHVlID0gcGFyc2VUb0RhdGVDb21wb25lbnRzKGVs ZW1lbnQoKS0+dmFsdWUoKSwgJmRhdGUpOworICAgIGlmICghaGFzVmFsdWUpCisgICAgICAgIHNl dE1pbGxpc2Vjb25kVG9EYXRlQ29tcG9uZW50cyhsYXlvdXRQYXJhbWV0ZXJzLnN0ZXBSYW5nZS5t aW5pbXVtKCkudG9Eb3VibGUoKSwgJmRhdGUpOworCisgICAgaWYgKGRhdGUuc2Vjb25kKCkgfHwg RGF0ZVRpbWVFZGl0RWxlbWVudDo6c2hvdWxkSGF2ZVNlY29uZEZpZWxkKGxheW91dFBhcmFtZXRl cnMpKSB7CisgICAgICAgIGxheW91dFBhcmFtZXRlcnMuZGF0ZVRpbWVGb3JtYXQgPSBsb2NhbGl6 ZXIudGltZUZvcm1hdCgpOworICAgICAgICBsYXlvdXRQYXJhbWV0ZXJzLmZhbGxiYWNrRGF0ZVRp bWVGb3JtYXQgPSAiSEg6bW06c3MiOworICAgIH0gZWxzZSB7CisgICAgICAgIGxheW91dFBhcmFt ZXRlcnMuZGF0ZVRpbWVGb3JtYXQgPSBsb2NhbGl6ZXIuc2hvcnRUaW1lRm9ybWF0KCk7CisgICAg ICAgIGxheW91dFBhcmFtZXRlcnMuZmFsbGJhY2tEYXRlVGltZUZvcm1hdCA9ICJISDptbSI7CiAg ICAgfQorCisgICAgaWYgKGhhc1ZhbHVlKQorICAgICAgICBtX2RhdGVUaW1lRWRpdEVsZW1lbnQt PnNldFZhbHVlQXNEYXRlKGxheW91dFBhcmFtZXRlcnMsIGRhdGUpOworICAgIGVsc2UKKyAgICAg ICAgbV9kYXRlVGltZUVkaXRFbGVtZW50LT5zZXRFbXB0eVZhbHVlKGxheW91dFBhcmFtZXRlcnMs IGRhdGUpOwogfQogI2Vsc2UKIFRpbWVJbnB1dFR5cGU6OlRpbWVJbnB1dFR5cGUoSFRNTElucHV0 RWxlbWVudCogZWxlbWVudCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93 L0RhdGVUaW1lRWRpdEVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvRGF0 ZVRpbWVFZGl0RWxlbWVudC5jcHAKaW5kZXggZTlhYTg1OGNjYjhlMGQ3M2IwOGVmZDZmMGQ1OWY4 YTI4YzViYWFlMC4uZTJkM2Q2ZWY2ZDQxNGNhNjhlNjFjNjRmZTUxN2YyMDY0MzhjOTFkYyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvRGF0ZVRpbWVFZGl0RWxlbWVudC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvRGF0ZVRpbWVFZGl0RWxlbWVudC5j cHAKQEAgLTM1LDExICszNSw4IEBACiAjaW5jbHVkZSAiRXZlbnRIYW5kbGVyLmgiCiAjaW5jbHVk ZSAiSFRNTE5hbWVzLmgiCiAjaW5jbHVkZSAiS2V5Ym9hcmRFdmVudC5oIgotI2luY2x1ZGUgIkxv Y2FsaXplZERhdGUuaCIKLSNpbmNsdWRlICJMb2NhbGl6ZWROdW1iZXIuaCIKICNpbmNsdWRlICJM b2NhbGl6ZXIuaCIKICNpbmNsdWRlICJNb3VzZUV2ZW50LmgiCi0jaW5jbHVkZSAiU3RlcFJhbmdl LmgiCiAjaW5jbHVkZSAiVGV4dC5oIgogI2luY2x1ZGUgPHd0Zi9EYXRlTWF0aC5oPgogI2luY2x1 ZGUgPHd0Zi90ZXh0L1N0cmluZ0J1aWxkZXIuaD4KQEAgLTUyLDE0ICs0OSwxMiBAQCBjbGFzcyBE YXRlVGltZUVkaXRCdWlsZGVyIDogcHJpdmF0ZSBEYXRlVGltZUZvcm1hdDo6VG9rZW5IYW5kbGVy IHsKICAgICBXVEZfTUFLRV9OT05DT1BZQUJMRShEYXRlVGltZUVkaXRCdWlsZGVyKTsKIAogcHVi bGljOgotICAgIERhdGVUaW1lRWRpdEJ1aWxkZXIoRGF0ZVRpbWVFZGl0RWxlbWVudCYsIGNvbnN0 IFN0ZXBSYW5nZSYsIGNvbnN0IERhdGVDb21wb25lbnRzJiwgTG9jYWxpemVyJik7CisgICAgRGF0 ZVRpbWVFZGl0QnVpbGRlcihEYXRlVGltZUVkaXRFbGVtZW50JiwgY29uc3QgRGF0ZVRpbWVFZGl0 RWxlbWVudDo6TGF5b3V0UGFyYW1ldGVycyYsIGNvbnN0IERhdGVDb21wb25lbnRzJik7CiAKICAg ICBib29sIGJ1aWxkKGNvbnN0IFN0cmluZyYpOwotICAgIGJvb2wgbmVlZFNlY29uZEZpZWxkKCkg Y29uc3Q7CiAKIHByaXZhdGU6CiAgICAgYm9vbCBuZWVkTWlsbGlzZWNvbmRGaWVsZCgpIGNvbnN0 OwotICAgIGJvb2wgbmVlZE1pbnV0ZUZpZWxkKCkgY29uc3Q7CiAgICAgYm9vbCBzaG91bGRNaWxs aXNlY29uZEZpZWxkUmVhZE9ubHkoKSBjb25zdDsKICAgICBib29sIHNob3VsZE1pbnV0ZUZpZWxk UmVhZE9ubHkoKSBjb25zdDsKICAgICBib29sIHNob3VsZFNlY29uZEZpZWxkUmVhZE9ubHkoKSBj b25zdDsKQEAgLTc0LDExICs2OSwxMSBAQCBwcml2YXRlOgogICAgIExvY2FsaXplciYgbV9sb2Nh bGl6ZXI7CiB9OwogCi1EYXRlVGltZUVkaXRCdWlsZGVyOjpEYXRlVGltZUVkaXRCdWlsZGVyKERh dGVUaW1lRWRpdEVsZW1lbnQmIGVsZW1udCwgY29uc3QgU3RlcFJhbmdlJiBzdGVwUmFuZ2UsIGNv bnN0IERhdGVDb21wb25lbnRzJiBkYXRlVmFsdWUsIExvY2FsaXplciYgbG9jYWxpemVyKQorRGF0 ZVRpbWVFZGl0QnVpbGRlcjo6RGF0ZVRpbWVFZGl0QnVpbGRlcihEYXRlVGltZUVkaXRFbGVtZW50 JiBlbGVtbnQsIGNvbnN0IERhdGVUaW1lRWRpdEVsZW1lbnQ6OkxheW91dFBhcmFtZXRlcnMmIGxh eW91dFBhcmFtZXRlcnMsIGNvbnN0IERhdGVDb21wb25lbnRzJiBkYXRlVmFsdWUpCiAgICAgOiBt X2VkaXRFbGVtZW50KGVsZW1udCkKICAgICAsIG1fZGF0ZVZhbHVlKGRhdGVWYWx1ZSkKLSAgICAs IG1fc3RlcFJhbmdlKHN0ZXBSYW5nZSkKLSAgICAsIG1fbG9jYWxpemVyKGxvY2FsaXplcikKKyAg ICAsIG1fc3RlcFJhbmdlKGxheW91dFBhcmFtZXRlcnMuc3RlcFJhbmdlKQorICAgICwgbV9sb2Nh bGl6ZXIobGF5b3V0UGFyYW1ldGVycy5sb2NhbGl6ZXIpCiB7CiB9CiAKQEAgLTk1LDIwICs5MCw2 IEBAIGJvb2wgRGF0ZVRpbWVFZGl0QnVpbGRlcjo6bmVlZE1pbGxpc2Vjb25kRmllbGQoKSBjb25z dAogICAgICAgICB8fCAhbV9zdGVwUmFuZ2Uuc3RlcCgpLnJlbWFpbmRlcihzdGF0aWNfY2FzdDxp bnQ+KG1zUGVyU2Vjb25kKSkuaXNaZXJvKCk7CiB9CiAKLWJvb2wgRGF0ZVRpbWVFZGl0QnVpbGRl cjo6bmVlZE1pbnV0ZUZpZWxkKCkgY29uc3QKLXsKLSAgICByZXR1cm4gbV9kYXRlVmFsdWUubWlu dXRlKCkKLSAgICAgICAgfHwgIW1fc3RlcFJhbmdlLm1pbmltdW0oKS5yZW1haW5kZXIoc3RhdGlj X2Nhc3Q8aW50Pihtc1BlckhvdXIpKS5pc1plcm8oKQotICAgICAgICB8fCAhbV9zdGVwUmFuZ2Uu c3RlcCgpLnJlbWFpbmRlcihzdGF0aWNfY2FzdDxpbnQ+KG1zUGVySG91cikpLmlzWmVybygpOwot fQotCi1ib29sIERhdGVUaW1lRWRpdEJ1aWxkZXI6Om5lZWRTZWNvbmRGaWVsZCgpIGNvbnN0Ci17 Ci0gICAgcmV0dXJuIG1fZGF0ZVZhbHVlLnNlY29uZCgpCi0gICAgICAgIHx8ICFtX3N0ZXBSYW5n ZS5taW5pbXVtKCkucmVtYWluZGVyKHN0YXRpY19jYXN0PGludD4obXNQZXJNaW51dGUpKS5pc1pl cm8oKQotICAgICAgICB8fCAhbV9zdGVwUmFuZ2Uuc3RlcCgpLnJlbWFpbmRlcihzdGF0aWNfY2Fz dDxpbnQ+KG1zUGVyTWludXRlKSkuaXNaZXJvKCk7Ci19Ci0KIHZvaWQgRGF0ZVRpbWVFZGl0QnVp bGRlcjo6dmlzaXRGaWVsZChEYXRlVGltZUZvcm1hdDo6RmllbGRUeXBlIGZpZWxkVHlwZSwgaW50 KQogewogICAgIERvY3VtZW50KiBjb25zdCBkb2N1bWVudCA9IG1fZWRpdEVsZW1lbnQuZG9jdW1l bnQoKTsKQEAgLTM0MCwxOCArMzIxLDE3IEBAIGJvb2wgRGF0ZVRpbWVFZGl0RWxlbWVudDo6aXNS ZWFkT25seSgpIGNvbnN0CiAgICAgcmV0dXJuIG1fZWRpdENvbnRyb2xPd25lciAmJiBtX2VkaXRD b250cm9sT3duZXItPmlzRWRpdENvbnRyb2xPd25lclJlYWRPbmx5KCk7CiB9CiAKLXZvaWQgRGF0 ZVRpbWVFZGl0RWxlbWVudDo6bGF5b3V0KGNvbnN0IFN0ZXBSYW5nZSYgc3RlcFJhbmdlLCBjb25z dCBEYXRlQ29tcG9uZW50cyYgZGF0ZVZhbHVlLCBMb2NhbGl6ZXImIGxvY2FsaXplcikKK3ZvaWQg RGF0ZVRpbWVFZGl0RWxlbWVudDo6bGF5b3V0KGNvbnN0IExheW91dFBhcmFtZXRlcnMmIGxheW91 dFBhcmFtZXRlcnMsIGNvbnN0IERhdGVDb21wb25lbnRzJiBkYXRlVmFsdWUpCiB7CiAgICAgc2l6 ZV90IGZvY3VzZWRGaWVsZEluZGV4ID0gdGhpcy0+Zm9jdXNlZEZpZWxkSW5kZXgoKTsKICAgICBE YXRlVGltZUZpZWxkRWxlbWVudCogY29uc3QgZm9jdXNlZEZpZWxkID0gZmllbGRBdChmb2N1c2Vk RmllbGRJbmRleCk7CiAgICAgY29uc3QgQXRvbWljU3RyaW5nIGZvY3VzZWRGaWVsZElkID0gZm9j dXNlZEZpZWxkID8gZm9jdXNlZEZpZWxkLT5zaGFkb3dQc2V1ZG9JZCgpIDogbnVsbEF0b207CiAK LSAgICBEYXRlVGltZUVkaXRCdWlsZGVyIGJ1aWxkZXIoKnRoaXMsIHN0ZXBSYW5nZSwgZGF0ZVZh bHVlLCBsb2NhbGl6ZXIpOwotICAgIGNvbnN0IFN0cmluZyBkYXRlVGltZUZvcm1hdCA9IGJ1aWxk ZXIubmVlZFNlY29uZEZpZWxkKCkgPyBsb2NhbGl6ZXIudGltZUZvcm1hdCgpIDogbG9jYWxpemVy LnNob3J0VGltZUZvcm1hdCgpOworICAgIERhdGVUaW1lRWRpdEJ1aWxkZXIgYnVpbGRlcigqdGhp cywgbGF5b3V0UGFyYW1ldGVycywgZGF0ZVZhbHVlKTsKICAgICBOb2RlKiBsYXN0Q2hpbGRUb0Jl UmVtb3ZlZCA9IGxhc3RDaGlsZCgpOwotICAgIGlmICghYnVpbGRlci5idWlsZChkYXRlVGltZUZv cm1hdCkgfHwgbV9maWVsZHMuaXNFbXB0eSgpKSB7CisgICAgaWYgKCFidWlsZGVyLmJ1aWxkKGxh eW91dFBhcmFtZXRlcnMuZGF0ZVRpbWVGb3JtYXQpIHx8IG1fZmllbGRzLmlzRW1wdHkoKSkgewog ICAgICAgICBsYXN0Q2hpbGRUb0JlUmVtb3ZlZCA9IGxhc3RDaGlsZCgpOwotICAgICAgICBidWls ZGVyLmJ1aWxkKGJ1aWxkZXIubmVlZFNlY29uZEZpZWxkKCkgPyAiSEg6bW06c3MiIDogIkhIOm1t Iik7CisgICAgICAgIGJ1aWxkZXIuYnVpbGQobGF5b3V0UGFyYW1ldGVycy5mYWxsYmFja0RhdGVU aW1lRm9ybWF0KTsKICAgICB9CiAKICAgICBpZiAoZm9jdXNlZEZpZWxkSW5kZXggIT0gaW52YWxp ZEZpZWxkSW5kZXgpIHsKQEAgLTQwNyw5ICszODcsOSBAQCB2b2lkIERhdGVUaW1lRWRpdEVsZW1l bnQ6OmRlZmF1bHRFdmVudEhhbmRsZXIoRXZlbnQqIGV2ZW50KQogICAgIEhUTUxEaXZFbGVtZW50 OjpkZWZhdWx0RXZlbnRIYW5kbGVyKGV2ZW50KTsKIH0KIAotdm9pZCBEYXRlVGltZUVkaXRFbGVt ZW50OjpzZXRWYWx1ZUFzRGF0ZShjb25zdCBTdGVwUmFuZ2UmIHN0ZXBSYW5nZSwgY29uc3QgRGF0 ZUNvbXBvbmVudHMmIGRhdGUsIExvY2FsaXplciYgbG9jYWxpemVyKQordm9pZCBEYXRlVGltZUVk aXRFbGVtZW50OjpzZXRWYWx1ZUFzRGF0ZShjb25zdCBMYXlvdXRQYXJhbWV0ZXJzJiBsYXlvdXRQ YXJhbWV0ZXJzLCBjb25zdCBEYXRlQ29tcG9uZW50cyYgZGF0ZSkKIHsKLSAgICBsYXlvdXQoc3Rl cFJhbmdlLCBkYXRlLCBsb2NhbGl6ZXIpOworICAgIGxheW91dChsYXlvdXRQYXJhbWV0ZXJzLCBk YXRlKTsKICAgICBmb3IgKHNpemVfdCBmaWVsZEluZGV4ID0gMDsgZmllbGRJbmRleCA8IG1fZmll bGRzLnNpemUoKTsgKytmaWVsZEluZGV4KQogICAgICAgICBtX2ZpZWxkc1tmaWVsZEluZGV4XS0+ c2V0VmFsdWVBc0RhdGUoZGF0ZSk7CiB9CkBAIC00MjAsMTMgKzQwMCwxOSBAQCB2b2lkIERhdGVU aW1lRWRpdEVsZW1lbnQ6OnNldFZhbHVlQXNEYXRlVGltZUZpZWxkc1N0YXRlKGNvbnN0IERhdGVU aW1lRmllbGRzU3RhdAogICAgICAgICBtX2ZpZWxkc1tmaWVsZEluZGV4XS0+c2V0VmFsdWVBc0Rh dGVUaW1lRmllbGRzU3RhdGUoZGF0ZVRpbWVGaWVsZHNTdGF0ZSwgZGF0ZUZvclJlYWRPbmx5Rmll bGQpOwogfQogCi12b2lkIERhdGVUaW1lRWRpdEVsZW1lbnQ6OnNldEVtcHR5VmFsdWUoY29uc3Qg U3RlcFJhbmdlJiBzdGVwUmFuZ2UsIGNvbnN0IERhdGVDb21wb25lbnRzJiBkYXRlRm9yUmVhZE9u bHlGaWVsZCwgTG9jYWxpemVyJiBsb2NhbGl6ZXIpCit2b2lkIERhdGVUaW1lRWRpdEVsZW1lbnQ6 OnNldEVtcHR5VmFsdWUoY29uc3QgTGF5b3V0UGFyYW1ldGVycyYgbGF5b3V0UGFyYW1ldGVycywg Y29uc3QgRGF0ZUNvbXBvbmVudHMmIGRhdGVGb3JSZWFkT25seUZpZWxkKQogewotICAgIGxheW91 dChzdGVwUmFuZ2UsIGRhdGVGb3JSZWFkT25seUZpZWxkLCBsb2NhbGl6ZXIpOworICAgIGxheW91 dChsYXlvdXRQYXJhbWV0ZXJzLCBkYXRlRm9yUmVhZE9ubHlGaWVsZCk7CiAgICAgZm9yIChzaXpl X3QgZmllbGRJbmRleCA9IDA7IGZpZWxkSW5kZXggPCBtX2ZpZWxkcy5zaXplKCk7ICsrZmllbGRJ bmRleCkKICAgICAgICAgbV9maWVsZHNbZmllbGRJbmRleF0tPnNldEVtcHR5VmFsdWUoZGF0ZUZv clJlYWRPbmx5RmllbGQsIERhdGVUaW1lRmllbGRFbGVtZW50OjpEaXNwYXRjaE5vRXZlbnQpOwog fQogCitib29sIERhdGVUaW1lRWRpdEVsZW1lbnQ6OnNob3VsZEhhdmVTZWNvbmRGaWVsZChjb25z dCBMYXlvdXRQYXJhbWV0ZXJzJiBsYXlvdXRQYXJhbWV0ZXJzKQoreworICAgIHJldHVybiAhbGF5 b3V0UGFyYW1ldGVycy5zdGVwUmFuZ2UubWluaW11bSgpLnJlbWFpbmRlcihzdGF0aWNfY2FzdDxp bnQ+KG1zUGVyTWludXRlKSkuaXNaZXJvKCkKKyAgICAgICAgfHwgIWxheW91dFBhcmFtZXRlcnMu c3RlcFJhbmdlLnN0ZXAoKS5yZW1haW5kZXIoc3RhdGljX2Nhc3Q8aW50Pihtc1Blck1pbnV0ZSkp LmlzWmVybygpOworfQorCiBib29sIERhdGVUaW1lRWRpdEVsZW1lbnQ6OnNob3VsZFNwaW5CdXR0 b25SZXNwb25kVG9Nb3VzZUV2ZW50cygpCiB7CiAgICAgcmV0dXJuICFpc0Rpc2FibGVkKCkgJiYg IWlzUmVhZE9ubHkoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L0Rh dGVUaW1lRWRpdEVsZW1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L0RhdGVUaW1l RWRpdEVsZW1lbnQuaAppbmRleCBjMTdiZDdhN2EwNTQxZjZjMWQ4MmJhY2JkMzE3YmYxZWQ0N2Fh NTg2Li42MjNlYjU4MmUxNDIxYzcwMGZmYzlmYTE1NTJmZmUwYThiNTE0MGQ2IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9EYXRlVGltZUVkaXRFbGVtZW50LmgKKysrIGIv U291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvRGF0ZVRpbWVFZGl0RWxlbWVudC5oCkBAIC0yOSwx MSArMjksMTAgQEAKICNpZiBFTkFCTEUoSU5QVVRfVFlQRV9USU1FX01VTFRJUExFX0ZJRUxEUykK ICNpbmNsdWRlICJEYXRlVGltZUZpZWxkRWxlbWVudC5oIgogI2luY2x1ZGUgIlNwaW5CdXR0b25F bGVtZW50LmgiCisjaW5jbHVkZSAiU3RlcFJhbmdlLmgiCiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsK IAotY2xhc3MgRGF0ZUNvbXBvbmVudHM7Ci1jbGFzcyBEYXRlVGltZUVkaXRMYXlvdXRlcjsKIGNs YXNzIERhdGVUaW1lRmllbGRzU3RhdGU7CiBjbGFzcyBLZXlib2FyZEV2ZW50OwogY2xhc3MgTG9j YWxpemVyOwpAQCAtNjAsNiArNTksMTkgQEAgcHVibGljOgogICAgICAgICB2aXJ0dWFsIGJvb2wg aXNFZGl0Q29udHJvbE93bmVyUmVhZE9ubHkoKSBjb25zdCA9IDA7CiAgICAgfTsKIAorICAgIHN0 cnVjdCBMYXlvdXRQYXJhbWV0ZXJzIHsKKyAgICAgICAgU3RyaW5nIGRhdGVUaW1lRm9ybWF0Owor ICAgICAgICBTdHJpbmcgZmFsbGJhY2tEYXRlVGltZUZvcm1hdDsKKyAgICAgICAgTG9jYWxpemVy JiBsb2NhbGl6ZXI7CisgICAgICAgIGNvbnN0IFN0ZXBSYW5nZSYgc3RlcFJhbmdlOworCisgICAg ICAgIExheW91dFBhcmFtZXRlcnMoTG9jYWxpemVyJiBsb2NhbGl6ZXIsIGNvbnN0IFN0ZXBSYW5n ZSYgc3RlcFJhbmdlKQorICAgICAgICAgICAgOiBsb2NhbGl6ZXIobG9jYWxpemVyKQorICAgICAg ICAgICAgLCBzdGVwUmFuZ2Uoc3RlcFJhbmdlKQorICAgICAgICB7CisgICAgICAgIH0KKyAgICB9 OworCiAgICAgc3RhdGljIFBhc3NSZWZQdHI8RGF0ZVRpbWVFZGl0RWxlbWVudD4gY3JlYXRlKERv Y3VtZW50KiwgRWRpdENvbnRyb2xPd25lciYpOwogCiAgICAgdmlydHVhbCB+RGF0ZVRpbWVFZGl0 RWxlbWVudCgpOwpAQCAtNzEsOSArODMsMTAgQEAgcHVibGljOgogICAgIHZvaWQgcmVhZE9ubHlT dGF0ZUNoYW5nZWQoKTsKICAgICB2b2lkIHJlbW92ZUVkaXRDb250cm9sT3duZXIoKSB7IG1fZWRp dENvbnRyb2xPd25lciA9IDA7IH0KICAgICB2b2lkIHJlc2V0RmllbGRzKCk7Ci0gICAgdm9pZCBz ZXRFbXB0eVZhbHVlKGNvbnN0IFN0ZXBSYW5nZSYsIGNvbnN0IERhdGVDb21wb25lbnRzJiAgZGF0 ZUZvclJlYWRPbmx5RmllbGQsIExvY2FsaXplciYpOwotICAgIHZvaWQgc2V0VmFsdWVBc0RhdGUo Y29uc3QgU3RlcFJhbmdlJiwgY29uc3QgRGF0ZUNvbXBvbmVudHMmLCBMb2NhbGl6ZXImKTsKKyAg ICB2b2lkIHNldEVtcHR5VmFsdWUoY29uc3QgTGF5b3V0UGFyYW1ldGVycyYsIGNvbnN0IERhdGVD b21wb25lbnRzJiBkYXRlRm9yUmVhZE9ubHlGaWVsZCk7CisgICAgdm9pZCBzZXRWYWx1ZUFzRGF0 ZShjb25zdCBMYXlvdXRQYXJhbWV0ZXJzJiwgY29uc3QgRGF0ZUNvbXBvbmVudHMmKTsKICAgICB2 b2lkIHNldFZhbHVlQXNEYXRlVGltZUZpZWxkc1N0YXRlKGNvbnN0IERhdGVUaW1lRmllbGRzU3Rh dGUmLCBjb25zdCBEYXRlQ29tcG9uZW50cyYgZGF0ZUZvclJlYWRPbmx5RmllbGQpOworICAgIHN0 YXRpYyBib29sIHNob3VsZEhhdmVTZWNvbmRGaWVsZChjb25zdCBMYXlvdXRQYXJhbWV0ZXJzJik7 CiAgICAgRGF0ZVRpbWVGaWVsZHNTdGF0ZSB2YWx1ZUFzRGF0ZVRpbWVGaWVsZHNTdGF0ZSgpIGNv bnN0OwogICAgIGRvdWJsZSB2YWx1ZUFzRG91YmxlKCkgY29uc3Q7CiAKQEAgLTk5LDcgKzExMiw3 IEBAIHByaXZhdGU6CiAgICAgc2l6ZV90IGZvY3VzZWRGaWVsZEluZGV4KCkgY29uc3Q7CiAgICAg Ym9vbCBpc0Rpc2FibGVkKCkgY29uc3Q7CiAgICAgYm9vbCBpc1JlYWRPbmx5KCkgY29uc3Q7Ci0g ICAgdm9pZCBsYXlvdXQoY29uc3QgU3RlcFJhbmdlJiwgY29uc3QgRGF0ZUNvbXBvbmVudHMmLCBM b2NhbGl6ZXImKTsKKyAgICB2b2lkIGxheW91dChjb25zdCBMYXlvdXRQYXJhbWV0ZXJzJiwgY29u c3QgRGF0ZUNvbXBvbmVudHMmKTsKICAgICB2b2lkIHVwZGF0ZVVJU3RhdGUoKTsKIAogICAgIC8v IERhdGVUaW1lRmllbGRFbGVtZW50OjpGaWVsZE93bmVyIGZ1bmN0aW9ucy4K 165097 2012-09-21 02:52:31 -0700 2012-09-21 03:05:44 -0700 Patch 2 bug-97300-20120921185155.patch text/plain 12292 yosin U3VidmVyc2lvbiBSZXZpc2lvbjogMTI5MjA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzFlY2M0ZWVmM2Q1Yjk5 NzdjOWIzMzI4ZjcwNGViMzdkMWMzYzRhMi4uMmQ5MDBjOGQ1ODcyNGNkNzJiZDY0ZTc5ZDQ3MmU1 ZGRjNjE0OGVkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDEyLTA5LTIxICBZb3No aWZ1bWkgSW5vdWUgIDx5b3NpbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0Zvcm1zXSBEYXRl VGltZUVkaXRFbGVtZW50OjpsYXlvdXQoKSBzaG91bGQgdGFrZSBkYXRlIHRpbWUgZm9ybWF0IGFz IGEgcGFyYW1ldGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD05NzMwMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFRoaXMgcGF0Y2ggaW50cm9kdWNlcyBEYXRlVGltZUVkaXRFbGVtZW50OjpMYXlvdXRQYXJh bWV0ZXJzIHN0cnVjdCBmb3IKKyAgICAgICAgcGFzc2luZyBmb3VyIHBhcmFtZXRlcnMgdG8gRGF0 ZVRpbWVFZGl0RWxlbWVudDo6bGF5b3V0KCkgZm9yIHBhc3NpbmcKKyAgICAgICAgZGF0ZSB0aW1l IGZvcm1hdCBmcm9tIGNsaWVudCBvZiBEYXRlVGltZUVkaXRFbGVtZW50IGluc3RlYWQgb2YKKyAg ICAgICAgRGF0ZVRpbWVFZGl0RWxlbWVudDo6bGF5b3V0KCkgdGFrZXMgdGltZSBvciBzaG9ydCB0 aW1lIGZvcm1hdC4KKworICAgICAgICBUaGlzIHBhdGNoIGlzIGEgcGFydCBvZiBwcmVwYXJhdGlv biBvZiBpbnRyb2R1Y2luZyBtdWx0aXBsZSBmaWVsZHMKKyAgICAgICAgZGF0ZS9kYXRldGltZS9t b250aC93ZWVrIGlucHV0IFVJLgorCisgICAgICAgIFRoaXMgcGF0Y2ggYWZmZWN0cyBwb3J0cyB3 aGljaCBlbmFibGUgYm90aCBFTkFCTEVfSU5QVVRfVFlQRV9USU1FIGFuZAorICAgICAgICBFTkFC TEVfSU5QVVRfVFlQRV9USU1FX01VTFRJUExFX0ZJRUxEUy4KKworICAgICAgICBObyBuZXcgdGVz dHMuIFRoaXMgcGF0Y2ggZG9lc24ndCBjaGFuZ2UgYmVoYXZpb3IuCisKKyAgICAgICAgKiBodG1s L1RpbWVJbnB1dFR5cGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VGltZUlucHV0VHlwZTo6dXBk YXRlSW5uZXJUZXh0VmFsdWUpOiBDaGFuZ2VkIHRvIHVzZSBMYXlvdXRQYXJtZXRlcnMuCisgICAg ICAgICogaHRtbC9zaGFkb3cvRGF0ZVRpbWVFZGl0RWxlbWVudC5jcHA6ICBSZW1vdmVkIHVudXNl ZCBpbmNsdWRlIGZpbGVzLCBMb2NhbGl6ZWREYXRlLmggYW5kIExvY2FsaXplZE51bWJlci5oLgor ICAgICAgICAoRGF0ZVRpbWVFZGl0QnVpbGRlcik6CisgICAgICAgIChXZWJDb3JlOjpEYXRlVGlt ZUVkaXRCdWlsZGVyOjpEYXRlVGltZUVkaXRCdWlsZGVyKTogQ2hhbmdlZCBwYXJhbWV0ZXJzIHRv IExheW91dFBhcm1ldGVycy4KKyAgICAgICAgKFdlYkNvcmU6OkRhdGVUaW1lRWRpdEVsZW1lbnQ6 OkxheW91dFBhcmFtZXRlcnM6OnNob3VsZEhhdmVTZWNvbmRGaWVsZCk6IE1vdmVkIGZyb20gRGF0 ZVRpbWVFZGl0QnVpbGRlcjo6bmVlZFNlY29uZEZpZWxkKCkuCisgICAgICAgIChXZWJDb3JlOjpE YXRlVGltZUVkaXRFbGVtZW50OjpsYXlvdXQpOiBDaGFuZ2VkIHRvIHRha2UgTGF5b3V0UGFyYW1l dGVycy4KKyAgICAgICAgKFdlYkNvcmU6OkRhdGVUaW1lRWRpdEVsZW1lbnQ6OnNldFZhbHVlQXNE YXRlKTogZGl0dG8KKyAgICAgICAgKFdlYkNvcmU6OkRhdGVUaW1lRWRpdEVsZW1lbnQ6OnNldEVt cHR5VmFsdWUpOiBkaXR0bworICAgICAgICAqIGh0bWwvc2hhZG93L0RhdGVUaW1lRWRpdEVsZW1l bnQuaDogUmVtb3ZlZCB1bnVzZWQgY2xhc3NlIGRlY2xhcmF0aW9ucyBEYXRlQ29tcG9uZW50cyBh bmQgRGF0ZVRpbWVFZGl0TGF5b3V0ZXIuCisgICAgICAgIChMYXlvdXRQYXJhbWV0ZXJzKTogIEFk ZGVkIHRvIGJ1bmRsZSBwYXJhbWV0ZXJzIGZvciBsYXlvdXQoKS4KKyAgICAgICAgKFdlYkNvcmU6 OkRhdGVUaW1lRWRpdEVsZW1lbnQ6OkxheW91dFBhcmFtZXRlcnM6OkxheW91dFBhcmFtZXRlcnMp OiBBZGRlZC4KKwogMjAxMi0wOS0yMSAgU2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBn bWFpbC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjEyOTA4Ni4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvVGltZUlucHV0VHlwZS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9odG1sL1RpbWVJbnB1dFR5cGUuY3BwCmluZGV4IGMxNTk3ZWNiYmFiZGM2Njg0OTcy MTgxNTYzZDMwZTYwZmIwNTkxM2YuLjRiNWJiMWYxNWNlOGU5OTUxNTllNTViNTExNWIwNThiZGQw YTk2MmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvVGltZUlucHV0VHlwZS5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9UaW1lSW5wdXRUeXBlLmNwcApAQCAtNDYsNiArNDYs NyBAQAogI2luY2x1ZGUgIkVsZW1lbnRTaGFkb3cuaCIKICNpbmNsdWRlICJGb3JtQ29udHJvbGxl ci5oIgogI2luY2x1ZGUgIktleWJvYXJkRXZlbnQuaCIKKyNpbmNsdWRlICJMb2NhbGl6ZXIuaCIK ICNpbmNsdWRlICJTaGFkb3dSb290LmgiCiAjZW5kaWYKIApAQCAtMzA0LDE0ICszMDUsMjUgQEAg dm9pZCBUaW1lSW5wdXRUeXBlOjp1cGRhdGVJbm5lclRleHRWYWx1ZSgpCiAgICAgICAgIHJldHVy bjsKIAogICAgIExvY2FsaXplciYgbG9jYWxpemVyID0gZWxlbWVudCgpLT5kb2N1bWVudCgpLT5n ZXRMb2NhbGl6ZXIoZWxlbWVudCgpLT5jb21wdXRlSW5oZXJpdGVkTGFuZ3VhZ2UoKSk7Ci0gICAg Y29uc3QgU3RlcFJhbmdlIHN0ZXBSYW5nZShjcmVhdGVTdGVwUmFuZ2UoQW55SXNEZWZhdWx0U3Rl cCkpOworICAgIERhdGVUaW1lRWRpdEVsZW1lbnQ6OkxheW91dFBhcmFtZXRlcnMgbGF5b3V0UGFy YW1ldGVycyhsb2NhbGl6ZXIsIGNyZWF0ZVN0ZXBSYW5nZShBbnlJc0RlZmF1bHRTdGVwKSk7CisK ICAgICBEYXRlQ29tcG9uZW50cyBkYXRlOwotICAgIGlmIChwYXJzZVRvRGF0ZUNvbXBvbmVudHMo ZWxlbWVudCgpLT52YWx1ZSgpLCAmZGF0ZSkpCi0gICAgICAgIG1fZGF0ZVRpbWVFZGl0RWxlbWVu dC0+c2V0VmFsdWVBc0RhdGUoc3RlcFJhbmdlLCBkYXRlLCBsb2NhbGl6ZXIpOwotICAgIGVsc2Ug ewotICAgICAgICBzZXRNaWxsaXNlY29uZFRvRGF0ZUNvbXBvbmVudHMoc3RlcFJhbmdlLm1pbmlt dW0oKS50b0RvdWJsZSgpLCAmZGF0ZSk7Ci0gICAgICAgIG1fZGF0ZVRpbWVFZGl0RWxlbWVudC0+ c2V0RW1wdHlWYWx1ZShzdGVwUmFuZ2UsIGRhdGUsIGxvY2FsaXplcik7CisgICAgY29uc3QgYm9v bCBoYXNWYWx1ZSA9IHBhcnNlVG9EYXRlQ29tcG9uZW50cyhlbGVtZW50KCktPnZhbHVlKCksICZk YXRlKTsKKyAgICBpZiAoIWhhc1ZhbHVlKQorICAgICAgICBzZXRNaWxsaXNlY29uZFRvRGF0ZUNv bXBvbmVudHMobGF5b3V0UGFyYW1ldGVycy5zdGVwUmFuZ2UubWluaW11bSgpLnRvRG91YmxlKCks ICZkYXRlKTsKKworICAgIGlmIChkYXRlLnNlY29uZCgpIHx8IGxheW91dFBhcmFtZXRlcnMuc2hv dWxkSGF2ZVNlY29uZEZpZWxkKCkpIHsKKyAgICAgICAgbGF5b3V0UGFyYW1ldGVycy5kYXRlVGlt ZUZvcm1hdCA9IGxvY2FsaXplci50aW1lRm9ybWF0KCk7CisgICAgICAgIGxheW91dFBhcmFtZXRl cnMuZmFsbGJhY2tEYXRlVGltZUZvcm1hdCA9ICJISDptbTpzcyI7CisgICAgfSBlbHNlIHsKKyAg ICAgICAgbGF5b3V0UGFyYW1ldGVycy5kYXRlVGltZUZvcm1hdCA9IGxvY2FsaXplci5zaG9ydFRp bWVGb3JtYXQoKTsKKyAgICAgICAgbGF5b3V0UGFyYW1ldGVycy5mYWxsYmFja0RhdGVUaW1lRm9y bWF0ID0gIkhIOm1tIjsKICAgICB9CisKKyAgICBpZiAoaGFzVmFsdWUpCisgICAgICAgIG1fZGF0 ZVRpbWVFZGl0RWxlbWVudC0+c2V0VmFsdWVBc0RhdGUobGF5b3V0UGFyYW1ldGVycywgZGF0ZSk7 CisgICAgZWxzZQorICAgICAgICBtX2RhdGVUaW1lRWRpdEVsZW1lbnQtPnNldEVtcHR5VmFsdWUo bGF5b3V0UGFyYW1ldGVycywgZGF0ZSk7CiB9CiAjZWxzZQogVGltZUlucHV0VHlwZTo6VGltZUlu cHV0VHlwZShIVE1MSW5wdXRFbGVtZW50KiBlbGVtZW50KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaHRtbC9zaGFkb3cvRGF0ZVRpbWVFZGl0RWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9odG1sL3NoYWRvdy9EYXRlVGltZUVkaXRFbGVtZW50LmNwcAppbmRleCBlOWFhODU4Y2NiOGUw ZDczYjA4ZWZkNmYwZDU5ZjhhMjhjNWJhYWUwLi4wN2JlZmQ4NzQxOGY5YTM3MzA2OGI0MWUxNmIy ZjU1ZjNiNWRjNTJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9EYXRl VGltZUVkaXRFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9EYXRl VGltZUVkaXRFbGVtZW50LmNwcApAQCAtMzUsMTEgKzM1LDggQEAKICNpbmNsdWRlICJFdmVudEhh bmRsZXIuaCIKICNpbmNsdWRlICJIVE1MTmFtZXMuaCIKICNpbmNsdWRlICJLZXlib2FyZEV2ZW50 LmgiCi0jaW5jbHVkZSAiTG9jYWxpemVkRGF0ZS5oIgotI2luY2x1ZGUgIkxvY2FsaXplZE51bWJl ci5oIgogI2luY2x1ZGUgIkxvY2FsaXplci5oIgogI2luY2x1ZGUgIk1vdXNlRXZlbnQuaCIKLSNp bmNsdWRlICJTdGVwUmFuZ2UuaCIKICNpbmNsdWRlICJUZXh0LmgiCiAjaW5jbHVkZSA8d3RmL0Rh dGVNYXRoLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvU3RyaW5nQnVpbGRlci5oPgpAQCAtNTIsMTQg KzQ5LDEyIEBAIGNsYXNzIERhdGVUaW1lRWRpdEJ1aWxkZXIgOiBwcml2YXRlIERhdGVUaW1lRm9y bWF0OjpUb2tlbkhhbmRsZXIgewogICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKERhdGVUaW1lRWRp dEJ1aWxkZXIpOwogCiBwdWJsaWM6Ci0gICAgRGF0ZVRpbWVFZGl0QnVpbGRlcihEYXRlVGltZUVk aXRFbGVtZW50JiwgY29uc3QgU3RlcFJhbmdlJiwgY29uc3QgRGF0ZUNvbXBvbmVudHMmLCBMb2Nh bGl6ZXImKTsKKyAgICBEYXRlVGltZUVkaXRCdWlsZGVyKERhdGVUaW1lRWRpdEVsZW1lbnQmLCBj b25zdCBEYXRlVGltZUVkaXRFbGVtZW50OjpMYXlvdXRQYXJhbWV0ZXJzJiwgY29uc3QgRGF0ZUNv bXBvbmVudHMmKTsKIAogICAgIGJvb2wgYnVpbGQoY29uc3QgU3RyaW5nJik7Ci0gICAgYm9vbCBu ZWVkU2Vjb25kRmllbGQoKSBjb25zdDsKIAogcHJpdmF0ZToKICAgICBib29sIG5lZWRNaWxsaXNl Y29uZEZpZWxkKCkgY29uc3Q7Ci0gICAgYm9vbCBuZWVkTWludXRlRmllbGQoKSBjb25zdDsKICAg ICBib29sIHNob3VsZE1pbGxpc2Vjb25kRmllbGRSZWFkT25seSgpIGNvbnN0OwogICAgIGJvb2wg c2hvdWxkTWludXRlRmllbGRSZWFkT25seSgpIGNvbnN0OwogICAgIGJvb2wgc2hvdWxkU2Vjb25k RmllbGRSZWFkT25seSgpIGNvbnN0OwpAQCAtNzQsMTEgKzY5LDExIEBAIHByaXZhdGU6CiAgICAg TG9jYWxpemVyJiBtX2xvY2FsaXplcjsKIH07CiAKLURhdGVUaW1lRWRpdEJ1aWxkZXI6OkRhdGVU aW1lRWRpdEJ1aWxkZXIoRGF0ZVRpbWVFZGl0RWxlbWVudCYgZWxlbW50LCBjb25zdCBTdGVwUmFu Z2UmIHN0ZXBSYW5nZSwgY29uc3QgRGF0ZUNvbXBvbmVudHMmIGRhdGVWYWx1ZSwgTG9jYWxpemVy JiBsb2NhbGl6ZXIpCitEYXRlVGltZUVkaXRCdWlsZGVyOjpEYXRlVGltZUVkaXRCdWlsZGVyKERh dGVUaW1lRWRpdEVsZW1lbnQmIGVsZW1udCwgY29uc3QgRGF0ZVRpbWVFZGl0RWxlbWVudDo6TGF5 b3V0UGFyYW1ldGVycyYgbGF5b3V0UGFyYW1ldGVycywgY29uc3QgRGF0ZUNvbXBvbmVudHMmIGRh dGVWYWx1ZSkKICAgICA6IG1fZWRpdEVsZW1lbnQoZWxlbW50KQogICAgICwgbV9kYXRlVmFsdWUo ZGF0ZVZhbHVlKQotICAgICwgbV9zdGVwUmFuZ2Uoc3RlcFJhbmdlKQotICAgICwgbV9sb2NhbGl6 ZXIobG9jYWxpemVyKQorICAgICwgbV9zdGVwUmFuZ2UobGF5b3V0UGFyYW1ldGVycy5zdGVwUmFu Z2UpCisgICAgLCBtX2xvY2FsaXplcihsYXlvdXRQYXJhbWV0ZXJzLmxvY2FsaXplcikKIHsKIH0K IApAQCAtOTUsMjAgKzkwLDYgQEAgYm9vbCBEYXRlVGltZUVkaXRCdWlsZGVyOjpuZWVkTWlsbGlz ZWNvbmRGaWVsZCgpIGNvbnN0CiAgICAgICAgIHx8ICFtX3N0ZXBSYW5nZS5zdGVwKCkucmVtYWlu ZGVyKHN0YXRpY19jYXN0PGludD4obXNQZXJTZWNvbmQpKS5pc1plcm8oKTsKIH0KIAotYm9vbCBE YXRlVGltZUVkaXRCdWlsZGVyOjpuZWVkTWludXRlRmllbGQoKSBjb25zdAotewotICAgIHJldHVy biBtX2RhdGVWYWx1ZS5taW51dGUoKQotICAgICAgICB8fCAhbV9zdGVwUmFuZ2UubWluaW11bSgp LnJlbWFpbmRlcihzdGF0aWNfY2FzdDxpbnQ+KG1zUGVySG91cikpLmlzWmVybygpCi0gICAgICAg IHx8ICFtX3N0ZXBSYW5nZS5zdGVwKCkucmVtYWluZGVyKHN0YXRpY19jYXN0PGludD4obXNQZXJI b3VyKSkuaXNaZXJvKCk7Ci19Ci0KLWJvb2wgRGF0ZVRpbWVFZGl0QnVpbGRlcjo6bmVlZFNlY29u ZEZpZWxkKCkgY29uc3QKLXsKLSAgICByZXR1cm4gbV9kYXRlVmFsdWUuc2Vjb25kKCkKLSAgICAg ICAgfHwgIW1fc3RlcFJhbmdlLm1pbmltdW0oKS5yZW1haW5kZXIoc3RhdGljX2Nhc3Q8aW50Piht c1Blck1pbnV0ZSkpLmlzWmVybygpCi0gICAgICAgIHx8ICFtX3N0ZXBSYW5nZS5zdGVwKCkucmVt YWluZGVyKHN0YXRpY19jYXN0PGludD4obXNQZXJNaW51dGUpKS5pc1plcm8oKTsKLX0KLQogdm9p ZCBEYXRlVGltZUVkaXRCdWlsZGVyOjp2aXNpdEZpZWxkKERhdGVUaW1lRm9ybWF0OjpGaWVsZFR5 cGUgZmllbGRUeXBlLCBpbnQpCiB7CiAgICAgRG9jdW1lbnQqIGNvbnN0IGRvY3VtZW50ID0gbV9l ZGl0RWxlbWVudC5kb2N1bWVudCgpOwpAQCAtMTkxLDYgKzE3MiwxNSBAQCB2b2lkIERhdGVUaW1l RWRpdEJ1aWxkZXI6OnZpc2l0TGl0ZXJhbChjb25zdCBTdHJpbmcmIHRleHQpCiAKIC8vIC0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIAorCitib29sIERhdGVUaW1lRWRpdEVsZW1lbnQ6Okxh eW91dFBhcmFtZXRlcnM6OnNob3VsZEhhdmVTZWNvbmRGaWVsZCgpIGNvbnN0Cit7CisgICAgcmV0 dXJuICFzdGVwUmFuZ2UubWluaW11bSgpLnJlbWFpbmRlcihzdGF0aWNfY2FzdDxpbnQ+KG1zUGVy TWludXRlKSkuaXNaZXJvKCkKKyAgICAgICAgfHwgIXN0ZXBSYW5nZS5zdGVwKCkucmVtYWluZGVy KHN0YXRpY19jYXN0PGludD4obXNQZXJNaW51dGUpKS5pc1plcm8oKTsKK30KKworLy8gLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLQorCiBEYXRlVGltZUVkaXRFbGVtZW50OjpFZGl0Q29udHJv bE93bmVyOjp+RWRpdENvbnRyb2xPd25lcigpCiB7CiB9CkBAIC0zNDAsMTggKzMzMCwxNyBAQCBi b29sIERhdGVUaW1lRWRpdEVsZW1lbnQ6OmlzUmVhZE9ubHkoKSBjb25zdAogICAgIHJldHVybiBt X2VkaXRDb250cm9sT3duZXIgJiYgbV9lZGl0Q29udHJvbE93bmVyLT5pc0VkaXRDb250cm9sT3du ZXJSZWFkT25seSgpOwogfQogCi12b2lkIERhdGVUaW1lRWRpdEVsZW1lbnQ6OmxheW91dChjb25z dCBTdGVwUmFuZ2UmIHN0ZXBSYW5nZSwgY29uc3QgRGF0ZUNvbXBvbmVudHMmIGRhdGVWYWx1ZSwg TG9jYWxpemVyJiBsb2NhbGl6ZXIpCit2b2lkIERhdGVUaW1lRWRpdEVsZW1lbnQ6OmxheW91dChj b25zdCBMYXlvdXRQYXJhbWV0ZXJzJiBsYXlvdXRQYXJhbWV0ZXJzLCBjb25zdCBEYXRlQ29tcG9u ZW50cyYgZGF0ZVZhbHVlKQogewogICAgIHNpemVfdCBmb2N1c2VkRmllbGRJbmRleCA9IHRoaXMt PmZvY3VzZWRGaWVsZEluZGV4KCk7CiAgICAgRGF0ZVRpbWVGaWVsZEVsZW1lbnQqIGNvbnN0IGZv Y3VzZWRGaWVsZCA9IGZpZWxkQXQoZm9jdXNlZEZpZWxkSW5kZXgpOwogICAgIGNvbnN0IEF0b21p Y1N0cmluZyBmb2N1c2VkRmllbGRJZCA9IGZvY3VzZWRGaWVsZCA/IGZvY3VzZWRGaWVsZC0+c2hh ZG93UHNldWRvSWQoKSA6IG51bGxBdG9tOwogCi0gICAgRGF0ZVRpbWVFZGl0QnVpbGRlciBidWls ZGVyKCp0aGlzLCBzdGVwUmFuZ2UsIGRhdGVWYWx1ZSwgbG9jYWxpemVyKTsKLSAgICBjb25zdCBT dHJpbmcgZGF0ZVRpbWVGb3JtYXQgPSBidWlsZGVyLm5lZWRTZWNvbmRGaWVsZCgpID8gbG9jYWxp emVyLnRpbWVGb3JtYXQoKSA6IGxvY2FsaXplci5zaG9ydFRpbWVGb3JtYXQoKTsKKyAgICBEYXRl VGltZUVkaXRCdWlsZGVyIGJ1aWxkZXIoKnRoaXMsIGxheW91dFBhcmFtZXRlcnMsIGRhdGVWYWx1 ZSk7CiAgICAgTm9kZSogbGFzdENoaWxkVG9CZVJlbW92ZWQgPSBsYXN0Q2hpbGQoKTsKLSAgICBp ZiAoIWJ1aWxkZXIuYnVpbGQoZGF0ZVRpbWVGb3JtYXQpIHx8IG1fZmllbGRzLmlzRW1wdHkoKSkg eworICAgIGlmICghYnVpbGRlci5idWlsZChsYXlvdXRQYXJhbWV0ZXJzLmRhdGVUaW1lRm9ybWF0 KSB8fCBtX2ZpZWxkcy5pc0VtcHR5KCkpIHsKICAgICAgICAgbGFzdENoaWxkVG9CZVJlbW92ZWQg PSBsYXN0Q2hpbGQoKTsKLSAgICAgICAgYnVpbGRlci5idWlsZChidWlsZGVyLm5lZWRTZWNvbmRG aWVsZCgpID8gIkhIOm1tOnNzIiA6ICJISDptbSIpOworICAgICAgICBidWlsZGVyLmJ1aWxkKGxh eW91dFBhcmFtZXRlcnMuZmFsbGJhY2tEYXRlVGltZUZvcm1hdCk7CiAgICAgfQogCiAgICAgaWYg KGZvY3VzZWRGaWVsZEluZGV4ICE9IGludmFsaWRGaWVsZEluZGV4KSB7CkBAIC00MDcsOSArMzk2 LDkgQEAgdm9pZCBEYXRlVGltZUVkaXRFbGVtZW50OjpkZWZhdWx0RXZlbnRIYW5kbGVyKEV2ZW50 KiBldmVudCkKICAgICBIVE1MRGl2RWxlbWVudDo6ZGVmYXVsdEV2ZW50SGFuZGxlcihldmVudCk7 CiB9CiAKLXZvaWQgRGF0ZVRpbWVFZGl0RWxlbWVudDo6c2V0VmFsdWVBc0RhdGUoY29uc3QgU3Rl cFJhbmdlJiBzdGVwUmFuZ2UsIGNvbnN0IERhdGVDb21wb25lbnRzJiBkYXRlLCBMb2NhbGl6ZXIm IGxvY2FsaXplcikKK3ZvaWQgRGF0ZVRpbWVFZGl0RWxlbWVudDo6c2V0VmFsdWVBc0RhdGUoY29u c3QgTGF5b3V0UGFyYW1ldGVycyYgbGF5b3V0UGFyYW1ldGVycywgY29uc3QgRGF0ZUNvbXBvbmVu dHMmIGRhdGUpCiB7Ci0gICAgbGF5b3V0KHN0ZXBSYW5nZSwgZGF0ZSwgbG9jYWxpemVyKTsKKyAg ICBsYXlvdXQobGF5b3V0UGFyYW1ldGVycywgZGF0ZSk7CiAgICAgZm9yIChzaXplX3QgZmllbGRJ bmRleCA9IDA7IGZpZWxkSW5kZXggPCBtX2ZpZWxkcy5zaXplKCk7ICsrZmllbGRJbmRleCkKICAg ICAgICAgbV9maWVsZHNbZmllbGRJbmRleF0tPnNldFZhbHVlQXNEYXRlKGRhdGUpOwogfQpAQCAt NDIwLDkgKzQwOSw5IEBAIHZvaWQgRGF0ZVRpbWVFZGl0RWxlbWVudDo6c2V0VmFsdWVBc0RhdGVU aW1lRmllbGRzU3RhdGUoY29uc3QgRGF0ZVRpbWVGaWVsZHNTdGF0CiAgICAgICAgIG1fZmllbGRz W2ZpZWxkSW5kZXhdLT5zZXRWYWx1ZUFzRGF0ZVRpbWVGaWVsZHNTdGF0ZShkYXRlVGltZUZpZWxk c1N0YXRlLCBkYXRlRm9yUmVhZE9ubHlGaWVsZCk7CiB9CiAKLXZvaWQgRGF0ZVRpbWVFZGl0RWxl bWVudDo6c2V0RW1wdHlWYWx1ZShjb25zdCBTdGVwUmFuZ2UmIHN0ZXBSYW5nZSwgY29uc3QgRGF0 ZUNvbXBvbmVudHMmIGRhdGVGb3JSZWFkT25seUZpZWxkLCBMb2NhbGl6ZXImIGxvY2FsaXplcikK K3ZvaWQgRGF0ZVRpbWVFZGl0RWxlbWVudDo6c2V0RW1wdHlWYWx1ZShjb25zdCBMYXlvdXRQYXJh bWV0ZXJzJiBsYXlvdXRQYXJhbWV0ZXJzLCBjb25zdCBEYXRlQ29tcG9uZW50cyYgZGF0ZUZvclJl YWRPbmx5RmllbGQpCiB7Ci0gICAgbGF5b3V0KHN0ZXBSYW5nZSwgZGF0ZUZvclJlYWRPbmx5Rmll bGQsIGxvY2FsaXplcik7CisgICAgbGF5b3V0KGxheW91dFBhcmFtZXRlcnMsIGRhdGVGb3JSZWFk T25seUZpZWxkKTsKICAgICBmb3IgKHNpemVfdCBmaWVsZEluZGV4ID0gMDsgZmllbGRJbmRleCA8 IG1fZmllbGRzLnNpemUoKTsgKytmaWVsZEluZGV4KQogICAgICAgICBtX2ZpZWxkc1tmaWVsZElu ZGV4XS0+c2V0RW1wdHlWYWx1ZShkYXRlRm9yUmVhZE9ubHlGaWVsZCwgRGF0ZVRpbWVGaWVsZEVs ZW1lbnQ6OkRpc3BhdGNoTm9FdmVudCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9o dG1sL3NoYWRvdy9EYXRlVGltZUVkaXRFbGVtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3No YWRvdy9EYXRlVGltZUVkaXRFbGVtZW50LmgKaW5kZXggYzE3YmQ3YTdhMDU0MWY2YzFkODJiYWNi ZDMxN2JmMWVkNDdhYTU4Ni4uZTU0N2NiZGVhYzgyYTM2NmMwZTBiZDdjNzMzODI3NzdjYTUyMWJm MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvRGF0ZVRpbWVFZGl0RWxl bWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L0RhdGVUaW1lRWRpdEVsZW1l bnQuaApAQCAtMjksMTEgKzI5LDEwIEBACiAjaWYgRU5BQkxFKElOUFVUX1RZUEVfVElNRV9NVUxU SVBMRV9GSUVMRFMpCiAjaW5jbHVkZSAiRGF0ZVRpbWVGaWVsZEVsZW1lbnQuaCIKICNpbmNsdWRl ICJTcGluQnV0dG9uRWxlbWVudC5oIgorI2luY2x1ZGUgIlN0ZXBSYW5nZS5oIgogCiBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiAKLWNsYXNzIERhdGVDb21wb25lbnRzOwotY2xhc3MgRGF0ZVRpbWVFZGl0 TGF5b3V0ZXI7CiBjbGFzcyBEYXRlVGltZUZpZWxkc1N0YXRlOwogY2xhc3MgS2V5Ym9hcmRFdmVu dDsKIGNsYXNzIExvY2FsaXplcjsKQEAgLTYwLDYgKzU5LDIxIEBAIHB1YmxpYzoKICAgICAgICAg dmlydHVhbCBib29sIGlzRWRpdENvbnRyb2xPd25lclJlYWRPbmx5KCkgY29uc3QgPSAwOwogICAg IH07CiAKKyAgICBzdHJ1Y3QgTGF5b3V0UGFyYW1ldGVycyB7CisgICAgICAgIFN0cmluZyBkYXRl VGltZUZvcm1hdDsKKyAgICAgICAgU3RyaW5nIGZhbGxiYWNrRGF0ZVRpbWVGb3JtYXQ7CisgICAg ICAgIExvY2FsaXplciYgbG9jYWxpemVyOworICAgICAgICBjb25zdCBTdGVwUmFuZ2UmIHN0ZXBS YW5nZTsKKworICAgICAgICBMYXlvdXRQYXJhbWV0ZXJzKExvY2FsaXplciYgbG9jYWxpemVyLCBj b25zdCBTdGVwUmFuZ2UmIHN0ZXBSYW5nZSkKKyAgICAgICAgICAgIDogbG9jYWxpemVyKGxvY2Fs aXplcikKKyAgICAgICAgICAgICwgc3RlcFJhbmdlKHN0ZXBSYW5nZSkKKyAgICAgICAgeworICAg ICAgICB9CisKKyAgICAgICAgYm9vbCBzaG91bGRIYXZlU2Vjb25kRmllbGQoKSBjb25zdDsKKyAg ICB9OworCiAgICAgc3RhdGljIFBhc3NSZWZQdHI8RGF0ZVRpbWVFZGl0RWxlbWVudD4gY3JlYXRl KERvY3VtZW50KiwgRWRpdENvbnRyb2xPd25lciYpOwogCiAgICAgdmlydHVhbCB+RGF0ZVRpbWVF ZGl0RWxlbWVudCgpOwpAQCAtNzEsOCArODUsOCBAQCBwdWJsaWM6CiAgICAgdm9pZCByZWFkT25s eVN0YXRlQ2hhbmdlZCgpOwogICAgIHZvaWQgcmVtb3ZlRWRpdENvbnRyb2xPd25lcigpIHsgbV9l ZGl0Q29udHJvbE93bmVyID0gMDsgfQogICAgIHZvaWQgcmVzZXRGaWVsZHMoKTsKLSAgICB2b2lk IHNldEVtcHR5VmFsdWUoY29uc3QgU3RlcFJhbmdlJiwgY29uc3QgRGF0ZUNvbXBvbmVudHMmICBk YXRlRm9yUmVhZE9ubHlGaWVsZCwgTG9jYWxpemVyJik7Ci0gICAgdm9pZCBzZXRWYWx1ZUFzRGF0 ZShjb25zdCBTdGVwUmFuZ2UmLCBjb25zdCBEYXRlQ29tcG9uZW50cyYsIExvY2FsaXplciYpOwor ICAgIHZvaWQgc2V0RW1wdHlWYWx1ZShjb25zdCBMYXlvdXRQYXJhbWV0ZXJzJiwgY29uc3QgRGF0 ZUNvbXBvbmVudHMmIGRhdGVGb3JSZWFkT25seUZpZWxkKTsKKyAgICB2b2lkIHNldFZhbHVlQXNE YXRlKGNvbnN0IExheW91dFBhcmFtZXRlcnMmLCBjb25zdCBEYXRlQ29tcG9uZW50cyYpOwogICAg IHZvaWQgc2V0VmFsdWVBc0RhdGVUaW1lRmllbGRzU3RhdGUoY29uc3QgRGF0ZVRpbWVGaWVsZHNT dGF0ZSYsIGNvbnN0IERhdGVDb21wb25lbnRzJiBkYXRlRm9yUmVhZE9ubHlGaWVsZCk7CiAgICAg RGF0ZVRpbWVGaWVsZHNTdGF0ZSB2YWx1ZUFzRGF0ZVRpbWVGaWVsZHNTdGF0ZSgpIGNvbnN0Owog ICAgIGRvdWJsZSB2YWx1ZUFzRG91YmxlKCkgY29uc3Q7CkBAIC05OSw3ICsxMTMsNyBAQCBwcml2 YXRlOgogICAgIHNpemVfdCBmb2N1c2VkRmllbGRJbmRleCgpIGNvbnN0OwogICAgIGJvb2wgaXNE aXNhYmxlZCgpIGNvbnN0OwogICAgIGJvb2wgaXNSZWFkT25seSgpIGNvbnN0OwotICAgIHZvaWQg bGF5b3V0KGNvbnN0IFN0ZXBSYW5nZSYsIGNvbnN0IERhdGVDb21wb25lbnRzJiwgTG9jYWxpemVy Jik7CisgICAgdm9pZCBsYXlvdXQoY29uc3QgTGF5b3V0UGFyYW1ldGVycyYsIGNvbnN0IERhdGVD b21wb25lbnRzJik7CiAgICAgdm9pZCB1cGRhdGVVSVN0YXRlKCk7CiAKICAgICAvLyBEYXRlVGlt ZUZpZWxkRWxlbWVudDo6RmllbGRPd25lciBmdW5jdGlvbnMuCg==