132643 2014-05-06 23:29:19 -0700 Fix build errors for BlobDataItem after r168391 2014-05-07 09:35:22 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 132628 1 praveen.j webkit-unassigned ap berto cdumez cgarcia commit-queue danw dev_sachin gustavo gyuyoung.kim mrobinson ossy oldest_to_newest 1007228 0 praveen.j 2014-05-06 23:29:19 -0700 Build fails for EFL port after including patch from Bug 132628. 1007231 1 230974 praveen.j 2014-05-06 23:48:30 -0700 Created attachment 230974 Patch Patch 1007232 2 commit-queue 2014-05-06 23:50:28 -0700 Attachment 230974 did not pass style-queue: ERROR: Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp:783: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp:792: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp:793: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp:794: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Total errors found: 4 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 1007236 3 230974 cgarcia 2014-05-07 00:02:00 -0700 Comment on attachment 230974 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=230974&action=review > Source/WebCore/ChangeLog:6 > + Build error fix. This doesn't provide any useful information, since the summary already says Fix build errors ... > Source/WebCore/ChangeLog:10 > + No new tests. No change in behaviour. You should remove this, commit-queue will refuse to commit this if this line is present in the changelog. > Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp:783 > soup_message_body_append(message->request_body, SOUP_MEMORY_TEMPORARY, > - blobItem.data->data() + blobItem.offset, blobItem.length); > + blobItem.data->data() + blobItem.offset(), blobItem.length()); Even if this was already using the old coding style, we can take advantage we are changing it now to use the new coding style, please fix it. > Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp:794 > - blobItem.path, > - blobItem.offset, > - blobItem.length == BlobDataItem::toEndOfFile ? 0 : blobItem.length, > + blobItem.file->path(), > + blobItem.offset(), > + blobItem.length() == BlobDataItem::toEndOfFile ? 0 : blobItem.length(), Ditto. 1007239 4 230975 praveen.j 2014-05-07 00:39:57 -0700 Created attachment 230975 Patch All comments are considered. 1007240 5 230975 cgarcia 2014-05-07 00:44:24 -0700 Comment on attachment 230975 Patch Thanks! 1007242 6 230975 ossy 2014-05-07 00:56:40 -0700 Comment on attachment 230975 Patch Clearing flags on attachment: 230975 Committed r168413: <http://trac.webkit.org/changeset/168413> 1007243 7 ossy 2014-05-07 00:56:51 -0700 All reviewed patches have been landed. Closing bug. 1007344 8 ap 2014-05-07 09:35:22 -0700 Sorry about the breakage, and thank you for the fix! 230974 2014-05-06 23:48:30 -0700 2014-05-07 00:39:57 -0700 Patch BlobDataItem-132643.txt text/plain 2963 praveen.j SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2ODQxMikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE0LTA1LTA2ICBQcmF2ZWVu IFIgSmFkaGF2ICA8cHJhdmVlbi5qQHNhbXN1bmcuY29tPgorCisgICAgICAgIEZpeCBidWlsZCBl cnJvcnMgZm9yIEJsb2JEYXRhSXRlbSBhZnRlciBwYXRjaCBmcm9tIGJ1ZyAxMzI2MjgKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMjY0MworCisgICAg ICAgIEJ1aWxkIGVycm9yIGZpeC4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBObyBuZXcgdGVzdHMuIE5vIGNoYW5nZSBpbiBiZWhhdmlvdXIuCisKKyAg ICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VIYW5kbGVTb3VwLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OmJsb2JJc091dE9mRGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjphZGRF bmNvZGVkQmxvYkl0ZW1Ub1NvdXBNZXNzYWdlQm9keSk6CisKIDIwMTQtMDUtMDYgIERlYW4gSmFj a3NvbiAgPGRpbm9AYXBwbGUuY29tPgogCiAgICAgICAgIENsZWFuIHVwIHRoZSBkaWZmZXJlbmNl IGJldHdlZW4gcGFpbnRpbmcgZm9jdXMgcmluZ3MgYW5kIGFkZGluZyBQREYgYW5ub3RhdGlvbnMK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZUhhbmRs ZVNvdXAuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsv c291cC9SZXNvdXJjZUhhbmRsZVNvdXAuY3BwCShyZXZpc2lvbiAxNjg0MDcpCisrKyBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VIYW5kbGVTb3VwLmNwcAkod29y a2luZyBjb3B5KQpAQCAtNzY1LDIyICs3NjUsMjIgQEAgc3RhdGljIGJvb2wgYWRkRmlsZVRvU291 cE1lc3NhZ2VCb2R5KFNvdQogc3RhdGljIGJvb2wgYmxvYklzT3V0T2ZEYXRlKGNvbnN0IEJsb2JE YXRhSXRlbSYgYmxvYkl0ZW0pCiB7CiAgICAgQVNTRVJUKGJsb2JJdGVtLnR5cGUgPT0gQmxvYkRh dGFJdGVtOjpGaWxlKTsKLSAgICBpZiAoIWlzVmFsaWRGaWxlVGltZShibG9iSXRlbS5leHBlY3Rl ZE1vZGlmaWNhdGlvblRpbWUpKQorICAgIGlmICghaXNWYWxpZEZpbGVUaW1lKGJsb2JJdGVtLmZp bGUtPmV4cGVjdGVkTW9kaWZpY2F0aW9uVGltZSgpKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwog CiAgICAgdGltZV90IGZpbGVNb2RpZmljYXRpb25UaW1lOwotICAgIGlmICghZ2V0RmlsZU1vZGlm aWNhdGlvblRpbWUoYmxvYkl0ZW0ucGF0aCwgZmlsZU1vZGlmaWNhdGlvblRpbWUpKQorICAgIGlm ICghZ2V0RmlsZU1vZGlmaWNhdGlvblRpbWUoYmxvYkl0ZW0uZmlsZS0+cGF0aCgpLCBmaWxlTW9k aWZpY2F0aW9uVGltZSkpCiAgICAgICAgIHJldHVybiB0cnVlOwogCi0gICAgcmV0dXJuIGZpbGVN b2RpZmljYXRpb25UaW1lICE9IHN0YXRpY19jYXN0PHRpbWVfdD4oYmxvYkl0ZW0uZXhwZWN0ZWRN b2RpZmljYXRpb25UaW1lKTsKKyAgICByZXR1cm4gZmlsZU1vZGlmaWNhdGlvblRpbWUgIT0gc3Rh dGljX2Nhc3Q8dGltZV90PihibG9iSXRlbS5maWxlLT5leHBlY3RlZE1vZGlmaWNhdGlvblRpbWUo KSk7CiB9CiAKIHN0YXRpYyB2b2lkIGFkZEVuY29kZWRCbG9iSXRlbVRvU291cE1lc3NhZ2VCb2R5 KFNvdXBNZXNzYWdlKiBtZXNzYWdlLCBjb25zdCBCbG9iRGF0YUl0ZW0mIGJsb2JJdGVtLCB1bnNp Z25lZCBsb25nJiB0b3RhbEJvZHlTaXplKQogewogICAgIGlmIChibG9iSXRlbS50eXBlID09IEJs b2JEYXRhSXRlbTo6RGF0YSkgewotICAgICAgICB0b3RhbEJvZHlTaXplICs9IGJsb2JJdGVtLmxl bmd0aDsKKyAgICAgICAgdG90YWxCb2R5U2l6ZSArPSBibG9iSXRlbS5sZW5ndGgoKTsKICAgICAg ICAgc291cF9tZXNzYWdlX2JvZHlfYXBwZW5kKG1lc3NhZ2UtPnJlcXVlc3RfYm9keSwgU09VUF9N RU1PUllfVEVNUE9SQVJZLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYmxvYkl0 ZW0uZGF0YS0+ZGF0YSgpICsgYmxvYkl0ZW0ub2Zmc2V0LCBibG9iSXRlbS5sZW5ndGgpOworICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYmxvYkl0ZW0uZGF0YS0+ZGF0YSgpICsgYmxv Ykl0ZW0ub2Zmc2V0KCksIGJsb2JJdGVtLmxlbmd0aCgpKTsKICAgICAgICAgcmV0dXJuOwogICAg IH0KIApAQCAtNzg5LDkgKzc4OSw5IEBAIHN0YXRpYyB2b2lkIGFkZEVuY29kZWRCbG9iSXRlbVRv U291cE1lc3MKICAgICAgICAgcmV0dXJuOwogCiAgICAgYWRkRmlsZVRvU291cE1lc3NhZ2VCb2R5 KG1lc3NhZ2UsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJsb2JJdGVtLnBhdGgsCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJsb2JJdGVtLm9mZnNldCwKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgYmxvYkl0ZW0ubGVuZ3RoID09IEJsb2JEYXRhSXRlbTo6dG9FbmRP ZkZpbGUgPyAwIDogYmxvYkl0ZW0ubGVuZ3RoLAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBibG9iSXRlbS5maWxlLT5wYXRoKCksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJs b2JJdGVtLm9mZnNldCgpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICBibG9iSXRlbS5s ZW5ndGgoKSA9PSBCbG9iRGF0YUl0ZW06OnRvRW5kT2ZGaWxlID8gMCA6IGJsb2JJdGVtLmxlbmd0 aCgpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0b3RhbEJvZHlTaXplKTsKIH0KIAo= 230975 2014-05-07 00:39:57 -0700 2014-05-07 00:56:40 -0700 Patch BlobDataItem-132643.txt text/plain 3396 praveen.j SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2ODQxMikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE0LTA1LTA2ICBQcmF2ZWVu IFIgSmFkaGF2ICA8cHJhdmVlbi5qQHNhbXN1bmcuY29tPgorCisgICAgICAgIEZpeCBidWlsZCBl cnJvcnMgZm9yIEJsb2JEYXRhSXRlbSBhZnRlciByMTY4MzkxLgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMyNjQzCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUGF0Y2ggdXBkYXRlcyBCbG9iRGF0YUl0ZW0g cGFyYW1zIHVzYWdlIGluIFJlc291cmNlSGFuZGxlU291cC5jcHAKKyAgICAgICAgdG8gYmUgaW5s aW5lIHdpdGggcjE2ODM5MS4KKworICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvc291cC9SZXNv dXJjZUhhbmRsZVNvdXAuY3BwOgorICAgICAgICAoV2ViQ29yZTo6YmxvYklzT3V0T2ZEYXRlKTog QmxvYkRhdGFJdGVtIGNsYXNzIGlzIHVwZGF0ZWQgaW4gcjE2ODM5MS4KKyAgICAgICAgQ29ycmVz cG9uZGluZyBwYXJhbWV0ZXIgY2hhbmdlcyBhcmUgZG9uZSB0byByZXNvbHZlIGJ1aWxkIGVycm9y LgorICAgICAgICAoV2ViQ29yZTo6YWRkRW5jb2RlZEJsb2JJdGVtVG9Tb3VwTWVzc2FnZUJvZHkp OiBCbG9iRGF0YUl0ZW0gY2xhc3MgaXMgdXBkYXRlZAorICAgICAgICBpbiByMTY4MzkxLiBDb3Jy ZXNwb25kaW5nIHBhcmFtZXRlciBjaGFuZ2VzIGFyZSBkb25lIHRvIHJlc29sdmUgYnVpbGQgZXJy b3IuCisKIDIwMTQtMDUtMDYgIERlYW4gSmFja3NvbiAgPGRpbm9AYXBwbGUuY29tPgogCiAgICAg ICAgIENsZWFuIHVwIHRoZSBkaWZmZXJlbmNlIGJldHdlZW4gcGFpbnRpbmcgZm9jdXMgcmluZ3Mg YW5kIGFkZGluZyBQREYgYW5ub3RhdGlvbnMKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L25ldHdvcmsvc291cC9SZXNvdXJjZUhhbmRsZVNvdXAuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZUhhbmRsZVNvdXAuY3BwCShy ZXZpc2lvbiAxNjg0MDcpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAv UmVzb3VyY2VIYW5kbGVTb3VwLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzY1LDIyICs3NjUsMjEg QEAgc3RhdGljIGJvb2wgYWRkRmlsZVRvU291cE1lc3NhZ2VCb2R5KFNvdQogc3RhdGljIGJvb2wg YmxvYklzT3V0T2ZEYXRlKGNvbnN0IEJsb2JEYXRhSXRlbSYgYmxvYkl0ZW0pCiB7CiAgICAgQVNT RVJUKGJsb2JJdGVtLnR5cGUgPT0gQmxvYkRhdGFJdGVtOjpGaWxlKTsKLSAgICBpZiAoIWlzVmFs aWRGaWxlVGltZShibG9iSXRlbS5leHBlY3RlZE1vZGlmaWNhdGlvblRpbWUpKQorICAgIGlmICgh aXNWYWxpZEZpbGVUaW1lKGJsb2JJdGVtLmZpbGUtPmV4cGVjdGVkTW9kaWZpY2F0aW9uVGltZSgp KSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgdGltZV90IGZpbGVNb2RpZmljYXRpb25U aW1lOwotICAgIGlmICghZ2V0RmlsZU1vZGlmaWNhdGlvblRpbWUoYmxvYkl0ZW0ucGF0aCwgZmls ZU1vZGlmaWNhdGlvblRpbWUpKQorICAgIGlmICghZ2V0RmlsZU1vZGlmaWNhdGlvblRpbWUoYmxv Ykl0ZW0uZmlsZS0+cGF0aCgpLCBmaWxlTW9kaWZpY2F0aW9uVGltZSkpCiAgICAgICAgIHJldHVy biB0cnVlOwogCi0gICAgcmV0dXJuIGZpbGVNb2RpZmljYXRpb25UaW1lICE9IHN0YXRpY19jYXN0 PHRpbWVfdD4oYmxvYkl0ZW0uZXhwZWN0ZWRNb2RpZmljYXRpb25UaW1lKTsKKyAgICByZXR1cm4g ZmlsZU1vZGlmaWNhdGlvblRpbWUgIT0gc3RhdGljX2Nhc3Q8dGltZV90PihibG9iSXRlbS5maWxl LT5leHBlY3RlZE1vZGlmaWNhdGlvblRpbWUoKSk7CiB9CiAKIHN0YXRpYyB2b2lkIGFkZEVuY29k ZWRCbG9iSXRlbVRvU291cE1lc3NhZ2VCb2R5KFNvdXBNZXNzYWdlKiBtZXNzYWdlLCBjb25zdCBC bG9iRGF0YUl0ZW0mIGJsb2JJdGVtLCB1bnNpZ25lZCBsb25nJiB0b3RhbEJvZHlTaXplKQogewog ICAgIGlmIChibG9iSXRlbS50eXBlID09IEJsb2JEYXRhSXRlbTo6RGF0YSkgewotICAgICAgICB0 b3RhbEJvZHlTaXplICs9IGJsb2JJdGVtLmxlbmd0aDsKLSAgICAgICAgc291cF9tZXNzYWdlX2Jv ZHlfYXBwZW5kKG1lc3NhZ2UtPnJlcXVlc3RfYm9keSwgU09VUF9NRU1PUllfVEVNUE9SQVJZLAot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYmxvYkl0ZW0uZGF0YS0+ZGF0YSgpICsg YmxvYkl0ZW0ub2Zmc2V0LCBibG9iSXRlbS5sZW5ndGgpOworICAgICAgICB0b3RhbEJvZHlTaXpl ICs9IGJsb2JJdGVtLmxlbmd0aCgpOworICAgICAgICBzb3VwX21lc3NhZ2VfYm9keV9hcHBlbmQo bWVzc2FnZS0+cmVxdWVzdF9ib2R5LCBTT1VQX01FTU9SWV9URU1QT1JBUlksIGJsb2JJdGVtLmRh dGEtPmRhdGEoKSArIGJsb2JJdGVtLm9mZnNldCgpLCBibG9iSXRlbS5sZW5ndGgoKSk7CiAgICAg ICAgIHJldHVybjsKICAgICB9CiAKQEAgLTc4OCwxMSArNzg3LDcgQEAgc3RhdGljIHZvaWQgYWRk RW5jb2RlZEJsb2JJdGVtVG9Tb3VwTWVzcwogICAgIGlmIChibG9iSXNPdXRPZkRhdGUoYmxvYkl0 ZW0pKQogICAgICAgICByZXR1cm47CiAKLSAgICBhZGRGaWxlVG9Tb3VwTWVzc2FnZUJvZHkobWVz c2FnZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYmxvYkl0ZW0ucGF0aCwKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgYmxvYkl0ZW0ub2Zmc2V0LAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBibG9iSXRlbS5sZW5ndGggPT0gQmxvYkRhdGFJdGVtOjp0b0VuZE9mRmls ZSA/IDAgOiBibG9iSXRlbS5sZW5ndGgsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRv dGFsQm9keVNpemUpOworICAgIGFkZEZpbGVUb1NvdXBNZXNzYWdlQm9keShtZXNzYWdlLCBibG9i SXRlbS5maWxlLT5wYXRoKCksIGJsb2JJdGVtLm9mZnNldCgpLCBibG9iSXRlbS5sZW5ndGgoKSA9 PSBCbG9iRGF0YUl0ZW06OnRvRW5kT2ZGaWxlID8gMCA6IGJsb2JJdGVtLmxlbmd0aCgpLCAgdG90 YWxCb2R5U2l6ZSk7CiB9CiAKIHN0YXRpYyB2b2lkIGFkZEVuY29kZWRCbG9iVG9Tb3VwTWVzc2Fn ZUJvZHkoU291cE1lc3NhZ2UqIG1lc3NhZ2UsIGNvbnN0IEZvcm1EYXRhRWxlbWVudCYgZWxlbWVu dCwgdW5zaWduZWQgbG9uZyYgdG90YWxCb2R5U2l6ZSkK