89669 2012-06-21 09:31:01 -0700 Rename CSS Exclusions CSSWrapShape class properties to match Exclusion shape function parameters 2012-07-17 09:55:15 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 89671 1 giles_joplin giles_joplin cmarcelo eric macpherson menard webkit.review.bot oldest_to_newest 654594 0 giles_joplin 2012-06-21 09:31:01 -0700 The names of a few of the CSSWrapShape class properties are inconsistent with the corresponding CSS shape function parameters: CSSWrapShapeRectangle - left,top should be x, y CSSWrapShapeCircle - left,top should be centerX, centerY CSSWrapShapeEllipse - left,top should be centerX, centerY To precisely match the specification, radiusX,Y should be rx,y and centerX,Y should be cx,y. This change doesn't seem helpful. 671286 1 152767 giles_joplin 2012-07-17 08:14:00 -0700 Created attachment 152767 Patch 671288 2 152767 krit 2012-07-17 08:21:51 -0700 Comment on attachment 152767 Patch LGTM. r+ 671335 3 152767 webkit.review.bot 2012-07-17 09:55:10 -0700 Comment on attachment 152767 Patch Clearing flags on attachment: 152767 Committed r122848: <http://trac.webkit.org/changeset/122848> 671336 4 webkit.review.bot 2012-07-17 09:55:15 -0700 All reviewed patches have been landed. Closing bug. 152767 2012-07-17 08:14:00 -0700 2012-07-17 09:55:10 -0700 Patch bug-89669-20120717081415.patch text/plain 19271 giles_joplin U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyNzc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2M3NjcxYWQ5YmYyY2Fl Njg3OGVmZWZiMTk0ZWU1NzQ3NWI2OTgwNy4uM2JiMzA3NmQ4ZGE5YjA5MjgwYjYwZGVjYjI0Mzgz N2QzN2QxMjkwMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDYzIEBACisyMDEyLTA3LTE3ICBIYW5z IE11bGxlciAgPGhtdWxsZXJAYWRvYmUuY29tPgorCisgICAgICAgIFJlbmFtZSBDU1MgRXhjbHVz aW9ucyBDU1NXcmFwU2hhcGUgY2xhc3MgcHJvcGVydGllcyB0byBtYXRjaCBFeGNsdXNpb24gc2hh cGUgZnVuY3Rpb24gcGFyYW1ldGVycworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9ODk2NjkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBSZW5hbWVkIGxlZnQsdG9wIHByb3BlcnRpZXMgaW4gdGhlIGV4Y2x1c2lv biBzaGFwZSB0eXBlcyB0byBiZXR0ZXIgbWF0Y2ggdGhlIHNwZWNpZmljYXRpb24KKyAgICAgICAg aHR0cDovL2Rldi53My5vcmcvY3Nzd2cvY3NzMy1leGNsdXNpb25zLyNzaGFwZXMtZnJvbS1zdmct c3ludGF4OgorCisgICAgICAgIFdyYXBTaGFwZVJlY3RhbmdsZSwgQ1NTV3JhcFNoYXBlUmVjdGFu Z2xlIC0gbGVmdCx0b3Agc2hvdWxkIGJlIHgsIHkKKyAgICAgICAgV3JhcFNoYXBlQ2lyY2xlLCBD U1NXcmFwU2hhcGVDaXJjbGUgLSBsZWZ0LHRvcCBzaG91bGQgYmUgY2VudGVyWCwgY2VudGVyWQor ICAgICAgICBXcmFwU2hhcGVFbGxpcHNlLCBDU1NXcmFwU2hhcGVFbGxpcHNlIC0gbGVmdCx0b3Ag c2hvdWxkIGJlIGNlbnRlclgsIGNlbnRlclkKKworICAgICAgICBObyBuZXcgdGVzdHMgb3IgdGVz dHMgcmV2aXNpb25zIHdlcmUgbmVlZGVkLCB0aGUgZXhpc3RpbmcgdGVzdHMgY292ZXIgdGhlc2Ug QVBJcy4KKworICAgICAgICAqIGNzcy9DU1NQYXJzZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 Q1NTUGFyc2VyOjpwYXJzZUV4Y2x1c2lvblNoYXBlUmVjdGFuZ2xlKToKKyAgICAgICAgKFdlYkNv cmU6OkNTU1BhcnNlcjo6cGFyc2VFeGNsdXNpb25TaGFwZUNpcmNsZSk6CisgICAgICAgIChXZWJD b3JlOjpDU1NQYXJzZXI6OnBhcnNlRXhjbHVzaW9uU2hhcGVFbGxpcHNlKToKKyAgICAgICAgKiBj c3MvQ1NTV3JhcFNoYXBlcy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDU1NXcmFwU2hhcGVSZWN0 YW5nbGU6OmNzc1RleHQpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTV3JhcFNoYXBlQ2lyY2xlOjpj c3NUZXh0KToKKyAgICAgICAgKFdlYkNvcmU6OkNTU1dyYXBTaGFwZUVsbGlwc2U6OmNzc1RleHQp OgorICAgICAgICAqIGNzcy9DU1NXcmFwU2hhcGVzLmg6CisgICAgICAgIChXZWJDb3JlOjpDU1NX cmFwU2hhcGVSZWN0YW5nbGU6OngpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTV3JhcFNoYXBlUmVj dGFuZ2xlOjp5KToKKyAgICAgICAgKFdlYkNvcmU6OkNTU1dyYXBTaGFwZVJlY3RhbmdsZTo6c2V0 WCk6CisgICAgICAgIChXZWJDb3JlOjpDU1NXcmFwU2hhcGVSZWN0YW5nbGU6OnNldFkpOgorICAg ICAgICAoQ1NTV3JhcFNoYXBlUmVjdGFuZ2xlKToKKyAgICAgICAgKFdlYkNvcmU6OkNTU1dyYXBT aGFwZUNpcmNsZTo6Y2VudGVyWCk6CisgICAgICAgIChXZWJDb3JlOjpDU1NXcmFwU2hhcGVDaXJj bGU6OmNlbnRlclkpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTV3JhcFNoYXBlQ2lyY2xlOjpzZXRD ZW50ZXJYKToKKyAgICAgICAgKFdlYkNvcmU6OkNTU1dyYXBTaGFwZUNpcmNsZTo6c2V0Q2VudGVy WSk6CisgICAgICAgIChDU1NXcmFwU2hhcGVDaXJjbGUpOgorICAgICAgICAoV2ViQ29yZTo6Q1NT V3JhcFNoYXBlRWxsaXBzZTo6Y2VudGVyWCk6CisgICAgICAgIChXZWJDb3JlOjpDU1NXcmFwU2hh cGVFbGxpcHNlOjpjZW50ZXJZKToKKyAgICAgICAgKFdlYkNvcmU6OkNTU1dyYXBTaGFwZUVsbGlw c2U6OnNldENlbnRlclgpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTV3JhcFNoYXBlRWxsaXBzZTo6 c2V0Q2VudGVyWSk6CisgICAgICAgIChDU1NXcmFwU2hhcGVFbGxpcHNlKToKKyAgICAgICAgKiBj c3MvV3JhcFNoYXBlRnVuY3Rpb25zLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnZhbHVlRm9yV3Jh cFNoYXBlKToKKyAgICAgICAgKFdlYkNvcmU6OndyYXBTaGFwZUZvclZhbHVlKToKKyAgICAgICAg KiByZW5kZXJpbmcvc3R5bGUvV3JhcFNoYXBlcy5oOgorICAgICAgICAoV2ViQ29yZTo6V3JhcFNo YXBlUmVjdGFuZ2xlOjp4KToKKyAgICAgICAgKFdlYkNvcmU6OldyYXBTaGFwZVJlY3RhbmdsZTo6 eSk6CisgICAgICAgIChXZWJDb3JlOjpXcmFwU2hhcGVSZWN0YW5nbGU6OnNldFgpOgorICAgICAg ICAoV2ViQ29yZTo6V3JhcFNoYXBlUmVjdGFuZ2xlOjpzZXRZKToKKyAgICAgICAgKFdyYXBTaGFw ZVJlY3RhbmdsZSk6CisgICAgICAgIChXZWJDb3JlOjpXcmFwU2hhcGVDaXJjbGU6OmNlbnRlclgp OgorICAgICAgICAoV2ViQ29yZTo6V3JhcFNoYXBlQ2lyY2xlOjpjZW50ZXJZKToKKyAgICAgICAg KFdlYkNvcmU6OldyYXBTaGFwZUNpcmNsZTo6c2V0Q2VudGVyWCk6CisgICAgICAgIChXZWJDb3Jl OjpXcmFwU2hhcGVDaXJjbGU6OnNldENlbnRlclkpOgorICAgICAgICAoV3JhcFNoYXBlQ2lyY2xl KToKKyAgICAgICAgKFdlYkNvcmU6OldyYXBTaGFwZUVsbGlwc2U6OmNlbnRlclgpOgorICAgICAg ICAoV2ViQ29yZTo6V3JhcFNoYXBlRWxsaXBzZTo6Y2VudGVyWSk6CisgICAgICAgIChXZWJDb3Jl OjpXcmFwU2hhcGVFbGxpcHNlOjpzZXRDZW50ZXJYKToKKyAgICAgICAgKFdlYkNvcmU6OldyYXBT aGFwZUVsbGlwc2U6OnNldENlbnRlclkpOgorICAgICAgICAoV3JhcFNoYXBlRWxsaXBzZSk6CisK IDIwMTItMDctMTYgIEJlYXIgVHJhdmlzICA8YmV0cmF2aXNAYWRvYmUuY29tPgogCiAgICAgICAg IFJlc29sdmUgQ1NTIEV4Y2x1c2lvbnMgc2hhcGVJbnNpZGUsIHNoYXBlT3V0c2lkZSBwcm9wZXJ0 aWVzIHRvIExlbmd0aCBiYXNlZCBXcmFwU2hhcGUgY2xhc3NlcwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvY3NzL0NTU1BhcnNlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUGFyc2Vy LmNwcAppbmRleCBlZWU1M2NjYjZjOGQ1ZGRhYjAxZjBhODRkN2ZjODlmZWZhNTNjY2VlLi5iMWQw MjcwZDc2ODJlMmZhNTM3NWRmY2IzZDI0Mzg2MTM3NGRkZDFiIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUGFy c2VyLmNwcApAQCAtNDQ2NiwxMCArNDQ2NiwxMCBAQCBQYXNzUmVmUHRyPENTU1dyYXBTaGFwZT4g Q1NTUGFyc2VyOjpwYXJzZUV4Y2x1c2lvblNoYXBlUmVjdGFuZ2xlKENTU1BhcnNlclZhbHVlTAog ICAgICAgICBBU1NFUlQoYXJndW1lbnROdW1iZXIgPCA2KTsKICAgICAgICAgc3dpdGNoIChhcmd1 bWVudE51bWJlcikgewogICAgICAgICBjYXNlIDA6Ci0gICAgICAgICAgICBzaGFwZS0+c2V0TGVm dChsZW5ndGgpOworICAgICAgICAgICAgc2hhcGUtPnNldFgobGVuZ3RoKTsKICAgICAgICAgICAg IGJyZWFrOwogICAgICAgICBjYXNlIDE6Ci0gICAgICAgICAgICBzaGFwZS0+c2V0VG9wKGxlbmd0 aCk7CisgICAgICAgICAgICBzaGFwZS0+c2V0WShsZW5ndGgpOwogICAgICAgICAgICAgYnJlYWs7 CiAgICAgICAgIGNhc2UgMjoKICAgICAgICAgICAgIHNoYXBlLT5zZXRXaWR0aChsZW5ndGgpOwpA QCAtNDUwMyw3ICs0NTAzLDcgQEAgUGFzc1JlZlB0cjxDU1NXcmFwU2hhcGU+IENTU1BhcnNlcjo6 cGFyc2VFeGNsdXNpb25TaGFwZUNpcmNsZShDU1NQYXJzZXJWYWx1ZUxpc3QKIHsKICAgICBBU1NF UlQoYXJncyk7CiAKLSAgICAvLyBjaXJjbGUoeCwgeSwgcikKKyAgICAvLyBjaXJjbGUoY2VudGVy WCwgY2VudGVyWSwgcmFkaXVzKQogICAgIGlmIChhcmdzLT5zaXplKCkgIT0gNSkKICAgICAgICAg cmV0dXJuIDA7CiAKQEAgLTQ1MTksMTAgKzQ1MTksMTAgQEAgUGFzc1JlZlB0cjxDU1NXcmFwU2hh cGU+IENTU1BhcnNlcjo6cGFyc2VFeGNsdXNpb25TaGFwZUNpcmNsZShDU1NQYXJzZXJWYWx1ZUxp c3QKICAgICAgICAgQVNTRVJUKGFyZ3VtZW50TnVtYmVyIDwgMyk7CiAgICAgICAgIHN3aXRjaCAo YXJndW1lbnROdW1iZXIpIHsKICAgICAgICAgY2FzZSAwOgotICAgICAgICAgICAgc2hhcGUtPnNl dExlZnQobGVuZ3RoKTsKKyAgICAgICAgICAgIHNoYXBlLT5zZXRDZW50ZXJYKGxlbmd0aCk7CiAg ICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSAxOgotICAgICAgICAgICAgc2hhcGUtPnNl dFRvcChsZW5ndGgpOworICAgICAgICAgICAgc2hhcGUtPnNldENlbnRlclkobGVuZ3RoKTsKICAg ICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIDI6CiAgICAgICAgICAgICBzaGFwZS0+c2V0 UmFkaXVzKGxlbmd0aCk7CkBAIC00NTQ3LDcgKzQ1NDcsNyBAQCBQYXNzUmVmUHRyPENTU1dyYXBT aGFwZT4gQ1NTUGFyc2VyOjpwYXJzZUV4Y2x1c2lvblNoYXBlRWxsaXBzZShDU1NQYXJzZXJWYWx1 ZUxpcwogewogICAgIEFTU0VSVChhcmdzKTsKIAotICAgIC8vIGVsbGlwc2UoeCwgeSwgcngsIHJ5 KQorICAgIC8vIGVsbGlwc2UoY2VudGVyWCwgY2VudGVyWSwgcmFkaXVzWCwgcmFkaXVzWSkKICAg ICBpZiAoYXJncy0+c2l6ZSgpICE9IDcpCiAgICAgICAgIHJldHVybiAwOwogCkBAIC00NTYyLDEw ICs0NTYyLDEwIEBAIFBhc3NSZWZQdHI8Q1NTV3JhcFNoYXBlPiBDU1NQYXJzZXI6OnBhcnNlRXhj bHVzaW9uU2hhcGVFbGxpcHNlKENTU1BhcnNlclZhbHVlTGlzCiAgICAgICAgIEFTU0VSVChhcmd1 bWVudE51bWJlciA8IDQpOwogICAgICAgICBzd2l0Y2ggKGFyZ3VtZW50TnVtYmVyKSB7CiAgICAg ICAgIGNhc2UgMDoKLSAgICAgICAgICAgIHNoYXBlLT5zZXRMZWZ0KGxlbmd0aCk7CisgICAgICAg ICAgICBzaGFwZS0+c2V0Q2VudGVyWChsZW5ndGgpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAg ICAgIGNhc2UgMToKLSAgICAgICAgICAgIHNoYXBlLT5zZXRUb3AobGVuZ3RoKTsKKyAgICAgICAg ICAgIHNoYXBlLT5zZXRDZW50ZXJZKGxlbmd0aCk7CiAgICAgICAgICAgICBicmVhazsKICAgICAg ICAgY2FzZSAyOgogICAgICAgICAgICAgc2hhcGUtPnNldFJhZGl1c1gobGVuZ3RoKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NXcmFwU2hhcGVzLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2Nzcy9DU1NXcmFwU2hhcGVzLmNwcAppbmRleCA0OWViM2I4OGMwZDk2ZTRmMGM0ZjE2MmM3 Y2I5MjEyMTQyYzljMWIxLi4xNmVjYzgwMjEyYmQzZTE5MDI2M2I5Y2Q2MDVmMWI1MDVlMDBiMmIy IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTV3JhcFNoYXBlcy5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvY3NzL0NTU1dyYXBTaGFwZXMuY3BwCkBAIC00NiwxMCArNDYsMTAgQEAg U3RyaW5nIENTU1dyYXBTaGFwZVJlY3RhbmdsZTo6Y3NzVGV4dCgpIGNvbnN0CiAgICAgcmVzdWx0 LnJlc2VydmVDYXBhY2l0eSgzMik7CiAgICAgcmVzdWx0LmFwcGVuZChyZWN0YW5nbGVQYXJlbik7 CiAKLSAgICByZXN1bHQuYXBwZW5kKG1fbGVmdC0+Y3NzVGV4dCgpKTsKKyAgICByZXN1bHQuYXBw ZW5kKG1feC0+Y3NzVGV4dCgpKTsKICAgICByZXN1bHQuYXBwZW5kKGNvbW1hKTsKIAotICAgIHJl c3VsdC5hcHBlbmQobV90b3AtPmNzc1RleHQoKSk7CisgICAgcmVzdWx0LmFwcGVuZChtX3ktPmNz c1RleHQoKSk7CiAgICAgcmVzdWx0LmFwcGVuZChjb21tYSk7CiAKICAgICByZXN1bHQuYXBwZW5k KG1fd2lkdGgtPmNzc1RleHQoKSk7CkBAIC04MSwxMCArODEsMTAgQEAgU3RyaW5nIENTU1dyYXBT aGFwZUNpcmNsZTo6Y3NzVGV4dCgpIGNvbnN0CiAgICAgcmVzdWx0LnJlc2VydmVDYXBhY2l0eSgz Mik7CiAgICAgcmVzdWx0LmFwcGVuZChjaXJjbGVQYXJlbik7CiAKLSAgICByZXN1bHQuYXBwZW5k KG1fbGVmdC0+Y3NzVGV4dCgpKTsKKyAgICByZXN1bHQuYXBwZW5kKG1fY2VudGVyWC0+Y3NzVGV4 dCgpKTsKICAgICByZXN1bHQuYXBwZW5kKGNvbW1hKTsKIAotICAgIHJlc3VsdC5hcHBlbmQobV90 b3AtPmNzc1RleHQoKSk7CisgICAgcmVzdWx0LmFwcGVuZChtX2NlbnRlclktPmNzc1RleHQoKSk7 CiAgICAgcmVzdWx0LmFwcGVuZChjb21tYSk7CiAKICAgICByZXN1bHQuYXBwZW5kKG1fcmFkaXVz LT5jc3NUZXh0KCkpOwpAQCAtMTAyLDEwICsxMDIsMTAgQEAgU3RyaW5nIENTU1dyYXBTaGFwZUVs bGlwc2U6OmNzc1RleHQoKSBjb25zdAogICAgIHJlc3VsdC5yZXNlcnZlQ2FwYWNpdHkoMzIpOwog ICAgIHJlc3VsdC5hcHBlbmQoZWxsaXBzZVBhcmVuKTsKIAotICAgIHJlc3VsdC5hcHBlbmQobV9s ZWZ0LT5jc3NUZXh0KCkpOworICAgIHJlc3VsdC5hcHBlbmQobV9jZW50ZXJYLT5jc3NUZXh0KCkp OwogICAgIHJlc3VsdC5hcHBlbmQoY29tbWEpOwogCi0gICAgcmVzdWx0LmFwcGVuZChtX3RvcC0+ Y3NzVGV4dCgpKTsKKyAgICByZXN1bHQuYXBwZW5kKG1fY2VudGVyWS0+Y3NzVGV4dCgpKTsKICAg ICByZXN1bHQuYXBwZW5kKGNvbW1hKTsKIAogICAgIHJlc3VsdC5hcHBlbmQobV9yYWRpdXNYLT5j c3NUZXh0KCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1dyYXBTaGFwZXMu aCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NXcmFwU2hhcGVzLmgKaW5kZXggNzEzYjhkZDYwYzky NzQ0NDRlZWVkNDRhZDE5NGNlMDQ2YTM5MDFiNy4uMzQ3YmIzNDEwNTI4M2Y4YTE1YmFmNTNhMTU0 MjI4MWM4NzU3MmMzZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1dyYXBTaGFw ZXMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTV3JhcFNoYXBlcy5oCkBAIC02MSwxNSAr NjEsMTUgQEAgY2xhc3MgQ1NTV3JhcFNoYXBlUmVjdGFuZ2xlIDogcHVibGljIENTU1dyYXBTaGFw ZSB7CiBwdWJsaWM6CiAgICAgc3RhdGljIFBhc3NSZWZQdHI8Q1NTV3JhcFNoYXBlUmVjdGFuZ2xl PiBjcmVhdGUoKSB7IHJldHVybiBhZG9wdFJlZihuZXcgQ1NTV3JhcFNoYXBlUmVjdGFuZ2xlKTsg fQogCi0gICAgQ1NTUHJpbWl0aXZlVmFsdWUqIGxlZnQoKSBjb25zdCB7IHJldHVybiBtX2xlZnQu Z2V0KCk7IH0KLSAgICBDU1NQcmltaXRpdmVWYWx1ZSogdG9wKCkgY29uc3QgeyByZXR1cm4gbV90 b3AuZ2V0KCk7IH0KKyAgICBDU1NQcmltaXRpdmVWYWx1ZSogeCgpIGNvbnN0IHsgcmV0dXJuIG1f eC5nZXQoKTsgfQorICAgIENTU1ByaW1pdGl2ZVZhbHVlKiB5KCkgY29uc3QgeyByZXR1cm4gbV95 LmdldCgpOyB9CiAgICAgQ1NTUHJpbWl0aXZlVmFsdWUqIHdpZHRoKCkgY29uc3QgeyByZXR1cm4g bV93aWR0aC5nZXQoKTsgfQogICAgIENTU1ByaW1pdGl2ZVZhbHVlKiBoZWlnaHQoKSBjb25zdCB7 IHJldHVybiBtX2hlaWdodC5nZXQoKTsgfQogICAgIENTU1ByaW1pdGl2ZVZhbHVlKiByYWRpdXNY KCkgY29uc3QgeyByZXR1cm4gbV9yYWRpdXNYLmdldCgpOyB9CiAgICAgQ1NTUHJpbWl0aXZlVmFs dWUqIHJhZGl1c1koKSBjb25zdCB7IHJldHVybiBtX3JhZGl1c1kuZ2V0KCk7IH0KIAotICAgIHZv aWQgc2V0TGVmdChQYXNzUmVmUHRyPENTU1ByaW1pdGl2ZVZhbHVlPiBsZWZ0KSB7IG1fbGVmdCA9 IGxlZnQ7IH0KLSAgICB2b2lkIHNldFRvcChQYXNzUmVmUHRyPENTU1ByaW1pdGl2ZVZhbHVlPiB0 b3ApIHsgbV90b3AgPSB0b3A7IH0KKyAgICB2b2lkIHNldFgoUGFzc1JlZlB0cjxDU1NQcmltaXRp dmVWYWx1ZT4geCkgeyBtX3ggPSB4OyB9CisgICAgdm9pZCBzZXRZKFBhc3NSZWZQdHI8Q1NTUHJp bWl0aXZlVmFsdWU+IHkpIHsgbV95ID0geTsgfQogICAgIHZvaWQgc2V0V2lkdGgoUGFzc1JlZlB0 cjxDU1NQcmltaXRpdmVWYWx1ZT4gd2lkdGgpIHsgbV93aWR0aCA9IHdpZHRoOyB9CiAgICAgdm9p ZCBzZXRIZWlnaHQoUGFzc1JlZlB0cjxDU1NQcmltaXRpdmVWYWx1ZT4gaGVpZ2h0KSB7IG1faGVp Z2h0ID0gaGVpZ2h0OyB9CiAgICAgdm9pZCBzZXRSYWRpdXNYKFBhc3NSZWZQdHI8Q1NTUHJpbWl0 aXZlVmFsdWU+IHJhZGl1c1gpIHsgbV9yYWRpdXNYID0gcmFkaXVzWDsgfQpAQCAtODEsOCArODEs OCBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIENTU1dyYXBTaGFwZVJlY3RhbmdsZSgpIHsgfQog Ci0gICAgUmVmUHRyPENTU1ByaW1pdGl2ZVZhbHVlPiBtX3RvcDsKLSAgICBSZWZQdHI8Q1NTUHJp bWl0aXZlVmFsdWU+IG1fbGVmdDsKKyAgICBSZWZQdHI8Q1NTUHJpbWl0aXZlVmFsdWU+IG1feTsK KyAgICBSZWZQdHI8Q1NTUHJpbWl0aXZlVmFsdWU+IG1feDsKICAgICBSZWZQdHI8Q1NTUHJpbWl0 aXZlVmFsdWU+IG1fd2lkdGg7CiAgICAgUmVmUHRyPENTU1ByaW1pdGl2ZVZhbHVlPiBtX2hlaWdo dDsKICAgICBSZWZQdHI8Q1NTUHJpbWl0aXZlVmFsdWU+IG1fcmFkaXVzWDsKQEAgLTkzLDEyICs5 MywxMiBAQCBjbGFzcyBDU1NXcmFwU2hhcGVDaXJjbGUgOiBwdWJsaWMgQ1NTV3JhcFNoYXBlIHsK IHB1YmxpYzoKICAgICBzdGF0aWMgUGFzc1JlZlB0cjxDU1NXcmFwU2hhcGVDaXJjbGU+IGNyZWF0 ZSgpIHsgcmV0dXJuIGFkb3B0UmVmKG5ldyBDU1NXcmFwU2hhcGVDaXJjbGUpOyB9CiAKLSAgICBD U1NQcmltaXRpdmVWYWx1ZSogbGVmdCgpIGNvbnN0IHsgcmV0dXJuIG1fbGVmdC5nZXQoKTsgfQot ICAgIENTU1ByaW1pdGl2ZVZhbHVlKiB0b3AoKSBjb25zdCB7IHJldHVybiBtX3RvcC5nZXQoKTsg fQorICAgIENTU1ByaW1pdGl2ZVZhbHVlKiBjZW50ZXJYKCkgY29uc3QgeyByZXR1cm4gbV9jZW50 ZXJYLmdldCgpOyB9CisgICAgQ1NTUHJpbWl0aXZlVmFsdWUqIGNlbnRlclkoKSBjb25zdCB7IHJl dHVybiBtX2NlbnRlclkuZ2V0KCk7IH0KICAgICBDU1NQcmltaXRpdmVWYWx1ZSogcmFkaXVzKCkg Y29uc3QgeyByZXR1cm4gbV9yYWRpdXMuZ2V0KCk7IH0KIAotICAgIHZvaWQgc2V0TGVmdChQYXNz UmVmUHRyPENTU1ByaW1pdGl2ZVZhbHVlPiBsZWZ0KSB7IG1fbGVmdCA9IGxlZnQ7IH0KLSAgICB2 b2lkIHNldFRvcChQYXNzUmVmUHRyPENTU1ByaW1pdGl2ZVZhbHVlPiB0b3ApIHsgbV90b3AgPSB0 b3A7IH0KKyAgICB2b2lkIHNldENlbnRlclgoUGFzc1JlZlB0cjxDU1NQcmltaXRpdmVWYWx1ZT4g Y2VudGVyWCkgeyBtX2NlbnRlclggPSBjZW50ZXJYOyB9CisgICAgdm9pZCBzZXRDZW50ZXJZKFBh c3NSZWZQdHI8Q1NTUHJpbWl0aXZlVmFsdWU+IGNlbnRlclkpIHsgbV9jZW50ZXJZID0gY2VudGVy WTsgfQogICAgIHZvaWQgc2V0UmFkaXVzKFBhc3NSZWZQdHI8Q1NTUHJpbWl0aXZlVmFsdWU+IHJh ZGl1cykgeyBtX3JhZGl1cyA9IHJhZGl1czsgfQogCiAgICAgdmlydHVhbCBUeXBlIHR5cGUoKSBj b25zdCB7IHJldHVybiBDU1NfV1JBUF9TSEFQRV9DSVJDTEU7IH0KQEAgLTEwNyw4ICsxMDcsOCBA QCBwdWJsaWM6CiBwcml2YXRlOgogICAgIENTU1dyYXBTaGFwZUNpcmNsZSgpIHsgfQogCi0gICAg UmVmUHRyPENTU1ByaW1pdGl2ZVZhbHVlPiBtX3RvcDsKLSAgICBSZWZQdHI8Q1NTUHJpbWl0aXZl VmFsdWU+IG1fbGVmdDsKKyAgICBSZWZQdHI8Q1NTUHJpbWl0aXZlVmFsdWU+IG1fY2VudGVyWTsK KyAgICBSZWZQdHI8Q1NTUHJpbWl0aXZlVmFsdWU+IG1fY2VudGVyWDsKICAgICBSZWZQdHI8Q1NT UHJpbWl0aXZlVmFsdWU+IG1fcmFkaXVzOwogfTsKIApAQCAtMTE2LDEzICsxMTYsMTMgQEAgY2xh c3MgQ1NTV3JhcFNoYXBlRWxsaXBzZSA6IHB1YmxpYyBDU1NXcmFwU2hhcGUgewogcHVibGljOgog ICAgIHN0YXRpYyBQYXNzUmVmUHRyPENTU1dyYXBTaGFwZUVsbGlwc2U+IGNyZWF0ZSgpIHsgcmV0 dXJuIGFkb3B0UmVmKG5ldyBDU1NXcmFwU2hhcGVFbGxpcHNlKTsgfQogCi0gICAgQ1NTUHJpbWl0 aXZlVmFsdWUqIGxlZnQoKSBjb25zdCB7IHJldHVybiBtX2xlZnQuZ2V0KCk7IH0KLSAgICBDU1NQ cmltaXRpdmVWYWx1ZSogdG9wKCkgY29uc3QgeyByZXR1cm4gbV90b3AuZ2V0KCk7IH0KKyAgICBD U1NQcmltaXRpdmVWYWx1ZSogY2VudGVyWCgpIGNvbnN0IHsgcmV0dXJuIG1fY2VudGVyWC5nZXQo KTsgfQorICAgIENTU1ByaW1pdGl2ZVZhbHVlKiBjZW50ZXJZKCkgY29uc3QgeyByZXR1cm4gbV9j ZW50ZXJZLmdldCgpOyB9CiAgICAgQ1NTUHJpbWl0aXZlVmFsdWUqIHJhZGl1c1goKSBjb25zdCB7 IHJldHVybiBtX3JhZGl1c1guZ2V0KCk7IH0KICAgICBDU1NQcmltaXRpdmVWYWx1ZSogcmFkaXVz WSgpIGNvbnN0IHsgcmV0dXJuIG1fcmFkaXVzWS5nZXQoKTsgfQogCi0gICAgdm9pZCBzZXRMZWZ0 KFBhc3NSZWZQdHI8Q1NTUHJpbWl0aXZlVmFsdWU+IGxlZnQpIHsgbV9sZWZ0ID0gbGVmdDsgfQot ICAgIHZvaWQgc2V0VG9wKFBhc3NSZWZQdHI8Q1NTUHJpbWl0aXZlVmFsdWU+IHRvcCkgeyBtX3Rv cCA9IHRvcDsgfQorICAgIHZvaWQgc2V0Q2VudGVyWChQYXNzUmVmUHRyPENTU1ByaW1pdGl2ZVZh bHVlPiBjZW50ZXJYKSB7IG1fY2VudGVyWCA9IGNlbnRlclg7IH0KKyAgICB2b2lkIHNldENlbnRl clkoUGFzc1JlZlB0cjxDU1NQcmltaXRpdmVWYWx1ZT4gY2VudGVyWSkgeyBtX2NlbnRlclkgPSBj ZW50ZXJZOyB9CiAgICAgdm9pZCBzZXRSYWRpdXNYKFBhc3NSZWZQdHI8Q1NTUHJpbWl0aXZlVmFs dWU+IHJhZGl1c1gpIHsgbV9yYWRpdXNYID0gcmFkaXVzWDsgfQogICAgIHZvaWQgc2V0UmFkaXVz WShQYXNzUmVmUHRyPENTU1ByaW1pdGl2ZVZhbHVlPiByYWRpdXNZKSB7IG1fcmFkaXVzWSA9IHJh ZGl1c1k7IH0KIApAQCAtMTMyLDggKzEzMiw4IEBAIHB1YmxpYzoKIHByaXZhdGU6CiAgICAgQ1NT V3JhcFNoYXBlRWxsaXBzZSgpIHsgfQogCi0gICAgUmVmUHRyPENTU1ByaW1pdGl2ZVZhbHVlPiBt X3RvcDsKLSAgICBSZWZQdHI8Q1NTUHJpbWl0aXZlVmFsdWU+IG1fbGVmdDsKKyAgICBSZWZQdHI8 Q1NTUHJpbWl0aXZlVmFsdWU+IG1fY2VudGVyWDsKKyAgICBSZWZQdHI8Q1NTUHJpbWl0aXZlVmFs dWU+IG1fY2VudGVyWTsKICAgICBSZWZQdHI8Q1NTUHJpbWl0aXZlVmFsdWU+IG1fcmFkaXVzWDsK ICAgICBSZWZQdHI8Q1NTUHJpbWl0aXZlVmFsdWU+IG1fcmFkaXVzWTsKIH07CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9jc3MvV3JhcFNoYXBlRnVuY3Rpb25zLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2Nzcy9XcmFwU2hhcGVGdW5jdGlvbnMuY3BwCmluZGV4IDMzZmM1YTZiZDg3ZDZlODA5NDRj NGRhYjNiNzVhNWFmNTJkZDk4YzMuLjZjYTYzNDE2OWM0NmI3MDUyMGI3NzRjZjViYTFmOWU5OTJj OTExZTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9XcmFwU2hhcGVGdW5jdGlvbnMu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9XcmFwU2hhcGVGdW5jdGlvbnMuY3BwCkBAIC00 Niw4ICs0Niw4IEBAIFBhc3NSZWZQdHI8Q1NTVmFsdWU+IHZhbHVlRm9yV3JhcFNoYXBlKGNvbnN0 IFdyYXBTaGFwZSogd3JhcFNoYXBlKQogICAgICAgICBjb25zdCBXcmFwU2hhcGVSZWN0YW5nbGUq IHJlY3RhbmdsZSA9IHN0YXRpY19jYXN0PGNvbnN0IFdyYXBTaGFwZVJlY3RhbmdsZSo+KHdyYXBT aGFwZSk7CiAgICAgICAgIFJlZlB0cjxDU1NXcmFwU2hhcGVSZWN0YW5nbGU+IHJlY3RhbmdsZVZh bHVlID0gQ1NTV3JhcFNoYXBlUmVjdGFuZ2xlOjpjcmVhdGUoKTsKIAotICAgICAgICByZWN0YW5n bGVWYWx1ZS0+c2V0TGVmdChjc3NWYWx1ZVBvb2woKS5jcmVhdGVWYWx1ZShyZWN0YW5nbGUtPmxl ZnQoKSkpOwotICAgICAgICByZWN0YW5nbGVWYWx1ZS0+c2V0VG9wKGNzc1ZhbHVlUG9vbCgpLmNy ZWF0ZVZhbHVlKHJlY3RhbmdsZS0+dG9wKCkpKTsKKyAgICAgICAgcmVjdGFuZ2xlVmFsdWUtPnNl dFgoY3NzVmFsdWVQb29sKCkuY3JlYXRlVmFsdWUocmVjdGFuZ2xlLT54KCkpKTsKKyAgICAgICAg cmVjdGFuZ2xlVmFsdWUtPnNldFkoY3NzVmFsdWVQb29sKCkuY3JlYXRlVmFsdWUocmVjdGFuZ2xl LT55KCkpKTsKICAgICAgICAgcmVjdGFuZ2xlVmFsdWUtPnNldFdpZHRoKGNzc1ZhbHVlUG9vbCgp LmNyZWF0ZVZhbHVlKHJlY3RhbmdsZS0+d2lkdGgoKSkpOwogICAgICAgICByZWN0YW5nbGVWYWx1 ZS0+c2V0SGVpZ2h0KGNzc1ZhbHVlUG9vbCgpLmNyZWF0ZVZhbHVlKHJlY3RhbmdsZS0+aGVpZ2h0 KCkpKTsKICAgICAgICAgaWYgKCFyZWN0YW5nbGUtPmNvcm5lclJhZGl1c1goKS5pc1VuZGVmaW5l ZCgpKSB7CkBAIC02Myw4ICs2Myw4IEBAIFBhc3NSZWZQdHI8Q1NTVmFsdWU+IHZhbHVlRm9yV3Jh cFNoYXBlKGNvbnN0IFdyYXBTaGFwZSogd3JhcFNoYXBlKQogICAgICAgICBjb25zdCBXcmFwU2hh cGVDaXJjbGUqIGNpcmNsZSA9IHN0YXRpY19jYXN0PGNvbnN0IFdyYXBTaGFwZUNpcmNsZSo+KHdy YXBTaGFwZSk7CiAgICAgICAgIFJlZlB0cjxDU1NXcmFwU2hhcGVDaXJjbGU+IGNpcmNsZVZhbHVl ID0gQ1NTV3JhcFNoYXBlQ2lyY2xlOjpjcmVhdGUoKTsKIAotICAgICAgICBjaXJjbGVWYWx1ZS0+ c2V0TGVmdChjc3NWYWx1ZVBvb2woKS5jcmVhdGVWYWx1ZShjaXJjbGUtPmxlZnQoKSkpOwotICAg ICAgICBjaXJjbGVWYWx1ZS0+c2V0VG9wKGNzc1ZhbHVlUG9vbCgpLmNyZWF0ZVZhbHVlKGNpcmNs ZS0+dG9wKCkpKTsKKyAgICAgICAgY2lyY2xlVmFsdWUtPnNldENlbnRlclgoY3NzVmFsdWVQb29s KCkuY3JlYXRlVmFsdWUoY2lyY2xlLT5jZW50ZXJYKCkpKTsKKyAgICAgICAgY2lyY2xlVmFsdWUt PnNldENlbnRlclkoY3NzVmFsdWVQb29sKCkuY3JlYXRlVmFsdWUoY2lyY2xlLT5jZW50ZXJZKCkp KTsKICAgICAgICAgY2lyY2xlVmFsdWUtPnNldFJhZGl1cyhjc3NWYWx1ZVBvb2woKS5jcmVhdGVW YWx1ZShjaXJjbGUtPnJhZGl1cygpKSk7CiAKICAgICAgICAgd3JhcFNoYXBlVmFsdWUgPSBjaXJj bGVWYWx1ZS5yZWxlYXNlKCk7CkBAIC03NCw4ICs3NCw4IEBAIFBhc3NSZWZQdHI8Q1NTVmFsdWU+ IHZhbHVlRm9yV3JhcFNoYXBlKGNvbnN0IFdyYXBTaGFwZSogd3JhcFNoYXBlKQogICAgICAgICBj b25zdCBXcmFwU2hhcGVFbGxpcHNlKiBlbGxpcHNlID0gc3RhdGljX2Nhc3Q8Y29uc3QgV3JhcFNo YXBlRWxsaXBzZSo+KHdyYXBTaGFwZSk7CiAgICAgICAgIFJlZlB0cjxDU1NXcmFwU2hhcGVFbGxp cHNlPiBlbGxpcHNlVmFsdWUgPSBDU1NXcmFwU2hhcGVFbGxpcHNlOjpjcmVhdGUoKTsKIAotICAg ICAgICBlbGxpcHNlVmFsdWUtPnNldExlZnQoY3NzVmFsdWVQb29sKCkuY3JlYXRlVmFsdWUoZWxs aXBzZS0+bGVmdCgpKSk7Ci0gICAgICAgIGVsbGlwc2VWYWx1ZS0+c2V0VG9wKGNzc1ZhbHVlUG9v bCgpLmNyZWF0ZVZhbHVlKGVsbGlwc2UtPnRvcCgpKSk7CisgICAgICAgIGVsbGlwc2VWYWx1ZS0+ c2V0Q2VudGVyWChjc3NWYWx1ZVBvb2woKS5jcmVhdGVWYWx1ZShlbGxpcHNlLT5jZW50ZXJYKCkp KTsKKyAgICAgICAgZWxsaXBzZVZhbHVlLT5zZXRDZW50ZXJZKGNzc1ZhbHVlUG9vbCgpLmNyZWF0 ZVZhbHVlKGVsbGlwc2UtPmNlbnRlclkoKSkpOwogICAgICAgICBlbGxpcHNlVmFsdWUtPnNldFJh ZGl1c1goY3NzVmFsdWVQb29sKCkuY3JlYXRlVmFsdWUoZWxsaXBzZS0+cmFkaXVzWCgpKSk7CiAg ICAgICAgIGVsbGlwc2VWYWx1ZS0+c2V0UmFkaXVzWShjc3NWYWx1ZVBvb2woKS5jcmVhdGVWYWx1 ZShlbGxpcHNlLT5yYWRpdXNZKCkpKTsKIApAQCAtMTE0LDggKzExNCw4IEBAIFBhc3NSZWZQdHI8 V3JhcFNoYXBlPiB3cmFwU2hhcGVGb3JWYWx1ZShjb25zdCBTdHlsZVJlc29sdmVyKiBzdHlsZVJl c29sdmVyLCBjb25zCiAgICAgICAgIGNvbnN0IENTU1dyYXBTaGFwZVJlY3RhbmdsZSogcmVjdFZh bHVlID0gc3RhdGljX2Nhc3Q8Y29uc3QgQ1NTV3JhcFNoYXBlUmVjdGFuZ2xlICo+KHdyYXBTaGFw ZVZhbHVlKTsKICAgICAgICAgUmVmUHRyPFdyYXBTaGFwZVJlY3RhbmdsZT4gcmVjdCA9IFdyYXBT aGFwZVJlY3RhbmdsZTo6Y3JlYXRlKCk7CiAKLSAgICAgICAgcmVjdC0+c2V0TGVmdChjb252ZXJ0 VG9MZW5ndGgoc3R5bGVSZXNvbHZlciwgcmVjdFZhbHVlLT5sZWZ0KCkpKTsKLSAgICAgICAgcmVj dC0+c2V0VG9wKGNvbnZlcnRUb0xlbmd0aChzdHlsZVJlc29sdmVyLCByZWN0VmFsdWUtPnRvcCgp KSk7CisgICAgICAgIHJlY3QtPnNldFgoY29udmVydFRvTGVuZ3RoKHN0eWxlUmVzb2x2ZXIsIHJl Y3RWYWx1ZS0+eCgpKSk7CisgICAgICAgIHJlY3QtPnNldFkoY29udmVydFRvTGVuZ3RoKHN0eWxl UmVzb2x2ZXIsIHJlY3RWYWx1ZS0+eSgpKSk7CiAgICAgICAgIHJlY3QtPnNldFdpZHRoKGNvbnZl cnRUb0xlbmd0aChzdHlsZVJlc29sdmVyLCByZWN0VmFsdWUtPndpZHRoKCkpKTsKICAgICAgICAg cmVjdC0+c2V0SGVpZ2h0KGNvbnZlcnRUb0xlbmd0aChzdHlsZVJlc29sdmVyLCByZWN0VmFsdWUt PmhlaWdodCgpKSk7CiAgICAgICAgIGlmIChyZWN0VmFsdWUtPnJhZGl1c1goKSkgewpAQCAtMTMw LDggKzEzMCw4IEBAIFBhc3NSZWZQdHI8V3JhcFNoYXBlPiB3cmFwU2hhcGVGb3JWYWx1ZShjb25z dCBTdHlsZVJlc29sdmVyKiBzdHlsZVJlc29sdmVyLCBjb25zCiAgICAgICAgIGNvbnN0IENTU1dy YXBTaGFwZUNpcmNsZSogY2lyY2xlVmFsdWUgPSBzdGF0aWNfY2FzdDxjb25zdCBDU1NXcmFwU2hh cGVDaXJjbGUgKj4od3JhcFNoYXBlVmFsdWUpOwogICAgICAgICBSZWZQdHI8V3JhcFNoYXBlQ2ly Y2xlPiBjaXJjbGUgPSBXcmFwU2hhcGVDaXJjbGU6OmNyZWF0ZSgpOwogCi0gICAgICAgIGNpcmNs ZS0+c2V0TGVmdChjb252ZXJ0VG9MZW5ndGgoc3R5bGVSZXNvbHZlciwgY2lyY2xlVmFsdWUtPmxl ZnQoKSkpOwotICAgICAgICBjaXJjbGUtPnNldFRvcChjb252ZXJ0VG9MZW5ndGgoc3R5bGVSZXNv bHZlciwgY2lyY2xlVmFsdWUtPnRvcCgpKSk7CisgICAgICAgIGNpcmNsZS0+c2V0Q2VudGVyWChj b252ZXJ0VG9MZW5ndGgoc3R5bGVSZXNvbHZlciwgY2lyY2xlVmFsdWUtPmNlbnRlclgoKSkpOwor ICAgICAgICBjaXJjbGUtPnNldENlbnRlclkoY29udmVydFRvTGVuZ3RoKHN0eWxlUmVzb2x2ZXIs IGNpcmNsZVZhbHVlLT5jZW50ZXJZKCkpKTsKICAgICAgICAgY2lyY2xlLT5zZXRSYWRpdXMoY29u dmVydFRvTGVuZ3RoKHN0eWxlUmVzb2x2ZXIsIGNpcmNsZVZhbHVlLT5yYWRpdXMoKSkpOwogCiAg ICAgICAgIHdyYXBTaGFwZSA9IGNpcmNsZS5yZWxlYXNlKCk7CkBAIC0xNDEsOCArMTQxLDggQEAg UGFzc1JlZlB0cjxXcmFwU2hhcGU+IHdyYXBTaGFwZUZvclZhbHVlKGNvbnN0IFN0eWxlUmVzb2x2 ZXIqIHN0eWxlUmVzb2x2ZXIsIGNvbnMKICAgICAgICAgY29uc3QgQ1NTV3JhcFNoYXBlRWxsaXBz ZSogZWxsaXBzZVZhbHVlID0gc3RhdGljX2Nhc3Q8Y29uc3QgQ1NTV3JhcFNoYXBlRWxsaXBzZSAq Pih3cmFwU2hhcGVWYWx1ZSk7CiAgICAgICAgIFJlZlB0cjxXcmFwU2hhcGVFbGxpcHNlPiBlbGxp cHNlID0gV3JhcFNoYXBlRWxsaXBzZTo6Y3JlYXRlKCk7CiAKLSAgICAgICAgZWxsaXBzZS0+c2V0 TGVmdChjb252ZXJ0VG9MZW5ndGgoc3R5bGVSZXNvbHZlciwgZWxsaXBzZVZhbHVlLT5sZWZ0KCkp KTsKLSAgICAgICAgZWxsaXBzZS0+c2V0VG9wKGNvbnZlcnRUb0xlbmd0aChzdHlsZVJlc29sdmVy LCBlbGxpcHNlVmFsdWUtPnRvcCgpKSk7CisgICAgICAgIGVsbGlwc2UtPnNldENlbnRlclgoY29u dmVydFRvTGVuZ3RoKHN0eWxlUmVzb2x2ZXIsIGVsbGlwc2VWYWx1ZS0+Y2VudGVyWCgpKSk7Cisg ICAgICAgIGVsbGlwc2UtPnNldENlbnRlclkoY29udmVydFRvTGVuZ3RoKHN0eWxlUmVzb2x2ZXIs IGVsbGlwc2VWYWx1ZS0+Y2VudGVyWSgpKSk7CiAgICAgICAgIGVsbGlwc2UtPnNldFJhZGl1c1go Y29udmVydFRvTGVuZ3RoKHN0eWxlUmVzb2x2ZXIsIGVsbGlwc2VWYWx1ZS0+cmFkaXVzWCgpKSk7 CiAgICAgICAgIGVsbGlwc2UtPnNldFJhZGl1c1koY29udmVydFRvTGVuZ3RoKHN0eWxlUmVzb2x2 ZXIsIGVsbGlwc2VWYWx1ZS0+cmFkaXVzWSgpKSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9zdHlsZS9XcmFwU2hhcGVzLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvc3R5bGUvV3JhcFNoYXBlcy5oCmluZGV4IDU3ZTU1ZWMwNTU5NDI5YTUzMGU5MjgxMzNiOGFm YmQ2MmFjN2E5M2IuLjYxMDUyY2IwZGE0Y2YzZDc1NjY1MjM0MTg3NjgyMDQ5YTk2ZDQxZjggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9XcmFwU2hhcGVzLmgKKysr IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1dyYXBTaGFwZXMuaApAQCAtNTUsMTUg KzU1LDE1IEBAIGNsYXNzIFdyYXBTaGFwZVJlY3RhbmdsZSA6IHB1YmxpYyBXcmFwU2hhcGUgewog cHVibGljOgogICAgIHN0YXRpYyBQYXNzUmVmUHRyPFdyYXBTaGFwZVJlY3RhbmdsZT4gY3JlYXRl KCkgeyByZXR1cm4gYWRvcHRSZWYobmV3IFdyYXBTaGFwZVJlY3RhbmdsZSk7IH0KIAotICAgIExl bmd0aCBsZWZ0KCkgY29uc3QgeyByZXR1cm4gbV9sZWZ0OyB9Ci0gICAgTGVuZ3RoIHRvcCgpIGNv bnN0IHsgcmV0dXJuIG1fdG9wOyB9CisgICAgTGVuZ3RoIHgoKSBjb25zdCB7IHJldHVybiBtX3g7 IH0KKyAgICBMZW5ndGggeSgpIGNvbnN0IHsgcmV0dXJuIG1feTsgfQogICAgIExlbmd0aCB3aWR0 aCgpIGNvbnN0IHsgcmV0dXJuIG1fd2lkdGg7IH0KICAgICBMZW5ndGggaGVpZ2h0KCkgY29uc3Qg eyByZXR1cm4gbV9oZWlnaHQ7IH0KICAgICBMZW5ndGggY29ybmVyUmFkaXVzWCgpIGNvbnN0IHsg cmV0dXJuIG1fY29ybmVyUmFkaXVzWDsgfQogICAgIExlbmd0aCBjb3JuZXJSYWRpdXNZKCkgY29u c3QgeyByZXR1cm4gbV9jb3JuZXJSYWRpdXNZOyB9CiAKLSAgICB2b2lkIHNldExlZnQoTGVuZ3Ro IGxlZnQpIHsgbV9sZWZ0ID0gbGVmdDsgfQotICAgIHZvaWQgc2V0VG9wKExlbmd0aCB0b3ApIHsg bV90b3AgPSB0b3A7IH0KKyAgICB2b2lkIHNldFgoTGVuZ3RoIHgpIHsgbV94ID0geDsgfQorICAg IHZvaWQgc2V0WShMZW5ndGggeSkgeyBtX3kgPSB5OyB9CiAgICAgdm9pZCBzZXRXaWR0aChMZW5n dGggd2lkdGgpIHsgbV93aWR0aCA9IHdpZHRoOyB9CiAgICAgdm9pZCBzZXRIZWlnaHQoTGVuZ3Ro IGhlaWdodCkgeyBtX2hlaWdodCA9IGhlaWdodDsgfQogICAgIHZvaWQgc2V0Q29ybmVyUmFkaXVz WChMZW5ndGggcmFkaXVzWCkgeyBtX2Nvcm5lclJhZGl1c1ggPSByYWRpdXNYOyB9CkBAIC03Nyw4 ICs3Nyw4IEBAIHByaXZhdGU6CiAgICAgICAgICwgbV9jb3JuZXJSYWRpdXNZKFVuZGVmaW5lZCkK ICAgICB7IH0KIAotICAgIExlbmd0aCBtX3RvcDsKLSAgICBMZW5ndGggbV9sZWZ0OworICAgIExl bmd0aCBtX3k7CisgICAgTGVuZ3RoIG1feDsKICAgICBMZW5ndGggbV93aWR0aDsKICAgICBMZW5n dGggbV9oZWlnaHQ7CiAgICAgTGVuZ3RoIG1fY29ybmVyUmFkaXVzWDsKQEAgLTg5LDIwICs4OSwy MCBAQCBjbGFzcyBXcmFwU2hhcGVDaXJjbGUgOiBwdWJsaWMgV3JhcFNoYXBlIHsKIHB1YmxpYzoK ICAgICBzdGF0aWMgUGFzc1JlZlB0cjxXcmFwU2hhcGVDaXJjbGU+IGNyZWF0ZSgpIHsgcmV0dXJu IGFkb3B0UmVmKG5ldyBXcmFwU2hhcGVDaXJjbGUpOyB9CiAKLSAgICBMZW5ndGggbGVmdCgpIGNv bnN0IHsgcmV0dXJuIG1fbGVmdDsgfQotICAgIExlbmd0aCB0b3AoKSBjb25zdCB7IHJldHVybiBt X3RvcDsgfQorICAgIExlbmd0aCBjZW50ZXJYKCkgY29uc3QgeyByZXR1cm4gbV9jZW50ZXJYOyB9 CisgICAgTGVuZ3RoIGNlbnRlclkoKSBjb25zdCB7IHJldHVybiBtX2NlbnRlclk7IH0KICAgICBM ZW5ndGggcmFkaXVzKCkgY29uc3QgeyByZXR1cm4gbV9yYWRpdXM7IH0KIAotICAgIHZvaWQgc2V0 TGVmdChMZW5ndGggbGVmdCkgeyBtX2xlZnQgPSBsZWZ0OyB9Ci0gICAgdm9pZCBzZXRUb3AoTGVu Z3RoIHRvcCkgeyBtX3RvcCA9IHRvcDsgfQorICAgIHZvaWQgc2V0Q2VudGVyWChMZW5ndGggY2Vu dGVyWCkgeyBtX2NlbnRlclggPSBjZW50ZXJYOyB9CisgICAgdm9pZCBzZXRDZW50ZXJZKExlbmd0 aCBjZW50ZXJZKSB7IG1fY2VudGVyWSA9IGNlbnRlclk7IH0KICAgICB2b2lkIHNldFJhZGl1cyhM ZW5ndGggcmFkaXVzKSB7IG1fcmFkaXVzID0gcmFkaXVzOyB9CiAKICAgICB2aXJ0dWFsIFR5cGUg dHlwZSgpIGNvbnN0IHsgcmV0dXJuIFdSQVBfU0hBUEVfQ0lSQ0xFOyB9CiBwcml2YXRlOgogICAg IFdyYXBTaGFwZUNpcmNsZSgpIHsgfQogCi0gICAgTGVuZ3RoIG1fdG9wOwotICAgIExlbmd0aCBt X2xlZnQ7CisgICAgTGVuZ3RoIG1fY2VudGVyWDsKKyAgICBMZW5ndGggbV9jZW50ZXJZOwogICAg IExlbmd0aCBtX3JhZGl1czsKIH07CiAKQEAgLTExMCwxMyArMTEwLDEzIEBAIGNsYXNzIFdyYXBT aGFwZUVsbGlwc2UgOiBwdWJsaWMgV3JhcFNoYXBlIHsKIHB1YmxpYzoKICAgICBzdGF0aWMgUGFz c1JlZlB0cjxXcmFwU2hhcGVFbGxpcHNlPiBjcmVhdGUoKSB7IHJldHVybiBhZG9wdFJlZihuZXcg V3JhcFNoYXBlRWxsaXBzZSk7IH0KIAotICAgIExlbmd0aCB0b3AoKSBjb25zdCB7IHJldHVybiBt X3RvcDsgfQotICAgIExlbmd0aCBsZWZ0KCkgY29uc3QgeyByZXR1cm4gbV9sZWZ0OyB9CisgICAg TGVuZ3RoIGNlbnRlclgoKSBjb25zdCB7IHJldHVybiBtX2NlbnRlclg7IH0KKyAgICBMZW5ndGgg Y2VudGVyWSgpIGNvbnN0IHsgcmV0dXJuIG1fY2VudGVyWTsgfQogICAgIExlbmd0aCByYWRpdXNY KCkgY29uc3QgeyByZXR1cm4gbV9yYWRpdXNYOyB9CiAgICAgTGVuZ3RoIHJhZGl1c1koKSBjb25z dCB7IHJldHVybiBtX3JhZGl1c1k7IH0KIAotICAgIHZvaWQgc2V0VG9wKExlbmd0aCB0b3ApIHsg bV90b3AgPSB0b3A7IH0KLSAgICB2b2lkIHNldExlZnQoTGVuZ3RoIGxlZnQpIHsgbV9sZWZ0ID0g bGVmdDsgfQorICAgIHZvaWQgc2V0Q2VudGVyWChMZW5ndGggY2VudGVyWCkgeyBtX2NlbnRlclgg PSBjZW50ZXJYOyB9CisgICAgdm9pZCBzZXRDZW50ZXJZKExlbmd0aCBjZW50ZXJZKSB7IG1fY2Vu dGVyWSA9IGNlbnRlclk7IH0KICAgICB2b2lkIHNldFJhZGl1c1goTGVuZ3RoIHJhZGl1c1gpIHsg bV9yYWRpdXNYID0gcmFkaXVzWDsgfQogICAgIHZvaWQgc2V0UmFkaXVzWShMZW5ndGggcmFkaXVz WSkgeyBtX3JhZGl1c1kgPSByYWRpdXNZOyB9CiAKQEAgLTEyNCw4ICsxMjQsOCBAQCBwdWJsaWM6 CiBwcml2YXRlOgogICAgIFdyYXBTaGFwZUVsbGlwc2UoKSB7IH0KIAotICAgIExlbmd0aCBtX3Rv cDsKLSAgICBMZW5ndGggbV9sZWZ0OworICAgIExlbmd0aCBtX2NlbnRlclg7CisgICAgTGVuZ3Ro IG1fY2VudGVyWTsKICAgICBMZW5ndGggbV9yYWRpdXNYOwogICAgIExlbmd0aCBtX3JhZGl1c1k7 CiB9Owo=