139687 2014-12-16 11:32:51 -0800 Introduce PageActivityState 2014-12-16 11:49:55 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 barraclough barraclough commit-queue oldest_to_newest 1056024 0 barraclough 2014-12-16 11:32:51 -0800 Add a bitfield to track each of the activities on the page separately. Split the hysteresis & counters so we can track these separately. 1056025 1 243370 barraclough 2014-12-16 11:34:46 -0800 Created attachment 243370 Fix 1056026 2 commit-queue 2014-12-16 11:37:24 -0800 Attachment 243370 did not pass style-queue: ERROR: Source/WebCore/page/PageThrottler.cpp:34: Code inside a namespace should not be indented. [whitespace/indent] [4] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 1056032 3 barraclough 2014-12-16 11:49:55 -0800 Committed revision 177378. 243370 2014-12-16 11:34:46 -0800 2014-12-16 11:38:07 -0800 Fix 139687.1.patch text/plain 5871 barraclough SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3NzM3NikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBACisyMDE0LTEyLTE2ICBHYXZpbiBC YXJyYWNsb3VnaCAgPGJhcnJhY2xvdWdoQGFwcGxlLmNvbT4KKworICAgICAgICBJbnRyb2R1Y2Ug UGFnZUFjdGl2aXR5U3RhdGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEzOTY4NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEFkZCBhIGJpdGZpZWxkIHRvIHRyYWNrIGVhY2ggb2YgdGhlIGFjdGl2aXRpZXMg b24gdGhlIHBhZ2Ugc2VwYXJhdGVseS4KKyAgICAgICAgU3BsaXQgdGhlIGh5c3RlcmVzaXMgJiBj b3VudGVycyBzbyB3ZSBjYW4gdHJhY2sgdGhlc2Ugc2VwYXJhdGVseS4KKworICAgICAgICAqIHBh Z2UvUGFnZVRocm90dGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYWdlVGhyb3R0bGVyOjpQ YWdlVGhyb3R0bGVyKToKKyAgICAgICAgICAgIC0gaW5pdGlhbHplIG5ldyBoeXN0ZXJlc2lzLCBj b3VudGVyczsgY2xvc3VyZXMgY2FsbCBzZXRBY3Rpdml0eUZsYWcuCisgICAgICAgIChXZWJDb3Jl OjpQYWdlVGhyb3R0bGVyOjptZWRpYUFjdGl2aXR5VG9rZW4pOgorICAgICAgICAoV2ViQ29yZTo6 UGFnZVRocm90dGxlcjo6cGFnZUxvYWRBY3Rpdml0eVRva2VuKToKKyAgICAgICAgICAgIC0gc3Bs aXQgbV9wYWdlQWN0aXZpdHlDb3VudGVyIC0+IG1fbWVkaWFBY3Rpdml0eUNvdW50ZXIsIG1fcGFn ZUxvYWRBY3Rpdml0eUNvdW50ZXIuCisgICAgICAgIChXZWJDb3JlOjpQYWdlVGhyb3R0bGVyOjp1 cGRhdGVVc2VyQWN0aXZpdHkpOgorICAgICAgICAgICAgLSB1c2UgbV9hY3Rpdml0eVN0YXRlIHRv IGNoZWNrIGZvciBhY3Rpdml0eS4KKyAgICAgICAgKFdlYkNvcmU6OlBhZ2VUaHJvdHRsZXI6OnNl dEFjdGl2aXR5RmxhZyk6CisgICAgICAgICAgICAtIGhlbHBlciB0byBjbGVhci9zZXQgYSBiaXQg aW4gbV9hY3Rpdml0eVN0YXRlLCBhbmQgY2FsbCB1cGRhdGVVc2VyQWN0aXZpdHkgYXMgbmVjZXNz YXJ5LgorICAgICAgICAqIHBhZ2UvUGFnZVRocm90dGxlci5oOgorICAgICAgICAoV2ViQ29yZTo6 UGFnZVRocm90dGxlcjo6ZGlkUmVjZWl2ZVVzZXJJbnB1dCk6CisgICAgICAgIChXZWJDb3JlOjpQ YWdlVGhyb3R0bGVyOjpwbHVnaW5EaWRFdmFsdWF0ZVdoaWxlQXVkaW9Jc1BsYXlpbmcpOgorICAg ICAgICAgICAgLSBzcGxpdCBtX2h5c3RlcmVzaXMgLT4gbV91c2VySW5wdXRIeXN0ZXJlc2lzLCBt X2F1ZGlibGVQbHVnaW5IeXN0ZXJlc2lzCisKIDIwMTQtMTItMTYgIEplciBOb2JsZSAgPGplci5u b2JsZUBhcHBsZS5jb20+CiAKICAgICAgICAgW2lPU10gQ3Jhc2ggaW4gV2ViS2l0OjpXZWJQYWdl UHJveHk6OmRpc3BhdGNoVmlld1N0YXRlQ2hhbmdlKCkgdGFwcGluZyBhIGxpbmsgZnJvbSBhbm90 aGVyIGFwcCB3aGlsZSBwbGF5aW5nIGEgdmlkZW8KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2Uv UGFnZVRocm90dGxlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9QYWdl VGhyb3R0bGVyLmNwcAkocmV2aXNpb24gMTc3MzMzKQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9Q YWdlVGhyb3R0bGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzAsOCArMzAsMTAgQEAgbmFtZXNw YWNlIFdlYkNvcmUgewogCiBQYWdlVGhyb3R0bGVyOjpQYWdlVGhyb3R0bGVyKFZpZXdTdGF0ZTo6 RmxhZ3Mgdmlld1N0YXRlKQogICAgIDogbV92aWV3U3RhdGUodmlld1N0YXRlKQotICAgICwgbV9o eXN0ZXJlc2lzKFt0aGlzXShIeXN0ZXJlc2lzU3RhdGUpIHsgdXBkYXRlVXNlckFjdGl2aXR5KCk7 IH0pCi0gICAgLCBtX3BhZ2VBY3Rpdml0eUNvdW50ZXIoW3RoaXNdKCkgeyB1cGRhdGVVc2VyQWN0 aXZpdHkoKTsgfSkKKyAgICAsIG1fdXNlcklucHV0SHlzdGVyZXNpcyhbdGhpc10oSHlzdGVyZXNp c1N0YXRlIHN0YXRlKSB7IHNldEFjdGl2aXR5RmxhZyhQYWdlQWN0aXZpdHlTdGF0ZTo6VXNlcklu cHV0QWN0aXZpdHksIHN0YXRlID09IEh5c3RlcmVzaXNTdGF0ZTo6U3RhcnRlZCk7IH0pCisgICAg LCBtX2F1ZGlibGVQbHVnaW5IeXN0ZXJlc2lzKFt0aGlzXShIeXN0ZXJlc2lzU3RhdGUgc3RhdGUp IHsgc2V0QWN0aXZpdHlGbGFnKFBhZ2VBY3Rpdml0eVN0YXRlOjpBdWRpYmxlUGx1Z2luLCBzdGF0 ZSA9PSBIeXN0ZXJlc2lzU3RhdGU6OlN0YXJ0ZWQpOyB9KQorICAgICwgbV9tZWRpYUFjdGl2aXR5 Q291bnRlcihbdGhpc10oKSB7IHNldEFjdGl2aXR5RmxhZyhQYWdlQWN0aXZpdHlTdGF0ZTo6TWVk aWFBY3Rpdml0eSwgbV9tZWRpYUFjdGl2aXR5Q291bnRlci52YWx1ZSgpKTsgfSkKKyAgICAsIG1f cGFnZUxvYWRBY3Rpdml0eUNvdW50ZXIoW3RoaXNdKCkgeyBzZXRBY3Rpdml0eUZsYWcoUGFnZUFj dGl2aXR5U3RhdGU6OlBhZ2VMb2FkQWN0aXZpdHksIG1fcGFnZUxvYWRBY3Rpdml0eUNvdW50ZXIu dmFsdWUoKSk7IH0pCiB7CiB9CiAKQEAgLTQ0LDEyICs0NiwxMiBAQCB2b2lkIFBhZ2VUaHJvdHRs ZXI6OmNyZWF0ZVVzZXJBY3Rpdml0eSgpCiAKIFBhZ2VBY3Rpdml0eUFzc2VydGlvblRva2VuIFBh Z2VUaHJvdHRsZXI6Om1lZGlhQWN0aXZpdHlUb2tlbigpCiB7Ci0gICAgcmV0dXJuIG1fcGFnZUFj dGl2aXR5Q291bnRlci5jb3VudCgpOworICAgIHJldHVybiBtX21lZGlhQWN0aXZpdHlDb3VudGVy LmNvdW50KCk7CiB9CiAKIFBhZ2VBY3Rpdml0eUFzc2VydGlvblRva2VuIFBhZ2VUaHJvdHRsZXI6 OnBhZ2VMb2FkQWN0aXZpdHlUb2tlbigpCiB7Ci0gICAgcmV0dXJuIG1fcGFnZUFjdGl2aXR5Q291 bnRlci5jb3VudCgpOworICAgIHJldHVybiBtX3BhZ2VMb2FkQWN0aXZpdHlDb3VudGVyLmNvdW50 KCk7CiB9CiAKIHZvaWQgUGFnZVRocm90dGxlcjo6dXBkYXRlVXNlckFjdGl2aXR5KCkKQEAgLTU4 LDEyICs2MCwyNyBAQCB2b2lkIFBhZ2VUaHJvdHRsZXI6OnVwZGF0ZVVzZXJBY3Rpdml0eSgpCiAg ICAgICAgIHJldHVybjsKIAogICAgIC8vIEFsbG93IHRocm90dGxpbmcgaWYgdGhlcmUgaXMgbm8g cGFnZSBhY3Rpdml0eSwgYW5kIHRoZSBwYWdlIGlzIHZpc3VhbGx5IGlkbGUuCi0gICAgaWYgKCFt X3BhZ2VBY3Rpdml0eUNvdW50ZXIudmFsdWUoKSAmJiBtX2h5c3RlcmVzaXMuc3RhdGUoKSA9PSBI eXN0ZXJlc2lzU3RhdGU6OlN0b3BwZWQgJiYgbV92aWV3U3RhdGUgJiBWaWV3U3RhdGU6OklzVmlz dWFsbHlJZGxlKQorICAgIGlmICghbV9hY3Rpdml0eVN0YXRlICYmIG1fdmlld1N0YXRlICYgVmll d1N0YXRlOjpJc1Zpc3VhbGx5SWRsZSkKICAgICAgICAgbV9hY3Rpdml0eS0+c3RvcCgpOwogICAg IGVsc2UKICAgICAgICAgbV9hY3Rpdml0eS0+c3RhcnQoKTsKIH0KIAordm9pZCBQYWdlVGhyb3R0 bGVyOjpzZXRBY3Rpdml0eUZsYWcoUGFnZUFjdGl2aXR5U3RhdGU6OkZsYWdzIGZsYWcsIGJvb2wg dmFsdWUpCit7CisgICAgUGFnZUFjdGl2aXR5U3RhdGU6OkZsYWdzIGFjdGl2aXR5U3RhdGUgPSBt X2FjdGl2aXR5U3RhdGU7CisgICAgaWYgKHZhbHVlKQorICAgICAgICBhY3Rpdml0eVN0YXRlIHw9 IGZsYWc7CisgICAgZWxzZQorICAgICAgICBhY3Rpdml0eVN0YXRlICY9IH5mbGFnOworCisgICAg aWYgKG1fYWN0aXZpdHlTdGF0ZSA9PSBhY3Rpdml0eVN0YXRlKQorICAgICAgICByZXR1cm47Cisg ICAgbV9hY3Rpdml0eVN0YXRlID0gYWN0aXZpdHlTdGF0ZTsKKworICAgIHVwZGF0ZVVzZXJBY3Rp dml0eSgpOworfQorCiB2b2lkIFBhZ2VUaHJvdHRsZXI6OnNldFZpZXdTdGF0ZShWaWV3U3RhdGU6 OkZsYWdzIHZpZXdTdGF0ZSkKIHsKICAgICBWaWV3U3RhdGU6OkZsYWdzIGNoYW5nZWQgPSBtX3Zp ZXdTdGF0ZSBeIHZpZXdTdGF0ZTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZVRocm90 dGxlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZVRocm90dGxlci5o CShyZXZpc2lvbiAxNzczMzMpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VUaHJvdHRsZXIu aAkod29ya2luZyBjb3B5KQpAQCAtMzYsNiArMzYsMjAgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewog CiB0eXBlZGVmIFJlZlB0cjxSZWZDb3VudGVyOjpDb3VudD4gUGFnZUFjdGl2aXR5QXNzZXJ0aW9u VG9rZW47CiAKK3N0cnVjdCBQYWdlQWN0aXZpdHlTdGF0ZSB7CisgICAgZW51bSB7CisgICAgICAg IFVzZXJJbnB1dEFjdGl2aXR5ID0gMSA8PCAwLAorICAgICAgICBBdWRpYmxlUGx1Z2luID0gMSA8 PCAxLAorICAgICAgICBNZWRpYUFjdGl2aXR5ID0gMSA8PCAyLAorICAgICAgICBQYWdlTG9hZEFj dGl2aXR5ID0gMSA8PCAzLAorICAgIH07CisKKyAgICB0eXBlZGVmIHVuc2lnbmVkIEZsYWdzOwor CisgICAgc3RhdGljIGNvbnN0IEZsYWdzIE5vRmxhZ3MgPSAwOworICAgIHN0YXRpYyBjb25zdCBG bGFncyBBbGxGbGFncyA9IFVzZXJJbnB1dEFjdGl2aXR5IHwgQXVkaWJsZVBsdWdpbiB8IE1lZGlh QWN0aXZpdHkgfCBQYWdlTG9hZEFjdGl2aXR5OworfTsKKwogY2xhc3MgUGFnZVRocm90dGxlciB7 CiAgICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CiBwdWJsaWM6CkBAIC00NCwxOCArNTgsMjIg QEAgcHVibGljOgogICAgIHZvaWQgY3JlYXRlVXNlckFjdGl2aXR5KCk7CiAgICAgdm9pZCBzZXRW aWV3U3RhdGUoVmlld1N0YXRlOjpGbGFncyk7CiAKLSAgICB2b2lkIGRpZFJlY2VpdmVVc2VySW5w dXQoKSB7IG1faHlzdGVyZXNpcy5pbXB1bHNlKCk7IH0KLSAgICB2b2lkIHBsdWdpbkRpZEV2YWx1 YXRlV2hpbGVBdWRpb0lzUGxheWluZygpIHsgbV9oeXN0ZXJlc2lzLmltcHVsc2UoKTsgfQorICAg IHZvaWQgZGlkUmVjZWl2ZVVzZXJJbnB1dCgpIHsgbV91c2VySW5wdXRIeXN0ZXJlc2lzLmltcHVs c2UoKTsgfQorICAgIHZvaWQgcGx1Z2luRGlkRXZhbHVhdGVXaGlsZUF1ZGlvSXNQbGF5aW5nKCkg eyBtX2F1ZGlibGVQbHVnaW5IeXN0ZXJlc2lzLmltcHVsc2UoKTsgfQogICAgIFBhZ2VBY3Rpdml0 eUFzc2VydGlvblRva2VuIG1lZGlhQWN0aXZpdHlUb2tlbigpOwogICAgIFBhZ2VBY3Rpdml0eUFz c2VydGlvblRva2VuIHBhZ2VMb2FkQWN0aXZpdHlUb2tlbigpOwogCiBwcml2YXRlOgogICAgIHZv aWQgdXBkYXRlVXNlckFjdGl2aXR5KCk7CisgICAgdm9pZCBzZXRBY3Rpdml0eUZsYWcoUGFnZUFj dGl2aXR5U3RhdGU6OkZsYWdzLCBib29sKTsKIAogICAgIFZpZXdTdGF0ZTo6RmxhZ3MgbV92aWV3 U3RhdGU7Ci0gICAgSHlzdGVyZXNpc0FjdGl2aXR5IG1faHlzdGVyZXNpczsKKyAgICBQYWdlQWN0 aXZpdHlTdGF0ZTo6RmxhZ3MgbV9hY3Rpdml0eVN0YXRlIHsgUGFnZUFjdGl2aXR5U3RhdGU6Ok5v RmxhZ3MgfTsKKyAgICBIeXN0ZXJlc2lzQWN0aXZpdHkgbV91c2VySW5wdXRIeXN0ZXJlc2lzOwor ICAgIEh5c3RlcmVzaXNBY3Rpdml0eSBtX2F1ZGlibGVQbHVnaW5IeXN0ZXJlc2lzOworICAgIFJl ZkNvdW50ZXIgbV9tZWRpYUFjdGl2aXR5Q291bnRlcjsKKyAgICBSZWZDb3VudGVyIG1fcGFnZUxv YWRBY3Rpdml0eUNvdW50ZXI7CiAgICAgc3RkOjp1bmlxdWVfcHRyPFVzZXJBY3Rpdml0eT4gbV9h Y3Rpdml0eTsKLSAgICBSZWZDb3VudGVyIG1fcGFnZUFjdGl2aXR5Q291bnRlcjsKIH07CiAKIH0K