117106 2013-06-01 01:05:29 -0700 [wk2] WebProcess' page-in-window count can be wrong 2013-06-05 12:58:03 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton andersca simon.fraser webkit-bug-importer oldest_to_newest 896075 0 thorton 2013-06-01 01:05:29 -0700 Interestingly: Close-tab hits both WebPage::setIsInWindow(false) and WebPage::close(). Close-window only hits WebPage::close(). I didn't add decrement-page-in-window count to WebPage::close() :( So, opening and closing a window is an easy way to make sure we never do cleanup on non-PPT. I have a patch that turns the page-in-window thing into a hashset of pageids instead of a count so we can decrement from both setIsInWindow(false) and WebPage::close. 896076 1 webkit-bug-importer 2013-06-01 01:05:46 -0700 <rdar://problem/14040991> 896080 2 203483 thorton 2013-06-01 01:17:59 -0700 Created attachment 203483 patch 896081 3 203483 thorton 2013-06-01 01:18:55 -0700 Comment on attachment 203483 patch View in context: https://bugs.webkit.org/attachment.cgi?id=203483&action=review > Source/WebKit2/ChangeLog:9 > + If we're using a single WebProcess and a window is closed, we were Maybe I should remove the bit about single WebProcess since there are cases where this can affect multiprocess too (if we're over the process cap or are using window.open or something). 896108 4 203483 simon.fraser 2013-06-01 09:51:10 -0700 Comment on attachment 203483 patch View in context: https://bugs.webkit.org/attachment.cgi?id=203483&action=review > Source/WebKit2/WebProcess/WebProcess.h:316 > + HashSet<uint64_t> m_inWindowPageSet; inWindowPageSet sounds like something boolean. I guess this is "set of pages in any window"? 896189 5 thorton 2013-06-02 02:22:00 -0700 (In reply to comment #4) > (From update of attachment 203483 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=203483&action=review > > > Source/WebKit2/WebProcess/WebProcess.h:316 > > + HashSet<uint64_t> m_inWindowPageSet; > > inWindowPageSet sounds like something boolean. I guess this is "set of pages in any window"? It is "set of pages in this process that are parented in a window", yes. 896282 6 203483 andersca 2013-06-02 17:07:30 -0700 Comment on attachment 203483 patch View in context: https://bugs.webkit.org/attachment.cgi?id=203483&action=review >>> Source/WebKit2/WebProcess/WebProcess.h:316 >>> + HashSet<uint64_t> m_inWindowPageSet; >> >> inWindowPageSet sounds like something boolean. I guess this is "set of pages in any window"? > > It is "set of pages in this process that are parented in a window", yes. How about m_pagesInWindows or something similar. I don’t think you need to put the type in the variable name. 897521 7 thorton 2013-06-05 12:58:03 -0700 http://trac.webkit.org/changeset/151235 203483 2013-06-01 01:17:59 -0700 2013-06-02 17:08:37 -0700 patch in-window.diff text/plain 5958 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA2NGU4YTI0Li4zMTAzYmVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDIg QEAKKzIwMTMtMDYtMDEgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgW3drMl0gV2ViUHJvY2VzcycgcGFnZS1pbi13aW5kb3cgY291bnQgY2FuIGJlIHdy b25nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTcx MDYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE0MDQwOTkxPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIElmIHdlJ3JlIHVzaW5nIGEgc2luZ2xlIFdl YlByb2Nlc3MgYW5kIGEgd2luZG93IGlzIGNsb3NlZCwgd2Ugd2VyZQorICAgICAgICBub3QgZGVj cmVtZW50aW5nIHRoZSBwYWdlLWluLXdpbmRvdyBjb3VudCAoYmVjYXVzZSB3ZSBhcHBhcmVudGx5 IGRvbid0CisgICAgICAgIHNldElzSW5XaW5kb3coZmFsc2UpIGEgV2ViUGFnZSBpbiBhIGNsb3Np bmcgd2luZG93IGJlZm9yZSB0ZWFyaW5nIGl0IGRvd24pLgorCisgICAgICAgIFR1cm4gdGhlIHBh Z2UtaW4td2luZG93IGNvdW50IGludG8gYSBIYXNoU2V0IG9mIHBhZ2VJRHMgaW5zdGVhZC4KKwor ICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKFdlYktp dDo6V2ViUGFnZTo6V2ViUGFnZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnNldElzSW5X aW5kb3cpOgorICAgICAgICBTZW5kIHRoZSBwYWdlSUQgaW5zdGVhZCAodGhpcyBjaGFuZ2UgaXMg anVzdCBzbyB0aGF0IEkgZG9uJ3QgbmVlZCB0bworICAgICAgICBmZXRjaCB0aGUgV2ViUGFnZSBp biBXZWJQcm9jZXNzOjpyZW1vdmVXZWJQYWdlKS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2Vi UHJvY2Vzcy5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3M6OldlYlByb2Nlc3MpOgor ICAgICAgICBSZW1vdmUgbV9pbldpbmRvd1BhZ2VDb3VudC4KKworICAgICAgICAoV2ViS2l0OjpX ZWJQcm9jZXNzOjpyZW1vdmVXZWJQYWdlKToKKyAgICAgICAgRW5zdXJlIHRoYXQgV2ViUGFnZXMg YmVpbmcgdG9ybi1kb3duIGFyZSByZW1vdmVkIGZyb20gdGhlIGluLXdpbmRvdyBXZWJQYWdlIHNl dC4KKworICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzOjpwYWdlRGlkRW50ZXJXaW5kb3cpOgor ICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzOjpwYWdlV2lsbExlYXZlV2luZG93KToKKyAgICAg ICAgVXNlIG91ciBuZXcgSGFzaFNldCBpbnN0ZWFkIG9mIGEgY291bnQuCisKKyAgICAgICAgKFdl YktpdDo6V2ViUHJvY2Vzczo6bm9uVmlzaWJsZVByb2Nlc3NDbGVhbnVwVGltZXJGaXJlZCk6Cisg ICAgICAgIE1ha2Ugc3VyZSB0aGF0IHdlIGRvbid0IGhhdmUgYW55IHZpc2libGUgcGFnZXMgYmVm b3JlIGRvaW5nIGNsZWFudXAuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlByb2Nlc3MuaDoK KyAgICAgICAgUmVtb3ZlIG1faW5XaW5kb3dQYWdlQ291bnQuCisgICAgICAgIEFkZCBtX2luV2lu ZG93UGFnZVNldC4KKyAgICAgICAgTWFrZSBwYWdlRGlkRW50ZXJXaW5kb3cvcGFnZVdpbGxMZWF2 ZVdpbmRvdyB0YWtlIHBhZ2VJRCBpbnN0ZWFkIG9mIFdlYlBhZ2UuCisKIDIwMTMtMDUtMjkgIFRp bSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAKICAgICAgICAgRXhwb3NlIGlu Y3JlbWVudGFsUmVuZGVyaW5nU3VwcHJlc3Npb25UaW1lb3V0IHZpYSBXSzIKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAppbmRleCAxN2YxNzM0Li5lMjM3 ZjlhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFn ZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3Bw CkBAIC0zNzUsNyArMzc1LDcgQEAgV2ViUGFnZTo6V2ViUGFnZSh1aW50NjRfdCBwYWdlSUQsIGNv bnN0IFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMmIHBhcmFtZXRlcnMpCiAgICAgaWYgKCFwYXJh bWV0ZXJzLmlzSW5XaW5kb3cpCiAgICAgICAgIG1fcGFnZS0+c2V0SXNJbldpbmRvdyhmYWxzZSk7 CiAgICAgZWxzZQotICAgICAgICBXZWJQcm9jZXNzOjpzaGFyZWQoKS5wYWdlRGlkRW50ZXJXaW5k b3codGhpcyk7CisgICAgICAgIFdlYlByb2Nlc3M6OnNoYXJlZCgpLnBhZ2VEaWRFbnRlcldpbmRv dyhtX3BhZ2VJRCk7CiAKICAgICBzZXRJc0luV2luZG93KHBhcmFtZXRlcnMuaXNJbldpbmRvdyk7 CiAKQEAgLTIxMDQsNyArMjEwNCw3IEBAIHZvaWQgV2ViUGFnZTo6c2V0SXNJbldpbmRvdyhib29s IGlzSW5XaW5kb3cpCiAgICAgICAgIG1fcGFnZS0+d2lsbE1vdmVPZmZzY3JlZW4oKTsKICAgICAg ICAgCiAgICAgICAgIGlmIChwYWdlV2FzSW5XaW5kb3cpCi0gICAgICAgICAgICBXZWJQcm9jZXNz OjpzaGFyZWQoKS5wYWdlV2lsbExlYXZlV2luZG93KHRoaXMpOworICAgICAgICAgICAgV2ViUHJv Y2Vzczo6c2hhcmVkKCkucGFnZVdpbGxMZWF2ZVdpbmRvdyhtX3BhZ2VJRCk7CiAgICAgfSBlbHNl IHsKICAgICAgICAgLy8gRGVmZXIgdGhlIGNhbGwgdG8gUGFnZTo6c2V0Q2FuU3RhcnRNZWRpYSgp IHNpbmNlIGl0IGVuZHMgdXAgc2VuZGluZyBhIHN5bmNocm9ub3VzIG1lc3NhZ2UgdG8gdGhlIFVJ IHByb2Nlc3MKICAgICAgICAgLy8gaW4gb3JkZXIgdG8gZ2V0IHBsdWctaW4gY29ubmVjdGlvbnMs IGFuZCB0aGUgVUkgcHJvY2VzcyB3aWxsIGJlIHdhaXRpbmcgZm9yIHRoZSBXZWIgcHJvY2VzcyB0 byB1cGRhdGUgdGhlIGJhY2tpbmcKQEAgLTIxMTUsNyArMjExNSw3IEBAIHZvaWQgV2ViUGFnZTo6 c2V0SXNJbldpbmRvdyhib29sIGlzSW5XaW5kb3cpCiAgICAgICAgIG1fcGFnZS0+ZGlkTW92ZU9u c2NyZWVuKCk7CiAgICAgICAgIAogICAgICAgICBpZiAoIXBhZ2VXYXNJbldpbmRvdykKLSAgICAg ICAgICAgIFdlYlByb2Nlc3M6OnNoYXJlZCgpLnBhZ2VEaWRFbnRlcldpbmRvdyh0aGlzKTsKKyAg ICAgICAgICAgIFdlYlByb2Nlc3M6OnNoYXJlZCgpLnBhZ2VEaWRFbnRlcldpbmRvdyhtX3BhZ2VJ RCk7CiAgICAgfQogCiAgICAgbV9wYWdlLT5zZXRJc0luV2luZG93KGlzSW5XaW5kb3cpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcCBiL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAKaW5kZXggNWFjOTk1NS4uZWI0ZDVl YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuY3BwCkBAIC0xNzYsNyAr MTc2LDYgQEAgV2ViUHJvY2Vzczo6V2ViUHJvY2VzcygpCiAjaWYgRU5BQkxFKFBMVUdJTl9QUk9D RVNTKQogICAgICwgbV9wbHVnaW5Qcm9jZXNzQ29ubmVjdGlvbk1hbmFnZXIoUGx1Z2luUHJvY2Vz c0Nvbm5lY3Rpb25NYW5hZ2VyOjpjcmVhdGUoKSkKICNlbmRpZgotICAgICwgbV9pbldpbmRvd1Bh Z2VDb3VudCgwKQogICAgICwgbV9ub25WaXNpYmxlUHJvY2Vzc0NsZWFudXBUaW1lcih0aGlzLCAm V2ViUHJvY2Vzczo6bm9uVmlzaWJsZVByb2Nlc3NDbGVhbnVwVGltZXJGaXJlZCkKIHsKICAgICAv LyBJbml0aWFsaXplIG91ciBwbGF0Zm9ybSBzdHJhdGVnaWVzLgpAQCAtNTg4LDYgKzU4Nyw3IEBA IHZvaWQgV2ViUHJvY2Vzczo6cmVtb3ZlV2ViUGFnZSh1aW50NjRfdCBwYWdlSUQpCiB7CiAgICAg QVNTRVJUKG1fcGFnZU1hcC5jb250YWlucyhwYWdlSUQpKTsKIAorICAgIHBhZ2VXaWxsTGVhdmVX aW5kb3cocGFnZUlEKTsKICAgICBtX3BhZ2VNYXAucmVtb3ZlKHBhZ2VJRCk7CiAKICAgICBlbmFi bGVUZXJtaW5hdGlvbigpOwpAQCAtMTE2MSwyNyArMTE2MSwyNiBAQCB2b2lkIFdlYlByb2Nlc3M6 OnVwZGF0ZUFjdGl2ZVBhZ2VzKCkKIAogI2VuZGlmCiAgICAgCi12b2lkIFdlYlByb2Nlc3M6OnBh Z2VEaWRFbnRlcldpbmRvdyhXZWJQYWdlKikKK3ZvaWQgV2ViUHJvY2Vzczo6cGFnZURpZEVudGVy V2luZG93KHVpbnQ2NF90IHBhZ2VJRCkKIHsKLSAgICBtX2luV2luZG93UGFnZUNvdW50Kys7Cisg ICAgbV9pbldpbmRvd1BhZ2VTZXQuYWRkKHBhZ2VJRCk7CiAgICAgbV9ub25WaXNpYmxlUHJvY2Vz c0NsZWFudXBUaW1lci5zdG9wKCk7CiB9CiAKLXZvaWQgV2ViUHJvY2Vzczo6cGFnZVdpbGxMZWF2 ZVdpbmRvdyhXZWJQYWdlKikKK3ZvaWQgV2ViUHJvY2Vzczo6cGFnZVdpbGxMZWF2ZVdpbmRvdyh1 aW50NjRfdCBwYWdlSUQpCiB7Ci0gICAgQVNTRVJUKG1faW5XaW5kb3dQYWdlQ291bnQgPiAwKTsK LSAgICBpZiAobV9pbldpbmRvd1BhZ2VDb3VudCA8PSAwKQotICAgICAgICByZXR1cm47Ci0KLSAg ICBtX2luV2luZG93UGFnZUNvdW50LS07CisgICAgbV9pbldpbmRvd1BhZ2VTZXQucmVtb3ZlKHBh Z2VJRCk7CiAKLSAgICBpZiAoIW1faW5XaW5kb3dQYWdlQ291bnQpCisgICAgaWYgKG1faW5XaW5k b3dQYWdlU2V0LmlzRW1wdHkoKSAmJiAhbV9ub25WaXNpYmxlUHJvY2Vzc0NsZWFudXBUaW1lci5p c0FjdGl2ZSgpKQogICAgICAgICBtX25vblZpc2libGVQcm9jZXNzQ2xlYW51cFRpbWVyLnN0YXJ0 T25lU2hvdChub25WaXNpYmxlUHJvY2Vzc0NsZWFudXBEZWxheSk7CiB9CiAgICAgCiB2b2lkIFdl YlByb2Nlc3M6Om5vblZpc2libGVQcm9jZXNzQ2xlYW51cFRpbWVyRmlyZWQoVGltZXI8V2ViUHJv Y2Vzcz4qKQogewotICAgIEFTU0VSVCghbV9pbldpbmRvd1BhZ2VDb3VudCk7CisgICAgQVNTRVJU KG1faW5XaW5kb3dQYWdlU2V0LmlzRW1wdHkoKSk7CisgICAgaWYgKCFtX2luV2luZG93UGFnZVNl dC5pc0VtcHR5KCkpCisgICAgICAgIHJldHVybjsKKwogI2lmIFBMQVRGT1JNKE1BQykKICAgICB3 a0Rlc3Ryb3lSZW5kZXJpbmdSZXNvdXJjZXMoKTsKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYlByb2Nlc3MuaAppbmRleCBhNGNlYjhkLi41ZTlkZjdjIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlByb2Nlc3MuaApAQCAtMTYzLDggKzE2Myw4IEBAIHB1YmxpYzoKICAgICB2 b2lkIGVuc3VyZVByaXZhdGVCcm93c2luZ1Nlc3Npb24oKTsKICAgICB2b2lkIGRlc3Ryb3lQcml2 YXRlQnJvd3NpbmdTZXNzaW9uKCk7CiAgICAgCi0gICAgdm9pZCBwYWdlRGlkRW50ZXJXaW5kb3co V2ViUGFnZSopOwotICAgIHZvaWQgcGFnZVdpbGxMZWF2ZVdpbmRvdyhXZWJQYWdlKik7CisgICAg dm9pZCBwYWdlRGlkRW50ZXJXaW5kb3codWludDY0X3QgcGFnZUlEKTsKKyAgICB2b2lkIHBhZ2VX aWxsTGVhdmVXaW5kb3codWludDY0X3QgcGFnZUlEKTsKIAogICAgIHZvaWQgbm9uVmlzaWJsZVBy b2Nlc3NDbGVhbnVwVGltZXJGaXJlZChXZWJDb3JlOjpUaW1lcjxXZWJQcm9jZXNzPiopOwogCkBA IC0zMTMsNyArMzEzLDcgQEAgcHJpdmF0ZToKICAgICBSZWZQdHI8UGx1Z2luUHJvY2Vzc0Nvbm5l Y3Rpb25NYW5hZ2VyPiBtX3BsdWdpblByb2Nlc3NDb25uZWN0aW9uTWFuYWdlcjsKICNlbmRpZgog Ci0gICAgaW50IG1faW5XaW5kb3dQYWdlQ291bnQ7CisgICAgSGFzaFNldDx1aW50NjRfdD4gbV9p bldpbmRvd1BhZ2VTZXQ7CiAgICAgV2ViQ29yZTo6VGltZXI8V2ViUHJvY2Vzcz4gbV9ub25WaXNp YmxlUHJvY2Vzc0NsZWFudXBUaW1lcjsKIH07CiAK