61230 2011-05-20 17:23:01 -0700 Change HitTestResult to use IntPoint 2011-05-21 06:54:49 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 60318 1 eae eae apavlov commit-queue darin eric leviw simon.fraser oldest_to_newest 407436 0 eae 2011-05-20 17:23:01 -0700 Change HitTestResult to use IntPoint instead of int x, int y 407438 1 94300 eae 2011-05-20 17:28:32 -0700 Created attachment 94300 Patch 407529 2 94300 eric 2011-05-21 04:59:36 -0700 Comment on attachment 94300 Patch Ok 407534 3 94300 commit-queue 2011-05-21 06:54:44 -0700 Comment on attachment 94300 Patch Clearing flags on attachment: 94300 Committed r87018: <http://trac.webkit.org/changeset/87018> 407535 4 commit-queue 2011-05-21 06:54:49 -0700 All reviewed patches have been landed. Closing bug. 94300 2011-05-20 17:28:32 -0700 2011-05-21 06:54:44 -0700 Patch bug-61230-20110520172831.patch text/plain 12366 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg3MDAwKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzIgQEAKKzIwMTEtMDUtMjAgIEVtaWwgQSBF a2x1bmQgIDxlYWVAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIENoYW5nZSBIaXRUZXN0UmVzdWx0IHRvIHVzZSBJbnRQb2ludAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjEyMzAKKwor ICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICogcmVuZGVyaW5n L0VsbGlwc2lzQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkVsbGlwc2lzQm94Ojpub2RlQXRQ b2ludCk6CisgICAgICAgICogcmVuZGVyaW5nL0hpdFRlc3RSZXN1bHQuY3BwOgorICAgICAgICAo V2ViQ29yZTo6SGl0VGVzdFJlc3VsdDo6YWRkTm9kZVRvUmVjdEJhc2VkVGVzdFJlc3VsdCk6Cisg ICAgICAgICogcmVuZGVyaW5nL0hpdFRlc3RSZXN1bHQuaDoKKyAgICAgICAgKFdlYkNvcmU6Okhp dFRlc3RSZXN1bHQ6OmlzUmVjdEJhc2VkVGVzdCk6CisgICAgICAgICogcmVuZGVyaW5nL0lubGlu ZUZsb3dCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5saW5lRmxvd0JveDo6bm9kZUF0UG9p bnQpOgorICAgICAgICAqIHJlbmRlcmluZy9JbmxpbmVUZXh0Qm94LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OklubGluZVRleHRCb3g6Om5vZGVBdFBvaW50KToKKyAgICAgICAgKiByZW5kZXJpbmcv UmVuZGVyQmxvY2suY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6Om5vZGVBdFBv aW50KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjpoaXRUZXN0Q29sdW1ucyk6Cisg ICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJCb3g6Om5vZGVBdFBvaW50KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGFibGUuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGFibGU6Om5vZGVBdFBvaW50KToKKyAgICAgICAg KiByZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jvb3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyU1ZHUm9vdDo6bm9kZUF0UG9pbnQpOgorCiAyMDExLTA1LTIwICBBbmR5IEVzdGVzICA8YWVz dGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9FbGxpcHNpc0JveC5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0VsbGlwc2lzQm94LmNwcAkocmV2aXNpb24gODY5ODMp CisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvRWxsaXBzaXNCb3guY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0xMTgsNyArMTE4LDcgQEAgYm9vbCBFbGxpcHNpc0JveDo6bm9kZUF0UG9pbnQoY29u c3QgSGl0VAogICAgIEludFJlY3QgYm91bmRzUmVjdCA9IEludFJlY3QodHgsIHR5LCBtX2xvZ2lj YWxXaWR0aCwgbV9oZWlnaHQpOwogICAgIGlmICh2aXNpYmxlVG9IaXRUZXN0aW5nKCkgJiYgYm91 bmRzUmVjdC5pbnRlcnNlY3RzKHJlc3VsdC5yZWN0Rm9yUG9pbnQocG9pbnRJbkNvbnRhaW5lcikp KSB7CiAgICAgICAgIHJlbmRlcmVyKCktPnVwZGF0ZUhpdFRlc3RSZXN1bHQocmVzdWx0LCBwb2lu dEluQ29udGFpbmVyIC0gSW50U2l6ZSh0eCwgdHkpKTsKLSAgICAgICAgaWYgKCFyZXN1bHQuYWRk Tm9kZVRvUmVjdEJhc2VkVGVzdFJlc3VsdChyZW5kZXJlcigpLT5ub2RlKCksIHBvaW50SW5Db250 YWluZXIueCgpLCBwb2ludEluQ29udGFpbmVyLnkoKSwgYm91bmRzUmVjdCkpCisgICAgICAgIGlm ICghcmVzdWx0LmFkZE5vZGVUb1JlY3RCYXNlZFRlc3RSZXN1bHQocmVuZGVyZXIoKS0+bm9kZSgp LCBwb2ludEluQ29udGFpbmVyLCBib3VuZHNSZWN0KSkKICAgICAgICAgICAgIHJldHVybiB0cnVl OwogICAgIH0KIApJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0hpdFRlc3RSZXN1bHQu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9IaXRUZXN0UmVzdWx0 LmNwcAkocmV2aXNpb24gODY5ODMpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSGl0VGVz dFJlc3VsdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTUwOCw3ICs1MDgsNyBAQCBib29sIEhpdFRl c3RSZXN1bHQ6OmlzQ29udGVudEVkaXRhYmxlKCkgCiAgICAgcmV0dXJuIG1faW5uZXJOb25TaGFy ZWROb2RlLT5yZW5kZXJlcklzRWRpdGFibGUoKTsKIH0KIAotYm9vbCBIaXRUZXN0UmVzdWx0Ojph ZGROb2RlVG9SZWN0QmFzZWRUZXN0UmVzdWx0KE5vZGUqIG5vZGUsIGludCB4LCBpbnQgeSwgY29u c3QgSW50UmVjdCYgcmVjdCkKK2Jvb2wgSGl0VGVzdFJlc3VsdDo6YWRkTm9kZVRvUmVjdEJhc2Vk VGVzdFJlc3VsdChOb2RlKiBub2RlLCBjb25zdCBJbnRQb2ludCYgcG9pbnRJbkNvbnRhaW5lciwg Y29uc3QgSW50UmVjdCYgcmVjdCkKIHsKICAgICAvLyBJZiBpdCBpcyBub3QgYSByZWN0LWJhc2Vk IGhpdCB0ZXN0LCB0aGlzIG1ldGhvZCBoYXMgdG8gYmUgbm8tb3AuCiAgICAgLy8gUmV0dXJuIGZh bHNlLCBzbyB0aGUgaGl0IHRlc3Qgc3RvcHMuCkBAIC01MzYsMTAgKzUzNiwxMCBAQCBib29sIEhp dFRlc3RSZXN1bHQ6OmFkZE5vZGVUb1JlY3RCYXNlZFRlCiAgICAgICAgICAgICAgICAgbXV0YWJs ZVJlY3RCYXNlZFRlc3RSZXN1bHQoKS5hZGQoY3VycklubGluZS0+bm9kZSgpLT5zaGFkb3dBbmNl c3Rvck5vZGUoKSk7CiAgICAgICAgIH0KICAgICB9Ci0gICAgcmV0dXJuICFyZWN0LmNvbnRhaW5z KHJlY3RGb3JQb2ludCh4LCB5KSk7CisgICAgcmV0dXJuICFyZWN0LmNvbnRhaW5zKHJlY3RGb3JQ b2ludChwb2ludEluQ29udGFpbmVyKSk7CiB9CiAKLWJvb2wgSGl0VGVzdFJlc3VsdDo6YWRkTm9k ZVRvUmVjdEJhc2VkVGVzdFJlc3VsdChOb2RlKiBub2RlLCBpbnQgeCwgaW50IHksIGNvbnN0IEZs b2F0UmVjdCYgcmVjdCkKK2Jvb2wgSGl0VGVzdFJlc3VsdDo6YWRkTm9kZVRvUmVjdEJhc2VkVGVz dFJlc3VsdChOb2RlKiBub2RlLCBjb25zdCBJbnRQb2ludCYgcG9pbnRJbkNvbnRhaW5lciwgY29u c3QgRmxvYXRSZWN0JiByZWN0KQogewogICAgIC8vIElmIGl0IGlzIG5vdCBhIHJlY3QtYmFzZWQg aGl0IHRlc3QsIHRoaXMgbWV0aG9kIGhhcyB0byBiZSBuby1vcC4KICAgICAvLyBSZXR1cm4gZmFs c2UsIHNvIHRoZSBoaXQgdGVzdCBzdG9wcy4KQEAgLTU2Nyw3ICs1NjcsNyBAQCBib29sIEhpdFRl c3RSZXN1bHQ6OmFkZE5vZGVUb1JlY3RCYXNlZFRlCiAgICAgICAgICAgICAgICAgbXV0YWJsZVJl Y3RCYXNlZFRlc3RSZXN1bHQoKS5hZGQoY3VycklubGluZS0+bm9kZSgpLT5zaGFkb3dBbmNlc3Rv ck5vZGUoKSk7CiAgICAgICAgIH0KICAgICB9Ci0gICAgcmV0dXJuICFyZWN0LmNvbnRhaW5zKHJl Y3RGb3JQb2ludCh4LCB5KSk7CisgICAgcmV0dXJuICFyZWN0LmNvbnRhaW5zKHJlY3RGb3JQb2lu dChwb2ludEluQ29udGFpbmVyKSk7CiB9CiAKIHZvaWQgSGl0VGVzdFJlc3VsdDo6YXBwZW5kKGNv bnN0IEhpdFRlc3RSZXN1bHQmIG90aGVyKQpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L0hpdFRlc3RSZXN1bHQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv SGl0VGVzdFJlc3VsdC5oCShyZXZpc2lvbiA4Njk4MykKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9IaXRUZXN0UmVzdWx0LmgJKHdvcmtpbmcgY29weSkKQEAgLTEwMyw3ICsxMDMsNiBAQCBw dWJsaWM6CiAKICAgICAvLyBSZWN0LWJhc2VkIGhpdCB0ZXN0IHJlbGF0ZWQgbWV0aG9kcy4KICAg ICBib29sIGlzUmVjdEJhc2VkVGVzdCgpIGNvbnN0IHsgcmV0dXJuIG1faXNSZWN0QmFzZWQ7IH0K LSAgICBJbnRSZWN0IHJlY3RGb3JQb2ludChpbnQgeCwgaW50IHkpIGNvbnN0OwogICAgIEludFJl Y3QgcmVjdEZvclBvaW50KGNvbnN0IEludFBvaW50JikgY29uc3Q7CiAgICAgc3RhdGljIEludFJl Y3QgcmVjdEZvclBvaW50KGNvbnN0IEludFBvaW50JiwgdW5zaWduZWQgdG9wUGFkZGluZywgdW5z aWduZWQgcmlnaHRQYWRkaW5nLCB1bnNpZ25lZCBib3R0b21QYWRkaW5nLCB1bnNpZ25lZCBsZWZ0 UGFkZGluZyk7CiAgICAgaW50IHRvcFBhZGRpbmcoKSBjb25zdCB7IHJldHVybiBtX3RvcFBhZGRp bmc7IH0KQEAgLTExMyw4ICsxMTIsOCBAQCBwdWJsaWM6CiAKICAgICAvLyBSZXR1cm5zIHRydWUg aWYgaXQgaXMgcmVjdC1iYXNlZCBoaXQgdGVzdCBhbmQgbmVlZHMgdG8gY29udGludWUgdW50aWwg dGhlIHJlY3QgaXMgZnVsbHkKICAgICAvLyBlbmNsb3NlZCBieSB0aGUgYm91bmRhcmllcyBvZiBh IG5vZGUuCi0gICAgYm9vbCBhZGROb2RlVG9SZWN0QmFzZWRUZXN0UmVzdWx0KE5vZGUqLCBpbnQg eCwgaW50IHksIGNvbnN0IEludFJlY3QmID0gSW50UmVjdCgpKTsKLSAgICBib29sIGFkZE5vZGVU b1JlY3RCYXNlZFRlc3RSZXN1bHQoTm9kZSosIGludCB4LCBpbnQgeSwgY29uc3QgRmxvYXRSZWN0 Jik7CisgICAgYm9vbCBhZGROb2RlVG9SZWN0QmFzZWRUZXN0UmVzdWx0KE5vZGUqLCBjb25zdCBJ bnRQb2ludCYgcG9pbnRJbkNvbnRhaW5lciwgY29uc3QgSW50UmVjdCYgPSBJbnRSZWN0KCkpOwor ICAgIGJvb2wgYWRkTm9kZVRvUmVjdEJhc2VkVGVzdFJlc3VsdChOb2RlKiwgY29uc3QgSW50UG9p bnQmIHBvaW50SW5Db250YWluZXIsIGNvbnN0IEZsb2F0UmVjdCYpOwogICAgIHZvaWQgYXBwZW5k KGNvbnN0IEhpdFRlc3RSZXN1bHQmKTsKIAogICAgIC8vIElmIG1fcmVjdEJhc2VkVGVzdFJlc3Vs dCBpcyAwIHRoZW4gc2V0IGl0IHRvIGEgbmV3IE5vZGVTZXQuIFJldHVybiAqbV9yZWN0QmFzZWRU ZXN0UmVzdWx0LiBMYXp5IGFsbG9jYXRpb24gbWFrZXMKQEAgLTE0NSwxMSArMTQ0LDYgQEAgcHJp dmF0ZToKICAgICBtdXRhYmxlIE93blB0cjxOb2RlU2V0PiBtX3JlY3RCYXNlZFRlc3RSZXN1bHQ7 CiB9OwogCi1pbmxpbmUgSW50UmVjdCBIaXRUZXN0UmVzdWx0OjpyZWN0Rm9yUG9pbnQoaW50IHgs IGludCB5KSBjb25zdAotewotICAgIHJldHVybiByZWN0Rm9yUG9pbnQoSW50UG9pbnQoeCwgeSks IG1fdG9wUGFkZGluZywgbV9yaWdodFBhZGRpbmcsIG1fYm90dG9tUGFkZGluZywgbV9sZWZ0UGFk ZGluZyk7Ci19Ci0KIC8vIEZvcm11bGE6CiAvLyB4ID0gcC54KCkgLSByaWdodFBhZGRpbmcKIC8v IHkgPSBwLnkoKSAtIHRvcFBhZGRpbmcKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9J bmxpbmVGbG93Qm94LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv SW5saW5lRmxvd0JveC5jcHAJKHJldmlzaW9uIDg2OTgzKQorKysgU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL0lubGluZUZsb3dCb3guY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05MzksNyArOTM5LDcg QEAgYm9vbCBJbmxpbmVGbG93Qm94Ojpub2RlQXRQb2ludChjb25zdCBIaQogCiAgICAgaWYgKHZp c2libGVUb0hpdFRlc3RpbmcoKSAmJiByZWN0LmludGVyc2VjdHMocmVzdWx0LnJlY3RGb3JQb2lu dChwb2ludEluQ29udGFpbmVyKSkpIHsKICAgICAgICAgcmVuZGVyZXIoKS0+dXBkYXRlSGl0VGVz dFJlc3VsdChyZXN1bHQsIGZsaXBGb3JXcml0aW5nTW9kZShwb2ludEluQ29udGFpbmVyIC0gSW50 U2l6ZSh0eCwgdHkpKSk7IC8vIERvbid0IGFkZCBpbiBtX3ggb3IgbV95IGhlcmUsIHdlIHdhbnQg Y29vcmRzIGluIHRoZSBjb250YWluaW5nIGJsb2NrJ3Mgc3BhY2UuCi0gICAgICAgIGlmICghcmVz dWx0LmFkZE5vZGVUb1JlY3RCYXNlZFRlc3RSZXN1bHQocmVuZGVyZXIoKS0+bm9kZSgpLCBwb2lu dEluQ29udGFpbmVyLngoKSwgcG9pbnRJbkNvbnRhaW5lci55KCksIHJlY3QpKQorICAgICAgICBp ZiAoIXJlc3VsdC5hZGROb2RlVG9SZWN0QmFzZWRUZXN0UmVzdWx0KHJlbmRlcmVyKCktPm5vZGUo KSwgcG9pbnRJbkNvbnRhaW5lciwgcmVjdCkpCiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAg ICB9CiAgICAgCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lVGV4dEJveC5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZVRleHRCb3gu Y3BwCShyZXZpc2lvbiA4Njk4MykKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVU ZXh0Qm94LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzUwLDcgKzM1MCw3IEBAIGJvb2wgSW5saW5l VGV4dEJveDo6bm9kZUF0UG9pbnQoY29uc3QgSGkKICAgICBGbG9hdFJlY3QgcmVjdChib3hPcmln aW4sIEludFNpemUod2lkdGgoKSwgaGVpZ2h0KCkpKTsKICAgICBpZiAobV90cnVuY2F0aW9uICE9 IGNGdWxsVHJ1bmNhdGlvbiAmJiB2aXNpYmxlVG9IaXRUZXN0aW5nKCkgJiYgcmVjdC5pbnRlcnNl Y3RzKHJlc3VsdC5yZWN0Rm9yUG9pbnQocG9pbnRJbkNvbnRhaW5lcikpKSB7CiAgICAgICAgIHJl bmRlcmVyKCktPnVwZGF0ZUhpdFRlc3RSZXN1bHQocmVzdWx0LCBmbGlwRm9yV3JpdGluZ01vZGUo cG9pbnRJbkNvbnRhaW5lciAtIEludFNpemUodHgsIHR5KSkpOwotICAgICAgICBpZiAoIXJlc3Vs dC5hZGROb2RlVG9SZWN0QmFzZWRUZXN0UmVzdWx0KHJlbmRlcmVyKCktPm5vZGUoKSwgcG9pbnRJ bkNvbnRhaW5lci54KCksIHBvaW50SW5Db250YWluZXIueSgpLCByZWN0KSkKKyAgICAgICAgaWYg KCFyZXN1bHQuYWRkTm9kZVRvUmVjdEJhc2VkVGVzdFJlc3VsdChyZW5kZXJlcigpLT5ub2RlKCks IHBvaW50SW5Db250YWluZXIsIHJlY3QpKQogICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAg fQogICAgIHJldHVybiBmYWxzZTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCbG9jay5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJsb2NrLmNwcAkocmV2aXNpb24gODY5ODMpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyQmxvY2suY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zOTEyLDcgKzM5MTIsNyBAQCBib29s IFJlbmRlckJsb2NrOjpub2RlQXRQb2ludChjb25zdCBIaXRUCiAgICAgaWYgKChoaXRUZXN0QWN0 aW9uID09IEhpdFRlc3RCbG9ja0JhY2tncm91bmQgfHwgaGl0VGVzdEFjdGlvbiA9PSBIaXRUZXN0 Q2hpbGRCbG9ja0JhY2tncm91bmQpICYmIGlzUG9pbnRJbk92ZXJmbG93Q29udHJvbChyZXN1bHQs IHBvaW50SW5Db250YWluZXIueCgpLCBwb2ludEluQ29udGFpbmVyLnkoKSwgbG9jYWxPZmZzZXQu d2lkdGgoKSwgbG9jYWxPZmZzZXQuaGVpZ2h0KCkpKSB7CiAgICAgICAgIHVwZGF0ZUhpdFRlc3RS ZXN1bHQocmVzdWx0LCBwb2ludEluQ29udGFpbmVyIC0gbG9jYWxPZmZzZXQpOwogICAgICAgICAv LyBGSVhNRTogaXNQb2ludEluT3ZlcmZsb3dDb250cm9sKCkgZG9lc24ndCBoYW5kbGUgcmVjdC1i YXNlZCB0ZXN0cyB5ZXQuCi0gICAgICAgIGlmICghcmVzdWx0LmFkZE5vZGVUb1JlY3RCYXNlZFRl c3RSZXN1bHQobm9kZSgpLCBwb2ludEluQ29udGFpbmVyLngoKSwgcG9pbnRJbkNvbnRhaW5lci55 KCkpKQorICAgICAgICBpZiAoIXJlc3VsdC5hZGROb2RlVG9SZWN0QmFzZWRUZXN0UmVzdWx0KG5v ZGUoKSwgcG9pbnRJbkNvbnRhaW5lcikpCiAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0K IApAQCAtMzk0Nyw3ICszOTQ3LDcgQEAgYm9vbCBSZW5kZXJCbG9jazo6bm9kZUF0UG9pbnQoY29u c3QgSGl0VAogICAgICAgICBJbnRSZWN0IGJvdW5kc1JlY3QobG9jYWxPZmZzZXQud2lkdGgoKSwg bG9jYWxPZmZzZXQuaGVpZ2h0KCksIHdpZHRoKCksIGhlaWdodCgpKTsKICAgICAgICAgaWYgKHZp c2libGVUb0hpdFRlc3RpbmcoKSAmJiBib3VuZHNSZWN0LmludGVyc2VjdHMocmVzdWx0LnJlY3RG b3JQb2ludChwb2ludEluQ29udGFpbmVyKSkpIHsKICAgICAgICAgICAgIHVwZGF0ZUhpdFRlc3RS ZXN1bHQocmVzdWx0LCBmbGlwRm9yV3JpdGluZ01vZGUocG9pbnRJbkNvbnRhaW5lciAtIGxvY2Fs T2Zmc2V0KSk7Ci0gICAgICAgICAgICBpZiAoIXJlc3VsdC5hZGROb2RlVG9SZWN0QmFzZWRUZXN0 UmVzdWx0KG5vZGUoKSwgcG9pbnRJbkNvbnRhaW5lci54KCksIHBvaW50SW5Db250YWluZXIueSgp LCBib3VuZHNSZWN0KSkKKyAgICAgICAgICAgIGlmICghcmVzdWx0LmFkZE5vZGVUb1JlY3RCYXNl ZFRlc3RSZXN1bHQobm9kZSgpLCBwb2ludEluQ29udGFpbmVyLCBib3VuZHNSZWN0KSkKICAgICAg ICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgfQogICAgIH0KQEAgLTQwMTQsMTQgKzQw MTQsMTQgQEAgYm9vbCBSZW5kZXJCbG9jazo6aGl0VGVzdENvbHVtbnMoY29uc3QgSAogICAgICAg ICAgICAgY3VyckxvZ2ljYWxUb3BPZmZzZXQgKz0gYmxvY2tEZWx0YTsKICAgICAgICAgY29sUmVj dC5tb3ZlKHR4LCB0eSk7CiAgICAgICAgIAotICAgICAgICBpZiAoY29sUmVjdC5pbnRlcnNlY3Rz KHJlc3VsdC5yZWN0Rm9yUG9pbnQoeCwgeSkpKSB7CisgICAgICAgIGlmIChjb2xSZWN0LmludGVy c2VjdHMocmVzdWx0LnJlY3RGb3JQb2ludChJbnRQb2ludCh4LCB5KSkpKSB7CiAgICAgICAgICAg ICAvLyBUaGUgcG9pbnQgaXMgaW5zaWRlIHRoaXMgY29sdW1uLgogICAgICAgICAgICAgLy8gQWRq dXN0IHR4IGFuZCB0eSB0byBjaGFuZ2Ugd2hlcmUgd2UgaGl0IHRlc3QuCiAgICAgICAgIAogICAg ICAgICAgICAgSW50U2l6ZSBvZmZzZXQgPSBpc0hvcml6b250YWwgPyBJbnRTaXplKGN1cnJMb2dp Y2FsTGVmdE9mZnNldCwgY3VyckxvZ2ljYWxUb3BPZmZzZXQpIDogSW50U2l6ZShjdXJyTG9naWNh bFRvcE9mZnNldCwgY3VyckxvZ2ljYWxMZWZ0T2Zmc2V0KTsKICAgICAgICAgICAgIGludCBmaW5h bFggPSB0eCArIG9mZnNldC53aWR0aCgpOwogICAgICAgICAgICAgaW50IGZpbmFsWSA9IHR5ICsg b2Zmc2V0LmhlaWdodCgpOwotICAgICAgICAgICAgaWYgKHJlc3VsdC5pc1JlY3RCYXNlZFRlc3Qo KSAmJiAhY29sUmVjdC5jb250YWlucyhyZXN1bHQucmVjdEZvclBvaW50KHgsIHkpKSkKKyAgICAg ICAgICAgIGlmIChyZXN1bHQuaXNSZWN0QmFzZWRUZXN0KCkgJiYgIWNvbFJlY3QuY29udGFpbnMo cmVzdWx0LnJlY3RGb3JQb2ludChJbnRQb2ludCh4LCB5KSkpKQogICAgICAgICAgICAgICAgIGhp dFRlc3RDb250ZW50cyhyZXF1ZXN0LCByZXN1bHQsIHgsIHksIGZpbmFsWCwgZmluYWxZLCBoaXRU ZXN0QWN0aW9uKTsKICAgICAgICAgICAgIGVsc2UKICAgICAgICAgICAgICAgICByZXR1cm4gaGl0 VGVzdENvbnRlbnRzKHJlcXVlc3QsIHJlc3VsdCwgeCwgeSwgZmluYWxYLCBmaW5hbFksIGhpdFRl c3RBY3Rpb24pIHx8IChoaXRUZXN0QWN0aW9uID09IEhpdFRlc3RGbG9hdCAmJiBoaXRUZXN0Rmxv YXRzKHJlcXVlc3QsIHJlc3VsdCwgeCwgeSwgZmluYWxYLCBmaW5hbFkpKTsKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCShyZXZpc2lvbiA4Njk4MykKKysrIFNvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03NTgs NyArNzU4LDcgQEAgYm9vbCBSZW5kZXJCb3g6Om5vZGVBdFBvaW50KGNvbnN0IEhpdFRlcwogICAg IEludFJlY3QgYm91bmRzUmVjdCA9IEludFJlY3QodHgsIHR5LCB3aWR0aCgpLCBoZWlnaHQoKSk7 CiAgICAgaWYgKHZpc2libGVUb0hpdFRlc3RpbmcoKSAmJiBhY3Rpb24gPT0gSGl0VGVzdEZvcmVn cm91bmQgJiYgYm91bmRzUmVjdC5pbnRlcnNlY3RzKHJlc3VsdC5yZWN0Rm9yUG9pbnQocG9pbnRJ bkNvbnRhaW5lcikpKSB7CiAgICAgICAgIHVwZGF0ZUhpdFRlc3RSZXN1bHQocmVzdWx0LCBwb2lu dEluQ29udGFpbmVyIC0gSW50U2l6ZSh0eCwgdHkpKTsKLSAgICAgICAgaWYgKCFyZXN1bHQuYWRk Tm9kZVRvUmVjdEJhc2VkVGVzdFJlc3VsdChub2RlKCksIHBvaW50SW5Db250YWluZXIueCgpLCBw b2ludEluQ29udGFpbmVyLnkoKSwgYm91bmRzUmVjdCkpCisgICAgICAgIGlmICghcmVzdWx0LmFk ZE5vZGVUb1JlY3RCYXNlZFRlc3RSZXN1bHQobm9kZSgpLCBwb2ludEluQ29udGFpbmVyLCBib3Vu ZHNSZWN0KSkKICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KIApJbmRleDogU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFibGUuY3BwCShyZXZpc2lvbiA4Njk4MykKKysrIFNv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZS5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTEyMTYsNyArMTIxNiw3IEBAIGJvb2wgUmVuZGVyVGFibGU6Om5vZGVBdFBvaW50KGNvbnN0IEhp dFQKICAgICBJbnRSZWN0IGJvdW5kc1JlY3QgPSBJbnRSZWN0KHR4LCB0eSwgd2lkdGgoKSwgaGVp Z2h0KCkpOwogICAgIGlmICh2aXNpYmxlVG9IaXRUZXN0aW5nKCkgJiYgKGFjdGlvbiA9PSBIaXRU ZXN0QmxvY2tCYWNrZ3JvdW5kIHx8IGFjdGlvbiA9PSBIaXRUZXN0Q2hpbGRCbG9ja0JhY2tncm91 bmQpICYmIGJvdW5kc1JlY3QuaW50ZXJzZWN0cyhyZXN1bHQucmVjdEZvclBvaW50KHBvaW50SW5D b250YWluZXIpKSkgewogICAgICAgICB1cGRhdGVIaXRUZXN0UmVzdWx0KHJlc3VsdCwgZmxpcEZv cldyaXRpbmdNb2RlKHBvaW50SW5Db250YWluZXIgLSBJbnRTaXplKHR4LCB0eSkpKTsKLSAgICAg ICAgaWYgKCFyZXN1bHQuYWRkTm9kZVRvUmVjdEJhc2VkVGVzdFJlc3VsdChub2RlKCksIHBvaW50 SW5Db250YWluZXIueCgpLCBwb2ludEluQ29udGFpbmVyLnkoKSwgYm91bmRzUmVjdCkpCisgICAg ICAgIGlmICghcmVzdWx0LmFkZE5vZGVUb1JlY3RCYXNlZFRlc3RSZXN1bHQobm9kZSgpLCBwb2lu dEluQ29udGFpbmVyLCBib3VuZHNSZWN0KSkKICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAg IH0KIApJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSb290LmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jv b3QuY3BwCShyZXZpc2lvbiA4Njk4MykKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcv UmVuZGVyU1ZHUm9vdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMzNCw3ICszMzQsNyBAQCBib29s IFJlbmRlclNWR1Jvb3Q6Om5vZGVBdFBvaW50KGNvbnN0IEhpCiAgICAgICAgICAgICAvLyBGSVhN RTogQ1NTL0hUTUwgYXNzdW1lcyB0aGUgbG9jYWwgcG9pbnQgaXMgcmVsYXRpdmUgdG8gdGhlIGJv cmRlciBib3gsIHJpZ2h0PwogICAgICAgICAgICAgdXBkYXRlSGl0VGVzdFJlc3VsdChyZXN1bHQs IHBvaW50SW5Cb3JkZXJCb3gpOwogICAgICAgICAgICAgLy8gRklYTUU6IG5vZGVBdEZsb2F0UG9p bnQoKSBkb2Vzbid0IGhhbmRsZSByZWN0LWJhc2VkIGhpdCB0ZXN0cyB5ZXQuCi0gICAgICAgICAg ICByZXN1bHQuYWRkTm9kZVRvUmVjdEJhc2VkVGVzdFJlc3VsdChjaGlsZC0+bm9kZSgpLCBwb2lu dEluQ29udGFpbmVyLngoKSwgcG9pbnRJbkNvbnRhaW5lci55KCkpOworICAgICAgICAgICAgcmVz dWx0LmFkZE5vZGVUb1JlY3RCYXNlZFRlc3RSZXN1bHQoY2hpbGQtPm5vZGUoKSwgcG9pbnRJbkNv bnRhaW5lcik7CiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgfQogICAgIH0K