103186 2012-11-24 12:22:23 -0800 [EFL] Refactor RenderThemeEfl::getThemePartFromCache() 2012-11-24 14:45:48 -0800 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 103189 1 cdumez cdumez gyuyoung.kim kenneth laszlo.gombos lucas.de.marchi rakuco tonikitoo webkit.review.bot oldest_to_newest 774873 0 cdumez 2012-11-24 12:22:23 -0800 RenderThemeEfl::getThemePartFromCache() could be refactored to use a list instead of a vector. The function keep moving items to the head of the container which is efficient with a list but not with a vector. There is also some code duplication in the function that could be avoided. 774878 1 175864 cdumez 2012-11-24 12:36:12 -0800 Created attachment 175864 Patch 774881 2 175864 kenneth 2012-11-24 13:03:46 -0800 Comment on attachment 175864 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=175864&action=review > Source/WebCore/ChangeLog:11 > + Refactor getThemePartFromCache() so that a list is used > + for the cache instead of a vector. The function moves > + items to the head of the container which is much more > + efficient with a list than a vector. Ah nice, I wanted to do this at some point but forgot all about it 774885 3 175864 webkit.review.bot 2012-11-24 14:25:56 -0800 Comment on attachment 175864 Patch Clearing flags on attachment: 175864 Committed r135658: <http://trac.webkit.org/changeset/135658> 774886 4 webkit.review.bot 2012-11-24 14:26:00 -0800 All reviewed patches have been landed. Closing bug. 175864 2012-11-24 12:36:12 -0800 2012-11-24 14:25:55 -0800 Patch 103186_getThemePartFromCache.patch text/plain 9939 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBiMGMwY2RiLi4wYTcwNjBjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzkg QEAKKzIwMTItMTEtMjQgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVs LmNvbT4KKworICAgICAgICBbRUZMXSBSZWZhY3RvciBSZW5kZXJUaGVtZUVmbDo6Z2V0VGhlbWVQ YXJ0RnJvbUNhY2hlKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTEwMzE4NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFJlZmFjdG9yIGdldFRoZW1lUGFydEZyb21DYWNoZSgpIHNvIHRoYXQgYSBsaXN0IGlz IHVzZWQKKyAgICAgICAgZm9yIHRoZSBjYWNoZSBpbnN0ZWFkIG9mIGEgdmVjdG9yLiBUaGUgZnVu Y3Rpb24gbW92ZXMKKyAgICAgICAgaXRlbXMgdG8gdGhlIGhlYWQgb2YgdGhlIGNvbnRhaW5lciB3 aGljaCBpcyBtdWNoIG1vcmUKKyAgICAgICAgZWZmaWNpZW50IHdpdGggYSBsaXN0IHRoYW4gYSB2 ZWN0b3IuCisKKyAgICAgICAgVGhlIGxpc3Qgb3JkZXJpbmcgaXMgYWxzbyBzbGlnaHRseSBhbHRl cmVkIHNvIHRoYXQgdGhlCisgICAgICAgIGNhY2hlZCBwYXJ0cyB0aGF0IHdlcmUgdXNlZCBsYXN0 IGNvbWUgZmlyc3QuIFByZXZpb3VzbHksCisgICAgICAgIHRoZXkgd2VyZSBzb3J0ZWQgYnkgY3Jl YXRpb24gdGltZSB3aGljaCBtYXkgY2F1c2UgYW4KKyAgICAgICAgaXRlbSB0byBiZSByZW1vdmVk IGZyb20gdGhlIGNhY2hlIGJlY2F1c2UgaXQgaXMgb2xkZXIKKyAgICAgICAgZXZlbiBpZiBpcyB3 YXMgdXNlZCByZWNlbnRseS4KKworICAgICAgICBUaGlzIHBhdGNoIGFsc28gZ2V0cyByaWQgb2Yg c29tZSBjb2RlIGR1cGxpY2F0aW9uIGF0IHRoZQorICAgICAgICBlbmQgb2YgdGhlIGZ1bmN0aW9u LgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgbm8gYmVoYXZpb3IgY2hhbmdlLgorCisgICAgICAg ICogcGxhdGZvcm0vZWZsL1JlbmRlclRoZW1lRWZsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlclRoZW1lRWZsOjpUaGVtZVBhcnRDYWNoZUVudHJ5OjpjcmVhdGUpOiBSZXR1cm4KKyAgICAg ICAgYSBzbWFydCBwb2ludGVyIGluc3RlYWQgb2YgYSByYXcgcG9pbnRlci4KKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlclRoZW1lRWZsOjpnZXRUaGVtZVBhcnRGcm9tQ2FjaGUpOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyVGhlbWVFZmw6OmNsZWFyVGhlbWVQYXJ0Q2FjaGUpOiBSZW5hbWUgCisg ICAgICAgIGZsdXNoVGhlbWVQYXJ0Q2FjaGUgdG8gY2xlYXJUaGVtZVBhcnRDYWNoZSBmb3IgY2xh cml0eS4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lRWZsOjpsb2FkVGhlbWUpOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVFZmw6OlJlbmRlclRoZW1lRWZsKToKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlclRoZW1lRWZsOjp+UmVuZGVyVGhlbWVFZmwpOgorICAgICAgICAqIHBs YXRmb3JtL2VmbC9SZW5kZXJUaGVtZUVmbC5oOgorICAgICAgICAoVGhlbWVQYXJ0Q2FjaGVFbnRy eSk6CisgICAgICAgIChSZW5kZXJUaGVtZUVmbCk6CisKIDIwMTItMTEtMjMgIEthbmdpbCBIYW4g IDxrYW5naWwuaGFuQHNhbXN1bmcuY29tPgogCiAgICAgICAgIEZpeCB1bnVzZWQgcGFyYW1ldGVy IGNvbXBpbGUgd2FybmluZ3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Vm bC9SZW5kZXJUaGVtZUVmbC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9lZmwvUmVuZGVy VGhlbWVFZmwuY3BwCmluZGV4IGIxY2EyMWMuLmViZjZjNDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2VmbC9SZW5kZXJUaGVtZUVmbC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZWZsL1JlbmRlclRoZW1lRWZsLmNwcApAQCAtMTczLDIxICsxNzMsMjEgQEAg c3RhdGljIGJvb2wgaXNGb3JtRWxlbWVudFRvb0xhcmdlVG9EaXNwbGF5KGNvbnN0IEludFNpemUm IGVsZW1lbnRTaXplKQogICAgIHJldHVybiBlbGVtZW50U2l6ZS53aWR0aCgpID4gbWF4RWRqZURp bWVuc2lvbiB8fCBlbGVtZW50U2l6ZS5oZWlnaHQoKSA+IG1heEVkamVEaW1lbnNpb247CiB9CiAK LVJlbmRlclRoZW1lRWZsOjpUaGVtZVBhcnRDYWNoZUVudHJ5KiBSZW5kZXJUaGVtZUVmbDo6VGhl bWVQYXJ0Q2FjaGVFbnRyeTo6Y3JlYXRlKGNvbnN0IFN0cmluZyYgdGhlbWVQYXRoLCBGb3JtVHlw ZSB0eXBlLCBjb25zdCBJbnRTaXplJiBzaXplKQorUGFzc093blB0cjxSZW5kZXJUaGVtZUVmbDo6 VGhlbWVQYXJ0Q2FjaGVFbnRyeT4gUmVuZGVyVGhlbWVFZmw6OlRoZW1lUGFydENhY2hlRW50cnk6 OmNyZWF0ZShjb25zdCBTdHJpbmcmIHRoZW1lUGF0aCwgRm9ybVR5cGUgdHlwZSwgY29uc3QgSW50 U2l6ZSYgc2l6ZSkKIHsKICAgICBBU1NFUlQoIXRoZW1lUGF0aC5pc0VtcHR5KCkpOwogCiAgICAg aWYgKGlzRm9ybUVsZW1lbnRUb29MYXJnZVRvRGlzcGxheShzaXplKSB8fCBzaXplLmlzRW1wdHko KSkgewogICAgICAgICBFSU5BX0xPR19FUlIoIkNhbm5vdCByZW5kZXIgYW4gZWxlbWVudCBvZiBz aXplICVkeCVkLiIsIHNpemUud2lkdGgoKSwgc2l6ZS5oZWlnaHQoKSk7Ci0gICAgICAgIHJldHVy biAwOworICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICB9CiAKLSAgICBPd25QdHI8VGhlbWVQ YXJ0Q2FjaGVFbnRyeSo+IGVudHJ5ID0gYWRvcHRQdHIobmV3IFRoZW1lUGFydENhY2hlRW50cnkp OworICAgIE93blB0cjxUaGVtZVBhcnRDYWNoZUVudHJ5PiBlbnRyeSA9IGFkb3B0UHRyKG5ldyBU aGVtZVBhcnRDYWNoZUVudHJ5KTsKIAogICAgIGVudHJ5LT5tX2NhbnZhcyA9IGFkb3B0UHRyKGVj b3JlX2V2YXNfYnVmZmVyX25ldyhzaXplLndpZHRoKCksIHNpemUuaGVpZ2h0KCkpKTsKICAgICBp ZiAoIWVudHJ5LT5jYW52YXMoKSkgewogICAgICAgICBFSU5BX0xPR19FUlIoImVjb3JlX2V2YXNf YnVmZmVyX25ldyglZCwgJWQpIGZhaWxlZC4iLCBzaXplLndpZHRoKCksIHNpemUuaGVpZ2h0KCkp OwotICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgfQogCiAg ICAgLy8gQnkgZGVmYXVsdCBFRkwgY3JlYXRlcyBidWZmZXJzIHdpdGhvdXQgYWxwaGEuCkBAIC0x OTcsMTEgKzE5NywxMSBAQCBSZW5kZXJUaGVtZUVmbDo6VGhlbWVQYXJ0Q2FjaGVFbnRyeSogUmVu ZGVyVGhlbWVFZmw6OlRoZW1lUGFydENhY2hlRW50cnk6OmNyZWF0ZQogICAgIEFTU0VSVChlbnRy eS0+ZWRqZSgpKTsKIAogICAgIGlmICghc2V0U291cmNlR3JvdXBGb3JFZGplT2JqZWN0KGVudHJ5 LT5lZGplKCksIHRoZW1lUGF0aCwgdG9FZGplR3JvdXAodHlwZSkpKQotICAgICAgICByZXR1cm4g MDsKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAKICAgICBlbnRyeS0+bV9zdXJmYWNlID0gY3Jl YXRlU3VyZmFjZUZvckJhY2tpbmdTdG9yZShlbnRyeS0+Y2FudmFzKCkpOwogICAgIGlmICghZW50 cnktPnN1cmZhY2UoKSkKLSAgICAgICAgcmV0dXJuIDA7CisgICAgICAgIHJldHVybiBudWxscHRy OwogCiAgICAgZXZhc19vYmplY3RfcmVzaXplKGVudHJ5LT5lZGplKCksIHNpemUud2lkdGgoKSwg c2l6ZS5oZWlnaHQoKSk7CiAgICAgZXZhc19vYmplY3Rfc2hvdyhlbnRyeS0+ZWRqZSgpKTsKQEAg LTIwOSw3ICsyMDksNyBAQCBSZW5kZXJUaGVtZUVmbDo6VGhlbWVQYXJ0Q2FjaGVFbnRyeSogUmVu ZGVyVGhlbWVFZmw6OlRoZW1lUGFydENhY2hlRW50cnk6OmNyZWF0ZQogICAgIGVudHJ5LT50eXBl ID0gdHlwZTsKICAgICBlbnRyeS0+c2l6ZSA9IHNpemU7CiAKLSAgICByZXR1cm4gZW50cnkubGVh a1B0cigpOworICAgIHJldHVybiBlbnRyeS5yZWxlYXNlKCk7CiB9CiAKIHZvaWQgUmVuZGVyVGhl bWVFZmw6OlRoZW1lUGFydENhY2hlRW50cnk6OnJldXNlKGNvbnN0IFN0cmluZyYgdGhlbWVQYXRo LCBGb3JtVHlwZSBuZXdUeXBlLCBjb25zdCBJbnRTaXplJiBuZXdTaXplKQpAQCAtMjQwLDU4ICsy NDAsNTQgQEAgdm9pZCBSZW5kZXJUaGVtZUVmbDo6VGhlbWVQYXJ0Q2FjaGVFbnRyeTo6cmV1c2Uo Y29uc3QgU3RyaW5nJiB0aGVtZVBhdGgsIEZvcm1UeXAKIAogUmVuZGVyVGhlbWVFZmw6OlRoZW1l UGFydENhY2hlRW50cnkqIFJlbmRlclRoZW1lRWZsOjpnZXRUaGVtZVBhcnRGcm9tQ2FjaGUoRm9y bVR5cGUgdHlwZSwgY29uc3QgSW50U2l6ZSYgc2l6ZSkKIHsKLSAgICBWZWN0b3I8VGhlbWVQYXJ0 Q2FjaGVFbnRyeSo+OjppdGVyYXRvciBpdCwgZW5kOwotICAgIHNpemVfdCBsYXN0V2l0aFJlcXVl c3RlZFNpemUgPSBub3RGb3VuZDsKLQotICAgIGl0ID0gbV9wYXJ0Q2FjaGUuYmVnaW4oKTsKLSAg ICBlbmQgPSBtX3BhcnRDYWNoZS5lbmQoKTsKLSAgICBmb3IgKHNpemVfdCBpID0gMDsgaXQgIT0g ZW5kOyBpKyssIGl0KyspIHsKLSAgICAgICAgVGhlbWVQYXJ0Q2FjaGVFbnRyeSogZW50cnkgPSAq aXQ7Ci0gICAgICAgIEFTU0VSVChlbnRyeSk7Ci0gICAgICAgIGlmIChlbnRyeS0+c2l6ZSA9PSBz aXplKSB7Ci0gICAgICAgICAgICBpZiAoZW50cnktPnR5cGUgPT0gdHlwZSkKLSAgICAgICAgICAg ICAgICByZXR1cm4gZW50cnk7Ci0gICAgICAgICAgICBsYXN0V2l0aFJlcXVlc3RlZFNpemUgPSBp OworICAgIHZvaWQqIGRhdGE7CisgICAgRWluYV9MaXN0KiBub2RlOworICAgIEVpbmFfTGlzdCog cmV1c2FibGVOb2RlID0gMDsKKworICAgIC8vIExvb2sgZm9yIHRoZSBpdGVtIGluIHRoZSBjYWNo ZS4KKyAgICBFSU5BX0xJU1RfRk9SRUFDSChtX3BhcnRDYWNoZSwgbm9kZSwgZGF0YSkgeworICAg ICAgICBUaGVtZVBhcnRDYWNoZUVudHJ5KiBjYWNoZWRFbnRyeSA9IHN0YXRpY19jYXN0PFRoZW1l UGFydENhY2hlRW50cnkqPihkYXRhKTsKKyAgICAgICAgaWYgKGNhY2hlZEVudHJ5LT5zaXplID09 IHNpemUpIHsKKyAgICAgICAgICAgIGlmIChjYWNoZWRFbnRyeS0+dHlwZSA9PSB0eXBlKSB7Cisg ICAgICAgICAgICAgICAgLy8gRm91bmQgdGhlIHJpZ2h0IGl0ZW0sIG1vdmUgaXQgdG8gdGhlIGhl YWQgb2YgdGhlIGxpc3QKKyAgICAgICAgICAgICAgICAvLyBhbmQgcmV0dXJuIGl0LgorICAgICAg ICAgICAgICAgIG1fcGFydENhY2hlID0gZWluYV9saXN0X3Byb21vdGVfbGlzdChtX3BhcnRDYWNo ZSwgbm9kZSk7CisgICAgICAgICAgICAgICAgcmV0dXJuIGNhY2hlZEVudHJ5OworICAgICAgICAg ICAgfQorICAgICAgICAgICAgLy8gV2UgcmV1c2UgaW4gcHJpb3JpdHkgdGhlIGxhc3QgaXRlbSBp biB0aGUgbGlzdCB0aGF0IGhhcworICAgICAgICAgICAgLy8gdGhlIHJlcXVlc3RlZCBzaXplLgor ICAgICAgICAgICAgcmV1c2FibGVOb2RlID0gbm9kZTsKICAgICAgICAgfQogICAgIH0KIAotICAg IGlmIChtX3BhcnRDYWNoZS5zaXplKCkgPCBSRU5ERVJfVEhFTUVfRUZMX1BBUlRfQ0FDSEVfTUFY KSB7Ci0gICAgICAgIFRoZW1lUGFydENhY2hlRW50cnkqIGVudHJ5ID0gVGhlbWVQYXJ0Q2FjaGVF bnRyeTo6Y3JlYXRlKHRoZW1lUGF0aCgpLCB0eXBlLCBzaXplKTsKLSAgICAgICAgaWYgKGVudHJ5 KSAvLyBDYW4gYmUgJzAnLCBpZiBjcmVhdGlvbiBmYWlscy4gRG8gbm90IHN0b3JlIGl0IGluIHRo aXMgY2FzZS4KLSAgICAgICAgICAgIG1fcGFydENhY2hlLnByZXBlbmQoZW50cnkpOworICAgIGlm IChlaW5hX2xpc3RfY291bnQobV9wYXJ0Q2FjaGUpIDwgUkVOREVSX1RIRU1FX0VGTF9QQVJUX0NB Q0hFX01BWCkgeworICAgICAgICBUaGVtZVBhcnRDYWNoZUVudHJ5KiBlbnRyeSA9IFRoZW1lUGFy dENhY2hlRW50cnk6OmNyZWF0ZSh0aGVtZVBhdGgoKSwgdHlwZSwgc2l6ZSkubGVha1B0cigpOwor ICAgICAgICBpZiAoZW50cnkpCisgICAgICAgICAgICBtX3BhcnRDYWNoZSA9IGVpbmFfbGlzdF9w cmVwZW5kKG1fcGFydENhY2hlLCBlbnRyeSk7CisKICAgICAgICAgcmV0dXJuIGVudHJ5OwogICAg IH0KIAotICAgIC8vIFdlIGhhdmUgYSBmdWxsIGNhY2hlIG5vdyEKLSAgICBFSU5BX0xPR19JTkZP KCJSZW5kZXJUaGVtZSBjYWNoZSBpcyBmdWxsLCByZXVzaW5nLiIpOworICAgIC8vIFRoZSBjYWNo ZSBpcyBmdWxsLCByZXVzZSB0aGUgbGFzdCBpdGVtIHdlIGZvdW5kIHRoYXQgaGFkIHRoZQorICAg IC8vIHJlcXVlc3RlZCBzaXplIHRvIGF2b2lkIHJlc2l6aW5nLiBJZiB0aGVyZSB3YXMgbm9uZSwg cmV1c2UKKyAgICAvLyB0aGUgbGFzdCBpdGVtIG9mIHRoZSBsaXN0LgorICAgIGlmICghcmV1c2Fi bGVOb2RlKQorICAgICAgICByZXVzYWJsZU5vZGUgPSBlaW5hX2xpc3RfbGFzdChtX3BhcnRDYWNo ZSk7CiAKLSAgICBpZiAobGFzdFdpdGhSZXF1ZXN0ZWRTaXplICE9IG5vdEZvdW5kICYmIGxhc3RX aXRoUmVxdWVzdGVkU2l6ZSAhPSAxKSB7Ci0gICAgICAgIFRoZW1lUGFydENhY2hlRW50cnkqIGVu dHJ5ID0gbV9wYXJ0Q2FjaGUuYXQobGFzdFdpdGhSZXF1ZXN0ZWRTaXplKTsKLSAgICAgICAgQVNT RVJUKGVudHJ5KTsKLSAgICAgICAgZW50cnktPnJldXNlKHRoZW1lUGF0aCgpLCB0eXBlKTsKLSAg ICAgICAgbV9wYXJ0Q2FjaGUucmVtb3ZlKGxhc3RXaXRoUmVxdWVzdGVkU2l6ZSk7Ci0gICAgICAg IG1fcGFydENhY2hlLnByZXBlbmQoZW50cnkpOwotICAgICAgICByZXR1cm4gZW50cnk7Ci0gICAg fQorICAgIFRoZW1lUGFydENhY2hlRW50cnkqIHJldXNlZEVudHJ5ID0gc3RhdGljX2Nhc3Q8VGhl bWVQYXJ0Q2FjaGVFbnRyeSo+KGVpbmFfbGlzdF9kYXRhX2dldChyZXVzYWJsZU5vZGUpKTsKKyAg ICBBU1NFUlQocmV1c2VkRW50cnkpOworICAgIHJldXNlZEVudHJ5LT5yZXVzZSh0aGVtZVBhdGgo KSwgdHlwZSwgc2l6ZSk7CisgICAgbV9wYXJ0Q2FjaGUgPSBlaW5hX2xpc3RfcHJvbW90ZV9saXN0 KG1fcGFydENhY2hlLCByZXVzYWJsZU5vZGUpOwogCi0gICAgVGhlbWVQYXJ0Q2FjaGVFbnRyeSog ZW50cnkgPSBtX3BhcnRDYWNoZS5sYXN0KCk7Ci0gICAgQVNTRVJUKGVudHJ5KTsKLSAgICBlbnRy eS0+cmV1c2UodGhlbWVQYXRoKCksIHR5cGUsIHNpemUpOwotICAgIG1fcGFydENhY2hlLnJlbW92 ZUxhc3QoKTsKLSAgICBtX3BhcnRDYWNoZS5wcmVwZW5kKGVudHJ5KTsKLSAgICByZXR1cm4gZW50 cnk7CisgICAgcmV0dXJuIHJldXNlZEVudHJ5OwogfQogCi12b2lkIFJlbmRlclRoZW1lRWZsOjpm bHVzaFRoZW1lUGFydENhY2hlKCkKK3ZvaWQgUmVuZGVyVGhlbWVFZmw6OmNsZWFyVGhlbWVQYXJ0 Q2FjaGUoKQogewotICAgIFZlY3RvcjxUaGVtZVBhcnRDYWNoZUVudHJ5Kj46Oml0ZXJhdG9yIGl0 LCBlbmQ7Ci0KLSAgICBpdCA9IG1fcGFydENhY2hlLmJlZ2luKCk7Ci0gICAgZW5kID0gbV9wYXJ0 Q2FjaGUuZW5kKCk7Ci0gICAgZm9yICg7IGl0ICE9IGVuZDsgaXQrKykKLSAgICAgICAgZGVsZXRl ICgqaXQpOworICAgIHZvaWQqIGRhdGE7CisgICAgRUlOQV9MSVNUX0ZSRUUobV9wYXJ0Q2FjaGUs IGRhdGEpCisgICAgICAgIGRlbGV0ZSBzdGF0aWNfY2FzdDxUaGVtZVBhcnRDYWNoZUVudHJ5Kj4o ZGF0YSk7CiAKLSAgICBtX3BhcnRDYWNoZS5jbGVhcigpOwogfQogCiB2b2lkIFJlbmRlclRoZW1l RWZsOjphcHBseUVkamVTdGF0ZUZyb21Gb3JtKEV2YXNfT2JqZWN0KiBvYmplY3QsIENvbnRyb2xT dGF0ZXMgc3RhdGVzKQpAQCAtNDk0LDkgKzQ5MCw5IEBAIGJvb2wgUmVuZGVyVGhlbWVFZmw6Omxv YWRUaGVtZSgpCiAgICAgaWYgKCFzZXRTb3VyY2VHcm91cEZvckVkamVPYmplY3Qoby5nZXQoKSwg bV90aGVtZVBhdGgsICJ3ZWJraXQvYmFzZSIpKQogICAgICAgICByZXR1cm4gZmFsc2U7IC8vIEtl ZXAgY3VycmVudCB0aGVtZS4KIAotICAgIC8vIEdldCByaWQgb2YgZXhpc3RpbmcgdGhlbWUuCisg ICAgLy8gSW52YWxpZGF0ZSBleGlzdGluZyB0aGVtZSBwYXJ0IGNhY2hlLgogICAgIGlmIChlZGpl KCkpCi0gICAgICAgIGZsdXNoVGhlbWVQYXJ0Q2FjaGUoKTsKKyAgICAgICAgY2xlYXJUaGVtZVBh cnRDYWNoZSgpOwogCiAgICAgLy8gU2V0IG5ldyBsb2FkZWQgdGhlbWUsIGFuZCBhcHBseSBpdC4K ICAgICBtX2VkamUgPSBvOwpAQCAtNjA2LDEyICs2MDIsMTMgQEAgUmVuZGVyVGhlbWVFZmw6OlJl bmRlclRoZW1lRWZsKFBhZ2UqIHBhZ2UpCiAgICAgLCBtX21lZGlhUGFuZWxDb2xvcigyMjAsIDIy MCwgMTk1KSAvLyBsaWdodCB0YW5uaXNoIGNvbG9yLgogICAgICwgbV9tZWRpYVNsaWRlckNvbG9y KENvbG9yOjp3aGl0ZSkKICNlbmRpZgorICAgICwgbV9wYXJ0Q2FjaGUoMCkKIHsKIH0KIAogUmVu ZGVyVGhlbWVFZmw6On5SZW5kZXJUaGVtZUVmbCgpCiB7Ci0gICAgZmx1c2hUaGVtZVBhcnRDYWNo ZSgpOworICAgIGNsZWFyVGhlbWVQYXJ0Q2FjaGUoKTsKIH0KIAogc3RhdGljIGJvb2wgc3VwcG9y dHNGb2N1cyhDb250cm9sUGFydCBhcHBlYXJhbmNlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZWZsL1JlbmRlclRoZW1lRWZsLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9lZmwvUmVuZGVyVGhlbWVFZmwuaAppbmRleCA0ODNjMGJlLi40NTMyOTllIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9lZmwvUmVuZGVyVGhlbWVFZmwuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9lZmwvUmVuZGVyVGhlbWVFZmwuaApAQCAtMzUsNiArMzUsNyBA QAogI2VuZGlmCiAjaW5jbHVkZSAiUmVuZGVyVGhlbWUuaCIKIAorI2luY2x1ZGUgPEVpbmEuaD4K ICNpbmNsdWRlIDxjYWlyby5oPgogI2luY2x1ZGUgPHd0Zi9lZmwvUmVmUHRyRWZsLmg+CiAKQEAg LTI2Myw3ICsyNjQsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgYXBwbHlQYXJ0RGVzY3JpcHRpb24o RXZhc19PYmplY3QqLCBzdHJ1Y3QgVGhlbWVQYXJ0RGVzYyopOwogCiAgICAgc3RydWN0IFRoZW1l UGFydENhY2hlRW50cnkgewotICAgICAgICBzdGF0aWMgVGhlbWVQYXJ0Q2FjaGVFbnRyeSogY3Jl YXRlKGNvbnN0IFN0cmluZyYgdGhlbWVQYXRoLCBGb3JtVHlwZSwgY29uc3QgSW50U2l6ZSYpOwor ICAgICAgICBzdGF0aWMgUGFzc093blB0cjxSZW5kZXJUaGVtZUVmbDo6VGhlbWVQYXJ0Q2FjaGVF bnRyeT4gY3JlYXRlKGNvbnN0IFN0cmluZyYgdGhlbWVQYXRoLCBGb3JtVHlwZSwgY29uc3QgSW50 U2l6ZSYpOwogICAgICAgICB2b2lkIHJldXNlKGNvbnN0IFN0cmluZyYgdGhlbWVQYXRoLCBGb3Jt VHlwZSwgY29uc3QgSW50U2l6ZSYgPSBJbnRTaXplKCkpOwogCiAgICAgICAgIEFMV0FZU19JTkxJ TkUgRWNvcmVfRXZhcyogY2FudmFzKCkgeyByZXR1cm4gbV9jYW52YXMuZ2V0KCk7IH0KQEAgLTI4 MiwxMiArMjgzLDEzIEBAIHByaXZhdGU6CiAKICAgICBzdHJ1Y3QgVGhlbWVQYXJ0RGVzYyBtX3Bh cnREZXNjc1tGb3JtVHlwZUxhc3RdOwogCi0gICAgLy8gdGhpcyBzaG91bGQgYmUgc21hbGwgYW5k IG5vdCBzbyBmcmVxdWVudGx5IHVzZWQsCi0gICAgLy8gc28gdXNlIGEgdmVjdG9yIGFuZCBkbyBs aW5lYXIgc2VhcmNoZXMKLSAgICBWZWN0b3I8VGhlbWVQYXJ0Q2FjaGVFbnRyeSo+IG1fcGFydENh Y2hlOworICAgIC8vIExpc3Qgb2YgVGhlbWVQYXJ0Q2FjaGVFbnRyeSogc29ydGVkIHNvIHRoYXQg dGhlIG1vc3QgcmVjZW50bHkKKyAgICAvLyB1c2VkIGVudHJpZXMgY29tZSBmaXJzdC4gV2UgdXNl IGEgbGlzdCBmb3IgZWZmaWNpZW50IG1vdmluZworICAgIC8vIG9mIGl0ZW1zIHdpdGhpbiB0aGUg Y29udGFpbmVyLgorICAgIEVpbmFfTGlzdCogbV9wYXJ0Q2FjaGU7CiAKICAgICBUaGVtZVBhcnRD YWNoZUVudHJ5KiBnZXRUaGVtZVBhcnRGcm9tQ2FjaGUoRm9ybVR5cGUsIGNvbnN0IEludFNpemUm KTsKLSAgICB2b2lkIGZsdXNoVGhlbWVQYXJ0Q2FjaGUoKTsKKyAgICB2b2lkIGNsZWFyVGhlbWVQ YXJ0Q2FjaGUoKTsKIH07CiB9CiAK