76972 2012-01-24 18:05:20 -0800 Move RenderLayer::size() calls to a common function 2012-02-28 15:09:32 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 75568 1 jchaffraix jchaffraix darin hyatt jamesr simon.fraser webkit.review.bot oldest_to_newest 541924 0 jchaffraix 2012-01-24 18:05:20 -0800 This is a second refactoring towards lazily allocating our layers as part of bug 75568. Once all callers go through this new function we can add some layer() checks and some size caching scheme so that we can properly repaint without a layer. 541941 1 123869 jchaffraix 2012-01-24 18:19:27 -0800 Created attachment 123869 Proposed refactoring 561125 2 128020 jchaffraix 2012-02-21 12:19:33 -0800 Created attachment 128020 Updated to ToT. 562362 3 128020 hyatt 2012-02-22 14:00:28 -0800 Comment on attachment 128020 Updated to ToT. I don't like the term "cachedSize", since this is specifically about "the overflow clip layer size." I know you are going to stop making layers eventually, but maybe layerSize() is still an ok name to use. 562392 4 128290 jchaffraix 2012-02-22 14:29:33 -0800 Created attachment 128290 With a better naming after talking with Dave on IRC. 567029 5 jchaffraix 2012-02-28 13:26:48 -0800 Adding more reviewers as this should be a simple change to review. 567142 6 128290 webkit.review.bot 2012-02-28 15:09:27 -0800 Comment on attachment 128290 With a better naming after talking with Dave on IRC. Clearing flags on attachment: 128290 Committed r109157: <http://trac.webkit.org/changeset/109157> 567143 7 webkit.review.bot 2012-02-28 15:09:32 -0800 All reviewed patches have been landed. Closing bug. 123869 2012-01-24 18:19:27 -0800 2012-02-21 12:19:29 -0800 Proposed refactoring cached-size-76972.diff text/plain 6885 jchaffraix ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA2YzBiMTUwLi4yOWFlNTZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIg QEAKKzIwMTItMDEtMjQgIEp1bGllbiBDaGFmZnJhaXggIDxqY2hhZmZyYWl4QHdlYmtpdC5vcmc+ CisKKyAgICAgICAgTW92ZSBSZW5kZXJMYXllcjo6c2l6ZSgpIGNhbGxzIHRvIGEgY29tbW9uIGZ1 bmN0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03 Njk3MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJl ZmFjdG9yaW5nIG9ubHkuCisKKyAgICAgICAgKiByZW5kZXJpbmcvTGF5b3V0U3RhdGUuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6TGF5b3V0U3RhdGU6OkxheW91dFN0YXRlKToKKyAgICAgICAgKiBy ZW5kZXJpbmcvUmVuZGVyQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29t cHV0ZVJlY3RGb3JSZXBhaW50KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxP YmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94TW9kZWxPYmplY3Q6OmNhY2hl ZFNpemUpOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJv eE1vZGVsT2JqZWN0Lmg6CisgICAgICAgIChSZW5kZXJCb3hNb2RlbE9iamVjdCk6CisgICAgICAg ICogcmVuZGVyaW5nL1JlbmRlcklubGluZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJJ bmxpbmU6OmNsaXBwZWRPdmVyZmxvd1JlY3RGb3JSZXBhaW50KToKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlcklubGluZTo6Y29tcHV0ZVJlY3RGb3JSZXBhaW50KToKKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVyT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck9iamVjdDo6Y29t cHV0ZVJlY3RGb3JSZXBhaW50KToKKyAgICAgICAgRml4ZWQgdGhlIGNhbGwgc2l0ZXMgYWJvdmUu CisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyT2JqZWN0Lmg6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJPYmplY3Q6OmNhY2hlZFNpemUpOgorICAgICAgICBBZGRlZCB0aGlzIGZ1bmN0aW9u IHRvIGhhbmRsZSB0aGUgY2FsbHMgdG8gUmVuZGVyTGF5ZXIncyBzaXplKCkuCisKIDIwMTItMDEt MjQgIEtlbiBCdWNoYW5hbiAgPGtlbnJiQGNocm9taXVtLm9yZz4KIAogICAgICAgICBDcmFzaCBp biB1cGRhdGVGaXJzdExldHRlcigpIGZyb20gdW5uZWNlc3NhcnkgYW5vbnltb3VzIGJsb2NrCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvTGF5b3V0U3RhdGUuY3BwIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0xheW91dFN0YXRlLmNwcAppbmRleCAwMGFmYmM4Li4yOWQ1 NTgzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvTGF5b3V0U3RhdGUuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9MYXlvdXRTdGF0ZS5jcHAKQEAgLTcwLDgg KzcwLDcgQEAgTGF5b3V0U3RhdGU6OkxheW91dFN0YXRlKExheW91dFN0YXRlKiBwcmV2LCBSZW5k ZXJCb3gqIHJlbmRlcmVyLCBjb25zdCBMYXlvdXRTaXoKICAgICAgICAgbV9jbGlwUmVjdCA9IHBy ZXYtPm1fY2xpcFJlY3Q7CiAKICAgICBpZiAocmVuZGVyZXItPmhhc092ZXJmbG93Q2xpcCgpKSB7 Ci0gICAgICAgIFJlbmRlckxheWVyKiBsYXllciA9IHJlbmRlcmVyLT5sYXllcigpOwotICAgICAg ICBMYXlvdXRSZWN0IGNsaXBSZWN0KHRvUG9pbnQobV9wYWludE9mZnNldCkgKyByZW5kZXJlci0+ dmlldygpLT5sYXlvdXREZWx0YSgpLCBsYXllci0+c2l6ZSgpKTsKKyAgICAgICAgTGF5b3V0UmVj dCBjbGlwUmVjdCh0b1BvaW50KG1fcGFpbnRPZmZzZXQpICsgcmVuZGVyZXItPnZpZXcoKS0+bGF5 b3V0RGVsdGEoKSwgcmVuZGVyZXItPmNhY2hlZFNpemUoKSk7CiAgICAgICAgIGlmIChtX2NsaXBw ZWQpCiAgICAgICAgICAgICBtX2NsaXBSZWN0LmludGVyc2VjdChjbGlwUmVjdCk7CiAgICAgICAg IGVsc2UgewpAQCAtMTUzLDkgKzE1Miw4IEBAIExheW91dFN0YXRlOjpMYXlvdXRTdGF0ZShSZW5k ZXJPYmplY3QqIHJvb3QpCiAgICAgbV9wYWludE9mZnNldCA9IExheW91dFNpemUoYWJzQ29udGVu dFBvaW50LngoKSwgYWJzQ29udGVudFBvaW50LnkoKSk7CiAKICAgICBpZiAoY29udGFpbmVyLT5o YXNPdmVyZmxvd0NsaXAoKSkgewotICAgICAgICBSZW5kZXJMYXllciogbGF5ZXIgPSB0b1JlbmRl ckJveE1vZGVsT2JqZWN0KGNvbnRhaW5lciktPmxheWVyKCk7CiAgICAgICAgIG1fY2xpcHBlZCA9 IHRydWU7Ci0gICAgICAgIG1fY2xpcFJlY3QgPSBMYXlvdXRSZWN0KHRvUG9pbnQobV9wYWludE9m ZnNldCksIGxheWVyLT5zaXplKCkpOworICAgICAgICBtX2NsaXBSZWN0ID0gTGF5b3V0UmVjdCh0 b1BvaW50KG1fcGFpbnRPZmZzZXQpLCBjb250YWluZXItPmNhY2hlZFNpemUoKSk7CiAgICAgICAg IG1fcGFpbnRPZmZzZXQgLT0gY29udGFpbmVyLT5zY3JvbGxlZENvbnRlbnRPZmZzZXQoKTsKICAg ICB9CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNw cCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCmluZGV4IDE5NGQ4YTIu LmIxZTgyODEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3gu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCkBAIC0xNTg2 LDcgKzE1ODYsNyBAQCB2b2lkIFJlbmRlckJveDo6Y29tcHV0ZVJlY3RGb3JSZXBhaW50KFJlbmRl ckJveE1vZGVsT2JqZWN0KiByZXBhaW50Q29udGFpbmVyLCBMYQogICAgICAgICB0b3BMZWZ0IC09 IGNvbnRhaW5lckJveC0+c2Nyb2xsZWRDb250ZW50T2Zmc2V0KCk7IC8vIEZvciBvdmVyZmxvdzph dXRvL3Njcm9sbC9oaWRkZW4uCiAKICAgICAgICAgTGF5b3V0UmVjdCByZXBhaW50UmVjdCh0b3BM ZWZ0LCByZWN0LnNpemUoKSk7Ci0gICAgICAgIExheW91dFJlY3QgYm94UmVjdChMYXlvdXRQb2lu dCgpLCBjb250YWluZXJCb3gtPmxheWVyKCktPnNpemUoKSk7CisgICAgICAgIExheW91dFJlY3Qg Ym94UmVjdChMYXlvdXRQb2ludCgpLCBjb250YWluZXJCb3gtPmNhY2hlZFNpemUoKSk7CiAgICAg ICAgIHJlY3QgPSBpbnRlcnNlY3Rpb24ocmVwYWludFJlY3QsIGJveFJlY3QpOwogICAgICAgICBp ZiAocmVjdC5pc0VtcHR5KCkpCiAgICAgICAgICAgICByZXR1cm47CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuY3BwIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcAppbmRleCBmOGExZDE3Li5k MmE4MjdiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9k ZWxPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2Rl bE9iamVjdC5jcHAKQEAgLTI3ODUsNCArMjc4NSwxMiBAQCB2b2lkIFJlbmRlckJveE1vZGVsT2Jq ZWN0OjptYXBBYnNvbHV0ZVRvTG9jYWxQb2ludChib29sIGZpeGVkLCBib29sIHVzZVRyYW5zZm9y bQogICAgICAgICB0cmFuc2Zvcm1TdGF0ZS5tb3ZlKGNvbnRhaW5lck9mZnNldC53aWR0aCgpLCBj b250YWluZXJPZmZzZXQuaGVpZ2h0KCksIHByZXNlcnZlM0QgPyBUcmFuc2Zvcm1TdGF0ZTo6QWNj dW11bGF0ZVRyYW5zZm9ybSA6IFRyYW5zZm9ybVN0YXRlOjpGbGF0dGVuVHJhbnNmb3JtKTsKIH0K IAorTGF5b3V0U2l6ZSBSZW5kZXJCb3hNb2RlbE9iamVjdDo6Y2FjaGVkU2l6ZSgpIGNvbnN0Cit7 CisgICAgQVNTRVJUKGhhc092ZXJmbG93Q2xpcCgpKTsKKyAgICBBU1NFUlQoaGFzTGF5ZXIoKSk7 CisKKyAgICByZXR1cm4gbGF5ZXIoKS0+c2l6ZSgpOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJD b3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxP YmplY3QuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5o CmluZGV4IGJiODFiZDMuLjc5ZTIyZmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJCb3hNb2RlbE9iamVjdC5oCkBAIC0xMzQsNiArMTM0LDggQEAgcHVibGljOgogCiAg ICAgdmlydHVhbCB2b2lkIHNldFNlbGVjdGlvblN0YXRlKFNlbGVjdGlvblN0YXRlIHMpOwogCisg ICAgdmlydHVhbCBMYXlvdXRTaXplIGNhY2hlZFNpemUoKSBjb25zdCBPVkVSUklERTsKKwogcHJv dGVjdGVkOgogICAgIHZpcnR1YWwgdm9pZCB3aWxsQmVEZXN0cm95ZWQoKTsKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcklubGluZS5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5lLmNwcAppbmRleCBiZmFkNjJmLi45YTcxMWVkIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5lLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5lLmNwcApAQCAtOTkwLDcgKzk5 MCw3IEBAIExheW91dFJlY3QgUmVuZGVySW5saW5lOjpjbGlwcGVkT3ZlcmZsb3dSZWN0Rm9yUmVw YWludChSZW5kZXJCb3hNb2RlbE9iamVjdCogcmVwCiAgICAgICAgIExheW91dFJlY3QgcmVwYWlu dFJlY3Qocik7CiAgICAgICAgIHJlcGFpbnRSZWN0Lm1vdmUoLWNiLT5zY3JvbGxlZENvbnRlbnRP ZmZzZXQoKSk7IC8vIEZvciBvdmVyZmxvdzphdXRvL3Njcm9sbC9oaWRkZW4uCiAKLSAgICAgICAg TGF5b3V0UmVjdCBib3hSZWN0KExheW91dFBvaW50KCksIGNiLT5sYXllcigpLT5zaXplKCkpOwor ICAgICAgICBMYXlvdXRSZWN0IGJveFJlY3QoTGF5b3V0UG9pbnQoKSwgY2ItPmNhY2hlZFNpemUo KSk7CiAgICAgICAgIHIgPSBpbnRlcnNlY3Rpb24ocmVwYWludFJlY3QsIGJveFJlY3QpOwogICAg IH0KICAgICAKQEAgLTEwOTIsNyArMTA5Miw3IEBAIHZvaWQgUmVuZGVySW5saW5lOjpjb21wdXRl UmVjdEZvclJlcGFpbnQoUmVuZGVyQm94TW9kZWxPYmplY3QqIHJlcGFpbnRDb250YWluZXIsCiAg ICAgICAgIHRvcExlZnQgLT0gY29udGFpbmVyQm94LT5zY3JvbGxlZENvbnRlbnRPZmZzZXQoKTsg Ly8gRm9yIG92ZXJmbG93OmF1dG8vc2Nyb2xsL2hpZGRlbi4KIAogICAgICAgICBMYXlvdXRSZWN0 IHJlcGFpbnRSZWN0KHRvcExlZnQsIHJlY3Quc2l6ZSgpKTsKLSAgICAgICAgTGF5b3V0UmVjdCBi b3hSZWN0KExheW91dFBvaW50KCksIGNvbnRhaW5lckJveC0+bGF5ZXIoKS0+c2l6ZSgpKTsKKyAg ICAgICAgTGF5b3V0UmVjdCBib3hSZWN0KExheW91dFBvaW50KCksIGNvbnRhaW5lckJveC0+Y2Fj aGVkU2l6ZSgpKTsKICAgICAgICAgcmVjdCA9IGludGVyc2VjdGlvbihyZXBhaW50UmVjdCwgYm94 UmVjdCk7CiAgICAgICAgIGlmIChyZWN0LmlzRW1wdHkoKSkKICAgICAgICAgICAgIHJldHVybjsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAKaW5kZXggMGQ1ZWExYy4u NTc3YTQ4YyAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVj dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAKQEAg LTE1MDIsNyArMTUwMiw3IEBAIHZvaWQgUmVuZGVyT2JqZWN0Ojpjb21wdXRlUmVjdEZvclJlcGFp bnQoUmVuZGVyQm94TW9kZWxPYmplY3QqIHJlcGFpbnRDb250YWluZXIsCiAgICAgICAgICAgICBM YXlvdXRSZWN0IHJlcGFpbnRSZWN0KHJlY3QpOwogICAgICAgICAgICAgcmVwYWludFJlY3QubW92 ZSgtYm94UGFyZW50LT5zY3JvbGxlZENvbnRlbnRPZmZzZXQoKSk7IC8vIEZvciBvdmVyZmxvdzph dXRvL3Njcm9sbC9oaWRkZW4uCiAKLSAgICAgICAgICAgIExheW91dFJlY3QgYm94UmVjdChMYXlv dXRQb2ludCgpLCBib3hQYXJlbnQtPmxheWVyKCktPnNpemUoKSk7CisgICAgICAgICAgICBMYXlv dXRSZWN0IGJveFJlY3QoTGF5b3V0UG9pbnQoKSwgYm94UGFyZW50LT5jYWNoZWRTaXplKCkpOwog ICAgICAgICAgICAgcmVjdCA9IGludGVyc2VjdGlvbihyZXBhaW50UmVjdCwgYm94UmVjdCk7CiAg ICAgICAgICAgICBpZiAocmVjdC5pc0VtcHR5KCkpCiAgICAgICAgICAgICAgICAgcmV0dXJuOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oCmluZGV4IDNhYmQ5NGQuLjlkOTM2 ZGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmgKQEAgLTg1Niw2ICs4 NTYsNyBAQCBwdWJsaWM6CiAgICAgUmVuZGVyT2JqZWN0KiByZW5kZXJlckZvclJvb3RCYWNrZ3Jv dW5kKCk7CiAKICAgICBMYXlvdXRTaXplIHNjcm9sbGVkQ29udGVudE9mZnNldCgpIGNvbnN0Owor ICAgIHZpcnR1YWwgTGF5b3V0U2l6ZSBjYWNoZWRTaXplKCkgY29uc3QgeyBBU1NFUlRfTk9UX1JF QUNIRUQoKTsgcmV0dXJuIExheW91dFNpemUoKTsgfQogCiBwcm90ZWN0ZWQ6CiAgICAgLy8gT3Zl cnJpZGVzIHNob3VsZCBjYWxsIHRoZSBzdXBlcmNsYXNzIGF0IHRoZSBlbmQK 128020 2012-02-21 12:19:33 -0800 2012-02-22 14:29:31 -0800 Updated to ToT. bug-76972-20120221121932.patch text/plain 6967 jchaffraix U3VidmVyc2lvbiBSZXZpc2lvbjogMTA4MzgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWI1YzA0MzY4MGRhNmEy Y2Y0OGZjNmYxZjBiYjZmNWE5ZDI5NzU3NS4uNDJiNGE2Mzg2OTAxOTBmMTAwMGUwZDNkODRjZTU5 NTcxMzJjYWZhZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM2IEBACiAyMDEyLTAyLTIxICBKdWxp ZW4gQ2hhZmZyYWl4ICA8amNoYWZmcmFpeEB3ZWJraXQub3JnPgogCisgICAgICAgIE1vdmUgUmVu ZGVyTGF5ZXI6OnNpemUoKSBjYWxscyB0byBhIGNvbW1vbiBmdW5jdGlvbgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzY5NzIKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZWZhY3RvcmluZyBvbmx5LgorCisg ICAgICAgIFRoaXMgY2hhbmdlIGludHJvZHVjZXMgUmVuZGVyQm94OjpjYWNoZWRTaXplKCkgdGhh dCBoYW5kbGVzIGFsbCB0aGUgY2FjaGVkIHNpemUgcmVxdWVzdHMgdGhhdAorICAgICAgICBjdXJy ZW50bHkgZ29lcyB0aHJvdWdoIHRoZSBSZW5kZXJMYXllci4gVGhpcyBpbmRpcmVjdGlvbiBoZWxw cyB0byBkZWNvdXBsZSB0aGUgbmVlZCBmb3IgYSBSZW5kZXJMYXllcgorICAgICAgICBzbyB0aGF0 IHdlIGNhbiBsYXppbHkgYWxsb2NhdGUgUmVuZGVyTGF5ZXJzIGFzIHBhcnQgb2YgYnVnIDc1NTY4 LgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJCb3g6OmNhY2hlZFNpemUpOgorICAgICAgICBBZGRlZCB0aGlzIGZ1bmN0aW9uIHRv IGhhbmRsZSB0aGUgY2FsbHMgdG8gUmVuZGVyTGF5ZXIncyBzaXplKCkuIFVuZm9ydHVuYXRlbHkg YSBsb3Qgb2YgdGhlIGNvZGUKKyAgICAgICAgY2FsbHMgUmVuZGVyTGF5ZXI6OnNpemUoKSBkaXJl Y3RseSBzbyBJIGNvdWxkIG5vdCBtYWtlIGl0IHByaXZhdGUuCisKKyAgICAgICAgKiByZW5kZXJp bmcvTGF5b3V0U3RhdGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0U3RhdGU6OkxheW91 dFN0YXRlKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckJveDo6Y29tcHV0ZVJlY3RGb3JSZXBhaW50KToKKyAgICAgICAgKiByZW5k ZXJpbmcvUmVuZGVyQm94Lmg6CisgICAgICAgIChSZW5kZXJCb3gpOgorICAgICAgICAqIHJlbmRl cmluZy9SZW5kZXJJbmxpbmUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVySW5saW5lOjpj bGlwcGVkT3ZlcmZsb3dSZWN0Rm9yUmVwYWludCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJJ bmxpbmU6OmNvbXB1dGVSZWN0Rm9yUmVwYWludCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRl ck9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJPYmplY3Q6OmNvbXB1dGVSZWN0 Rm9yUmVwYWludCk6CisgICAgICAgIEZpeGVkIHRoZSBjYWxsIHNpdGVzIGFib3ZlLgorCisyMDEy LTAyLTIxICBKdWxpZW4gQ2hhZmZyYWl4ICA8amNoYWZmcmFpeEB3ZWJraXQub3JnPgorCiAgICAg ICAgIE1vdmUgUmVuZGVyTGF5ZXI6OnNjcm9sbGVkQ29udGVudE9mZnNldCBjYWxscyB0byBhIGNv bW1vbiBmdW5jdGlvbgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NzY5NzEKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0xheW91 dFN0YXRlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9MYXlvdXRTdGF0ZS5jcHAKaW5k ZXggZTg5ZGNjNWRiZjQ4Yjk3YzA1Y2FkMjUzNGYwODAyYzc1MTIzY2FiOS4uNTBjNGU0NzNiZmNk ZDhkMjQ4Y2U5ODViOWI0MzI4ZjYyNmU1YmE0MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL0xheW91dFN0YXRlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv TGF5b3V0U3RhdGUuY3BwCkBAIC03MCw4ICs3MCw3IEBAIExheW91dFN0YXRlOjpMYXlvdXRTdGF0 ZShMYXlvdXRTdGF0ZSogcHJldiwgUmVuZGVyQm94KiByZW5kZXJlciwgY29uc3QgTGF5b3V0U2l6 CiAgICAgICAgIG1fY2xpcFJlY3QgPSBwcmV2LT5tX2NsaXBSZWN0OwogCiAgICAgaWYgKHJlbmRl cmVyLT5oYXNPdmVyZmxvd0NsaXAoKSkgewotICAgICAgICBSZW5kZXJMYXllciogbGF5ZXIgPSBy ZW5kZXJlci0+bGF5ZXIoKTsKLSAgICAgICAgTGF5b3V0UmVjdCBjbGlwUmVjdCh0b1BvaW50KG1f cGFpbnRPZmZzZXQpICsgcmVuZGVyZXItPnZpZXcoKS0+bGF5b3V0RGVsdGEoKSwgbGF5ZXItPnNp emUoKSk7CisgICAgICAgIExheW91dFJlY3QgY2xpcFJlY3QodG9Qb2ludChtX3BhaW50T2Zmc2V0 KSArIHJlbmRlcmVyLT52aWV3KCktPmxheW91dERlbHRhKCksIHJlbmRlcmVyLT5jYWNoZWRTaXpl KCkpOwogICAgICAgICBpZiAobV9jbGlwcGVkKQogICAgICAgICAgICAgbV9jbGlwUmVjdC5pbnRl cnNlY3QoY2xpcFJlY3QpOwogICAgICAgICBlbHNlIHsKQEAgLTE1NiwxMCArMTU1LDkgQEAgTGF5 b3V0U3RhdGU6OkxheW91dFN0YXRlKFJlbmRlck9iamVjdCogcm9vdCkKICAgICBtX3BhaW50T2Zm c2V0ID0gTGF5b3V0U2l6ZShhYnNDb250ZW50UG9pbnQueCgpLCBhYnNDb250ZW50UG9pbnQueSgp KTsKIAogICAgIGlmIChjb250YWluZXItPmhhc092ZXJmbG93Q2xpcCgpKSB7Ci0gICAgICAgIFJl bmRlckJveCogY29udGFpbmVyQm94ID0gdG9SZW5kZXJCb3goY29udGFpbmVyKTsKLSAgICAgICAg UmVuZGVyTGF5ZXIqIGxheWVyID0gY29udGFpbmVyQm94LT5sYXllcigpOwogICAgICAgICBtX2Ns aXBwZWQgPSB0cnVlOwotICAgICAgICBtX2NsaXBSZWN0ID0gTGF5b3V0UmVjdCh0b1BvaW50KG1f cGFpbnRPZmZzZXQpLCBsYXllci0+c2l6ZSgpKTsKKyAgICAgICAgUmVuZGVyQm94KiBjb250YWlu ZXJCb3ggPSB0b1JlbmRlckJveChjb250YWluZXIpOworICAgICAgICBtX2NsaXBSZWN0ID0gTGF5 b3V0UmVjdCh0b1BvaW50KG1fcGFpbnRPZmZzZXQpLCBjb250YWluZXJCb3gtPmNhY2hlZFNpemUo KSk7CiAgICAgICAgIG1fcGFpbnRPZmZzZXQgLT0gY29udGFpbmVyQm94LT5zY3JvbGxlZENvbnRl bnRPZmZzZXQoKTsKICAgICB9CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3Bw CmluZGV4IGQyMWMyNDA1ZGY5M2VlY2U0M2Q2OTgxZDhiZmJkYjUxZmRmMTdkN2QuLmYwMDA4M2Yx NDczZDU1NmYyN2E1MzY4ZjA0ZDExMjQ4M2E3NDVjMTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJCb3guY3BwCkBAIC03NTMsNiArNzUzLDE0IEBAIEludFNpemUgUmVuZGVyQm94Ojpz Y3JvbGxlZENvbnRlbnRPZmZzZXQoKSBjb25zdAogICAgIHJldHVybiBsYXllcigpLT5zY3JvbGxl ZENvbnRlbnRPZmZzZXQoKTsKIH0KIAorSW50U2l6ZSBSZW5kZXJCb3g6OmNhY2hlZFNpemUoKSBj b25zdAoreworICAgIEFTU0VSVChoYXNPdmVyZmxvd0NsaXAoKSk7CisgICAgQVNTRVJUKGhhc0xh eWVyKCkpOworCisgICAgcmV0dXJuIGxheWVyKCktPnNpemUoKTsKK30KKwogTGF5b3V0VW5pdCBS ZW5kZXJCb3g6Om1pblByZWZlcnJlZExvZ2ljYWxXaWR0aCgpIGNvbnN0CiB7CiAgICAgaWYgKHBy ZWZlcnJlZExvZ2ljYWxXaWR0aHNEaXJ0eSgpKQpAQCAtMTY0Miw3ICsxNjUwLDcgQEAgdm9pZCBS ZW5kZXJCb3g6OmNvbXB1dGVSZWN0Rm9yUmVwYWludChSZW5kZXJCb3hNb2RlbE9iamVjdCogcmVw YWludENvbnRhaW5lciwgTGEKICAgICAgICAgdG9wTGVmdCAtPSBjb250YWluZXJCb3gtPnNjcm9s bGVkQ29udGVudE9mZnNldCgpOyAvLyBGb3Igb3ZlcmZsb3c6YXV0by9zY3JvbGwvaGlkZGVuLgog CiAgICAgICAgIExheW91dFJlY3QgcmVwYWludFJlY3QodG9wTGVmdCwgcmVjdC5zaXplKCkpOwot ICAgICAgICBMYXlvdXRSZWN0IGJveFJlY3QoTGF5b3V0UG9pbnQoKSwgY29udGFpbmVyQm94LT5s YXllcigpLT5zaXplKCkpOworICAgICAgICBMYXlvdXRSZWN0IGJveFJlY3QoTGF5b3V0UG9pbnQo KSwgY29udGFpbmVyQm94LT5jYWNoZWRTaXplKCkpOwogICAgICAgICByZWN0ID0gaW50ZXJzZWN0 aW9uKHJlcGFpbnRSZWN0LCBib3hSZWN0KTsKICAgICAgICAgaWYgKHJlY3QuaXNFbXB0eSgpKQog ICAgICAgICAgICAgcmV0dXJuOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckJveC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oCmluZGV4 IDMxZWMzOWEyMDM3YzAwNjVlODBkOGJhYTdiMzVjNDBiNjJiMGU2YTIuLjA3NjExNTkxYmZhNTM1 MzY2OWU5YjczNTllYmI2NjUwOTc4NTE2NzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJCb3guaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy Qm94LmgKQEAgLTQ0OCw2ICs0NDgsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIGNvbXB1 dGVJbnRyaW5zaWNSYXRpb0luZm9ybWF0aW9uKEZsb2F0U2l6ZSYgLyogaW50cmluc2ljU2l6ZSAq LywgZG91YmxlJiAvKiBpbnRyaW5zaWNSYXRpbyAqLywgYm9vbCYgLyogaXNQZXJjZW50YWdlSW50 cmluc2ljU2l6ZSAqLykgY29uc3QgeyB9CiAKICAgICBJbnRTaXplIHNjcm9sbGVkQ29udGVudE9m ZnNldCgpIGNvbnN0OworICAgIEludFNpemUgY2FjaGVkU2l6ZSgpIGNvbnN0OwogCiBwcm90ZWN0 ZWQ6CiAgICAgdmlydHVhbCB2b2lkIHdpbGxCZURlc3Ryb3llZCgpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcklubGluZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVySW5saW5lLmNwcAppbmRleCBlMTYzMTBmYjQ5YTYzMWM3NmZjNWI5ODk3 ZjBlMGNjZDExZGZkMjMzLi41YmQxZTQ1MjNhOGNjYmQyMTFjNzM3Mzg2NGEzYTkxYjlkODdjMWRi IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5lLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5lLmNwcApAQCAtMTAzMyw3 ICsxMDMzLDcgQEAgTGF5b3V0UmVjdCBSZW5kZXJJbmxpbmU6OmNsaXBwZWRPdmVyZmxvd1JlY3RG b3JSZXBhaW50KFJlbmRlckJveE1vZGVsT2JqZWN0KiByZXAKICAgICAgICAgTGF5b3V0UmVjdCBy ZXBhaW50UmVjdChyKTsKICAgICAgICAgcmVwYWludFJlY3QubW92ZSgtY2ItPnNjcm9sbGVkQ29u dGVudE9mZnNldCgpKTsgLy8gRm9yIG92ZXJmbG93OmF1dG8vc2Nyb2xsL2hpZGRlbi4KIAotICAg ICAgICBMYXlvdXRSZWN0IGJveFJlY3QoTGF5b3V0UG9pbnQoKSwgY2ItPmxheWVyKCktPnNpemUo KSk7CisgICAgICAgIExheW91dFJlY3QgYm94UmVjdChMYXlvdXRQb2ludCgpLCBjYi0+Y2FjaGVk U2l6ZSgpKTsKICAgICAgICAgciA9IGludGVyc2VjdGlvbihyZXBhaW50UmVjdCwgYm94UmVjdCk7 CiAgICAgfQogICAgIApAQCAtMTEzNSw3ICsxMTM1LDcgQEAgdm9pZCBSZW5kZXJJbmxpbmU6OmNv bXB1dGVSZWN0Rm9yUmVwYWludChSZW5kZXJCb3hNb2RlbE9iamVjdCogcmVwYWludENvbnRhaW5l ciwKICAgICAgICAgdG9wTGVmdCAtPSBjb250YWluZXJCb3gtPnNjcm9sbGVkQ29udGVudE9mZnNl dCgpOyAvLyBGb3Igb3ZlcmZsb3c6YXV0by9zY3JvbGwvaGlkZGVuLgogCiAgICAgICAgIExheW91 dFJlY3QgcmVwYWludFJlY3QodG9wTGVmdCwgcmVjdC5zaXplKCkpOwotICAgICAgICBMYXlvdXRS ZWN0IGJveFJlY3QoTGF5b3V0UG9pbnQoKSwgY29udGFpbmVyQm94LT5sYXllcigpLT5zaXplKCkp OworICAgICAgICBMYXlvdXRSZWN0IGJveFJlY3QoTGF5b3V0UG9pbnQoKSwgY29udGFpbmVyQm94 LT5jYWNoZWRTaXplKCkpOwogICAgICAgICByZWN0ID0gaW50ZXJzZWN0aW9uKHJlcGFpbnRSZWN0 LCBib3hSZWN0KTsKICAgICAgICAgaWYgKHJlY3QuaXNFbXB0eSgpKQogICAgICAgICAgICAgcmV0 dXJuOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcAppbmRleCA0ODEz ZGI4OTg5YmVkZjVlYzQxMWM2NGRiNzVlMWZiYWNiMTFhMGQ1Li5kOGIxYWNjZmM1Y2Y5YTc0NGRk M2Y0ODM3MjZiNTY0YTU5ODM0MDZkIDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyT2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy T2JqZWN0LmNwcApAQCAtMTUwOCw3ICsxNTA4LDcgQEAgdm9pZCBSZW5kZXJPYmplY3Q6OmNvbXB1 dGVSZWN0Rm9yUmVwYWludChSZW5kZXJCb3hNb2RlbE9iamVjdCogcmVwYWludENvbnRhaW5lciwK ICAgICAgICAgICAgIExheW91dFJlY3QgcmVwYWludFJlY3QocmVjdCk7CiAgICAgICAgICAgICBy ZXBhaW50UmVjdC5tb3ZlKC1ib3hQYXJlbnQtPnNjcm9sbGVkQ29udGVudE9mZnNldCgpKTsgLy8g Rm9yIG92ZXJmbG93OmF1dG8vc2Nyb2xsL2hpZGRlbi4KIAotICAgICAgICAgICAgTGF5b3V0UmVj dCBib3hSZWN0KExheW91dFBvaW50KCksIGJveFBhcmVudC0+bGF5ZXIoKS0+c2l6ZSgpKTsKKyAg ICAgICAgICAgIExheW91dFJlY3QgYm94UmVjdChMYXlvdXRQb2ludCgpLCBib3hQYXJlbnQtPmNh Y2hlZFNpemUoKSk7CiAgICAgICAgICAgICByZWN0ID0gaW50ZXJzZWN0aW9uKHJlcGFpbnRSZWN0 LCBib3hSZWN0KTsKICAgICAgICAgICAgIGlmIChyZWN0LmlzRW1wdHkoKSkKICAgICAgICAgICAg ICAgICByZXR1cm47Cg== 128290 2012-02-22 14:29:33 -0800 2012-02-28 15:09:27 -0800 With a better naming after talking with Dave on IRC. bug-76972-20120222142932.patch text/plain 7045 jchaffraix U3VidmVyc2lvbiBSZXZpc2lvbjogMTA4NTQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGE2ZGU4ZDM2ZWZkOTcw ZTBlYjcxZTAxMTk0MzE1OTUyMzllZmQ3My4uMTZjMWZiZTA0MzY4Y2IzMjBlMTg3MDc4ZDA4YjE2 ZjliNmM2NDU2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDEyLTAyLTIyICBKdWxp ZW4gQ2hhZmZyYWl4ICA8amNoYWZmcmFpeEB3ZWJraXQub3JnPgorCisgICAgICAgIE1vdmUgUmVu ZGVyTGF5ZXI6OnNpemUoKSBjYWxscyB0byBhIGNvbW1vbiBmdW5jdGlvbgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzY5NzIKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZWZhY3RvcmluZyBvbmx5LgorCisg ICAgICAgIFRoaXMgY2hhbmdlIGludHJvZHVjZXMgUmVuZGVyQm94OjpjYWNoZWRTaXplRm9yT3Zl cmZsb3dDbGlwKCkgdGhhdCBoYW5kbGVzIGFsbCB0aGUgY2FjaGVkIHNpemUKKyAgICAgICAgcmVx dWVzdHMgdGhhdCBjdXJyZW50bHkgZ29lcyB0aHJvdWdoIHRoZSBSZW5kZXJMYXllci4gVGhpcyBp bmRpcmVjdGlvbiBoZWxwcyB0byBkZWNvdXBsZSB0aGUgbmVlZAorICAgICAgICBmb3IgYSBSZW5k ZXJMYXllciBzbyB0aGF0IHdlIGNhbiBsYXppbHkgYWxsb2NhdGUgUmVuZGVyTGF5ZXJzIGFzIHBh cnQgb2YgYnVnIDc1NTY4LgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OmNhY2hlZFNpemVGb3JPdmVyZmxvd0NsaXApOgor ICAgICAgICBBZGRlZCB0aGlzIGZ1bmN0aW9uIHRvIGhhbmRsZSB0aGUgY2FsbHMgdG8gUmVuZGVy TGF5ZXIncyBzaXplKCkuIFVuZm9ydHVuYXRlbHkgYSBsb3Qgb2YgdGhlCisgICAgICAgIGNvZGUg Y2FsbHMgUmVuZGVyTGF5ZXI6OnNpemUoKSBkaXJlY3RseSBzbyBJIGNvdWxkIG5vdCBtYWtlIGl0 IHByaXZhdGUuCisKKyAgICAgICAgKiByZW5kZXJpbmcvTGF5b3V0U3RhdGUuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6TGF5b3V0U3RhdGU6OkxheW91dFN0YXRlKToKKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVyQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29tcHV0ZVJl Y3RGb3JSZXBhaW50KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94Lmg6CisgICAgICAg IChSZW5kZXJCb3gpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJJbmxpbmUuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVySW5saW5lOjpjbGlwcGVkT3ZlcmZsb3dSZWN0Rm9yUmVwYWlu dCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJJbmxpbmU6OmNvbXB1dGVSZWN0Rm9yUmVwYWlu dCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJPYmplY3Q6OmNvbXB1dGVSZWN0Rm9yUmVwYWludCk6CisgICAgICAgIEZpeGVk IHRoZSBjYWxsIHNpdGVzIGFib3ZlLgorCiAyMDEyLTAyLTIyICBLZW4gQnVjaGFuYW4gIDxrZW5y YkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgQ3Jhc2ggZnJvbSBlbXB0eSBhbm9ueW1vdXMgYmxv Y2sgcHJlY2VkaW5nIDpiZWZvcmUgY29udGVudApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL0xheW91dFN0YXRlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9MYXlv dXRTdGF0ZS5jcHAKaW5kZXggZTg5ZGNjNWRiZjQ4Yjk3YzA1Y2FkMjUzNGYwODAyYzc1MTIzY2Fi OS4uNWVmYTUyOGU4M2I2Yzg0ZjViNTJmZWU1MTM0MGY4OTVlYzZkMTMzNyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0xheW91dFN0YXRlLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvTGF5b3V0U3RhdGUuY3BwCkBAIC03MCw4ICs3MCw3IEBAIExheW91dFN0 YXRlOjpMYXlvdXRTdGF0ZShMYXlvdXRTdGF0ZSogcHJldiwgUmVuZGVyQm94KiByZW5kZXJlciwg Y29uc3QgTGF5b3V0U2l6CiAgICAgICAgIG1fY2xpcFJlY3QgPSBwcmV2LT5tX2NsaXBSZWN0Owog CiAgICAgaWYgKHJlbmRlcmVyLT5oYXNPdmVyZmxvd0NsaXAoKSkgewotICAgICAgICBSZW5kZXJM YXllciogbGF5ZXIgPSByZW5kZXJlci0+bGF5ZXIoKTsKLSAgICAgICAgTGF5b3V0UmVjdCBjbGlw UmVjdCh0b1BvaW50KG1fcGFpbnRPZmZzZXQpICsgcmVuZGVyZXItPnZpZXcoKS0+bGF5b3V0RGVs dGEoKSwgbGF5ZXItPnNpemUoKSk7CisgICAgICAgIExheW91dFJlY3QgY2xpcFJlY3QodG9Qb2lu dChtX3BhaW50T2Zmc2V0KSArIHJlbmRlcmVyLT52aWV3KCktPmxheW91dERlbHRhKCksIHJlbmRl cmVyLT5jYWNoZWRTaXplRm9yT3ZlcmZsb3dDbGlwKCkpOwogICAgICAgICBpZiAobV9jbGlwcGVk KQogICAgICAgICAgICAgbV9jbGlwUmVjdC5pbnRlcnNlY3QoY2xpcFJlY3QpOwogICAgICAgICBl bHNlIHsKQEAgLTE1NiwxMCArMTU1LDkgQEAgTGF5b3V0U3RhdGU6OkxheW91dFN0YXRlKFJlbmRl ck9iamVjdCogcm9vdCkKICAgICBtX3BhaW50T2Zmc2V0ID0gTGF5b3V0U2l6ZShhYnNDb250ZW50 UG9pbnQueCgpLCBhYnNDb250ZW50UG9pbnQueSgpKTsKIAogICAgIGlmIChjb250YWluZXItPmhh c092ZXJmbG93Q2xpcCgpKSB7Ci0gICAgICAgIFJlbmRlckJveCogY29udGFpbmVyQm94ID0gdG9S ZW5kZXJCb3goY29udGFpbmVyKTsKLSAgICAgICAgUmVuZGVyTGF5ZXIqIGxheWVyID0gY29udGFp bmVyQm94LT5sYXllcigpOwogICAgICAgICBtX2NsaXBwZWQgPSB0cnVlOwotICAgICAgICBtX2Ns aXBSZWN0ID0gTGF5b3V0UmVjdCh0b1BvaW50KG1fcGFpbnRPZmZzZXQpLCBsYXllci0+c2l6ZSgp KTsKKyAgICAgICAgUmVuZGVyQm94KiBjb250YWluZXJCb3ggPSB0b1JlbmRlckJveChjb250YWlu ZXIpOworICAgICAgICBtX2NsaXBSZWN0ID0gTGF5b3V0UmVjdCh0b1BvaW50KG1fcGFpbnRPZmZz ZXQpLCBjb250YWluZXJCb3gtPmNhY2hlZFNpemVGb3JPdmVyZmxvd0NsaXAoKSk7CiAgICAgICAg IG1fcGFpbnRPZmZzZXQgLT0gY29udGFpbmVyQm94LT5zY3JvbGxlZENvbnRlbnRPZmZzZXQoKTsK ICAgICB9CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94 LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCmluZGV4IGQyMWMy NDA1ZGY5M2VlY2U0M2Q2OTgxZDhiZmJkYjUxZmRmMTdkN2QuLmI5YzQ2MjgxMGFiY2NiNWRjNThh NWM5Zjg4OTU5MjZhM2E1NTEyZGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3gu Y3BwCkBAIC03NTMsNiArNzUzLDE0IEBAIEludFNpemUgUmVuZGVyQm94OjpzY3JvbGxlZENvbnRl bnRPZmZzZXQoKSBjb25zdAogICAgIHJldHVybiBsYXllcigpLT5zY3JvbGxlZENvbnRlbnRPZmZz ZXQoKTsKIH0KIAorSW50U2l6ZSBSZW5kZXJCb3g6OmNhY2hlZFNpemVGb3JPdmVyZmxvd0NsaXAo KSBjb25zdAoreworICAgIEFTU0VSVChoYXNPdmVyZmxvd0NsaXAoKSk7CisgICAgQVNTRVJUKGhh c0xheWVyKCkpOworCisgICAgcmV0dXJuIGxheWVyKCktPnNpemUoKTsKK30KKwogTGF5b3V0VW5p dCBSZW5kZXJCb3g6Om1pblByZWZlcnJlZExvZ2ljYWxXaWR0aCgpIGNvbnN0CiB7CiAgICAgaWYg KHByZWZlcnJlZExvZ2ljYWxXaWR0aHNEaXJ0eSgpKQpAQCAtMTY0Miw3ICsxNjUwLDcgQEAgdm9p ZCBSZW5kZXJCb3g6OmNvbXB1dGVSZWN0Rm9yUmVwYWludChSZW5kZXJCb3hNb2RlbE9iamVjdCog cmVwYWludENvbnRhaW5lciwgTGEKICAgICAgICAgdG9wTGVmdCAtPSBjb250YWluZXJCb3gtPnNj cm9sbGVkQ29udGVudE9mZnNldCgpOyAvLyBGb3Igb3ZlcmZsb3c6YXV0by9zY3JvbGwvaGlkZGVu LgogCiAgICAgICAgIExheW91dFJlY3QgcmVwYWludFJlY3QodG9wTGVmdCwgcmVjdC5zaXplKCkp OwotICAgICAgICBMYXlvdXRSZWN0IGJveFJlY3QoTGF5b3V0UG9pbnQoKSwgY29udGFpbmVyQm94 LT5sYXllcigpLT5zaXplKCkpOworICAgICAgICBMYXlvdXRSZWN0IGJveFJlY3QoTGF5b3V0UG9p bnQoKSwgY29udGFpbmVyQm94LT5jYWNoZWRTaXplRm9yT3ZlcmZsb3dDbGlwKCkpOwogICAgICAg ICByZWN0ID0gaW50ZXJzZWN0aW9uKHJlcGFpbnRSZWN0LCBib3hSZWN0KTsKICAgICAgICAgaWYg KHJlY3QuaXNFbXB0eSgpKQogICAgICAgICAgICAgcmV0dXJuOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckJveC5oCmluZGV4IDMxZWMzOWEyMDM3YzAwNjVlODBkOGJhYTdiMzVjNDBiNjJiMGU2 YTIuLjA2YWRhYWRiY2FhMzMyMjhlMzRjN2RmMTRhMzk2ODlmMzNiZjQ2OTggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgKQEAgLTQ0OCw2ICs0NDgsNyBAQCBwdWJsaWM6CiAgICAg dmlydHVhbCB2b2lkIGNvbXB1dGVJbnRyaW5zaWNSYXRpb0luZm9ybWF0aW9uKEZsb2F0U2l6ZSYg LyogaW50cmluc2ljU2l6ZSAqLywgZG91YmxlJiAvKiBpbnRyaW5zaWNSYXRpbyAqLywgYm9vbCYg LyogaXNQZXJjZW50YWdlSW50cmluc2ljU2l6ZSAqLykgY29uc3QgeyB9CiAKICAgICBJbnRTaXpl IHNjcm9sbGVkQ29udGVudE9mZnNldCgpIGNvbnN0OworICAgIEludFNpemUgY2FjaGVkU2l6ZUZv ck92ZXJmbG93Q2xpcCgpIGNvbnN0OwogCiBwcm90ZWN0ZWQ6CiAgICAgdmlydHVhbCB2b2lkIHdp bGxCZURlc3Ryb3llZCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlcklubGluZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5lLmNw cAppbmRleCBlMTYzMTBmYjQ5YTYzMWM3NmZjNWI5ODk3ZjBlMGNjZDExZGZkMjMzLi45NDk5YjAy MzcwYTJkZGY1Zjc3NzY5ZDFjMzFmMDg5ZjgyNTM4ZWNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5lLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVySW5saW5lLmNwcApAQCAtMTAzMyw3ICsxMDMzLDcgQEAgTGF5b3V0UmVjdCBS ZW5kZXJJbmxpbmU6OmNsaXBwZWRPdmVyZmxvd1JlY3RGb3JSZXBhaW50KFJlbmRlckJveE1vZGVs T2JqZWN0KiByZXAKICAgICAgICAgTGF5b3V0UmVjdCByZXBhaW50UmVjdChyKTsKICAgICAgICAg cmVwYWludFJlY3QubW92ZSgtY2ItPnNjcm9sbGVkQ29udGVudE9mZnNldCgpKTsgLy8gRm9yIG92 ZXJmbG93OmF1dG8vc2Nyb2xsL2hpZGRlbi4KIAotICAgICAgICBMYXlvdXRSZWN0IGJveFJlY3Qo TGF5b3V0UG9pbnQoKSwgY2ItPmxheWVyKCktPnNpemUoKSk7CisgICAgICAgIExheW91dFJlY3Qg Ym94UmVjdChMYXlvdXRQb2ludCgpLCBjYi0+Y2FjaGVkU2l6ZUZvck92ZXJmbG93Q2xpcCgpKTsK ICAgICAgICAgciA9IGludGVyc2VjdGlvbihyZXBhaW50UmVjdCwgYm94UmVjdCk7CiAgICAgfQog ICAgIApAQCAtMTEzNSw3ICsxMTM1LDcgQEAgdm9pZCBSZW5kZXJJbmxpbmU6OmNvbXB1dGVSZWN0 Rm9yUmVwYWludChSZW5kZXJCb3hNb2RlbE9iamVjdCogcmVwYWludENvbnRhaW5lciwKICAgICAg ICAgdG9wTGVmdCAtPSBjb250YWluZXJCb3gtPnNjcm9sbGVkQ29udGVudE9mZnNldCgpOyAvLyBG b3Igb3ZlcmZsb3c6YXV0by9zY3JvbGwvaGlkZGVuLgogCiAgICAgICAgIExheW91dFJlY3QgcmVw YWludFJlY3QodG9wTGVmdCwgcmVjdC5zaXplKCkpOwotICAgICAgICBMYXlvdXRSZWN0IGJveFJl Y3QoTGF5b3V0UG9pbnQoKSwgY29udGFpbmVyQm94LT5sYXllcigpLT5zaXplKCkpOworICAgICAg ICBMYXlvdXRSZWN0IGJveFJlY3QoTGF5b3V0UG9pbnQoKSwgY29udGFpbmVyQm94LT5jYWNoZWRT aXplRm9yT3ZlcmZsb3dDbGlwKCkpOwogICAgICAgICByZWN0ID0gaW50ZXJzZWN0aW9uKHJlcGFp bnRSZWN0LCBib3hSZWN0KTsKICAgICAgICAgaWYgKHJlY3QuaXNFbXB0eSgpKQogICAgICAgICAg ICAgcmV0dXJuOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9i amVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcAppbmRl eCBlOTgzNzFiZjE2NjU2ZjcxMGQwYjRkODJlYjBhODQ5NzlhZDkwYjkyLi5mMjA1NzI3MWEwNzQy ZmQ3ZWYxM2FlY2VjN2JlNDQ3Zjc3MWI4OTA1IDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyT2JqZWN0LmNwcApAQCAtMTUxOSw3ICsxNTE5LDcgQEAgdm9pZCBSZW5kZXJPYmplY3Q6 OmNvbXB1dGVSZWN0Rm9yUmVwYWludChSZW5kZXJCb3hNb2RlbE9iamVjdCogcmVwYWludENvbnRh aW5lciwKICAgICAgICAgICAgIExheW91dFJlY3QgcmVwYWludFJlY3QocmVjdCk7CiAgICAgICAg ICAgICByZXBhaW50UmVjdC5tb3ZlKC1ib3hQYXJlbnQtPnNjcm9sbGVkQ29udGVudE9mZnNldCgp KTsgLy8gRm9yIG92ZXJmbG93OmF1dG8vc2Nyb2xsL2hpZGRlbi4KIAotICAgICAgICAgICAgTGF5 b3V0UmVjdCBib3hSZWN0KExheW91dFBvaW50KCksIGJveFBhcmVudC0+bGF5ZXIoKS0+c2l6ZSgp KTsKKyAgICAgICAgICAgIExheW91dFJlY3QgYm94UmVjdChMYXlvdXRQb2ludCgpLCBib3hQYXJl bnQtPmNhY2hlZFNpemVGb3JPdmVyZmxvd0NsaXAoKSk7CiAgICAgICAgICAgICByZWN0ID0gaW50 ZXJzZWN0aW9uKHJlcGFpbnRSZWN0LCBib3hSZWN0KTsKICAgICAgICAgICAgIGlmIChyZWN0Lmlz RW1wdHkoKSkKICAgICAgICAgICAgICAgICByZXR1cm47Cg==