64232 2011-07-09 11:09:42 -0700 wxPrintData settings 2011-07-09 12:33:13 -0700 1 1 1 Unclassified WebKit WebKit wx 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 robin webkit-unassigned kevino oldest_to_newest 434502 0 robin 2011-07-09 11:09:42 -0700 Make sure wxPrintData grabs the default print settings to calculate page width, and readjusts settings after the print dialog is displayed. 434503 1 100211 robin 2011-07-09 11:10:31 -0700 Created attachment 100211 wxPrintData patch 434517 2 kevino 2011-07-09 12:33:13 -0700 Landed in r90683, thanks! 100211 2011-07-09 11:10:31 -0700 2011-07-09 11:21:09 -0700 wxPrintData patch print_data.patch text/plain 2948 robin SW5kZXg6IFNvdXJjZS9XZWJLaXQvd3gvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvd3gvQ2hhbmdlTG9nCShyZXZpc2lvbiA5MDY1MCkKKysrIFNvdXJjZS9XZWJLaXQvd3gv Q2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDctMDggIFJv YmluIER1bm4gIDxyb2JpbkBhbGxkdW5uLmNvbT4KKworICAgICAgICBNYWtlIHN1cmUgd3hQcmlu dERhdGEgZ3JhYnMgdGhlIGRlZmF1bHQgcHJpbnQgc2V0dGluZ3MgdG8gY2FsY3VsYXRlIHBhZ2Ug d2lkdGgsIAorICAgICAgICBhbmQgcmVhZGp1c3RzIHNldHRpbmdzIGFmdGVyIHRoZSBwcmludCBk aWFsb2cgaXMgZGlzcGxheWVkLiAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIFdlYkZyYW1lLmNwcDoKKyAgICAgICAgKHd4V2ViRnJhbWVQcmludG91 dDo6SW5pdGlhbGl6ZVdpdGhQYWdlU2l6ZSk6CisgICAgICAgICh3eFdlYkZyYW1lUHJpbnRvdXQ6 Ok9uQmVnaW5QcmludGluZyk6CisgICAgICAgICh3eFdlYkZyYW1lOjpQcmludCk6CisKIDIwMTEt MDctMDYgIEtldmluIE9sbGl2aWVyICA8a2V2aW5vQHRoZW9sbGl2aWVycy5jb20+CiAKICAgICAg ICAgW3d4XSBVbnJldmlld2VkIGJ1aWxkIGZpeC4gRG9uJ3QgZXhwb3NlIHRoZSBraXQgZnVuY3Rp b24gdG8gdGhlIHN3aWcgd3JhcHBlcnMuCkluZGV4OiBTb3VyY2UvV2ViS2l0L3d4L1dlYkZyYW1l LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L3d4L1dlYkZyYW1lLmNwcAkocmV2aXNp b24gOTA1OTApCisrKyBTb3VyY2UvV2ViS2l0L3d4L1dlYkZyYW1lLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMTE3LDcgKzExNyw3IEBACiAgICAgICAgIHBhZ2VSZWN0LnkgPSBwYWdlUmVjdC55ICog bW1Ub1BpeGVsc1k7CiAgICAgICAgIHBhZ2VSZWN0LndpZHRoID0gcGFnZVJlY3Qud2lkdGggKiBt bVRvUGl4ZWxzWDsKICAgICAgICAgcGFnZVJlY3QuaGVpZ2h0ID0gcGFnZVJlY3QuaGVpZ2h0ICog bW1Ub1BpeGVsc1k7Ci0KKyAgICAgICAgCiAgICAgICAgIG1fcGFnZVdpZHRoID0gcGFnZVJlY3Qu d2lkdGg7CiAgICAgICAgIG1fcHJpbnRDb250ZXh0LmJlZ2luKG1fcGFnZVdpZHRoKTsKICAgICAg ICAgCkBAIC0xMjksNiArMTI5LDExIEBACiAgICAgewogICAgICAgICB3eFByaW50ZXJEQyogcGRj ID0gZHluYW1pY19jYXN0PHd4UHJpbnRlckRDKj4oR2V0REMoKSk7CiAgICAgICAgIHBkYy0+U2V0 TWFwTW9kZSh3eE1NX1BPSU5UUyk7CisgICAgICAgIGludCBwYWdlV2lkdGggPSAwOworICAgICAg ICBpbnQgcGFnZUhlaWdodCA9IDA7CisgICAgICAgIEdldFBhZ2VTaXplTU0oJnBhZ2VXaWR0aCwg JnBhZ2VIZWlnaHQpOworICAgICAgICAKKyAgICAgICAgSW5pdGlhbGl6ZVdpdGhQYWdlU2l6ZSh3 eFJlY3QoMCwgMCwgcGFnZVdpZHRoLCBwYWdlSGVpZ2h0KSk7CiAgICAgfQogICAgIAogICAgIHZv aWQgR2V0UGFnZUluZm8oaW50ICptaW5QYWdlLCBpbnQgKm1heFBhZ2UsIGludCAqcGFnZUZyb20s IGludCAqcGFnZVRvKQpAQCAtNTc5LDkgKzU4NCw5IEBACiAgICAgCiAgICAgd3hQcmludERpYWxv Z0RhdGEgcHJpbnRkYXRhOwogICAgIHByaW50ZGF0YS5HZXRQcmludERhdGEoKS5TZXRQcmludE1v ZGUod3hQUklOVF9NT0RFX1BSSU5URVIpOwotICAgIHByaW50ZGF0YS5HZXRQcmludERhdGEoKS5T ZXRQYXBlcklkKHd4UEFQRVJfTEVUVEVSKTsKICAgICBwcmludGRhdGEuR2V0UHJpbnREYXRhKCku U2V0Tm9Db3BpZXMoMSk7Ci0gICAgICAgIAorICAgIHByaW50ZGF0YS5HZXRQcmludERhdGEoKS5D b252ZXJ0RnJvbU5hdGl2ZSgpOworICAgIAogICAgIHd4UGFnZVNldHVwRGlhbG9nRGF0YSBwYWdl U2V0dXAocHJpbnRkYXRhLkdldFByaW50RGF0YSgpKTsKIAogICAgIHd4UmVjdCBwYXBlclNpemUg PSBwYWdlU2V0dXAuR2V0UGFwZXJTaXplKCk7CkBAIC01OTgsMTkgKzYwMywxNyBAQAogICAgIHBy aW50ZGF0YS5TZXRGcm9tUGFnZSgxKTsKICAgICBwcmludGRhdGEuU2V0VG9QYWdlKHByaW50b3V0 LT5HZXRQYWdlQ291bnQoKSk7CiAKLSAgICB3eFByaW50RGlhbG9nRGF0YSBkYXRhKHByaW50ZGF0 YSk7Ci0KICAgICBpZiAoc2hvd0RpYWxvZykgewotICAgICAgICB3eFByaW50RGlhbG9nIGRpYWxv ZygwLCAmZGF0YSk7CisgICAgICAgIHd4UHJpbnREaWFsb2cgZGlhbG9nKDAsICZwcmludGRhdGEp OwogICAgICAgICBpZiAoZGlhbG9nLlNob3dNb2RhbCgpID09IHd4SURfT0spIHsKLSAgICAgICAg ICAgIGRhdGEgPSBkaWFsb2cuR2V0UHJpbnREaWFsb2dEYXRhKCk7Ci0gICAgICAgICAgICBwcmlu dG91dC0+U2V0Rmlyc3RQYWdlKGRhdGEuR2V0RnJvbVBhZ2UoKSk7Ci0gICAgICAgICAgICBwcmlu dG91dC0+U2V0TGFzdFBhZ2UoZGF0YS5HZXRUb1BhZ2UoKSk7CisgICAgICAgICAgICB3eFByaW50 RGlhbG9nRGF0YSB1cGRhdGVkUHJpbnRkYXRhID0gZGlhbG9nLkdldFByaW50RGlhbG9nRGF0YSgp OyAgICAgICAgICAgIAorICAgICAgICAgICAgcHJpbnRvdXQtPlNldEZpcnN0UGFnZSh1cGRhdGVk UHJpbnRkYXRhLkdldEZyb21QYWdlKCkpOworICAgICAgICAgICAgcHJpbnRvdXQtPlNldExhc3RQ YWdlKHVwZGF0ZWRQcmludGRhdGEuR2V0VG9QYWdlKCkpOwogICAgICAgICB9IGVsc2UKICAgICAg ICAgICAgIHJldHVybjsKICAgICB9CiAgICAgCi0gICAgd3hQcmludGVyIHByaW50ZXIoJmRhdGEp OworICAgIHd4UHJpbnRlciBwcmludGVyKCZwcmludGRhdGEpOwogICAgICAgICAKICAgICBwcmlu dGVyLlByaW50KDAsIHByaW50b3V0LCBmYWxzZSk7CiAgICAgICAgIAo=