83803 2012-04-12 12:06:08 -0700 Make AccessibilityObject::size non-virtual and fix platform accessibility code's LayoutUnit usage 2012-04-12 13:57:09 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 60318 1 leviw leviw aboxhall cfleizach eae eric jchaffraix webkit.review.bot oldest_to_newest 601414 0 leviw 2012-04-12 12:06:08 -0700 AccessibilityObject has a virtual size() method, but all overloads do the same thing. Removing the virtual modifier and all overloaded copies of the function, adding a pixelSnappedSize method, and using it for platform code. 601424 1 136951 leviw 2012-04-12 12:11:37 -0700 Created attachment 136951 Patch 601464 2 leviw 2012-04-12 13:08:51 -0700 Thanks Eric! 601509 3 136951 webkit.review.bot 2012-04-12 13:57:04 -0700 Comment on attachment 136951 Patch Clearing flags on attachment: 136951 Committed r114031: <http://trac.webkit.org/changeset/114031> 601510 4 webkit.review.bot 2012-04-12 13:57:09 -0700 All reviewed patches have been landed. Closing bug. 136951 2012-04-12 12:11:37 -0700 2012-04-12 13:57:04 -0700 Patch bug-83803-20120412121136.patch text/plain 11928 leviw SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExNDAxMSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDUxIEBACisyMDEyLTA0LTEyICBMZXZpIFdl aW50cmF1YiAgPGxldml3QGNocm9taXVtLm9yZz4KKworICAgICAgICBNYWtlIEFjY2Vzc2liaWxp dHlPYmplY3Q6OnNpemUgbm9uLXZpcnR1YWwgYW5kIGZpeCBwbGF0Zm9ybSBhY2Nlc3NpYmlsaXR5 IGNvZGUncyBMYXlvdXRVbml0IHVzYWdlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD04MzgwMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEFjY2Vzc2liaWxpdHlPYmplY3Q6OnNpemUgd2FzIHZpcnR1YWwgd2l0 aCBhIG51bWJlciBvZiBvdmVybG9hZHMsIGJ1dCBhbGwgdGhlIGltcGxlbWVudGF0aW9ucyB3ZXJl CisgICAgICAgIHJlZHVuZGFudC4gQXZvaWRpbmcgdGhlIHZpcnR1YWwgdGh1bmsgYW5kIGNvZGUg ZHVwbGljYXRpb24gYnkgZGVjbGFyaW5nIGl0IG5vbi12aXJ0dWFsIGFuZCBvbmx5CisgICAgICAg IGltcGxlbWVudGluZyBpdCBpbiBBY2Nlc3NpYmlsaXR5T2JqZWN0LgorCisgICAgICAgIEFsc28g YWRkaW5nIGEgcGl4ZWxTbmFwcGVkU2l6ZSBtZXRob2QgdGhhdCByZXR1cm5zIGFuIEludFNpemUs IGFuZCB1c2luZyBpdCBpbiBwbGF0Zm9ybQorICAgICAgICBhY2Nlc3NpYmlsaXR5IGNvZGUuCisK KyAgICAgICAgTm8gbmV3IHRlc3RzLiBObyBjaGFuZ2UgaW4gYmVoYXZpb3IuCisKKyAgICAgICAg KiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlNZW51TGlzdE9wdGlvbi5oOgorICAgICAgICAo V2ViQ29yZTo6QWNjZXNzaWJpbGl0eU1lbnVMaXN0T3B0aW9uOjpjYW5IYXZlQ2hpbGRyZW4pOgor ICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU1lbnVMaXN0UG9wdXAuaDoKKyAg ICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlNZW51TGlzdFBvcHVwOjplbGVtZW50UmVjdCk6 CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0Lmg6CisgICAgICAg IChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5T2JqZWN0OjpzaXplKToKKyAgICAgICAgKFdlYkNvcmU6 OkFjY2Vzc2liaWxpdHlPYmplY3Q6OnBpeGVsU25hcHBlZFNpemUpOgorICAgICAgICAqIGFjY2Vz c2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3Jl KToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuaDoK KyAgICAgICAgKEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QpOgorICAgICAgICAqIGFjY2Vzc2li aWxpdHkvQWNjZXNzaWJpbGl0eVNsaWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAg ICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlTbGlkZXIuaDoKKyAgICAgICAgKEFjY2Vz c2liaWxpdHlTbGlkZXJUaHVtYik6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmls aXR5VGFibGVDb2x1bW4uY3BwOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgICogYWNjZXNz aWJpbGl0eS9BY2Nlc3NpYmlsaXR5VGFibGVDb2x1bW4uaDoKKyAgICAgICAgKEFjY2Vzc2liaWxp dHlUYWJsZUNvbHVtbik6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5VGFi bGVIZWFkZXJDb250YWluZXIuY3BwOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgICogYWNj ZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5VGFibGVIZWFkZXJDb250YWluZXIuaDoKKyAgICAgICAg KEFjY2Vzc2liaWxpdHlUYWJsZUhlYWRlckNvbnRhaW5lcik6CisgICAgICAgICogYWNjZXNzaWJp bGl0eS9ndGsvV2ViS2l0QWNjZXNzaWJsZUludGVyZmFjZUNvbXBvbmVudC5jcHA6CisgICAgICAg ICh3ZWJraXRBY2Nlc3NpYmxlQ29tcG9uZW50R2V0RXh0ZW50cyk6CisgICAgICAgICogYWNjZXNz aWJpbGl0eS9ndGsvV2ViS2l0QWNjZXNzaWJsZUludGVyZmFjZUltYWdlLmNwcDoKKyAgICAgICAg KHdlYmtpdEFjY2Vzc2libGVJbWFnZUdldEltYWdlUG9zaXRpb24pOgorICAgICAgICAod2Via2l0 QWNjZXNzaWJsZUltYWdlR2V0SW1hZ2VTaXplKToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L21h Yy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlci5tbToKKyAgICAgICAgKC1bV2ViQWNjZXNz aWJpbGl0eU9iamVjdFdyYXBwZXIgcG9zaXRpb25dKToKKyAgICAgICAgKC1bV2ViQWNjZXNzaWJp bGl0eU9iamVjdFdyYXBwZXIgYWNjZXNzaWJpbGl0eUF0dHJpYnV0ZVZhbHVlOl0pOgorCiAyMDEy LTA0LTEyICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAg QnVpbGQgZml4LgpJbmRleDogU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmls aXR5TWVudUxpc3RPcHRpb24uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L0FjY2Vzc2liaWxpdHlNZW51TGlzdE9wdGlvbi5oCShyZXZpc2lvbiAxMTQwMDEpCisr KyBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlNZW51TGlzdE9wdGlv bi5oCSh3b3JraW5nIGNvcHkpCkBAIC00Niw3ICs0Niw2IEBAIHByaXZhdGU6CiAKICAgICB2aXJ0 dWFsIEFjY2Vzc2liaWxpdHlSb2xlIHJvbGVWYWx1ZSgpIGNvbnN0IHsgcmV0dXJuIE1lbnVMaXN0 T3B0aW9uUm9sZTsgfQogICAgIHZpcnR1YWwgYm9vbCBjYW5IYXZlQ2hpbGRyZW4oKSBjb25zdCB7 IHJldHVybiBmYWxzZTsgfQotICAgIHZpcnR1YWwgTGF5b3V0U2l6ZSBzaXplKCkgY29uc3QgeyBy ZXR1cm4gZWxlbWVudFJlY3QoKS5zaXplKCk7IH0KIAogICAgIHZpcnR1YWwgRWxlbWVudCogYWN0 aW9uRWxlbWVudCgpIGNvbnN0OwogICAgIHZpcnR1YWwgYm9vbCBpc0VuYWJsZWQoKSBjb25zdDsK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU1lbnVMaXN0 UG9wdXAuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vz c2liaWxpdHlNZW51TGlzdFBvcHVwLmgJKHJldmlzaW9uIDExNDAwMSkKKysrIFNvdXJjZS9XZWJD b3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU1lbnVMaXN0UG9wdXAuaAkod29ya2luZyBj b3B5KQpAQCAtNTAsNyArNTAsNiBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgYm9vbCBpc01lbnVM aXN0UG9wdXAoKSBjb25zdCB7IHJldHVybiB0cnVlOyB9CiAKICAgICB2aXJ0dWFsIExheW91dFJl Y3QgZWxlbWVudFJlY3QoKSBjb25zdCB7IHJldHVybiBMYXlvdXRSZWN0KCk7IH0KLSAgICB2aXJ0 dWFsIExheW91dFNpemUgc2l6ZSgpIGNvbnN0IHsgcmV0dXJuIExheW91dFNpemUoKTsgfQogICAg IHZpcnR1YWwgQWNjZXNzaWJpbGl0eVJvbGUgcm9sZVZhbHVlKCkgY29uc3QgeyByZXR1cm4gTWVu dUxpc3RQb3B1cFJvbGU7IH0KIAogICAgIHZpcnR1YWwgYm9vbCBpc1Zpc2libGUoKSBjb25zdDsK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0 eU9iamVjdC5oCShyZXZpc2lvbiAxMTQwMDEpCisrKyBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmls aXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaAkod29ya2luZyBjb3B5KQpAQCAtNTA2LDcgKzUwNiw4 IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIExheW91dFJlY3QgYm91bmRpbmdCb3hSZWN0KCkgY29u c3QgeyByZXR1cm4gTGF5b3V0UmVjdCgpOyB9CiAgICAgSW50UmVjdCBwaXhlbFNuYXBwZWRCb3Vu ZGluZ0JveFJlY3QoKSBjb25zdCB7IHJldHVybiBwaXhlbFNuYXBwZWRJbnRSZWN0KGJvdW5kaW5n Qm94UmVjdCgpKTsgfQogICAgIHZpcnR1YWwgTGF5b3V0UmVjdCBlbGVtZW50UmVjdCgpIGNvbnN0 ID0gMDsKLSAgICB2aXJ0dWFsIExheW91dFNpemUgc2l6ZSgpIGNvbnN0IHsgcmV0dXJuIGVsZW1l bnRSZWN0KCkuc2l6ZSgpOyB9CisgICAgTGF5b3V0U2l6ZSBzaXplKCkgY29uc3QgeyByZXR1cm4g ZWxlbWVudFJlY3QoKS5zaXplKCk7IH0KKyAgICBJbnRTaXplIHBpeGVsU25hcHBlZFNpemUoKSBj b25zdCB7IHJldHVybiBlbGVtZW50UmVjdCgpLnBpeGVsU25hcHBlZFNpemUoKTsgfQogICAgIHZp cnR1YWwgSW50UG9pbnQgY2xpY2tQb2ludCgpOwogICAgIHN0YXRpYyBJbnRSZWN0IGJvdW5kaW5n Qm94Rm9yUXVhZHMoUmVuZGVyT2JqZWN0KiwgY29uc3QgVmVjdG9yPEZsb2F0UXVhZD4mKTsKICAg ICAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRl ck9iamVjdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9B Y2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcAkocmV2aXNpb24gMTE0MDAxKQorKysgU291cmNl L1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcAkod29y a2luZyBjb3B5KQpAQCAtMTUyMywxMiArMTUyMyw2IEBAIExheW91dFJlY3QgQWNjZXNzaWJpbGl0 eVJlbmRlck9iamVjdDo6ZWwKICAgICByZXR1cm4gYm91bmRpbmdCb3hSZWN0KCk7CiB9CiAKLUxh eW91dFNpemUgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6c2l6ZSgpIGNvbnN0Ci17Ci0gICAg TGF5b3V0UmVjdCByZWN0ID0gZWxlbWVudFJlY3QoKTsKLSAgICByZXR1cm4gcmVjdC5zaXplKCk7 Ci19Ci0KIEludFBvaW50IEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OmNsaWNrUG9pbnQoKQog ewogICAgIC8vIEhlYWRpbmdzIGFyZSB1c3VhbGx5IG11Y2ggd2lkZXIgdGhhbiB0aGVpciB0ZXh0 dWFsIGNvbnRlbnQuIElmIHRoZSBtaWQgcG9pbnQgaXMgdXNlZCwgb2Z0ZW4gaXQgY2FuIGJlIHdy b25nLgpJbmRleDogU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVu ZGVyT2JqZWN0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9B Y2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmgJKHJldmlzaW9uIDExNDAwMSkKKysrIFNvdXJjZS9X ZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5oCSh3b3JraW5n IGNvcHkpCkBAIC0xNjYsNyArMTY2LDYgQEAgcHVibGljOgogICAgIAogICAgIHZpcnR1YWwgTGF5 b3V0UmVjdCBib3VuZGluZ0JveFJlY3QoKSBjb25zdDsKICAgICB2aXJ0dWFsIExheW91dFJlY3Qg ZWxlbWVudFJlY3QoKSBjb25zdDsKLSAgICB2aXJ0dWFsIExheW91dFNpemUgc2l6ZSgpIGNvbnN0 OwogICAgIHZpcnR1YWwgSW50UG9pbnQgY2xpY2tQb2ludCgpOwogICAgIAogICAgIHZvaWQgc2V0 UmVuZGVyZXIoUmVuZGVyT2JqZWN0KiByZW5kZXJlcikgeyBtX3JlbmRlcmVyID0gcmVuZGVyZXI7 IH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVNsaWRl ci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3Np YmlsaXR5U2xpZGVyLmNwcAkocmV2aXNpb24gMTE0MDAxKQorKysgU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5U2xpZGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTc4 LDExICsxNzgsNiBAQCBMYXlvdXRSZWN0IEFjY2Vzc2liaWxpdHlTbGlkZXJUaHVtYjo6ZWxlCiAg ICAgcmV0dXJuIHNsaWRlclRodW1iRWxlbWVudE9mKHNsaWRlclJlbmRlcmVyLT5ub2RlKCkpLT5n ZXRSZWN0KCk7CiB9CiAKLUxheW91dFNpemUgQWNjZXNzaWJpbGl0eVNsaWRlclRodW1iOjpzaXpl KCkgY29uc3QKLXsKLSAgICByZXR1cm4gZWxlbWVudFJlY3QoKS5zaXplKCk7Ci19Ci0KIGJvb2wg QWNjZXNzaWJpbGl0eVNsaWRlclRodW1iOjphY2Nlc3NpYmlsaXR5SXNJZ25vcmVkKCkgY29uc3QK IHsKICAgICBBY2Nlc3NpYmlsaXR5T2JqZWN0SW5jbHVzaW9uIGRlY2lzaW9uID0gYWNjZXNzaWJp bGl0eVBsYXRmb3JtSW5jbHVkZXNPYmplY3QoKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvQWNjZXNzaWJpbGl0eVNsaWRlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVNsaWRlci5oCShyZXZpc2lvbiAxMTQwMDEp CisrKyBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlTbGlkZXIuaAko d29ya2luZyBjb3B5KQpAQCAtNzUsNyArNzUsNiBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFsIEFj Y2Vzc2liaWxpdHlSb2xlIHJvbGVWYWx1ZSgpIGNvbnN0IHsgcmV0dXJuIFNsaWRlclRodW1iUm9s ZTsgfQogCi0gICAgdmlydHVhbCBMYXlvdXRTaXplIHNpemUoKSBjb25zdDsKICAgICB2aXJ0dWFs IExheW91dFJlY3QgZWxlbWVudFJlY3QoKSBjb25zdDsKIAogICAgIHZpcnR1YWwgYm9vbCBhY2Nl c3NpYmlsaXR5SXNJZ25vcmVkKCkgY29uc3Q7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L0FjY2Vzc2liaWxpdHlUYWJsZUNvbHVtbi5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5VGFibGVDb2x1bW4uY3BwCShyZXZp c2lvbiAxMTQwMDEpCisrKyBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxp dHlUYWJsZUNvbHVtbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTY4LDExICs2OCw2IEBAIExheW91 dFJlY3QgQWNjZXNzaWJpbGl0eVRhYmxlQ29sdW1uOjplbGUKICAgICByZXR1cm4gbV9jb2x1bW5S ZWN0OwogfQogCi1MYXlvdXRTaXplIEFjY2Vzc2liaWxpdHlUYWJsZUNvbHVtbjo6c2l6ZSgpIGNv bnN0Ci17Ci0gICAgcmV0dXJuIGVsZW1lbnRSZWN0KCkuc2l6ZSgpOwotfQotIAogQWNjZXNzaWJp bGl0eU9iamVjdCogQWNjZXNzaWJpbGl0eVRhYmxlQ29sdW1uOjpoZWFkZXJPYmplY3QoKQogewog ICAgIGlmICghbV9wYXJlbnQpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0Fj Y2Vzc2liaWxpdHlUYWJsZUNvbHVtbi5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Fj Y2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVRhYmxlQ29sdW1uLmgJKHJldmlzaW9uIDExNDAwMSkK KysrIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVRhYmxlQ29sdW1u LmgJKHdvcmtpbmcgY29weSkKQEAgLTU3LDcgKzU3LDYgQEAgcHVibGljOgogICAgIHZpcnR1YWwg dm9pZCBhZGRDaGlsZHJlbigpOwogICAgIHZpcnR1YWwgdm9pZCBzZXRQYXJlbnQoQWNjZXNzaWJp bGl0eU9iamVjdCopOwogICAgIAotICAgIHZpcnR1YWwgTGF5b3V0U2l6ZSBzaXplKCkgY29uc3Q7 CiAgICAgdmlydHVhbCBMYXlvdXRSZWN0IGVsZW1lbnRSZWN0KCkgY29uc3Q7CiAgICAgCiBwcml2 YXRlOiAgICAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0 eVRhYmxlSGVhZGVyQ29udGFpbmVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9h Y2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlUYWJsZUhlYWRlckNvbnRhaW5lci5jcHAJKHJldmlz aW9uIDExNDAwMSkKKysrIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0 eVRhYmxlSGVhZGVyQ29udGFpbmVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTUsMTEgKzU1LDYg QEAgTGF5b3V0UmVjdCBBY2Nlc3NpYmlsaXR5VGFibGVIZWFkZXJDb250YQogICAgIHJldHVybiBt X2hlYWRlclJlY3Q7CiB9CiAKLUxheW91dFNpemUgQWNjZXNzaWJpbGl0eVRhYmxlSGVhZGVyQ29u dGFpbmVyOjpzaXplKCkgY29uc3QKLXsKLSAgICByZXR1cm4gZWxlbWVudFJlY3QoKS5zaXplKCk7 Ci19Ci0KIGJvb2wgQWNjZXNzaWJpbGl0eVRhYmxlSGVhZGVyQ29udGFpbmVyOjphY2Nlc3NpYmls aXR5SXNJZ25vcmVkKCkgY29uc3QKIHsKICAgICBpZiAoIW1fcGFyZW50KQpJbmRleDogU291cmNl L1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5VGFibGVIZWFkZXJDb250YWluZXIu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxp dHlUYWJsZUhlYWRlckNvbnRhaW5lci5oCShyZXZpc2lvbiAxMTQwMDEpCisrKyBTb3VyY2UvV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlUYWJsZUhlYWRlckNvbnRhaW5lci5oCSh3 b3JraW5nIGNvcHkpCkBAIC00Nyw3ICs0Nyw2IEBAIHB1YmxpYzoKICAgICAKICAgICB2aXJ0dWFs IHZvaWQgYWRkQ2hpbGRyZW4oKTsKICAgICAKLSAgICB2aXJ0dWFsIExheW91dFNpemUgc2l6ZSgp IGNvbnN0OwogICAgIHZpcnR1YWwgTGF5b3V0UmVjdCBlbGVtZW50UmVjdCgpIGNvbnN0OwogICAg IAogcHJpdmF0ZToKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvZ3RrL1dlYktp dEFjY2Vzc2libGVJbnRlcmZhY2VDb21wb25lbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL2FjY2Vzc2liaWxpdHkvZ3RrL1dlYktpdEFjY2Vzc2libGVJbnRlcmZhY2VDb21wb25l bnQuY3BwCShyZXZpc2lvbiAxMTQwMDEpCisrKyBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L2d0ay9XZWJLaXRBY2Nlc3NpYmxlSW50ZXJmYWNlQ29tcG9uZW50LmNwcAkod29ya2luZyBjb3B5 KQpAQCAtNzcsNyArNzcsNyBAQCBzdGF0aWMgQXRrT2JqZWN0KiB3ZWJraXRBY2Nlc3NpYmxlQ29t cG9uCiAKIHN0YXRpYyB2b2lkIHdlYmtpdEFjY2Vzc2libGVDb21wb25lbnRHZXRFeHRlbnRzKEF0 a0NvbXBvbmVudCogY29tcG9uZW50LCBnaW50KiB4LCBnaW50KiB5LCBnaW50KiB3aWR0aCwgZ2lu dCogaGVpZ2h0LCBBdGtDb29yZFR5cGUgY29vcmRUeXBlKQogewotICAgIEludFJlY3QgcmVjdCA9 IGNvcmUoY29tcG9uZW50KS0+ZWxlbWVudFJlY3QoKTsKKyAgICBJbnRSZWN0IHJlY3QgPSBwaXhl bFNuYXBwZWRJbnRSZWN0KGNvcmUoY29tcG9uZW50KS0+ZWxlbWVudFJlY3QoKSk7CiAgICAgY29u dGVudHNSZWxhdGl2ZVRvQXRrQ29vcmRpbmF0ZVR5cGUoY29yZShjb21wb25lbnQpLCBjb29yZFR5 cGUsIHJlY3QsIHgsIHksIHdpZHRoLCBoZWlnaHQpOwogfQogCkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9hY2Nlc3NpYmlsaXR5L2d0ay9XZWJLaXRBY2Nlc3NpYmxlSW50ZXJmYWNlSW1hZ2UuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvZ3RrL1dlYktpdEFjY2Vz c2libGVJbnRlcmZhY2VJbWFnZS5jcHAJKHJldmlzaW9uIDExNDAwMSkKKysrIFNvdXJjZS9XZWJD b3JlL2FjY2Vzc2liaWxpdHkvZ3RrL1dlYktpdEFjY2Vzc2libGVJbnRlcmZhY2VJbWFnZS5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTQ4LDcgKzQ4LDcgQEAgc3RhdGljIEFjY2Vzc2liaWxpdHlPYmpl Y3QqIGNvcmUoQXRrSW1hZwogCiBzdGF0aWMgdm9pZCB3ZWJraXRBY2Nlc3NpYmxlSW1hZ2VHZXRJ bWFnZVBvc2l0aW9uKEF0a0ltYWdlKiBpbWFnZSwgZ2ludCogeCwgZ2ludCogeSwgQXRrQ29vcmRU eXBlIGNvb3JkVHlwZSkKIHsKLSAgICBJbnRSZWN0IHJlY3QgPSBjb3JlKGltYWdlKS0+ZWxlbWVu dFJlY3QoKTsKKyAgICBJbnRSZWN0IHJlY3QgPSBwaXhlbFNuYXBwZWRJbnRSZWN0KGNvcmUoaW1h Z2UpLT5lbGVtZW50UmVjdCgpKTsKICAgICBjb250ZW50c1JlbGF0aXZlVG9BdGtDb29yZGluYXRl VHlwZShjb3JlKGltYWdlKSwgY29vcmRUeXBlLCByZWN0LCB4LCB5KTsKIH0KIApAQCAtNTksNyAr NTksNyBAQCBzdGF0aWMgY29uc3QgZ2NoYXIqIHdlYmtpdEFjY2Vzc2libGVJbWFnCiAKIHN0YXRp YyB2b2lkIHdlYmtpdEFjY2Vzc2libGVJbWFnZUdldEltYWdlU2l6ZShBdGtJbWFnZSogaW1hZ2Us IGdpbnQqIHdpZHRoLCBnaW50KiBoZWlnaHQpCiB7Ci0gICAgSW50U2l6ZSBzaXplID0gY29yZShp bWFnZSktPnNpemUoKTsKKyAgICBJbnRTaXplIHNpemUgPSBjb3JlKGltYWdlKS0+cGl4ZWxTbmFw cGVkU2l6ZSgpOwogCiAgICAgaWYgKHdpZHRoKQogICAgICAgICAqd2lkdGggPSBzaXplLndpZHRo KCk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmls aXR5T2JqZWN0V3JhcHBlci5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlci5tbQkocmV2aXNpb24gMTE0 MDAxKQorKysgU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0 eU9iamVjdFdyYXBwZXIubW0JKHdvcmtpbmcgY29weSkKQEAgLTE0MDksNyArMTQwOSw3IEBAIC0g KGlkKXRleHRNYXJrZXJSYW5nZUZvclNlbGVjdGlvbgogCiAtIChOU1ZhbHVlICopcG9zaXRpb24K IHsKLSAgICBMYXlvdXRSZWN0IHJlY3QgPSBtX29iamVjdC0+ZWxlbWVudFJlY3QoKTsKKyAgICBJ bnRSZWN0IHJlY3QgPSBwaXhlbFNuYXBwZWRJbnRSZWN0KG1fb2JqZWN0LT5lbGVtZW50UmVjdCgp KTsKICAgICBOU1BvaW50IHBvaW50OwogICAgIAogICAgIEZyYW1lVmlldyogZnJhbWVWaWV3ID0g bV9vYmplY3QtPmRvY3VtZW50RnJhbWVWaWV3KCk7CkBAIC0yMDI1LDcgKzIwMjUsNyBAQCAtIChp ZClhY2Nlc3NpYmlsaXR5QXR0cmlidXRlVmFsdWU6KE5TU3RyCiAgICAgICAgIHJldHVybiBbTlNO dW1iZXIgbnVtYmVyV2l0aEJvb2w6IG1fb2JqZWN0LT5pc0VuYWJsZWQoKV07CiAKICAgICBpZiAo W2F0dHJpYnV0ZU5hbWUgaXNFcXVhbFRvU3RyaW5nOiBOU0FjY2Vzc2liaWxpdHlTaXplQXR0cmli dXRlXSkgewotICAgICAgICBMYXlvdXRTaXplIHMgPSBtX29iamVjdC0+c2l6ZSgpOworICAgICAg ICBJbnRTaXplIHMgPSBtX29iamVjdC0+cGl4ZWxTbmFwcGVkU2l6ZSgpOwogICAgICAgICByZXR1 cm4gW05TVmFsdWUgdmFsdWVXaXRoU2l6ZTogTlNNYWtlU2l6ZShzLndpZHRoKCksIHMuaGVpZ2h0 KCkpXTsKICAgICB9CiAK