78823 2012-02-16 08:32:12 -0800 [GTK] Allow printing scaled pages in WebKit2 for printers that don't support it 2012-02-17 10:19:36 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 78805 75544 1 cgarcia webkit-unassigned gustavo oldest_to_newest 558218 0 cgarcia 2012-02-16 08:32:12 -0800 This is the last print capability that needs to be implemented manually for printers that doesn't support it like Print To File 558221 1 127385 cgarcia 2012-02-16 08:35:31 -0800 Created attachment 127385 Patch 558666 2 127385 gustavo 2012-02-16 16:41:57 -0800 Comment on attachment 127385 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=127385&action=review > Source/WebKit2/ChangeLog:14 > + page accoding to the manual scale factor. s/accoding/according/ 559284 3 cgarcia 2012-02-17 10:19:36 -0800 Committed r108092: <http://trac.webkit.org/changeset/108092> 127385 2012-02-16 08:35:31 -0800 2012-02-16 16:41:57 -0800 Patch wk2-print-scale.diff text/plain 6368 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA1NzZmM2MxLi4yOTY0ODIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjMg QEAKIDIwMTItMDItMTYgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCisgICAgICAgIFtHVEtdIEFsbG93IHByaW50aW5nIHNjYWxlZCBwYWdlcyBpbiBXZWJLaXQy IGZvciBwcmludGVycyB0aGF0IGRvbid0IHN1cHBvcnQgaXQKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc4ODIzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvZ3RrL1dlYlBy aW50T3BlcmF0aW9uR3RrLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUHJpbnRPcGVyYXRpb25H dGs6OldlYlByaW50T3BlcmF0aW9uR3RrKTogSW5pdGlhbGl6ZQorICAgICAgICBtYW51YWwgc2Nh bGUgdG8gMS4KKyAgICAgICAgKFdlYktpdDo6V2ViUHJpbnRPcGVyYXRpb25HdGs6OnJvdGF0ZVBh Z2VJZk5lZWRlZCk6IFJlbmFtZWQgYW5kCisgICAgICAgIG1vdmVkIHRoZSBuZWVkcyByb3RhdGUg Y2hlY2sgaGVyZSBhcyBhbiBlYXJseSByZXR1cm4uCisgICAgICAgIChXZWJLaXQ6OldlYlByaW50 T3BlcmF0aW9uR3RrOjpwcmVwYXJlQ29udGV4dFRvRHJhdyk6IFNjYWxlIHRoZQorICAgICAgICBw YWdlIGFjY29kaW5nIHRvIHRoZSBtYW51YWwgc2NhbGUgZmFjdG9yLgorICAgICAgICAoV2ViS2l0 OjpXZWJQcmludE9wZXJhdGlvbkd0azo6cmVuZGVyUGFnZSk6IE1vdmUgcm90YXRlUGFnZSB0bwor ICAgICAgICBwcmVwYXJlQ29udGV4dFRvRHJhdy4KKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBh Z2UvZ3RrL1dlYlByaW50T3BlcmF0aW9uR3RrLmg6CisKKzIwMTItMDItMTYgIENhcmxvcyBHYXJj aWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCiAgICAgICAgIFtHVEtdIERvY3VtZW50 IHRoYXQgbG9jYWwgcGF0aHMgaW4gaHRtbCBsb2FkZWQgd2l0aCBsb2FkSFRNTCBtaWdodCBjYXVz ZSB0aGUgd2ViIHByb2Nlc3MgdG8gdGVybWluYXRlCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD03ODcxOQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvZ3RrL1dlYlByaW50T3BlcmF0aW9uR3RrLmNwcCBiL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9ndGsvV2ViUHJpbnRPcGVyYXRpb25HdGsuY3Bw CmluZGV4IDJhNjQ5OTYuLjg0MmQ5NzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViUGFnZS9ndGsvV2ViUHJpbnRPcGVyYXRpb25HdGsuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9ndGsvV2ViUHJpbnRPcGVyYXRpb25HdGsuY3BwCkBA IC05NCw2ICs5NCw3IEBAIHB1YmxpYzoKICAgICAgICAgcHJpbnRPcGVyYXRpb24tPm1fbWFudWFs UmV2ZXJzZSA9IGd0a19wcmludF9qb2JfZ2V0X3JldmVyc2UocHJpbnRPcGVyYXRpb24tPm1fcHJp bnRKb2IuZ2V0KCkpOwogICAgICAgICBwcmludE9wZXJhdGlvbi0+bV9tYW51YWxDb3BpZXMgPSBn dGtfcHJpbnRfam9iX2dldF9udW1fY29waWVzKHByaW50T3BlcmF0aW9uLT5tX3ByaW50Sm9iLmdl dCgpKTsKICAgICAgICAgcHJpbnRPcGVyYXRpb24tPm1fbWFudWFsQ29sbGF0ZUNvcGllcyA9IGd0 a19wcmludF9qb2JfZ2V0X2NvbGxhdGUocHJpbnRPcGVyYXRpb24tPm1fcHJpbnRKb2IuZ2V0KCkp OworICAgICAgICBwcmludE9wZXJhdGlvbi0+bV9tYW51YWxTY2FsZSA9IGd0a19wcmludF9qb2Jf Z2V0X3NjYWxlKHByaW50T3BlcmF0aW9uLT5tX3ByaW50Sm9iLmdldCgpKTsKIAogICAgICAgICBw cmludE9wZXJhdGlvbi0+cHJpbnQoc3VyZmFjZSwgNzIsIDcyKTsKICAgICB9CkBAIC0zOTIsNiAr MzkzLDcgQEAgV2ViUHJpbnRPcGVyYXRpb25HdGs6OldlYlByaW50T3BlcmF0aW9uR3RrKFdlYlBh Z2UqIHBhZ2UsIGNvbnN0IFByaW50SW5mbyYgcHJpbnQKICAgICAsIG1fbWFudWFsUmV2ZXJzZShm YWxzZSkKICAgICAsIG1fbWFudWFsQ29waWVzKDEpCiAgICAgLCBtX21hbnVhbENvbGxhdGVDb3Bp ZXMoZmFsc2UpCisgICAgLCBtX21hbnVhbFNjYWxlKDEpCiB7CiB9CiAKQEAgLTQxNiw4ICs0MTgs MTEgQEAgYm9vbCBXZWJQcmludE9wZXJhdGlvbkd0azo6Y3VycmVudFBhZ2VJc0xhc3RQYWdlT2ZT aGVldCgpIGNvbnN0CiAgICAgcmV0dXJuIChtX21hbnVhbE51bWJlclVwIDwgMiB8fCAhKChtX3Bh Z2VQb3NpdGlvbiArIDEpICUgbV9tYW51YWxOdW1iZXJVcCkgfHwgbV9wYWdlUG9zaXRpb24gPT0g bV9udW1iZXJPZlBhZ2VzVG9QcmludCAtIDEpOwogfQogCi12b2lkIFdlYlByaW50T3BlcmF0aW9u R3RrOjpyb3RhdGVQYWdlKCkKK3ZvaWQgV2ViUHJpbnRPcGVyYXRpb25HdGs6OnJvdGF0ZVBhZ2VJ Zk5lZWRlZCgpCiB7CisgICAgaWYgKCFtX25lZWRzUm90YXRpb24pCisgICAgICAgIHJldHVybjsK KwogICAgIEd0a1BhcGVyU2l6ZSogcGFwZXJTaXplID0gZ3RrX3BhZ2Vfc2V0dXBfZ2V0X3BhcGVy X3NpemUobV9wYWdlU2V0dXAuZ2V0KCkpOwogICAgIGRvdWJsZSB3aWR0aCA9IGd0a19wYXBlcl9z aXplX2dldF93aWR0aChwYXBlclNpemUsIEdUS19VTklUX0lOQ0gpICogbV94RFBJOwogICAgIGRv dWJsZSBoZWlnaHQgPSBndGtfcGFwZXJfc2l6ZV9nZXRfaGVpZ2h0KHBhcGVyU2l6ZSwgR1RLX1VO SVRfSU5DSCkgKiBtX3lEUEk7CkBAIC01MTgsMTEgKzUyMywxNiBAQCB2b2lkIFdlYlByaW50T3Bl cmF0aW9uR3RrOjpwcmVwYXJlQ29udGV4dFRvRHJhdygpCiAgICAgaWYgKG1fbWFudWFsTnVtYmVy VXAgPCAyKSB7CiAgICAgICAgIGRvdWJsZSBsZWZ0ID0gZ3RrX3BhZ2Vfc2V0dXBfZ2V0X2xlZnRf bWFyZ2luKG1fcGFnZVNldHVwLmdldCgpLCBHVEtfVU5JVF9JTkNIKTsKICAgICAgICAgZG91Ymxl IHRvcCA9IGd0a19wYWdlX3NldHVwX2dldF90b3BfbWFyZ2luKG1fcGFnZVNldHVwLmdldCgpLCBH VEtfVU5JVF9JTkNIKTsKKyAgICAgICAgaWYgKG1fbWFudWFsU2NhbGUgIT0gMS4wKQorICAgICAg ICAgICAgY2Fpcm9fc2NhbGUobV9jYWlyb0NvbnRleHQuZ2V0KCksIG1fbWFudWFsU2NhbGUsIG1f bWFudWFsU2NhbGUpOworICAgICAgICByb3RhdGVQYWdlSWZOZWVkZWQoKTsKICAgICAgICAgY2Fp cm9fdHJhbnNsYXRlKG1fY2Fpcm9Db250ZXh0LmdldCgpLCBsZWZ0ICogbV94RFBJLCB0b3AgKiBt X3lEUEkpOwogCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKKyAgICByb3RhdGVQYWdlSWZOZWVk ZWQoKTsKKwogICAgIC8vIE11bHRpcGxlIHBhZ2VzIHBlciBzaGVldC4KICAgICBkb3VibGUgbWFy Z2luTGVmdCA9IGd0a19wYWdlX3NldHVwX2dldF9sZWZ0X21hcmdpbihtX3BhZ2VTZXR1cC5nZXQo KSwgR1RLX1VOSVRfUE9JTlRTKTsKICAgICBkb3VibGUgbWFyZ2luUmlnaHQgPSBndGtfcGFnZV9z ZXR1cF9nZXRfcmlnaHRfbWFyZ2luKG1fcGFnZVNldHVwLmdldCgpLCBHVEtfVU5JVF9QT0lOVFMp OwpAQCAtNTg0LDYgKzU5NCw4IEBAIHZvaWQgV2ViUHJpbnRPcGVyYXRpb25HdGs6OnByZXBhcmVD b250ZXh0VG9EcmF3KCkKIAogICAgICAgICBjYWlyb19zY2FsZShtX2NhaXJvQ29udGV4dC5nZXQo KSwgc2NhbGUsIHNjYWxlKTsKICAgICAgICAgY2Fpcm9fdHJhbnNsYXRlKG1fY2Fpcm9Db250ZXh0 LmdldCgpLCB4ICogc3RlcFggKyBvZmZzZXRYLCB5ICogc3RlcFkgKyBvZmZzZXRZKTsKKyAgICAg ICAgaWYgKG1fbWFudWFsU2NhbGUgIT0gMS4wKQorICAgICAgICAgICAgY2Fpcm9fc2NhbGUobV9j YWlyb0NvbnRleHQuZ2V0KCksIG1fbWFudWFsU2NhbGUsIG1fbWFudWFsU2NhbGUpOwogICAgICAg ICBicmVhazsKICAgICB9CiAgICAgY2FzZSAyOgpAQCAtNjAwLDYgKzYxMiw4IEBAIHZvaWQgV2Vi UHJpbnRPcGVyYXRpb25HdGs6OnByZXBhcmVDb250ZXh0VG9EcmF3KCkKIAogICAgICAgICBjYWly b19zY2FsZShtX2NhaXJvQ29udGV4dC5nZXQoKSwgc2NhbGUsIHNjYWxlKTsKICAgICAgICAgY2Fp cm9fdHJhbnNsYXRlKG1fY2Fpcm9Db250ZXh0LmdldCgpLCB5ICogcGFwZXJIZWlnaHQgKyBvZmZz ZXRZLCAoY29sdW1ucyAtIHgpICogcGFwZXJXaWR0aCArIG9mZnNldFgpOworICAgICAgICBpZiAo bV9tYW51YWxTY2FsZSAhPSAxLjApCisgICAgICAgICAgICBjYWlyb19zY2FsZShtX2NhaXJvQ29u dGV4dC5nZXQoKSwgbV9tYW51YWxTY2FsZSwgbV9tYW51YWxTY2FsZSk7CiAgICAgICAgIGNhaXJv X3JvdGF0ZShtX2NhaXJvQ29udGV4dC5nZXQoKSwgLUdfUEkgLyAyKTsKICAgICAgICAgYnJlYWs7 CiAgICAgfQpAQCAtNjEzLDE0ICs2MjcsMTIgQEAgdm9pZCBXZWJQcmludE9wZXJhdGlvbkd0azo6 cmVuZGVyUGFnZShpbnQgcGFnZU51bWJlcikKICAgICBzdGFydFBhZ2UobV9jYWlyb0NvbnRleHQu Z2V0KCkpOwogICAgIGNhaXJvX3NhdmUobV9jYWlyb0NvbnRleHQuZ2V0KCkpOwogCi0gICAgaWYg KG1fbmVlZHNSb3RhdGlvbikKLSAgICAgICAgcm90YXRlUGFnZSgpOwogICAgIHByZXBhcmVDb250 ZXh0VG9EcmF3KCk7CiAKICAgICBkb3VibGUgcGFnZVdpZHRoID0gZ3RrX3BhZ2Vfc2V0dXBfZ2V0 X3BhZ2Vfd2lkdGgobV9wYWdlU2V0dXAuZ2V0KCksIEdUS19VTklUX0lOQ0gpICogbV94RFBJOwog ICAgIFdlYkNvcmU6OlBsYXRmb3JtQ29udGV4dENhaXJvIHBsYXRmb3JtQ29udGV4dChtX2NhaXJv Q29udGV4dC5nZXQoKSk7CiAgICAgV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0IGdyYXBoaWNzQ29u dGV4dCgmcGxhdGZvcm1Db250ZXh0KTsKLSAgICBtX3ByaW50Q29udGV4dC0+c3Bvb2xQYWdlKGdy YXBoaWNzQ29udGV4dCwgcGFnZU51bWJlciwgcGFnZVdpZHRoKTsKKyAgICBtX3ByaW50Q29udGV4 dC0+c3Bvb2xQYWdlKGdyYXBoaWNzQ29udGV4dCwgcGFnZU51bWJlciwgcGFnZVdpZHRoIC8gbV9t YW51YWxTY2FsZSk7CiAKICAgICBjYWlyb19yZXN0b3JlKG1fY2Fpcm9Db250ZXh0LmdldCgpKTsK ICAgICBlbmRQYWdlKG1fY2Fpcm9Db250ZXh0LmdldCgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9ndGsvV2ViUHJpbnRPcGVyYXRpb25HdGsuaCBiL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9ndGsvV2ViUHJpbnRPcGVyYXRpb25HdGsu aAppbmRleCBjMjRhMThiLi4wZGNiMWI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYlBhZ2UvZ3RrL1dlYlByaW50T3BlcmF0aW9uR3RrLmgKKysrIGIvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL2d0ay9XZWJQcmludE9wZXJhdGlvbkd0ay5oCkBAIC02 Nyw2ICs2Nyw3IEBAIHB1YmxpYzoKICAgICBib29sIG1hbnVhbFJldmVyc2UoKSBjb25zdCB7IHJl dHVybiBtX21hbnVhbFJldmVyc2U7IH0KICAgICB1bnNpZ25lZCBpbnQgbWFudWFsQ29waWVzKCkg Y29uc3QgeyByZXR1cm4gbV9tYW51YWxDb3BpZXM7IH0KICAgICBib29sIG1hbnVhbENvbGxhdGVD b3BpZXMoKSBjb25zdCB7IHJldHVybiBtX21hbnVhbENvbGxhdGVDb3BpZXM7IH0KKyAgICBkb3Vi bGUgbWFudWFsU2NhbGUoKSBjb25zdCB7IHJldHVybiBtX21hbnVhbFNjYWxlOyB9CiAKICAgICB2 aXJ0dWFsIHZvaWQgc3RhcnRQcmludChXZWJDb3JlOjpQcmludENvbnRleHQqLCB1aW50NjRfdCBj YWxsYmFja0lEKSA9IDA7CiAKQEAgLTgyLDcgKzgzLDcgQEAgcHJvdGVjdGVkOgogCiAgICAgdm9p ZCBwcmludChjYWlyb19zdXJmYWNlX3QqLCBkb3VibGUgeERQSSwgZG91YmxlIHlEUEkpOwogICAg IHZvaWQgcmVuZGVyUGFnZShpbnQgcGFnZU51bWJlcik7Ci0gICAgdm9pZCByb3RhdGVQYWdlKCk7 CisgICAgdm9pZCByb3RhdGVQYWdlSWZOZWVkZWQoKTsKICAgICB2b2lkIGdldFJvd3NBbmRDb2x1 bW5zT2ZQYWdlc1BlclNoZWV0KHNpemVfdCYgcm93cywgc2l6ZV90JiBjb2x1bW5zKTsKICAgICB2 b2lkIGdldFBvc2l0aW9uT2ZQYWdlSW5TaGVldChzaXplX3Qgcm93cywgc2l6ZV90IGNvbHVtbnMs IGludCYgeCwgaW50JnkpOwogICAgIHZvaWQgcHJlcGFyZUNvbnRleHRUb0RyYXcoKTsKQEAgLTEx Miw2ICsxMTMsNyBAQCBwcm90ZWN0ZWQ6CiAgICAgYm9vbCBtX21hbnVhbFJldmVyc2U7CiAgICAg dW5zaWduZWQgaW50IG1fbWFudWFsQ29waWVzOwogICAgIGJvb2wgbV9tYW51YWxDb2xsYXRlQ29w aWVzOworICAgIGRvdWJsZSBtX21hbnVhbFNjYWxlOwogfTsKIAogfQo=