139657 2014-12-15 15:14:05 -0800 Separate counted and hysteresis activities in PageThrottler 2024-02-24 15:38:29 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 barraclough barraclough ahmad.saleem792 commit-queue oldest_to_newest 1055754 0 barraclough 2014-12-15 15:14:05 -0800 Currently all activities funnel into a common hysteresis mechanism, the result of which is combined with the visually idle state, the result of which in turn drives a UserActivity::Impl. This is a first refactoring towards moving the UserActivity out to WebKit2. Use m_hysteresis only of the impulse activities (plugin evaluation, user input), and flatten the three types of activities (impulse, counted, ViewState) to all directly control a UserActivity. Switch from a UserActivity::Impl to a UserActivity since this will provide hysteresis for media activity. 1055757 1 243315 barraclough 2014-12-15 15:16:49 -0800 Created attachment 243315 Fix 1055758 2 commit-queue 2014-12-15 15:19:24 -0800 Attachment 243315 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. 2016662 3 ahmad.saleem792 2024-02-24 15:38:29 -0800 Landed - https://github.com/WebKit/WebKit/commit/80c7a0febfc965e78aceb418e3ce2f82e690a8b9 243315 2014-12-15 15:16:49 -0800 2014-12-15 15:19:37 -0800 Fix 139657.1.patch text/plain 4510 barraclough SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3NzMxNSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMyIEBACisyMDE0LTEyLTE1ICBHYXZpbiBC YXJyYWNsb3VnaCAgPGJhcnJhY2xvdWdoQGFwcGxlLmNvbT4KKworICAgICAgICBTZXBhcmF0ZSBj b3VudGVkIGFuZCBoeXN0ZXJlc2lzIGFjdGl2aXRpZXMgaW4gUGFnZVRocm90dGxlcgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM5NjU3CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ3VycmVudGx5IGFsbCBh Y3Rpdml0aWVzIGZ1bm5lbCBpbnRvIGEgY29tbW9uIGh5c3RlcmVzaXMgbWVjaGFuaXNtLCB0aGUg cmVzdWx0IG9mCisgICAgICAgIHdoaWNoIGlzIGNvbWJpbmVkIHdpdGggdGhlIHZpc3VhbGx5IGlk bGUgc3RhdGUsIHRoZSByZXN1bHQgb2Ygd2hpY2ggaW4gdHVybiBkcml2ZXMKKyAgICAgICAgYSBV c2VyQWN0aXZpdHk6OkltcGwuCisKKyAgICAgICAgVGhpcyBpcyBhIGZpcnN0IHJlZmFjdG9yaW5n IHRvd2FyZHMgbW92aW5nIHRoZSBVc2VyQWN0aXZpdHkgb3V0IHRvIFdlYktpdDIuIFVzZQorICAg ICAgICBtX2h5c3RlcmVzaXMgb25seSBvZiB0aGUgaW1wdWxzZSBhY3Rpdml0aWVzIChwbHVnaW4g ZXZhbHVhdGlvbiwgdXNlciBpbnB1dCksIGFuZAorICAgICAgICBmbGF0dGVuIHRoZSB0aHJlZSB0 eXBlcyBvZiBhY3Rpdml0aWVzIChpbXB1bHNlLCBjb3VudGVkLCBWaWV3U3RhdGUpIHRvIGFsbCBk aXJlY3RseQorICAgICAgICBjb250cm9sIGEgVXNlckFjdGl2aXR5LiBTd2l0Y2ggZnJvbSBhIFVz ZXJBY3Rpdml0eTo6SW1wbCB0byBhIFVzZXJBY3Rpdml0eSBzaW5jZQorICAgICAgICB0aGlzIHdp bGwgcHJvdmlkZSBoeXN0ZXJlc2lzIGZvciBtZWRpYSBhY3Rpdml0eS4KKworICAgICAgICAqIHBh Z2UvUGFnZVRocm90dGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjptX3BhZ2VBY3Rpdml0eUNv dW50ZXIpOgorICAgICAgICAgICAgLSB3aGVuIHRoZSBSZWZDb3VudGVyIGNoYW5nZXMganVzdCBj YWxsIHVwZGF0ZVVzZXJBY3Rpdml0eSBkaXJlY3RseSwgcmVtb3ZlZWQgcmVkdW5kYW50IGNhbGwg dG8gdXBkYXRlVXNlckFjdGl2aXR5LgorICAgICAgICAoV2ViQ29yZTo6UGFnZVRocm90dGxlcjo6 Y3JlYXRlVXNlckFjdGl2aXR5KToKKyAgICAgICAgICAgIC0gbV9hY3Rpdml0eSBpcyBub3cgYSBV c2VyQWN0aXZpdHkuCisgICAgICAgIChXZWJDb3JlOjpQYWdlVGhyb3R0bGVyOjp1cGRhdGVVc2Vy QWN0aXZpdHkpOgorICAgICAgICAgICAgLSBwcmV2aW91c2x5IGp1c3QgY2hlY2tlZCBtX2h5c3Rl cmVzaXMgZm9yIGFjdGl2aXR5OyBub3cgY2hlY2sgbV9wYWdlQWN0aXZpdHlDb3VudGVyIHRvby4K KyAgICAgICAgKFdlYkNvcmU6OlBhZ2VUaHJvdHRsZXI6OnBhZ2VBY3Rpdml0eUNvdW50ZXJWYWx1 ZURpZENoYW5nZSk6IERlbGV0ZWQuCisgICAgICAgICAgICAtIG5vIGxvbmdlciBuZWVkZWQ7IHdo ZW4gdGhlIFJlZkNvdW50ZXIgY2hhbmdlcyBqdXN0IGNhbGwgdXBkYXRlVXNlckFjdGl2aXR5IGRp cmVjdGx5LgorICAgICAgICAqIHBhZ2UvUGFnZVRocm90dGxlci5oOgorICAgICAgICAgICAgLSBy ZW1vdmVkIHBhZ2VBY3Rpdml0eUNvdW50ZXJWYWx1ZURpZENoYW5nZSwgbV9hY3Rpdml0eSBpcyBu b3cgYSBVc2VyQWN0aXZpdHkuCisKIDIwMTQtMTItMTUgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdl YmtpdC5vcmc+CiAKICAgICAgICAgY2xvbmVOb2RlKHRydWUpIGRvZXMgbm90IGNsb25lIG5lc3Rl ZCB0ZW1wbGF0ZSBlbGVtZW50cycgY29udGVudHMKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2Uv UGFnZVRocm90dGxlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9QYWdl VGhyb3R0bGVyLmNwcAkocmV2aXNpb24gMTc3MzA4KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9Q YWdlVGhyb3R0bGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzEsMTUgKzMxLDE0IEBAIG5hbWVz cGFjZSBXZWJDb3JlIHsKIFBhZ2VUaHJvdHRsZXI6OlBhZ2VUaHJvdHRsZXIoVmlld1N0YXRlOjpG bGFncyB2aWV3U3RhdGUpCiAgICAgOiBtX3ZpZXdTdGF0ZSh2aWV3U3RhdGUpCiAgICAgLCBtX2h5 c3RlcmVzaXMoW3RoaXNdKEh5c3RlcmVzaXNTdGF0ZSkgeyB1cGRhdGVVc2VyQWN0aXZpdHkoKTsg fSkKLSAgICAsIG1fcGFnZUFjdGl2aXR5Q291bnRlcihbdGhpc10oKSB7IHBhZ2VBY3Rpdml0eUNv dW50ZXJWYWx1ZURpZENoYW5nZSgpOyB9KQorICAgICwgbV9wYWdlQWN0aXZpdHlDb3VudGVyKFt0 aGlzXSgpIHsgdXBkYXRlVXNlckFjdGl2aXR5KCk7IH0pCiB7Ci0gICAgdXBkYXRlVXNlckFjdGl2 aXR5KCk7CiB9CiAKIHZvaWQgUGFnZVRocm90dGxlcjo6Y3JlYXRlVXNlckFjdGl2aXR5KCkKIHsK ICAgICBBU1NFUlQoIW1fYWN0aXZpdHkpOwotICAgIG1fYWN0aXZpdHkgPSBzdGQ6Om1ha2VfdW5p cXVlPFVzZXJBY3Rpdml0eTo6SW1wbD4oIlBhZ2UgaXMgYWN0aXZlLiIpOworICAgIG1fYWN0aXZp dHkgPSBzdGQ6Om1ha2VfdW5pcXVlPFVzZXJBY3Rpdml0eT4oIlBhZ2UgaXMgYWN0aXZlLiIpOwog ICAgIHVwZGF0ZVVzZXJBY3Rpdml0eSgpOwogfQogCkBAIC01MywyNyArNTIsMTYgQEAgUGFnZUFj dGl2aXR5QXNzZXJ0aW9uVG9rZW4gUGFnZVRocm90dGxlcgogICAgIHJldHVybiBtX3BhZ2VBY3Rp dml0eUNvdW50ZXIuY291bnQoKTsKIH0KIAotdm9pZCBQYWdlVGhyb3R0bGVyOjpwYWdlQWN0aXZp dHlDb3VudGVyVmFsdWVEaWRDaGFuZ2UoKQotewotICAgIGlmIChtX3BhZ2VBY3Rpdml0eUNvdW50 ZXIudmFsdWUoKSkKLSAgICAgICAgbV9oeXN0ZXJlc2lzLnN0YXJ0KCk7Ci0gICAgZWxzZQotICAg ICAgICBtX2h5c3RlcmVzaXMuc3RvcCgpOwotCi0gICAgLy8gSWYgdGhlIGNvdW50ZXIgaXMgbm9u emVybywgc3RhdGUgY2Fubm90IGJlIFN0b3BwZWQuCi0gICAgQVNTRVJUKCEobV9wYWdlQWN0aXZp dHlDb3VudGVyLnZhbHVlKCkgJiYgbV9oeXN0ZXJlc2lzLnN0YXRlKCkgPT0gSHlzdGVyZXNpc1N0 YXRlOjpTdG9wcGVkKSk7Ci19Ci0KIHZvaWQgUGFnZVRocm90dGxlcjo6dXBkYXRlVXNlckFjdGl2 aXR5KCkKIHsKICAgICBpZiAoIW1fYWN0aXZpdHkpCiAgICAgICAgIHJldHVybjsKIAogICAgIC8v IEFsbG93IHRocm90dGxpbmcgaWYgdGhlcmUgaXMgbm8gcGFnZSBhY3Rpdml0eSwgYW5kIHRoZSBw YWdlIGlzIHZpc3VhbGx5IGlkbGUuCi0gICAgaWYgKG1faHlzdGVyZXNpcy5zdGF0ZSgpID09IEh5 c3RlcmVzaXNTdGF0ZTo6U3RvcHBlZCAmJiBtX3ZpZXdTdGF0ZSAmIFZpZXdTdGF0ZTo6SXNWaXN1 YWxseUlkbGUpCi0gICAgICAgIG1fYWN0aXZpdHktPmVuZEFjdGl2aXR5KCk7CisgICAgaWYgKCFt X3BhZ2VBY3Rpdml0eUNvdW50ZXIudmFsdWUoKSAmJiBtX2h5c3RlcmVzaXMuc3RhdGUoKSA9PSBI eXN0ZXJlc2lzU3RhdGU6OlN0b3BwZWQgJiYgbV92aWV3U3RhdGUgJiBWaWV3U3RhdGU6OklzVmlz dWFsbHlJZGxlKQorICAgICAgICBtX2FjdGl2aXR5LT5zdG9wKCk7CiAgICAgZWxzZQotICAgICAg ICBtX2FjdGl2aXR5LT5iZWdpbkFjdGl2aXR5KCk7CisgICAgICAgIG1fYWN0aXZpdHktPnN0YXJ0 KCk7CiB9CiAKIHZvaWQgUGFnZVRocm90dGxlcjo6c2V0Vmlld1N0YXRlKFZpZXdTdGF0ZTo6Rmxh Z3Mgdmlld1N0YXRlKQpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlVGhyb3R0bGVyLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlVGhyb3R0bGVyLmgJKHJldmlz aW9uIDE3NzMwOCkKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZVRocm90dGxlci5oCSh3b3Jr aW5nIGNvcHkpCkBAIC01MCwxMiArNTAsMTEgQEAgcHVibGljOgogICAgIFBhZ2VBY3Rpdml0eUFz c2VydGlvblRva2VuIHBhZ2VMb2FkQWN0aXZpdHlUb2tlbigpOwogCiBwcml2YXRlOgotICAgIHZv aWQgcGFnZUFjdGl2aXR5Q291bnRlclZhbHVlRGlkQ2hhbmdlKCk7CiAgICAgdm9pZCB1cGRhdGVV c2VyQWN0aXZpdHkoKTsKIAogICAgIFZpZXdTdGF0ZTo6RmxhZ3MgbV92aWV3U3RhdGU7CiAgICAg SHlzdGVyZXNpc0FjdGl2aXR5IG1faHlzdGVyZXNpczsKLSAgICBzdGQ6OnVuaXF1ZV9wdHI8VXNl ckFjdGl2aXR5OjpJbXBsPiBtX2FjdGl2aXR5OworICAgIHN0ZDo6dW5pcXVlX3B0cjxVc2VyQWN0 aXZpdHk+IG1fYWN0aXZpdHk7CiAgICAgUmVmQ291bnRlciBtX3BhZ2VBY3Rpdml0eUNvdW50ZXI7 CiB9OwogCg==