97864 2012-09-27 22:35:10 -0700 [Forms] Adding DateTimeMonthFieldElement and DateTimeYearFieldElement 2012-09-28 00:03:15 -0700 1 1 1 Unclassified WebKit Forms 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 97299 1 yosin yosin tkent oldest_to_newest 730250 0 yosin 2012-09-27 22:35:10 -0700 To implement multiple fields "month" input UI, we would like to have DateTimeMonthFieldElement and DateTimeYearFieldElement 730289 1 166153 yosin 2012-09-27 23:50:10 -0700 Created attachment 166153 Patch 1 730291 2 166153 yosin 2012-09-27 23:50:46 -0700 Comment on attachment 166153 Patch 1 Could you review this patch? Thanks in advance. 730300 3 166153 tkent 2012-09-28 00:01:48 -0700 Comment on attachment 166153 Patch 1 View in context: https://bugs.webkit.org/attachment.cgi?id=166153&action=review > Source/WebCore/ChangeLog:26 > + Note: This patch affects ports which enable both ENABLE_INPUT_TYPE_TIME > + and ENABLE_INPUT_MULTIPLE_FIELDS_UI. Looks wrong. INPUT_TYPE_TIME is unrelated. > Source/WebCore/ChangeLog:52 > + (WebCore::DateTimeNumericFieldElement::stepDown): Changed to use defaultValueForStepDown instead of maximum field value. > + (WebCore::DateTimeNumericFieldElement::stepUp): Changed to use defaultValueForStepUp minium field value. > + (WebCore::DateTimeNumericFieldElement::value): Changed to use "%04d" when maximum field value is greater than 999 for year field. They should be "why" comments. "what" comments are not helpful in many cases. 730301 4 166153 yosin 2012-09-28 00:03:10 -0700 Comment on attachment 166153 Patch 1 Clearing flags on attachment: 166153 Committed r129855: <http://trac.webkit.org/changeset/129855> 730302 5 yosin 2012-09-28 00:03:15 -0700 All reviewed patches have been landed. Closing bug. 166153 2012-09-27 23:50:10 -0700 2012-09-28 00:03:10 -0700 Patch 1 bug-97864-20120928154927.patch text/plain 14618 yosin U3VidmVyc2lvbiBSZXZpc2lvbjogMTI5ODU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTY5MzQ0YWNlNWM0YmJj M2M3MDY5NWM2OWU2MjU4M2ZlYWU2MTBmMC4uYjUzNDMxODAyOTQzYzRmMjU5YmNlZmVkYjdkZWVi NTU3MjJjZDBkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDYwIEBACiAyMDEyLTA5LTI3ICBZb3No aWZ1bWkgSW5vdWUgIDx5b3NpbkBjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgW0Zvcm1zXSBBZGRp bmcgRGF0ZVRpbWVNb250aEZpZWxkRWxlbWVudCBhbmQgRGF0ZVRpbWVZZWFyRmllbGRFbGVtZW50 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05Nzg2NAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgcGF0 Y2ggaXMgYSBwYXJ0IG9mIHByZXBhcmF0aW9uIG9mIGltcGxlbWVudGluZyBtdWx0aXBsZSBmaWVs ZHMKKyAgICAgICAgZGF0ZS90aW1lIGlucHV0IFVJLgorCisgICAgICAgIFRoaXMgcGF0Y2ggaW50 cm9kdWNlcyBEYXRlVGltZU1vbnRoRmllbGRFbGVtZW50IGFuZCBEYXRlVGltZVllYXJGaWVsZEVs ZW1lbnQKKyAgICAgICAgY2xhc3NlcyBmb3IgaW1wbGVtZW50aW5nIG11bHRpcGxlIGZpZWxkcyAi bW9udGgiIGlucHV0IHR5cGUuCisKKyAgICAgICAgTXVsdGlwbGUgZmllbGRzICJtb250aCIgaW5w dXQgdHlwZSB1c2VzIHR3byBmaWVsZHMgZm9yIG1vbnRoIGFuZCB5ZWFyCisgICAgICAgIGluIGxv Y2FsZSBkZXBlbmRlbnQgb3JkZXIuIE1vbnRoIGZpZWxkIGRpc3BsYXkgbW9udGggYXMgdHdvIGRp Z2l0LgorICAgICAgICBZZWFyIGZpZWxkIGRpc3BsYXkgeWVhciBhcyBmb3VyIGRpZ2l0cyBpbiB1 c3VhbCBjYXNlIGFuZCBjYW4gZGlzcGxheQorICAgICAgICB1cCB0byA2IGRpZ2l0cyB0byBzdXBw b3J0IG1heGltdW0geWVhciAyNzU3NjAsIGRlZmluZWQgaW4gSFRNTDUKKyAgICAgICAgc3BlY2lm aWNhdGlvbi4KKworICAgICAgICBUaGlzIHBhdGNoIGFsc28gY2hhbmdlcyBkZWZhdWx0IHZhbHVl IGZvciBzdGVwIGRvd24gYW5kIHVwIG9uIGVtcHR5CisgICAgICAgIGZpZWxkIHRvIGJldHRlciBV SSBpbiB5ZWFyIGZpZWxkLiBZZWFyIGZpZWxkIGRpc3BsYXlzIGN1cnJlbnQgeWVhcgorICAgICAg ICB3aGVuIHN0ZXAgZG93biBhbmQgdXAgb24gZW1wdHkgZmllbGQgcmF0aGVyIHRoYW4gbWluaW11 bSB5ZWFyIDEsIG9yCisgICAgICAgIG1heGltdW0geWVhciAyNzU3NjAuCisKKyAgICAgICAgTm90 ZTogVGhpcyBwYXRjaCBhZmZlY3RzIHBvcnRzIHdoaWNoIGVuYWJsZSBib3RoIEVOQUJMRV9JTlBV VF9UWVBFX1RJTUUKKyAgICAgICAgYW5kIEVOQUJMRV9JTlBVVF9NVUxUSVBMRV9GSUVMRFNfVUku CisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBUaGlzIHBhdGNoIGRvZXNuJ3QgY2hhbmdlIGJlaGF2 aW9yLgorCisgICAgICAgICogaHRtbC9zaGFkb3cvRGF0ZVRpbWVGaWVsZEVsZW1lbnRzLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkRhdGVUaW1lTW9udGhGaWVsZEVsZW1lbnQ6OkRhdGVUaW1lTW9u dGhGaWVsZEVsZW1lbnQpOiBBZGRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkRhdGVUaW1lTW9udGhG aWVsZEVsZW1lbnQ6OmNyZWF0ZSk6IEFkZGVkLgorICAgICAgICAoV2ViQ29yZTo6RGF0ZVRpbWVN b250aEZpZWxkRWxlbWVudDo6cG9wdWxhdGVEYXRlVGltZUZpZWxkc1N0YXRlKTogQWRkZWQuCisg ICAgICAgIChXZWJDb3JlOjpEYXRlVGltZU1vbnRoRmllbGRFbGVtZW50OjpzZXRWYWx1ZUFzRGF0 ZSk6IEFkZGVkLgorICAgICAgICAoV2ViQ29yZTo6RGF0ZVRpbWVNb250aEZpZWxkRWxlbWVudDo6 c2V0VmFsdWVBc0RhdGVUaW1lRmllbGRzU3RhdGUpOiBBZGRlZC4KKyAgICAgICAgKFdlYkNvcmU6 OkRhdGVUaW1lWWVhckZpZWxkRWxlbWVudDo6RGF0ZVRpbWVZZWFyRmllbGRFbGVtZW50KTogQWRk ZWQuCisgICAgICAgIChXZWJDb3JlOjpEYXRlVGltZVllYXJGaWVsZEVsZW1lbnQ6OmNyZWF0ZSk6 IEFkZGVkLgorICAgICAgICAoV2ViQ29yZTo6RGF0ZVRpbWVZZWFyRmllbGRFbGVtZW50OjpkZWZh dWx0VmFsdWVGb3JTdGVwRG93bik6IEFkZGVkLgorICAgICAgICAoV2ViQ29yZTo6RGF0ZVRpbWVZ ZWFyRmllbGRFbGVtZW50OjpkZWZhdWx0VmFsdWVGb3JTdGVwVXApOiBBZGRlZC4KKyAgICAgICAg KFdlYkNvcmU6OkRhdGVUaW1lWWVhckZpZWxkRWxlbWVudDo6cG9wdWxhdGVEYXRlVGltZUZpZWxk c1N0YXRlKTogQWRkZWQuCisgICAgICAgIChXZWJDb3JlOjpEYXRlVGltZVllYXJGaWVsZEVsZW1l bnQ6OnNldFZhbHVlQXNEYXRlKTogQWRkZWQuCisgICAgICAgIChXZWJDb3JlOjpEYXRlVGltZVll YXJGaWVsZEVsZW1lbnQ6OnNldFZhbHVlQXNEYXRlVGltZUZpZWxkc1N0YXRlKTogQWRkZWQuCisg ICAgICAgICogaHRtbC9zaGFkb3cvRGF0ZVRpbWVGaWVsZEVsZW1lbnRzLmg6CisgICAgICAgIChE YXRlVGltZU1vbnRoRmllbGRFbGVtZW50KTogQWRkZWQuCisgICAgICAgIChEYXRlVGltZVllYXJG aWVsZEVsZW1lbnQpOiBBZGRlZC4KKyAgICAgICAgKiBodG1sL3NoYWRvdy9EYXRlVGltZU51bWVy aWNGaWVsZEVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RGF0ZVRpbWVOdW1lcmljRmll bGRFbGVtZW50OjpSYW5nZTo6aXNJblJhbmdlKTogQWRkZWQgZm9yIGVhc2Ugb2YgY2hlY2tpbmcg dmFsdWUgaXMgaW4gcmFuZ2UuCisgICAgICAgIChXZWJDb3JlOjpEYXRlVGltZU51bWVyaWNGaWVs ZEVsZW1lbnQ6OmRlZmF1bHRWYWx1ZUZvclN0ZXBEb3duKTogQWRkZWQgZm9yIGRlZmF1bHQgYmVo YXZpb3IuCisgICAgICAgIChXZWJDb3JlOjpEYXRlVGltZU51bWVyaWNGaWVsZEVsZW1lbnQ6OmRl ZmF1bHRWYWx1ZUZvclN0ZXBVcCk6IGRpdHRvLgorICAgICAgICAoV2ViQ29yZTo6RGF0ZVRpbWVO dW1lcmljRmllbGRFbGVtZW50OjpzdGVwRG93bik6IENoYW5nZWQgdG8gdXNlIGRlZmF1bHRWYWx1 ZUZvclN0ZXBEb3duIGluc3RlYWQgb2YgbWF4aW11bSBmaWVsZCB2YWx1ZS4KKyAgICAgICAgKFdl YkNvcmU6OkRhdGVUaW1lTnVtZXJpY0ZpZWxkRWxlbWVudDo6c3RlcFVwKTogIENoYW5nZWQgdG8g dXNlIGRlZmF1bHRWYWx1ZUZvclN0ZXBVcCBtaW5pdW0gZmllbGQgdmFsdWUuCisgICAgICAgIChX ZWJDb3JlOjpEYXRlVGltZU51bWVyaWNGaWVsZEVsZW1lbnQ6OnZhbHVlKTogQ2hhbmdlZCB0byB1 c2UgIiUwNGQiIHdoZW4gbWF4aW11bSBmaWVsZCB2YWx1ZSBpcyBncmVhdGVyIHRoYW4gOTk5IGZv ciB5ZWFyIGZpZWxkLgorICAgICAgICAqIGh0bWwvc2hhZG93L0RhdGVUaW1lTnVtZXJpY0ZpZWxk RWxlbWVudC5oOgorICAgICAgICAoRGF0ZVRpbWVOdW1lcmljRmllbGRFbGVtZW50KTogQ2hhbmdl ZCB0byBhZGQgZGVjbGFyYXRpb25zIG9mIGRlZmF1bHRWYWx1ZUZvclN0ZXBEb3duKCkgYW5kIGRl ZmF1bHRWYWx1ZUZvclN0ZXBVcCgpLgorCisyMDEyLTA5LTI3ICBZb3NoaWZ1bWkgSW5vdWUgIDx5 b3NpbkBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgW0Zvcm1zXSBBZGRpbmcgcGxhY2Vob2xkZXIg ZmVhdHVyZSB0byBEYXRlVGltZU51bWVyaWNFbGVtZW50LCBhbmQgdXBkYXRlIGl0cyBleGlzdGlu ZyBzdWJjbGFzc2VzLgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9OTc4NjMKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvRGF0 ZVRpbWVGaWVsZEVsZW1lbnRzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L0RhdGVU aW1lRmllbGRFbGVtZW50cy5jcHAKaW5kZXggNGE3OWViOTIyOWFmZWQ3NGYyYWYyNzdmYmEzMzI2 ZDUxM2E4YzVmMy4uYzQ1ZWVkOThmYmMxNDI1MzkyNjY3ZTllN2FmMTY4MGYxZmZkZjI1MiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvRGF0ZVRpbWVGaWVsZEVsZW1lbnRz LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9EYXRlVGltZUZpZWxkRWxlbWVu dHMuY3BwCkBAIC0zMCw2ICszMCw4IEBACiAjaW5jbHVkZSAiRGF0ZUNvbXBvbmVudHMuaCIKICNp bmNsdWRlICJEYXRlVGltZUZpZWxkc1N0YXRlLmgiCiAjaW5jbHVkZSAiTG9jYWxpemVkU3RyaW5n cy5oIgorI2luY2x1ZGUgPHd0Zi9DdXJyZW50VGltZS5oPgorI2luY2x1ZGUgPHd0Zi9EYXRlTWF0 aC5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAgLTI1Niw2ICsyNTgsNDcgQEAgdm9pZCBE YXRlVGltZU1pbnV0ZUZpZWxkRWxlbWVudDo6c2V0VmFsdWVBc0RhdGVUaW1lRmllbGRzU3RhdGUo Y29uc3QgRGF0ZVRpbWVGaWUKIAogLy8gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogCitE YXRlVGltZU1vbnRoRmllbGRFbGVtZW50OjpEYXRlVGltZU1vbnRoRmllbGRFbGVtZW50KERvY3Vt ZW50KiBkb2N1bWVudCwgRmllbGRPd25lciYgZmllbGRPd25lciwgY29uc3QgU3RyaW5nJiBwbGFj ZWhvbGRlcikKKyAgICA6IERhdGVUaW1lTnVtZXJpY0ZpZWxkRWxlbWVudChkb2N1bWVudCwgZmll bGRPd25lciwgMSwgMTIsIHBsYWNlaG9sZGVyKQoreworfQorCitQYXNzUmVmUHRyPERhdGVUaW1l TW9udGhGaWVsZEVsZW1lbnQ+IERhdGVUaW1lTW9udGhGaWVsZEVsZW1lbnQ6OmNyZWF0ZShEb2N1 bWVudCogZG9jdW1lbnQsIEZpZWxkT3duZXImIGZpZWxkT3duZXIsIGNvbnN0IFN0cmluZyYgcGxh Y2Vob2xkZXIpCit7CisgICAgREVGSU5FX1NUQVRJQ19MT0NBTChBdG9taWNTdHJpbmcsIG1vbnRo UHN1ZWRvSWQsICgiLXdlYmtpdC1kYXRldGltZS1lZGl0LW1vbnRoLWZpZWxkIikpOworICAgIFJl ZlB0cjxEYXRlVGltZU1vbnRoRmllbGRFbGVtZW50PiBmaWVsZCA9IGFkb3B0UmVmKG5ldyBEYXRl VGltZU1vbnRoRmllbGRFbGVtZW50KGRvY3VtZW50LCBmaWVsZE93bmVyLCBwbGFjZWhvbGRlcikp OworICAgIGZpZWxkLT5pbml0aWFsaXplKG1vbnRoUHN1ZWRvSWQsIEFYTW9udGhGaWVsZFRleHQo KSk7CisgICAgcmV0dXJuIGZpZWxkLnJlbGVhc2UoKTsKK30KKwordm9pZCBEYXRlVGltZU1vbnRo RmllbGRFbGVtZW50Ojpwb3B1bGF0ZURhdGVUaW1lRmllbGRzU3RhdGUoRGF0ZVRpbWVGaWVsZHNT dGF0ZSYgZGF0ZVRpbWVGaWVsZHNTdGF0ZSkKK3sKKyAgICBkYXRlVGltZUZpZWxkc1N0YXRlLnNl dE1vbnRoKGhhc1ZhbHVlKCkgPyB2YWx1ZUFzSW50ZWdlcigpIDogRGF0ZVRpbWVGaWVsZHNTdGF0 ZTo6ZW1wdHlWYWx1ZSk7Cit9CisKK3ZvaWQgRGF0ZVRpbWVNb250aEZpZWxkRWxlbWVudDo6c2V0 VmFsdWVBc0RhdGUoY29uc3QgRGF0ZUNvbXBvbmVudHMmIGRhdGUpCit7CisgICAgc2V0VmFsdWVB c0ludGVnZXIoZGF0ZS5tb250aCgpICsgMSk7Cit9CisKK3ZvaWQgRGF0ZVRpbWVNb250aEZpZWxk RWxlbWVudDo6c2V0VmFsdWVBc0RhdGVUaW1lRmllbGRzU3RhdGUoY29uc3QgRGF0ZVRpbWVGaWVs ZHNTdGF0ZSYgZGF0ZVRpbWVGaWVsZHNTdGF0ZSwgY29uc3QgRGF0ZUNvbXBvbmVudHMmIGRhdGVG b3JSZWFkT25seUZpZWxkKQoreworICAgIGlmICghZGF0ZVRpbWVGaWVsZHNTdGF0ZS5oYXNNb250 aCgpKSB7CisgICAgICAgIHNldEVtcHR5VmFsdWUoZGF0ZUZvclJlYWRPbmx5RmllbGQpOworICAg ICAgICByZXR1cm47CisgICAgfQorCisgICAgY29uc3QgdW5zaWduZWQgdmFsdWUgPSBkYXRlVGlt ZUZpZWxkc1N0YXRlLm1vbnRoKCk7CisgICAgaWYgKHJhbmdlKCkuaXNJblJhbmdlKHN0YXRpY19j YXN0PGludD4odmFsdWUpKSkgeworICAgICAgICBzZXRWYWx1ZUFzSW50ZWdlcih2YWx1ZSk7Cisg ICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBzZXRFbXB0eVZhbHVlKGRhdGVGb3JSZWFkT25s eUZpZWxkKTsKK30KKworLy8gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQorCiBEYXRlVGlt ZVNlY29uZEZpZWxkRWxlbWVudDo6RGF0ZVRpbWVTZWNvbmRGaWVsZEVsZW1lbnQoRG9jdW1lbnQq IGRvY3VtZW50LCBGaWVsZE93bmVyJiBmaWVsZE93bmVyKQogICAgIDogRGF0ZVRpbWVOdW1lcmlj RmllbGRFbGVtZW50KGRvY3VtZW50LCBmaWVsZE93bmVyLCAwLCA1OSwgIi0tIikKIHsKQEAgLTI5 NSw2ICszMzgsNzIgQEAgdm9pZCBEYXRlVGltZVNlY29uZEZpZWxkRWxlbWVudDo6c2V0VmFsdWVB c0RhdGVUaW1lRmllbGRzU3RhdGUoY29uc3QgRGF0ZVRpbWVGaWUKICAgICBzZXRWYWx1ZUFzSW50 ZWdlcih2YWx1ZSk7CiB9CiAKKy8vIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KKworLy8g SFRNTDUgdXNlcyBJU08tODYwMSBmb3JtYXQgd2l0aCB5ZWFyID49IDEuIEdyZWdvcmlhbiBjYWxl bmRhciBzdGFydGVkIGluCisvLyAxNTgyLiBIb3dldmVyLCB3ZSBuZWVkIHRvIHN1cHBvcnQgMDAw MS0wMS0wMSBpbiBHcmVnb3JpYW4gY2FsZW5kYXIgcnVsZS4KK3N0YXRpYyBjb25zdCBpbnQgbWlu aW11bVllYXIgPSAxOworLy8gRGF0ZSBpbiBFQ01BU2NyaXB0IGNhbid0IHJlcHJlc2VudCBkYXRl cyBsYXRlciB0aGFuIDI3NTc2MC0wOS0xM1QwMDowMFouCisvLyBTbywgd2UgaGF2ZSB0aGUgc2Ft ZSB1cHBlciBsaW1pdCBpbiBIVE1MNSBkYXRlcy4KK3N0YXRpYyBjb25zdCBpbnQgbWF4aW11bVll YXIgPSAyNzU3NjA7CisKK0RhdGVUaW1lWWVhckZpZWxkRWxlbWVudDo6RGF0ZVRpbWVZZWFyRmll bGRFbGVtZW50KERvY3VtZW50KiBkb2N1bWVudCwgRmllbGRPd25lciYgZmllbGRPd25lciwgY29u c3QgU3RyaW5nJiBwbGFjZWhvbGRlcikKKyAgICA6IERhdGVUaW1lTnVtZXJpY0ZpZWxkRWxlbWVu dChkb2N1bWVudCwgZmllbGRPd25lciwgbWluaW11bVllYXIsIG1heGltdW1ZZWFyLCBwbGFjZWhv bGRlcikKK3sKK30KKworUGFzc1JlZlB0cjxEYXRlVGltZVllYXJGaWVsZEVsZW1lbnQ+IERhdGVU aW1lWWVhckZpZWxkRWxlbWVudDo6Y3JlYXRlKERvY3VtZW50KiBkb2N1bWVudCwgRmllbGRPd25l ciYgZmllbGRPd25lciwgY29uc3QgU3RyaW5nJiBwbGFjZWhvbGRlcikKK3sKKyAgICBERUZJTkVf U1RBVElDX0xPQ0FMKEF0b21pY1N0cmluZywgeWVhclBzdWVkb0lkLCAoIi13ZWJraXQtZGF0ZXRp bWUtZWRpdC15ZWFyLWZpZWxkIikpOworICAgIFJlZlB0cjxEYXRlVGltZVllYXJGaWVsZEVsZW1l bnQ+IGZpZWxkID0gYWRvcHRSZWYobmV3IERhdGVUaW1lWWVhckZpZWxkRWxlbWVudChkb2N1bWVu dCwgZmllbGRPd25lciwgcGxhY2Vob2xkZXIpKTsKKyAgICBmaWVsZC0+aW5pdGlhbGl6ZSh5ZWFy UHN1ZWRvSWQsIEFYWWVhckZpZWxkVGV4dCgpKTsKKyAgICByZXR1cm4gZmllbGQucmVsZWFzZSgp OworfQorCitpbnQgRGF0ZVRpbWVZZWFyRmllbGRFbGVtZW50OjpkZWZhdWx0VmFsdWVGb3JTdGVw RG93bigpIGNvbnN0Cit7CisgICAgZG91YmxlIGN1cnJlbnQgPSBjdXJyZW50VGltZU1TKCk7Cisg ICAgZG91YmxlIHV0Y09mZnNldCA9IGNhbGN1bGF0ZVVUQ09mZnNldCgpOworICAgIGRvdWJsZSBk c3RPZmZzZXQgPSBjYWxjdWxhdGVEU1RPZmZzZXQoY3VycmVudCwgdXRjT2Zmc2V0KTsKKyAgICBp bnQgb2Zmc2V0ID0gc3RhdGljX2Nhc3Q8aW50PigodXRjT2Zmc2V0ICsgZHN0T2Zmc2V0KSAvIG1z UGVyTWludXRlKTsKKyAgICBjdXJyZW50ICs9IG9mZnNldCAqIG1zUGVyTWludXRlOworCisgICAg RGF0ZUNvbXBvbmVudHMgZGF0ZTsKKyAgICBkYXRlLnNldE1pbGxpc2Vjb25kc1NpbmNlRXBvY2hG b3JNb250aChjdXJyZW50KTsKKyAgICByZXR1cm4gZGF0ZS5mdWxsWWVhcigpOworfQorCitpbnQg RGF0ZVRpbWVZZWFyRmllbGRFbGVtZW50OjpkZWZhdWx0VmFsdWVGb3JTdGVwVXAoKSBjb25zdAor eworICAgIHJldHVybiBkZWZhdWx0VmFsdWVGb3JTdGVwRG93bigpOworfQorCit2b2lkIERhdGVU aW1lWWVhckZpZWxkRWxlbWVudDo6cG9wdWxhdGVEYXRlVGltZUZpZWxkc1N0YXRlKERhdGVUaW1l RmllbGRzU3RhdGUmIGRhdGVUaW1lRmllbGRzU3RhdGUpCit7CisgICAgZGF0ZVRpbWVGaWVsZHNT dGF0ZS5zZXRZZWFyKGhhc1ZhbHVlKCkgPyB2YWx1ZUFzSW50ZWdlcigpIDogRGF0ZVRpbWVGaWVs ZHNTdGF0ZTo6ZW1wdHlWYWx1ZSk7Cit9CisKK3ZvaWQgRGF0ZVRpbWVZZWFyRmllbGRFbGVtZW50 OjpzZXRWYWx1ZUFzRGF0ZShjb25zdCBEYXRlQ29tcG9uZW50cyYgZGF0ZSkKK3sKKyAgICBzZXRW YWx1ZUFzSW50ZWdlcihkYXRlLmZ1bGxZZWFyKCkpOworfQorCit2b2lkIERhdGVUaW1lWWVhckZp ZWxkRWxlbWVudDo6c2V0VmFsdWVBc0RhdGVUaW1lRmllbGRzU3RhdGUoY29uc3QgRGF0ZVRpbWVG aWVsZHNTdGF0ZSYgZGF0ZVRpbWVGaWVsZHNTdGF0ZSwgY29uc3QgRGF0ZUNvbXBvbmVudHMmIGRh dGVGb3JSZWFkT25seUZpZWxkKQoreworICAgIGlmICghZGF0ZVRpbWVGaWVsZHNTdGF0ZS5oYXNZ ZWFyKCkpIHsKKyAgICAgICAgc2V0RW1wdHlWYWx1ZShkYXRlRm9yUmVhZE9ubHlGaWVsZCk7Cisg ICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBjb25zdCB1bnNpZ25lZCB2YWx1ZSA9IGRhdGVU aW1lRmllbGRzU3RhdGUueWVhcigpOworICAgIGlmIChyYW5nZSgpLmlzSW5SYW5nZShzdGF0aWNf Y2FzdDxpbnQ+KHZhbHVlKSkpIHsKKyAgICAgICAgc2V0VmFsdWVBc0ludGVnZXIodmFsdWUpOwor ICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgc2V0RW1wdHlWYWx1ZShkYXRlRm9yUmVhZE9u bHlGaWVsZCk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIAogI2VuZGlmCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9EYXRlVGltZUZpZWxkRWxlbWVudHMuaCBi L1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L0RhdGVUaW1lRmllbGRFbGVtZW50cy5oCmluZGV4 IGUxNGRkMTMxNzNiMWViMjQ4YTVkMDI4MzM2NTQzZDUyMTUxNGRmZmEuLjdjMzI4ZmRhZDFjYWVj ZThhNWZmNWZmNDI2MWU5ZmM1ODc5MjU2NjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0 bWwvc2hhZG93L0RhdGVUaW1lRmllbGRFbGVtZW50cy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0 bWwvc2hhZG93L0RhdGVUaW1lRmllbGRFbGVtZW50cy5oCkBAIC0xMDMsNiArMTAzLDIxIEBAIHBy aXZhdGU6CiAgICAgdmlydHVhbCB2b2lkIHNldFZhbHVlQXNEYXRlVGltZUZpZWxkc1N0YXRlKGNv bnN0IERhdGVUaW1lRmllbGRzU3RhdGUmLCBjb25zdCBEYXRlQ29tcG9uZW50cyYgZGF0ZUZvclJl YWRPbmx5RmllbGQpIE9WRVJSSURFIEZJTkFMOwogfTsKIAorY2xhc3MgRGF0ZVRpbWVNb250aEZp ZWxkRWxlbWVudCA6IHB1YmxpYyBEYXRlVGltZU51bWVyaWNGaWVsZEVsZW1lbnQgeworICAgIFdU Rl9NQUtFX05PTkNPUFlBQkxFKERhdGVUaW1lTW9udGhGaWVsZEVsZW1lbnQpOworCitwdWJsaWM6 CisgICAgc3RhdGljIFBhc3NSZWZQdHI8RGF0ZVRpbWVNb250aEZpZWxkRWxlbWVudD4gY3JlYXRl KERvY3VtZW50KiwgRmllbGRPd25lciYsIGNvbnN0IFN0cmluZyYgcGxhY2Vob2xkZXIpOworCitw cml2YXRlOgorICAgIERhdGVUaW1lTW9udGhGaWVsZEVsZW1lbnQoRG9jdW1lbnQqLCBGaWVsZE93 bmVyJiwgY29uc3QgU3RyaW5nJiBwbGFjZWhvbGRlcik7CisKKyAgICAvLyBEYXRlVGltZUZpZWxk RWxlbWVudCBmdW5jdGlvbnMuCisgICAgdmlydHVhbCB2b2lkIHBvcHVsYXRlRGF0ZVRpbWVGaWVs ZHNTdGF0ZShEYXRlVGltZUZpZWxkc1N0YXRlJikgT1ZFUlJJREUgRklOQUw7CisgICAgdmlydHVh bCB2b2lkIHNldFZhbHVlQXNEYXRlKGNvbnN0IERhdGVDb21wb25lbnRzJikgT1ZFUlJJREUgRklO QUw7CisgICAgdmlydHVhbCB2b2lkIHNldFZhbHVlQXNEYXRlVGltZUZpZWxkc1N0YXRlKGNvbnN0 IERhdGVUaW1lRmllbGRzU3RhdGUmLCBjb25zdCBEYXRlQ29tcG9uZW50cyYgZGF0ZUZvclJlYWRP bmx5RmllbGQpIE9WRVJSSURFIEZJTkFMOworfTsKKwogY2xhc3MgRGF0ZVRpbWVTZWNvbmRGaWVs ZEVsZW1lbnQgOiBwdWJsaWMgRGF0ZVRpbWVOdW1lcmljRmllbGRFbGVtZW50IHsKICAgICBXVEZf TUFLRV9OT05DT1BZQUJMRShEYXRlVGltZVNlY29uZEZpZWxkRWxlbWVudCk7CiAKQEAgLTExOCw2 ICsxMzMsMjUgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIHZvaWQgc2V0VmFsdWVBc0RhdGVUaW1l RmllbGRzU3RhdGUoY29uc3QgRGF0ZVRpbWVGaWVsZHNTdGF0ZSYsIGNvbnN0IERhdGVDb21wb25l bnRzJiBkYXRlRm9yUmVhZE9ubHlGaWVsZCkgT1ZFUlJJREUgRklOQUw7CiB9OwogCitjbGFzcyBE YXRlVGltZVllYXJGaWVsZEVsZW1lbnQgOiBwdWJsaWMgRGF0ZVRpbWVOdW1lcmljRmllbGRFbGVt ZW50IHsKKyAgICBXVEZfTUFLRV9OT05DT1BZQUJMRShEYXRlVGltZVllYXJGaWVsZEVsZW1lbnQp OworCitwdWJsaWM6CisgICAgc3RhdGljIFBhc3NSZWZQdHI8RGF0ZVRpbWVZZWFyRmllbGRFbGVt ZW50PiBjcmVhdGUoRG9jdW1lbnQqLCBGaWVsZE93bmVyJiwgY29uc3QgU3RyaW5nJiBwbGFjZWhv bGRlcik7CisKK3ByaXZhdGU6CisgICAgRGF0ZVRpbWVZZWFyRmllbGRFbGVtZW50KERvY3VtZW50 KiwgRmllbGRPd25lciYsIGNvbnN0IFN0cmluZyYgcGxhY2Vob2xkZXIpOworCisgICAgLy8gRGF0 ZVRpbWVGaWVsZEVsZW1lbnQgZnVuY3Rpb25zLgorICAgIHZpcnR1YWwgdm9pZCBwb3B1bGF0ZURh dGVUaW1lRmllbGRzU3RhdGUoRGF0ZVRpbWVGaWVsZHNTdGF0ZSYpIE9WRVJSSURFIEZJTkFMOwor ICAgIHZpcnR1YWwgdm9pZCBzZXRWYWx1ZUFzRGF0ZShjb25zdCBEYXRlQ29tcG9uZW50cyYpIE9W RVJSSURFIEZJTkFMOworICAgIHZpcnR1YWwgdm9pZCBzZXRWYWx1ZUFzRGF0ZVRpbWVGaWVsZHNT dGF0ZShjb25zdCBEYXRlVGltZUZpZWxkc1N0YXRlJiwgY29uc3QgRGF0ZUNvbXBvbmVudHMmIGRh dGVGb3JSZWFkT25seUZpZWxkKSBPVkVSUklERSBGSU5BTDsKKworICAgIC8vIERhdGVUaW1lTnVt ZXJpY0ZpZWxkRWxlbWVudCBmdW5jdGlvbnMuCisgICAgdmlydHVhbCBpbnQgZGVmYXVsdFZhbHVl Rm9yU3RlcERvd24oKSBjb25zdCBPVkVSUklERSBGSU5BTDsKKyAgICB2aXJ0dWFsIGludCBkZWZh dWx0VmFsdWVGb3JTdGVwVXAoKSBjb25zdCBPVkVSUklERSBGSU5BTDsKK307CisKIH0gLy8gbmFt ZXNwYWNlIFdlYkNvcmUKIAogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1s L3NoYWRvdy9EYXRlVGltZU51bWVyaWNGaWVsZEVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUv aHRtbC9zaGFkb3cvRGF0ZVRpbWVOdW1lcmljRmllbGRFbGVtZW50LmNwcAppbmRleCAyMjI4Y2Zh NDM5YTZmMDk1NDA4N2JjYTAwYmRmMTVmNWVlOWMyMGVmLi4yYzg5M2ZlMDMwNzY5NzljYzg2ODU5 MDFkOGUxMzQ0MTRiMjhlMGU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRv dy9EYXRlVGltZU51bWVyaWNGaWVsZEVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0 bWwvc2hhZG93L0RhdGVUaW1lTnVtZXJpY0ZpZWxkRWxlbWVudC5jcHAKQEAgLTQ3LDYgKzQ3LDEz IEBAIGludCBEYXRlVGltZU51bWVyaWNGaWVsZEVsZW1lbnQ6OlJhbmdlOjpjbGFtcFZhbHVlKGlu dCB2YWx1ZSkgY29uc3QKICAgICByZXR1cm4gc3RkOjptaW4oc3RkOjptYXgodmFsdWUsIG1pbmlt dW0pLCBtYXhpbXVtKTsKIH0KIAorYm9vbCBEYXRlVGltZU51bWVyaWNGaWVsZEVsZW1lbnQ6OlJh bmdlOjppc0luUmFuZ2UoaW50IHZhbHVlKSBjb25zdAoreworICAgIHJldHVybiB2YWx1ZSA+PSBt aW5pbXVtICYmIHZhbHVlIDw9IG1heGltdW07Cit9CisKKy8vIC0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0KKwogRGF0ZVRpbWVOdW1lcmljRmllbGRFbGVtZW50OjpEYXRlVGltZU51bWVyaWNG aWVsZEVsZW1lbnQoRG9jdW1lbnQqIGRvY3VtZW50LCBGaWVsZE93bmVyJiBmaWVsZE93bmVyLCBp bnQgbWluaW11bSwgaW50IG1heGltdW0sIGNvbnN0IFN0cmluZyYgcGxhY2Vob2xkZXIpCiAgICAg OiBEYXRlVGltZUZpZWxkRWxlbWVudChkb2N1bWVudCwgZmllbGRPd25lcikKICAgICAsIG1fbGFz dERpZ2l0Q2hhclRpbWUoMCkKQEAgLTU3LDYgKzY0LDE2IEBAIERhdGVUaW1lTnVtZXJpY0ZpZWxk RWxlbWVudDo6RGF0ZVRpbWVOdW1lcmljRmllbGRFbGVtZW50KERvY3VtZW50KiBkb2N1bWVudCwg RmllCiB7CiB9CiAKK2ludCBEYXRlVGltZU51bWVyaWNGaWVsZEVsZW1lbnQ6OmRlZmF1bHRWYWx1 ZUZvclN0ZXBEb3duKCkgY29uc3QKK3sKKyAgICByZXR1cm4gbV9yYW5nZS5tYXhpbXVtOworfQor CitpbnQgRGF0ZVRpbWVOdW1lcmljRmllbGRFbGVtZW50OjpkZWZhdWx0VmFsdWVGb3JTdGVwVXAo KSBjb25zdAoreworICAgIHJldHVybiBtX3JhbmdlLm1pbmltdW07Cit9CisKIHZvaWQgRGF0ZVRp bWVOdW1lcmljRmllbGRFbGVtZW50OjpkaWRCbHVyKCkKIHsKICAgICBtX2xhc3REaWdpdENoYXJU aW1lID0gMDsKQEAgLTEzOCw3ICsxNTUsNyBAQCB2b2lkIERhdGVUaW1lTnVtZXJpY0ZpZWxkRWxl bWVudDo6c3RlcERvd24oKQogICAgIGlmIChtX2hhc1ZhbHVlKQogICAgICAgICBzZXRWYWx1ZUFz SW50ZWdlcihtX3ZhbHVlID09IG1fcmFuZ2UubWluaW11bSA/IG1fcmFuZ2UubWF4aW11bSA6IGNs YW1wVmFsdWUobV92YWx1ZSAtIDEpLCBEaXNwYXRjaEV2ZW50KTsKICAgICBlbHNlCi0gICAgICAg IHNldFZhbHVlQXNJbnRlZ2VyKG1fcmFuZ2UubWF4aW11bSwgRGlzcGF0Y2hFdmVudCk7CisgICAg ICAgIHNldFZhbHVlQXNJbnRlZ2VyKGRlZmF1bHRWYWx1ZUZvclN0ZXBEb3duKCksIERpc3BhdGNo RXZlbnQpOwogfQogCiB2b2lkIERhdGVUaW1lTnVtZXJpY0ZpZWxkRWxlbWVudDo6c3RlcFVwKCkK QEAgLTE0Niw3ICsxNjMsNyBAQCB2b2lkIERhdGVUaW1lTnVtZXJpY0ZpZWxkRWxlbWVudDo6c3Rl cFVwKCkKICAgICBpZiAobV9oYXNWYWx1ZSkKICAgICAgICAgc2V0VmFsdWVBc0ludGVnZXIobV92 YWx1ZSA9PSBtX3JhbmdlLm1heGltdW0gPyBtX3JhbmdlLm1pbmltdW0gOiBjbGFtcFZhbHVlKG1f dmFsdWUgKyAxKSwgRGlzcGF0Y2hFdmVudCk7CiAgICAgZWxzZQotICAgICAgICBzZXRWYWx1ZUFz SW50ZWdlcihtX3JhbmdlLm1pbmltdW0sIERpc3BhdGNoRXZlbnQpOworICAgICAgICBzZXRWYWx1 ZUFzSW50ZWdlcihkZWZhdWx0VmFsdWVGb3JTdGVwVXAoKSwgRGlzcGF0Y2hFdmVudCk7CiB9CiAK IFN0cmluZyBEYXRlVGltZU51bWVyaWNGaWVsZEVsZW1lbnQ6OnZhbHVlKCkgY29uc3QKQEAgLTE1 Niw3ICsxNzMsNyBAQCBTdHJpbmcgRGF0ZVRpbWVOdW1lcmljRmllbGRFbGVtZW50Ojp2YWx1ZSgp IGNvbnN0CiAKICAgICBMb2NhbGl6ZXImIGxvY2FsaXplciA9IHRoaXMtPmxvY2FsaXplcigpOwog ICAgIGlmIChtX3JhbmdlLm1heGltdW0gPiA5OTkpCi0gICAgICAgIHJldHVybiBsb2NhbGl6ZXIu Y29udmVydFRvTG9jYWxpemVkTnVtYmVyKFN0cmluZzo6bnVtYmVyKG1fdmFsdWUpKTsKKyAgICAg ICAgcmV0dXJuIGxvY2FsaXplci5jb252ZXJ0VG9Mb2NhbGl6ZWROdW1iZXIoU3RyaW5nOjpmb3Jt YXQoIiUwNGQiLCBtX3ZhbHVlKSk7CiAKICAgICBpZiAobV9yYW5nZS5tYXhpbXVtID4gOTkpCiAg ICAgICAgIHJldHVybiBsb2NhbGl6ZXIuY29udmVydFRvTG9jYWxpemVkTnVtYmVyKFN0cmluZzo6 Zm9ybWF0KCIlMDNkIiwgbV92YWx1ZSkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRt bC9zaGFkb3cvRGF0ZVRpbWVOdW1lcmljRmllbGRFbGVtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9o dG1sL3NoYWRvdy9EYXRlVGltZU51bWVyaWNGaWVsZEVsZW1lbnQuaAppbmRleCA0MGI2MjhjZmFi ZjkyNmNiZjQyM2YxZGYzN2VmMTQ0ZjU4ZWZlMTZiLi44ZDJjYmNhNmQ0ZGRlMzdlODIyY2QxOThk NjY4MzU1ZGJlNzkzOGMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9E YXRlVGltZU51bWVyaWNGaWVsZEVsZW1lbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3No YWRvdy9EYXRlVGltZU51bWVyaWNGaWVsZEVsZW1lbnQuaApAQCAtNDUsNiArNDUsNyBAQCBwcm90 ZWN0ZWQ6CiAgICAgc3RydWN0IFJhbmdlIHsKICAgICAgICAgUmFuZ2UoaW50IG1pbmltdW0sIGlu dCBtYXhpbXVtKTsKICAgICAgICAgaW50IGNsYW1wVmFsdWUoaW50KSBjb25zdDsKKyAgICAgICAg Ym9vbCBpc0luUmFuZ2UoaW50KSBjb25zdDsKIAogICAgICAgICBpbnQgbWF4aW11bTsKICAgICAg ICAgaW50IG1pbmltdW07CkBAIC01Myw2ICs1NCw4IEBAIHByb3RlY3RlZDoKICAgICBEYXRlVGlt ZU51bWVyaWNGaWVsZEVsZW1lbnQoRG9jdW1lbnQqLCBGaWVsZE93bmVyJiwgaW50IG1pbmltdW0s IGludCBtYXhpbXVtLCBjb25zdCBTdHJpbmcmIHBsYWNlaG9sZGVyKTsKIAogICAgIGludCBjbGFt cFZhbHVlKGludCB2YWx1ZSkgY29uc3QgeyByZXR1cm4gbV9yYW5nZS5jbGFtcFZhbHVlKHZhbHVl KTsgfQorICAgIHZpcnR1YWwgaW50IGRlZmF1bHRWYWx1ZUZvclN0ZXBEb3duKCkgY29uc3Q7Cisg ICAgdmlydHVhbCBpbnQgZGVmYXVsdFZhbHVlRm9yU3RlcFVwKCkgY29uc3Q7CiAgICAgY29uc3Qg UmFuZ2UmIHJhbmdlKCkgY29uc3QgeyByZXR1cm4gbV9yYW5nZTsgfQogCiAgICAgLy8gRGF0ZVRp bWVGaWVsZEVsZW1lbnQgZnVuY3Rpb25zLgo=