139570 2014-12-11 17:08:52 -0800 Layer borders on contentsLayers don't correctly toggle with the rest of the borders 2014-12-12 01:15:38 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser commit-queue dino simon.fraser thorton oldest_to_newest 1054700 0 simon.fraser 2014-12-11 17:08:52 -0800 Layer borders on contentsLayers don't correctly toggle with the rest of the borders 1054704 1 243165 simon.fraser 2014-12-11 17:12:47 -0800 Created attachment 243165 Patch 1054768 2 243165 thorton 2014-12-11 23:47:18 -0800 Comment on attachment 243165 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=243165&action=review > Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm:702 > + RetainPtr<CGColorSpaceRef> colorSpace = adoptCF(CGColorSpaceCreateDeviceRGB()); > + RetainPtr<CGColorRef> color = adoptCF(CGColorCreate(colorSpace.get(), components)); This maybe should use cachedCGColor (from Color.h)? Simplifies things a bit. 1054786 3 243165 commit-queue 2014-12-12 01:15:34 -0800 Comment on attachment 243165 Patch Clearing flags on attachment: 243165 Committed r177214: <http://trac.webkit.org/changeset/177214> 1054787 4 commit-queue 2014-12-12 01:15:38 -0800 All reviewed patches have been landed. Closing bug. 243165 2014-12-11 17:12:47 -0800 2014-12-12 01:15:34 -0800 Patch bug-139570-20141211171330.patch text/plain 8908 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3MTg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTczNTU1Y2RiZDBhODEw NDg3MjViYzRlMzcwMGZkOGRlYzIxYzI2MC4uMDllZDY0ZmM3OGU2ZjVhMDUzYmI4M2Y0ZTY3YWY4 ZmRjMjQ0OTFmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE0LTEyLTExICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIExheWVyIGJvcmRl cnMgb24gY29udGVudHNMYXllcnMgZG9uJ3QgY29ycmVjdGx5IHRvZ2dsZSB3aXRoIHRoZSByZXN0 IG9mIHRoZSBib3JkZXJzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMzk1NzAKKyAgICAgICAgcmRhcjovL3Byb2JsZW0vMTgwMDc3NDYKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAgICAgICAgCisgICAgICAgIFRoZSAiU2hv dyBEZWJ1ZyBCb3JkZXJzIiB0b2dnbGUgZGlkbid0IGNsZWFubHkgcmVtb3ZlIGxheWVyIGJvcmRl cnMgZnJvbQorICAgICAgICBjb250ZW50IGxheWVycyAoaW1hZ2UsIHZpZGVvKSwgbm9yIGRpZCBp dCBkZWFsIHdpdGggY2xvbmVkIGxheWVycyAocmVmbGVjdGlvbnMpLgorICAgICAgICAKKyAgICAg ICAgRml4IGJ5IG1ha2luZyB1cGRhdGVEZWJ1Z0JvcmRlcigpIHVwZGF0ZSB0aGUgbGF5ZXIgYm9y ZGVycyBvbiB0aGUgY29udGVudHMKKyAgICAgICAgbGF5ZXIgYW5kIGNsb25lZCBsYXllcnMsIG1v dmluZyBzb21lIGNvZGUgYXJvdW5kIHRvIGF2b2lkIGhhdmluZyBjb2xvcnMKKyAgICAgICAgaW4g bW9yZSB0aGFuIG9uZSBwbGFjZS4gSWYgdGhlIGJvcmRlcnMgYXJlIGhpZGRlbiwgc2VuZCBhbiBp bnZhbGlkIGNvbG9yCisgICAgICAgIHRvIFBsYXRmb3JtQ0FMYXllcjo6c2V0Qm9yZGVyQ29sb3Io KSwgd2hpY2ggbm93IGtub3dzIHRvIHJlbW92ZSB0aGUgY29sb3IKKyAgICAgICAgcHJvcGVydHkg b24gdGhlIGxheWVyICh0byBhdm9pZCBsZWF2aW5nIHRyYW5zcGFyZW50IGJvcmRlciBjb2xvciBw cm9wZXJ0aWVzCisgICAgICAgIG9uIENBTGF5ZXJzKS4KKworICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL2NhL0dyYXBoaWNzTGF5ZXJDQS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpzZXRMYXll ckRlYnVnQm9yZGVyKToKKyAgICAgICAgKFdlYkNvcmU6OmNvbnRlbnRzTGF5ZXJEZWJ1Z0JvcmRl ckNvbG9yKToKKyAgICAgICAgKFdlYkNvcmU6OmNsb25lTGF5ZXJEZWJ1Z0JvcmRlckNvbG9yKToK KyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJDQTo6dXBkYXRlRGVidWdCb3JkZXIpOgor ICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllckNBOjpzZXREZWJ1Z0JvcmRlcik6CisgICAg ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2EvbWFjL1BsYXRmb3JtQ0FMYXllck1hYy5tbToKKyAg ICAgICAgKFBsYXRmb3JtQ0FMYXllck1hYzo6c2V0Qm9yZGVyQ29sb3IpOgorCiAyMDE0LTEyLTEx ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgRml4IFdp bmRvd3MgYnVpbGQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3Vy Y2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMTZjNTA1NTUwMGQwYWZlZGI2ODgxOTljZDA2MDQw YWIyMzE0YzcxMi4uYzc4YzRlNTRiZWMwZGQ0NTkzZmJiYzNiNzMxODFkZWFjM2Q4YWNiZiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE0LTEyLTExICBTaW1vbiBGcmFzZXIgIDxzaW1v bi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIExheWVyIGJvcmRlcnMgb24gY29udGVudHNM YXllcnMgZG9uJ3QgY29ycmVjdGx5IHRvZ2dsZSB3aXRoIHRoZSByZXN0IG9mIHRoZSBib3JkZXJz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzk1NzAK KyAgICAgICAgcmRhcjovL3Byb2JsZW0vMTgwMDc3NDYKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKyAgICAgICAgCisgICAgICAgIFJldHVybiBuaWwgaWYgdGhlIGNvbG9y IGlzIGludmFsaWQsIHRvIHJlbW92ZSB0aGUgY29sb3IgZnJvbSB0aGUgbGF5ZXIncworICAgICAg ICBib3JkZXIgb3IgYmFja2dyb3VuZC4KKworICAgICAgICAqIFNoYXJlZC9tYWMvUmVtb3RlTGF5 ZXJUcmVlUHJvcGVydHlBcHBsaWVyLm1tOgorICAgICAgICAoV2ViS2l0OjpjZ0NvbG9yRnJvbUNv bG9yKToKKwogMjAxNC0xMi0xMSAgVGltb3RoeSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBs ZS5jb20+CiAKICAgICAgICAgTW92ZSB0aGUgcHJldmlldyBwb3BvdmVyIHRvIFdlYkltbWVkaWF0 ZUFjdGlvbkNvbnRyb2xsZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2NhL0dyYXBoaWNzTGF5ZXJDQS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jYS9HcmFwaGljc0xheWVyQ0EuY3BwCmluZGV4IGM5Mzc4NzZmYjYyNjQ3NGY3Yjg1 MGEyOWY2ZTAyY2M5MjI4MTVlMDkuLmEwNTE3Y2YxMTEzN2FmMDJiM2E4NmI4ZWQzOTZlNzMzZDYy ZWZjNzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL0dy YXBoaWNzTGF5ZXJDQS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2EvR3JhcGhpY3NMYXllckNBLmNwcApAQCAtMTgyMCwxMiArMTgyMCw1MyBAQCB2b2lkIEdyYXBo aWNzTGF5ZXJDQTo6dXBkYXRlQWNjZWxlcmF0ZXNEcmF3aW5nKCkKICAgICBtX2xheWVyLT5zZXRB Y2NlbGVyYXRlc0RyYXdpbmcobV9hY2NlbGVyYXRlc0RyYXdpbmcpOwogfQogCitzdGF0aWMgdm9p ZCBzZXRMYXllckRlYnVnQm9yZGVyKFBsYXRmb3JtQ0FMYXllciYgbGF5ZXIsIENvbG9yIGJvcmRl ckNvbG9yLCBmbG9hdCBib3JkZXJXaWR0aCkKK3sKKyAgICBsYXllci5zZXRCb3JkZXJDb2xvcihi b3JkZXJDb2xvcik7CisgICAgbGF5ZXIuc2V0Qm9yZGVyV2lkdGgoYm9yZGVyQ29sb3IuaXNWYWxp ZCgpID8gYm9yZGVyV2lkdGggOiAwKTsKK30KKworc3RhdGljIGZsb2F0IGNvbnRlbnRzTGF5ZXJC b3JkZXJXaWR0aCA9IDQ7CitzdGF0aWMgQ29sb3IgY29udGVudHNMYXllckRlYnVnQm9yZGVyQ29s b3IoYm9vbCBzaG93aW5nQm9yZGVycykKK3sKKyAgICByZXR1cm4gc2hvd2luZ0JvcmRlcnMgPyBD b2xvcigwLCAwLCAxMjgsIDE4MCkgOiBDb2xvcigpOworfQorCitzdGF0aWMgZmxvYXQgY2xvbmVM YXllckJvcmRlcldpZHRoID0gMjsKK3N0YXRpYyBDb2xvciBjbG9uZUxheWVyRGVidWdCb3JkZXJD b2xvcihib29sIHNob3dpbmdCb3JkZXJzKQoreworICAgIHJldHVybiBzaG93aW5nQm9yZGVycyA/ IENvbG9yKDI1NSwgMTIyLCAyNTEpIDogQ29sb3IoKTsKK30KKwogdm9pZCBHcmFwaGljc0xheWVy Q0E6OnVwZGF0ZURlYnVnQm9yZGVyKCkKIHsKLSAgICBpZiAoaXNTaG93aW5nRGVidWdCb3JkZXIo KSkKLSAgICAgICAgdXBkYXRlRGVidWdJbmRpY2F0b3JzKCk7Ci0gICAgZWxzZQotICAgICAgICBt X2xheWVyLT5zZXRCb3JkZXJXaWR0aCgwKTsKKyAgICBDb2xvciBib3JkZXJDb2xvcjsKKyAgICBm bG9hdCB3aWR0aCA9IDA7CisKKyAgICBib29sIHNob3dEZWJ1Z0JvcmRlcnMgPSBpc1Nob3dpbmdE ZWJ1Z0JvcmRlcigpOworICAgIGlmIChzaG93RGVidWdCb3JkZXJzKQorICAgICAgICBnZXREZWJ1 Z0JvcmRlckluZm8oYm9yZGVyQ29sb3IsIHdpZHRoKTsKKworICAgIHNldExheWVyRGVidWdCb3Jk ZXIoKm1fbGF5ZXIsIGJvcmRlckNvbG9yLCB3aWR0aCk7CisgICAgaWYgKG1fY29udGVudHNMYXll cikKKyAgICAgICAgc2V0TGF5ZXJEZWJ1Z0JvcmRlcigqbV9jb250ZW50c0xheWVyLCBjb250ZW50 c0xheWVyRGVidWdCb3JkZXJDb2xvcihzaG93RGVidWdCb3JkZXJzKSwgY29udGVudHNMYXllckJv cmRlcldpZHRoKTsKKworICAgIGlmIChtX2xheWVyQ2xvbmVzKSB7CisgICAgICAgIGZvciAoYXV0 byYgY2xvbmUgOiBtX2xheWVyQ2xvbmVzLT52YWx1ZXMoKSkKKyAgICAgICAgICAgIHNldExheWVy RGVidWdCb3JkZXIoKmNsb25lLCBib3JkZXJDb2xvciwgd2lkdGgpOworICAgIH0KKworICAgIGlm IChtX3N0cnVjdHVyYWxMYXllckNsb25lcykgeworICAgICAgICBDb2xvciBjbG9uZUxheWVyQm9y ZGVyQ29sb3IgPSBjbG9uZUxheWVyRGVidWdCb3JkZXJDb2xvcihzaG93RGVidWdCb3JkZXJzKTsK KyAgICAgICAgZm9yIChhdXRvJiBjbG9uZSA6IG1fc3RydWN0dXJhbExheWVyQ2xvbmVzLT52YWx1 ZXMoKSkKKyAgICAgICAgICAgIHNldExheWVyRGVidWdCb3JkZXIoKmNsb25lLCBjbG9uZUxheWVy Qm9yZGVyQ29sb3IsIGNsb25lTGF5ZXJCb3JkZXJXaWR0aCk7CisgICAgfQorCisgICAgaWYgKG1f Y29udGVudHNMYXllckNsb25lcykgeworICAgICAgICBDb2xvciBjb250ZW50c0xheWVyQm9yZGVy Q29sb3IgPSBjb250ZW50c0xheWVyRGVidWdCb3JkZXJDb2xvcihzaG93RGVidWdCb3JkZXJzKTsK KyAgICAgICAgZm9yIChhdXRvJiBjb250ZW50c0xheWVyQ2xvbmUgOiBtX2NvbnRlbnRzTGF5ZXJD bG9uZXMtPnZhbHVlcygpKQorICAgICAgICAgICAgc2V0TGF5ZXJEZWJ1Z0JvcmRlcigqY29udGVu dHNMYXllckNsb25lLCBjb250ZW50c0xheWVyQm9yZGVyQ29sb3IsIGNvbnRlbnRzTGF5ZXJCb3Jk ZXJXaWR0aCk7CisgICAgfQogfQogCiBGbG9hdFJlY3QgR3JhcGhpY3NMYXllckNBOjphZGp1c3RU aWxlZExheWVyVmlzaWJsZVJlY3QoVGlsZWRCYWNraW5nKiB0aWxlZEJhY2tpbmcsIGNvbnN0IEZs b2F0UmVjdCYgb2xkVmlzaWJsZVJlY3QsIGNvbnN0IEZsb2F0UmVjdCYgbmV3VmlzaWJsZVJlY3Qs IGNvbnN0IEZsb2F0U2l6ZSYgb2xkU2l6ZSwgY29uc3QgRmxvYXRTaXplJiBuZXdTaXplKQpAQCAt MzAwOSwxNCArMzA1MCw4IEBAIHZvaWQgR3JhcGhpY3NMYXllckNBOjpkdW1wQWRkaXRpb25hbFBy b3BlcnRpZXMoVGV4dFN0cmVhbSYgdGV4dFN0cmVhbSwgaW50IGluZGVuCiB9CiAKIHZvaWQgR3Jh cGhpY3NMYXllckNBOjpzZXREZWJ1Z0JvcmRlcihjb25zdCBDb2xvciYgY29sb3IsIGZsb2F0IGJv cmRlcldpZHRoKQoteyAgICAKLSAgICBpZiAoY29sb3IuaXNWYWxpZCgpKSB7Ci0gICAgICAgIG1f bGF5ZXItPnNldEJvcmRlckNvbG9yKGNvbG9yKTsKLSAgICAgICAgbV9sYXllci0+c2V0Qm9yZGVy V2lkdGgoYm9yZGVyV2lkdGgpOwotICAgIH0gZWxzZSB7Ci0gICAgICAgIG1fbGF5ZXItPnNldEJv cmRlckNvbG9yKENvbG9yOjp0cmFuc3BhcmVudCk7Ci0gICAgICAgIG1fbGF5ZXItPnNldEJvcmRl cldpZHRoKDApOwotICAgIH0KK3sKKyAgICBzZXRMYXllckRlYnVnQm9yZGVyKCptX2xheWVyLCBj b2xvciwgYm9yZGVyV2lkdGgpOwogfQogCiB2b2lkIEdyYXBoaWNzTGF5ZXJDQTo6c2V0Q3VzdG9t QXBwZWFyYW5jZShDdXN0b21BcHBlYXJhbmNlIGN1c3RvbUFwcGVhcmFuY2UpCkBAIC0zMTM4LDEw ICszMTczLDcgQEAgdm9pZCBHcmFwaGljc0xheWVyQ0E6OnNldHVwQ29udGVudHNMYXllcihQbGF0 Zm9ybUNBTGF5ZXIqIGNvbnRlbnRzTGF5ZXIpCiAgICAgfSBlbHNlCiAgICAgICAgIGNvbnRlbnRz TGF5ZXItPnNldEFuY2hvclBvaW50KEZsb2F0UG9pbnQzRCgpKTsKIAotICAgIGlmIChpc1Nob3dp bmdEZWJ1Z0JvcmRlcigpKSB7Ci0gICAgICAgIGNvbnRlbnRzTGF5ZXItPnNldEJvcmRlckNvbG9y KENvbG9yKDAsIDAsIDEyOCwgMTgwKSk7Ci0gICAgICAgIGNvbnRlbnRzTGF5ZXItPnNldEJvcmRl cldpZHRoKDQpOwotICAgIH0KKyAgICBzZXRMYXllckRlYnVnQm9yZGVyKCpjb250ZW50c0xheWVy LCBjb250ZW50c0xheWVyRGVidWdCb3JkZXJDb2xvcihpc1Nob3dpbmdEZWJ1Z0JvcmRlcigpKSwg Y29udGVudHNMYXllckJvcmRlcldpZHRoKTsKIH0KIAogUGFzc1JlZlB0cjxQbGF0Zm9ybUNBTGF5 ZXI+IEdyYXBoaWNzTGF5ZXJDQTo6ZmluZE9yTWFrZUNsb25lKENsb25lSUQgY2xvbmVJRCwgUGxh dGZvcm1DQUxheWVyICpzb3VyY2VMYXllciwgTGF5ZXJNYXAqIGNsb25lcywgQ2xvbmVMZXZlbCBj bG9uZUxldmVsKQpAQCAtMzMzOSwxMiArMzM3MSw5IEBAIFBhc3NSZWZQdHI8UGxhdGZvcm1DQUxh eWVyPiBHcmFwaGljc0xheWVyQ0E6OmNsb25lTGF5ZXIoUGxhdGZvcm1DQUxheWVyICpsYXllciwK ICAgICAgICAgbmV3TGF5ZXItPnNldE9wYWNpdHkobGF5ZXItPm9wYWNpdHkoKSk7CiAgICAgICAg IG1vdmVPckNvcHlBbmltYXRpb25zKENvcHksIGxheWVyLCBuZXdMYXllci5nZXQoKSk7CiAgICAg fQotICAgIAotICAgIGlmIChpc1Nob3dpbmdEZWJ1Z0JvcmRlcigpKSB7Ci0gICAgICAgIG5ld0xh eWVyLT5zZXRCb3JkZXJDb2xvcihDb2xvcigyNTUsIDEyMiwgMjUxKSk7Ci0gICAgICAgIG5ld0xh eWVyLT5zZXRCb3JkZXJXaWR0aCgyKTsKLSAgICB9Ci0gICAgCisKKyAgICBzZXRMYXllckRlYnVn Qm9yZGVyKCpuZXdMYXllciwgY2xvbmVMYXllckRlYnVnQm9yZGVyQ29sb3IoaXNTaG93aW5nRGVi dWdCb3JkZXIoKSksIGNsb25lTGF5ZXJCb3JkZXJXaWR0aCk7CisKICAgICByZXR1cm4gbmV3TGF5 ZXI7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nh L21hYy9QbGF0Zm9ybUNBTGF5ZXJNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jYS9tYWMvUGxhdGZvcm1DQUxheWVyTWFjLm1tCmluZGV4IGYwOTdlODQ2MmIzM2I4MjAw OGRmYzU3MzVhZDk5MjUxMGM2YWY5YTYuLmFmN2M4Y2I0MmFhMjJkYzI0ZTI3Mzg0NmUyNDg0YTRk Njg3YmZjZjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nh L21hYy9QbGF0Zm9ybUNBTGF5ZXJNYWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2EvbWFjL1BsYXRmb3JtQ0FMYXllck1hYy5tbQpAQCAtNjk0LDE1ICs2OTQsMjEg QEAgdm9pZCBQbGF0Zm9ybUNBTGF5ZXJNYWM6OnNldEJvcmRlcldpZHRoKGZsb2F0IHZhbHVlKQog CiB2b2lkIFBsYXRmb3JtQ0FMYXllck1hYzo6c2V0Qm9yZGVyQ29sb3IoY29uc3QgQ29sb3ImIHZh bHVlKQogewotICAgIENHRmxvYXQgY29tcG9uZW50c1s0XTsKLSAgICB2YWx1ZS5nZXRSR0JBKGNv bXBvbmVudHNbMF0sIGNvbXBvbmVudHNbMV0sIGNvbXBvbmVudHNbMl0sIGNvbXBvbmVudHNbM10p OworICAgIGlmICh2YWx1ZS5pc1ZhbGlkKCkpIHsKKyAgICAgICAgQ0dGbG9hdCBjb21wb25lbnRz WzRdOworICAgICAgICB2YWx1ZS5nZXRSR0JBKGNvbXBvbmVudHNbMF0sIGNvbXBvbmVudHNbMV0s IGNvbXBvbmVudHNbMl0sIGNvbXBvbmVudHNbM10pOwogCi0gICAgUmV0YWluUHRyPENHQ29sb3JT cGFjZVJlZj4gY29sb3JTcGFjZSA9IGFkb3B0Q0YoQ0dDb2xvclNwYWNlQ3JlYXRlRGV2aWNlUkdC KCkpOwotICAgIFJldGFpblB0cjxDR0NvbG9yUmVmPiBjb2xvciA9IGFkb3B0Q0YoQ0dDb2xvckNy ZWF0ZShjb2xvclNwYWNlLmdldCgpLCBjb21wb25lbnRzKSk7CisgICAgICAgIFJldGFpblB0cjxD R0NvbG9yU3BhY2VSZWY+IGNvbG9yU3BhY2UgPSBhZG9wdENGKENHQ29sb3JTcGFjZUNyZWF0ZURl dmljZVJHQigpKTsKKyAgICAgICAgUmV0YWluUHRyPENHQ29sb3JSZWY+IGNvbG9yID0gYWRvcHRD RihDR0NvbG9yQ3JlYXRlKGNvbG9yU3BhY2UuZ2V0KCksIGNvbXBvbmVudHMpKTsKIAotICAgIEJF R0lOX0JMT0NLX09CSkNfRVhDRVBUSU9OUwotICAgIFttX2xheWVyLmdldCgpIHNldEJvcmRlckNv bG9yOmNvbG9yLmdldCgpXTsKLSAgICBFTkRfQkxPQ0tfT0JKQ19FWENFUFRJT05TCisgICAgICAg IEJFR0lOX0JMT0NLX09CSkNfRVhDRVBUSU9OUworICAgICAgICBbbV9sYXllci5nZXQoKSBzZXRC b3JkZXJDb2xvcjpjb2xvci5nZXQoKV07CisgICAgICAgIEVORF9CTE9DS19PQkpDX0VYQ0VQVElP TlMKKyAgICB9IGVsc2UgeworICAgICAgICBCRUdJTl9CTE9DS19PQkpDX0VYQ0VQVElPTlMKKyAg ICAgICAgW21fbGF5ZXIuZ2V0KCkgc2V0Qm9yZGVyQ29sb3I6bmlsXTsKKyAgICAgICAgRU5EX0JM T0NLX09CSkNfRVhDRVBUSU9OUworICAgIH0KIH0KIAogZmxvYXQgUGxhdGZvcm1DQUxheWVyTWFj OjpvcGFjaXR5KCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMv UmVtb3RlTGF5ZXJUcmVlUHJvcGVydHlBcHBsaWVyLm1tIGIvU291cmNlL1dlYktpdDIvU2hhcmVk L21hYy9SZW1vdGVMYXllclRyZWVQcm9wZXJ0eUFwcGxpZXIubW0KaW5kZXggMzIxN2ZiOTliZmVk NDY3YzQ0MWM4ZTNjM2M1MzllMWExN2Q1YWFhMC4uMjFmYjhkZGVhNjJhZjI1YzUzNTJjNDZmMzkw MmEwZGNiNzBlNDZkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVkL21hYy9SZW1v dGVMYXllclRyZWVQcm9wZXJ0eUFwcGxpZXIubW0KKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVk L21hYy9SZW1vdGVMYXllclRyZWVQcm9wZXJ0eUFwcGxpZXIubW0KQEAgLTgyLDYgKzgyLDkgQEAg bmFtZXNwYWNlIFdlYktpdCB7CiAKIHN0YXRpYyBSZXRhaW5QdHI8Q0dDb2xvclJlZj4gY2dDb2xv ckZyb21Db2xvcihDb2xvciBjb2xvcikKIHsKKyAgICBpZiAoIWNvbG9yLmlzVmFsaWQoKSkKKyAg ICAgICAgcmV0dXJuIG5pbDsKKwogICAgIENHRmxvYXQgY29tcG9uZW50c1s0XTsKICAgICBjb2xv ci5nZXRSR0JBKGNvbXBvbmVudHNbMF0sIGNvbXBvbmVudHNbMV0sIGNvbXBvbmVudHNbMl0sIGNv bXBvbmVudHNbM10pOwogCg==