105864 2012-12-29 16:44:35 -0800 Rename StyleResolver's member variable that holds SelectorChecker to a proper name. 2013-01-08 21:06:39 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 89879 1 dglazkov dglazkov allan.jensen cmarcelo eric koivisto macpherson menard ojan.autocc webkit.review.bot oldest_to_newest 798181 0 dglazkov 2012-12-29 16:44:35 -0800 Rename StyleResolver's member variable that holds SelectorChecker to a proper name. 798182 1 180947 dglazkov 2012-12-29 16:46:45 -0800 Created attachment 180947 Patch 798184 2 180947 eric 2012-12-29 16:49:27 -0800 Comment on attachment 180947 Patch LGTM. 798186 3 180947 webkit.review.bot 2012-12-29 17:24:03 -0800 Comment on attachment 180947 Patch Clearing flags on attachment: 180947 Committed r138572: <http://trac.webkit.org/changeset/138572> 798187 4 webkit.review.bot 2012-12-29 17:24:07 -0800 All reviewed patches have been landed. Closing bug. 798200 5 180947 koivisto 2012-12-30 00:35:52 -0800 Comment on attachment 180947 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=180947&action=review > Source/WebCore/css/StyleResolver.cpp:2260 > - SelectorChecker::SelectorMatch match = m_checker.checkSelector(context, m_dynamicPseudo); > + SelectorChecker::SelectorMatch match = m_selectorChecker.checkSelector(context, m_dynamicPseudo); To reduce redundancy it would also be nice to remove the word 'selector' from the SelectorChecker methods. 798201 6 koivisto 2012-12-30 00:38:22 -0800 ...and enums too SelectorChecker::SelectorMatch -> SelectorChecker::Match 802980 7 dglazkov 2013-01-08 21:06:39 -0800 (In reply to comment #6) > ...and enums too > > SelectorChecker::SelectorMatch -> SelectorChecker::Match Good idea! See bug 106413. 180947 2012-12-29 16:46:45 -0800 2012-12-30 00:35:52 -0800 Patch bug-105864-20121229164355.patch text/plain 8833 dglazkov U3VidmVyc2lvbiBSZXZpc2lvbjogMTM4NTcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTAyYWEzZDJjNzlmNjU2 YTVkZWY5Njk3ZDUyMmJhYjM4YzU0ODg4Yy4uOWY0M2FkYWM1MDgyN2QzOGFhM2QyNTQwMzNkNjNh ODVlNTE0N2ExMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE5IEBACiAyMDEyLTEyLTI5ICBEaW1p dHJpIEdsYXprb3YgIDxkZ2xhemtvdkBjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgUmVuYW1lIFN0 eWxlUmVzb2x2ZXIncyBtZW1iZXIgdmFyaWFibGUgdGhhdCBob2xkcyBTZWxlY3RvckNoZWNrZXIg dG8gYSBwcm9wZXIgbmFtZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEwNTg2NAorCisgICAgICAgIEluIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMDU2NjAjYzExLCBBbnR0aSBzdWdnZXN0ZWQgcmVuYW1pbmcgbV9jaGVj a2VyIHRvCisgICAgICAgIG1fc2VsZWN0b3JDaGVja2VyLiBJJ3ZlIGZvcmdvdHRlbiBhYm91dCB0 aGF0LCBidXQgbm93IEkgcmVtZW1iZXJlZCBpdC4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBObyBjaGFuZ2UgaW4gZnVuY3Rpb25hbGl0eSwgY292ZXJl ZCBieSBleGlzdGluZyB0ZXN0cy4KKworICAgICAgICAqIGNzcy9TdHlsZVJlc29sdmVyLmNwcC9o OiBSZW5hbWVkIGFsbCBpbnN0YW5jZXMgb2YgbV9jaGVja2VyIHRvIG1fc2VsZWN0b3JDaGVja2Vy LgorCisyMDEyLTEyLTI5ICBEaW1pdHJpIEdsYXprb3YgIDxkZ2xhemtvdkBjaHJvbWl1bS5vcmc+ CisKICAgICAgICAgTW92ZSBwb2ludGVyIHRvIERvY3VtZW50IHVwIGZyb20gU2VsZWN0b3JDaGVj a2VyIHRvIFN0eWxlUmVzb2x2ZXIuCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMDU4NjMKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL1N0 eWxlUmVzb2x2ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIuY3BwCmlu ZGV4IDEzYWQzMWY0MWNmMTY3MTUzMTNiMWYwYmQxYWE2ODUxZmRmNzVmODcuLmMwNjNkZTNlNGM4 ZWRkNzU5OGE5MTFjYWQyNWI5ZjNjNGQxYWQ1YmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2Nzcy9TdHlsZVJlc29sdmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNv bHZlci5jcHAKQEAgLTI2NSw3ICsyNjUsNyBAQCBTdHlsZVJlc29sdmVyOjpTdHlsZVJlc29sdmVy KERvY3VtZW50KiBkb2N1bWVudCwgYm9vbCBtYXRjaEF1dGhvckFuZFVzZXJTdHlsZXMpCiAgICAg LCBtX21hdGNoZWRQcm9wZXJ0aWVzQ2FjaGVBZGRpdGlvbnNTaW5jZUxhc3RTd2VlcCgwKQogICAg ICwgbV9tYXRjaGVkUHJvcGVydGllc0NhY2hlU3dlZXBUaW1lcih0aGlzLCAmU3R5bGVSZXNvbHZl cjo6c3dlZXBNYXRjaGVkUHJvcGVydGllc0NhY2hlKQogICAgICwgbV9kb2N1bWVudChkb2N1bWVu dCkKLSAgICAsIG1fY2hlY2tlcihkb2N1bWVudCkKKyAgICAsIG1fc2VsZWN0b3JDaGVja2VyKGRv Y3VtZW50KQogICAgICwgbV9wYXJlbnRTdHlsZSgwKQogICAgICwgbV9yb290RWxlbWVudFN0eWxl KDApCiAgICAgLCBtX2VsZW1lbnQoMCkKQEAgLTY3Niw3ICs2NzYsNyBAQCB2b2lkIFN0eWxlUmVz b2x2ZXI6OmNvbGxlY3RNYXRjaGluZ1J1bGVzKFJ1bGVTZXQqIHJ1bGVzLCBpbnQmIGZpcnN0UnVs ZUluZGV4LCBpbgogCiAgICAgaWYgKG1fZWxlbWVudC0+aXNMaW5rKCkpCiAgICAgICAgIGNvbGxl Y3RNYXRjaGluZ1J1bGVzRm9yTGlzdChydWxlcy0+bGlua1BzZXVkb0NsYXNzUnVsZXMoKSwgZmly c3RSdWxlSW5kZXgsIGxhc3RSdWxlSW5kZXgsIG9wdGlvbnMpOwotICAgIGlmIChtX2NoZWNrZXIu bWF0Y2hlc0ZvY3VzUHNldWRvQ2xhc3MobV9lbGVtZW50KSkKKyAgICBpZiAobV9zZWxlY3RvckNo ZWNrZXIubWF0Y2hlc0ZvY3VzUHNldWRvQ2xhc3MobV9lbGVtZW50KSkKICAgICAgICAgY29sbGVj dE1hdGNoaW5nUnVsZXNGb3JMaXN0KHJ1bGVzLT5mb2N1c1BzZXVkb0NsYXNzUnVsZXMoKSwgZmly c3RSdWxlSW5kZXgsIGxhc3RSdWxlSW5kZXgsIG9wdGlvbnMpOwogICAgIGNvbGxlY3RNYXRjaGlu Z1J1bGVzRm9yTGlzdChydWxlcy0+dGFnUnVsZXMobV9lbGVtZW50LT5sb2NhbE5hbWUoKS5pbXBs KCkpLCBmaXJzdFJ1bGVJbmRleCwgbGFzdFJ1bGVJbmRleCwgb3B0aW9ucyk7CiAgICAgY29sbGVj dE1hdGNoaW5nUnVsZXNGb3JMaXN0KHJ1bGVzLT51bml2ZXJzYWxSdWxlcygpLCBmaXJzdFJ1bGVJ bmRleCwgbGFzdFJ1bGVJbmRleCwgb3B0aW9ucyk7CkBAIC03MDUsNyArNzA1LDcgQEAgdm9pZCBT dHlsZVJlc29sdmVyOjpzb3J0QW5kVHJhbnNmZXJNYXRjaGVkUnVsZXMoTWF0Y2hSZXN1bHQmIHJl c3VsdCkKIAogICAgIHNvcnRNYXRjaGVkUnVsZXMoKTsKIAotICAgIGlmIChtX2NoZWNrZXIubW9k ZSgpID09IFNlbGVjdG9yQ2hlY2tlcjo6Q29sbGVjdGluZ1J1bGVzKSB7CisgICAgaWYgKG1fc2Vs ZWN0b3JDaGVja2VyLm1vZGUoKSA9PSBTZWxlY3RvckNoZWNrZXI6OkNvbGxlY3RpbmdSdWxlcykg ewogICAgICAgICBpZiAoIW1fcnVsZUxpc3QpCiAgICAgICAgICAgICBtX3J1bGVMaXN0ID0gU3Rh dGljQ1NTUnVsZUxpc3Q6OmNyZWF0ZSgpOwogICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBp IDwgbV9tYXRjaGVkUnVsZXMuc2l6ZSgpOyArK2kpCkBAIC04NzAsNyArODcwLDcgQEAgdm9pZCBT dHlsZVJlc29sdmVyOjpjb2xsZWN0TWF0Y2hpbmdSdWxlc0Zvckxpc3QoY29uc3QgVmVjdG9yPFJ1 bGVEYXRhPiogcnVsZXMsIGkKICAgICAgICAgICAgIC8vIElmIHdlJ3JlIG1hdGNoaW5nIG5vcm1h bCBydWxlcywgc2V0IGEgcHNldWRvIGJpdCBpZgogICAgICAgICAgICAgLy8gd2UgcmVhbGx5IGp1 c3QgbWF0Y2hlZCBhIHBzZXVkby1lbGVtZW50LgogICAgICAgICAgICAgaWYgKG1fZHluYW1pY1Bz ZXVkbyAhPSBOT1BTRVVETyAmJiBtX3BzZXVkb1N0eWxlID09IE5PUFNFVURPKSB7Ci0gICAgICAg ICAgICAgICAgaWYgKG1fY2hlY2tlci5tb2RlKCkgPT0gU2VsZWN0b3JDaGVja2VyOjpDb2xsZWN0 aW5nUnVsZXMpIHsKKyAgICAgICAgICAgICAgICBpZiAobV9zZWxlY3RvckNoZWNrZXIubW9kZSgp ID09IFNlbGVjdG9yQ2hlY2tlcjo6Q29sbGVjdGluZ1J1bGVzKSB7CiAgICAgICAgICAgICAgICAg ICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkTWF0Y2hSdWxlKGNvb2tpZSwgZmFsc2Up OwogICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgICAgICAgICB9CkBAIC0x MDU4LDkgKzEwNTgsOSBAQCBib29sIFN0eWxlUmVzb2x2ZXI6OnN0eWxlU2hhcmluZ0NhbmRpZGF0 ZU1hdGNoZXNSdWxlU2V0KFJ1bGVTZXQqIHJ1bGVTZXQpCiAgICAgbV9tYXRjaGVkUnVsZXMuY2xl YXIoKTsKIAogICAgIGludCBmaXJzdFJ1bGVJbmRleCA9IC0xLCBsYXN0UnVsZUluZGV4ID0gLTE7 Ci0gICAgbV9jaGVja2VyLnNldE1vZGUoU2VsZWN0b3JDaGVja2VyOjpTaGFyaW5nUnVsZXMpOwor ICAgIG1fc2VsZWN0b3JDaGVja2VyLnNldE1vZGUoU2VsZWN0b3JDaGVja2VyOjpTaGFyaW5nUnVs ZXMpOwogICAgIGNvbGxlY3RNYXRjaGluZ1J1bGVzKHJ1bGVTZXQsIGZpcnN0UnVsZUluZGV4LCBs YXN0UnVsZUluZGV4LCBmYWxzZSk7Ci0gICAgbV9jaGVja2VyLnNldE1vZGUoU2VsZWN0b3JDaGVj a2VyOjpSZXNvbHZpbmdTdHlsZSk7CisgICAgbV9zZWxlY3RvckNoZWNrZXIuc2V0TW9kZShTZWxl Y3RvckNoZWNrZXI6OlJlc29sdmluZ1N0eWxlKTsKICAgICBpZiAobV9tYXRjaGVkUnVsZXMuaXNF bXB0eSgpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgbV9tYXRjaGVkUnVsZXMuY2xlYXIo KTsKQEAgLTEzMzQsNyArMTMzNCw3IEBAIHZvaWQgU3R5bGVSZXNvbHZlcjo6bWF0Y2hVQVJ1bGVz KE1hdGNoUmVzdWx0JiByZXN1bHQpCiAgICAgbWF0Y2hVQVJ1bGVzKHJlc3VsdCwgdXNlckFnZW50 U3R5bGVTaGVldCk7CiAKICAgICAvLyBJbiBxdWlya3MgbW9kZSwgd2UgbWF0Y2ggcnVsZXMgZnJv bSB0aGUgcXVpcmtzIHVzZXIgYWdlbnQgc2hlZXQuCi0gICAgaWYgKCFtX2NoZWNrZXIuc3RyaWN0 UGFyc2luZygpKQorICAgIGlmICghbV9zZWxlY3RvckNoZWNrZXIuc3RyaWN0UGFyc2luZygpKQog ICAgICAgICBtYXRjaFVBUnVsZXMocmVzdWx0LCBkZWZhdWx0UXVpcmtzU3R5bGUpOwogCiAgICAg Ly8gSWYgZG9jdW1lbnQgdXNlcyB2aWV3IHNvdXJjZSBzdHlsZXMgKGluIHZpZXcgc291cmNlIG1v ZGUgb3IgaW4geG1sIHZpZXdlciBtb2RlKSwgdGhlbiB3ZSBtYXRjaCBydWxlcyBmcm9tIHRoZSB2 aWV3IHNvdXJjZSBzdHlsZSBzaGVldC4KQEAgLTE5MTUsNyArMTkxNSw3IEBAIHZvaWQgU3R5bGVS ZXNvbHZlcjo6YWRqdXN0UmVuZGVyU3R5bGUoUmVuZGVyU3R5bGUqIHN0eWxlLCBSZW5kZXJTdHls ZSogcGFyZW50U3R5CiAgICAgICAgIC8vIHByb3BlcnR5LgogICAgICAgICAvLyBTaXRlcyBhbHNv IGNvbW1vbmx5IHVzZSBkaXNwbGF5OmlubGluZS9ibG9jayBvbiA8dGQ+cyBhbmQgPHRhYmxlPnMu IEluIHF1aXJrcyBtb2RlIHdlIGZvcmNlCiAgICAgICAgIC8vIHRoZXNlIHRhZ3MgdG8gcmV0YWlu IHRoZWlyIGRpc3BsYXkgdHlwZXMuCi0gICAgICAgIGlmICghbV9jaGVja2VyLnN0cmljdFBhcnNp bmcoKSAmJiBlKSB7CisgICAgICAgIGlmICghbV9zZWxlY3RvckNoZWNrZXIuc3RyaWN0UGFyc2lu ZygpICYmIGUpIHsKICAgICAgICAgICAgIGlmIChlLT5oYXNUYWdOYW1lKHRkVGFnKSkgewogICAg ICAgICAgICAgICAgIHN0eWxlLT5zZXREaXNwbGF5KFRBQkxFX0NFTEwpOwogICAgICAgICAgICAg ICAgIHN0eWxlLT5zZXRGbG9hdGluZyhOb0Zsb2F0KTsKQEAgLTE5NjIsNyArMTk2Miw3IEBAIHZv aWQgU3R5bGVSZXNvbHZlcjo6YWRqdXN0UmVuZGVyU3R5bGUoUmVuZGVyU3R5bGUqIHN0eWxlLCBS ZW5kZXJTdHlsZSogcGFyZW50U3R5CiAKICAgICAgICAgLy8gQWJzb2x1dGUvZml4ZWQgcG9zaXRp b25lZCBlbGVtZW50cywgZmxvYXRpbmcgZWxlbWVudHMgYW5kIHRoZSBkb2N1bWVudCBlbGVtZW50 IG5lZWQgYmxvY2stbGlrZSBvdXRzaWRlIGRpc3BsYXkuCiAgICAgICAgIGlmIChzdHlsZS0+aGFz T3V0T2ZGbG93UG9zaXRpb24oKSB8fCBzdHlsZS0+aXNGbG9hdGluZygpIHx8IChlICYmIGUtPmRv Y3VtZW50KCktPmRvY3VtZW50RWxlbWVudCgpID09IGUpKQotICAgICAgICAgICAgc3R5bGUtPnNl dERpc3BsYXkoZXF1aXZhbGVudEJsb2NrRGlzcGxheShzdHlsZS0+ZGlzcGxheSgpLCBzdHlsZS0+ aXNGbG9hdGluZygpLCBtX2NoZWNrZXIuc3RyaWN0UGFyc2luZygpKSk7CisgICAgICAgICAgICBz dHlsZS0+c2V0RGlzcGxheShlcXVpdmFsZW50QmxvY2tEaXNwbGF5KHN0eWxlLT5kaXNwbGF5KCks IHN0eWxlLT5pc0Zsb2F0aW5nKCksIG1fc2VsZWN0b3JDaGVja2VyLnN0cmljdFBhcnNpbmcoKSkp OwogCiAgICAgICAgIC8vIEZJWE1FOiBEb24ndCBzdXBwb3J0IHRoaXMgbXV0YXRpb24gZm9yIHBz ZXVkbyBzdHlsZXMgbGlrZSBmaXJzdC1sZXR0ZXIgb3IgZmlyc3QtbGluZSwgc2luY2UgaXQncyBu b3QgY29tcGxldGVseQogICAgICAgICAvLyBjbGVhciBob3cgdGhhdCBzaG91bGQgd29yay4KQEAg LTE5OTIsNyArMTk5Miw3IEBAIHZvaWQgU3R5bGVSZXNvbHZlcjo6YWRqdXN0UmVuZGVyU3R5bGUo UmVuZGVyU3R5bGUqIHN0eWxlLCBSZW5kZXJTdHlsZSogcGFyZW50U3R5CiAKICAgICAgICAgaWYg KGlzRGlzcGxheUZsZXhpYmxlQm94KHBhcmVudFN0eWxlLT5kaXNwbGF5KCkpKSB7CiAgICAgICAg ICAgICBzdHlsZS0+c2V0RmxvYXRpbmcoTm9GbG9hdCk7Ci0gICAgICAgICAgICBzdHlsZS0+c2V0 RGlzcGxheShlcXVpdmFsZW50QmxvY2tEaXNwbGF5KHN0eWxlLT5kaXNwbGF5KCksIHN0eWxlLT5p c0Zsb2F0aW5nKCksIG1fY2hlY2tlci5zdHJpY3RQYXJzaW5nKCkpKTsKKyAgICAgICAgICAgIHN0 eWxlLT5zZXREaXNwbGF5KGVxdWl2YWxlbnRCbG9ja0Rpc3BsYXkoc3R5bGUtPmRpc3BsYXkoKSwg c3R5bGUtPmlzRmxvYXRpbmcoKSwgbV9zZWxlY3RvckNoZWNrZXIuc3RyaWN0UGFyc2luZygpKSk7 CiAgICAgICAgIH0KICAgICB9CiAKQEAgLTIyMDIsNyArMjIwMiw3IEBAIFBhc3NSZWZQdHI8Q1NT UnVsZUxpc3Q+IFN0eWxlUmVzb2x2ZXI6OnBzZXVkb1N0eWxlUnVsZXNGb3JFbGVtZW50KEVsZW1l bnQqIGUsIFBzCiAgICAgaWYgKCFlIHx8ICFlLT5kb2N1bWVudCgpLT5oYXZlU3R5bGVzaGVldHNM b2FkZWQoKSkKICAgICAgICAgcmV0dXJuIDA7CiAKLSAgICBtX2NoZWNrZXIuc2V0TW9kZShTZWxl Y3RvckNoZWNrZXI6OkNvbGxlY3RpbmdSdWxlcyk7CisgICAgbV9zZWxlY3RvckNoZWNrZXIuc2V0 TW9kZShTZWxlY3RvckNoZWNrZXI6OkNvbGxlY3RpbmdSdWxlcyk7CiAKICAgICBpbml0RWxlbWVu dChlKTsKICAgICBpbml0Rm9yU3R5bGVSZXNvbHZlKGUsIDAsIHBzZXVkb0lkKTsKQEAgLTIyMjYs NyArMjIyNiw3IEBAIFBhc3NSZWZQdHI8Q1NTUnVsZUxpc3Q+IFN0eWxlUmVzb2x2ZXI6OnBzZXVk b1N0eWxlUnVsZXNGb3JFbGVtZW50KEVsZW1lbnQqIGUsIFBzCiAgICAgICAgIG1fc2FtZU9yaWdp bk9ubHkgPSBmYWxzZTsKICAgICB9CiAKLSAgICBtX2NoZWNrZXIuc2V0TW9kZShTZWxlY3RvckNo ZWNrZXI6OlJlc29sdmluZ1N0eWxlKTsKKyAgICBtX3NlbGVjdG9yQ2hlY2tlci5zZXRNb2RlKFNl bGVjdG9yQ2hlY2tlcjo6UmVzb2x2aW5nU3R5bGUpOwogCiAgICAgcmV0dXJuIG1fcnVsZUxpc3Qu cmVsZWFzZSgpOwogfQpAQCAtMjI0OCw3ICsyMjQ4LDcgQEAgaW5saW5lIGJvb2wgU3R5bGVSZXNv bHZlcjo6Y2hlY2tTZWxlY3Rvcihjb25zdCBSdWxlRGF0YSYgcnVsZURhdGEsIGNvbnN0IENvbnRh aW4KICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgaWYgKCFTZWxlY3RvckNoZWNr ZXI6OmZhc3RDaGVja1JpZ2h0bW9zdEF0dHJpYnV0ZVNlbGVjdG9yKG1fZWxlbWVudCwgcnVsZURh dGEuc2VsZWN0b3IoKSkpCiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgIHJldHVy biBtX2NoZWNrZXIuZmFzdENoZWNrU2VsZWN0b3IocnVsZURhdGEuc2VsZWN0b3IoKSwgbV9lbGVt ZW50KTsKKyAgICAgICAgcmV0dXJuIG1fc2VsZWN0b3JDaGVja2VyLmZhc3RDaGVja1NlbGVjdG9y KHJ1bGVEYXRhLnNlbGVjdG9yKCksIG1fZWxlbWVudCk7CiAgICAgfQogCiAgICAgLy8gU2xvdyBw YXRoLgpAQCAtMjI1Nyw3ICsyMjU3LDcgQEAgaW5saW5lIGJvb2wgU3R5bGVSZXNvbHZlcjo6Y2hl Y2tTZWxlY3Rvcihjb25zdCBSdWxlRGF0YSYgcnVsZURhdGEsIGNvbnN0IENvbnRhaW4KICAgICBj b250ZXh0LmVsZW1lbnRQYXJlbnRTdHlsZSA9IG1fcGFyZW50Tm9kZSA/IG1fcGFyZW50Tm9kZS0+ cmVuZGVyU3R5bGUoKSA6IDA7CiAgICAgY29udGV4dC5zY29wZSA9IHNjb3BlOwogICAgIGNvbnRl eHQucHNldWRvU3R5bGUgPSBtX3BzZXVkb1N0eWxlOwotICAgIFNlbGVjdG9yQ2hlY2tlcjo6U2Vs ZWN0b3JNYXRjaCBtYXRjaCA9IG1fY2hlY2tlci5jaGVja1NlbGVjdG9yKGNvbnRleHQsIG1fZHlu YW1pY1BzZXVkbyk7CisgICAgU2VsZWN0b3JDaGVja2VyOjpTZWxlY3Rvck1hdGNoIG1hdGNoID0g bV9zZWxlY3RvckNoZWNrZXIuY2hlY2tTZWxlY3Rvcihjb250ZXh0LCBtX2R5bmFtaWNQc2V1ZG8p OwogICAgIGlmIChtYXRjaCAhPSBTZWxlY3RvckNoZWNrZXI6OlNlbGVjdG9yTWF0Y2hlcykKICAg ICAgICAgcmV0dXJuIGZhbHNlOwogICAgIGlmIChtX3BzZXVkb1N0eWxlICE9IE5PUFNFVURPICYm IG1fcHNldWRvU3R5bGUgIT0gbV9keW5hbWljUHNldWRvKQpAQCAtMjI3Myw3ICsyMjczLDcgQEAg Ym9vbCBTdHlsZVJlc29sdmVyOjpjaGVja1JlZ2lvblNlbGVjdG9yKENTU1NlbGVjdG9yKiByZWdp b25TZWxlY3RvciwgRWxlbWVudCogcmUKICAgICBtX3BzZXVkb1N0eWxlID0gTk9QU0VVRE87CiAK ICAgICBmb3IgKENTU1NlbGVjdG9yKiBzID0gcmVnaW9uU2VsZWN0b3I7IHM7IHMgPSBDU1NTZWxl Y3Rvckxpc3Q6Om5leHQocykpCi0gICAgICAgIGlmIChtX2NoZWNrZXIuY2hlY2tTZWxlY3Rvcihz LCByZWdpb25FbGVtZW50KSkKKyAgICAgICAgaWYgKG1fc2VsZWN0b3JDaGVja2VyLmNoZWNrU2Vs ZWN0b3IocywgcmVnaW9uRWxlbWVudCkpCiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKIAogICAg IHJldHVybiBmYWxzZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJlc29s dmVyLmggYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNvbHZlci5oCmluZGV4IDNjZDhmYWJl ZWQyMjUyMDc1YzhjNTUwYzk5OTZkODVhNzkxMDZiZGMuLjViZDI5NDBlNTdmMjk4MjFmZTYxM2Vh MGU4YTM5YmZkZmI4OGQwN2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJl c29sdmVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIuaApAQCAtNDg5 LDcgKzQ4OSw3IEBAIHByaXZhdGU6CiAgICAgUHNldWRvSWQgbV9wc2V1ZG9TdHlsZTsKIAogICAg IERvY3VtZW50KiBtX2RvY3VtZW50OwotICAgIFNlbGVjdG9yQ2hlY2tlciBtX2NoZWNrZXI7Cisg ICAgU2VsZWN0b3JDaGVja2VyIG1fc2VsZWN0b3JDaGVja2VyOwogICAgIFNlbGVjdG9yRmlsdGVy IG1fc2VsZWN0b3JGaWx0ZXI7CiAKICAgICBSZWZQdHI8UmVuZGVyU3R5bGU+IG1fc3R5bGU7Cg==