60984 2011-05-17 13:48:02 -0700 [Qt] Fix tst_QWebFrame::getSetStaticProperty() autotest 2011-05-19 13:35:58 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 38654 1 cmarcelo cmarcelo ademar commit-queue oldest_to_newest 405269 0 cmarcelo 2011-05-17 13:48:02 -0700 [Qt] Fix tst_QWebFrame::getSetStaticProperty() autotest 405277 1 93813 cmarcelo 2011-05-17 13:57:51 -0700 Created attachment 93813 Patch 405407 2 93813 kling 2011-05-17 17:06:22 -0700 Comment on attachment 93813 Patch r=me, though I wonder about other potential cases where we'd end up with an exception on the ExecState. 405682 3 cmarcelo 2011-05-18 06:51:11 -0700 (In reply to comment #2) > (From update of attachment 93813 [details]) > r=me, though I wonder about other potential cases where we'd end up with an exception on the ExecState. There are other potential cases, like value.toString. However, the conversion function is huge and I want clean it up before treating the other cases. I'm landing this since it fix the concrete reproducible (and important) case we have -- converting 'document' to 'QVariantMap'. We can improve the exception "cleaning" later. 405691 4 93813 commit-queue 2011-05-18 07:13:08 -0700 Comment on attachment 93813 Patch Clearing flags on attachment: 93813 Committed r86758: <http://trac.webkit.org/changeset/86758> 405692 5 commit-queue 2011-05-18 07:13:13 -0700 All reviewed patches have been landed. Closing bug. 406609 6 ademar 2011-05-19 13:35:58 -0700 Revision r86758 cherry-picked into qtwebkit-2.2 with commit cace979 <http://gitorious.org/webkit/qtwebkit/commit/cace979> 93813 2011-05-17 13:57:51 -0700 2011-05-18 07:13:08 -0700 Patch bug-60984-20110517175752.patch text/plain 4741 cmarcelo U3VidmVyc2lvbiBSZXZpc2lvbjogODY2OTcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBiZTYxNzNkODNlNGZhZGEw MTAxZTg4NmFkODYwOGQzOTA0ZDI3NmJmLi4wODIyYTMzOTZlYzlhZGNiYzkwNzY3MTQ1MzZlZDJl ZTc4NTMzN2FiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTEtMDUtMTcgIENhaW8g TWFyY2VsbyBkZSBPbGl2ZWlyYSBGaWxobyAgPGNhaW8ub2xpdmVpcmFAb3BlbmJvc3NhLm9yZz4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIEZp eCB0c3RfUVdlYkZyYW1lOjpnZXRTZXRTdGF0aWNQcm9wZXJ0eSgpIGF1dG90ZXN0CisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MDk4NAorCisgICAgICAg IFRoZSBjb2RlIGZvciBjb252ZXJ0aW5nIG9iamVjdHMgdG8gUVZhcmlhbnRNYXAgd2FzIGNhdXNp bmcgZXhjZXB0aW9uLAorICAgICAgICB0aGF0IHdhcyAibGVha2luZyIgdG8gdGhlIG5leHQgZXZh bHVhdGlvbi4gT25lIHNpdHVhdGlvbiB3YXMgcmVhZGluZworICAgICAgICB0aGUgcHJvcGVydHkg J2xvY2FsU3RvcmFnZScgd2hlbiB3ZSBkbyBub3QgaGF2ZSBhIHByb3BlciBzZWN1cml0eQorICAg ICAgICBvcmlnaW4sIHdoaWNoIHRocm93cyBhIFNFQ1VSSVRZX0VSUi4KKworICAgICAgICBOb3cs IHdlIHdpbGwgc2ltcGx5IG5vdCBpbmNsdWRlIG9uIHRoZSBRVmFyaWFudE1hcCB0aG9zZSBwcm9w ZXJ0aWVzLAorICAgICAgICBhbmQgbWFrZSBzdXJlIHRoYXQgd2UgY2xlYW4gdGhlIGV4Y2VwdGlv biBpZiBuZWNlc3NhcnkuCisKKyAgICAgICAgKiBicmlkZ2UvcXQvcXRfcnVudGltZS5jcHA6Cisg ICAgICAgIChKU0M6OkJpbmRpbmdzOjpjb252ZXJ0VmFsdWVUb1FWYXJpYW50TWFwKToKKyAgICAg ICAgRXh0cmFjdGVkIGZ1bmN0aW9uIHRoYXQgcGVyZm9ybXMgY29udmVyc2lvbiBmcm9tIEpTT2Jq ZWN0IHRvIGEgUVZhcmlhbnRNYXAuIFRoaXMKKyAgICAgICAgZnVuY3Rpb25zIG1ha2VzIHN1cmUg dGhhdCBleGNlcHRpb24gaXMgY2xlYW4gYWZ0ZXIgaXRzIGV4ZWN1dGlvbi4KKworICAgICAgICAo SlNDOjpCaW5kaW5nczo6Y29udmVydFZhbHVlVG9RVmFyaWFudCk6CisgICAgICAgIFVzZSB0aGUg cHJldmlvdXMgZnVuY3Rpb24uIEFkZCBhIGNvbW1lbnQgZXhwbGFpbmluZyB0aGUgY2hvaWNlIG9m IGRpc3RhbmNlIHZhbHVlLgorCiAyMDExLTA1LTE3ICBBbmRyZWFzIEtsaW5nICA8a2xpbmdAd2Vi a2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNl bi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JyaWRnZS9xdC9xdF9ydW50aW1lLmNwcCBi L1NvdXJjZS9XZWJDb3JlL2JyaWRnZS9xdC9xdF9ydW50aW1lLmNwcAppbmRleCA3ZTJiZjIwOWQ3 MzYyYmIwYTU4OWU0ZThmNzBlYmI2ZTVkMjk3ZDFkLi42MmQ0NDE3YTc0MjJlOThmMGUwODM1NzFm ZWU4MmQ4YWY2ZGRmZmNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9icmlkZ2UvcXQvcXRf cnVudGltZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYnJpZGdlL3F0L3F0X3J1bnRpbWUuY3Bw CkBAIC0xODAsNiArMTgwLDM3IEBAIHN0YXRpYyBKU1JlYWxUeXBlIHZhbHVlUmVhbFR5cGUoRXhl Y1N0YXRlKiBleGVjLCBKU1ZhbHVlIHZhbCkKICAgICByZXR1cm4gU3RyaW5nOyAvLyBJIGRvbid0 IGtub3cuCiB9CiAKK1FWYXJpYW50IGNvbnZlcnRWYWx1ZVRvUVZhcmlhbnQoRXhlY1N0YXRlKiwg SlNWYWx1ZSwgUU1ldGFUeXBlOjpUeXBlLCBpbnQqLCBIYXNoU2V0PEpTT2JqZWN0Kj4qLCBpbnQp OworCitzdGF0aWMgUVZhcmlhbnRNYXAgY29udmVydFZhbHVlVG9RVmFyaWFudE1hcChFeGVjU3Rh dGUqIGV4ZWMsIEpTT2JqZWN0KiBvYmplY3QsIEhhc2hTZXQ8SlNPYmplY3QqPiogdmlzaXRlZE9i amVjdHMsIGludCByZWN1cnNpb25MaW1pdCkKK3sKKyAgICBRX0FTU0VSVCghZXhlYy0+aGFkRXhj ZXB0aW9uKCkpOworCisgICAgUHJvcGVydHlOYW1lQXJyYXkgcHJvcGVydGllcyhleGVjKTsKKyAg ICBvYmplY3QtPmdldFByb3BlcnR5TmFtZXMoZXhlYywgcHJvcGVydGllcyk7CisgICAgUHJvcGVy dHlOYW1lQXJyYXk6OmNvbnN0X2l0ZXJhdG9yIGl0ID0gcHJvcGVydGllcy5iZWdpbigpOworICAg IFFWYXJpYW50TWFwIHJlc3VsdDsKKyAgICBpbnQgb2JqZGlzdCA9IDA7CisKKyAgICB3aGlsZSAo aXQgIT0gcHJvcGVydGllcy5lbmQoKSkgeworICAgICAgICBpZiAob2JqZWN0LT5wcm9wZXJ0eUlz RW51bWVyYWJsZShleGVjLCAqaXQpKSB7CisgICAgICAgICAgICBKU1ZhbHVlIHZhbCA9IG9iamVj dC0+Z2V0KGV4ZWMsICppdCk7CisgICAgICAgICAgICBpZiAoZXhlYy0+aGFkRXhjZXB0aW9uKCkp CisgICAgICAgICAgICAgICAgZXhlYy0+Y2xlYXJFeGNlcHRpb24oKTsKKyAgICAgICAgICAgIGVs c2UgeworICAgICAgICAgICAgICAgIFFWYXJpYW50IHYgPSBjb252ZXJ0VmFsdWVUb1FWYXJpYW50 KGV4ZWMsIHZhbCwgUU1ldGFUeXBlOjpWb2lkLCAmb2JqZGlzdCwgdmlzaXRlZE9iamVjdHMsIHJl Y3Vyc2lvbkxpbWl0KTsKKyAgICAgICAgICAgICAgICBpZiAob2JqZGlzdCA+PSAwKSB7CisgICAg ICAgICAgICAgICAgICAgIFVTdHJpbmcgdXN0cmluZyA9ICgqaXQpLnVzdHJpbmcoKTsKKyAgICAg ICAgICAgICAgICAgICAgUVN0cmluZyBpZCA9IFFTdHJpbmcoKGNvbnN0IFFDaGFyKil1c3RyaW5n LmltcGwoKS0+Y2hhcmFjdGVycygpLCB1c3RyaW5nLmxlbmd0aCgpKTsKKyAgICAgICAgICAgICAg ICAgICAgcmVzdWx0Lmluc2VydChpZCwgdik7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAg ICAgfQorICAgICAgICB9CisgICAgICAgICsraXQ7CisgICAgfQorICAgIHJldHVybiByZXN1bHQ7 Cit9CisKIFFWYXJpYW50IGNvbnZlcnRWYWx1ZVRvUVZhcmlhbnQoRXhlY1N0YXRlKiBleGVjLCBK U1ZhbHVlIHZhbHVlLCBRTWV0YVR5cGU6OlR5cGUgaGludCwgaW50ICpkaXN0YW5jZSwgSGFzaFNl dDxKU09iamVjdCo+KiB2aXNpdGVkT2JqZWN0cywgaW50IHJlY3Vyc2lvbkxpbWl0KQogewogICAg IC0tcmVjdXJzaW9uTGltaXQ7CkBAIC0zNTQsMjcgKzM4NSw5IEBAIFFWYXJpYW50IGNvbnZlcnRW YWx1ZVRvUVZhcmlhbnQoRXhlY1N0YXRlKiBleGVjLCBKU1ZhbHVlIHZhbHVlLCBRTWV0YVR5cGU6 OlR5cGUKIAogICAgICAgICBjYXNlIFFNZXRhVHlwZTo6UVZhcmlhbnRNYXA6CiAgICAgICAgICAg ICBpZiAodHlwZSA9PSBPYmplY3QgfHwgdHlwZSA9PSBBcnJheSB8fCB0eXBlID09IFJUQXJyYXkp IHsKLSAgICAgICAgICAgICAgICAvLyBFbnVtZXJhdGUgdGhlIGNvbnRlbnRzIG9mIHRoZSBvYmpl Y3QKLSAgICAgICAgICAgICAgICBQcm9wZXJ0eU5hbWVBcnJheSBwcm9wZXJ0aWVzKGV4ZWMpOwot ICAgICAgICAgICAgICAgIG9iamVjdC0+Z2V0UHJvcGVydHlOYW1lcyhleGVjLCBwcm9wZXJ0aWVz KTsKLSAgICAgICAgICAgICAgICBQcm9wZXJ0eU5hbWVBcnJheTo6Y29uc3RfaXRlcmF0b3IgaXQg PSBwcm9wZXJ0aWVzLmJlZ2luKCk7Ci0KLSAgICAgICAgICAgICAgICBRVmFyaWFudE1hcCByZXN1 bHQ7Ci0gICAgICAgICAgICAgICAgaW50IG9iamRpc3QgPSAwOwotICAgICAgICAgICAgICAgIHdo aWxlKGl0ICE9IHByb3BlcnRpZXMuZW5kKCkpIHsKLSAgICAgICAgICAgICAgICAgICAgaWYgKG9i amVjdC0+cHJvcGVydHlJc0VudW1lcmFibGUoZXhlYywgKml0KSkgewotICAgICAgICAgICAgICAg ICAgICAgICAgSlNWYWx1ZSB2YWwgPSBvYmplY3QtPmdldChleGVjLCAqaXQpOwotICAgICAgICAg ICAgICAgICAgICAgICAgUVZhcmlhbnQgdiA9IGNvbnZlcnRWYWx1ZVRvUVZhcmlhbnQoZXhlYywg dmFsLCBRTWV0YVR5cGU6OlZvaWQsICZvYmpkaXN0LCB2aXNpdGVkT2JqZWN0cywgcmVjdXJzaW9u TGltaXQpOwotICAgICAgICAgICAgICAgICAgICAgICAgaWYgKG9iamRpc3QgPj0gMCkgewotICAg ICAgICAgICAgICAgICAgICAgICAgICAgIFVTdHJpbmcgdXN0cmluZyA9ICgqaXQpLnVzdHJpbmco KTsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBRU3RyaW5nIGlkID0gUVN0cmluZygoY29u c3QgUUNoYXIqKXVzdHJpbmcuaW1wbCgpLT5jaGFyYWN0ZXJzKCksIHVzdHJpbmcubGVuZ3RoKCkp OwotICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJlc3VsdC5pbnNlcnQoaWQsIHYpOwotICAg ICAgICAgICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAg ICAgICAgICAgICsraXQ7Ci0gICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIHJldCA9 IFFWYXJpYW50KGNvbnZlcnRWYWx1ZVRvUVZhcmlhbnRNYXAoZXhlYywgb2JqZWN0LCB2aXNpdGVk T2JqZWN0cywgcmVjdXJzaW9uTGltaXQpKTsKKyAgICAgICAgICAgICAgICAvLyBUaG9zZSB0eXBl cyBjYW4gc3RpbGwgaGF2ZSBwZXJmZWN0IG1hdGNoZXMsIGUuZy4gJ2Jvb2wnIGlmIHZhbHVlIGlz IGEgQm9vbGVhbiBPYmplY3QuCiAgICAgICAgICAgICAgICAgZGlzdCA9IDE7Ci0gICAgICAgICAg ICAgICAgcmV0ID0gUVZhcmlhbnQocmVzdWx0KTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAg IGJyZWFrOwogCg==