81789 2012-03-21 08:54:06 -0700 Correct LayoutUnit usage in Accessibility code 2012-03-22 08:07:25 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 60318 1 leviw leviw cfleizach eae eric jchaffraix webkit.review.bot oldest_to_newest 584174 0 leviw 2012-03-21 08:54:06 -0700 Updating Accessibility code to properly use LayoutUnits. 585115 1 133217 leviw 2012-03-22 04:05:49 -0700 Created attachment 133217 Patch 585244 2 133217 eric 2012-03-22 07:29:56 -0700 Comment on attachment 133217 Patch I agree! 585247 3 133217 leviw 2012-03-22 07:30:36 -0700 Comment on attachment 133217 Patch Thanks Eric :) 585294 4 133217 webkit.review.bot 2012-03-22 08:07:20 -0700 Comment on attachment 133217 Patch Clearing flags on attachment: 133217 Committed r111699: <http://trac.webkit.org/changeset/111699> 585295 5 webkit.review.bot 2012-03-22 08:07:25 -0700 All reviewed patches have been landed. Closing bug. 133217 2012-03-22 04:05:49 -0700 2012-03-22 08:07:20 -0700 Patch bug-81789-20120322040548.patch text/plain 14206 leviw SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExMTU0OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQ4IEBACisyMDEyLTAzLTIyICBMZXZpIFdl aW50cmF1YiAgPGxldml3QGNocm9taXVtLm9yZz4KKworICAgICAgICBDb3JyZWN0IExheW91dFVu aXQgdXNhZ2UgaW4gQWNjZXNzaWJpbGl0eSBjb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MTc4OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFJldmVydGluZyBBY2Nlc3NpYmlsaXR5IGhpdCB0ZXN0aW5n IGNvZGUgYmFjayB0byBpbnRlZ2Vycy4gQWNjZXNzaWJpbGl0eSBoaXQgdGVzdHMgb3JpZ2luYXRl IGZyb20KKyAgICAgICAgdGhlIGVtYmVkZGVyIGFuZCBkb24ndCBhY2N1bXVsYXRlIG9mZnNldHMs IHNvIHdlIGdldCBub3RoaW5nIGZyb20gdXNpbmcgTGF5b3V0VW5pdHMsIGFuZCBuZWVkbGVzc2x5 CisgICAgICAgIGV4cG9zZSB0aGVtIHRvIHRoZSBlbWJlZGRlci4KKworICAgICAgICBObyBuZXcg dGVzdHMuIE5vIGNoYW5nZSBpbiBiZWhhdmlvci4KKworICAgICAgICAqIGFjY2Vzc2liaWxpdHkv QWNjZXNzaWJpbGl0eUxpc3RCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0 eUxpc3RCb3g6OmVsZW1lbnRBY2Nlc3NpYmlsaXR5SGl0VGVzdCk6IFNlZSBhYm92ZS4KKyAgICAg ICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlMaXN0Qm94Lmg6CisgICAgICAgIChBY2Nl c3NpYmlsaXR5TGlzdEJveCk6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5 T2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlPYmplY3Q6OmNsaWNr UG9pbnQpOiBUaGlzIHZhbHVlIGlzIG9ubHkgZXZlciB1c2VkIHRvIGRpc3BsYXkgYSBjb250ZXh0 IG1lbnUsCisgICAgICAgIHdoaWNoIGlzIGFsd2F5cyBkb25lIHdpdGggaW50ZWdlciBjb29yZGlu YXRlcy4KKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlPYmplY3Q6OmJvdW5kaW5nQm94 Rm9yUXVhZHMpOiBUaGlzIGlzIGEgYm91bmRpbmcgYm94IGJ1aWx0IGZyb20gZmxvYXRzLiBXZQor ICAgICAgICBkb24ndCBwaXhlbCBzbmFwIGZsb2F0cywgc28gd2UgcmV0dXJuIGFuIGludGVnZXIg Ym91bmRpbmcgYm94LgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eU9iamVjdDo6ZWxl bWVudEFjY2Vzc2liaWxpdHlIaXRUZXN0KTogU2VlIGFib3ZlLgorICAgICAgICAoV2ViQ29yZTo6 QWNjZXNzaWJpbGl0eU9iamVjdDo6c2Nyb2xsVG9NYWtlVmlzaWJsZSk6IFBpeGVsIHNuYXBwaW5n IHRoZSBib3VuZGluZyBib3ggYW5kIHNpbXBsaWZ5aW5nCisgICAgICAgIHVwIHRoZSBjb2RlIHRv IHBvc2l0aW9uIGl0IGF0ICgwLDApLgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJp bGl0eU9iamVjdC5oOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eU9iamVjdDo6YWNj ZXNzaWJpbGl0eUhpdFRlc3QpOiBTZWUgYWJvdmUuCisgICAgICAgIChBY2Nlc3NpYmlsaXR5T2Jq ZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlPYmplY3Q6OnBpeGVsU25hcHBl ZEJvdW5kaW5nQm94UmVjdCk6IENvbnZlbmllbmNlIG1ldGhvZCBmb3IgZW1iZWRkZXIgY2FsbGVy cy4KKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6dmlzaWJsZVBv c2l0aW9uRm9yUG9pbnQpOiBUaGUgcG9pbnQgcGFzc2VkIGluIGhlcmUgaXMgY29tZXMgZnJvbQor ICAgICAgICBzY3JlZW4gY29vcmRpbmF0ZXMgYW5kIG9yaWdpbmF0ZXMgaW4gZW1iZWRkZXIgY29k ZS4gUmV2ZXJ0aW5nIGl0IHRvIHRha2UgYW4gaW50ZWdlci4KKyAgICAgICAgKFdlYkNvcmU6OkFj Y2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OmFjY2Vzc2liaWxpdHlJbWFnZU1hcEhpdFRlc3QpOiBT ZWUgYWJvdmUuCisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0Ojph Y2Nlc3NpYmlsaXR5SGl0VGVzdCk6IFNlZSBhYm92ZS4KKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5 L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuaDoKKyAgICAgICAgKEFjY2Vzc2liaWxpdHlSZW5k ZXJPYmplY3QpOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVNjcm9sbFZp ZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVNjcm9sbFZpZXc6OmFjY2Vz c2liaWxpdHlIaXRUZXN0KTogU2VlIGFib3ZlLgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNj ZXNzaWJpbGl0eVNjcm9sbFZpZXcuaDoKKyAgICAgICAgKEFjY2Vzc2liaWxpdHlTY3JvbGxWaWV3 KToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlTbGlkZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVNsaWRlcjo6ZWxlbWVudEFjY2Vzc2liaWxpdHlI aXRUZXN0KTogU2VlIGFib3ZlLgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0 eVNsaWRlci5oOgorICAgICAgICAoQWNjZXNzaWJpbGl0eVNsaWRlcik6CisKIDIwMTItMDMtMjEg IElseWEgVGlraG9ub3Zza3kgIDxsb2lzbG9AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJ bnNwZWN0b3I6IEhlYXBTbmFwc2hvdDogbW92ZSBhbGwgYnVpbGRlcnMgYW5kIGNhbGN1bGF0aW9u IGNhbGxzIHRvIEhlYXBTbmFwc2hvdC5faW5pdCBmdW5jdGlvbi4KSW5kZXg6IFNvdXJjZS9XZWJD b3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eUxpc3RCb3guY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eUxpc3RCb3guY3BwCShy ZXZpc2lvbiAxMTE1MTgpCisrKyBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2li aWxpdHlMaXN0Qm94LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTYzLDcgKzE2Myw3IEBAIGJvb2wg QWNjZXNzaWJpbGl0eUxpc3RCb3g6OmFjY2Vzc2liaWxpdHkKICAgICByZXR1cm4gZmFsc2U7CiB9 CiAKLUFjY2Vzc2liaWxpdHlPYmplY3QqIEFjY2Vzc2liaWxpdHlMaXN0Qm94OjplbGVtZW50QWNj ZXNzaWJpbGl0eUhpdFRlc3QoY29uc3QgTGF5b3V0UG9pbnQmIHBvaW50KSBjb25zdAorQWNjZXNz aWJpbGl0eU9iamVjdCogQWNjZXNzaWJpbGl0eUxpc3RCb3g6OmVsZW1lbnRBY2Nlc3NpYmlsaXR5 SGl0VGVzdChjb25zdCBJbnRQb2ludCYgcG9pbnQpIGNvbnN0CiB7CiAgICAgLy8gdGhlIGludGVy bmFsIEhUTUxTZWxlY3RFbGVtZW50IG1ldGhvZHMgZm9yIHJldHVybmluZyBhIGxpc3Rib3ggb3B0 aW9uIGF0IGEgcG9pbnQKICAgICAvLyBpZ25vcmUgb3B0Z3JvdXAgZWxlbWVudHMuCkluZGV4OiBT b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlMaXN0Qm94LmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5TGlzdEJv eC5oCShyZXZpc2lvbiAxMTE1MTgpCisrKyBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0Fj Y2Vzc2liaWxpdHlMaXN0Qm94LmgJKHdvcmtpbmcgY29weSkKQEAgLTU2LDcgKzU2LDcgQEAgcHVi bGljOgogcHJpdmF0ZTogICAgCiAgICAgQWNjZXNzaWJpbGl0eU9iamVjdCogbGlzdEJveE9wdGlv bkFjY2Vzc2liaWxpdHlPYmplY3QoSFRNTEVsZW1lbnQqKSBjb25zdDsKICAgICB2aXJ0dWFsIGJv b2wgYWNjZXNzaWJpbGl0eUlzSWdub3JlZCgpIGNvbnN0OwotICAgIHZpcnR1YWwgQWNjZXNzaWJp bGl0eU9iamVjdCogZWxlbWVudEFjY2Vzc2liaWxpdHlIaXRUZXN0KGNvbnN0IExheW91dFBvaW50 JikgY29uc3Q7CisgICAgdmlydHVhbCBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBlbGVtZW50QWNjZXNz aWJpbGl0eUhpdFRlc3QoY29uc3QgSW50UG9pbnQmKSBjb25zdDsKIH07CiAgICAgCiB9IC8vIG5h bWVzcGFjZSBXZWJDb3JlCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vz c2liaWxpdHlPYmplY3QuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2li aWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5jcHAJKHJldmlzaW9uIDExMTUxOCkKKysrIFNvdXJj ZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTQ4OSwyNSArNDg5LDI1IEBAIGJvb2wgQWNjZXNzaWJpbGl0eU9iamVjdDo6aXNB UklBQ29udHJvbCgKICAgICB8fCBhcmlhUm9sZSA9PSBDb21ib0JveFJvbGUgfHwgYXJpYVJvbGUg PT0gU2xpZGVyUm9sZTsgCiB9CiAKLUxheW91dFBvaW50IEFjY2Vzc2liaWxpdHlPYmplY3Q6OmNs aWNrUG9pbnQoKQorSW50UG9pbnQgQWNjZXNzaWJpbGl0eU9iamVjdDo6Y2xpY2tQb2ludCgpCiB7 CiAgICAgTGF5b3V0UmVjdCByZWN0ID0gZWxlbWVudFJlY3QoKTsKLSAgICByZXR1cm4gTGF5b3V0 UG9pbnQocmVjdC54KCkgKyByZWN0LndpZHRoKCkgLyAyLCByZWN0LnkoKSArIHJlY3QuaGVpZ2h0 KCkgLyAyKTsKKyAgICByZXR1cm4gcm91bmRlZEludFBvaW50KExheW91dFBvaW50KHJlY3QueCgp ICsgcmVjdC53aWR0aCgpIC8gMiwgcmVjdC55KCkgKyByZWN0LmhlaWdodCgpIC8gMikpOwogfQog Ci1MYXlvdXRSZWN0IEFjY2Vzc2liaWxpdHlPYmplY3Q6OmJvdW5kaW5nQm94Rm9yUXVhZHMoUmVu ZGVyT2JqZWN0KiBvYmosIGNvbnN0IFZlY3RvcjxGbG9hdFF1YWQ+JiBxdWFkcykKK0ludFJlY3Qg QWNjZXNzaWJpbGl0eU9iamVjdDo6Ym91bmRpbmdCb3hGb3JRdWFkcyhSZW5kZXJPYmplY3QqIG9i aiwgY29uc3QgVmVjdG9yPEZsb2F0UXVhZD4mIHF1YWRzKQogewogICAgIEFTU0VSVChvYmopOwog ICAgIGlmICghb2JqKQotICAgICAgICByZXR1cm4gTGF5b3V0UmVjdCgpOworICAgICAgICByZXR1 cm4gSW50UmVjdCgpOwogICAgIAogICAgIHNpemVfdCBjb3VudCA9IHF1YWRzLnNpemUoKTsKICAg ICBpZiAoIWNvdW50KQotICAgICAgICByZXR1cm4gTGF5b3V0UmVjdCgpOworICAgICAgICByZXR1 cm4gSW50UmVjdCgpOwogICAgIAotICAgIExheW91dFJlY3QgcmVzdWx0OworICAgIEludFJlY3Qg cmVzdWx0OwogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgY291bnQ7ICsraSkgewotICAgICAg ICBMYXlvdXRSZWN0IHIgPSBxdWFkc1tpXS5lbmNsb3NpbmdCb3VuZGluZ0JveCgpOworICAgICAg ICBJbnRSZWN0IHIgPSBxdWFkc1tpXS5lbmNsb3NpbmdCb3VuZGluZ0JveCgpOwogICAgICAgICBp ZiAoIXIuaXNFbXB0eSgpKSB7CiAgICAgICAgICAgICBpZiAob2JqLT5zdHlsZSgpLT5oYXNBcHBl YXJhbmNlKCkpCiAgICAgICAgICAgICAgICAgb2JqLT50aGVtZSgpLT5hZGp1c3RSZXBhaW50UmVj dChvYmosIHIpOwpAQCAtMTQ2Niw3ICsxNDY2LDcgQEAgYm9vbCBBY2Nlc3NpYmlsaXR5T2JqZWN0 OjpzdXBwb3J0c0FSSUFMaQogICAgIHJldHVybiBlcXVhbElnbm9yaW5nQ2FzZShsaXZlUmVnaW9u LCAicG9saXRlIikgfHwgZXF1YWxJZ25vcmluZ0Nhc2UobGl2ZVJlZ2lvbiwgImFzc2VydGl2ZSIp OwogfQogCi1BY2Nlc3NpYmlsaXR5T2JqZWN0KiBBY2Nlc3NpYmlsaXR5T2JqZWN0OjplbGVtZW50 QWNjZXNzaWJpbGl0eUhpdFRlc3QoY29uc3QgTGF5b3V0UG9pbnQmIHBvaW50KSBjb25zdAorQWNj ZXNzaWJpbGl0eU9iamVjdCogQWNjZXNzaWJpbGl0eU9iamVjdDo6ZWxlbWVudEFjY2Vzc2liaWxp dHlIaXRUZXN0KGNvbnN0IEludFBvaW50JiBwb2ludCkgY29uc3QKIHsgCiAgICAgLy8gU2VuZCB0 aGUgaGl0IHRlc3QgYmFjayBpbnRvIHRoZSBzdWItZnJhbWUgaWYgbmVjZXNzYXJ5LgogICAgIGlm IChpc0F0dGFjaG1lbnQoKSkgewpAQCAtMTYxOSw4ICsxNjE5LDggQEAgc3RhdGljIGludCBjb21w dXRlQmVzdFNjcm9sbE9mZnNldChpbnQgYwogCiB2b2lkIEFjY2Vzc2liaWxpdHlPYmplY3Q6OnNj cm9sbFRvTWFrZVZpc2libGUoKSBjb25zdAogewotICAgIEludFJlY3Qgb2JqZWN0UmVjdCA9IGJv dW5kaW5nQm94UmVjdCgpOwotICAgIG9iamVjdFJlY3QubW92ZSgtb2JqZWN0UmVjdC54KCksIC1v YmplY3RSZWN0LnkoKSk7CisgICAgSW50UmVjdCBvYmplY3RSZWN0ID0gcGl4ZWxTbmFwcGVkSW50 UmVjdChib3VuZGluZ0JveFJlY3QoKSk7CisgICAgb2JqZWN0UmVjdC5zZXRMb2NhdGlvbihJbnRQ b2ludCgpKTsKICAgICBzY3JvbGxUb01ha2VWaXNpYmxlV2l0aFN1YkZvY3VzKG9iamVjdFJlY3Qp OwogfQogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlP YmplY3QuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vz c2liaWxpdHlPYmplY3QuaAkocmV2aXNpb24gMTExNTE4KQorKysgU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmgJKHdvcmtpbmcgY29weSkKQEAgLTQ2MSw5 ICs0NjEsOSBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIGRldGVybWluZUFSSUFEcm9wRWZm ZWN0cyhWZWN0b3I8U3RyaW5nPiYpIHsgfQogICAgIAogICAgIC8vIENhbGxlZCBvbiB0aGUgcm9v dCBBWCBvYmplY3QgdG8gcmV0dXJuIHRoZSBkZWVwZXN0IGF2YWlsYWJsZSBlbGVtZW50LgotICAg IHZpcnR1YWwgQWNjZXNzaWJpbGl0eU9iamVjdCogYWNjZXNzaWJpbGl0eUhpdFRlc3QoY29uc3Qg TGF5b3V0UG9pbnQmKSBjb25zdCB7IHJldHVybiAwOyB9CisgICAgdmlydHVhbCBBY2Nlc3NpYmls aXR5T2JqZWN0KiBhY2Nlc3NpYmlsaXR5SGl0VGVzdChjb25zdCBJbnRQb2ludCYpIGNvbnN0IHsg cmV0dXJuIDA7IH0KICAgICAvLyBDYWxsZWQgb24gdGhlIEFYIG9iamVjdCBhZnRlciB0aGUgcmVu ZGVyIHRyZWUgZGV0ZXJtaW5lcyB3aGljaCBpcyB0aGUgcmlnaHQgQWNjZXNzaWJpbGl0eVJlbmRl ck9iamVjdC4KLSAgICB2aXJ0dWFsIEFjY2Vzc2liaWxpdHlPYmplY3QqIGVsZW1lbnRBY2Nlc3Np YmlsaXR5SGl0VGVzdChjb25zdCBMYXlvdXRQb2ludCYpIGNvbnN0OworICAgIHZpcnR1YWwgQWNj ZXNzaWJpbGl0eU9iamVjdCogZWxlbWVudEFjY2Vzc2liaWxpdHlIaXRUZXN0KGNvbnN0IEludFBv aW50JikgY29uc3Q7CiAKICAgICB2aXJ0dWFsIEFjY2Vzc2liaWxpdHlPYmplY3QqIGZvY3VzZWRV SUVsZW1lbnQoKSBjb25zdDsKIApAQCAtNTAzLDEwICs1MDMsMTEgQEAgcHVibGljOgogICAgIHZp cnR1YWwgRWxlbWVudCogYW5jaG9yRWxlbWVudCgpIGNvbnN0IHsgcmV0dXJuIDA7IH0KICAgICB2 aXJ0dWFsIEVsZW1lbnQqIGFjdGlvbkVsZW1lbnQoKSBjb25zdCB7IHJldHVybiAwOyB9CiAgICAg dmlydHVhbCBMYXlvdXRSZWN0IGJvdW5kaW5nQm94UmVjdCgpIGNvbnN0IHsgcmV0dXJuIExheW91 dFJlY3QoKTsgfQorICAgIEludFJlY3QgcGl4ZWxTbmFwcGVkQm91bmRpbmdCb3hSZWN0KCkgY29u c3QgeyByZXR1cm4gcGl4ZWxTbmFwcGVkSW50UmVjdChib3VuZGluZ0JveFJlY3QoKSk7IH0KICAg ICB2aXJ0dWFsIExheW91dFJlY3QgZWxlbWVudFJlY3QoKSBjb25zdCA9IDA7CiAgICAgdmlydHVh bCBMYXlvdXRTaXplIHNpemUoKSBjb25zdCB7IHJldHVybiBlbGVtZW50UmVjdCgpLnNpemUoKTsg fQotICAgIHZpcnR1YWwgTGF5b3V0UG9pbnQgY2xpY2tQb2ludCgpOwotICAgIHN0YXRpYyBMYXlv dXRSZWN0IGJvdW5kaW5nQm94Rm9yUXVhZHMoUmVuZGVyT2JqZWN0KiwgY29uc3QgVmVjdG9yPEZs b2F0UXVhZD4mKTsKKyAgICB2aXJ0dWFsIEludFBvaW50IGNsaWNrUG9pbnQoKTsKKyAgICBzdGF0 aWMgSW50UmVjdCBib3VuZGluZ0JveEZvclF1YWRzKFJlbmRlck9iamVjdCosIGNvbnN0IFZlY3Rv cjxGbG9hdFF1YWQ+Jik7CiAgICAgCiAgICAgdmlydHVhbCBQbGFpblRleHRSYW5nZSBzZWxlY3Rl ZFRleHRSYW5nZSgpIGNvbnN0IHsgcmV0dXJuIFBsYWluVGV4dFJhbmdlKCk7IH0KICAgICB1bnNp Z25lZCBzZWxlY3Rpb25TdGFydCgpIGNvbnN0IHsgcmV0dXJuIHNlbGVjdGVkVGV4dFJhbmdlKCku c3RhcnQ7IH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0 eVJlbmRlck9iamVjdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp bGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcAkocmV2aXNpb24gMTExNTE4KQorKysg U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNw cAkod29ya2luZyBjb3B5KQpAQCAtMjY1MSw3ICsyNjUxLDcgQEAgdm9pZCBBY2Nlc3NpYmlsaXR5 UmVuZGVyT2JqZWN0OjpzZXRTZWxlYwogICAgIH0gICAgCiB9CiAKLVZpc2libGVQb3NpdGlvbiBB Y2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0Ojp2aXNpYmxlUG9zaXRpb25Gb3JQb2ludChjb25zdCBM YXlvdXRQb2ludCYgcG9pbnQpIGNvbnN0CitWaXNpYmxlUG9zaXRpb24gQWNjZXNzaWJpbGl0eVJl bmRlck9iamVjdDo6dmlzaWJsZVBvc2l0aW9uRm9yUG9pbnQoY29uc3QgSW50UG9pbnQmIHBvaW50 KSBjb25zdAogewogICAgIGlmICghbV9yZW5kZXJlcikKICAgICAgICAgcmV0dXJuIFZpc2libGVQ b3NpdGlvbigpOwpAQCAtMjY3Niw3ICsyNjc2LDcgQEAgVmlzaWJsZVBvc2l0aW9uIEFjY2Vzc2li aWxpdHlSZW5kZXJPYmplYwogICAgIHdoaWxlICgxKSB7CiAgICAgICAgIExheW91dFBvaW50IG91 cnBvaW50OwogI2lmIFBMQVRGT1JNKE1BQykKLSAgICAgICAgb3VycG9pbnQgPSBmcmFtZVZpZXct PnNjcmVlblRvQ29udGVudHMocm91bmRlZEludFBvaW50KHBvaW50KSk7CisgICAgICAgIG91cnBv aW50ID0gZnJhbWVWaWV3LT5zY3JlZW5Ub0NvbnRlbnRzKHBvaW50KTsKICNlbHNlCiAgICAgICAg IG91cnBvaW50ID0gcG9pbnQ7CiAjZW5kaWYKQEAgLTI4MTksNyArMjgxOSw3IEBAIEludFJlY3Qg QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6ZG9BWEIKICAgICByZXR1cm4gSW50UmVjdCgpOwog fQogCi1BY2Nlc3NpYmlsaXR5T2JqZWN0KiBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjphY2Nl c3NpYmlsaXR5SW1hZ2VNYXBIaXRUZXN0KEhUTUxBcmVhRWxlbWVudCogYXJlYSwgY29uc3QgTGF5 b3V0UG9pbnQmIHBvaW50KSBjb25zdAorQWNjZXNzaWJpbGl0eU9iamVjdCogQWNjZXNzaWJpbGl0 eVJlbmRlck9iamVjdDo6YWNjZXNzaWJpbGl0eUltYWdlTWFwSGl0VGVzdChIVE1MQXJlYUVsZW1l bnQqIGFyZWEsIGNvbnN0IEludFBvaW50JiBwb2ludCkgY29uc3QKIHsKICAgICBpZiAoIWFyZWEp CiAgICAgICAgIHJldHVybiAwOwpAQCAtMjg1NSw3ICsyODU1LDcgQEAgQWNjZXNzaWJpbGl0eU9i amVjdCogQWNjZXNzaWJpbGl0eVJlbmRlcgogICAgIE5vZGUqIG5vZGUgPSBoaXRUZXN0UmVzdWx0 LmlubmVyTm9kZSgpLT5zaGFkb3dBbmNlc3Rvck5vZGUoKTsKIAogICAgIGlmIChub2RlLT5oYXNU YWdOYW1lKGFyZWFUYWcpKSAKLSAgICAgICAgcmV0dXJuIGFjY2Vzc2liaWxpdHlJbWFnZU1hcEhp dFRlc3Qoc3RhdGljX2Nhc3Q8SFRNTEFyZWFFbGVtZW50Kj4obm9kZSksIHJvdW5kZWRJbnRQb2lu dChwb2ludCkpOworICAgICAgICByZXR1cm4gYWNjZXNzaWJpbGl0eUltYWdlTWFwSGl0VGVzdChz dGF0aWNfY2FzdDxIVE1MQXJlYUVsZW1lbnQqPihub2RlKSwgcG9pbnQpOwogICAgIAogICAgIGlm IChub2RlLT5oYXNUYWdOYW1lKG9wdGlvblRhZykpCiAgICAgICAgIG5vZGUgPSBzdGF0aWNfY2Fz dDxIVE1MT3B0aW9uRWxlbWVudCo+KG5vZGUpLT5vd25lclNlbGVjdEVsZW1lbnQoKTsKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0 eVJlbmRlck9iamVjdC5oCShyZXZpc2lvbiAxMTE1MTgpCisrKyBTb3VyY2UvV2ViQ29yZS9hY2Nl c3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuaAkod29ya2luZyBjb3B5KQpAQCAt MTU0LDcgKzE1NCw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHVwZGF0ZUFjY2Vzc2liaWxpdHlSb2xl KCk7CiAgICAgCiAgICAgLy8gU2hvdWxkIGJlIGNhbGxlZCBvbiB0aGUgcm9vdCBhY2Nlc3NpYmls aXR5IG9iamVjdCB0byBraWNrIG9mZiBhIGhpdCB0ZXN0LgotICAgIHZpcnR1YWwgQWNjZXNzaWJp bGl0eU9iamVjdCogYWNjZXNzaWJpbGl0eUhpdFRlc3QoY29uc3QgTGF5b3V0UG9pbnQmKSBjb25z dDsKKyAgICB2aXJ0dWFsIEFjY2Vzc2liaWxpdHlPYmplY3QqIGFjY2Vzc2liaWxpdHlIaXRUZXN0 KGNvbnN0IEludFBvaW50JikgY29uc3Q7CiAKICAgICB2aXJ0dWFsIEVsZW1lbnQqIGFjdGlvbkVs ZW1lbnQoKSBjb25zdDsKICAgICBFbGVtZW50KiBtb3VzZUJ1dHRvbkxpc3RlbmVyKCkgY29uc3Q7 CkBAIC0yMzksNyArMjM5LDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgYm9vbCBpc0FSSUFHcmFi YmVkKCk7CiAgICAgdmlydHVhbCB2b2lkIGRldGVybWluZUFSSUFEcm9wRWZmZWN0cyhWZWN0b3I8 U3RyaW5nPiYpOwogICAgIAotICAgIHZpcnR1YWwgVmlzaWJsZVBvc2l0aW9uIHZpc2libGVQb3Np dGlvbkZvclBvaW50KGNvbnN0IExheW91dFBvaW50JikgY29uc3Q7CisgICAgdmlydHVhbCBWaXNp YmxlUG9zaXRpb24gdmlzaWJsZVBvc2l0aW9uRm9yUG9pbnQoY29uc3QgSW50UG9pbnQmKSBjb25z dDsKICAgICB2aXJ0dWFsIFZpc2libGVQb3NpdGlvbiB2aXNpYmxlUG9zaXRpb25Gb3JJbmRleCh1 bnNpZ25lZCBpbmRleFZhbHVlLCBib29sIGxhc3RJbmRleE9LKSBjb25zdDsgICAgCiAgICAgdmly dHVhbCBpbnQgaW5kZXgoY29uc3QgVmlzaWJsZVBvc2l0aW9uJikgY29uc3Q7CiAKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVNjcm9sbFZpZXcuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVNj cm9sbFZpZXcuY3BwCShyZXZpc2lvbiAxMTE1MTgpCisrKyBTb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L0FjY2Vzc2liaWxpdHlTY3JvbGxWaWV3LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTYz LDcgKzE2Myw3IEBAIEFjY2Vzc2liaWxpdHlPYmplY3QqIEFjY2Vzc2liaWxpdHlTY3JvbGwKICAg ICByZXR1cm4gYXhPYmplY3RDYWNoZSgpLT5nZXRPckNyZWF0ZShkb2MtPnJlbmRlcmVyKCkpOwog fQogCi1BY2Nlc3NpYmlsaXR5T2JqZWN0KiBBY2Nlc3NpYmlsaXR5U2Nyb2xsVmlldzo6YWNjZXNz aWJpbGl0eUhpdFRlc3QoY29uc3QgTGF5b3V0UG9pbnQmIHBvaW50KSBjb25zdAorQWNjZXNzaWJp bGl0eU9iamVjdCogQWNjZXNzaWJpbGl0eVNjcm9sbFZpZXc6OmFjY2Vzc2liaWxpdHlIaXRUZXN0 KGNvbnN0IEludFBvaW50JiBwb2ludCkgY29uc3QKIHsKICAgICBBY2Nlc3NpYmlsaXR5T2JqZWN0 KiB3ZWJBcmVhID0gd2ViQXJlYU9iamVjdCgpOwogICAgIGlmICghd2ViQXJlYSkKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVNjcm9sbFZpZXcuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlTY3Jv bGxWaWV3LmgJKHJldmlzaW9uIDExMTUxOCkKKysrIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvQWNjZXNzaWJpbGl0eVNjcm9sbFZpZXcuaAkod29ya2luZyBjb3B5KQpAQCAtNTcsNyArNTcs NyBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgQWNjZXNzaWJpbGl0eU9iamVjdCogc2Nyb2xsQmFy KEFjY2Vzc2liaWxpdHlPcmllbnRhdGlvbik7CiAgICAgdmlydHVhbCB2b2lkIGFkZENoaWxkcmVu KCk7CiAgICAgdmlydHVhbCB2b2lkIGNsZWFyQ2hpbGRyZW4oKTsKLSAgICB2aXJ0dWFsIEFjY2Vz c2liaWxpdHlPYmplY3QqIGFjY2Vzc2liaWxpdHlIaXRUZXN0KGNvbnN0IExheW91dFBvaW50Jikg Y29uc3Q7CisgICAgdmlydHVhbCBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBhY2Nlc3NpYmlsaXR5SGl0 VGVzdChjb25zdCBJbnRQb2ludCYpIGNvbnN0OwogICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVDaGls ZHJlbklmTmVjZXNzYXJ5KCk7CiAgICAgdmlydHVhbCB2b2lkIHNldE5lZWRzVG9VcGRhdGVDaGls ZHJlbigpIHsgbV9jaGlsZHJlbkRpcnR5ID0gdHJ1ZTsgfQogICAgIHZvaWQgdXBkYXRlU2Nyb2xs YmFycygpOwpJbmRleDogU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5 U2xpZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0Fj Y2Vzc2liaWxpdHlTbGlkZXIuY3BwCShyZXZpc2lvbiAxMTE1MTgpCisrKyBTb3VyY2UvV2ViQ29y ZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlTbGlkZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0xMDIsNyArMTAyLDcgQEAgY29uc3QgQXRvbWljU3RyaW5nJiBBY2Nlc3NpYmlsaXR5U2xpZGVy OgogICAgIHJldHVybiBlbGVtZW50KCktPmdldEF0dHJpYnV0ZShhdHRyaWJ1dGUpOwogfQogICAg IAotQWNjZXNzaWJpbGl0eU9iamVjdCogQWNjZXNzaWJpbGl0eVNsaWRlcjo6ZWxlbWVudEFjY2Vz c2liaWxpdHlIaXRUZXN0KGNvbnN0IExheW91dFBvaW50JiBwb2ludCkgY29uc3QKK0FjY2Vzc2li aWxpdHlPYmplY3QqIEFjY2Vzc2liaWxpdHlTbGlkZXI6OmVsZW1lbnRBY2Nlc3NpYmlsaXR5SGl0 VGVzdChjb25zdCBJbnRQb2ludCYgcG9pbnQpIGNvbnN0CiB7CiAgICAgaWYgKG1fY2hpbGRyZW4u c2l6ZSgpKSB7CiAgICAgICAgIEFTU0VSVChtX2NoaWxkcmVuLnNpemUoKSA9PSAxKTsKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVNsaWRlci5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVNsaWRl ci5oCShyZXZpc2lvbiAxMTE1MTgpCisrKyBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0Fj Y2Vzc2liaWxpdHlTbGlkZXIuaAkod29ya2luZyBjb3B5KQpAQCAtNDgsNyArNDgsNyBAQCBwcm90 ZWN0ZWQ6CiBwcml2YXRlOgogICAgIEhUTUxJbnB1dEVsZW1lbnQqIGVsZW1lbnQoKSBjb25zdDsK ICAgICB2aXJ0dWFsIGJvb2wgYWNjZXNzaWJpbGl0eUlzSWdub3JlZCgpIGNvbnN0OwotICAgIHZp cnR1YWwgQWNjZXNzaWJpbGl0eU9iamVjdCogZWxlbWVudEFjY2Vzc2liaWxpdHlIaXRUZXN0KGNv bnN0IExheW91dFBvaW50JikgY29uc3Q7CisgICAgdmlydHVhbCBBY2Nlc3NpYmlsaXR5T2JqZWN0 KiBlbGVtZW50QWNjZXNzaWJpbGl0eUhpdFRlc3QoY29uc3QgSW50UG9pbnQmKSBjb25zdDsKIAog ICAgIHZpcnR1YWwgQWNjZXNzaWJpbGl0eVJvbGUgcm9sZVZhbHVlKCkgY29uc3QgeyByZXR1cm4g U2xpZGVyUm9sZTsgfSAgICAKICAgICB2aXJ0dWFsIGJvb2wgaXNTbGlkZXIoKSBjb25zdCB7IHJl dHVybiB0cnVlOyB9Cg==