84496 2012-04-20 14:40:38 -0700 Clean up subpixel unit handling in hit testing code 2012-04-23 12:02:35 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 60318 1 eae eae eric leviw simon.fraser oldest_to_newest 606922 0 eae 2012-04-20 14:40:38 -0700 We currently use IntRect where we should use LayoutRect and the other way around in a couple of places. 606932 1 138170 eae 2012-04-20 14:51:57 -0700 Created attachment 138170 Patch 606980 2 138170 eric 2012-04-20 15:49:08 -0700 Comment on attachment 138170 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=138170&action=review > Source/WebCore/ChangeLog:9 > + Fix use of IntRect and LayoutRect in hit testing code in preparation for > + subpixel layout. Why? 607071 3 eae 2012-04-20 16:57:53 -0700 (In reply to comment #2) > Why? I really should expand on that, thanks for pointing it out. 607799 4 138377 eae 2012-04-23 10:26:07 -0700 Created attachment 138377 Patch 607848 5 138377 eric 2012-04-23 11:03:53 -0700 Comment on attachment 138377 Patch I guess hit testing results are currently IntRects, so this isn't really a change. I'm just slightly surprised we wouldnt' want them to be LayoutRects. 607849 6 eae 2012-04-23 11:07:02 -0700 (In reply to comment #5) > (From update of attachment 138377 [details]) > I guess hit testing results are currently IntRects, so this isn't really a change. I'm just slightly surprised we wouldnt' want them to be LayoutRects. Eventually we do want to move hit testing to LayoutUnits/Rects. I would prefer changing one system at a time though. 607904 7 eae 2012-04-23 12:02:15 -0700 Committed r114926: <http://trac.webkit.org/changeset/114926> 138170 2012-04-20 14:51:57 -0700 2012-04-23 10:25:57 -0700 Patch bug-84496-20120420145156.patch text/plain 4831 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExNDc4NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDEyLTA0LTIwICBFbWlsIEEg RWtsdW5kICA8ZWFlQGNocm9taXVtLm9yZz4KKworICAgICAgICBDbGVhbiB1cCBzdWJwaXhlbCB1 bml0IGhhbmRsaW5nIGluIGhpdCB0ZXN0aW5nIGNvZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg0NDk2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgRml4IHVzZSBvZiBJbnRSZWN0IGFuZCBMYXlvdXRSZWN0 IGluIGhpdCB0ZXN0aW5nIGNvZGUgaW4gcHJlcGFyYXRpb24gZm9yCisgICAgICAgIHN1YnBpeGVs IGxheW91dC4KKworICAgICAgICBObyBuZXcgdGVzdHMsIG5vIGNoYW5nZSBpbiBmdW5jdGlvbmFs aXR5LgorCisgICAgICAgICogcmVuZGVyaW5nL0hpdFRlc3RSZXN1bHQuY3BwOgorICAgICAgICAo V2ViQ29yZTo6SGl0VGVzdFJlc3VsdDo6cmVjdEZvclBvaW50KToKKyAgICAgICAgKiByZW5kZXJp bmcvSGl0VGVzdFJlc3VsdC5oOgorICAgICAgICAoSGl0VGVzdFJlc3VsdCk6CisgICAgICAgIChX ZWJDb3JlOjpIaXRUZXN0UmVzdWx0OjpyZWN0Rm9yUG9pbnQpOgorICAgICAgICAqIHJlbmRlcmlu Zy9IaXRUZXN0aW5nVHJhbnNmb3JtU3RhdGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SGl0VGVz dGluZ1RyYW5zZm9ybVN0YXRlOjpib3VuZHNPZk1hcHBlZFF1YWQpOgorICAgICAgICAqIHJlbmRl cmluZy9IaXRUZXN0aW5nVHJhbnNmb3JtU3RhdGUuaDoKKwogMjAxMi0wNC0yMCAgRGFuIEJlcm5z dGVpbiAgPG1pdHpAYXBwbGUuY29tPgogCiAgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xMDc4NjAw MD4gU2VsZWN0aW9uIGhpZ2hsaWdodHMgb2YgbGluZXMgaW4gYWRqb2luaW5nIGJsb2NrcyBjYW4g b3ZlcmxhcApJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0hpdFRlc3RSZXN1bHQuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9IaXRUZXN0UmVzdWx0LmNw cAkocmV2aXNpb24gMTE0Nzc3KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0hpdFRlc3RS ZXN1bHQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02NTIsMTYgKzY1MiwxNiBAQCB2b2lkIEhpdFRl c3RSZXN1bHQ6OmFwcGVuZChjb25zdCBIaXRUZXN0CiAgICAgfQogfQogCi1MYXlvdXRSZWN0IEhp dFRlc3RSZXN1bHQ6OnJlY3RGb3JQb2ludChjb25zdCBMYXlvdXRQb2ludCYgcG9pbnQsIHVuc2ln bmVkIHRvcFBhZGRpbmcsIHVuc2lnbmVkIHJpZ2h0UGFkZGluZywgdW5zaWduZWQgYm90dG9tUGFk ZGluZywgdW5zaWduZWQgbGVmdFBhZGRpbmcpCitJbnRSZWN0IEhpdFRlc3RSZXN1bHQ6OnJlY3RG b3JQb2ludChjb25zdCBMYXlvdXRQb2ludCYgcG9pbnQsIHVuc2lnbmVkIHRvcFBhZGRpbmcsIHVu c2lnbmVkIHJpZ2h0UGFkZGluZywgdW5zaWduZWQgYm90dG9tUGFkZGluZywgdW5zaWduZWQgbGVm dFBhZGRpbmcpCiB7Ci0gICAgTGF5b3V0UG9pbnQgYWN0dWFsUG9pbnQocG9pbnQpOwotICAgIGFj dHVhbFBvaW50IC09IExheW91dFNpemUobGVmdFBhZGRpbmcsIHRvcFBhZGRpbmcpOworICAgIElu dFBvaW50IGFjdHVhbFBvaW50KHJvdW5kZWRJbnRQb2ludChwb2ludCkpOworICAgIGFjdHVhbFBv aW50IC09IEludFNpemUobGVmdFBhZGRpbmcsIHRvcFBhZGRpbmcpOwogCiAgICAgSW50U2l6ZSBh Y3R1YWxQYWRkaW5nKGxlZnRQYWRkaW5nICsgcmlnaHRQYWRkaW5nLCB0b3BQYWRkaW5nICsgYm90 dG9tUGFkZGluZyk7CiAgICAgLy8gQXMgSW50UmVjdCBpcyBsZWZ0IGluY2x1c2l2ZSBhbmQgcmln aHQgZXhjbHVzaXZlIChzZWVpbmcgSW50UmVjdDo6Y29udGFpbnMoeCwgeSkpLCBhZGRpbmcgIjEi LgogICAgIGFjdHVhbFBhZGRpbmcgKz0gSW50U2l6ZSgxLCAxKTsKIAotICAgIHJldHVybiBMYXlv dXRSZWN0KGFjdHVhbFBvaW50LCBhY3R1YWxQYWRkaW5nKTsKKyAgICByZXR1cm4gSW50UmVjdChh Y3R1YWxQb2ludCwgYWN0dWFsUGFkZGluZyk7CiB9CiAKIGNvbnN0IEhpdFRlc3RSZXN1bHQ6Ok5v ZGVTZXQmIEhpdFRlc3RSZXN1bHQ6OnJlY3RCYXNlZFRlc3RSZXN1bHQoKSBjb25zdApJbmRleDog U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0hpdFRlc3RSZXN1bHQuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSGl0VGVzdFJlc3VsdC5oCShyZXZpc2lvbiAxMTQ3Nzcp CisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSGl0VGVzdFJlc3VsdC5oCSh3b3JraW5nIGNv cHkpCkBAIC0xMTIsOCArMTEyLDggQEAgcHVibGljOgogCiAgICAgLy8gUmVjdC1iYXNlZCBoaXQg dGVzdCByZWxhdGVkIG1ldGhvZHMuCiAgICAgYm9vbCBpc1JlY3RCYXNlZFRlc3QoKSBjb25zdCB7 IHJldHVybiBtX2lzUmVjdEJhc2VkOyB9Ci0gICAgTGF5b3V0UmVjdCByZWN0Rm9yUG9pbnQoY29u c3QgTGF5b3V0UG9pbnQmKSBjb25zdDsKLSAgICBzdGF0aWMgTGF5b3V0UmVjdCByZWN0Rm9yUG9p bnQoY29uc3QgTGF5b3V0UG9pbnQmLCB1bnNpZ25lZCB0b3BQYWRkaW5nLCB1bnNpZ25lZCByaWdo dFBhZGRpbmcsIHVuc2lnbmVkIGJvdHRvbVBhZGRpbmcsIHVuc2lnbmVkIGxlZnRQYWRkaW5nKTsK KyAgICBJbnRSZWN0IHJlY3RGb3JQb2ludChjb25zdCBMYXlvdXRQb2ludCYpIGNvbnN0OworICAg IHN0YXRpYyBJbnRSZWN0IHJlY3RGb3JQb2ludChjb25zdCBMYXlvdXRQb2ludCYsIHVuc2lnbmVk IHRvcFBhZGRpbmcsIHVuc2lnbmVkIHJpZ2h0UGFkZGluZywgdW5zaWduZWQgYm90dG9tUGFkZGlu ZywgdW5zaWduZWQgbGVmdFBhZGRpbmcpOwogICAgIGludCB0b3BQYWRkaW5nKCkgY29uc3QgeyBy ZXR1cm4gbV90b3BQYWRkaW5nOyB9CiAgICAgaW50IHJpZ2h0UGFkZGluZygpIGNvbnN0IHsgcmV0 dXJuIG1fcmlnaHRQYWRkaW5nOyB9CiAgICAgaW50IGJvdHRvbVBhZGRpbmcoKSBjb25zdCB7IHJl dHVybiBtX2JvdHRvbVBhZGRpbmc7IH0KQEAgLTE2Miw3ICsxNjIsNyBAQCBwcml2YXRlOgogLy8g eSA9IHAueSgpIC0gdG9wUGFkZGluZwogLy8gd2lkdGggPSBsZWZ0UGFkZGluZyArIHJpZ2h0UGFk ZGluZyArIDEKIC8vIGhlaWdodCA9IHRvcFBhZGRpbmcgKyBib3R0b21QYWRkaW5nICsgMQotaW5s aW5lIExheW91dFJlY3QgSGl0VGVzdFJlc3VsdDo6cmVjdEZvclBvaW50KGNvbnN0IExheW91dFBv aW50JiBwb2ludCkgY29uc3QKK2lubGluZSBJbnRSZWN0IEhpdFRlc3RSZXN1bHQ6OnJlY3RGb3JQ b2ludChjb25zdCBMYXlvdXRQb2ludCYgcG9pbnQpIGNvbnN0CiB7CiAgICAgcmV0dXJuIHJlY3RG b3JQb2ludChwb2ludCwgbV90b3BQYWRkaW5nLCBtX3JpZ2h0UGFkZGluZywgbV9ib3R0b21QYWRk aW5nLCBtX2xlZnRQYWRkaW5nKTsKIH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9I aXRUZXN0aW5nVHJhbnNmb3JtU3RhdGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9IaXRUZXN0aW5nVHJhbnNmb3JtU3RhdGUuY3BwCShyZXZpc2lvbiAxMTQ3Nzcp CisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSGl0VGVzdGluZ1RyYW5zZm9ybVN0YXRlLmNw cAkod29ya2luZyBjb3B5KQpAQCAtNzMsNyArNzMsNyBAQCBGbG9hdFF1YWQgSGl0VGVzdGluZ1Ry YW5zZm9ybVN0YXRlOjptYXBwCiAgICAgcmV0dXJuIG1fYWNjdW11bGF0ZWRUcmFuc2Zvcm0uaW52 ZXJzZSgpLnByb2plY3RRdWFkKG1fbGFzdFBsYW5hclF1YWQpOwogfQogCi1JbnRSZWN0IEhpdFRl c3RpbmdUcmFuc2Zvcm1TdGF0ZTo6Ym91bmRzT2ZNYXBwZWRRdWFkKCkgY29uc3QKK0xheW91dFJl Y3QgSGl0VGVzdGluZ1RyYW5zZm9ybVN0YXRlOjpib3VuZHNPZk1hcHBlZFF1YWQoKSBjb25zdAog ewogICAgIHJldHVybiBtX2FjY3VtdWxhdGVkVHJhbnNmb3JtLmludmVyc2UoKS5jbGFtcGVkQm91 bmRzT2ZQcm9qZWN0ZWRRdWFkKG1fbGFzdFBsYW5hclF1YWQpOwogfQpJbmRleDogU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL0hpdFRlc3RpbmdUcmFuc2Zvcm1TdGF0ZS5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9IaXRUZXN0aW5nVHJhbnNmb3JtU3RhdGUuaAkocmV2 aXNpb24gMTE0Nzc3KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0hpdFRlc3RpbmdUcmFu c2Zvcm1TdGF0ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC01OCw3ICs1OCw3IEBAIHB1YmxpYzoKIAog ICAgIEZsb2F0UG9pbnQgbWFwcGVkUG9pbnQoKSBjb25zdDsKICAgICBGbG9hdFF1YWQgbWFwcGVk UXVhZCgpIGNvbnN0OwotICAgIEludFJlY3QgYm91bmRzT2ZNYXBwZWRRdWFkKCkgY29uc3Q7Cisg ICAgTGF5b3V0UmVjdCBib3VuZHNPZk1hcHBlZFF1YWQoKSBjb25zdDsKICAgICB2b2lkIGZsYXR0 ZW4oKTsKIAogICAgIEZsb2F0UG9pbnQgbV9sYXN0UGxhbmFyUG9pbnQ7Cg== 138377 2012-04-23 10:26:07 -0700 2012-04-23 12:02:35 -0700 Patch bug-84496-20120423102606.patch text/plain 4936 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExNDkxMCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDEyLTA0LTIzICBFbWlsIEEg RWtsdW5kICA8ZWFlQGNocm9taXVtLm9yZz4KKworICAgICAgICBDbGVhbiB1cCBzdWJwaXhlbCB1 bml0IGhhbmRsaW5nIGluIGhpdCB0ZXN0aW5nIGNvZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg0NDk2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgRml4IHVzZSBvZiBJbnRSZWN0IGFuZCBMYXlvdXRSZWN0 IGluIGhpdCB0ZXN0aW5nIGNvZGUgaW4gcHJlcGFyYXRpb24gZm9yCisgICAgICAgIHN1YnBpeGVs IGxheW91dC4KKworICAgICAgICBObyBuZXcgdGVzdHMsIG5vIGNoYW5nZSBpbiBmdW5jdGlvbmFs aXR5LgorCisgICAgICAgICogcmVuZGVyaW5nL0hpdFRlc3RSZXN1bHQuY3BwOgorICAgICAgICAo V2ViQ29yZTo6SGl0VGVzdFJlc3VsdDo6cmVjdEZvclBvaW50KToKKyAgICAgICAgUmV2ZXJ0IHJl Y3RGb3JQb2ludCB0byBJbnRSZWN0IGFzIGFsbCBjYWxsIHNpdGVzIGNvbnZlcnRlZCBpdCB0byBh bgorICAgICAgICBJbnRSZWN0IGFueXdheSB0byBjb21wYXJlIGl0IHdpdGggYW4gSW50UG9pbnQg b3IgYW5vdGhlciBJbnRSZWN0LgorCisgICAgICAgICogcmVuZGVyaW5nL0hpdFRlc3RpbmdUcmFu c2Zvcm1TdGF0ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIaXRUZXN0aW5nVHJhbnNmb3JtU3Rh dGU6OmJvdW5kc09mTWFwcGVkUXVhZCk6CisgICAgICAgICogcmVuZGVyaW5nL0hpdFRlc3RpbmdU cmFuc2Zvcm1TdGF0ZS5oOgorICAgICAgICBDb252ZXJ0IGJvdW5kc09mTWFwcGVkUXVhZCB0byBM YXlvdXRSZWN0IGFzIHRoZSBUcmFuc2Zvcm1hdGlvbk1hdHJpeCBub3cKKyAgICAgICAgaGFzIHN1 YnBpeGVsIHByZWNpc2lvbi4KKwogMjAxMi0wNC0xNyAgS2VudGFybyBIYXJhICA8aGFyYWtlbkBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgW1Y4XSBQYXNzIElzb2xhdGUgdG8gdG9WOFNsb3coKQpJ bmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0hpdFRlc3RSZXN1bHQuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9IaXRUZXN0UmVzdWx0LmNwcAkocmV2aXNp b24gMTE0OTEwKQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0hpdFRlc3RSZXN1bHQuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC02NTIsMTYgKzY1MiwxNiBAQCB2b2lkIEhpdFRlc3RSZXN1bHQ6 OmFwcGVuZChjb25zdCBIaXRUZXN0CiAgICAgfQogfQogCi1MYXlvdXRSZWN0IEhpdFRlc3RSZXN1 bHQ6OnJlY3RGb3JQb2ludChjb25zdCBMYXlvdXRQb2ludCYgcG9pbnQsIHVuc2lnbmVkIHRvcFBh ZGRpbmcsIHVuc2lnbmVkIHJpZ2h0UGFkZGluZywgdW5zaWduZWQgYm90dG9tUGFkZGluZywgdW5z aWduZWQgbGVmdFBhZGRpbmcpCitJbnRSZWN0IEhpdFRlc3RSZXN1bHQ6OnJlY3RGb3JQb2ludChj b25zdCBMYXlvdXRQb2ludCYgcG9pbnQsIHVuc2lnbmVkIHRvcFBhZGRpbmcsIHVuc2lnbmVkIHJp Z2h0UGFkZGluZywgdW5zaWduZWQgYm90dG9tUGFkZGluZywgdW5zaWduZWQgbGVmdFBhZGRpbmcp CiB7Ci0gICAgTGF5b3V0UG9pbnQgYWN0dWFsUG9pbnQocG9pbnQpOwotICAgIGFjdHVhbFBvaW50 IC09IExheW91dFNpemUobGVmdFBhZGRpbmcsIHRvcFBhZGRpbmcpOworICAgIEludFBvaW50IGFj dHVhbFBvaW50KHJvdW5kZWRJbnRQb2ludChwb2ludCkpOworICAgIGFjdHVhbFBvaW50IC09IElu dFNpemUobGVmdFBhZGRpbmcsIHRvcFBhZGRpbmcpOwogCiAgICAgSW50U2l6ZSBhY3R1YWxQYWRk aW5nKGxlZnRQYWRkaW5nICsgcmlnaHRQYWRkaW5nLCB0b3BQYWRkaW5nICsgYm90dG9tUGFkZGlu Zyk7CiAgICAgLy8gQXMgSW50UmVjdCBpcyBsZWZ0IGluY2x1c2l2ZSBhbmQgcmlnaHQgZXhjbHVz aXZlIChzZWVpbmcgSW50UmVjdDo6Y29udGFpbnMoeCwgeSkpLCBhZGRpbmcgIjEiLgogICAgIGFj dHVhbFBhZGRpbmcgKz0gSW50U2l6ZSgxLCAxKTsKIAotICAgIHJldHVybiBMYXlvdXRSZWN0KGFj dHVhbFBvaW50LCBhY3R1YWxQYWRkaW5nKTsKKyAgICByZXR1cm4gSW50UmVjdChhY3R1YWxQb2lu dCwgYWN0dWFsUGFkZGluZyk7CiB9CiAKIGNvbnN0IEhpdFRlc3RSZXN1bHQ6Ok5vZGVTZXQmIEhp dFRlc3RSZXN1bHQ6OnJlY3RCYXNlZFRlc3RSZXN1bHQoKSBjb25zdApJbmRleDogU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL0hpdFRlc3RSZXN1bHQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvSGl0VGVzdFJlc3VsdC5oCShyZXZpc2lvbiAxMTQ5MTApCisrKyBTb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvSGl0VGVzdFJlc3VsdC5oCSh3b3JraW5nIGNvcHkpCkBAIC0x MTIsOCArMTEyLDggQEAgcHVibGljOgogCiAgICAgLy8gUmVjdC1iYXNlZCBoaXQgdGVzdCByZWxh dGVkIG1ldGhvZHMuCiAgICAgYm9vbCBpc1JlY3RCYXNlZFRlc3QoKSBjb25zdCB7IHJldHVybiBt X2lzUmVjdEJhc2VkOyB9Ci0gICAgTGF5b3V0UmVjdCByZWN0Rm9yUG9pbnQoY29uc3QgTGF5b3V0 UG9pbnQmKSBjb25zdDsKLSAgICBzdGF0aWMgTGF5b3V0UmVjdCByZWN0Rm9yUG9pbnQoY29uc3Qg TGF5b3V0UG9pbnQmLCB1bnNpZ25lZCB0b3BQYWRkaW5nLCB1bnNpZ25lZCByaWdodFBhZGRpbmcs IHVuc2lnbmVkIGJvdHRvbVBhZGRpbmcsIHVuc2lnbmVkIGxlZnRQYWRkaW5nKTsKKyAgICBJbnRS ZWN0IHJlY3RGb3JQb2ludChjb25zdCBMYXlvdXRQb2ludCYpIGNvbnN0OworICAgIHN0YXRpYyBJ bnRSZWN0IHJlY3RGb3JQb2ludChjb25zdCBMYXlvdXRQb2ludCYsIHVuc2lnbmVkIHRvcFBhZGRp bmcsIHVuc2lnbmVkIHJpZ2h0UGFkZGluZywgdW5zaWduZWQgYm90dG9tUGFkZGluZywgdW5zaWdu ZWQgbGVmdFBhZGRpbmcpOwogICAgIGludCB0b3BQYWRkaW5nKCkgY29uc3QgeyByZXR1cm4gbV90 b3BQYWRkaW5nOyB9CiAgICAgaW50IHJpZ2h0UGFkZGluZygpIGNvbnN0IHsgcmV0dXJuIG1fcmln aHRQYWRkaW5nOyB9CiAgICAgaW50IGJvdHRvbVBhZGRpbmcoKSBjb25zdCB7IHJldHVybiBtX2Jv dHRvbVBhZGRpbmc7IH0KQEAgLTE2Miw3ICsxNjIsNyBAQCBwcml2YXRlOgogLy8geSA9IHAueSgp IC0gdG9wUGFkZGluZwogLy8gd2lkdGggPSBsZWZ0UGFkZGluZyArIHJpZ2h0UGFkZGluZyArIDEK IC8vIGhlaWdodCA9IHRvcFBhZGRpbmcgKyBib3R0b21QYWRkaW5nICsgMQotaW5saW5lIExheW91 dFJlY3QgSGl0VGVzdFJlc3VsdDo6cmVjdEZvclBvaW50KGNvbnN0IExheW91dFBvaW50JiBwb2lu dCkgY29uc3QKK2lubGluZSBJbnRSZWN0IEhpdFRlc3RSZXN1bHQ6OnJlY3RGb3JQb2ludChjb25z dCBMYXlvdXRQb2ludCYgcG9pbnQpIGNvbnN0CiB7CiAgICAgcmV0dXJuIHJlY3RGb3JQb2ludChw b2ludCwgbV90b3BQYWRkaW5nLCBtX3JpZ2h0UGFkZGluZywgbV9ib3R0b21QYWRkaW5nLCBtX2xl ZnRQYWRkaW5nKTsKIH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9IaXRUZXN0aW5n VHJhbnNmb3JtU3RhdGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9IaXRUZXN0aW5nVHJhbnNmb3JtU3RhdGUuY3BwCShyZXZpc2lvbiAxMTQ5MTApCisrKyBTb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvSGl0VGVzdGluZ1RyYW5zZm9ybVN0YXRlLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtNzMsNyArNzMsNyBAQCBGbG9hdFF1YWQgSGl0VGVzdGluZ1RyYW5zZm9ybVN0 YXRlOjptYXBwCiAgICAgcmV0dXJuIG1fYWNjdW11bGF0ZWRUcmFuc2Zvcm0uaW52ZXJzZSgpLnBy b2plY3RRdWFkKG1fbGFzdFBsYW5hclF1YWQpOwogfQogCi1JbnRSZWN0IEhpdFRlc3RpbmdUcmFu c2Zvcm1TdGF0ZTo6Ym91bmRzT2ZNYXBwZWRRdWFkKCkgY29uc3QKK0xheW91dFJlY3QgSGl0VGVz dGluZ1RyYW5zZm9ybVN0YXRlOjpib3VuZHNPZk1hcHBlZFF1YWQoKSBjb25zdAogewogICAgIHJl dHVybiBtX2FjY3VtdWxhdGVkVHJhbnNmb3JtLmludmVyc2UoKS5jbGFtcGVkQm91bmRzT2ZQcm9q ZWN0ZWRRdWFkKG1fbGFzdFBsYW5hclF1YWQpOwogfQpJbmRleDogU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL0hpdFRlc3RpbmdUcmFuc2Zvcm1TdGF0ZS5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9IaXRUZXN0aW5nVHJhbnNmb3JtU3RhdGUuaAkocmV2aXNpb24gMTE0 OTEwKQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0hpdFRlc3RpbmdUcmFuc2Zvcm1TdGF0 ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC01OCw3ICs1OCw3IEBAIHB1YmxpYzoKIAogICAgIEZsb2F0 UG9pbnQgbWFwcGVkUG9pbnQoKSBjb25zdDsKICAgICBGbG9hdFF1YWQgbWFwcGVkUXVhZCgpIGNv bnN0OwotICAgIEludFJlY3QgYm91bmRzT2ZNYXBwZWRRdWFkKCkgY29uc3Q7CisgICAgTGF5b3V0 UmVjdCBib3VuZHNPZk1hcHBlZFF1YWQoKSBjb25zdDsKICAgICB2b2lkIGZsYXR0ZW4oKTsKIAog ICAgIEZsb2F0UG9pbnQgbV9sYXN0UGxhbmFyUG9pbnQ7Cg==