30588 2009-10-20 11:59:23 -0700 Make accelerated compositing debug indicators work in release builds 2009-10-22 10:37:09 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser dino oldest_to_newest 156233 0 simon.fraser 2009-10-20 11:59:23 -0700 We have some useful indicators that show which page elements get compositing layers. We should make them available in release builds (they are controlled by 'defaults' settings). 156304 1 41524 simon.fraser 2009-10-20 14:42:36 -0700 Created attachment 41524 Patch 156419 2 41524 darin 2009-10-20 23:48:52 -0700 Comment on attachment 41524 Patch > + * platform/graphics/mac/WebLayer.mm: > + (WebCore::if): Please don't leave a line like this in the change log. r=me 156919 3 simon.fraser 2009-10-22 10:37:09 -0700 http://trac.webkit.org/changeset/49945 41524 2009-10-20 14:42:36 -0700 2009-10-20 23:48:52 -0700 Patch 30588_patch.txt text/plain 8628 simon.fraser ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MThlZmIwZS4uYjM1OTUzYSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMCBAQAorMjAwOS0xMC0yMCAgU2ltb24gRnJhc2Vy ICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBNYWtlIGFjY2VsZXJhdGVkIGNvbXBvc2l0aW5nIGRlYnVnIGlu ZGljYXRvcnMgd29yayBpbiByZWxlYXNlIGJ1aWxkcworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzA1ODgKKyAgICAgICAgCisgICAgICAgIEFsbG93IHNv bWUgZGVidWcgaW5kaWNhdG9ycywgdGhhdCBzaG93IHdoaWNoIHBhZ2UgZWxlbWVudHMgZ28gaW50 byBjb21wb3NpdGluZyBsYXllcnMsCisgICAgICAgIHRvIHdvcmsgaW4gcmVsZWFzZSBidWlsZHMs IHdoZW4gdGhlIHJ1bnRpbWUgcHJlZnMgYXJlIHNldC4KKworICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL0dyYXBoaWNzTGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXll cjo6R3JhcGhpY3NMYXllcik6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xheWVyOjpzZXRa UG9zaXRpb24pOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXIuaDoK KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9tYWMvR3JhcGhpY3NMYXllckNBLmg6CisgICAg ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0dyYXBoaWNzTGF5ZXJDQS5tbToKKyAgICAgICAg KFdlYkNvcmU6OmNsZWFyQm9yZGVyQ29sb3IpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NM YXllcjo6c2hvd1JlcGFpbnRDb3VudGVyKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5 ZXJDQTo6R3JhcGhpY3NMYXllckNBKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJD QTo6dXBkYXRlTWFza3NUb0JvdW5kcyk6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xheWVy Q0E6OnVwZGF0ZUxheWVyRHJhd3NDb250ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNz TGF5ZXJDQTo6c2V0RGVidWdCb3JkZXIpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXll ckNBOjpzd2FwRnJvbU9yVG9UaWxlZExheWVyKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNz TGF5ZXJDQTo6c2V0dXBDb250ZW50c0xheWVyKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9tYWMvV2ViTGF5ZXIubW06CisgICAgICAgIChXZWJDb3JlOjppZik6CisKIDIwMDktMTAtMTkg IFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgRGFyaW4gQWRsZXIuCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L0dyYXBoaWNzTGF5ZXIuY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0xh eWVyLmNwcAppbmRleCBkMTk2YTBjLi5jODU4MmJiIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXIuY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvR3JhcGhpY3NMYXllci5jcHAKQEAgLTU5LDkgKzU5LDcgQEAgR3JhcGhpY3NMYXllcjo6 R3JhcGhpY3NMYXllcihHcmFwaGljc0xheWVyQ2xpZW50KiBjbGllbnQpCiAgICAgOiBtX2NsaWVu dChjbGllbnQpCiAgICAgLCBtX2FuY2hvclBvaW50KDAuNWYsIDAuNWYsIDApCiAgICAgLCBtX29w YWNpdHkoMSkKLSNpZm5kZWYgTkRFQlVHCiAgICAgLCBtX3pQb3NpdGlvbigwKQotI2VuZGlmCiAg ICAgLCBtX2JhY2tncm91bmRDb2xvclNldChmYWxzZSkKICAgICAsIG1fY29udGVudHNPcGFxdWUo ZmFsc2UpCiAgICAgLCBtX3ByZXNlcnZlczNEKGZhbHNlKQpAQCAtNzQsOSArNzIsNyBAQCBHcmFw aGljc0xheWVyOjpHcmFwaGljc0xheWVyKEdyYXBoaWNzTGF5ZXJDbGllbnQqIGNsaWVudCkKICAg ICAsIG1fY29udGVudHNPcmllbnRhdGlvbihDb21wb3NpdGluZ0Nvb3JkaW5hdGVzVG9wRG93bikK ICAgICAsIG1fcGFyZW50KDApCiAgICAgLCBtX21hc2tMYXllcigwKQotI2lmbmRlZiBOREVCVUcK ICAgICAsIG1fcmVwYWludENvdW50KDApCi0jZW5kaWYKIHsKIH0KIApAQCAtMjI5LDcgKzIyNSw2 IEBAIHZvaWQgR3JhcGhpY3NMYXllcjo6cmVzdW1lQW5pbWF0aW9ucygpCiB7CiB9CiAKLSNpZm5k ZWYgTkRFQlVHCiB2b2lkIEdyYXBoaWNzTGF5ZXI6OnVwZGF0ZURlYnVnSW5kaWNhdG9ycygpCiB7 CiAgICAgaWYgKEdyYXBoaWNzTGF5ZXI6OnNob3dEZWJ1Z0JvcmRlcnMoKSkgewpAQCAtMjUxLDcg KzI0Niw2IEBAIHZvaWQgR3JhcGhpY3NMYXllcjo6c2V0WlBvc2l0aW9uKGZsb2F0IHBvc2l0aW9u KQogewogICAgIG1felBvc2l0aW9uID0gcG9zaXRpb247CiB9Ci0jZW5kaWYKIAogZmxvYXQgR3Jh cGhpY3NMYXllcjo6YWNjdW11bGF0ZWRPcGFjaXR5KCkgY29uc3QKIHsKZGlmZiAtLWdpdCBhL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NMYXllci5oIGIvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9HcmFwaGljc0xheWVyLmgKaW5kZXggZTViMTdhNi4uODVlYWNlMCAxMDA2NDQK LS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0xheWVyLmgKKysrIGIvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0xheWVyLmgKQEAgLTI3NiwxMCArMjc2LDgg QEAgcHVibGljOgogICAgIAogICAgIHZvaWQgZHVtcExheWVyKFRleHRTdHJlYW0mLCBpbnQgaW5k ZW50ID0gMCkgY29uc3Q7CiAKLSNpZm5kZWYgTkRFQlVHCiAgICAgaW50IHJlcGFpbnRDb3VudCgp IGNvbnN0IHsgcmV0dXJuIG1fcmVwYWludENvdW50OyB9CiAgICAgaW50IGluY3JlbWVudFJlcGFp bnRDb3VudCgpIHsgcmV0dXJuICsrbV9yZXBhaW50Q291bnQ7IH0KLSNlbmRpZgogCiAgICAgLy8g UmVwb3J0IHdoZXRoZXIgdGhlIHVuZGVybHlpbmcgY29tcG9zaXRpbmcgc3lzdGVtIHVzZXMgYSB0 b3AtZG93bgogICAgIC8vIG9yIGEgYm90dG9tLXVwIGNvb3JkaW5hdGUgc3lzdGVtLgpAQCAtMjk0 LDcgKzI5Miw2IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgc2V0Q29udGVudHNPcmllbnRh dGlvbihDb21wb3NpdGluZ0Nvb3JkaW5hdGVzT3JpZW50YXRpb24gb3JpZW50YXRpb24pIHsgbV9j b250ZW50c09yaWVudGF0aW9uID0gb3JpZW50YXRpb247IH0KICAgICBDb21wb3NpdGluZ0Nvb3Jk aW5hdGVzT3JpZW50YXRpb24gY29udGVudHNPcmllbnRhdGlvbigpIGNvbnN0IHsgcmV0dXJuIG1f Y29udGVudHNPcmllbnRhdGlvbjsgfQogCi0jaWZuZGVmIE5ERUJVRwogICAgIHN0YXRpYyBib29s IHNob3dEZWJ1Z0JvcmRlcnMoKTsKICAgICBzdGF0aWMgYm9vbCBzaG93UmVwYWludENvdW50ZXIo KTsKICAgICAKQEAgLTMwNSw3ICszMDIsNiBAQCBwdWJsaWM6CiAgICAgLy8gei1wb3NpdGlvbiBp cyB0aGUgei1lcXVpdmFsZW50IG9mIHBvc2l0aW9uKCkuIEl0J3Mgb25seSB1c2VkIGZvciBkZWJ1 Z2dpbmcgcHVycG9zZXMuCiAgICAgdmlydHVhbCBmbG9hdCB6UG9zaXRpb24oKSBjb25zdCB7IHJl dHVybiBtX3pQb3NpdGlvbjsgfQogICAgIHZpcnR1YWwgdm9pZCBzZXRaUG9zaXRpb24oZmxvYXQp OwotI2VuZGlmCiAKICAgICB2aXJ0dWFsIHZvaWQgZGlzdHJpYnV0ZU9wYWNpdHkoZmxvYXQpOwog ICAgIHZpcnR1YWwgZmxvYXQgYWNjdW11bGF0ZWRPcGFjaXR5KCkgY29uc3Q7CkBAIC0zNDIsOSAr MzM4LDcgQEAgcHJvdGVjdGVkOgogCiAgICAgQ29sb3IgbV9iYWNrZ3JvdW5kQ29sb3I7CiAgICAg ZmxvYXQgbV9vcGFjaXR5OwotI2lmbmRlZiBOREVCVUcKICAgICBmbG9hdCBtX3pQb3NpdGlvbjsK LSNlbmRpZgogCiAgICAgYm9vbCBtX2JhY2tncm91bmRDb2xvclNldCA6IDE7CiAgICAgYm9vbCBt X2NvbnRlbnRzT3BhcXVlIDogMTsKQEAgLTM2NSw5ICszNTksNyBAQCBwcm90ZWN0ZWQ6CiAKICAg ICBJbnRSZWN0IG1fY29udGVudHNSZWN0OwogCi0jaWZuZGVmIE5ERUJVRwogICAgIGludCBtX3Jl cGFpbnRDb3VudDsKLSNlbmRpZgogfTsKIAogCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL21hYy9HcmFwaGljc0xheWVyQ0EuaCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvbWFjL0dyYXBoaWNzTGF5ZXJDQS5oCmluZGV4IGQwZTExMDguLjhjZjUxYjQgMTAwNjQ0Ci0t LSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0dyYXBoaWNzTGF5ZXJDQS5oCisrKyBi L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0dyYXBoaWNzTGF5ZXJDQS5oCkBAIC0xMTAs MTAgKzExMCw4IEBAIHB1YmxpYzoKICAgICAKICAgICB2aXJ0dWFsIFBsYXRmb3JtTGF5ZXIqIHBs YXRmb3JtTGF5ZXIoKSBjb25zdDsKIAotI2lmbmRlZiBOREVCVUcKICAgICB2aXJ0dWFsIHZvaWQg c2V0RGVidWdCYWNrZ3JvdW5kQ29sb3IoY29uc3QgQ29sb3ImKTsKICAgICB2aXJ0dWFsIHZvaWQg c2V0RGVidWdCb3JkZXIoY29uc3QgQ29sb3ImLCBmbG9hdCBib3JkZXJXaWR0aCk7Ci0jZW5kaWYK IAogICAgIHZpcnR1YWwgdm9pZCBzZXRHZW9tZXRyeU9yaWVudGF0aW9uKENvbXBvc2l0aW5nQ29v cmRpbmF0ZXNPcmllbnRhdGlvbik7CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvbWFjL0dyYXBoaWNzTGF5ZXJDQS5tbSBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv bWFjL0dyYXBoaWNzTGF5ZXJDQS5tbQppbmRleCBlZWM5ZmFhLi5iMzUxOTU2IDEwMDY0NAotLS0g YS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9HcmFwaGljc0xheWVyQ0EubW0KKysrIGIv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvR3JhcGhpY3NMYXllckNBLm1tCkBAIC0yNzQs NyArMjc0LDYgQEAgc3RhdGljIENBTWVkaWFUaW1pbmdGdW5jdGlvbiogZ2V0Q0FNZWRpYVRpbWlu Z0Z1bmN0aW9uKGNvbnN0IFRpbWluZ0Z1bmN0aW9uJiB0aW0KICAgICByZXR1cm4gMDsKIH0KIAot I2lmbmRlZiBOREVCVUcKIHN0YXRpYyB2b2lkIHNldExheWVyQm9yZGVyQ29sb3IoUGxhdGZvcm1M YXllciogbGF5ZXIsIGNvbnN0IENvbG9yJiBjb2xvcikKIHsKICAgICBDR0NvbG9yUmVmIGJvcmRl ckNvbG9yID0gY3JlYXRlQ0dDb2xvcihjb2xvcik7CkBAIC0yODYsNyArMjg1LDYgQEAgc3RhdGlj IHZvaWQgY2xlYXJCb3JkZXJDb2xvcihQbGF0Zm9ybUxheWVyKiBsYXllcikKIHsKICAgICBbbGF5 ZXIgc2V0Qm9yZGVyQ29sb3I6bmlsXTsKIH0KLSNlbmRpZgogCiBzdGF0aWMgdm9pZCBzZXRMYXll ckJhY2tncm91bmRDb2xvcihQbGF0Zm9ybUxheWVyKiBsYXllciwgY29uc3QgQ29sb3ImIGNvbG9y KQogewpAQCAtMzE3LDcgKzMxNSw2IEBAIEdyYXBoaWNzTGF5ZXI6OkNvbXBvc2l0aW5nQ29vcmRp bmF0ZXNPcmllbnRhdGlvbiBHcmFwaGljc0xheWVyOjpjb21wb3NpdGluZ0Nvb3JkCiAgICAgcmV0 dXJuIENvbXBvc2l0aW5nQ29vcmRpbmF0ZXNCb3R0b21VcDsKIH0KIAotI2lmbmRlZiBOREVCVUcK IGJvb2wgR3JhcGhpY3NMYXllcjo6c2hvd0RlYnVnQm9yZGVycygpCiB7CiAgICAgc3RhdGljIGJv b2wgc2hvd0RlYnVnQm9yZGVycyA9IFtbTlNVc2VyRGVmYXVsdHMgc3RhbmRhcmRVc2VyRGVmYXVs dHNdIGJvb2xGb3JLZXk6QCJXZWJDb3JlTGF5ZXJCb3JkZXJzIl07CkBAIC0zMjksNyArMzI2LDYg QEAgYm9vbCBHcmFwaGljc0xheWVyOjpzaG93UmVwYWludENvdW50ZXIoKQogICAgIHN0YXRpYyBi b29sIHNob3dSZXBhaW50Q291bnRlciA9IFtbTlNVc2VyRGVmYXVsdHMgc3RhbmRhcmRVc2VyRGVm YXVsdHNdIGJvb2xGb3JLZXk6QCJXZWJDb3JlTGF5ZXJSZXBhaW50Q291bnRlciJdOwogICAgIHJl dHVybiBzaG93UmVwYWludENvdW50ZXI7CiB9Ci0jZW5kaWYKIAogc3RhdGljIE5TRGljdGlvbmFy eSogbnVsbEFjdGlvbnNEaWN0aW9uYXJ5KCkKIHsKQEAgLTM3Myw5ICszNjksNyBAQCBHcmFwaGlj c0xheWVyQ0E6OkdyYXBoaWNzTGF5ZXJDQShHcmFwaGljc0xheWVyQ2xpZW50KiBjbGllbnQpCiAg ICAgc2V0Q29udGVudHNPcmllbnRhdGlvbihkZWZhdWx0Q29udGVudHNPcmllbnRhdGlvbigpKTsK ICNlbmRpZgogCi0jaWZuZGVmIE5ERUJVRwogICAgIHVwZGF0ZURlYnVnSW5kaWNhdG9ycygpOwot I2VuZGlmCiAKICAgICBtX2FuaW1hdGlvbkRlbGVnYXRlLmFkb3B0TlMoW1tXZWJBbmltYXRpb25E ZWxlZ2F0ZSBhbGxvY10gaW5pdF0pOwogICAgIFttX2FuaW1hdGlvbkRlbGVnYXRlLmdldCgpIHNl dExheWVyOnRoaXNdOwpAQCAtOTY0LDkgKzk1OCw3IEBAIHZvaWQgR3JhcGhpY3NMYXllckNBOjp1 cGRhdGVDaGlsZHJlblRyYW5zZm9ybSgpCiB2b2lkIEdyYXBoaWNzTGF5ZXJDQTo6dXBkYXRlTWFz a3NUb0JvdW5kcygpCiB7CiAgICAgW21fbGF5ZXIuZ2V0KCkgc2V0TWFza3NUb0JvdW5kczptX21h c2tzVG9Cb3VuZHNdOwotI2lmbmRlZiBOREVCVUcKICAgICB1cGRhdGVEZWJ1Z0luZGljYXRvcnMo KTsKLSNlbmRpZgogfQogCiB2b2lkIEdyYXBoaWNzTGF5ZXJDQTo6dXBkYXRlQ29udGVudHNPcGFx dWUoKQpAQCAtMTA1MSw5ICsxMDQzLDcgQEAgdm9pZCBHcmFwaGljc0xheWVyQ0E6OnVwZGF0ZUxh eWVyRHJhd3NDb250ZW50KCkKICAgICBlbHNlCiAgICAgICAgIFttX2xheWVyLmdldCgpIHNldENv bnRlbnRzOm5pbF07CiAKLSNpZm5kZWYgTkRFQlVHCiAgICAgdXBkYXRlRGVidWdJbmRpY2F0b3Jz KCk7Ci0jZW5kaWYKIH0KIAogdm9pZCBHcmFwaGljc0xheWVyQ0E6OnVwZGF0ZUxheWVyQmFja2dy b3VuZENvbG9yKCkKQEAgLTE2OTUsNyArMTY4NSw2IEBAIFBsYXRmb3JtTGF5ZXIqIEdyYXBoaWNz TGF5ZXJDQTo6cGxhdGZvcm1MYXllcigpIGNvbnN0CiAgICAgcmV0dXJuIHByaW1hcnlMYXllcigp OwogfQogCi0jaWZuZGVmIE5ERUJVRwogdm9pZCBHcmFwaGljc0xheWVyQ0E6OnNldERlYnVnQmFj a2dyb3VuZENvbG9yKGNvbnN0IENvbG9yJiBjb2xvcikKIHsKICAgICBCRUdJTl9CTE9DS19PQkpD X0VYQ0VQVElPTlMKQEAgLTE3MjIsNyArMTcxMSw2IEBAIHZvaWQgR3JhcGhpY3NMYXllckNBOjpz ZXREZWJ1Z0JvcmRlcihjb25zdCBDb2xvciYgY29sb3IsIGZsb2F0IGJvcmRlcldpZHRoKQogICAg IAogICAgIEVORF9CTE9DS19PQkpDX0VYQ0VQVElPTlMKIH0KLSNlbmRpZiAvLyBOREVCVUcKIAog Ym9vbCBHcmFwaGljc0xheWVyQ0E6OnJlcXVpcmVzVGlsZWRMYXllcihjb25zdCBGbG9hdFNpemUm IHNpemUpIGNvbnN0CiB7CkBAIC0xODAwLDkgKzE3ODgsNyBAQCB2b2lkIEdyYXBoaWNzTGF5ZXJD QTo6c3dhcEZyb21PclRvVGlsZWRMYXllcihib29sIHVzZVRpbGVkTGF5ZXIpCiAgICAgLy8gbmVl ZCB0byB0ZWxsIG5ldyBsYXllciB0byBkcmF3IGl0c2VsZgogICAgIHNldE5lZWRzRGlzcGxheSgp OwogICAgIAotI2lmbmRlZiBOREVCVUcKICAgICB1cGRhdGVEZWJ1Z0luZGljYXRvcnMoKTsKLSNl bmRpZgogfQogCiBHcmFwaGljc0xheWVyOjpDb21wb3NpdGluZ0Nvb3JkaW5hdGVzT3JpZW50YXRp b24gR3JhcGhpY3NMYXllckNBOjpkZWZhdWx0Q29udGVudHNPcmllbnRhdGlvbigpIGNvbnN0CkBA IC0xODQ2LDEyICsxODMyLDEwIEBAIHZvaWQgR3JhcGhpY3NMYXllckNBOjpzZXR1cENvbnRlbnRz TGF5ZXIoQ0FMYXllciogY29udGVudHNMYXllcikKICAgICB9IGVsc2UKICAgICAgICAgW2NvbnRl bnRzTGF5ZXIgc2V0QW5jaG9yUG9pbnQ6Q0dQb2ludFplcm9dOwogCi0jaWZuZGVmIE5ERUJVRwog ICAgIGlmIChzaG93RGVidWdCb3JkZXJzKCkpIHsKICAgICAgICAgc2V0TGF5ZXJCb3JkZXJDb2xv cihjb250ZW50c0xheWVyLCBDb2xvcigwLCAwLCAxMjgsIDE4MCkpOwogICAgICAgICBbY29udGVu dHNMYXllciBzZXRCb3JkZXJXaWR0aDoxLjBmXTsKICAgICB9Ci0jZW5kaWYKIH0KIAogdm9pZCBH cmFwaGljc0xheWVyQ0E6OnNldE9wYWNpdHlJbnRlcm5hbChmbG9hdCBhY2N1bXVsYXRlZE9wYWNp dHkpCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9XZWJMYXllci5t bSBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL1dlYkxheWVyLm1tCmluZGV4IDI2NDc0 NjYuLjU2YjI4ZTYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL1dl YkxheWVyLm1tCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL1dlYkxheWVyLm1t CkBAIC04MCw3ICs4MCw2IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogICAgIH0KICNlbmRp ZgogCi0jaWZuZGVmIE5ERUJVRwogICAgIGlmIChsYXllckNvbnRlbnRzLT5zaG93UmVwYWludENv dW50ZXIoKSkgewogICAgICAgICBib29sIGlzVGlsZWRMYXllciA9IFtsYXllciBpc0tpbmRPZkNs YXNzOltDQVRpbGVkTGF5ZXIgY2xhc3NdXTsKIApAQCAtMTA3LDcgKzEwNiw2IEBAIHVzaW5nIG5h bWVzcGFjZSBXZWJDb3JlOwogICAgICAgICAKICAgICAgICAgQ0dDb250ZXh0UmVzdG9yZUdTdGF0 ZShjb250ZXh0KTsgICAgICAgIAogICAgIH0KLSNlbmRpZgogCiAgICAgQ0dDb250ZXh0UmVzdG9y ZUdTdGF0ZShjb250ZXh0KTsKIH0K