47180 2010-10-05 08:25:12 -0700 SVGTextLayoutAttributesBuilder: "XValue" and "YValue" clash with X11 macros 2010-10-08 07:36:50 -0700 1 1 1 Unclassified WebKit SVG 528+ (Nightly build) All Linux RESOLVED FIXED Qt, QtTriaged P2 Normal --- 1 kling webkit-unassigned mdelaney7 zimmermann oldest_to_newest 289622 0 kling 2010-10-05 08:25:12 -0700 Xutil.h defines both "XValue" and "YValue", so including that before SVGTextLayoutAttributesBuilder.h breaks compilation. It would be neat if we could avoid these names (but there's always the npruntime_internal.h approach of manually undeffing things..) This currently breaks Qt+V8 compilation. 291524 1 zimmermann 2010-10-08 02:36:27 -0700 Ok, just rename to XValueAttribute or sth. similar, no problem. 291527 2 70217 kling 2010-10-08 02:43:02 -0700 Created attachment 70217 Proposed patch 291529 3 70217 zimmermann 2010-10-08 02:45:57 -0700 Comment on attachment 70217 Proposed patch r=me. 291652 4 70217 kling 2010-10-08 07:36:40 -0700 Comment on attachment 70217 Proposed patch Clearing flags on attachment: 70217 Committed r69399: <http://trac.webkit.org/changeset/69399> 291653 5 kling 2010-10-08 07:36:50 -0700 All reviewed patches have been landed. Closing bug. 70217 2010-10-08 02:43:02 -0700 2010-10-08 07:36:40 -0700 Proposed patch bug-47180.diff text/plain 3880 kling ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MDViMTcwNS4uYmM3MmRhMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMC0xMC0wOCAgQW5kcmVhcyBLbGlu ZyAgPGtsaW5nQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgU1ZHVGV4dExheW91dEF0dHJpYnV0ZXNCdWlsZGVyOiAiWFZhbHVlIiBh bmQgIllWYWx1ZSIgY2xhc2ggd2l0aCBYMTEgbWFjcm9zCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NzE4MAorCisgICAgICAgIFJlbmFtZSAqVmFsdWUg dG8gKlZhbHVlQXR0cmlidXRlCisKKyAgICAgICAgKiByZW5kZXJpbmcvc3ZnL1NWR1RleHRMYXlv dXRBdHRyaWJ1dGVzQnVpbGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTVkdUZXh0TGF5b3V0 QXR0cmlidXRlc0J1aWxkZXI6Om5leHRMYXlvdXRWYWx1ZSk6CisgICAgICAgIChXZWJDb3JlOjpT VkdUZXh0TGF5b3V0QXR0cmlidXRlc0J1aWxkZXI6OmFzc2lnbkxheW91dEF0dHJpYnV0ZXNGb3JD aGFyYWN0ZXIpOgorICAgICAgICAqIHJlbmRlcmluZy9zdmcvU1ZHVGV4dExheW91dEF0dHJpYnV0 ZXNCdWlsZGVyLmg6CisKIDIwMTAtMTAtMDggIEtpbnVrbyBZYXN1ZGEgIDxraW51a29AY2hyb21p dW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhdmlkIExldmluLgpkaWZmIC0tZ2l0IGEv V2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1NWR1RleHRMYXlvdXRBdHRyaWJ1dGVzQnVpbGRlci5jcHAg Yi9XZWJDb3JlL3JlbmRlcmluZy9zdmcvU1ZHVGV4dExheW91dEF0dHJpYnV0ZXNCdWlsZGVyLmNw cAppbmRleCA2NmZjYjM3Li5jM2Y0YjZhIDEwMDY0NAotLS0gYS9XZWJDb3JlL3JlbmRlcmluZy9z dmcvU1ZHVGV4dExheW91dEF0dHJpYnV0ZXNCdWlsZGVyLmNwcAorKysgYi9XZWJDb3JlL3JlbmRl cmluZy9zdmcvU1ZHVGV4dExheW91dEF0dHJpYnV0ZXNCdWlsZGVyLmNwcApAQCAtMjU4LDE5ICsy NTgsMTkgQEAgZmxvYXQgU1ZHVGV4dExheW91dEF0dHJpYnV0ZXNCdWlsZGVyOjpuZXh0TGF5b3V0 VmFsdWUoTGF5b3V0VmFsdWVUeXBlIHR5cGUsIHVuc2kKIAogICAgICAgICBjb25zdCBWZWN0b3I8 ZmxvYXQ+KiB2YWx1ZXNQb2ludGVyID0gMDsKICAgICAgICAgc3dpdGNoICh0eXBlKSB7Ci0gICAg ICAgIGNhc2UgWFZhbHVlOgorICAgICAgICBjYXNlIFhWYWx1ZUF0dHJpYnV0ZToKICAgICAgICAg ICAgIHZhbHVlc1BvaW50ZXIgPSAmc2NvcGUuYXR0cmlidXRlcy54VmFsdWVzKCk7CiAgICAgICAg ICAgICBicmVhazsKLSAgICAgICAgY2FzZSBZVmFsdWU6CisgICAgICAgIGNhc2UgWVZhbHVlQXR0 cmlidXRlOgogICAgICAgICAgICAgdmFsdWVzUG9pbnRlciA9ICZzY29wZS5hdHRyaWJ1dGVzLnlW YWx1ZXMoKTsKICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICBjYXNlIER4VmFsdWU6CisgICAg ICAgIGNhc2UgRHhWYWx1ZUF0dHJpYnV0ZToKICAgICAgICAgICAgIHZhbHVlc1BvaW50ZXIgPSAm c2NvcGUuYXR0cmlidXRlcy5keFZhbHVlcygpOwogICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAg IGNhc2UgRHlWYWx1ZToKKyAgICAgICAgY2FzZSBEeVZhbHVlQXR0cmlidXRlOgogICAgICAgICAg ICAgdmFsdWVzUG9pbnRlciA9ICZzY29wZS5hdHRyaWJ1dGVzLmR5VmFsdWVzKCk7CiAgICAgICAg ICAgICBicmVhazsKLSAgICAgICAgY2FzZSBSb3RhdGVWYWx1ZToKKyAgICAgICAgY2FzZSBSb3Rh dGVWYWx1ZUF0dHJpYnV0ZToKICAgICAgICAgICAgIHZhbHVlc1BvaW50ZXIgPSAmc2NvcGUuYXR0 cmlidXRlcy5yb3RhdGVWYWx1ZXMoKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBkZWZh dWx0OgpAQCAtMjk0LDExICsyOTQsMTEgQEAgZmxvYXQgU1ZHVGV4dExheW91dEF0dHJpYnV0ZXNC dWlsZGVyOjpuZXh0TGF5b3V0VmFsdWUoTGF5b3V0VmFsdWVUeXBlIHR5cGUsIHVuc2kKIAogdm9p ZCBTVkdUZXh0TGF5b3V0QXR0cmlidXRlc0J1aWxkZXI6OmFzc2lnbkxheW91dEF0dHJpYnV0ZXNG b3JDaGFyYWN0ZXIoU1ZHVGV4dExheW91dEF0dHJpYnV0ZXMmIGF0dHJpYnV0ZXMsIFNWR1RleHRN ZXRyaWNzJiBtZXRyaWNzLCB1bnNpZ25lZCB2YWx1ZUxpc3RQb3NpdGlvbikgY29uc3QKIHsKLSAg ICBhdHRyaWJ1dGVzLnhWYWx1ZXMoKS5hcHBlbmQobmV4dExheW91dFZhbHVlKFhWYWx1ZSwgdmFs dWVMaXN0UG9zaXRpb24pKTsKLSAgICBhdHRyaWJ1dGVzLnlWYWx1ZXMoKS5hcHBlbmQobmV4dExh eW91dFZhbHVlKFlWYWx1ZSwgdmFsdWVMaXN0UG9zaXRpb24pKTsKLSAgICBhdHRyaWJ1dGVzLmR4 VmFsdWVzKCkuYXBwZW5kKG5leHRMYXlvdXRWYWx1ZShEeFZhbHVlLCB2YWx1ZUxpc3RQb3NpdGlv bikpOwotICAgIGF0dHJpYnV0ZXMuZHlWYWx1ZXMoKS5hcHBlbmQobmV4dExheW91dFZhbHVlKER5 VmFsdWUsIHZhbHVlTGlzdFBvc2l0aW9uKSk7Ci0gICAgYXR0cmlidXRlcy5yb3RhdGVWYWx1ZXMo KS5hcHBlbmQobmV4dExheW91dFZhbHVlKFJvdGF0ZVZhbHVlLCB2YWx1ZUxpc3RQb3NpdGlvbikp OworICAgIGF0dHJpYnV0ZXMueFZhbHVlcygpLmFwcGVuZChuZXh0TGF5b3V0VmFsdWUoWFZhbHVl QXR0cmlidXRlLCB2YWx1ZUxpc3RQb3NpdGlvbikpOworICAgIGF0dHJpYnV0ZXMueVZhbHVlcygp LmFwcGVuZChuZXh0TGF5b3V0VmFsdWUoWVZhbHVlQXR0cmlidXRlLCB2YWx1ZUxpc3RQb3NpdGlv bikpOworICAgIGF0dHJpYnV0ZXMuZHhWYWx1ZXMoKS5hcHBlbmQobmV4dExheW91dFZhbHVlKER4 VmFsdWVBdHRyaWJ1dGUsIHZhbHVlTGlzdFBvc2l0aW9uKSk7CisgICAgYXR0cmlidXRlcy5keVZh bHVlcygpLmFwcGVuZChuZXh0TGF5b3V0VmFsdWUoRHlWYWx1ZUF0dHJpYnV0ZSwgdmFsdWVMaXN0 UG9zaXRpb24pKTsKKyAgICBhdHRyaWJ1dGVzLnJvdGF0ZVZhbHVlcygpLmFwcGVuZChuZXh0TGF5 b3V0VmFsdWUoUm90YXRlVmFsdWVBdHRyaWJ1dGUsIHZhbHVlTGlzdFBvc2l0aW9uKSk7CiAgICAg YXR0cmlidXRlcy50ZXh0TWV0cmljc1ZhbHVlcygpLmFwcGVuZChtZXRyaWNzKTsKIH0KIApkaWZm IC0tZ2l0IGEvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1NWR1RleHRMYXlvdXRBdHRyaWJ1dGVzQnVp bGRlci5oIGIvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1NWR1RleHRMYXlvdXRBdHRyaWJ1dGVzQnVp bGRlci5oCmluZGV4IDMzNmM0YzMuLmYyOWFjNjQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcmVuZGVy aW5nL3N2Zy9TVkdUZXh0TGF5b3V0QXR0cmlidXRlc0J1aWxkZXIuaAorKysgYi9XZWJDb3JlL3Jl bmRlcmluZy9zdmcvU1ZHVGV4dExheW91dEF0dHJpYnV0ZXNCdWlsZGVyLmgKQEAgLTYyLDExICs2 MiwxMSBAQCBwcml2YXRlOgogICAgIHZvaWQgcHJvcGFnYXRlTGF5b3V0QXR0cmlidXRlcyhSZW5k ZXJPYmplY3QqLCB1bnNpZ25lZCYgYXRDaGFyYWN0ZXIsIFVDaGFyJiBsYXN0Q2hhcmFjdGVyKSBj b25zdDsKIAogICAgIGVudW0gTGF5b3V0VmFsdWVUeXBlIHsKLSAgICAgICAgWFZhbHVlLAotICAg ICAgICBZVmFsdWUsCi0gICAgICAgIER4VmFsdWUsCi0gICAgICAgIER5VmFsdWUsCi0gICAgICAg IFJvdGF0ZVZhbHVlCisgICAgICAgIFhWYWx1ZUF0dHJpYnV0ZSwKKyAgICAgICAgWVZhbHVlQXR0 cmlidXRlLAorICAgICAgICBEeFZhbHVlQXR0cmlidXRlLAorICAgICAgICBEeVZhbHVlQXR0cmli dXRlLAorICAgICAgICBSb3RhdGVWYWx1ZUF0dHJpYnV0ZQogICAgIH07CiAKICAgICBmbG9hdCBu ZXh0TGF5b3V0VmFsdWUoTGF5b3V0VmFsdWVUeXBlLCB1bnNpZ25lZCBhdENoYXJhY3RlcikgY29u c3Q7Cg==