52418 2011-01-13 18:01:19 -0800 [chromium] Tiled compositor should use texture manager 2011-01-19 14:29:26 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 enne enne commit-queue enne jamesr kbr nduca vangelis oldest_to_newest 334064 0 enne 2011-01-13 18:01:19 -0800 [chromium] Tiled compositor should use texture manager 334065 1 enne 2011-01-13 18:03:37 -0800 This is a needed first step prior to tiling the content and image layers. This change will get the root layer's behavior closer to how these other layers behave. 334576 2 78992 enne 2011-01-14 13:52:13 -0800 Created attachment 78992 Patch 334596 3 78992 kbr 2011-01-14 14:04:34 -0800 Comment on attachment 78992 Patch Looks good as far as I can tell from code inspection. Please make sure these changes are fully tested in the browser as well as with the automated tests. 334643 4 enne 2011-01-14 14:59:07 -0800 Yeah, I know our compositing testing infrastructure is not the best yet, so I did a number of manual browser tests (which the ChangeLog entry was too narrow to contain). I opened up a number of pages (in the same render process) that used the compositor, resized the browser, switched tabs, closed tabs, and made sure both scrollbars still behaved as expected. 336807 5 78992 commit-queue 2011-01-19 14:29:21 -0800 Comment on attachment 78992 Patch Clearing flags on attachment: 78992 Committed r76165: <http://trac.webkit.org/changeset/76165> 336808 6 commit-queue 2011-01-19 14:29:26 -0800 All reviewed patches have been landed. Closing bug. 78992 2011-01-14 13:52:13 -0800 2011-01-19 14:29:21 -0800 Patch bug-52418-20110114135212.patch text/plain 10526 enne ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBkM2MyZDc0MmZjNjc0MjM3YTBhOTA3ZmU2NzA1MWQzZDE5MjM1ZmMxLi4x ZWU0MGE4YjQ0YjY5OGE2NjFmMDI4YmMxNmE3OWZkMDdkMjk3Y2NiIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMjUgQEAKKzIwMTEtMDEtMTQgIEFkcmllbm5lIFdhbGtlciAgPGVubmVAZ29vZ2xlLmNv bT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbY2hy b21pdW1dIFRpbGVkIGNvbXBvc2l0b3Igc2hvdWxkIHVzZSB0ZXh0dXJlIG1hbmFnZXIKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUyNDE4CisKKyAgICAg ICAgVGVzdDogY29tcG9zaXRpbmcvCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJv bWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5ZXJS ZW5kZXJlckNocm9taXVtOjp+TGF5ZXJSZW5kZXJlckNocm9taXVtKToKKyAgICAgICAgKFdlYkNv cmU6OkxheWVyUmVuZGVyZXJDaHJvbWl1bTo6Y2xlYW51cFNoYXJlZE9iamVjdHMpOgorICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyVGlsZXJDaHJvbWl1bS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpMYXllclRpbGVyQ2hyb21pdW06OkxheWVyVGlsZXJDaHJvbWl1bSk6 CisgICAgICAgIChXZWJDb3JlOjpMYXllclRpbGVyQ2hyb21pdW06OnJlc2V0KToKKyAgICAgICAg KFdlYkNvcmU6OkxheWVyVGlsZXJDaHJvbWl1bTo6Y3JlYXRlVGlsZSk6CisgICAgICAgIChXZWJD b3JlOjpMYXllclRpbGVyQ2hyb21pdW06OnVwZGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpMYXll clRpbGVyQ2hyb21pdW06OmRyYXcpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9t aXVtL0xheWVyVGlsZXJDaHJvbWl1bS5oOgorICAgICAgICAoV2ViQ29yZTo6TGF5ZXJUaWxlckNo cm9taXVtOjpUaWxlOjpUaWxlKToKKyAgICAgICAgKFdlYkNvcmU6OkxheWVyVGlsZXJDaHJvbWl1 bTo6VGlsZTo6dGV4dHVyZSk6CisKIDIwMTEtMDEtMTMgIEFkcmllbm5lIFdhbGtlciAgPGVubmVA Z29vZ2xlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBLZW5uZXRoIFJ1c3NlbGwuCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclJl bmRlcmVyQ2hyb21pdW0uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hy b21pdW0vTGF5ZXJSZW5kZXJlckNocm9taXVtLmNwcAppbmRleCA4ZDc3YmVhZTliNTM2MjI3M2Iz OGE5OGU5YzZjNDM3M2I0NDZmNGI0Li43MjgzMzllM2I4NjJmOTJjYjJkMzU0OTk2OTYwZDg5ZTEw ODEyMDEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJv bWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1bS5jcHAKQEAgLTExOSwx MiArMTE5LDYgQEAgTGF5ZXJSZW5kZXJlckNocm9taXVtOjpMYXllclJlbmRlcmVyQ2hyb21pdW0o UGFzc1JlZlB0cjxHcmFwaGljc0NvbnRleHQzRD4gY29udGUKIExheWVyUmVuZGVyZXJDaHJvbWl1 bTo6fkxheWVyUmVuZGVyZXJDaHJvbWl1bSgpCiB7CiAgICAgY2xlYW51cFNoYXJlZE9iamVjdHMo KTsKLQotICAgIC8vIEJlY2F1c2UgdGhlIHRpbGVycyBuZWVkIHRvIGNsZWFuIHVwIHRleHR1cmVz LCBjbGVhbiB0aGVtIHVwIGV4cGxpY2l0bHkKLSAgICAvLyBiZWZvcmUgdGhlIEdyYXBoaWNzQ29u dGV4dDNEIGlzIGRlc3Ryb3llZC4KLSAgICBtX3Jvb3RMYXllclRpbGVyLmNsZWFyKCk7Ci0gICAg bV9ob3Jpem9udGFsU2Nyb2xsYmFyVGlsZXIuY2xlYXIoKTsKLSAgICBtX3ZlcnRpY2FsU2Nyb2xs YmFyVGlsZXIuY2xlYXIoKTsKIH0KIAogR3JhcGhpY3NDb250ZXh0M0QqIExheWVyUmVuZGVyZXJD aHJvbWl1bTo6Y29udGV4dCgpCkBAIC03OTUsNiArNzg5LDExIEBAIHZvaWQgTGF5ZXJSZW5kZXJl ckNocm9taXVtOjpjbGVhbnVwU2hhcmVkT2JqZWN0cygpCiAgICAgaWYgKG1fb2Zmc2NyZWVuRnJh bWVidWZmZXJJZCkKICAgICAgICAgR0xDKG1fY29udGV4dC5nZXQoKSwgbV9jb250ZXh0LT5kZWxl dGVGcmFtZWJ1ZmZlcihtX29mZnNjcmVlbkZyYW1lYnVmZmVySWQpKTsKIAorICAgIC8vIENsZWFy IHRpbGVycyBiZWZvcmUgdGhlIHRleHR1cmUgbWFuYWdlciwgYXMgdGhleSBoYXZlIHJlZmVyZW5j ZXMgdG8gdGV4dHVyZXMuCisgICAgbV9yb290TGF5ZXJUaWxlci5jbGVhcigpOworICAgIG1faG9y aXpvbnRhbFNjcm9sbGJhclRpbGVyLmNsZWFyKCk7CisgICAgbV92ZXJ0aWNhbFNjcm9sbGJhclRp bGVyLmNsZWFyKCk7CisKICAgICBtX3RleHR1cmVNYW5hZ2VyLmNsZWFyKCk7CiB9CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyVGls ZXJDaHJvbWl1bS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1 bS9MYXllclRpbGVyQ2hyb21pdW0uY3BwCmluZGV4IGI0YjRhNzJkYWI5NGMzOWE3MjBlM2E5M2Ux MTQzOTMxZDNjNTIzZjMuLjZiNjVlNjY5NDg1ZTBlN2JiZGVmZTg1NWE2ZjA1MzQ5NGJkODdkN2Ug MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xh eWVyVGlsZXJDaHJvbWl1bS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vTGF5ZXJUaWxlckNocm9taXVtLmNwcApAQCAtMzMsNiArMzMsNyBAQAogI2lu Y2x1ZGUgIkdyYXBoaWNzQ29udGV4dC5oIgogI2luY2x1ZGUgIkdyYXBoaWNzQ29udGV4dDNELmgi CiAjaW5jbHVkZSAiTGF5ZXJSZW5kZXJlckNocm9taXVtLmgiCisjaW5jbHVkZSAiTGF5ZXJUZXh0 dXJlLmgiCiAKICNpZiBQTEFURk9STShTS0lBKQogI2luY2x1ZGUgIk5hdGl2ZUltYWdlU2tpYS5o IgpAQCAtNTQsNyArNTUsOCBAQCBQYXNzT3duUHRyPExheWVyVGlsZXJDaHJvbWl1bT4gTGF5ZXJU aWxlckNocm9taXVtOjpjcmVhdGUoTGF5ZXJSZW5kZXJlckNocm9taXVtKgogfQogCiBMYXllclRp bGVyQ2hyb21pdW06OkxheWVyVGlsZXJDaHJvbWl1bShMYXllclJlbmRlcmVyQ2hyb21pdW0qIGxh eWVyUmVuZGVyZXIsIGNvbnN0IEludFNpemUmIHRpbGVTaXplKQotICAgIDogbV9sYXllclJlbmRl cmVyKGxheWVyUmVuZGVyZXIpCisgICAgOiBtX3NraXBzRHJhdyhmYWxzZSkKKyAgICAsIG1fbGF5 ZXJSZW5kZXJlcihsYXllclJlbmRlcmVyKQogewogICAgIHNldFRpbGVTaXplKHRpbGVTaXplKTsK IH0KQEAgLTgzLDE3ICs4NSw3IEBAIHZvaWQgTGF5ZXJUaWxlckNocm9taXVtOjpzZXRUaWxlU2l6 ZShjb25zdCBJbnRTaXplJiBzaXplKQogCiB2b2lkIExheWVyVGlsZXJDaHJvbWl1bTo6cmVzZXQo KQogewotICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbV90aWxlcy5zaXplKCk7ICsraSkgewot ICAgICAgICBpZiAoIW1fdGlsZXNbaV0pCi0gICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAg bGF5ZXJSZW5kZXJlcigpLT5kZWxldGVMYXllclRleHR1cmUobV90aWxlc1tpXS0+cmVsZWFzZVRl eHR1cmVJZCgpKTsKLSAgICB9CiAgICAgbV90aWxlcy5jbGVhcigpOwotICAgIGZvciAoc2l6ZV90 IGkgPSAwOyBpIDwgbV91bnVzZWRUaWxlcy5zaXplKCk7ICsraSkgewotICAgICAgICBpZiAoIW1f dW51c2VkVGlsZXNbaV0pCi0gICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgbGF5ZXJSZW5k ZXJlcigpLT5kZWxldGVMYXllclRleHR1cmUobV91bnVzZWRUaWxlc1tpXS0+cmVsZWFzZVRleHR1 cmVJZCgpKTsKLSAgICB9CiAgICAgbV91bnVzZWRUaWxlcy5jbGVhcigpOwogCiAgICAgbV9sYXll clNpemUgPSBJbnRTaXplKCk7CkBAIC0xMTAsMTIgKzEwMiw5IEBAIExheWVyVGlsZXJDaHJvbWl1 bTo6VGlsZSogTGF5ZXJUaWxlckNocm9taXVtOjpjcmVhdGVUaWxlKGludCBpLCBpbnQgaikKICAg ICAgICAgbV90aWxlc1tpbmRleF0gPSBtX3VudXNlZFRpbGVzLmxhc3QoKS5yZWxlYXNlKCk7CiAg ICAgICAgIG1fdW51c2VkVGlsZXMucmVtb3ZlTGFzdCgpOwogICAgIH0gZWxzZSB7Ci0gICAgICAg IGNvbnN0IHVuc2lnbmVkIGludCB0ZXh0dXJlSWQgPSBsYXllclJlbmRlcmVyKCktPmNyZWF0ZUxh eWVyVGV4dHVyZSgpOwotICAgICAgICBPd25QdHI8VGlsZT4gdGlsZSA9IGFkb3B0UHRyKG5ldyBU aWxlKHRleHR1cmVJZCkpOwotCiAgICAgICAgIEdyYXBoaWNzQ29udGV4dDNEKiBjb250ZXh0ID0g bGF5ZXJSZW5kZXJlckNvbnRleHQoKTsKLSAgICAgICAgR0xDKGNvbnRleHQsIGNvbnRleHQtPnRl eEltYWdlMkRSZXNvdXJjZVNhZmUoR3JhcGhpY3NDb250ZXh0M0Q6OlRFWFRVUkVfMkQsIDAsIEdy YXBoaWNzQ29udGV4dDNEOjpSR0JBLCBtX3RpbGVTaXplLndpZHRoKCksIG1fdGlsZVNpemUuaGVp Z2h0KCksIDAsIEdyYXBoaWNzQ29udGV4dDNEOjpSR0JBLCBHcmFwaGljc0NvbnRleHQzRDo6VU5T SUdORURfQllURSkpOwotCisgICAgICAgIFRleHR1cmVNYW5hZ2VyKiBtYW5hZ2VyID0gbGF5ZXJS ZW5kZXJlcigpLT50ZXh0dXJlTWFuYWdlcigpOworICAgICAgICBPd25QdHI8VGlsZT4gdGlsZSA9 IGFkb3B0UHRyKG5ldyBUaWxlKExheWVyVGV4dHVyZTo6Y3JlYXRlKGNvbnRleHQsIG1hbmFnZXIp KSk7CiAgICAgICAgIG1fdGlsZXNbaW5kZXhdID0gdGlsZS5yZWxlYXNlKCk7CiAgICAgfQogCkBA IC0yMzgsNiArMjI3LDkgQEAgdm9pZCBMYXllclRpbGVyQ2hyb21pdW06OmludmFsaWRhdGVFbnRp cmVMYXllcigpCiAKIHZvaWQgTGF5ZXJUaWxlckNocm9taXVtOjp1cGRhdGUoVGlsZVBhaW50SW50 ZXJmYWNlJiBwYWludGVyLCBjb25zdCBJbnRSZWN0JiBjb250ZW50UmVjdCkKIHsKKyAgICBpZiAo bV9za2lwc0RyYXcpCisgICAgICAgIHJldHVybjsKKwogICAgIC8vIEludmFsaWRhdGUgb2xkIHRp bGVzIHRoYXQgd2VyZSBwcmV2aW91c2x5IHVzZWQgYnV0IGFyZW4ndCBpbiB1c2UgdGhpcwogICAg IC8vIGZyYW1lIHNvIHRoYXQgdGhleSBjYW4gZ2V0IHJldXNlZCBmb3IgbmV3IHRpbGVzLgogICAg IEludFJlY3QgbGF5ZXJSZWN0ID0gY29udGVudFJlY3RUb0xheWVyUmVjdChjb250ZW50UmVjdCk7 CkBAIC0yNTYsNiArMjQ4LDggQEAgdm9pZCBMYXllclRpbGVyQ2hyb21pdW06OnVwZGF0ZShUaWxl UGFpbnRJbnRlcmZhY2UmIHBhaW50ZXIsIGNvbnN0IEludFJlY3QmIGNvbnQKICAgICAgICAgICAg IFRpbGUqIHRpbGUgPSBtX3RpbGVzW3RpbGVJbmRleChpLCBqKV0uZ2V0KCk7CiAgICAgICAgICAg ICBpZiAoIXRpbGUpCiAgICAgICAgICAgICAgICAgdGlsZSA9IGNyZWF0ZVRpbGUoaSwgaik7Cisg ICAgICAgICAgICBpZiAoIXRpbGUtPnRleHR1cmUoKS0+aXNWYWxpZChtX3RpbGVTaXplLCBHcmFw aGljc0NvbnRleHQzRDo6UkdCQSkpCisgICAgICAgICAgICAgICAgdGlsZS0+bV9kaXJ0eUxheWVy UmVjdCA9IHRpbGVMYXllclJlY3QoaSwgaik7CiAgICAgICAgICAgICBkaXJ0eUxheWVyUmVjdC51 bml0ZSh0aWxlLT5tX2RpcnR5TGF5ZXJSZWN0KTsKICAgICAgICAgfQogICAgIH0KQEAgLTMxOCw2 ICszMTIsMTIgQEAgdm9pZCBMYXllclRpbGVyQ2hyb21pdW06OnVwZGF0ZShUaWxlUGFpbnRJbnRl cmZhY2UmIHBhaW50ZXIsIGNvbnN0IEludFJlY3QmIGNvbnQKICAgICAgICAgICAgIGlmIChzb3Vy Y2VSZWN0LmlzRW1wdHkoKSkKICAgICAgICAgICAgICAgICBjb250aW51ZTsKIAorICAgICAgICAg ICAgaWYgKCF0aWxlLT50ZXh0dXJlKCktPnJlc2VydmUobV90aWxlU2l6ZSwgR3JhcGhpY3NDb250 ZXh0M0Q6OlJHQkEpKSB7CisgICAgICAgICAgICAgICAgbV9za2lwc0RyYXcgPSB0cnVlOworICAg ICAgICAgICAgICAgIHJlc2V0KCk7CisgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAg ICAgfQorCiAgICAgICAgICAgICAvLyBDYWxjdWxhdGUgdGlsZS1zcGFjZSByZWN0YW5nbGUgdG8g dXBsb2FkIGludG8uCiAgICAgICAgICAgICBJbnRSZWN0IGRlc3RSZWN0KEludFBvaW50KHNvdXJj ZVJlY3QueCgpIC0gYW5jaG9yLngoKSwgc291cmNlUmVjdC55KCkgLSBhbmNob3IueSgpKSwgc291 cmNlUmVjdC5zaXplKCkpOwogICAgICAgICAgICAgQVNTRVJUKGRlc3RSZWN0LngoKSA+PSAwKTsK QEAgLTM0Miw3ICszNDIsNyBAQCB2b2lkIExheWVyVGlsZXJDaHJvbWl1bTo6dXBkYXRlKFRpbGVQ YWludEludGVyZmFjZSYgcGFpbnRlciwgY29uc3QgSW50UmVjdCYgY29udAogICAgICAgICAgICAg ICAgIHBpeGVsU291cmNlID0gJm1fdGlsZVBpeGVsc1swXTsKICAgICAgICAgICAgIH0KIAotICAg ICAgICAgICAgR0xDKGNvbnRleHQsIGNvbnRleHQtPmJpbmRUZXh0dXJlKEdyYXBoaWNzQ29udGV4 dDNEOjpURVhUVVJFXzJELCB0aWxlLT50ZXh0dXJlSWQoKSkpOworICAgICAgICAgICAgdGlsZS0+ dGV4dHVyZSgpLT5iaW5kVGV4dHVyZSgpOwogICAgICAgICAgICAgR0xDKGNvbnRleHQsIGNvbnRl eHQtPnRleFN1YkltYWdlMkQoR3JhcGhpY3NDb250ZXh0M0Q6OlRFWFRVUkVfMkQsIDAsIGRlc3RS ZWN0LngoKSwgZGVzdFJlY3QueSgpLCBkZXN0UmVjdC53aWR0aCgpLCBkZXN0UmVjdC5oZWlnaHQo KSwgR3JhcGhpY3NDb250ZXh0M0Q6OlJHQkEsIEdyYXBoaWNzQ29udGV4dDNEOjpVTlNJR05FRF9C WVRFLCBwaXhlbFNvdXJjZSkpOwogCiAgICAgICAgICAgICB0aWxlLT5jbGVhckRpcnR5KCk7CkBA IC0zNTcsNiArMzU3LDkgQEAgdm9pZCBMYXllclRpbGVyQ2hyb21pdW06OnNldExheWVyUG9zaXRp b24oY29uc3QgSW50UG9pbnQmIGxheWVyUG9zaXRpb24pCiAKIHZvaWQgTGF5ZXJUaWxlckNocm9t aXVtOjpkcmF3KGNvbnN0IEludFJlY3QmIGNvbnRlbnRSZWN0KQogeworICAgIGlmIChtX3NraXBz RHJhdykKKyAgICAgICAgcmV0dXJuOworCiAgICAgLy8gV2UgcmV1c2UgdGhlIHNoYWRlciBwcm9n cmFtIHVzZWQgYnkgQ29udGVudExheWVyQ2hyb21pdW0uCiAgICAgR3JhcGhpY3NDb250ZXh0M0Qq IGNvbnRleHQgPSBsYXllclJlbmRlcmVyQ29udGV4dCgpOwogICAgIGNvbnN0IENvbnRlbnRMYXll ckNocm9taXVtOjpTaGFyZWRWYWx1ZXMqIGNvbnRlbnRMYXllclZhbHVlcyA9IGxheWVyUmVuZGVy ZXIoKS0+Y29udGVudExheWVyU2hhcmVkVmFsdWVzKCk7CkBAIC0zNzAsMTMgKzM3MywxNSBAQCB2 b2lkIExheWVyVGlsZXJDaHJvbWl1bTo6ZHJhdyhjb25zdCBJbnRSZWN0JiBjb250ZW50UmVjdCkK ICAgICAgICAgICAgIFRpbGUqIHRpbGUgPSBtX3RpbGVzW3RpbGVJbmRleChpLCBqKV0uZ2V0KCk7 CiAgICAgICAgICAgICBBU1NFUlQodGlsZSk7CiAKLSAgICAgICAgICAgIEdMQyhjb250ZXh0LCBj b250ZXh0LT5iaW5kVGV4dHVyZShHcmFwaGljc0NvbnRleHQzRDo6VEVYVFVSRV8yRCwgdGlsZS0+ dGV4dHVyZUlkKCkpKTsKKyAgICAgICAgICAgIHRpbGUtPnRleHR1cmUoKS0+YmluZFRleHR1cmUo KTsKIAogICAgICAgICAgICAgVHJhbnNmb3JtYXRpb25NYXRyaXggdGlsZU1hdHJpeDsKICAgICAg ICAgICAgIEludFJlY3QgdGlsZVJlY3QgPSB0aWxlQ29udGVudFJlY3QoaSwgaik7CiAgICAgICAg ICAgICB0aWxlTWF0cml4LnRyYW5zbGF0ZTNkKHRpbGVSZWN0LngoKSAtIGNvbnRlbnRSZWN0Lngo KSArIHRpbGVSZWN0LndpZHRoKCkgLyAyLjAsIHRpbGVSZWN0LnkoKSAtIGNvbnRlbnRSZWN0Lnko KSArIHRpbGVSZWN0LmhlaWdodCgpIC8gMi4wLCAwKTsKIAogICAgICAgICAgICAgTGF5ZXJDaHJv bWl1bTo6ZHJhd1RleHR1cmVkUXVhZChjb250ZXh0LCBsYXllclJlbmRlcmVyKCktPnByb2plY3Rp b25NYXRyaXgoKSwgdGlsZU1hdHJpeCwgbV90aWxlU2l6ZS53aWR0aCgpLCBtX3RpbGVTaXplLmhl aWdodCgpLCAxLCBjb250ZW50TGF5ZXJWYWx1ZXMtPnNoYWRlck1hdHJpeExvY2F0aW9uKCksIGNv bnRlbnRMYXllclZhbHVlcy0+c2hhZGVyQWxwaGFMb2NhdGlvbigpKTsKKworICAgICAgICAgICAg dGlsZS0+dGV4dHVyZSgpLT51bnJlc2VydmUoKTsKICAgICAgICAgfQogICAgIH0KIH0KQEAgLTQx MCwyMSArNDE1LDYgQEAgdm9pZCBMYXllclRpbGVyQ2hyb21pdW06Omdyb3dMYXllclRvQ29udGFp bihjb25zdCBJbnRSZWN0JiBjb250ZW50UmVjdCkKICAgICByZXNpemVMYXllcihuZXdTaXplKTsK IH0KIAotTGF5ZXJUaWxlckNocm9taXVtOjpUaWxlOjp+VGlsZSgpCi17Ci0gICAgLy8gRWFjaCB0 aWxlIGRvZXNuJ3QgaGF2ZSBhIHJlZmVyZW5jZSB0byB0aGUgY29udGV4dCwgc28gY2FuJ3QgY2xl YW4gdXAKLSAgICAvLyBpdHMgb3duIHRleHR1cmUuICBJZiB0aGlzIGFzc2VydCBpcyBoaXQsIHRo ZW4gdGhlIExheWVyVGlsZXJDaHJvbWl1bQotICAgIC8vIGRlc3RydWN0b3IgZGlkbid0IGNsZWFu IHRoaXMgdXAuCi0gICAgQVNTRVJUKCFtX3RleHR1cmVJZCk7Ci19Ci0KLXVuc2lnbmVkIGludCBM YXllclRpbGVyQ2hyb21pdW06OlRpbGU6OnJlbGVhc2VUZXh0dXJlSWQoKQotewotICAgIHVuc2ln bmVkIGludCBpZCA9IG1fdGV4dHVyZUlkOwotICAgIG1fdGV4dHVyZUlkID0gMDsKLSAgICByZXR1 cm4gaWQ7Ci19Ci0KIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIAogI2VuZGlmIC8vIFVTRShBQ0NF TEVSQVRFRF9DT01QT1NJVElORykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2Nocm9taXVtL0xheWVyVGlsZXJDaHJvbWl1bS5oIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJUaWxlckNocm9taXVtLmgKaW5kZXggYzA2 NmZkZjZjMDk5YTBkNWZjMzZjM2M0YTk0NWRmM2JkYjFlZDhlMi4uMDVmNTI0MjUzMDk5YzdlN2E1 YzkwMzQ0MjZmOWY2YmU2MzVkYzliOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJUaWxlckNocm9taXVtLmgKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJUaWxlckNocm9taXVtLmgKQEAg LTMwLDYgKzMwLDcgQEAKICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCiAKICNpbmNs dWRlICJMYXllckNocm9taXVtLmgiCisjaW5jbHVkZSAiTGF5ZXJUZXh0dXJlLmgiCiAjaW5jbHVk ZSA8d3RmL093bkFycmF5UHRyLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKQEAgLTYxLDEzICs2 MiwxMSBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIExheWVyVGlsZXJDaHJvbWl1bShMYXllclJl bmRlcmVyQ2hyb21pdW0qIGxheWVyUmVuZGVyZXIsIGNvbnN0IEludFNpemUmIHRpbGVTaXplKTsK IAotICAgIGNsYXNzIFRpbGUgeworICAgIGNsYXNzIFRpbGUgOiBwdWJsaWMgTm9uY29weWFibGUg ewogICAgIHB1YmxpYzoKLSAgICAgICAgZXhwbGljaXQgVGlsZSh1bnNpZ25lZCBpbnQgdGV4dHVy ZUlkKSA6IG1fdGV4dHVyZUlkKHRleHR1cmVJZCkgeyB9Ci0gICAgICAgIH5UaWxlKCk7CisgICAg ICAgIGV4cGxpY2l0IFRpbGUoUGFzc093blB0cjxMYXllclRleHR1cmU+IHRleCkgOiBtX3RleCh0 ZXgpIHt9CiAKLSAgICAgICAgdW5zaWduZWQgaW50IHRleHR1cmVJZCgpIGNvbnN0IHsgcmV0dXJu IG1fdGV4dHVyZUlkOyB9Ci0gICAgICAgIHVuc2lnbmVkIGludCByZWxlYXNlVGV4dHVyZUlkKCk7 CisgICAgICAgIExheWVyVGV4dHVyZSogdGV4dHVyZSgpIHsgcmV0dXJuIG1fdGV4LmdldCgpOyB9 CiAKICAgICAgICAgYm9vbCBkaXJ0eSgpIGNvbnN0IHsgcmV0dXJuICFtX2RpcnR5TGF5ZXJSZWN0 LmlzRW1wdHkoKTsgfQogICAgICAgICB2b2lkIGNsZWFyRGlydHkoKSB7IG1fZGlydHlMYXllclJl Y3QgPSBJbnRSZWN0KCk7IH0KQEAgLTc1LDcgKzc0LDcgQEAgcHJpdmF0ZToKICAgICAgICAgLy8g TGF5ZXItc3BhY2UgZGlydHkgcmVjdGFuZ2xlIHRoYXQgbmVlZHMgdG8gYmUgcmVwYWludGVkLgog ICAgICAgICBJbnRSZWN0IG1fZGlydHlMYXllclJlY3Q7CiAgICAgcHJpdmF0ZToKLSAgICAgICAg dW5zaWduZWQgaW50IG1fdGV4dHVyZUlkOworICAgICAgICBPd25QdHI8TGF5ZXJUZXh0dXJlPiBt X3RleDsKICAgICB9OwogCiAgICAgdm9pZCByZXNpemVMYXllcihjb25zdCBJbnRTaXplJiBzaXpl KTsKQEAgLTEwNSw2ICsxMDQsOCBAQCBwcml2YXRlOgogICAgIEludFJlY3QgbV9sYXN0VXBkYXRl TGF5ZXJSZWN0OwogICAgIEludFBvaW50IG1fbGF5ZXJQb3NpdGlvbjsKIAorICAgIGJvb2wgbV9z a2lwc0RyYXc7CisKICAgICAvLyBMb2dpY2FsIDJEIGFycmF5IG9mIHRpbGVzIChkaW1lbnNpb25z IG9mIG1fbGF5ZXJUaWxlU2l6ZSkKICAgICBWZWN0b3I8T3duUHRyPFRpbGU+ID4gbV90aWxlczsK ICAgICAvLyBMaW5lYXIgYXJyYXkgb2YgdW51c2VkIHRpbGVzLgo=