30311 2009-10-12 12:55:10 -0700 [Qt] Missing default value for the default text encoding 2009-10-12 23:11:30 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 0 jwieczorek webkit-unassigned commit-queue oldest_to_newest 154141 0 jwieczorek 2009-10-12 12:55:10 -0700 So far the default charset has been hardcoded in the constructor of QWebPagePrivate: // ### should be configurable page->settings()->setDefaultTextEncodingName("iso-8859-1"); But since the addition of an equivalent setting in QWebSettings (https://bugs.webkit.org/show_bug.cgi?id=25863), this default value has had no effect because the above two lines are followed by: settings = new QWebSettings(page->settings()); which applies the default global settings, where the default text encoding string is empty. The default value should be moved to QWebSettings (as a result, it would also work when a page-specific encoding is reset to QString()). This bug seems to trigger the fast/dom/Document/default-charset.html test failure. 154149 1 41056 jwieczorek 2009-10-12 13:20:45 -0700 Created attachment 41056 proposed patch Fixed the issue by moving the default setting to QWebSettings. Added an auto test. Unskipped fast/dom/Document/document-charset.html which is passing now. 154274 2 41056 hausmann 2009-10-12 22:52:28 -0700 Comment on attachment 41056 proposed patch Thanks! 154275 3 41056 commit-queue 2009-10-12 23:11:27 -0700 Comment on attachment 41056 proposed patch Clearing flags on attachment: 41056 Committed r49492: <http://trac.webkit.org/changeset/49492> 154276 4 commit-queue 2009-10-12 23:11:30 -0700 All reviewed patches have been landed. Closing bug. 41056 2009-10-12 13:20:45 -0700 2009-10-12 23:11:27 -0700 proposed patch 0001-Qt-Missing-default-value-for-the-default-text-encodi.patch text/plain 6205 jwieczorek RnJvbSA1ZGExYTU4YzA1MTQ5ZTVkZWY4YTlmZWIzYzQzMDc3OGY3MTExNWRjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKYWt1YiBXaWVjem9yZWsgPGZhdzIxN0BnbWFpbC5jb20+CkRh dGU6IE1vbiwgMTIgT2N0IDIwMDkgMjE6Mjg6MTMgKzAyMDAKU3ViamVjdDogW1BBVENIXSBbUXRd IE1pc3NpbmcgZGVmYXVsdCB2YWx1ZSBmb3IgdGhlIGRlZmF1bHQgdGV4dCBlbmNvZGluZy4KIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMDMxMQoKUXRXZWJLaXQgaGFz IHByb3ZpZGVkIGEgZGVmYXVsdCwgaGFyZGNvZGVkIHZhbHVlIGZvciBkZWZhdWx0IGNoYXJzZXQg YnV0IHNpbmNlCnRoZSBhZGRpdGlvbiBvZiB0aGUgZGVmYXVsdFRleHRFbmNvZGluZyBzZXR0aW5n IGluIFFXZWJTZXR0aW5ncywgdGhhdCBoYXJkY29kZWQKdmFsdWUgaGFzIGhhZCBubyBlZmZlY3Qu CgpBZGRlZCBhIHJlZ3Jlc3Npb24gdGVzdCBhbmQgdW5za2lwcGVkIGZhc3QvZG9tL0RvY3VtZW50 L2RvY3VtZW50LWNoYXJzZXQuaHRtbCwKd2hpY2ggaXMgcGFzc2luZyBub3cuCi0tLQogTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgfCAgIDE2ICsrKysrKysrKysrKysr KysKIExheW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQgICAgICAgICAgIHwgICAgMSAtCiBX ZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcCAgICAgICAgICAgICAgICB8ICAgIDMgLS0tCiBXZWJL aXQvcXQvQXBpL3F3ZWJzZXR0aW5ncy5jcHAgICAgICAgICAgICB8ICAgIDEgKwogV2ViS2l0L3F0 L0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgfCAgIDIxICsrKysrKysrKysrKysrKysr KysrKwogV2ViS2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAgfCAgIDI1ICsr KysrKysrKysrKysrKysrKysrKysrKysKIDYgZmlsZXMgY2hhbmdlZCwgNjMgaW5zZXJ0aW9ucygr KSwgNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9M YXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggOTdiY2UwMy4uMDRhNTQyNCAxMDA2NDQKLS0tIGEv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDE5IEBACisyMDA5LTEwLTEyICBKYWt1YiBXaWVjem9yZWsgIDxmYXcyMTdAZ21haWwuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0g TWlzc2luZyBkZWZhdWx0IHZhbHVlIGZvciB0aGUgZGVmYXVsdCB0ZXh0IGVuY29kaW5nLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzAzMTEKKworICAg ICAgICBRdFdlYktpdCBoYXMgcHJvdmlkZWQgYSBkZWZhdWx0LCBoYXJkY29kZWQgdmFsdWUgZm9y IGRlZmF1bHQgY2hhcnNldCBidXQgc2luY2UKKyAgICAgICAgdGhlIGFkZGl0aW9uIG9mIHRoZSBk ZWZhdWx0VGV4dEVuY29kaW5nIHNldHRpbmcgaW4gUVdlYlNldHRpbmdzLCB0aGF0IGhhcmRjb2Rl ZAorICAgICAgICB2YWx1ZSBoYXMgaGFkIG5vIGVmZmVjdC4KKworICAgICAgICBBZGRlZCBhIHJl Z3Jlc3Npb24gdGVzdCBhbmQgdW5za2lwcGVkIGZhc3QvZG9tL0RvY3VtZW50L2RvY3VtZW50LWNo YXJzZXQuaHRtbCwKKyAgICAgICAgd2hpY2ggaXMgcGFzc2luZyBub3cuCisKKyAgICAgICAgKiBw bGF0Zm9ybS9xdC9Ta2lwcGVkOgorCiAyMDA5LTEwLTEwICBDYW1lcm9uIE1jQ29ybWFjayAgPGNh bUBtY2MuaWQuYXU+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU2FtIFdlaW5pZy4KZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9y bS9xdC9Ta2lwcGVkCmluZGV4IGZiODU4YzUuLjkzNDZkNzMgMTAwNjQ0Ci0tLSBhL0xheW91dFRl c3RzL3BsYXRmb3JtL3F0L1NraXBwZWQKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tp cHBlZApAQCAtNDc1Niw3ICs0NzU2LDYgQEAgZmFzdC9kb20vUmFuZ2UvZ2V0Qm91bmRpbmdDbGll bnRSZWN0Lmh0bWwKIGZhc3QvZG9tL1JhbmdlL2dldENsaWVudFJlY3RzLmh0bWwKIGZhc3QvZG9t L2xvY2F0aW9uLWFzc2lnbi5odG1sCiBmYXN0L2RvbS90YWJpbmRleC1jbGFtcC5odG1sCi1mYXN0 L2RvbS9Eb2N1bWVudC9kb2N1bWVudC1jaGFyc2V0Lmh0bWwKIGZhc3QvZG9tL0hUTUxTY3JpcHRF bGVtZW50L25lc3RlZC1leGVjdXRpb24uaHRtbAogZmFzdC9kb20vV2luZG93L3dlYmtpdENvbnZl cnRQb2ludC5odG1sCiBmYXN0L2RvbS9XaW5kb3cvd2luZG93LWxvb2t1cC1wcmVjZWRlbmNlLmh0 bWwKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2UuY3BwIGIvV2ViS2l0L3F0L0Fw aS9xd2VicGFnZS5jcHAKaW5kZXggMGFjZWM0OC4uZTNkYzExZiAxMDA2NDQKLS0tIGEvV2ViS2l0 L3F0L0FwaS9xd2VicGFnZS5jcHAKKysrIGIvV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5jcHAKQEAg LTI3OSw5ICsyNzksNiBAQCBRV2ViUGFnZVByaXZhdGU6OlFXZWJQYWdlUHJpdmF0ZShRV2ViUGFn ZSAqcXEpCiAgICAgcGFnZSA9IG5ldyBQYWdlKGNocm9tZUNsaWVudCwgY29udGV4dE1lbnVDbGll bnQsIGVkaXRvckNsaWVudCwKICAgICAgICAgICAgICAgICAgICAgbmV3IERyYWdDbGllbnRRdChx KSwgbmV3IEluc3BlY3RvckNsaWVudFF0KHEpLCAwKTsKIAotICAgIC8vICMjIyBzaG91bGQgYmUg Y29uZmlndXJhYmxlCi0gICAgcGFnZS0+c2V0dGluZ3MoKS0+c2V0RGVmYXVsdFRleHRFbmNvZGlu Z05hbWUoImlzby04ODU5LTEiKTsKLQogICAgIHNldHRpbmdzID0gbmV3IFFXZWJTZXR0aW5ncyhw YWdlLT5zZXR0aW5ncygpKTsKIAogI2lmbmRlZiBRVF9OT19VTkRPU1RBQ0sKZGlmZiAtLWdpdCBh L1dlYktpdC9xdC9BcGkvcXdlYnNldHRpbmdzLmNwcCBiL1dlYktpdC9xdC9BcGkvcXdlYnNldHRp bmdzLmNwcAppbmRleCBhYmQ3MDM2Li4wM2VhMmE3IDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQXBp L3F3ZWJzZXR0aW5ncy5jcHAKKysrIGIvV2ViS2l0L3F0L0FwaS9xd2Vic2V0dGluZ3MuY3BwCkBA IC0zNzcsNiArMzc3LDcgQEAgUVdlYlNldHRpbmdzOjpRV2ViU2V0dGluZ3MoKQogICAgIGQtPmF0 dHJpYnV0ZXMuaW5zZXJ0KFFXZWJTZXR0aW5nczo6TG9jYWxDb250ZW50Q2FuQWNjZXNzUmVtb3Rl VXJscywgZmFsc2UpOwogICAgIGQtPmF0dHJpYnV0ZXMuaW5zZXJ0KFFXZWJTZXR0aW5nczo6U2Vz c2lvblN0b3JhZ2VFbmFibGVkLCB0cnVlKTsKICAgICBkLT5vZmZsaW5lU3RvcmFnZURlZmF1bHRR dW90YSA9IDUgKiAxMDI0ICogMTAyNDsKKyAgICBkLT5kZWZhdWx0VGV4dEVuY29kaW5nID0gUUxh dGluMVN0cmluZygiaXNvLTg4NTktMSIpOwogfQogCiAvKiEKZGlmZiAtLWdpdCBhL1dlYktpdC9x dC9DaGFuZ2VMb2cgYi9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IDdlYThkYzQuLmNiM2FjYzIg MTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L3F0L0NoYW5nZUxv ZwpAQCAtMSwzICsxLDI0IEBACisyMDA5LTEwLTEyICBKYWt1YiBXaWVjem9yZWsgIDxmYXcyMTdA Z21haWwuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFtRdF0gTWlzc2luZyBkZWZhdWx0IHZhbHVlIGZvciB0aGUgZGVmYXVsdCB0ZXh0IGVuY29k aW5nLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzAz MTEKKworICAgICAgICBRdFdlYktpdCBoYXMgcHJvdmlkZWQgYSBkZWZhdWx0LCBoYXJkY29kZWQg dmFsdWUgZm9yIGRlZmF1bHQgY2hhcnNldCBidXQgc2luY2UKKyAgICAgICAgdGhlIGFkZGl0aW9u IG9mIHRoZSBkZWZhdWx0VGV4dEVuY29kaW5nIHNldHRpbmcgaW4gUVdlYlNldHRpbmdzLCB0aGF0 IGhhcmRjb2RlZAorICAgICAgICB2YWx1ZSBoYXMgaGFkIG5vIGVmZmVjdC4KKworICAgICAgICBB ZGRlZCBhIHJlZ3Jlc3Npb24gdGVzdCBhbmQgdW5za2lwcGVkIGZhc3QvZG9tL0RvY3VtZW50L2Rv Y3VtZW50LWNoYXJzZXQuaHRtbCwKKyAgICAgICAgd2hpY2ggaXMgcGFzc2luZyBub3cuCisKKyAg ICAgICAgKiBBcGkvcXdlYnBhZ2UuY3BwOgorICAgICAgICAoUVdlYlBhZ2VQcml2YXRlOjpRV2Vi UGFnZVByaXZhdGUpOgorICAgICAgICAqIEFwaS9xd2Vic2V0dGluZ3MuY3BwOgorICAgICAgICAo UVdlYlNldHRpbmdzOjpRV2ViU2V0dGluZ3MpOgorICAgICAgICAqIHRlc3RzL3F3ZWJwYWdlL3Rz dF9xd2VicGFnZS5jcHA6CisgICAgICAgICh0c3RfUVdlYlBhZ2U6OmRlZmF1bHRUZXh0RW5jb2Rp bmcpOgorCiAyMDA5LTEwLTA5ICBKb2UgTGlnbWFuICA8am9zZXBoLmxpZ21hbkBub2tpYS5jb20+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gSGF1c21hbm4uCmRpZmYgLS1naXQgYS9XZWJL aXQvcXQvdGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJwYWdlLmNwcCBiL1dlYktpdC9xdC90ZXN0cy9x d2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwCmluZGV4IDZmY2I1MzMuLjhjOGU2ODIgMTAwNjQ0Ci0t LSBhL1dlYktpdC9xdC90ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwCisrKyBiL1dlYktp dC9xdC90ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwCkBAIC0xMTYsNiArMTE2LDcgQEAg cHJpdmF0ZSBzbG90czoKICAgICB2b2lkIHRlc3RFbmFibGVQZXJzaXN0ZW50U3RvcmFnZSgpOwog ICAgIHZvaWQgY29uc29sZU91dHB1dCgpOwogICAgIHZvaWQgaW5wdXRNZXRob2RzKCk7CisgICAg dm9pZCBkZWZhdWx0VGV4dEVuY29kaW5nKCk7CiAKICAgICB2b2lkIGNyYXNoVGVzdHNfTGF6eUlu aXRpYWxpemF0aW9uT2ZNYWluRnJhbWUoKTsKIApAQCAtMTQxNiw2ICsxNDE3LDMwIEBAIHZvaWQg dHN0X1FXZWJQYWdlOjp0ZXN0RW5hYmxlUGVyc2lzdGVudFN0b3JhZ2UoKQogICAgIFFWRVJJRlko IXdlYlBhZ2Uuc2V0dGluZ3MoKS0+aWNvbkRhdGFiYXNlUGF0aCgpLmlzRW1wdHkoKSk7CiB9CiAK K3ZvaWQgdHN0X1FXZWJQYWdlOjpkZWZhdWx0VGV4dEVuY29kaW5nKCkKK3sKKyAgICBRV2ViRnJh bWUqIG1haW5GcmFtZSA9IG1fcGFnZS0+bWFpbkZyYW1lKCk7CisKKyAgICBRU3RyaW5nIGRlZmF1 bHRDaGFyc2V0ID0gbWFpbkZyYW1lLT5ldmFsdWF0ZUphdmFTY3JpcHQoImRvY3VtZW50LmRlZmF1 bHRDaGFyc2V0IikudG9TdHJpbmcoKTsKKyAgICBRVkVSSUZZKCFkZWZhdWx0Q2hhcnNldC5pc0Vt cHR5KCkpOworICAgIFFDT01QQVJFKFFXZWJTZXR0aW5nczo6Z2xvYmFsU2V0dGluZ3MoKS0+ZGVm YXVsdFRleHRFbmNvZGluZygpLCBkZWZhdWx0Q2hhcnNldCk7CisKKyAgICBtX3BhZ2UtPnNldHRp bmdzKCktPnNldERlZmF1bHRUZXh0RW5jb2RpbmcoUVN0cmluZygidXRmLTgiKSk7CisgICAgUVN0 cmluZyBjaGFyc2V0ID0gbWFpbkZyYW1lLT5ldmFsdWF0ZUphdmFTY3JpcHQoImRvY3VtZW50LmRl ZmF1bHRDaGFyc2V0IikudG9TdHJpbmcoKTsKKyAgICBRQ09NUEFSRShjaGFyc2V0LCBRU3RyaW5n KCJ1dGYtOCIpKTsKKyAgICBRQ09NUEFSRShtX3BhZ2UtPnNldHRpbmdzKCktPmRlZmF1bHRUZXh0 RW5jb2RpbmcoKSwgY2hhcnNldCk7CisKKyAgICBtX3BhZ2UtPnNldHRpbmdzKCktPnNldERlZmF1 bHRUZXh0RW5jb2RpbmcoUVN0cmluZygpKTsKKyAgICBjaGFyc2V0ID0gbWFpbkZyYW1lLT5ldmFs dWF0ZUphdmFTY3JpcHQoImRvY3VtZW50LmRlZmF1bHRDaGFyc2V0IikudG9TdHJpbmcoKTsKKyAg ICBRVkVSSUZZKCFjaGFyc2V0LmlzRW1wdHkoKSk7CisgICAgUUNPTVBBUkUoY2hhcnNldCwgZGVm YXVsdENoYXJzZXQpOworCisgICAgUVdlYlNldHRpbmdzOjpnbG9iYWxTZXR0aW5ncygpLT5zZXRE ZWZhdWx0VGV4dEVuY29kaW5nKFFTdHJpbmcoInV0Zi04IikpOworICAgIGNoYXJzZXQgPSBtYWlu RnJhbWUtPmV2YWx1YXRlSmF2YVNjcmlwdCgiZG9jdW1lbnQuZGVmYXVsdENoYXJzZXQiKS50b1N0 cmluZygpOworICAgIFFDT01QQVJFKGNoYXJzZXQsIFFTdHJpbmcoInV0Zi04IikpOworICAgIFFD T01QQVJFKFFXZWJTZXR0aW5nczo6Z2xvYmFsU2V0dGluZ3MoKS0+ZGVmYXVsdFRleHRFbmNvZGlu ZygpLCBjaGFyc2V0KTsKK30KKwogdm9pZCB0c3RfUVdlYlBhZ2U6OmNyYXNoVGVzdHNfTGF6eUlu aXRpYWxpemF0aW9uT2ZNYWluRnJhbWUoKQogewogICAgIHsKLS0gCjEuNi40LjIKCg==