133886 2014-06-13 15:38:39 -0700 Use the callOnMainThread version that takes an std::function in BlobResourceHandle::start() 2014-06-13 16:01:58 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca cmarcelo commit-queue jamesr luiz tonikitoo oldest_to_newest 1015555 0 andersca 2014-06-13 15:38:39 -0700 Use the callOnMainThread version that takes an std::function in BlobResourceHandle::start() 1015556 1 233083 andersca 2014-06-13 15:39:30 -0700 Created attachment 233083 Patch 1015562 2 andersca 2014-06-13 16:01:58 -0700 Committed r169955: <http://trac.webkit.org/changeset/169955> 233083 2014-06-13 15:39:30 -0700 2014-06-13 15:53:34 -0700 Patch bug-133886-20140613153907.patch text/plain 7309 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTY5OTQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2ZiOTAwMjM0ODUxYmI0 OTYwMWE0NDRmOTU1NjYzOTUyYjRmY2M3NS4uMzE5YTZjNGQxMDcxZTMzODRhNTUwMjlmNjEzMmQz YWE3MWQwYjhhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI3IEBACiAyMDE0LTA2LTEzICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgVXNlIHRoZSBjYWxs T25NYWluVGhyZWFkIHZlcnNpb24gdGhhdCB0YWtlcyBhbiBzdGQ6OmZ1bmN0aW9uIGluIEJsb2JS ZXNvdXJjZUhhbmRsZTo6c3RhcnQoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTMzODg2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQWxzbyByZXBsYWNlIGEgY291cGxlIG9mIE5TQXV0b3JlbGVhc2VQb29s cyB3aXRoIEBhdXRvcmVsZWFzZXBvb2wgYW5kIGFuIE93blB0ciB3aXRoIGFuIHN0ZDo6dW5pcXVl X3B0ci4KKworICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdUaHJlYWRNYWMu bW06CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdUaHJlYWQ6OnRocmVhZFJ1bkxvb3BTb3Vy Y2VDYWxsYmFjayk6CisgICAgICAgICogcGxhdGZvcm0vbWFjL1NoYXJlZFRpbWVyTWFjLm1tOgor ICAgICAgICAoV2ViQ29yZTo6UG93ZXJPYnNlcnZlcjo6UG93ZXJPYnNlcnZlcik6CisgICAgICAg IChXZWJDb3JlOjp0aW1lckZpcmVkKToKKyAgICAgICAgKFdlYkNvcmU6OnNldFNoYXJlZFRpbWVy RmlyZUludGVydmFsKToKKyAgICAgICAgKFdlYkNvcmU6OlBvd2VyT2JzZXJ2ZXI6OmNyZWF0ZSk6 IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpQb3dlck9ic2VydmVyOjpkaWRSZWNlaXZlU3lz dGVtUG93ZXJOb3RpZmljYXRpb24pOiBEZWxldGVkLgorICAgICAgICAqIHBsYXRmb3JtL25ldHdv cmsvQmxvYlJlc291cmNlSGFuZGxlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkJsb2JSZXNvdXJj ZUhhbmRsZTo6c3RhcnQpOgorICAgICAgICAoV2ViQ29yZTo6ZGVsYXllZFN0YXJ0QmxvYlJlc291 cmNlSGFuZGxlKTogRGVsZXRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL0Jsb2JSZXNv dXJjZUhhbmRsZS5oOgorCisyMDE0LTA2LTEzICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBh cHBsZS5jb20+CisKICAgICAgICAgQWRkIGEgSFRUUEhlYWRlck1hcDo6Z2V0IG92ZXJsb2FkIHRo YXQgdGFrZXMgYW4gSFRUUEhlYWRlck5hbWUKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEzMzg3NwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nVGhyZWFkTWFjLm1tIGIvU291cmNlL1dlYkNvcmUv cGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1RocmVhZE1hYy5tbQppbmRleCBlZjk2M2UwMzg3 ZDBjZWJiNzYyNTc5YmEwOTEwYWNiMTg3MjFmZjZjLi4zODYzMTczNzJmYjhhY2YyMjdkMTlmODJk ZDBjOTRkZDI3YTEzNDhjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGlu Zy9tYWMvU2Nyb2xsaW5nVGhyZWFkTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Ny b2xsaW5nL21hYy9TY3JvbGxpbmdUaHJlYWRNYWMubW0KQEAgLTYzLDkgKzYzLDkgQEAgdm9pZCBT Y3JvbGxpbmdUaHJlYWQ6OnRocmVhZFJ1bkxvb3BTb3VyY2VDYWxsYmFjayh2b2lkKiBzY3JvbGxp bmdUaHJlYWQpCiAKIHZvaWQgU2Nyb2xsaW5nVGhyZWFkOjp0aHJlYWRSdW5Mb29wU291cmNlQ2Fs bGJhY2soKQogewotICAgIE5TQXV0b3JlbGVhc2VQb29sICpwb29sID0gW1tOU0F1dG9yZWxlYXNl UG9vbCBhbGxvY10gaW5pdF07Ci0gICAgZGlzcGF0Y2hGdW5jdGlvbnNGcm9tU2Nyb2xsaW5nVGhy ZWFkKCk7Ci0gICAgW3Bvb2wgZHJhaW5dOworICAgIEBhdXRvcmVsZWFzZXBvb2wgeworICAgICAg ICBkaXNwYXRjaEZ1bmN0aW9uc0Zyb21TY3JvbGxpbmdUaHJlYWQoKTsKKyAgICB9CiB9CiAKIH0g Ly8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L21hYy9TaGFyZWRUaW1lck1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TaGFy ZWRUaW1lck1hYy5tbQppbmRleCA1YmVlMzMzZjdjOGRkNjlhMjJjZTFjZGRkMGE2MzJkMzQwZDYy ZjkzLi43ZjhlNWUzN2Q3ZTk2YWVlNjdkMDE3MDA4MWE5NDdjYmZiMjg3OWNmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2hhcmVkVGltZXJNYWMubW0KKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1NoYXJlZFRpbWVyTWFjLm1tCkBAIC00MywxNiArNDMs MTAgQEAgY2xhc3MgUG93ZXJPYnNlcnZlciB7CiAgICAgV1RGX01BS0VfTk9OQ09QWUFCTEUoUG93 ZXJPYnNlcnZlcik7CiAgICAgCiBwdWJsaWM6Ci0gICAgc3RhdGljIFBhc3NPd25QdHI8UG93ZXJP YnNlcnZlcj4gY3JlYXRlKCkKLSAgICB7Ci0gICAgICAgIHJldHVybiBhZG9wdFB0cihuZXcgUG93 ZXJPYnNlcnZlcik7Ci0gICAgfQorICAgIFBvd2VyT2JzZXJ2ZXIoKTsKICAgICB+UG93ZXJPYnNl cnZlcigpOwogCiBwcml2YXRlOgotICAgIFBvd2VyT2JzZXJ2ZXIoKTsKLQotICAgIHN0YXRpYyB2 b2lkIGRpZFJlY2VpdmVTeXN0ZW1Qb3dlck5vdGlmaWNhdGlvbih2b2lkKiBjb250ZXh0LCBpb19z ZXJ2aWNlX3QsIHVpbnQzMl90IG1lc3NhZ2VUeXBlLCB2b2lkKiBtZXNzYWdlQXJndW1lbnQpOwog ICAgIHZvaWQgZGlkUmVjZWl2ZVN5c3RlbVBvd2VyTm90aWZpY2F0aW9uKGlvX3NlcnZpY2VfdCwg dWludDMyX3QgbWVzc2FnZVR5cGUsIHZvaWQqIG1lc3NhZ2VBcmd1bWVudCk7CiAKICAgICB2b2lk IHJlc3RhcnRTaGFyZWRUaW1lcigpOwpAQCAtNjUsMTEgKzU5LDEzIEBAIHByaXZhdGU6CiAKIFBv d2VyT2JzZXJ2ZXI6OlBvd2VyT2JzZXJ2ZXIoKQogICAgIDogbV9wb3dlckNvbm5lY3Rpb24oMCkK LSAgICAsIG1fbm90aWZpY2F0aW9uUG9ydCgwKQorICAgICwgbV9ub3RpZmljYXRpb25Qb3J0KG51 bGxwdHIpCiAgICAgLCBtX25vdGlmaWVyUmVmZXJlbmNlKDApCiAgICAgLCBtX2Rpc3BhdGNoUXVl dWUoZGlzcGF0Y2hfcXVldWVfY3JlYXRlKCJjb20uYXBwbGUuV2ViS2l0LlBvd2VyT2JzZXJ2ZXIi LCAwKSkKIHsKLSAgICBtX3Bvd2VyQ29ubmVjdGlvbiA9IElPUmVnaXN0ZXJGb3JTeXN0ZW1Qb3dl cih0aGlzLCAmbV9ub3RpZmljYXRpb25Qb3J0LCBkaWRSZWNlaXZlU3lzdGVtUG93ZXJOb3RpZmlj YXRpb24sICZtX25vdGlmaWVyUmVmZXJlbmNlKTsKKyAgICBtX3Bvd2VyQ29ubmVjdGlvbiA9IElP UmVnaXN0ZXJGb3JTeXN0ZW1Qb3dlcih0aGlzLCAmbV9ub3RpZmljYXRpb25Qb3J0LCBbXSh2b2lk KiBjb250ZXh0LCBpb19zZXJ2aWNlX3Qgc2VydmljZSwgdWludDMyX3QgbWVzc2FnZVR5cGUsIHZv aWQqIG1lc3NhZ2VBcmd1bWVudCkgeworICAgICAgICBzdGF0aWNfY2FzdDxQb3dlck9ic2VydmVy Kj4oY29udGV4dCktPmRpZFJlY2VpdmVTeXN0ZW1Qb3dlck5vdGlmaWNhdGlvbihzZXJ2aWNlLCBt ZXNzYWdlVHlwZSwgbWVzc2FnZUFyZ3VtZW50KTsKKyAgICB9LCAmbV9ub3RpZmllclJlZmVyZW5j ZSk7CiAgICAgaWYgKCFtX3Bvd2VyQ29ubmVjdGlvbikKICAgICAgICAgcmV0dXJuOwogCkBAIC04 OCwxMSArODQsNiBAQCBQb3dlck9ic2VydmVyOjp+UG93ZXJPYnNlcnZlcigpCiAgICAgSU9Ob3Rp ZmljYXRpb25Qb3J0RGVzdHJveShtX25vdGlmaWNhdGlvblBvcnQpOwogfQogCi12b2lkIFBvd2Vy T2JzZXJ2ZXI6OmRpZFJlY2VpdmVTeXN0ZW1Qb3dlck5vdGlmaWNhdGlvbih2b2lkKiBjb250ZXh0 LCBpb19zZXJ2aWNlX3Qgc2VydmljZSwgdWludDMyX3QgbWVzc2FnZVR5cGUsIHZvaWQqIG1lc3Nh Z2VBcmd1bWVudCkKLXsKLSAgICBzdGF0aWNfY2FzdDxQb3dlck9ic2VydmVyKj4oY29udGV4dCkt PmRpZFJlY2VpdmVTeXN0ZW1Qb3dlck5vdGlmaWNhdGlvbihzZXJ2aWNlLCBtZXNzYWdlVHlwZSwg bWVzc2FnZUFyZ3VtZW50KTsKLX0KLQogdm9pZCBQb3dlck9ic2VydmVyOjpkaWRSZWNlaXZlU3lz dGVtUG93ZXJOb3RpZmljYXRpb24oaW9fc2VydmljZV90LCB1aW50MzJfdCBtZXNzYWdlVHlwZSwg dm9pZCogbWVzc2FnZUFyZ3VtZW50KQogewogICAgIElPQWxsb3dQb3dlckNoYW5nZShtX3Bvd2Vy Q29ubmVjdGlvbiwgcmVpbnRlcnByZXRfY2FzdDxsb25nPihtZXNzYWdlQXJndW1lbnQpKTsKQEAg LTExOCw3ICsxMDksNyBAQCB2b2lkIFBvd2VyT2JzZXJ2ZXI6OnJlc3RhcnRTaGFyZWRUaW1lcigp CiAgICAgdGltZXJGaXJlZCgwLCAwKTsKIH0KIAotc3RhdGljIFBvd2VyT2JzZXJ2ZXIqIFBvd2Vy T2JzZXJ2ZXI7CitzdGF0aWMgUG93ZXJPYnNlcnZlciogcG93ZXJPYnNlcnZlcjsKIAogdm9pZCBz ZXRTaGFyZWRUaW1lckZpcmVkRnVuY3Rpb24odm9pZCAoKmYpKCkpCiB7CkBAIC0xMjksOSArMTIw LDkgQEAgdm9pZCBzZXRTaGFyZWRUaW1lckZpcmVkRnVuY3Rpb24odm9pZCAoKmYpKCkpCiAKIHN0 YXRpYyB2b2lkIHRpbWVyRmlyZWQoQ0ZSdW5Mb29wVGltZXJSZWYsIHZvaWQqKQogewotICAgIE5T QXV0b3JlbGVhc2VQb29sICpwb29sID0gW1tOU0F1dG9yZWxlYXNlUG9vbCBhbGxvY10gaW5pdF07 Ci0gICAgc2hhcmVkVGltZXJGaXJlZEZ1bmN0aW9uKCk7Ci0gICAgW3Bvb2wgZHJhaW5dOworICAg IEBhdXRvcmVsZWFzZXBvb2wgeworICAgICAgICBzaGFyZWRUaW1lckZpcmVkRnVuY3Rpb24oKTsK KyAgICB9CiB9CiAKIHZvaWQgc2V0U2hhcmVkVGltZXJGaXJlSW50ZXJ2YWwoZG91YmxlIGludGVy dmFsKQpAQCAtMTQ3LDggKzEzOCw4IEBAIHZvaWQgc2V0U2hhcmVkVGltZXJGaXJlSW50ZXJ2YWwo ZG91YmxlIGludGVydmFsKQogICAgIHNoYXJlZFRpbWVyID0gQ0ZSdW5Mb29wVGltZXJDcmVhdGUo MCwgZmlyZURhdGUsIDAsIDAsIDAsIHRpbWVyRmlyZWQsIDApOwogICAgIENGUnVuTG9vcEFkZFRp bWVyKENGUnVuTG9vcEdldEN1cnJlbnQoKSwgc2hhcmVkVGltZXIsIGtDRlJ1bkxvb3BDb21tb25N b2Rlcyk7CiAgICAgCi0gICAgaWYgKCFQb3dlck9ic2VydmVyKQotICAgICAgICBQb3dlck9ic2Vy dmVyID0gUG93ZXJPYnNlcnZlcjo6Y3JlYXRlKCkubGVha1B0cigpOworICAgIGlmICghcG93ZXJP YnNlcnZlcikKKyAgICAgICAgcG93ZXJPYnNlcnZlciA9IHN0ZDo6bWFrZV91bmlxdWU8UG93ZXJP YnNlcnZlcj4oKS5yZWxlYXNlKCk7CiB9CiAKIHZvaWQgc3RvcFNoYXJlZFRpbWVyKCkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvQmxvYlJlc291cmNlSGFuZGxl LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvQmxvYlJlc291cmNlSGFuZGxl LmNwcAppbmRleCAzMDQ2Y2QxZjQ0NWViOTY5NGZhNDQ0ZjAxNjIxODJlOTM1ZjVjNzNkLi40OTFh OWMzZjA0NWU1OTVjZmZiNTk1ODI4NDZhZTg2MmM4M2Y0NzlmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL0Jsb2JSZXNvdXJjZUhhbmRsZS5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9CbG9iUmVzb3VyY2VIYW5kbGUuY3BwCkBAIC0y MDUsMjQgKzIwNSwxOSBAQCB2b2lkIEJsb2JSZXNvdXJjZUhhbmRsZTo6Y29udGludWVEaWRSZWNl aXZlUmVzcG9uc2UoKQogICAgIC8vIEJsb2JSZXNvdXJjZUhhbmRsZSBkb2Vzbid0IHdhaXQgZm9y IGRpZFJlY2VpdmVSZXNwb25zZSwgYW5kIGl0IGN1cnJlbnRseSBjYW5ub3QgYmUgdXNlZCBmb3Ig ZG93bmxvYWRpbmcuCiB9CiAKLXZvaWQgZGVsYXllZFN0YXJ0QmxvYlJlc291cmNlSGFuZGxlKHZv aWQqIGNvbnRleHQpCi17Ci0gICAgUmVmUHRyPEJsb2JSZXNvdXJjZUhhbmRsZT4gaGFuZGxlID0g YWRvcHRSZWYoc3RhdGljX2Nhc3Q8QmxvYlJlc291cmNlSGFuZGxlKj4oY29udGV4dCkpOwotICAg IGhhbmRsZS0+ZG9TdGFydCgpOwotfQotCiB2b2lkIEJsb2JSZXNvdXJjZUhhbmRsZTo6c3RhcnQo KQogewotICAgIGlmIChtX2FzeW5jKSB7Ci0gICAgICAgIC8vIEtlZXAgQmxvYlJlc291cmNlSGFu ZGxlIGFsaXZlIHVudGlsIGRlbGF5ZWRTdGFydEJsb2JSZXNvdXJjZUhhbmRsZSBydW5zLgotICAg ICAgICByZWYoKTsKLQotICAgICAgICAvLyBGaW5pc2ggdGhpcyBhc3luYyBjYWxsIHF1aWNrbHkg YW5kIHJldHVybi4KLSAgICAgICAgY2FsbE9uTWFpblRocmVhZChkZWxheWVkU3RhcnRCbG9iUmVz b3VyY2VIYW5kbGUsIHRoaXMpOworICAgIGlmICghbV9hc3luYykgeworICAgICAgICBkb1N0YXJ0 KCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBkb1N0YXJ0KCk7CisgICAgUmVmUHRy PEJsb2JSZXNvdXJjZUhhbmRsZT4gaGFuZGxlKHRoaXMpOworCisgICAgLy8gRmluaXNoIHRoaXMg YXN5bmMgY2FsbCBxdWlja2x5IGFuZCByZXR1cm4uCisgICAgY2FsbE9uTWFpblRocmVhZChbaGFu ZGxlXSB7CisgICAgICAgIGhhbmRsZS0+ZG9TdGFydCgpOworICAgIH0pOwogfQogCiB2b2lkIEJs b2JSZXNvdXJjZUhhbmRsZTo6ZG9TdGFydCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9uZXR3b3JrL0Jsb2JSZXNvdXJjZUhhbmRsZS5oIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vbmV0d29yay9CbG9iUmVzb3VyY2VIYW5kbGUuaAppbmRleCA2YWNiN2ZjMzFkYjQxMmEy ZWY4ZDc1ZGVjZGY2NmE3MTYzZGMxYThkLi43MzJmZjc5MDQ1MzlkNGQ4ZjgwNGMyN2VhMDQ2Njgz NmYwYTQ5YjFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL0Js b2JSZXNvdXJjZUhhbmRsZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsv QmxvYlJlc291cmNlSGFuZGxlLmgKQEAgLTU4LDggKzU4LDYgQEAgcHVibGljOgogICAgIGJvb2wg YWJvcnRlZCgpIGNvbnN0IHsgcmV0dXJuIG1fYWJvcnRlZDsgfQogCiBwcml2YXRlOgotICAgIGZy aWVuZCB2b2lkIGRlbGF5ZWRTdGFydEJsb2JSZXNvdXJjZUhhbmRsZSh2b2lkKik7Ci0KICAgICBC bG9iUmVzb3VyY2VIYW5kbGUoQmxvYkRhdGEqLCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmLCBSZXNv dXJjZUhhbmRsZUNsaWVudCosIGJvb2wgYXN5bmMpOwogICAgIHZpcnR1YWwgfkJsb2JSZXNvdXJj ZUhhbmRsZSgpOwogCg==