96431 2012-09-11 15:26:25 -0700 Stop shuttling PseudoId from StyleResolver to SelectorChecker. 2012-09-13 09:32:46 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 89879 1 dglazkov dglazkov cmarcelo eric macpherson menard webkit.review.bot oldest_to_newest 717615 0 dglazkov 2012-09-11 15:26:25 -0700 Stop shuttling PseudoId from StyleResolver to SelectorChecker. 717626 1 163459 dglazkov 2012-09-11 15:31:26 -0700 Created attachment 163459 Patch 717677 2 163459 eric 2012-09-11 16:07:53 -0700 Comment on attachment 163459 Patch OK. I see where you're going. :) We should probably mark in the STyleREsolver header what state we plan to pull out. 719561 3 163886 dglazkov 2012-09-13 08:58:25 -0700 Created attachment 163886 Patch for landing 719581 4 eric 2012-09-13 09:27:25 -0700 Thank you for working on this Dimitri! 719587 5 163886 webkit.review.bot 2012-09-13 09:32:43 -0700 Comment on attachment 163886 Patch for landing Clearing flags on attachment: 163886 Committed r128475: <http://trac.webkit.org/changeset/128475> 719588 6 webkit.review.bot 2012-09-13 09:32:46 -0700 All reviewed patches have been landed. Closing bug. 163459 2012-09-11 15:31:26 -0700 2012-09-13 08:58:22 -0700 Patch bug-96431-20120911153101.patch text/plain 7359 dglazkov U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4MjI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWVhMzFjYmQxNTM0Yzk1 ODNjMmE5OTJiYjgwNGYwZTE0MGNmM2NmNC4uZmE5ZDBhNjYxNzg3ZDBjMDVlNzVlYTBlNmYyZTQ4 MmVhNDc3ZDFjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEyLTA5LTExICBEaW1p dHJpIEdsYXprb3YgIDxkZ2xhemtvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgU3RvcCBzaHV0 dGxpbmcgUHNldWRvSWQgZnJvbSBTdHlsZVJlc29sdmVyIHRvIFNlbGVjdG9yQ2hlY2tlci4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk2NDMxCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU2VsZWN0b3JDaGVj a2VyIHJldGFpbmVkIGV4dHJhIHN0YXRlIHRvIHN0b3JlIHRoZSBQc2V1ZG9JZCB2YWx1ZSBvZiB0 aGUgZWxlbWVudC4gSXQgd2FzIHNhZCwgYmVjYXVzZSB3ZSBuZWVkZWQgdG8gZXhwbGljaXRseSBt YWludGFpbiBpdHMgaW50ZWdyaXR5LiBJbnN0ZWFkLCB3ZSBub3cganVzdCBtYWtlIGl0IHBhcnQg b2YgU3R5bGVSZXNvbHZlciBhbmQgZmVlZCB0byBTZWxlY3RvckNoZWNrZXIgYXMgcGFydCBvZiBT ZWxlY3RvckNoZWNraW5nQ29udGV4dC4KKworICAgICAgICBObyBuZXcgdGVzdHMsIHJlZmFjdG9y aW5nIG9ubHkuIENvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMuCisKKyAgICAgICAgKiBjc3MvU2Vs ZWN0b3JDaGVja2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNlbGVjdG9yQ2hlY2tlcjo6U2Vs ZWN0b3JDaGVja2VyKTogUmVtb3ZlZCBzdGF0ZSBpbml0aWFsaXplci4KKyAgICAgICAgKFdlYkNv cmU6OlNlbGVjdG9yQ2hlY2tlcjo6Y2hlY2tTZWxlY3Rvcik6IENoYW5nZWQgdG8gbG9vayBpbnRv IGNvbnRleHQsIHJhdGhlciB0aGFuIG93biBtZW1iZXIuCisgICAgICAgICogY3NzL1NlbGVjdG9y Q2hlY2tlci5oOgorICAgICAgICAoV2ViQ29yZTo6U2VsZWN0b3JDaGVja2VyOjpTZWxlY3RvckNo ZWNraW5nQ29udGV4dDo6U2VsZWN0b3JDaGVja2luZ0NvbnRleHQpOiBBZGRlZCBwc2V1ZG9TdHls ZSBhcyBwYXJhbWV0ZXIuCisgICAgICAgIChTZWxlY3RvckNoZWNraW5nQ29udGV4dCk6IEFkZGVk IHBzZXVkb1N0eWxlIGFzIG1lbWJlci4KKyAgICAgICAgKiBjc3MvU3R5bGVSZXNvbHZlci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpTdHlsZVJlc29sdmVyOjpjb2xsZWN0TWF0Y2hpbmdSdWxlc0Zv ckxpc3QpOiBDaGFuZ2VkIHRvIGxvb2sgYXQgb3duIG1lbWJlciwgcmF0aGVyIHRoYW4gbV9jaGVj a2VyLgorICAgICAgICAqIGNzcy9TdHlsZVJlc29sdmVyLmg6CisgICAgICAgIChTdHlsZVJlc29s dmVyKTogQWRkZWQgbmV3IG1lbWJlci4KKwogMjAxMi0wOS0xMSAgUmlrIENhYmFuaWVyICA8Y2Fi YW5pZXJAYWRvYmUuY29tPgogCiAgICAgICAgIENsZWFuIHVwIGZ1bmN0aW9ucyBpbiBSZW5kZXJM YXllckJhY2tpbmcuaC8uY3BwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU2VsZWN0 b3JDaGVja2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TZWxlY3RvckNoZWNrZXIuY3BwCmlu ZGV4IDlhMzJkNjA4MGM0MDBmNTQ4YmY5MWE0N2I3YmE1YjQ3OGYyMGM0ZmQuLmYyYzExYmY1ZGZj YzI3ZjhhNDBmNDBjMWEyMGEzMjhiZDk0ZTgxODYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2Nzcy9TZWxlY3RvckNoZWNrZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TZWxlY3Rv ckNoZWNrZXIuY3BwCkBAIC03MCw3ICs3MCw2IEBAIFNlbGVjdG9yQ2hlY2tlcjo6U2VsZWN0b3JD aGVja2VyKERvY3VtZW50KiBkb2N1bWVudCwgYm9vbCBzdHJpY3RQYXJzaW5nKQogICAgICwgbV9z dHJpY3RQYXJzaW5nKHN0cmljdFBhcnNpbmcpCiAgICAgLCBtX2RvY3VtZW50SXNIVE1MKGRvY3Vt ZW50LT5pc0hUTUxEb2N1bWVudCgpKQogICAgICwgbV9tb2RlKFJlc29sdmluZ1N0eWxlKQotICAg ICwgbV9wc2V1ZG9TdHlsZShOT1BTRVVETykKICAgICAsIG1faGFzVW5rbm93blBzZXVkb0VsZW1l bnRzKGZhbHNlKQogewogfQpAQCAtNDYyLDcgKzQ2MSw3IEBAIFNlbGVjdG9yQ2hlY2tlcjo6U2Vs ZWN0b3JNYXRjaCBTZWxlY3RvckNoZWNrZXI6OmNoZWNrU2VsZWN0b3IoY29uc3QgU2VsZWN0b3JD aGVjCiAgICAgICAgICAgICByZXR1cm4gU2VsZWN0b3JGYWlsc0NvbXBsZXRlbHk7CiAKICAgICAg ICAgLy8gQmFpbC1vdXQgaWYgdGhpcyBzZWxlY3RvciBpcyBpcnJlbGV2YW50IGZvciB0aGUgcHNl dWRvU3R5bGUKLSAgICAgICAgaWYgKG1fcHNldWRvU3R5bGUgIT0gTk9QU0VVRE8gJiYgbV9wc2V1 ZG9TdHlsZSAhPSBkeW5hbWljUHNldWRvKQorICAgICAgICBpZiAoY29udGV4dC5wc2V1ZG9TdHls ZSAhPSBOT1BTRVVETyAmJiBjb250ZXh0LnBzZXVkb1N0eWxlICE9IGR5bmFtaWNQc2V1ZG8pCiAg ICAgICAgICAgICByZXR1cm4gU2VsZWN0b3JGYWlsc0NvbXBsZXRlbHk7CiAKICAgICAgICAgLy8g RGlzYWJsZSA6dmlzaXRlZCBtYXRjaGluZyB3aGVuIHdlIHNlZSB0aGUgZmlyc3QgbGluayBvciB0 cnkgdG8gbWF0Y2ggYW55dGhpbmcgZWxzZSB0aGFuIGFuIGFuY2VzdG9ycy4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2Nzcy9TZWxlY3RvckNoZWNrZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2Nz cy9TZWxlY3RvckNoZWNrZXIuaAppbmRleCBjZTcyMTNiODAxODc2MTc2MDNhOGQwNjFmZmE1YzI4 Mjc2MmRmYzYyLi4wODcyYTUwNTU3OTMwOWJhZTYzYTc0NWJkZTgwYzIwZjg0YTY1NTI4IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU2VsZWN0b3JDaGVja2VyLmgKKysrIGIvU291cmNl L1dlYkNvcmUvY3NzL1NlbGVjdG9yQ2hlY2tlci5oCkBAIC02NCw2ICs2NCw3IEBAIHB1YmxpYzoK ICAgICAgICAgICAgICwgZWxlbWVudFN0eWxlKDApCiAgICAgICAgICAgICAsIGVsZW1lbnRQYXJl bnRTdHlsZSgwKQogICAgICAgICAgICAgLCBpc1N1YlNlbGVjdG9yKGZhbHNlKQorICAgICAgICAg ICAgLCBwc2V1ZG9TdHlsZShOT1BTRVVETykKICAgICAgICAgeyB9CiAKICAgICAgICAgQ1NTU2Vs ZWN0b3IqIHNlbGVjdG9yOwpAQCAtNzMsNiArNzQsNyBAQCBwdWJsaWM6CiAgICAgICAgIFJlbmRl clN0eWxlKiBlbGVtZW50U3R5bGU7CiAgICAgICAgIFJlbmRlclN0eWxlKiBlbGVtZW50UGFyZW50 U3R5bGU7CiAgICAgICAgIGJvb2wgaXNTdWJTZWxlY3RvcjsKKyAgICAgICAgUHNldWRvSWQgcHNl dWRvU3R5bGU7CiAgICAgfTsKIAogICAgIGJvb2wgY2hlY2tTZWxlY3RvcihDU1NTZWxlY3Rvcios IEVsZW1lbnQqLCBib29sIGlzRmFzdENoZWNrYWJsZVNlbGVjdG9yID0gZmFsc2UpIGNvbnN0OwpA QCAtMTAwLDkgKzEwMiw2IEBAIHB1YmxpYzoKICAgICBNb2RlIG1vZGUoKSBjb25zdCB7IHJldHVy biBtX21vZGU7IH0KICAgICB2b2lkIHNldE1vZGUoTW9kZSBtb2RlKSB7IG1fbW9kZSA9IG1vZGU7 IH0KIAotICAgIFBzZXVkb0lkIHBzZXVkb1N0eWxlKCkgY29uc3QgeyByZXR1cm4gbV9wc2V1ZG9T dHlsZTsgfQotICAgIHZvaWQgc2V0UHNldWRvU3R5bGUoUHNldWRvSWQgcHNldWRvSWQpIHsgbV9w c2V1ZG9TdHlsZSA9IHBzZXVkb0lkOyB9Ci0KICAgICBib29sIGhhc1Vua25vd25Qc2V1ZG9FbGVt ZW50cygpIGNvbnN0IHsgcmV0dXJuIG1faGFzVW5rbm93blBzZXVkb0VsZW1lbnRzOyB9CiAgICAg dm9pZCBjbGVhckhhc1Vua25vd25Qc2V1ZG9FbGVtZW50cygpIHsgbV9oYXNVbmtub3duUHNldWRv RWxlbWVudHMgPSBmYWxzZTsgfQogCkBAIC0xMzcsNyArMTM2LDYgQEAgcHJpdmF0ZToKICAgICBi b29sIG1fc3RyaWN0UGFyc2luZzsKICAgICBib29sIG1fZG9jdW1lbnRJc0hUTUw7CiAgICAgTW9k ZSBtX21vZGU7Ci0gICAgUHNldWRvSWQgbV9wc2V1ZG9TdHlsZTsKICAgICBtdXRhYmxlIGJvb2wg bV9oYXNVbmtub3duUHNldWRvRWxlbWVudHM7CiAgICAgbXV0YWJsZSBIYXNoU2V0PExpbmtIYXNo LCBMaW5rSGFzaEhhc2g+IG1fbGlua3NDaGVja2VkRm9yVmlzaXRlZFN0YXRlOwogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNvbHZlci5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9jc3MvU3R5bGVSZXNvbHZlci5jcHAKaW5kZXggZGQ4NzczNzcxZjFmODc3YzBjZjM5YmY5NDRm ZTZhMjBiMDY1MTYxYy4uMjI2MGU1Mjc3N2UzM2Y4Y2I0YWU5MjRkMDE3OWY4NzIzZjQyOGYzOSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmNwcApAQCAtMTExOSw3ICsxMTE5LDcgQEAg dm9pZCBTdHlsZVJlc29sdmVyOjpjb2xsZWN0TWF0Y2hpbmdSdWxlc0Zvckxpc3QoY29uc3QgVmVj dG9yPFJ1bGVEYXRhPiogcnVsZXMsIGkKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIC8vIElm IHdlJ3JlIG1hdGNoaW5nIG5vcm1hbCBydWxlcywgc2V0IGEgcHNldWRvIGJpdCBpZgogICAgICAg ICAgICAgLy8gd2UgcmVhbGx5IGp1c3QgbWF0Y2hlZCBhIHBzZXVkby1lbGVtZW50LgotICAgICAg ICAgICAgaWYgKG1fZHluYW1pY1BzZXVkbyAhPSBOT1BTRVVETyAmJiBtX2NoZWNrZXIucHNldWRv U3R5bGUoKSA9PSBOT1BTRVVETykgeworICAgICAgICAgICAgaWYgKG1fZHluYW1pY1BzZXVkbyAh PSBOT1BTRVVETyAmJiBtX3BzZXVkb1N0eWxlID09IE5PUFNFVURPKSB7CiAgICAgICAgICAgICAg ICAgaWYgKG1fY2hlY2tlci5tb2RlKCkgPT0gU2VsZWN0b3JDaGVja2VyOjpDb2xsZWN0aW5nUnVs ZXMpIHsKICAgICAgICAgICAgICAgICAgICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRN YXRjaFJ1bGUoY29va2llLCBmYWxzZSk7CiAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOwpA QCAtMTIxNiw3ICsxMjE2LDcgQEAgaW5saW5lIHZvaWQgU3R5bGVSZXNvbHZlcjo6aW5pdEVsZW1l bnQoRWxlbWVudCogZSkKIAogaW5saW5lIHZvaWQgU3R5bGVSZXNvbHZlcjo6aW5pdEZvclN0eWxl UmVzb2x2ZShFbGVtZW50KiBlLCBSZW5kZXJTdHlsZSogcGFyZW50U3R5bGUsIFBzZXVkb0lkIHBz ZXVkb0lEKQogewotICAgIG1fY2hlY2tlci5zZXRQc2V1ZG9TdHlsZShwc2V1ZG9JRCk7CisgICAg bV9wc2V1ZG9TdHlsZSA9IHBzZXVkb0lEOwogCiAgICAgaWYgKGUpIHsKICAgICAgICAgTm9kZVJl bmRlcmluZ0NvbnRleHQgY29udGV4dChlKTsKQEAgLTI0MDMsNyArMjQwMyw3IEBAIGlubGluZSBi b29sIFN0eWxlUmVzb2x2ZXI6OmNoZWNrU2VsZWN0b3IoY29uc3QgUnVsZURhdGEmIHJ1bGVEYXRh LCBjb25zdCBDb250YWluCiAKICAgICBpZiAocnVsZURhdGEuaGFzRmFzdENoZWNrYWJsZVNlbGVj dG9yKCkpIHsKICAgICAgICAgLy8gV2Uga25vdyB0aGlzIHNlbGVjdG9yIGRvZXMgbm90IGluY2x1 ZGUgYW55IHBzZXVkbyBlbGVtZW50cy4KLSAgICAgICAgaWYgKG1fY2hlY2tlci5wc2V1ZG9TdHls ZSgpICE9IE5PUFNFVURPKQorICAgICAgICBpZiAobV9wc2V1ZG9TdHlsZSAhPSBOT1BTRVVETykK ICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgLy8gV2Uga25vdyBhIHN1ZmZpY2ll bnRseSBzaW1wbGUgc2luZ2xlIHBhcnQgc2VsZWN0b3IgbWF0Y2hlcyBzaW1wbHkgYmVjYXVzZSB3 ZSBmb3VuZCBpdCBmcm9tIHRoZSBydWxlIGhhc2guCiAgICAgICAgIC8vIFRoaXMgaXMgbGltaXRl ZCB0byBIVE1MIG9ubHkgc28gd2UgZG9uJ3QgbmVlZCB0byBjaGVjayB0aGUgbmFtZXNwYWNlLgpA QCAtMjQyMiwxMCArMjQyMiwxMSBAQCBpbmxpbmUgYm9vbCBTdHlsZVJlc29sdmVyOjpjaGVja1Nl bGVjdG9yKGNvbnN0IFJ1bGVEYXRhJiBydWxlRGF0YSwgY29uc3QgQ29udGFpbgogICAgIGNvbnRl eHQuZWxlbWVudFN0eWxlID0gc3R5bGUoKTsKICAgICBjb250ZXh0LmVsZW1lbnRQYXJlbnRTdHls ZSA9IG1fcGFyZW50Tm9kZSA/IG1fcGFyZW50Tm9kZS0+cmVuZGVyU3R5bGUoKSA6IDA7CiAgICAg Y29udGV4dC5zY29wZSA9IHNjb3BlOworICAgIGNvbnRleHQucHNldWRvU3R5bGUgPSBtX3BzZXVk b1N0eWxlOwogICAgIFNlbGVjdG9yQ2hlY2tlcjo6U2VsZWN0b3JNYXRjaCBtYXRjaCA9IG1fY2hl Y2tlci5jaGVja1NlbGVjdG9yKGNvbnRleHQsIG1fZHluYW1pY1BzZXVkbyk7CiAgICAgaWYgKG1h dGNoICE9IFNlbGVjdG9yQ2hlY2tlcjo6U2VsZWN0b3JNYXRjaGVzKQogICAgICAgICByZXR1cm4g ZmFsc2U7Ci0gICAgaWYgKG1fY2hlY2tlci5wc2V1ZG9TdHlsZSgpICE9IE5PUFNFVURPICYmIG1f Y2hlY2tlci5wc2V1ZG9TdHlsZSgpICE9IG1fZHluYW1pY1BzZXVkbykKKyAgICBpZiAobV9wc2V1 ZG9TdHlsZSAhPSBOT1BTRVVETyAmJiBtX3BzZXVkb1N0eWxlICE9IG1fZHluYW1pY1BzZXVkbykK ICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIHJldHVybiB0cnVlOwogfQpAQCAtMjQzNiw3ICsy NDM3LDcgQEAgYm9vbCBTdHlsZVJlc29sdmVyOjpjaGVja1JlZ2lvblNlbGVjdG9yKENTU1NlbGVj dG9yKiByZWdpb25TZWxlY3RvciwgRWxlbWVudCogcmUKICAgICAgICAgcmV0dXJuIGZhbHNlOwog CiAgICAgbV9jaGVja2VyLmNsZWFySGFzVW5rbm93blBzZXVkb0VsZW1lbnRzKCk7Ci0gICAgbV9j aGVja2VyLnNldFBzZXVkb1N0eWxlKE5PUFNFVURPKTsKKyAgICBtX3BzZXVkb1N0eWxlID0gTk9Q U0VVRE87CiAKICAgICBmb3IgKENTU1NlbGVjdG9yKiBzID0gcmVnaW9uU2VsZWN0b3I7IHM7IHMg PSBDU1NTZWxlY3Rvckxpc3Q6Om5leHQocykpCiAgICAgICAgIGlmIChtX2NoZWNrZXIuY2hlY2tT ZWxlY3RvcihzLCByZWdpb25FbGVtZW50KSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nz cy9TdHlsZVJlc29sdmVyLmggYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNvbHZlci5oCmlu ZGV4IGZlNjk3MzkwYzc2MGM2ZWIzYjdhOTBiNTVhZDEzYjJlYzhjZWRiYjAuLmZjNWM3MzUyZmQy YzNlNzU2MzAxM2Y4ZWFiYTEyMjQ5ZDM1N2M1MWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2Nzcy9TdHlsZVJlc29sdmVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUmVzb2x2 ZXIuaApAQCAtNDgzLDYgKzQ4Myw3IEBAIHByaXZhdGU6CiAgICAgUmVmUHRyPFJlbmRlclN0eWxl PiBtX3Jvb3REZWZhdWx0U3R5bGU7CiAKICAgICBQc2V1ZG9JZCBtX2R5bmFtaWNQc2V1ZG87Cisg ICAgUHNldWRvSWQgbV9wc2V1ZG9TdHlsZTsKIAogICAgIFNlbGVjdG9yQ2hlY2tlciBtX2NoZWNr ZXI7CiAK 163886 2012-09-13 08:58:25 -0700 2012-09-13 09:32:43 -0700 Patch for landing bug-96431-20120913085757.patch text/plain 7378 dglazkov U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4NDcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzQ5YjliNzI5MmVkZTM2 NzNlNDU4ZmQ0ODVkZTU2MmFlNzJiOWQ1NS4uMzNlMzc4YTNiYzVhNzBkODQwZjM2MGUyYTNhYmVj Y2JmOWU3OTZkZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEyLTA5LTExICBEaW1p dHJpIEdsYXprb3YgIDxkZ2xhemtvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgU3RvcCBzaHV0 dGxpbmcgUHNldWRvSWQgZnJvbSBTdHlsZVJlc29sdmVyIHRvIFNlbGVjdG9yQ2hlY2tlci4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk2NDMxCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCisKKyAgICAgICAgU2VsZWN0b3JDaGVja2Vy IHJldGFpbmVkIGV4dHJhIHN0YXRlIHRvIHN0b3JlIHRoZSBQc2V1ZG9JZCB2YWx1ZSBvZiB0aGUg ZWxlbWVudC4gSXQgd2FzIHNhZCwgYmVjYXVzZSB3ZSBuZWVkZWQgdG8gZXhwbGljaXRseSBtYWlu dGFpbiBpdHMgaW50ZWdyaXR5LiBJbnN0ZWFkLCB3ZSBub3cganVzdCBtYWtlIGl0IHBhcnQgb2Yg U3R5bGVSZXNvbHZlciBhbmQgZmVlZCB0byBTZWxlY3RvckNoZWNrZXIgYXMgcGFydCBvZiBTZWxl Y3RvckNoZWNraW5nQ29udGV4dC4KKworICAgICAgICBObyBuZXcgdGVzdHMsIHJlZmFjdG9yaW5n IG9ubHkuIENvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMuCisKKyAgICAgICAgKiBjc3MvU2VsZWN0 b3JDaGVja2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNlbGVjdG9yQ2hlY2tlcjo6U2VsZWN0 b3JDaGVja2VyKTogUmVtb3ZlZCBzdGF0ZSBpbml0aWFsaXplci4KKyAgICAgICAgKFdlYkNvcmU6 OlNlbGVjdG9yQ2hlY2tlcjo6Y2hlY2tTZWxlY3Rvcik6IENoYW5nZWQgdG8gbG9vayBpbnRvIGNv bnRleHQsIHJhdGhlciB0aGFuIG93biBtZW1iZXIuCisgICAgICAgICogY3NzL1NlbGVjdG9yQ2hl Y2tlci5oOgorICAgICAgICAoV2ViQ29yZTo6U2VsZWN0b3JDaGVja2VyOjpTZWxlY3RvckNoZWNr aW5nQ29udGV4dDo6U2VsZWN0b3JDaGVja2luZ0NvbnRleHQpOiBBZGRlZCBwc2V1ZG9TdHlsZSBh cyBwYXJhbWV0ZXIuCisgICAgICAgIChTZWxlY3RvckNoZWNraW5nQ29udGV4dCk6IEFkZGVkIHBz ZXVkb1N0eWxlIGFzIG1lbWJlci4KKyAgICAgICAgKiBjc3MvU3R5bGVSZXNvbHZlci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpTdHlsZVJlc29sdmVyOjpjb2xsZWN0TWF0Y2hpbmdSdWxlc0Zvckxp c3QpOiBDaGFuZ2VkIHRvIGxvb2sgYXQgb3duIG1lbWJlciwgcmF0aGVyIHRoYW4gbV9jaGVja2Vy LgorICAgICAgICAqIGNzcy9TdHlsZVJlc29sdmVyLmg6CisgICAgICAgIChTdHlsZVJlc29sdmVy KTogQWRkZWQgbmV3IG1lbWJlci4KKwogMjAxMi0wOS0xMyAgS2VubmV0aCBSb2hkZSBDaHJpc3Rp YW5zZW4gIDxrZW5uZXRoQHdlYmtpdC5vcmc+CiAKICAgICAgICAgW0VGTF0gVXNlIFJlZlB0ciBm b3Igc3RvcmluZyBjYWlyb19zdXJmYWNlX3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nz cy9TZWxlY3RvckNoZWNrZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL1NlbGVjdG9yQ2hlY2tl ci5jcHAKaW5kZXggNDg1ZDZjYzYxNzY3MjcwNGRiMmQ2ZWYxNWUyY2MxMDU5Y2UwYWEyMi4uMTMz ZTJhOGFhNGNlNmZlMzBjYWIzYmQ3OTgzNDJmNzdkYzQ4ZmIzMyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvY3NzL1NlbGVjdG9yQ2hlY2tlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3Nz L1NlbGVjdG9yQ2hlY2tlci5jcHAKQEAgLTcwLDcgKzcwLDYgQEAgU2VsZWN0b3JDaGVja2VyOjpT ZWxlY3RvckNoZWNrZXIoRG9jdW1lbnQqIGRvY3VtZW50LCBib29sIHN0cmljdFBhcnNpbmcpCiAg ICAgLCBtX3N0cmljdFBhcnNpbmcoc3RyaWN0UGFyc2luZykKICAgICAsIG1fZG9jdW1lbnRJc0hU TUwoZG9jdW1lbnQtPmlzSFRNTERvY3VtZW50KCkpCiAgICAgLCBtX21vZGUoUmVzb2x2aW5nU3R5 bGUpCi0gICAgLCBtX3BzZXVkb1N0eWxlKE5PUFNFVURPKQogewogfQogCkBAIC00NjIsNyArNDYx LDcgQEAgU2VsZWN0b3JDaGVja2VyOjpTZWxlY3Rvck1hdGNoIFNlbGVjdG9yQ2hlY2tlcjo6Y2hl Y2tTZWxlY3Rvcihjb25zdCBTZWxlY3RvckNoZWMKICAgICAgICAgICAgIHJldHVybiBTZWxlY3Rv ckZhaWxzQ29tcGxldGVseTsKIAogICAgICAgICAvLyBCYWlsLW91dCBpZiB0aGlzIHNlbGVjdG9y IGlzIGlycmVsZXZhbnQgZm9yIHRoZSBwc2V1ZG9TdHlsZQotICAgICAgICBpZiAobV9wc2V1ZG9T dHlsZSAhPSBOT1BTRVVETyAmJiBtX3BzZXVkb1N0eWxlICE9IGR5bmFtaWNQc2V1ZG8pCisgICAg ICAgIGlmIChjb250ZXh0LnBzZXVkb1N0eWxlICE9IE5PUFNFVURPICYmIGNvbnRleHQucHNldWRv U3R5bGUgIT0gZHluYW1pY1BzZXVkbykKICAgICAgICAgICAgIHJldHVybiBTZWxlY3RvckZhaWxz Q29tcGxldGVseTsKIAogICAgICAgICAvLyBEaXNhYmxlIDp2aXNpdGVkIG1hdGNoaW5nIHdoZW4g d2Ugc2VlIHRoZSBmaXJzdCBsaW5rIG9yIHRyeSB0byBtYXRjaCBhbnl0aGluZyBlbHNlIHRoYW4g YW4gYW5jZXN0b3JzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL1NlbGVjdG9yQ2hl Y2tlci5oIGIvU291cmNlL1dlYkNvcmUvY3NzL1NlbGVjdG9yQ2hlY2tlci5oCmluZGV4IGViNmZm YjljYjVjYjY0MmQ5MjczZTYyZGUzODc5ZGQ0NWQxNmMxZDEuLmYxNWNlMGQwOGVlNDMyOThiNDEy MDQxMmNmNzZkOTVhYTViZjNjMDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TZWxl Y3RvckNoZWNrZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU2VsZWN0b3JDaGVja2VyLmgK QEAgLTY0LDYgKzY0LDcgQEAgcHVibGljOgogICAgICAgICAgICAgLCBlbGVtZW50U3R5bGUoMCkK ICAgICAgICAgICAgICwgZWxlbWVudFBhcmVudFN0eWxlKDApCiAgICAgICAgICAgICAsIGlzU3Vi U2VsZWN0b3IoZmFsc2UpCisgICAgICAgICAgICAsIHBzZXVkb1N0eWxlKE5PUFNFVURPKQogICAg ICAgICB7IH0KIAogICAgICAgICBDU1NTZWxlY3Rvciogc2VsZWN0b3I7CkBAIC03Myw2ICs3NCw3 IEBAIHB1YmxpYzoKICAgICAgICAgUmVuZGVyU3R5bGUqIGVsZW1lbnRTdHlsZTsKICAgICAgICAg UmVuZGVyU3R5bGUqIGVsZW1lbnRQYXJlbnRTdHlsZTsKICAgICAgICAgYm9vbCBpc1N1YlNlbGVj dG9yOworICAgICAgICBQc2V1ZG9JZCBwc2V1ZG9TdHlsZTsKICAgICB9OwogCiAgICAgYm9vbCBj aGVja1NlbGVjdG9yKENTU1NlbGVjdG9yKiwgRWxlbWVudCosIGJvb2wgaXNGYXN0Q2hlY2thYmxl U2VsZWN0b3IgPSBmYWxzZSkgY29uc3Q7CkBAIC0xMDAsOSArMTAyLDYgQEAgcHVibGljOgogICAg IE1vZGUgbW9kZSgpIGNvbnN0IHsgcmV0dXJuIG1fbW9kZTsgfQogICAgIHZvaWQgc2V0TW9kZShN b2RlIG1vZGUpIHsgbV9tb2RlID0gbW9kZTsgfQogCi0gICAgUHNldWRvSWQgcHNldWRvU3R5bGUo KSBjb25zdCB7IHJldHVybiBtX3BzZXVkb1N0eWxlOyB9Ci0gICAgdm9pZCBzZXRQc2V1ZG9TdHls ZShQc2V1ZG9JZCBwc2V1ZG9JZCkgeyBtX3BzZXVkb1N0eWxlID0gcHNldWRvSWQ7IH0KLQogICAg IHN0YXRpYyBib29sIHRhZ01hdGNoZXMoY29uc3QgRWxlbWVudCosIGNvbnN0IENTU1NlbGVjdG9y Kik7CiAgICAgc3RhdGljIGJvb2wgYXR0cmlidXRlTmFtZU1hdGNoZXMoY29uc3QgQXR0cmlidXRl KiwgY29uc3QgUXVhbGlmaWVkTmFtZSYpOwogICAgIHN0YXRpYyBib29sIGlzQ29tbW9uUHNldWRv Q2xhc3NTZWxlY3Rvcihjb25zdCBDU1NTZWxlY3RvciopOwpAQCAtMTM0LDcgKzEzMyw2IEBAIHBy aXZhdGU6CiAgICAgYm9vbCBtX3N0cmljdFBhcnNpbmc7CiAgICAgYm9vbCBtX2RvY3VtZW50SXNI VE1MOwogICAgIE1vZGUgbV9tb2RlOwotICAgIFBzZXVkb0lkIG1fcHNldWRvU3R5bGU7CiAgICAg bXV0YWJsZSBIYXNoU2V0PExpbmtIYXNoLCBMaW5rSGFzaEhhc2g+IG1fbGlua3NDaGVja2VkRm9y VmlzaXRlZFN0YXRlOwogCiAgICAgc3RydWN0IFBhcmVudFN0YWNrRnJhbWUgewpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUv Y3NzL1N0eWxlUmVzb2x2ZXIuY3BwCmluZGV4IGNiYmYwNGE0MTE2OTExZjg2NzZiOTIzNzQwN2U2 NDcwZGUwMzQzZDkuLjhlNmNiZWFkNGZiYmFhMTFhNGFkNDFhMGJkM2RhNWU0ZTZhN2ExYjMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNvbHZlci5jcHAKQEAgLTExMjEsNyArMTEyMSw3IEBAIHZv aWQgU3R5bGVSZXNvbHZlcjo6Y29sbGVjdE1hdGNoaW5nUnVsZXNGb3JMaXN0KGNvbnN0IFZlY3Rv cjxSdWxlRGF0YT4qIHJ1bGVzLCBpCiAgICAgICAgICAgICB9CiAgICAgICAgICAgICAvLyBJZiB3 ZSdyZSBtYXRjaGluZyBub3JtYWwgcnVsZXMsIHNldCBhIHBzZXVkbyBiaXQgaWYKICAgICAgICAg ICAgIC8vIHdlIHJlYWxseSBqdXN0IG1hdGNoZWQgYSBwc2V1ZG8tZWxlbWVudC4KLSAgICAgICAg ICAgIGlmIChtX2R5bmFtaWNQc2V1ZG8gIT0gTk9QU0VVRE8gJiYgbV9jaGVja2VyLnBzZXVkb1N0 eWxlKCkgPT0gTk9QU0VVRE8pIHsKKyAgICAgICAgICAgIGlmIChtX2R5bmFtaWNQc2V1ZG8gIT0g Tk9QU0VVRE8gJiYgbV9wc2V1ZG9TdHlsZSA9PSBOT1BTRVVETykgewogICAgICAgICAgICAgICAg IGlmIChtX2NoZWNrZXIubW9kZSgpID09IFNlbGVjdG9yQ2hlY2tlcjo6Q29sbGVjdGluZ1J1bGVz KSB7CiAgICAgICAgICAgICAgICAgICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkTWF0 Y2hSdWxlKGNvb2tpZSwgZmFsc2UpOwogICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKQEAg LTEyMTgsNyArMTIxOCw3IEBAIGlubGluZSB2b2lkIFN0eWxlUmVzb2x2ZXI6OmluaXRFbGVtZW50 KEVsZW1lbnQqIGUpCiAKIGlubGluZSB2b2lkIFN0eWxlUmVzb2x2ZXI6OmluaXRGb3JTdHlsZVJl c29sdmUoRWxlbWVudCogZSwgUmVuZGVyU3R5bGUqIHBhcmVudFN0eWxlLCBQc2V1ZG9JZCBwc2V1 ZG9JRCkKIHsKLSAgICBtX2NoZWNrZXIuc2V0UHNldWRvU3R5bGUocHNldWRvSUQpOworICAgIG1f cHNldWRvU3R5bGUgPSBwc2V1ZG9JRDsKIAogICAgIGlmIChlKSB7CiAgICAgICAgIE5vZGVSZW5k ZXJpbmdDb250ZXh0IGNvbnRleHQoZSk7CkBAIC0yNDA1LDcgKzI0MDUsNyBAQCBpbmxpbmUgYm9v bCBTdHlsZVJlc29sdmVyOjpjaGVja1NlbGVjdG9yKGNvbnN0IFJ1bGVEYXRhJiBydWxlRGF0YSwg Y29uc3QgQ29udGFpbgogCiAgICAgaWYgKHJ1bGVEYXRhLmhhc0Zhc3RDaGVja2FibGVTZWxlY3Rv cigpKSB7CiAgICAgICAgIC8vIFdlIGtub3cgdGhpcyBzZWxlY3RvciBkb2VzIG5vdCBpbmNsdWRl IGFueSBwc2V1ZG8gZWxlbWVudHMuCi0gICAgICAgIGlmIChtX2NoZWNrZXIucHNldWRvU3R5bGUo KSAhPSBOT1BTRVVETykKKyAgICAgICAgaWYgKG1fcHNldWRvU3R5bGUgIT0gTk9QU0VVRE8pCiAg ICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgIC8vIFdlIGtub3cgYSBzdWZmaWNpZW50 bHkgc2ltcGxlIHNpbmdsZSBwYXJ0IHNlbGVjdG9yIG1hdGNoZXMgc2ltcGx5IGJlY2F1c2Ugd2Ug Zm91bmQgaXQgZnJvbSB0aGUgcnVsZSBoYXNoLgogICAgICAgICAvLyBUaGlzIGlzIGxpbWl0ZWQg dG8gSFRNTCBvbmx5IHNvIHdlIGRvbid0IG5lZWQgdG8gY2hlY2sgdGhlIG5hbWVzcGFjZS4KQEAg LTI0MjQsMTAgKzI0MjQsMTEgQEAgaW5saW5lIGJvb2wgU3R5bGVSZXNvbHZlcjo6Y2hlY2tTZWxl Y3Rvcihjb25zdCBSdWxlRGF0YSYgcnVsZURhdGEsIGNvbnN0IENvbnRhaW4KICAgICBjb250ZXh0 LmVsZW1lbnRTdHlsZSA9IHN0eWxlKCk7CiAgICAgY29udGV4dC5lbGVtZW50UGFyZW50U3R5bGUg PSBtX3BhcmVudE5vZGUgPyBtX3BhcmVudE5vZGUtPnJlbmRlclN0eWxlKCkgOiAwOwogICAgIGNv bnRleHQuc2NvcGUgPSBzY29wZTsKKyAgICBjb250ZXh0LnBzZXVkb1N0eWxlID0gbV9wc2V1ZG9T dHlsZTsKICAgICBTZWxlY3RvckNoZWNrZXI6OlNlbGVjdG9yTWF0Y2ggbWF0Y2ggPSBtX2NoZWNr ZXIuY2hlY2tTZWxlY3Rvcihjb250ZXh0LCBtX2R5bmFtaWNQc2V1ZG8sIG1faGFzVW5rbm93blBz ZXVkb0VsZW1lbnRzKTsKICAgICBpZiAobWF0Y2ggIT0gU2VsZWN0b3JDaGVja2VyOjpTZWxlY3Rv ck1hdGNoZXMpCiAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICBpZiAobV9jaGVja2VyLnBzZXVk b1N0eWxlKCkgIT0gTk9QU0VVRE8gJiYgbV9jaGVja2VyLnBzZXVkb1N0eWxlKCkgIT0gbV9keW5h bWljUHNldWRvKQorICAgIGlmIChtX3BzZXVkb1N0eWxlICE9IE5PUFNFVURPICYmIG1fcHNldWRv U3R5bGUgIT0gbV9keW5hbWljUHNldWRvKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgcmV0 dXJuIHRydWU7CiB9CkBAIC0yNDM4LDcgKzI0MzksNyBAQCBib29sIFN0eWxlUmVzb2x2ZXI6OmNo ZWNrUmVnaW9uU2VsZWN0b3IoQ1NTU2VsZWN0b3IqIHJlZ2lvblNlbGVjdG9yLCBFbGVtZW50KiBy ZQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBtX2hhc1Vua25vd25Qc2V1ZG9FbGVtZW50 cyA9IGZhbHNlOwotICAgIG1fY2hlY2tlci5zZXRQc2V1ZG9TdHlsZShOT1BTRVVETyk7CisgICAg bV9wc2V1ZG9TdHlsZSA9IE5PUFNFVURPOwogCiAgICAgZm9yIChDU1NTZWxlY3RvciogcyA9IHJl Z2lvblNlbGVjdG9yOyBzOyBzID0gQ1NTU2VsZWN0b3JMaXN0OjpuZXh0KHMpKQogICAgICAgICBp ZiAobV9jaGVja2VyLmNoZWNrU2VsZWN0b3IocywgcmVnaW9uRWxlbWVudCkpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNvbHZlci5oIGIvU291cmNlL1dlYkNvcmUvY3Nz L1N0eWxlUmVzb2x2ZXIuaAppbmRleCA4NzljMzUwOWZhMjZiYjI4NThhOGQxMTUxMGI4Yzg0NTkw MDA1MjU3Li5lNjk4YTRmZmQ3Nzk4ZDAzYzUwZTdjYjEwODczMTY3NDYyZTEyNjYwIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNvbHZlci5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL2Nzcy9TdHlsZVJlc29sdmVyLmgKQEAgLTQ4MCw2ICs0ODAsNyBAQCBwcml2YXRlOgogICAg IFJlZlB0cjxSZW5kZXJTdHlsZT4gbV9yb290RGVmYXVsdFN0eWxlOwogCiAgICAgUHNldWRvSWQg bV9keW5hbWljUHNldWRvOworICAgIFBzZXVkb0lkIG1fcHNldWRvU3R5bGU7CiAKICAgICBTZWxl Y3RvckNoZWNrZXIgbV9jaGVja2VyOwogCg==