37622 2010-04-14 16:16:02 -0700 [Qt] Moving setViewMode from DumpRenderTreeSupportQt to qwebpage.cpp 2010-04-20 12:37:27 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) PC All RESOLVED FIXED Qt P2 Normal --- 1 luiz webkit-unassigned commit-queue hausmann oldest_to_newest 212640 0 luiz 2010-04-14 16:16:02 -0700 Method qt_wrt_setViewMode was removed from qwebpage.cpp by mistake in r57433 (bug 35844). Moving it back. 212646 1 53383 luiz 2010-04-14 16:21:58 -0700 Created attachment 53383 patch 1 212659 2 hausmann 2010-04-14 16:55:25 -0700 A nicer way of achieving the same kind of private "API" would be to use dynamic properties. So instead of using a private function QWebPage* page = ... qt_wrt_setViewMode(page, "foobar"); the client could would be much simpler: page->setProperty("wrt_viewMode", "foobar"); and QWebPage would receiver a QEvent::DynamicPropertyChange where the QEvent* is actually a QDynamicPropertyChangeEvent. Here's a link to the docs: http://doc.qt.nokia.com/4.6/qobject.html#setProperty 212723 3 53383 commit-queue 2010-04-14 20:34:52 -0700 Comment on attachment 53383 patch 1 Clearing flags on attachment: 53383 Committed r57629: <http://trac.webkit.org/changeset/57629> 212724 4 commit-queue 2010-04-14 20:34:57 -0700 All reviewed patches have been landed. Closing bug. 214870 5 hausmann 2010-04-20 12:37:27 -0700 Right now the function in question is still present in the qtwebkit-2.0 branch, so I'm removing this as a blocker 53383 2010-04-14 16:21:58 -0700 2010-04-14 20:34:52 -0700 patch 1 0001-Qt-Moving-setViewMode-from-DumpRenderTreeSupportQt-t.patch text/plain 5829 luiz RnJvbSBmNGZjNDY0NjdmMTJiNDdmNWI2NzRmYmFmMzNlOTJkNTUxN2QzMjU5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBMdWl6IEFnb3N0aW5pIDxsdWl6LmFnb3N0aW5pQG9wZW5ib3Nz YS5vcmc+CkRhdGU6IFdlZCwgMTQgQXByIDIwMTAgMjA6MTk6NDIgLTAzMDAKU3ViamVjdDogW1BB VENIXSBbUXRdIE1vdmluZyBzZXRWaWV3TW9kZSBmcm9tIER1bXBSZW5kZXJUcmVlU3VwcG9ydFF0 IHRvIHF3ZWJwYWdlLmNwcAogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTM3NjIyCgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCk1ldGhvZCBxdF93cnRfc2V0Vmll d01vZGUgd2FzIHJlbW92ZWQgZnJvbSBxd2VicGFnZS5jcHAgYnkgbWlzdGFrZSBpbiByNTc0MzMK KGJ1ZyAzNTg0NCkuIE1vdmluZyBpdCBiYWNrLgoKV2ViS2l0L3F0OgoKKiBBcGkvcXdlYnBhZ2Uu Y3BwOgoocXRfd3J0X3NldFZpZXdNb2RlKToKKiBXZWJDb3JlU3VwcG9ydC9EdW1wUmVuZGVyVHJl ZVN1cHBvcnRRdC5jcHA6CihEdW1wUmVuZGVyVHJlZVN1cHBvcnRRdDo6c2V0TWVkaWFUeXBlKToK KiBXZWJDb3JlU3VwcG9ydC9EdW1wUmVuZGVyVHJlZVN1cHBvcnRRdC5oOgoKV2ViS2l0VG9vbHM6 CgoqIER1bXBSZW5kZXJUcmVlL3F0L0xheW91dFRlc3RDb250cm9sbGVyUXQuY3BwOgooTGF5b3V0 VGVzdENvbnRyb2xsZXI6OnNldFZpZXdNb2RlTWVkaWFGZWF0dXJlKToKLS0tCiBXZWJLaXQvcXQv QXBpL3F3ZWJwYWdlLmNwcCAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgIDkgKysrKysrKysr CiBXZWJLaXQvcXQvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAg MTYgKysrKysrKysrKysrKysrKwogLi4uL3F0L1dlYkNvcmVTdXBwb3J0L0R1bXBSZW5kZXJUcmVl U3VwcG9ydFF0LmNwcCAgfCAgICA5IC0tLS0tLS0tLQogV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0 L0R1bXBSZW5kZXJUcmVlU3VwcG9ydFF0LmggfCAgICAxIC0KIFdlYktpdFRvb2xzL0NoYW5nZUxv ZyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAxMyArKysrKysrKysrKysrCiAuLi4v RHVtcFJlbmRlclRyZWUvcXQvTGF5b3V0VGVzdENvbnRyb2xsZXJRdC5jcHAgICB8ICAgIDMgKyst CiA2IGZpbGVzIGNoYW5nZWQsIDQwIGluc2VydGlvbnMoKyksIDExIGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2UuY3BwIGIvV2ViS2l0L3F0L0FwaS9xd2Vi cGFnZS5jcHAKaW5kZXggMTgwYzdhZi4uM2E1MzUxNCAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L0Fw aS9xd2VicGFnZS5jcHAKKysrIGIvV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5jcHAKQEAgLTEyMCw2 ICsxMjAsMTUgQEAKIAogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKK3ZvaWQgUVdFQktJVF9F WFBPUlQgcXRfd3J0X3NldFZpZXdNb2RlKFFXZWJQYWdlKiBwYWdlLCBjb25zdCBRU3RyaW5nJiBt b2RlKQoreworICAgIFFXZWJQYWdlUHJpdmF0ZTo6cHJpdihwYWdlKS0+dmlld01vZGUgPSBtb2Rl OworICAgIFdlYkNvcmU6OkZyYW1lKiBmcmFtZSA9IFFXZWJGcmFtZVByaXZhdGU6OmNvcmUocGFn ZS0+bWFpbkZyYW1lKCkpOworICAgIFdlYkNvcmU6OkZyYW1lVmlldyogdmlldyA9IGZyYW1lLT52 aWV3KCk7CisgICAgZnJhbWUtPmRvY3VtZW50KCktPnVwZGF0ZVN0eWxlU2VsZWN0b3IoKTsKKyAg ICB2aWV3LT5mb3JjZUxheW91dCgpOworfQorCiBib29sIFFXZWJQYWdlUHJpdmF0ZTo6ZHJ0UnVu ID0gZmFsc2U7CiAKIGNsYXNzIFFXZWJQYWdlV2lkZ2V0Q2xpZW50IDogcHVibGljIFFXZWJQYWdl Q2xpZW50IHsKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9XZWJLaXQvcXQvQ2hh bmdlTG9nCmluZGV4IGY1M2M2ODMuLmUxNjZmOTAgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9DaGFu Z2VMb2cKKysrIGIvV2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEwLTA0 LTE0ICBMdWl6IEFnb3N0aW5pICA8bHVpei5hZ29zdGluaUBvcGVuYm9zc2Eub3JnPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gTW92aW5nIHNl dFZpZXdNb2RlIGZyb20gRHVtcFJlbmRlclRyZWVTdXBwb3J0UXQgdG8gcXdlYnBhZ2UuY3BwCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNzYyMgorCisg ICAgICAgIE1ldGhvZCBxdF93cnRfc2V0Vmlld01vZGUgd2FzIHJlbW92ZWQgZnJvbSBxd2VicGFn ZS5jcHAgYnkgbWlzdGFrZSBpbiByNTc0MzMKKyAgICAgICAgKGJ1ZyAzNTg0NCkuIE1vdmluZyBp dCBiYWNrLgorCisgICAgICAgICogQXBpL3F3ZWJwYWdlLmNwcDoKKyAgICAgICAgKHF0X3dydF9z ZXRWaWV3TW9kZSk6CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvRHVtcFJlbmRlclRyZWVTdXBw b3J0UXQuY3BwOgorICAgICAgICAoRHVtcFJlbmRlclRyZWVTdXBwb3J0UXQ6OnNldE1lZGlhVHlw ZSk6CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvRHVtcFJlbmRlclRyZWVTdXBwb3J0UXQuaDoK KwogMjAxMC0wNC0xNCAgQWFyb24gQm9vZG1hbiAgPGFhQGNocm9taXVtLm9yZz4KIAogICAgICAg ICBSZXZpZXdlZCBieSBEYXZpZCBMZXZpbi4KZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9XZWJDb3Jl U3VwcG9ydC9EdW1wUmVuZGVyVHJlZVN1cHBvcnRRdC5jcHAgYi9XZWJLaXQvcXQvV2ViQ29yZVN1 cHBvcnQvRHVtcFJlbmRlclRyZWVTdXBwb3J0UXQuY3BwCmluZGV4IDk3YmI5OWEuLjRkZjgwMjEg MTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9EdW1wUmVuZGVyVHJlZVN1cHBv cnRRdC5jcHAKKysrIGIvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0R1bXBSZW5kZXJUcmVlU3Vw cG9ydFF0LmNwcApAQCAtMzQyLDEyICszNDIsMyBAQCB2b2lkIER1bXBSZW5kZXJUcmVlU3VwcG9y dFF0OjpzZXRNZWRpYVR5cGUoUVdlYkZyYW1lKiBmcmFtZSwgY29uc3QgUVN0cmluZyYgdHlwZQog ICAgIGNvcmVGcmFtZS0+ZG9jdW1lbnQoKS0+dXBkYXRlU3R5bGVTZWxlY3RvcigpOwogICAgIHZp ZXctPmZvcmNlTGF5b3V0KCk7CiB9Ci0KLXZvaWQgRHVtcFJlbmRlclRyZWVTdXBwb3J0UXQ6OnNl dFZpZXdNb2RlKFFXZWJQYWdlKiBwYWdlLCBjb25zdCBRU3RyaW5nJiBtb2RlKQotewotICAgIFFX ZWJQYWdlUHJpdmF0ZTo6cHJpdihwYWdlKS0+dmlld01vZGUgPSBtb2RlOwotICAgIFdlYkNvcmU6 OkZyYW1lKiBmcmFtZSA9IFFXZWJGcmFtZVByaXZhdGU6OmNvcmUocGFnZS0+bWFpbkZyYW1lKCkp OwotICAgIFdlYkNvcmU6OkZyYW1lVmlldyogdmlldyA9IGZyYW1lLT52aWV3KCk7Ci0gICAgZnJh bWUtPmRvY3VtZW50KCktPnVwZGF0ZVN0eWxlU2VsZWN0b3IoKTsKLSAgICB2aWV3LT5mb3JjZUxh eW91dCgpOwotfQpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0R1bXBSZW5k ZXJUcmVlU3VwcG9ydFF0LmggYi9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRHVtcFJlbmRlclRy ZWVTdXBwb3J0UXQuaAppbmRleCA3ZTAzZDdjLi4yNTYyOTdmIDEwMDY0NAotLS0gYS9XZWJLaXQv cXQvV2ViQ29yZVN1cHBvcnQvRHVtcFJlbmRlclRyZWVTdXBwb3J0UXQuaAorKysgYi9XZWJLaXQv cXQvV2ViQ29yZVN1cHBvcnQvRHVtcFJlbmRlclRyZWVTdXBwb3J0UXQuaApAQCAtNjYsNyArNjYs NiBAQCBwdWJsaWM6CiAgICAgc3RhdGljIFFTdHJpbmcgY291bnRlclZhbHVlRm9yRWxlbWVudEJ5 SWQoUVdlYkZyYW1lKiBmcmFtZSwgY29uc3QgUVN0cmluZyYgaWQpOwogICAgIHN0YXRpYyB2b2lk IHdlYlBhZ2VTZXRHcm91cE5hbWUoUVdlYlBhZ2UqIHBhZ2UsIGNvbnN0IFFTdHJpbmcmIGdyb3Vw TmFtZSk7CiAgICAgc3RhdGljIHZvaWQgY2xlYXJGcmFtZU5hbWUoUVdlYkZyYW1lKiBmcmFtZSk7 Ci0gICAgc3RhdGljIHZvaWQgc2V0Vmlld01vZGUoUVdlYlBhZ2UqIHBhZ2UsIGNvbnN0IFFTdHJp bmcmIG1vZGUpOwogICAgIHN0YXRpYyB2b2lkIG92ZXJ3cml0ZVBsdWdpbkRpcmVjdG9yaWVzKCk7 CiAgICAgc3RhdGljIGludCBudW1iZXJPZkFjdGl2ZUFuaW1hdGlvbnMoUVdlYkZyYW1lKik7CiAg ICAgc3RhdGljIGludCBudW1iZXJPZlBhZ2VzKFFXZWJGcmFtZSogZnJhbWUsIGZsb2F0IHdpZHRo LCBmbG9hdCBoZWlnaHQpOwpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nIGIvV2Vi S2l0VG9vbHMvQ2hhbmdlTG9nCmluZGV4IDIzMjFkOTIuLjUzNjU1NjYgMTAwNjQ0Ci0tLSBhL1dl YktpdFRvb2xzL0NoYW5nZUxvZworKysgYi9XZWJLaXRUb29scy9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwxNiBAQAorMjAxMC0wNC0xNCAgTHVpeiBBZ29zdGluaSAgPGx1aXouYWdvc3RpbmlAb3BlbmJv c3NhLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBbUXRdIE1vdmluZyBzZXRWaWV3TW9kZSBmcm9tIER1bXBSZW5kZXJUcmVlU3VwcG9ydFF0IHRv IHF3ZWJwYWdlLmNwcAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9Mzc2MjIKKworICAgICAgICBNZXRob2QgcXRfd3J0X3NldFZpZXdNb2RlIHdhcyByZW1v dmVkIGZyb20gcXdlYnBhZ2UuY3BwIGJ5IG1pc3Rha2UgaW4gcjU3NDMzCisgICAgICAgIChidWcg MzU4NDQpLiBNb3ZpbmcgaXQgYmFjay4KKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL3F0L0xh eW91dFRlc3RDb250cm9sbGVyUXQuY3BwOgorICAgICAgICAoTGF5b3V0VGVzdENvbnRyb2xsZXI6 OnNldFZpZXdNb2RlTWVkaWFGZWF0dXJlKToKKwogMjAxMC0wNC0xNCAgQnJpYW4gV2VpbnN0ZWlu ICA8YndlaW5zdGVpbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBSb2Jl bi4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L0xheW91dFRlc3RD b250cm9sbGVyUXQuY3BwIGIvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvTGF5b3V0VGVz dENvbnRyb2xsZXJRdC5jcHAKaW5kZXggNzM3ZjU1YS4uMjkwZjNiMiAxMDA2NDQKLS0tIGEvV2Vi S2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvTGF5b3V0VGVzdENvbnRyb2xsZXJRdC5jcHAKKysr IGIvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvTGF5b3V0VGVzdENvbnRyb2xsZXJRdC5j cHAKQEAgLTM3LDYgKzM3LDcgQEAKICNpbmNsdWRlIDxRTG9jYWxlPgogI2luY2x1ZGUgPHF3ZWJz ZXR0aW5ncy5oPgogCitleHRlcm4gdm9pZCBxdF93cnRfc2V0Vmlld01vZGUoUVdlYlBhZ2UqIHBh Z2UsIGNvbnN0IFFTdHJpbmcmIG1vZGUpOwogZXh0ZXJuIHZvaWQgcXRfZHVtcF9lZGl0aW5nX2Nh bGxiYWNrcyhib29sIGIpOwogZXh0ZXJuIHZvaWQgcXRfZHVtcF9mcmFtZV9sb2FkZXIoYm9vbCBi KTsKIGV4dGVybiB2b2lkIHF0X2R1bXBfcmVzb3VyY2VfbG9hZF9jYWxsYmFja3MoYm9vbCBiKTsK QEAgLTEzOSw3ICsxNDAsNyBAQCBRU3RyaW5nIExheW91dFRlc3RDb250cm9sbGVyOjpjb3VudGVy VmFsdWVGb3JFbGVtZW50QnlJZChjb25zdCBRU3RyaW5nJiBpZCkKIAogdm9pZCBMYXlvdXRUZXN0 Q29udHJvbGxlcjo6c2V0Vmlld01vZGVNZWRpYUZlYXR1cmUoY29uc3QgUVN0cmluZyYgbW9kZSkK IHsKLSAgICBEdW1wUmVuZGVyVHJlZVN1cHBvcnRRdDo6c2V0Vmlld01vZGUobV9kcnQtPndlYlBh Z2UoKSwgbW9kZSk7CisgICAgcXRfd3J0X3NldFZpZXdNb2RlKG1fZHJ0LT53ZWJQYWdlKCksIG1v ZGUpOwogfQogCiBpbnQgTGF5b3V0VGVzdENvbnRyb2xsZXI6OndlYkhpc3RvcnlJdGVtQ291bnQo KQotLSAKMS42LjMuMwoK