49746 2010-11-18 10:37:22 -0800 compositing/masks/simple-composited-mask.html failure 2010-12-14 17:18:29 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Mac OS X 10.6 RESOLVED FIXED InRadar P2 Normal --- 1 vangelis simon.fraser abarth dglazkov eric simon.fraser webkit.review.bot oldest_to_newest 310939 0 vangelis 2010-11-18 10:37:22 -0800 When loading: compositing/masks/simple-composited-mask.html the top image in the composited column is blank. This is with a recent nightly build: Version 5.0 (6533.16, r72146) It also occasionally happens for the masked-ancestor test, after successive reloads. I did spend a little bit of time trying to debug this and it appears that the mask layer's bounds are zero when that happens. 310943 1 simon.fraser 2010-11-18 10:42:40 -0800 I can reproduce. I think this must have regressed at some point. 310944 2 simon.fraser 2010-11-18 10:43:02 -0800 <rdar://problem/8683794> 321658 3 simon.fraser 2010-12-13 21:12:56 -0800 The mask isn't getting painted for some reason. 321671 4 simon.fraser 2010-12-13 21:39:15 -0800 The masked compositing layer is 0x0; it gets its size via box->maskClipRect() but that returns 0x0 before the image has loaded. So when the mask image loads, we need to rejigger some composting geometry. 321692 5 76503 simon.fraser 2010-12-13 22:50:37 -0800 Created attachment 76503 Patch 321694 6 76503 mitz 2010-12-13 22:54:20 -0800 Comment on attachment 76503 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=76503&action=review > WebCore/rendering/RenderLayerBacking.cpp:801 > - if (isDirectlyCompositedImage()) { > + if ((changeType == RenderLayer::ImageChanged) && isDirectlyCompositedImage()) { This method’s body can now be a switch statement. 321700 7 webkit.review.bot 2010-12-13 22:57:39 -0800 Attachment 76503 did not build on chromium: Build output: http://queues.webkit.org/results/6977103 321723 8 eric 2010-12-13 23:58:45 -0800 Attachment 76503 did not build on chromium: Build output: http://queues.webkit.org/results/6889119 321743 9 76503 eric 2010-12-14 01:17:39 -0800 Comment on attachment 76503 Patch Seems this patch will need an update to avoid breaking Chromium. 322026 10 vangelis 2010-12-14 10:03:47 -0800 (In reply to comment #9) > (From update of attachment 76503 [details]) > Seems this patch will need an update to avoid breaking Chromium. Definitely. I'll update and resubmit! Thanks. 322057 11 simon.fraser 2010-12-14 11:18:57 -0800 I can take care of it. 322324 12 simon.fraser 2010-12-14 16:10:33 -0800 http://trac.webkit.org/changeset/74066 322370 13 webkit.review.bot 2010-12-14 17:18:29 -0800 http://trac.webkit.org/changeset/74066 might have broken SnowLeopard Intel Release (Tests) The following tests are not passing: fast/css/focus-ring-detached.html fast/css/focus-ring-multiline.html 76503 2010-12-13 22:50:37 -0800 2010-12-14 01:17:38 -0800 Patch bug-49746-20101213225035.patch text/plain 11864 simon.fraser ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NTY5YTkxYWM2NWE2YTU3ODgwYTQ1NTc2MjdkMmYzMmNkOWI4N2IwNy4uNmFkY2ZlZDEzNDJlM2Nj YTc1MTI2ODAxMzhmZDhmYjg3ZDRiZjBlNiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSw0NyBAQAorMjAxMC0xMi0xMyAgU2lt b24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBjb21wb3NpdGluZy9tYXNrcy9zaW1wbGUtY29t cG9zaXRlZC1tYXNrLmh0bWwgZmFpbHVyZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NDk3NDYKKworICAgICAgICBHZW9tZXRyeSBvZiBjb21wb3NpdGVk IGxheWVycyB3aXRoIGEgbWFzayBkZXBlbmRzIG9uIHRoZSBsb2FkaW5nCisgICAgICAgIG9mIHRo ZSBtYXNrIGltYWdlLCBzaW5jZSBtYXNrQ2xpcFJlY3QoKSBpcyB1c2VkIGZvciB0aGUgbGF5ZXIg Ym91bmRzLgorICAgICAgICAKKyAgICAgICAgU28gd2hlbiBSZW5kZXJCb3g6OmltYWdlQ2hhbmdl ZCgpIGlzIGNhbGxlZCBmb3IgYW4gaW1hZ2UgdXNlZCBieQorICAgICAgICBhIG1hc2sgb24gYSBs YXllciB3aXRoIGEgY29tcG9zaXRlZCBtYXNrLCBjYWxsIHRoZSBuZXdseS1yZW5hbWVkCisgICAg ICAgIGxheWVyLT5jb250ZW50c0NoYW5nZWQoKSBtZXRob2QuIFRoaXMgcGVyY29sYXRlcyBkb3du IGludG8gUmVuZGVyTGF5ZXJCYWNraW5nLAorICAgICAgICBlbmRpbmcgaW4gYSBsYXllciBnZW9t ZXRyeSB1cGRhdGUuCisgICAgICAgIAorICAgICAgICBSZW5hbWVkIFJlbmRlckxheWVyOjpyZW5k ZXJlQ29udGVudHNDaGFuZ2VkKCkgdG8gY29udGVudHNDaGFuZ2VkKCkgYW5kIGFkZGVkCisgICAg ICAgIGFuIGVudW0gdG8gc2F5IHdoYXQgY2hhbmdlZCwgZm9yIHNvbWV3aGF0IG1vcmUgZWZmaWNp ZW50IHVwZGF0aW5nLgorICAgICAgICAKKyAgICAgICAgQWxzbywgd2hlbiB0aGUgbWFzayBsYXll ciBnZXRzIHJlc2l6ZWQsIG1ha2Ugc3VyZSB3ZSBtYXJrIGl0IGFzIG5lZWRpbmcKKyAgICAgICAg ZGlzcGxheS4KKyAgICAgICAgCisgICAgICAgIFRlc3RlZCBieSBwaXhlbCByZXN1bHQgb2YgY29t cG9zaXRpbmcvbWFza3Mvc2ltcGxlLWNvbXBvc2l0ZWQtbWFzay5odG1sCisKKyAgICAgICAgKiBo dG1sL2NhbnZhcy9DYW52YXNSZW5kZXJpbmdDb250ZXh0MkQuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6Q2FudmFzUmVuZGVyaW5nQ29udGV4dDJEOjpkaWREcmF3KToKKyAgICAgICAgKiBodG1sL2Nh bnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6V2ViR0xS ZW5kZXJpbmdDb250ZXh0OjptYXJrQ29udGV4dENoYW5nZWQpOgorICAgICAgICAoV2ViQ29yZTo6 V2ViR0xSZW5kZXJpbmdDb250ZXh0OjpyZXNoYXBlKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVu ZGVyQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmxheWVyc1VzZUltYWdlKToKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlckJveDo6aW1hZ2VDaGFuZ2VkKToKKyAgICAgICAgKiByZW5kZXJpbmcv UmVuZGVySW1hZ2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVySW1hZ2U6OmltYWdlRGlt ZW5zaW9uc0NoYW5nZWQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVySW1hZ2U6Om5vdGlmeUZp bmlzaGVkKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyTGF5ZXI6OmNvbnRlbnRDaGFuZ2VkKToKKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVyTGF5ZXIuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5n LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQmFja2luZzo6dXBkYXRlR3JhcGhp Y3NMYXllckdlb21ldHJ5KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQmFja2luZzo6 Y29udGVudENoYW5nZWQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcu aDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVmlkZW8uY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyVmlkZW86OnVwZGF0ZVBsYXllcik6CisKIDIwMTAtMTItMDggIE5pY29sYXMgRHVm cmVzbmUgIDxuaWNvbGFzLmR1ZnJlc25lQGNvbGxhYm9yYS5jby51az4KIAogICAgICAgICBSZXZp ZXdlZCBieSBNYXJ0aW4gUm9iaW5zb24uCmRpZmYgLS1naXQgYS9XZWJDb3JlL2h0bWwvY2FudmFz L0NhbnZhc1JlbmRlcmluZ0NvbnRleHQyRC5jcHAgYi9XZWJDb3JlL2h0bWwvY2FudmFzL0NhbnZh c1JlbmRlcmluZ0NvbnRleHQyRC5jcHAKaW5kZXggNDViOWM1NTc5YTAwNjNiNzYyZjlmYTAwZmI5 NGMyYTJiMGU0ZGZkZS4uNGI0NTg4OGVkNzdlMTBlMjlmYzViZDJhYjBiNzYxYjdlYmY4OGNjOCAx MDA2NDQKLS0tIGEvV2ViQ29yZS9odG1sL2NhbnZhcy9DYW52YXNSZW5kZXJpbmdDb250ZXh0MkQu Y3BwCisrKyBiL1dlYkNvcmUvaHRtbC9jYW52YXMvQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJELmNw cApAQCAtMTQ5OCwxMCArMTQ5OCwxMCBAQCB2b2lkIENhbnZhc1JlbmRlcmluZ0NvbnRleHQyRDo6 ZGlkRHJhdyhjb25zdCBGbG9hdFJlY3QmIHIsIHVuc2lnbmVkIG9wdGlvbnMpCiAgICAgICAgIGRy YXdpbmdDb250ZXh0KCktPm1hcmtEaXJ0eVJlY3QoZW5jbG9zaW5nSW50UmVjdChkaXJ0eVJlY3Qp KTsKICNlbmRpZgogI2lmIEVOQUJMRShBQ0NFTEVSQVRFRF8yRF9DQU5WQVMpICYmIFVTRShBQ0NF TEVSQVRFRF9DT01QT1NJVElORykKLSAgICAvLyBJZiB3ZSBhcmUgZHJhd2luZyB0byBoYXJkd2Fy ZSBhbmQgd2UgaGF2ZSBhIGNvbXBvc2l0ZWQgbGF5ZXIsIGp1c3QgY2FsbCByZW5kZXJlckNvbnRl bnRDaGFuZ2VkKCkuCisgICAgLy8gSWYgd2UgYXJlIGRyYXdpbmcgdG8gaGFyZHdhcmUgYW5kIHdl IGhhdmUgYSBjb21wb3NpdGVkIGxheWVyLCBqdXN0IGNhbGwgY29udGVudENoYW5nZWQoKS4KICAg ICBSZW5kZXJCb3gqIHJlbmRlckJveCA9IGNhbnZhcygpLT5yZW5kZXJCb3goKTsKICAgICBpZiAo aXNBY2NlbGVyYXRlZCgpICYmIHJlbmRlckJveCAmJiByZW5kZXJCb3gtPmhhc0xheWVyKCkgJiYg cmVuZGVyQm94LT5sYXllcigpLT5oYXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nKCkpCi0gICAgICAg IHJlbmRlckJveC0+bGF5ZXIoKS0+cmVuZGVyZXJDb250ZW50Q2hhbmdlZCgpOworICAgICAgICBy ZW5kZXJCb3gtPmxheWVyKCktPmNvbnRlbnRDaGFuZ2VkKFJlbmRlckxheWVyOjpDYW52YXNVcGRh dGVkKTsKICAgICBlbHNlCiAjZW5kaWYKICAgICAgICAgY2FudmFzKCktPmRpZERyYXcoZGlydHlS ZWN0KTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250 ZXh0LmNwcCBiL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0LmNwcApp bmRleCAwOGU5YmE4ZGIxMDI0ODAxZWQwZjEwZjFjYzU2NmY2M2M2NTdlNzIyLi4zZjA1MDQ5YmZj MTczZTQ2M2EyMDcwMzJjN2NhYmU3ZTA2ZGZmZmEyIDEwMDY0NAotLS0gYS9XZWJDb3JlL2h0bWwv Y2FudmFzL1dlYkdMUmVuZGVyaW5nQ29udGV4dC5jcHAKKysrIGIvV2ViQ29yZS9odG1sL2NhbnZh cy9XZWJHTFJlbmRlcmluZ0NvbnRleHQuY3BwCkBAIC0yMDgsNyArMjA4LDcgQEAgdm9pZCBXZWJH TFJlbmRlcmluZ0NvbnRleHQ6Om1hcmtDb250ZXh0Q2hhbmdlZCgpCiAjaWYgVVNFKEFDQ0VMRVJB VEVEX0NPTVBPU0lUSU5HKQogICAgIFJlbmRlckJveCogcmVuZGVyQm94ID0gY2FudmFzKCktPnJl bmRlckJveCgpOwogICAgIGlmIChyZW5kZXJCb3ggJiYgcmVuZGVyQm94LT5oYXNMYXllcigpICYm IHJlbmRlckJveC0+bGF5ZXIoKS0+aGFzQWNjZWxlcmF0ZWRDb21wb3NpdGluZygpKQotICAgICAg ICByZW5kZXJCb3gtPmxheWVyKCktPnJlbmRlcmVyQ29udGVudENoYW5nZWQoKTsKKyAgICAgICAg cmVuZGVyQm94LT5sYXllcigpLT5jb250ZW50Q2hhbmdlZChSZW5kZXJMYXllcjo6Q2FudmFzQ2hh bmdlZCk7CiAgICAgZWxzZSB7CiAjZW5kaWYKICAgICAgICAgaWYgKCFtX21hcmtlZENhbnZhc0Rp cnR5KQpAQCAtMjM5LDcgKzIzOSw3IEBAIHZvaWQgV2ViR0xSZW5kZXJpbmdDb250ZXh0OjpyZXNo YXBlKGludCB3aWR0aCwgaW50IGhlaWdodCkKICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJ TkcpCiAgICAgICAgIFJlbmRlckJveCogcmVuZGVyQm94ID0gY2FudmFzKCktPnJlbmRlckJveCgp OwogICAgICAgICBpZiAocmVuZGVyQm94ICYmIHJlbmRlckJveC0+aGFzTGF5ZXIoKSkKLSAgICAg ICAgICAgIHJlbmRlckJveC0+bGF5ZXIoKS0+cmVuZGVyZXJDb250ZW50Q2hhbmdlZCgpOworICAg ICAgICAgICAgcmVuZGVyQm94LT5sYXllcigpLT5jb250ZW50Q2hhbmdlZChSZW5kZXJMYXllcjo6 Q2FudmFzQ2hhbmdlZCk7CiAjZW5kaWYKICAgICAgICAgbV9uZWVkc1VwZGF0ZSA9IGZhbHNlOwog ICAgIH0KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAgYi9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCmluZGV4IGFhODQ1ZDU3NDhiMGFmYTkwMDY3MGYy ZTYyOTIwNjdjY2IxMzkwMWQuLmMyYTFkZWZjMTY3NDYzYjA5NzRiOWU0OTkxY2QyODU1OGVlYzM2 MjMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKKysrIGIvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcApAQCAtOTA3LDYgKzkwNywxNiBAQCB2b2lkIFJl bmRlckJveDo6cGFpbnRGaWxsTGF5ZXIoY29uc3QgUGFpbnRJbmZvJiBwYWludEluZm8sIGNvbnN0 IENvbG9yJiBjLCBjb25zdAogICAgIHBhaW50RmlsbExheWVyRXh0ZW5kZWQocGFpbnRJbmZvLCBj LCBmaWxsTGF5ZXIsIHR4LCB0eSwgd2lkdGgsIGhlaWdodCwgMCwgb3AsIGJhY2tncm91bmRPYmpl Y3QpOwogfQogCitzdGF0aWMgYm9vbCBsYXllcnNVc2VJbWFnZShXcmFwcGVkSW1hZ2VQdHIgaW1h Z2UsIGNvbnN0IEZpbGxMYXllciogbGF5ZXJzKQoreworICAgIGZvciAoY29uc3QgRmlsbExheWVy KiBjdXJMYXllciA9IGxheWVyczsgY3VyTGF5ZXI7IGN1ckxheWVyID0gY3VyTGF5ZXItPm5leHQo KSkgeworICAgICAgICBpZiAoY3VyTGF5ZXItPmltYWdlKCkgJiYgaW1hZ2UgPT0gY3VyTGF5ZXIt PmltYWdlKCktPmRhdGEoKSkKKyAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgIH0KKworICAg IHJldHVybiBmYWxzZTsKK30KKwogdm9pZCBSZW5kZXJCb3g6OmltYWdlQ2hhbmdlZChXcmFwcGVk SW1hZ2VQdHIgaW1hZ2UsIGNvbnN0IEludFJlY3QqKQogewogICAgIGlmICghcGFyZW50KCkpCkBA IC05MjEsNiArOTMxLDEyIEBAIHZvaWQgUmVuZGVyQm94OjppbWFnZUNoYW5nZWQoV3JhcHBlZElt YWdlUHRyIGltYWdlLCBjb25zdCBJbnRSZWN0KikKICAgICBib29sIGRpZEZ1bGxSZXBhaW50ID0g cmVwYWludExheWVyUmVjdHNGb3JJbWFnZShpbWFnZSwgc3R5bGUoKS0+YmFja2dyb3VuZExheWVy cygpLCB0cnVlKTsKICAgICBpZiAoIWRpZEZ1bGxSZXBhaW50KQogICAgICAgICByZXBhaW50TGF5 ZXJSZWN0c0ZvckltYWdlKGltYWdlLCBzdHlsZSgpLT5tYXNrTGF5ZXJzKCksIGZhbHNlKTsKKwor CisjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQorICAgIGlmIChoYXNMYXllcigpICYm IGxheWVyKCktPmhhc0NvbXBvc2l0ZWRNYXNrKCkgJiYgbGF5ZXJzVXNlSW1hZ2UoaW1hZ2UsIHN0 eWxlKCktPm1hc2tMYXllcnMoKSkpCisgICAgICAgIGxheWVyKCktPmNvbnRlbnRDaGFuZ2VkKFJl bmRlckxheWVyOjpNYXNrSW1hZ2VDaGFuZ2VkKTsKKyNlbmRpZgogfQogCiBib29sIFJlbmRlckJv eDo6cmVwYWludExheWVyUmVjdHNGb3JJbWFnZShXcmFwcGVkSW1hZ2VQdHIgaW1hZ2UsIGNvbnN0 IEZpbGxMYXllciogbGF5ZXJzLCBib29sIGRyYXdpbmdCYWNrZ3JvdW5kKQpkaWZmIC0tZ2l0IGEv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW1hZ2UuY3BwIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVySW1hZ2UuY3BwCmluZGV4IDM0Nzk5ZjQ0OTUzZjIyYjIxNDAzN2QxZDM4YmNiMDQ1OGI0ZmU1 ODcuLjYwOWQ5NDQ2Y2YzYjViODY3ZDU2ZDdjNzI1ZDMzY2VkZjUwMTM3ZTIgMTAwNjQ0Ci0tLSBh L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckltYWdlLmNwcAorKysgYi9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJJbWFnZS5jcHAKQEAgLTIxMSw3ICsyMTEsNyBAQCB2b2lkIFJlbmRlckltYWdlOjpp bWFnZURpbWVuc2lvbnNDaGFuZ2VkKGJvb2wgaW1hZ2VTaXplQ2hhbmdlZCwgY29uc3QgSW50UmVj dCogcgogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKICAgICAgICAgaWYgKGhhc0xh eWVyKCkpIHsKICAgICAgICAgICAgIC8vIFRlbGwgYW55IHBvdGVudGlhbCBjb21wb3NpdGluZyBs YXllcnMgdGhhdCB0aGUgaW1hZ2UgbmVlZHMgdXBkYXRpbmcuCi0gICAgICAgICAgICBsYXllcigp LT5yZW5kZXJlckNvbnRlbnRDaGFuZ2VkKCk7CisgICAgICAgICAgICBsYXllcigpLT5jb250ZW50 Q2hhbmdlZChSZW5kZXJMYXllcjo6SW1hZ2VDaGFuZ2VkKTsKICAgICAgICAgfQogI2VuZGlmCiAg ICAgfQpAQCAtMjI5LDcgKzIyOSw3IEBAIHZvaWQgUmVuZGVySW1hZ2U6Om5vdGlmeUZpbmlzaGVk KENhY2hlZFJlc291cmNlKiBuZXdJbWFnZSkKICAgICBpZiAobmV3SW1hZ2UgPT0gbV9pbWFnZVJl c291cmNlLT5jYWNoZWRJbWFnZSgpICYmIGhhc0xheWVyKCkpIHsKICAgICAgICAgLy8gdGVsbCBh bnkgcG90ZW50aWFsIGNvbXBvc2l0aW5nIGxheWVycwogICAgICAgICAvLyB0aGF0IHRoZSBpbWFn ZSBpcyBkb25lIGFuZCB0aGV5IGNhbiByZWZlcmVuY2UgaXQgZGlyZWN0bHkuCi0gICAgICAgIGxh eWVyKCktPnJlbmRlcmVyQ29udGVudENoYW5nZWQoKTsKKyAgICAgICAgbGF5ZXIoKS0+Y29udGVu dENoYW5nZWQoUmVuZGVyTGF5ZXI6OkltYWdlQ2hhbmdlZCk7CiAgICAgfQogI2Vsc2UKICAgICBV TlVTRURfUEFSQU0obmV3SW1hZ2UpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyTGF5ZXIuY3BwIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCmluZGV4IDg0 ZGJkOGZhOGE4N2FkZTYyNDQxNjYxY2JjMmVjMGE3ZTVhMzc2YTMuLjM3NGQxYTAzMDc1MTk5NzY4 ZWQ1YTAzNDA3NzE1ODU4YmUwZmQ2MTUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckxheWVyLmNwcAorKysgYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKQEAg LTIyOSwxNCArMjI5LDE0IEBAIFJlbmRlckxheWVyQ29tcG9zaXRvciogUmVuZGVyTGF5ZXI6OmNv bXBvc2l0b3IoKSBjb25zdAogICAgIHJldHVybiByZW5kZXJlcigpLT52aWV3KCktPmNvbXBvc2l0 b3IoKTsKIH0KIAotdm9pZCBSZW5kZXJMYXllcjo6cmVuZGVyZXJDb250ZW50Q2hhbmdlZCgpCit2 b2lkIFJlbmRlckxheWVyOjpjb250ZW50Q2hhbmdlZChDb250ZW50Q2hhbmdlVHlwZSBjaGFuZ2VU eXBlKQogewogICAgIC8vIFRoaXMgY2FuIGdldCBjYWxsZWQgd2hlbiB2aWRlbyBiZWNvbWVzIGFj Y2VsZXJhdGVkLCBzbyB0aGUgbGF5ZXJzIG1heSBjaGFuZ2UuCi0gICAgaWYgKGNvbXBvc2l0b3Io KS0+dXBkYXRlTGF5ZXJDb21wb3NpdGluZ1N0YXRlKHRoaXMpKQorICAgIGlmICgoY2hhbmdlVHlw ZSA9PSBDYW52YXNDaGFuZ2VkIHx8IGNoYW5nZVR5cGUgPT0gVmlkZW9DaGFuZ2VkKSAmJiBjb21w b3NpdG9yKCktPnVwZGF0ZUxheWVyQ29tcG9zaXRpbmdTdGF0ZSh0aGlzKSkKICAgICAgICAgY29t cG9zaXRvcigpLT5zZXRDb21wb3NpdGluZ0xheWVyc05lZWRSZWJ1aWxkKCk7CiAKICAgICBpZiAo bV9iYWNraW5nKQotICAgICAgICBtX2JhY2tpbmctPnJlbmRlcmVyQ29udGVudENoYW5nZWQoKTsK KyAgICAgICAgbV9iYWNraW5nLT5jb250ZW50Q2hhbmdlZChjaGFuZ2VUeXBlKTsKIH0KICNlbmRp ZiAvLyBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckxheWVyLmggYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5o CmluZGV4IDVkOTQxYzEyODlkNzJhZjJhOGZjOWZkZTE0ZGJjNDdmMzYxN2NiMmYuLmUwYzYwNDdm NWI5OTcxNjU2ZmU1NjRmMjIzNTM4YTI5MWNiNzM3NzAgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckxheWVyLmgKKysrIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIu aApAQCAtMjgzLDcgKzI4Myw4IEBAIHB1YmxpYzoKICAgICAKICAgICAvLyBOb3RpZmljYXRpb24g ZnJvbSB0aGUgcmVuZGVyZXIgdGhhdCBpdHMgY29udGVudCBjaGFuZ2VkIChlLmcuIGN1cnJlbnQg ZnJhbWUgb2YgaW1hZ2UgY2hhbmdlZCkuCiAgICAgLy8gQWxsb3dzIHVwZGF0ZXMgb2YgbGF5ZXIg Y29udGVudCB3aXRob3V0IHJlcGFpbnRpbmcuCi0gICAgdm9pZCByZW5kZXJlckNvbnRlbnRDaGFu Z2VkKCk7CisgICAgZW51bSBDb250ZW50Q2hhbmdlVHlwZSB7IEltYWdlQ2hhbmdlZCwgTWFza0lt YWdlQ2hhbmdlZCwgQ2FudmFzQ2hhbmdlZCwgVmlkZW9DaGFuZ2VkIH07CisgICAgdm9pZCBjb250 ZW50Q2hhbmdlZChDb250ZW50Q2hhbmdlVHlwZSk7CiAjZW5kaWYKIAogICAgIC8vIFJldHVybnMg dHJ1ZSBpZiB0aGUgYWNjZWxlcmF0ZWQgY29tcG9zaXRpbmcgaXMgZW5hYmxlZApkaWZmIC0tZ2l0 IGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcCBiL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAKaW5kZXggYjliZjE5NmUxMWIyNmYxNzM4OTdk YWM0NjYwNWQ3MmQ4MDk0ODJjOC4uZGUyMTQ2MTdkZTZlNzAzODMyNjFlZDgzYWUxMjZhYjFlOGQw MjYwOSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNw cAorKysgYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCkBAIC0zNzQs NyArMzc0LDEwIEBAIHZvaWQgUmVuZGVyTGF5ZXJCYWNraW5nOjp1cGRhdGVHcmFwaGljc0xheWVy R2VvbWV0cnkoKQogICAgIH0KICAgICAKICAgICBpZiAobV9tYXNrTGF5ZXIpIHsKLSAgICAgICAg bV9tYXNrTGF5ZXItPnNldFNpemUobV9ncmFwaGljc0xheWVyLT5zaXplKCkpOworICAgICAgICBp ZiAobV9tYXNrTGF5ZXItPnNpemUoKSAhPSBtX2dyYXBoaWNzTGF5ZXItPnNpemUoKSkgeworICAg ICAgICAgICAgbV9tYXNrTGF5ZXItPnNldFNpemUobV9ncmFwaGljc0xheWVyLT5zaXplKCkpOwor ICAgICAgICAgICAgbV9tYXNrTGF5ZXItPnNldE5lZWRzRGlzcGxheSgpOworICAgICAgICB9CiAg ICAgICAgIG1fbWFza0xheWVyLT5zZXRQb3NpdGlvbihGbG9hdFBvaW50KCkpOwogICAgIH0KICAg ICAKQEAgLTc5MywxNSArNzk2LDIyIEBAIGJvb2wgUmVuZGVyTGF5ZXJCYWNraW5nOjppc0RpcmVj dGx5Q29tcG9zaXRlZEltYWdlKCkgY29uc3QKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKLXZvaWQg UmVuZGVyTGF5ZXJCYWNraW5nOjpyZW5kZXJlckNvbnRlbnRDaGFuZ2VkKCkKK3ZvaWQgUmVuZGVy TGF5ZXJCYWNraW5nOjpjb250ZW50Q2hhbmdlZChSZW5kZXJMYXllcjo6Q29udGVudENoYW5nZVR5 cGUgY2hhbmdlVHlwZSkKIHsKLSAgICBpZiAoaXNEaXJlY3RseUNvbXBvc2l0ZWRJbWFnZSgpKSB7 CisgICAgaWYgKChjaGFuZ2VUeXBlID09IFJlbmRlckxheWVyOjpJbWFnZUNoYW5nZWQpICYmIGlz RGlyZWN0bHlDb21wb3NpdGVkSW1hZ2UoKSkgewogICAgICAgICB1cGRhdGVJbWFnZUNvbnRlbnRz KCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CisgICAgCisgICAgaWYgKChjaGFuZ2VUeXBlID09 IFJlbmRlckxheWVyOjpNYXNrSW1hZ2VDaGFuZ2VkKSAmJiBtX21hc2tMYXllcikgeworICAgICAg ICAvLyBUaGUgY29tcG9zaXRlZCBsYXllciBib3VuZHMgcmVsaWVzIG9uIGJveC0+bWFza0NsaXBS ZWN0KCksIHdoaWNoIGNoYW5nZXMKKyAgICAgICAgLy8gd2hlbiB0aGUgbWFzayBpbWFnZSBiZWNv bWVzIGF2YWlsYWJsZS4KKyAgICAgICAgYm9vbCBpc1VwZGF0ZVJvb3QgPSB0cnVlOworICAgICAg ICB1cGRhdGVBZnRlckxheW91dChDb21wb3NpdGluZ0NoaWxkcmVuLCBpc1VwZGF0ZVJvb3QpOwor ICAgIH0KIAogI2lmIEVOQUJMRSgzRF9DQU5WQVMpIHx8IEVOQUJMRShBQ0NFTEVSQVRFRF8yRF9D QU5WQVMpCi0gICAgaWYgKGlzQWNjZWxlcmF0ZWRDYW52YXMocmVuZGVyZXIoKSkpIHsKKyAgICBp ZiAoKGNoYW5nZVR5cGUgPT0gUmVuZGVyTGF5ZXI6OkNhbnZhc0NoYW5nZWQpICYmIGlzQWNjZWxl cmF0ZWRDYW52YXMocmVuZGVyZXIoKSkpIHsKICAgICAgICAgbV9ncmFwaGljc0xheWVyLT5zZXRD b250ZW50c05lZWRzRGlzcGxheSgpOwogICAgICAgICByZXR1cm47CiAgICAgfQpkaWZmIC0tZ2l0 IGEvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmggYi9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJMYXllckJhY2tpbmcuaAppbmRleCBmYjNhYjY3MTEwZDM0N2Q1NjRjZWE5YTU5 NzViN2M1ZWI1OTMwYTExLi5jNTQ4OWYzY2FiZWE3N2RhMTkyMjAyNTVkZTMzOWYzNzhkMzQ4YTQw IDEwMDY0NAotLS0gYS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuaAorKysg Yi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuaApAQCAtMTAxLDggKzEwMSw4 IEBAIHB1YmxpYzoKICAgICAvLyByIGlzIGluIHRoZSBjb29yZGluYXRlIHNwYWNlIG9mIHRoZSBs YXllcidzIHJlbmRlciBvYmplY3QKICAgICB2b2lkIHNldENvbnRlbnRzTmVlZERpc3BsYXlJblJl Y3QoY29uc3QgSW50UmVjdCYgcik7CiAKLSAgICAvLyBOb3RpZmljYXRpb24gZnJvbSB0aGUgcmVu ZGVyZXIgdGhhdCBpdHMgY29udGVudCBjaGFuZ2VkOyB1c2VkIGJ5IFJlbmRlckltYWdlLgotICAg IHZvaWQgcmVuZGVyZXJDb250ZW50Q2hhbmdlZCgpOworICAgIC8vIE5vdGlmaWNhdGlvbiBmcm9t IHRoZSByZW5kZXJlciB0aGF0IGl0cyBjb250ZW50IGNoYW5nZWQuCisgICAgdm9pZCBjb250ZW50 Q2hhbmdlZChSZW5kZXJMYXllcjo6Q29udGVudENoYW5nZVR5cGUpOwogCiAgICAgLy8gSW50ZXJm YWNlIHRvIHN0YXJ0LCBmaW5pc2gsIHN1c3BlbmQgYW5kIHJlc3VtZSBhbmltYXRpb25zIGFuZCB0 cmFuc2l0aW9ucwogICAgIGJvb2wgc3RhcnRUcmFuc2l0aW9uKGRvdWJsZSB0aW1lT2Zmc2V0LCBp bnQgcHJvcGVydHksIGNvbnN0IFJlbmRlclN0eWxlKiBmcm9tU3R5bGUsIGNvbnN0IFJlbmRlclN0 eWxlKiB0b1N0eWxlKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZGVv LmNwcCBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZGVvLmNwcAppbmRleCAzMmJhOTFiY2Zi MTU3NWRlY2JiMzQ4YmFhNjBhODE1YmZhYjJiZDEzLi41YjgyZGViZGRhZWU4YjRhZGM2YjVkMDJj MGU4ZmYzYWM0ZDBhZDNmIDEwMDY0NAotLS0gYS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWRl by5jcHAKKysrIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlkZW8uY3BwCkBAIC0yMzcsNyAr MjM3LDcgQEAgdm9pZCBSZW5kZXJWaWRlbzo6dXBkYXRlUGxheWVyKCkKICAgICB9CiAKICNpZiBV U0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCi0gICAgbGF5ZXIoKS0+cmVuZGVyZXJDb250ZW50 Q2hhbmdlZCgpOworICAgIGxheWVyKCktPmNvbnRlbnRDaGFuZ2VkKFJlbmRlckxheWVyOjpWaWRl b0NoYW5nZWQpOwogI2VuZGlmCiAgICAgCiAgICAgSW50UmVjdCB2aWRlb0JvdW5kcyA9IHZpZGVv Qm94KCk7IAo=