34312 2010-01-28 23:05:55 -0800 [Win] Utilize PrintContext to share the printing code with other ports 2010-02-02 03:07:33 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) PC Windows Vista RESOLVED FIXED P2 Normal --- 1 hamaji hamaji aroben bweinstein eric hayato sfalken yuzo oldest_to_newest 185749 0 hamaji 2010-01-28 23:05:55 -0800 PrintContext::computePageRects is very similar to computePageRectsForFrame in WebCore/page/FrameWin.cpp. We should be able to share the code. This is another instance of Bug 18578. A patch will come soon later. 185757 1 47683 hamaji 2010-01-28 23:50:07 -0800 Created attachment 47683 Patch v1 185758 2 hamaji 2010-01-28 23:53:18 -0800 I manually tested this patch by print-preview and didn't see any difference between before and after this patch. Please let me know if there are something I must check. 186621 3 47683 eric 2010-02-01 15:51:58 -0800 Comment on attachment 47683 Patch v1 Looks sane to me. 186662 4 eric 2010-02-01 16:13:34 -0800 Attachment 47683 was posted by a committer and has review+, assigning to Shinichiro Hamaji for commit. 186884 5 hamaji 2010-02-02 03:07:33 -0800 Committed r54221: <http://trac.webkit.org/changeset/54221> 47683 2010-01-28 23:50:07 -0800 2010-02-01 15:51:57 -0800 Patch v1 bug-34312-20100128235005.patch text/plain 5030 hamaji ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZGMzYWQ5Ny4uMTZmYTI0ZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAxMC0wMS0yOCAgU2hpbmljaGlybyBI YW1hamkgIDxoYW1hamlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFtXaW5dIFV0aWxpemUgUHJpbnRDb250ZXh0IHRvIHNoYXJl IHRoZSBwcmludGluZyBjb2RlIHdpdGggb3RoZXIgcG9ydHMKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM0MzEyCisKKyAgICAgICAgTm8gbmV3IHRlc3Rz IGFzIHRoaXMgaXMganVzdCBhIHNtYWxsIHJlZmFjdG9yaW5nLgorCiAyMDEwLTAxLTI4ICBNaWNo YWVsIE5vcmRtYW4gIDxtaWNoYWVsbkBnb29nbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IEFsZXhleSBQcm9za3VyeWFrb3YuCmRpZmYgLS1naXQgYS9XZWJDb3JlL1dlYkNvcmUudmNwcm9q L1dlYkNvcmUudmNwcm9qIGIvV2ViQ29yZS9XZWJDb3JlLnZjcHJvai9XZWJDb3JlLnZjcHJvagpp bmRleCBlNDFhN2ZhLi41OTc0MTc2IDEwMDY0NAotLS0gYS9XZWJDb3JlL1dlYkNvcmUudmNwcm9q L1dlYkNvcmUudmNwcm9qCisrKyBiL1dlYkNvcmUvV2ViQ29yZS52Y3Byb2ovV2ViQ29yZS52Y3By b2oKQEAgLTIwOTMzLDYgKzIwOTMzLDE0IEBACiAJCQkJPg0KIAkJCTwvRmlsZT4NCiAJCQk8Rmls ZQ0KKwkJCQlSZWxhdGl2ZVBhdGg9Ii4uXHBhZ2VcUHJpbnRDb250ZXh0LmNwcCINCisJCQkJPg0K KwkJCTwvRmlsZT4NCisJCQk8RmlsZQ0KKwkJCQlSZWxhdGl2ZVBhdGg9Ii4uXHBhZ2VcUHJpbnRD b250ZXh0LmgiDQorCQkJCT4NCisJCQk8L0ZpbGU+DQorCQkJPEZpbGUNCiAJCQkJUmVsYXRpdmVQ YXRoPSIuLlxwYWdlXFNjcmVlbi5jcHAiDQogCQkJCT4NCiAJCQk8L0ZpbGU+DQpkaWZmIC0tZ2l0 IGEvV2ViQ29yZS9wYWdlL1ByaW50Q29udGV4dC5oIGIvV2ViQ29yZS9wYWdlL1ByaW50Q29udGV4 dC5oCmluZGV4IDBiM2IzMDMuLjU2OWFhZjYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGFnZS9Qcmlu dENvbnRleHQuaAorKysgYi9XZWJDb3JlL3BhZ2UvUHJpbnRDb250ZXh0LmgKQEAgLTM2LDYgKzM2 LDcgQEAgcHVibGljOgogICAgIH5QcmludENvbnRleHQoKTsKIAogICAgIGludCBwYWdlQ291bnQo KSBjb25zdDsKKyAgICBjb25zdCBWZWN0b3I8SW50UmVjdD4mIHBhZ2VSZWN0cygpIGNvbnN0IHsg cmV0dXJuIG1fcGFnZVJlY3RzOyB9CiAKICAgICB2b2lkIGNvbXB1dGVQYWdlUmVjdHMoY29uc3Qg RmxvYXRSZWN0JiBwcmludFJlY3QsIGZsb2F0IGhlYWRlckhlaWdodCwgZmxvYXQgZm9vdGVySGVp Z2h0LCBmbG9hdCB1c2VyU2NhbGVGYWN0b3IsIGZsb2F0JiBvdXRQYWdlSGVpZ2h0KTsKIApkaWZm IC0tZ2l0IGEvV2ViQ29yZS9wYWdlL3dpbi9GcmFtZVdpbi5jcHAgYi9XZWJDb3JlL3BhZ2Uvd2lu L0ZyYW1lV2luLmNwcAppbmRleCA4NDQwYTgwLi4yYjU0MzVkIDEwMDY0NAotLS0gYS9XZWJDb3Jl L3BhZ2Uvd2luL0ZyYW1lV2luLmNwcAorKysgYi9XZWJDb3JlL3BhZ2Uvd2luL0ZyYW1lV2luLmNw cApAQCAtMjksNjQgKzI5LDIwIEBACiAjaW5jbHVkZSAiQnJpZGdlLmgiCiAjaW5jbHVkZSAiRG9j dW1lbnQuaCIKICNpbmNsdWRlICJGbG9hdFJlY3QuaCIKKyNpbmNsdWRlICJQcmludENvbnRleHQu aCIKICNpbmNsdWRlICJSZW5kZXJWaWV3LmgiCiAjaW5jbHVkZSAiU2V0dGluZ3MuaCIKICNpbmNs dWRlICJUcmFuc2Zvcm1hdGlvbk1hdHJpeC5oIgogCi11c2luZyBzdGQ6Om1pbjsKLQogbmFtZXNw YWNlIFdlYkNvcmUgewogCi12b2lkIGNvbXB1dGVQYWdlUmVjdHNGb3JGcmFtZShGcmFtZSogZnJh bWUsIGNvbnN0IEludFJlY3QmIHByaW50UmVjdCwgZmxvYXQgaGVhZGVySGVpZ2h0LCBmbG9hdCBm b290ZXJIZWlnaHQsIGZsb2F0IHVzZXJTY2FsZUZhY3RvciwgVmVjdG9yPEludFJlY3Q+JiBwYWdl cywgaW50JiBvdXRQYWdlSGVpZ2h0KQordm9pZCBjb21wdXRlUGFnZVJlY3RzRm9yRnJhbWUoRnJh bWUqIGZyYW1lLCBjb25zdCBJbnRSZWN0JiBwcmludFJlY3QsIGZsb2F0IGhlYWRlckhlaWdodCwg ZmxvYXQgZm9vdGVySGVpZ2h0LCBmbG9hdCB1c2VyU2NhbGVGYWN0b3IsIFZlY3RvcjxJbnRSZWN0 PiYgb3V0UGFnZXMsIGludCYgb3V0UGFnZUhlaWdodCkKIHsKLSAgICBBU1NFUlQoZnJhbWUpOwot Ci0gICAgcGFnZXMuY2xlYXIoKTsKLSAgICBvdXRQYWdlSGVpZ2h0ID0gMDsKLQotICAgIGlmICgh ZnJhbWUtPmRvY3VtZW50KCkgfHwgIWZyYW1lLT52aWV3KCkgfHwgIWZyYW1lLT5kb2N1bWVudCgp LT5yZW5kZXJlcigpKQotICAgICAgICByZXR1cm47Ci0gCi0gICAgUmVuZGVyVmlldyogcm9vdCA9 IHRvUmVuZGVyVmlldyhmcmFtZS0+ZG9jdW1lbnQoKS0+cmVuZGVyZXIoKSk7Ci0KLSAgICBpZiAo IXJvb3QpIHsKLSAgICAgICAgTE9HX0VSUk9SKCJkb2N1bWVudCB0byBiZSBwcmludGVkIGhhcyBu byByZW5kZXJlciIpOwotICAgICAgICByZXR1cm47Ci0gICAgfQotCi0gICAgaWYgKHVzZXJTY2Fs ZUZhY3RvciA8PSAwKSB7Ci0gICAgICAgIExPR19FUlJPUigidXNlclNjYWxlRmFjdG9yIGhhcyBi YWQgdmFsdWUgJS4yZiIsIHVzZXJTY2FsZUZhY3Rvcik7Ci0gICAgICAgIHJldHVybjsKLSAgICB9 Ci0gICAgCi0gICAgZmxvYXQgcmF0aW8gPSBzdGF0aWNfY2FzdDxmbG9hdD4ocHJpbnRSZWN0Lmhl aWdodCgpKSAvIHN0YXRpY19jYXN0PGZsb2F0PihwcmludFJlY3Qud2lkdGgoKSk7Ci0gCi0gICAg ZmxvYXQgcGFnZVdpZHRoICA9IHN0YXRpY19jYXN0PGZsb2F0Pihyb290LT5yaWdodExheW91dE92 ZXJmbG93KCkpOwotICAgIGZsb2F0IHBhZ2VIZWlnaHQgPSBwYWdlV2lkdGggKiByYXRpbzsKLSAg ICBvdXRQYWdlSGVpZ2h0ID0gc3RhdGljX2Nhc3Q8aW50PihwYWdlSGVpZ2h0KTsgICAvLyB0aGlz IGlzIHRoZSBoZWlnaHQgb2YgdGhlIHBhZ2UgYWRqdXN0ZWQgYnkgbWFyZ2lucwotICAgIHBhZ2VI ZWlnaHQgLT0gKGhlYWRlckhlaWdodCArIGZvb3RlckhlaWdodCk7Ci0KLSAgICBpZiAocGFnZUhl aWdodCA8PSAwKSB7Ci0gICAgICAgIExPR19FUlJPUigicGFnZUhlaWdodCBoYXMgYmFkIHZhbHVl ICUuMmYiLCBwYWdlSGVpZ2h0KTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KLQotICAgIGZsb2F0 IGN1cnJQYWdlSGVpZ2h0ID0gcGFnZUhlaWdodCAvIHVzZXJTY2FsZUZhY3RvcjsKLSAgICBmbG9h dCBkb2NIZWlnaHQgICAgICA9IHJvb3QtPmxheWVyKCktPmhlaWdodCgpOwotICAgIGZsb2F0IGRv Y1dpZHRoICAgICAgID0gcm9vdC0+bGF5ZXIoKS0+d2lkdGgoKTsKLSAgICBmbG9hdCBjdXJyUGFn ZVdpZHRoICA9IHBhZ2VXaWR0aCAvIHVzZXJTY2FsZUZhY3RvcjsKLQotICAgIAotICAgIC8vIGFs d2F5cyByZXR1cm4gYXQgbGVhc3Qgb25lIHBhZ2UsIHNpbmNlIGVtcHR5IGZpbGVzIHNob3VsZCBw cmludCBhIGJsYW5rIHBhZ2UKLSAgICBmbG9hdCBwcmludGVkUGFnZXNIZWlnaHQgPSAwLjBmOwot ICAgIGRvIHsKLSAgICAgICAgZmxvYXQgcHJvcG9zZWRCb3R0b20gPSBtaW4oZG9jSGVpZ2h0LCBw cmludGVkUGFnZXNIZWlnaHQgKyBwYWdlSGVpZ2h0KTsKLSAgICAgICAgZnJhbWUtPnZpZXcoKS0+ YWRqdXN0UGFnZUhlaWdodCgmcHJvcG9zZWRCb3R0b20sIHByaW50ZWRQYWdlc0hlaWdodCwgcHJv cG9zZWRCb3R0b20sIHByaW50ZWRQYWdlc0hlaWdodCk7Ci0gICAgICAgIGN1cnJQYWdlSGVpZ2h0 ID0gbWF4KDEuMGYsIHByb3Bvc2VkQm90dG9tIC0gcHJpbnRlZFBhZ2VzSGVpZ2h0KTsKLSAgICAg ICAKLSAgICAgICAgcGFnZXMuYXBwZW5kKEludFJlY3QoMCwgcHJpbnRlZFBhZ2VzSGVpZ2h0LCBj dXJyUGFnZVdpZHRoLCBjdXJyUGFnZUhlaWdodCkpOwotICAgICAgICBwcmludGVkUGFnZXNIZWln aHQgKz0gY3VyclBhZ2VIZWlnaHQ7Ci0gICAgfSB3aGlsZSAocHJpbnRlZFBhZ2VzSGVpZ2h0IDwg ZG9jSGVpZ2h0KTsKKyAgICBQcmludENvbnRleHQgcHJpbnRDb250ZXh0KGZyYW1lKTsKKyAgICBm bG9hdCBwYWdlSGVpZ2h0ID0gMDsKKyAgICBwcmludENvbnRleHQuY29tcHV0ZVBhZ2VSZWN0cyhw cmludFJlY3QsIGhlYWRlckhlaWdodCwgZm9vdGVySGVpZ2h0LCB1c2VyU2NhbGVGYWN0b3IsIHBh Z2VIZWlnaHQpOworICAgIG91dFBhZ2VIZWlnaHQgPSBzdGF0aWNfY2FzdDxpbnQ+KHBhZ2VIZWln aHQpOworICAgIG91dFBhZ2VzID0gcHJpbnRDb250ZXh0LnBhZ2VSZWN0cygpOwogfQogCiBEcmFn SW1hZ2VSZWYgRnJhbWU6OmRyYWdJbWFnZUZvclNlbGVjdGlvbigpCmRpZmYgLS1naXQgYS9XZWJD b3JlL3BhZ2Uvd2luL0ZyYW1lV2luLmggYi9XZWJDb3JlL3BhZ2Uvd2luL0ZyYW1lV2luLmgKaW5k ZXggOWNmOTY4My4uNGMyNzRiNyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wYWdlL3dpbi9GcmFtZVdp bi5oCisrKyBiL1dlYkNvcmUvcGFnZS93aW4vRnJhbWVXaW4uaApAQCAtMzcsNyArMzcsNyBAQCBu YW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgY2xhc3MgSW50UmVjdDsKIAogICAgIEhCSVRNQVAgaW1h Z2VGcm9tU2VsZWN0aW9uKEZyYW1lKiBmcmFtZSwgYm9vbCBmb3JjZVdoaXRlVGV4dCk7Ci0gICAg dm9pZCBjb21wdXRlUGFnZVJlY3RzRm9yRnJhbWUoRnJhbWUqLCBjb25zdCBJbnRSZWN0JiBwcmlu dFJlY3QsIGZsb2F0IGhlYWRlckhlaWdodCwgZmxvYXQgZm9vdGVySGVpZ2h0LCBmbG9hdCB1c2Vy U2NhbGVGYWN0b3IsIFZlY3RvcjxJbnRSZWN0PiYgcGFnZXMsIGludCYgcGFnZUhlaWdodCk7Cisg ICAgdm9pZCBjb21wdXRlUGFnZVJlY3RzRm9yRnJhbWUoRnJhbWUqLCBjb25zdCBJbnRSZWN0JiBw cmludFJlY3QsIGZsb2F0IGhlYWRlckhlaWdodCwgZmxvYXQgZm9vdGVySGVpZ2h0LCBmbG9hdCB1 c2VyU2NhbGVGYWN0b3IsIFZlY3RvcjxJbnRSZWN0PiYgb3V0UGFnZXMsIGludCYgb3V0UGFnZUhl aWdodCk7CiAKIH0KIAo=