62172 2011-06-06 18:01:54 -0700 Change RenderBlock::hitTestColumns to IntPoint 2011-06-07 18:47:08 -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 webkit.review.bot oldest_to_newest 416185 0 eae 2011-06-06 18:01:54 -0700 Ongoing tx, ty removal. 416191 1 96167 eae 2011-06-06 18:07:45 -0700 Created attachment 96167 Patch 416192 2 eae 2011-06-06 18:09:07 -0700 This will make more sense when 62170 is in. I plan to rename accumulatedOffset before committing, assuming we agree on a name name before then. 416632 3 96167 eric 2011-06-07 10:49:02 -0700 Comment on attachment 96167 Patch OK. 416634 4 96167 eric 2011-06-07 10:49:26 -0700 Comment on attachment 96167 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=96167&action=review > Source/WebCore/rendering/RenderBlock.cpp:4025 > + return hitTestContents(request, result, pointInContainer, adjustedPosition.x(), adjustedPosition.y(), hitTestAction) || (hitTestAction == HitTestFloat && hitTestFloats(request, result, pointInContainer, adjustedPosition.x(), adjustedPosition.y())); adjusted position is also a meaningless name IMO. 416799 5 96300 eae 2011-06-07 14:44:42 -0700 Created attachment 96300 Patch for landing 416800 6 eae 2011-06-07 14:48:28 -0700 Renamed adjustedPosition to finalLocation to mirror the name used previously. 416982 7 96300 webkit.review.bot 2011-06-07 17:58:30 -0700 Comment on attachment 96300 Patch for landing Rejecting attachment 96300 from commit-queue. Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=ec2-cq-01', '--port..." exit_code: 2 Last 500 characters of output: rce/WebCore/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file Source/WebCore/rendering/RenderBlock.cpp Hunk #3 FAILED at 4010. 1 out of 3 hunks FAILED -- saving rejects to file Source/WebCore/rendering/RenderBlock.cpp.rej patching file Source/WebCore/rendering/RenderBlock.h Hunk #1 FAILED at 588. 1 out of 1 hunk FAILED -- saving rejects to file Source/WebCore/rendering/RenderBlock.h.rej Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--force']" exit_code: 1 Full output: http://queues.webkit.org/results/8812100 417003 8 eae 2011-06-07 18:46:55 -0700 Landed r88311. 96167 2011-06-06 18:07:45 -0700 2011-06-07 14:44:39 -0700 Patch bug-62172-20110606180743.patch text/plain 4767 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg4MjA2KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDYtMDYgIEVtaWwgQSBF a2x1bmQgIDxlYWVAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIENoYW5nZSBSZW5kZXJCbG9jazo6aGl0VGVzdENvbHVtbnMgdG8g SW50UG9pbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTYyMTcyCisKKyAgICAgICAgQ292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4KKworICAgICAgICAq IHJlbmRlcmluZy9SZW5kZXJCbG9jay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9j azo6bm9kZUF0UG9pbnQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OmhpdFRlc3RD b2x1bW5zKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2suaDoKKwogMjAxMS0wNi0w NiAgRW1pbCBBIEVrbHVuZCAgPGVhZUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgRXJpYyBTZWlkZWwuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxv Y2suY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9j ay5jcHAJKHJldmlzaW9uIDg4MjAyKQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJsb2NrLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzkzNSw3ICszOTM1LDcgQEAgYm9vbCBSZW5k ZXJCbG9jazo6bm9kZUF0UG9pbnQoY29uc3QgSGl0VAogICAgICAgICAgICAgfQogICAgICAgICAg ICAgaWYgKGhpdFRlc3RBY3Rpb24gPT0gSGl0VGVzdEZsb2F0ICYmIGhpdFRlc3RGbG9hdHMocmVx dWVzdCwgcmVzdWx0LCBwb2ludEluQ29udGFpbmVyLCBzY3JvbGxlZE9mZnNldC53aWR0aCgpLCBz Y3JvbGxlZE9mZnNldC5oZWlnaHQoKSkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7Ci0g ICAgICAgIH0gZWxzZSBpZiAoaGl0VGVzdENvbHVtbnMocmVxdWVzdCwgcmVzdWx0LCBwb2ludElu Q29udGFpbmVyLCBzY3JvbGxlZE9mZnNldC53aWR0aCgpLCBzY3JvbGxlZE9mZnNldC5oZWlnaHQo KSwgaGl0VGVzdEFjdGlvbikpIHsKKyAgICAgICAgfSBlbHNlIGlmIChoaXRUZXN0Q29sdW1ucyhy ZXF1ZXN0LCByZXN1bHQsIHBvaW50SW5Db250YWluZXIsIHRvUG9pbnQoc2Nyb2xsZWRPZmZzZXQp LCBoaXRUZXN0QWN0aW9uKSkgewogICAgICAgICAgICAgdXBkYXRlSGl0VGVzdFJlc3VsdChyZXN1 bHQsIHBvaW50SW5Db250YWluZXIgLSBsb2NhbE9mZnNldCk7CiAgICAgICAgICAgICByZXR1cm4g dHJ1ZTsKICAgICAgICAgfQpAQCAtMzk4Myw3ICszOTgzLDcgQEAgYm9vbCBSZW5kZXJCbG9jazo6 aGl0VGVzdEZsb2F0cyhjb25zdCBIaQogICAgIHJldHVybiBmYWxzZTsKIH0KIAotYm9vbCBSZW5k ZXJCbG9jazo6aGl0VGVzdENvbHVtbnMoY29uc3QgSGl0VGVzdFJlcXVlc3QmIHJlcXVlc3QsIEhp dFRlc3RSZXN1bHQmIHJlc3VsdCwgY29uc3QgSW50UG9pbnQmIHBvaW50SW5Db250YWluZXIsIGlu dCB0eCwgaW50IHR5LCBIaXRUZXN0QWN0aW9uIGhpdFRlc3RBY3Rpb24pCitib29sIFJlbmRlckJs b2NrOjpoaXRUZXN0Q29sdW1ucyhjb25zdCBIaXRUZXN0UmVxdWVzdCYgcmVxdWVzdCwgSGl0VGVz dFJlc3VsdCYgcmVzdWx0LCBjb25zdCBJbnRQb2ludCYgcG9pbnRJbkNvbnRhaW5lciwgY29uc3Qg SW50UG9pbnQmIGFjY3VtdWxhdGVkT2Zmc2V0LCBIaXRUZXN0QWN0aW9uIGhpdFRlc3RBY3Rpb24p CiB7CiAgICAgLy8gV2UgbmVlZCB0byBkbyBtdWx0aXBsZSBwYXNzZXMsIGJyZWFraW5nIHVwIG91 ciBoaXQgdGVzdGluZyBpbnRvIHN0cmlwcy4KICAgICBDb2x1bW5JbmZvKiBjb2xJbmZvID0gY29s dW1uSW5mbygpOwpAQCAtNDAxMSwxOSArNDAxMSwxOCBAQCBib29sIFJlbmRlckJsb2NrOjpoaXRU ZXN0Q29sdW1ucyhjb25zdCBICiAgICAgICAgICAgICBjdXJyTG9naWNhbFRvcE9mZnNldCAtPSBi bG9ja0RlbHRhOwogICAgICAgICBlbHNlCiAgICAgICAgICAgICBjdXJyTG9naWNhbFRvcE9mZnNl dCArPSBibG9ja0RlbHRhOwotICAgICAgICBjb2xSZWN0Lm1vdmUodHgsIHR5KTsKKyAgICAgICAg Y29sUmVjdC5tb3ZlQnkoYWNjdW11bGF0ZWRPZmZzZXQpOwogICAgICAgICAKICAgICAgICAgaWYg KGNvbFJlY3QuaW50ZXJzZWN0cyhyZXN1bHQucmVjdEZvclBvaW50KHBvaW50SW5Db250YWluZXIp KSkgewogICAgICAgICAgICAgLy8gVGhlIHBvaW50IGlzIGluc2lkZSB0aGlzIGNvbHVtbi4KLSAg ICAgICAgICAgIC8vIEFkanVzdCB0eCBhbmQgdHkgdG8gY2hhbmdlIHdoZXJlIHdlIGhpdCB0ZXN0 LgorICAgICAgICAgICAgLy8gQWRqdXN0IGFjY3VtdWxhdGVkT2Zmc2V0IHRvIGNoYW5nZSB3aGVy ZSB3ZSBoaXQgdGVzdC4KICAgICAgICAgCiAgICAgICAgICAgICBJbnRTaXplIG9mZnNldCA9IGlz SG9yaXpvbnRhbCA/IEludFNpemUoY3VyckxvZ2ljYWxMZWZ0T2Zmc2V0LCBjdXJyTG9naWNhbFRv cE9mZnNldCkgOiBJbnRTaXplKGN1cnJMb2dpY2FsVG9wT2Zmc2V0LCBjdXJyTG9naWNhbExlZnRP ZmZzZXQpOwotICAgICAgICAgICAgaW50IGZpbmFsWCA9IHR4ICsgb2Zmc2V0LndpZHRoKCk7Ci0g ICAgICAgICAgICBpbnQgZmluYWxZID0gdHkgKyBvZmZzZXQuaGVpZ2h0KCk7CisgICAgICAgICAg ICBJbnRQb2ludCBhZGp1c3RlZFBvc2l0aW9uID0gYWNjdW11bGF0ZWRPZmZzZXQgKyBvZmZzZXQ7 CiAgICAgICAgICAgICBpZiAocmVzdWx0LmlzUmVjdEJhc2VkVGVzdCgpICYmICFjb2xSZWN0LmNv bnRhaW5zKHJlc3VsdC5yZWN0Rm9yUG9pbnQocG9pbnRJbkNvbnRhaW5lcikpKQotICAgICAgICAg ICAgICAgIGhpdFRlc3RDb250ZW50cyhyZXF1ZXN0LCByZXN1bHQsIHBvaW50SW5Db250YWluZXIs IGZpbmFsWCwgZmluYWxZLCBoaXRUZXN0QWN0aW9uKTsKKyAgICAgICAgICAgICAgICBoaXRUZXN0 Q29udGVudHMocmVxdWVzdCwgcmVzdWx0LCBwb2ludEluQ29udGFpbmVyLCBhZGp1c3RlZFBvc2l0 aW9uLngoKSwgYWRqdXN0ZWRQb3NpdGlvbi55KCksIGhpdFRlc3RBY3Rpb24pOwogICAgICAgICAg ICAgZWxzZQotICAgICAgICAgICAgICAgIHJldHVybiBoaXRUZXN0Q29udGVudHMocmVxdWVzdCwg cmVzdWx0LCBwb2ludEluQ29udGFpbmVyLCBmaW5hbFgsIGZpbmFsWSwgaGl0VGVzdEFjdGlvbikg fHwgKGhpdFRlc3RBY3Rpb24gPT0gSGl0VGVzdEZsb2F0ICYmIGhpdFRlc3RGbG9hdHMocmVxdWVz dCwgcmVzdWx0LCBwb2ludEluQ29udGFpbmVyLCBmaW5hbFgsIGZpbmFsWSkpOworICAgICAgICAg ICAgICAgIHJldHVybiBoaXRUZXN0Q29udGVudHMocmVxdWVzdCwgcmVzdWx0LCBwb2ludEluQ29u dGFpbmVyLCBhZGp1c3RlZFBvc2l0aW9uLngoKSwgYWRqdXN0ZWRQb3NpdGlvbi55KCksIGhpdFRl c3RBY3Rpb24pIHx8IChoaXRUZXN0QWN0aW9uID09IEhpdFRlc3RGbG9hdCAmJiBoaXRUZXN0Rmxv YXRzKHJlcXVlc3QsIHJlc3VsdCwgcG9pbnRJbkNvbnRhaW5lciwgYWRqdXN0ZWRQb3NpdGlvbi54 KCksIGFkanVzdGVkUG9zaXRpb24ueSgpKSk7CiAgICAgICAgIH0KICAgICB9CiAKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5oCShyZXZpc2lvbiA4ODIwMikKKysrIFNv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5oCSh3b3JraW5nIGNvcHkpCkBAIC01 ODgsNyArNTg4LDcgQEAgcHJpdmF0ZToKICAgICBpbnQgbG93ZXN0RmxvYXRMb2dpY2FsQm90dG9t KEZsb2F0aW5nT2JqZWN0OjpUeXBlID0gRmxvYXRpbmdPYmplY3Q6OkZsb2F0Qm90aCkgY29uc3Q7 CiAgICAgaW50IG5leHRGbG9hdExvZ2ljYWxCb3R0b21CZWxvdyhpbnQpIGNvbnN0OwogICAgIAot ICAgIHZpcnR1YWwgYm9vbCBoaXRUZXN0Q29sdW1ucyhjb25zdCBIaXRUZXN0UmVxdWVzdCYsIEhp dFRlc3RSZXN1bHQmLCBjb25zdCBJbnRQb2ludCYgcG9pbnRJbkNvbnRhaW5lciwgaW50IHR4LCBp bnQgdHksIEhpdFRlc3RBY3Rpb24pOworICAgIHZpcnR1YWwgYm9vbCBoaXRUZXN0Q29sdW1ucyhj b25zdCBIaXRUZXN0UmVxdWVzdCYsIEhpdFRlc3RSZXN1bHQmLCBjb25zdCBJbnRQb2ludCYgcG9p bnRJbkNvbnRhaW5lciwgY29uc3QgSW50UG9pbnQmIGFjY3VtdWxhdGVkT2Zmc2V0LCBIaXRUZXN0 QWN0aW9uKTsKICAgICB2aXJ0dWFsIGJvb2wgaGl0VGVzdENvbnRlbnRzKGNvbnN0IEhpdFRlc3RS ZXF1ZXN0JiwgSGl0VGVzdFJlc3VsdCYsIGNvbnN0IEludFBvaW50JiBwb2ludEluQ29udGFpbmVy LCBpbnQgdHgsIGludCB0eSwgSGl0VGVzdEFjdGlvbik7CiAgICAgYm9vbCBoaXRUZXN0RmxvYXRz KGNvbnN0IEhpdFRlc3RSZXF1ZXN0JiwgSGl0VGVzdFJlc3VsdCYsIGNvbnN0IEludFBvaW50JiBw b2ludEluQ29udGFpbmVyLCBpbnQgdHgsIGludCB0eSk7CiAK 96300 2011-06-07 14:44:42 -0700 2011-06-07 18:47:08 -0700 Patch for landing bug-62172-20110607144441.patch text/plain 4736 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg4MjY3KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDYtMDcgIEVtaWwgQSBF a2x1bmQgIDxlYWVAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgU2Vp ZGVsLgorCisgICAgICAgIENoYW5nZSBSZW5kZXJCbG9jazo6aGl0VGVzdENvbHVtbnMgdG8gSW50 UG9pbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYy MTcyCisKKyAgICAgICAgQ292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4KKworICAgICAgICAqIHJl bmRlcmluZy9SZW5kZXJCbG9jay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6 bm9kZUF0UG9pbnQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OmhpdFRlc3RDb2x1 bW5zKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2suaDoKKwogMjAxMS0wNi0wNyAg Um9iIEJ1aXMgIDxyYnVpc0ByaW0uY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERpcmsgU2No dWx6ZS4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAkocmV2 aXNpb24gODgyNjcpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0zOTM0LDcgKzM5MzQsNyBAQCBib29sIFJlbmRlckJsb2NrOjpu b2RlQXRQb2ludChjb25zdCBIaXRUCiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBpZiAoaGl0 VGVzdEFjdGlvbiA9PSBIaXRUZXN0RmxvYXQgJiYgaGl0VGVzdEZsb2F0cyhyZXF1ZXN0LCByZXN1 bHQsIHBvaW50SW5Db250YWluZXIsIHNjcm9sbGVkT2Zmc2V0LndpZHRoKCksIHNjcm9sbGVkT2Zm c2V0LmhlaWdodCgpKSkKICAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICAgICAgfSBl bHNlIGlmIChoaXRUZXN0Q29sdW1ucyhyZXF1ZXN0LCByZXN1bHQsIHBvaW50SW5Db250YWluZXIs IHNjcm9sbGVkT2Zmc2V0LndpZHRoKCksIHNjcm9sbGVkT2Zmc2V0LmhlaWdodCgpLCBoaXRUZXN0 QWN0aW9uKSkgeworICAgICAgICB9IGVsc2UgaWYgKGhpdFRlc3RDb2x1bW5zKHJlcXVlc3QsIHJl c3VsdCwgcG9pbnRJbkNvbnRhaW5lciwgdG9Qb2ludChzY3JvbGxlZE9mZnNldCksIGhpdFRlc3RB Y3Rpb24pKSB7CiAgICAgICAgICAgICB1cGRhdGVIaXRUZXN0UmVzdWx0KHJlc3VsdCwgcG9pbnRJ bkNvbnRhaW5lciAtIGxvY2FsT2Zmc2V0KTsKICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAg ICAgICB9CkBAIC0zOTgyLDcgKzM5ODIsNyBAQCBib29sIFJlbmRlckJsb2NrOjpoaXRUZXN0Rmxv YXRzKGNvbnN0IEhpCiAgICAgcmV0dXJuIGZhbHNlOwogfQogCi1ib29sIFJlbmRlckJsb2NrOjpo aXRUZXN0Q29sdW1ucyhjb25zdCBIaXRUZXN0UmVxdWVzdCYgcmVxdWVzdCwgSGl0VGVzdFJlc3Vs dCYgcmVzdWx0LCBjb25zdCBJbnRQb2ludCYgcG9pbnRJbkNvbnRhaW5lciwgaW50IHR4LCBpbnQg dHksIEhpdFRlc3RBY3Rpb24gaGl0VGVzdEFjdGlvbikKK2Jvb2wgUmVuZGVyQmxvY2s6OmhpdFRl c3RDb2x1bW5zKGNvbnN0IEhpdFRlc3RSZXF1ZXN0JiByZXF1ZXN0LCBIaXRUZXN0UmVzdWx0JiBy ZXN1bHQsIGNvbnN0IEludFBvaW50JiBwb2ludEluQ29udGFpbmVyLCBjb25zdCBJbnRQb2ludCYg YWNjdW11bGF0ZWRPZmZzZXQsIEhpdFRlc3RBY3Rpb24gaGl0VGVzdEFjdGlvbikKIHsKICAgICAv LyBXZSBuZWVkIHRvIGRvIG11bHRpcGxlIHBhc3NlcywgYnJlYWtpbmcgdXAgb3VyIGhpdCB0ZXN0 aW5nIGludG8gc3RyaXBzLgogICAgIENvbHVtbkluZm8qIGNvbEluZm8gPSBjb2x1bW5JbmZvKCk7 CkBAIC00MDEwLDE5ICs0MDEwLDE4IEBAIGJvb2wgUmVuZGVyQmxvY2s6OmhpdFRlc3RDb2x1bW5z KGNvbnN0IEgKICAgICAgICAgICAgIGN1cnJMb2dpY2FsVG9wT2Zmc2V0IC09IGJsb2NrRGVsdGE7 CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIGN1cnJMb2dpY2FsVG9wT2Zmc2V0ICs9IGJsb2Nr RGVsdGE7Ci0gICAgICAgIGNvbFJlY3QubW92ZSh0eCwgdHkpOworICAgICAgICBjb2xSZWN0Lm1v dmVCeShhY2N1bXVsYXRlZE9mZnNldCk7CiAgICAgICAgIAogICAgICAgICBpZiAoY29sUmVjdC5p bnRlcnNlY3RzKHJlc3VsdC5yZWN0Rm9yUG9pbnQocG9pbnRJbkNvbnRhaW5lcikpKSB7CiAgICAg ICAgICAgICAvLyBUaGUgcG9pbnQgaXMgaW5zaWRlIHRoaXMgY29sdW1uLgotICAgICAgICAgICAg Ly8gQWRqdXN0IHR4IGFuZCB0eSB0byBjaGFuZ2Ugd2hlcmUgd2UgaGl0IHRlc3QuCisgICAgICAg ICAgICAvLyBBZGp1c3QgYWNjdW11bGF0ZWRPZmZzZXQgdG8gY2hhbmdlIHdoZXJlIHdlIGhpdCB0 ZXN0LgogICAgICAgICAKICAgICAgICAgICAgIEludFNpemUgb2Zmc2V0ID0gaXNIb3Jpem9udGFs ID8gSW50U2l6ZShjdXJyTG9naWNhbExlZnRPZmZzZXQsIGN1cnJMb2dpY2FsVG9wT2Zmc2V0KSA6 IEludFNpemUoY3VyckxvZ2ljYWxUb3BPZmZzZXQsIGN1cnJMb2dpY2FsTGVmdE9mZnNldCk7Ci0g ICAgICAgICAgICBpbnQgZmluYWxYID0gdHggKyBvZmZzZXQud2lkdGgoKTsKLSAgICAgICAgICAg IGludCBmaW5hbFkgPSB0eSArIG9mZnNldC5oZWlnaHQoKTsKKyAgICAgICAgICAgIEludFBvaW50 IGZpbmFsTG9jYXRpb24gPSBhY2N1bXVsYXRlZE9mZnNldCArIG9mZnNldDsKICAgICAgICAgICAg IGlmIChyZXN1bHQuaXNSZWN0QmFzZWRUZXN0KCkgJiYgIWNvbFJlY3QuY29udGFpbnMocmVzdWx0 LnJlY3RGb3JQb2ludChwb2ludEluQ29udGFpbmVyKSkpCi0gICAgICAgICAgICAgICAgaGl0VGVz dENvbnRlbnRzKHJlcXVlc3QsIHJlc3VsdCwgcG9pbnRJbkNvbnRhaW5lciwgZmluYWxYLCBmaW5h bFksIGhpdFRlc3RBY3Rpb24pOworICAgICAgICAgICAgICAgIGhpdFRlc3RDb250ZW50cyhyZXF1 ZXN0LCByZXN1bHQsIHBvaW50SW5Db250YWluZXIsIGZpbmFsTG9jYXRpb24ueCgpLCBmaW5hbExv Y2F0aW9uLnkoKSwgaGl0VGVzdEFjdGlvbik7CiAgICAgICAgICAgICBlbHNlCi0gICAgICAgICAg ICAgICAgcmV0dXJuIGhpdFRlc3RDb250ZW50cyhyZXF1ZXN0LCByZXN1bHQsIHBvaW50SW5Db250 YWluZXIsIGZpbmFsWCwgZmluYWxZLCBoaXRUZXN0QWN0aW9uKSB8fCAoaGl0VGVzdEFjdGlvbiA9 PSBIaXRUZXN0RmxvYXQgJiYgaGl0VGVzdEZsb2F0cyhyZXF1ZXN0LCByZXN1bHQsIHBvaW50SW5D b250YWluZXIsIGZpbmFsWCwgZmluYWxZKSk7CisgICAgICAgICAgICAgICAgcmV0dXJuIGhpdFRl c3RDb250ZW50cyhyZXF1ZXN0LCByZXN1bHQsIHBvaW50SW5Db250YWluZXIsIGZpbmFsTG9jYXRp b24ueCgpLCBmaW5hbExvY2F0aW9uLnkoKSwgaGl0VGVzdEFjdGlvbikgfHwgKGhpdFRlc3RBY3Rp b24gPT0gSGl0VGVzdEZsb2F0ICYmIGhpdFRlc3RGbG9hdHMocmVxdWVzdCwgcmVzdWx0LCBwb2lu dEluQ29udGFpbmVyLCBmaW5hbExvY2F0aW9uLngoKSwgZmluYWxMb2NhdGlvbi55KCkpKTsKICAg ICAgICAgfQogICAgIH0KIApJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJs b2NrLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2Nr LmgJKHJldmlzaW9uIDg4MjY3KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJs b2NrLmgJKHdvcmtpbmcgY29weSkKQEAgLTU4OCw3ICs1ODgsNyBAQCBwcml2YXRlOgogICAgIGlu dCBsb3dlc3RGbG9hdExvZ2ljYWxCb3R0b20oRmxvYXRpbmdPYmplY3Q6OlR5cGUgPSBGbG9hdGlu Z09iamVjdDo6RmxvYXRCb3RoKSBjb25zdDsKICAgICBpbnQgbmV4dEZsb2F0TG9naWNhbEJvdHRv bUJlbG93KGludCkgY29uc3Q7CiAgICAgCi0gICAgdmlydHVhbCBib29sIGhpdFRlc3RDb2x1bW5z KGNvbnN0IEhpdFRlc3RSZXF1ZXN0JiwgSGl0VGVzdFJlc3VsdCYsIGNvbnN0IEludFBvaW50JiBw b2ludEluQ29udGFpbmVyLCBpbnQgdHgsIGludCB0eSwgSGl0VGVzdEFjdGlvbik7CisgICAgdmly dHVhbCBib29sIGhpdFRlc3RDb2x1bW5zKGNvbnN0IEhpdFRlc3RSZXF1ZXN0JiwgSGl0VGVzdFJl c3VsdCYsIGNvbnN0IEludFBvaW50JiBwb2ludEluQ29udGFpbmVyLCBjb25zdCBJbnRQb2ludCYg YWNjdW11bGF0ZWRPZmZzZXQsIEhpdFRlc3RBY3Rpb24pOwogICAgIHZpcnR1YWwgYm9vbCBoaXRU ZXN0Q29udGVudHMoY29uc3QgSGl0VGVzdFJlcXVlc3QmLCBIaXRUZXN0UmVzdWx0JiwgY29uc3Qg SW50UG9pbnQmIHBvaW50SW5Db250YWluZXIsIGludCB0eCwgaW50IHR5LCBIaXRUZXN0QWN0aW9u KTsKICAgICBib29sIGhpdFRlc3RGbG9hdHMoY29uc3QgSGl0VGVzdFJlcXVlc3QmLCBIaXRUZXN0 UmVzdWx0JiwgY29uc3QgSW50UG9pbnQmIHBvaW50SW5Db250YWluZXIsIGludCB0eCwgaW50IHR5 KTsKIAo=