7071 2006-02-04 13:46:02 -0800 REGRESSION: Jumping to an anchor identifier makes page scroll horizontally 2006-02-06 22:31:26 -0800 1 1 1 Unclassified WebKit DOM 420+ Mac OS X 10.4 VERIFIED FIXED HasReduction, Regression P1 Normal --- 1 ddkilzer darin adele darin vicki oldest_to_newest 31357 0 ddkilzer 2006-02-04 13:46:02 -0800 Clicking on a '#name' link where the <a name="name"></a> tag is offset from the left side of the page causes the page to scroll to the right (assuming content on the page is wider than the visible area). This is a regression from Safari 2.0.3 (417.8) in 10.4.4. Test with ToT on revision r12557. 31358 1 6252 ddkilzer 2006-02-04 13:46:38 -0800 Created attachment 6252 Test case 31359 2 ddkilzer 2006-02-04 13:53:20 -0800 Neither Firefox 1.5.0.1 nor MSIE 6 jump to the right using the test case (Attachment 6252). 31363 3 ddkilzer 2006-02-04 15:42:29 -0800 Doing a binary search of nightly builds, the regression occurred here: Broken: WebKit-SVN-r12476.dmg Mon Jan 30 10:04:50 GMT 2006 Not broken: WebKit-SVN-r12467.dmg Mon Jan 30 4:45:53 GMT 2006 31396 4 darin 2006-02-04 22:42:05 -0800 My first guess would be that I broke this when doing my cleanup of Int/Float-Size/Point/Rect classes. 31397 5 darin 2006-02-04 22:55:04 -0800 Yes, I caused this problem by changing the definition of what the intersection function does for empty rectangles. Empty intersections now return a completely empty rectangle, but getRectToExpose depends on the old behavior where the X and Y intersections were separate. 31398 6 6259 darin 2006-02-04 23:52:52 -0800 Created attachment 6259 patch to fix the problem, including change log and test 31600 7 6259 adele 2006-02-06 11:32:26 -0800 Comment on attachment 6259 patch to fix the problem, including change log and test looks good. r=me 31677 8 ddkilzer 2006-02-06 22:31:26 -0800 Verified fixed! 6252 2006-02-04 13:46:38 -0800 2006-02-04 13:46:38 -0800 Test case bug-7071-test.html text/html 540 ddkilzer PCFET0NUWVBFIEhUTUwgUFVCTElDICItLy9XM0MvL0RURCBIVE1MIDQuMDEgVHJhbnNpdGlvbmFs Ly9FTiIgImh0dHA6Ly93d3cudzMub3JnL1RSL2h0bWw0L2xvb3NlLmR0ZCI+CjxodG1sPgo8aGVh ZD48dGl0bGU+U3BhbUNvcC5uZXQ8L3RpdGxlPgo8L2hlYWQ+Cjxib2R5PgoKPGRpdiBzdHlsZT0i cGFkZGluZy1sZWZ0OiAxMGVtOyI+Cgo8YSBocmVmPSIjcmVwb3J0Ij5DbGlja2luZyBoZXJlIHNo b3VsZCBub3QgY2F1c2UgdGhlIHBhZ2UgdG8gc2Nyb2xsIGhvcml6b250YWxseTwvYT4KPGRpdj50 aGlzaXNhcmVhbGx5d2lkZWxpbmV0aGlzaXNhcmVhbGx5d2lkZWxpbmV0aGlzaXNhcmVhbGx5d2lk ZWxpbmV0aGlzaXNhcmVhbGx5d2lkZWxpbmV0aGlzaXNhcmVhbGx5d2lkZWxpbmV0aGlzaXNhcmVh bGx5d2lkZWxpbmV0aGlzaXNhcmVhbGx5d2lkZWxpbmV0aGlzaXNhcmVhbGx5d2lkZWxpbmV0aGlz aXNhcmVhbGx5d2lkZWxpbmU8L2Rpdj4KCjxhIG5hbWU9InJlcG9ydCI+PC9hPkFuY2hvciBpcyBo ZXJlCjwvZGl2PgoKPC9ib2R5PjwvaHRtbD4K 6259 2006-02-04 23:52:52 -0800 2006-02-06 11:32:26 -0800 patch to fix the problem, including change log and test HorizontalScrollPatch.txt text/plain 12510 darin SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9D aGFuZ2VMb2cJKHJldmlzaW9uIDEyNTY4KQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMDYtMDItMDQgIERhcmluIEFkbGVyICA8ZGFy aW5AYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIC0gdGVzdCBmb3IgaHR0cDovL2J1Z3ppbGxhLm9wZW5kYXJ3aW4ub3JnL3Nob3dfYnVn LmNnaT9pZD03MDcxCisgICAgICAgICAgUkVHUkVTU0lPTjogSnVtcGluZyB0byBhbiBhbmNob3Ig aWRlbnRpZmllciBtYWtlcyBwYWdlIHNjcm9sbCBob3Jpem9udGFsbHkKKworICAgICAgICAqIGZh c3Qvb3ZlcmZsb3cvc2Nyb2xsLXZlcnRpY2FsLW5vdC1ob3Jpem9udGFsLmh0bWw6IEFkZGVkLgor ICAgICAgICAqIGZhc3Qvb3ZlcmZsb3cvc2Nyb2xsLXZlY3RpY2FsLW5vdC1ob3Jpem9udGFsLWV4 cGVjdGVkLnR4dDogQWRkZWQuCisKIDIwMDYtMDItMDQgIE1hY2llaiBTdGFjaG93aWFrICA8bWpz QGFwcGxlLmNvbT4KIAogICAgICAgICAtIHJldmVydGVkIENTUyBtZWRpYSBxdWVyaWVzIHBhdGNo LCBhcyBpdCBjYXVzZXMgcmFuZG9tIGNyYXNoZXMgb24gdGhlCkluZGV4OiBMYXlvdXRUZXN0cy9m YXN0L292ZXJmbG93L3Njcm9sbC12ZXJ0aWNhbC1ub3QtaG9yaXpvbnRhbC1leHBlY3RlZC50eHQK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9vdmVyZmxvdy9zY3JvbGwtdmVydGljYWwt bm90LWhvcml6b250YWwtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMv ZmFzdC9vdmVyZmxvdy9zY3JvbGwtdmVydGljYWwtbm90LWhvcml6b250YWwtZXhwZWN0ZWQudHh0 CShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDExIEBACitUaGlzaXNhcmVhbGx5d2lkZWxpbmV0aGF0 c2hlcmVhdHRoZXN0YXJ0c293ZWhhdmVhaG9yaXpvbnRhbHNjcm9sbGJhci5UaGlzaXNhcmVhbGx5 d2lkZWxpbmV0aGF0c2hlcmVhdHRoZXN0YXJ0c293ZWhhdmVhaG9yaXpvbnRhbHNjcm9sbGJhci5U aGlzaXNhcmVhbGx5d2lkZWxpbmV0aGF0c2hlcmVhdHRoZXN0YXJ0c293ZWhhdmVhaG9yaXpvbnRh bHNjcm9sbGJhci4KKworQW5jaG9yIGlzIGhlcmUsIGFuZCBzaG91bGQgY2F1c2UgYSB2ZXJ0aWNh bCBzY3JvbGwgb25seSwgbm90IGEgaG9yaXpvbnRhbCBzY3JvbGwuCisKK1NvLCBpZiB0aGUgdGVz dCBzdWNjZWVkcywgdGhlIHRleHQgYmVsb3cgc2hvdWxkIHNheSB0aGF0IHdlJ3JlIGF0IHRoZSBs ZWZ0IGJ1dCBub3QgYXQgdGhlIHRvcC4KKworU2Nyb2xsIHBvc2l0aW9uIGlzIGF0IGxlZnQgYW5k IG5vdCBhdCB0b3AuCisKK1RoaXMgaXMgdmVyeSB0YWxsIGxpbmUgdGhhdCdzIGhlcmUgYXQgdGhl IGVuZCBzbyB3ZSBoYXZlIGEgdmVydGljYWwgc2Nyb2xsIGJhci4KKworCgpQcm9wZXJ0eSBjaGFu Z2VzIG9uOiBMYXlvdXRUZXN0cy9mYXN0L292ZXJmbG93L3Njcm9sbC12ZXJ0aWNhbC1ub3QtaG9y aXpvbnRhbC1leHBlY3RlZC50eHQKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpOYW1lOiBzdm46ZW9sLXN0eWxlCiAgICsg bmF0aXZlCgpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9vdmVyZmxvdy9zY3JvbGwtdmVydGljYWwt bm90LWhvcml6b250YWwuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L292ZXJm bG93L3Njcm9sbC12ZXJ0aWNhbC1ub3QtaG9yaXpvbnRhbC5odG1sCShyZXZpc2lvbiAwKQorKysg TGF5b3V0VGVzdHMvZmFzdC9vdmVyZmxvdy9zY3JvbGwtdmVydGljYWwtbm90LWhvcml6b250YWwu aHRtbAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwzOCBAQAorPCFET0NUWVBFIEhUTUwgUFVCTElD ICItLy9XM0MvL0RURCBIVE1MIDQuMDEgVHJhbnNpdGlvbmFsLy9FTiIgImh0dHA6Ly93d3cudzMu b3JnL1RSL2h0bWw0L2xvb3NlLmR0ZCI+Cis8aHRtbD4KKzxoZWFkPgorPHNjcmlwdD4KK2Z1bmN0 aW9uIHRlc3QoKQoreworICAgIGlmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpIHsKKyAg ICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4dCgpOworICAgICAgICBsYXlvdXRU ZXN0Q29udHJvbGxlci53YWl0VW50aWxEb25lKCk7CisgICAgfQorICAgIHdpbmRvdy5sb2NhdGlv bj0nI2FuY2hvcic7CisgICAgc2V0VGltZW91dCgiZmluaXNoVGVzdCgpIiwgMCk7Cit9CitmdW5j dGlvbiBmaW5pc2hUZXN0KCkKK3sKKyAgICBpZiAod2luZG93LmxvY2F0aW9uLnRvU3RyaW5nKCku aW5kZXhPZigiIyIpID09IC0xKSB7CisgICAgICAgIHNldFRpbWVvdXQoImZpbmlzaFRlc3QoKSIs IDApOworICAgICAgICByZXR1cm47CisgICAgfQorICAgIHZhciBtZXNzYWdlID0gIlNjcm9sbCBw b3NpdGlvbiBpcyAiICsgKHdpbmRvdy5zY3JvbGxYID09IDAgPyAiIiA6ICJub3QgIikgKyAiYXQg bGVmdCBhbmQgIgorICAgICAgICArICh3aW5kb3cuc2Nyb2xsWSA9PSAwID8gIiIgOiAibm90ICIp ICsgImF0IHRvcC4iOworICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJjb25zb2xlIikuYXBw ZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUobWVzc2FnZSkpOworICAgIGlmICh3aW5k b3cubGF5b3V0VGVzdENvbnRyb2xsZXIpCisgICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLm5v dGlmeURvbmUoKTsKK30KKzwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHkgb25sb2FkPSJ0ZXN0KCki PgorCis8ZGl2IHN0eWxlPSJwYWRkaW5nLWxlZnQ6IDEwMHB4OyI+Cis8cD5UaGlzaXNhcmVhbGx5 d2lkZWxpbmV0aGF0c2hlcmVhdHRoZXN0YXJ0c293ZWhhdmVhaG9yaXpvbnRhbHNjcm9sbGJhci5U aGlzaXNhcmVhbGx5d2lkZWxpbmV0aGF0c2hlcmVhdHRoZXN0YXJ0c293ZWhhdmVhaG9yaXpvbnRh bHNjcm9sbGJhci5UaGlzaXNhcmVhbGx5d2lkZWxpbmV0aGF0c2hlcmVhdHRoZXN0YXJ0c293ZWhh dmVhaG9yaXpvbnRhbHNjcm9sbGJhci48L3A+Cis8cD48YSBuYW1lPSJhbmNob3IiPjwvYT5BbmNo b3IgaXMgaGVyZSwgYW5kIHNob3VsZCBjYXVzZSBhIHZlcnRpY2FsIHNjcm9sbCBvbmx5LCBub3Qg YSBob3Jpem9udGFsIHNjcm9sbC48L3A+Cis8cD5TbywgaWYgdGhlIHRlc3Qgc3VjY2VlZHMsIHRo ZSB0ZXh0IGJlbG93IHNob3VsZCBzYXkgdGhhdCB3ZSdyZSBhdCB0aGUgbGVmdCBidXQgbm90IGF0 IHRoZSB0b3AuPC9wPgorPHAgaWQ9ImNvbnNvbGUiPjwvcD4KKzxwIHN0eWxlPSJoZWlnaHQ6IDEw MDBweCI+VGhpcyBpcyB2ZXJ5IHRhbGwgbGluZSB0aGF0J3MgaGVyZSBhdCB0aGUgZW5kIHNvIHdl IGhhdmUgYSB2ZXJ0aWNhbCBzY3JvbGwgYmFyLjwvcD4KKzwvZGl2PgorCis8L2JvZHk+PC9odG1s PgoKUHJvcGVydHkgY2hhbmdlcyBvbjogTGF5b3V0VGVzdHMvZmFzdC9vdmVyZmxvdy9zY3JvbGwt dmVydGljYWwtbm90LWhvcml6b250YWwuaHRtbApfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCk5hbWU6IHN2bjptaW1lLXR5 cGUKICAgKyB0ZXh0L2h0bWwKTmFtZTogc3ZuOmVvbC1zdHlsZQogICArIG5hdGl2ZQoKSW5kZXg6 IFdlYkNvcmUvcmVuZGVyaW5nL3JlbmRlcl9sYXllci5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29y ZS9yZW5kZXJpbmcvcmVuZGVyX2xheWVyLmNwcAkocmV2aXNpb24gMTI1NjgpCisrKyBXZWJDb3Jl L3JlbmRlcmluZy9yZW5kZXJfbGF5ZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02MTgsNyArNjE4 LDYgQEAKICAgICAgICAgICAgIC8vIEFkanVzdCBvZmZzZXRzIGlmIHRoZXkncmUgb3V0c2lkZSBv ZiB0aGUgYWxsb3dhYmxlIHJhbmdlLgogICAgICAgICAgICAgeE9mZnNldCA9IGtNYXgoMCwga01p bih2aWV3LT5jb250ZW50c1dpZHRoKCksIHhPZmZzZXQpKTsKICAgICAgICAgICAgIHlPZmZzZXQg PSBrTWF4KDAsIGtNaW4odmlldy0+Y29udGVudHNIZWlnaHQoKSwgeU9mZnNldCkpOwotICAgICAg ICAgICAgCiAKICAgICAgICAgICAgIGlmIChtX29iamVjdC0+ZG9jdW1lbnQoKSAmJiBtX29iamVj dC0+ZG9jdW1lbnQoKS0+b3duZXJFbGVtZW50KCkgJiYgbV9vYmplY3QtPmRvY3VtZW50KCktPm93 bmVyRWxlbWVudCgpLT5yZW5kZXJlcigpKSB7CiAgICAgICAgICAgICAgICAgdmlldy0+c2V0Q29u dGVudHNQb3MoeE9mZnNldCwgeU9mZnNldCk7CkBAIC02MzcsNzIgKzYzNiw3NyBAQAogICAgICAg ICBwYXJlbnRMYXllci0+c2Nyb2xsUmVjdFRvVmlzaWJsZShuZXdSZWN0LCBhbGlnblgsIGFsaWdu WSk7CiB9CiAKLUludFJlY3QgUmVuZGVyTGF5ZXI6OmdldFJlY3RUb0V4cG9zZShjb25zdCBJbnRS ZWN0ICZ2aXNpYmxlUmVjdCwgY29uc3QgSW50UmVjdCAmZXhwb3NlUmVjdCwgY29uc3QgU2Nyb2xs QWxpZ25tZW50JiBhbGlnblgsIGNvbnN0IFNjcm9sbEFsaWdubWVudCYgYWxpZ25ZKSB7Ci0KLSAg ICBpbnQgeCwgeSwgdywgaDsKLSAgICB4ID0gZXhwb3NlUmVjdC54KCk7Ci0gICAgeSA9IGV4cG9z ZVJlY3QueSgpOwotICAgIHcgPSBleHBvc2VSZWN0LndpZHRoKCk7Ci0gICAgaCA9IGV4cG9zZVJl Y3QuaGVpZ2h0KCk7Ci0gICAgCi0gICAgLy8gRmluZCB0aGUgYXBwcm9wcmlhdGUgWCBjb29yZGlu YXRlIHRvIHNjcm9sbCB0by4KLSAgICBTY3JvbGxCZWhhdmlvciBzY3JvbGxYID0gZ2V0SGlkZGVu QmVoYXZpb3IoYWxpZ25YKTsKLSAgICBpbnQgaW50ZXJzZWN0V2lkdGggPSBpbnRlcnNlY3Rpb24o dmlzaWJsZVJlY3QsIGV4cG9zZVJlY3QpLndpZHRoKCk7Ci0gICAgLy8gSWYgdGhlIHJlY3Rhbmds ZSBpcyBmdWxseSB2aXNpYmxlLCB1c2UgdGhlIHNwZWNpZmllZCB2aXNpYmxlIGJlaGF2aW9yLgot ICAgIC8vIElmIHRoZSByZWN0YW5nbGUgaXMgcGFydGlhbGx5IHZpc2libGUsIGJ1dCBvdmVyIGEg Y2VydGFpbiB0aHJlc2hvbGQsIHRoZW4gdHJlYXQgaXQgYXMgZnVsbHkgdmlzaWJsZSB0byBhdm9p ZCB1bm5lY2Vzc2FyeSBob3Jpem9udGFsIHNjcm9sbGluZwotICAgIGlmIChpbnRlcnNlY3RXaWR0 aCA9PSB3IHx8IGludGVyc2VjdFdpZHRoID49IE1JTl9JTlRFUlNFQ1RfRk9SX1JFVkVBTCkKK0lu dFJlY3QgUmVuZGVyTGF5ZXI6OmdldFJlY3RUb0V4cG9zZShjb25zdCBJbnRSZWN0ICZ2aXNpYmxl UmVjdCwgY29uc3QgSW50UmVjdCAmZXhwb3NlUmVjdCwgY29uc3QgU2Nyb2xsQWxpZ25tZW50JiBh bGlnblgsIGNvbnN0IFNjcm9sbEFsaWdubWVudCYgYWxpZ25ZKQoreworICAgIC8vIERldGVybWlu ZSB0aGUgYXBwcm9wcmlhdGUgWCBiZWhhdmlvci4KKyAgICBTY3JvbGxCZWhhdmlvciBzY3JvbGxY OworICAgIEludFJlY3QgZXhwb3NlUmVjdFgoZXhwb3NlUmVjdC54KCksIHZpc2libGVSZWN0Lnko KSwgZXhwb3NlUmVjdC53aWR0aCgpLCB2aXNpYmxlUmVjdC5oZWlnaHQoKSk7CisgICAgaW50IGlu dGVyc2VjdFdpZHRoID0gaW50ZXJzZWN0aW9uKHZpc2libGVSZWN0LCBleHBvc2VSZWN0WCkud2lk dGgoKTsKKyAgICBpZiAoaW50ZXJzZWN0V2lkdGggPT0gZXhwb3NlUmVjdC53aWR0aCgpIHx8IGlu dGVyc2VjdFdpZHRoID49IE1JTl9JTlRFUlNFQ1RfRk9SX1JFVkVBTCkKKyAgICAgICAgLy8gSWYg dGhlIHJlY3RhbmdsZSBpcyBmdWxseSB2aXNpYmxlLCB1c2UgdGhlIHNwZWNpZmllZCB2aXNpYmxl IGJlaGF2aW9yLgorICAgICAgICAvLyBJZiB0aGUgcmVjdGFuZ2xlIGlzIHBhcnRpYWxseSB2aXNp YmxlLCBidXQgb3ZlciBhIGNlcnRhaW4gdGhyZXNob2xkLAorICAgICAgICAvLyB0aGVuIHRyZWF0 IGl0IGFzIGZ1bGx5IHZpc2libGUgdG8gYXZvaWQgdW5uZWNlc3NhcnkgaG9yaXpvbnRhbCBzY3Jv bGxpbmcKICAgICAgICAgc2Nyb2xsWCA9IGdldFZpc2libGVCZWhhdmlvcihhbGlnblgpOwogICAg IGVsc2UgaWYgKGludGVyc2VjdFdpZHRoID09IHZpc2libGVSZWN0LndpZHRoKCkpIHsKLSAgICAg ICAgLy8gSWYgdGhlIHJlY3QgaXMgYmlnZ2VyIHRoYW4gdGhlIHZpc2libGUgYXJlYSwgZG9uJ3Qg Ym90aGVyIHRyeWluZyB0byBjZW50ZXIuICBPdGhlciBhbGlnbm1lbnRzIHdpbGwgd29yay4KLSAg ICAgICAgaWYgKGdldFZpc2libGVCZWhhdmlvcihhbGlnblgpID09IGFsaWduQ2VudGVyKQorICAg ICAgICAvLyBJZiB0aGUgcmVjdCBpcyBiaWdnZXIgdGhhbiB0aGUgdmlzaWJsZSBhcmVhLCBkb24n dCBib3RoZXIgdHJ5aW5nIHRvIGNlbnRlci4gT3RoZXIgYWxpZ25tZW50cyB3aWxsIHdvcmsuCisg ICAgICAgIHNjcm9sbFggPSBnZXRWaXNpYmxlQmVoYXZpb3IoYWxpZ25YKTsKKyAgICAgICAgaWYg KHNjcm9sbFggPT0gYWxpZ25DZW50ZXIpCiAgICAgICAgICAgICBzY3JvbGxYID0gbm9TY3JvbGw7 Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIHNjcm9sbFggPSBnZXRWaXNpYmxlQmVoYXZpb3Io YWxpZ25YKTsKLSAgICB9Ci0gICAgLy8gSWYgdGhlIHJlY3RhbmdsZSBpcyBwYXJ0aWFsbHkgdmlz aWJsZSwgYnV0IG5vdCBhYm92ZSB0aGUgbWluaW11bSB0aHJlc2hvbGQsIHVzZSB0aGUgc3BlY2lm aWVkIHBhcnRpYWwgYmVoYXZpb3IKLSAgICBlbHNlIGlmIChpbnRlcnNlY3RXaWR0aCA+IDApCisg ICAgfSBlbHNlIGlmIChpbnRlcnNlY3RXaWR0aCA+IDApCisgICAgICAgIC8vIElmIHRoZSByZWN0 YW5nbGUgaXMgcGFydGlhbGx5IHZpc2libGUsIGJ1dCBub3QgYWJvdmUgdGhlIG1pbmltdW0gdGhy ZXNob2xkLCB1c2UgdGhlIHNwZWNpZmllZCBwYXJ0aWFsIGJlaGF2aW9yCiAgICAgICAgIHNjcm9s bFggPSBnZXRQYXJ0aWFsQmVoYXZpb3IoYWxpZ25YKTsKLSAgICAgICAgCisgICAgZWxzZQorICAg ICAgICBzY3JvbGxYID0gZ2V0SGlkZGVuQmVoYXZpb3IoYWxpZ25YKTsKKyAgICAvLyBJZiB3ZSdy ZSB0cnlpbmcgdG8gYWxpZ24gdG8gdGhlIGNsb3Nlc3QgZWRnZSwgYW5kIHRoZSBleHBvc2VSZWN0 IGlzIGZ1cnRoZXIgcmlnaHQKKyAgICAvLyB0aGFuIHRoZSB2aXNpYmxlUmVjdCwgYW5kIG5vdCBi aWdnZXIgdGhhbiB0aGUgdmlzaWJsZSBhcmVhLCB0aGVuIGFsaWduIHdpdGggdGhlIHJpZ2h0Lgor ICAgIGlmIChzY3JvbGxYID09IGFsaWduVG9DbG9zZXN0RWRnZSAmJiBleHBvc2VSZWN0LnJpZ2h0 KCkgPiB2aXNpYmxlUmVjdC5yaWdodCgpICYmIGV4cG9zZVJlY3Qud2lkdGgoKSA8IHZpc2libGVS ZWN0LndpZHRoKCkpCisgICAgICAgIHNjcm9sbFggPSBhbGlnblJpZ2h0OworCisgICAgLy8gR2l2 ZW4gdGhlIFggYmVoYXZpb3IsIGNvbXB1dGUgdGhlIFggY29vcmRpbmF0ZS4KKyAgICBpbnQgeDsK ICAgICBpZiAoc2Nyb2xsWCA9PSBub1Njcm9sbCkgCiAgICAgICAgIHggPSB2aXNpYmxlUmVjdC54 KCk7Ci0gICAgLy8gSWYgd2UncmUgdHJ5aW5nIHRvIGFsaWduIHRvIHRoZSBjbG9zZXN0IGVkZ2Us IGFuZCB0aGUgZXhwb3NlUmVjdCBpcyBmdXJ0aGVyIHJpZ2h0IHRoYW4gdGhlIHZpc2libGVSZWN0 LCBhbmQgbm90IGJpZ2dlciB0aGFuIHRoZSB2aXNpYmxlIGFyZWEsIHRoZW4gYWxpZ25SaWdodC4K LSAgICBlbHNlIGlmICgoc2Nyb2xsWCA9PSBhbGlnblJpZ2h0KSB8fCAoKHNjcm9sbFggPT0gYWxp Z25Ub0Nsb3Nlc3RFZGdlKSAmJiBleHBvc2VSZWN0LnJpZ2h0KCkgPiB2aXNpYmxlUmVjdC5yaWdo dCgpICYmIHcgPCB2aXNpYmxlUmVjdC53aWR0aCgpKSkKLSAgICAgICAgeCA9IChleHBvc2VSZWN0 LnJpZ2h0KCkgLSAxKSAtIHZpc2libGVSZWN0LndpZHRoKCk7CisgICAgZWxzZSBpZiAoc2Nyb2xs WCA9PSBhbGlnblJpZ2h0KQorICAgICAgICB4ID0gZXhwb3NlUmVjdC5yaWdodCgpIC0gdmlzaWJs ZVJlY3Qud2lkdGgoKTsKICAgICBlbHNlIGlmIChzY3JvbGxYID09IGFsaWduQ2VudGVyKQotICAg ICAgICB4IC09ICh2aXNpYmxlUmVjdC53aWR0aCgpIC0gdykgLyAyOwotICAgIC8vIEJ5IGRlZmF1 bHQsIHggaXMgc2V0IHRvIHRoZSBsZWZ0IG9mIHRoZSBleHBvc2VSZWN0LCBzbyBmb3IgdGhlIGFs aWduTGVmdCBjYXNlLCAKLSAgICAvLyBvciB0aGUgYWxpZ25Ub0Nsb3Nlc3RFZGdlIGNhc2Ugd2hl cmUgdGhlIGNsb3Nlc3QgZWRnZSBpcyB0aGUgbGVmdCBlZGdlLCB0aGVuIHggZG9lcyBub3QgbmVl ZCB0byBiZSBjaGFuZ2VkLgotICAgIHcgPSB2aXNpYmxlUmVjdC53aWR0aCgpOwotICAgIAotICAg IC8vIEZpbmQgdGhlIGFwcHJvcHJpYXRlIFkgY29vcmRpbmF0ZSB0byBzY3JvbGwgdG8uCi0gICAg U2Nyb2xsQmVoYXZpb3Igc2Nyb2xsWSA9IGdldEhpZGRlbkJlaGF2aW9yKGFsaWduWSk7Ci0gICAg aW50IGludGVyc2VjdEhlaWdodCA9IGludGVyc2VjdGlvbih2aXNpYmxlUmVjdCwgZXhwb3NlUmVj dCkuaGVpZ2h0KCk7Ci0gICAgLy8gSWYgdGhlIHJlY3RhbmdsZSBpcyBmdWxseSB2aXNpYmxlLCB1 c2UgdGhlIHNwZWNpZmllZCB2aXNpYmxlIGJlaGF2aW9yLgotICAgIGlmIChpbnRlcnNlY3RIZWln aHQgPT0gaCkKKyAgICAgICAgeCA9IGV4cG9zZVJlY3QueCgpICsgKGV4cG9zZVJlY3Qud2lkdGgo KSAtIHZpc2libGVSZWN0LndpZHRoKCkpIC8gMjsKKyAgICBlbHNlCisgICAgICAgIHggPSBleHBv c2VSZWN0LngoKTsKKworICAgIC8vIERldGVybWluZSB0aGUgYXBwcm9wcmlhdGUgWSBiZWhhdmlv ci4KKyAgICBTY3JvbGxCZWhhdmlvciBzY3JvbGxZOworICAgIEludFJlY3QgZXhwb3NlUmVjdFko dmlzaWJsZVJlY3QueCgpLCBleHBvc2VSZWN0LnkoKSwgdmlzaWJsZVJlY3Qud2lkdGgoKSwgZXhw b3NlUmVjdC5oZWlnaHQoKSk7CisgICAgaW50IGludGVyc2VjdEhlaWdodCA9IGludGVyc2VjdGlv bih2aXNpYmxlUmVjdCwgZXhwb3NlUmVjdFkpLmhlaWdodCgpOworICAgIGlmIChpbnRlcnNlY3RI ZWlnaHQgPT0gZXhwb3NlUmVjdC5oZWlnaHQoKSkKKyAgICAgICAgLy8gSWYgdGhlIHJlY3Rhbmds ZSBpcyBmdWxseSB2aXNpYmxlLCB1c2UgdGhlIHNwZWNpZmllZCB2aXNpYmxlIGJlaGF2aW9yLgog ICAgICAgICBzY3JvbGxZID0gZ2V0VmlzaWJsZUJlaGF2aW9yKGFsaWduWSk7CiAgICAgZWxzZSBp ZiAoaW50ZXJzZWN0SGVpZ2h0ID09IHZpc2libGVSZWN0LmhlaWdodCgpKSB7Ci0gICAgICAgIC8v IElmIHRoZSByZWN0IGlzIGJpZ2dlciB0aGFuIHRoZSB2aXNpYmxlIGFyZWEsIGRvbid0IGJvdGhl ciB0cnlpbmcgdG8gY2VudGVyLiAgT3RoZXIgYWxpZ25tZW50cyB3aWxsIHdvcmsuCi0gICAgICAg IGlmIChnZXRWaXNpYmxlQmVoYXZpb3IoYWxpZ25ZKSA9PSBhbGlnbkNlbnRlcikKKyAgICAgICAg Ly8gSWYgdGhlIHJlY3QgaXMgYmlnZ2VyIHRoYW4gdGhlIHZpc2libGUgYXJlYSwgZG9uJ3QgYm90 aGVyIHRyeWluZyB0byBjZW50ZXIuIE90aGVyIGFsaWdubWVudHMgd2lsbCB3b3JrLgorICAgICAg ICBzY3JvbGxZID0gZ2V0VmlzaWJsZUJlaGF2aW9yKGFsaWduWSk7CisgICAgICAgIGlmIChzY3Jv bGxZID09IGFsaWduQ2VudGVyKQogICAgICAgICAgICAgc2Nyb2xsWSA9IG5vU2Nyb2xsOwotICAg ICAgICBlbHNlCi0gICAgICAgICAgICBzY3JvbGxZID0gZ2V0VmlzaWJsZUJlaGF2aW9yKGFsaWdu WSk7Ci0gICAgfQotICAgIC8vIElmIHRoZSByZWN0YW5nbGUgaXMgcGFydGlhbGx5IHZpc2libGUs IHVzZSB0aGUgc3BlY2lmaWVkIHBhcnRpYWwgYmVoYXZpb3IKLSAgICBlbHNlIGlmIChpbnRlcnNl Y3RIZWlnaHQgPiAwKQorICAgIH0gZWxzZSBpZiAoaW50ZXJzZWN0SGVpZ2h0ID4gMCkKKyAgICAg ICAgLy8gSWYgdGhlIHJlY3RhbmdsZSBpcyBwYXJ0aWFsbHkgdmlzaWJsZSwgdXNlIHRoZSBzcGVj aWZpZWQgcGFydGlhbCBiZWhhdmlvcgogICAgICAgICBzY3JvbGxZID0gZ2V0UGFydGlhbEJlaGF2 aW9yKGFsaWduWSk7Ci0gICAgICAgIAorICAgIGVsc2UKKyAgICAgICAgc2Nyb2xsWSA9IGdldEhp ZGRlbkJlaGF2aW9yKGFsaWduWSk7CisgICAgLy8gSWYgd2UncmUgdHJ5aW5nIHRvIGFsaWduIHRv IHRoZSBjbG9zZXN0IGVkZ2UsIGFuZCB0aGUgZXhwb3NlUmVjdCBpcyBmdXJ0aGVyIGRvd24KKyAg ICAvLyB0aGFuIHRoZSB2aXNpYmxlUmVjdCwgYW5kIG5vdCBiaWdnZXIgdGhhbiB0aGUgdmlzaWJs ZSBhcmVhLCB0aGVuIGFsaWduIHdpdGggdGhlIGJvdHRvbS4KKyAgICBpZiAoc2Nyb2xsWSA9PSBh bGlnblRvQ2xvc2VzdEVkZ2UgJiYgZXhwb3NlUmVjdC5ib3R0b20oKSA+IHZpc2libGVSZWN0LmJv dHRvbSgpICYmIGV4cG9zZVJlY3QuaGVpZ2h0KCkgPCB2aXNpYmxlUmVjdC5oZWlnaHQoKSkKKyAg ICAgICAgc2Nyb2xsWSA9IGFsaWduQm90dG9tOworCisgICAgLy8gR2l2ZW4gdGhlIFkgYmVoYXZp b3IsIGNvbXB1dGUgdGhlIFkgY29vcmRpbmF0ZS4KKyAgICBpbnQgeTsKICAgICBpZiAoc2Nyb2xs WSA9PSBub1Njcm9sbCkgCiAgICAgICAgIHkgPSB2aXNpYmxlUmVjdC55KCk7Ci0gICAgLy8gSWYg d2UncmUgdHJ5aW5nIHRvIGFsaWduIHRvIHRoZSBjbG9zZXN0IGVkZ2UsIGFuZCB0aGUgZXhwb3Nl UmVjdCBpcyBmdXJ0aGVyIGRvd24gdGhhbiB0aGUgdmlzaWJsZVJlY3QsIGFuZCBub3QgYmlnZ2Vy IHRoYW4gdGhlIHZpc2libGUgYXJlYSwgdGhlbiBhbGlnbkJvdHRvbS4KLSAgICBlbHNlIGlmICgo c2Nyb2xsWSA9PSBhbGlnbkJvdHRvbSkgfHwgKChzY3JvbGxZID09IGFsaWduVG9DbG9zZXN0RWRn ZSkgJiYgZXhwb3NlUmVjdC5ib3R0b20oKSA+IHZpc2libGVSZWN0LmJvdHRvbSgpICYmIGggPCB2 aXNpYmxlUmVjdC5oZWlnaHQoKSkpCi0gICAgICAgIHkgPSAoZXhwb3NlUmVjdC5ib3R0b20oKSAt IDEpIC0gdmlzaWJsZVJlY3QuaGVpZ2h0KCk7CisgICAgZWxzZSBpZiAoc2Nyb2xsWSA9PSBhbGln bkJvdHRvbSkKKyAgICAgICAgeSA9IGV4cG9zZVJlY3QuYm90dG9tKCkgLSB2aXNpYmxlUmVjdC5o ZWlnaHQoKTsKICAgICBlbHNlIGlmIChzY3JvbGxZID09IGFsaWduQ2VudGVyKQotICAgICAgICB5 IC09ICh2aXNpYmxlUmVjdC5oZWlnaHQoKSAtIGgpIC8gMjsKLSAgICAvLyBCeSBkZWZhdWx0LCB5 IGlzIHNldCB0byB0aGUgdG9wIG9mIHRoZSBleHBvc2VSZWN0LCBzbyBmb3IgdGhlIGFsaWduVG9w IGNhc2UsIAotICAgIC8vIG9yIHRoZSBhbGlnblRvRWRnZVkgY2FzZSB3aGVyZSB0aGUgY2xvc2Vz dCBlZGdlIGlzIHRoZSB0b3AgZWRnZSwgdGhlbiB5IGRvZXMgbm90IG5lZWQgdG8gYmUgY2hhbmdl ZC4KLSAgICBoID0gdmlzaWJsZVJlY3QuaGVpZ2h0KCk7Ci0gICAgCi0gICAgcmV0dXJuIEludFJl Y3QoeCwgeSwgdywgaCk7CisgICAgICAgIHkgPSBleHBvc2VSZWN0LnkoKSArIChleHBvc2VSZWN0 LmhlaWdodCgpIC0gdmlzaWJsZVJlY3QuaGVpZ2h0KCkpIC8gMjsKKyAgICBlbHNlCisgICAgICAg IHkgPSBleHBvc2VSZWN0LnkoKTsKKworICAgIHJldHVybiBJbnRSZWN0KEludFBvaW50KHgsIHkp LCB2aXNpYmxlUmVjdC5zaXplKCkpOwogfQogCiB2b2lkIFJlbmRlckxheWVyOjp1cGRhdGVTY3Jv bGxQb3NpdGlvbkZyb21TY3JvbGxiYXJzKCkKSW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9nCShyZXZpc2lvbiAxMjU2OCkKKysrIFdlYkNvcmUv Q2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMDYtMDItMDQgIERh cmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIC0gZml4IGh0dHA6Ly9idWd6aWxsYS5vcGVuZGFyd2luLm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NzA3MQorICAgICAgICAgIFJFR1JFU1NJT046IEp1bXBpbmcgdG8g YW4gYW5jaG9yIGlkZW50aWZpZXIgbWFrZXMgcGFnZSBzY3JvbGwgaG9yaXpvbnRhbGx5CisKKyAg ICAgICAgVGVzdDogZmFzdC9vdmVyZmxvdy9zY3JvbGwtdmVydGljYWwtbm90LWhvcml6b250YWwu aHRtbAorCisgICAgICAgICogcmVuZGVyaW5nL3JlbmRlcl9sYXllci5jcHA6IChXZWJDb3JlOjpS ZW5kZXJMYXllcjo6Z2V0UmVjdFRvRXhwb3NlKToKKyAgICAgICAgRml4ZWQgcmVjdGFuZ2xlIGlu dGVyc2VjdGlvbnMgc28gdGhhdCB0aGUgWCBhbmQgWSBkaW1lbnNpb25zIGFyZSBpbmRlcGVuZGVu dCwKKyAgICAgICAgdG8gZml4IHRoZSBidWcuIEFsc28gcmVzdHJ1Y3R1cmVkIHRoZSBmdW5jdGlv biBhIGJpdCBzbyBpdCdzIGV2ZW4gZWFzaWVyIHRvCisgICAgICAgIHJlYWQgYW5kIHVuZGVyc3Rh bmQuCisKIDIwMDYtMDItMDQgIE1hY2llaiBTdGFjaG93aWFrICA8bWpzQGFwcGxlLmNvbT4KIAog ICAgICAgICBSZXZpZXdlZCBieSBEYXJpbi4K