107415 2013-01-20 22:05:08 -0800 [Refactoring] rename StyleRuleBlock -> StyleRuleGroup 2013-01-21 02:34:50 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 tasak tasak cmarcelo koivisto macpherson menard ojan.autocc webkit.review.bot oldest_to_newest 811794 0 tasak 2013-01-20 22:05:08 -0800 Rename StyleRuleBlock to StyleRuleGroup, because: - CSSGroupingRule is an interface for representing an at-rule that contains other rules nested inside itself http://www.w3.org/TR/2012/WD-css3-conditional-20121213/#the-cssgroupingrule-interface - The spec defines CSSGroupingRule, not CSSBlockRule. So StyleRuleGroup looks a better name comparing with StyleRuleBlock. 811885 1 183722 tasak 2013-01-21 00:05:38 -0800 Created attachment 183722 Patch 811969 2 183722 webkit.review.bot 2013-01-21 02:34:46 -0800 Comment on attachment 183722 Patch Clearing flags on attachment: 183722 Committed r140316: <http://trac.webkit.org/changeset/140316> 811970 3 webkit.review.bot 2013-01-21 02:34:50 -0800 All reviewed patches have been landed. Closing bug. 183722 2013-01-21 00:05:38 -0800 2013-01-21 02:34:46 -0800 Patch bug-107415-20130121170234.patch text/plain 10420 tasak U3VidmVyc2lvbiBSZXZpc2lvbjogMTQwMjg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOThkMTFlYWRkMGUzNTFk OGRhMTU5ZDQxYmU0ZmM3YmJmYTI3NTNiOS4uN2Y4NGI1ZmU0YzRlMmMxOWJkYWY3MmJlNWZiMmZl NDkyOWFkMzk5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDEzLTAxLTIwICBUYWth c2hpIFNha2Ftb3RvICA8dGFzYWtAZ29vZ2xlLmNvbT4KKworICAgICAgICBbUmVmYWN0b3Jpbmdd IHJlbmFtZSBTdHlsZVJ1bGVCbG9jayAtPiBTdHlsZVJ1bGVHcm91cAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA3NDE1CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU3R5bGVSdWxlQmxvY2sgc2hvdWxkIGJl IHJlbmFtZWQgU3R5bGVSdWxlR3JvdXAsIGJlY2F1c2UKKyAgICAgICAgQ1NTR3JvdXBpbmdSdWxl IChub3QgQ1NTQmxvY2tSdWxlKSBpcyBhbiBpbnRlcmZhY2UgZm9yIGFuIGF0LXJ1bGUgdGhhdAor ICAgICAgICBjb250YWlucyBvdGhlciBydWxlcyBuZXN0ZWQgaW5zaWRlIGl0c2VsZjoKKyAgICAg ICAgaHR0cDovL3d3dy53My5vcmcvVFIvMjAxMi9XRC1jc3MzLWNvbmRpdGlvbmFsLTIwMTIxMjEz LyN0aGUtY3NzZ3JvdXBpbmdydWxlLWludGVyZmFjZQorICAgICAgICBUbyBtYXRjaCB0aGUgbmFt ZTogQ1NTR3JvdXBpbmdSdWxlLCBTdHlsZVJ1bGVHcm91cCBsb29rcyBiZXR0ZXIuCisKKyAgICAg ICAgTm8gbmV3IHRlc3RzLCBiZWNhdXNlIGp1c3QgcmVmYWN0b3JpbmcuCisKKyAgICAgICAgKiBj c3MvQ1NTR3JvdXBpbmdSdWxlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU0dyb3VwaW5nUnVs ZTo6Q1NTR3JvdXBpbmdSdWxlKToKKyAgICAgICAgKFdlYkNvcmU6OkNTU0dyb3VwaW5nUnVsZTo6 cmVhdHRhY2gpOgorICAgICAgICAqIGNzcy9DU1NHcm91cGluZ1J1bGUuaDoKKyAgICAgICAgKENT U0dyb3VwaW5nUnVsZSk6CisgICAgICAgICogY3NzL1N0eWxlUnVsZS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpTdHlsZVJ1bGVHcm91cDo6U3R5bGVSdWxlR3JvdXApOgorICAgICAgICAoV2ViQ29y ZTo6U3R5bGVSdWxlR3JvdXA6OndyYXBwZXJJbnNlcnRSdWxlKToKKyAgICAgICAgKFdlYkNvcmU6 OlN0eWxlUnVsZUdyb3VwOjp3cmFwcGVyUmVtb3ZlUnVsZSk6CisgICAgICAgIChXZWJDb3JlOjpT dHlsZVJ1bGVHcm91cDo6cmVwb3J0RGVzY2VuZGFudE1lbW9yeVVzYWdlKToKKyAgICAgICAgKFdl YkNvcmU6OlN0eWxlUnVsZU1lZGlhOjpTdHlsZVJ1bGVNZWRpYSk6CisgICAgICAgIChXZWJDb3Jl OjpTdHlsZVJ1bGVTdXBwb3J0czo6U3R5bGVSdWxlU3VwcG9ydHMpOgorICAgICAgICAoV2ViQ29y ZTo6U3R5bGVSdWxlUmVnaW9uOjpTdHlsZVJ1bGVSZWdpb24pOgorICAgICAgICAqIGNzcy9TdHls ZVJ1bGUuaDoKKyAgICAgICAgKFN0eWxlUnVsZUdyb3VwKToKKyAgICAgICAgKFdlYkNvcmU6OlN0 eWxlUnVsZUhvc3Q6OlN0eWxlUnVsZUhvc3QpOgorICAgICAgICAoV2ViQ29yZTo6dG9TdHlsZVJ1 bGVNZWRpYSk6CisgICAgICAgIChXZWJDb3JlOjp0b1N0eWxlUnVsZVN1cHBvcnRzKToKKyAgICAg ICAgKFdlYkNvcmU6OnRvU3R5bGVSdWxlUmVnaW9uKToKKyAgICAgICAgSnVzdCByZXBsYWNlZCBT dHlsZVJ1bGVCbG9jayB3aXRoIFN0eWxlUnVsZUdyb3VwLgorCiAyMDEzLTAxLTIwICBLZW50YXJv IEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xs aW5nIG91dCByMTQwMjcwLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0dyb3Vw aW5nUnVsZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTR3JvdXBpbmdSdWxlLmNwcAppbmRl eCA2MDFhMzUzODUzMmEyM2RkMzRjMjMxMGFlYzkzNjhiOTM1ODA0ZDY2Li5iMzk1MzBkMzA5ZDA5 ZDU0MzcxYWY3MWJkZDZhMGQwY2U1MzBkZjk4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9j c3MvQ1NTR3JvdXBpbmdSdWxlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTR3JvdXBp bmdSdWxlLmNwcApAQCAtNDMsNyArNDMsNyBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLUNT U0dyb3VwaW5nUnVsZTo6Q1NTR3JvdXBpbmdSdWxlKFN0eWxlUnVsZUJsb2NrKiBncm91cFJ1bGUs IENTU1N0eWxlU2hlZXQqIHBhcmVudCkKK0NTU0dyb3VwaW5nUnVsZTo6Q1NTR3JvdXBpbmdSdWxl KFN0eWxlUnVsZUdyb3VwKiBncm91cFJ1bGUsIENTU1N0eWxlU2hlZXQqIHBhcmVudCkKICAgICA6 IENTU1J1bGUocGFyZW50KQogICAgICwgbV9ncm91cFJ1bGUoZ3JvdXBSdWxlKQogICAgICwgbV9j aGlsZFJ1bGVDU1NPTVdyYXBwZXJzKGdyb3VwUnVsZS0+Y2hpbGRSdWxlcygpLnNpemUoKSkKQEAg LTE1Myw3ICsxNTMsNyBAQCBDU1NSdWxlTGlzdCogQ1NTR3JvdXBpbmdSdWxlOjpjc3NSdWxlcygp IGNvbnN0CiB2b2lkIENTU0dyb3VwaW5nUnVsZTo6cmVhdHRhY2goU3R5bGVSdWxlQmFzZSogcnVs ZSkKIHsKICAgICBBU1NFUlQocnVsZSk7Ci0gICAgbV9ncm91cFJ1bGUgPSBzdGF0aWNfY2FzdDxT dHlsZVJ1bGVCbG9jayo+KHJ1bGUpOworICAgIG1fZ3JvdXBSdWxlID0gc3RhdGljX2Nhc3Q8U3R5 bGVSdWxlR3JvdXAqPihydWxlKTsKICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbV9jaGls ZFJ1bGVDU1NPTVdyYXBwZXJzLnNpemUoKTsgKytpKSB7CiAgICAgICAgIGlmIChtX2NoaWxkUnVs ZUNTU09NV3JhcHBlcnNbaV0pCiAgICAgICAgICAgICBtX2NoaWxkUnVsZUNTU09NV3JhcHBlcnNb aV0tPnJlYXR0YWNoKG1fZ3JvdXBSdWxlLT5jaGlsZFJ1bGVzKClbaV0uZ2V0KCkpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0dyb3VwaW5nUnVsZS5oIGIvU291cmNlL1dlYkNv cmUvY3NzL0NTU0dyb3VwaW5nUnVsZS5oCmluZGV4IGIyYmNmM2U4M2Y4MmIyMjVkMGIyM2U3ZDA0 YWMwZTBhNjhkYmE1NGQuLmQyZjY2YTJmOWZlMTkzYTczOWNiYzI0NDRkZGUzYTlmODJiNWFhMjgg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NHcm91cGluZ1J1bGUuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9jc3MvQ1NTR3JvdXBpbmdSdWxlLmgKQEAgLTQ4LDExICs0OCwxMSBAQCBw dWJsaWM6CiAgICAgQ1NTUnVsZSogaXRlbSh1bnNpZ25lZCBpbmRleCkgY29uc3Q7CiAKIHByb3Rl Y3RlZDoKLSAgICBDU1NHcm91cGluZ1J1bGUoU3R5bGVSdWxlQmxvY2sqIGdyb3VwUnVsZSwgQ1NT U3R5bGVTaGVldCogcGFyZW50KTsKKyAgICBDU1NHcm91cGluZ1J1bGUoU3R5bGVSdWxlR3JvdXAq IGdyb3VwUnVsZSwgQ1NTU3R5bGVTaGVldCogcGFyZW50KTsKICAgICAKICAgICB2b2lkIGFwcGVu ZENzc1RleHRGb3JJdGVtcyhTdHJpbmdCdWlsZGVyJikgY29uc3Q7CiAKLSAgICBSZWZQdHI8U3R5 bGVSdWxlQmxvY2s+IG1fZ3JvdXBSdWxlOworICAgIFJlZlB0cjxTdHlsZVJ1bGVHcm91cD4gbV9n cm91cFJ1bGU7CiAgICAgbXV0YWJsZSBWZWN0b3I8UmVmUHRyPENTU1J1bGU+ID4gbV9jaGlsZFJ1 bGVDU1NPTVdyYXBwZXJzOwogICAgIG11dGFibGUgT3duUHRyPENTU1J1bGVMaXN0PiBtX3J1bGVM aXN0Q1NTT01XcmFwcGVyOwogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHls ZVJ1bGUuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUnVsZS5jcHAKaW5kZXggZDAxOWVh NjZmNWMxYTc1MzdjNWQ3YWE0NWI5MTI2NmNmNmM4MDFmYy4uNGViYjNjNTNkNzA5YmU5ZDMxZTE1 OTE3MDQ0MzRlOTc2OGE2MWJhOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxl UnVsZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUnVsZS5jcHAKQEAgLTM3Mywx MyArMzczLDEzIEBAIHZvaWQgU3R5bGVSdWxlRm9udEZhY2U6OnJlcG9ydERlc2NlbmRhbnRNZW1v cnlVc2FnZShNZW1vcnlPYmplY3RJbmZvKiBtZW1vcnlPYmplCiB9CiAKIAotU3R5bGVSdWxlQmxv Y2s6OlN0eWxlUnVsZUJsb2NrKFR5cGUgdHlwZSwgVmVjdG9yPFJlZlB0cjxTdHlsZVJ1bGVCYXNl PiA+JiBhZG9wdFJ1bGUpCitTdHlsZVJ1bGVHcm91cDo6U3R5bGVSdWxlR3JvdXAoVHlwZSB0eXBl LCBWZWN0b3I8UmVmUHRyPFN0eWxlUnVsZUJhc2U+ID4mIGFkb3B0UnVsZSkKICAgICA6IFN0eWxl UnVsZUJhc2UodHlwZSwgMCkKIHsKICAgICBtX2NoaWxkUnVsZXMuc3dhcChhZG9wdFJ1bGUpOwog fQogCi1TdHlsZVJ1bGVCbG9jazo6U3R5bGVSdWxlQmxvY2soY29uc3QgU3R5bGVSdWxlQmxvY2sm IG8pCitTdHlsZVJ1bGVHcm91cDo6U3R5bGVSdWxlR3JvdXAoY29uc3QgU3R5bGVSdWxlR3JvdXAm IG8pCiAgICAgOiBTdHlsZVJ1bGVCYXNlKG8pCiAgICAgLCBtX2NoaWxkUnVsZXMoby5tX2NoaWxk UnVsZXMuc2l6ZSgpKQogewpAQCAtMzg3LDMwICszODcsMzAgQEAgU3R5bGVSdWxlQmxvY2s6OlN0 eWxlUnVsZUJsb2NrKGNvbnN0IFN0eWxlUnVsZUJsb2NrJiBvKQogICAgICAgICBtX2NoaWxkUnVs ZXNbaV0gPSBvLm1fY2hpbGRSdWxlc1tpXS0+Y29weSgpOwogfQogCi12b2lkIFN0eWxlUnVsZUJs b2NrOjp3cmFwcGVySW5zZXJ0UnVsZSh1bnNpZ25lZCBpbmRleCwgUGFzc1JlZlB0cjxTdHlsZVJ1 bGVCYXNlPiBydWxlKQordm9pZCBTdHlsZVJ1bGVHcm91cDo6d3JhcHBlckluc2VydFJ1bGUodW5z aWduZWQgaW5kZXgsIFBhc3NSZWZQdHI8U3R5bGVSdWxlQmFzZT4gcnVsZSkKIHsKICAgICBtX2No aWxkUnVsZXMuaW5zZXJ0KGluZGV4LCBydWxlKTsKIH0KICAgICAKLXZvaWQgU3R5bGVSdWxlQmxv Y2s6OndyYXBwZXJSZW1vdmVSdWxlKHVuc2lnbmVkIGluZGV4KQordm9pZCBTdHlsZVJ1bGVHcm91 cDo6d3JhcHBlclJlbW92ZVJ1bGUodW5zaWduZWQgaW5kZXgpCiB7CiAgICAgbV9jaGlsZFJ1bGVz LnJlbW92ZShpbmRleCk7CiB9CiAKLXZvaWQgU3R5bGVSdWxlQmxvY2s6OnJlcG9ydERlc2NlbmRh bnRNZW1vcnlVc2FnZShNZW1vcnlPYmplY3RJbmZvKiBtZW1vcnlPYmplY3RJbmZvKSBjb25zdAor dm9pZCBTdHlsZVJ1bGVHcm91cDo6cmVwb3J0RGVzY2VuZGFudE1lbW9yeVVzYWdlKE1lbW9yeU9i amVjdEluZm8qIG1lbW9yeU9iamVjdEluZm8pIGNvbnN0CiB7CiAgICAgTWVtb3J5Q2xhc3NJbmZv IGluZm8obWVtb3J5T2JqZWN0SW5mbywgdGhpcywgV2ViQ29yZU1lbW9yeVR5cGVzOjpDU1MpOwog ICAgIGluZm8uYWRkTWVtYmVyKG1fY2hpbGRSdWxlcyk7CiB9CiAKIFN0eWxlUnVsZU1lZGlhOjpT dHlsZVJ1bGVNZWRpYShQYXNzUmVmUHRyPE1lZGlhUXVlcnlTZXQ+IG1lZGlhLCBWZWN0b3I8UmVm UHRyPFN0eWxlUnVsZUJhc2U+ID4mIGFkb3B0UnVsZXMpCi0gICAgOiBTdHlsZVJ1bGVCbG9jayhN ZWRpYSwgYWRvcHRSdWxlcykKKyAgICA6IFN0eWxlUnVsZUdyb3VwKE1lZGlhLCBhZG9wdFJ1bGVz KQogICAgICwgbV9tZWRpYVF1ZXJpZXMobWVkaWEpCiB7CiB9CiAKIFN0eWxlUnVsZU1lZGlhOjpT dHlsZVJ1bGVNZWRpYShjb25zdCBTdHlsZVJ1bGVNZWRpYSYgbykKLSAgICA6IFN0eWxlUnVsZUJs b2NrKG8pCisgICAgOiBTdHlsZVJ1bGVHcm91cChvKQogewogICAgIGlmIChvLm1fbWVkaWFRdWVy aWVzKQogICAgICAgICBtX21lZGlhUXVlcmllcyA9IG8ubV9tZWRpYVF1ZXJpZXMtPmNvcHkoKTsK QEAgLTQyNSwxNCArNDI1LDE0IEBAIHZvaWQgU3R5bGVSdWxlTWVkaWE6OnJlcG9ydERlc2NlbmRh bnRNZW1vcnlVc2FnZShNZW1vcnlPYmplY3RJbmZvKiBtZW1vcnlPYmplY3RJCiAKICNpZiBFTkFC TEUoQ1NTM19DT05ESVRJT05BTF9SVUxFUykKIFN0eWxlUnVsZVN1cHBvcnRzOjpTdHlsZVJ1bGVT dXBwb3J0cyhjb25zdCBTdHJpbmcmIGNvbmRpdGlvblRleHQsIGJvb2wgY29uZGl0aW9uSXNTdXBw b3J0ZWQsIFZlY3RvcjxSZWZQdHI8U3R5bGVSdWxlQmFzZT4gPiYgYWRvcHRSdWxlcykKLSAgICA6 IFN0eWxlUnVsZUJsb2NrKFN1cHBvcnRzLCBhZG9wdFJ1bGVzKQorICAgIDogU3R5bGVSdWxlR3Jv dXAoU3VwcG9ydHMsIGFkb3B0UnVsZXMpCiAgICAgLCBtX2NvbmRpdGlvblRleHQoY29uZGl0aW9u VGV4dCkKICAgICAsIG1fY29uZGl0aW9uSXNTdXBwb3J0ZWQoY29uZGl0aW9uSXNTdXBwb3J0ZWQp CiB7CiB9CiAKIFN0eWxlUnVsZVN1cHBvcnRzOjpTdHlsZVJ1bGVTdXBwb3J0cyhjb25zdCBTdHls ZVJ1bGVTdXBwb3J0cyYgbykKLSAgICA6IFN0eWxlUnVsZUJsb2NrKG8pCisgICAgOiBTdHlsZVJ1 bGVHcm91cChvKQogICAgICwgbV9jb25kaXRpb25UZXh0KG8ubV9jb25kaXRpb25UZXh0KQogICAg ICwgbV9jb25kaXRpb25Jc1N1cHBvcnRlZChvLm1fY29uZGl0aW9uSXNTdXBwb3J0ZWQpCiB7CkBA IC00NDAsMTMgKzQ0MCwxMyBAQCBTdHlsZVJ1bGVTdXBwb3J0czo6U3R5bGVSdWxlU3VwcG9ydHMo Y29uc3QgU3R5bGVSdWxlU3VwcG9ydHMmIG8pCiAjZW5kaWYKIAogU3R5bGVSdWxlUmVnaW9uOjpT dHlsZVJ1bGVSZWdpb24oVmVjdG9yPE93blB0cjxDU1NQYXJzZXJTZWxlY3Rvcj4gPiogc2VsZWN0 b3JzLCBWZWN0b3I8UmVmUHRyPFN0eWxlUnVsZUJhc2U+ID4mIGFkb3B0UnVsZXMpCi0gICAgOiBT dHlsZVJ1bGVCbG9jayhSZWdpb24sIGFkb3B0UnVsZXMpCisgICAgOiBTdHlsZVJ1bGVHcm91cChS ZWdpb24sIGFkb3B0UnVsZXMpCiB7CiAgICAgbV9zZWxlY3Rvckxpc3QuYWRvcHRTZWxlY3RvclZl Y3Rvcigqc2VsZWN0b3JzKTsKIH0KIAogU3R5bGVSdWxlUmVnaW9uOjpTdHlsZVJ1bGVSZWdpb24o Y29uc3QgU3R5bGVSdWxlUmVnaW9uJiBvKQotICAgIDogU3R5bGVSdWxlQmxvY2sobykKKyAgICA6 IFN0eWxlUnVsZUdyb3VwKG8pCiAgICAgLCBtX3NlbGVjdG9yTGlzdChvLm1fc2VsZWN0b3JMaXN0 KQogewogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUnVsZS5oIGIvU291 cmNlL1dlYkNvcmUvY3NzL1N0eWxlUnVsZS5oCmluZGV4IDRiZGFjZmNhNGE5NWNmYWM2YTAxYTY2 YmEzOGRkYWI0NDY2ZTk1MjEuLmZiYTVhNzQ1ZDRhNmMyM2JiMGY4MmI5N2YxZGE1Nzg4YmIxMzI4 ZjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJ1bGUuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9jc3MvU3R5bGVSdWxlLmgKQEAgLTE4NSw3ICsxODUsNyBAQCBwcml2YXRlOgog ICAgIENTU1NlbGVjdG9yTGlzdCBtX3NlbGVjdG9yTGlzdDsKIH07CiAKLWNsYXNzIFN0eWxlUnVs ZUJsb2NrIDogcHVibGljIFN0eWxlUnVsZUJhc2UgeworY2xhc3MgU3R5bGVSdWxlR3JvdXAgOiBw dWJsaWMgU3R5bGVSdWxlQmFzZSB7CiBwdWJsaWM6CiAgICAgY29uc3QgVmVjdG9yPFJlZlB0cjxT dHlsZVJ1bGVCYXNlPiA+JiBjaGlsZFJ1bGVzKCkgY29uc3QgeyByZXR1cm4gbV9jaGlsZFJ1bGVz OyB9CiAgICAgCkBAIC0xOTUsMTQgKzE5NSwxNCBAQCBwdWJsaWM6CiAgICAgdm9pZCByZXBvcnRE ZXNjZW5kYW50TWVtb3J5VXNhZ2UoTWVtb3J5T2JqZWN0SW5mbyopIGNvbnN0OwogICAgIAogcHJv dGVjdGVkOgotICAgIFN0eWxlUnVsZUJsb2NrKFR5cGUsIFZlY3RvcjxSZWZQdHI8U3R5bGVSdWxl QmFzZT4gPiYgYWRvcHRSdWxlKTsKLSAgICBTdHlsZVJ1bGVCbG9jayhjb25zdCBTdHlsZVJ1bGVC bG9jayYpOworICAgIFN0eWxlUnVsZUdyb3VwKFR5cGUsIFZlY3RvcjxSZWZQdHI8U3R5bGVSdWxl QmFzZT4gPiYgYWRvcHRSdWxlKTsKKyAgICBTdHlsZVJ1bGVHcm91cChjb25zdCBTdHlsZVJ1bGVH cm91cCYpOwogICAgIAogcHJpdmF0ZToKICAgICBWZWN0b3I8UmVmUHRyPFN0eWxlUnVsZUJhc2U+ ID4gbV9jaGlsZFJ1bGVzOwogfTsKIAotY2xhc3MgU3R5bGVSdWxlTWVkaWEgOiBwdWJsaWMgU3R5 bGVSdWxlQmxvY2sgeworY2xhc3MgU3R5bGVSdWxlTWVkaWEgOiBwdWJsaWMgU3R5bGVSdWxlR3Jv dXAgewogcHVibGljOgogICAgIHN0YXRpYyBQYXNzUmVmUHRyPFN0eWxlUnVsZU1lZGlhPiBjcmVh dGUoUGFzc1JlZlB0cjxNZWRpYVF1ZXJ5U2V0PiBtZWRpYSwgVmVjdG9yPFJlZlB0cjxTdHlsZVJ1 bGVCYXNlPiA+JiBhZG9wdFJ1bGVzKQogICAgIHsKQEAgLTIyMyw3ICsyMjMsNyBAQCBwcml2YXRl OgogfTsKIAogI2lmIEVOQUJMRShDU1MzX0NPTkRJVElPTkFMX1JVTEVTKQotY2xhc3MgU3R5bGVS dWxlU3VwcG9ydHMgOiBwdWJsaWMgU3R5bGVSdWxlQmxvY2sgeworY2xhc3MgU3R5bGVSdWxlU3Vw cG9ydHMgOiBwdWJsaWMgU3R5bGVSdWxlR3JvdXAgewogcHVibGljOgogICAgIHN0YXRpYyBQYXNz UmVmUHRyPFN0eWxlUnVsZVN1cHBvcnRzPiBjcmVhdGUoY29uc3QgU3RyaW5nJiBjb25kaXRpb25U ZXh0LCBib29sIGNvbmRpdGlvbklzU3VwcG9ydGVkLCBWZWN0b3I8UmVmUHRyPFN0eWxlUnVsZUJh c2U+ID4mIGFkb3B0UnVsZXMpCiAgICAgewpAQCAtMjQzLDcgKzI0Myw3IEBAIHByaXZhdGU6CiB9 OwogI2VuZGlmCiAKLWNsYXNzIFN0eWxlUnVsZVJlZ2lvbiA6IHB1YmxpYyBTdHlsZVJ1bGVCbG9j ayB7CitjbGFzcyBTdHlsZVJ1bGVSZWdpb24gOiBwdWJsaWMgU3R5bGVSdWxlR3JvdXAgewogcHVi bGljOgogICAgIHN0YXRpYyBQYXNzUmVmUHRyPFN0eWxlUnVsZVJlZ2lvbj4gY3JlYXRlKFZlY3Rv cjxPd25QdHI8Q1NTUGFyc2VyU2VsZWN0b3I+ID4qIHNlbGVjdG9ycywgVmVjdG9yPFJlZlB0cjxT dHlsZVJ1bGVCYXNlPiA+JiBhZG9wdFJ1bGVzKQogICAgIHsKQEAgLTI2NCw3ICsyNjQsNyBAQCBw cml2YXRlOgogfTsKIAogI2lmIEVOQUJMRShTSEFET1dfRE9NKQotY2xhc3MgU3R5bGVSdWxlSG9z dCA6IHB1YmxpYyBTdHlsZVJ1bGVCbG9jayB7CitjbGFzcyBTdHlsZVJ1bGVIb3N0IDogcHVibGlj IFN0eWxlUnVsZUdyb3VwIHsKIHB1YmxpYzoKICAgICBzdGF0aWMgUGFzc1JlZlB0cjxTdHlsZVJ1 bGVIb3N0PiBjcmVhdGUoVmVjdG9yPFJlZlB0cjxTdHlsZVJ1bGVCYXNlPiA+JiBhZG9wdFJ1bGVz KQogICAgIHsKQEAgLTI3NCw4ICsyNzQsOCBAQCBwdWJsaWM6CiAgICAgUGFzc1JlZlB0cjxTdHls ZVJ1bGVIb3N0PiBjb3B5KCkgY29uc3QgeyByZXR1cm4gYWRvcHRSZWYobmV3IFN0eWxlUnVsZUhv c3QoKnRoaXMpKTsgfQogCiBwcml2YXRlOgotICAgIFN0eWxlUnVsZUhvc3QoVmVjdG9yPFJlZlB0 cjxTdHlsZVJ1bGVCYXNlPiA+JiBhZG9wdFJ1bGVzKSA6IFN0eWxlUnVsZUJsb2NrKEhvc3RJbnRl cm5hbCwgYWRvcHRSdWxlcykgeyB9Ci0gICAgU3R5bGVSdWxlSG9zdChjb25zdCBTdHlsZVJ1bGVI b3N0JiBvKSA6IFN0eWxlUnVsZUJsb2NrKG8pIHsgfQorICAgIFN0eWxlUnVsZUhvc3QoVmVjdG9y PFJlZlB0cjxTdHlsZVJ1bGVCYXNlPiA+JiBhZG9wdFJ1bGVzKSA6IFN0eWxlUnVsZUdyb3VwKEhv c3RJbnRlcm5hbCwgYWRvcHRSdWxlcykgeyB9CisgICAgU3R5bGVSdWxlSG9zdChjb25zdCBTdHls ZVJ1bGVIb3N0JiBvKSA6IFN0eWxlUnVsZUdyb3VwKG8pIHsgfQogfTsKICNlbmRpZgogCkBAIC0z MDMsMjEgKzMwMywyMSBAQCBwcml2YXRlOgogfTsKICNlbmRpZiAvLyBFTkFCTEUoQ1NTX0RFVklD RV9BREFQVEFUSU9OKQogCi1pbmxpbmUgY29uc3QgU3R5bGVSdWxlTWVkaWEqIHRvU3R5bGVSdWxl TWVkaWEoY29uc3QgU3R5bGVSdWxlQmxvY2sqIHJ1bGUpCitpbmxpbmUgY29uc3QgU3R5bGVSdWxl TWVkaWEqIHRvU3R5bGVSdWxlTWVkaWEoY29uc3QgU3R5bGVSdWxlR3JvdXAqIHJ1bGUpCiB7CiAg ICAgQVNTRVJUKCFydWxlIHx8IHJ1bGUtPmlzTWVkaWFSdWxlKCkpOwogICAgIHJldHVybiBzdGF0 aWNfY2FzdDxjb25zdCBTdHlsZVJ1bGVNZWRpYSo+KHJ1bGUpOwogfQogCiAjaWYgRU5BQkxFKENT UzNfQ09ORElUSU9OQUxfUlVMRVMpCi1pbmxpbmUgY29uc3QgU3R5bGVSdWxlU3VwcG9ydHMqIHRv U3R5bGVSdWxlU3VwcG9ydHMoY29uc3QgU3R5bGVSdWxlQmxvY2sqIHJ1bGUpCitpbmxpbmUgY29u c3QgU3R5bGVSdWxlU3VwcG9ydHMqIHRvU3R5bGVSdWxlU3VwcG9ydHMoY29uc3QgU3R5bGVSdWxl R3JvdXAqIHJ1bGUpCiB7CiAgICAgQVNTRVJUKCFydWxlIHx8IHJ1bGUtPmlzU3VwcG9ydHNSdWxl KCkpOwogICAgIHJldHVybiBzdGF0aWNfY2FzdDxjb25zdCBTdHlsZVJ1bGVTdXBwb3J0cyo+KHJ1 bGUpOwogfQogI2VuZGlmCiAKLWlubGluZSBjb25zdCBTdHlsZVJ1bGVSZWdpb24qIHRvU3R5bGVS dWxlUmVnaW9uKGNvbnN0IFN0eWxlUnVsZUJsb2NrKiBydWxlKQoraW5saW5lIGNvbnN0IFN0eWxl UnVsZVJlZ2lvbiogdG9TdHlsZVJ1bGVSZWdpb24oY29uc3QgU3R5bGVSdWxlR3JvdXAqIHJ1bGUp CiB7CiAgICAgQVNTRVJUKCFydWxlIHx8IHJ1bGUtPmlzUmVnaW9uUnVsZSgpKTsKICAgICByZXR1 cm4gc3RhdGljX2Nhc3Q8Y29uc3QgU3R5bGVSdWxlUmVnaW9uKj4ocnVsZSk7Cg==