61311 2011-05-23 14:50:51 -0700 REGRESSION (86992): World leak when all windows closed 2011-05-23 18:02:46 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P1 Normal --- 1 jer.noble jer.noble darin oldest_to_newest 408332 0 jer.noble 2011-05-23 14:50:51 -0700 REGRESSION (r86990:86992): World leak when all windows closed 408340 1 94495 jer.noble 2011-05-23 14:57:04 -0700 Created attachment 94495 Patch 408342 2 jer.noble 2011-05-23 14:57:24 -0700 <rdar://problem/9486740> 408343 3 jer.noble 2011-05-23 14:57:42 -0700 Caused by http://trac.webkit.org/changeset/86992. 408353 4 94495 darin 2011-05-23 15:03:08 -0700 Comment on attachment 94495 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=94495&action=review > Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm:-141 > - [webView retain]; > - [_webView release]; Are you sure this is necessary? The way this cycle is broken is by calling setWebView:0. Can we leave out this change please? Does the world leak go away if you leave this in? 408366 5 94495 jer.noble 2011-05-23 15:12:23 -0700 Comment on attachment 94495 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=94495&action=review >> Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm:-141 >> - [_webView release]; > > Are you sure this is necessary? The way this cycle is broken is by calling setWebView:0. Can we leave out this change please? Does the world leak go away if you leave this in? I think either this, or the "_data->_fullScreenWindowController = nullptr;" change in [WKView closeFullScreenWindowController] would be sufficient to fix this leak. However, the retain-cycle would still be there, and there may still be an unfound leak because of it. For safety's sake, we could add a call in [WKView dealloc] which explicitly called [_data->_fullScreenWindowController.get() setWebVIew:nil], and that would be enough to ensure that WKFullScreenWindowController was never pointing to a deleted object. 408416 6 94508 jer.noble 2011-05-23 15:52:30 -0700 Created attachment 94508 Patch 408472 7 darin 2011-05-23 16:53:29 -0700 (In reply to comment #5) > For safety's sake, we could add a call in [WKView dealloc] which explicitly called [_data->_fullScreenWindowController.get() setWebVIew:nil], and that would be enough to ensure that WKFullScreenWindowController was never pointing to a deleted object. Except under GC. 408473 8 94508 darin 2011-05-23 16:54:34 -0700 Comment on attachment 94508 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=94508&action=review > Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm:-141 > - [webView retain]; > - [_webView release]; I still don’t think it was best to remove these. A retain cycle is not intrinsically incorrect, as long as something breaks the cycle. 408478 9 94508 jer.noble 2011-05-23 16:58:02 -0700 Comment on attachment 94508 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=94508&action=review >> Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm:-141 >> - [_webView release]; > > I still don’t think it was best to remove these. A retain cycle is not intrinsically incorrect, as long as something breaks the cycle. Okay, I'll upload a new patch that puts these back in. 408480 10 jer.noble 2011-05-23 16:58:28 -0700 (In reply to comment #9) > (From update of attachment 94508 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=94508&action=review > > >> Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm:-141 > >> - [_webView release]; > > > > I still don’t think it was best to remove these. A retain cycle is not intrinsically incorrect, as long as something breaks the cycle. > > Okay, I'll upload a new patch that puts these back in. Oh! r+! In that case, I'll check-in a patch that puts these back in. Thanks! 408523 11 jer.noble 2011-05-23 18:02:46 -0700 Committed r87113: <http://trac.webkit.org/changeset/87113> 94495 2011-05-23 14:57:04 -0700 2011-05-23 15:52:27 -0700 Patch bug-61311-20110523145703.patch text/plain 4435 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogODcwNjUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCAwOTUwZTNiMzIxMjMwMDhj NmNiNjc2Mzg0MTVkYjQwMWU1ZmZjYzY4Li43YTAwNTZhMjA3YzQ5NGRjOGI1NWZiODcyODdkODM4 NmI4OWExZjBlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEgQEAKKzIwMTEtMDUtMjMgIEplcmVt eSBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgUkVHUkVTU0lPTiAocjg2OTkwOjg2OTkyKTogV29ybGQg bGVhayB3aGVuIGFsbCB3aW5kb3dzIGNsb3NlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjEzMTEKKworICAgICAgICBUaHJlZSBpbnRlcmxvY2tpbmcg cHJvYmxlbXM6CisgICAgICAgIAorICAgICAgICAxKSBDYWxsaW5nIFtXS1ZpZXcgZnVsbFNjcmVl bkNvbnRyb2xsZXJdIHdpbGwgY3JlYXRlIHRoZSBjb250cm9sbGVyIGlmIGl0IGRvZXNuJ3QgYWxs IHJlYWR5CisgICAgICAgIGV4aXN0LCBzbyBtb3ZlIHRoZSBjbG9zaW5nIGNvZGUgaW50byBXS1Zp ZXcsIHdoZXJlIHdlIGNhbiBiYWlsIGVhcmx5IGlmIHRoZXJlIGlzbid0IGEgCisgICAgICAgIGNv bnRyb2xsZXIuCisgICAgICAgIAorICAgICAgICAyKSBBIHJldGFpbi1jeWNsZSBleGlzdHMgYmV0 d2VlbiBXS1ZpZXcgYW5kIFdLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIuICBTaW5jZSBXS1Zp ZXcgaXMgCisgICAgICAgIHJlc3BvbnNpYmxlIGZvciBjcmVhdGluZyBhbmQgZGVzdHJveWluZyB0 aGUgY29udHJvbGxlciwgYnJlYWsgdGhlIHJldGFpbi1jeWNsZSBieSBub3QKKyAgICAgICAgcmV0 YWluaW5nIHRoZSBXS1ZpZXcgcGFzc2VkIGludG8gdGhlIGNvbnRyb2xsZXIuCisgICAgICAgIAor ICAgICAgICAzKSBbTlNXaW5kb3dDb250cm9sbGVyIGNsb3NlXSB3YXMgb3ZlcnJpZGRlbiB3aXRo b3V0IGNhbGxpbmcgW3N1cGVyIGNsb3NlXS4gIERvIHRoYXQuCisKKyAgICAgICAgKiBVSVByb2Nl c3MvQVBJL21hYy9XS1ZpZXcubW06CisgICAgICAgICgtW1dLVmlldyBjbG9zZUZ1bGxTY3JlZW5X aW5kb3dDb250cm9sbGVyXSk6IE1vdmVkIGhlcmUgZnJvbSBXZWJGdWxsU2NyZWVuTWFuYWdlclBy b3h5TWFjLm1tLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvbWFjL1dLVmlld0ludGVybmFsLmg6 CisgICAgICAgICogVUlQcm9jZXNzL21hYy9XS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyLm1t OgorICAgICAgICAoLVtXS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyIHNldFdlYlZpZXc6XSk6 IERvIG5vdCByZXRhaW4gdGhlIHBhc3NlZCBXS1ZpZXcuCisgICAgICAgICgtW1dLRnVsbFNjcmVl bldpbmRvd0NvbnRyb2xsZXIgY2xvc2VdKTogQ2FsbCBbc3VwZXIgY2xvc2VdLgorICAgICAgICAq IFVJUHJvY2Vzcy9tYWMvV2ViRnVsbFNjcmVlbk1hbmFnZXJQcm94eU1hYy5tbToKKyAgICAgICAg KFdlYktpdDo6V2ViRnVsbFNjcmVlbk1hbmFnZXJQcm94eTo6aW52YWxpZGF0ZSk6CisKIDIwMTEt MDUtMjAgIEplcmVteSBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21h Yy9XS1ZpZXcubW0KaW5kZXggNTE2YzBlZTAxZDI2NTMwMzA5YTkyMzk0MmEwOTZiNjVhOTU1YTM4 My4uODkwNDcyMzQxODk1NDNlYzAwNTE1MDk2ZTA5MjNmZjk2MGM1YzcwMyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQpAQCAtMjQyMyw2ICsyNDIzLDE0IEBA IHN0YXRpYyB2b2lkIGRyYXdQYWdlQmFja2dyb3VuZChDR0NvbnRleHRSZWYgY29udGV4dCwgV2Vi UGFnZVByb3h5KiBwYWdlLCBjb25zdCBJCiAgICAgfQogICAgIHJldHVybiBfZGF0YS0+X2Z1bGxT Y3JlZW5XaW5kb3dDb250cm9sbGVyLmdldCgpOwogfQorCistICh2b2lkKWNsb3NlRnVsbFNjcmVl bldpbmRvd0NvbnRyb2xsZXIKK3sKKyAgICBpZiAoIV9kYXRhLT5fZnVsbFNjcmVlbldpbmRvd0Nv bnRyb2xsZXIpCisgICAgICAgIHJldHVybjsKKyAgICBbX2RhdGEtPl9mdWxsU2NyZWVuV2luZG93 Q29udHJvbGxlci5nZXQoKSBjbG9zZV07CisgICAgX2RhdGEtPl9mdWxsU2NyZWVuV2luZG93Q29u dHJvbGxlciA9IG51bGxwdHI7Cit9CiAjZW5kaWYKIAogLSAoYm9vbClfZXhlY3V0ZVNhdmVkQ29t bWFuZEJ5U2VsZWN0b3I6KFNFTClzZWxlY3RvcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3SW50ZXJuYWwuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvbWFjL1dLVmlld0ludGVybmFsLmgKaW5kZXggN2RlN2IxMTI2NGM1NDQ0NTg5ZGFm NTc2ZjFkMjgwYTY0NTQ2OWNkZC4uZGM5MjA0Y2RmNDc4ZTVhYmQ2NjQxNTZiOTE2ZGFlM2YzMTdl N2Q4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3 SW50ZXJuYWwuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXdJ bnRlcm5hbC5oCkBAIC04NCw2ICs4NCw3IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogCiAjaWYgRU5B QkxFKEZVTExTQ1JFRU5fQVBJKQogLSAoV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxlciopZnVs bFNjcmVlbldpbmRvd0NvbnRyb2xsZXI7CistICh2b2lkKWNsb3NlRnVsbFNjcmVlbldpbmRvd0Nv bnRyb2xsZXI7CiAjZW5kaWYKIAogLSAodm9pZClfY2FjaGVXaW5kb3dCb3R0b21Db3JuZXJSZWN0 OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XS0Z1bGxTY3JlZW5X aW5kb3dDb250cm9sbGVyLm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XS0Z1bGxT Y3JlZW5XaW5kb3dDb250cm9sbGVyLm1tCmluZGV4IGM1MTJiN2FjYzZkYTYyNzNhODdkMTFkZmMw MTNkODgxMTU5MTA1YzAuLjk1MTRlNzAxOGY2YmEzZjAxOWVlYzJkMzRhZTU4YWQzZjFmOWU5ZjAg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV0tGdWxsU2NyZWVuV2lu ZG93Q29udHJvbGxlci5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dLRnVs bFNjcmVlbldpbmRvd0NvbnRyb2xsZXIubW0KQEAgLTEzNyw4ICsxMzcsNiBAQCBzdGF0aWMgdm9p ZCBleGl0Q29tcG9zaXRlZE1vZGVSZXBhaW50Q29tcGxldGVkKFdLRXJyb3JSZWYsIHZvaWQqIGNv bnRleHQpOwogCiAtICh2b2lkKXNldFdlYlZpZXc6KFdLVmlldyAqKXdlYlZpZXcKIHsKLSAgICBb d2ViVmlldyByZXRhaW5dOwotICAgIFtfd2ViVmlldyByZWxlYXNlXTsKICAgICBfd2ViVmlldyA9 IHdlYlZpZXc7CiB9CiAKQEAgLTQzNSw2ICs0MzMsOCBAQCBzdGF0aWMgdm9pZCBleGl0Q29tcG9z aXRlZE1vZGVSZXBhaW50Q29tcGxldGVkKFdLRXJyb3JSZWYsIHZvaWQqIGNvbnRleHQpCiAgICAg CiAgICAgaWYgKF9pc0V4aXRpbmdGdWxsU2NyZWVuKQogICAgICAgICBbc2VsZiBmaW5pc2hlZEV4 aXRGdWxsU2NyZWVuQW5pbWF0aW9uOllFU107CisKKyAgICBbc3VwZXIgY2xvc2VdOwogfQogCiAj cHJhZ21hIG1hcmsgLQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9X ZWJGdWxsU2NyZWVuTWFuYWdlclByb3h5TWFjLm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L21hYy9XZWJGdWxsU2NyZWVuTWFuYWdlclByb3h5TWFjLm1tCmluZGV4IGQ3ZDg0ZDhiOGQ5Y2I4 MjhmZTYzNGJhN2Q1M2JmMDRmNDI0MDEwMjUuLjIwZTkyYzA1NGI3NDNhZDFkOTUzNDAyMGNmZDdj MGFlZmVmOGQwZDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2Vi RnVsbFNjcmVlbk1hbmFnZXJQcm94eU1hYy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvbWFjL1dlYkZ1bGxTY3JlZW5NYW5hZ2VyUHJveHlNYWMubW0KQEAgLTQwLDcgKzQwLDcgQEAg dm9pZCBXZWJGdWxsU2NyZWVuTWFuYWdlclByb3h5OjppbnZhbGlkYXRlKCkKICAgICBpZiAoIW1f d2ViVmlldykKICAgICAgICAgcmV0dXJuOwogICAgIAotICAgIFtbbV93ZWJWaWV3IGZ1bGxTY3Jl ZW5XaW5kb3dDb250cm9sbGVyXSBjbG9zZV07CisgICAgW21fd2ViVmlldyBjbG9zZUZ1bGxTY3Jl ZW5XaW5kb3dDb250cm9sbGVyXTsKICAgICBtX3dlYlZpZXcgPSAwOwogfQogCg== 94508 2011-05-23 15:52:30 -0700 2011-05-23 16:58:02 -0700 Patch bug-61311-20110523155229.patch text/plain 4991 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogODcxMDIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCAwMmQwMjVlZWIyNmJmNzdl MWJjOGYyNzQ5YmJmMGI3OWZjNzI4NzI2Li43NDViODg0MTk0ZTcyYjc0MzU0MmU0ZTI4NmVkY2Rl MWFjMDllMzBjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMgQEAKKzIwMTEtMDUtMjMgIEplcmVt eSBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgUkVHUkVTU0lPTiAocjg2OTkwOjg2OTkyKTogV29ybGQg bGVhayB3aGVuIGFsbCB3aW5kb3dzIGNsb3NlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjEzMTEKKworICAgICAgICBUaHJlZSBpbnRlcmxvY2tpbmcg cHJvYmxlbXM6CisgICAgICAgIAorICAgICAgICAxKSBDYWxsaW5nIFtXS1ZpZXcgZnVsbFNjcmVl bkNvbnRyb2xsZXJdIHdpbGwgY3JlYXRlIHRoZSBjb250cm9sbGVyIGlmIGl0IGRvZXNuJ3QgYWxs IHJlYWR5CisgICAgICAgIGV4aXN0LCBzbyBtb3ZlIHRoZSBjbG9zaW5nIGNvZGUgaW50byBXS1Zp ZXcsIHdoZXJlIHdlIGNhbiBiYWlsIGVhcmx5IGlmIHRoZXJlIGlzbid0IGEgCisgICAgICAgIGNv bnRyb2xsZXIuCisgICAgICAgIAorICAgICAgICAyKSBBIHJldGFpbi1jeWNsZSBleGlzdHMgYmV0 d2VlbiBXS1ZpZXcgYW5kIFdLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIuICBTaW5jZSBXS1Zp ZXcgaXMgCisgICAgICAgIHJlc3BvbnNpYmxlIGZvciBjcmVhdGluZyBhbmQgZGVzdHJveWluZyB0 aGUgY29udHJvbGxlciwgYnJlYWsgdGhlIHJldGFpbi1jeWNsZSBieSBub3QKKyAgICAgICAgcmV0 YWluaW5nIHRoZSBXS1ZpZXcgcGFzc2VkIGludG8gdGhlIGNvbnRyb2xsZXIuICBNYWtlIHN1cmUg dGhlIFdLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIKKyAgICAgICAgbmV2ZXIgaG9sZHMgYSBw b2ludGVyIHRvIGEgZGVsZXRlZCBvYmplY3QgYnkgZXhwbGljaXRseSBjbGVhcmluZyBpdCdzIHdl YlZpZXcgaW4gW1dLVmlldyBkZWFsbG9jXS4KKyAgICAgICAgCisgICAgICAgIDMpIFtOU1dpbmRv d0NvbnRyb2xsZXIgY2xvc2VdIHdhcyBvdmVycmlkZGVuIHdpdGhvdXQgY2FsbGluZyBbc3VwZXIg Y2xvc2VdLiAgRG8gdGhhdC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5t bToKKyAgICAgICAgKC1bV0tWaWV3IGRlYWxsb2NdKTogQ2xlYXIgdGhlIFdLRnVsbFNjcmVlbldp bmRvd0NvbnRyb2xsZXIncyBfd2ViVmlldyBwb2ludGVyLgorICAgICAgICAoLVtXS1ZpZXcgY2xv c2VGdWxsU2NyZWVuV2luZG93Q29udHJvbGxlcl0pOiBNb3ZlZCBoZXJlIGZyb20gV2ViRnVsbFNj cmVlbk1hbmFnZXJQcm94eU1hYy5tbS4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL21hYy9XS1Zp ZXdJbnRlcm5hbC5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9tYWMvV0tGdWxsU2NyZWVuV2luZG93 Q29udHJvbGxlci5tbToKKyAgICAgICAgKC1bV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxlciBz ZXRXZWJWaWV3Ol0pOiBEbyBub3QgcmV0YWluIHRoZSBwYXNzZWQgV0tWaWV3LgorICAgICAgICAo LVtXS0Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyIGNsb3NlXSk6IENhbGwgW3N1cGVyIGNsb3Nl XS4KKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1dlYkZ1bGxTY3JlZW5NYW5hZ2VyUHJveHlNYWMu bW06CisgICAgICAgIChXZWJLaXQ6OldlYkZ1bGxTY3JlZW5NYW5hZ2VyUHJveHk6OmludmFsaWRh dGUpOgorCiAyMDExLTA1LTIwICBKZXJlbXkgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgog CiAgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCmluZGV4IDUxNmMwZWUwMWQyNjUzMDMwOWE5MjM5NDJh MDk2YjY1YTk1NWEzODMuLjdiZWM4YmQ2ZDcyMWMxMTg2YjYyYWQyMjY5NDA4NmZhZTc4ODI4MDMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0KQEAgLTI1MSw2 ICsyNTEsMTEgQEAgc3RydWN0IFdLVmlld0ludGVycHJldEtleUV2ZW50c1BhcmFtZXRlcnMgewog ewogICAgIF9kYXRhLT5fcGFnZS0+Y2xvc2UoKTsKIAorI2lmIEVOQUJMRShGVUxMU0NSRUVOX0FQ SSkKKyAgICBpZiAoX2RhdGEtPl9mdWxsU2NyZWVuV2luZG93Q29udHJvbGxlcikKKyAgICAgICAg W19kYXRhLT5fZnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIuZ2V0KCkgc2V0V2ViVmlldzpuaWxd OworI2VuZGlmCisKICAgICBBU1NFUlQoIV9kYXRhLT5faW5TZWN1cmVJbnB1dFN0YXRlKTsKIAog ICAgIFtfZGF0YSByZWxlYXNlXTsKQEAgLTI0MjMsNiArMjQyOCwxNCBAQCBzdGF0aWMgdm9pZCBk cmF3UGFnZUJhY2tncm91bmQoQ0dDb250ZXh0UmVmIGNvbnRleHQsIFdlYlBhZ2VQcm94eSogcGFn ZSwgY29uc3QgSQogICAgIH0KICAgICByZXR1cm4gX2RhdGEtPl9mdWxsU2NyZWVuV2luZG93Q29u dHJvbGxlci5nZXQoKTsKIH0KKworLSAodm9pZCljbG9zZUZ1bGxTY3JlZW5XaW5kb3dDb250cm9s bGVyCit7CisgICAgaWYgKCFfZGF0YS0+X2Z1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyKQorICAg ICAgICByZXR1cm47CisgICAgW19kYXRhLT5fZnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIuZ2V0 KCkgY2xvc2VdOworICAgIF9kYXRhLT5fZnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIgPSBudWxs cHRyOworfQogI2VuZGlmCiAKIC0gKGJvb2wpX2V4ZWN1dGVTYXZlZENvbW1hbmRCeVNlbGVjdG9y OihTRUwpc2VsZWN0b3IKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv bWFjL1dLVmlld0ludGVybmFsLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9X S1ZpZXdJbnRlcm5hbC5oCmluZGV4IDdkZTdiMTEyNjRjNTQ0NDU4OWRhZjU3NmYxZDI4MGE2NDU0 NjljZGQuLmRjOTIwNGNkZjQ3OGU1YWJkNjY0MTU2YjkxNmRhZTNmMzE3ZTdkODcgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlld0ludGVybmFsLmgKKysr IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3SW50ZXJuYWwuaApAQCAt ODQsNiArODQsNyBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKIAogI2lmIEVOQUJMRShGVUxMU0NSRUVO X0FQSSkKIC0gKFdLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIqKWZ1bGxTY3JlZW5XaW5kb3dD b250cm9sbGVyOworLSAodm9pZCljbG9zZUZ1bGxTY3JlZW5XaW5kb3dDb250cm9sbGVyOwogI2Vu ZGlmCiAKIC0gKHZvaWQpX2NhY2hlV2luZG93Qm90dG9tQ29ybmVyUmVjdDsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV0tGdWxsU2NyZWVuV2luZG93Q29udHJvbGxl ci5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV0tGdWxsU2NyZWVuV2luZG93Q29u dHJvbGxlci5tbQppbmRleCBjNTEyYjdhY2M2ZGE2MjczYTg3ZDExZGZjMDEzZDg4MTE1OTEwNWMw Li45NTE0ZTcwMThmNmJhM2YwMTllZWMyZDM0YWU1OGFkM2YxZjllOWYwIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIu bW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XS0Z1bGxTY3JlZW5XaW5kb3dD b250cm9sbGVyLm1tCkBAIC0xMzcsOCArMTM3LDYgQEAgc3RhdGljIHZvaWQgZXhpdENvbXBvc2l0 ZWRNb2RlUmVwYWludENvbXBsZXRlZChXS0Vycm9yUmVmLCB2b2lkKiBjb250ZXh0KTsKIAogLSAo dm9pZClzZXRXZWJWaWV3OihXS1ZpZXcgKil3ZWJWaWV3CiB7Ci0gICAgW3dlYlZpZXcgcmV0YWlu XTsKLSAgICBbX3dlYlZpZXcgcmVsZWFzZV07CiAgICAgX3dlYlZpZXcgPSB3ZWJWaWV3OwogfQog CkBAIC00MzUsNiArNDMzLDggQEAgc3RhdGljIHZvaWQgZXhpdENvbXBvc2l0ZWRNb2RlUmVwYWlu dENvbXBsZXRlZChXS0Vycm9yUmVmLCB2b2lkKiBjb250ZXh0KQogICAgIAogICAgIGlmIChfaXNF eGl0aW5nRnVsbFNjcmVlbikKICAgICAgICAgW3NlbGYgZmluaXNoZWRFeGl0RnVsbFNjcmVlbkFu aW1hdGlvbjpZRVNdOworCisgICAgW3N1cGVyIGNsb3NlXTsKIH0KIAogI3ByYWdtYSBtYXJrIC0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2ViRnVsbFNjcmVlbk1h bmFnZXJQcm94eU1hYy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2ViRnVsbFNj cmVlbk1hbmFnZXJQcm94eU1hYy5tbQppbmRleCBkN2Q4NGQ4YjhkOWNiODI4ZmU2MzRiYTdkNTNi ZjA0ZjQyNDAxMDI1Li4yMGU5MmMwNTRiNzQzYWQxZDk1MzQwMjBjZmQ3YzBhZWZlZjhkMGQ5IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYkZ1bGxTY3JlZW5NYW5h Z2VyUHJveHlNYWMubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJGdWxs U2NyZWVuTWFuYWdlclByb3h5TWFjLm1tCkBAIC00MCw3ICs0MCw3IEBAIHZvaWQgV2ViRnVsbFNj cmVlbk1hbmFnZXJQcm94eTo6aW52YWxpZGF0ZSgpCiAgICAgaWYgKCFtX3dlYlZpZXcpCiAgICAg ICAgIHJldHVybjsKICAgICAKLSAgICBbW21fd2ViVmlldyBmdWxsU2NyZWVuV2luZG93Q29udHJv bGxlcl0gY2xvc2VdOworICAgIFttX3dlYlZpZXcgY2xvc2VGdWxsU2NyZWVuV2luZG93Q29udHJv bGxlcl07CiAgICAgbV93ZWJWaWV3ID0gMDsKIH0KIAo=