118862 2013-07-18 14:13:39 -0700 [wk2] Ensure that the plugin layer is removed completely when the PluginProcess crashes 2013-07-18 14:55:18 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified NEW InRadar P2 Normal --- 1 thorton thorton andersca sam oldest_to_newest 909864 0 thorton 2013-07-18 14:13:39 -0700 Currently it isn't, which can cause the unavailable plugin indicator to not paint. <rdar://problem/14474988> 909866 1 207021 thorton 2013-07-18 14:21:15 -0700 Created attachment 207021 patch 909869 2 207023 thorton 2013-07-18 14:49:39 -0700 Created attachment 207023 ignore this one 207021 2013-07-18 14:21:15 -0700 2013-07-18 14:55:18 -0700 patch cleanup-plugin-layer.diff text/plain 3761 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBmNDI5Njk5Li45NjcwNmRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjYg QEAKIDIwMTMtMDctMTggIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAK KyAgICAgICAgW3drMl0gRW5zdXJlIHRoYXQgdGhlIHBsdWdpbiBsYXllciBpcyByZW1vdmVkIGNv bXBsZXRlbHkgd2hlbiB0aGUgUGx1Z2luUHJvY2VzcyBjcmFzaGVzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTg4NjIKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvUGx1Z2lucy9QbHVn aW5WaWV3LmNwcDoKKyAgICAgICAgKFdlYktpdDo6UGx1Z2luVmlldzo6UGx1Z2luVmlldyk6Cisg ICAgICAgIEFkZCBtX3BsdWdpblByb2Nlc3NIYXNDcmFzaGVkLgorCisgICAgICAgIChXZWJLaXQ6 OlBsdWdpblZpZXc6OnBsYXRmb3JtTGF5ZXIpOgorICAgICAgICBEb24ndCByZXR1cm4gdGhlIHBs dWdpbidzIGxheWVyIGlmIGl0IGhhcyBjcmFzaGVkLgorCisgICAgICAgIChXZWJLaXQ6OlBsdWdp blZpZXc6OnBsdWdpblByb2Nlc3NDcmFzaGVkKToKKyAgICAgICAgU2V0IG1fcGx1Z2luUHJvY2Vz c0hhc0NyYXNoZWQuCisgICAgICAgIENhdXNlIGEgc3R5bGUgcmVjYWxjIHNvIHRoYXQgd2UgcmVi dWlsZCB0aGUgbGF5ZXIgdHJlZTsgb3VyIGxheWVyIHdvbid0IGJlIGluY2x1ZGVkLgorCisgICAg ICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuaDoKKyAgICAgICAgQWRkIG1fcGx1 Z2luUHJvY2Vzc0hhc0NyYXNoZWQuCisKKzIwMTMtMDctMTggIFRpbSBIb3J0b24gIDx0aW1vdGh5 X2hvcnRvbkBhcHBsZS5jb20+CisKICAgICAgICAgUmVtb3ZlIFBERlZpZXdDb250cm9sbGVyIGFu ZCBXS1ZpZXcgImN1c3RvbSByZXByZXNlbnRhdGlvbnMiCiAgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTg3MjAKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuY3BwCmluZGV4IDBiNzE0MzNjLi5lMjg0MTcx IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luVmll dy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcu Y3BwCkBAIC0yNzYsNiArMjc2LDcgQEAgUGx1Z2luVmlldzo6UGx1Z2luVmlldyhQYXNzUmVmUHRy PEhUTUxQbHVnSW5FbGVtZW50PiBwbHVnaW5FbGVtZW50LCBQYXNzUmVmUHRyPFAKICAgICAsIG1f aXNXYWl0aW5nRm9yU3luY2hyb25vdXNJbml0aWFsaXphdGlvbihmYWxzZSkKICAgICAsIG1faXNX YWl0aW5nVW50aWxNZWRpYUNhblN0YXJ0KGZhbHNlKQogICAgICwgbV9pc0JlaW5nRGVzdHJveWVk KGZhbHNlKQorICAgICwgbV9wbHVnaW5Qcm9jZXNzSGFzQ3Jhc2hlZChmYWxzZSkKICAgICAsIG1f cGVuZGluZ1VSTFJlcXVlc3RzVGltZXIoUnVuTG9vcDo6bWFpbigpLCB0aGlzLCAmUGx1Z2luVmll dzo6cGVuZGluZ1VSTFJlcXVlc3RzVGltZXJGaXJlZCkKICNpZiBFTkFCTEUoTkVUU0NBUEVfUExV R0lOX0FQSSkKICAgICAsIG1fbnBSdW50aW1lT2JqZWN0TWFwKHRoaXMpCkBAIC02MjAsNyArNjIx LDcgQEAgdm9pZCBQbHVnaW5WaWV3OjpkaWRJbml0aWFsaXplUGx1Z2luKCkKIFBsYXRmb3JtTGF5 ZXIqIFBsdWdpblZpZXc6OnBsYXRmb3JtTGF5ZXIoKSBjb25zdAogewogICAgIC8vIFRoZSBwbHVn LWluIGNhbiBiZSBudWxsIGhlcmUgaWYgaXQgZmFpbGVkIHRvIGluaXRpYWxpemUuCi0gICAgaWYg KCFtX2lzSW5pdGlhbGl6ZWQgfHwgIW1fcGx1Z2luKQorICAgIGlmICghbV9pc0luaXRpYWxpemVk IHx8ICFtX3BsdWdpbiB8fCBtX3BsdWdpblByb2Nlc3NIYXNDcmFzaGVkKQogICAgICAgICByZXR1 cm4gMDsKICAgICAgICAgCiAgICAgcmV0dXJuIG1fcGx1Z2luLT5wbHVnaW5MYXllcigpOwpAQCAt MTI0OSw3ICsxMjUwLDcgQEAgdm9pZCBQbHVnaW5WaWV3OjppbnZhbGlkYXRlUmVjdChjb25zdCBJ bnRSZWN0JiBkaXJ0eVJlY3QpCiAgICAgUmVuZGVyQm94TW9kZWxPYmplY3QqIHJlbmRlcmVyID0g dG9SZW5kZXJCb3hNb2RlbE9iamVjdChtX3BsdWdpbkVsZW1lbnQtPnJlbmRlcmVyKCkpOwogICAg IGlmICghcmVuZGVyZXIpCiAgICAgICAgIHJldHVybjsKLSAgICAKKwogICAgIEludFJlY3QgY29u dGVudFJlY3QoZGlydHlSZWN0KTsKICAgICBjb250ZW50UmVjdC5tb3ZlKHJlbmRlcmVyLT5ib3Jk ZXJMZWZ0KCkgKyByZW5kZXJlci0+cGFkZGluZ0xlZnQoKSwgcmVuZGVyZXItPmJvcmRlclRvcCgp ICsgcmVuZGVyZXItPnBhZGRpbmdUb3AoKSk7CiAgICAgcmVuZGVyZXItPnJlcGFpbnRSZWN0YW5n bGUoY29udGVudFJlY3QpOwpAQCAtMTQxMywxMyArMTQxNCwxNyBAQCBib29sIFBsdWdpblZpZXc6 OmlzQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJsZWQoKQogCiB2b2lkIFBsdWdpblZpZXc6OnBs dWdpblByb2Nlc3NDcmFzaGVkKCkKIHsKKyAgICBtX3BsdWdpblByb2Nlc3NIYXNDcmFzaGVkID0g dHJ1ZTsKKwogICAgIGlmICghbV9wbHVnaW5FbGVtZW50LT5yZW5kZXJlcigpKQogICAgICAgICBy ZXR1cm47CiAKICAgICAvLyBGSVhNRTogVGhlIHJlbmRlcmVyIGNvdWxkIGFsc28gYmUgYSBSZW5k ZXJBcHBsZXQsIHdlIHNob3VsZCBoYW5kbGUgdGhhdC4KICAgICBpZiAoIW1fcGx1Z2luRWxlbWVu dC0+cmVuZGVyZXIoKS0+aXNFbWJlZGRlZE9iamVjdCgpKQogICAgICAgICByZXR1cm47Ci0gICAg ICAgIAorCisgICAgbV9wbHVnaW5FbGVtZW50LT5zZXROZWVkc1N0eWxlUmVjYWxjKFN5bnRoZXRp Y1N0eWxlQ2hhbmdlKTsKKwogICAgIFJlbmRlckVtYmVkZGVkT2JqZWN0KiByZW5kZXJlciA9IHRv UmVuZGVyRW1iZWRkZWRPYmplY3QobV9wbHVnaW5FbGVtZW50LT5yZW5kZXJlcigpKTsKICAgICBy ZW5kZXJlci0+c2V0UGx1Z2luVW5hdmFpbGFiaWxpdHlSZWFzb24oUmVuZGVyRW1iZWRkZWRPYmpl Y3Q6OlBsdWdpbkNyYXNoZWQpOwogICAgIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv UGx1Z2lucy9QbHVnaW5WaWV3LmgKaW5kZXggMWFhZjJkYi4uODllYTg0MSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuaAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5oCkBAIC0yMzEsNiArMjMx LDcgQEAgcHJpdmF0ZToKICAgICBib29sIG1faXNXYWl0aW5nRm9yU3luY2hyb25vdXNJbml0aWFs aXphdGlvbjsKICAgICBib29sIG1faXNXYWl0aW5nVW50aWxNZWRpYUNhblN0YXJ0OwogICAgIGJv b2wgbV9pc0JlaW5nRGVzdHJveWVkOworICAgIGJvb2wgbV9wbHVnaW5Qcm9jZXNzSGFzQ3Jhc2hl ZDsKIAogICAgIC8vIFBlbmRpbmcgVVJMUmVxdWVzdHMgdGhhdCB0aGUgcGx1Zy1pbiBoYXMgbWFk ZS4KICAgICBEZXF1ZTxSZWZQdHI8VVJMUmVxdWVzdD4+IG1fcGVuZGluZ1VSTFJlcXVlc3RzOwo= 207023 2013-07-18 14:49:39 -0700 2013-07-18 14:54:00 -0700 ignore this one cleanup-plugin-layer.diff text/plain 5115 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBmNDI5Njk5Li5mMDcxYzc2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzEg QEAKIDIwMTMtMDctMTggIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAK KyAgICAgICAgW3drMl0gRW5zdXJlIHRoYXQgdGhlIHBsdWdpbiBsYXllciBpcyByZW1vdmVkIGNv bXBsZXRlbHkgd2hlbiB0aGUgUGx1Z2luUHJvY2VzcyBjcmFzaGVzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTg4NjIKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvUGx1Z2lucy9QbHVn aW5Qcm94eS5jcHA6CisgICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL21hYy9Q bHVnaW5Qcm94eU1hYy5tbToKKyAgICAgICAgKFdlYktpdDo6UGx1Z2luUHJveHk6OnBsdWdpblBy b2Nlc3NDcmFzaGVkKToKKyAgICAgICAgRGVzdHJveSB0aGUgcGx1Z2luJ3MgbGF5ZXIgd2hlbiB0 aGUgcGx1Z2luIHByb2Nlc3MgY3Jhc2hlcy4KKworICAgICAgICAqIFdlYlByb2Nlc3MvUGx1Z2lu cy9QbHVnaW5WaWV3LmNwcDoKKyAgICAgICAgKFdlYktpdDo6UGx1Z2luVmlldzo6UGx1Z2luVmll dyk6CisgICAgICAgIEFkZCBtX3BsdWdpblByb2Nlc3NIYXNDcmFzaGVkLgorCisgICAgICAgIChX ZWJLaXQ6OlBsdWdpblZpZXc6OnBsYXRmb3JtTGF5ZXIpOgorICAgICAgICBEb24ndCByZXR1cm4g dGhlIHBsdWdpbidzIGxheWVyIGlmIGl0IGhhcyBjcmFzaGVkLgorCisgICAgICAgIChXZWJLaXQ6 OlBsdWdpblZpZXc6OnBsdWdpblByb2Nlc3NDcmFzaGVkKToKKyAgICAgICAgU2V0IG1fcGx1Z2lu UHJvY2Vzc0hhc0NyYXNoZWQuCisgICAgICAgIENhdXNlIGEgc3R5bGUgcmVjYWxjIHNvIHRoYXQg d2UgcmVidWlsZCB0aGUgbGF5ZXIgdHJlZTsgb3VyIGxheWVyIHdvbid0IGJlIGluY2x1ZGVkLgor CisgICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuaDoKKyAgICAgICAgQWRk IG1fcGx1Z2luUHJvY2Vzc0hhc0NyYXNoZWQuCisKKzIwMTMtMDctMTggIFRpbSBIb3J0b24gIDx0 aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKICAgICAgICAgUmVtb3ZlIFBERlZpZXdDb250cm9s bGVyIGFuZCBXS1ZpZXcgImN1c3RvbSByZXByZXNlbnRhdGlvbnMiCiAgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTg3MjAKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL21hYy9QbHVnaW5Qcm94eU1h Yy5tbSBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9tYWMvUGx1 Z2luUHJveHlNYWMubW0KaW5kZXggZDIwMzMwNS4uYjIzYTQ0YSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL21hYy9QbHVnaW5Qcm94eU1hYy5t bQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvbWFjL1Bs dWdpblByb3h5TWFjLm1tCkBAIC02OSw2ICs2OSwxMiBAQCBQbGF0Zm9ybUxheWVyKiBQbHVnaW5Q cm94eTo6cGx1Z2luTGF5ZXIoKQogICAgIHJldHVybiBtX3BsdWdpbkxheWVyLmdldCgpOwogfQog Cit2b2lkIFBsdWdpblByb3h5OjpwbHVnaW5Qcm9jZXNzQ3Jhc2hlZCgpCit7CisgICAgbV9wbHVn aW5MYXllciA9IG51bGxwdHI7CisgICAgY29udHJvbGxlcigpLT5wbHVnaW5Qcm9jZXNzQ3Jhc2hl ZCgpOworfQorCiBib29sIFBsdWdpblByb3h5OjpuZWVkc0JhY2tpbmdTdG9yZSgpIGNvbnN0CiB7 CiAgICAgcmV0dXJuICFtX3JlbW90ZUxheWVyQ2xpZW50SUQ7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJveHkuY3BwIGIvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblByb3h5LmNwcAppbmRleCBlMDc1NjQzLi5jNTQ3 MGZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2lu UHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5Q cm94eS5jcHAKQEAgLTc4LDEwICs3OCwxMiBAQCBQbHVnaW5Qcm94eTo6flBsdWdpblByb3h5KCkK IHsKIH0KIAorI2lmICFQTEFURk9STShNQUMpCiB2b2lkIFBsdWdpblByb3h5OjpwbHVnaW5Qcm9j ZXNzQ3Jhc2hlZCgpCiB7CiAgICAgY29udHJvbGxlcigpLT5wbHVnaW5Qcm9jZXNzQ3Jhc2hlZCgp OwogfQorI2VuZGlmCiAKIGJvb2wgUGx1Z2luUHJveHk6OmluaXRpYWxpemUoY29uc3QgUGFyYW1l dGVycyYgcGFyYW1ldGVycykKIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvUGx1Z2lucy9QbHVnaW5WaWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1 Z2lucy9QbHVnaW5WaWV3LmNwcAppbmRleCAwYjcxNDMzYy4uZTI4NDE3MSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmNwcApAQCAtMjc2LDYg KzI3Niw3IEBAIFBsdWdpblZpZXc6OlBsdWdpblZpZXcoUGFzc1JlZlB0cjxIVE1MUGx1Z0luRWxl bWVudD4gcGx1Z2luRWxlbWVudCwgUGFzc1JlZlB0cjxQCiAgICAgLCBtX2lzV2FpdGluZ0ZvclN5 bmNocm9ub3VzSW5pdGlhbGl6YXRpb24oZmFsc2UpCiAgICAgLCBtX2lzV2FpdGluZ1VudGlsTWVk aWFDYW5TdGFydChmYWxzZSkKICAgICAsIG1faXNCZWluZ0Rlc3Ryb3llZChmYWxzZSkKKyAgICAs IG1fcGx1Z2luUHJvY2Vzc0hhc0NyYXNoZWQoZmFsc2UpCiAgICAgLCBtX3BlbmRpbmdVUkxSZXF1 ZXN0c1RpbWVyKFJ1bkxvb3A6Om1haW4oKSwgdGhpcywgJlBsdWdpblZpZXc6OnBlbmRpbmdVUkxS ZXF1ZXN0c1RpbWVyRmlyZWQpCiAjaWYgRU5BQkxFKE5FVFNDQVBFX1BMVUdJTl9BUEkpCiAgICAg LCBtX25wUnVudGltZU9iamVjdE1hcCh0aGlzKQpAQCAtNjIwLDcgKzYyMSw3IEBAIHZvaWQgUGx1 Z2luVmlldzo6ZGlkSW5pdGlhbGl6ZVBsdWdpbigpCiBQbGF0Zm9ybUxheWVyKiBQbHVnaW5WaWV3 OjpwbGF0Zm9ybUxheWVyKCkgY29uc3QKIHsKICAgICAvLyBUaGUgcGx1Zy1pbiBjYW4gYmUgbnVs bCBoZXJlIGlmIGl0IGZhaWxlZCB0byBpbml0aWFsaXplLgotICAgIGlmICghbV9pc0luaXRpYWxp emVkIHx8ICFtX3BsdWdpbikKKyAgICBpZiAoIW1faXNJbml0aWFsaXplZCB8fCAhbV9wbHVnaW4g fHwgbV9wbHVnaW5Qcm9jZXNzSGFzQ3Jhc2hlZCkKICAgICAgICAgcmV0dXJuIDA7CiAgICAgICAg IAogICAgIHJldHVybiBtX3BsdWdpbi0+cGx1Z2luTGF5ZXIoKTsKQEAgLTEyNDksNyArMTI1MCw3 IEBAIHZvaWQgUGx1Z2luVmlldzo6aW52YWxpZGF0ZVJlY3QoY29uc3QgSW50UmVjdCYgZGlydHlS ZWN0KQogICAgIFJlbmRlckJveE1vZGVsT2JqZWN0KiByZW5kZXJlciA9IHRvUmVuZGVyQm94TW9k ZWxPYmplY3QobV9wbHVnaW5FbGVtZW50LT5yZW5kZXJlcigpKTsKICAgICBpZiAoIXJlbmRlcmVy KQogICAgICAgICByZXR1cm47Ci0gICAgCisKICAgICBJbnRSZWN0IGNvbnRlbnRSZWN0KGRpcnR5 UmVjdCk7CiAgICAgY29udGVudFJlY3QubW92ZShyZW5kZXJlci0+Ym9yZGVyTGVmdCgpICsgcmVu ZGVyZXItPnBhZGRpbmdMZWZ0KCksIHJlbmRlcmVyLT5ib3JkZXJUb3AoKSArIHJlbmRlcmVyLT5w YWRkaW5nVG9wKCkpOwogICAgIHJlbmRlcmVyLT5yZXBhaW50UmVjdGFuZ2xlKGNvbnRlbnRSZWN0 KTsKQEAgLTE0MTMsMTMgKzE0MTQsMTcgQEAgYm9vbCBQbHVnaW5WaWV3Ojppc0FjY2VsZXJhdGVk Q29tcG9zaXRpbmdFbmFibGVkKCkKIAogdm9pZCBQbHVnaW5WaWV3OjpwbHVnaW5Qcm9jZXNzQ3Jh c2hlZCgpCiB7CisgICAgbV9wbHVnaW5Qcm9jZXNzSGFzQ3Jhc2hlZCA9IHRydWU7CisKICAgICBp ZiAoIW1fcGx1Z2luRWxlbWVudC0+cmVuZGVyZXIoKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAg Ly8gRklYTUU6IFRoZSByZW5kZXJlciBjb3VsZCBhbHNvIGJlIGEgUmVuZGVyQXBwbGV0LCB3ZSBz aG91bGQgaGFuZGxlIHRoYXQuCiAgICAgaWYgKCFtX3BsdWdpbkVsZW1lbnQtPnJlbmRlcmVyKCkt PmlzRW1iZWRkZWRPYmplY3QoKSkKICAgICAgICAgcmV0dXJuOwotICAgICAgICAKKworICAgIG1f cGx1Z2luRWxlbWVudC0+c2V0TmVlZHNTdHlsZVJlY2FsYyhTeW50aGV0aWNTdHlsZUNoYW5nZSk7 CisKICAgICBSZW5kZXJFbWJlZGRlZE9iamVjdCogcmVuZGVyZXIgPSB0b1JlbmRlckVtYmVkZGVk T2JqZWN0KG1fcGx1Z2luRWxlbWVudC0+cmVuZGVyZXIoKSk7CiAgICAgcmVuZGVyZXItPnNldFBs dWdpblVuYXZhaWxhYmlsaXR5UmVhc29uKFJlbmRlckVtYmVkZGVkT2JqZWN0OjpQbHVnaW5DcmFz aGVkKTsKICAgICAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lu cy9QbHVnaW5WaWV3LmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2lu Vmlldy5oCmluZGV4IDFhYWYyZGIuLjg5ZWE4NDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmgKKysrIGIvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuaApAQCAtMjMxLDYgKzIzMSw3IEBAIHByaXZhdGU6 CiAgICAgYm9vbCBtX2lzV2FpdGluZ0ZvclN5bmNocm9ub3VzSW5pdGlhbGl6YXRpb247CiAgICAg Ym9vbCBtX2lzV2FpdGluZ1VudGlsTWVkaWFDYW5TdGFydDsKICAgICBib29sIG1faXNCZWluZ0Rl c3Ryb3llZDsKKyAgICBib29sIG1fcGx1Z2luUHJvY2Vzc0hhc0NyYXNoZWQ7CiAKICAgICAvLyBQ ZW5kaW5nIFVSTFJlcXVlc3RzIHRoYXQgdGhlIHBsdWctaW4gaGFzIG1hZGUuCiAgICAgRGVxdWU8 UmVmUHRyPFVSTFJlcXVlc3Q+PiBtX3BlbmRpbmdVUkxSZXF1ZXN0czsK