117645 2013-06-14 09:54:36 -0700 [Windows] Provide simple <meter> drawing logic for testing 2013-06-14 12:35:06 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bfulgham bfulgham commit-queue esprehn+autocc glenn oldest_to_newest 900591 0 bfulgham 2013-06-14 09:54:36 -0700 Several accessibility tests crash due to missing <meter> features in the Windows port. The attached patch provides a simple implementation that allows the tests to run without crashing. 900592 1 204717 bfulgham 2013-06-14 09:58:47 -0700 Created attachment 204717 Patch 900594 2 204717 andersca 2013-06-14 10:02:29 -0700 Comment on attachment 204717 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=204717&action=review > Source/WebCore/rendering/RenderThemeSafari.h:145 > + virtual IntSize meterSizeForBounds(const RenderMeter*, const IntRect&) const; > + virtual bool supportsMeter(ControlPart) const; > + virtual void adjustMeterStyle(StyleResolver*, RenderStyle*, Element*) const; > + virtual bool paintMeter(RenderObject*, const PaintInfo&, const IntRect&); No OVERRIDEs on these? > Source/WebCore/rendering/RenderThemeWin.cpp:140 > +// Progress bar parts > +#define PP_BAR 1 > +#define PP_BARVERT 2 > +#define PP_CHUNK 3 > +#define PP_CHUNKVERT 4 > +#define PP_FILL 5 > +#define PP_FILLVERT 6 > +#define PP_PULSEOVERLAY 7 > +#define PP_MOVEOVERLAY 8 > +#define PP_PULSEOVERLAYVERT 9 > +#define PP_MOVEOVERLAYVERT 10 > +#define PP_TRANSPARENTBAR 11 > +#define PP_TRANSPARENTBARVERT 12 > + > +// Progress bar states > +#define PBBS_NORMAL 1 > +#define PBBS_PARTIAL 2 > +#define PBBVS_NORMAL 1 // Vertical > +#define PBBVS_PARTIAL 2 > + > +// Progress bar fill states > +#define PBFS_NORMAL 1 > +#define PBFS_ERROR 2 > +#define PBFS_PAUSED 3 > +#define PBFS_PARTIAL 4 > +#define PBFVS_NORMAL 1 // Vertical > +#define PBFVS_ERROR 2 > +#define PBFVS_PAUSED 3 > +#define PBFVS_PARTIAL 4 I'd use enums for these, but #defines are fine (especially if they come from Windows headers). 900623 3 bfulgham 2013-06-14 12:24:09 -0700 (In reply to comment #2) > > + virtual bool paintMeter(RenderObject*, const PaintInfo&, const IntRect&); > > No OVERRIDEs on these? Good point. I'll fix when I land. > > +#define PBFVS_PARTIAL 4 > > I'd use enums for these, but #defines are fine (especially if they come from Windows headers). Yeah -- I was trying to be consistent with the other examples in this file. 900624 4 bfulgham 2013-06-14 12:35:06 -0700 Committed r151601: <http://trac.webkit.org/changeset/151601> 204717 2013-06-14 09:58:47 -0700 2013-06-14 10:02:29 -0700 Patch bug-117645-20130614095743.patch text/plain 11331 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MTU5NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBACisyMDEzLTA2LTE0ICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtXaW5kb3dzXSBQcm92aWRl IHNpbXBsZSA8bWV0ZXI+IGRyYXdpbmcgbG9naWMgZm9yIHRlc3RpbmcuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTc2NDUuCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgYWNjZXNzYmlsaXR5L21ldGVyLWVs ZW1lbnQuaHRtbAorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1lU2FmYXJpLmNwcDog U2ltcGxlIHRlc3QgaW1wbGVtZW50YXRpb24KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1l U2FmYXJpOjphZGp1c3RNZXRlclN0eWxlKTogQWRkZWQuCisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJUaGVtZVNhZmFyaTo6c3VwcG9ydHNNZXRlcik6IEFkZGVkLgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyVGhlbWVTYWZhcmk6Om1ldGVyU2l6ZUZvckJvdW5kcyk6IEFkZGVkLgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyVGhlbWVTYWZhcmk6OnBhaW50TWV0ZXIpOiBBZGRlZC4KKyAgICAgICAg KiByZW5kZXJpbmcvUmVuZGVyVGhlbWVTYWZhcmkuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVu ZGVyVGhlbWVXaW4uY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVXaW46OnByb2dy ZXNzQmFyVGhlbWUpOiBBZGRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lV2luOjpn ZXRDbGFzc2ljVGhlbWVEYXRhKTogU3VwcG9ydCBtZXRlcnMuCisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJUaGVtZVdpbjo6Z2V0VGhlbWVEYXRhKTogU3VwcG9ydCBtZXRlciB0aGVtZS4KKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lV2luOjphZGp1c3RNZXRlclN0eWxlKTogQWRkZWQuCisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZVdpbjo6c3VwcG9ydHNNZXRlcik6IEFkZGVkLgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVXaW46Om1ldGVyU2l6ZUZvckJvdW5kcyk6IEFk ZGVkLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVXaW46OnBhaW50TWV0ZXIpOiBBZGRl ZC4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGhlbWVXaW4uaDoKKwogMjAxMy0wNi0xNCAg SmFlaHVuIExpbSAgPGxqYWVodW4ubGltQHNhbXN1bmcuY29tPgogCiAgICAgICAgIENTU1BhcnNl cjo6cGFyc2VJbWFnZVNldCgpIGRvZXNuJ3QgbmVlZCBhIHBhcmFtZXRlci4KSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZVNhZmFyaS5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lU2FmYXJpLmNwcAkocmV2aXNpb24g MTUxNTYxKQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lU2FmYXJpLmNw cAkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIw MDcsIDIwMDgsIDIwMDkgQXBwbGUgSW5jLgorICogQ29weXJpZ2h0IChDKSAyMDA3LCAyMDA4LCAy MDA5LCAyMDEzIEFwcGxlIEluYy4KICAqIENvcHlyaWdodCAoQykgMjAwOSBLZW5uZXRoIFJvaGRl IENocmlzdGlhbnNlbgogICoKICAqIFRoaXMgbGlicmFyeSBpcyBmcmVlIHNvZnR3YXJlOyB5b3Ug Y2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IKQEAgLTM1LDkgKzM1LDExIEBACiAjaW5jbHVkZSAi R3JhcGhpY3NDb250ZXh0Q0cuaCIKICNpbmNsdWRlICJIVE1MSW5wdXRFbGVtZW50LmgiCiAjaW5j bHVkZSAiSFRNTE1lZGlhRWxlbWVudC5oIgorI2luY2x1ZGUgIkhUTUxNZXRlckVsZW1lbnQuaCIK ICNpbmNsdWRlICJIVE1MTmFtZXMuaCIKICNpbmNsdWRlICJQYWludEluZm8uaCIKICNpbmNsdWRl ICJSZW5kZXJNZWRpYUNvbnRyb2xzLmgiCisjaW5jbHVkZSAiUmVuZGVyTWV0ZXIuaCIKICNpbmNs dWRlICJSZW5kZXJTbGlkZXIuaCIKICNpbmNsdWRlICJSZW5kZXJWaWV3LmgiCiAjaW5jbHVkZSAi U29mdExpbmtpbmcuaCIKQEAgLTEyMDIsNiArMTIwNCw1MiBAQCBib29sIFJlbmRlclRoZW1lU2Fm YXJpOjpwYWludE1lZGlhU2xpZGVyCiB9CiAjZW5kaWYKIAorI2lmIEVOQUJMRShNRVRFUl9FTEVN RU5UKQordm9pZCBSZW5kZXJUaGVtZVNhZmFyaTo6YWRqdXN0TWV0ZXJTdHlsZShTdHlsZVJlc29s dmVyKiwgUmVuZGVyU3R5bGUqIHN0eWxlLCBFbGVtZW50KikgY29uc3QKK3sKKyAgICBzdHlsZS0+ c2V0Qm94U2hhZG93KG51bGxwdHIpOworfQorCitib29sIFJlbmRlclRoZW1lU2FmYXJpOjpzdXBw b3J0c01ldGVyKENvbnRyb2xQYXJ0IHBhcnQpIGNvbnN0Cit7CisgICAgc3dpdGNoIChwYXJ0KSB7 CisgICAgY2FzZSBNZXRlclBhcnQ6CisgICAgICAgIHJldHVybiB0cnVlOworICAgIGRlZmF1bHQ6 CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9Cit9CisKK0ludFNpemUgUmVuZGVyVGhlbWVT YWZhcmk6Om1ldGVyU2l6ZUZvckJvdW5kcyhjb25zdCBSZW5kZXJNZXRlciosIGNvbnN0IEludFJl Y3QmIGJvdW5kcykgY29uc3QKK3sKKyAgICByZXR1cm4gYm91bmRzLnNpemUoKTsKK30KKworYm9v bCBSZW5kZXJUaGVtZVNhZmFyaTo6cGFpbnRNZXRlcihSZW5kZXJPYmplY3QqIHJlbmRlck9iamVj dCwgY29uc3QgUGFpbnRJbmZvJiBwYWludEluZm8sIGNvbnN0IEludFJlY3QmIHJlY3QpCit7Cisg ICAgLy8gTk9URTogVGhpcyByb3V0aW5lIGlzIGZvciB0ZXN0aW5nIG9ubHkuIEl0IHNob3VsZCBi ZSBmbGVzaGVkIG91dCB3aXRoIGEgcmVhbCBDRy1iYXNlZCBpbXBsZW1lbnRhdGlvbi4KKyAgICAv LyBSaWdodCBub3cgaXQgdXNlcyBhIHNsaWRlciwgd2l0aCB0aGUgdGh1bWIgcG9zaXRpb25lZCBh dCB0aGUgbWV0ZXIgcG9pbnQuCisgICAgaWYgKCFyZW5kZXJPYmplY3QtPmlzTWV0ZXIoKSkKKyAg ICAgICAgcmV0dXJuIHRydWU7CisKKyAgICBIVE1MTWV0ZXJFbGVtZW50KiBlbGVtZW50ID0gdG9S ZW5kZXJNZXRlcihyZW5kZXJPYmplY3QpLT5tZXRlckVsZW1lbnQoKTsKKworICAgIGludCByZW1h aW5pbmcgPSBzdGF0aWNfY2FzdDxpbnQ+KCgxLjAgLSBlbGVtZW50LT52YWx1ZVJhdGlvKCkpICog c3RhdGljX2Nhc3Q8ZG91YmxlPihyZWN0LnNpemUoKS53aWR0aCgpKSk7CisKKyAgICAvLyBEcmF3 IHRoZSBiYWNrZ3JvdW5kCisgICAgcGFpbnRTbGlkZXJUcmFjayhyZW5kZXJPYmplY3QsIHBhaW50 SW5mbywgcmVjdCk7CisKKyAgICAvLyBEcmF3IHRoZSBwcm9ncmVzcyBwb3J0aW9uCisgICAgSW50 UmVjdCBjb21wbGV0ZWRSZWN0KHJlY3QpOworICAgIGNvbXBsZXRlZFJlY3QuY29udHJhY3QocmVt YWluaW5nLCAwKTsKKworICAgIHBhaW50U2xpZGVyVGh1bWIocmVuZGVyT2JqZWN0LCBwYWludElu Zm8sIGNvbXBsZXRlZFJlY3QpOworCisgICAgcmV0dXJuIHRydWU7Cit9CisKKyNlbmRpZgorCiB9 IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKICNlbmRpZiAvLyAjaWYgVVNFKFNBRkFSSV9USEVNRSkK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZVNhZmFyaS5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZVNhZmFyaS5oCShy ZXZpc2lvbiAxNTE1NjEpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVT YWZhcmkuaAkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQg KEMpIDIwMDcsIDIwMDggQXBwbGUgSW5jLgorICogQ29weXJpZ2h0IChDKSAyMDA3LCAyMDA4LCAy MDEzIEFwcGxlIEluYy4KICAqIENvcHlyaWdodCAoQykgMjAwOSBLZW5uZXRoIFJvaGRlIENocmlz dGlhbnNlbgogICoKICAqIFRoaXMgbGlicmFyeSBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJl ZGlzdHJpYnV0ZSBpdCBhbmQvb3IKQEAgLTEzOCw2ICsxMzgsMTMgQEAgcHJvdGVjdGVkOgogICAg IHZpcnR1YWwgYm9vbCBwYWludE1lZGlhU2xpZGVyVGh1bWIoUmVuZGVyT2JqZWN0KiwgY29uc3Qg UGFpbnRJbmZvJiwgY29uc3QgSW50UmVjdCYpOwogI2VuZGlmCiAKKyNpZiBFTkFCTEUoTUVURVJf RUxFTUVOVCkKKyAgICB2aXJ0dWFsIEludFNpemUgbWV0ZXJTaXplRm9yQm91bmRzKGNvbnN0IFJl bmRlck1ldGVyKiwgY29uc3QgSW50UmVjdCYpIGNvbnN0OworICAgIHZpcnR1YWwgYm9vbCBzdXBw b3J0c01ldGVyKENvbnRyb2xQYXJ0KSBjb25zdDsKKyAgICB2aXJ0dWFsIHZvaWQgYWRqdXN0TWV0 ZXJTdHlsZShTdHlsZVJlc29sdmVyKiwgUmVuZGVyU3R5bGUqLCBFbGVtZW50KikgY29uc3Q7Cisg ICAgdmlydHVhbCBib29sIHBhaW50TWV0ZXIoUmVuZGVyT2JqZWN0KiwgY29uc3QgUGFpbnRJbmZv JiwgY29uc3QgSW50UmVjdCYpOworI2VuZGlmCisKICAgICB2aXJ0dWFsIGJvb2wgc2hvdWxkU2hv d1BsYWNlaG9sZGVyV2hlbkZvY3VzZWQoKSBjb25zdCB7IHJldHVybiB0cnVlOyB9CiAKIHByaXZh dGU6CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVXaW4uY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZVdpbi5jcHAJ KHJldmlzaW9uIDE1MTU2MSkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVt ZVdpbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0 IChDKSAyMDA2LCAyMDA3IEFwcGxlIEluYy4KKyAqIENvcHlyaWdodCAoQykgMjAwNiwgMjAwNywg MjAxMyBBcHBsZSBJbmMuCiAgKiBDb3B5cmlnaHQgKEMpIDIwMDkgS2VubmV0aCBSb2hkZSBDaHJp c3RpYW5zZW4KICAqCiAgKiBUaGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiBy ZWRpc3RyaWJ1dGUgaXQgYW5kL29yCkBAIC0xMDksNiArMTA5LDM2IEBACiAjZGVmaW5lIFVQU19Q UkVTU0VEICAgICAzCiAjZGVmaW5lIFVQU19ESVNBQkxFRCAgICA0CiAKKy8vIFByb2dyZXNzIGJh ciBwYXJ0cworI2RlZmluZSBQUF9CQVIgICAgICAgICAgMQorI2RlZmluZSBQUF9CQVJWRVJUICAg ICAgMgorI2RlZmluZSBQUF9DSFVOSyAgICAgICAgMworI2RlZmluZSBQUF9DSFVOS1ZFUlQgICAg NAorI2RlZmluZSBQUF9GSUxMICAgICAgICAgNQorI2RlZmluZSBQUF9GSUxMVkVSVCAgICAgNgor I2RlZmluZSBQUF9QVUxTRU9WRVJMQVkgNworI2RlZmluZSBQUF9NT1ZFT1ZFUkxBWSAgOAorI2Rl ZmluZSBQUF9QVUxTRU9WRVJMQVlWRVJUIDkKKyNkZWZpbmUgUFBfTU9WRU9WRVJMQVlWRVJUICAx MAorI2RlZmluZSBQUF9UUkFOU1BBUkVOVEJBUiAgIDExCisjZGVmaW5lIFBQX1RSQU5TUEFSRU5U QkFSVkVSVCAxMgorCisvLyBQcm9ncmVzcyBiYXIgc3RhdGVzCisjZGVmaW5lIFBCQlNfTk9STUFM ICAgICAxCisjZGVmaW5lIFBCQlNfUEFSVElBTCAgICAyCisjZGVmaW5lIFBCQlZTX05PUk1BTCAg ICAxIC8vIFZlcnRpY2FsCisjZGVmaW5lIFBCQlZTX1BBUlRJQUwgICAyCisKKy8vIFByb2dyZXNz IGJhciBmaWxsIHN0YXRlcworI2RlZmluZSBQQkZTX05PUk1BTCAgICAgMQorI2RlZmluZSBQQkZT X0VSUk9SICAgICAgMgorI2RlZmluZSBQQkZTX1BBVVNFRCAgICAgMworI2RlZmluZSBQQkZTX1BB UlRJQUwgICAgNAorI2RlZmluZSBQQkZWU19OT1JNQUwgICAgMSAvLyBWZXJ0aWNhbAorI2RlZmlu ZSBQQkZWU19FUlJPUiAgICAgMgorI2RlZmluZSBQQkZWU19QQVVTRUQgICAgMworI2RlZmluZSBQ QkZWU19QQVJUSUFMICAgNAorCiAKIFNPRlRfTElOS19MSUJSQVJZKHV4dGhlbWUpCiBTT0ZUX0xJ TksodXh0aGVtZSwgT3BlblRoZW1lRGF0YSwgSEFORExFLCBXSU5BUEksIChIV05EIGh3bmQsIExQ Q1dTVFIgcHN6Q2xhc3NMaXN0KSwgKGh3bmQsIHBzekNsYXNzTGlzdCkpCkBAIC0xNzMsNiArMjAz LDcgQEAgUmVuZGVyVGhlbWVXaW46OlJlbmRlclRoZW1lV2luKCkKICAgICAsIG1fbWVudUxpc3RU aGVtZSgwKQogICAgICwgbV9zbGlkZXJUaGVtZSgwKQogICAgICwgbV9zcGluQnV0dG9uVGhlbWUo MCkKKyAgICAsIG1fcHJvZ3Jlc3NCYXJUaGVtZSgwKQogewogICAgIGhhdmVUaGVtZSA9IHV4dGhl bWVMaWJyYXJ5KCkgJiYgSXNUaGVtZUFjdGl2ZSgpOwogfQpAQCAtMjIwLDYgKzI1MSwxMyBAQCBI QU5ETEUgUmVuZGVyVGhlbWVXaW46OnNwaW5CdXR0b25UaGVtZSgpCiAgICAgcmV0dXJuIG1fc3Bp bkJ1dHRvblRoZW1lOwogfQogCitIQU5ETEUgUmVuZGVyVGhlbWVXaW46OnByb2dyZXNzQmFyVGhl bWUoKSBjb25zdAoreworICAgIGlmIChoYXZlVGhlbWUgJiYgIW1fcHJvZ3Jlc3NCYXJUaGVtZSkK KyAgICAgICAgbV9wcm9ncmVzc0JhclRoZW1lID0gT3BlblRoZW1lRGF0YSgwLCBMIlByb2dyZXNz Iik7CisgICAgcmV0dXJuIG1fcHJvZ3Jlc3NCYXJUaGVtZTsKK30KKwogdm9pZCBSZW5kZXJUaGVt ZVdpbjo6Y2xvc2UoKQogewogICAgIC8vIFRoaXMgbWV0aG9kIHdpbGwgbmVlZCB0byBiZSBjYWxs ZWQgd2hlbiB0aGUgT1MgdGhlbWUgY2hhbmdlcyB0byBmbHVzaCBvdXIgY2FjaGVkIHRoZW1lcy4K QEAgLTIzMyw3ICsyNzEsOSBAQCB2b2lkIFJlbmRlclRoZW1lV2luOjpjbG9zZSgpCiAgICAgICAg IENsb3NlVGhlbWVEYXRhKG1fc2xpZGVyVGhlbWUpOwogICAgIGlmIChtX3NwaW5CdXR0b25UaGVt ZSkKICAgICAgICAgQ2xvc2VUaGVtZURhdGEobV9zcGluQnV0dG9uVGhlbWUpOwotICAgIG1fYnV0 dG9uVGhlbWUgPSBtX3RleHRGaWVsZFRoZW1lID0gbV9tZW51TGlzdFRoZW1lID0gbV9zbGlkZXJU aGVtZSA9IG1fc3BpbkJ1dHRvblRoZW1lID0gMDsKKyAgICBpZiAobV9wcm9ncmVzc0JhclRoZW1l KQorICAgICAgICBDbG9zZVRoZW1lRGF0YShtX3Byb2dyZXNzQmFyVGhlbWUpOworICAgIG1fYnV0 dG9uVGhlbWUgPSBtX3RleHRGaWVsZFRoZW1lID0gbV9tZW51TGlzdFRoZW1lID0gbV9zbGlkZXJU aGVtZSA9IG1fc3BpbkJ1dHRvblRoZW1lID0gbV9wcm9ncmVzc0JhclRoZW1lID0gMDsKIAogICAg IGhhdmVUaGVtZSA9IHV4dGhlbWVMaWJyYXJ5KCkgJiYgSXNUaGVtZUFjdGl2ZSgpOwogfQpAQCAt NTIzLDYgKzU2MywxMCBAQCBUaGVtZURhdGEgUmVuZGVyVGhlbWVXaW46OmdldENsYXNzaWNUaGVt CiAgICAgICAgICAgICByZXN1bHQubV9wYXJ0ID0gREZDX1NDUk9MTDsKICAgICAgICAgICAgIHJl c3VsdC5tX3N0YXRlID0gZGV0ZXJtaW5lQ2xhc3NpY1N0YXRlKG8pOwogICAgICAgICAgICAgYnJl YWs7CisgICAgICAgIGNhc2UgTWV0ZXJQYXJ0OgorICAgICAgICAgICAgcmVzdWx0Lm1fcGFydCA9 IFBQX0JBUjsKKyAgICAgICAgICAgIHJlc3VsdC5tX3N0YXRlID0gZGV0ZXJtaW5lU3RhdGUobyk7 CisgICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBTZWFyY2hGaWVsZFBhcnQ6CiAgICAg ICAgIGNhc2UgVGV4dEZpZWxkUGFydDoKICAgICAgICAgY2FzZSBUZXh0QXJlYVBhcnQ6CkBAIC01 ODQsNiArNjI4LDEwIEBAIFRoZW1lRGF0YSBSZW5kZXJUaGVtZVdpbjo6Z2V0VGhlbWVEYXRhKFIK ICAgICAgICAgICAgICAgICByZXN1bHQubV9zdGF0ZSA9IGRldGVybWluZVN0YXRlKG8pOwogICAg ICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KKyAgICAgICAgY2FzZSBNZXRlclBhcnQ6CisgICAg ICAgICAgICByZXN1bHQubV9wYXJ0ID0gUFBfQkFSOworICAgICAgICAgICAgcmVzdWx0Lm1fc3Rh dGUgPSBkZXRlcm1pbmVTdGF0ZShvKTsKKyAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNl IFJhZGlvUGFydDoKICAgICAgICAgICAgIHJlc3VsdC5tX3BhcnQgPSBCUF9SQURJTzsKICAgICAg ICAgICAgIHJlc3VsdC5tX3N0YXRlID0gZGV0ZXJtaW5lU3RhdGUobyk7CkBAIC0xMTIwLDcgKzEx NjgsNTQgQEAgSW50UG9pbnQgUmVuZGVyVGhlbWVXaW46OnZvbHVtZVNsaWRlck9mZgogICAgIHJl dHVybiBSZW5kZXJNZWRpYUNvbnRyb2xzOjp2b2x1bWVTbGlkZXJPZmZzZXRGcm9tTXV0ZUJ1dHRv bihtdXRlQnV0dG9uQm94LCBzaXplKTsKIH0KIAorI2VuZGlmCisKKyNpZiBFTkFCTEUoTUVURVJf RUxFTUVOVCkKK3ZvaWQgUmVuZGVyVGhlbWVXaW46OmFkanVzdE1ldGVyU3R5bGUoU3R5bGVSZXNv bHZlciosIFJlbmRlclN0eWxlKiBzdHlsZSwgRWxlbWVudCopIGNvbnN0Cit7CisgICAgc3R5bGUt PnNldEJveFNoYWRvdyhudWxscHRyKTsKK30KKworYm9vbCBSZW5kZXJUaGVtZVdpbjo6c3VwcG9y dHNNZXRlcihDb250cm9sUGFydCBwYXJ0KSBjb25zdAoreworICAgIHN3aXRjaCAocGFydCkgewor ICAgIGNhc2UgTWV0ZXJQYXJ0OgorICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICBkZWZhdWx0Ogor ICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgfQorfQorCitJbnRTaXplIFJlbmRlclRoZW1lV2lu OjptZXRlclNpemVGb3JCb3VuZHMoY29uc3QgUmVuZGVyTWV0ZXIqLCBjb25zdCBJbnRSZWN0JiBi b3VuZHMpIGNvbnN0Cit7CisgICAgcmV0dXJuIGJvdW5kcy5zaXplKCk7Cit9CisKK2Jvb2wgUmVu ZGVyVGhlbWVXaW46OnBhaW50TWV0ZXIoUmVuZGVyT2JqZWN0KiByZW5kZXJPYmplY3QsIGNvbnN0 IFBhaW50SW5mbyYgcGFpbnRJbmZvLCBjb25zdCBJbnRSZWN0JiByZWN0KQoreworICAgIGlmICgh cmVuZGVyT2JqZWN0LT5pc01ldGVyKCkpCisgICAgICAgIHJldHVybiB0cnVlOworCisgICAgSFRN TE1ldGVyRWxlbWVudCogZWxlbWVudCA9IHRvUmVuZGVyTWV0ZXIocmVuZGVyT2JqZWN0KS0+bWV0 ZXJFbGVtZW50KCk7CisKKyAgICBUaGVtZURhdGEgdGhlbWUgPSBnZXRUaGVtZURhdGEocmVuZGVy T2JqZWN0KTsKKworICAgIGludCByZW1haW5pbmcgPSBzdGF0aWNfY2FzdDxpbnQ+KCgxLjAgLSBl bGVtZW50LT52YWx1ZVJhdGlvKCkpICogc3RhdGljX2Nhc3Q8ZG91YmxlPihyZWN0LnNpemUoKS53 aWR0aCgpKSk7CisKKyAgICAvLyBEcmF3IHRoZSBiYWNrZ3JvdW5kCisgICAgZHJhd0NvbnRyb2wo cGFpbnRJbmZvLmNvbnRleHQsIHJlbmRlck9iamVjdCwgcHJvZ3Jlc3NCYXJUaGVtZSgpLCB0aGVt ZSwgcmVjdCk7CisKKyAgICAvLyBEcmF3IHRoZSBwcm9ncmVzcyBwb3J0aW9uCisgICAgSW50UmVj dCBjb21wbGV0ZWRSZWN0KHJlY3QpOworICAgIGNvbXBsZXRlZFJlY3QuY29udHJhY3QocmVtYWlu aW5nLCAwKTsKKworICAgIHRoZW1lLm1fcGFydCA9IFBQX0ZJTEw7CisgICAgZHJhd0NvbnRyb2wo cGFpbnRJbmZvLmNvbnRleHQsIHJlbmRlck9iamVjdCwgcHJvZ3Jlc3NCYXJUaGVtZSgpLCB0aGVt ZSwgY29tcGxldGVkUmVjdCk7CisKKyAgICByZXR1cm4gdHJ1ZTsKK30KIAogI2VuZGlmCiAKKwog fQpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lV2luLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lV2luLmgJKHJldmlz aW9uIDE1MTU2MSkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZVdpbi5o CSh3b3JraW5nIGNvcHkpCkBAIC0xLDcgKzEsNyBAQAogLyoKICAqIFRoaXMgZmlsZSBpcyBwYXJ0 IG9mIHRoZSBXZWJLaXQgcHJvamVjdC4KICAqCi0gKiBDb3B5cmlnaHQgKEMpIDIwMDYsIDIwMDgg QXBwbGUgQ29tcHV0ZXIsIEluYy4KKyAqIENvcHlyaWdodCAoQykgMjAwNiwgMjAwOCwgMjAxMyBB cHBsZSBDb21wdXRlciwgSW5jLgogICogQ29weXJpZ2h0IChDKSAyMDA5IEtlbm5ldGggUm9oZGUg Q2hyaXN0aWFuc2VuCiAgKgogICogVGhpcyBsaWJyYXJ5IGlzIGZyZWUgc29mdHdhcmU7IHlvdSBj YW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vcgpAQCAtMTQ0LDYgKzE0NCwxMyBAQCBwdWJsaWM6CiAg ICAgdmlydHVhbCBJbnRQb2ludCB2b2x1bWVTbGlkZXJPZmZzZXRGcm9tTXV0ZUJ1dHRvbihSZW5k ZXJCb3gqLCBjb25zdCBJbnRTaXplJikgY29uc3QgT1ZFUlJJREU7CiAjZW5kaWYKIAorI2lmIEVO QUJMRShNRVRFUl9FTEVNRU5UKQorICAgIHZpcnR1YWwgSW50U2l6ZSBtZXRlclNpemVGb3JCb3Vu ZHMoY29uc3QgUmVuZGVyTWV0ZXIqLCBjb25zdCBJbnRSZWN0JikgY29uc3Q7CisgICAgdmlydHVh bCBib29sIHN1cHBvcnRzTWV0ZXIoQ29udHJvbFBhcnQpIGNvbnN0OworICAgIHZpcnR1YWwgdm9p ZCBhZGp1c3RNZXRlclN0eWxlKFN0eWxlUmVzb2x2ZXIqLCBSZW5kZXJTdHlsZSosIEVsZW1lbnQq KSBjb25zdDsKKyAgICB2aXJ0dWFsIGJvb2wgcGFpbnRNZXRlcihSZW5kZXJPYmplY3QqLCBjb25z dCBQYWludEluZm8mLCBjb25zdCBJbnRSZWN0Jik7CisjZW5kaWYKKwogICAgIHZpcnR1YWwgYm9v bCBzaG91bGRTaG93UGxhY2Vob2xkZXJXaGVuRm9jdXNlZCgpIGNvbnN0IHsgcmV0dXJuIHRydWU7 IH0KIAogcHJpdmF0ZToKQEAgLTE1NCw3ICsxNjEsNyBAQCBwcml2YXRlOgogICAgIH07CiAKICAg ICBSZW5kZXJUaGVtZVdpbigpOwotICAgIH5SZW5kZXJUaGVtZVdpbigpOworICAgIHZpcnR1YWwg flJlbmRlclRoZW1lV2luKCk7CiAKICAgICB2b2lkIGFkZEludHJpbnNpY01hcmdpbnMoUmVuZGVy U3R5bGUqKSBjb25zdDsKICAgICB2b2lkIGNsb3NlKCk7CkBAIC0xNzUsMTIgKzE4MiwxNCBAQCBw cml2YXRlOgogICAgIEhBTkRMRSBtZW51TGlzdFRoZW1lKCkgY29uc3Q7CiAgICAgSEFORExFIHNs aWRlclRoZW1lKCkgY29uc3Q7CiAgICAgSEFORExFIHNwaW5CdXR0b25UaGVtZSgpIGNvbnN0Owor ICAgIEhBTkRMRSBwcm9ncmVzc0JhclRoZW1lKCkgY29uc3Q7CiAKICAgICBtdXRhYmxlIEhBTkRM RSBtX2J1dHRvblRoZW1lOwogICAgIG11dGFibGUgSEFORExFIG1fdGV4dEZpZWxkVGhlbWU7CiAg ICAgbXV0YWJsZSBIQU5ETEUgbV9tZW51TGlzdFRoZW1lOwogICAgIG11dGFibGUgSEFORExFIG1f c2xpZGVyVGhlbWU7CiAgICAgbXV0YWJsZSBIQU5ETEUgbV9zcGluQnV0dG9uVGhlbWU7CisgICAg bXV0YWJsZSBIQU5ETEUgbV9wcm9ncmVzc0JhclRoZW1lOwogfTsKIAogfTsK