138695 2014-11-13 04:54:47 -0800 [SOUP] Use GMainLoopSource for request timeout in ResourceHandle 2014-11-14 01:21:52 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Soup P2 Normal --- 1 cgarcia webkit-unassigned buildbot gustavo rniwa svillar oldest_to_newest 1048393 0 cgarcia 2014-11-13 04:54:47 -0800 We are currently using soup_timeout_add() that simply creates a GSource and attaches it to the given context. Using GMainLoopsource we simplify the code and fix any potential problem of converting the double value into milliseconds. 1048394 1 241482 cgarcia 2014-11-13 04:56:42 -0800 Created attachment 241482 Patch 1048690 2 cgarcia 2014-11-14 01:21:52 -0800 Committed r176120: <http://trac.webkit.org/changeset/176120> 241482 2014-11-13 04:56:42 -0800 2014-11-14 01:20:19 -0800 Patch wcore-resource-handle-main-loop-source.diff text/plain 4985 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3ZDM4ODM3Li45NjJlZjM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTQtMTEtMTMgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtTT1VQXSBVc2UgR01haW5Mb29wU291cmNlIGZvciByZXF1ZXN0IHRpbWVv dXQgaW4gUmVzb3VyY2VIYW5kbGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEzODY5NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFdlIGFyZSBjdXJyZW50bHkgdXNpbmcgc291cF90aW1lb3V0X2FkZCgpIHRo YXQgc2ltcGx5IGNyZWF0ZXMgYQorICAgICAgICBHU291cmNlIGFuZCBhdHRhY2hlcyBpdCB0byB0 aGUgZ2l2ZW4gY29udGV4dC4gVXNpbmcKKyAgICAgICAgR01haW5Mb29wU291cmNlIHdlIHNpbXBs aWZ5IHRoZSBjb2RlIGFuZCBmaXggYW55IHBvdGVudGlhbCBwcm9ibGVtCisgICAgICAgIG9mIGNv bnZlcnRpbmcgdGhlIGRvdWJsZSB2YWx1ZSBpbnRvIG1pbGxpc2Vjb25kcy4KKworICAgICAgICAq IHBsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VIYW5kbGVJbnRlcm5hbC5oOgorICAgICAgICAqIHBs YXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZUhhbmRsZVNvdXAuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6Y2xlYW51cFNvdXBSZXF1ZXN0T3BlcmF0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OlJl c291cmNlSGFuZGxlOjpzZW5kUGVuZGluZ1JlcXVlc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVz b3VyY2VIYW5kbGU6OnBsYXRmb3JtU2V0RGVmZXJzTG9hZGluZyk6CisgICAgICAgIChXZWJDb3Jl OjpyZXF1ZXN0VGltZW91dENhbGxiYWNrKTogRGVsZXRlZC4KKwogMjAxNC0xMS0xMyAgR3l1eW91 bmcgS2ltICA8Z3l1eW91bmcua2ltQHNhbXN1bmcuY29tPgogCiAgICAgICAgIFtFRkxdIFVuZXhw ZWN0ZWQgY3Jhc2hlcyBpbiBsYXlvdXQgdGVzdCBhZnRlciByMTc1OTUzCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlSGFuZGxlSW50ZXJuYWwuaCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VIYW5kbGVJbnRlcm5hbC5o CmluZGV4IGE4M2Y3ODEuLjFhYTRjZDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL25ldHdvcmsvUmVzb3VyY2VIYW5kbGVJbnRlcm5hbC5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VIYW5kbGVJbnRlcm5hbC5oCkBAIC01MSw2ICs1MSw3 IEBACiAjaWYgVVNFKFNPVVApCiAjaW5jbHVkZSAiR1VuaXF1ZVB0clNvdXAuaCIKICNpbmNsdWRl IDxsaWJzb3VwL3NvdXAuaD4KKyNpbmNsdWRlIDx3dGYvZ29iamVjdC9HTWFpbkxvb3BTb3VyY2Uu aD4KICNpbmNsdWRlIDx3dGYvZ29iamVjdC9HUmVmUHRyLmg+CiAjZW5kaWYKIApAQCAtMTk2LDcg KzE5Nyw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgR1JlZlB0cjxTb3VwTXVsdGlw YXJ0SW5wdXRTdHJlYW0+IG1fbXVsdGlwYXJ0SW5wdXRTdHJlYW07CiAgICAgICAgIEdSZWZQdHI8 R0NhbmNlbGxhYmxlPiBtX2NhbmNlbGxhYmxlOwogICAgICAgICBHUmVmUHRyPEdBc3luY1Jlc3Vs dD4gbV9kZWZlcnJlZFJlc3VsdDsKLSAgICAgICAgR1JlZlB0cjxHU291cmNlPiBtX3RpbWVvdXRT b3VyY2U7CisgICAgICAgIEdNYWluTG9vcFNvdXJjZSBtX3RpbWVvdXRTb3VyY2U7CiAgICAgICAg IEdVbmlxdWVQdHI8U291cEJ1ZmZlcj4gbV9zb3VwQnVmZmVyOwogICAgICAgICB1bnNpZ25lZCBs b25nIG1fYm9keVNpemU7CiAgICAgICAgIHVuc2lnbmVkIGxvbmcgbV9ib2R5RGF0YVNlbnQ7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VI YW5kbGVTb3VwLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNv dXJjZUhhbmRsZVNvdXAuY3BwCmluZGV4IDkwNjM0ZTYuLjA4Y2NjMTMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZUhhbmRsZVNvdXAuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZUhhbmRs ZVNvdXAuY3BwCkBAIC0yMzEsNyArMjMxLDYgQEAgc3RhdGljIGJvb2wgY3JlYXRlU291cFJlcXVl c3RBbmRNZXNzYWdlRm9ySGFuZGxlKFJlc291cmNlSGFuZGxlKiwgY29uc3QgUmVzb3VyY2UKIHN0 YXRpYyB2b2lkIGNsZWFudXBTb3VwUmVxdWVzdE9wZXJhdGlvbihSZXNvdXJjZUhhbmRsZSosIGJv b2wgaXNEZXN0cm95aW5nID0gZmFsc2UpOwogc3RhdGljIHZvaWQgc2VuZFJlcXVlc3RDYWxsYmFj ayhHT2JqZWN0KiwgR0FzeW5jUmVzdWx0KiwgZ3BvaW50ZXIpOwogc3RhdGljIHZvaWQgcmVhZENh bGxiYWNrKEdPYmplY3QqLCBHQXN5bmNSZXN1bHQqLCBncG9pbnRlcik7Ci1zdGF0aWMgZ2Jvb2xl YW4gcmVxdWVzdFRpbWVvdXRDYWxsYmFjayh2b2lkKik7CiAjaWYgRU5BQkxFKFdFQl9USU1JTkcp CiBzdGF0aWMgaW50ICBtaWxpc2Vjb25kc1NpbmNlUmVxdWVzdChkb3VibGUgcmVxdWVzdFRpbWUp OwogI2VuZGlmCkBAIC01OTAsMTAgKzU4OSw3IEBAIHN0YXRpYyB2b2lkIGNsZWFudXBTb3VwUmVx dWVzdE9wZXJhdGlvbihSZXNvdXJjZUhhbmRsZSogaGFuZGxlLCBib29sIGlzRGVzdHJveWluCiAg ICAgICAgIGQtPm1fc291cE1lc3NhZ2UuY2xlYXIoKTsKICAgICB9CiAKLSAgICBpZiAoZC0+bV90 aW1lb3V0U291cmNlKSB7Ci0gICAgICAgIGdfc291cmNlX2Rlc3Ryb3koZC0+bV90aW1lb3V0U291 cmNlLmdldCgpKTsKLSAgICAgICAgZC0+bV90aW1lb3V0U291cmNlLmNsZWFyKCk7Ci0gICAgfQor ICAgIGQtPm1fdGltZW91dFNvdXJjZS5jYW5jZWwoKTsKIAogICAgIGlmICghaXNEZXN0cm95aW5n KQogICAgICAgICBoYW5kbGUtPmRlcmVmKCk7CkBAIC0xMDE1LDEwICsxMDExLDExIEBAIHZvaWQg UmVzb3VyY2VIYW5kbGU6OnNlbmRQZW5kaW5nUmVxdWVzdCgpCiAjZW5kaWYKIAogICAgIGlmIChk LT5tX2ZpcnN0UmVxdWVzdC50aW1lb3V0SW50ZXJ2YWwoKSA+IDApIHsKLSAgICAgICAgLy8gc291 cF9hZGRfdGltZW91dCByZXR1cm5zIGEgR1NvdXJjZSogd2hvc2Ugb25seSByZWZlcmVuY2UgaXMg b3duZWQgYnkKLSAgICAgICAgLy8gdGhlIGNvbnRleHQuIFdlIG5lZWQgdG8gaGF2ZSBvdXIgb3du IHJlZmVyZW5jZSB0byBpdCwgaGVuY2Ugbm90IHVzaW5nIGFkb3B0UmVmLgotICAgICAgICBkLT5t X3RpbWVvdXRTb3VyY2UgPSBzb3VwX2FkZF90aW1lb3V0KGdfbWFpbl9jb250ZXh0X2dldF90aHJl YWRfZGVmYXVsdCgpLAotICAgICAgICAgICAgZC0+bV9maXJzdFJlcXVlc3QudGltZW91dEludGVy dmFsKCkgKiAxMDAwLCByZXF1ZXN0VGltZW91dENhbGxiYWNrLCB0aGlzKTsKKyAgICAgICAgZC0+ bV90aW1lb3V0U291cmNlLnNjaGVkdWxlQWZ0ZXJEZWxheSgiW1dlYktpdF0gUmVzb3VyY2VIYW5k bGUgcmVxdWVzdCB0aW1lb3V0IiwgW3RoaXNdIHsKKyAgICAgICAgICAgIGNsaWVudCgpLT5kaWRG YWlsKHRoaXMsIFJlc291cmNlRXJyb3I6OnRpbWVvdXRFcnJvcihmaXJzdFJlcXVlc3QoKS51cmwo KS5zdHJpbmcoKSkpOworICAgICAgICAgICAgY2FuY2VsKCk7CisgICAgICAgIH0sIHN0ZDo6Y2hy b25vOjpkdXJhdGlvbl9jYXN0PHN0ZDo6Y2hyb25vOjptaWNyb3NlY29uZHM+KHN0ZDo6Y2hyb25v OjpkdXJhdGlvbjxkb3VibGU+KGQtPm1fZmlyc3RSZXF1ZXN0LnRpbWVvdXRJbnRlcnZhbCgpKSks CisgICAgICAgIEdfUFJJT1JJVFlfREVGQVVMVCwgbnVsbHB0ciwgZ19tYWluX2NvbnRleHRfZ2V0 X3RocmVhZF9kZWZhdWx0KCkpOwogICAgIH0KIAogICAgIC8vIEJhbGFuY2VkIGJ5IGEgZGVyZWYo KSBpbiBjbGVhbnVwU291cFJlcXVlc3RPcGVyYXRpb24sIHdoaWNoIHNob3VsZCBhbHdheXMgcnVu LgpAQCAtMTIyMywxMCArMTIyMCw3IEBAIHZvaWQgUmVzb3VyY2VIYW5kbGU6OnBsYXRmb3JtU2V0 RGVmZXJzTG9hZGluZyhib29sIGRlZmVyc0xvYWRpbmcpCiAKICAgICAvLyBFeGNlcHQgd2hlbiBj YW5jZWxpbmcgYSBwb3NzaWJsZSB0aW1lb3V0IHRpbWVyLCB3ZSBvbmx5IG5lZWQgdG8gdGFrZSBh Y3Rpb24gaGVyZSB0byBVTi1kZWZlciBsb2FkaW5nLgogICAgIGlmIChkZWZlcnNMb2FkaW5nKSB7 Ci0gICAgICAgIGlmIChkLT5tX3RpbWVvdXRTb3VyY2UpIHsKLSAgICAgICAgICAgIGdfc291cmNl X2Rlc3Ryb3koZC0+bV90aW1lb3V0U291cmNlLmdldCgpKTsKLSAgICAgICAgICAgIGQtPm1fdGlt ZW91dFNvdXJjZS5jbGVhcigpOwotICAgICAgICB9CisgICAgICAgIGQtPm1fdGltZW91dFNvdXJj ZS5jYW5jZWwoKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAtMTM0NSwxNSArMTMzOSw2 IEBAIHZvaWQgUmVzb3VyY2VIYW5kbGU6OmNvbnRpbnVlRGlkUmVjZWl2ZVJlc3BvbnNlKCkKICAg ICBjb250aW51ZUFmdGVyRGlkUmVjZWl2ZVJlc3BvbnNlKHRoaXMpOwogfQogCi1zdGF0aWMgZ2Jv b2xlYW4gcmVxdWVzdFRpbWVvdXRDYWxsYmFjayhncG9pbnRlciBkYXRhKQotewotICAgIFJlZlB0 cjxSZXNvdXJjZUhhbmRsZT4gaGFuZGxlID0gc3RhdGljX2Nhc3Q8UmVzb3VyY2VIYW5kbGUqPihk YXRhKTsKLSAgICBoYW5kbGUtPmNsaWVudCgpLT5kaWRGYWlsKGhhbmRsZS5nZXQoKSwgUmVzb3Vy Y2VFcnJvcjo6dGltZW91dEVycm9yKGhhbmRsZS0+Z2V0SW50ZXJuYWwoKS0+bV9maXJzdFJlcXVl c3QudXJsKCkuc3RyaW5nKCkpKTsKLSAgICBoYW5kbGUtPmNhbmNlbCgpOwotCi0gICAgcmV0dXJu IEZBTFNFOwotfQotCiB9CiAKICNlbmRpZgo=