22260 2008-11-14 03:58:18 -0800 Two build fixes for WebKit trunk against Symbian S60 2008-11-14 09:55:01 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 hausmann webkit-unassigned oldest_to_newest 98768 0 hausmann 2008-11-14 03:58:18 -0800 In the past few weeks we have submitted a bunch of trivial fixes for compiling the trunk of WebKit with the Qt port inside the Symbian S60 environment. Two of those fixes however are more debatable and we would like to bring them up here for discussion and review. 98771 1 25170 hausmann 2008-11-14 06:25:29 -0800 Created attachment 25170 Patch to fix compilation with WINSCW We did not find a way to make the protection against the conversion from pointers to booleans to integers work with WINSCW, hence the #ifdef in the patch. But we would like to disable the protection in that case - in order to achieve compilation - and rely on the protection to work on the actual development platforms. 98772 2 25171 hausmann 2008-11-14 06:27:32 -0800 Created attachment 25171 Simple workaround for RVCT compiler bug This rather simple patch works around a bug in RVCT. I would normally not try to submit this as it is a compiler bug, but given the difficulty of changing RVCT and the simplicity I thought it's worth a try :-) 98788 3 25170 darin 2008-11-14 09:21:28 -0800 Comment on attachment 25170 Patch to fix compilation with WINSCW Code change looks OK, but it uses tabs, so we can't check it in as-is. I'll say r=me, but to save work for committers please don't put patches up for review if they have tabs. Maybe the Qt folks can configure their git repository to catch this? 98789 4 25171 darin 2008-11-14 09:23:38 -0800 Comment on attachment 25171 Simple workaround for RVCT compiler bug Looks fine, r=me 98793 5 hausmann 2008-11-14 09:55:01 -0800 Thanks Darin for the review! Landed both (with tabs fixed) in r38391 and r38392. I'll try to fix our git repositories to catch tab errors, I'm surprised I didn't see it :( 25170 2008-11-14 06:25:29 -0800 2008-11-14 09:21:28 -0800 Patch to fix compilation with WINSCW 0001-2008-11-14-Kristian-Amlie-kristian.amlie-trolltec.patch text/plain 2815 hausmann RnJvbSAzOTg4NjAzMmNhNjcxNGI1ZDBlMzYxYTEzNjU5ODk5ZGMyMjMzMzFlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBLcmlzdGlhbiBBbWxpZSA8a3Jpc3RpYW4uYW1saWVAdHJvbGx0 ZWNoLmNvbT4KRGF0ZTogV2VkLCAyMiBPY3QgMjAwOCAxMDo1ODozNCAtMDQwMApTdWJqZWN0OiBb UEFUQ0hdIDIwMDgtMTEtMTQgIEtyaXN0aWFuIEFtbGllICA8a3Jpc3RpYW4uYW1saWVAdHJvbGx0 ZWNoLmNvbT4KCiAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgogICAgICAgIENv bXBpbGUgZml4IGZvciBXSU5TQ1cuCgogICAgICAgIFRoaXMgZml4IGRvZXNuJ3QgcHJvdGVjdCBh Z2FpbnN0IGltcGxpY2l0IGNvbnZlcnNpb25zIGZyb20gYm9vbCB0bwogICAgICAgIGludGVnZXJz LCBidXQgbW9zdCBsaWtlbHkgdGhhdCB3aWxsIGJlIGNhdWdodCBvbiBhbm90aGVyIHBsYXRmb3Jt LgotLS0KIEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyAgICAgICAgfCAgIDE0ICsrKysrKysrKysr KysrCiBKYXZhU2NyaXB0Q29yZS93dGYvUGFzc1JlZlB0ci5oIHwgICAgNSArKysrLQogSmF2YVNj cmlwdENvcmUvd3RmL1JlZlB0ci5oICAgICB8ICAgIDQgKysrKwogMyBmaWxlcyBjaGFuZ2VkLCAy MiBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZyBiL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAxNzgyMjlkLi5j YzI3ZTJjIDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvSmF2YVNj cmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMDgtMTEtMTQgIEtyaXN0aWFu IEFtbGllICA8a3Jpc3RpYW4uYW1saWVAdHJvbGx0ZWNoLmNvbT4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDb21waWxlIGZpeCBmb3IgV0lOU0NXLgor CisgICAgICAgIFRoaXMgZml4IGRvZXNuJ3QgcHJvdGVjdCBhZ2FpbnN0IGltcGxpY2l0IGNvbnZl cnNpb25zIGZyb20gYm9vbCB0bworICAgICAgICBpbnRlZ2VycywgYnV0IG1vc3QgbGlrZWx5IHRo YXQgd2lsbCBiZSBjYXVnaHQgb24gYW5vdGhlciBwbGF0Zm9ybS4KKworICAgICAgICAqIHd0Zi9Q YXNzUmVmUHRyLmg6CisgICAgICAgIChXVEY6OlBhc3NSZWZQdHI6Om9wZXJhdG9yIGJvb2wpOgor ICAgICAgICAqIHd0Zi9SZWZQdHIuaDoKKyAgICAgICAgKFdURjo6UmVmUHRyOjpvcGVyYXRvciBi b29sKToKKwogMjAwOC0xMS0xNCAgQ2FtZXJvbiBad2FyaWNoICA8endhcmljaEBhcHBsZS5jb20+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTWFjaWVqIFN0YWNob3dpYWsuCmRpZmYgLS1naXQgYS9K YXZhU2NyaXB0Q29yZS93dGYvUGFzc1JlZlB0ci5oIGIvSmF2YVNjcmlwdENvcmUvd3RmL1Bhc3NS ZWZQdHIuaAppbmRleCBjYThmMmNiLi40ZjNmMjE4IDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29y ZS93dGYvUGFzc1JlZlB0ci5oCisrKyBiL0phdmFTY3JpcHRDb3JlL3d0Zi9QYXNzUmVmUHRyLmgK QEAgLTU2LDkgKzU2LDEyIEBAIG5hbWVzcGFjZSBXVEYgewogICAgICAgICBib29sIG9wZXJhdG9y ISgpIGNvbnN0IHsgcmV0dXJuICFtX3B0cjsgfQogCiAgICAgICAgIC8vIFRoaXMgY29udmVyc2lv biBvcGVyYXRvciBhbGxvd3MgaW1wbGljaXQgY29udmVyc2lvbiB0byBib29sIGJ1dCBub3QgdG8g b3RoZXIgaW50ZWdlciB0eXBlcy4KKyNpZiBDT01QSUxFUihXSU5TQ1cpCisJb3BlcmF0b3IgYm9v bCgpIGNvbnN0IHsgcmV0dXJuIG1fcHRyOyB9CisjZWxzZQogICAgICAgICB0eXBlZGVmIFQqIFBh c3NSZWZQdHI6OipVbnNwZWNpZmllZEJvb2xUeXBlOwogICAgICAgICBvcGVyYXRvciBVbnNwZWNp ZmllZEJvb2xUeXBlKCkgY29uc3QgeyByZXR1cm4gbV9wdHIgPyAmUGFzc1JlZlB0cjo6bV9wdHIg OiAwOyB9Ci0gICAgICAgIAorI2VuZGlmCiAgICAgICAgIFBhc3NSZWZQdHImIG9wZXJhdG9yPShU Kik7CiAgICAgICAgIFBhc3NSZWZQdHImIG9wZXJhdG9yPShjb25zdCBQYXNzUmVmUHRyJik7CiAg ICAgICAgIHRlbXBsYXRlIDx0eXBlbmFtZSBVPiBQYXNzUmVmUHRyJiBvcGVyYXRvcj0oY29uc3Qg UGFzc1JlZlB0cjxVPiYpOwpkaWZmIC0tZ2l0IGEvSmF2YVNjcmlwdENvcmUvd3RmL1JlZlB0ci5o IGIvSmF2YVNjcmlwdENvcmUvd3RmL1JlZlB0ci5oCmluZGV4IDc4YmQyNTcuLjUxNGZiNzAgMTAw NjQ0Ci0tLSBhL0phdmFTY3JpcHRDb3JlL3d0Zi9SZWZQdHIuaAorKysgYi9KYXZhU2NyaXB0Q29y ZS93dGYvUmVmUHRyLmgKQEAgLTYyLDggKzYyLDEyIEBAIG5hbWVzcGFjZSBXVEYgewogICAgICAg ICBib29sIG9wZXJhdG9yISgpIGNvbnN0IHsgcmV0dXJuICFtX3B0cjsgfQogICAgIAogICAgICAg ICAvLyBUaGlzIGNvbnZlcnNpb24gb3BlcmF0b3IgYWxsb3dzIGltcGxpY2l0IGNvbnZlcnNpb24g dG8gYm9vbCBidXQgbm90IHRvIG90aGVyIGludGVnZXIgdHlwZXMuCisjaWYgQ09NUElMRVIoV0lO U0NXKQorCW9wZXJhdG9yIGJvb2woKSBjb25zdCB7IHJldHVybiBtX3B0cjsgfQorI2Vsc2UKICAg ICAgICAgdHlwZWRlZiBUKiBSZWZQdHI6OipVbnNwZWNpZmllZEJvb2xUeXBlOwogICAgICAgICBv cGVyYXRvciBVbnNwZWNpZmllZEJvb2xUeXBlKCkgY29uc3QgeyByZXR1cm4gbV9wdHIgPyAmUmVm UHRyOjptX3B0ciA6IDA7IH0KKyNlbmRpZgogICAgICAgICAKICAgICAgICAgUmVmUHRyJiBvcGVy YXRvcj0oY29uc3QgUmVmUHRyJik7CiAgICAgICAgIFJlZlB0ciYgb3BlcmF0b3I9KFQqKTsKLS0g CjEuNi4wLjIuNTMyLmc4NGVkNGMKCg== 25171 2008-11-14 06:27:32 -0800 2008-11-14 09:23:38 -0800 Simple workaround for RVCT compiler bug 0002-2008-11-14-Kristian-Amlie-kristian.amlie-trolltec.patch text/plain 3437 hausmann RnJvbSAzNGRmMTU3MTVmNzE3ZDRjYjQzMjhkMjNhN2JlZmI1YzQzYzJlMTcyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBLcmlzdGlhbiBBbWxpZSA8a3Jpc3RpYW4uYW1saWVAdHJvbGx0 ZWNoLmNvbT4KRGF0ZTogV2VkLCAyMiBPY3QgMjAwOCAxNjoyMTowMiAtMDQwMApTdWJqZWN0OiBb UEFUQ0hdIDIwMDgtMTEtMTQgIEtyaXN0aWFuIEFtbGllICA8a3Jpc3RpYW4uYW1saWVAdHJvbGx0 ZWNoLmNvbT4KCiAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgogICAgICAgIENv bXBpbGUgZml4IGZvciBSVkNULgoKICAgICAgICBJbiByZWFsaXR5LCBpdCBpcyB0d28gZml4ZXM6 CgogICAgICAgIDEuIFJlbW92ZSB0eXBlbmFtZS4gSSBiZWxpZXZlIHR5cGVuYW1lIGNhbiBvbmx5 IGJlIHVzZWQgd2hlbiB0aGUgbmFtZWQKICAgICAgICB0eXBlIGRlcGVuZHMgb24gdGhlIHRlbXBs YXRlIHBhcmFtZXRlcnMsIHdoaWNoIGl0IGRvZXNuJ3QgaW4gdGhpcwogICAgICAgIGNhc2UsIHNv IEkgdGhpbmsgdGhpcyBpcyBtb3JlIGNvcnJlY3QuCiAgICAgICAgMi4gUmVwbGFjZSA6Oml0ZXJh dG9yIHNjb3BlIHdpdGggc3BlY2lhbGl6ZWQgdHlwZWRlZi4gVGhpcyBpcyB0byB3b3JrCiAgICAg ICAgYXJvdW5kIGEgYnVnIGluIFJWQ1QuCi0tLQogSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nICAg ICAgICAgfCAgIDE3ICsrKysrKysrKysrKysrKysrCiBKYXZhU2NyaXB0Q29yZS93dGYvTGlzdEhh c2hTZXQuaCB8ICAgIDYgKysrKy0tCiAyIGZpbGVzIGNoYW5nZWQsIDIxIGluc2VydGlvbnMoKyks IDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nIGIv SmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IGNjMjdlMmMuLjBjMWMwNWYgMTAwNjQ0Ci0t LSBhL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZworKysgYi9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VM b2cKQEAgLTIsNiArMiwyMyBAQAogCiAgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgogCisgICAgICAgIENvbXBpbGUgZml4IGZvciBSVkNULgorCisgICAgICAgIEluIHJlYWxpdHks IGl0IGlzIHR3byBmaXhlczoKKworICAgICAgICAxLiBSZW1vdmUgdHlwZW5hbWUuIEkgYmVsaWV2 ZSB0eXBlbmFtZSBjYW4gb25seSBiZSB1c2VkIHdoZW4gdGhlIG5hbWVkCisgICAgICAgIHR5cGUg ZGVwZW5kcyBvbiB0aGUgdGVtcGxhdGUgcGFyYW1ldGVycywgd2hpY2ggaXQgZG9lc24ndCBpbiB0 aGlzCisgICAgICAgIGNhc2UsIHNvIEkgdGhpbmsgdGhpcyBpcyBtb3JlIGNvcnJlY3QuCisgICAg ICAgIDIuIFJlcGxhY2UgOjppdGVyYXRvciBzY29wZSB3aXRoIHNwZWNpYWxpemVkIHR5cGVkZWYu IFRoaXMgaXMgdG8gd29yaworICAgICAgICBhcm91bmQgYSBidWcgaW4gUlZDVC4KKworICAgICAg ICAqIHd0Zi9MaXN0SGFzaFNldC5oOgorICAgICAgICAoV1RGOjo6OmZpbmQpOgorCisyMDA4LTEx LTE0ICBLcmlzdGlhbiBBbWxpZSAgPGtyaXN0aWFuLmFtbGllQHRyb2xsdGVjaC5jb20+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKICAgICAgICAgQ29tcGlsZSBmaXgg Zm9yIFdJTlNDVy4KIAogICAgICAgICBUaGlzIGZpeCBkb2Vzbid0IHByb3RlY3QgYWdhaW5zdCBp bXBsaWNpdCBjb252ZXJzaW9ucyBmcm9tIGJvb2wgdG8KZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRD b3JlL3d0Zi9MaXN0SGFzaFNldC5oIGIvSmF2YVNjcmlwdENvcmUvd3RmL0xpc3RIYXNoU2V0LmgK aW5kZXggMmY3NWMzMy4uMzhjYzk5OCAxMDA2NDQKLS0tIGEvSmF2YVNjcmlwdENvcmUvd3RmL0xp c3RIYXNoU2V0LmgKKysrIGIvSmF2YVNjcmlwdENvcmUvd3RmL0xpc3RIYXNoU2V0LmgKQEAgLTYw LDYgKzYwLDggQEAgbmFtZXNwYWNlIFdURiB7CiAgICAgICAgIHR5cGVkZWYgTGlzdEhhc2hTZXRO b2RlSGFzaEZ1bmN0aW9uczxWYWx1ZUFyZywgSGFzaEFyZz4gTm9kZUhhc2g7CiAKICAgICAgICAg dHlwZWRlZiBIYXNoVGFibGU8Tm9kZSosIE5vZGUqLCBJZGVudGl0eUV4dHJhY3RvcjxOb2RlKj4s IE5vZGVIYXNoLCBOb2RlVHJhaXRzLCBOb2RlVHJhaXRzPiBJbXBsVHlwZTsKKyAgICAgICAgdHlw ZWRlZiBIYXNoVGFibGVJdGVyYXRvcjxOb2RlKiwgTm9kZSosIElkZW50aXR5RXh0cmFjdG9yPE5v ZGUqPiwgTm9kZUhhc2gsIE5vZGVUcmFpdHMsIE5vZGVUcmFpdHM+IEltcGxUeXBlSXRlcmF0b3I7 CisgICAgICAgIHR5cGVkZWYgSGFzaFRhYmxlQ29uc3RJdGVyYXRvcjxOb2RlKiwgTm9kZSosIElk ZW50aXR5RXh0cmFjdG9yPE5vZGUqPiwgTm9kZUhhc2gsIE5vZGVUcmFpdHMsIE5vZGVUcmFpdHM+ IEltcGxUeXBlQ29uc3RJdGVyYXRvcjsKIAogICAgICAgICB0eXBlZGVmIEhhc2hBcmcgSGFzaEZ1 bmN0aW9uczsKIApAQCAtNDQxLDcgKzQ0Myw3IEBAIG5hbWVzcGFjZSBXVEYgewogICAgIGlubGlu ZSB0eXBlbmFtZSBMaXN0SGFzaFNldDxULCBVPjo6aXRlcmF0b3IgTGlzdEhhc2hTZXQ8VCwgVT46 OmZpbmQoY29uc3QgVmFsdWVUeXBlJiB2YWx1ZSkKICAgICB7CiAgICAgICAgIHR5cGVkZWYgTGlz dEhhc2hTZXRUcmFuc2xhdG9yPFZhbHVlVHlwZSwgSGFzaEZ1bmN0aW9ucz4gVHJhbnNsYXRvcjsK LSAgICAgICAgdHlwZW5hbWUgSW1wbFR5cGU6Oml0ZXJhdG9yIGl0ID0gbV9pbXBsLnRlbXBsYXRl IGZpbmQ8VmFsdWVUeXBlLCBUcmFuc2xhdG9yPih2YWx1ZSk7CisgICAgICAgIEltcGxUeXBlSXRl cmF0b3IgaXQgPSBtX2ltcGwudGVtcGxhdGUgZmluZDxWYWx1ZVR5cGUsIFRyYW5zbGF0b3I+KHZh bHVlKTsKICAgICAgICAgaWYgKGl0ID09IG1faW1wbC5lbmQoKSkKICAgICAgICAgICAgIHJldHVy biBlbmQoKTsKICAgICAgICAgcmV0dXJuIG1ha2VJdGVyYXRvcigqaXQpOyAKQEAgLTQ1MSw3ICs0 NTMsNyBAQCBuYW1lc3BhY2UgV1RGIHsKICAgICBpbmxpbmUgdHlwZW5hbWUgTGlzdEhhc2hTZXQ8 VCwgVT46OmNvbnN0X2l0ZXJhdG9yIExpc3RIYXNoU2V0PFQsIFU+OjpmaW5kKGNvbnN0IFZhbHVl VHlwZSYgdmFsdWUpIGNvbnN0CiAgICAgewogICAgICAgICB0eXBlZGVmIExpc3RIYXNoU2V0VHJh bnNsYXRvcjxWYWx1ZVR5cGUsIEhhc2hGdW5jdGlvbnM+IFRyYW5zbGF0b3I7Ci0gICAgICAgIHR5 cGVuYW1lIEltcGxUeXBlOjpjb25zdF9pdGVyYXRvciBpdCA9IG1faW1wbC50ZW1wbGF0ZSBmaW5k PFZhbHVlVHlwZSwgVHJhbnNsYXRvcj4odmFsdWUpOworICAgICAgICBJbXBsVHlwZUNvbnN0SXRl cmF0b3IgaXQgPSBtX2ltcGwudGVtcGxhdGUgZmluZDxWYWx1ZVR5cGUsIFRyYW5zbGF0b3I+KHZh bHVlKTsKICAgICAgICAgaWYgKGl0ID09IG1faW1wbC5lbmQoKSkKICAgICAgICAgICAgIHJldHVy biBlbmQoKTsKICAgICAgICAgcmV0dXJuIG1ha2VDb25zdEl0ZXJhdG9yKCppdCk7Ci0tIAoxLjYu MC4yLjUzMi5nODRlZDRjCgo=