154940 2016-03-02 16:57:34 -0800 PageThrottler should apply hysteresis to media activity 2016-03-03 12:41:26 -0800 1 1 1 Unclassified WebKit WebKit Website Other Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 barraclough barraclough jond manian timothy webkit-bug-importer oldest_to_newest 1170017 0 barraclough 2016-03-02 16:57:34 -0800 Currently PageThrottler keeps a track of audible plugin activity and HTML media element activity separately. Audible plugin activity also gets an extra 5s hysteresis applied, so that after audio playback has completed there is a chance to queue up more audio before timer throttling kicks in. HTML audio does not get this grace. Funnel both together into a single activity flag, such that the hysteresis is applied to both. 1170021 1 272705 barraclough 2016-03-02 17:02:18 -0800 Created attachment 272705 Fix 1170030 2 barraclough 2016-03-02 17:19:49 -0800 Transmitting file data ... Committed revision 197480. 272705 2016-03-02 17:02:18 -0800 2016-03-02 17:06:09 -0800 Fix 154940.1.patch text/plain 5299 barraclough SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5NzQ3OSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMwIEBACisyMDE2LTAzLTAyICBHYXZpbiBC YXJyYWNsb3VnaCAgPGJhcnJhY2xvdWdoQGFwcGxlLmNvbT4KKworICAgICAgICBQYWdlVGhyb3R0 bGVyIHNob3VsZCBhcHBseSBoeXN0ZXJlc2lzIHRvIG1lZGlhIGFjdGl2aXR5CisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTQ5NDAKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDdXJyZW50bHkgUGFnZVRocm90 dGxlciBrZWVwcyBhIHRyYWNrIG9mIGF1ZGlibGUgcGx1Z2luIGFjdGl2aXR5IGFuZCBIVE1MIG1l ZGlhIGVsZW1lbnQKKyAgICAgICAgYWN0aXZpdHkgc2VwYXJhdGVseS4gQXVkaWJsZSBwbHVnaW4g YWN0aXZpdHkgYWxzbyBnZXRzIGFuIGV4dHJhIDVzIGh5c3RlcmVzaXMgYXBwbGllZCwKKyAgICAg ICAgc28gdGhhdCBhZnRlciBhdWRpbyBwbGF5YmFjayBoYXMgY29tcGxldGVkIHRoZXJlIGlzIGEg Y2hhbmNlIHRvIHF1ZXVlIHVwIG1vcmUgYXVkaW8KKyAgICAgICAgYmVmb3JlIHRpbWVyIHRocm90 dGxpbmcga2lja3MgaW4uIEhUTUwgYXVkaW8gZG9lcyBub3QgZ2V0IHRoaXMgZ3JhY2UuIEZ1bm5l bCBib3RoCisgICAgICAgIHRvZ2V0aGVyIGludG8gYSBzaW5nbGUgYWN0aXZpdHkgZmxhZywgc3Vj aCB0aGF0IHRoZSBoeXN0ZXJlc2lzIGlzIGFwcGxpZWQgdG8gYm90aC4KKworICAgICAgICAqIHBh Z2UvUGFnZVRocm90dGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYWdlVGhyb3R0bGVyOjpQ YWdlVGhyb3R0bGVyKToKKyAgICAgICAgKFdlYkNvcmU6Om1fbWVkaWFBY3Rpdml0eUh5c3RlcmVz aXMpOgorICAgICAgICAgICAgLSBQYWdlQWN0aXZpdHlTdGF0ZTo6QXVkaWJsZVBsdWdpbiAtPiBQ YWdlQWN0aXZpdHlTdGF0ZTo6TWVkaWFBY3Rpdml0eS4KKyAgICAgICAgKFdlYkNvcmU6Om1fbWVk aWFBY3Rpdml0eUNvdW50ZXIpOgorICAgICAgICAgICAgLSB3aGVuIG1fbWVkaWFBY3Rpdml0eUNv dW50ZXIgdmFsdWUgY2hhbmdlcyBjYWxsIG1lZGlhQWN0aXZpdHlDb3VudGVyQ2hhbmdlZCgpLgor ICAgICAgICAoV2ViQ29yZTo6UGFnZVRocm90dGxlcjo6bWVkaWFBY3Rpdml0eUNvdW50ZXJDaGFu Z2VkKToKKyAgICAgICAgICAgIC0gRHJpdmUgUGFnZUFjdGl2aXR5U3RhdGU6Ok1lZGlhQWN0aXZp dHkgaW5kaXJlY3RseSB2aWEgbV9tZWRpYUFjdGl2aXR5SHlzdGVyZXNpcywKKyAgICAgICAgICAg ICAgc3VjaCB0aGF0IGEgNXMgaHlzdGVyZXNpcyBpcyBhcHBsaWVkLgorICAgICAgICAqIHBhZ2Uv UGFnZVRocm90dGxlci5oOgorICAgICAgICAgICAgLSBSZW1vdmVkIEF1ZGlibGVQbHVnaW4gKG1l cmdlZCBpbiB3aXRoIE1lZGlhQWN0aXZpdHkpLgorICAgICAgICAoV2ViQ29yZTo6UGFnZVRocm90 dGxlcjo6cGx1Z2luRGlkRXZhbHVhdGVXaGlsZUF1ZGlvSXNQbGF5aW5nKToKKyAgICAgICAgICAg IC0gbV9hdWRpYmxlUGx1Z2luSHlzdGVyZXNpcy5pbXB1bHNlIC0+IG1fbWVkaWFBY3Rpdml0eUh5 c3RlcmVzaXMuaW1wdWxzZS4KKwogMjAxNi0wMy0wMSAgQWRhIENoYW4gIDxhZGFjaGFuQGFwcGxl LmNvbT4KIAogICAgICAgICBVcGRhdGUgdGhlIG1lZGlhIGVsZW1lbnQncyBwcmVzZW50YXRpb24g bW9kZSBwcm9wZXJseSBhZnRlciBnb2luZyBpbiBhbmQgb3V0IG9mIGZ1bGwgc2NyZWVuIHZpYSB0 aGUgRnVsbCBTY3JlZW4gQVBJCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VUaHJvdHRs ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZVRocm90dGxlci5j cHAJKHJldmlzaW9uIDE5NzQ1OCkKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZVRocm90dGxl ci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMzLDggKzMzLDggQEAgbmFtZXNwYWNlIFdlYkNvcmUg ewogUGFnZVRocm90dGxlcjo6UGFnZVRocm90dGxlcihQYWdlJiBwYWdlKQogICAgIDogbV9wYWdl KHBhZ2UpCiAgICAgLCBtX3VzZXJJbnB1dEh5c3RlcmVzaXMoW3RoaXNdKEh5c3RlcmVzaXNTdGF0 ZSBzdGF0ZSkgeyBzZXRBY3Rpdml0eUZsYWcoUGFnZUFjdGl2aXR5U3RhdGU6OlVzZXJJbnB1dEFj dGl2aXR5LCBzdGF0ZSA9PSBIeXN0ZXJlc2lzU3RhdGU6OlN0YXJ0ZWQpOyB9KQotICAgICwgbV9h dWRpYmxlUGx1Z2luSHlzdGVyZXNpcyhbdGhpc10oSHlzdGVyZXNpc1N0YXRlIHN0YXRlKSB7IHNl dEFjdGl2aXR5RmxhZyhQYWdlQWN0aXZpdHlTdGF0ZTo6QXVkaWJsZVBsdWdpbiwgc3RhdGUgPT0g SHlzdGVyZXNpc1N0YXRlOjpTdGFydGVkKTsgfSkKLSAgICAsIG1fbWVkaWFBY3Rpdml0eUNvdW50 ZXIoW3RoaXNdKFJlZkNvdW50ZXJFdmVudCkgeyBzZXRBY3Rpdml0eUZsYWcoUGFnZUFjdGl2aXR5 U3RhdGU6Ok1lZGlhQWN0aXZpdHksIG1fbWVkaWFBY3Rpdml0eUNvdW50ZXIudmFsdWUoKSk7IH0p CisgICAgLCBtX21lZGlhQWN0aXZpdHlIeXN0ZXJlc2lzKFt0aGlzXShIeXN0ZXJlc2lzU3RhdGUg c3RhdGUpIHsgc2V0QWN0aXZpdHlGbGFnKFBhZ2VBY3Rpdml0eVN0YXRlOjpNZWRpYUFjdGl2aXR5 LCBzdGF0ZSA9PSBIeXN0ZXJlc2lzU3RhdGU6OlN0YXJ0ZWQpOyB9KQorICAgICwgbV9tZWRpYUFj dGl2aXR5Q291bnRlcihbdGhpc10oUmVmQ291bnRlckV2ZW50KSB7IG1lZGlhQWN0aXZpdHlDb3Vu dGVyQ2hhbmdlZCgpOyB9KQogICAgICwgbV9wYWdlTG9hZEFjdGl2aXR5Q291bnRlcihbdGhpc10o UmVmQ291bnRlckV2ZW50KSB7IHNldEFjdGl2aXR5RmxhZyhQYWdlQWN0aXZpdHlTdGF0ZTo6UGFn ZUxvYWRBY3Rpdml0eSwgbV9wYWdlTG9hZEFjdGl2aXR5Q291bnRlci52YWx1ZSgpKTsgfSkKIHsK IH0KQEAgLTQ5LDYgKzQ5LDE0IEBAIFBhZ2VBY3Rpdml0eUFzc2VydGlvblRva2VuIFBhZ2VUaHJv dHRsZXIKICAgICByZXR1cm4gbV9wYWdlTG9hZEFjdGl2aXR5Q291bnRlci5jb3VudCgpOwogfQog Cit2b2lkIFBhZ2VUaHJvdHRsZXI6Om1lZGlhQWN0aXZpdHlDb3VudGVyQ2hhbmdlZCgpCit7Cisg ICAgaWYgKG1fbWVkaWFBY3Rpdml0eUNvdW50ZXIudmFsdWUoKSkKKyAgICAgICAgbV9tZWRpYUFj dGl2aXR5SHlzdGVyZXNpcy5zdGFydCgpOworICAgIGVsc2UKKyAgICAgICAgbV9tZWRpYUFjdGl2 aXR5SHlzdGVyZXNpcy5zdG9wKCk7Cit9CisKIHZvaWQgUGFnZVRocm90dGxlcjo6c2V0QWN0aXZp dHlGbGFnKFBhZ2VBY3Rpdml0eVN0YXRlOjpGbGFncyBmbGFnLCBib29sIHZhbHVlKQogewogICAg IFBhZ2VBY3Rpdml0eVN0YXRlOjpGbGFncyBhY3Rpdml0eVN0YXRlID0gbV9hY3Rpdml0eVN0YXRl OwpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlVGhyb3R0bGVyLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlVGhyb3R0bGVyLmgJKHJldmlzaW9uIDE5NzQ1OCkK KysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZVRocm90dGxlci5oCSh3b3JraW5nIGNvcHkpCkBA IC00MywxNSArNDMsMTQgQEAgdHlwZWRlZiBQYWdlQWN0aXZpdHlDb3VudGVyOjpUb2tlbiBQYWdl QQogc3RydWN0IFBhZ2VBY3Rpdml0eVN0YXRlIHsKICAgICBlbnVtIHsKICAgICAgICAgVXNlcklu cHV0QWN0aXZpdHkgPSAxIDw8IDAsCi0gICAgICAgIEF1ZGlibGVQbHVnaW4gPSAxIDw8IDEsCi0g ICAgICAgIE1lZGlhQWN0aXZpdHkgPSAxIDw8IDIsCi0gICAgICAgIFBhZ2VMb2FkQWN0aXZpdHkg PSAxIDw8IDMsCisgICAgICAgIE1lZGlhQWN0aXZpdHkgPSAxIDw8IDEsCisgICAgICAgIFBhZ2VM b2FkQWN0aXZpdHkgPSAxIDw8IDIsCiAgICAgfTsKIAogICAgIHR5cGVkZWYgdW5zaWduZWQgRmxh Z3M7CiAKICAgICBzdGF0aWMgY29uc3QgRmxhZ3MgTm9GbGFncyA9IDA7Ci0gICAgc3RhdGljIGNv bnN0IEZsYWdzIEFsbEZsYWdzID0gVXNlcklucHV0QWN0aXZpdHkgfCBBdWRpYmxlUGx1Z2luIHwg TWVkaWFBY3Rpdml0eSB8IFBhZ2VMb2FkQWN0aXZpdHk7CisgICAgc3RhdGljIGNvbnN0IEZsYWdz IEFsbEZsYWdzID0gVXNlcklucHV0QWN0aXZpdHkgfCBNZWRpYUFjdGl2aXR5IHwgUGFnZUxvYWRB Y3Rpdml0eTsKIH07CiAKIGNsYXNzIFBhZ2VUaHJvdHRsZXIgewpAQCAtNjEsMTcgKzYwLDE4IEBA IHB1YmxpYzoKIAogICAgIHZvaWQgZGlkUmVjZWl2ZVVzZXJJbnB1dCgpIHsgbV91c2VySW5wdXRI eXN0ZXJlc2lzLmltcHVsc2UoKTsgfQogICAgIFBhZ2VBY3Rpdml0eVN0YXRlOjpGbGFncyBhY3Rp dml0eVN0YXRlKCkgeyByZXR1cm4gbV9hY3Rpdml0eVN0YXRlOyB9Ci0gICAgdm9pZCBwbHVnaW5E aWRFdmFsdWF0ZVdoaWxlQXVkaW9Jc1BsYXlpbmcoKSB7IG1fYXVkaWJsZVBsdWdpbkh5c3RlcmVz aXMuaW1wdWxzZSgpOyB9CisgICAgdm9pZCBwbHVnaW5EaWRFdmFsdWF0ZVdoaWxlQXVkaW9Jc1Bs YXlpbmcoKSB7IG1fbWVkaWFBY3Rpdml0eUh5c3RlcmVzaXMuaW1wdWxzZSgpOyB9CiAgICAgUGFn ZUFjdGl2aXR5QXNzZXJ0aW9uVG9rZW4gbWVkaWFBY3Rpdml0eVRva2VuKCk7CiAgICAgUGFnZUFj dGl2aXR5QXNzZXJ0aW9uVG9rZW4gcGFnZUxvYWRBY3Rpdml0eVRva2VuKCk7CiAKIHByaXZhdGU6 CisgICAgdm9pZCBtZWRpYUFjdGl2aXR5Q291bnRlckNoYW5nZWQoKTsKICAgICB2b2lkIHNldEFj dGl2aXR5RmxhZyhQYWdlQWN0aXZpdHlTdGF0ZTo6RmxhZ3MsIGJvb2wpOwogCiAgICAgUGFnZSYg bV9wYWdlOwogICAgIFBhZ2VBY3Rpdml0eVN0YXRlOjpGbGFncyBtX2FjdGl2aXR5U3RhdGUgeyBQ YWdlQWN0aXZpdHlTdGF0ZTo6Tm9GbGFncyB9OwogICAgIEh5c3RlcmVzaXNBY3Rpdml0eSBtX3Vz ZXJJbnB1dEh5c3RlcmVzaXM7Ci0gICAgSHlzdGVyZXNpc0FjdGl2aXR5IG1fYXVkaWJsZVBsdWdp bkh5c3RlcmVzaXM7CisgICAgSHlzdGVyZXNpc0FjdGl2aXR5IG1fbWVkaWFBY3Rpdml0eUh5c3Rl cmVzaXM7CiAgICAgUGFnZUFjdGl2aXR5Q291bnRlciBtX21lZGlhQWN0aXZpdHlDb3VudGVyOwog ICAgIFBhZ2VBY3Rpdml0eUNvdW50ZXIgbV9wYWdlTG9hZEFjdGl2aXR5Q291bnRlcjsKIH07Cg==