78805 2012-02-16 05:57:37 -0800 [GTK] Allow printing multiple copies in WebKit2 for printers that don't support it 2012-02-17 10:08:39 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 78799 75544 78823 1 cgarcia webkit-unassigned gustavo oldest_to_newest 558128 0 cgarcia 2012-02-16 05:57:37 -0800 This is another print capability that needs to be implemented manually for printers that doesn't support it like Print To File 558133 1 127367 cgarcia 2012-02-16 06:02:59 -0800 Created attachment 127367 Patch It supports collated and uncollated copies. 558665 2 127367 gustavo 2012-02-16 16:40:29 -0800 Comment on attachment 127367 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=127367&action=review > Source/WebKit2/WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp:329 > + collated = 0; This puzzled me. Why do you set collated to 0 in this case? Is it so that if there are uncollated copies left the count will start from scratch? 559269 3 cgarcia 2012-02-17 09:51:29 -0800 (In reply to comment #2) > (From update of attachment 127367 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=127367&action=review > > > Source/WebKit2/WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp:329 > > + collated = 0; > > This puzzled me. Why do you set collated to 0 in this case? Is it so that if there are uncollated copies left the count will start from scratch? No, there can't be collated and uncollated at the same time, they are mutually exclusive. When collatedCopiesLeft() is 0, it's because collated == collatedCopies - 1, so we reset it to 0, so that next page is collated again. 559270 4 127367 gustavo 2012-02-17 09:53:58 -0800 Comment on attachment 127367 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=127367&action=review >>> Source/WebKit2/WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp:329 >>> + collated = 0; >> >> This puzzled me. Why do you set collated to 0 in this case? Is it so that if there are uncollated copies left the count will start from scratch? > > No, there can't be collated and uncollated at the same time, they are mutually exclusive. When collatedCopiesLeft() is 0, it's because collated == collatedCopies - 1, so we reset it to 0, so that next page is collated again. OK, makes sense 559280 5 cgarcia 2012-02-17 10:08:39 -0800 Committed r108089: <http://trac.webkit.org/changeset/108089> 127367 2012-02-16 06:02:59 -0800 2012-02-17 09:53:58 -0800 Patch wk2-printing-copies.diff text/plain 6902 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA1NzZmM2MxLi5iYjc0NmRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjkg QEAKIDIwMTItMDItMTYgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCisgICAgICAgIFtHVEtdIEFsbG93IHByaW50aW5nIG11bHRpcGxlIGNvcGllcyBpbiBXZWJL aXQyIGZvciBwcmludGVycyB0aGF0IGRvbid0IHN1cHBvcnQgaXQKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc4ODA1CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvZ3RrL1dl YlByaW50T3BlcmF0aW9uR3RrLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UHJpbnRQYWdlc0RhdGE6 OlByaW50UGFnZXNEYXRhKTogSW5pdGlhbGl6ZSBudW1iZXIgb2YKKyAgICAgICAgY29sbGF0ZWQg YW5kIHVuY29sYXRlZCBjb3BpZXMgZG9uZSBhbmQgdG90YWwuCisgICAgICAgIChXZWJLaXQ6OlBy aW50UGFnZXNEYXRhOjpjb2xsYXRlZENvcGllc0xlZnQpOiBIZWxwZXIgZnVuY3Rpb24gdGhhdAor ICAgICAgICByZXR1cm5zIHRoZSBudW1iZXIgb2YgY29sbGF0ZWQgY29waWVzIGxlZnQgdG8gZG8u CisgICAgICAgIChXZWJLaXQ6OlByaW50UGFnZXNEYXRhOjp1bmNvbGxhdGVkQ29waWVzTGVmdCk6 IEhlbHBlciBmdW5jdGlvbgorICAgICAgICB0aGF0IHJldHVybnMgdGhlIG51bWJlciBvZiB1bmNv bGxhdGVkIGNvcGllcyBsZWZ0IHRvIGRvLgorICAgICAgICAoV2ViS2l0OjpQcmludFBhZ2VzRGF0 YTo6Y29waWVzTGVmdCk6IEhlbHBlciBmdW5jdGlvbgorICAgICAgICB0aGF0IHJldHVybnMgdGhl IG51bWJlciBvZiBjb2xsYXRlZCBvciB1bmNvbGxhdGVkIGNvcGllcyBsZWZ0IHRvCisgICAgICAg IGRvLgorICAgICAgICAoV2ViS2l0OjpQcmludFBhZ2VzRGF0YTo6aW5jcmVtZW50UGFnZVNlcXVl bmNlKTogRG8gbm90IGZpbmlzaCB0aGUKKyAgICAgICAgcHJpbnQgaWYgdGhlcmUgYXJlIHVuY29s bGF0ZWQgY29waWVzIGxlZnQsIGFuZCBkbyBub3QgaW5jcmVtZW50CisgICAgICAgIHNoZWV0IG51 bWJlciBpZiB0aGVyZSBhcmUgY29sbGF0ZWQgY29waWVzIGxlZnQuCisgICAgICAgIChXZWJLaXQ6 OldlYlByaW50T3BlcmF0aW9uR3RrOjpXZWJQcmludE9wZXJhdGlvbkd0ayk6IEluaXRpYWxpemUK KyAgICAgICAgbV9tYW51YWxDb3BpZXMgdG8gMSBhbmQgbV9tYW51YWxDb2xsYXRlQ29waWVzIHRv IGZhbHNlLgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9ndGsvV2ViUHJpbnRPcGVyYXRp b25HdGsuaDoKKworMjAxMi0wMi0xNiAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGln YWxpYS5jb20+CisKICAgICAgICAgW0dUS10gRG9jdW1lbnQgdGhhdCBsb2NhbCBwYXRocyBpbiBo dG1sIGxvYWRlZCB3aXRoIGxvYWRIVE1MIG1pZ2h0IGNhdXNlIHRoZSB3ZWIgcHJvY2VzcyB0byB0 ZXJtaW5hdGUKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTc4NzE5CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9n dGsvV2ViUHJpbnRPcGVyYXRpb25HdGsuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJQYWdlL2d0ay9XZWJQcmludE9wZXJhdGlvbkd0ay5jcHAKaW5kZXggZGYxMzM3YS4uMmE2NDk5 NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL2d0ay9XZWJQ cmludE9wZXJhdGlvbkd0ay5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQ YWdlL2d0ay9XZWJQcmludE9wZXJhdGlvbkd0ay5jcHAKQEAgLTkyLDYgKzkyLDggQEAgcHVibGlj OgogICAgICAgICBwcmludE9wZXJhdGlvbi0+bV9tYW51YWxOdW1iZXJVcExheW91dCA9IGd0a19w cmludF9qb2JfZ2V0X25fdXBfbGF5b3V0KHByaW50T3BlcmF0aW9uLT5tX3ByaW50Sm9iLmdldCgp KTsKICAgICAgICAgcHJpbnRPcGVyYXRpb24tPm1fbWFudWFsUGFnZVNldCA9IGd0a19wcmludF9q b2JfZ2V0X3BhZ2Vfc2V0KHByaW50T3BlcmF0aW9uLT5tX3ByaW50Sm9iLmdldCgpKTsKICAgICAg ICAgcHJpbnRPcGVyYXRpb24tPm1fbWFudWFsUmV2ZXJzZSA9IGd0a19wcmludF9qb2JfZ2V0X3Jl dmVyc2UocHJpbnRPcGVyYXRpb24tPm1fcHJpbnRKb2IuZ2V0KCkpOworICAgICAgICBwcmludE9w ZXJhdGlvbi0+bV9tYW51YWxDb3BpZXMgPSBndGtfcHJpbnRfam9iX2dldF9udW1fY29waWVzKHBy aW50T3BlcmF0aW9uLT5tX3ByaW50Sm9iLmdldCgpKTsKKyAgICAgICAgcHJpbnRPcGVyYXRpb24t Pm1fbWFudWFsQ29sbGF0ZUNvcGllcyA9IGd0a19wcmludF9qb2JfZ2V0X2NvbGxhdGUocHJpbnRP cGVyYXRpb24tPm1fcHJpbnRKb2IuZ2V0KCkpOwogCiAgICAgICAgIHByaW50T3BlcmF0aW9uLT5w cmludChzdXJmYWNlLCA3MiwgNzIpOwogICAgIH0KQEAgLTIwMCw5ICsyMDIsMjEgQEAgc3RydWN0 IFByaW50UGFnZXNEYXRhIHsKICAgICAgICAgLCB0b3RhbFByaW50ZWQoLTEpCiAgICAgICAgICwg cGFnZU51bWJlcigwKQogICAgICAgICAsIHNoZWV0TnVtYmVyKDApCisgICAgICAgICwgZmlyc3RT aGVldE51bWJlcigwKQogICAgICAgICAsIG51bWJlck9mU2hlZXRzKDApCisgICAgICAgICwgZmly c3RQYWdlUG9zaXRpb24oMCkKKyAgICAgICAgLCBjb2xsYXRlZCgwKQorICAgICAgICAsIHVuY29s bGF0ZWQoMCkKICAgICAgICAgLCBpc0RvbmUoZmFsc2UpCiAgICAgeworICAgICAgICBpZiAocHJp bnRPcGVyYXRpb24tPm1hbnVhbENvbGxhdGVDb3BpZXMoKSkgeworICAgICAgICAgICAgY29sbGF0 ZWRDb3BpZXMgPSBwcmludE9wZXJhdGlvbi0+bWFudWFsQ29waWVzKCk7CisgICAgICAgICAgICB1 bmNvbGxhdGVkQ29waWVzID0gMTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIGNvbGxh dGVkQ29waWVzID0gMTsKKyAgICAgICAgICAgIHVuY29sbGF0ZWRDb3BpZXMgPSBwcmludE9wZXJh dGlvbi0+bWFudWFsQ29waWVzKCk7CisgICAgICAgIH0KKwogICAgICAgICBpZiAocHJpbnRPcGVy YXRpb24tPnBhZ2VzVG9QcmludCgpID09IEdUS19QUklOVF9QQUdFU19SQU5HRVMpIHsKICAgICAg ICAgICAgIFZlY3RvcjxHdGtQYWdlUmFuZ2U+IHBhZ2VSYW5nZXM7CiAgICAgICAgICAgICBHdGtQ YWdlUmFuZ2UqIHJhbmdlcyA9IHByaW50T3BlcmF0aW9uLT5wYWdlUmFuZ2VzKCk7CkBAIC0yNzEs NiArMjg1LDIzIEBAIHN0cnVjdCBQcmludFBhZ2VzRGF0YSB7CiAgICAgICAgIC8vIGlzIGltcGxl bWVudGVkLgogICAgICAgICBwcmludE9wZXJhdGlvbi0+c2V0UGFnZVBvc2l0aW9uKHNoZWV0TnVt YmVyICogbWFudWFsTnVtYmVyVXApOwogICAgICAgICBwYWdlTnVtYmVyID0gcGFnZXNbcHJpbnRP cGVyYXRpb24tPnBhZ2VQb3NpdGlvbigpXTsKKyAgICAgICAgZmlyc3RQYWdlUG9zaXRpb24gPSBw cmludE9wZXJhdGlvbi0+cGFnZVBvc2l0aW9uKCk7CisgICAgICAgIGZpcnN0U2hlZXROdW1iZXIg PSBzaGVldE51bWJlcjsKKyAgICB9CisKKyAgICBzaXplX3QgY29sbGF0ZWRDb3BpZXNMZWZ0KCkK KyAgICB7CisgICAgICAgIHJldHVybiBjb2xsYXRlZENvcGllcyA+IDEgPyBjb2xsYXRlZENvcGll cyAtIGNvbGxhdGVkIC0gMSA6IDA7CisgICAgfQorCisgICAgc2l6ZV90IHVuY29sbGF0ZWRDb3Bp ZXNMZWZ0KCkKKyAgICB7CisgICAgICAgIHJldHVybiB1bmNvbGxhdGVkQ29waWVzID4gMSA/IHVu Y29sbGF0ZWRDb3BpZXMgLSB1bmNvbGxhdGVkIC0gMSA6IDA7CisgICAgfQorCisgICAgc2l6ZV90 IGNvcGllc0xlZnQoKQorICAgIHsKKyAgICAgICAgcmV0dXJuIGNvbGxhdGVkQ29waWVzTGVmdCgp ICsgdW5jb2xsYXRlZENvcGllc0xlZnQoKTsKICAgICB9CiAKICAgICB2b2lkIGluY3JlbWVudFBh Z2VTZXF1ZW5jZSgpCkBAIC0yODEsMTUgKzMxMiwyMyBAQCBzdHJ1Y3QgUHJpbnRQYWdlc0RhdGEg ewogICAgICAgICB9CiAKICAgICAgICAgc2l6ZV90IHBhZ2VQb3NpdGlvbiA9IHByaW50T3BlcmF0 aW9uLT5wYWdlUG9zaXRpb24oKTsKLSAgICAgICAgaWYgKHBhZ2VQb3NpdGlvbiA9PSBsYXN0UGFn ZVBvc2l0aW9uKSB7CisgICAgICAgIGlmIChwYWdlUG9zaXRpb24gPT0gbGFzdFBhZ2VQb3NpdGlv biAmJiAhY29waWVzTGVmdCgpKSB7CiAgICAgICAgICAgICBpc0RvbmUgPSB0cnVlOwogICAgICAg ICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKLSAgICAgICAgaWYgKHByaW50T3BlcmF0aW9uLT5j dXJyZW50UGFnZUlzTGFzdFBhZ2VPZlNoZWV0KCkpIHsKLSAgICAgICAgICAgIGludCBzdGVwID0g cHJpbnRPcGVyYXRpb24tPm1hbnVhbFBhZ2VTZXQoKSA9PSBHVEtfUEFHRV9TRVRfQUxMID8gMSA6 IDI7Ci0gICAgICAgICAgICBzdGVwICo9IHByaW50T3BlcmF0aW9uLT5tYW51YWxSZXZlcnNlKCkg PyAtMSA6IDE7Ci0gICAgICAgICAgICBzaGVldE51bWJlciArPSBzdGVwOworICAgICAgICBpZiAo cGFnZVBvc2l0aW9uID09IGxhc3RQYWdlUG9zaXRpb24gJiYgdW5jb2xsYXRlZENvcGllc0xlZnQo KSkgeworICAgICAgICAgICAgcGFnZVBvc2l0aW9uID0gZmlyc3RQYWdlUG9zaXRpb247CisgICAg ICAgICAgICBzaGVldE51bWJlciA9IGZpcnN0U2hlZXROdW1iZXI7CisgICAgICAgICAgICB1bmNv bGxhdGVkKys7CisgICAgICAgIH0gZWxzZSBpZiAocHJpbnRPcGVyYXRpb24tPmN1cnJlbnRQYWdl SXNMYXN0UGFnZU9mU2hlZXQoKSkgeworICAgICAgICAgICAgaWYgKCFjb2xsYXRlZENvcGllc0xl ZnQoKSkgeworICAgICAgICAgICAgICAgIGludCBzdGVwID0gcHJpbnRPcGVyYXRpb24tPm1hbnVh bFBhZ2VTZXQoKSA9PSBHVEtfUEFHRV9TRVRfQUxMID8gMSA6IDI7CisgICAgICAgICAgICAgICAg c3RlcCAqPSBwcmludE9wZXJhdGlvbi0+bWFudWFsUmV2ZXJzZSgpID8gLTEgOiAxOworICAgICAg ICAgICAgICAgIHNoZWV0TnVtYmVyICs9IHN0ZXA7CisgICAgICAgICAgICAgICAgY29sbGF0ZWQg PSAwOworICAgICAgICAgICAgfSBlbHNlCisgICAgICAgICAgICAgICAgY29sbGF0ZWQrKzsKICAg ICAgICAgICAgIHBhZ2VQb3NpdGlvbiA9IHNoZWV0TnVtYmVyICogcHJpbnRPcGVyYXRpb24tPm1h bnVhbE51bWJlclVwKCk7CiAgICAgICAgIH0gZWxzZQogICAgICAgICAgICAgcGFnZVBvc2l0aW9u Kys7CkBAIC0zMTAsOCArMzQ5LDE0IEBAIHN0cnVjdCBQcmludFBhZ2VzRGF0YSB7CiAgICAgaW50 IHBhZ2VOdW1iZXI7CiAgICAgVmVjdG9yPHNpemVfdD4gcGFnZXM7CiAgICAgaW50IHNoZWV0TnVt YmVyOworICAgIGludCBmaXJzdFNoZWV0TnVtYmVyOwogICAgIGludCBudW1iZXJPZlNoZWV0czsK KyAgICBpbnQgZmlyc3RQYWdlUG9zaXRpb247CiAgICAgaW50IGxhc3RQYWdlUG9zaXRpb247Cisg ICAgc2l6ZV90IGNvbGxhdGVkOworICAgIHNpemVfdCB1bmNvbGxhdGVkOworICAgIHNpemVfdCBj b2xsYXRlZENvcGllczsKKyAgICBzaXplX3QgdW5jb2xsYXRlZENvcGllczsKIAogICAgIGJvb2wg aXNEb25lIDogMTsKIH07CkBAIC0zNDUsNiArMzkwLDggQEAgV2ViUHJpbnRPcGVyYXRpb25HdGs6 OldlYlByaW50T3BlcmF0aW9uR3RrKFdlYlBhZ2UqIHBhZ2UsIGNvbnN0IFByaW50SW5mbyYgcHJp bnQKICAgICAsIG1fbWFudWFsTnVtYmVyVXBMYXlvdXQoMCkKICAgICAsIG1fbWFudWFsUGFnZVNl dChHVEtfUEFHRV9TRVRfQUxMKQogICAgICwgbV9tYW51YWxSZXZlcnNlKGZhbHNlKQorICAgICwg bV9tYW51YWxDb3BpZXMoMSkKKyAgICAsIG1fbWFudWFsQ29sbGF0ZUNvcGllcyhmYWxzZSkKIHsK IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL2d0ay9X ZWJQcmludE9wZXJhdGlvbkd0ay5oIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdl L2d0ay9XZWJQcmludE9wZXJhdGlvbkd0ay5oCmluZGV4IDYyMDA1MjAuLmMyNGExOGIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9ndGsvV2ViUHJpbnRPcGVy YXRpb25HdGsuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvZ3RrL1dl YlByaW50T3BlcmF0aW9uR3RrLmgKQEAgLTY1LDYgKzY1LDggQEAgcHVibGljOgogICAgIHVuc2ln bmVkIGludCBtYW51YWxOdW1iZXJVcExheW91dCgpIGNvbnN0IHsgcmV0dXJuIG1fbWFudWFsTnVt YmVyVXBMYXlvdXQ7IH0KICAgICB1bnNpZ25lZCBpbnQgbWFudWFsUGFnZVNldCgpIGNvbnN0IHsg cmV0dXJuIG1fbWFudWFsUGFnZVNldDsgfQogICAgIGJvb2wgbWFudWFsUmV2ZXJzZSgpIGNvbnN0 IHsgcmV0dXJuIG1fbWFudWFsUmV2ZXJzZTsgfQorICAgIHVuc2lnbmVkIGludCBtYW51YWxDb3Bp ZXMoKSBjb25zdCB7IHJldHVybiBtX21hbnVhbENvcGllczsgfQorICAgIGJvb2wgbWFudWFsQ29s bGF0ZUNvcGllcygpIGNvbnN0IHsgcmV0dXJuIG1fbWFudWFsQ29sbGF0ZUNvcGllczsgfQogCiAg ICAgdmlydHVhbCB2b2lkIHN0YXJ0UHJpbnQoV2ViQ29yZTo6UHJpbnRDb250ZXh0KiwgdWludDY0 X3QgY2FsbGJhY2tJRCkgPSAwOwogCkBAIC0xMDgsNiArMTEwLDggQEAgcHJvdGVjdGVkOgogICAg IHVuc2lnbmVkIGludCBtX21hbnVhbE51bWJlclVwTGF5b3V0OwogICAgIHVuc2lnbmVkIGludCBt X21hbnVhbFBhZ2VTZXQ7CiAgICAgYm9vbCBtX21hbnVhbFJldmVyc2U7CisgICAgdW5zaWduZWQg aW50IG1fbWFudWFsQ29waWVzOworICAgIGJvb2wgbV9tYW51YWxDb2xsYXRlQ29waWVzOwogfTsK IAogfQo=