134866 2014-07-12 21:13:49 -0700 Remove SelectorCheckerFastPath from the style resolution algorithm 2014-07-13 14:51:51 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 benjamin benjamin allan.jensen commit-queue esprehn+autocc glenn gyuyoung.kim kling koivisto macpherson menard ysuzuki oldest_to_newest 1022080 0 benjamin 2014-07-12 21:13:49 -0700 Remove SelectorCheckerFastPath from the style resolution algorithm 1022081 1 234824 benjamin 2014-07-12 21:19:07 -0700 Created attachment 234824 Patch 1022138 2 234824 benjamin 2014-07-13 14:51:45 -0700 Comment on attachment 234824 Patch Clearing flags on attachment: 234824 Committed r171059: <http://trac.webkit.org/changeset/171059> 1022139 3 benjamin 2014-07-13 14:51:51 -0700 All reviewed patches have been landed. Closing bug. 234824 2014-07-12 21:19:07 -0700 2014-07-13 14:51:45 -0700 Patch bug-134866-20140712211848.patch text/plain 11644 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTcxMDMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTY5NTkzODFmODc1OGIz OGQ3YzAyNzhmODUxNDM1ODEwMTFlYmJjOS4uYzcyYTM3NDZiN2MwNDg5MWZiODEzOGIxMGFkNWQz YjMyZGZmM2RjYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM1IEBACiAyMDE0LTA3LTEyICBCZW5q YW1pbiBQb3VsYWluICA8YmVuamFtaW5Ad2Via2l0Lm9yZz4KIAorICAgICAgICBSZW1vdmUgU2Vs ZWN0b3JDaGVja2VyRmFzdFBhdGggZnJvbSB0aGUgc3R5bGUgcmVzb2x1dGlvbiBhbGdvcml0aG0K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNDg2Ngor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNlbGVjdG9y Q2hlY2tlckZhc3RQYXRoIGlzIG5vdyBwdXJlIG92ZXJoZWFkIGJlY2F1c2UgaXQgY2FuIGFsbW9z dCBuZXZlciBtYXRjaAorICAgICAgICBpZiB0aGUgQ1NTIEpJVCB3YXMgdW5hYmxlIHRvIGNvbXBp bGUuCisKKyAgICAgICAgKiBjc3MvRWxlbWVudFJ1bGVDb2xsZWN0b3IuY3BwOgorICAgICAgICAo V2ViQ29yZTo6RWxlbWVudFJ1bGVDb2xsZWN0b3I6OnJ1bGVNYXRjaGVzKToKKyAgICAgICAgVGhl ICJwcmUtZmlsdGVyIiBiZWhpbmQgZmFzdENoZWNrYWJsZVNlbGVjdG9yIGhhZCB0d28gcGFydHM6 CisgICAgICAgIDEpIEZpbHRlcmluZyB0aGUgcHNldWRvSUQuCisgICAgICAgIDIpIEZpbHRlcmlu ZyBvbiB0aGUgcnVsZSBoYXNoLgorCisgICAgICAgIFRoZSBmaXJzdCBwYXJ0IGhhcyBiZWVuIGdl bmVyYWxpemVkIChSdWxlRGF0YWNhbk1hdGNoUHNldWRvRWxlbWVudCgpKQorICAgICAgICBhbmQg bW92ZWQgdG8gY29sbGVjdE1hdGNoaW5nUnVsZXNGb3JMaXN0KCkuIAorCisgICAgICAgIChXZWJD b3JlOjpFbGVtZW50UnVsZUNvbGxlY3Rvcjo6Y29sbGVjdE1hdGNoaW5nUnVsZXNGb3JMaXN0KToK KyAgICAgICAgKiBjc3MvUnVsZVNldC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpzZWxlY3RvckNh bk1hdGNoUHNldWRvRWxlbWVudCk6CisgICAgICAgIChXZWJDb3JlOjpSdWxlRGF0YTo6UnVsZURh dGEpOgorICAgICAgICAoV2ViQ29yZTo6UnVsZVNldDo6YWRkUmVnaW9uUnVsZSk6CisgICAgICAg IChXZWJDb3JlOjpSdWxlU2V0OjphZGRSdWxlc0Zyb21TaGVldCk6CisgICAgICAgICogY3NzL1J1 bGVTZXQuaDoKKyAgICAgICAgKFdlYkNvcmU6OlJ1bGVEYXRhOjpjYW5NYXRjaFBzZXVkb0VsZW1l bnQpOgorICAgICAgICAoV2ViQ29yZTo6UnVsZURhdGE6Omhhc0Zhc3RDaGVja2FibGVTZWxlY3Rv cik6IERlbGV0ZWQuCisgICAgICAgICogY3NzL1N0eWxlUmVzb2x2ZXIuY3BwOgorCisyMDE0LTA3 LTEyICBCZW5qYW1pbiBQb3VsYWluICA8YmVuamFtaW5Ad2Via2l0Lm9yZz4KKwogICAgICAgICBS ZW5hbWUgc2VsZWN0b3JMaXN0Q29udGFpbnNVbmNvbW1vbkF0dHJpYnV0ZVNlbGVjdG9yKCkgdG8g c2VsZWN0b3JMaXN0Q29udGFpbnNBdHRyaWJ1dGVTZWxlY3RvcigpCiAgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzQ4NjIKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvY3NzL0VsZW1lbnRSdWxlQ29sbGVjdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2Nzcy9FbGVtZW50UnVsZUNvbGxlY3Rvci5jcHAKaW5kZXggYjJkMzQ3NTFkOWYzMTVlNzVmZmJi YTdiMWRiOWEwMGQ2YWUwYTg5Yy4uZmYzNWUzODFiOGFjNzQzMzkzNGJlZjdkY2FlNGFlZDJiOGU0 NjdlYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0VsZW1lbnRSdWxlQ29sbGVjdG9y LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvRWxlbWVudFJ1bGVDb2xsZWN0b3IuY3BwCkBA IC0zOSw3ICszOSw2IEBACiAjaW5jbHVkZSAiSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmgiCiAj aW5jbHVkZSAiUmVuZGVyUmVnaW9uLmgiCiAjaW5jbHVkZSAiU1ZHRWxlbWVudC5oIgotI2luY2x1 ZGUgIlNlbGVjdG9yQ2hlY2tlckZhc3RQYXRoLmgiCiAjaW5jbHVkZSAiU2VsZWN0b3JDb21waWxl ci5oIgogI2luY2x1ZGUgIlN0eWxlUHJvcGVydGllcy5oIgogI2luY2x1ZGUgIlN0eWxlZEVsZW1l bnQuaCIKQEAgLTI3MywxNSArMjcyLDExIEBAIHZvaWQgRWxlbWVudFJ1bGVDb2xsZWN0b3I6Om1h dGNoVUFSdWxlcyhSdWxlU2V0KiBydWxlcykKIAogaW5saW5lIGJvb2wgRWxlbWVudFJ1bGVDb2xs ZWN0b3I6OnJ1bGVNYXRjaGVzKGNvbnN0IFJ1bGVEYXRhJiBydWxlRGF0YSkKIHsKLSAgICBib29s IGZhc3RDaGVja2FibGVTZWxlY3RvciA9IHJ1bGVEYXRhLmhhc0Zhc3RDaGVja2FibGVTZWxlY3Rv cigpOwotICAgIGlmIChmYXN0Q2hlY2thYmxlU2VsZWN0b3IpIHsKLSAgICAgICAgLy8gV2Uga25v dyB0aGlzIHNlbGVjdG9yIGRvZXMgbm90IGluY2x1ZGUgYW55IHBzZXVkbyBlbGVtZW50cy4KLSAg ICAgICAgaWYgKG1fcHNldWRvU3R5bGVSZXF1ZXN0LnBzZXVkb0lkICE9IE5PUFNFVURPKQotICAg ICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgICAvLyBXZSBrbm93IGEgc3VmZmljaWVudGx5 IHNpbXBsZSBzaW5nbGUgcGFydCBzZWxlY3RvciBtYXRjaGVzIHNpbXBseSBiZWNhdXNlIHdlIGZv dW5kIGl0IGZyb20gdGhlIHJ1bGUgaGFzaC4KLSAgICAgICAgLy8gVGhpcyBpcyBsaW1pdGVkIHRv IEhUTUwgb25seSBzbyB3ZSBkb24ndCBuZWVkIHRvIGNoZWNrIHRoZSBuYW1lc3BhY2UuCi0gICAg ICAgIGlmIChydWxlRGF0YS5oYXNSaWdodG1vc3RTZWxlY3Rvck1hdGNoaW5nSFRNTEJhc2VkT25S dWxlSGFzaCgpICYmIG1fZWxlbWVudC5pc0hUTUxFbGVtZW50KCkpCi0gICAgICAgICAgICByZXR1 cm4gdHJ1ZTsKKyAgICAvLyBXZSBrbm93IGEgc3VmZmljaWVudGx5IHNpbXBsZSBzaW5nbGUgcGFy dCBzZWxlY3RvciBtYXRjaGVzIHNpbXBseSBiZWNhdXNlIHdlIGZvdW5kIGl0IGZyb20gdGhlIHJ1 bGUgaGFzaCB3aGVuIGZpbHRlcmluZyB0aGUgUnVsZVNldC4KKyAgICAvLyBUaGlzIGlzIGxpbWl0 ZWQgdG8gSFRNTCBvbmx5IHNvIHdlIGRvbid0IG5lZWQgdG8gY2hlY2sgdGhlIG5hbWVzcGFjZSAo YmVjYXVzZSBvZiB0YWcgbmFtZSBtYXRjaCkuCisgICAgaWYgKHJ1bGVEYXRhLmhhc1JpZ2h0bW9z dFNlbGVjdG9yTWF0Y2hpbmdIVE1MQmFzZWRPblJ1bGVIYXNoKCkgJiYgbV9lbGVtZW50LmlzSFRN TEVsZW1lbnQoKSkgeworICAgICAgICBBU1NFUlRfV0lUSF9NRVNTQUdFKG1fcHNldWRvU3R5bGVS ZXF1ZXN0LnBzZXVkb0lkID09IE5PUFNFVURPLCAiSWYgd2UgbWF0Y2ggYmFzZWQgb24gdGhlIHJ1 bGUgaGFzaCB3aGlsZSBjb2xsZWN0aW5nIGZvciBhIHBhcnRpY3VsYXIgcHNldWRvIGVsZW1lbnQg SUQsIHdlIHdvdWxkIGFkZCBpbmNvcnJlY3QgcnVsZXMgZm9yIHRoYXQgcHNldWRvIGVsZW1lbnQg SUQuIFdlIHNob3VsZCBuZXZlciBlbmQgaW4gcnVsZU1hdGNoZXMoKSB3aXRoIGEgcHNldWRvIGVs ZW1lbnQgaWYgdGhlIHJ1bGVEYXRhIGNhbm5vdCBtYXRjaCBhbnkgcHNldWRvIGVsZW1lbnQuIik7 CisgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KIAogI2lmIEVOQUJMRShDU1NfU0VMRUNUT1Jf SklUKQpAQCAtMzE5LDE2ICszMTQsNiBAQCBpbmxpbmUgYm9vbCBFbGVtZW50UnVsZUNvbGxlY3Rv cjo6cnVsZU1hdGNoZXMoY29uc3QgUnVsZURhdGEmIHJ1bGVEYXRhKQogICAgIH0KICNlbmRpZiAv LyBFTkFCTEUoQ1NTX1NFTEVDVE9SX0pJVCkKIAotICAgIGlmIChmYXN0Q2hlY2thYmxlU2VsZWN0 b3IpIHsKLSAgICAgICAgaWYgKHJ1bGVEYXRhLnNlbGVjdG9yKCktPm1fbWF0Y2ggPT0gQ1NTU2Vs ZWN0b3I6OlRhZyAmJiAhU2VsZWN0b3JDaGVja2VyOjp0YWdNYXRjaGVzKCZtX2VsZW1lbnQsIHJ1 bGVEYXRhLnNlbGVjdG9yKCktPnRhZ1FOYW1lKCkpKQotICAgICAgICAgICAgcmV0dXJuIGZhbHNl OwotICAgICAgICBTZWxlY3RvckNoZWNrZXJGYXN0UGF0aCBzZWxlY3RvckNoZWNrZXJGYXN0UGF0 aChydWxlRGF0YS5zZWxlY3RvcigpLCAmbV9lbGVtZW50KTsKLSAgICAgICAgaWYgKCFzZWxlY3Rv ckNoZWNrZXJGYXN0UGF0aC5tYXRjaGVzUmlnaHRtb3N0QXR0cmlidXRlU2VsZWN0b3IoKSkKLSAg ICAgICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgICAgICByZXR1cm4gc2VsZWN0b3JDaGVja2Vy RmFzdFBhdGgubWF0Y2hlcygpOwotICAgIH0KLQogICAgIC8vIFNsb3cgcGF0aC4KICAgICBTZWxl Y3RvckNoZWNrZXIgc2VsZWN0b3JDaGVja2VyKG1fZWxlbWVudC5kb2N1bWVudCgpLCBtX21vZGUp OwogICAgIFNlbGVjdG9yQ2hlY2tlcjo6U2VsZWN0b3JDaGVja2luZ0NvbnRleHQgY29udGV4dChy dWxlRGF0YS5zZWxlY3RvcigpLCAmbV9lbGVtZW50LCBTZWxlY3RvckNoZWNrZXI6OlZpc2l0ZWRN YXRjaEVuYWJsZWQpOwpAQCAtMzQ2LDYgKzMzMSwxMCBAQCB2b2lkIEVsZW1lbnRSdWxlQ29sbGVj dG9yOjpjb2xsZWN0TWF0Y2hpbmdSdWxlc0Zvckxpc3QoY29uc3QgVmVjdG9yPFJ1bGVEYXRhPiog cgogCiAgICAgZm9yICh1bnNpZ25lZCBpID0gMCwgc2l6ZSA9IHJ1bGVzLT5zaXplKCk7IGkgPCBz aXplOyArK2kpIHsKICAgICAgICAgY29uc3QgUnVsZURhdGEmIHJ1bGVEYXRhID0gcnVsZXMtPmRh dGEoKVtpXTsKKworICAgICAgICBpZiAoIXJ1bGVEYXRhLmNhbk1hdGNoUHNldWRvRWxlbWVudCgp ICYmIG1fcHNldWRvU3R5bGVSZXF1ZXN0LnBzZXVkb0lkICE9IE5PUFNFVURPKQorICAgICAgICAg ICAgY29udGludWU7CisKICAgICAgICAgaWYgKG1fY2FuVXNlRmFzdFJlamVjdCAmJiBtX3NlbGVj dG9yRmlsdGVyLmZhc3RSZWplY3RTZWxlY3RvcjxSdWxlRGF0YTo6bWF4aW11bUlkZW50aWZpZXJD b3VudD4ocnVsZURhdGEuZGVzY2VuZGFudFNlbGVjdG9ySWRlbnRpZmllckhhc2hlcygpKSkKICAg ICAgICAgICAgIGNvbnRpbnVlOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvUnVs ZVNldC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvUnVsZVNldC5jcHAKaW5kZXggMzZhYjgxOWQ3 MGZlMzQzODRlNjM4YzQ1ZjAxYWUwMzI1NjRmYjRlYi4uZWU0MTc1ZGViMDZiNjlmMDY5YmVjOTQz MDk1YzZiNjhiNzg3YmYwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL1J1bGVTZXQu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9SdWxlU2V0LmNwcApAQCAtMzYsNyArMzYsNiBA QAogI2luY2x1ZGUgIk1lZGlhUXVlcnlFdmFsdWF0b3IuaCIKICNpbmNsdWRlICJTZWN1cml0eU9y aWdpbi5oIgogI2luY2x1ZGUgIlNlbGVjdG9yQ2hlY2tlci5oIgotI2luY2x1ZGUgIlNlbGVjdG9y Q2hlY2tlckZhc3RQYXRoLmgiCiAjaW5jbHVkZSAiU2VsZWN0b3JGaWx0ZXIuaCIKICNpbmNsdWRl ICJTdHlsZVJlc29sdmVyLmgiCiAjaW5jbHVkZSAiU3R5bGVSdWxlLmgiCkBAIC02OCw2ICs2Nywy NSBAQCBzdGF0aWMgaW5saW5lIGJvb2wgaXNTZWxlY3Rvck1hdGNoaW5nSFRNTEJhc2VkT25SdWxl SGFzaChjb25zdCBDU1NTZWxlY3RvciYgc2VsZQogICAgIHJldHVybiBzZWxlY3Rvci5tX21hdGNo ID09IENTU1NlbGVjdG9yOjpJZCB8fCBzZWxlY3Rvci5tX21hdGNoID09IENTU1NlbGVjdG9yOjpD bGFzczsKIH0KIAorc3RhdGljIGJvb2wgc2VsZWN0b3JDYW5NYXRjaFBzZXVkb0VsZW1lbnQoY29u c3QgQ1NTU2VsZWN0b3ImIHJvb3RTZWxlY3RvcikKK3sKKyAgICBjb25zdCBDU1NTZWxlY3Rvciog c2VsZWN0b3IgPSAmcm9vdFNlbGVjdG9yOworICAgIGRvIHsKKyAgICAgICAgaWYgKHNlbGVjdG9y LT5tYXRjaGVzUHNldWRvRWxlbWVudCgpKQorICAgICAgICAgICAgcmV0dXJuIHRydWU7CisKKyAg ICAgICAgaWYgKGNvbnN0IENTU1NlbGVjdG9yTGlzdCogc2VsZWN0b3JMaXN0ID0gc2VsZWN0b3It PnNlbGVjdG9yTGlzdCgpKSB7CisgICAgICAgICAgICBmb3IgKGNvbnN0IENTU1NlbGVjdG9yKiBz dWJTZWxlY3RvciA9IHNlbGVjdG9yTGlzdC0+Zmlyc3QoKTsgc3ViU2VsZWN0b3I7IHN1YlNlbGVj dG9yID0gQ1NTU2VsZWN0b3JMaXN0OjpuZXh0KHN1YlNlbGVjdG9yKSkgeworICAgICAgICAgICAg ICAgIGlmIChzZWxlY3RvckNhbk1hdGNoUHNldWRvRWxlbWVudCgqc3ViU2VsZWN0b3IpKQorICAg ICAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQor CisgICAgICAgIHNlbGVjdG9yID0gc2VsZWN0b3ItPnRhZ0hpc3RvcnkoKTsKKyAgICB9IHdoaWxl IChzZWxlY3Rvcik7CisgICAgcmV0dXJuIGZhbHNlOworfQorCiBzdGF0aWMgaW5saW5lIGJvb2wg c2VsZWN0b3JMaXN0Q29udGFpbnNBdHRyaWJ1dGVTZWxlY3Rvcihjb25zdCBDU1NTZWxlY3Rvciog c2VsZWN0b3IpCiB7CiAgICAgY29uc3QgQ1NTU2VsZWN0b3JMaXN0KiBzZWxlY3Rvckxpc3QgPSBz ZWxlY3Rvci0+c2VsZWN0b3JMaXN0KCk7CkBAIC0xMjksMTMgKzE0NywxMyBAQCBzdGF0aWMgaW5s aW5lIFByb3BlcnR5V2hpdGVsaXN0VHlwZSBkZXRlcm1pbmVQcm9wZXJ0eVdoaXRlbGlzdFR5cGUo Y29uc3QgQWRkUnVsZQogUnVsZURhdGE6OlJ1bGVEYXRhKFN0eWxlUnVsZSogcnVsZSwgdW5zaWdu ZWQgc2VsZWN0b3JJbmRleCwgdW5zaWduZWQgcG9zaXRpb24sIEFkZFJ1bGVGbGFncyBhZGRSdWxl RmxhZ3MpCiAgICAgOiBtX3J1bGUocnVsZSkKICAgICAsIG1fc2VsZWN0b3JJbmRleChzZWxlY3Rv ckluZGV4KQorICAgICwgbV9oYXNEb2N1bWVudFNlY3VyaXR5T3JpZ2luKGFkZFJ1bGVGbGFncyAm IFJ1bGVIYXNEb2N1bWVudFNlY3VyaXR5T3JpZ2luKQogICAgICwgbV9wb3NpdGlvbihwb3NpdGlv bikKLSAgICAsIG1faGFzRmFzdENoZWNrYWJsZVNlbGVjdG9yKChhZGRSdWxlRmxhZ3MgJiBSdWxl Q2FuVXNlRmFzdENoZWNrU2VsZWN0b3IpICYmIFNlbGVjdG9yQ2hlY2tlckZhc3RQYXRoOjpjYW5V c2Uoc2VsZWN0b3IoKSkpCiAgICAgLCBtX3NwZWNpZmljaXR5KHNlbGVjdG9yKCktPnNwZWNpZmlj aXR5KCkpCiAgICAgLCBtX2hhc1JpZ2h0bW9zdFNlbGVjdG9yTWF0Y2hpbmdIVE1MQmFzZWRPblJ1 bGVIYXNoKGlzU2VsZWN0b3JNYXRjaGluZ0hUTUxCYXNlZE9uUnVsZUhhc2goKnNlbGVjdG9yKCkp KQorICAgICwgbV9jYW5NYXRjaFBzZXVkb0VsZW1lbnQoc2VsZWN0b3JDYW5NYXRjaFBzZXVkb0Vs ZW1lbnQoKnNlbGVjdG9yKCkpKQogICAgICwgbV9jb250YWluc1VuY29tbW9uQXR0cmlidXRlU2Vs ZWN0b3IoV2ViQ29yZTo6Y29udGFpbnNVbmNvbW1vbkF0dHJpYnV0ZVNlbGVjdG9yKHNlbGVjdG9y KCkpKQogICAgICwgbV9saW5rTWF0Y2hUeXBlKFNlbGVjdG9yQ2hlY2tlcjo6ZGV0ZXJtaW5lTGlu a01hdGNoVHlwZShzZWxlY3RvcigpKSkKLSAgICAsIG1faGFzRG9jdW1lbnRTZWN1cml0eU9yaWdp bihhZGRSdWxlRmxhZ3MgJiBSdWxlSGFzRG9jdW1lbnRTZWN1cml0eU9yaWdpbikKICAgICAsIG1f cHJvcGVydHlXaGl0ZWxpc3RUeXBlKGRldGVybWluZVByb3BlcnR5V2hpdGVsaXN0VHlwZShhZGRS dWxlRmxhZ3MsIHNlbGVjdG9yKCkpKQogI2lmIEVOQUJMRShDU1NfU0VMRUNUT1JfSklUKSAmJiBD U1NfU0VMRUNUT1JfSklUX1BST0ZJTElORwogICAgICwgbV9jb21waWxlZFNlbGVjdG9yVXNlQ291 bnQoMCkKQEAgLTI5MSw3ICszMDksNyBAQCB2b2lkIFJ1bGVTZXQ6OmFkZFJlZ2lvblJ1bGUoU3R5 bGVSdWxlUmVnaW9uKiByZWdpb25SdWxlLCBib29sIGhhc0RvY3VtZW50U2VjdXJpdAogICAgIC8v IEZJWE1FOiBTaG91bGQgdGhpcyBhZGQgb3RoZXIgdHlwZXMgb2YgcnVsZXM/IChpLmUuIHVzZSBh ZGRDaGlsZFJ1bGVzKCkgZGlyZWN0bHk/KQogICAgIGNvbnN0IFZlY3RvcjxSZWZQdHI8U3R5bGVS dWxlQmFzZT4+JiBjaGlsZFJ1bGVzID0gcmVnaW9uUnVsZS0+Y2hpbGRSdWxlcygpOwogICAgIEFk ZFJ1bGVGbGFncyBhZGRSdWxlRmxhZ3MgPSBoYXNEb2N1bWVudFNlY3VyaXR5T3JpZ2luID8gUnVs ZUhhc0RvY3VtZW50U2VjdXJpdHlPcmlnaW4gOiBSdWxlSGFzTm9TcGVjaWFsU3RhdGU7Ci0gICAg YWRkUnVsZUZsYWdzID0gc3RhdGljX2Nhc3Q8QWRkUnVsZUZsYWdzPihhZGRSdWxlRmxhZ3MgfCBS dWxlQ2FuVXNlRmFzdENoZWNrU2VsZWN0b3IgfCBSdWxlSXNJblJlZ2lvblJ1bGUpOworICAgIGFk ZFJ1bGVGbGFncyA9IHN0YXRpY19jYXN0PEFkZFJ1bGVGbGFncz4oYWRkUnVsZUZsYWdzIHwgUnVs ZUlzSW5SZWdpb25SdWxlKTsKICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgY2hpbGRSdWxl cy5zaXplKCk7ICsraSkgewogICAgICAgICBTdHlsZVJ1bGVCYXNlKiByZWdpb25TdHlsaW5nUnVs ZSA9IGNoaWxkUnVsZXNbaV0uZ2V0KCk7CiAgICAgICAgIGlmIChyZWdpb25TdHlsaW5nUnVsZS0+ aXNTdHlsZVJ1bGUoKSkKQEAgLTM1NCw3ICszNzIsNyBAQCB2b2lkIFJ1bGVTZXQ6OmFkZFJ1bGVz RnJvbVNoZWV0KFN0eWxlU2hlZXRDb250ZW50cyogc2hlZXQsIGNvbnN0IE1lZGlhUXVlcnlFdmFs dQogICAgIH0KIAogICAgIGJvb2wgaGFzRG9jdW1lbnRTZWN1cml0eU9yaWdpbiA9IHJlc29sdmVy ICYmIHJlc29sdmVyLT5kb2N1bWVudCgpLnNlY3VyaXR5T3JpZ2luKCktPmNhblJlcXVlc3Qoc2hl ZXQtPmJhc2VVUkwoKSk7Ci0gICAgQWRkUnVsZUZsYWdzIGFkZFJ1bGVGbGFncyA9IHN0YXRpY19j YXN0PEFkZFJ1bGVGbGFncz4oKGhhc0RvY3VtZW50U2VjdXJpdHlPcmlnaW4gPyBSdWxlSGFzRG9j dW1lbnRTZWN1cml0eU9yaWdpbiA6IDApIHwgUnVsZUNhblVzZUZhc3RDaGVja1NlbGVjdG9yKTsK KyAgICBBZGRSdWxlRmxhZ3MgYWRkUnVsZUZsYWdzID0gc3RhdGljX2Nhc3Q8QWRkUnVsZUZsYWdz PigoaGFzRG9jdW1lbnRTZWN1cml0eU9yaWdpbiA/IFJ1bGVIYXNEb2N1bWVudFNlY3VyaXR5T3Jp Z2luIDogMCkpOwogCiAgICAgYWRkQ2hpbGRSdWxlcyhzaGVldC0+Y2hpbGRSdWxlcygpLCBtZWRp dW0sIHJlc29sdmVyLCBoYXNEb2N1bWVudFNlY3VyaXR5T3JpZ2luLCBhZGRSdWxlRmxhZ3MpOwog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvUnVsZVNldC5oIGIvU291cmNlL1dlYkNv cmUvY3NzL1J1bGVTZXQuaAppbmRleCAwNzIwNzNiNWRhNThhMzFjZDdmNmEwZGM5MTA5OTVlNWZl MDBjNGE2Li5hM2RjNDBlMTJhNjc5MjE3YWFjM2E1ZTI4MDdkOGNmZTFmMTkyMjk5IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvUnVsZVNldC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nz cy9SdWxlU2V0LmgKQEAgLTM2LDggKzM2LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogZW51bSBB ZGRSdWxlRmxhZ3MgewogICAgIFJ1bGVIYXNOb1NwZWNpYWxTdGF0ZSAgICAgICAgID0gMCwKICAg ICBSdWxlSGFzRG9jdW1lbnRTZWN1cml0eU9yaWdpbiA9IDEsCi0gICAgUnVsZUNhblVzZUZhc3RD aGVja1NlbGVjdG9yICAgPSAxIDw8IDEsCi0gICAgUnVsZUlzSW5SZWdpb25SdWxlICAgICAgICAg ICAgPSAxIDw8IDIsCisgICAgUnVsZUlzSW5SZWdpb25SdWxlICAgICAgICAgICAgPSAxIDw8IDEs CiB9OwogICAgIAogZW51bSBQcm9wZXJ0eVdoaXRlbGlzdFR5cGUgewpAQCAtNjYsNyArNjUsNyBA QCBwdWJsaWM6CiAgICAgY29uc3QgQ1NTU2VsZWN0b3IqIHNlbGVjdG9yKCkgY29uc3QgeyByZXR1 cm4gbV9ydWxlLT5zZWxlY3Rvckxpc3QoKS5zZWxlY3RvckF0KG1fc2VsZWN0b3JJbmRleCk7IH0K ICAgICB1bnNpZ25lZCBzZWxlY3RvckluZGV4KCkgY29uc3QgeyByZXR1cm4gbV9zZWxlY3Rvcklu ZGV4OyB9CiAKLSAgICBib29sIGhhc0Zhc3RDaGVja2FibGVTZWxlY3RvcigpIGNvbnN0IHsgcmV0 dXJuIG1faGFzRmFzdENoZWNrYWJsZVNlbGVjdG9yOyB9CisgICAgYm9vbCBjYW5NYXRjaFBzZXVk b0VsZW1lbnQoKSBjb25zdCB7IHJldHVybiBtX2Nhbk1hdGNoUHNldWRvRWxlbWVudDsgfQogICAg IGJvb2wgaGFzUmlnaHRtb3N0U2VsZWN0b3JNYXRjaGluZ0hUTUxCYXNlZE9uUnVsZUhhc2goKSBj b25zdCB7IHJldHVybiBtX2hhc1JpZ2h0bW9zdFNlbGVjdG9yTWF0Y2hpbmdIVE1MQmFzZWRPblJ1 bGVIYXNoOyB9CiAgICAgYm9vbCBjb250YWluc1VuY29tbW9uQXR0cmlidXRlU2VsZWN0b3IoKSBj b25zdCB7IHJldHVybiBtX2NvbnRhaW5zVW5jb21tb25BdHRyaWJ1dGVTZWxlY3RvcjsgfQogICAg IHVuc2lnbmVkIHNwZWNpZmljaXR5KCkgY29uc3QgeyByZXR1cm4gbV9zcGVjaWZpY2l0eTsgfQpA QCAtOTgsMTUgKzk3LDE1IEBAIHB1YmxpYzoKIHByaXZhdGU6CiAgICAgUmVmUHRyPFN0eWxlUnVs ZT4gbV9ydWxlOwogICAgIHVuc2lnbmVkIG1fc2VsZWN0b3JJbmRleCA6IDEzOworICAgIHVuc2ln bmVkIG1faGFzRG9jdW1lbnRTZWN1cml0eU9yaWdpbiA6IDE7CiAgICAgLy8gVGhpcyBudW1iZXIg d2FzIHBpY2tlZCBmYWlybHkgYXJiaXRyYXJpbHkuIFdlIGNhbiBwcm9iYWJseSBsb3dlciBpdCBp ZiB3ZSBuZWVkIHRvLgogICAgIC8vIFNvbWUgc2ltcGxlIHRlc3Rpbmcgc2hvd2VkIDwxMDAsMDAw IFJ1bGVEYXRhJ3Mgb24gbGFyZ2Ugc2l0ZXMuCiAgICAgdW5zaWduZWQgbV9wb3NpdGlvbiA6IDE4 OwotICAgIHVuc2lnbmVkIG1faGFzRmFzdENoZWNrYWJsZVNlbGVjdG9yIDogMTsKICAgICB1bnNp Z25lZCBtX3NwZWNpZmljaXR5IDogMjQ7CiAgICAgdW5zaWduZWQgbV9oYXNSaWdodG1vc3RTZWxl Y3Rvck1hdGNoaW5nSFRNTEJhc2VkT25SdWxlSGFzaCA6IDE7CisgICAgdW5zaWduZWQgbV9jYW5N YXRjaFBzZXVkb0VsZW1lbnQgOiAxOwogICAgIHVuc2lnbmVkIG1fY29udGFpbnNVbmNvbW1vbkF0 dHJpYnV0ZVNlbGVjdG9yIDogMTsKICAgICB1bnNpZ25lZCBtX2xpbmtNYXRjaFR5cGUgOiAyOyAv LyAgU2VsZWN0b3JDaGVja2VyOjpMaW5rTWF0Y2hNYXNrCi0gICAgdW5zaWduZWQgbV9oYXNEb2N1 bWVudFNlY3VyaXR5T3JpZ2luIDogMTsKICAgICB1bnNpZ25lZCBtX3Byb3BlcnR5V2hpdGVsaXN0 VHlwZSA6IDI7CiAgICAgLy8gVXNlIHBsYWluIGFycmF5IGluc3RlYWQgb2YgYSBWZWN0b3IgdG8g bWluaW1pemUgbWVtb3J5IG92ZXJoZWFkLgogICAgIHVuc2lnbmVkIG1fZGVzY2VuZGFudFNlbGVj dG9ySWRlbnRpZmllckhhc2hlc1ttYXhpbXVtSWRlbnRpZmllckNvdW50XTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nz cy9TdHlsZVJlc29sdmVyLmNwcAppbmRleCAyYWIyZTk3MWQ1ZGQyMjZlZmE1ZjQ5NTI3ZWZlM2Y4 YjU0ZWM5MTQ3Li44MDU0NzQ1MjVlZDgwMmViOGYxNjhmYzdhYmQ5YWUwZTUwYmQ3MTllIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNvbHZlci5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIuY3BwCkBAIC0xMDksNyArMTA5LDYgQEAKICNpbmNs dWRlICJTVkdOYW1lcy5oIgogI2luY2x1ZGUgIlNWR1VSSVJlZmVyZW5jZS5oIgogI2luY2x1ZGUg IlNlY3VyaXR5T3JpZ2luLmgiCi0jaW5jbHVkZSAiU2VsZWN0b3JDaGVja2VyRmFzdFBhdGguaCIK ICNpbmNsdWRlICJTZXR0aW5ncy5oIgogI2luY2x1ZGUgIlNoYWRvd0RhdGEuaCIKICNpbmNsdWRl ICJTaGFkb3dSb290LmgiCg==