26929 2009-07-02 12:38:15 -0700 convertFromScrollbarToContainingView and friends should be in ScrollView 2009-07-02 13:19:13 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 jorlow hyatt hyatt oldest_to_newest 129550 0 jorlow 2009-07-02 12:38:15 -0700 convertFromScrollbarToContainingView and friends should be in ScrollView (but still overridable) This is breaking Chromium's build because PopupMenuChromium inherits from ScrollView, but these functions are pure virtual in it. I could put it directly in PopupMenuChromium, but that seems a bit silly since the functions are fairly generic. 129551 1 32191 jorlow 2009-07-02 12:52:59 -0700 Created attachment 32191 patch 129552 2 32191 hyatt 2009-07-02 12:59:37 -0700 Comment on attachment 32191 patch Remove the FIXME: Test on Windows. I forgot to do that. Oops. You can devirtualize the methods once you move them to ScrollView. 129558 3 32194 hyatt 2009-07-02 13:13:22 -0700 Created attachment 32194 Remove unused functions 129559 4 32194 simon.fraser 2009-07-02 13:16:58 -0700 Comment on attachment 32194 Remove unused functions The previous patch is right. 129560 5 32191 simon.fraser 2009-07-02 13:17:10 -0700 Comment on attachment 32191 patch This is the right one! 129562 6 hyatt 2009-07-02 13:19:13 -0700 Fixed in r45485. 32191 2009-07-02 12:52:59 -0700 2009-07-02 13:17:10 -0700 patch scrollview.patch text/plain 7015 jorlow SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NTQ4NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzAgQEAKKzIwMDktMDctMDIgIEplcmVteSBPcmxvdyAgPGpvcmxvd0BjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg Y29udmVydEZyb21TY3JvbGxiYXJUb0NvbnRhaW5pbmdWaWV3IGFuZCBmcmllbmRzIHNob3VsZCBi ZSBpbiBTY3JvbGxWaWV3CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yNjkyOQorCisgICAgICAgIFRoaXMgaXMgYnJlYWtpbmcgQ2hyb21pdW0ncyBidWls ZCBiZWNhdXNlIFBvcHVwTWVudUNocm9taXVtIGluaGVyaXRzCisgICAgICAgIGZyb20gU2Nyb2xs VmlldywgYnV0IHRoZXNlIGZ1bmN0aW9ucyBhcmUgcHVyZSB2aXJ0dWFsIGluIGl0LiAgSSBjb3Vs ZAorICAgICAgICBwdXQgaXQgZGlyZWN0bHkgaW4gUG9wdXBNZW51Q2hyb21pdW0sIGJ1dCB0aGF0 IHNlZW1zIGEgYml0IHNpbGx5IHNpbmNlCisgICAgICAgIHRoZSBmdW5jdGlvbnMgYXJlIGZhaXJs eSBnZW5lcmljLgorCisgICAgICAgIFBhc3NlcyBleGlzdGluZyBsYXlvdXQgdGVzdHMuCisKKyAg ICAgICAgKiBwYWdlL0ZyYW1lVmlldy5jcHA6ICBSZW1vdmUgdGhlIDQgZnVuY3Rpb25zIEh5YXR0 IGp1c3QgYWRkZWQKKyAgICAgICAgKEludFJlY3QgV2ViQ29yZTo6RnJhbWVWaWV3Ojpjb252ZXJ0 RnJvbVNjcm9sbGJhclRvQ29udGFpbmluZ1ZpZXcpOgorICAgICAgICAoSW50UmVjdCBXZWJDb3Jl OjpGcmFtZVZpZXc6OmNvbnZlcnRGcm9tQ29udGFpbmluZ1ZpZXdUb1Njcm9sbEJhcik6CisgICAg ICAgIChJbnRQb2ludCBXZWJDb3JlOjpGcmFtZVZpZXc6OmNvbnZlcnRGcm9tU2Nyb2xsYmFyVG9D b250YWluaW5nVmlldyk6CisgICAgICAgIChJbnRQb2ludCBXZWJDb3JlOjpGcmFtZVZpZXc6OmNv bnZlcnRGcm9tQ29udGFpbmluZ1ZpZXdUb1Njcm9sbEJhcik6CisgICAgICAgICogcGFnZS9GcmFt ZVZpZXcuaDogZGl0dG8KKyAgICAgICAgKiBwbGF0Zm9ybS9TY3JvbGxWaWV3LmNwcDogIE1vdmUg dGhlIDQgZnVuY3Rpb25zIGZyb20gRnJhbWVWaWV3IGhlcmUKKyAgICAgICAgKEludFJlY3QgV2Vi Q29yZTo6U2Nyb2xsVmlldzo6Y29udmVydEZyb21TY3JvbGxiYXJUb0NvbnRhaW5pbmdWaWV3KToK KyAgICAgICAgKEludFJlY3QgV2ViQ29yZTo6U2Nyb2xsVmlldzo6Y29udmVydEZyb21Db250YWlu aW5nVmlld1RvU2Nyb2xsQmFyKToKKyAgICAgICAgKEludFBvaW50IFdlYkNvcmU6OlNjcm9sbFZp ZXc6OmNvbnZlcnRGcm9tU2Nyb2xsYmFyVG9Db250YWluaW5nVmlldyk6CisgICAgICAgIChJbnRQ b2ludCBXZWJDb3JlOjpTY3JvbGxWaWV3Ojpjb252ZXJ0RnJvbUNvbnRhaW5pbmdWaWV3VG9TY3Jv bGxCYXIpOgorICAgICAgICAqIHBsYXRmb3JtL1Njcm9sbFZpZXcuaDogZGl0dG8KKwogMjAwOS0w Ny0wMiAgRGlyayBQcmFua2UgIDxkcHJhbmtlQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZp ZXdlZCBieSBEYXJpbiBGaXNoZXIuCkluZGV4OiBXZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAkocmV2aXNpb24gNDU0ODEp CisrKyBXZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTI5NCwz OSArMTI5NCw2IEBAIHZvaWQgRnJhbWVWaWV3OjpnZXRUaWNrbWFya3MoVmVjdG9yPEludFIKICAg ICB0aWNrbWFya3MgPSBmcmFtZSgpLT5kb2N1bWVudCgpLT5yZW5kZXJlZFJlY3RzRm9yTWFya2Vy cyhEb2N1bWVudE1hcmtlcjo6VGV4dE1hdGNoKTsKIH0KIAotSW50UmVjdCBGcmFtZVZpZXc6OmNv bnZlcnRGcm9tU2Nyb2xsYmFyVG9Db250YWluaW5nVmlldyhjb25zdCBTY3JvbGxiYXIqIHNjcm9s bGJhciwgY29uc3QgSW50UmVjdCYgbG9jYWxSZWN0KSBjb25zdAotewotICAgIC8vIFNjcm9sbGJh cnMgd29uJ3QgYmUgdHJhbnNmb3JtZWQgd2l0aGluIHVzCi0gICAgSW50UmVjdCBuZXdSZWN0ID0g bG9jYWxSZWN0OwotICAgIG5ld1JlY3QubW92ZShzY3JvbGxiYXItPngoKSwgc2Nyb2xsYmFyLT55 KCkpOwotICAgIHJldHVybiBuZXdSZWN0OwotfQotCi1JbnRSZWN0IEZyYW1lVmlldzo6Y29udmVy dEZyb21Db250YWluaW5nVmlld1RvU2Nyb2xsYmFyKGNvbnN0IFNjcm9sbGJhciogc2Nyb2xsYmFy LCBjb25zdCBJbnRSZWN0JiBwYXJlbnRSZWN0KSBjb25zdAotewotICAgIEludFJlY3QgbmV3UmVj dCA9IHBhcmVudFJlY3Q7Ci0gICAgLy8gU2Nyb2xsYmFycyB3b24ndCBiZSB0cmFuc2Zvcm1lZCB3 aXRoaW4gdXMKLSAgICBuZXdSZWN0Lm1vdmUoLXNjcm9sbGJhci0+eCgpLCAtc2Nyb2xsYmFyLT55 KCkpOwotICAgIHJldHVybiBuZXdSZWN0OwotfQotCi0vLyBGSVhNRTogdGVzdCB0aGVzZSBvbiB3 aW5kb3dzCi1JbnRQb2ludCBGcmFtZVZpZXc6OmNvbnZlcnRGcm9tU2Nyb2xsYmFyVG9Db250YWlu aW5nVmlldyhjb25zdCBTY3JvbGxiYXIqIHNjcm9sbGJhciwgY29uc3QgSW50UG9pbnQmIGxvY2Fs UG9pbnQpIGNvbnN0Ci17Ci0gICAgLy8gU2Nyb2xsYmFycyB3b24ndCBiZSB0cmFuc2Zvcm1lZCB3 aXRoaW4gdXMKLSAgICBJbnRQb2ludCBuZXdQb2ludCA9IGxvY2FsUG9pbnQ7Ci0gICAgbmV3UG9p bnQubW92ZShzY3JvbGxiYXItPngoKSwgc2Nyb2xsYmFyLT55KCkpOwotICAgIHJldHVybiBuZXdQ b2ludDsKLX0KLQotSW50UG9pbnQgRnJhbWVWaWV3Ojpjb252ZXJ0RnJvbUNvbnRhaW5pbmdWaWV3 VG9TY3JvbGxiYXIoY29uc3QgU2Nyb2xsYmFyKiBzY3JvbGxiYXIsIGNvbnN0IEludFBvaW50JiBw YXJlbnRQb2ludCkgY29uc3QKLXsKLSAgICBJbnRQb2ludCBuZXdQb2ludCA9IHBhcmVudFBvaW50 OwotICAgIC8vIFNjcm9sbGJhcnMgd29uJ3QgYmUgdHJhbnNmb3JtZWQgd2l0aGluIHVzCi0gICAg bmV3UG9pbnQubW92ZSgtc2Nyb2xsYmFyLT54KCksIC1zY3JvbGxiYXItPnkoKSk7Ci0gICAgcmV0 dXJuIG5ld1BvaW50OwotfQotCiBJbnRSZWN0IEZyYW1lVmlldzo6d2luZG93UmVzaXplclJlY3Qo KSBjb25zdAogewogICAgIFBhZ2UqIHBhZ2UgPSBmcmFtZSgpID8gZnJhbWUoKS0+cGFnZSgpIDog MDsKSW5kZXg6IFdlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3Jl L3BhZ2UvRnJhbWVWaWV3LmgJKHJldmlzaW9uIDQ1NDgxKQorKysgV2ViQ29yZS9wYWdlL0ZyYW1l Vmlldy5oCSh3b3JraW5nIGNvcHkpCkBAIC0yMjcsMTAgKzIyNyw2IEBAIHByaXZhdGU6CiAgICAg dmlydHVhbCB2b2lkIGludmFsaWRhdGVTY3JvbGxiYXJSZWN0KFNjcm9sbGJhciosIGNvbnN0IElu dFJlY3QmKTsKICAgICB2aXJ0dWFsIGJvb2wgaXNBY3RpdmUoKSBjb25zdDsKICAgICB2aXJ0dWFs IHZvaWQgZ2V0VGlja21hcmtzKFZlY3RvcjxJbnRSZWN0PiYpIGNvbnN0OwotICAgIHZpcnR1YWwg SW50UmVjdCBjb252ZXJ0RnJvbVNjcm9sbGJhclRvQ29udGFpbmluZ1ZpZXcoY29uc3QgU2Nyb2xs YmFyKiwgY29uc3QgSW50UmVjdCYpIGNvbnN0OwotICAgIHZpcnR1YWwgSW50UmVjdCBjb252ZXJ0 RnJvbUNvbnRhaW5pbmdWaWV3VG9TY3JvbGxiYXIoY29uc3QgU2Nyb2xsYmFyKiwgY29uc3QgSW50 UmVjdCYpIGNvbnN0OwotICAgIHZpcnR1YWwgSW50UG9pbnQgY29udmVydEZyb21TY3JvbGxiYXJU b0NvbnRhaW5pbmdWaWV3KGNvbnN0IFNjcm9sbGJhciosIGNvbnN0IEludFBvaW50JikgY29uc3Q7 Ci0gICAgdmlydHVhbCBJbnRQb2ludCBjb252ZXJ0RnJvbUNvbnRhaW5pbmdWaWV3VG9TY3JvbGxi YXIoY29uc3QgU2Nyb2xsYmFyKiwgY29uc3QgSW50UG9pbnQmKSBjb25zdDsKIAogICAgIHZvaWQg ZGVmZXJyZWRSZXBhaW50VGltZXJGaXJlZChUaW1lcjxGcmFtZVZpZXc+Kik7CiAgICAgdm9pZCBk b0RlZmVycmVkUmVwYWludHMoKTsKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmNwcAkocmV2aXNp b24gNDU0ODEpCisrKyBXZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC04MDIsNiArODAyLDM5IEBAIGJvb2wgU2Nyb2xsVmlldzo6c2Nyb2xsYmFyQ29ybmVy UHJlc2VudCgKICAgICAgICAgICAgKG1fdmVydGljYWxTY3JvbGxiYXIgJiYgaGVpZ2h0KCkgLSBt X3ZlcnRpY2FsU2Nyb2xsYmFyLT5oZWlnaHQoKSA+IDApOwogfQogCitJbnRSZWN0IFNjcm9sbFZp ZXc6OmNvbnZlcnRGcm9tU2Nyb2xsYmFyVG9Db250YWluaW5nVmlldyhjb25zdCBTY3JvbGxiYXIq IHNjcm9sbGJhciwgY29uc3QgSW50UmVjdCYgbG9jYWxSZWN0KSBjb25zdAoreworICAgIC8vIFNj cm9sbGJhcnMgd29uJ3QgYmUgdHJhbnNmb3JtZWQgd2l0aGluIHVzCisgICAgSW50UmVjdCBuZXdS ZWN0ID0gbG9jYWxSZWN0OworICAgIG5ld1JlY3QubW92ZShzY3JvbGxiYXItPngoKSwgc2Nyb2xs YmFyLT55KCkpOworICAgIHJldHVybiBuZXdSZWN0OworfQorCitJbnRSZWN0IFNjcm9sbFZpZXc6 OmNvbnZlcnRGcm9tQ29udGFpbmluZ1ZpZXdUb1Njcm9sbGJhcihjb25zdCBTY3JvbGxiYXIqIHNj cm9sbGJhciwgY29uc3QgSW50UmVjdCYgcGFyZW50UmVjdCkgY29uc3QKK3sKKyAgICBJbnRSZWN0 IG5ld1JlY3QgPSBwYXJlbnRSZWN0OworICAgIC8vIFNjcm9sbGJhcnMgd29uJ3QgYmUgdHJhbnNm b3JtZWQgd2l0aGluIHVzCisgICAgbmV3UmVjdC5tb3ZlKC1zY3JvbGxiYXItPngoKSwgLXNjcm9s bGJhci0+eSgpKTsKKyAgICByZXR1cm4gbmV3UmVjdDsKK30KKworLy8gRklYTUU6IHRlc3QgdGhl c2Ugb24gd2luZG93cworSW50UG9pbnQgU2Nyb2xsVmlldzo6Y29udmVydEZyb21TY3JvbGxiYXJU b0NvbnRhaW5pbmdWaWV3KGNvbnN0IFNjcm9sbGJhciogc2Nyb2xsYmFyLCBjb25zdCBJbnRQb2lu dCYgbG9jYWxQb2ludCkgY29uc3QKK3sKKyAgICAvLyBTY3JvbGxiYXJzIHdvbid0IGJlIHRyYW5z Zm9ybWVkIHdpdGhpbiB1cworICAgIEludFBvaW50IG5ld1BvaW50ID0gbG9jYWxQb2ludDsKKyAg ICBuZXdQb2ludC5tb3ZlKHNjcm9sbGJhci0+eCgpLCBzY3JvbGxiYXItPnkoKSk7CisgICAgcmV0 dXJuIG5ld1BvaW50OworfQorCitJbnRQb2ludCBTY3JvbGxWaWV3Ojpjb252ZXJ0RnJvbUNvbnRh aW5pbmdWaWV3VG9TY3JvbGxiYXIoY29uc3QgU2Nyb2xsYmFyKiBzY3JvbGxiYXIsIGNvbnN0IElu dFBvaW50JiBwYXJlbnRQb2ludCkgY29uc3QKK3sKKyAgICBJbnRQb2ludCBuZXdQb2ludCA9IHBh cmVudFBvaW50OworICAgIC8vIFNjcm9sbGJhcnMgd29uJ3QgYmUgdHJhbnNmb3JtZWQgd2l0aGlu IHVzCisgICAgbmV3UG9pbnQubW92ZSgtc2Nyb2xsYmFyLT54KCksIC1zY3JvbGxiYXItPnkoKSk7 CisgICAgcmV0dXJuIG5ld1BvaW50OworfQorCiB2b2lkIFNjcm9sbFZpZXc6OnNldFBhcmVudFZp c2libGUoYm9vbCB2aXNpYmxlKQogewogICAgIGlmIChpc1BhcmVudFZpc2libGUoKSA9PSB2aXNp YmxlKQpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmgJKHJldmlzaW9uIDQ1NDgxKQorKysgV2ViQ29y ZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmgJKHdvcmtpbmcgY29weSkKQEAgLTIyMSwxMCArMjIxLDEw IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgYm9vbCBzY3JvbGxiYXJDb3JuZXJQcmVzZW50KCkg Y29uc3Q7CiAKLSAgICB2aXJ0dWFsIEludFJlY3QgY29udmVydEZyb21TY3JvbGxiYXJUb0NvbnRh aW5pbmdWaWV3KGNvbnN0IFNjcm9sbGJhciosIGNvbnN0IEludFJlY3QmKSBjb25zdCA9IDA7Ci0g ICAgdmlydHVhbCBJbnRSZWN0IGNvbnZlcnRGcm9tQ29udGFpbmluZ1ZpZXdUb1Njcm9sbGJhcihj b25zdCBTY3JvbGxiYXIqLCBjb25zdCBJbnRSZWN0JikgY29uc3QgPSAwOwotICAgIHZpcnR1YWwg SW50UG9pbnQgY29udmVydEZyb21TY3JvbGxiYXJUb0NvbnRhaW5pbmdWaWV3KGNvbnN0IFNjcm9s bGJhciosIGNvbnN0IEludFBvaW50JikgY29uc3QgPSAwOwotICAgIHZpcnR1YWwgSW50UG9pbnQg Y29udmVydEZyb21Db250YWluaW5nVmlld1RvU2Nyb2xsYmFyKGNvbnN0IFNjcm9sbGJhciosIGNv bnN0IEludFBvaW50JikgY29uc3QgPSAwOworICAgIHZpcnR1YWwgSW50UmVjdCBjb252ZXJ0RnJv bVNjcm9sbGJhclRvQ29udGFpbmluZ1ZpZXcoY29uc3QgU2Nyb2xsYmFyKiwgY29uc3QgSW50UmVj dCYpIGNvbnN0OworICAgIHZpcnR1YWwgSW50UmVjdCBjb252ZXJ0RnJvbUNvbnRhaW5pbmdWaWV3 VG9TY3JvbGxiYXIoY29uc3QgU2Nyb2xsYmFyKiwgY29uc3QgSW50UmVjdCYpIGNvbnN0OworICAg IHZpcnR1YWwgSW50UG9pbnQgY29udmVydEZyb21TY3JvbGxiYXJUb0NvbnRhaW5pbmdWaWV3KGNv bnN0IFNjcm9sbGJhciosIGNvbnN0IEludFBvaW50JikgY29uc3Q7CisgICAgdmlydHVhbCBJbnRQ b2ludCBjb252ZXJ0RnJvbUNvbnRhaW5pbmdWaWV3VG9TY3JvbGxiYXIoY29uc3QgU2Nyb2xsYmFy KiwgY29uc3QgSW50UG9pbnQmKSBjb25zdDsKIAogcHJvdGVjdGVkOgogICAgIHZpcnR1YWwgdm9p ZCByZXBhaW50Q29udGVudFJlY3RhbmdsZShjb25zdCBJbnRSZWN0JiwgYm9vbCBub3cgPSBmYWxz ZSk7Cg== 32194 2009-07-02 13:13:22 -0700 2009-07-02 13:16:58 -0700 Remove unused functions patch.txt text/plain 3847 hyatt SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDQ1NDg0 KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMDktMDct MDIgIERhdmlkIEh5YXR0ICA8aHlhdHRAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZSB1bnVzZWQgZnVuY3Rpb25zIGZyb20g RnJhbWVWaWV3LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjY5MjkKKworICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3LmNwcDoKKyAgICAgICAgKiBwYWdl L0ZyYW1lVmlldy5oOgorICAgICAgICAqIHBsYXRmb3JtL1Njcm9sbFZpZXcuaDoKKwogMjAwOS0w Ny0wMiAgRGlyayBQcmFua2UgIDxkcHJhbmtlQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZp ZXdlZCBieSBEYXJpbiBGaXNoZXIuCkluZGV4OiBwYWdlL0ZyYW1lVmlldy5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gcGFnZS9GcmFtZVZpZXcuY3BwCShyZXZpc2lvbiA0NTQ3OCkKKysrIHBhZ2UvRnJhbWVW aWV3LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTI5NCwzOSArMTI5NCw2IEBAIHZvaWQgRnJhbWVW aWV3OjpnZXRUaWNrbWFya3MoVmVjdG9yPEludFIKICAgICB0aWNrbWFya3MgPSBmcmFtZSgpLT5k b2N1bWVudCgpLT5yZW5kZXJlZFJlY3RzRm9yTWFya2VycyhEb2N1bWVudE1hcmtlcjo6VGV4dE1h dGNoKTsKIH0KIAotSW50UmVjdCBGcmFtZVZpZXc6OmNvbnZlcnRGcm9tU2Nyb2xsYmFyVG9Db250 YWluaW5nVmlldyhjb25zdCBTY3JvbGxiYXIqIHNjcm9sbGJhciwgY29uc3QgSW50UmVjdCYgbG9j YWxSZWN0KSBjb25zdAotewotICAgIC8vIFNjcm9sbGJhcnMgd29uJ3QgYmUgdHJhbnNmb3JtZWQg d2l0aGluIHVzCi0gICAgSW50UmVjdCBuZXdSZWN0ID0gbG9jYWxSZWN0OwotICAgIG5ld1JlY3Qu bW92ZShzY3JvbGxiYXItPngoKSwgc2Nyb2xsYmFyLT55KCkpOwotICAgIHJldHVybiBuZXdSZWN0 OwotfQotCi1JbnRSZWN0IEZyYW1lVmlldzo6Y29udmVydEZyb21Db250YWluaW5nVmlld1RvU2Ny b2xsYmFyKGNvbnN0IFNjcm9sbGJhciogc2Nyb2xsYmFyLCBjb25zdCBJbnRSZWN0JiBwYXJlbnRS ZWN0KSBjb25zdAotewotICAgIEludFJlY3QgbmV3UmVjdCA9IHBhcmVudFJlY3Q7Ci0gICAgLy8g U2Nyb2xsYmFycyB3b24ndCBiZSB0cmFuc2Zvcm1lZCB3aXRoaW4gdXMKLSAgICBuZXdSZWN0Lm1v dmUoLXNjcm9sbGJhci0+eCgpLCAtc2Nyb2xsYmFyLT55KCkpOwotICAgIHJldHVybiBuZXdSZWN0 OwotfQotCi0vLyBGSVhNRTogdGVzdCB0aGVzZSBvbiB3aW5kb3dzCi1JbnRQb2ludCBGcmFtZVZp ZXc6OmNvbnZlcnRGcm9tU2Nyb2xsYmFyVG9Db250YWluaW5nVmlldyhjb25zdCBTY3JvbGxiYXIq IHNjcm9sbGJhciwgY29uc3QgSW50UG9pbnQmIGxvY2FsUG9pbnQpIGNvbnN0Ci17Ci0gICAgLy8g U2Nyb2xsYmFycyB3b24ndCBiZSB0cmFuc2Zvcm1lZCB3aXRoaW4gdXMKLSAgICBJbnRQb2ludCBu ZXdQb2ludCA9IGxvY2FsUG9pbnQ7Ci0gICAgbmV3UG9pbnQubW92ZShzY3JvbGxiYXItPngoKSwg c2Nyb2xsYmFyLT55KCkpOwotICAgIHJldHVybiBuZXdQb2ludDsKLX0KLQotSW50UG9pbnQgRnJh bWVWaWV3Ojpjb252ZXJ0RnJvbUNvbnRhaW5pbmdWaWV3VG9TY3JvbGxiYXIoY29uc3QgU2Nyb2xs YmFyKiBzY3JvbGxiYXIsIGNvbnN0IEludFBvaW50JiBwYXJlbnRQb2ludCkgY29uc3QKLXsKLSAg ICBJbnRQb2ludCBuZXdQb2ludCA9IHBhcmVudFBvaW50OwotICAgIC8vIFNjcm9sbGJhcnMgd29u J3QgYmUgdHJhbnNmb3JtZWQgd2l0aGluIHVzCi0gICAgbmV3UG9pbnQubW92ZSgtc2Nyb2xsYmFy LT54KCksIC1zY3JvbGxiYXItPnkoKSk7Ci0gICAgcmV0dXJuIG5ld1BvaW50OwotfQotCiBJbnRS ZWN0IEZyYW1lVmlldzo6d2luZG93UmVzaXplclJlY3QoKSBjb25zdAogewogICAgIFBhZ2UqIHBh Z2UgPSBmcmFtZSgpID8gZnJhbWUoKS0+cGFnZSgpIDogMDsKSW5kZXg6IHBhZ2UvRnJhbWVWaWV3 LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gcGFnZS9GcmFtZVZpZXcuaAkocmV2aXNpb24gNDU0NzgpCisrKyBw YWdlL0ZyYW1lVmlldy5oCSh3b3JraW5nIGNvcHkpCkBAIC0yMjcsMTAgKzIyNyw2IEBAIHByaXZh dGU6CiAgICAgdmlydHVhbCB2b2lkIGludmFsaWRhdGVTY3JvbGxiYXJSZWN0KFNjcm9sbGJhcios IGNvbnN0IEludFJlY3QmKTsKICAgICB2aXJ0dWFsIGJvb2wgaXNBY3RpdmUoKSBjb25zdDsKICAg ICB2aXJ0dWFsIHZvaWQgZ2V0VGlja21hcmtzKFZlY3RvcjxJbnRSZWN0PiYpIGNvbnN0OwotICAg IHZpcnR1YWwgSW50UmVjdCBjb252ZXJ0RnJvbVNjcm9sbGJhclRvQ29udGFpbmluZ1ZpZXcoY29u c3QgU2Nyb2xsYmFyKiwgY29uc3QgSW50UmVjdCYpIGNvbnN0OwotICAgIHZpcnR1YWwgSW50UmVj dCBjb252ZXJ0RnJvbUNvbnRhaW5pbmdWaWV3VG9TY3JvbGxiYXIoY29uc3QgU2Nyb2xsYmFyKiwg Y29uc3QgSW50UmVjdCYpIGNvbnN0OwotICAgIHZpcnR1YWwgSW50UG9pbnQgY29udmVydEZyb21T Y3JvbGxiYXJUb0NvbnRhaW5pbmdWaWV3KGNvbnN0IFNjcm9sbGJhciosIGNvbnN0IEludFBvaW50 JikgY29uc3Q7Ci0gICAgdmlydHVhbCBJbnRQb2ludCBjb252ZXJ0RnJvbUNvbnRhaW5pbmdWaWV3 VG9TY3JvbGxiYXIoY29uc3QgU2Nyb2xsYmFyKiwgY29uc3QgSW50UG9pbnQmKSBjb25zdDsKIAog ICAgIHZvaWQgZGVmZXJyZWRSZXBhaW50VGltZXJGaXJlZChUaW1lcjxGcmFtZVZpZXc+Kik7CiAg ICAgdm9pZCBkb0RlZmVycmVkUmVwYWludHMoKTsKSW5kZXg6IHBsYXRmb3JtL1Njcm9sbFZpZXcu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBwbGF0Zm9ybS9TY3JvbGxWaWV3LmgJKHJldmlzaW9uIDQ1NDc4KQor KysgcGxhdGZvcm0vU2Nyb2xsVmlldy5oCSh3b3JraW5nIGNvcHkpCkBAIC0yMjEsMTEgKzIyMSw2 IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgYm9vbCBzY3JvbGxiYXJDb3JuZXJQcmVzZW50KCkg Y29uc3Q7CiAKLSAgICB2aXJ0dWFsIEludFJlY3QgY29udmVydEZyb21TY3JvbGxiYXJUb0NvbnRh aW5pbmdWaWV3KGNvbnN0IFNjcm9sbGJhciosIGNvbnN0IEludFJlY3QmKSBjb25zdCA9IDA7Ci0g ICAgdmlydHVhbCBJbnRSZWN0IGNvbnZlcnRGcm9tQ29udGFpbmluZ1ZpZXdUb1Njcm9sbGJhcihj b25zdCBTY3JvbGxiYXIqLCBjb25zdCBJbnRSZWN0JikgY29uc3QgPSAwOwotICAgIHZpcnR1YWwg SW50UG9pbnQgY29udmVydEZyb21TY3JvbGxiYXJUb0NvbnRhaW5pbmdWaWV3KGNvbnN0IFNjcm9s bGJhciosIGNvbnN0IEludFBvaW50JikgY29uc3QgPSAwOwotICAgIHZpcnR1YWwgSW50UG9pbnQg Y29udmVydEZyb21Db250YWluaW5nVmlld1RvU2Nyb2xsYmFyKGNvbnN0IFNjcm9sbGJhciosIGNv bnN0IEludFBvaW50JikgY29uc3QgPSAwOwotCiBwcm90ZWN0ZWQ6CiAgICAgdmlydHVhbCB2b2lk IHJlcGFpbnRDb250ZW50UmVjdGFuZ2xlKGNvbnN0IEludFJlY3QmLCBib29sIG5vdyA9IGZhbHNl KTsKICAgICB2aXJ0dWFsIHZvaWQgcGFpbnRDb250ZW50cyhHcmFwaGljc0NvbnRleHQqLCBjb25z dCBJbnRSZWN0JiBkYW1hZ2VSZWN0KSA9IDA7Cg==