118375 2013-07-03 18:05:23 -0700 Remove PageThrottler::m_activeThrottleBlockers 2013-07-04 11:00:54 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 barraclough barraclough oldest_to_newest 906016 0 barraclough 2013-07-03 18:05:23 -0700 This is simply m_activityTokens.size(). Also, fold preventThrottling into addActivityToken & allowThrottling into removeActivityToken (these should no longer be called directly, and should not be public). 906017 1 206040 barraclough 2013-07-03 18:11:59 -0700 Created attachment 206040 Fix 906218 2 barraclough 2013-07-04 11:00:54 -0700 Committed revision 152402. 206040 2013-07-03 18:11:59 -0700 2013-07-03 18:21:56 -0700 Fix 118375.patch text/plain 5296 barraclough SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MjM4NikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBACisyMDEzLTA3LTAzICBHYXZpbiBC YXJyYWNsb3VnaCAgPGJhcnJhY2xvdWdoQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgUGFn ZVRocm90dGxlcjo6bV9hY3RpdmVUaHJvdHRsZUJsb2NrZXJzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTgzNzUKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGlzIHNpbXBseSBtX2FjdGl2aXR5VG9r ZW5zLnNpemUoKS4KKworICAgICAgICBBbHNvLCBmb2xkIHByZXZlbnRUaHJvdHRsaW5nIGludG8g YWRkQWN0aXZpdHlUb2tlbiAmIGFsbG93VGhyb3R0bGluZyBpbnRvIHJlbW92ZUFjdGl2aXR5VG9r ZW4KKyAgICAgICAgKHRoZXNlIHNob3VsZCBubyBsb25nZXIgYmUgY2FsbGVkIGRpcmVjdGx5LCBh bmQgc2hvdWxkIG5vdCBiZSBwdWJsaWMpLgorCisgICAgICAgICogcGFnZS9QYWdlVGhyb3R0bGVy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2VUaHJvdHRsZXI6OlBhZ2VUaHJvdHRsZXIpOgor ICAgICAgICAgICAgLSByZW1vdmVkIG1fYWN0aXZlVGhyb3R0bGVCbG9ja2VycworICAgICAgICAo V2ViQ29yZTo6UGFnZVRocm90dGxlcjo6c3RhcnRUaHJvdHRsZUh5c3RlcmVzaXNUaW1lcik6Cisg ICAgICAgICAgICAtIG1fYWN0aXZlVGhyb3R0bGVCbG9ja2VycyAtPiBtX2FjdGl2aXR5VG9rZW5z LnNpemUoKQorICAgICAgICAoV2ViQ29yZTo6UGFnZVRocm90dGxlcjo6dGhyb3R0bGVIeXN0ZXJl c2lzVGltZXJGaXJlZCk6CisgICAgICAgICAgICAtIG1fYWN0aXZlVGhyb3R0bGVCbG9ja2VycyAt PiBtX2FjdGl2aXR5VG9rZW5zLnNpemUoKQorICAgICAgICAoV2ViQ29yZTo6UGFnZVRocm90dGxl cjo6YWRkQWN0aXZpdHlUb2tlbik6CisgICAgICAgICAgICAtIGFkZGVkIGZ1bmN0aW9uYWxpdHkg ZnJvbSBwcmV2ZW50VGhyb3R0bGluZworICAgICAgICAoV2ViQ29yZTo6UGFnZVRocm90dGxlcjo6 cmVtb3ZlQWN0aXZpdHlUb2tlbik6CisgICAgICAgICAgICAtIGFkZGVkIGZ1bmN0aW9uYWxpdHkg ZnJvbSBhbGxvd1Rocm90dGxpbmcKKyAgICAgICAgKiBwYWdlL1BhZ2VUaHJvdHRsZXIuaDoKKyAg ICAgICAgICAgIC0gcmVtb3ZlZCBwcmV2ZW50VGhyb3R0bGluZywgYWxsb3dUaHJvdHRsaW5nLCBh bmQgbV9hY3RpdmVUaHJvdHRsZUJsb2NrZXJzLgorCiAyMDEzLTA3LTAzICBCcmVudCBGdWxnaGFt ICA8YmZ1bGdoYW1AYXBwbGUuY29tPgogCiAgICAgICAgIFtXaW5kb3dzXSBVbnJldmlld2VkIGJ1 aWxkIGNvcnJlY3Rpb24gYWZ0ZXIgcjE1MjgzLgpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9Q YWdlVGhyb3R0bGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VU aHJvdHRsZXIuY3BwCShyZXZpc2lvbiAxNTIzODQpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL1Bh Z2VUaHJvdHRsZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zOCw3ICszOCw2IEBAIHN0YXRpYyBj b25zdCBkb3VibGUga1Rocm90dGxlSHlzdGVyZXNpc1MKIAogUGFnZVRocm90dGxlcjo6UGFnZVRo cm90dGxlcihQYWdlKiBwYWdlKQogICAgIDogbV9wYWdlKHBhZ2UpCi0gICAgLCBtX2FjdGl2ZVRo cm90dGxlQmxvY2tlcnMoMCkKICAgICAsIG1fdGhyb3R0bGVTdGF0ZShQYWdlTm90VGhyb3R0bGVk U3RhdGUpCiAgICAgLCBtX3Rocm90dGxlSHlzdGVyZXNpc1RpbWVyKHRoaXMsICZQYWdlVGhyb3R0 bGVyOjp0aHJvdHRsZUh5c3RlcmVzaXNUaW1lckZpcmVkKQogewpAQCAtMTA2LDM3ICsxMDUsNiBA QCB2b2lkIFBhZ2VUaHJvdHRsZXI6OnNldFRocm90dGxlZChib29sIGlzCiAgICAgfQogfQogCi12 b2lkIFBhZ2VUaHJvdHRsZXI6OnByZXZlbnRUaHJvdHRsaW5nKCkKLXsKLSAgICAvLyBJZiB3ZSd2 ZSBhbHJlYWR5IGdvdCBldmVudHMgdGhhdCBibG9jayB0aHJvdHRsaW5nIHdlIGNhbiBpbmNyZW1l bnQKLSAgICAvLyBhbmQgcmV0dXJuIGVhcmx5Ci0gICAgaWYgKG1fYWN0aXZlVGhyb3R0bGVCbG9j a2VycysrKQotICAgICAgICByZXR1cm47Ci0KLSAgICBpZiAobV90aHJvdHRsZVN0YXRlID09IFBh Z2VOb3RUaHJvdHRsZWRTdGF0ZSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgaWYgKG1fdGhyb3R0 bGVTdGF0ZSA9PSBQYWdlVGhyb3R0bGVkU3RhdGUpCi0gICAgICAgIHVudGhyb3R0bGVQYWdlKCk7 Ci0KLSAgICBtX3Rocm90dGxlU3RhdGUgPSBQYWdlV2FpdGluZ1RvVGhyb3R0bGVTdGF0ZTsKLSAg ICBzdG9wVGhyb3R0bGVIeXN0ZXJlc2lzVGltZXIoKTsKLX0KLQotdm9pZCBQYWdlVGhyb3R0bGVy OjphbGxvd1Rocm90dGxpbmcoKQotewotICAgIEFTU0VSVChtX2FjdGl2ZVRocm90dGxlQmxvY2tl cnMgPiAwKTsKLSAgICBtX2FjdGl2ZVRocm90dGxlQmxvY2tlcnMtLTsKLSAgICBpZiAobV9hY3Rp dmVUaHJvdHRsZUJsb2NrZXJzKQotICAgICAgICByZXR1cm47Ci0KLSAgICBpZiAobV90aHJvdHRs ZVN0YXRlID09IFBhZ2VOb3RUaHJvdHRsZWRTdGF0ZSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAg QVNTRVJUKG1fdGhyb3R0bGVTdGF0ZSA9PSBQYWdlV2FpdGluZ1RvVGhyb3R0bGVTdGF0ZSk7Ci0g ICAgc3RhcnRUaHJvdHRsZUh5c3RlcmVzaXNUaW1lcigpOwotfQotCiB2b2lkIFBhZ2VUaHJvdHRs ZXI6OnN0b3BUaHJvdHRsZUh5c3RlcmVzaXNUaW1lcigpCiB7CiAgICAgbV90aHJvdHRsZUh5c3Rl cmVzaXNUaW1lci5zdG9wKCk7CkBAIC0xNTYsMzIgKzEyNCw1MCBAQCB2b2lkIFBhZ2VUaHJvdHRs ZXI6OnN0YXJ0VGhyb3R0bGVIeXN0ZXJlCiB7CiAgICAgaWYgKG1fdGhyb3R0bGVIeXN0ZXJlc2lz VGltZXIuaXNBY3RpdmUoKSkKICAgICAgICAgbV90aHJvdHRsZUh5c3RlcmVzaXNUaW1lci5zdG9w KCk7Ci0gICAgaWYgKCFtX2FjdGl2ZVRocm90dGxlQmxvY2tlcnMpCisgICAgaWYgKCFtX2FjdGl2 aXR5VG9rZW5zLnNpemUoKSkKICAgICAgICAgbV90aHJvdHRsZUh5c3RlcmVzaXNUaW1lci5zdGFy dE9uZVNob3Qoa1Rocm90dGxlSHlzdGVyZXNpc1NlY29uZHMpOwogfQogCiB2b2lkIFBhZ2VUaHJv dHRsZXI6OnRocm90dGxlSHlzdGVyZXNpc1RpbWVyRmlyZWQoVGltZXI8UGFnZVRocm90dGxlcj4q KQogewotICAgIEFTU0VSVCghbV9hY3RpdmVUaHJvdHRsZUJsb2NrZXJzKTsKKyAgICBBU1NFUlQo IW1fYWN0aXZpdHlUb2tlbnMuc2l6ZSgpKTsKICAgICB0aHJvdHRsZVBhZ2UoKTsKIH0KIAogdm9p ZCBQYWdlVGhyb3R0bGVyOjphZGRBY3Rpdml0eVRva2VuKFBhZ2VBY3Rpdml0eUFzc2VydGlvblRv a2VuKiB0b2tlbikKIHsKLSAgICBpZiAoIXRva2VuIHx8IG1fYWN0aXZpdHlUb2tlbnMuY29udGFp bnModG9rZW4pKQotICAgICAgICByZXR1cm47CisgICAgQVNTRVJUKHRva2VuICYmICFtX2FjdGl2 aXR5VG9rZW5zLmNvbnRhaW5zKHRva2VuKSk7CiAKICAgICBtX2FjdGl2aXR5VG9rZW5zLmFkZCh0 b2tlbik7Ci0gICAgcHJldmVudFRocm90dGxpbmcoKTsKKworICAgIC8vIElmIHdlJ3ZlIGFscmVh ZHkgZ290IGV2ZW50cyB0aGF0IGJsb2NrIHRocm90dGxpbmcgd2UgY2FuIHJldHVybiBlYXJseQor ICAgIGlmIChtX2FjdGl2aXR5VG9rZW5zLnNpemUoKSA+IDEpCisgICAgICAgIHJldHVybjsKKwor ICAgIGlmIChtX3Rocm90dGxlU3RhdGUgPT0gUGFnZU5vdFRocm90dGxlZFN0YXRlKQorICAgICAg ICByZXR1cm47CisKKyAgICBpZiAobV90aHJvdHRsZVN0YXRlID09IFBhZ2VUaHJvdHRsZWRTdGF0 ZSkKKyAgICAgICAgdW50aHJvdHRsZVBhZ2UoKTsKKworICAgIG1fdGhyb3R0bGVTdGF0ZSA9IFBh Z2VXYWl0aW5nVG9UaHJvdHRsZVN0YXRlOworICAgIHN0b3BUaHJvdHRsZUh5c3RlcmVzaXNUaW1l cigpOwogfQogCiB2b2lkIFBhZ2VUaHJvdHRsZXI6OnJlbW92ZUFjdGl2aXR5VG9rZW4oUGFnZUFj dGl2aXR5QXNzZXJ0aW9uVG9rZW4qIHRva2VuKQogewotICAgIGlmICghdG9rZW4gfHwgIW1fYWN0 aXZpdHlUb2tlbnMuY29udGFpbnModG9rZW4pKQotICAgICAgICByZXR1cm47CisgICAgQVNTRVJU KHRva2VuICYmIG1fYWN0aXZpdHlUb2tlbnMuY29udGFpbnModG9rZW4pKTsKIAogICAgIG1fYWN0 aXZpdHlUb2tlbnMucmVtb3ZlKHRva2VuKTsKLSAgICBhbGxvd1Rocm90dGxpbmcoKTsKKworICAg IGlmIChtX2FjdGl2aXR5VG9rZW5zLnNpemUoKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgaWYg KG1fdGhyb3R0bGVTdGF0ZSA9PSBQYWdlTm90VGhyb3R0bGVkU3RhdGUpCisgICAgICAgIHJldHVy bjsKKworICAgIEFTU0VSVChtX3Rocm90dGxlU3RhdGUgPT0gUGFnZVdhaXRpbmdUb1Rocm90dGxl U3RhdGUpOworICAgIHN0YXJ0VGhyb3R0bGVIeXN0ZXJlc2lzVGltZXIoKTsKIH0KIAogfQpJbmRl eDogU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlVGhyb3R0bGVyLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvcGFnZS9QYWdlVGhyb3R0bGVyLmgJKHJldmlzaW9uIDE1MjM4NCkKKysrIFNv dXJjZS9XZWJDb3JlL3BhZ2UvUGFnZVRocm90dGxlci5oCSh3b3JraW5nIGNvcHkpCkBAIC00OSw5 ICs0OSw3IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgc2V0VGhyb3R0bGVkKGJvb2wpOwogCi0gICAg dm9pZCBwcmV2ZW50VGhyb3R0bGluZygpOwogICAgIHZvaWQgcmVwb3J0SW50ZXJlc3RpbmdFdmVu dCgpOwotICAgIHZvaWQgYWxsb3dUaHJvdHRsaW5nKCk7CiAKICAgICB+UGFnZVRocm90dGxlcigp OwogCkBAIC03Niw3ICs3NCw2IEBAIHByaXZhdGU6CiAgICAgdm9pZCB0aHJvdHRsZVBhZ2UoKTsK ICAgICB2b2lkIHVudGhyb3R0bGVQYWdlKCk7CiAKLSAgICB1bnNpZ25lZCBtX2FjdGl2ZVRocm90 dGxlQmxvY2tlcnM7CiAgICAgUGFnZVRocm90dGxlU3RhdGUgbV90aHJvdHRsZVN0YXRlOwogICAg IFRpbWVyPFBhZ2VUaHJvdHRsZXI+IG1fdGhyb3R0bGVIeXN0ZXJlc2lzVGltZXI7CiAgICAgSGFz aFNldDxQYWdlQWN0aXZpdHlBc3NlcnRpb25Ub2tlbio+IG1fYWN0aXZpdHlUb2tlbnM7Cg==