59613 2011-04-27 09:01:02 -0700 Speech input button layout issues with padding and border. 2011-04-28 14:51:04 -0700 1 1 1 Unclassified WebKit Forms 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 39485 59742 0 satish satish pfeldman tkent tonyg oldest_to_newest 393586 0 satish 2011-04-27 09:01:02 -0700 The bounding box where the mouse cursor turns from an text insert cursor to a pointer is misaligned with the speech input mic icon. Here's one example that illustrates the problem: http://slides.html5rocks.com/#speech-input - the mic icon appears to partially overlap the right padding and for the right half of the mic icon the cursor turns into the text insert cursor. Ideally the button should appear inside and honour the padding of the input field. 393610 1 91300 satish 2011-04-27 09:42:13 -0700 Created attachment 91300 Patch 394339 2 91300 tonyg 2011-04-28 03:36:16 -0700 Comment on attachment 91300 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=91300&action=review > Source/WebCore/ChangeLog:8 > + No new tests, existing tests cover this code. Is it really impossible to add a regression test for this bug? Seems like it would be easy to add a test for an input with padding, and click in particular locations to verify the bounds of the button target. > Source/WebCore/rendering/RenderTextControlSingleLine.cpp:311 > + int x = width() - borderRight() - paddingRight() - button->width(); Does this work for RTL? Seems worth adding an rtl input to the click target test suggested above. 394438 3 91494 satish 2011-04-28 08:27:04 -0700 Created attachment 91494 Updated an existing layout test to check for padding and rtl cases. Also fixed the code to handle RTL cases properly. 394467 4 satish 2011-04-28 09:12:34 -0700 Committed r85190: <http://trac.webkit.org/changeset/85190> 394468 5 pfeldman 2011-04-28 09:19:05 -0700 Committed r85191: <http://trac.webkit.org/changeset/85191> 91300 2011-04-27 09:42:13 -0700 2011-04-28 08:26:58 -0700 Patch bug-59613-20110427174211.patch text/plain 3364 satish ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAxZmViMGEwODU2OWViMDNlZGEyZmE2YmYwZTk1NDRiZWQyNDczZGJjLi40 ZGFhODBmZDg2Yjk0N2FkYmY3MWIyMDFiNjhjNGRlZmUwOTg1NGY3IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTcgQEAKKzIwMTEtMDQtMjcgIFNhdGlzaCBTYW1wYXRoICA8c2F0aXNoQGNocm9taXVt Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBT cGVlY2ggaW5wdXQgYnV0dG9uIGxheW91dCBpc3N1ZXMgd2l0aCBwYWRkaW5nIGFuZCBib3JkZXIu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01OTYxMwor CisgICAgICAgIE5vIG5ldyB0ZXN0cywgZXhpc3RpbmcgdGVzdHMgY292ZXIgdGhpcyBjb2RlLgor CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9sU2luZ2xlTGluZS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJUZXh0Q29udHJvbFNpbmdsZUxpbmU6OmxheW91dCk6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJUZXh0Q29udHJvbFNpbmdsZUxpbmU6Om5vZGVBdFBvaW50 KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRleHRDb250cm9sU2luZ2xlTGluZTo6Zm9yd2Fy ZEV2ZW50KToKKwogMjAxMS0wNC0yNyAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgU2FtIFdlaW5pZy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0Q29udHJvbFNpbmdsZUxpbmUuY3BwIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9sU2luZ2xlTGluZS5jcHAKaW5kZXggMTcz MGEwZTY1MTIzZGIyMDE2MTE4MGFmM2E3ZmZjNjUyYjYzMmRjMS4uZmM1YjMwNWE2MDk3Yzk3Mzc3 OWI0MTk4ODdmMWRmOTk3YTY0ZTE3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlclRleHRDb250cm9sU2luZ2xlTGluZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9sU2luZ2xlTGluZS5jcHAKQEAgLTMwOCw5ICszMDgs MTEgQEAgdm9pZCBSZW5kZXJUZXh0Q29udHJvbFNpbmdsZUxpbmU6OmxheW91dCgpCiAgICAgICAg ICAgICBpbnQgeSA9IChoZWlnaHQoKSAtIGJ1dHRvbi0+aGVpZ2h0KCkpIC8gMjsKICAgICAgICAg ICAgIGJ1dHRvbi0+c2V0TG9jYXRpb24oeCwgeSk7CiAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAg ICAgICAvLyBGb3Igbm9uLXNlYXJjaCBmaWVsZHMgd2hpY2ggYXJlIHNpbXBsZXIgYW5kIHdlIGxl dCB0aGUgZGVmYXV0IGxheW91dCBoYW5kbGUgdGhpbmdzCi0gICAgICAgICAgICAvLyBleGNlcHQg Zm9yIHNtYWxsIHR3ZWFraW5nIGJlbG93LgotICAgICAgICAgICAgYnV0dG9uLT5zZXRMb2NhdGlv bihidXR0b24tPngoKSArIHBhZGRpbmdSaWdodCgpLCAoaGVpZ2h0KCkgLSBidXR0b24tPmhlaWdo dCgpKSAvIDIpOworICAgICAgICAgICAgaW50IHggPSB3aWR0aCgpIC0gYm9yZGVyUmlnaHQoKSAt IHBhZGRpbmdSaWdodCgpIC0gYnV0dG9uLT53aWR0aCgpOworICAgICAgICAgICAgaWYgKFJlbmRl ckJveCogc3BpbkJveCA9IG1faW5uZXJTcGluQnV0dG9uID8gbV9pbm5lclNwaW5CdXR0b24tPnJl bmRlckJveCgpIDogMCkKKyAgICAgICAgICAgICAgICB4IC09IHNwaW5Cb3gtPndpZHRoKCk7Cisg ICAgICAgICAgICBpbnQgeSA9IChoZWlnaHQoKSAtIGJ1dHRvbi0+aGVpZ2h0KCkpIC8gMjsKKyAg ICAgICAgICAgIGJ1dHRvbi0+c2V0TG9jYXRpb24oeCwgeSk7CiAgICAgICAgIH0KICAgICB9CiAj ZW5kaWYKQEAgLTM2OSw2ICszNzEsMTQgQEAgYm9vbCBSZW5kZXJUZXh0Q29udHJvbFNpbmdsZUxp bmU6Om5vZGVBdFBvaW50KGNvbnN0IEhpdFRlc3RSZXF1ZXN0JiByZXF1ZXN0LCBIaXQKICAgICBp ZiAobV9yZXN1bHRzQnV0dG9uICYmIG1fcmVzdWx0c0J1dHRvbi0+cmVuZGVyZXIoKSAmJiB4UG9z IDwgdGV4dExlZnQpCiAgICAgICAgIGlubmVyTm9kZSA9IG1fcmVzdWx0c0J1dHRvbi5nZXQoKTsK IAorI2lmIEVOQUJMRShJTlBVVF9TUEVFQ0gpCisgICAgaWYgKCFpbm5lck5vZGUgJiYgbV9zcGVl Y2hCdXR0b24gJiYgbV9zcGVlY2hCdXR0b24tPnJlbmRlcmVyKCkpIHsKKyAgICAgICAgaW50IGJ1 dHRvbkxlZnQgPSB0eCArIHgoKSArIGlubmVyQmxvY2tSZW5kZXJlci0+eCgpICsgaW5uZXJCbG9j a1JlbmRlcmVyLT53aWR0aCgpIC0gbV9zcGVlY2hCdXR0b24tPnJlbmRlckJveCgpLT53aWR0aCgp OworICAgICAgICBpZiAoeFBvcyA+PSBidXR0b25MZWZ0KQorICAgICAgICAgICAgaW5uZXJOb2Rl ID0gbV9zcGVlY2hCdXR0b24uZ2V0KCk7CisgICAgfQorI2VuZGlmCisKICAgICBpZiAoIWlubmVy Tm9kZSkgewogICAgICAgICBpbnQgdGV4dFJpZ2h0ID0gdGV4dExlZnQgKyBpbm5lclRleHRSZW5k ZXJlci0+d2lkdGgoKTsKICAgICAgICAgaWYgKG1fY2FuY2VsQnV0dG9uICYmIG1fY2FuY2VsQnV0 dG9uLT5yZW5kZXJlcigpICYmIHhQb3MgPiB0ZXh0UmlnaHQpCkBAIC00MDUsNyArNDE1LDggQEAg dm9pZCBSZW5kZXJUZXh0Q29udHJvbFNpbmdsZUxpbmU6OmZvcndhcmRFdmVudChFdmVudCogZXZl bnQpCiAKICNpZiBFTkFCTEUoSU5QVVRfU1BFRUNIKQogICAgIGlmIChSZW5kZXJCb3gqIHNwZWVj aEJveCA9IG1fc3BlZWNoQnV0dG9uID8gbV9zcGVlY2hCdXR0b24tPnJlbmRlckJveCgpIDogMCkg ewotICAgICAgICBGbG9hdFBvaW50IHBvaW50SW5UZXh0Q29udHJvbENvb3JkcyA9IGFic29sdXRl VG9Mb2NhbChzdGF0aWNfY2FzdDxNb3VzZUV2ZW50Kj4oZXZlbnQpLT5hYnNvbHV0ZUxvY2F0aW9u KCksIGZhbHNlLCB0cnVlKTsKKyAgICAgICAgUmVuZGVyQm94KiBwYXJlbnQgPSBpbm5lclRleHRS ZW5kZXJlciA/IGlubmVyVGV4dFJlbmRlcmVyIDogdGhpczsKKyAgICAgICAgRmxvYXRQb2ludCBw b2ludEluVGV4dENvbnRyb2xDb29yZHMgPSBwYXJlbnQtPmFic29sdXRlVG9Mb2NhbChzdGF0aWNf Y2FzdDxNb3VzZUV2ZW50Kj4oZXZlbnQpLT5hYnNvbHV0ZUxvY2F0aW9uKCksIGZhbHNlLCB0cnVl KTsKICAgICAgICAgaWYgKHNwZWVjaEJveC0+ZnJhbWVSZWN0KCkuY29udGFpbnMocm91bmRlZElu dFBvaW50KHBvaW50SW5UZXh0Q29udHJvbENvb3JkcykpKSB7CiAgICAgICAgICAgICBtX3NwZWVj aEJ1dHRvbi0+ZGVmYXVsdEV2ZW50SGFuZGxlcihldmVudCk7CiAgICAgICAgICAgICByZXR1cm47 Cg== 91494 2011-04-28 08:27:04 -0700 2011-04-28 08:54:11 -0700 Updated an existing layout test to check for padding and rtl cases. Also fixed the code to handle RTL cases properly. bug-59613-20110428162702.patch text/plain 8547 satish ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBkN2QxMjcyOWU5ZGJjZjdlYzdmMTY5Y2ZhODRjZDMwNDBlOThkYjI1Li5mMTU5NDhh ODYyMzdkNTQwZWY3ODhlYmIzYzM0ODEyYjFjMDJhNzVlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAK KzIwMTEtMDQtMjggIFNhdGlzaCBTYW1wYXRoICA8c2F0aXNoQGNocm9taXVtLm9yZz4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTcGVlY2ggaW5wdXQg YnV0dG9uIGxheW91dCBpc3N1ZXMgd2l0aCBwYWRkaW5nIGFuZCBib3JkZXIuCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01OTYxMworCisgICAgICAgICog ZmFzdC9zcGVlY2gvaW5wdXQtdGV4dC1zcGVlY2hidXR0b24tZXhwZWN0ZWQudHh0OgorICAgICAg ICAqIGZhc3Qvc3BlZWNoL2lucHV0LXRleHQtc3BlZWNoYnV0dG9uLmh0bWw6IFVwZGF0ZWQgdG8g dGVzdCB3aXRoIHBhZGRpbmcuCisKIDIwMTEtMDQtMjggIE1pa2hhaWwgTmFnYW5vdiAgPG1uYWdh bm92QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBZdXJ5IFNlbWlraGF0c2t5 LgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9zcGVlY2gvaW5wdXQtdGV4dC1zcGVlY2hi dXR0b24tZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9zcGVlY2gvaW5wdXQtdGV4dC1z cGVlY2hidXR0b24tZXhwZWN0ZWQudHh0CmluZGV4IDUzNzBkNjliOTExNWZmNjkyNjQ1OTRkNTEz MzJmZWZjMTdhOTBjMzIuLjk3MDAxMjFhYTA3NjMxMGIwMDk0YzI3MWNiZjcyZDg3MGQ5MGE1Mzkg MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3Qvc3BlZWNoL2lucHV0LXRleHQtc3BlZWNoYnV0 dG9uLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3NwZWVjaC9pbnB1dC10ZXh0 LXNwZWVjaGJ1dHRvbi1leHBlY3RlZC50eHQKQEAgLTMsOSArMywxMSBAQCBUZXN0cyBmb3Igc3Bl ZWNoIGJ1dHRvbiBjbGljayB3aXRoIDxpbnB1dCB0eXBlPSJ0ZXh0IiBzcGVlY2g+LgogT24gc3Vj Y2VzcywgeW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQg YnkgIlRFU1QgQ09NUExFVEUiLgogCiAKLVBBU1MgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInNw ZWVjaElucHV0IikudmFsdWUgaXMgIlBpY3R1cmVzIG9mIHRoZSBtb29uIgotUEFTUyBkb2N1bWVu dC5nZXRFbGVtZW50QnlJZCgic3BlZWNoSW5wdXQiKS52YWx1ZSBpcyAiUGljdHVyZXMgb2YgdGhl IG1vb24iCitQQVNTIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJzcGVlY2hJbnB1dDEiKS52YWx1 ZSBpcyAiUGljdHVyZXMgb2YgdGhlIG1vb24iCitQQVNTIGRvY3VtZW50LmdldEVsZW1lbnRCeUlk KCJzcGVlY2hJbnB1dDIiKS52YWx1ZSBpcyAiUGljdHVyZXMgb2YgdGhlIG1vb24iCitQQVNTIGRv Y3VtZW50LmdldEVsZW1lbnRCeUlkKCJzcGVlY2hJbnB1dDMiKS52YWx1ZSBpcyAiUGljdHVyZXMg b2YgdGhlIG1vb24iCitQQVNTIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJzcGVlY2hJbnB1dDQi KS52YWx1ZSBpcyAiUGljdHVyZXMgb2YgdGhlIG1vb24iCiBQQVNTIHN1Y2Nlc3NmdWxseVBhcnNl ZCBpcyB0cnVlCiAKIFRFU1QgQ09NUExFVEUKLQorICAgCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9mYXN0L3NwZWVjaC9pbnB1dC10ZXh0LXNwZWVjaGJ1dHRvbi5odG1sIGIvTGF5b3V0VGVzdHMv ZmFzdC9zcGVlY2gvaW5wdXQtdGV4dC1zcGVlY2hidXR0b24uaHRtbAppbmRleCAzNTFhOTUzNzBi ZDY4NzlhNDM2OTI1YWUwZDU5M2JjNDcxNmVjMDEwLi42MjZjMzVmNzg3Y2FjYjliMjM3YTM1Yzk3 ZDk4ZmQ5ZDE0YzYwOTJlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L3NwZWVjaC9pbnB1 dC10ZXh0LXNwZWVjaGJ1dHRvbi5odG1sCisrKyBiL0xheW91dFRlc3RzL2Zhc3Qvc3BlZWNoL2lu cHV0LXRleHQtc3BlZWNoYnV0dG9uLmh0bWwKQEAgLTEwLDM3ICsxMCwzNSBAQAogPHNjcmlwdCB0 eXBlPSJ0ZXh0L2phdmFzY3JpcHQiPgogZGVzY3JpcHRpb24oJ1Rlc3RzIGZvciBzcGVlY2ggYnV0 dG9uIGNsaWNrIHdpdGggJmx0O2lucHV0IHR5cGU9InRleHQiIHNwZWVjaD4uJyk7CiAKK2Z1bmN0 aW9uIHN0YXJ0U3BlZWNoSW5wdXQoaWQpIHsKKyAgICAvLyBDbGlja2luZyB0aGUgc3BlZWNoIGJ1 dHRvbiBzaG91bGQgZmlsbCBpbiBtb2NrIHNwZWVjaC1yZWNvZ25pemVkIHRleHQuCisgICAgdmFy IGlucHV0ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoaWQpOworICAgIHZhciB4ID0gaW5wdXQu b2Zmc2V0TGVmdCArIGlucHV0Lm9mZnNldFdpZHRoIC0gNDsKKyAgICB2YXIgeSA9IGlucHV0Lm9m ZnNldFRvcCArIGlucHV0Lm9mZnNldEhlaWdodCAvIDI7CisgICAgaWYgKGlucHV0LnN0eWxlLnBh ZGRpbmdSaWdodC5sZW5ndGgpCisgICAgICAgIHggLT0gcGFyc2VJbnQoaW5wdXQuc3R5bGUucGFk ZGluZ1JpZ2h0LnN1YnN0cigwLCBpbnB1dC5zdHlsZS5wYWRkaW5nUmlnaHQubGVuZ3RoIC0gMikp OworICAgIGV2ZW50U2VuZGVyLm1vdXNlTW92ZVRvKHgsIHkpOworICAgIGV2ZW50U2VuZGVyLm1v dXNlRG93bigpOworICAgIGV2ZW50U2VuZGVyLm1vdXNlVXAoKTsKK30KKwordmFyIHRlc3RJbmRl eCA9IDE7CiBmdW5jdGlvbiBvbldlYmtpdFNwZWVjaENoYW5nZSgpIHsKLSAgICBzaG91bGRCZUVx dWFsVG9TdHJpbmcoJ2RvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJzcGVlY2hJbnB1dCIpLnZhbHVl JywgJ1BpY3R1cmVzIG9mIHRoZSBtb29uJyk7CisgICAgc2hvdWxkQmVFcXVhbFRvU3RyaW5nKCdk b2N1bWVudC5nZXRFbGVtZW50QnlJZCgic3BlZWNoSW5wdXQnICsgdGVzdEluZGV4ICsgJyIpLnZh bHVlJywgJ1BpY3R1cmVzIG9mIHRoZSBtb29uJyk7CisgICAgaWYgKHRlc3RJbmRleCA9PSA0KSB7 CisgICAgICAgIGZpbmlzaEpTVGVzdCgpOworICAgICAgICByZXR1cm47CisgICAgfQorICAgICsr dGVzdEluZGV4OwogICAgIHNldFRpbWVvdXQoZnVuY3Rpb24oKSB7Ci0gICAgICAgIHZhciBpbnB1 dCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdzcGVlY2hJbnB1dCcpOwotICAgICAgICBpbnB1 dC5kaXIgPSAncnRsJzsKLSAgICAgICAgaW5wdXQudmFsdWUgPSAnJzsKLSAgICAgICAgaW5wdXQu b253ZWJraXRzcGVlY2hjaGFuZ2UgPSBmdW5jdGlvbigpIHsKLSAgICAgICAgICAgIHNob3VsZEJl RXF1YWxUb1N0cmluZygnZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInNwZWVjaElucHV0IikudmFs dWUnLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICdQaWN0dXJlcyBvZiB0aGUg bW9vbicpOwotICAgICAgICAgICAgZmluaXNoSlNUZXN0KCk7Ci0gICAgICAgIH07Ci0KLSAgICAg ICAgdmFyIHggPSBpbnB1dC5vZmZzZXRMZWZ0ICsgNDsKLSAgICAgICAgdmFyIHkgPSBpbnB1dC5v ZmZzZXRUb3AgKyBpbnB1dC5vZmZzZXRIZWlnaHQgLyAyOwotICAgICAgICBldmVudFNlbmRlci5t b3VzZU1vdmVUbyh4LCB5KTsKLSAgICAgICAgZXZlbnRTZW5kZXIubW91c2VEb3duKCk7Ci0gICAg ICAgIGV2ZW50U2VuZGVyLm1vdXNlVXAoKTsKKyAgICAgICAgc3RhcnRTcGVlY2hJbnB1dCgic3Bl ZWNoSW5wdXQiICsgdGVzdEluZGV4KTsKICAgICB9LCA1MCk7CiB9CiAKIGZ1bmN0aW9uIHJ1bigp IHsKICAgICBpZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVyICYmIHdpbmRvdy5ldmVudFNl bmRlcikgewogICAgICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5hZGRNb2NrU3BlZWNoSW5wdXRS ZXN1bHQoJ1BpY3R1cmVzIG9mIHRoZSBtb29uJywgMS4wLCAnJyk7Ci0KLSAgICAgICAgLy8gQ2xp Y2tpbmcgdGhlIHNwZWVjaCBidXR0b24gc2hvdWxkIGZpbGwgaW4gbW9jayBzcGVlY2gtcmVjb2du aXplZCB0ZXh0LgotICAgICAgICB2YXIgaW5wdXQgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgn c3BlZWNoSW5wdXQnKTsKLSAgICAgICAgdmFyIHggPSBpbnB1dC5vZmZzZXRMZWZ0ICsgaW5wdXQu b2Zmc2V0V2lkdGggLSA0OwotICAgICAgICB2YXIgeSA9IGlucHV0Lm9mZnNldFRvcCArIGlucHV0 Lm9mZnNldEhlaWdodCAvIDI7Ci0gICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlTW92ZVRvKHgsIHkp OwotICAgICAgICBldmVudFNlbmRlci5tb3VzZURvd24oKTsKLSAgICAgICAgZXZlbnRTZW5kZXIu bW91c2VVcCgpOworICAgICAgICBzdGFydFNwZWVjaElucHV0KCJzcGVlY2hJbnB1dCIgKyB0ZXN0 SW5kZXgpOwogICAgIH0KIH0KIApAQCAtNDksNiArNDcsMTAgQEAgd2luZG93LmpzVGVzdElzQXN5 bmMgPSB0cnVlOwogd2luZG93LnN1Y2Nlc3NmdWxseVBhcnNlZCA9IHRydWU7CiA8L3NjcmlwdD4K IDxzY3JpcHQgc3JjPSIuLi9qcy9yZXNvdXJjZXMvanMtdGVzdC1wb3N0LmpzIj48L3NjcmlwdD4K LTxpbnB1dCBpZD0nc3BlZWNoSW5wdXQnIHgtd2Via2l0LXNwZWVjaCBvbndlYmtpdHNwZWVjaGNo YW5nZT0ib25XZWJraXRTcGVlY2hDaGFuZ2UoKSI+Cis8aW5wdXQgaWQ9J3NwZWVjaElucHV0MScg eC13ZWJraXQtc3BlZWNoIG9ud2Via2l0c3BlZWNoY2hhbmdlPSJvbldlYmtpdFNwZWVjaENoYW5n ZSgpIj4KKzxpbnB1dCBpZD0nc3BlZWNoSW5wdXQyJyB4LXdlYmtpdC1zcGVlY2ggb253ZWJraXRz cGVlY2hjaGFuZ2U9Im9uV2Via2l0U3BlZWNoQ2hhbmdlKCkiIGRpcj0icnRsIj4KKzxpbnB1dCBp ZD0nc3BlZWNoSW5wdXQzJyB4LXdlYmtpdC1zcGVlY2ggb253ZWJraXRzcGVlY2hjaGFuZ2U9Im9u V2Via2l0U3BlZWNoQ2hhbmdlKCkiIHN0eWxlPSJwYWRkaW5nOjVweCAxMHB4Ij4KKzxpbnB1dCBp ZD0nc3BlZWNoSW5wdXQ0JyB4LXdlYmtpdC1zcGVlY2ggb253ZWJraXRzcGVlY2hjaGFuZ2U9Im9u V2Via2l0U3BlZWNoQ2hhbmdlKCkiIHN0eWxlPSJwYWRkaW5nOjVweCAxMHB4IiBkaXI9InJ0bCI+ CiA8L2JvZHk+CiA8L2h0bWw+CisKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAxMTM4NmE1ZDlhMzRkMWY2YTBiMDc5 MTQxM2UyMjFjYWY1ZGQ2OWYzLi5iMDM2MTk1ZjU3YTk0MTIyYWI0OWI0YTJjMWRjZmRiNGM2ZmQ3 NjM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDQtMjggIFNhdGlzaCBTYW1w YXRoICA8c2F0aXNoQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBTcGVlY2ggaW5wdXQgYnV0dG9uIGxheW91dCBpc3N1ZXMgd2l0 aCBwYWRkaW5nIGFuZCBib3JkZXIuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD01OTYxMworCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRleHRDb250 cm9sU2luZ2xlTGluZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUZXh0Q29udHJvbFNp bmdsZUxpbmU6OmxheW91dCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUZXh0Q29udHJvbFNp bmdsZUxpbmU6Om5vZGVBdFBvaW50KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRleHRDb250 cm9sU2luZ2xlTGluZTo6Zm9yd2FyZEV2ZW50KToKKwogMjAxMS0wNC0yOCAgTWlraGFpbCBOYWdh bm92ICA8bW5hZ2Fub3ZAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFl1cnkg U2VtaWtoYXRza3kuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy VGV4dENvbnRyb2xTaW5nbGVMaW5lLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJUZXh0Q29udHJvbFNpbmdsZUxpbmUuY3BwCmluZGV4IDE3MzBhMGU2NTEyM2RiMjAxNjExODBh ZjNhN2ZmYzY1MmI2MzJkYzEuLjVhODU1ZWE2ZjlhZmExYjk0YTc5ZDAwODVlM2EzNDZkZTVkMWNl MTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0Q29udHJv bFNpbmdsZUxpbmUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0 Q29udHJvbFNpbmdsZUxpbmUuY3BwCkBAIC0zMDgsOSArMzA4LDE0IEBAIHZvaWQgUmVuZGVyVGV4 dENvbnRyb2xTaW5nbGVMaW5lOjpsYXlvdXQoKQogICAgICAgICAgICAgaW50IHkgPSAoaGVpZ2h0 KCkgLSBidXR0b24tPmhlaWdodCgpKSAvIDI7CiAgICAgICAgICAgICBidXR0b24tPnNldExvY2F0 aW9uKHgsIHkpOwogICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgLy8gRm9yIG5vbi1zZWFy Y2ggZmllbGRzIHdoaWNoIGFyZSBzaW1wbGVyIGFuZCB3ZSBsZXQgdGhlIGRlZmF1dCBsYXlvdXQg aGFuZGxlIHRoaW5ncwotICAgICAgICAgICAgLy8gZXhjZXB0IGZvciBzbWFsbCB0d2Vha2luZyBi ZWxvdy4KLSAgICAgICAgICAgIGJ1dHRvbi0+c2V0TG9jYXRpb24oYnV0dG9uLT54KCkgKyBwYWRk aW5nUmlnaHQoKSwgKGhlaWdodCgpIC0gYnV0dG9uLT5oZWlnaHQoKSkgLyAyKTsKKyAgICAgICAg ICAgIGludCB4ID0gd2lkdGgoKSAtIGJvcmRlclJpZ2h0KCkgLSBwYWRkaW5nUmlnaHQoKSAtIGJ1 dHRvbi0+d2lkdGgoKTsKKyAgICAgICAgICAgIFJlbmRlckJveCogc3BpbkJveCA9IG1faW5uZXJT cGluQnV0dG9uID8gbV9pbm5lclNwaW5CdXR0b24tPnJlbmRlckJveCgpIDogMDsKKyAgICAgICAg ICAgIGlmIChzdHlsZSgpLT5pc0xlZnRUb1JpZ2h0RGlyZWN0aW9uKCkpCisgICAgICAgICAgICAg ICAgeCAtPSBzcGluQm94ID8gc3BpbkJveC0+d2lkdGgoKSA6IDA7CisgICAgICAgICAgICBlbHNl CisgICAgICAgICAgICAgICAgaW5uZXJUZXh0UmVuZGVyZXItPnNldFgocGFkZGluZ0xlZnQoKSAr IGJvcmRlckxlZnQoKSArIChzcGluQm94ID8gc3BpbkJveC0+d2lkdGgoKSA6IDApKTsKKyAgICAg ICAgICAgIGludCB5ID0gKGhlaWdodCgpIC0gYnV0dG9uLT5oZWlnaHQoKSkgLyAyOworICAgICAg ICAgICAgYnV0dG9uLT5zZXRMb2NhdGlvbih4LCB5KTsKICAgICAgICAgfQogICAgIH0KICNlbmRp ZgpAQCAtMzY5LDYgKzM3NCwxNCBAQCBib29sIFJlbmRlclRleHRDb250cm9sU2luZ2xlTGluZTo6 bm9kZUF0UG9pbnQoY29uc3QgSGl0VGVzdFJlcXVlc3QmIHJlcXVlc3QsIEhpdAogICAgIGlmICht X3Jlc3VsdHNCdXR0b24gJiYgbV9yZXN1bHRzQnV0dG9uLT5yZW5kZXJlcigpICYmIHhQb3MgPCB0 ZXh0TGVmdCkKICAgICAgICAgaW5uZXJOb2RlID0gbV9yZXN1bHRzQnV0dG9uLmdldCgpOwogCisj aWYgRU5BQkxFKElOUFVUX1NQRUVDSCkKKyAgICBpZiAoIWlubmVyTm9kZSAmJiBtX3NwZWVjaEJ1 dHRvbiAmJiBtX3NwZWVjaEJ1dHRvbi0+cmVuZGVyZXIoKSkgeworICAgICAgICBpbnQgYnV0dG9u TGVmdCA9IHR4ICsgeCgpICsgaW5uZXJCbG9ja1JlbmRlcmVyLT54KCkgKyBpbm5lckJsb2NrUmVu ZGVyZXItPndpZHRoKCkgLSBtX3NwZWVjaEJ1dHRvbi0+cmVuZGVyQm94KCktPndpZHRoKCk7Cisg ICAgICAgIGlmICh4UG9zID49IGJ1dHRvbkxlZnQpCisgICAgICAgICAgICBpbm5lck5vZGUgPSBt X3NwZWVjaEJ1dHRvbi5nZXQoKTsKKyAgICB9CisjZW5kaWYKKwogICAgIGlmICghaW5uZXJOb2Rl KSB7CiAgICAgICAgIGludCB0ZXh0UmlnaHQgPSB0ZXh0TGVmdCArIGlubmVyVGV4dFJlbmRlcmVy LT53aWR0aCgpOwogICAgICAgICBpZiAobV9jYW5jZWxCdXR0b24gJiYgbV9jYW5jZWxCdXR0b24t PnJlbmRlcmVyKCkgJiYgeFBvcyA+IHRleHRSaWdodCkKQEAgLTQwNSw3ICs0MTgsOCBAQCB2b2lk IFJlbmRlclRleHRDb250cm9sU2luZ2xlTGluZTo6Zm9yd2FyZEV2ZW50KEV2ZW50KiBldmVudCkK IAogI2lmIEVOQUJMRShJTlBVVF9TUEVFQ0gpCiAgICAgaWYgKFJlbmRlckJveCogc3BlZWNoQm94 ID0gbV9zcGVlY2hCdXR0b24gPyBtX3NwZWVjaEJ1dHRvbi0+cmVuZGVyQm94KCkgOiAwKSB7Ci0g ICAgICAgIEZsb2F0UG9pbnQgcG9pbnRJblRleHRDb250cm9sQ29vcmRzID0gYWJzb2x1dGVUb0xv Y2FsKHN0YXRpY19jYXN0PE1vdXNlRXZlbnQqPihldmVudCktPmFic29sdXRlTG9jYXRpb24oKSwg ZmFsc2UsIHRydWUpOworICAgICAgICBSZW5kZXJCb3gqIHBhcmVudCA9IGlubmVyVGV4dFJlbmRl cmVyID8gaW5uZXJUZXh0UmVuZGVyZXIgOiB0aGlzOworICAgICAgICBGbG9hdFBvaW50IHBvaW50 SW5UZXh0Q29udHJvbENvb3JkcyA9IHBhcmVudC0+YWJzb2x1dGVUb0xvY2FsKHN0YXRpY19jYXN0 PE1vdXNlRXZlbnQqPihldmVudCktPmFic29sdXRlTG9jYXRpb24oKSwgZmFsc2UsIHRydWUpOwog ICAgICAgICBpZiAoc3BlZWNoQm94LT5mcmFtZVJlY3QoKS5jb250YWlucyhyb3VuZGVkSW50UG9p bnQocG9pbnRJblRleHRDb250cm9sQ29vcmRzKSkpIHsKICAgICAgICAgICAgIG1fc3BlZWNoQnV0 dG9uLT5kZWZhdWx0RXZlbnRIYW5kbGVyKGV2ZW50KTsKICAgICAgICAgICAgIHJldHVybjsK