64131 2011-07-07 16:18:40 -0700 Switch HitTestResult to to new layout types 2011-07-07 17:17:42 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 63567 1 eae eae eric leviw webkit.review.bot oldest_to_newest 433774 0 eae 2011-07-07 16:18:40 -0700 Convert HitTestResult to new layout abstraction. 433789 1 100051 eae 2011-07-07 16:49:03 -0700 Created attachment 100051 Patch 433800 2 100051 webkit.review.bot 2011-07-07 17:17:38 -0700 Comment on attachment 100051 Patch Clearing flags on attachment: 100051 Committed r90603: <http://trac.webkit.org/changeset/90603> 433801 3 webkit.review.bot 2011-07-07 17:17:42 -0700 All reviewed patches have been landed. Closing bug. 100051 2011-07-07 16:49:03 -0700 2011-07-07 17:17:38 -0700 Patch bug-64131-20110707164902.patch text/plain 10256 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDkwNjAwKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTEtMDctMDcgIEVtaWwgQSBF a2x1bmQgIDxlYWVAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFN3aXRjaCBIaXRUZXN0UmVzdWx0 IHRvIHRvIG5ldyBsYXlvdXQgdHlwZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTY0MTMxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBubyBmdW5jdGlvbmFsaXR5IGNoYW5nZXMuCisK KyAgICAgICAgKiBwYWdlL01vdXNlRXZlbnRXaXRoSGl0VGVzdFJlc3VsdHMuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6TW91c2VFdmVudFdpdGhIaXRUZXN0UmVzdWx0czo6bG9jYWxQb2ludCk6Cisg ICAgICAgICogcGFnZS9Nb3VzZUV2ZW50V2l0aEhpdFRlc3RSZXN1bHRzLmg6CisgICAgICAgICog cmVuZGVyaW5nL0hpdFRlc3RSZXN1bHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SGl0VGVzdFJl c3VsdDo6SGl0VGVzdFJlc3VsdCk6CisgICAgICAgIChXZWJDb3JlOjpIaXRUZXN0UmVzdWx0Ojph ZGROb2RlVG9SZWN0QmFzZWRUZXN0UmVzdWx0KToKKyAgICAgICAgKFdlYkNvcmU6OkhpdFRlc3RS ZXN1bHQ6OnJlY3RGb3JQb2ludCk6CisgICAgICAgICogcmVuZGVyaW5nL0hpdFRlc3RSZXN1bHQu aDoKKyAgICAgICAgKFdlYkNvcmU6OkhpdFRlc3RSZXN1bHQ6OnBvaW50KToKKyAgICAgICAgKFdl YkNvcmU6OkhpdFRlc3RSZXN1bHQ6OmxvY2FsUG9pbnQpOgorICAgICAgICAoV2ViQ29yZTo6SGl0 VGVzdFJlc3VsdDo6c2V0UG9pbnQpOgorICAgICAgICAoV2ViQ29yZTo6SGl0VGVzdFJlc3VsdDo6 c2V0TG9jYWxQb2ludCk6CisgICAgICAgIChXZWJDb3JlOjpIaXRUZXN0UmVzdWx0OjpyZWN0Rm9y UG9pbnQpOgorCiAyMDExLTA3LTA3ICBMZXZpIFdlaW50cmF1YiAgPGxldml3QGNocm9taXVtLm9y Zz4KIAogICAgICAgICBTd2l0Y2ggcmVtYWluaW5nIHBhaW50IGZ1bmN0aW9ucyB0byBuZXcgbGF5 b3V0IHR5cGVzCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL01vdXNlRXZlbnRXaXRoSGl0VGVz dFJlc3VsdHMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvTW91c2VFdmVu dFdpdGhIaXRUZXN0UmVzdWx0cy5jcHAJKHJldmlzaW9uIDkwNTk2KQorKysgU291cmNlL1dlYkNv cmUvcGFnZS9Nb3VzZUV2ZW50V2l0aEhpdFRlc3RSZXN1bHRzLmNwcAkod29ya2luZyBjb3B5KQpA QCAtMzMsNyArMzMsNyBAQCBNb3VzZUV2ZW50V2l0aEhpdFRlc3RSZXN1bHRzOjpNb3VzZUV2ZW50 CiB7CiB9CiAKLWNvbnN0IEludFBvaW50IE1vdXNlRXZlbnRXaXRoSGl0VGVzdFJlc3VsdHM6Omxv Y2FsUG9pbnQoKSBjb25zdAorY29uc3QgTGF5b3V0UG9pbnQgTW91c2VFdmVudFdpdGhIaXRUZXN0 UmVzdWx0czo6bG9jYWxQb2ludCgpIGNvbnN0CiB7CiAgICAgcmV0dXJuIG1faGl0VGVzdFJlc3Vs dC5sb2NhbFBvaW50KCk7CiB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL01vdXNlRXZlbnRX aXRoSGl0VGVzdFJlc3VsdHMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL01v dXNlRXZlbnRXaXRoSGl0VGVzdFJlc3VsdHMuaAkocmV2aXNpb24gOTA1OTYpCisrKyBTb3VyY2Uv V2ViQ29yZS9wYWdlL01vdXNlRXZlbnRXaXRoSGl0VGVzdFJlc3VsdHMuaAkod29ya2luZyBjb3B5 KQpAQCAtMzQsNyArMzQsNyBAQCBwdWJsaWM6CiAKICAgICBjb25zdCBQbGF0Zm9ybU1vdXNlRXZl bnQmIGV2ZW50KCkgY29uc3QgeyByZXR1cm4gbV9ldmVudDsgfQogICAgIGNvbnN0IEhpdFRlc3RS ZXN1bHQmIGhpdFRlc3RSZXN1bHQoKSBjb25zdCB7IHJldHVybiBtX2hpdFRlc3RSZXN1bHQ7IH0K LSAgICBjb25zdCBJbnRQb2ludCBsb2NhbFBvaW50KCkgY29uc3Q7CisgICAgY29uc3QgTGF5b3V0 UG9pbnQgbG9jYWxQb2ludCgpIGNvbnN0OwogICAgIFNjcm9sbGJhciogc2Nyb2xsYmFyKCkgY29u c3Q7CiAgICAgYm9vbCBpc092ZXJMaW5rKCkgY29uc3Q7CiAgICAgYm9vbCBpc092ZXJXaWRnZXQo KSBjb25zdCB7IHJldHVybiBtX2hpdFRlc3RSZXN1bHQuaXNPdmVyV2lkZ2V0KCk7IH0KSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9IaXRUZXN0UmVzdWx0LmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSGl0VGVzdFJlc3VsdC5jcHAJKHJldmlzaW9uIDkw NTk2KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0hpdFRlc3RSZXN1bHQuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC01NSw3ICs1NSw3IEBAIEhpdFRlc3RSZXN1bHQ6OkhpdFRlc3RSZXN1bHQo KQogewogfQogCi1IaXRUZXN0UmVzdWx0OjpIaXRUZXN0UmVzdWx0KGNvbnN0IEludFBvaW50JiBw b2ludCkKK0hpdFRlc3RSZXN1bHQ6OkhpdFRlc3RSZXN1bHQoY29uc3QgTGF5b3V0UG9pbnQmIHBv aW50KQogICAgIDogbV9wb2ludChwb2ludCkKICAgICAsIG1faXNPdmVyV2lkZ2V0KGZhbHNlKQog ICAgICwgbV9pc1JlY3RCYXNlZChmYWxzZSkKQEAgLTY2LDcgKzY2LDcgQEAgSGl0VGVzdFJlc3Vs dDo6SGl0VGVzdFJlc3VsdChjb25zdCBJbnRQbwogewogfQogCi1IaXRUZXN0UmVzdWx0OjpIaXRU ZXN0UmVzdWx0KGNvbnN0IEludFBvaW50JiBjZW50ZXJQb2ludCwgdW5zaWduZWQgdG9wUGFkZGlu ZywgdW5zaWduZWQgcmlnaHRQYWRkaW5nLCB1bnNpZ25lZCBib3R0b21QYWRkaW5nLCB1bnNpZ25l ZCBsZWZ0UGFkZGluZykKK0hpdFRlc3RSZXN1bHQ6OkhpdFRlc3RSZXN1bHQoY29uc3QgTGF5b3V0 UG9pbnQmIGNlbnRlclBvaW50LCB1bnNpZ25lZCB0b3BQYWRkaW5nLCB1bnNpZ25lZCByaWdodFBh ZGRpbmcsIHVuc2lnbmVkIGJvdHRvbVBhZGRpbmcsIHVuc2lnbmVkIGxlZnRQYWRkaW5nKQogICAg IDogbV9wb2ludChjZW50ZXJQb2ludCkKICAgICAsIG1faXNPdmVyV2lkZ2V0KGZhbHNlKQogICAg ICwgbV90b3BQYWRkaW5nKHRvcFBhZGRpbmcpCkBAIC01MDgsNyArNTA4LDcgQEAgYm9vbCBIaXRU ZXN0UmVzdWx0Ojppc0NvbnRlbnRFZGl0YWJsZSgpIAogICAgIHJldHVybiBtX2lubmVyTm9uU2hh cmVkTm9kZS0+cmVuZGVyZXJJc0VkaXRhYmxlKCk7CiB9CiAKLWJvb2wgSGl0VGVzdFJlc3VsdDo6 YWRkTm9kZVRvUmVjdEJhc2VkVGVzdFJlc3VsdChOb2RlKiBub2RlLCBjb25zdCBJbnRQb2ludCYg cG9pbnRJbkNvbnRhaW5lciwgY29uc3QgSW50UmVjdCYgcmVjdCkKK2Jvb2wgSGl0VGVzdFJlc3Vs dDo6YWRkTm9kZVRvUmVjdEJhc2VkVGVzdFJlc3VsdChOb2RlKiBub2RlLCBjb25zdCBMYXlvdXRQ b2ludCYgcG9pbnRJbkNvbnRhaW5lciwgY29uc3QgTGF5b3V0UmVjdCYgcmVjdCkKIHsKICAgICAv LyBJZiBpdCBpcyBub3QgYSByZWN0LWJhc2VkIGhpdCB0ZXN0LCB0aGlzIG1ldGhvZCBoYXMgdG8g YmUgbm8tb3AuCiAgICAgLy8gUmV0dXJuIGZhbHNlLCBzbyB0aGUgaGl0IHRlc3Qgc3RvcHMuCkBA IC01MzksNyArNTM5LDcgQEAgYm9vbCBIaXRUZXN0UmVzdWx0OjphZGROb2RlVG9SZWN0QmFzZWRU ZQogICAgIHJldHVybiAhcmVjdC5jb250YWlucyhyZWN0Rm9yUG9pbnQocG9pbnRJbkNvbnRhaW5l cikpOwogfQogCi1ib29sIEhpdFRlc3RSZXN1bHQ6OmFkZE5vZGVUb1JlY3RCYXNlZFRlc3RSZXN1 bHQoTm9kZSogbm9kZSwgY29uc3QgSW50UG9pbnQmIHBvaW50SW5Db250YWluZXIsIGNvbnN0IEZs b2F0UmVjdCYgcmVjdCkKK2Jvb2wgSGl0VGVzdFJlc3VsdDo6YWRkTm9kZVRvUmVjdEJhc2VkVGVz dFJlc3VsdChOb2RlKiBub2RlLCBjb25zdCBMYXlvdXRQb2ludCYgcG9pbnRJbkNvbnRhaW5lciwg Y29uc3QgRmxvYXRSZWN0JiByZWN0KQogewogICAgIC8vIElmIGl0IGlzIG5vdCBhIHJlY3QtYmFz ZWQgaGl0IHRlc3QsIHRoaXMgbWV0aG9kIGhhcyB0byBiZSBuby1vcC4KICAgICAvLyBSZXR1cm4g ZmFsc2UsIHNvIHRoZSBoaXQgdGVzdCBzdG9wcy4KQEAgLTU5MCwxNiArNTkwLDE2IEBAIHZvaWQg SGl0VGVzdFJlc3VsdDo6YXBwZW5kKGNvbnN0IEhpdFRlc3QKICAgICB9CiB9CiAKLUludFJlY3Qg SGl0VGVzdFJlc3VsdDo6cmVjdEZvclBvaW50KGNvbnN0IEludFBvaW50JiBwb2ludCwgdW5zaWdu ZWQgdG9wUGFkZGluZywgdW5zaWduZWQgcmlnaHRQYWRkaW5nLCB1bnNpZ25lZCBib3R0b21QYWRk aW5nLCB1bnNpZ25lZCBsZWZ0UGFkZGluZykKK0xheW91dFJlY3QgSGl0VGVzdFJlc3VsdDo6cmVj dEZvclBvaW50KGNvbnN0IExheW91dFBvaW50JiBwb2ludCwgdW5zaWduZWQgdG9wUGFkZGluZywg dW5zaWduZWQgcmlnaHRQYWRkaW5nLCB1bnNpZ25lZCBib3R0b21QYWRkaW5nLCB1bnNpZ25lZCBs ZWZ0UGFkZGluZykKIHsKLSAgICBJbnRQb2ludCBhY3R1YWxQb2ludChwb2ludCk7Ci0gICAgYWN0 dWFsUG9pbnQgLT0gSW50U2l6ZShsZWZ0UGFkZGluZywgdG9wUGFkZGluZyk7CisgICAgTGF5b3V0 UG9pbnQgYWN0dWFsUG9pbnQocG9pbnQpOworICAgIGFjdHVhbFBvaW50IC09IExheW91dFNpemUo bGVmdFBhZGRpbmcsIHRvcFBhZGRpbmcpOwogCiAgICAgSW50U2l6ZSBhY3R1YWxQYWRkaW5nKGxl ZnRQYWRkaW5nICsgcmlnaHRQYWRkaW5nLCB0b3BQYWRkaW5nICsgYm90dG9tUGFkZGluZyk7CiAg ICAgLy8gQXMgSW50UmVjdCBpcyBsZWZ0IGluY2x1c2l2ZSBhbmQgcmlnaHQgZXhjbHVzaXZlIChz ZWVpbmcgSW50UmVjdDo6Y29udGFpbnMoeCwgeSkpLCBhZGRpbmcgIjEiLgogICAgIGFjdHVhbFBh ZGRpbmcgKz0gSW50U2l6ZSgxLCAxKTsKIAotICAgIHJldHVybiBJbnRSZWN0KGFjdHVhbFBvaW50 LCBhY3R1YWxQYWRkaW5nKTsKKyAgICByZXR1cm4gTGF5b3V0UmVjdChhY3R1YWxQb2ludCwgYWN0 dWFsUGFkZGluZyk7CiB9CiAKIGNvbnN0IEhpdFRlc3RSZXN1bHQ6Ok5vZGVTZXQmIEhpdFRlc3RS ZXN1bHQ6OnJlY3RCYXNlZFRlc3RSZXN1bHQoKSBjb25zdApJbmRleDogU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL0hpdFRlc3RSZXN1bHQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvSGl0VGVzdFJlc3VsdC5oCShyZXZpc2lvbiA5MDU5NikKKysrIFNvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9IaXRUZXN0UmVzdWx0LmgJKHdvcmtpbmcgY29weSkKQEAgLTIxLDkgKzIx LDcgQEAKICNkZWZpbmUgSGl0VGVzdFJlc3VsdF9oCiAKICNpbmNsdWRlICJGbG9hdFJlY3QuaCIK LSNpbmNsdWRlICJJbnRQb2ludC5oIgotI2luY2x1ZGUgIkludFJlY3QuaCIKLSNpbmNsdWRlICJJ bnRTaXplLmgiCisjaW5jbHVkZSAiTGF5b3V0VHlwZXMuaCIKICNpbmNsdWRlICJUZXh0RGlyZWN0 aW9uLmgiCiAjaW5jbHVkZSA8d3RmL0ZvcndhcmQuaD4KICNpbmNsdWRlIDx3dGYvTGlzdEhhc2hT ZXQuaD4KQEAgLTM4LDcgKzM2LDYgQEAgY2xhc3MgRnJhbWU7CiBjbGFzcyBIVE1MTWVkaWFFbGVt ZW50OwogI2VuZGlmCiBjbGFzcyBJbWFnZTsKLWNsYXNzIEludFJlY3Q7CiBjbGFzcyBLVVJMOwog Y2xhc3MgTm9kZTsKIGNsYXNzIFNjcm9sbGJhcjsKQEAgLTQ4LDE3ICs0NSwxNyBAQCBwdWJsaWM6 CiAgICAgdHlwZWRlZiBMaXN0SGFzaFNldDxSZWZQdHI8Tm9kZT4gPiBOb2RlU2V0OwogCiAgICAg SGl0VGVzdFJlc3VsdCgpOwotICAgIEhpdFRlc3RSZXN1bHQoY29uc3QgSW50UG9pbnQmKTsKKyAg ICBIaXRUZXN0UmVzdWx0KGNvbnN0IExheW91dFBvaW50Jik7CiAgICAgLy8gUGFzcyBub24tbmVn YXRpdmUgcGFkZGluZyB2YWx1ZXMgdG8gcGVyZm9ybSBhIHJlY3QtYmFzZWQgaGl0IHRlc3QuCi0g ICAgSGl0VGVzdFJlc3VsdChjb25zdCBJbnRQb2ludCYgY2VudGVyUG9pbnQsIHVuc2lnbmVkIHRv cFBhZGRpbmcsIHVuc2lnbmVkIHJpZ2h0UGFkZGluZywgdW5zaWduZWQgYm90dG9tUGFkZGluZywg dW5zaWduZWQgbGVmdFBhZGRpbmcpOworICAgIEhpdFRlc3RSZXN1bHQoY29uc3QgTGF5b3V0UG9p bnQmIGNlbnRlclBvaW50LCB1bnNpZ25lZCB0b3BQYWRkaW5nLCB1bnNpZ25lZCByaWdodFBhZGRp bmcsIHVuc2lnbmVkIGJvdHRvbVBhZGRpbmcsIHVuc2lnbmVkIGxlZnRQYWRkaW5nKTsKICAgICBI aXRUZXN0UmVzdWx0KGNvbnN0IEhpdFRlc3RSZXN1bHQmKTsKICAgICB+SGl0VGVzdFJlc3VsdCgp OwogICAgIEhpdFRlc3RSZXN1bHQmIG9wZXJhdG9yPShjb25zdCBIaXRUZXN0UmVzdWx0Jik7CiAK ICAgICBOb2RlKiBpbm5lck5vZGUoKSBjb25zdCB7IHJldHVybiBtX2lubmVyTm9kZS5nZXQoKTsg fQogICAgIE5vZGUqIGlubmVyTm9uU2hhcmVkTm9kZSgpIGNvbnN0IHsgcmV0dXJuIG1faW5uZXJO b25TaGFyZWROb2RlLmdldCgpOyB9Ci0gICAgSW50UG9pbnQgcG9pbnQoKSBjb25zdCB7IHJldHVy biBtX3BvaW50OyB9Ci0gICAgSW50UG9pbnQgbG9jYWxQb2ludCgpIGNvbnN0IHsgcmV0dXJuIG1f bG9jYWxQb2ludDsgfQorICAgIExheW91dFBvaW50IHBvaW50KCkgY29uc3QgeyByZXR1cm4gbV9w b2ludDsgfQorICAgIExheW91dFBvaW50IGxvY2FsUG9pbnQoKSBjb25zdCB7IHJldHVybiBtX2xv Y2FsUG9pbnQ7IH0KICAgICBFbGVtZW50KiBVUkxFbGVtZW50KCkgY29uc3QgeyByZXR1cm4gbV9p bm5lclVSTEVsZW1lbnQuZ2V0KCk7IH0KICAgICBTY3JvbGxiYXIqIHNjcm9sbGJhcigpIGNvbnN0 IHsgcmV0dXJuIG1fc2Nyb2xsYmFyLmdldCgpOyB9CiAgICAgYm9vbCBpc092ZXJXaWRnZXQoKSBj b25zdCB7IHJldHVybiBtX2lzT3ZlcldpZGdldDsgfQpAQCAtNjcsOCArNjQsOCBAQCBwdWJsaWM6 CiAKICAgICB2b2lkIHNldElubmVyTm9kZShOb2RlKik7CiAgICAgdm9pZCBzZXRJbm5lck5vblNo YXJlZE5vZGUoTm9kZSopOwotICAgIHZvaWQgc2V0UG9pbnQoY29uc3QgSW50UG9pbnQmIHApIHsg bV9wb2ludCA9IHA7IH0KLSAgICB2b2lkIHNldExvY2FsUG9pbnQoY29uc3QgSW50UG9pbnQmIHAp IHsgbV9sb2NhbFBvaW50ID0gcDsgfQorICAgIHZvaWQgc2V0UG9pbnQoY29uc3QgTGF5b3V0UG9p bnQmIHApIHsgbV9wb2ludCA9IHA7IH0KKyAgICB2b2lkIHNldExvY2FsUG9pbnQoY29uc3QgTGF5 b3V0UG9pbnQmIHApIHsgbV9sb2NhbFBvaW50ID0gcDsgfQogICAgIHZvaWQgc2V0VVJMRWxlbWVu dChFbGVtZW50Kik7CiAgICAgdm9pZCBzZXRTY3JvbGxiYXIoU2Nyb2xsYmFyKik7CiAgICAgdm9p ZCBzZXRJc092ZXJXaWRnZXQoYm9vbCBiKSB7IG1faXNPdmVyV2lkZ2V0ID0gYjsgfQpAQCAtMTAz LDggKzEwMCw4IEBAIHB1YmxpYzoKIAogICAgIC8vIFJlY3QtYmFzZWQgaGl0IHRlc3QgcmVsYXRl ZCBtZXRob2RzLgogICAgIGJvb2wgaXNSZWN0QmFzZWRUZXN0KCkgY29uc3QgeyByZXR1cm4gbV9p c1JlY3RCYXNlZDsgfQotICAgIEludFJlY3QgcmVjdEZvclBvaW50KGNvbnN0IEludFBvaW50Jikg Y29uc3Q7Ci0gICAgc3RhdGljIEludFJlY3QgcmVjdEZvclBvaW50KGNvbnN0IEludFBvaW50Jiwg dW5zaWduZWQgdG9wUGFkZGluZywgdW5zaWduZWQgcmlnaHRQYWRkaW5nLCB1bnNpZ25lZCBib3R0 b21QYWRkaW5nLCB1bnNpZ25lZCBsZWZ0UGFkZGluZyk7CisgICAgTGF5b3V0UmVjdCByZWN0Rm9y UG9pbnQoY29uc3QgTGF5b3V0UG9pbnQmKSBjb25zdDsKKyAgICBzdGF0aWMgTGF5b3V0UmVjdCBy ZWN0Rm9yUG9pbnQoY29uc3QgTGF5b3V0UG9pbnQmLCB1bnNpZ25lZCB0b3BQYWRkaW5nLCB1bnNp Z25lZCByaWdodFBhZGRpbmcsIHVuc2lnbmVkIGJvdHRvbVBhZGRpbmcsIHVuc2lnbmVkIGxlZnRQ YWRkaW5nKTsKICAgICBpbnQgdG9wUGFkZGluZygpIGNvbnN0IHsgcmV0dXJuIG1fdG9wUGFkZGlu ZzsgfQogICAgIGludCByaWdodFBhZGRpbmcoKSBjb25zdCB7IHJldHVybiBtX3JpZ2h0UGFkZGlu ZzsgfQogICAgIGludCBib3R0b21QYWRkaW5nKCkgY29uc3QgeyByZXR1cm4gbV9ib3R0b21QYWRk aW5nOyB9CkBAIC0xMTIsOCArMTA5LDggQEAgcHVibGljOgogCiAgICAgLy8gUmV0dXJucyB0cnVl IGlmIGl0IGlzIHJlY3QtYmFzZWQgaGl0IHRlc3QgYW5kIG5lZWRzIHRvIGNvbnRpbnVlIHVudGls IHRoZSByZWN0IGlzIGZ1bGx5CiAgICAgLy8gZW5jbG9zZWQgYnkgdGhlIGJvdW5kYXJpZXMgb2Yg YSBub2RlLgotICAgIGJvb2wgYWRkTm9kZVRvUmVjdEJhc2VkVGVzdFJlc3VsdChOb2RlKiwgY29u c3QgSW50UG9pbnQmIHBvaW50SW5Db250YWluZXIsIGNvbnN0IEludFJlY3QmID0gSW50UmVjdCgp KTsKLSAgICBib29sIGFkZE5vZGVUb1JlY3RCYXNlZFRlc3RSZXN1bHQoTm9kZSosIGNvbnN0IElu dFBvaW50JiBwb2ludEluQ29udGFpbmVyLCBjb25zdCBGbG9hdFJlY3QmKTsKKyAgICBib29sIGFk ZE5vZGVUb1JlY3RCYXNlZFRlc3RSZXN1bHQoTm9kZSosIGNvbnN0IExheW91dFBvaW50JiBwb2lu dEluQ29udGFpbmVyLCBjb25zdCBMYXlvdXRSZWN0JiA9IEludFJlY3QoKSk7CisgICAgYm9vbCBh ZGROb2RlVG9SZWN0QmFzZWRUZXN0UmVzdWx0KE5vZGUqLCBjb25zdCBMYXlvdXRQb2ludCYgcG9p bnRJbkNvbnRhaW5lciwgY29uc3QgRmxvYXRSZWN0Jik7CiAgICAgdm9pZCBhcHBlbmQoY29uc3Qg SGl0VGVzdFJlc3VsdCYpOwogCiAgICAgLy8gSWYgbV9yZWN0QmFzZWRUZXN0UmVzdWx0IGlzIDAg dGhlbiBzZXQgaXQgdG8gYSBuZXcgTm9kZVNldC4gUmV0dXJuICptX3JlY3RCYXNlZFRlc3RSZXN1 bHQuIExhenkgYWxsb2NhdGlvbiBtYWtlcwpAQCAtMTMwLDkgKzEyNyw5IEBAIHByaXZhdGU6CiAK ICAgICBSZWZQdHI8Tm9kZT4gbV9pbm5lck5vZGU7CiAgICAgUmVmUHRyPE5vZGU+IG1faW5uZXJO b25TaGFyZWROb2RlOwotICAgIEludFBvaW50IG1fcG9pbnQ7Ci0gICAgSW50UG9pbnQgbV9sb2Nh bFBvaW50OyAvLyBBIHBvaW50IGluIHRoZSBsb2NhbCBjb29yZGluYXRlIHNwYWNlIG9mIG1faW5u ZXJOb25TaGFyZWROb2RlJ3MgcmVuZGVyZXIuICBBbGxvd3MgdXMgdG8gZWZmaWNpZW50bHkKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgIC8vIGRldGVybWluZSB3aGVyZSBpbnNpZGUgdGhlIHJl bmRlcmVyIHdlIGhpdCBvbiBzdWJzZXF1ZW50IG9wZXJhdGlvbnMuCisgICAgTGF5b3V0UG9pbnQg bV9wb2ludDsKKyAgICBMYXlvdXRQb2ludCBtX2xvY2FsUG9pbnQ7IC8vIEEgcG9pbnQgaW4gdGhl IGxvY2FsIGNvb3JkaW5hdGUgc3BhY2Ugb2YgbV9pbm5lck5vblNoYXJlZE5vZGUncyByZW5kZXJl ci4gQWxsb3dzIHVzIHRvIGVmZmljaWVudGx5CisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAvLyBkZXRlcm1pbmUgd2hlcmUgaW5zaWRlIHRoZSByZW5kZXJlciB3ZSBoaXQgb24gc3Vic2Vx dWVudCBvcGVyYXRpb25zLgogICAgIFJlZlB0cjxFbGVtZW50PiBtX2lubmVyVVJMRWxlbWVudDsK ICAgICBSZWZQdHI8U2Nyb2xsYmFyPiBtX3Njcm9sbGJhcjsKICAgICBib29sIG1faXNPdmVyV2lk Z2V0OyAvLyBSZXR1cm5zIHRydWUgaWYgd2UgYXJlIG92ZXIgYSB3aWRnZXQgKGFuZCBub3QgaW4g dGhlIGJvcmRlci9wYWRkaW5nIGFyZWEgb2YgYSBSZW5kZXJXaWRnZXQgZm9yIGV4YW1wbGUpLgpA QCAtMTQ5LDcgKzE0Niw3IEBAIHByaXZhdGU6CiAvLyB5ID0gcC55KCkgLSB0b3BQYWRkaW5nCiAv LyB3aWR0aCA9IGxlZnRQYWRkaW5nICsgcmlnaHRQYWRkaW5nICsgMQogLy8gaGVpZ2h0ID0gdG9w UGFkZGluZyArIGJvdHRvbVBhZGRpbmcgKyAxCi1pbmxpbmUgSW50UmVjdCBIaXRUZXN0UmVzdWx0 OjpyZWN0Rm9yUG9pbnQoY29uc3QgSW50UG9pbnQmIHBvaW50KSBjb25zdAoraW5saW5lIExheW91 dFJlY3QgSGl0VGVzdFJlc3VsdDo6cmVjdEZvclBvaW50KGNvbnN0IExheW91dFBvaW50JiBwb2lu dCkgY29uc3QKIHsKICAgICByZXR1cm4gcmVjdEZvclBvaW50KHBvaW50LCBtX3RvcFBhZGRpbmcs IG1fcmlnaHRQYWRkaW5nLCBtX2JvdHRvbVBhZGRpbmcsIG1fbGVmdFBhZGRpbmcpOwogfQo=