24762 2009-03-23 11:57:40 -0700 Text-indent is not supported on <option> elements 2009-03-23 16:46:59 -0700 1 1 1 Unclassified WebKit Forms 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 adachan adachan oldest_to_newest 114820 0 adachan 2009-03-23 11:57:40 -0700 Text-indent is not supported on option elements. For example: <select> <option>no text-indent</option> <option style="text-indent: 100px;">100px text-indent</option> </select> The second option should be much wider due to the text-indent, causing the select to be wider also. 114823 1 28858 adachan 2009-03-23 12:06:52 -0700 Created attachment 28858 Patch 114829 2 28858 mitz 2009-03-23 12:39:40 -0700 Comment on attachment 28858 Patch Setting the review flag 114841 3 28858 mitz 2009-03-23 13:40:05 -0700 Comment on attachment 28858 Patch I think you can make the PopupMenuStyle changes in all platform, even if only Windows uses the extra members now. For the RenderMenuList.cpp change, the problem is that not all Windows platform ports use PopupMenuWin.cpp and themeWin.css. Perhaps it should be a RenderTheme decision whether to support text-indent. Then RenderMenuList can as the theme if it should apply the indent to the width, and PopupMenuWin could do the same. 114843 4 mitz 2009-03-23 13:40:41 -0700 (In reply to comment #3) > Then RenderMenuList can as the theme s/as/ask/ 114865 5 28872 adachan 2009-03-23 16:15:33 -0700 Created attachment 28872 Second try. Added RenderTheme::popupOptionSupportsTextIndent(). 114872 6 28872 adele 2009-03-23 16:32:38 -0700 Comment on attachment 28872 Second try. I think you have extra spacing on the last line here. > + maxOptionWidth = max(maxOptionWidth, optionWidth); > + } else if (!text.isEmpty()) > + maxOptionWidth = max(maxOptionWidth, style()->font().floatWidth(text)); > } Looks good! r=me. 114877 7 adachan 2009-03-23 16:46:59 -0700 Fixed in r41923. 28858 2009-03-23 12:06:52 -0700 2009-03-23 16:32:48 -0700 Patch 20090323-optiontextindent.patch.txt text/plain 7077 adachan SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDQxOTE0 KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjUgQEAKKzIwMDktMDMt MjMgIEFkYSBDaGFuICA8YWRhY2hhbkBhcHBsZS5jb20+CisKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI0NzYyCisgICAgICAgIFN1cHBvcnQgdGV4dC1p bmRlbnQgaW4gPG9wdGlvbj4gZWxlbWVudHMgb24gd2luZG93cyBwbGF0Zm9ybS4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGNzcy90aGVtZVdpbi5j c3M6IFdlIGRvbid0IGhvbm9yIGZvbnQgc3BlY2lmaWVkIG9uIDxvcHRpb24+IGVsZW1lbnRzIHJp Z2h0IG5vdy4gIE1ha2UgdGhpcworICAgICAgICBleHBsaWNpdCB2aWEgd2luZG93cyB0aGVtZWQg ZGVmYXVsdCBzdHlsZXNoZWV0LgorICAgICAgICAqIHBsYXRmb3JtL1BvcHVwTWVudVN0eWxlLmg6 CisgICAgICAgIChXZWJDb3JlOjpQb3B1cE1lbnVTdHlsZTo6UG9wdXBNZW51U3R5bGUpOiBBbHNv IHN0b3JlIHRleHQtaW5kZW50IGFuZCB0ZXh0LWRpcmVjdGlvbi4KKyAgICAgICAgKFdlYkNvcmU6 OlBvcHVwTWVudVN0eWxlOjp0ZXh0SW5kZW50KToKKyAgICAgICAgKFdlYkNvcmU6OlBvcHVwTWVu dVN0eWxlOjp0ZXh0RGlyZWN0aW9uKToKKyAgICAgICAgKiBwbGF0Zm9ybS93aW4vUG9wdXBNZW51 V2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBvcHVwTWVudTo6cGFpbnQpOiBBZGp1c3QgdGhl IHRleHQncyB4LWNvb3JkaW5hdGUgaWYgdGV4dC1pbmRlbnQgaXMgc3BlY2lmaWVkIHdpdGggTFRS IGRpcmVjdGlvbi4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTWVudUxpc3QuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyTWVudUxpc3Q6OnVwZGF0ZU9wdGlvbnNXaWR0aCk6IFRha2Ug dGV4dC1pbmRlbnQgaW50byBhY2NvdW50LgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTWVudUxp c3Q6Oml0ZW1TdHlsZSk6IFVzZSBuZXcgUG9wdXBNZW51U3R5bGUgY29uc3RydWN0b3Igb24gd2lu ZG93cy4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck1lbnVMaXN0OjptZW51U3R5bGUpOiBEaXR0 by4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5lLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRleHRDb250cm9sU2luZ2xlTGluZTo6bWVudVN0eWxl KTogRGl0dG8uCisKIDIwMDktMDMtMjMgIEdsZW4gTXVycGh5ICA8Z2xlbkBjaHJvbWl1bS5vcmc+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gRmlzaGVyLgpJbmRleDogY3NzL3RoZW1lV2lu LmNzcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBjc3MvdGhlbWVXaW4uY3NzCShyZXZpc2lvbiA0MTkxMCkKKysr IGNzcy90aGVtZVdpbi5jc3MJKHdvcmtpbmcgY29weSkKQEAgLTkzLDYgKzkzLDEwIEBAIHNlbGVj dFtzaXplPSIxIl0gewogICAgIC13ZWJraXQtYm9yZGVyLXJhZGl1czogMDsKICAgICBtYXJnaW46 IDA7CiB9CisvKiBPcHRpb25zIGFsd2F5cyB1c2UgdGhlIHNlbGVjdHMnIGZvbnRzICovCitvcHRp b24geworICAgIGZvbnQ6IGluaGVyaXQgIWltcG9ydGFudDsKK30KIAogdGV4dGFyZWEgewogICBm b250LWZhbWlseTogbW9ub3NwYWNlOwpJbmRleDogcGxhdGZvcm0vUG9wdXBNZW51U3R5bGUuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBwbGF0Zm9ybS9Qb3B1cE1lbnVTdHlsZS5oCShyZXZpc2lvbiA0MTkxMCkK KysrIHBsYXRmb3JtL1BvcHVwTWVudVN0eWxlLmgJKHdvcmtpbmcgY29weSkKQEAgLTI4LDExICsy OCwyNiBAQAogCiAjaW5jbHVkZSAiQ29sb3IuaCIKICNpbmNsdWRlICJGb250LmgiCisjaWYgUExB VEZPUk0oV0lOKQorI2luY2x1ZGUgIkxlbmd0aC5oIgorI2luY2x1ZGUgIlRleHREaXJlY3Rpb24u aCIKKyNlbmRpZgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIGNsYXNzIFBvcHVwTWVudVN0eWxl IHsKIHB1YmxpYzoKKyNpZiBQTEFURk9STShXSU4pCisgICAgUG9wdXBNZW51U3R5bGUoY29uc3Qg Q29sb3ImIGZvcmVncm91bmQsIGNvbnN0IENvbG9yJiBiYWNrZ3JvdW5kLCBjb25zdCBGb250JiBm b250LCBib29sIHZpc2libGUsIExlbmd0aCB0ZXh0SW5kZW50LCBUZXh0RGlyZWN0aW9uIHRleHRE aXJlY3Rpb24pCisgICAgICAgIDogbV9mb3JlZ3JvdW5kQ29sb3IoZm9yZWdyb3VuZCkKKyAgICAg ICAgLCBtX2JhY2tncm91bmRDb2xvcihiYWNrZ3JvdW5kKQorICAgICAgICAsIG1fZm9udChmb250 KQorICAgICAgICAsIG1fdmlzaWJsZSh2aXNpYmxlKQorICAgICAgICAsIG1fdGV4dEluZGVudCh0 ZXh0SW5kZW50KQorICAgICAgICAsIG1fdGV4dERpcmVjdGlvbih0ZXh0RGlyZWN0aW9uKQorICAg IHsKKyAgICB9CisjZWxzZQogICAgIFBvcHVwTWVudVN0eWxlKGNvbnN0IENvbG9yJiBmb3JlZ3Jv dW5kLCBjb25zdCBDb2xvciYgYmFja2dyb3VuZCwgY29uc3QgRm9udCYgZm9udCwgYm9vbCB2aXNp YmxlKQogICAgICAgICA6IG1fZm9yZWdyb3VuZENvbG9yKGZvcmVncm91bmQpCiAgICAgICAgICwg bV9iYWNrZ3JvdW5kQ29sb3IoYmFja2dyb3VuZCkKQEAgLTQwLDE3ICs1NSwyNiBAQCBwdWJsaWM6 CiAgICAgICAgICwgbV92aXNpYmxlKHZpc2libGUpCiAgICAgewogICAgIH0KKyNlbmRpZgogICAg IAogICAgIGNvbnN0IENvbG9yJiBmb3JlZ3JvdW5kQ29sb3IoKSBjb25zdCB7IHJldHVybiBtX2Zv cmVncm91bmRDb2xvcjsgfQogICAgIGNvbnN0IENvbG9yJiBiYWNrZ3JvdW5kQ29sb3IoKSBjb25z dCB7IHJldHVybiBtX2JhY2tncm91bmRDb2xvcjsgfQogICAgIGNvbnN0IEZvbnQmIGZvbnQoKSBj b25zdCB7IHJldHVybiBtX2ZvbnQ7IH0KICAgICBib29sIGlzVmlzaWJsZSgpIGNvbnN0IHsgcmV0 dXJuIG1fdmlzaWJsZTsgfQorI2lmIFBMQVRGT1JNKFdJTikKKyAgICBMZW5ndGggdGV4dEluZGVu dCgpIGNvbnN0IHsgcmV0dXJuIG1fdGV4dEluZGVudDsgfQorICAgIFRleHREaXJlY3Rpb24gdGV4 dERpcmVjdGlvbigpIGNvbnN0IHsgcmV0dXJuIG1fdGV4dERpcmVjdGlvbjsgfQorI2VuZGlmCiAK IHByaXZhdGU6CiAgICAgQ29sb3IgbV9mb3JlZ3JvdW5kQ29sb3I7CiAgICAgQ29sb3IgbV9iYWNr Z3JvdW5kQ29sb3I7CiAgICAgRm9udCBtX2ZvbnQ7CiAgICAgYm9vbCBtX3Zpc2libGU7CisjaWYg UExBVEZPUk0oV0lOKQorICAgIExlbmd0aCBtX3RleHRJbmRlbnQ7CisgICAgVGV4dERpcmVjdGlv biBtX3RleHREaXJlY3Rpb247CisjZW5kaWYKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK SW5kZXg6IHBsYXRmb3JtL3dpbi9Qb3B1cE1lbnVXaW4uY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHBsYXRm b3JtL3dpbi9Qb3B1cE1lbnVXaW4uY3BwCShyZXZpc2lvbiA0MTkxMCkKKysrIHBsYXRmb3JtL3dp bi9Qb3B1cE1lbnVXaW4uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01MjcsNiArNTI3LDggQEAgdm9p ZCBQb3B1cE1lbnU6OnBhaW50KGNvbnN0IEludFJlY3QmIGRhbQogICAgICAgICAvLyBEcmF3IHRo ZSBpdGVtIHRleHQKICAgICAgICAgaWYgKGl0ZW1TdHlsZS5pc1Zpc2libGUoKSkgewogICAgICAg ICAgICAgaW50IHRleHRYID0gbWF4KDAsIGNsaWVudCgpLT5jbGllbnRQYWRkaW5nTGVmdCgpIC0g Y2xpZW50KCktPmNsaWVudEluc2V0TGVmdCgpKTsKKyAgICAgICAgICAgIGlmIChpdGVtU3R5bGUu dGV4dERpcmVjdGlvbigpID09IExUUikKKyAgICAgICAgICAgICAgICB0ZXh0WCArPSBpdGVtU3R5 bGUudGV4dEluZGVudCgpLmNhbGNNaW5WYWx1ZShpdGVtUmVjdC53aWR0aCgpKTsKICAgICAgICAg ICAgIGludCB0ZXh0WSA9IGl0ZW1SZWN0LnkoKSArIGl0ZW1Gb250LmFzY2VudCgpICsgKGl0ZW1S ZWN0LmhlaWdodCgpIC0gaXRlbUZvbnQuaGVpZ2h0KCkpIC8gMjsKICAgICAgICAgICAgIGNvbnRl eHQuZHJhd0JpZGlUZXh0KGl0ZW1Gb250LCB0ZXh0UnVuLCBJbnRQb2ludCh0ZXh0WCwgdGV4dFkp KTsKICAgICAgICAgfQpJbmRleDogcmVuZGVyaW5nL1JlbmRlck1lbnVMaXN0LmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSByZW5kZXJpbmcvUmVuZGVyTWVudUxpc3QuY3BwCShyZXZpc2lvbiA0MTkxMCkKKysr IHJlbmRlcmluZy9SZW5kZXJNZW51TGlzdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE0Myw4ICsx NDMsMTggQEAgdm9pZCBSZW5kZXJNZW51TGlzdDo6dXBkYXRlT3B0aW9uc1dpZHRoKAogICAgICAg ICAgICAgY29udGludWU7CiAKICAgICAgICAgU3RyaW5nIHRleHQgPSBvcHRpb25FbGVtZW50LT50 ZXh0SW5kZW50ZWRUb1Jlc3BlY3RHcm91cExhYmVsKCk7CisjaWYgUExBVEZPUk0oV0lOKQorICAg ICAgICAvLyBBZGQgaW4gdGhlIG9wdGlvbidzIHRleHQgaW5kZW50LiAgV2UgY2FuJ3QgY2FsY3Vs YXRlIHBlcmNlbnRhZ2UgdmFsdWVzIGZvciBub3cuCisgICAgICAgIGZsb2F0IG9wdGlvbldpZHRo ID0gMDsKKyAgICAgICAgaWYgKFJlbmRlclN0eWxlKiBvcHRpb25TdHlsZSA9IGVsZW1lbnQtPnJl bmRlclN0eWxlKCkpCisgICAgICAgICAgICBvcHRpb25XaWR0aCArPSBvcHRpb25TdHlsZS0+dGV4 dEluZGVudCgpLmNhbGNNaW5WYWx1ZSgwKTsKKyAgICAgICAgaWYgKCF0ZXh0LmlzRW1wdHkoKSkK KyAgICAgICAgICAgIG9wdGlvbldpZHRoICs9IHN0eWxlKCktPmZvbnQoKS5mbG9hdFdpZHRoKHRl eHQpOworICAgICAgICBtYXhPcHRpb25XaWR0aCA9IG1heChtYXhPcHRpb25XaWR0aCwgb3B0aW9u V2lkdGgpOworI2Vsc2UKICAgICAgICAgaWYgKCF0ZXh0LmlzRW1wdHkoKSkKICAgICAgICAgICAg IG1heE9wdGlvbldpZHRoID0gbWF4KG1heE9wdGlvbldpZHRoLCBzdHlsZSgpLT5mb250KCkuZmxv YXRXaWR0aCh0ZXh0KSk7CisjZW5kaWYKICAgICB9CiAKICAgICBpbnQgd2lkdGggPSBzdGF0aWNf Y2FzdDxpbnQ+KGNlaWxmKG1heE9wdGlvbldpZHRoKSk7CkBAIC0zMzIsNyArMzQyLDExIEBAIFBv cHVwTWVudVN0eWxlIFJlbmRlck1lbnVMaXN0OjppdGVtU3R5bGUKICAgICBIVE1MRWxlbWVudCog ZWxlbWVudCA9IHNlbGVjdC0+bGlzdEl0ZW1zKClbbGlzdEluZGV4XTsKICAgICAKICAgICBSZW5k ZXJTdHlsZSogc3R5bGUgPSBlbGVtZW50LT5yZW5kZXJTdHlsZSgpID8gZWxlbWVudC0+cmVuZGVy U3R5bGUoKSA6IGVsZW1lbnQtPmNvbXB1dGVkU3R5bGUoKTsKKyNpZiBQTEFURk9STShXSU4pCisg ICAgcmV0dXJuIHN0eWxlID8gUG9wdXBNZW51U3R5bGUoc3R5bGUtPmNvbG9yKCksIGl0ZW1CYWNr Z3JvdW5kQ29sb3IobGlzdEluZGV4KSwgc3R5bGUtPmZvbnQoKSwgc3R5bGUtPnZpc2liaWxpdHko KSA9PSBWSVNJQkxFLCBzdHlsZS0+dGV4dEluZGVudCgpLCBzdHlsZS0+ZGlyZWN0aW9uKCkpIDog bWVudVN0eWxlKCk7CisjZWxzZQogICAgIHJldHVybiBzdHlsZSA/IFBvcHVwTWVudVN0eWxlKHN0 eWxlLT5jb2xvcigpLCBpdGVtQmFja2dyb3VuZENvbG9yKGxpc3RJbmRleCksIHN0eWxlLT5mb250 KCksIHN0eWxlLT52aXNpYmlsaXR5KCkgPT0gVklTSUJMRSkgOiBtZW51U3R5bGUoKTsKKyNlbmRp ZgogfQogCiBDb2xvciBSZW5kZXJNZW51TGlzdDo6aXRlbUJhY2tncm91bmRDb2xvcih1bnNpZ25l ZCBsaXN0SW5kZXgpIGNvbnN0CkBAIC0zNjAsNyArMzc0LDcgQEAgUG9wdXBNZW51U3R5bGUgUmVu ZGVyTWVudUxpc3Q6Om1lbnVTdHlsZQogewogCiAgICAgUmVuZGVyU3R5bGUqIHMgPSBtX2lubmVy QmxvY2sgPyBtX2lubmVyQmxvY2stPnN0eWxlKCkgOiBzdHlsZSgpOwotICAgIHJldHVybiBQb3B1 cE1lbnVTdHlsZShzLT5jb2xvcigpLCBzLT5iYWNrZ3JvdW5kQ29sb3IoKSwgcy0+Zm9udCgpLCBz LT52aXNpYmlsaXR5KCkgPT0gVklTSUJMRSk7CisgICAgcmV0dXJuIFBvcHVwTWVudVN0eWxlKHMt PmNvbG9yKCksIHMtPmJhY2tncm91bmRDb2xvcigpLCBzLT5mb250KCksIHMtPnZpc2liaWxpdHko KSA9PSBWSVNJQkxFLCBzLT50ZXh0SW5kZW50KCksIHMtPmRpcmVjdGlvbigpKTsKIH0KIAogSG9z dFdpbmRvdyogUmVuZGVyTWVudUxpc3Q6Omhvc3RXaW5kb3coKSBjb25zdApJbmRleDogcmVuZGVy aW5nL1JlbmRlclRleHRDb250cm9sU2luZ2xlTGluZS5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gcmVuZGVy aW5nL1JlbmRlclRleHRDb250cm9sU2luZ2xlTGluZS5jcHAJKHJldmlzaW9uIDQxOTEwKQorKysg cmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9sU2luZ2xlTGluZS5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTY5Miw3ICs2OTIsMTEgQEAgUG9wdXBNZW51U3R5bGUgUmVuZGVyVGV4dENvbnRyb2xTaW5n bGVMaQogCiBQb3B1cE1lbnVTdHlsZSBSZW5kZXJUZXh0Q29udHJvbFNpbmdsZUxpbmU6Om1lbnVT dHlsZSgpIGNvbnN0CiB7CisjaWYgUExBVEZPUk0oV0lOKQorICAgIHJldHVybiBQb3B1cE1lbnVT dHlsZShzdHlsZSgpLT5jb2xvcigpLCBzdHlsZSgpLT5iYWNrZ3JvdW5kQ29sb3IoKSwgc3R5bGUo KS0+Zm9udCgpLCBzdHlsZSgpLT52aXNpYmlsaXR5KCkgPT0gVklTSUJMRSwgc3R5bGUoKS0+dGV4 dEluZGVudCgpLCBzdHlsZSgpLT5kaXJlY3Rpb24oKSk7CisjZWxzZQogICAgIHJldHVybiBQb3B1 cE1lbnVTdHlsZShzdHlsZSgpLT5jb2xvcigpLCBzdHlsZSgpLT5iYWNrZ3JvdW5kQ29sb3IoKSwg c3R5bGUoKS0+Zm9udCgpLCBzdHlsZSgpLT52aXNpYmlsaXR5KCkgPT0gVklTSUJMRSk7CisjZW5k aWYKIH0KIAogaW50IFJlbmRlclRleHRDb250cm9sU2luZ2xlTGluZTo6Y2xpZW50SW5zZXRMZWZ0 KCkgY29uc3QK 28872 2009-03-23 16:15:33 -0700 2009-03-23 16:32:38 -0700 Second try. 20090323-optiontextindent2.patch.txt text/plain 8587 adachan SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDQxOTIx KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzAgQEAKKzIwMDktMDMt MjMgIEFkYSBDaGFuICA8YWRhY2hhbkBhcHBsZS5jb20+CisKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI0NzYyCisgICAgICAgIFN1cHBvcnQgdGV4dC1p bmRlbnQgaW4gPG9wdGlvbj4gZWxlbWVudHMgb24gd2luZG93cyBwbGF0Zm9ybS4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGNzcy90aGVtZVdpbi5j c3M6CisgICAgICAgICogcGxhdGZvcm0vUG9wdXBNZW51U3R5bGUuaDogV2UgZG9uJ3QgaG9ub3Ig Zm9udCBzcGVjaWZpZWQgb24gPG9wdGlvbj4gZWxlbWVudHMgcmlnaHQgbm93LiAgTWFrZSB0aGlz CisgICAgICAgIGV4cGxpY2l0IHZpYSB3aW5kb3dzIHRoZW1lZCBkZWZhdWx0IHN0eWxlc2hlZXQu CisgICAgICAgIChXZWJDb3JlOjpQb3B1cE1lbnVTdHlsZTo6UG9wdXBNZW51U3R5bGUpOiBBbHNv IHN0b3JlIHRleHQtaW5kZW50IGFuZCB0ZXh0LWRpcmVjdGlvbi4KKyAgICAgICAgKFdlYkNvcmU6 OlBvcHVwTWVudVN0eWxlOjp0ZXh0SW5kZW50KToKKyAgICAgICAgKFdlYkNvcmU6OlBvcHVwTWVu dVN0eWxlOjp0ZXh0RGlyZWN0aW9uKToKKyAgICAgICAgKiBwbGF0Zm9ybS93aW4vUG9wdXBNZW51 V2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBvcHVwTWVudTo6cGFpbnQpOiBBZGp1c3QgdGhl IHRleHQncyB4LWNvb3JkaW5hdGUgaWYgdGV4dC1pbmRlbnQgaXMgc3VwcG9ydGVkIGZvciBvcHRp b25zIGFuZCAKKyAgICAgICAgdGV4dC1pbmRlbnQgaXMgc3BlY2lmaWVkIHdpdGggTFRSIGRpcmVj dGlvbi4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTWVudUxpc3QuY3BwOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyTWVudUxpc3Q6OnVwZGF0ZU9wdGlvbnNXaWR0aCk6IFRha2UgdGV4dC1p bmRlbnQgaW50byBhY2NvdW50IGlmIHRoZW1lIHN1cHBvcnRzIHRleHQtaW5kZW50IGZvciBvcHRp b25zLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTWVudUxpc3Q6Oml0ZW1TdHlsZSk6IFVzZSBu ZXcgUG9wdXBNZW51U3R5bGUgY29uc3RydWN0b3Igb24gd2luZG93cy4KKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlck1lbnVMaXN0OjptZW51U3R5bGUpOiBEaXR0by4KKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5lLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlclRleHRDb250cm9sU2luZ2xlTGluZTo6bWVudVN0eWxlKTogRGl0dG8uCisgICAgICAgICog cmVuZGVyaW5nL1JlbmRlclRoZW1lLmg6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZTo6 cG9wdXBPcHRpb25TdXBwb3J0c1RleHRJbmRlbnQpOiBBZGRlZC4gIERlZmF1bHQgaXMgZmFsc2Ug c2luY2Ugd2UgYXJlIG9ubHkgc3VwcG9ydGluZyBpdCBpbiB3aW5kb3dzIGZvciBub3cuCisgICAg ICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1lV2luLmg6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJUaGVtZVdpbjo6cG9wdXBPcHRpb25TdXBwb3J0c1RleHRJbmRlbnQpOiBSZXR1cm5zIHRydWUg Zm9yIHdpbmRvd3MuCisKIDIwMDktMDMtMjMgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29t PgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNhbSBXZWluaWcuCkluZGV4OiBjc3MvdGhlbWVXaW4u Y3NzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIGNzcy90aGVtZVdpbi5jc3MJKHJldmlzaW9uIDQxOTIxKQorKysg Y3NzL3RoZW1lV2luLmNzcwkod29ya2luZyBjb3B5KQpAQCAtOTMsNiArOTMsMTAgQEAgc2VsZWN0 W3NpemU9IjEiXSB7CiAgICAgLXdlYmtpdC1ib3JkZXItcmFkaXVzOiAwOwogICAgIG1hcmdpbjog MDsKIH0KKy8qIE9wdGlvbnMgYWx3YXlzIHVzZSB0aGUgc2VsZWN0cycgZm9udHMgKi8KK29wdGlv biB7CisgICAgZm9udDogaW5oZXJpdCAhaW1wb3J0YW50OworfQogCiB0ZXh0YXJlYSB7CiAgIGZv bnQtZmFtaWx5OiBtb25vc3BhY2U7CkluZGV4OiBwbGF0Zm9ybS9Qb3B1cE1lbnVTdHlsZS5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIHBsYXRmb3JtL1BvcHVwTWVudVN0eWxlLmgJKHJldmlzaW9uIDQxOTIxKQor KysgcGxhdGZvcm0vUG9wdXBNZW51U3R5bGUuaAkod29ya2luZyBjb3B5KQpAQCAtMjgsMTYgKzI4 LDIwIEBACiAKICNpbmNsdWRlICJDb2xvci5oIgogI2luY2x1ZGUgIkZvbnQuaCIKKyNpbmNsdWRl ICJMZW5ndGguaCIKKyNpbmNsdWRlICJUZXh0RGlyZWN0aW9uLmgiCiAKIG5hbWVzcGFjZSBXZWJD b3JlIHsKIAogY2xhc3MgUG9wdXBNZW51U3R5bGUgewogcHVibGljOgotICAgIFBvcHVwTWVudVN0 eWxlKGNvbnN0IENvbG9yJiBmb3JlZ3JvdW5kLCBjb25zdCBDb2xvciYgYmFja2dyb3VuZCwgY29u c3QgRm9udCYgZm9udCwgYm9vbCB2aXNpYmxlKQorICAgIFBvcHVwTWVudVN0eWxlKGNvbnN0IENv bG9yJiBmb3JlZ3JvdW5kLCBjb25zdCBDb2xvciYgYmFja2dyb3VuZCwgY29uc3QgRm9udCYgZm9u dCwgYm9vbCB2aXNpYmxlLCBMZW5ndGggdGV4dEluZGVudCwgVGV4dERpcmVjdGlvbiB0ZXh0RGly ZWN0aW9uKQogICAgICAgICA6IG1fZm9yZWdyb3VuZENvbG9yKGZvcmVncm91bmQpCiAgICAgICAg ICwgbV9iYWNrZ3JvdW5kQ29sb3IoYmFja2dyb3VuZCkKICAgICAgICAgLCBtX2ZvbnQoZm9udCkK ICAgICAgICAgLCBtX3Zpc2libGUodmlzaWJsZSkKKyAgICAgICAgLCBtX3RleHRJbmRlbnQodGV4 dEluZGVudCkKKyAgICAgICAgLCBtX3RleHREaXJlY3Rpb24odGV4dERpcmVjdGlvbikKICAgICB7 CiAgICAgfQogICAgIApAQCAtNDUsMTIgKzQ5LDE2IEBAIHB1YmxpYzoKICAgICBjb25zdCBDb2xv ciYgYmFja2dyb3VuZENvbG9yKCkgY29uc3QgeyByZXR1cm4gbV9iYWNrZ3JvdW5kQ29sb3I7IH0K ICAgICBjb25zdCBGb250JiBmb250KCkgY29uc3QgeyByZXR1cm4gbV9mb250OyB9CiAgICAgYm9v bCBpc1Zpc2libGUoKSBjb25zdCB7IHJldHVybiBtX3Zpc2libGU7IH0KKyAgICBMZW5ndGggdGV4 dEluZGVudCgpIGNvbnN0IHsgcmV0dXJuIG1fdGV4dEluZGVudDsgfQorICAgIFRleHREaXJlY3Rp b24gdGV4dERpcmVjdGlvbigpIGNvbnN0IHsgcmV0dXJuIG1fdGV4dERpcmVjdGlvbjsgfQogCiBw cml2YXRlOgogICAgIENvbG9yIG1fZm9yZWdyb3VuZENvbG9yOwogICAgIENvbG9yIG1fYmFja2dy b3VuZENvbG9yOwogICAgIEZvbnQgbV9mb250OwogICAgIGJvb2wgbV92aXNpYmxlOworICAgIExl bmd0aCBtX3RleHRJbmRlbnQ7CisgICAgVGV4dERpcmVjdGlvbiBtX3RleHREaXJlY3Rpb247CiB9 OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCkluZGV4OiBwbGF0Zm9ybS93aW4vUG9wdXBNZW51 V2luLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBwbGF0Zm9ybS93aW4vUG9wdXBNZW51V2luLmNwcAkocmV2 aXNpb24gNDE5MjEpCisrKyBwbGF0Zm9ybS93aW4vUG9wdXBNZW51V2luLmNwcAkod29ya2luZyBj b3B5KQpAQCAtNTI3LDYgKzUyNyw4IEBAIHZvaWQgUG9wdXBNZW51OjpwYWludChjb25zdCBJbnRS ZWN0JiBkYW0KICAgICAgICAgLy8gRHJhdyB0aGUgaXRlbSB0ZXh0CiAgICAgICAgIGlmIChpdGVt U3R5bGUuaXNWaXNpYmxlKCkpIHsKICAgICAgICAgICAgIGludCB0ZXh0WCA9IG1heCgwLCBjbGll bnQoKS0+Y2xpZW50UGFkZGluZ0xlZnQoKSAtIGNsaWVudCgpLT5jbGllbnRJbnNldExlZnQoKSk7 CisgICAgICAgICAgICBpZiAodGhlbWUoKS0+cG9wdXBPcHRpb25TdXBwb3J0c1RleHRJbmRlbnQo KSAmJiBpdGVtU3R5bGUudGV4dERpcmVjdGlvbigpID09IExUUikKKyAgICAgICAgICAgICAgICB0 ZXh0WCArPSBpdGVtU3R5bGUudGV4dEluZGVudCgpLmNhbGNNaW5WYWx1ZShpdGVtUmVjdC53aWR0 aCgpKTsKICAgICAgICAgICAgIGludCB0ZXh0WSA9IGl0ZW1SZWN0LnkoKSArIGl0ZW1Gb250LmFz Y2VudCgpICsgKGl0ZW1SZWN0LmhlaWdodCgpIC0gaXRlbUZvbnQuaGVpZ2h0KCkpIC8gMjsKICAg ICAgICAgICAgIGNvbnRleHQuZHJhd0JpZGlUZXh0KGl0ZW1Gb250LCB0ZXh0UnVuLCBJbnRQb2lu dCh0ZXh0WCwgdGV4dFkpKTsKICAgICAgICAgfQpJbmRleDogcmVuZGVyaW5nL1JlbmRlck1lbnVM aXN0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSByZW5kZXJpbmcvUmVuZGVyTWVudUxpc3QuY3BwCShyZXZp c2lvbiA0MTkyMSkKKysrIHJlbmRlcmluZy9SZW5kZXJNZW51TGlzdC5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTE0Myw4ICsxNDMsMTYgQEAgdm9pZCBSZW5kZXJNZW51TGlzdDo6dXBkYXRlT3B0aW9u c1dpZHRoKAogICAgICAgICAgICAgY29udGludWU7CiAKICAgICAgICAgU3RyaW5nIHRleHQgPSBv cHRpb25FbGVtZW50LT50ZXh0SW5kZW50ZWRUb1Jlc3BlY3RHcm91cExhYmVsKCk7Ci0gICAgICAg IGlmICghdGV4dC5pc0VtcHR5KCkpCi0gICAgICAgICAgICBtYXhPcHRpb25XaWR0aCA9IG1heCht YXhPcHRpb25XaWR0aCwgc3R5bGUoKS0+Zm9udCgpLmZsb2F0V2lkdGgodGV4dCkpOworICAgICAg ICBpZiAodGhlbWUoKS0+cG9wdXBPcHRpb25TdXBwb3J0c1RleHRJbmRlbnQoKSkgeworICAgICAg ICAgICAgLy8gQWRkIGluIHRoZSBvcHRpb24ncyB0ZXh0IGluZGVudC4gIFdlIGNhbid0IGNhbGN1 bGF0ZSBwZXJjZW50YWdlIHZhbHVlcyBmb3Igbm93LgorICAgICAgICAgICAgZmxvYXQgb3B0aW9u V2lkdGggPSAwOworICAgICAgICAgICAgaWYgKFJlbmRlclN0eWxlKiBvcHRpb25TdHlsZSA9IGVs ZW1lbnQtPnJlbmRlclN0eWxlKCkpCisgICAgICAgICAgICAgICAgb3B0aW9uV2lkdGggKz0gb3B0 aW9uU3R5bGUtPnRleHRJbmRlbnQoKS5jYWxjTWluVmFsdWUoMCk7CisgICAgICAgICAgICBpZiAo IXRleHQuaXNFbXB0eSgpKQorICAgICAgICAgICAgICAgIG9wdGlvbldpZHRoICs9IHN0eWxlKCkt PmZvbnQoKS5mbG9hdFdpZHRoKHRleHQpOworICAgICAgICAgICAgbWF4T3B0aW9uV2lkdGggPSBt YXgobWF4T3B0aW9uV2lkdGgsIG9wdGlvbldpZHRoKTsKKyAgICAgICAgfSBlbHNlIGlmICghdGV4 dC5pc0VtcHR5KCkpCisgICAgICAgICAgICAgICAgbWF4T3B0aW9uV2lkdGggPSBtYXgobWF4T3B0 aW9uV2lkdGgsIHN0eWxlKCktPmZvbnQoKS5mbG9hdFdpZHRoKHRleHQpKTsKICAgICB9CiAKICAg ICBpbnQgd2lkdGggPSBzdGF0aWNfY2FzdDxpbnQ+KGNlaWxmKG1heE9wdGlvbldpZHRoKSk7CkBA IC0zMzIsNyArMzQwLDcgQEAgUG9wdXBNZW51U3R5bGUgUmVuZGVyTWVudUxpc3Q6Oml0ZW1TdHls ZQogICAgIEhUTUxFbGVtZW50KiBlbGVtZW50ID0gc2VsZWN0LT5saXN0SXRlbXMoKVtsaXN0SW5k ZXhdOwogICAgIAogICAgIFJlbmRlclN0eWxlKiBzdHlsZSA9IGVsZW1lbnQtPnJlbmRlclN0eWxl KCkgPyBlbGVtZW50LT5yZW5kZXJTdHlsZSgpIDogZWxlbWVudC0+Y29tcHV0ZWRTdHlsZSgpOwot ICAgIHJldHVybiBzdHlsZSA/IFBvcHVwTWVudVN0eWxlKHN0eWxlLT5jb2xvcigpLCBpdGVtQmFj a2dyb3VuZENvbG9yKGxpc3RJbmRleCksIHN0eWxlLT5mb250KCksIHN0eWxlLT52aXNpYmlsaXR5 KCkgPT0gVklTSUJMRSkgOiBtZW51U3R5bGUoKTsKKyAgICByZXR1cm4gc3R5bGUgPyBQb3B1cE1l bnVTdHlsZShzdHlsZS0+Y29sb3IoKSwgaXRlbUJhY2tncm91bmRDb2xvcihsaXN0SW5kZXgpLCBz dHlsZS0+Zm9udCgpLCBzdHlsZS0+dmlzaWJpbGl0eSgpID09IFZJU0lCTEUsIHN0eWxlLT50ZXh0 SW5kZW50KCksIHN0eWxlLT5kaXJlY3Rpb24oKSkgOiBtZW51U3R5bGUoKTsKIH0KIAogQ29sb3Ig UmVuZGVyTWVudUxpc3Q6Oml0ZW1CYWNrZ3JvdW5kQ29sb3IodW5zaWduZWQgbGlzdEluZGV4KSBj b25zdApAQCAtMzYwLDcgKzM2OCw3IEBAIFBvcHVwTWVudVN0eWxlIFJlbmRlck1lbnVMaXN0Ojpt ZW51U3R5bGUKIHsKIAogICAgIFJlbmRlclN0eWxlKiBzID0gbV9pbm5lckJsb2NrID8gbV9pbm5l ckJsb2NrLT5zdHlsZSgpIDogc3R5bGUoKTsKLSAgICByZXR1cm4gUG9wdXBNZW51U3R5bGUocy0+ Y29sb3IoKSwgcy0+YmFja2dyb3VuZENvbG9yKCksIHMtPmZvbnQoKSwgcy0+dmlzaWJpbGl0eSgp ID09IFZJU0lCTEUpOworICAgIHJldHVybiBQb3B1cE1lbnVTdHlsZShzLT5jb2xvcigpLCBzLT5i YWNrZ3JvdW5kQ29sb3IoKSwgcy0+Zm9udCgpLCBzLT52aXNpYmlsaXR5KCkgPT0gVklTSUJMRSwg cy0+dGV4dEluZGVudCgpLCBzLT5kaXJlY3Rpb24oKSk7CiB9CiAKIEhvc3RXaW5kb3cqIFJlbmRl ck1lbnVMaXN0Ojpob3N0V2luZG93KCkgY29uc3QKSW5kZXg6IHJlbmRlcmluZy9SZW5kZXJUZXh0 Q29udHJvbFNpbmdsZUxpbmUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHJlbmRlcmluZy9SZW5kZXJUZXh0 Q29udHJvbFNpbmdsZUxpbmUuY3BwCShyZXZpc2lvbiA0MTkyMSkKKysrIHJlbmRlcmluZy9SZW5k ZXJUZXh0Q29udHJvbFNpbmdsZUxpbmUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02OTIsNyArNjky LDcgQEAgUG9wdXBNZW51U3R5bGUgUmVuZGVyVGV4dENvbnRyb2xTaW5nbGVMaQogCiBQb3B1cE1l bnVTdHlsZSBSZW5kZXJUZXh0Q29udHJvbFNpbmdsZUxpbmU6Om1lbnVTdHlsZSgpIGNvbnN0CiB7 Ci0gICAgcmV0dXJuIFBvcHVwTWVudVN0eWxlKHN0eWxlKCktPmNvbG9yKCksIHN0eWxlKCktPmJh Y2tncm91bmRDb2xvcigpLCBzdHlsZSgpLT5mb250KCksIHN0eWxlKCktPnZpc2liaWxpdHkoKSA9 PSBWSVNJQkxFKTsKKyAgICByZXR1cm4gUG9wdXBNZW51U3R5bGUoc3R5bGUoKS0+Y29sb3IoKSwg c3R5bGUoKS0+YmFja2dyb3VuZENvbG9yKCksIHN0eWxlKCktPmZvbnQoKSwgc3R5bGUoKS0+dmlz aWJpbGl0eSgpID09IFZJU0lCTEUsIHN0eWxlKCktPnRleHRJbmRlbnQoKSwgc3R5bGUoKS0+ZGly ZWN0aW9uKCkpOwogfQogCiBpbnQgUmVuZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5lOjpjbGllbnRJ bnNldExlZnQoKSBjb25zdApJbmRleDogcmVuZGVyaW5nL1JlbmRlclRoZW1lLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gcmVuZGVyaW5nL1JlbmRlclRoZW1lLmgJKHJldmlzaW9uIDQxOTIxKQorKysgcmVuZGVy aW5nL1JlbmRlclRoZW1lLmgJKHdvcmtpbmcgY29weSkKQEAgLTEzNSw2ICsxMzUsNyBAQCBwdWJs aWM6CiAgICAgdmlydHVhbCBpbnQgcG9wdXBJbnRlcm5hbFBhZGRpbmdSaWdodChSZW5kZXJTdHls ZSopIGNvbnN0IHsgcmV0dXJuIDA7IH0KICAgICB2aXJ0dWFsIGludCBwb3B1cEludGVybmFsUGFk ZGluZ1RvcChSZW5kZXJTdHlsZSopIGNvbnN0IHsgcmV0dXJuIDA7IH0KICAgICB2aXJ0dWFsIGlu dCBwb3B1cEludGVybmFsUGFkZGluZ0JvdHRvbShSZW5kZXJTdHlsZSopIGNvbnN0IHsgcmV0dXJu IDA7IH0KKyAgICB2aXJ0dWFsIGJvb2wgcG9wdXBPcHRpb25TdXBwb3J0c1RleHRJbmRlbnQoKSBj b25zdCB7IHJldHVybiBmYWxzZTsgfQogCiAgICAgdmlydHVhbCBpbnQgYnV0dG9uSW50ZXJuYWxQ YWRkaW5nTGVmdCgpIGNvbnN0IHsgcmV0dXJuIDA7IH0KICAgICB2aXJ0dWFsIGludCBidXR0b25J bnRlcm5hbFBhZGRpbmdSaWdodCgpIGNvbnN0IHsgcmV0dXJuIDA7IH0KSW5kZXg6IHJlbmRlcmlu Zy9SZW5kZXJUaGVtZVdpbi5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHJlbmRlcmluZy9SZW5kZXJUaGVtZVdp bi5oCShyZXZpc2lvbiA0MTkyMSkKKysrIHJlbmRlcmluZy9SZW5kZXJUaGVtZVdpbi5oCSh3b3Jr aW5nIGNvcHkpCkBAIC05Miw2ICs5Miw4IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIGJvb2wgcGFp bnRTbGlkZXJUaHVtYihSZW5kZXJPYmplY3QqIG8sIGNvbnN0IFJlbmRlck9iamVjdDo6UGFpbnRJ bmZvJiBpLCBjb25zdCBJbnRSZWN0JiByKTsKICAgICB2aXJ0dWFsIHZvaWQgYWRqdXN0U2xpZGVy VGh1bWJTaXplKFJlbmRlck9iamVjdCopIGNvbnN0OwogCisgICAgdmlydHVhbCBib29sIHBvcHVw T3B0aW9uU3VwcG9ydHNUZXh0SW5kZW50KCkgY29uc3QgeyByZXR1cm4gdHJ1ZTsgfQorCiAgICAg dmlydHVhbCBpbnQgYnV0dG9uSW50ZXJuYWxQYWRkaW5nTGVmdCgpIGNvbnN0OwogICAgIHZpcnR1 YWwgaW50IGJ1dHRvbkludGVybmFsUGFkZGluZ1JpZ2h0KCkgY29uc3Q7CiAgICAgdmlydHVhbCBp bnQgYnV0dG9uSW50ZXJuYWxQYWRkaW5nVG9wKCkgY29uc3Q7Cg==