22689 2008-12-05 12:32:41 -0800 RenderThemeWin should match Firefox button metrics 2008-12-09 13:46:26 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Mac Windows XP RESOLVED FIXED P2 Normal --- 1 ojan webkit-unassigned adele hyatt oldest_to_newest 101541 0 ojan 2008-12-05 12:32:41 -0800 RenderThemeWin should match one of Firefox or IE for compatibility sake. IE has a padding that is proportional to the amount of text in the button, which is crazy. So, matching Firefox seems best here. Firefox has a padding:1px 3px on the inner element of buttons. This is in addition to any padding set on the element. So, padding:0 set in the CSS still has that extra few pixels in the actual size of the button, but still returns padding:0 from getComputedStyle. 101596 1 25799 ojan 2008-12-05 16:18:49 -0800 Created attachment 25799 Sets the padding in RenderThemeWin 101846 2 25799 eric 2008-12-08 12:36:14 -0800 Comment on attachment 25799 Sets the padding in RenderThemeWin This looks fine to me, but Hyatt or Adele should offer an opinion before we accept this. 101992 3 25799 hyatt 2008-12-09 10:30:13 -0800 Comment on attachment 25799 Sets the padding in RenderThemeWin I would query the button style for appearance:none, and if it is none, don't apply this internal padding. Once you're not a "Windows" button, I don't think the theme should have any influence any more. 101998 4 25892 ojan 2008-12-09 12:09:27 -0800 Created attachment 25892 Sets padding only if style->appearance() != NoControlPart 102007 5 25892 hyatt 2008-12-09 13:39:11 -0800 Comment on attachment 25892 Sets padding only if style->appearance() != NoControlPart r=me 102009 6 fishd 2008-12-09 13:46:26 -0800 http://trac.webkit.org/changeset/39144 25799 2008-12-05 16:18:49 -0800 2008-12-09 12:09:27 -0800 Sets the padding in RenderThemeWin button.diff text/plain 4082 ojan SW5kZXg6IHJlbmRlcmluZy9SZW5kZXJCdXR0b24uY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHJlbmRlcmlu Zy9SZW5kZXJCdXR0b24uY3BwCShyZXZpc2lvbiAzOTA0MCkKKysrIHJlbmRlcmluZy9SZW5kZXJC dXR0b24uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01Myw3ICs1Myw3IEBACiAgICAgICAgIC8vIENy ZWF0ZSBhbiBhbm9ueW1vdXMgYmxvY2suCiAgICAgICAgIEFTU0VSVCghZmlyc3RDaGlsZCgpKTsK ICAgICAgICAgbV9pbm5lciA9IGNyZWF0ZUFub255bW91c0Jsb2NrKCk7Ci0gICAgICAgIG1faW5u ZXItPnN0eWxlKCktPnNldEJveEZsZXgoMS4wZik7CisgICAgICAgIHNldHVwSW5uZXJTdHlsZSht X2lubmVyLT5zdHlsZSgpKTsKICAgICAgICAgUmVuZGVyRmxleGlibGVCb3g6OmFkZENoaWxkKG1f aW5uZXIpOwogICAgIH0KICAgICAKQEAgLTg4LDcgKzg4LDcgQEAKICAgICBpZiAobV9idXR0b25U ZXh0KQogICAgICAgICBtX2J1dHRvblRleHQtPnNldFN0eWxlKHN0eWxlKCkpOwogICAgIGlmICht X2lubmVyKSAvLyBSZW5kZXJCbG9jayBoYW5kbGVkIHVwZGF0aW5nIHRoZSBhbm9ueW1vdXMgYmxv Y2sncyBzdHlsZS4KLSAgICAgICAgbV9pbm5lci0+c3R5bGUoKS0+c2V0Qm94RmxleCgxLjBmKTsK KyAgICAgICAgc2V0dXBJbm5lclN0eWxlKG1faW5uZXItPnN0eWxlKCkpOwogICAgIHNldFJlcGxh Y2VkKGlzSW5saW5lKCkpOwogCiAgICAgaWYgKCFtX2RlZmF1bHQgJiYgdGhlbWUoKS0+aXNEZWZh dWx0KHRoaXMpKSB7CkBAIC0xMDIsNiArMTAyLDE1IEBACiAgICAgfQogfQogCit2b2lkIFJlbmRl ckJ1dHRvbjo6c2V0dXBJbm5lclN0eWxlKFJlbmRlclN0eWxlKiBzdHlsZSkgCit7CisgICAgQVNT RVJUKHN0eWxlLT5yZWZDb3VudCgpID09IDEpOworCS8vIFJlbmRlckJsb2NrOjpjcmVhdGVBbm9u eW1vdXNCbG9jayBjcmVhdGVzIGEgbmV3IFJlbmRlclN0eWxlLCBzbyB0aGlzIGlzCisJLy8gc2Fm ZSB0byBtb2RpZnkuCisJc3R5bGUtPnNldEJveEZsZXgoMS4wZik7CisJdGhlbWUoKS0+YWRqdXN0 QnV0dG9uSW5uZXJTdHlsZShzdHlsZSk7Cit9CisKIHZvaWQgUmVuZGVyQnV0dG9uOjp1cGRhdGVG cm9tRWxlbWVudCgpCiB7CiAgICAgLy8gSWYgd2UncmUgYW4gaW5wdXQgZWxlbWVudCwgd2UgbWF5 IG5lZWQgdG8gY2hhbmdlIG91ciBidXR0b24gdGV4dC4KSW5kZXg6IHJlbmRlcmluZy9SZW5kZXJU aGVtZVdpbi5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIHJlbmRlcmluZy9SZW5kZXJUaGVtZVdpbi5oCShyZXZp c2lvbiAzOTA0MCkKKysrIHJlbmRlcmluZy9SZW5kZXJUaGVtZVdpbi5oCSh3b3JraW5nIGNvcHkp CkBAIC05Miw2ICs5Miw4IEBACiAgICAgdmlydHVhbCBib29sIHBhaW50U2xpZGVyVGh1bWIoUmVu ZGVyT2JqZWN0KiBvLCBjb25zdCBSZW5kZXJPYmplY3Q6OlBhaW50SW5mbyYgaSwgY29uc3QgSW50 UmVjdCYgcik7CiAgICAgdmlydHVhbCB2b2lkIGFkanVzdFNsaWRlclRodW1iU2l6ZShSZW5kZXJP YmplY3QqKSBjb25zdDsKIAorICAgIHZpcnR1YWwgdm9pZCBhZGp1c3RCdXR0b25Jbm5lclN0eWxl KFJlbmRlclN0eWxlKikgY29uc3Q7CisKICAgICB2aXJ0dWFsIHZvaWQgYWRqdXN0U2VhcmNoRmll bGRTdHlsZShDU1NTdHlsZVNlbGVjdG9yKiwgUmVuZGVyU3R5bGUqLCBFbGVtZW50KikgY29uc3Q7 CiAgICAgdmlydHVhbCBib29sIHBhaW50U2VhcmNoRmllbGQoUmVuZGVyT2JqZWN0KiwgY29uc3Qg UmVuZGVyT2JqZWN0OjpQYWludEluZm8mLCBjb25zdCBJbnRSZWN0Jik7CiAKSW5kZXg6IHJlbmRl cmluZy9SZW5kZXJUaGVtZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gcmVuZGVyaW5nL1JlbmRlclRoZW1l LmNwcAkocmV2aXNpb24gMzkwNDApCisrKyByZW5kZXJpbmcvUmVuZGVyVGhlbWUuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC02NTAsNiArNjUwLDEwIEBACiB7CiB9CiAKK3ZvaWQgUmVuZGVyVGhlbWU6 OmFkanVzdEJ1dHRvbklubmVyU3R5bGUoUmVuZGVyU3R5bGUqIHN0eWxlKSBjb25zdAoreworfQor CiB2b2lkIFJlbmRlclRoZW1lOjphZGp1c3RTbGlkZXJUcmFja1N0eWxlKENTU1N0eWxlU2VsZWN0 b3IqIHNlbGVjdG9yLCBSZW5kZXJTdHlsZSogc3R5bGUsIEVsZW1lbnQqIGUpIGNvbnN0CiB7CiB9 CkluZGV4OiByZW5kZXJpbmcvUmVuZGVyVGhlbWUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSByZW5kZXJpbmcv UmVuZGVyVGhlbWUuaAkocmV2aXNpb24gMzkwNDApCisrKyByZW5kZXJpbmcvUmVuZGVyVGhlbWUu aAkod29ya2luZyBjb3B5KQpAQCAtMTI5LDYgKzEyOSw3IEBACiAKICAgICB2aXJ0dWFsIGludCBt aW5pbXVtTWVudUxpc3RTaXplKFJlbmRlclN0eWxlKikgY29uc3QgeyByZXR1cm4gMDsgfQogCisg ICAgdmlydHVhbCB2b2lkIGFkanVzdEJ1dHRvbklubmVyU3R5bGUoUmVuZGVyU3R5bGUqKSBjb25z dDsKICAgICB2aXJ0dWFsIHZvaWQgYWRqdXN0U2xpZGVyVGh1bWJTaXplKFJlbmRlck9iamVjdCop IGNvbnN0OwogCiAgICAgdmlydHVhbCBpbnQgcG9wdXBJbnRlcm5hbFBhZGRpbmdMZWZ0KFJlbmRl clN0eWxlKikgY29uc3QgeyByZXR1cm4gMDsgfQpJbmRleDogcmVuZGVyaW5nL1JlbmRlckJ1dHRv bi5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIHJlbmRlcmluZy9SZW5kZXJCdXR0b24uaAkocmV2aXNpb24gMzkw NDApCisrKyByZW5kZXJpbmcvUmVuZGVyQnV0dG9uLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ1LDYg KzQ1LDcgQEAKICAgICB2aXJ0dWFsIHZvaWQgcmVtb3ZlTGVmdG92ZXJBbm9ueW1vdXNCbG9jayhS ZW5kZXJCbG9jayopIHsgfQogICAgIHZpcnR1YWwgYm9vbCBjcmVhdGVzQW5vbnltb3VzV3JhcHBl cigpIGNvbnN0IHsgcmV0dXJuIHRydWU7IH0KIAorICAgIHZvaWQgc2V0dXBJbm5lclN0eWxlKFJl bmRlclN0eWxlKik7CiAgICAgdmlydHVhbCB2b2lkIHVwZGF0ZUZyb21FbGVtZW50KCk7CiAKICAg ICB2aXJ0dWFsIHZvaWQgdXBkYXRlQmVmb3JlQWZ0ZXJDb250ZW50KFJlbmRlclN0eWxlOjpQc2V1 ZG9JZCk7CkluZGV4OiByZW5kZXJpbmcvUmVuZGVyVGhlbWVXaW4uY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IHJlbmRlcmluZy9SZW5kZXJUaGVtZVdpbi5jcHAJKHJldmlzaW9uIDM5MDQwKQorKysgcmVuZGVy aW5nL1JlbmRlclRoZW1lV2luLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjc4LDggKzY3OCwxNyBA QAogICAgICAgICBvLT5zdHlsZSgpLT5zZXRXaWR0aChMZW5ndGgoc2xpZGVyVGh1bWJXaWR0aCwg Rml4ZWQpKTsKICAgICAgICAgby0+c3R5bGUoKS0+c2V0SGVpZ2h0KExlbmd0aChzbGlkZXJUaHVt YkhlaWdodCwgRml4ZWQpKTsKICAgICB9Ci0gfQorfQogCit2b2lkIFJlbmRlclRoZW1lV2luOjph ZGp1c3RCdXR0b25Jbm5lclN0eWxlKFJlbmRlclN0eWxlKiBzdHlsZSkgY29uc3QKK3sKKyAgICAv LyBUaGlzIGlubmVyIHBhZGRpbmcgbWF0Y2hlcyBGaXJlZm94LgorICAgIHN0eWxlLT5zZXRQYWRk aW5nVG9wKExlbmd0aCgxLCBGaXhlZCkpOworICAgIHN0eWxlLT5zZXRQYWRkaW5nUmlnaHQoTGVu Z3RoKDMsIEZpeGVkKSk7CisgICAgc3R5bGUtPnNldFBhZGRpbmdCb3R0b20oTGVuZ3RoKDEsIEZp eGVkKSk7CisgICAgc3R5bGUtPnNldFBhZGRpbmdMZWZ0KExlbmd0aCgzLCBGaXhlZCkpOworfQor CiBib29sIFJlbmRlclRoZW1lV2luOjpwYWludFNlYXJjaEZpZWxkKFJlbmRlck9iamVjdCogbywg Y29uc3QgUmVuZGVyT2JqZWN0OjpQYWludEluZm8mIGksIGNvbnN0IEludFJlY3QmIHIpCiB7CiAg ICAgcmV0dXJuIHBhaW50VGV4dEZpZWxkKG8sIGksIHIpOwo= 25892 2008-12-09 12:09:27 -0800 2008-12-09 13:39:11 -0800 Sets padding only if style->appearance() != NoControlPart button.diff text/plain 5491 ojan SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzOTE0MSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjQgQEAKKzIwMDgtMTItMDkgIE9qYW4gVmFmYWkgIDxvamFuQGNocm9taXVtLm9y Zz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYXRj aCBGaXJlZm94IGJ1dHRvbiBtZXRyaWNzIG9uIFdpbmRvd3MuCisKKyAgICAgICAgV0FSTklORzog Tk8gVEVTVCBDQVNFUyBBRERFRCBPUiBDSEFOR0VECisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVu ZGVyQnV0dG9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJ1dHRvbjo6YWRkQ2hpbGQp OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQnV0dG9uOjpzdHlsZURpZENoYW5nZSk6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJCdXR0b246OnNldHVwSW5uZXJTdHlsZSk6CisgICAgICAgICog cmVuZGVyaW5nL1JlbmRlckJ1dHRvbi5oOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUaGVt ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZTo6YWRqdXN0QnV0dG9uSW5uZXJT dHlsZSk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1lLmg6CisgICAgICAgICogcmVu ZGVyaW5nL1JlbmRlclRoZW1lV2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1l V2luOjphZGp1c3RTbGlkZXJUaHVtYlNpemUpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhl bWVXaW46OmFkanVzdEJ1dHRvbklubmVyU3R5bGUpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5k ZXJUaGVtZVdpbi5oOgorCiAyMDA4LTEyLTA5ICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxlLmNv bT4KIAogICAgICAgICBUcnkgdG8gZml4IG5vbi1NYWMgYnVpbGRzLgpJbmRleDogV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyQnV0dG9uLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJCdXR0b24uY3BwCShyZXZpc2lvbiAzOTA0MCkKKysrIFdlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckJ1dHRvbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTUzLDcgKzUzLDcgQEAgdm9pZCBS ZW5kZXJCdXR0b246OmFkZENoaWxkKFJlbmRlck9iamVjdAogICAgICAgICAvLyBDcmVhdGUgYW4g YW5vbnltb3VzIGJsb2NrLgogICAgICAgICBBU1NFUlQoIWZpcnN0Q2hpbGQoKSk7CiAgICAgICAg IG1faW5uZXIgPSBjcmVhdGVBbm9ueW1vdXNCbG9jaygpOwotICAgICAgICBtX2lubmVyLT5zdHls ZSgpLT5zZXRCb3hGbGV4KDEuMGYpOworICAgICAgICBzZXR1cElubmVyU3R5bGUobV9pbm5lci0+ c3R5bGUoKSk7CiAgICAgICAgIFJlbmRlckZsZXhpYmxlQm94OjphZGRDaGlsZChtX2lubmVyKTsK ICAgICB9CiAgICAgCkBAIC04OCw3ICs4OCw3IEBAIHZvaWQgUmVuZGVyQnV0dG9uOjpzdHlsZURp ZENoYW5nZShSZW5kZXIKICAgICBpZiAobV9idXR0b25UZXh0KQogICAgICAgICBtX2J1dHRvblRl eHQtPnNldFN0eWxlKHN0eWxlKCkpOwogICAgIGlmIChtX2lubmVyKSAvLyBSZW5kZXJCbG9jayBo YW5kbGVkIHVwZGF0aW5nIHRoZSBhbm9ueW1vdXMgYmxvY2sncyBzdHlsZS4KLSAgICAgICAgbV9p bm5lci0+c3R5bGUoKS0+c2V0Qm94RmxleCgxLjBmKTsKKyAgICAgICAgc2V0dXBJbm5lclN0eWxl KG1faW5uZXItPnN0eWxlKCkpOwogICAgIHNldFJlcGxhY2VkKGlzSW5saW5lKCkpOwogCiAgICAg aWYgKCFtX2RlZmF1bHQgJiYgdGhlbWUoKS0+aXNEZWZhdWx0KHRoaXMpKSB7CkBAIC0xMDIsNiAr MTAyLDE2IEBAIHZvaWQgUmVuZGVyQnV0dG9uOjpzdHlsZURpZENoYW5nZShSZW5kZXIKICAgICB9 CiB9CiAKK3ZvaWQgUmVuZGVyQnV0dG9uOjpzZXR1cElubmVyU3R5bGUoUmVuZGVyU3R5bGUqIHN0 eWxlKSAKK3sKKyAgICBBU1NFUlQoc3R5bGUtPnJlZkNvdW50KCkgPT0gMSk7CisgICAgLy8gUmVu ZGVyQmxvY2s6OmNyZWF0ZUFub255bW91c0Jsb2NrIGNyZWF0ZXMgYSBuZXcgUmVuZGVyU3R5bGUs IHNvIHRoaXMgaXMKKyAgICAvLyBzYWZlIHRvIG1vZGlmeS4KKyAgICBzdHlsZS0+c2V0Qm94Rmxl eCgxLjBmKTsKKyAgICBpZiAoc3R5bGUtPmFwcGVhcmFuY2UoKSAhPSBOb0NvbnRyb2xQYXJ0KQor ICAgICAgICB0aGVtZSgpLT5hZGp1c3RCdXR0b25Jbm5lclN0eWxlKHN0eWxlKTsKK30KKwogdm9p ZCBSZW5kZXJCdXR0b246OnVwZGF0ZUZyb21FbGVtZW50KCkKIHsKICAgICAvLyBJZiB3ZSdyZSBh biBpbnB1dCBlbGVtZW50LCB3ZSBtYXkgbmVlZCB0byBjaGFuZ2Ugb3VyIGJ1dHRvbiB0ZXh0LgpJ bmRleDogV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQnV0dG9uLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyQnV0dG9uLmgJKHJldmlzaW9uIDM5MDQwKQorKysgV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQnV0dG9uLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ1LDYgKzQ1LDcg QEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCByZW1vdmVMZWZ0b3ZlckFub255bW91c0Jsb2Nr KFJlbmRlckJsb2NrKikgeyB9CiAgICAgdmlydHVhbCBib29sIGNyZWF0ZXNBbm9ueW1vdXNXcmFw cGVyKCkgY29uc3QgeyByZXR1cm4gdHJ1ZTsgfQogCisgICAgdm9pZCBzZXR1cElubmVyU3R5bGUo UmVuZGVyU3R5bGUqKTsKICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlRnJvbUVsZW1lbnQoKTsKIAog ICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVCZWZvcmVBZnRlckNvbnRlbnQoUmVuZGVyU3R5bGU6OlBz ZXVkb0lkKTsKSW5kZXg6IFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZS5jcHAJKHJldmlzaW9uIDM5MDQw KQorKysgV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWUuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC02NTAsNiArNjUwLDEwIEBAIHZvaWQgUmVuZGVyVGhlbWU6OmFkanVzdE1lbnVMaXN0QnV0dG9u U3QKIHsKIH0KIAordm9pZCBSZW5kZXJUaGVtZTo6YWRqdXN0QnV0dG9uSW5uZXJTdHlsZShSZW5k ZXJTdHlsZSogc3R5bGUpIGNvbnN0Cit7Cit9CisKIHZvaWQgUmVuZGVyVGhlbWU6OmFkanVzdFNs aWRlclRyYWNrU3R5bGUoQ1NTU3R5bGVTZWxlY3Rvciogc2VsZWN0b3IsIFJlbmRlclN0eWxlKiBz dHlsZSwgRWxlbWVudCogZSkgY29uc3QKIHsKIH0KSW5kZXg6IFdlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlclRoZW1lLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWUu aAkocmV2aXNpb24gMzkwNDApCisrKyBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZS5oCSh3 b3JraW5nIGNvcHkpCkBAIC0xMjksNiArMTI5LDcgQEAgcHVibGljOgogCiAgICAgdmlydHVhbCBp bnQgbWluaW11bU1lbnVMaXN0U2l6ZShSZW5kZXJTdHlsZSopIGNvbnN0IHsgcmV0dXJuIDA7IH0K IAorICAgIHZpcnR1YWwgdm9pZCBhZGp1c3RCdXR0b25Jbm5lclN0eWxlKFJlbmRlclN0eWxlKikg Y29uc3Q7CiAgICAgdmlydHVhbCB2b2lkIGFkanVzdFNsaWRlclRodW1iU2l6ZShSZW5kZXJPYmpl Y3QqKSBjb25zdDsKIAogICAgIHZpcnR1YWwgaW50IHBvcHVwSW50ZXJuYWxQYWRkaW5nTGVmdChS ZW5kZXJTdHlsZSopIGNvbnN0IHsgcmV0dXJuIDA7IH0KSW5kZXg6IFdlYkNvcmUvcmVuZGVyaW5n L1JlbmRlclRoZW1lV2luLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJUaGVtZVdpbi5jcHAJKHJldmlzaW9uIDM5MDQwKQorKysgV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyVGhlbWVXaW4uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02NzgsNyArNjc4LDE2IEBAIHZvaWQg UmVuZGVyVGhlbWVXaW46OmFkanVzdFNsaWRlclRodW1iU2kKICAgICAgICAgby0+c3R5bGUoKS0+ c2V0V2lkdGgoTGVuZ3RoKHNsaWRlclRodW1iV2lkdGgsIEZpeGVkKSk7CiAgICAgICAgIG8tPnN0 eWxlKCktPnNldEhlaWdodChMZW5ndGgoc2xpZGVyVGh1bWJIZWlnaHQsIEZpeGVkKSk7CiAgICAg fQotIH0KK30KKwordm9pZCBSZW5kZXJUaGVtZVdpbjo6YWRqdXN0QnV0dG9uSW5uZXJTdHlsZShS ZW5kZXJTdHlsZSogc3R5bGUpIGNvbnN0Cit7CisgICAgLy8gVGhpcyBpbm5lciBwYWRkaW5nIG1h dGNoZXMgRmlyZWZveC4KKyAgICBzdHlsZS0+c2V0UGFkZGluZ1RvcChMZW5ndGgoMSwgRml4ZWQp KTsKKyAgICBzdHlsZS0+c2V0UGFkZGluZ1JpZ2h0KExlbmd0aCgzLCBGaXhlZCkpOworICAgIHN0 eWxlLT5zZXRQYWRkaW5nQm90dG9tKExlbmd0aCgxLCBGaXhlZCkpOworICAgIHN0eWxlLT5zZXRQ YWRkaW5nTGVmdChMZW5ndGgoMywgRml4ZWQpKTsKK30KIAogYm9vbCBSZW5kZXJUaGVtZVdpbjo6 cGFpbnRTZWFyY2hGaWVsZChSZW5kZXJPYmplY3QqIG8sIGNvbnN0IFJlbmRlck9iamVjdDo6UGFp bnRJbmZvJiBpLCBjb25zdCBJbnRSZWN0JiByKQogewpJbmRleDogV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyVGhlbWVXaW4uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJU aGVtZVdpbi5oCShyZXZpc2lvbiAzOTA0MCkKKysrIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRo ZW1lV2luLmgJKHdvcmtpbmcgY29weSkKQEAgLTkyLDYgKzkyLDggQEAgcHVibGljOgogICAgIHZp cnR1YWwgYm9vbCBwYWludFNsaWRlclRodW1iKFJlbmRlck9iamVjdCogbywgY29uc3QgUmVuZGVy T2JqZWN0OjpQYWludEluZm8mIGksIGNvbnN0IEludFJlY3QmIHIpOwogICAgIHZpcnR1YWwgdm9p ZCBhZGp1c3RTbGlkZXJUaHVtYlNpemUoUmVuZGVyT2JqZWN0KikgY29uc3Q7CiAKKyAgICB2aXJ0 dWFsIHZvaWQgYWRqdXN0QnV0dG9uSW5uZXJTdHlsZShSZW5kZXJTdHlsZSopIGNvbnN0OworCiAg ICAgdmlydHVhbCB2b2lkIGFkanVzdFNlYXJjaEZpZWxkU3R5bGUoQ1NTU3R5bGVTZWxlY3Rvcios IFJlbmRlclN0eWxlKiwgRWxlbWVudCopIGNvbnN0OwogICAgIHZpcnR1YWwgYm9vbCBwYWludFNl YXJjaEZpZWxkKFJlbmRlck9iamVjdCosIGNvbnN0IFJlbmRlck9iamVjdDo6UGFpbnRJbmZvJiwg Y29uc3QgSW50UmVjdCYpOwogCg==