80556 2012-03-07 17:40:09 -0800 Add RenderBoxModelObject::marginWidth() and marginHeight() 2012-03-07 19:31:46 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) All All RESOLVED FIXED P5 Trivial --- 1 tkent tkent haraken morrita webkit.review.bot oldest_to_newest 573411 0 tkent 2012-03-07 17:40:09 -0800 to shorten some code. 573415 1 130736 tkent 2012-03-07 17:43:19 -0800 Created attachment 130736 Patch 573426 2 130736 haraken 2012-03-07 17:54:50 -0800 Comment on attachment 130736 Patch r=me 573441 3 130736 tkent 2012-03-07 18:09:22 -0800 Comment on attachment 130736 Patch Thanks! 573500 4 130736 webkit.review.bot 2012-03-07 19:31:41 -0800 Comment on attachment 130736 Patch Clearing flags on attachment: 130736 Committed r110135: <http://trac.webkit.org/changeset/110135> 573501 5 webkit.review.bot 2012-03-07 19:31:46 -0800 All reviewed patches have been landed. Closing bug. 130736 2012-03-07 17:43:19 -0800 2012-03-07 19:31:41 -0800 Patch bug-80556-20120308104317.patch text/plain 20176 tkent U3VidmVyc2lvbiBSZXZpc2lvbjogMTEwMTIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmMxOTJkYWVkOWNhMzNm NzUyMzY2ODhlYTRiOWNhN2M2ZDRmYWYxYi4uNjhkYTFiYTA2YmVhYjI2MTY2Y2U4NDMzMzFhNTU0 ZjBkZjdiNzZhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQxIEBACisyMDEyLTAzLTA3ICBLZW50 IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KKworICAgICAgICBBZGQgUmVuZGVyQm94TW9k ZWxPYmplY3Q6Om1hcmdpbldpZHRoKCkgYW5kIG1hcmdpbkhlaWdodCgpCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MDU1NgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZXkgbWFrZSBzb21lIGNvZGUgc2hv cnRlci4KKworICAgICAgICBObyBiZWhhdmlvciBjaGFuZ2UuCisKKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVyQm94TW9kZWxPYmplY3QuaDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveE1v ZGVsT2JqZWN0OjptYXJnaW5IZWlnaHQpOiBBZGRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckJveE1vZGVsT2JqZWN0OjptYXJnaW5XaWR0aCk6IEFkZGVkLgorICAgICAgICAqIGluc3BlY3Rv ci9ET01Ob2RlSGlnaGxpZ2h0ZXIuY3BwOiBVc2UgbWFyZ2luSGVpZ2h0KCkgYW5kL29yIG1hcmdp bldpZHRoKCkuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrLmg6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJCbG9jazo6RmxvYXRXaXRoUmVjdDo6RmxvYXRXaXRoUmVjdCk6IGRpdHRv LgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OmNoZWNrRmxvYXRzSW5DbGVhbkxpbmUpOiBkaXR0by4K KyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlckJveDo6cmVwYWludExheWVyUmVjdHNGb3JJbWFnZSk6IGRpdHRvLgorICAgICAgICAqIHJl bmRlcmluZy9SZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3guY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94OjpsYXlvdXRIb3Jpem9udGFsQm94KTogZGl0 dG8uCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3g6OmxheW91 dFZlcnRpY2FsQm94KTogZGl0dG8uCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxl Qm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94Ojpjcm9zc0F4aXNN YXJnaW5FeHRlbnRGb3JDaGlsZCk6IGRpdHRvLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxl eGlibGVCb3g6OmNvbXB1dGVOZXh0RmxleExpbmUpOiBkaXR0by4KKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVySW5saW5lLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlcklubGluZTo6Y3Vs bGVkSW5saW5lQWJzb2x1dGVSZWN0cyk6IGRpdHRvLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy SW5saW5lOjpjdWxsZWRJbmxpbmVBYnNvbHV0ZVF1YWRzKTogZGl0dG8uCisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJJbmxpbmU6OmN1bGxlZElubGluZUJvdW5kaW5nQm94KTogZGl0dG8uCisgICAg ICAgICogcmVuZGVyaW5nL1JlbmRlclNjcm9sbGJhci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJTY3JvbGxiYXI6OnRyYWNrUGllY2VSZWN0V2l0aE1hcmdpbnMpOiBkaXR0by4KKyAgICAg ICAgKiByZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2wuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyVGV4dENvbnRyb2w6OmNvbXB1dGVMb2dpY2FsSGVpZ2h0KTogZGl0dG8uCisgICAgICAg ICogcmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9sU2luZ2xlTGluZS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJUZXh0Q29udHJvbFNpbmdsZUxpbmU6OmNvbXB1dGVDb250cm9sSGVpZ2h0 KTogZGl0dG8uCisKIDIwMTItMDMtMDcgIEVtaWwgQSBFa2x1bmQgIDxlYWVAY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIENoYW5nZSByZW1haW5pbmcgc2Nyb2xsIG1ldGhvZHMgdG8gaW50ZWdlcnMK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9ET01Ob2RlSGlnaGxpZ2h0ZXIu Y3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0RPTU5vZGVIaWdobGlnaHRlci5jcHAKaW5k ZXggNzA1NzhjNzJhODA4NDI4MDFkYjMwMTNiYTY0YjYyNzY0ZmRmYTNiZi4uYzEzZmMzMjRiODgx NjE2MjMwZGRmODg0YTJkY2VhYmRmYmVlNTM3YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0RPTU5vZGVIaWdobGlnaHRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL0RPTU5vZGVIaWdobGlnaHRlci5jcHAKQEAgLTQxNCw3ICs0MTQsNyBAQCBzdGF0aWMg dm9pZCBnZXRPckRyYXdOb2RlSGlnaGxpZ2h0KEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgSGln aGxpZ2h0RGF0YSogaGlnaAogICAgICAgICAgICAgYm9yZGVyQm94ID0gTGF5b3V0UmVjdChwYWRk aW5nQm94LngoKSAtIHJlbmRlckJveC0+Ym9yZGVyTGVmdCgpLCBwYWRkaW5nQm94LnkoKSAtIHJl bmRlckJveC0+Ym9yZGVyVG9wKCksCiAgICAgICAgICAgICAgICAgICAgIHBhZGRpbmdCb3gud2lk dGgoKSArIHJlbmRlckJveC0+Ym9yZGVyTGVmdCgpICsgcmVuZGVyQm94LT5ib3JkZXJSaWdodCgp LCBwYWRkaW5nQm94LmhlaWdodCgpICsgcmVuZGVyQm94LT5ib3JkZXJUb3AoKSArIHJlbmRlckJv eC0+Ym9yZGVyQm90dG9tKCkpOwogICAgICAgICAgICAgbWFyZ2luQm94ID0gTGF5b3V0UmVjdChi b3JkZXJCb3gueCgpIC0gcmVuZGVyQm94LT5tYXJnaW5MZWZ0KCksIGJvcmRlckJveC55KCkgLSBy ZW5kZXJCb3gtPm1hcmdpblRvcCgpLAotICAgICAgICAgICAgICAgICAgICBib3JkZXJCb3gud2lk dGgoKSArIHJlbmRlckJveC0+bWFyZ2luTGVmdCgpICsgcmVuZGVyQm94LT5tYXJnaW5SaWdodCgp LCBib3JkZXJCb3guaGVpZ2h0KCkgKyByZW5kZXJCb3gtPm1hcmdpblRvcCgpICsgcmVuZGVyQm94 LT5tYXJnaW5Cb3R0b20oKSk7CisgICAgICAgICAgICAgICAgICAgIGJvcmRlckJveC53aWR0aCgp ICsgcmVuZGVyQm94LT5tYXJnaW5XaWR0aCgpLCBib3JkZXJCb3guaGVpZ2h0KCkgKyByZW5kZXJC b3gtPm1hcmdpbkhlaWdodCgpKTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIFJlbmRl cklubGluZSogcmVuZGVySW5saW5lID0gdG9SZW5kZXJJbmxpbmUocmVuZGVyZXIpOwogCkBAIC00 MjYsNyArNDI2LDcgQEAgc3RhdGljIHZvaWQgZ2V0T3JEcmF3Tm9kZUhpZ2hsaWdodChHcmFwaGlj c0NvbnRleHQqIGNvbnRleHQsIEhpZ2hsaWdodERhdGEqIGhpZ2gKICAgICAgICAgICAgICAgICAg ICAgcGFkZGluZ0JveC53aWR0aCgpIC0gcmVuZGVySW5saW5lLT5wYWRkaW5nTGVmdCgpIC0gcmVu ZGVySW5saW5lLT5wYWRkaW5nUmlnaHQoKSwgcGFkZGluZ0JveC5oZWlnaHQoKSAtIHJlbmRlcklu bGluZS0+cGFkZGluZ1RvcCgpIC0gcmVuZGVySW5saW5lLT5wYWRkaW5nQm90dG9tKCkpOwogICAg ICAgICAgICAgLy8gSWdub3JlIG1hcmdpblRvcCBhbmQgbWFyZ2luQm90dG9tIGZvciBpbmxpbmVz LgogICAgICAgICAgICAgbWFyZ2luQm94ID0gTGF5b3V0UmVjdChib3JkZXJCb3gueCgpIC0gcmVu ZGVySW5saW5lLT5tYXJnaW5MZWZ0KCksIGJvcmRlckJveC55KCksCi0gICAgICAgICAgICAgICAg ICAgIGJvcmRlckJveC53aWR0aCgpICsgcmVuZGVySW5saW5lLT5tYXJnaW5MZWZ0KCkgKyByZW5k ZXJJbmxpbmUtPm1hcmdpblJpZ2h0KCksIGJvcmRlckJveC5oZWlnaHQoKSk7CisgICAgICAgICAg ICAgICAgICAgIGJvcmRlckJveC53aWR0aCgpICsgcmVuZGVySW5saW5lLT5tYXJnaW5XaWR0aCgp LCBib3JkZXJCb3guaGVpZ2h0KCkpOwogICAgICAgICB9CiAKICAgICAgICAgRmxvYXRRdWFkIGFi c0NvbnRlbnRRdWFkID0gcmVuZGVyZXItPmxvY2FsVG9BYnNvbHV0ZVF1YWQoRmxvYXRSZWN0KGNv bnRlbnRCb3gpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC bG9jay5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgKaW5kZXggODhl MzcxMTU2ZmJhZGZjYjVmOGZiMzE1Yjc2OTk0NjQ2ZjFhNDg2OC4uODU3Njk2Mjk3MDYwMjk3MDM5 MTM5ZTY2MGE2YzZiODZkZWNkNTkzYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckJsb2NrLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJs b2NrLmgKQEAgLTUzMiw3ICs1MzIsNyBAQCBwcml2YXRlOgogICAgIHN0cnVjdCBGbG9hdFdpdGhS ZWN0IHsKICAgICAgICAgRmxvYXRXaXRoUmVjdChSZW5kZXJCb3gqIGYpCiAgICAgICAgICAgICA6 IG9iamVjdChmKQotICAgICAgICAgICAgLCByZWN0KExheW91dFJlY3QoZi0+eCgpIC0gZi0+bWFy Z2luTGVmdCgpLCBmLT55KCkgLSBmLT5tYXJnaW5Ub3AoKSwgZi0+d2lkdGgoKSArIGYtPm1hcmdp bkxlZnQoKSArIGYtPm1hcmdpblJpZ2h0KCksIGYtPmhlaWdodCgpICsgZi0+bWFyZ2luVG9wKCkg KyBmLT5tYXJnaW5Cb3R0b20oKSkpCisgICAgICAgICAgICAsIHJlY3QoTGF5b3V0UmVjdChmLT54 KCkgLSBmLT5tYXJnaW5MZWZ0KCksIGYtPnkoKSAtIGYtPm1hcmdpblRvcCgpLCBmLT53aWR0aCgp ICsgZi0+bWFyZ2luV2lkdGgoKSwgZi0+aGVpZ2h0KCkgKyBmLT5tYXJnaW5IZWlnaHQoKSkpCiAg ICAgICAgICAgICAsIGV2ZXJIYWRMYXlvdXQoZi0+ZXZlckhhZExheW91dCgpKQogICAgICAgICB7 CiAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC bG9ja0xpbmVMYXlvdXQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2Nr TGluZUxheW91dC5jcHAKaW5kZXggNjI4ZjkzZTRjNmVlZTVjNDA2NzQyNGEwNzMwNWE0N2I3NDAz OGRiMy4uZTk4ZGI1Yzc5NGQyOTliZTg4MjdkYzEyNTVlNTNhOGUxNDkzODA0MCAxMDA3NTUKLS0t IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHAKQEAg LTE1NDYsNyArMTU0Niw3IEBAIHZvaWQgUmVuZGVyQmxvY2s6OmNoZWNrRmxvYXRzSW5DbGVhbkxp bmUoUm9vdElubGluZUJveCogbGluZSwgVmVjdG9yPEZsb2F0V2l0aFJlCiAgICAgZm9yIChWZWN0 b3I8UmVuZGVyQm94Kj46Oml0ZXJhdG9yIGl0ID0gY2xlYW5MaW5lRmxvYXRzLT5iZWdpbigpOyBp dCAhPSBlbmQ7ICsraXQpIHsKICAgICAgICAgUmVuZGVyQm94KiBmbG9hdGluZ0JveCA9ICppdDsK ICAgICAgICAgZmxvYXRpbmdCb3gtPmxheW91dElmTmVlZGVkKCk7Ci0gICAgICAgIExheW91dFNp emUgbmV3U2l6ZShmbG9hdGluZ0JveC0+d2lkdGgoKSArIGZsb2F0aW5nQm94LT5tYXJnaW5MZWZ0 KCkgKyBmbG9hdGluZ0JveC0+bWFyZ2luUmlnaHQoKSwgZmxvYXRpbmdCb3gtPmhlaWdodCgpICsg ZmxvYXRpbmdCb3gtPm1hcmdpblRvcCgpICsgZmxvYXRpbmdCb3gtPm1hcmdpbkJvdHRvbSgpKTsK KyAgICAgICAgTGF5b3V0U2l6ZSBuZXdTaXplKGZsb2F0aW5nQm94LT53aWR0aCgpICsgZmxvYXRp bmdCb3gtPm1hcmdpbldpZHRoKCksIGZsb2F0aW5nQm94LT5oZWlnaHQoKSArIGZsb2F0aW5nQm94 LT5tYXJnaW5IZWlnaHQoKSk7CiAgICAgICAgIEFTU0VSVChmbG9hdEluZGV4IDwgZmxvYXRzLnNp emUoKSk7CiAgICAgICAgIGlmIChmbG9hdHNbZmxvYXRJbmRleF0ub2JqZWN0ICE9IGZsb2F0aW5n Qm94KSB7CiAgICAgICAgICAgICBlbmNvdW50ZXJlZE5ld0Zsb2F0ID0gdHJ1ZTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKaW5kZXggYjc3Njg2NjNkNzBkN2M4MmJmNDY2OTM4 MWEwYzE5MWVhNGY2MjU4Zi4uYmFmZGMzNzZhODkzZDBkNmNkZTM5ODU5Y2FlNzAzZWUzYWFhM2Nl MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKQEAgLTExODgsOCArMTE4 OCw4IEBAIGJvb2wgUmVuZGVyQm94OjpyZXBhaW50TGF5ZXJSZWN0c0ZvckltYWdlKFdyYXBwZWRJ bWFnZVB0ciBpbWFnZSwgY29uc3QgRmlsbExheWVyCiAgICAgICAgICAgICAgICAgICAgIH0KICAg ICAgICAgICAgICAgICAgICAgcmVuZGVyZXJSZWN0ID0gTGF5b3V0UmVjdCgtbGF5ZXJSZW5kZXJl ci0+bWFyZ2luTGVmdCgpLAogICAgICAgICAgICAgICAgICAgICAgICAgLWxheWVyUmVuZGVyZXIt Pm1hcmdpblRvcCgpLAotICAgICAgICAgICAgICAgICAgICAgICAgbWF4KGxheWVyUmVuZGVyZXIt PndpZHRoKCkgKyBsYXllclJlbmRlcmVyLT5tYXJnaW5MZWZ0KCkgKyBsYXllclJlbmRlcmVyLT5t YXJnaW5SaWdodCgpICsgbGF5ZXJSZW5kZXJlci0+Ym9yZGVyTGVmdCgpICsgbGF5ZXJSZW5kZXJl ci0+Ym9yZGVyUmlnaHQoKSwgcncpLAotICAgICAgICAgICAgICAgICAgICAgICAgbWF4KGxheWVy UmVuZGVyZXItPmhlaWdodCgpICsgbGF5ZXJSZW5kZXJlci0+bWFyZ2luVG9wKCkgKyBsYXllclJl bmRlcmVyLT5tYXJnaW5Cb3R0b20oKSArIGxheWVyUmVuZGVyZXItPmJvcmRlclRvcCgpICsgbGF5 ZXJSZW5kZXJlci0+Ym9yZGVyQm90dG9tKCksIHJoKSk7CisgICAgICAgICAgICAgICAgICAgICAg ICBtYXgobGF5ZXJSZW5kZXJlci0+d2lkdGgoKSArIGxheWVyUmVuZGVyZXItPm1hcmdpbldpZHRo KCkgKyBsYXllclJlbmRlcmVyLT5ib3JkZXJMZWZ0KCkgKyBsYXllclJlbmRlcmVyLT5ib3JkZXJS aWdodCgpLCBydyksCisgICAgICAgICAgICAgICAgICAgICAgICBtYXgobGF5ZXJSZW5kZXJlci0+ aGVpZ2h0KCkgKyBsYXllclJlbmRlcmVyLT5tYXJnaW5IZWlnaHQoKSArIGxheWVyUmVuZGVyZXIt PmJvcmRlclRvcCgpICsgbGF5ZXJSZW5kZXJlci0+Ym9yZGVyQm90dG9tKCksIHJoKSk7CiAgICAg ICAgICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgICAgICAgICAgbGF5ZXJSZW5kZXJlciA9 IHRoaXM7CiAgICAgICAgICAgICAgICAgICAgIHJlbmRlcmVyUmVjdCA9IGJvcmRlckJveFJlY3Qo KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9i amVjdC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmgK aW5kZXggNjViNDM2NmM0MDYxZTRjMWRlNTYzODdiODlhYmYzM2Y0ZDEzMjhkNS4uNTUzNTg0NzY5 NjhjYjQ4Nzc0YjRiOWEwNGI0NDkwN2FhNDI2MWZkMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmgKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmgKQEAgLTExNiw2ICsxMTYsOCBAQCBwdWJs aWM6CiAgICAgdmlydHVhbCBMYXlvdXRVbml0IG1hcmdpbkFmdGVyKCkgY29uc3QgPSAwOwogICAg IHZpcnR1YWwgTGF5b3V0VW5pdCBtYXJnaW5TdGFydCgpIGNvbnN0ID0gMDsKICAgICB2aXJ0dWFs IExheW91dFVuaXQgbWFyZ2luRW5kKCkgY29uc3QgPSAwOworICAgIExheW91dFVuaXQgbWFyZ2lu SGVpZ2h0KCkgY29uc3QgeyByZXR1cm4gbWFyZ2luVG9wKCkgKyBtYXJnaW5Cb3R0b20oKTsgfQor ICAgIExheW91dFVuaXQgbWFyZ2luV2lkdGgoKSBjb25zdCB7IHJldHVybiBtYXJnaW5MZWZ0KCkg KyBtYXJnaW5SaWdodCgpOyB9CiAKICAgICBib29sIGhhc0lubGluZURpcmVjdGlvbkJvcmRlcnNQ YWRkaW5nT3JNYXJnaW4oKSBjb25zdCB7IHJldHVybiBoYXNJbmxpbmVEaXJlY3Rpb25Cb3JkZXJz T3JQYWRkaW5nKCkgfHwgbWFyZ2luU3RhcnQoKXx8IG1hcmdpbkVuZCgpOyB9CiAgICAgYm9vbCBo YXNJbmxpbmVEaXJlY3Rpb25Cb3JkZXJzT3JQYWRkaW5nKCkgY29uc3QgeyByZXR1cm4gYm9yZGVy U3RhcnQoKSB8fCBib3JkZXJFbmQoKSB8fCBwYWRkaW5nU3RhcnQoKXx8IHBhZGRpbmdFbmQoKTsg fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckRlcHJlY2F0ZWRG bGV4aWJsZUJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRGVwcmVjYXRl ZEZsZXhpYmxlQm94LmNwcAppbmRleCAxZWI3YTM0MjEwMmIxZmIyYzEzMzg4OWQ5MGMxNTMxZGEy ZmFjMzg4Li5hZGQwMWEwYzIwNjZlMjhmZmMwZDY5M2UxMzUzOGVkM2UyMmM2YTljIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRGVwcmVjYXRlZEZsZXhp YmxlQm94LmNwcApAQCAtMzk0LDcgKzM5NCw3IEBAIHZvaWQgUmVuZGVyRGVwcmVjYXRlZEZsZXhp YmxlQm94OjpsYXlvdXRIb3Jpem9udGFsQm94KGJvb2wgcmVsYXlvdXRDaGlsZHJlbikKICAgICAg ICAgICAgICAgICBpZiAoYXNjZW50ID09IC0xKQogICAgICAgICAgICAgICAgICAgICBhc2NlbnQg PSBjaGlsZC0+aGVpZ2h0KCkgKyBjaGlsZC0+bWFyZ2luQm90dG9tKCk7CiAgICAgICAgICAgICAg ICAgYXNjZW50ICs9IGNoaWxkLT5tYXJnaW5Ub3AoKTsKLSAgICAgICAgICAgICAgICBMYXlvdXRV bml0IGRlc2NlbnQgPSAoY2hpbGQtPm1hcmdpblRvcCgpICsgY2hpbGQtPmhlaWdodCgpICsgY2hp bGQtPm1hcmdpbkJvdHRvbSgpKSAtIGFzY2VudDsKKyAgICAgICAgICAgICAgICBMYXlvdXRVbml0 IGRlc2NlbnQgPSAoY2hpbGQtPmhlaWdodCgpICsgY2hpbGQtPm1hcmdpbkhlaWdodCgpKSAtIGFz Y2VudDsKIAogICAgICAgICAgICAgICAgIC8vIFVwZGF0ZSBvdXIgbWF4aW11bSBhc2NlbnQuCiAg ICAgICAgICAgICAgICAgbWF4QXNjZW50ID0gbWF4KG1heEFzY2VudCwgYXNjZW50KTsKQEAgLTQw Niw3ICs0MDYsNyBAQCB2b2lkIFJlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveDo6bGF5b3V0SG9y aXpvbnRhbEJveChib29sIHJlbGF5b3V0Q2hpbGRyZW4pCiAgICAgICAgICAgICAgICAgc2V0SGVp Z2h0KG1heCh5UG9zICsgbWF4QXNjZW50ICsgbWF4RGVzY2VudCwgaGVpZ2h0KCkpKTsKICAgICAg ICAgICAgIH0KICAgICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICBzZXRIZWlnaHQobWF4 KGhlaWdodCgpLCB5UG9zICsgY2hpbGQtPm1hcmdpblRvcCgpICsgY2hpbGQtPmhlaWdodCgpICsg Y2hpbGQtPm1hcmdpbkJvdHRvbSgpKSk7CisgICAgICAgICAgICAgICAgc2V0SGVpZ2h0KG1heCho ZWlnaHQoKSwgeVBvcyArIGNoaWxkLT5oZWlnaHQoKSArIGNoaWxkLT5tYXJnaW5IZWlnaHQoKSkp OwogICAgICAgICB9CiAKICAgICAgICAgaWYgKCFpdGVyYXRvci5maXJzdCgpICYmIGhhc0xpbmVJ ZkVtcHR5KCkpCkBAIC00NjAsNyArNDYwLDcgQEAgdm9pZCBSZW5kZXJEZXByZWNhdGVkRmxleGli bGVCb3g6OmxheW91dEhvcml6b250YWxCb3goYm9vbCByZWxheW91dENoaWxkcmVuKQogICAgICAg ICAgICAgTGF5b3V0VW5pdCBjaGlsZFkgPSB5UG9zOwogICAgICAgICAgICAgc3dpdGNoIChzdHls ZSgpLT5ib3hBbGlnbigpKSB7CiAgICAgICAgICAgICAgICAgY2FzZSBCQ0VOVEVSOgotICAgICAg ICAgICAgICAgICAgICBjaGlsZFkgKz0gY2hpbGQtPm1hcmdpblRvcCgpICsgbWF4PExheW91dFVu aXQ+KDAsIChjb250ZW50SGVpZ2h0KCkgLSAoY2hpbGQtPmhlaWdodCgpICsgY2hpbGQtPm1hcmdp blRvcCgpICsgY2hpbGQtPm1hcmdpbkJvdHRvbSgpKSkgLyAyKTsKKyAgICAgICAgICAgICAgICAg ICAgY2hpbGRZICs9IGNoaWxkLT5tYXJnaW5Ub3AoKSArIG1heDxMYXlvdXRVbml0PigwLCAoY29u dGVudEhlaWdodCgpIC0gKGNoaWxkLT5oZWlnaHQoKSArIGNoaWxkLT5tYXJnaW5IZWlnaHQoKSkp IC8gMik7CiAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgICAgIGNhc2Ug QkJBU0VMSU5FOiB7CiAgICAgICAgICAgICAgICAgICAgIExheW91dFVuaXQgYXNjZW50ID0gY2hp bGQtPmZpcnN0TGluZUJveEJhc2VsaW5lKCk7CkBAIC02OTksNyArNjk5LDcgQEAgdm9pZCBSZW5k ZXJEZXByZWNhdGVkRmxleGlibGVCb3g6OmxheW91dFZlcnRpY2FsQm94KGJvb2wgcmVsYXlvdXRD aGlsZHJlbikKICAgICAgICAgICAgIHN3aXRjaCAoc3R5bGUoKS0+Ym94QWxpZ24oKSkgewogICAg ICAgICAgICAgICAgIGNhc2UgQkNFTlRFUjoKICAgICAgICAgICAgICAgICBjYXNlIEJCQVNFTElO RTogLy8gQmFzZWxpbmUganVzdCBtYXBzIHRvIGNlbnRlciBmb3IgdmVydGljYWwgYm94ZXMKLSAg ICAgICAgICAgICAgICAgICAgY2hpbGRYICs9IGNoaWxkLT5tYXJnaW5MZWZ0KCkgKyBtYXg8TGF5 b3V0VW5pdD4oMCwgKGNvbnRlbnRXaWR0aCgpIC0gKGNoaWxkLT53aWR0aCgpICsgY2hpbGQtPm1h cmdpbkxlZnQoKSArIGNoaWxkLT5tYXJnaW5SaWdodCgpKSkgLyAyKTsKKyAgICAgICAgICAgICAg ICAgICAgY2hpbGRYICs9IGNoaWxkLT5tYXJnaW5MZWZ0KCkgKyBtYXg8TGF5b3V0VW5pdD4oMCwg KGNvbnRlbnRXaWR0aCgpIC0gKGNoaWxkLT53aWR0aCgpICsgY2hpbGQtPm1hcmdpbldpZHRoKCkp KSAvIDIpOwogICAgICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgICAgICBjYXNl IEJFTkQ6CiAgICAgICAgICAgICAgICAgICAgIGlmICghc3R5bGUoKS0+aXNMZWZ0VG9SaWdodERp cmVjdGlvbigpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZs ZXhpYmxlQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJv eC5jcHAKaW5kZXggMmMyZDgzMGVkMDIzMWZiMTE2ZmJjY2JmYTcyZDlkMDVhNDBhMjZlYy4uMDVm NzBkYjExYWU1ZjNiMmFhODRjMzUyYzllZmIyOGRhMmQ2N2JhNiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCkBAIC00OTIsNyArNDkyLDcgQEAg TGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6Zmxvd0F3YXJlTWFyZ2luQWZ0ZXJGb3JDaGls ZChSZW5kZXJCb3gqIGNoaWxkKSBjb24KIAogTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6 Y3Jvc3NBeGlzTWFyZ2luRXh0ZW50Rm9yQ2hpbGQoUmVuZGVyQm94KiBjaGlsZCkgY29uc3QKIHsK LSAgICByZXR1cm4gaXNIb3Jpem9udGFsRmxvdygpID8gY2hpbGQtPm1hcmdpblRvcCgpICsgY2hp bGQtPm1hcmdpbkJvdHRvbSgpIDogY2hpbGQtPm1hcmdpbkxlZnQoKSArIGNoaWxkLT5tYXJnaW5S aWdodCgpOworICAgIHJldHVybiBpc0hvcml6b250YWxGbG93KCkgPyBjaGlsZC0+bWFyZ2luSGVp Z2h0KCkgOiBjaGlsZC0+bWFyZ2luV2lkdGgoKTsKIH0KIAogTGF5b3V0VW5pdCBSZW5kZXJGbGV4 aWJsZUJveDo6Y3Jvc3NBeGlzU2Nyb2xsYmFyRXh0ZW50KCkgY29uc3QKQEAgLTYzMiw5ICs2MzIs OSBAQCBib29sIFJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlTmV4dEZsZXhMaW5lKEZsZXhPcmRl ckl0ZXJhdG9yJiBpdGVyYXRvciwgT3JkZXJlZAogCiAgICAgICAgIExheW91dFVuaXQgY2hpbGRN YWluQXhpc0V4dGVudCA9IG1haW5BeGlzQm9yZGVyQW5kUGFkZGluZ0V4dGVudEZvckNoaWxkKGNo aWxkKSArIHByZWZlcnJlZE1haW5BeGlzQ29udGVudEV4dGVudEZvckNoaWxkKGNoaWxkKTsKICAg ICAgICAgaWYgKGlzSG9yaXpvbnRhbEZsb3coKSkKLSAgICAgICAgICAgIGNoaWxkTWFpbkF4aXNF eHRlbnQgKz0gY2hpbGQtPm1hcmdpbkxlZnQoKSArIGNoaWxkLT5tYXJnaW5SaWdodCgpOworICAg ICAgICAgICAgY2hpbGRNYWluQXhpc0V4dGVudCArPSBjaGlsZC0+bWFyZ2luV2lkdGgoKTsKICAg ICAgICAgZWxzZQotICAgICAgICAgICAgY2hpbGRNYWluQXhpc0V4dGVudCArPSBjaGlsZC0+bWFy Z2luVG9wKCkgKyBjaGlsZC0+bWFyZ2luQm90dG9tKCk7CisgICAgICAgICAgICBjaGlsZE1haW5B eGlzRXh0ZW50ICs9IGNoaWxkLT5tYXJnaW5IZWlnaHQoKTsKIAogICAgICAgICBpZiAoaXNNdWx0 aWxpbmUoKSAmJiBwcmVmZXJyZWRNYWluQXhpc0V4dGVudCArIGNoaWxkTWFpbkF4aXNFeHRlbnQg PiBtYWluQXhpc0NvbnRlbnRFeHRlbnQoKSAmJiBvcmRlcmVkQ2hpbGRyZW4uc2l6ZSgpID4gMCkK ICAgICAgICAgICAgIGJyZWFrOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlcklubGluZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5l LmNwcAppbmRleCBlNzliNmQzYzhjY2VmNzBlMmNmNDZhMTQ1M2RkZTEzYzQ2NWYzYmMwLi5hNWQ1 ODI0MzYyMzZiNDQ2YmVjZjZmZGIwYWMxZWJlZTZlN2NiZDA1IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW5saW5lLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVySW5saW5lLmNwcApAQCAtNTQ4LDkgKzU0OCw5IEBAIHZvaWQgUmVuZGVy SW5saW5lOjpjdWxsZWRJbmxpbmVBYnNvbHV0ZVJlY3RzKGNvbnN0IFJlbmRlcklubGluZSogY29u dGFpbmVyLCBWZWN0CiAgICAgICAgICAgICAgICAgaW50IGxvZ2ljYWxIZWlnaHQgPSBjb250YWlu ZXItPnN0eWxlKHJvb3RCb3gtPmlzRmlyc3RMaW5lU3R5bGUoKSktPmZvbnQoKS5mb250TWV0cmlj cygpLmhlaWdodCgpOwogICAgICAgICAgICAgICAgIEZsb2F0UmVjdCByZXN1bHQ7CiAgICAgICAg ICAgICAgICAgaWYgKGlzSG9yaXpvbnRhbCkKLSAgICAgICAgICAgICAgICAgICAgcmVzdWx0ID0g RmxvYXRSZWN0KG9mZnNldC53aWR0aCgpICsgY3VyckJveC0+aW5saW5lQm94V3JhcHBlcigpLT54 KCkgLSBjdXJyQm94LT5tYXJnaW5MZWZ0KCksIG9mZnNldC5oZWlnaHQoKSArIGxvZ2ljYWxUb3As IGN1cnJCb3gtPndpZHRoKCkgKyBjdXJyQm94LT5tYXJnaW5MZWZ0KCkgKyBjdXJyQm94LT5tYXJn aW5SaWdodCgpLCBsb2dpY2FsSGVpZ2h0KTsKKyAgICAgICAgICAgICAgICAgICAgcmVzdWx0ID0g RmxvYXRSZWN0KG9mZnNldC53aWR0aCgpICsgY3VyckJveC0+aW5saW5lQm94V3JhcHBlcigpLT54 KCkgLSBjdXJyQm94LT5tYXJnaW5MZWZ0KCksIG9mZnNldC5oZWlnaHQoKSArIGxvZ2ljYWxUb3As IGN1cnJCb3gtPndpZHRoKCkgKyBjdXJyQm94LT5tYXJnaW5XaWR0aCgpLCBsb2dpY2FsSGVpZ2h0 KTsKICAgICAgICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgICAgIHJlc3VsdCA9IEZs b2F0UmVjdChvZmZzZXQud2lkdGgoKSArIGxvZ2ljYWxUb3AsIG9mZnNldC5oZWlnaHQoKSArIGN1 cnJCb3gtPmlubGluZUJveFdyYXBwZXIoKS0+eSgpIC0gY3VyckJveC0+bWFyZ2luVG9wKCksIGxv Z2ljYWxIZWlnaHQsIGN1cnJCb3gtPmhlaWdodCgpICsgY3VyckJveC0+bWFyZ2luVG9wKCkgKyBj dXJyQm94LT5tYXJnaW5Cb3R0b20oKSk7CisgICAgICAgICAgICAgICAgICAgIHJlc3VsdCA9IEZs b2F0UmVjdChvZmZzZXQud2lkdGgoKSArIGxvZ2ljYWxUb3AsIG9mZnNldC5oZWlnaHQoKSArIGN1 cnJCb3gtPmlubGluZUJveFdyYXBwZXIoKS0+eSgpIC0gY3VyckJveC0+bWFyZ2luVG9wKCksIGxv Z2ljYWxIZWlnaHQsIGN1cnJCb3gtPmhlaWdodCgpICsgY3VyckJveC0+bWFyZ2luSGVpZ2h0KCkp OwogICAgICAgICAgICAgICAgIHJlY3RzLmFwcGVuZChlbmNsb3NpbmdJbnRSZWN0KHJlc3VsdCkp OwogICAgICAgICAgICAgfQogICAgICAgICB9IGVsc2UgaWYgKGN1cnItPmlzUmVuZGVySW5saW5l KCkpIHsKQEAgLTYzMiw5ICs2MzIsOSBAQCB2b2lkIFJlbmRlcklubGluZTo6Y3VsbGVkSW5saW5l QWJzb2x1dGVRdWFkcyhjb25zdCBSZW5kZXJJbmxpbmUqIGNvbnRhaW5lciwgVmVjdAogICAgICAg ICAgICAgICAgIGludCBsb2dpY2FsSGVpZ2h0ID0gY29udGFpbmVyLT5zdHlsZShyb290Qm94LT5p c0ZpcnN0TGluZVN0eWxlKCkpLT5mb250KCkuZm9udE1ldHJpY3MoKS5oZWlnaHQoKTsKICAgICAg ICAgICAgICAgICBGbG9hdFJlY3QgcmVzdWx0OwogICAgICAgICAgICAgICAgIGlmIChpc0hvcml6 b250YWwpCi0gICAgICAgICAgICAgICAgICAgIHJlc3VsdCA9IEZsb2F0UmVjdChjdXJyQm94LT5p bmxpbmVCb3hXcmFwcGVyKCktPngoKSAtIGN1cnJCb3gtPm1hcmdpbkxlZnQoKSwgbG9naWNhbFRv cCwgY3VyckJveC0+d2lkdGgoKSArIGN1cnJCb3gtPm1hcmdpbkxlZnQoKSArIGN1cnJCb3gtPm1h cmdpblJpZ2h0KCksIGxvZ2ljYWxIZWlnaHQpOworICAgICAgICAgICAgICAgICAgICByZXN1bHQg PSBGbG9hdFJlY3QoY3VyckJveC0+aW5saW5lQm94V3JhcHBlcigpLT54KCkgLSBjdXJyQm94LT5t YXJnaW5MZWZ0KCksIGxvZ2ljYWxUb3AsIGN1cnJCb3gtPndpZHRoKCkgKyBjdXJyQm94LT5tYXJn aW5XaWR0aCgpLCBsb2dpY2FsSGVpZ2h0KTsKICAgICAgICAgICAgICAgICBlbHNlCi0gICAgICAg ICAgICAgICAgICAgIHJlc3VsdCA9IEZsb2F0UmVjdChsb2dpY2FsVG9wLCBjdXJyQm94LT5pbmxp bmVCb3hXcmFwcGVyKCktPnkoKSAtIGN1cnJCb3gtPm1hcmdpblRvcCgpLCBsb2dpY2FsSGVpZ2h0 LCBjdXJyQm94LT5oZWlnaHQoKSArIGN1cnJCb3gtPm1hcmdpblRvcCgpICsgY3VyckJveC0+bWFy Z2luQm90dG9tKCkpOworICAgICAgICAgICAgICAgICAgICByZXN1bHQgPSBGbG9hdFJlY3QobG9n aWNhbFRvcCwgY3VyckJveC0+aW5saW5lQm94V3JhcHBlcigpLT55KCkgLSBjdXJyQm94LT5tYXJn aW5Ub3AoKSwgbG9naWNhbEhlaWdodCwgY3VyckJveC0+aGVpZ2h0KCkgKyBjdXJyQm94LT5tYXJn aW5IZWlnaHQoKSk7CiAgICAgICAgICAgICAgICAgcXVhZHMuYXBwZW5kKGxvY2FsVG9BYnNvbHV0 ZVF1YWQocmVzdWx0KSk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0gZWxzZSBpZiAoY3Vyci0+ aXNSZW5kZXJJbmxpbmUoKSkgewpAQCAtODM4LDkgKzgzOCw5IEBAIEZsb2F0UmVjdCBSZW5kZXJJ bmxpbmU6OmN1bGxlZElubGluZUJvdW5kaW5nQm94KGNvbnN0IFJlbmRlcklubGluZSogY29udGFp bmVyKSBjCiAgICAgICAgICAgICAgICAgaW50IGxvZ2ljYWxUb3AgPSByb290Qm94LT5sb2dpY2Fs VG9wKCkgKyAocm9vdEJveC0+cmVuZGVyZXIoKS0+c3R5bGUocm9vdEJveC0+aXNGaXJzdExpbmVT dHlsZSgpKS0+Zm9udCgpLmZvbnRNZXRyaWNzKCkuYXNjZW50KCkgLSBjb250YWluZXItPnN0eWxl KHJvb3RCb3gtPmlzRmlyc3RMaW5lU3R5bGUoKSktPmZvbnQoKS5mb250TWV0cmljcygpLmFzY2Vu dCgpKTsKICAgICAgICAgICAgICAgICBpbnQgbG9naWNhbEhlaWdodCA9IGNvbnRhaW5lci0+c3R5 bGUocm9vdEJveC0+aXNGaXJzdExpbmVTdHlsZSgpKS0+Zm9udCgpLmZvbnRNZXRyaWNzKCkuaGVp Z2h0KCk7CiAgICAgICAgICAgICAgICAgaWYgKGlzSG9yaXpvbnRhbCkKLSAgICAgICAgICAgICAg ICAgICAgcmVzdWx0LnVuaXRlSWZOb25aZXJvKEZsb2F0UmVjdChjdXJyQm94LT5pbmxpbmVCb3hX cmFwcGVyKCktPngoKSAtIGN1cnJCb3gtPm1hcmdpbkxlZnQoKSwgbG9naWNhbFRvcCwgY3VyckJv eC0+d2lkdGgoKSArIGN1cnJCb3gtPm1hcmdpbkxlZnQoKSArIGN1cnJCb3gtPm1hcmdpblJpZ2h0 KCksIGxvZ2ljYWxIZWlnaHQpKTsKKyAgICAgICAgICAgICAgICAgICAgcmVzdWx0LnVuaXRlSWZO b25aZXJvKEZsb2F0UmVjdChjdXJyQm94LT5pbmxpbmVCb3hXcmFwcGVyKCktPngoKSAtIGN1cnJC b3gtPm1hcmdpbkxlZnQoKSwgbG9naWNhbFRvcCwgY3VyckJveC0+d2lkdGgoKSArIGN1cnJCb3gt Pm1hcmdpbldpZHRoKCksIGxvZ2ljYWxIZWlnaHQpKTsKICAgICAgICAgICAgICAgICBlbHNlCi0g ICAgICAgICAgICAgICAgICAgIHJlc3VsdC51bml0ZUlmTm9uWmVybyhGbG9hdFJlY3QobG9naWNh bFRvcCwgY3VyckJveC0+aW5saW5lQm94V3JhcHBlcigpLT55KCkgLSBjdXJyQm94LT5tYXJnaW5U b3AoKSwgbG9naWNhbEhlaWdodCwgY3VyckJveC0+aGVpZ2h0KCkgKyBjdXJyQm94LT5tYXJnaW5U b3AoKSArIGN1cnJCb3gtPm1hcmdpbkJvdHRvbSgpKSk7CisgICAgICAgICAgICAgICAgICAgIHJl c3VsdC51bml0ZUlmTm9uWmVybyhGbG9hdFJlY3QobG9naWNhbFRvcCwgY3VyckJveC0+aW5saW5l Qm94V3JhcHBlcigpLT55KCkgLSBjdXJyQm94LT5tYXJnaW5Ub3AoKSwgbG9naWNhbEhlaWdodCwg Y3VyckJveC0+aGVpZ2h0KCkgKyBjdXJyQm94LT5tYXJnaW5IZWlnaHQoKSkpOwogICAgICAgICAg ICAgfQogICAgICAgICB9IGVsc2UgaWYgKGN1cnItPmlzUmVuZGVySW5saW5lKCkpIHsKICAgICAg ICAgICAgIC8vIElmIHRoZSBjaGlsZCBkb2Vzbid0IG5lZWQgbGluZSBib3hlcyBlaXRoZXIsIHRo ZW4gd2UgY2FuIHJlY3VyLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlclNjcm9sbGJhci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyU2Nyb2xs YmFyLmNwcAppbmRleCAzYmU3NjVmMDY0YzY3NjljNDMwY2RmNTFkNGI0MzU3MWY1MTdlMGFjLi42 ZjZmZDUzZWE4ZWE5ZWNiMjNlODBmZGMwMjVlZWNmMDQ3MWIyY2JkIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyU2Nyb2xsYmFyLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyU2Nyb2xsYmFyLmNwcApAQCAtMzU1LDEwICszNTUsMTAgQEAg SW50UmVjdCBSZW5kZXJTY3JvbGxiYXI6OnRyYWNrUGllY2VSZWN0V2l0aE1hcmdpbnMoU2Nyb2xs YmFyUGFydCBwYXJ0VHlwZSwgY29uc3QKICAgICBJbnRSZWN0IHJlY3QgPSBvbGRSZWN0OwogICAg IGlmIChvcmllbnRhdGlvbigpID09IEhvcml6b250YWxTY3JvbGxiYXIpIHsKICAgICAgICAgcmVj dC5zZXRYKHJlY3QueCgpICsgcGFydFJlbmRlcmVyLT5tYXJnaW5MZWZ0KCkpOwotICAgICAgICBy ZWN0LnNldFdpZHRoKHJlY3Qud2lkdGgoKSAtIChwYXJ0UmVuZGVyZXItPm1hcmdpbkxlZnQoKSAr IHBhcnRSZW5kZXJlci0+bWFyZ2luUmlnaHQoKSkpOworICAgICAgICByZWN0LnNldFdpZHRoKHJl Y3Qud2lkdGgoKSAtIHBhcnRSZW5kZXJlci0+bWFyZ2luV2lkdGgoKSk7CiAgICAgfSBlbHNlIHsK ICAgICAgICAgcmVjdC5zZXRZKHJlY3QueSgpICsgcGFydFJlbmRlcmVyLT5tYXJnaW5Ub3AoKSk7 Ci0gICAgICAgIHJlY3Quc2V0SGVpZ2h0KHJlY3QuaGVpZ2h0KCkgLSAocGFydFJlbmRlcmVyLT5t YXJnaW5Ub3AoKSArIHBhcnRSZW5kZXJlci0+bWFyZ2luQm90dG9tKCkpKTsKKyAgICAgICAgcmVj dC5zZXRIZWlnaHQocmVjdC5oZWlnaHQoKSAtIHBhcnRSZW5kZXJlci0+bWFyZ2luSGVpZ2h0KCkp OwogICAgIH0KICAgICByZXR1cm4gcmVjdDsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJUZXh0Q29udHJvbC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyVGV4dENvbnRyb2wuY3BwCmluZGV4IDdiNDgwN2I2NmE5MTVkZjhlZDdjM2ViN2Y1 MDUyZDdiYmM4YzIxZDEuLjNmMmI0NWFiMjc1YjcwN2E2YzNmZDBkYTU2MjdhYzdmNGI1ZDYyZDYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0Q29udHJvbC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9sLmNwcApA QCAtMTQzLDcgKzE0Myw3IEBAIHZvaWQgUmVuZGVyVGV4dENvbnRyb2w6OmNvbXB1dGVMb2dpY2Fs SGVpZ2h0KCkKICAgICBIVE1MRWxlbWVudCogaW5uZXJUZXh0ID0gaW5uZXJUZXh0RWxlbWVudCgp OwogICAgIEFTU0VSVChpbm5lclRleHQpOwogICAgIFJlbmRlckJveCogaW5uZXJUZXh0Qm94ID0g aW5uZXJUZXh0LT5yZW5kZXJCb3goKTsKLSAgICBMYXlvdXRVbml0IG5vbkNvbnRlbnRIZWlnaHQg PSBpbm5lclRleHRCb3gtPmJvcmRlckFuZFBhZGRpbmdIZWlnaHQoKSArIGlubmVyVGV4dEJveC0+ bWFyZ2luVG9wKCkgKyBpbm5lclRleHRCb3gtPm1hcmdpbkJvdHRvbSgpOworICAgIExheW91dFVu aXQgbm9uQ29udGVudEhlaWdodCA9IGlubmVyVGV4dEJveC0+Ym9yZGVyQW5kUGFkZGluZ0hlaWdo dCgpICsgaW5uZXJUZXh0Qm94LT5tYXJnaW5IZWlnaHQoKTsKICAgICBzZXRIZWlnaHQoY29tcHV0 ZUNvbnRyb2xIZWlnaHQoaW5uZXJUZXh0Qm94LT5saW5lSGVpZ2h0KHRydWUsIEhvcml6b250YWxM aW5lLCBQb3NpdGlvbk9mSW50ZXJpb3JMaW5lQm94ZXMpLCBub25Db250ZW50SGVpZ2h0KSArIGJv cmRlckFuZFBhZGRpbmdIZWlnaHQoKSk7CiAKICAgICAvLyBXZSBhcmUgYWJsZSB0byBoYXZlIGEg aG9yaXpvbnRhbCBzY3JvbGxiYXIgaWYgdGhlIG92ZXJmbG93IHN0eWxlIGlzIHNjcm9sbCwgb3Ig aWYgaXRzIGF1dG8gYW5kIHRoZXJlJ3Mgbm8gd29yZCB3cmFwLgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9sU2luZ2xlTGluZS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5lLmNwcAppbmRl eCAxNmNhMWVkMzg4NWYzYjY1Mzg5YjVkMThlM2UyM2FiZDU4MmNiZGViLi4wZWQ0ZWM4YzUzYjY0 ODhiMzExMTlmM2MzMTE5ZjUzZmQ5MzU2NzQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5lLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5lLmNwcApAQCAtNDU0LDEz ICs0NTQsMTMgQEAgTGF5b3V0VW5pdCBSZW5kZXJUZXh0Q29udHJvbFNpbmdsZUxpbmU6OmNvbXB1 dGVDb250cm9sSGVpZ2h0KExheW91dFVuaXQgbGluZUhlaWcKICAgICBIVE1MRWxlbWVudCogcmVz dWx0c0J1dHRvbiA9IHJlc3VsdHNCdXR0b25FbGVtZW50KCk7CiAgICAgaWYgKFJlbmRlckJveCog cmVzdWx0c1JlbmRlcmVyID0gcmVzdWx0c0J1dHRvbiA/IHJlc3VsdHNCdXR0b24tPnJlbmRlckJv eCgpIDogMCkgewogICAgICAgICByZXN1bHRzUmVuZGVyZXItPmNvbXB1dGVMb2dpY2FsSGVpZ2h0 KCk7Ci0gICAgICAgIG5vbkNvbnRlbnRIZWlnaHQgPSBtYXgobm9uQ29udGVudEhlaWdodCwgcmVz dWx0c1JlbmRlcmVyLT5ib3JkZXJBbmRQYWRkaW5nSGVpZ2h0KCkgKyByZXN1bHRzUmVuZGVyZXIt Pm1hcmdpblRvcCgpICsgcmVzdWx0c1JlbmRlcmVyLT5tYXJnaW5Cb3R0b20oKSk7CisgICAgICAg IG5vbkNvbnRlbnRIZWlnaHQgPSBtYXgobm9uQ29udGVudEhlaWdodCwgcmVzdWx0c1JlbmRlcmVy LT5ib3JkZXJBbmRQYWRkaW5nSGVpZ2h0KCkgKyByZXN1bHRzUmVuZGVyZXItPm1hcmdpbkhlaWdo dCgpKTsKICAgICAgICAgbGluZUhlaWdodCA9IG1heChsaW5lSGVpZ2h0LCByZXN1bHRzUmVuZGVy ZXItPmhlaWdodCgpKTsKICAgICB9CiAgICAgSFRNTEVsZW1lbnQqIGNhbmNlbEJ1dHRvbiA9IGNh bmNlbEJ1dHRvbkVsZW1lbnQoKTsKICAgICBpZiAoUmVuZGVyQm94KiBjYW5jZWxSZW5kZXJlciA9 IGNhbmNlbEJ1dHRvbiA/IGNhbmNlbEJ1dHRvbi0+cmVuZGVyQm94KCkgOiAwKSB7CiAgICAgICAg IGNhbmNlbFJlbmRlcmVyLT5jb21wdXRlTG9naWNhbEhlaWdodCgpOwotICAgICAgICBub25Db250 ZW50SGVpZ2h0ID0gbWF4KG5vbkNvbnRlbnRIZWlnaHQsIGNhbmNlbFJlbmRlcmVyLT5ib3JkZXJB bmRQYWRkaW5nSGVpZ2h0KCkgKyBjYW5jZWxSZW5kZXJlci0+bWFyZ2luVG9wKCkgKyBjYW5jZWxS ZW5kZXJlci0+bWFyZ2luQm90dG9tKCkpOworICAgICAgICBub25Db250ZW50SGVpZ2h0ID0gbWF4 KG5vbkNvbnRlbnRIZWlnaHQsIGNhbmNlbFJlbmRlcmVyLT5ib3JkZXJBbmRQYWRkaW5nSGVpZ2h0 KCkgKyBjYW5jZWxSZW5kZXJlci0+bWFyZ2luSGVpZ2h0KCkpOwogICAgICAgICBsaW5lSGVpZ2h0 ID0gbWF4KGxpbmVIZWlnaHQsIGNhbmNlbFJlbmRlcmVyLT5oZWlnaHQoKSk7CiAgICAgfQogCg==