112424 2013-03-15 03:08:57 -0700 [BlackBerry] Detach overlays from page when compositor is detached 2013-03-18 06:07:42 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 anilsson anilsson anilsson jpetsovits mifenton rwlbuis staikos tonikitoo webkit.review.bot oldest_to_newest 855844 0 anilsson 2013-03-15 03:08:57 -0700 Otherwise the overlays will have a dangling pointer to the WebPage. We don't bother with webkit-thread overlays, since they are obsolete (and only used internally in WebKit, so they go down together with the WebPage anyway). PR 309160 857020 1 193542 anilsson 2013-03-18 05:27:07 -0700 Created attachment 193542 Patch 857024 2 193542 rwlbuis 2013-03-18 05:32:26 -0700 Comment on attachment 193542 Patch LGTM. 857039 3 193542 webkit.review.bot 2013-03-18 06:07:38 -0700 Comment on attachment 193542 Patch Clearing flags on attachment: 193542 Committed r146058: <http://trac.webkit.org/changeset/146058> 857040 4 webkit.review.bot 2013-03-18 06:07:42 -0700 All reviewed patches have been landed. Closing bug. 193542 2013-03-18 05:27:07 -0700 2013-03-18 06:07:38 -0700 Patch bug-112424-20130318132256.patch text/plain 10761 anilsson U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2MDU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzQzMDNiZWM1YWRlZDk3 NjY4YzAwM2NlNjJiMGNkOWJkMmM5MWJmYi4uN2Y3M2FhNGM4YTdiNjgwNThiMTJhNDMwOGI4ZWYx NWQ5MDdlYTBmNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEzLTAzLTE4ICBBcnZp ZCBOaWxzc29uICA8YW5pbHNzb25AcmltLmNvbT4KKworICAgICAgICBbQmxhY2tCZXJyeV0gRGV0 YWNoIG92ZXJsYXlzIGZyb20gcGFnZSB3aGVuIGNvbXBvc2l0b3IgaXMgZGV0YWNoZWQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMjQyNAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBSIDMwOTE2MAorCisg ICAgICAgIEV4cG9zZSBhIG1ldGhvZCB0byByZXRyaWV2ZSBhIGNvbXBvc2l0aW5nIHRocmVhZCBs YXllcidzIGNsaWVudC4KKworICAgICAgICBObyBjaGFuZ2UgaW4gYmVoYXZpb3IsIG5vIG5ldyB0 ZXN0cy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkvTGF5ZXJDb21w b3NpdGluZ1RocmVhZC5oOgorICAgICAgICAoV2ViQ29yZTo6TGF5ZXJDb21wb3NpdGluZ1RocmVh ZDo6Y2xpZW50KToKKwogMjAxMy0wMy0xOCAgS3VuaWhpa28gU2FrYW1vdG8gIDxrc2FrYW1vdG9A Y2hyb21pdW0ub3JnPgogCiAgICAgICAgIFRoZSAnZm9ybW5vdmFsaWRhdGUnIGF0dHJpYnV0ZSBk b2Vzbid0IHdvcmsgY29ycmVjdGx5IG9uIGJ1dHRvbiBlbGVtZW50cyB3aXRoIGNoaWxkIGVsZW1l bnRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nIGIvU291 cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwppbmRleCBkNDc3ZmZkMjAzNmRmMDkxMjcz OTg0MTI3MjcwZjkwNGVkNzFlYWE0Li4wMGQ0NzU2ZTU1NzY4ODQ5MTdkYTQxNGJjYjI1M2ZiOTE2 NWQxYjkyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzNiBAQAor MjAxMy0wMy0xOCAgQXJ2aWQgTmlsc3NvbiAgPGFuaWxzc29uQHJpbS5jb20+CisKKyAgICAgICAg W0JsYWNrQmVycnldIERldGFjaCBvdmVybGF5cyBmcm9tIHBhZ2Ugd2hlbiBjb21wb3NpdG9yIGlz IGRldGFjaGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMTI0MjQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBQUiAzMDkxNjAKKworICAgICAgICBJZiBub3QgZGV0YWNoZWQgcHJvcGVybHksIHRoZSBvdmVy bGF5cyB3b3VsZCBoYXZlIGEgZGFuZ2xpbmcgcG9pbnRlciB0bworICAgICAgICB0aGUgcGFnZS4K KworICAgICAgICAqIEFwaS9XZWJPdmVybGF5LmNwcDoKKyAgICAgICAgKEJsYWNrQmVycnk6Oldl YktpdDo6V2ViT3ZlcmxheUxheWVyQ29tcG9zaXRpbmdUaHJlYWRDbGllbnQ6OldlYk92ZXJsYXlM YXllckNvbXBvc2l0aW5nVGhyZWFkQ2xpZW50KToKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktp dDo6V2ViT3ZlcmxheUxheWVyQ29tcG9zaXRpbmdUaHJlYWRDbGllbnQ6OnVwbG9hZFRleHR1cmVz SWZOZWVkZWQpOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJPdmVybGF5UHJpdmF0 ZUNvbXBvc2l0aW5nVGhyZWFkOjpXZWJPdmVybGF5UHJpdmF0ZUNvbXBvc2l0aW5nVGhyZWFkKToK KyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6V2ViT3ZlcmxheVByaXZhdGVDb21wb3NpdGlu Z1RocmVhZDo6fldlYk92ZXJsYXlQcml2YXRlQ29tcG9zaXRpbmdUaHJlYWQpOgorICAgICAgICAq IEFwaS9XZWJPdmVybGF5X3AuaDoKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6V2ViT3Zl cmxheVByaXZhdGU6OnNldENsaWVudCk6CisgICAgICAgIChXZWJPdmVybGF5TGF5ZXJDb21wb3Np dGluZ1RocmVhZENsaWVudCk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYk92ZXJs YXlMYXllckNvbXBvc2l0aW5nVGhyZWFkQ2xpZW50OjpvdmVybGF5KToKKyAgICAgICAgKEJsYWNr QmVycnk6OldlYktpdDo6V2ViT3ZlcmxheUxheWVyQ29tcG9zaXRpbmdUaHJlYWRDbGllbnQ6Om92 ZXJsYXlEZXN0cm95ZWQpOgorICAgICAgICAoV2ViT3ZlcmxheVByaXZhdGVDb21wb3NpdGluZ1Ro cmVhZCk6CisgICAgICAgICogQXBpL1dlYlBhZ2VDb21wb3NpdG9yLmNwcDoKKyAgICAgICAgKEJs YWNrQmVycnk6OldlYktpdDo6V2ViUGFnZUNvbXBvc2l0b3JQcml2YXRlOjpkZXRhY2gpOgorICAg ICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJQYWdlQ29tcG9zaXRvclByaXZhdGU6OnNldFBh Z2UpOgorICAgICAgICAoV2ViS2l0KToKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6V2Vi UGFnZUNvbXBvc2l0b3JQcml2YXRlOjphdHRhY2hPdmVybGF5cyk6CisgICAgICAgICogQXBpL1dl YlBhZ2VDb21wb3NpdG9yX3AuaDoKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6V2ViUGFn ZUNvbXBvc2l0b3JQcml2YXRlOjphdHRhY2hPdmVybGF5cyk6CisgICAgICAgIChCbGFja0JlcnJ5 OjpXZWJLaXQ6OldlYlBhZ2VDb21wb3NpdG9yUHJpdmF0ZTo6ZGV0YWNoT3ZlcmxheXMpOgorICAg ICAgICAoV2ViUGFnZUNvbXBvc2l0b3JQcml2YXRlKToKKwogMjAxMy0wMy0xOCAgQWxiZXJ0byBH YXJjaWEgIDxhZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0JsYWNrQmVycnldIEJhY2tp bmdTdG9yZUNsaWVudDogcmVtb3ZlIHVubmVjZXNzYXJ5IGNhbGwgdG8gdG9FbGVtZW50KCkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkvTGF5 ZXJDb21wb3NpdGluZ1RocmVhZC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv YmxhY2tiZXJyeS9MYXllckNvbXBvc2l0aW5nVGhyZWFkLmgKaW5kZXggYzFmMzA0NDdiMzE4ODE5 YzI4MGJhYjAzMjRkY2ZlOWIxMjI0NDBlZS4uY2MwMTRhNzBjZjQzNTlkOTEyNTcyYmE1MjI0NTU5 OTU0YzE4ZjlkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv YmxhY2tiZXJyeS9MYXllckNvbXBvc2l0aW5nVGhyZWFkLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJyeS9MYXllckNvbXBvc2l0aW5nVGhyZWFkLmgKQEAg LTEyMCw2ICsxMjAsNyBAQCBjbGFzcyBMYXllckNvbXBvc2l0aW5nVGhyZWFkIDogcHVibGljIFRo cmVhZFNhZmVSZWZDb3VudGVkPExheWVyQ29tcG9zaXRpbmdUaHJlYQogcHVibGljOgogICAgIHN0 YXRpYyBQYXNzUmVmUHRyPExheWVyQ29tcG9zaXRpbmdUaHJlYWQ+IGNyZWF0ZShMYXllclR5cGUs IExheWVyQ29tcG9zaXRpbmdUaHJlYWRDbGllbnQqKTsKIAorICAgIExheWVyQ29tcG9zaXRpbmdU aHJlYWRDbGllbnQqIGNsaWVudCgpIGNvbnN0IHsgcmV0dXJuIG1fY2xpZW50OyB9CiAgICAgdm9p ZCBzZXRDbGllbnQoTGF5ZXJDb21wb3NpdGluZ1RocmVhZENsaWVudCogY2xpZW50KSB7IG1fY2xp ZW50ID0gY2xpZW50OyB9CiAKICAgICAvLyBUaHJlYWQgc2FmZQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJPdmVybGF5LmNwcCBiL1NvdXJjZS9XZWJLaXQvYmxh Y2tiZXJyeS9BcGkvV2ViT3ZlcmxheS5jcHAKaW5kZXggODgyNTgzNDFhYTAxZjExMmMxMDc2M2Iw NzAyYzZkNTU2NjYzOGEzNS4uOGU1NmU4YTU3YmE0NzhlY2RjYjk3YWI3YmU5NTEwMmEwMGMyYzUw MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJPdmVybGF5LmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYk92ZXJsYXkuY3BwCkBAIC0z ODYsOSArMzg2LDkgQEAgdm9pZCBXZWJPdmVybGF5UHJpdmF0ZVdlYktpdFRocmVhZDo6cGFpbnRD b250ZW50cyhjb25zdCBXZWJDb3JlOjpHcmFwaGljc0xheWVyKiwKICAgICBkcmF3Q29udGVudHMo Yy5wbGF0Zm9ybUNvbnRleHQoKSk7CiB9CiAKLVdlYk92ZXJsYXlMYXllckNvbXBvc2l0aW5nVGhy ZWFkQ2xpZW50OjpXZWJPdmVybGF5TGF5ZXJDb21wb3NpdGluZ1RocmVhZENsaWVudCgpCitXZWJP dmVybGF5TGF5ZXJDb21wb3NpdGluZ1RocmVhZENsaWVudDo6V2ViT3ZlcmxheUxheWVyQ29tcG9z aXRpbmdUaHJlYWRDbGllbnQoV2ViT3ZlcmxheVByaXZhdGUqIG92ZXJsYXkpCiAgICAgOiBtX2Ry YXdzQ29udGVudChmYWxzZSkKLSAgICAsIG1fY2xpZW50KDApCisgICAgLCBtX292ZXJsYXkob3Zl cmxheSkKIHsKIH0KIApAQCAtNDUwLDcgKzQ1MCw3IEBAIHZvaWQgV2ViT3ZlcmxheUxheWVyQ29t cG9zaXRpbmdUaHJlYWRDbGllbnQ6OnVwbG9hZFRleHR1cmVzSWZOZWVkZWQoTGF5ZXJDb21wb3Np CiAgICAgSW50U2l6ZSB0ZXh0dXJlU2l6ZTsKIAogICAgIGlmIChtX2RyYXdzQ29udGVudCkgewot ICAgICAgICBpZiAoIW1fY2xpZW50IHx8ICFtX293bmVyKQorICAgICAgICBpZiAoIW1fb3Zlcmxh eSB8fCAhbV9vdmVybGF5LT5jbGllbnQpCiAgICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAg dGV4dHVyZVNpemUgPSBsYXllci0+Ym91bmRzKCk7CkBAIC00NjYsNyArNDY2LDcgQEAgdm9pZCBX ZWJPdmVybGF5TGF5ZXJDb21wb3NpdGluZ1RocmVhZENsaWVudDo6dXBsb2FkVGV4dHVyZXNJZk5l ZWRlZChMYXllckNvbXBvc2kKICAgICAgICAgICAgIC1sYXllci0+Ym91bmRzKCkud2lkdGgoKSAv IDIuMCwgLWxheWVyLT5ib3VuZHMoKS5oZWlnaHQoKSAvIDIuMAogICAgICAgICB9OwogICAgICAg ICBwbGF0Zm9ybUNvbnRleHQtPnNldFRyYW5zZm9ybSh0cmFuc2Zvcm0pOwotICAgICAgICBtX2Ns aWVudC0+ZHJhd092ZXJsYXlDb250ZW50cyhtX293bmVyLCBwbGF0Zm9ybUNvbnRleHQpOworICAg ICAgICBtX2NsaWVudC0+ZHJhd092ZXJsYXlDb250ZW50cyhtX292ZXJsYXktPnEsIHBsYXRmb3Jt Q29udGV4dCk7CiAKICAgICAgICAgcmVsZWFzZUJ1ZmZlckRyYXdhYmxlKHRleHR1cmVDb250ZW50 cyk7CiAgICAgfSBlbHNlIGlmICghbV9pbWFnZS5pc051bGwoKSkgewpAQCAtNTI1LDcgKzUyNSw3 IEBAIFdlYk92ZXJsYXlQcml2YXRlQ29tcG9zaXRpbmdUaHJlYWQ6OldlYk92ZXJsYXlQcml2YXRl Q29tcG9zaXRpbmdUaHJlYWQoUGFzc1JlZlB0CiB9CiAKIFdlYk92ZXJsYXlQcml2YXRlQ29tcG9z aXRpbmdUaHJlYWQ6OldlYk92ZXJsYXlQcml2YXRlQ29tcG9zaXRpbmdUaHJlYWQoKQotICAgIDog bV9sYXllckNvbXBvc2l0aW5nVGhyZWFkQ2xpZW50KG5ldyBXZWJPdmVybGF5TGF5ZXJDb21wb3Np dGluZ1RocmVhZENsaWVudCkKKyAgICA6IG1fbGF5ZXJDb21wb3NpdGluZ1RocmVhZENsaWVudChu ZXcgV2ViT3ZlcmxheUxheWVyQ29tcG9zaXRpbmdUaHJlYWRDbGllbnQodGhpcykpCiB7CiAgICAg bV9sYXllckNvbXBvc2l0aW5nVGhyZWFkID0gTGF5ZXJDb21wb3NpdGluZ1RocmVhZDo6Y3JlYXRl KExheWVyRGF0YTo6Q3VzdG9tTGF5ZXIsIG1fbGF5ZXJDb21wb3NpdGluZ1RocmVhZENsaWVudCk7 CiB9CkBAIC01MzMsMTQgKzUzMyw3IEBAIFdlYk92ZXJsYXlQcml2YXRlQ29tcG9zaXRpbmdUaHJl YWQ6OldlYk92ZXJsYXlQcml2YXRlQ29tcG9zaXRpbmdUaHJlYWQoKQogV2ViT3ZlcmxheVByaXZh dGVDb21wb3NpdGluZ1RocmVhZDo6fldlYk92ZXJsYXlQcml2YXRlQ29tcG9zaXRpbmdUaHJlYWQo KQogewogICAgIGlmIChtX2xheWVyQ29tcG9zaXRpbmdUaHJlYWRDbGllbnQpCi0gICAgICAgIG1f bGF5ZXJDb21wb3NpdGluZ1RocmVhZENsaWVudC0+c2V0Q2xpZW50KDAsIDApOwotfQotCi12b2lk IFdlYk92ZXJsYXlQcml2YXRlQ29tcG9zaXRpbmdUaHJlYWQ6OnNldENsaWVudChXZWJPdmVybGF5 Q2xpZW50KiBjbGllbnQpCi17Ci0gICAgV2ViT3ZlcmxheVByaXZhdGU6OnNldENsaWVudChjbGll bnQpOwotICAgIGlmIChtX2xheWVyQ29tcG9zaXRpbmdUaHJlYWRDbGllbnQpCi0gICAgICAgIG1f bGF5ZXJDb21wb3NpdGluZ1RocmVhZENsaWVudC0+c2V0Q2xpZW50KHEsIGNsaWVudCk7CisgICAg ICAgIG1fbGF5ZXJDb21wb3NpdGluZ1RocmVhZENsaWVudC0+b3ZlcmxheURlc3Ryb3llZCgpOwog fQogCiBGbG9hdFBvaW50IFdlYk92ZXJsYXlQcml2YXRlQ29tcG9zaXRpbmdUaHJlYWQ6OnBvc2l0 aW9uKCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2Vi T3ZlcmxheV9wLmggYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYk92ZXJsYXlfcC5o CmluZGV4IGNjYjAxNTllMGZjYjk1ODYzMGQ1MDc3ODkxMGExZmUwZGUwMDQ3Y2EuLjViMjFhY2U3 MGVkYTJlMTQ2YmE5YWUzOGViNmM1MGEyOGRjZDZiOGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvYmxhY2tiZXJyeS9BcGkvV2ViT3ZlcmxheV9wLmgKKysrIGIvU291cmNlL1dlYktpdC9ibGFj a2JlcnJ5L0FwaS9XZWJPdmVybGF5X3AuaApAQCAtNjUsNyArNjUsNyBAQCBwdWJsaWM6CiAgICAg V2ViUGFnZVByaXZhdGUqIHBhZ2UoKSBjb25zdDsKICAgICB2b2lkIHNldFBhZ2UoV2ViUGFnZVBy aXZhdGUqIHBhZ2UpIHsgbV9wYWdlID0gcGFnZTsgfQogCi0gICAgdmlydHVhbCB2b2lkIHNldENs aWVudChXZWJPdmVybGF5Q2xpZW50KiBjKSB7IGNsaWVudCA9IGM7IH0KKyAgICB2b2lkIHNldENs aWVudChXZWJPdmVybGF5Q2xpZW50KiBjKSB7IGNsaWVudCA9IGM7IH0KIAogICAgIFdlYk92ZXJs YXlPdmVycmlkZSogb3ZlcnJpZGUoKTsKIApAQCAtMTgwLDEwICsxODAsMTEgQEAgcHJpdmF0ZToK IC8vIHNvIGl0IG5lZWRzIHRvIGJlIGEgc2VwYXJhdGUgb2JqZWN0IGZyb20gdGhlIFdlYk92ZXJs YXlQcml2YXRlQ29tcG9zaXRpbmdUaHJlYWQuCiBjbGFzcyBXZWJPdmVybGF5TGF5ZXJDb21wb3Np dGluZ1RocmVhZENsaWVudCA6IHB1YmxpYyBXZWJDb3JlOjpMYXllckNvbXBvc2l0aW5nVGhyZWFk Q2xpZW50IHsKIHB1YmxpYzoKLSAgICBXZWJPdmVybGF5TGF5ZXJDb21wb3NpdGluZ1RocmVhZENs aWVudCgpOworICAgIFdlYk92ZXJsYXlMYXllckNvbXBvc2l0aW5nVGhyZWFkQ2xpZW50KFdlYk92 ZXJsYXlQcml2YXRlKik7CiAgICAgdmlydHVhbCB+V2ViT3ZlcmxheUxheWVyQ29tcG9zaXRpbmdU aHJlYWRDbGllbnQoKSB7IH0KIAotICAgIHZvaWQgc2V0Q2xpZW50KFdlYk92ZXJsYXkqIG93bmVy LCBXZWJPdmVybGF5Q2xpZW50KiBjbGllbnQpIHsgbV9vd25lciA9IG93bmVyOyBtX2NsaWVudCA9 IGNsaWVudDsgfQorICAgIFdlYk92ZXJsYXlQcml2YXRlKiBvdmVybGF5KCkgY29uc3QgeyByZXR1 cm4gbV9vdmVybGF5OyB9CisgICAgdm9pZCBvdmVybGF5RGVzdHJveWVkKCkgeyBtX292ZXJsYXkg PSAwOyB9CiAKICAgICBib29sIGRyYXdzQ29udGVudCgpIGNvbnN0IHsgcmV0dXJuIG1fZHJhd3ND b250ZW50OyB9CiAgICAgdm9pZCBzZXREcmF3c0NvbnRlbnQoYm9vbCk7CkBAIC0yMTAsOCArMjEx LDcgQEAgcHJpdmF0ZToKICAgICBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6R3JhcGhpY3M6OlRpbGVk SW1hZ2UgbV9pbWFnZTsKICAgICBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6R3JhcGhpY3M6OlRpbGVk SW1hZ2UgbV91cGxvYWRlZEltYWdlOwogICAgIFdlYkNvcmU6OkNvbG9yIG1fY29sb3I7Ci0gICAg V2ViT3ZlcmxheSogbV9vd25lcjsKLSAgICBXZWJPdmVybGF5Q2xpZW50KiBtX2NsaWVudDsKKyAg ICBXZWJPdmVybGF5UHJpdmF0ZSogbV9vdmVybGF5OwogfTsKIAogY2xhc3MgV2ViT3ZlcmxheVBy aXZhdGVDb21wb3NpdGluZ1RocmVhZCA6IHB1YmxpYyBXZWJPdmVybGF5UHJpdmF0ZSB7CkBAIC0y MjAsOCArMjIwLDYgQEAgcHVibGljOgogICAgIFdlYk92ZXJsYXlQcml2YXRlQ29tcG9zaXRpbmdU aHJlYWQoKTsKICAgICB+V2ViT3ZlcmxheVByaXZhdGVDb21wb3NpdGluZ1RocmVhZCgpOwogCi0g ICAgdmlydHVhbCB2b2lkIHNldENsaWVudChXZWJPdmVybGF5Q2xpZW50Kik7Ci0KICAgICB2aXJ0 dWFsIFdlYkNvcmU6OkZsb2F0UG9pbnQgcG9zaXRpb24oKSBjb25zdDsKICAgICB2aXJ0dWFsIHZv aWQgc2V0UG9zaXRpb24oY29uc3QgV2ViQ29yZTo6RmxvYXRQb2ludCYpOwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2VDb21wb3NpdG9yLmNwcCBiL1Nv dXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZUNvbXBvc2l0b3IuY3BwCmluZGV4IDJh NDI1NjMwMTFjMTRkYWIyNjRjNzUzOTVjYTNjY2JmMjMyYWNiNjUuLjBmYzQ1ZjJiYWZkYzk0OGI0 MzQzYTY2NzJhOWJjMGNmYjk5NzdiOTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2ti ZXJyeS9BcGkvV2ViUGFnZUNvbXBvc2l0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2ti ZXJyeS9BcGkvV2ViUGFnZUNvbXBvc2l0b3IuY3BwCkBAIC0yNiw2ICsyNiw3IEBACiAKICNpbmNs dWRlICJCYWNraW5nU3RvcmVfcC5oIgogI2luY2x1ZGUgIkxheWVyV2ViS2l0VGhyZWFkLmgiCisj aW5jbHVkZSAiV2ViT3ZlcmxheV9wLmgiCiAjaW5jbHVkZSAiV2ViUGFnZV9wLmgiCiAKICNpbmNs dWRlIDxCbGFja0JlcnJ5UGxhdGZvcm1EZWJ1Z01hY3Jvcy5oPgpAQCAtNjIsNyArNjMsOSBAQCB2 b2lkIFdlYlBhZ2VDb21wb3NpdG9yUHJpdmF0ZTo6ZGV0YWNoKCkKIHsKICAgICBpZiAobV93ZWJQ YWdlKQogICAgICAgICBQbGF0Zm9ybTo6QW5pbWF0aW9uRnJhbWVSYXRlQ29udHJvbGxlcjo6aW5z dGFuY2UoKS0+cmVtb3ZlQ2xpZW50KHRoaXMpOworCiAgICAgbV93ZWJQYWdlID0gMDsKKyAgICBk ZXRhY2hPdmVybGF5cygpOwogfQogCiB2b2lkIFdlYlBhZ2VDb21wb3NpdG9yUHJpdmF0ZTo6c2V0 UGFnZShXZWJQYWdlUHJpdmF0ZSAqcCkKQEAgLTcyLDYgKzc1LDIyIEBAIHZvaWQgV2ViUGFnZUNv bXBvc2l0b3JQcml2YXRlOjpzZXRQYWdlKFdlYlBhZ2VQcml2YXRlICpwKQogICAgIEFTU0VSVChw KTsKICAgICBBU1NFUlQobV93ZWJQYWdlKTsgLy8gaWYgdGhpcyBpcyBudWxsLCB3ZSBoYXZlIGEg YnVnIGFuZCB3ZSBuZWVkIHRvIHJlLWFkZC4KICAgICBtX3dlYlBhZ2UgPSBwOworICAgIGF0dGFj aE92ZXJsYXlzKCk7Cit9CisKK3ZvaWQgV2ViUGFnZUNvbXBvc2l0b3JQcml2YXRlOjphdHRhY2hP dmVybGF5cyhMYXllckNvbXBvc2l0aW5nVGhyZWFkKiBvdmVybGF5Um9vdCwgV2ViUGFnZVByaXZh dGUqIHBhZ2UpCit7CisgICAgaWYgKCFvdmVybGF5Um9vdCkKKyAgICAgICAgcmV0dXJuOworCisg ICAgY29uc3QgVmVjdG9yPFJlZlB0cjxMYXllckNvbXBvc2l0aW5nVGhyZWFkPiA+JiBvdmVybGF5 cyA9IG92ZXJsYXlSb290LT5nZXRTdWJsYXllcnMoKTsKKyAgICBmb3IgKHNpemVfdCBpID0gMDsg aSA8IG92ZXJsYXlzLnNpemUoKTsgKytpKSB7CisgICAgICAgIExheWVyQ29tcG9zaXRpbmdUaHJl YWQqIG92ZXJsYXkgPSBvdmVybGF5c1tpXS5nZXQoKTsKKyAgICAgICAgaWYgKExheWVyQ29tcG9z aXRpbmdUaHJlYWRDbGllbnQqIGNsaWVudCA9IG92ZXJsYXktPmNsaWVudCgpKSB7CisgICAgICAg ICAgICBpZiAoV2ViT3ZlcmxheVByaXZhdGUqIHdlYk92ZXJsYXkgPSBzdGF0aWNfY2FzdDxXZWJP dmVybGF5TGF5ZXJDb21wb3NpdGluZ1RocmVhZENsaWVudCo+KGNsaWVudCktPm92ZXJsYXkoKSkK KyAgICAgICAgICAgICAgICB3ZWJPdmVybGF5LT5zZXRQYWdlKHBhZ2UpOworICAgICAgICB9Cisg ICAgfQogfQogCiB2b2lkIFdlYlBhZ2VDb21wb3NpdG9yUHJpdmF0ZTo6c2V0Q29udGV4dChQbGF0 Zm9ybTo6R3JhcGhpY3M6OkdMRVMyQ29udGV4dCogY29udGV4dCkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZUNvbXBvc2l0b3JfcC5oIGIvU291cmNlL1dl YktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlQ29tcG9zaXRvcl9wLmgKaW5kZXggOGM5MmM4M2Ez ZDU5NDg4ZWIwMTNjMDVkYWU1MzBhM2MxMWYwY2RlNi4uYTQwMTk1N2U4NWZkYmY0YWU1MjE3NGFm YjJjMDlhOTliMDNlM2IxYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0Fw aS9XZWJQYWdlQ29tcG9zaXRvcl9wLmgKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0Fw aS9XZWJQYWdlQ29tcG9zaXRvcl9wLmgKQEAgLTEwOSw2ICsxMDksOSBAQCBwcm90ZWN0ZWQ6CiAK IHByaXZhdGU6CiAgICAgdm9pZCBjb21wb3NpdGVMYXllcnMoY29uc3QgV2ViQ29yZTo6VHJhbnNm b3JtYXRpb25NYXRyaXgmKTsKKyAgICB2b2lkIGF0dGFjaE92ZXJsYXlzKCkgeyBhdHRhY2hPdmVy bGF5cyhtX2NvbXBvc2l0aW5nVGhyZWFkT3ZlcmxheUxheWVyLmdldCgpLCBtX3dlYlBhZ2UpOyB9 CisgICAgdm9pZCBkZXRhY2hPdmVybGF5cygpIHsgYXR0YWNoT3ZlcmxheXMobV9jb21wb3NpdGlu Z1RocmVhZE92ZXJsYXlMYXllci5nZXQoKSwgMCk7IH0KKyAgICBzdGF0aWMgdm9pZCBhdHRhY2hP dmVybGF5cyhXZWJDb3JlOjpMYXllckNvbXBvc2l0aW5nVGhyZWFkKiBvdmVybGF5Um9vdCwgV2Vi UGFnZVByaXZhdGUqKTsKIAogICAgIC8vIExheWVyUmVuZGVyZXJDbGllbnQKICAgICB2aXJ0dWFs IGJvb2wgc2hvdWxkQ2xlYXJTdXJmYWNlQmVmb3JlQ29tcG9zaXRpbmcoKTsK