148541 2015-08-27 15:54:19 -0700 Tiny cleanup in RenderLayer::enclosingCompositingLayerForRepaint() 2015-08-27 20:51:35 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zalan zalan commit-queue esprehn+autocc glenn kondapallykalyan simon.fraser oldest_to_newest 1121458 0 zalan 2015-08-27 15:54:19 -0700 Use compositedWithOwnBackingStore. 1121463 1 260092 zalan 2015-08-27 16:00:02 -0700 Created attachment 260092 Patch 1121471 2 260093 zalan 2015-08-27 16:14:09 -0700 Created attachment 260093 Patch 1121555 3 260093 commit-queue 2015-08-27 20:51:31 -0700 Comment on attachment 260093 Patch Clearing flags on attachment: 260093 Committed r189083: <http://trac.webkit.org/changeset/189083> 1121556 4 commit-queue 2015-08-27 20:51:35 -0700 All reviewed patches have been landed. Closing bug. 260092 2015-08-27 16:00:02 -0700 2015-08-27 16:05:13 -0700 Patch bug-148541-20150827155950.patch text/plain 4081 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTg5MDIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjU2MDlhNjFjZDgyMjU1 YjdiYjE4NTZkZGYyMDlkMjY0MThmYzhmNS4uYTFjNTk2ZTNhMjE4NDM3MTc4YmIyODI1M2ViOWM4 ZmE1YjI4NjFjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE1LTA4LTI3ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgVGlueSBjbGVhbnVwIGluIFJl bmRlckxheWVyOjplbmNsb3NpbmdDb21wb3NpdGluZ0xheWVyRm9yUmVwYWludCgpCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDg1NDEKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBjaGFuZ2UgaW4gZnVu Y3Rpb25hbGl0eS4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpjb21wb3NpdGluZ0NvbnRhaW5lcik6CisgICAgICAgIChXZWJDb3JlOjpj b21wb3NpdGVkV2l0aE93bkJhY2tpbmdTdG9yZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJM YXllcjo6ZW5jbG9zaW5nQ29tcG9zaXRpbmdMYXllcik6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJMYXllcjo6ZW5jbG9zaW5nQ29tcG9zaXRpbmdMYXllckZvclJlcGFpbnQpOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyTGF5ZXI6OmNsaXBwaW5nUm9vdEZvclBhaW50aW5nKToKKwogMjAxNS0w OC0yNyAgRGVhbiBKYWNrc29uICA8ZGlub0BhcHBsZS5jb20+CiAKICAgICAgICAgSW5pdGlhbCBp bmZyYXN0cnVjdHVyZSBvZiBtZWRpYSBjb250cm9scyB0ZXN0aW5nCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckxheWVyLmNwcAppbmRleCBiODU5ZGZlYmZkM2U0MzFjNGYwNGIxNmRhNjI5 OGQxZWY3MjEwYThkLi5jZDU0YTM5ZWI3MjNmN2ViYWRiZmU0MTA0NzE2YWQ5OGNlM2E2OGU2IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKQEAgLTE1MTUsOSArMTUx NSw5IEBAIFJlbmRlckxheWVyKiBSZW5kZXJMYXllcjo6ZW5jbG9zaW5nVHJhbnNmb3JtZWRBbmNl c3RvcigpIGNvbnN0CiAgICAgcmV0dXJuIGN1cnI7CiB9CiAKLXN0YXRpYyBpbmxpbmUgY29uc3Qg UmVuZGVyTGF5ZXIqIGNvbXBvc2l0aW5nQ29udGFpbmVyKGNvbnN0IFJlbmRlckxheWVyKiBsYXll cikKK3N0YXRpYyBpbmxpbmUgY29uc3QgUmVuZGVyTGF5ZXIqIGNvbXBvc2l0aW5nQ29udGFpbmVy KGNvbnN0IFJlbmRlckxheWVyJiBsYXllcikKIHsKLSAgICByZXR1cm4gbGF5ZXItPmlzTm9ybWFs Rmxvd09ubHkoKSA/IGxheWVyLT5wYXJlbnQoKSA6IGxheWVyLT5zdGFja2luZ0NvbnRhaW5lcigp OworICAgIHJldHVybiBsYXllci5pc05vcm1hbEZsb3dPbmx5KCkgPyBsYXllci5wYXJlbnQoKSA6 IGxheWVyLnN0YWNraW5nQ29udGFpbmVyKCk7CiB9CiAKIGlubGluZSBib29sIFJlbmRlckxheWVy OjpzaG91bGRSZXBhaW50QWZ0ZXJMYXlvdXQoKSBjb25zdApAQCAtMTUzMSw5ICsxNTMxLDkgQEAg aW5saW5lIGJvb2wgUmVuZGVyTGF5ZXI6OnNob3VsZFJlcGFpbnRBZnRlckxheW91dCgpIGNvbnN0 CiAgICAgcmV0dXJuICFpc0NvbXBvc2l0ZWQoKSB8fCBiYWNraW5nKCktPnBhaW50c0ludG9Db21w b3NpdGVkQW5jZXN0b3IoKTsKIH0KIAotYm9vbCBjb21wb3NpdGVkV2l0aE93bkJhY2tpbmdTdG9y ZShjb25zdCBSZW5kZXJMYXllciogbGF5ZXIpCitzdGF0aWMgYm9vbCBjb21wb3NpdGVkV2l0aE93 bkJhY2tpbmdTdG9yZShjb25zdCBSZW5kZXJMYXllciYgbGF5ZXIpCiB7Ci0gICAgcmV0dXJuIGxh eWVyLT5pc0NvbXBvc2l0ZWQoKSAmJiAhbGF5ZXItPmJhY2tpbmcoKS0+cGFpbnRzSW50b0NvbXBv c2l0ZWRBbmNlc3RvcigpOworICAgIHJldHVybiBsYXllci5pc0NvbXBvc2l0ZWQoKSAmJiAhbGF5 ZXIuYmFja2luZygpLT5wYWludHNJbnRvQ29tcG9zaXRlZEFuY2VzdG9yKCk7CiB9CiAKIFJlbmRl ckxheWVyKiBSZW5kZXJMYXllcjo6ZW5jbG9zaW5nQ29tcG9zaXRpbmdMYXllcihJbmNsdWRlU2Vs Zk9yTm90IGluY2x1ZGVTZWxmKSBjb25zdApAQCAtMTU0MSw3ICsxNTQxLDcgQEAgUmVuZGVyTGF5 ZXIqIFJlbmRlckxheWVyOjplbmNsb3NpbmdDb21wb3NpdGluZ0xheWVyKEluY2x1ZGVTZWxmT3JO b3QgaW5jbHVkZVNlbGYKICAgICBpZiAoaW5jbHVkZVNlbGYgPT0gSW5jbHVkZVNlbGYgJiYgaXND b21wb3NpdGVkKCkpCiAgICAgICAgIHJldHVybiBjb25zdF9jYXN0PFJlbmRlckxheWVyKj4odGhp cyk7CiAKLSAgICBmb3IgKGNvbnN0IFJlbmRlckxheWVyKiBjdXJyID0gY29tcG9zaXRpbmdDb250 YWluZXIodGhpcyk7IGN1cnI7IGN1cnIgPSBjb21wb3NpdGluZ0NvbnRhaW5lcihjdXJyKSkgewor ICAgIGZvciAoY29uc3QgUmVuZGVyTGF5ZXIqIGN1cnIgPSBjb21wb3NpdGluZ0NvbnRhaW5lcigq dGhpcyk7IGN1cnI7IGN1cnIgPSBjb21wb3NpdGluZ0NvbnRhaW5lcigqY3VycikpIHsKICAgICAg ICAgaWYgKGN1cnItPmlzQ29tcG9zaXRlZCgpKQogICAgICAgICAgICAgcmV0dXJuIGNvbnN0X2Nh c3Q8UmVuZGVyTGF5ZXIqPihjdXJyKTsKICAgICB9CkBAIC0xNTUxLDExICsxNTUxLDExIEBAIFJl bmRlckxheWVyKiBSZW5kZXJMYXllcjo6ZW5jbG9zaW5nQ29tcG9zaXRpbmdMYXllcihJbmNsdWRl U2VsZk9yTm90IGluY2x1ZGVTZWxmCiAKIFJlbmRlckxheWVyKiBSZW5kZXJMYXllcjo6ZW5jbG9z aW5nQ29tcG9zaXRpbmdMYXllckZvclJlcGFpbnQoSW5jbHVkZVNlbGZPck5vdCBpbmNsdWRlU2Vs ZikgY29uc3QKIHsKLSAgICBpZiAoaW5jbHVkZVNlbGYgPT0gSW5jbHVkZVNlbGYgJiYgaXNDb21w b3NpdGVkKCkgJiYgIWJhY2tpbmcoKS0+cGFpbnRzSW50b0NvbXBvc2l0ZWRBbmNlc3RvcigpKQor ICAgIGlmIChpbmNsdWRlU2VsZiA9PSBJbmNsdWRlU2VsZiAmJiBjb21wb3NpdGVkV2l0aE93bkJh Y2tpbmdTdG9yZSgqdGhpcykpCiAgICAgICAgIHJldHVybiBjb25zdF9jYXN0PFJlbmRlckxheWVy Kj4odGhpcyk7CiAKLSAgICBmb3IgKGNvbnN0IFJlbmRlckxheWVyKiBjdXJyID0gY29tcG9zaXRp bmdDb250YWluZXIodGhpcyk7IGN1cnI7IGN1cnIgPSBjb21wb3NpdGluZ0NvbnRhaW5lcihjdXJy KSkgewotICAgICAgICBpZiAoY29tcG9zaXRlZFdpdGhPd25CYWNraW5nU3RvcmUoY3VycikpCisg ICAgZm9yIChjb25zdCBSZW5kZXJMYXllciogY3VyciA9IGNvbXBvc2l0aW5nQ29udGFpbmVyKCp0 aGlzKTsgY3VycjsgY3VyciA9IGNvbXBvc2l0aW5nQ29udGFpbmVyKCpjdXJyKSkgeworICAgICAg ICBpZiAoY29tcG9zaXRlZFdpdGhPd25CYWNraW5nU3RvcmUoKmN1cnIpKQogICAgICAgICAgICAg cmV0dXJuIGNvbnN0X2Nhc3Q8UmVuZGVyTGF5ZXIqPihjdXJyKTsKICAgICB9CiAgICAgICAgICAK QEAgLTE2NDAsNyArMTY0MCw3IEBAIFJlbmRlckxheWVyKiBSZW5kZXJMYXllcjo6Y2xpcHBpbmdS b290Rm9yUGFpbnRpbmcoKSBjb25zdAogICAgICAgICBpZiAoY3VycmVudC0+aXNSb290TGF5ZXIo KSkKICAgICAgICAgICAgIHJldHVybiBjb25zdF9jYXN0PFJlbmRlckxheWVyKj4oY3VycmVudCk7 CiAKLSAgICAgICAgY3VycmVudCA9IGNvbXBvc2l0aW5nQ29udGFpbmVyKGN1cnJlbnQpOworICAg ICAgICBjdXJyZW50ID0gY29tcG9zaXRpbmdDb250YWluZXIoKmN1cnJlbnQpOwogICAgICAgICBB U1NFUlQoY3VycmVudCk7CiAgICAgICAgIGlmIChjdXJyZW50LT50cmFuc2Zvcm0oKSB8fCBjb21w b3NpdGVkV2l0aE93bkJhY2tpbmdTdG9yZShjdXJyZW50KSkKICAgICAgICAgICAgIHJldHVybiBj b25zdF9jYXN0PFJlbmRlckxheWVyKj4oY3VycmVudCk7Cg== 260093 2015-08-27 16:14:09 -0700 2015-08-27 20:51:31 -0700 Patch bug-148541-20150827161356.patch text/plain 7378 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTg5MDIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjU2MDlhNjFjZDgyMjU1 YjdiYjE4NTZkZGYyMDlkMjY0MThmYzhmNS4uNDBlYzhjNmMyYmY3OWZkYmRiYTllNTc1NjI3OTQy ZDY5N2JhNGY4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE1LTA4LTI3ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgVGlueSBjbGVhbnVwIGluIFJl bmRlckxheWVyOjplbmNsb3NpbmdDb21wb3NpdGluZ0xheWVyRm9yUmVwYWludCgpCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDg1NDEKKworICAgICAg ICBSZXZpZXdlZCBieSBUaW0gSG9ydG9uLgorCisgICAgICAgIE5vIGNoYW5nZSBpbiBmdW5jdGlv bmFsaXR5LgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OmNvbXBvc2l0aW5nQ29udGFpbmVyKToKKyAgICAgICAgKFdlYkNvcmU6OmNvbXBv c2l0ZWRXaXRoT3duQmFja2luZ1N0b3JlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVy OjplbmNsb3NpbmdDb21wb3NpdGluZ0xheWVyKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxh eWVyOjplbmNsb3NpbmdDb21wb3NpdGluZ0xheWVyRm9yUmVwYWludCk6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJMYXllcjo6ZW5jbG9zaW5nRmlsdGVyUmVwYWludExheWVyKToKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlckxheWVyOjpjbGlwcGluZ1Jvb3RGb3JQYWludGluZyk6CisgICAgICAg ICogcmVuZGVyaW5nL1JlbmRlckxheWVyLmg6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxh eWVyQmFja2luZy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpkZXNjZW5kYW50TGF5ZXJQYWludHNJ bnRvQW5jZXN0b3IpOgorCiAyMDE1LTA4LTI3ICBEZWFuIEphY2tzb24gIDxkaW5vQGFwcGxlLmNv bT4KIAogICAgICAgICBJbml0aWFsIGluZnJhc3RydWN0dXJlIG9mIG1lZGlhIGNvbnRyb2xzIHRl c3RpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCmluZGV4IGI4NTlk ZmViZmQzZTQzMWM0ZjA0YjE2ZGE2Mjk4ZDFlZjcyMTBhOGQuLjdkZWRlNzFjYzRkNDM0MTRlODNh OWY4YTcxNzU5NjI5YWI3ZGFkNzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJMYXllci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxh eWVyLmNwcApAQCAtMTUxNSw5ICsxNTE1LDkgQEAgUmVuZGVyTGF5ZXIqIFJlbmRlckxheWVyOjpl bmNsb3NpbmdUcmFuc2Zvcm1lZEFuY2VzdG9yKCkgY29uc3QKICAgICByZXR1cm4gY3VycjsKIH0K IAotc3RhdGljIGlubGluZSBjb25zdCBSZW5kZXJMYXllciogY29tcG9zaXRpbmdDb250YWluZXIo Y29uc3QgUmVuZGVyTGF5ZXIqIGxheWVyKQorc3RhdGljIGlubGluZSBjb25zdCBSZW5kZXJMYXll ciogY29tcG9zaXRpbmdDb250YWluZXIoY29uc3QgUmVuZGVyTGF5ZXImIGxheWVyKQogewotICAg IHJldHVybiBsYXllci0+aXNOb3JtYWxGbG93T25seSgpID8gbGF5ZXItPnBhcmVudCgpIDogbGF5 ZXItPnN0YWNraW5nQ29udGFpbmVyKCk7CisgICAgcmV0dXJuIGxheWVyLmlzTm9ybWFsRmxvd09u bHkoKSA/IGxheWVyLnBhcmVudCgpIDogbGF5ZXIuc3RhY2tpbmdDb250YWluZXIoKTsKIH0KIAog aW5saW5lIGJvb2wgUmVuZGVyTGF5ZXI6OnNob3VsZFJlcGFpbnRBZnRlckxheW91dCgpIGNvbnN0 CkBAIC0xNTMxLDkgKzE1MzEsOSBAQCBpbmxpbmUgYm9vbCBSZW5kZXJMYXllcjo6c2hvdWxkUmVw YWludEFmdGVyTGF5b3V0KCkgY29uc3QKICAgICByZXR1cm4gIWlzQ29tcG9zaXRlZCgpIHx8IGJh Y2tpbmcoKS0+cGFpbnRzSW50b0NvbXBvc2l0ZWRBbmNlc3RvcigpOwogfQogCi1ib29sIGNvbXBv c2l0ZWRXaXRoT3duQmFja2luZ1N0b3JlKGNvbnN0IFJlbmRlckxheWVyKiBsYXllcikKK2Jvb2wg Y29tcG9zaXRlZFdpdGhPd25CYWNraW5nU3RvcmUoY29uc3QgUmVuZGVyTGF5ZXImIGxheWVyKQog ewotICAgIHJldHVybiBsYXllci0+aXNDb21wb3NpdGVkKCkgJiYgIWxheWVyLT5iYWNraW5nKCkt PnBhaW50c0ludG9Db21wb3NpdGVkQW5jZXN0b3IoKTsKKyAgICByZXR1cm4gbGF5ZXIuaXNDb21w b3NpdGVkKCkgJiYgIWxheWVyLmJhY2tpbmcoKS0+cGFpbnRzSW50b0NvbXBvc2l0ZWRBbmNlc3Rv cigpOwogfQogCiBSZW5kZXJMYXllciogUmVuZGVyTGF5ZXI6OmVuY2xvc2luZ0NvbXBvc2l0aW5n TGF5ZXIoSW5jbHVkZVNlbGZPck5vdCBpbmNsdWRlU2VsZikgY29uc3QKQEAgLTE1NDEsNyArMTU0 MSw3IEBAIFJlbmRlckxheWVyKiBSZW5kZXJMYXllcjo6ZW5jbG9zaW5nQ29tcG9zaXRpbmdMYXll cihJbmNsdWRlU2VsZk9yTm90IGluY2x1ZGVTZWxmCiAgICAgaWYgKGluY2x1ZGVTZWxmID09IElu Y2x1ZGVTZWxmICYmIGlzQ29tcG9zaXRlZCgpKQogICAgICAgICByZXR1cm4gY29uc3RfY2FzdDxS ZW5kZXJMYXllcio+KHRoaXMpOwogCi0gICAgZm9yIChjb25zdCBSZW5kZXJMYXllciogY3VyciA9 IGNvbXBvc2l0aW5nQ29udGFpbmVyKHRoaXMpOyBjdXJyOyBjdXJyID0gY29tcG9zaXRpbmdDb250 YWluZXIoY3VycikpIHsKKyAgICBmb3IgKGNvbnN0IFJlbmRlckxheWVyKiBjdXJyID0gY29tcG9z aXRpbmdDb250YWluZXIoKnRoaXMpOyBjdXJyOyBjdXJyID0gY29tcG9zaXRpbmdDb250YWluZXIo KmN1cnIpKSB7CiAgICAgICAgIGlmIChjdXJyLT5pc0NvbXBvc2l0ZWQoKSkKICAgICAgICAgICAg IHJldHVybiBjb25zdF9jYXN0PFJlbmRlckxheWVyKj4oY3Vycik7CiAgICAgfQpAQCAtMTU1MSwx MSArMTU1MSwxMSBAQCBSZW5kZXJMYXllciogUmVuZGVyTGF5ZXI6OmVuY2xvc2luZ0NvbXBvc2l0 aW5nTGF5ZXIoSW5jbHVkZVNlbGZPck5vdCBpbmNsdWRlU2VsZgogCiBSZW5kZXJMYXllciogUmVu ZGVyTGF5ZXI6OmVuY2xvc2luZ0NvbXBvc2l0aW5nTGF5ZXJGb3JSZXBhaW50KEluY2x1ZGVTZWxm T3JOb3QgaW5jbHVkZVNlbGYpIGNvbnN0CiB7Ci0gICAgaWYgKGluY2x1ZGVTZWxmID09IEluY2x1 ZGVTZWxmICYmIGlzQ29tcG9zaXRlZCgpICYmICFiYWNraW5nKCktPnBhaW50c0ludG9Db21wb3Np dGVkQW5jZXN0b3IoKSkKKyAgICBpZiAoaW5jbHVkZVNlbGYgPT0gSW5jbHVkZVNlbGYgJiYgY29t cG9zaXRlZFdpdGhPd25CYWNraW5nU3RvcmUoKnRoaXMpKQogICAgICAgICByZXR1cm4gY29uc3Rf Y2FzdDxSZW5kZXJMYXllcio+KHRoaXMpOwogCi0gICAgZm9yIChjb25zdCBSZW5kZXJMYXllciog Y3VyciA9IGNvbXBvc2l0aW5nQ29udGFpbmVyKHRoaXMpOyBjdXJyOyBjdXJyID0gY29tcG9zaXRp bmdDb250YWluZXIoY3VycikpIHsKLSAgICAgICAgaWYgKGNvbXBvc2l0ZWRXaXRoT3duQmFja2lu Z1N0b3JlKGN1cnIpKQorICAgIGZvciAoY29uc3QgUmVuZGVyTGF5ZXIqIGN1cnIgPSBjb21wb3Np dGluZ0NvbnRhaW5lcigqdGhpcyk7IGN1cnI7IGN1cnIgPSBjb21wb3NpdGluZ0NvbnRhaW5lcigq Y3VycikpIHsKKyAgICAgICAgaWYgKGNvbXBvc2l0ZWRXaXRoT3duQmFja2luZ1N0b3JlKCpjdXJy KSkKICAgICAgICAgICAgIHJldHVybiBjb25zdF9jYXN0PFJlbmRlckxheWVyKj4oY3Vycik7CiAg ICAgfQogICAgICAgICAgCkBAIC0xNTc2LDcgKzE1NzYsNyBAQCBSZW5kZXJMYXllciogUmVuZGVy TGF5ZXI6OmVuY2xvc2luZ0ZpbHRlckxheWVyKEluY2x1ZGVTZWxmT3JOb3QgaW5jbHVkZVNlbGYp IGNvbgogUmVuZGVyTGF5ZXIqIFJlbmRlckxheWVyOjplbmNsb3NpbmdGaWx0ZXJSZXBhaW50TGF5 ZXIoKSBjb25zdAogewogICAgIGZvciAoY29uc3QgUmVuZGVyTGF5ZXIqIGN1cnIgPSB0aGlzOyBj dXJyOyBjdXJyID0gY3Vyci0+cGFyZW50KCkpIHsKLSAgICAgICAgaWYgKChjdXJyICE9IHRoaXMg JiYgY3Vyci0+cmVxdWlyZXNGdWxsTGF5ZXJJbWFnZUZvckZpbHRlcnMoKSkgfHwgY29tcG9zaXRl ZFdpdGhPd25CYWNraW5nU3RvcmUoY3VycikgfHwgY3Vyci0+aXNSb290TGF5ZXIoKSkKKyAgICAg ICAgaWYgKChjdXJyICE9IHRoaXMgJiYgY3Vyci0+cmVxdWlyZXNGdWxsTGF5ZXJJbWFnZUZvckZp bHRlcnMoKSkgfHwgY29tcG9zaXRlZFdpdGhPd25CYWNraW5nU3RvcmUoKmN1cnIpIHx8IGN1cnIt PmlzUm9vdExheWVyKCkpCiAgICAgICAgICAgICByZXR1cm4gY29uc3RfY2FzdDxSZW5kZXJMYXll cio+KGN1cnIpOwogICAgIH0KICAgICByZXR1cm4gbnVsbHB0cjsKQEAgLTE2NDAsOSArMTY0MCw5 IEBAIFJlbmRlckxheWVyKiBSZW5kZXJMYXllcjo6Y2xpcHBpbmdSb290Rm9yUGFpbnRpbmcoKSBj b25zdAogICAgICAgICBpZiAoY3VycmVudC0+aXNSb290TGF5ZXIoKSkKICAgICAgICAgICAgIHJl dHVybiBjb25zdF9jYXN0PFJlbmRlckxheWVyKj4oY3VycmVudCk7CiAKLSAgICAgICAgY3VycmVu dCA9IGNvbXBvc2l0aW5nQ29udGFpbmVyKGN1cnJlbnQpOworICAgICAgICBjdXJyZW50ID0gY29t cG9zaXRpbmdDb250YWluZXIoKmN1cnJlbnQpOwogICAgICAgICBBU1NFUlQoY3VycmVudCk7Ci0g ICAgICAgIGlmIChjdXJyZW50LT50cmFuc2Zvcm0oKSB8fCBjb21wb3NpdGVkV2l0aE93bkJhY2tp bmdTdG9yZShjdXJyZW50KSkKKyAgICAgICAgaWYgKGN1cnJlbnQtPnRyYW5zZm9ybSgpIHx8IGNv bXBvc2l0ZWRXaXRoT3duQmFja2luZ1N0b3JlKCpjdXJyZW50KSkKICAgICAgICAgICAgIHJldHVy biBjb25zdF9jYXN0PFJlbmRlckxheWVyKj4oY3VycmVudCk7CiAgICAgfQogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXllci5oCmluZGV4IGY3MWEyODNlNDY3MzcwMWVjYjViZjdkZTY1 ZjVjMWI5NGZhZmMzY2MuLmI2YTEyOGNhOGVmOTQ1ZDAwNmUxOGI3OTA5YWM5MTc1YzdjMmFiNDMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oCkBAIC0xMTg0LDcgKzExODQs NyBAQCBwcml2YXRlOgogCiB2b2lkIG1ha2VNYXRyaXhSZW5kZXJhYmxlKFRyYW5zZm9ybWF0aW9u TWF0cml4JiwgYm9vbCBoYXMzRFJlbmRlcmluZyk7CiAKLWJvb2wgY29tcG9zaXRlZFdpdGhPd25C YWNraW5nU3RvcmUoY29uc3QgUmVuZGVyTGF5ZXIqKTsKK2Jvb2wgY29tcG9zaXRlZFdpdGhPd25C YWNraW5nU3RvcmUoY29uc3QgUmVuZGVyTGF5ZXImKTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29y ZQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNr aW5nLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3Bw CmluZGV4IDcwY2RhYTg4NTQ1ZTZlOWJlZGU5OWI0ZGFiODRmMDQzNzU2NGRhNzQuLjUwNjRjNGY4 Y2Y4NmVmM2U3MGEzZWU3N2RiMjJjMTI1NjZlYjQ3ZjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCkBAIC0xOTAyLDcgKzE5MDIsNyBAQCBz dGF0aWMgYm9vbCBkZXNjZW5kYW50TGF5ZXJQYWludHNJbnRvQW5jZXN0b3IoUmVuZGVyTGF5ZXIm IHBhcmVudCkKICAgICAgICAgc2l6ZV90IGxpc3RTaXplID0gbm9ybWFsRmxvd0xpc3QtPnNpemUo KTsKICAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBsaXN0U2l6ZTsgKytpKSB7CiAgICAg ICAgICAgICBSZW5kZXJMYXllciogY3VyTGF5ZXIgPSBub3JtYWxGbG93TGlzdC0+YXQoaSk7Ci0g ICAgICAgICAgICBpZiAoIWNvbXBvc2l0ZWRXaXRoT3duQmFja2luZ1N0b3JlKGN1ckxheWVyKQor ICAgICAgICAgICAgaWYgKCFjb21wb3NpdGVkV2l0aE93bkJhY2tpbmdTdG9yZSgqY3VyTGF5ZXIp CiAgICAgICAgICAgICAgICAgJiYgKGN1ckxheWVyLT5pc1Zpc3VhbGx5Tm9uRW1wdHkoKSB8fCBk ZXNjZW5kYW50TGF5ZXJQYWludHNJbnRvQW5jZXN0b3IoKmN1ckxheWVyKSkpCiAgICAgICAgICAg ICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgIH0KQEAgLTE5MTcsNyArMTkxNyw3IEBAIHN0YXRp YyBib29sIGRlc2NlbmRhbnRMYXllclBhaW50c0ludG9BbmNlc3RvcihSZW5kZXJMYXllciYgcGFy ZW50KQogICAgICAgICAgICAgc2l6ZV90IGxpc3RTaXplID0gbmVnWk9yZGVyTGlzdC0+c2l6ZSgp OwogICAgICAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBsaXN0U2l6ZTsgKytpKSB7CiAg ICAgICAgICAgICAgICAgUmVuZGVyTGF5ZXIqIGN1ckxheWVyID0gbmVnWk9yZGVyTGlzdC0+YXQo aSk7Ci0gICAgICAgICAgICAgICAgaWYgKCFjb21wb3NpdGVkV2l0aE93bkJhY2tpbmdTdG9yZShj dXJMYXllcikKKyAgICAgICAgICAgICAgICBpZiAoIWNvbXBvc2l0ZWRXaXRoT3duQmFja2luZ1N0 b3JlKCpjdXJMYXllcikKICAgICAgICAgICAgICAgICAgICAgJiYgKGN1ckxheWVyLT5pc1Zpc3Vh bGx5Tm9uRW1wdHkoKSB8fCBkZXNjZW5kYW50TGF5ZXJQYWludHNJbnRvQW5jZXN0b3IoKmN1ckxh eWVyKSkpCiAgICAgICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAgICAgICAgfQpA QCAtMTkyNyw3ICsxOTI3LDcgQEAgc3RhdGljIGJvb2wgZGVzY2VuZGFudExheWVyUGFpbnRzSW50 b0FuY2VzdG9yKFJlbmRlckxheWVyJiBwYXJlbnQpCiAgICAgICAgICAgICBzaXplX3QgbGlzdFNp emUgPSBwb3NaT3JkZXJMaXN0LT5zaXplKCk7CiAgICAgICAgICAgICBmb3IgKHNpemVfdCBpID0g MDsgaSA8IGxpc3RTaXplOyArK2kpIHsKICAgICAgICAgICAgICAgICBSZW5kZXJMYXllciogY3Vy TGF5ZXIgPSBwb3NaT3JkZXJMaXN0LT5hdChpKTsKLSAgICAgICAgICAgICAgICBpZiAoIWNvbXBv c2l0ZWRXaXRoT3duQmFja2luZ1N0b3JlKGN1ckxheWVyKQorICAgICAgICAgICAgICAgIGlmICgh Y29tcG9zaXRlZFdpdGhPd25CYWNraW5nU3RvcmUoKmN1ckxheWVyKQogICAgICAgICAgICAgICAg ICAgICAmJiAoY3VyTGF5ZXItPmlzVmlzdWFsbHlOb25FbXB0eSgpIHx8IGRlc2NlbmRhbnRMYXll clBhaW50c0ludG9BbmNlc3RvcigqY3VyTGF5ZXIpKSkKICAgICAgICAgICAgICAgICAgICAgcmV0 dXJuIHRydWU7CiAgICAgICAgICAgICB9Cg==