117152 2013-06-03 08:49:19 -0700 [GTK] Migrate WebKitWebResource to GTask 2013-06-21 01:07:48 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 117149 1 cgarcia webkit-unassigned commit-queue danw gustavo mrobinson xan.lopez oldest_to_newest 896468 0 cgarcia 2013-06-03 08:49:19 -0700 Migrate WebKitWebResource to GTask 896469 1 203595 cgarcia 2013-06-03 08:52:24 -0700 Created attachment 203595 Patch 896472 2 commit-queue 2013-06-03 08:55:03 -0700 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 902472 3 cgarcia 2013-06-21 01:07:48 -0700 Committed r151826: <http://trac.webkit.org/changeset/151826> 203595 2013-06-03 08:52:24 -0700 2013-06-20 05:46:02 -0700 Patch wk2-gtask-resource.diff text/plain 4673 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA0ZDZlNjEyLi42OGJhMzdmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTcg QEAKIDIwMTMtMDYtMDMgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCisgICAgICAgIFtHVEtdIE1pZ3JhdGUgV2ViS2l0V2ViUmVzb3VyY2UgdG8gR1Rhc2sKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNzE1MgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNz L0FQSS9ndGsvV2ViS2l0V2ViUmVzb3VyY2UuY3BwOgorICAgICAgICAocmVzb3VyY2VEYXRhQ2Fs bGJhY2spOgorICAgICAgICAod2Via2l0X3dlYl9yZXNvdXJjZV9nZXRfZGF0YSk6CisgICAgICAg ICh3ZWJraXRfd2ViX3Jlc291cmNlX2dldF9kYXRhX2ZpbmlzaCk6CisKKzIwMTMtMDYtMDMgIENh cmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCiAgICAgICAgIFtHVEtd IE1pZ3JhdGUgV2ViS2l0Q29va2llTWFuYWdlciB0byBHVGFzawogICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE3MTUwCiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlJlc291cmNlLmNwcCBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlJlc291cmNlLmNwcAppbmRleCA4 MjNkNTQwLi5mODFjZDJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2d0ay9XZWJLaXRXZWJSZXNvdXJjZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9ndGsvV2ViS2l0V2ViUmVzb3VyY2UuY3BwCkBAIC0zMTEsMjAgKzMxMSwxNSBAQCBXZWJL aXRVUklSZXNwb25zZSogd2Via2l0X3dlYl9yZXNvdXJjZV9nZXRfcmVzcG9uc2UoV2ViS2l0V2Vi UmVzb3VyY2UqIHJlc291cmNlKQogCiBzdHJ1Y3QgUmVzb3VyY2VHZXREYXRhQXN5bmNEYXRhIHsK ICAgICBSZWZQdHI8V2ViRGF0YT4gd2ViRGF0YTsKLSAgICBHUmVmUHRyPEdDYW5jZWxsYWJsZT4g Y2FuY2VsbGFibGU7CiB9OwogV0VCS0lUX0RFRklORV9BU1lOQ19EQVRBX1NUUlVDVChSZXNvdXJj ZUdldERhdGFBc3luY0RhdGEpCiAKIHN0YXRpYyB2b2lkIHJlc291cmNlRGF0YUNhbGxiYWNrKFdL RGF0YVJlZiB3a0RhdGEsIFdLRXJyb3JSZWYsIHZvaWQqIGNvbnRleHQpCiB7Ci0gICAgR1JlZlB0 cjxHU2ltcGxlQXN5bmNSZXN1bHQ+IHJlc3VsdCA9IGFkb3B0R1JlZihHX1NJTVBMRV9BU1lOQ19S RVNVTFQoY29udGV4dCkpOwotICAgIFJlc291cmNlR2V0RGF0YUFzeW5jRGF0YSogZGF0YSA9IHN0 YXRpY19jYXN0PFJlc291cmNlR2V0RGF0YUFzeW5jRGF0YSo+KGdfc2ltcGxlX2FzeW5jX3Jlc3Vs dF9nZXRfb3BfcmVzX2dwb2ludGVyKHJlc3VsdC5nZXQoKSkpOwotICAgIEdFcnJvciogZXJyb3Ig PSAwOwotICAgIGlmIChnX2NhbmNlbGxhYmxlX3NldF9lcnJvcl9pZl9jYW5jZWxsZWQoZGF0YS0+ Y2FuY2VsbGFibGUuZ2V0KCksICZlcnJvcikpCi0gICAgICAgIGdfc2ltcGxlX2FzeW5jX3Jlc3Vs dF90YWtlX2Vycm9yKHJlc3VsdC5nZXQoKSwgZXJyb3IpOwotICAgIGVsc2UKLSAgICAgICAgZGF0 YS0+d2ViRGF0YSA9IHRvSW1wbCh3a0RhdGEpOwotICAgIGdfc2ltcGxlX2FzeW5jX3Jlc3VsdF9j b21wbGV0ZShyZXN1bHQuZ2V0KCkpOworICAgIEdSZWZQdHI8R1Rhc2s+IHRhc2sgPSBhZG9wdEdS ZWYoR19UQVNLKGNvbnRleHQpKTsKKyAgICBSZXNvdXJjZUdldERhdGFBc3luY0RhdGEqIGRhdGEg PSBzdGF0aWNfY2FzdDxSZXNvdXJjZUdldERhdGFBc3luY0RhdGEqPihnX3Rhc2tfZ2V0X3Rhc2tf ZGF0YSh0YXNrLmdldCgpKSk7CisgICAgZGF0YS0+d2ViRGF0YSA9IHRvSW1wbCh3a0RhdGEpOwor ICAgIGdfdGFza19yZXR1cm5fYm9vbGVhbih0YXNrLmdldCgpLCBUUlVFKTsKIH0KIAogLyoqCkBA IC0zNDMsMTYgKzMzOCwxMyBAQCB2b2lkIHdlYmtpdF93ZWJfcmVzb3VyY2VfZ2V0X2RhdGEoV2Vi S2l0V2ViUmVzb3VyY2UqIHJlc291cmNlLCBHQ2FuY2VsbGFibGUqIGNhbgogewogICAgIGdfcmV0 dXJuX2lmX2ZhaWwoV0VCS0lUX0lTX1dFQl9SRVNPVVJDRShyZXNvdXJjZSkpOwogCi0gICAgR1Np bXBsZUFzeW5jUmVzdWx0KiByZXN1bHQgPSBnX3NpbXBsZV9hc3luY19yZXN1bHRfbmV3KEdfT0JK RUNUKHJlc291cmNlKSwgY2FsbGJhY2ssIHVzZXJEYXRhLAotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZWludGVycHJldF9jYXN0PGdw b2ludGVyPih3ZWJraXRfd2ViX3Jlc291cmNlX2dldF9kYXRhKSk7Ci0gICAgUmVzb3VyY2VHZXRE YXRhQXN5bmNEYXRhKiBkYXRhID0gY3JlYXRlUmVzb3VyY2VHZXREYXRhQXN5bmNEYXRhKCk7Ci0g ICAgZGF0YS0+Y2FuY2VsbGFibGUgPSBjYW5jZWxsYWJsZTsKLSAgICBnX3NpbXBsZV9hc3luY19y ZXN1bHRfc2V0X29wX3Jlc19ncG9pbnRlcihyZXN1bHQsIGRhdGEsIHJlaW50ZXJwcmV0X2Nhc3Q8 R0Rlc3Ryb3lOb3RpZnk+KGRlc3Ryb3lSZXNvdXJjZUdldERhdGFBc3luY0RhdGEpKTsKKyAgICBH VGFzayogdGFzayA9IGdfdGFza19uZXcocmVzb3VyY2UsIGNhbmNlbGxhYmxlLCBjYWxsYmFjaywg dXNlckRhdGEpOworICAgIGdfdGFza19zZXRfdGFza19kYXRhKHRhc2ssIGNyZWF0ZVJlc291cmNl R2V0RGF0YUFzeW5jRGF0YSgpLCByZWludGVycHJldF9jYXN0PEdEZXN0cm95Tm90aWZ5PihkZXN0 cm95UmVzb3VyY2VHZXREYXRhQXN5bmNEYXRhKSk7CiAgICAgaWYgKHJlc291cmNlLT5wcml2LT5p c01haW5SZXNvdXJjZSkKLSAgICAgICAgcmVzb3VyY2UtPnByaXYtPmZyYW1lLT5nZXRNYWluUmVz b3VyY2VEYXRhKERhdGFDYWxsYmFjazo6Y3JlYXRlKHJlc3VsdCwgcmVzb3VyY2VEYXRhQ2FsbGJh Y2spKTsKKyAgICAgICAgcmVzb3VyY2UtPnByaXYtPmZyYW1lLT5nZXRNYWluUmVzb3VyY2VEYXRh KERhdGFDYWxsYmFjazo6Y3JlYXRlKHRhc2ssIHJlc291cmNlRGF0YUNhbGxiYWNrKSk7CiAgICAg ZWxzZSB7CiAgICAgICAgIFN0cmluZyB1cmwgPSBTdHJpbmc6OmZyb21VVEY4KHJlc291cmNlLT5w cml2LT51cmkuZGF0YSgpKTsKLSAgICAgICAgcmVzb3VyY2UtPnByaXYtPmZyYW1lLT5nZXRSZXNv dXJjZURhdGEoV2ViVVJMOjpjcmVhdGUodXJsKS5nZXQoKSwgRGF0YUNhbGxiYWNrOjpjcmVhdGUo cmVzdWx0LCByZXNvdXJjZURhdGFDYWxsYmFjaykpOworICAgICAgICByZXNvdXJjZS0+cHJpdi0+ ZnJhbWUtPmdldFJlc291cmNlRGF0YShXZWJVUkw6OmNyZWF0ZSh1cmwpLmdldCgpLCBEYXRhQ2Fs bGJhY2s6OmNyZWF0ZSh0YXNrLCByZXNvdXJjZURhdGFDYWxsYmFjaykpOwogICAgIH0KIH0KIApA QCAtMzcxLDE1ICszNjMsMTMgQEAgdm9pZCB3ZWJraXRfd2ViX3Jlc291cmNlX2dldF9kYXRhKFdl YktpdFdlYlJlc291cmNlKiByZXNvdXJjZSwgR0NhbmNlbGxhYmxlKiBjYW4KIGd1Y2hhciogd2Vi a2l0X3dlYl9yZXNvdXJjZV9nZXRfZGF0YV9maW5pc2goV2ViS2l0V2ViUmVzb3VyY2UqIHJlc291 cmNlLCBHQXN5bmNSZXN1bHQqIHJlc3VsdCwgZ3NpemUqIGxlbmd0aCwgR0Vycm9yKiogZXJyb3Ip CiB7CiAgICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwoV0VCS0lUX0lTX1dFQl9SRVNPVVJDRShyZXNv dXJjZSksIDApOwotICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKEdfSVNfQVNZTkNfUkVTVUxUKHJl c3VsdCksIDApOworICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKGdfdGFza19pc192YWxpZChyZXN1 bHQsIHJlc291cmNlKSwgMCk7CiAKLSAgICBHU2ltcGxlQXN5bmNSZXN1bHQqIHNpbXBsZSA9IEdf U0lNUExFX0FTWU5DX1JFU1VMVChyZXN1bHQpOwotICAgIGdfd2Fybl9pZl9mYWlsKGdfc2ltcGxl X2FzeW5jX3Jlc3VsdF9nZXRfc291cmNlX3RhZyhzaW1wbGUpID09IHdlYmtpdF93ZWJfcmVzb3Vy Y2VfZ2V0X2RhdGEpOwotCi0gICAgaWYgKGdfc2ltcGxlX2FzeW5jX3Jlc3VsdF9wcm9wYWdhdGVf ZXJyb3Ioc2ltcGxlLCBlcnJvcikpCisgICAgR1Rhc2sqIHRhc2sgPSBHX1RBU0socmVzdWx0KTsK KyAgICBpZiAoIWdfdGFza19wcm9wYWdhdGVfYm9vbGVhbih0YXNrLCBlcnJvcikpCiAgICAgICAg IHJldHVybiAwOwogCi0gICAgUmVzb3VyY2VHZXREYXRhQXN5bmNEYXRhKiBkYXRhID0gc3RhdGlj X2Nhc3Q8UmVzb3VyY2VHZXREYXRhQXN5bmNEYXRhKj4oZ19zaW1wbGVfYXN5bmNfcmVzdWx0X2dl dF9vcF9yZXNfZ3BvaW50ZXIoc2ltcGxlKSk7CisgICAgUmVzb3VyY2VHZXREYXRhQXN5bmNEYXRh KiBkYXRhID0gc3RhdGljX2Nhc3Q8UmVzb3VyY2VHZXREYXRhQXN5bmNEYXRhKj4oZ190YXNrX2dl dF90YXNrX2RhdGEodGFzaykpOwogICAgIGlmIChsZW5ndGgpCiAgICAgICAgICpsZW5ndGggPSBk YXRhLT53ZWJEYXRhLT5zaXplKCk7CiAgICAgcmV0dXJuIHN0YXRpY19jYXN0PGd1Y2hhcio+KGdf bWVtZHVwKGRhdGEtPndlYkRhdGEtPmJ5dGVzKCksIGRhdGEtPndlYkRhdGEtPnNpemUoKSkpOwo=