35090 2010-02-18 05:09:57 -0800 Need -webkit-focus-inner to control the style of buttons 2010-07-21 20:25:07 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) PC All RESOLVED WONTFIX P2 Normal --- 1 hamaji webkit-unassigned cgriego oldest_to_newest 191538 0 hamaji 2010-02-18 05:09:57 -0800 With Firefox, we can change the style of anonymous render blocks in buttons using -moz-focus-inner pseudo element. This would be especially useful for Chrome because its buttons have some paddings to match the behavior of Firefox and currently there are no way to disable the paddings. See Bug 24048 for detail. The chromium bug for this issue: http://crbug.com/1437 191540 1 48999 hamaji 2010-02-18 05:12:36 -0800 Created attachment 48999 Patch v1 191542 2 hamaji 2010-02-18 05:13:55 -0800 I added baseStyle parameter for CSSStyleSelector::pseudoStyleForElement and this would be the most tricky point of my patch. We cannot use the existing parameter parentStyle because paddings aren't inherited. I think this solution isn't so bad, but I'm not 100% sure if this is the best. Any kind of suggestions will be really appreciated :) 202568 3 48999 abarth 2010-03-22 10:13:49 -0700 Comment on attachment 48999 Patch v1 Your ChangeLog doesn't give any information about this change. I didn't understand why this part was necessary: -void RenderButton::setupInnerStyle(RenderStyle* innerStyle) +void RenderButton::setupInnerStyle() This patch has been up for review for over a month with no discussion. Why do we want to implement this non-standard feature? Doesn't that just serve to fragment the web platform? Is this a feature that we'd like to see standardized at some point? 254638 4 hamaji 2010-07-21 20:25:07 -0700 The internal padding has gone so we don't need to provide a way to adjust it. https://bugs.webkit.org/show_bug.cgi?id=38016 48999 2010-02-18 05:12:36 -0800 2010-06-11 10:22:43 -0700 Patch v1 bug-35090-20100218051234.patch text/plain 13118 hamaji ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA3Y2JkZWM1Li4zNDY0MDA2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTAtMDIt MTggIFNoaW5pY2hpcm8gSGFtYWppICA8aGFtYWppQGNocm9taXVtLm9yZz4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBOZWVkIC13ZWJraXQtZm9jdXMt aW5uZXIgdG8gY29udHJvbCB0aGUgc3R5bGUgb2YgYnV0dG9ucworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzUwOTAKKworICAgICAgICAqIGZhc3QvZm9y bXMvYnV0dG9uLWZvY3VzLWlubmVyLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFz dC9mb3Jtcy9idXR0b24tZm9jdXMtaW5uZXIuaHRtbDogQWRkZWQuCisKIDIwMTAtMDItMTcgIFNo aW5pY2hpcm8gSGFtYWppICA8aGFtYWppQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdl ZCBieSBFcmljIFNlaWRlbC4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvZm9ybXMvYnV0 dG9uLWZvY3VzLWlubmVyLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvZm9ybXMvYnV0 dG9uLWZvY3VzLWlubmVyLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAw MDAwMDAwLi5mMWZiNmM0Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9mb3Jt cy9idXR0b24tZm9jdXMtaW5uZXItZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsNiBAQAorVGhpcyB0 ZXN0cyBmb3IgOjotd2Via2l0LWZvY3VzLWlubmVyIHBzZXVkbyBlbGVtZW50LiBZb3Ugc2hvdWxk IHNlZSBhIGdyZWVuIGJveCBhbmQgYSBzdHJpbmcgIlBBU1MiLgorCisKK2J1dHRvbgorCitQQVNT CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Zvcm1zL2J1dHRvbi1mb2N1cy1pbm5lci5o dG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9mb3Jtcy9idXR0b24tZm9jdXMtaW5uZXIuaHRtbApuZXcg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi40OTQ5OGMwCi0tLSAvZGV2L251bGwKKysr IGIvTGF5b3V0VGVzdHMvZmFzdC9mb3Jtcy9idXR0b24tZm9jdXMtaW5uZXIuaHRtbApAQCAtMCww ICsxLDUzIEBACis8aHRtbD4KKzxoZWFkPgorPHRpdGxlPlRlc3QgZm9yIDo6LXdlYmtpdC1mb2N1 cy1pbm5lciBwc2V1ZG8gZWxlbWVudDwvdGl0bGU+Cis8c3R5bGU+CitidXR0b24geworICAgIHdp ZHRoOiAyMDBweDsKKyAgICBib3JkZXI6IG5vbmU7CisgICAgcGFkZGluZzogMHB4OworICAgIGJh Y2tncm91bmQtY29sb3I6IHJlZDsKK30KK2J1dHRvbjo6LXdlYmtpdC1mb2N1cy1pbm5lciB7Cisg ICAgYm9yZGVyOiBub25lOworICAgIGJvcmRlci1yaWdodDogc29saWQgNTBweCBncmVlbjsKKyAg ICBib3JkZXItbGVmdDogc29saWQgNTBweCBncmVlbjsKKyAgICBwYWRkaW5nOiAwcHg7Cit9Citi dXR0b246Oi1tb3otZm9jdXMtaW5uZXIgeworICAgIGJvcmRlcjogbm9uZTsKKyAgICBib3JkZXIt cmlnaHQ6IHNvbGlkIDUwcHggZ3JlZW47CisgICAgYm9yZGVyLWxlZnQ6IHNvbGlkIDUwcHggZ3Jl ZW47CisgICAgcGFkZGluZzogMHB4OworfQorPC9zdHlsZT4KKzxzY3JpcHQ+CitpZiAod2luZG93 LmxheW91dFRlc3RDb250cm9sbGVyKQorICAgIGxheW91dFRlc3RDb250cm9sbGVyLmR1bXBBc1Rl eHQoKTsKKworZnVuY3Rpb24gdGVzdCgpCit7CisgICAgdmFyIHRlc3RFbGVtZW50ID0gZG9jdW1l bnQuZ2V0RWxlbWVudEJ5SWQoInRlc3QiKTsKKyAgICB2YXIgYWN0dWFsV2lkdGggPSB0ZXN0RWxl bWVudC5vZmZzZXRXaWR0aDsKKyAgICB2YXIgcmVzdWx0ID0gIiI7CisgICAgLy8gSWYgKi1mb2N1 cy1pbm5lciBpcyBoYW5kbGVkLCB0aGUgd2lkdGggbXVzdCBiZSAyMDAgLSA1MCoyID0gMTAwLgor ICAgIGlmIChhY3R1YWxXaWR0aCA9PSAxMDApIHsKKyAgICAgICAgcmVzdWx0ID0gIlBBU1MiOwor ICAgICAgICB0ZXN0RWxlbWVudC5zdHlsZS5iYWNrZ3JvdW5kQ29sb3IgPSAiZ3JlZW4iOworICAg IH0gZWxzZQorICAgICAgICByZXN1bHQgPSAiRkFJTDogdGhlIHdpZHRoIG9mIGlubmVyIGRpdiBt dXN0IGJlIDEwMCwgYnV0IGNvbWVzICIgKyBhY3R1YWxXaWR0aDsKKyAgICBkb2N1bWVudC5nZXRF bGVtZW50QnlJZCgicmVzdWx0IikuaW5uZXJIVE1MID0gcmVzdWx0OworfQorPC9zY3JpcHQ+Cis8 L2hlYWQ+Cis8Ym9keSBvbmxvYWQ9InRlc3QoKTsiPgorPHA+CisgICAgVGhpcyB0ZXN0cyBmb3Ig Ojotd2Via2l0LWZvY3VzLWlubmVyIHBzZXVkbyBlbGVtZW50LgorICAgIFlvdSBzaG91bGQgc2Vl IGEgZ3JlZW4gYm94IGFuZCBhIHN0cmluZyAmcXVvdDtQQVNTJnF1b3Q7LgorPC9wPgorPHA+Cisg ICAgPGJ1dHRvbj48ZGl2IGlkPSJ0ZXN0Ij5idXR0b248L2Rpdj48L2J1dHRvbj4KKzwvcD4KKzxw IGlkPSJyZXN1bHQiPjwvcD4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL1dlYkNvcmUv Q2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjQ4YjU1MC4uN2Q5YTY5MSAxMDA2 NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzMSBAQAorMjAxMC0wMi0xOCAgU2hpbmljaGlybyBIYW1hamkgIDxoYW1hamlAY2hyb21p dW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IE5lZWQgLXdlYmtpdC1mb2N1cy1pbm5lciB0byBjb250cm9sIHRoZSBzdHlsZSBvZiBidXR0b25z CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNTA5MAor CisgICAgICAgIFRlc3Q6IGZhc3QvZm9ybXMvYnV0dG9uLWZvY3VzLWlubmVyLmh0bWwKKworICAg ICAgICAqIGNzcy9DU1NTZWxlY3Rvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDU1NTZWxlY3Rv cjo6ZXh0cmFjdFBzZXVkb1R5cGUpOgorICAgICAgICAqIGNzcy9DU1NTZWxlY3Rvci5oOgorICAg ICAgICAoV2ViQ29yZTo6Q1NTU2VsZWN0b3I6Oik6CisgICAgICAgICogY3NzL0NTU1N0eWxlU2Vs ZWN0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTU3R5bGVTZWxlY3Rvcjo6cHNldWRvU3R5 bGVGb3JFbGVtZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkNTU1N0eWxlU2VsZWN0b3I6OlNlbGVj dG9yQ2hlY2tlcjo6Y2hlY2tPbmVTZWxlY3Rvcik6CisgICAgICAgICogY3NzL0NTU1N0eWxlU2Vs ZWN0b3IuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQnV0dG9uLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlckJ1dHRvbjo6YWRkQ2hpbGQpOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyQnV0dG9uOjpzdHlsZURpZENoYW5nZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCdXR0 b246OnNldHVwSW5uZXJTdHlsZSk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJ1dHRvbi5o OgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyT2JqZWN0OjpnZXRVbmNhY2hlZFBzZXVkb1N0eWxlKToKKyAgICAgICAgKiByZW5k ZXJpbmcvUmVuZGVyT2JqZWN0Lmg6CisgICAgICAgICogcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0 eWxlQ29uc3RhbnRzLmg6CisgICAgICAgIChXZWJDb3JlOjopOgorCiAyMDEwLTAyLTE3ICBNYXJr IFJvd2UgIDxtcm93ZUBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRs ZXIuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2Nzcy9DU1NTZWxlY3Rvci5jcHAgYi9XZWJDb3JlL2Nz cy9DU1NTZWxlY3Rvci5jcHAKaW5kZXggOWFlOWI5Zi4uNjdjNTc4MCAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9jc3MvQ1NTU2VsZWN0b3IuY3BwCisrKyBiL1dlYkNvcmUvY3NzL0NTU1NlbGVjdG9yLmNw cApAQCAtMTU3LDYgKzE1Nyw3IEBAIHZvaWQgQ1NTU2VsZWN0b3I6OmV4dHJhY3RQc2V1ZG9UeXBl KCkgY29uc3QKICAgICBERUZJTkVfU1RBVElDX0xPQ0FMKEF0b21pY1N0cmluZywgc2luZ2xlQnV0 dG9uLCAoInNpbmdsZS1idXR0b24iKSk7CiAgICAgREVGSU5FX1NUQVRJQ19MT0NBTChBdG9taWNT dHJpbmcsIG5vQnV0dG9uLCAoIm5vLWJ1dHRvbiIpKTsKICAgICBERUZJTkVfU1RBVElDX0xPQ0FM KEF0b21pY1N0cmluZywgY29ybmVyUHJlc2VudCwgKCJjb3JuZXItcHJlc2VudCIpKTsKKyAgICBE RUZJTkVfU1RBVElDX0xPQ0FMKEF0b21pY1N0cmluZywgZm9jdXNJbm5lciwgKCItd2Via2l0LWZv Y3VzLWlubmVyIikpOwogCiAgICAgYm9vbCBlbGVtZW50ID0gZmFsc2U7IC8vIHBzZXVkby1lbGVt ZW50CiAgICAgYm9vbCBjb21wYXQgPSBmYWxzZTsgLy8gc2luZ2xlIGNvbG9uIGNvbXBhdGJpbGl0 eSBtb2RlCkBAIC0zNzksNiArMzgwLDEwIEBAIHZvaWQgQ1NTU2VsZWN0b3I6OmV4dHJhY3RQc2V1 ZG9UeXBlKCkgY29uc3QKICAgICAgICAgbV9wc2V1ZG9UeXBlID0gUHNldWRvVGFyZ2V0OwogICAg IGVsc2UgaWYgKG1fdmFsdWUgPT0gdmlzaXRlZCkKICAgICAgICAgbV9wc2V1ZG9UeXBlID0gUHNl dWRvVmlzaXRlZDsKKyAgICBlbHNlIGlmIChtX3ZhbHVlID09IGZvY3VzSW5uZXIpIHsKKyAgICAg ICAgbV9wc2V1ZG9UeXBlID0gUHNldWRvRm9jdXNJbm5lcjsKKyAgICAgICAgZWxlbWVudCA9IHRy dWU7CisgICAgfQogCiAgICAgaWYgKG1fbWF0Y2ggPT0gUHNldWRvQ2xhc3MgJiYgZWxlbWVudCkg ewogICAgICAgICBpZiAoIWNvbXBhdCkgCmRpZmYgLS1naXQgYS9XZWJDb3JlL2Nzcy9DU1NTZWxl Y3Rvci5oIGIvV2ViQ29yZS9jc3MvQ1NTU2VsZWN0b3IuaAppbmRleCA3MGYyNTc0Li5kMDU2Yjc5 IDEwMDY0NAotLS0gYS9XZWJDb3JlL2Nzcy9DU1NTZWxlY3Rvci5oCisrKyBiL1dlYkNvcmUvY3Nz L0NTU1NlbGVjdG9yLmgKQEAgLTE4Niw2ICsxODYsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAg ICAgICAgICAgICBQc2V1ZG9JbnB1dExpc3RCdXR0b24sCiAgICAgICAgICAgICBQc2V1ZG9Jbm5l clNwaW5CdXR0b24sCiAgICAgICAgICAgICBQc2V1ZG9PdXRlclNwaW5CdXR0b24sCisgICAgICAg ICAgICBQc2V1ZG9Gb2N1c0lubmVyLAogICAgICAgICB9OwogCiAgICAgICAgIFBzZXVkb1R5cGUg cHNldWRvVHlwZSgpIGNvbnN0CmRpZmYgLS1naXQgYS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVj dG9yLmNwcCBiL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwCmluZGV4IDEyNGViOWYu LmI1OGQ3ZTcgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwCisr KyBiL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwCkBAIC0xNDEyLDcgKzE0MTIsNyBA QCB2b2lkIENTU1N0eWxlU2VsZWN0b3I6OmtleWZyYW1lU3R5bGVzRm9yQW5pbWF0aW9uKEVsZW1l bnQqIGUsIGNvbnN0IFJlbmRlclN0eWxlKgogICAgICAgICBsaXN0LmNsZWFyKCk7CiB9CiAKLVBh c3NSZWZQdHI8UmVuZGVyU3R5bGU+IENTU1N0eWxlU2VsZWN0b3I6OnBzZXVkb1N0eWxlRm9yRWxl bWVudChQc2V1ZG9JZCBwc2V1ZG8sIEVsZW1lbnQqIGUsIFJlbmRlclN0eWxlKiBwYXJlbnRTdHls ZSkKK1Bhc3NSZWZQdHI8UmVuZGVyU3R5bGU+IENTU1N0eWxlU2VsZWN0b3I6OnBzZXVkb1N0eWxl Rm9yRWxlbWVudChQc2V1ZG9JZCBwc2V1ZG8sIEVsZW1lbnQqIGUsIFJlbmRlclN0eWxlKiBwYXJl bnRTdHlsZSwgUmVuZGVyU3R5bGUqIGJhc2VTdHlsZSkKIHsKICAgICBpZiAoIWUpCiAgICAgICAg IHJldHVybiAwOwpAQCAtMTQzNSw4ICsxNDM1LDggQEAgUGFzc1JlZlB0cjxSZW5kZXJTdHlsZT4g Q1NTU3R5bGVTZWxlY3Rvcjo6cHNldWRvU3R5bGVGb3JFbGVtZW50KFBzZXVkb0lkIHBzZXVkbywK IAogICAgIGlmIChtX21hdGNoZWREZWNscy5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVybiAwOwot ICAgIAotICAgIG1fc3R5bGUgPSBSZW5kZXJTdHlsZTo6Y3JlYXRlKCk7CisKKyAgICBtX3N0eWxl ID0gYmFzZVN0eWxlID8gUmVuZGVyU3R5bGU6OmNsb25lKGJhc2VTdHlsZSkgOiBSZW5kZXJTdHls ZTo6Y3JlYXRlKCk7CiAgICAgaWYgKHBhcmVudFN0eWxlKQogICAgICAgICBtX3N0eWxlLT5pbmhl cml0RnJvbShwYXJlbnRTdHlsZSk7CiAKQEAgLTI2NDAsNiArMjY0MCw5IEBAIGJvb2wgQ1NTU3R5 bGVTZWxlY3Rvcjo6U2VsZWN0b3JDaGVja2VyOjpjaGVja09uZVNlbGVjdG9yKENTU1NlbGVjdG9y KiBzZWwsIEVsZW1lCiAgICAgICAgICAgICBjYXNlIENTU1NlbGVjdG9yOjpQc2V1ZG9PdXRlclNw aW5CdXR0b246CiAgICAgICAgICAgICAgICAgZHluYW1pY1BzZXVkbyA9IE9VVEVSX1NQSU5fQlVU VE9OOwogICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICAgICAgY2FzZSBDU1NT ZWxlY3Rvcjo6UHNldWRvRm9jdXNJbm5lcjoKKyAgICAgICAgICAgICAgICBkeW5hbWljUHNldWRv ID0gRk9DVVNfSU5ORVI7CisgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgICAg ICBjYXNlIENTU1NlbGVjdG9yOjpQc2V1ZG9Vbmtub3duOgogICAgICAgICAgICAgY2FzZSBDU1NT ZWxlY3Rvcjo6UHNldWRvTm90UGFyc2VkOgogICAgICAgICAgICAgZGVmYXVsdDoKZGlmZiAtLWdp dCBhL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuaCBiL1dlYkNvcmUvY3NzL0NTU1N0eWxl U2VsZWN0b3IuaAppbmRleCA2NDQwNTFjLi5kODQzMzY4IDEwMDY0NAotLS0gYS9XZWJDb3JlL2Nz cy9DU1NTdHlsZVNlbGVjdG9yLmgKKysrIGIvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5o CkBAIC05MCw3ICs5MCw3IEBAIHB1YmxpYzoKICAgICAgICAgUGFzc1JlZlB0cjxSZW5kZXJTdHls ZT4gc3R5bGVGb3JFbGVtZW50KEVsZW1lbnQqLCBSZW5kZXJTdHlsZSogcGFyZW50U3R5bGUgPSAw LCBib29sIGFsbG93U2hhcmluZyA9IHRydWUsIGJvb2wgcmVzb2x2ZUZvclJvb3REZWZhdWx0ID0g ZmFsc2UpOwogICAgICAgICB2b2lkIGtleWZyYW1lU3R5bGVzRm9yQW5pbWF0aW9uKEVsZW1lbnQq LCBjb25zdCBSZW5kZXJTdHlsZSosIEtleWZyYW1lTGlzdCYgbGlzdCk7CiAKLSAgICAgICAgUGFz c1JlZlB0cjxSZW5kZXJTdHlsZT4gcHNldWRvU3R5bGVGb3JFbGVtZW50KFBzZXVkb0lkLCBFbGVt ZW50KiwgUmVuZGVyU3R5bGUqIHBhcmVudFN0eWxlID0gMCk7CisgICAgICAgIFBhc3NSZWZQdHI8 UmVuZGVyU3R5bGU+IHBzZXVkb1N0eWxlRm9yRWxlbWVudChQc2V1ZG9JZCwgRWxlbWVudCosIFJl bmRlclN0eWxlKiBwYXJlbnRTdHlsZSA9IDAsIFJlbmRlclN0eWxlKiBiYXNlU3R5bGUgPSAwKTsK IAogICAgICAgICBzdGF0aWMgUGFzc1JlZlB0cjxSZW5kZXJTdHlsZT4gc3R5bGVGb3JEb2N1bWVu dChEb2N1bWVudCopOwogCmRpZmYgLS1naXQgYS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCdXR0 b24uY3BwIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQnV0dG9uLmNwcAppbmRleCAzZWNkMzgy Li5hMmYyNDU5IDEwMDY0NAotLS0gYS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCdXR0b24uY3Bw CisrKyBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJ1dHRvbi5jcHAKQEAgLTUyLDcgKzUyLDcg QEAgdm9pZCBSZW5kZXJCdXR0b246OmFkZENoaWxkKFJlbmRlck9iamVjdCogbmV3Q2hpbGQsIFJl bmRlck9iamVjdCogYmVmb3JlQ2hpbGQpCiAgICAgICAgIEFTU0VSVCghZmlyc3RDaGlsZCgpKTsK ICAgICAgICAgYm9vbCBpc0ZsZXhpYmxlQm94ID0gc3R5bGUoKS0+ZGlzcGxheSgpID09IEJPWCB8 fCBzdHlsZSgpLT5kaXNwbGF5KCkgPT0gSU5MSU5FX0JPWDsKICAgICAgICAgbV9pbm5lciA9IGNy ZWF0ZUFub255bW91c0Jsb2NrKGlzRmxleGlibGVCb3gpOwotICAgICAgICBzZXR1cElubmVyU3R5 bGUobV9pbm5lci0+c3R5bGUoKSk7CisgICAgICAgIHNldHVwSW5uZXJTdHlsZSgpOwogICAgICAg ICBSZW5kZXJGbGV4aWJsZUJveDo6YWRkQ2hpbGQobV9pbm5lcik7CiAgICAgfQogICAgIApAQCAt ODcsNyArODcsNyBAQCB2b2lkIFJlbmRlckJ1dHRvbjo6c3R5bGVEaWRDaGFuZ2UoU3R5bGVEaWZm ZXJlbmNlIGRpZmYsIGNvbnN0IFJlbmRlclN0eWxlKiBvbGRTdAogICAgIGlmIChtX2J1dHRvblRl eHQpCiAgICAgICAgIG1fYnV0dG9uVGV4dC0+c2V0U3R5bGUoc3R5bGUoKSk7CiAgICAgaWYgKG1f aW5uZXIpIC8vIFJlbmRlckJsb2NrIGhhbmRsZWQgdXBkYXRpbmcgdGhlIGFub255bW91cyBibG9j aydzIHN0eWxlLgotICAgICAgICBzZXR1cElubmVyU3R5bGUobV9pbm5lci0+c3R5bGUoKSk7Cisg ICAgICAgIHNldHVwSW5uZXJTdHlsZSgpOwogICAgIHNldFJlcGxhY2VkKGlzSW5saW5lKCkpOwog CiAgICAgaWYgKCFtX2RlZmF1bHQgJiYgdGhlbWUoKS0+aXNEZWZhdWx0KHRoaXMpKSB7CkBAIC0x MDEsOSArMTAxLDEyIEBAIHZvaWQgUmVuZGVyQnV0dG9uOjpzdHlsZURpZENoYW5nZShTdHlsZURp ZmZlcmVuY2UgZGlmZiwgY29uc3QgUmVuZGVyU3R5bGUqIG9sZFN0CiAgICAgfQogfQogCi12b2lk IFJlbmRlckJ1dHRvbjo6c2V0dXBJbm5lclN0eWxlKFJlbmRlclN0eWxlKiBpbm5lclN0eWxlKSAK K3ZvaWQgUmVuZGVyQnV0dG9uOjpzZXR1cElubmVyU3R5bGUoKQogeworICAgIEFTU0VSVChtX2lu bmVyKTsKKyAgICBSZW5kZXJTdHlsZSogaW5uZXJTdHlsZSA9IG1faW5uZXItPnN0eWxlKCk7CiAg ICAgQVNTRVJUKGlubmVyU3R5bGUtPnJlZkNvdW50KCkgPT0gMSk7CisKICAgICAvLyBSZW5kZXJC bG9jazo6Y3JlYXRlQW5vbnltb3VzQmxvY2sgY3JlYXRlcyBhIG5ldyBSZW5kZXJTdHlsZSwgc28g dGhpcyBpcwogICAgIC8vIHNhZmUgdG8gbW9kaWZ5LgogICAgIGlubmVyU3R5bGUtPnNldEJveEZs ZXgoMS4wZik7CkBAIC0xMTMsNiArMTE2LDExIEBAIHZvaWQgUmVuZGVyQnV0dG9uOjpzZXR1cElu bmVyU3R5bGUoUmVuZGVyU3R5bGUqIGlubmVyU3R5bGUpCiAgICAgaW5uZXJTdHlsZS0+c2V0UGFk ZGluZ1JpZ2h0KExlbmd0aCh0aGVtZSgpLT5idXR0b25JbnRlcm5hbFBhZGRpbmdSaWdodCgpLCBG aXhlZCkpOwogICAgIGlubmVyU3R5bGUtPnNldFBhZGRpbmdCb3R0b20oTGVuZ3RoKHRoZW1lKCkt PmJ1dHRvbkludGVybmFsUGFkZGluZ0JvdHRvbSgpLCBGaXhlZCkpOwogICAgIGlubmVyU3R5bGUt PnNldFBhZGRpbmdMZWZ0KExlbmd0aCh0aGVtZSgpLT5idXR0b25JbnRlcm5hbFBhZGRpbmdMZWZ0 KCksIEZpeGVkKSk7CisKKyAgICBpZiAoUmVmUHRyPFJlbmRlclN0eWxlPiBwc2V1ZG9TdHlsZSA9 IGdldFVuY2FjaGVkUHNldWRvU3R5bGUoRk9DVVNfSU5ORVIsIDAsIDAsIGlubmVyU3R5bGUpKSB7 CisgICAgICAgIHBzZXVkb1N0eWxlLT5zZXRTdHlsZVR5cGUoTk9QU0VVRE8pOworICAgICAgICBt X2lubmVyLT5zZXRTdHlsZShwc2V1ZG9TdHlsZS5nZXQoKSk7CisgICAgfQogfQogCiB2b2lkIFJl bmRlckJ1dHRvbjo6dXBkYXRlRnJvbUVsZW1lbnQoKQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQnV0dG9uLmggYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCdXR0b24uaApp bmRleCA3ZmQ2YWIwLi44YWFiMDg4IDEwMDY0NAotLS0gYS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCdXR0b24uaAorKysgYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCdXR0b24uaApAQCAtNDQs NyArNDQsNiBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHJlbW92ZUxlZnRvdmVyQW5vbnlt b3VzQmxvY2soUmVuZGVyQmxvY2sqKSB7IH0KICAgICB2aXJ0dWFsIGJvb2wgY3JlYXRlc0Fub255 bW91c1dyYXBwZXIoKSBjb25zdCB7IHJldHVybiB0cnVlOyB9CiAKLSAgICB2b2lkIHNldHVwSW5u ZXJTdHlsZShSZW5kZXJTdHlsZSopOwogICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVGcm9tRWxlbWVu dCgpOwogCiAgICAgdmlydHVhbCB2b2lkIHVwZGF0ZUJlZm9yZUFmdGVyQ29udGVudChQc2V1ZG9J ZCk7CkBAIC02NSw2ICs2NCw4IEBAIHByb3RlY3RlZDoKIAogICAgIHZvaWQgdGltZXJGaXJlZChU aW1lcjxSZW5kZXJCdXR0b24+Kik7CiAKKyAgICB2b2lkIHNldHVwSW5uZXJTdHlsZSgpOworCiAg ICAgUmVuZGVyVGV4dEZyYWdtZW50KiBtX2J1dHRvblRleHQ7CiAgICAgUmVuZGVyQmxvY2sqIG1f aW5uZXI7CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAg Yi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwCmluZGV4IGJjNTBjMDIuLmVhOGUw ZmEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAKKysrIGIv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcApAQCAtMjE4MSw3ICsyMTgxLDcgQEAg UmVuZGVyU3R5bGUqIFJlbmRlck9iamVjdDo6Z2V0Q2FjaGVkUHNldWRvU3R5bGUoUHNldWRvSWQg cHNldWRvLCBSZW5kZXJTdHlsZSogcGEKICAgICByZXR1cm4gMDsKIH0KIAotUGFzc1JlZlB0cjxS ZW5kZXJTdHlsZT4gUmVuZGVyT2JqZWN0OjpnZXRVbmNhY2hlZFBzZXVkb1N0eWxlKFBzZXVkb0lk IHBzZXVkbywgUmVuZGVyU3R5bGUqIHBhcmVudFN0eWxlLCBSZW5kZXJTdHlsZSogb3duU3R5bGUp IGNvbnN0CitQYXNzUmVmUHRyPFJlbmRlclN0eWxlPiBSZW5kZXJPYmplY3Q6OmdldFVuY2FjaGVk UHNldWRvU3R5bGUoUHNldWRvSWQgcHNldWRvLCBSZW5kZXJTdHlsZSogcGFyZW50U3R5bGUsIFJl bmRlclN0eWxlKiBvd25TdHlsZSwgUmVuZGVyU3R5bGUqIGJhc2VTdHlsZSkgY29uc3QKIHsKICAg ICBpZiAocHNldWRvIDwgRklSU1RfSU5URVJOQUxfUFNFVURPSUQgJiYgIW93blN0eWxlICYmICFz dHlsZSgpLT5oYXNQc2V1ZG9TdHlsZShwc2V1ZG8pKQogICAgICAgICByZXR1cm4gMDsKQEAgLTIy MDIsNyArMjIwMiw3IEBAIFBhc3NSZWZQdHI8UmVuZGVyU3R5bGU+IFJlbmRlck9iamVjdDo6Z2V0 VW5jYWNoZWRQc2V1ZG9TdHlsZShQc2V1ZG9JZCBwc2V1ZG8sIFJlCiAgICAgICAgIHJlc3VsdCA9 IGRvY3VtZW50KCktPnN0eWxlU2VsZWN0b3IoKS0+c3R5bGVGb3JFbGVtZW50KHN0YXRpY19jYXN0 PEVsZW1lbnQqPihuKSwgcGFyZW50U3R5bGUsIGZhbHNlKTsKICAgICAgICAgcmVzdWx0LT5zZXRT dHlsZVR5cGUoRklSU1RfTElORV9JTkhFUklURUQpOwogICAgIH0gZWxzZQotICAgICAgICByZXN1 bHQgPSBkb2N1bWVudCgpLT5zdHlsZVNlbGVjdG9yKCktPnBzZXVkb1N0eWxlRm9yRWxlbWVudChw c2V1ZG8sIHN0YXRpY19jYXN0PEVsZW1lbnQqPihuKSwgcGFyZW50U3R5bGUpOworICAgICAgICBy ZXN1bHQgPSBkb2N1bWVudCgpLT5zdHlsZVNlbGVjdG9yKCktPnBzZXVkb1N0eWxlRm9yRWxlbWVu dChwc2V1ZG8sIHN0YXRpY19jYXN0PEVsZW1lbnQqPihuKSwgcGFyZW50U3R5bGUsIGJhc2VTdHls ZSk7CiAgICAgcmV0dXJuIHJlc3VsdC5yZWxlYXNlKCk7CiB9CiAKZGlmZiAtLWdpdCBhL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2Jq ZWN0LmgKaW5kZXggM2QyNGM0My4uMzllZjcyZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyT2JqZWN0LmgKKysrIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmgK QEAgLTQxMCw3ICs0MTAsNyBAQCBwdWJsaWM6CiAgICAgLy8gVGhlIHBzZXVkbyBlbGVtZW50IHN0 eWxlIGNhbiBiZSBjYWNoZWQgb3IgdW5jYWNoZWQuICBVc2UgdGhlIGNhY2hlZCBtZXRob2QgaWYg dGhlIHBzZXVkbyBlbGVtZW50IGRvZXNuJ3QgcmVzcGVjdAogICAgIC8vIGFueSBwc2V1ZG8gY2xh c3NlcyAoYW5kIHRoZXJlZm9yZSBoYXMgbm8gY29uY2VwdCBvZiBjaGFuZ2luZyBzdGF0ZSkuCiAg ICAgUmVuZGVyU3R5bGUqIGdldENhY2hlZFBzZXVkb1N0eWxlKFBzZXVkb0lkLCBSZW5kZXJTdHls ZSogcGFyZW50U3R5bGUgPSAwKSBjb25zdDsKLSAgICBQYXNzUmVmUHRyPFJlbmRlclN0eWxlPiBn ZXRVbmNhY2hlZFBzZXVkb1N0eWxlKFBzZXVkb0lkLCBSZW5kZXJTdHlsZSogcGFyZW50U3R5bGUg PSAwLCBSZW5kZXJTdHlsZSogb3duU3R5bGUgPSAwKSBjb25zdDsKKyAgICBQYXNzUmVmUHRyPFJl bmRlclN0eWxlPiBnZXRVbmNhY2hlZFBzZXVkb1N0eWxlKFBzZXVkb0lkLCBSZW5kZXJTdHlsZSog cGFyZW50U3R5bGUgPSAwLCBSZW5kZXJTdHlsZSogb3duU3R5bGUgPSAwLCBSZW5kZXJTdHlsZSog YmFzZVN0eWxlID0gMCkgY29uc3Q7CiAgICAgCiAgICAgdmlydHVhbCB2b2lkIHVwZGF0ZURyYWdT dGF0ZShib29sIGRyYWdPbik7CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxl L1JlbmRlclN0eWxlQ29uc3RhbnRzLmggYi9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJT dHlsZUNvbnN0YW50cy5oCmluZGV4IDAxODYyZjYuLjEyNzNjODggMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlQ29uc3RhbnRzLmgKKysrIGIvV2ViQ29yZS9y ZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGVDb25zdGFudHMuaApAQCAtNzMsNyArNzMsNyBAQCBl bnVtIFBzZXVkb0lkIHsKICAgICBNRURJQV9DT05UUk9MU19TRUVLX0JBQ0tfQlVUVE9OLCBNRURJ QV9DT05UUk9MU19TRUVLX0ZPUldBUkRfQlVUVE9OLCBNRURJQV9DT05UUk9MU19GVUxMU0NSRUVO X0JVVFRPTiwgTUVESUFfQ09OVFJPTFNfUkVXSU5EX0JVVFRPTiwgCiAgICAgTUVESUFfQ09OVFJP TFNfUkVUVVJOX1RPX1JFQUxUSU1FX0JVVFRPTiwgTUVESUFfQ09OVFJPTFNfVE9HR0xFX0NMT1NF RF9DQVBUSU9OU19CVVRUT04sCiAgICAgTUVESUFfQ09OVFJPTFNfU1RBVFVTX0RJU1BMQVksIFND Uk9MTEJBUl9USFVNQiwgU0NST0xMQkFSX0JVVFRPTiwgU0NST0xMQkFSX1RSQUNLLCBTQ1JPTExC QVJfVFJBQ0tfUElFQ0UsIFNDUk9MTEJBUl9DT1JORVIsIFJFU0laRVIsCi0gICAgSU5QVVRfTElT VF9CVVRUT04sIElOTkVSX1NQSU5fQlVUVE9OLCBPVVRFUl9TUElOX0JVVFRPTiwKKyAgICBJTlBV VF9MSVNUX0JVVFRPTiwgSU5ORVJfU1BJTl9CVVRUT04sIE9VVEVSX1NQSU5fQlVUVE9OLCBGT0NV U19JTk5FUiwKIAogICAgIEZJUlNUX0lOVEVSTkFMX1BTRVVET0lEID0gRklMRV9VUExPQURfQlVU VE9OCiB9Owo=