31570 2009-11-16 17:14:32 -0800 scrollbar fixes for wxWebKit 2009-11-16 21:51:13 -0800 1 1 1 Unclassified WebKit WebKit wx 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 0 robin webkit-unassigned kevino oldest_to_newest 164118 0 robin 2009-11-16 17:14:32 -0800 Make sure wx scrollbar drawing code factors in transforms when switching backends, fix calcs for scrollbar length, and tweak the Mac scrollbar tracking rects. 164119 1 43332 robin 2009-11-16 17:16:00 -0800 Created attachment 43332 patch file 164154 2 kevino 2009-11-16 21:51:13 -0800 Landed in r51065, thanks! 43332 2009-11-16 17:16:00 -0800 2009-11-16 17:17:05 -0800 patch file scrollbar_fixes.patch text/plain 9006 robin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MTA0NikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjIgQEAKKzIwMDktMTEtMTYgIFJvYmluIER1bm4gIDxyb2JpbkBhbGxkdW5uLmNv bT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWtl IHN1cmUgd3ggc2Nyb2xsYmFyIGRyYXdpbmcgY29kZSBmYWN0b3JzIGluIHRyYW5zZm9ybXMgd2hl biBzd2l0Y2hpbmcgYmFja2VuZHMsCisgICAgICAgIGZpeCBjYWxjcyBmb3Igc2Nyb2xsYmFyIGxl bmd0aCwgYW5kIHR3ZWFrIHRoZSBNYWMgc2Nyb2xsYmFyIHRyYWNraW5nIHJlY3RzLgorCisgICAg ICAgICogcGxhdGZvcm0vd3gvU2Nyb2xsYmFyVGhlbWVXeC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpTY3JvbGxiYXJUaGVtZVd4OjptaW5pbXVtVGh1bWJMZW5ndGgpOgorICAgICAgICAoV2ViQ29y ZTo6U2Nyb2xsYmFyVGhlbWVXeDo6c3BsaXRUcmFjayk6CisgICAgICAgIChXZWJDb3JlOjpTY3Jv bGxiYXJUaGVtZVd4Ojpmb3J3YXJkQnV0dG9uUmVjdCk6CisgICAgICAgICogcGxhdGZvcm0vd3gv U2Nyb2xsYmFyVGhlbWVXeC5oOgorICAgICAgICAqIHBsYXRmb3JtL3d4L3d4Y29kZS9ndGsvc2Ny b2xsYmFyX3JlbmRlci5jcHA6CisgICAgICAgICh3eFJlbmRlcmVyX0RyYXdTY3JvbGxiYXIpOgor ICAgICAgICAqIHBsYXRmb3JtL3d4L3d4Y29kZS9zY3JvbGxiYXJfcmVuZGVyLmg6CisgICAgICAg IChjYWxjVGh1bWJTdGFydEFuZExlbmd0aCk6CisgICAgICAgICogcGxhdGZvcm0vd3gvd3hjb2Rl L3dpbi9zY3JvbGxiYXJfcmVuZGVyLmNwcDoKKyAgICAgICAgKHd4UmVuZGVyZXJfRHJhd1Njcm9s bGJhcik6CisKIDIwMDktMTEtMTUgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUB3ZWJraXQub3Jn PgogCiAgICAgICAgIFJldmlld2VkIGJ5IE9saXZlciBIdW50LgpJbmRleDogV2ViQ29yZS9wbGF0 Zm9ybS93eC93eGNvZGUvZ3RrL3Njcm9sbGJhcl9yZW5kZXIuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvcGxhdGZvcm0vd3gvd3hjb2RlL2d0ay9zY3JvbGxiYXJfcmVuZGVyLmNwcAkocmV2aXNp b24gNTEwNDYpCisrKyBXZWJDb3JlL3BsYXRmb3JtL3d4L3d4Y29kZS9ndGsvc2Nyb2xsYmFyX3Jl bmRlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExNiw5ICsxMTYsMTggQEAKICAgICBkYy5TZXRQ ZW4od3hQZW4od3hTeXN0ZW1TZXR0aW5nczo6R2V0Q29sb3VyKHd4U1lTX0NPTE9VUl9CVE5TSEFE T1cpKSk7CiAgICAgZGMuRHJhd1JlY3RhbmdsZShyZWN0LngsIHJlY3QueSwgcmVjdC53aWR0aCwg cmVjdC5oZWlnaHQpOwogCisgICAgLy8gd2hlbiBnb2luZyBmcm9tIENhaXJvIC0+IEdkaywgYW55 IENhaXJvIGNvbnRleHQgdHJhbnNmb3JtYXRpb25zIGFyZSBsb3N0CisgICAgLy8gc28gd2UgbmVl ZCB0byBhbHRlciB0aGUgY29vcmRpbmF0ZXMgdG8gcmVmbGVjdCB0aGVpciB0cmFuc2Zvcm1lZCBw b2ludC4KKyAgICBkb3VibGUgeHRyYW5zID0gMDsKKyAgICBkb3VibGUgeXRyYW5zID0gMDsKKyAg ICAKKyAgICB3eEdDREMqIGdjZGMgPSB3eER5bmFtaWNDYXN0KCZkYywgd3hHQ0RDKTsKKyAgICB3 eEdyYXBoaWNzQ29udGV4dCogZ2MgPSBnY2RjLT5HZXRHcmFwaGljc0NvbnRleHQoKTsKKyAgICBn Yy0+R2V0VHJhbnNmb3JtKCkuVHJhbnNmb3JtUG9pbnQoJnh0cmFucywgJnl0cmFucyk7CisKICAg ICB3eFJlbmRlcmVyTmF0aXZlJiByZW5kZXJlciA9IHd4UmVuZGVyZXJOYXRpdmU6OkdldCgpOwot ICAgIGludCB4ID0gcmVjdC54OwotICAgIGludCB5ID0gcmVjdC55OworICAgIGludCB4ID0gcmVj dC54ICsgKGludCl4dHJhbnM7CisgICAgaW50IHkgPSByZWN0LnkgKyAoaW50KXl0cmFuczsKIAog ICAgIGludCBidXR0b25MZW5ndGggPSAxNjsKIApAQCAtMTM4LDEzICsxNDcsMTUgQEAKICAgICBw aHlzaWNhbExlbmd0aCAtPSBidXR0b25MZW5ndGgqMjsKICAgICBpbnQgdGh1bWJTdGFydCA9IDA7 CiAgICAgaW50IHRodW1iTGVuZ3RoID0gMDsKLSAgICBjYWxjVGh1bWJTdGFydEFuZExlbmd0aChw aHlzaWNhbExlbmd0aCwgbWF4ICsgc3RlcCwgY3VycmVudCwgc3RlcCwgJnRodW1iU3RhcnQsICZ0 aHVtYkxlbmd0aCk7CisgICAgY2FsY1RodW1iU3RhcnRBbmRMZW5ndGgocGh5c2ljYWxMZW5ndGgs IG1heCwgY3VycmVudCwgc3RlcCwgJnRodW1iU3RhcnQsICZ0aHVtYkxlbmd0aCk7CiAKICAgICBp ZiAoaG9yaXopIHsKLSAgICAgICAgYnV0dG9uUmVjdC54ID0gdGh1bWJTdGFydCArIGJ1dHRvbkxl bmd0aDsKKyAgICAgICAgYnV0dG9uUmVjdC54ID0geCArIHRodW1iU3RhcnQgKyBidXR0b25MZW5n dGg7CisgICAgICAgIGJ1dHRvblJlY3QueSA9IHk7CiAgICAgICAgIGJ1dHRvblJlY3Qud2lkdGgg PSB0aHVtYkxlbmd0aDsKICAgICB9IGVsc2UgewotICAgICAgICBidXR0b25SZWN0LnkgPSB0aHVt YlN0YXJ0ICsgYnV0dG9uTGVuZ3RoOworICAgICAgICBidXR0b25SZWN0LnggPSB4OworICAgICAg ICBidXR0b25SZWN0LnkgPSB5ICsgdGh1bWJTdGFydCArIGJ1dHRvbkxlbmd0aDsKICAgICAgICAg YnV0dG9uUmVjdC5oZWlnaHQgPSB0aHVtYkxlbmd0aDsKICAgICB9CiAKSW5kZXg6IFdlYkNvcmUv cGxhdGZvcm0vd3gvd3hjb2RlL3Njcm9sbGJhcl9yZW5kZXIuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJD b3JlL3BsYXRmb3JtL3d4L3d4Y29kZS9zY3JvbGxiYXJfcmVuZGVyLmgJKHJldmlzaW9uIDUxMDQ2 KQorKysgV2ViQ29yZS9wbGF0Zm9ybS93eC93eGNvZGUvc2Nyb2xsYmFyX3JlbmRlci5oCSh3b3Jr aW5nIGNvcHkpCkBAIC01MCwxNiArNTAsMTcgQEAKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGludCBjdXJyZW50LCB3eFNjcm9sbGJhclBhcnQgZm9jdXNQYXJ0LCB3eFNj cm9sbGJhclBhcnQgaG92ZXJQYXJ0LCAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGludCBtYXgsIGludCBzdGVwLCBpbnQgZmxhZ3M9MCk7CiAKLWlubGluZSB2b2lkIGNh bGNUaHVtYlN0YXJ0QW5kTGVuZ3RoKGludCBwaHlzaWNhbExlbmd0aCwgaW50IHZpcnR1YWxMZW5n dGgsIGludCBjdXJyZW50LCAKK2lubGluZSB2b2lkIGNhbGNUaHVtYlN0YXJ0QW5kTGVuZ3RoKGlu dCBwaHlzaWNhbExlbmd0aCwgaW50IG1heCwgaW50IGN1cnJlbnQsIAogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBpbnQgc3RlcCwgaW50ICp0aHVtYlN0YXJ0LCBpbnQgKnRodW1iTGVu Z3RoKQogewotICAgICAgICBmbG9hdCBwcm9wb3J0aW9uID0gKGZsb2F0KXBoeXNpY2FsTGVuZ3Ro IC8gdmlydHVhbExlbmd0aDsKLSAgICAgICAgZmxvYXQgc2NhbGUgPSAoZmxvYXQpdmlydHVhbExl bmd0aCAvIHBoeXNpY2FsTGVuZ3RoOwotICAgICAgICBpbnQgdGh1bWJTaXplID0gcHJvcG9ydGlv biAqIHBoeXNpY2FsTGVuZ3RoOwotICAgICAgICBpbnQgY3VycmVudFBvcyA9IGN1cnJlbnQgLyBz Y2FsZTsKLSAgICAgICAgCisgICAgICAgIGZsb2F0IHByb3BvcnRpb24gPSAoKGZsb2F0KXBoeXNp Y2FsTGVuZ3RoIC0gOCkvIChtYXggKyBzdGVwKTsKKyAgICAgICAgZmxvYXQgdGh1bWJTaXplID0g IHByb3BvcnRpb24gKiAoZmxvYXQpcGh5c2ljYWxMZW5ndGg7CisgICAgICAgIGlmICh0aHVtYlNp emUgPCAyMCkKKyAgICAgICAgICAgIHRodW1iU2l6ZSA9IDIwOworCisgICAgICAgIGZsb2F0IHRo dW1iUG9zID0gKChmbG9hdCljdXJyZW50IC8gKGZsb2F0KW1heCkgKiAoKGZsb2F0KXBoeXNpY2Fs TGVuZ3RoIC0gdGh1bWJTaXplKTsKICAgICAgICAgaWYgKHRodW1iU3RhcnQpCi0gICAgICAgICAg ICAqdGh1bWJTdGFydCA9IGN1cnJlbnRQb3M7CisgICAgICAgICAgICAqdGh1bWJTdGFydCA9IHRo dW1iUG9zOwogICAgICAgICAKICAgICAgICAgaWYgKHRodW1iTGVuZ3RoKQogICAgICAgICAgICAg KnRodW1iTGVuZ3RoID0gdGh1bWJTaXplOwpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS93eC93eGNv ZGUvd2luL3Njcm9sbGJhcl9yZW5kZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZv cm0vd3gvd3hjb2RlL3dpbi9zY3JvbGxiYXJfcmVuZGVyLmNwcAkocmV2aXNpb24gNTEwNDYpCisr KyBXZWJDb3JlL3BsYXRmb3JtL3d4L3d4Y29kZS93aW4vc2Nyb2xsYmFyX3JlbmRlci5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTMwLDYgKzMwLDggQEAKICNpbmNsdWRlIDx3eC9kZWZzLmg+CiAKICNp bmNsdWRlIDx3eC9kYy5oPgorI2luY2x1ZGUgPHd4L2RjZ3JhcGguaD4KKyNpbmNsdWRlIDx3eC9n cmFwaGljcy5oPgogI2luY2x1ZGUgPHd4L3JlbmRlcmVyLmg+CiAjaW5jbHVkZSA8d3gvd2luZG93 Lmg+CiAKQEAgLTEzMSw4ICsxMzMsMjQgQEAKICAgICAgICAgcGFydCA9IFNQX1RSQUNLRU5EVkVS VDsKIAogICAgIGludCB4cFN0YXRlID0gVFNfTk9STUFMOworICAgIHd4UmVjdCB0cmFuc1JlY3Qg PSByZWN0OworCisjaWYgVVNFKFdYR0MpCisgICAgLy8gd2hlbiBnb2luZyBmcm9tIEdkaVBsdXMg LT4gR2RpLCBhbnkgR2RpUGx1cyB0cmFuc2Zvcm1hdGlvbnMgYXJlIGxvc3QKKyAgICAvLyBzbyB3 ZSBuZWVkIHRvIGFsdGVyIHRoZSBjb29yZGluYXRlcyB0byByZWZsZWN0IHRoZWlyIHRyYW5zZm9y bWVkIHBvaW50LgorICAgIGRvdWJsZSB4dHJhbnMgPSAwOworICAgIGRvdWJsZSB5dHJhbnMgPSAw OworICAgIAorICAgIHd4R0NEQyogZ2NkYyA9IHd4RHluYW1pY0Nhc3QoJmRjLCB3eEdDREMpOwor ICAgIHd4R3JhcGhpY3NDb250ZXh0KiBnYyA9IGdjZGMtPkdldEdyYXBoaWNzQ29udGV4dCgpOwor ICAgIGdjLT5HZXRUcmFuc2Zvcm0oKS5UcmFuc2Zvcm1Qb2ludCgmeHRyYW5zLCAmeXRyYW5zKTsK KworICAgIHRyYW5zUmVjdC54ICs9IChpbnQpeHRyYW5zOworICAgIHRyYW5zUmVjdC55ICs9IChp bnQpeXRyYW5zOworI2VuZGlmCisKICAgICBSRUNUIHI7Ci0gICAgd3hDb3B5UmVjdFRvUkVDVChy ZWN0LCByKTsKKyAgICB3eENvcHlSZWN0VG9SRUNUKHRyYW5zUmVjdCwgcik7CiAKICAgICAvLyBV bmxpa2UgTWFjLCBvbiBNU1cgeW91IGRyYXcgdGhlIHNjcm9sbGJhciBwaWVjZSBieSBwaWVjZS4K ICAgICAvLyBzbyB3ZSBkcmF3IHRoZSB0cmFjayBmaXJzdCwgdGhlbiB0aGUgYnV0dG9ucwpAQCAt MTYzLDE0ICsxODEsMTQgQEAKICAgICAgICAgcGh5c2ljYWxMZW5ndGggLT0gYnV0dG9uU2l6ZSoy OwogICAgICAgICBpbnQgdGh1bWJTdGFydCA9IDA7CiAgICAgICAgIGludCB0aHVtYkxlbmd0aCA9 IDA7Ci0gICAgICAgIGNhbGNUaHVtYlN0YXJ0QW5kTGVuZ3RoKHBoeXNpY2FsTGVuZ3RoLCBtYXgg KyBzdGVwLCAKKyAgICAgICAgY2FsY1RodW1iU3RhcnRBbmRMZW5ndGgocGh5c2ljYWxMZW5ndGgs IG1heCwgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY3VycmVudCwgc3RlcCwgJnRodW1i U3RhcnQsICZ0aHVtYkxlbmd0aCk7CiAgICAgICAgIGJ1dHRvblJlY3QgPSByOwogICAgICAgICBp ZiAoaG9yaXopIHsKLSAgICAgICAgICAgIGJ1dHRvblJlY3QubGVmdCA9IHRodW1iU3RhcnQgKyBi dXR0b25TaXplOworICAgICAgICAgICAgYnV0dG9uUmVjdC5sZWZ0ID0gYnV0dG9uUmVjdC5sZWZ0 ICsgdGh1bWJTdGFydCArIGJ1dHRvblNpemU7CiAgICAgICAgICAgICBidXR0b25SZWN0LnJpZ2h0 ID0gYnV0dG9uUmVjdC5sZWZ0ICsgdGh1bWJMZW5ndGg7CiAgICAgICAgIH0gZWxzZSB7Ci0gICAg ICAgICAgICBidXR0b25SZWN0LnRvcCA9IHRodW1iU3RhcnQgKyBidXR0b25TaXplOworICAgICAg ICAgICAgYnV0dG9uUmVjdC50b3AgPSBidXR0b25SZWN0LnRvcCArIHRodW1iU3RhcnQgKyBidXR0 b25TaXplOwogICAgICAgICAgICAgYnV0dG9uUmVjdC5ib3R0b20gPSBidXR0b25SZWN0LnRvcCAr IHRodW1iTGVuZ3RoOwogICAgICAgICB9CiAKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vd3gvU2Ny b2xsYmFyVGhlbWVXeC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vd3gvU2Nyb2xs YmFyVGhlbWVXeC5oCShyZXZpc2lvbiA1MTA0NikKKysrIFdlYkNvcmUvcGxhdGZvcm0vd3gvU2Ny b2xsYmFyVGhlbWVXeC5oCSh3b3JraW5nIGNvcHkpCkBAIC00OCw2ICs0OCwxMCBAQAogICAgIHZp cnR1YWwgSW50UmVjdCBiYWNrQnV0dG9uUmVjdChTY3JvbGxiYXIqLCBTY3JvbGxiYXJQYXJ0LCBi b29sIHBhaW50aW5nID0gZmFsc2UpOwogICAgIHZpcnR1YWwgSW50UmVjdCBmb3J3YXJkQnV0dG9u UmVjdChTY3JvbGxiYXIqLCBTY3JvbGxiYXJQYXJ0LCBib29sIHBhaW50aW5nID0gZmFsc2UpOwog ICAgIHZpcnR1YWwgSW50UmVjdCB0cmFja1JlY3QoU2Nyb2xsYmFyKiwgYm9vbCBwYWludGluZyA9 IGZhbHNlKTsKKworICAgIHZpcnR1YWwgdm9pZCBzcGxpdFRyYWNrKFNjcm9sbGJhciosIGNvbnN0 IEludFJlY3QmIHRyYWNrLCBJbnRSZWN0JiBzdGFydFRyYWNrLCBJbnRSZWN0JiB0aHVtYiwgSW50 UmVjdCYgZW5kVHJhY2spOworICAgIAorICAgIHZpcnR1YWwgaW50IG1pbmltdW1UaHVtYkxlbmd0 aChTY3JvbGxiYXIqKTsKIH07CiAKIH0KSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vd3gvU2Nyb2xs YmFyVGhlbWVXeC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS93eC9TY3JvbGxi YXJUaGVtZVd4LmNwcAkocmV2aXNpb24gNTEwNDYpCisrKyBXZWJDb3JlL3BsYXRmb3JtL3d4L1Nj cm9sbGJhclRoZW1lV3guY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yOCw2ICsyOCw3IEBACiAKICNp bmNsdWRlICJIb3N0V2luZG93LmgiCiAjaW5jbHVkZSAiTm90SW1wbGVtZW50ZWQuaCIKKyNpbmNs dWRlICJQbGF0Zm9ybU1vdXNlRXZlbnQuaCIKICNpbmNsdWRlICJTY3JvbGxiYXIuaCIKICNpbmNs dWRlICJTY3JvbGxiYXJDbGllbnQuaCIKICNpbmNsdWRlICJzY3JvbGxiYXJfcmVuZGVyLmgiCkBA IC03MCw2ICs3MSwxMSBAQAogICAgIHJldHVybiB0aHVtYkxlbmd0aChzY3JvbGxiYXIpID4gMDsK IH0KIAoraW50IFNjcm9sbGJhclRoZW1lV3g6Om1pbmltdW1UaHVtYkxlbmd0aChTY3JvbGxiYXIq IHNjcm9sbGJhcikKK3sKKyAgICByZXR1cm4gMjA7Cit9CisKIEludFNpemUgU2Nyb2xsYmFyVGhl bWVXeDo6YnV0dG9uU2l6ZShTY3JvbGxiYXIqKSAKIHsKICNpZmRlZiBfX1dYTUFDX18KQEAgLTc5 LDYgKzg1LDIyIEBACiAjZW5kaWYKIH0KIAordm9pZCBTY3JvbGxiYXJUaGVtZVd4OjpzcGxpdFRy YWNrKFNjcm9sbGJhciogc2Nyb2xsYmFyLCBjb25zdCBJbnRSZWN0JiB1bmNvbnN0cmFpbmVkVHJh Y2tSZWN0LCBJbnRSZWN0JiBiZWZvcmVUaHVtYlJlY3QsIEludFJlY3QmIHRodW1iUmVjdCwgSW50 UmVjdCYgYWZ0ZXJUaHVtYlJlY3QpCit7CisgICAgU2Nyb2xsYmFyVGhlbWVDb21wb3NpdGU6OnNw bGl0VHJhY2soc2Nyb2xsYmFyLCB1bmNvbnN0cmFpbmVkVHJhY2tSZWN0LCBiZWZvcmVUaHVtYlJl Y3QsIHRodW1iUmVjdCwgYWZ0ZXJUaHVtYlJlY3QpOworI2lmZGVmIF9fV1hNQUNfXworICAgIC8v IG9uIE1hYywgdGhlcmUgYXJlIGEgZmV3IHBpeGVscyBkcmF3biBhYm92ZSB0aGUgYWN0dWFsIHRy YWNrIGFuZCBzbyBhZGp1c3QKKyAgICAvLyB0aGUgaGl0IHRlc3RpbmcgcmVjdHMgYWNjb3JkaW5n bHkKKyAgICBpbnQgdHJhY2tTdGFydCA9IDEwOyAKKyAgICBpZiAoc2Nyb2xsYmFyLT5vcmllbnRh dGlvbigpID09IEhvcml6b250YWxTY3JvbGxiYXIpIHsKKyAgICAgICAgdGh1bWJSZWN0LnNldFgo dGh1bWJSZWN0LngoKSArIHRyYWNrU3RhcnQpOworICAgICAgICBhZnRlclRodW1iUmVjdC5zZXRY KGFmdGVyVGh1bWJSZWN0LngoKSAtIHRyYWNrU3RhcnQpOworICAgIH0gZWxzZSB7CisgICAgICAg IHRodW1iUmVjdC5zZXRZKHRodW1iUmVjdC55KCkgKyB0cmFja1N0YXJ0KTsKKyAgICAgICAgYWZ0 ZXJUaHVtYlJlY3Quc2V0WShhZnRlclRodW1iUmVjdC55KCkgLSB0cmFja1N0YXJ0KTsKKyAgICB9 CisjZW5kaWYKK30KIAogSW50UmVjdCBTY3JvbGxiYXJUaGVtZVd4OjpiYWNrQnV0dG9uUmVjdChT Y3JvbGxiYXIqIHNjcm9sbGJhciwgU2Nyb2xsYmFyUGFydCBwYXJ0LCBib29sKQogewpAQCAtMTEx LDEwICsxMzMsMTYgQEAKICAgICBJbnRTaXplIHNpemUgPSBidXR0b25TaXplKHNjcm9sbGJhcik7 CiAgICAgaW50IHgsIHk7CiAgICAgaWYgKHNjcm9sbGJhci0+b3JpZW50YXRpb24oKSA9PSBIb3Jp em9udGFsU2Nyb2xsYmFyKSB7CisjaWZkZWYgX19XWE1BQ19fCisgICAgICAgIHNpemUuc2V0V2lk dGgoc2l6ZS53aWR0aCgpICsgY01hY0J1dHRvbk92ZXJsYXApOworI2VuZGlmCiAgICAgICAgIHgg PSBzY3JvbGxiYXItPngoKSArIHNjcm9sbGJhci0+d2lkdGgoKSAtIHNpemUud2lkdGgoKTsKICAg ICAgICAgeSA9IHNjcm9sbGJhci0+eSgpOwogICAgIH0gZWxzZSB7CiAgICAgICAgIHggPSBzY3Jv bGxiYXItPngoKTsKKyNpZmRlZiBfX1dYTUFDX18KKyAgICAgICAgc2l6ZS5zZXRIZWlnaHQoc2l6 ZS5oZWlnaHQoKSArIGNNYWNCdXR0b25PdmVybGFwKTsKKyNlbmRpZgogICAgICAgICB5ID0gc2Ny b2xsYmFyLT55KCkgKyBzY3JvbGxiYXItPmhlaWdodCgpIC0gc2l6ZS5oZWlnaHQoKTsKICAgICB9 CiAgICAgcmV0dXJuIEludFJlY3QoeCwgeSwgc2l6ZS53aWR0aCgpLCBzaXplLmhlaWdodCgpKTsK