62176 2011-06-06 19:02:52 -0700 Change RenderBlock::hitTestFloats to IntPoint 2011-06-07 19:32:55 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 60318 1 eae eae eric leviw leviw simon.fraser oldest_to_newest 416216 0 eae 2011-06-06 19:02:52 -0700 Ongoing tx, ty removal. 416222 1 96175 eae 2011-06-06 19:05:47 -0700 Created attachment 96175 Patch 416802 2 eae 2011-06-07 14:49:22 -0700 Eric, did you miss this one in the flood of bug mail? 416807 3 96175 eric 2011-06-07 14:56:13 -0700 Comment on attachment 96175 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=96175&action=review > Source/WebCore/rendering/RenderBlock.cpp:3964 > + adjustedLocation += IntSize(toRenderView(this)->frameView()->scrollX(), toRenderView(this)->frameView()->scrollY()); Should we be using a scrollLocation() function here? 416808 4 eae 2011-06-07 14:56:32 -0700 Arhh, got the name wrong. This is about hitTestFloats. Not Columns. 416906 5 96323 eae 2011-06-07 16:23:35 -0700 Created attachment 96323 Patch for landing 417028 6 eae 2011-06-07 19:32:55 -0700 Landed r88317. 96175 2011-06-06 19:05:47 -0700 2011-06-07 16:23:32 -0700 Patch bug-62176-20110606190546.patch text/plain 5009 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg4MjExKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDYtMDYgIEVtaWwgQSBF a2x1bmQgIDxlYWVAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIENoYW5nZSBSZW5kZXJCbG9jazo6aGl0VGVzdENvbHVtbnMgdG8g SW50UG9pbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTYyMTc2CisKKyAgICAgICAgQ292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4KKworICAgICAgICAq IHJlbmRlcmluZy9SZW5kZXJCbG9jay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9j azo6bm9kZUF0UG9pbnQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OmhpdFRlc3RG bG9hdHMpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OmhpdFRlc3RDb2x1bW5zKToK KyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2suaDoKKwogMjAxMS0wNi0wNiAgTU9SSVRB IEhhamltZSAgPG1vcnJpdGFAZ29vZ2xlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBLZW50 IFRhbXVyYS4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAko cmV2aXNpb24gODgyMDIpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2su Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zOTMzLDcgKzM5MzMsNyBAQCBib29sIFJlbmRlckJsb2Nr Ojpub2RlQXRQb2ludChjb25zdCBIaXRUCiAgICAgICAgICAgICAgICAgdXBkYXRlSGl0VGVzdFJl c3VsdChyZXN1bHQsIHBvaW50SW5Db250YWluZXIgLSBsb2NhbE9mZnNldCk7CiAgICAgICAgICAg ICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgICAgICB9Ci0gICAgICAgICAgICBpZiAoaGl0VGVz dEFjdGlvbiA9PSBIaXRUZXN0RmxvYXQgJiYgaGl0VGVzdEZsb2F0cyhyZXF1ZXN0LCByZXN1bHQs IHBvaW50SW5Db250YWluZXIsIHNjcm9sbGVkT2Zmc2V0LndpZHRoKCksIHNjcm9sbGVkT2Zmc2V0 LmhlaWdodCgpKSkKKyAgICAgICAgICAgIGlmIChoaXRUZXN0QWN0aW9uID09IEhpdFRlc3RGbG9h dCAmJiBoaXRUZXN0RmxvYXRzKHJlcXVlc3QsIHJlc3VsdCwgcG9pbnRJbkNvbnRhaW5lciwgdG9Q b2ludChzY3JvbGxlZE9mZnNldCkpKQogICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAg ICAgICB9IGVsc2UgaWYgKGhpdFRlc3RDb2x1bW5zKHJlcXVlc3QsIHJlc3VsdCwgcG9pbnRJbkNv bnRhaW5lciwgc2Nyb2xsZWRPZmZzZXQud2lkdGgoKSwgc2Nyb2xsZWRPZmZzZXQuaGVpZ2h0KCks IGhpdFRlc3RBY3Rpb24pKSB7CiAgICAgICAgICAgICB1cGRhdGVIaXRUZXN0UmVzdWx0KHJlc3Vs dCwgcG9pbnRJbkNvbnRhaW5lciAtIGxvY2FsT2Zmc2V0KTsKQEAgLTM5NTQsMTQgKzM5NTQsMTQg QEAgYm9vbCBSZW5kZXJCbG9jazo6bm9kZUF0UG9pbnQoY29uc3QgSGl0VAogICAgIHJldHVybiBm YWxzZTsKIH0KIAotYm9vbCBSZW5kZXJCbG9jazo6aGl0VGVzdEZsb2F0cyhjb25zdCBIaXRUZXN0 UmVxdWVzdCYgcmVxdWVzdCwgSGl0VGVzdFJlc3VsdCYgcmVzdWx0LCBjb25zdCBJbnRQb2ludCYg cG9pbnRJbkNvbnRhaW5lciwgaW50IHR4LCBpbnQgdHkpCitib29sIFJlbmRlckJsb2NrOjpoaXRU ZXN0RmxvYXRzKGNvbnN0IEhpdFRlc3RSZXF1ZXN0JiByZXF1ZXN0LCBIaXRUZXN0UmVzdWx0JiBy ZXN1bHQsIGNvbnN0IEludFBvaW50JiBwb2ludEluQ29udGFpbmVyLCBjb25zdCBJbnRQb2ludCYg YWNjdW11bGF0ZWRPZmZzZXQpCiB7CiAgICAgaWYgKCFtX2Zsb2F0aW5nT2JqZWN0cykKICAgICAg ICAgcmV0dXJuIGZhbHNlOwogCisgICAgSW50UG9pbnQgYWRqdXN0ZWRMb2NhdGlvbiA9IGFjY3Vt dWxhdGVkT2Zmc2V0OwogICAgIGlmIChpc1JlbmRlclZpZXcoKSkgewotICAgICAgICB0eCArPSB0 b1JlbmRlclZpZXcodGhpcyktPmZyYW1lVmlldygpLT5zY3JvbGxYKCk7Ci0gICAgICAgIHR5ICs9 IHRvUmVuZGVyVmlldyh0aGlzKS0+ZnJhbWVWaWV3KCktPnNjcm9sbFkoKTsKKyAgICAgICAgYWRq dXN0ZWRMb2NhdGlvbiArPSBJbnRTaXplKHRvUmVuZGVyVmlldyh0aGlzKS0+ZnJhbWVWaWV3KCkt PnNjcm9sbFgoKSwgdG9SZW5kZXJWaWV3KHRoaXMpLT5mcmFtZVZpZXcoKS0+c2Nyb2xsWSgpKTsK ICAgICB9CiAKICAgICBGbG9hdGluZ09iamVjdFNldCYgZmxvYXRpbmdPYmplY3RTZXQgPSBtX2Zs b2F0aW5nT2JqZWN0cy0+c2V0KCk7CkBAIC0zOTcyLDcgKzM5NzIsNyBAQCBib29sIFJlbmRlckJs b2NrOjpoaXRUZXN0RmxvYXRzKGNvbnN0IEhpCiAgICAgICAgIGlmIChmbG9hdGluZ09iamVjdC0+ bV9zaG91bGRQYWludCAmJiAhZmxvYXRpbmdPYmplY3QtPm1fcmVuZGVyZXItPmhhc1NlbGZQYWlu dGluZ0xheWVyKCkpIHsKICAgICAgICAgICAgIGludCB4T2Zmc2V0ID0geFBvc2l0aW9uRm9yRmxv YXRJbmNsdWRpbmdNYXJnaW4oZmxvYXRpbmdPYmplY3QpIC0gZmxvYXRpbmdPYmplY3QtPm1fcmVu ZGVyZXItPngoKTsKICAgICAgICAgICAgIGludCB5T2Zmc2V0ID0geVBvc2l0aW9uRm9yRmxvYXRJ bmNsdWRpbmdNYXJnaW4oZmxvYXRpbmdPYmplY3QpIC0gZmxvYXRpbmdPYmplY3QtPm1fcmVuZGVy ZXItPnkoKTsKLSAgICAgICAgICAgIEludFBvaW50IGNoaWxkUG9pbnQgPSBmbGlwRmxvYXRGb3JX cml0aW5nTW9kZShmbG9hdGluZ09iamVjdCwgSW50UG9pbnQodHggKyB4T2Zmc2V0LCB0eSArIHlP ZmZzZXQpKTsKKyAgICAgICAgICAgIEludFBvaW50IGNoaWxkUG9pbnQgPSBmbGlwRmxvYXRGb3JX cml0aW5nTW9kZShmbG9hdGluZ09iamVjdCwgYWRqdXN0ZWRMb2NhdGlvbiArIEludFNpemUoeE9m ZnNldCwgeU9mZnNldCkpOwogICAgICAgICAgICAgaWYgKGZsb2F0aW5nT2JqZWN0LT5tX3JlbmRl cmVyLT5oaXRUZXN0KHJlcXVlc3QsIHJlc3VsdCwgcG9pbnRJbkNvbnRhaW5lciwgY2hpbGRQb2lu dCkpIHsKICAgICAgICAgICAgICAgICB1cGRhdGVIaXRUZXN0UmVzdWx0KHJlc3VsdCwgcG9pbnRJ bkNvbnRhaW5lciAtIHRvU2l6ZShjaGlsZFBvaW50KSk7CiAgICAgICAgICAgICAgICAgcmV0dXJu IHRydWU7CkBAIC00MDIzLDcgKzQwMjMsNyBAQCBib29sIFJlbmRlckJsb2NrOjpoaXRUZXN0Q29s dW1ucyhjb25zdCBICiAgICAgICAgICAgICBpZiAocmVzdWx0LmlzUmVjdEJhc2VkVGVzdCgpICYm ICFjb2xSZWN0LmNvbnRhaW5zKHJlc3VsdC5yZWN0Rm9yUG9pbnQocG9pbnRJbkNvbnRhaW5lcikp KQogICAgICAgICAgICAgICAgIGhpdFRlc3RDb250ZW50cyhyZXF1ZXN0LCByZXN1bHQsIHBvaW50 SW5Db250YWluZXIsIGZpbmFsWCwgZmluYWxZLCBoaXRUZXN0QWN0aW9uKTsKICAgICAgICAgICAg IGVsc2UKLSAgICAgICAgICAgICAgICByZXR1cm4gaGl0VGVzdENvbnRlbnRzKHJlcXVlc3QsIHJl c3VsdCwgcG9pbnRJbkNvbnRhaW5lciwgZmluYWxYLCBmaW5hbFksIGhpdFRlc3RBY3Rpb24pIHx8 IChoaXRUZXN0QWN0aW9uID09IEhpdFRlc3RGbG9hdCAmJiBoaXRUZXN0RmxvYXRzKHJlcXVlc3Qs IHJlc3VsdCwgcG9pbnRJbkNvbnRhaW5lciwgZmluYWxYLCBmaW5hbFkpKTsKKyAgICAgICAgICAg ICAgICByZXR1cm4gaGl0VGVzdENvbnRlbnRzKHJlcXVlc3QsIHJlc3VsdCwgcG9pbnRJbkNvbnRh aW5lciwgZmluYWxYLCBmaW5hbFksIGhpdFRlc3RBY3Rpb24pIHx8IChoaXRUZXN0QWN0aW9uID09 IEhpdFRlc3RGbG9hdCAmJiBoaXRUZXN0RmxvYXRzKHJlcXVlc3QsIHJlc3VsdCwgcG9pbnRJbkNv bnRhaW5lciwgSW50UG9pbnQoZmluYWxYLCBmaW5hbFkpKSk7CiAgICAgICAgIH0KICAgICB9CiAK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5oCShyZXZpc2lvbiA4ODIw MikKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5oCSh3b3JraW5nIGNv cHkpCkBAIC01OTAsNyArNTkwLDcgQEAgcHJpdmF0ZToKICAgICAKICAgICB2aXJ0dWFsIGJvb2wg aGl0VGVzdENvbHVtbnMoY29uc3QgSGl0VGVzdFJlcXVlc3QmLCBIaXRUZXN0UmVzdWx0JiwgY29u c3QgSW50UG9pbnQmIHBvaW50SW5Db250YWluZXIsIGludCB0eCwgaW50IHR5LCBIaXRUZXN0QWN0 aW9uKTsKICAgICB2aXJ0dWFsIGJvb2wgaGl0VGVzdENvbnRlbnRzKGNvbnN0IEhpdFRlc3RSZXF1 ZXN0JiwgSGl0VGVzdFJlc3VsdCYsIGNvbnN0IEludFBvaW50JiBwb2ludEluQ29udGFpbmVyLCBp bnQgdHgsIGludCB0eSwgSGl0VGVzdEFjdGlvbik7Ci0gICAgYm9vbCBoaXRUZXN0RmxvYXRzKGNv bnN0IEhpdFRlc3RSZXF1ZXN0JiwgSGl0VGVzdFJlc3VsdCYsIGNvbnN0IEludFBvaW50JiBwb2lu dEluQ29udGFpbmVyLCBpbnQgdHgsIGludCB0eSk7CisgICAgYm9vbCBoaXRUZXN0RmxvYXRzKGNv bnN0IEhpdFRlc3RSZXF1ZXN0JiwgSGl0VGVzdFJlc3VsdCYsIGNvbnN0IEludFBvaW50JiBwb2lu dEluQ29udGFpbmVyLCBjb25zdCBJbnRQb2ludCYgYWNjdW11bGF0ZWRPZmZzZXQpOwogCiAgICAg dmlydHVhbCBib29sIGlzUG9pbnRJbk92ZXJmbG93Q29udHJvbChIaXRUZXN0UmVzdWx0JiwgY29u c3QgSW50UG9pbnQmIHBvaW50SW5Db250YWluZXIsIGludCB0eCwgaW50IHR5KTsKIAo= 96323 2011-06-07 16:23:35 -0700 2011-06-07 19:11:19 -0700 Patch for landing bug-62176-20110607162334.patch text/plain 4971 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg4Mjc3KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDYtMDcgIEVtaWwgQSBF a2x1bmQgIDxlYWVAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgU2Vp ZGVsLgorCisgICAgICAgIENoYW5nZSBSZW5kZXJCbG9jazo6aGl0VGVzdEZsb2F0cyB0byBJbnRQ b2ludAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjIx NzYKKworICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICogcmVu ZGVyaW5nL1JlbmRlckJsb2NrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjpu b2RlQXRQb2ludCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6aGl0VGVzdEZsb2F0 cyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6aGl0VGVzdENvbHVtbnMpOgorICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9jay5oOgorCiAyMDExLTA2LTA3ICBBYmhpc2hlayBB cnlhICA8aW5mZXJub0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFuIEJl cm5zdGVpbi4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAko cmV2aXNpb24gODgyNzcpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2su Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zOTMyLDcgKzM5MzIsNyBAQCBib29sIFJlbmRlckJsb2Nr Ojpub2RlQXRQb2ludChjb25zdCBIaXRUCiAgICAgICAgICAgICAgICAgdXBkYXRlSGl0VGVzdFJl c3VsdChyZXN1bHQsIHBvaW50SW5Db250YWluZXIgLSBsb2NhbE9mZnNldCk7CiAgICAgICAgICAg ICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgICAgICB9Ci0gICAgICAgICAgICBpZiAoaGl0VGVz dEFjdGlvbiA9PSBIaXRUZXN0RmxvYXQgJiYgaGl0VGVzdEZsb2F0cyhyZXF1ZXN0LCByZXN1bHQs IHBvaW50SW5Db250YWluZXIsIHNjcm9sbGVkT2Zmc2V0LndpZHRoKCksIHNjcm9sbGVkT2Zmc2V0 LmhlaWdodCgpKSkKKyAgICAgICAgICAgIGlmIChoaXRUZXN0QWN0aW9uID09IEhpdFRlc3RGbG9h dCAmJiBoaXRUZXN0RmxvYXRzKHJlcXVlc3QsIHJlc3VsdCwgcG9pbnRJbkNvbnRhaW5lciwgdG9Q b2ludChzY3JvbGxlZE9mZnNldCkpKQogICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAg ICAgICB9IGVsc2UgaWYgKGhpdFRlc3RDb2x1bW5zKHJlcXVlc3QsIHJlc3VsdCwgcG9pbnRJbkNv bnRhaW5lciwgc2Nyb2xsZWRPZmZzZXQud2lkdGgoKSwgc2Nyb2xsZWRPZmZzZXQuaGVpZ2h0KCks IGhpdFRlc3RBY3Rpb24pKSB7CiAgICAgICAgICAgICB1cGRhdGVIaXRUZXN0UmVzdWx0KHJlc3Vs dCwgcG9pbnRJbkNvbnRhaW5lciAtIGxvY2FsT2Zmc2V0KTsKQEAgLTM5NTMsMTQgKzM5NTMsMTQg QEAgYm9vbCBSZW5kZXJCbG9jazo6bm9kZUF0UG9pbnQoY29uc3QgSGl0VAogICAgIHJldHVybiBm YWxzZTsKIH0KIAotYm9vbCBSZW5kZXJCbG9jazo6aGl0VGVzdEZsb2F0cyhjb25zdCBIaXRUZXN0 UmVxdWVzdCYgcmVxdWVzdCwgSGl0VGVzdFJlc3VsdCYgcmVzdWx0LCBjb25zdCBJbnRQb2ludCYg cG9pbnRJbkNvbnRhaW5lciwgaW50IHR4LCBpbnQgdHkpCitib29sIFJlbmRlckJsb2NrOjpoaXRU ZXN0RmxvYXRzKGNvbnN0IEhpdFRlc3RSZXF1ZXN0JiByZXF1ZXN0LCBIaXRUZXN0UmVzdWx0JiBy ZXN1bHQsIGNvbnN0IEludFBvaW50JiBwb2ludEluQ29udGFpbmVyLCBjb25zdCBJbnRQb2ludCYg YWNjdW11bGF0ZWRPZmZzZXQpCiB7CiAgICAgaWYgKCFtX2Zsb2F0aW5nT2JqZWN0cykKICAgICAg ICAgcmV0dXJuIGZhbHNlOwogCisgICAgSW50UG9pbnQgYWRqdXN0ZWRMb2NhdGlvbiA9IGFjY3Vt dWxhdGVkT2Zmc2V0OwogICAgIGlmIChpc1JlbmRlclZpZXcoKSkgewotICAgICAgICB0eCArPSB0 b1JlbmRlclZpZXcodGhpcyktPmZyYW1lVmlldygpLT5zY3JvbGxYKCk7Ci0gICAgICAgIHR5ICs9 IHRvUmVuZGVyVmlldyh0aGlzKS0+ZnJhbWVWaWV3KCktPnNjcm9sbFkoKTsKKyAgICAgICAgYWRq dXN0ZWRMb2NhdGlvbiArPSB0b1NpemUodG9SZW5kZXJWaWV3KHRoaXMpLT5mcmFtZVZpZXcoKS0+ c2Nyb2xsUG9zaXRpb24oKSk7CiAgICAgfQogCiAgICAgRmxvYXRpbmdPYmplY3RTZXQmIGZsb2F0 aW5nT2JqZWN0U2V0ID0gbV9mbG9hdGluZ09iamVjdHMtPnNldCgpOwpAQCAtMzk3MSw3ICszOTcx LDcgQEAgYm9vbCBSZW5kZXJCbG9jazo6aGl0VGVzdEZsb2F0cyhjb25zdCBIaQogICAgICAgICBp ZiAoZmxvYXRpbmdPYmplY3QtPm1fc2hvdWxkUGFpbnQgJiYgIWZsb2F0aW5nT2JqZWN0LT5tX3Jl bmRlcmVyLT5oYXNTZWxmUGFpbnRpbmdMYXllcigpKSB7CiAgICAgICAgICAgICBpbnQgeE9mZnNl dCA9IHhQb3NpdGlvbkZvckZsb2F0SW5jbHVkaW5nTWFyZ2luKGZsb2F0aW5nT2JqZWN0KSAtIGZs b2F0aW5nT2JqZWN0LT5tX3JlbmRlcmVyLT54KCk7CiAgICAgICAgICAgICBpbnQgeU9mZnNldCA9 IHlQb3NpdGlvbkZvckZsb2F0SW5jbHVkaW5nTWFyZ2luKGZsb2F0aW5nT2JqZWN0KSAtIGZsb2F0 aW5nT2JqZWN0LT5tX3JlbmRlcmVyLT55KCk7Ci0gICAgICAgICAgICBJbnRQb2ludCBjaGlsZFBv aW50ID0gZmxpcEZsb2F0Rm9yV3JpdGluZ01vZGUoZmxvYXRpbmdPYmplY3QsIEludFBvaW50KHR4 ICsgeE9mZnNldCwgdHkgKyB5T2Zmc2V0KSk7CisgICAgICAgICAgICBJbnRQb2ludCBjaGlsZFBv aW50ID0gZmxpcEZsb2F0Rm9yV3JpdGluZ01vZGUoZmxvYXRpbmdPYmplY3QsIGFkanVzdGVkTG9j YXRpb24gKyBJbnRTaXplKHhPZmZzZXQsIHlPZmZzZXQpKTsKICAgICAgICAgICAgIGlmIChmbG9h dGluZ09iamVjdC0+bV9yZW5kZXJlci0+aGl0VGVzdChyZXF1ZXN0LCByZXN1bHQsIHBvaW50SW5D b250YWluZXIsIGNoaWxkUG9pbnQpKSB7CiAgICAgICAgICAgICAgICAgdXBkYXRlSGl0VGVzdFJl c3VsdChyZXN1bHQsIHBvaW50SW5Db250YWluZXIgLSB0b1NpemUoY2hpbGRQb2ludCkpOwogICAg ICAgICAgICAgICAgIHJldHVybiB0cnVlOwpAQCAtNDAyMiw3ICs0MDIyLDcgQEAgYm9vbCBSZW5k ZXJCbG9jazo6aGl0VGVzdENvbHVtbnMoY29uc3QgSAogICAgICAgICAgICAgaWYgKHJlc3VsdC5p c1JlY3RCYXNlZFRlc3QoKSAmJiAhY29sUmVjdC5jb250YWlucyhyZXN1bHQucmVjdEZvclBvaW50 KHBvaW50SW5Db250YWluZXIpKSkKICAgICAgICAgICAgICAgICBoaXRUZXN0Q29udGVudHMocmVx dWVzdCwgcmVzdWx0LCBwb2ludEluQ29udGFpbmVyLCBmaW5hbFgsIGZpbmFsWSwgaGl0VGVzdEFj dGlvbik7CiAgICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgcmV0dXJuIGhpdFRlc3RD b250ZW50cyhyZXF1ZXN0LCByZXN1bHQsIHBvaW50SW5Db250YWluZXIsIGZpbmFsWCwgZmluYWxZ LCBoaXRUZXN0QWN0aW9uKSB8fCAoaGl0VGVzdEFjdGlvbiA9PSBIaXRUZXN0RmxvYXQgJiYgaGl0 VGVzdEZsb2F0cyhyZXF1ZXN0LCByZXN1bHQsIHBvaW50SW5Db250YWluZXIsIGZpbmFsWCwgZmlu YWxZKSk7CisgICAgICAgICAgICAgICAgcmV0dXJuIGhpdFRlc3RDb250ZW50cyhyZXF1ZXN0LCBy ZXN1bHQsIHBvaW50SW5Db250YWluZXIsIGZpbmFsWCwgZmluYWxZLCBoaXRUZXN0QWN0aW9uKSB8 fCAoaGl0VGVzdEFjdGlvbiA9PSBIaXRUZXN0RmxvYXQgJiYgaGl0VGVzdEZsb2F0cyhyZXF1ZXN0 LCByZXN1bHQsIHBvaW50SW5Db250YWluZXIsIEludFBvaW50KGZpbmFsWCwgZmluYWxZKSkpOwog ICAgICAgICB9CiAgICAgfQogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy QmxvY2suaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxv Y2suaAkocmV2aXNpb24gODgyNzcpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy QmxvY2suaAkod29ya2luZyBjb3B5KQpAQCAtNTkwLDcgKzU5MCw3IEBAIHByaXZhdGU6CiAgICAg CiAgICAgdmlydHVhbCBib29sIGhpdFRlc3RDb2x1bW5zKGNvbnN0IEhpdFRlc3RSZXF1ZXN0Jiwg SGl0VGVzdFJlc3VsdCYsIGNvbnN0IEludFBvaW50JiBwb2ludEluQ29udGFpbmVyLCBpbnQgdHgs IGludCB0eSwgSGl0VGVzdEFjdGlvbik7CiAgICAgdmlydHVhbCBib29sIGhpdFRlc3RDb250ZW50 cyhjb25zdCBIaXRUZXN0UmVxdWVzdCYsIEhpdFRlc3RSZXN1bHQmLCBjb25zdCBJbnRQb2ludCYg cG9pbnRJbkNvbnRhaW5lciwgaW50IHR4LCBpbnQgdHksIEhpdFRlc3RBY3Rpb24pOwotICAgIGJv b2wgaGl0VGVzdEZsb2F0cyhjb25zdCBIaXRUZXN0UmVxdWVzdCYsIEhpdFRlc3RSZXN1bHQmLCBj b25zdCBJbnRQb2ludCYgcG9pbnRJbkNvbnRhaW5lciwgaW50IHR4LCBpbnQgdHkpOworICAgIGJv b2wgaGl0VGVzdEZsb2F0cyhjb25zdCBIaXRUZXN0UmVxdWVzdCYsIEhpdFRlc3RSZXN1bHQmLCBj b25zdCBJbnRQb2ludCYgcG9pbnRJbkNvbnRhaW5lciwgY29uc3QgSW50UG9pbnQmIGFjY3VtdWxh dGVkT2Zmc2V0KTsKIAogICAgIHZpcnR1YWwgYm9vbCBpc1BvaW50SW5PdmVyZmxvd0NvbnRyb2wo SGl0VGVzdFJlc3VsdCYsIGNvbnN0IEludFBvaW50JiBwb2ludEluQ29udGFpbmVyLCBpbnQgdHgs IGludCB0eSk7CiAK