124795 2013-11-22 15:20:21 -0800 [Win] Clean up ColorSpace handling in Windows code 2013-11-22 16:15:34 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) PC All RESOLVED FIXED InRadar P2 Normal --- 31196 1 bfulgham bfulgham oldest_to_newest 953695 0 bfulgham 2013-11-22 15:20:21 -0800 There were some hard-coded DeviceColorSpace calls in the Windows code that should be revised to match all other platforms. This patch properly handles the sRGB color space (both on older Windows installations and current software) so that our existing test suites pass. It also removes some hard-coded ColorSpace values that were introduced while correcting a build failure around four years ago that were never revised to take advantage of the API. 953698 1 217720 bfulgham 2013-11-22 15:28:43 -0800 Created attachment 217720 Patch 953705 2 bfulgham 2013-11-22 15:44:37 -0800 <rdar://problem/7387791> 953708 3 217720 thorton 2013-11-22 15:55:04 -0800 Comment on attachment 217720 Patch r+ with the changes discussed on IRC 953721 4 bfulgham 2013-11-22 16:15:34 -0800 Committed r159720: <http://trac.webkit.org/changeset/159720> 217720 2013-11-22 15:28:43 -0800 2013-11-22 15:55:04 -0800 Patch bug-124795-20131122152843.patch text/plain 6254 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1OTcxNikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDEzLTExLTIyICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtXaW5dIENsZWFuIHVwIENv bG9yU3BhY2UgaGFuZGxpbmcgaW4gV2luZG93cyBjb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjQ3OTUKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGdW5jdGlvbmFsaXR5IGNvdmVyZWQgYnkgZXhpc3Rp bmcgZmFzdC9jc3MvY29sb3IgdGVzdCBzdWl0ZS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL2NnL0dyYXBoaWNzQ29udGV4dENHLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnNhZmVSR0JD b2xvclNwYWNlUmVmKTogSGFuZGxlIGNhc2Ugb2YgV2luZG93cyBDRyBpbXBsZW1lbnRhdGlvbiBu b3QKKyAgICAgICAgaGFuZGxpbmcgc1JHQiBjb3JyZWN0bHkuCisgICAgICAgIChXZWJDb3JlOjpz UkdCQ29sb3JTcGFjZVJlZik6IFVzZSBuZXcgaGVscGVyIGZ1bmN0aW9uLgorICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL3dpbi9Gb250Q0dXaW4uY3BwOgorICAgICAgICAoV2ViQ29yZTo6Rm9u dDo6ZHJhd0dseXBocyk6IFBhc3MgY29ycmVjdCBjb2xvciBzcGFjZSB0byBmaWxsIGZ1bmN0aW9u cy4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy93aW4vR3JhcGhpY3NDb250ZXh0Q0dXaW4u Y3BwOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpwbGF0Zm9ybUluaXQpOiBJ bml0aWFsaXplIGNvbG9yIHNwYWNlIHRvIHZhbHVlIHBhc3NlZAorICAgICAgICB2aWEgdGhlIHN0 eWxlIHRvIHRoZSBjb25zdHJ1Y3Rvci4KKwogMjAxMy0xMS0yMiAgQnJlbmRhbiBMb25nICA8Yi5s b25nQGNhYmxlbGFicy5jb20+CiAKICAgICAgICAgRmlyZSAiY2hhbmdlIiBldmVudCBvbiBUZXh0 VHJhY2tMaXN0IHdoZW4gYSBUZXh0VHJhY2sncyBtb2RlIGNoYW5nZXMKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NnL0dyYXBoaWNzQ29udGV4dENHLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9HcmFwaGljc0NvbnRl eHRDRy5jcHAJKHJldmlzaW9uIDE1OTcwNCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2NnL0dyYXBoaWNzQ29udGV4dENHLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsx LDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMDMsIDIwMDQsIDIwMDUsIDIwMDYsIDIwMDcs IDIwMDgsIDIwMDksIDIwMTAsIDIwMTEsIDIwMTIgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2Vy dmVkLgorICogQ29weXJpZ2h0IChDKSAyMDAzLCAyMDA0LCAyMDA1LCAyMDA2LCAyMDA3LCAyMDA4 LCAyMDA5LCAyMDEwLCAyMDExLCAyMDEyLCAyMDEzIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNl cnZlZC4KICAqIENvcHlyaWdodCAoQykgMjAwOCBFcmljIFNlaWRlbCA8ZXJpY0B3ZWJraXQub3Jn PgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9y bXMsIHdpdGggb3Igd2l0aG91dApAQCAtODAsMTUgKzgwLDIzIEBAIENHQ29sb3JTcGFjZVJlZiBk ZXZpY2VSR0JDb2xvclNwYWNlUmVmKCkKICAgICByZXR1cm4gZGV2aWNlU3BhY2U7CiB9CiAKLUNH Q29sb3JTcGFjZVJlZiBzUkdCQ29sb3JTcGFjZVJlZigpCitzdGF0aWMgQ0dDb2xvclNwYWNlUmVm IHNhZmVSR0JDb2xvclNwYWNlUmVmKCkKIHsKLSAgICAvLyBGSVhNRTogV2luZG93cyBzaG91bGQg YmUgYWJsZSB0byB1c2Uga0NHQ29sb3JTcGFjZVNSR0IsIHRoaXMgaXMgdHJhY2tlZCBieSBodHRw Oi8vd2Via2l0Lm9yZy9iLzMxMzYzLgorICAgIENHQ29sb3JTcGFjZVJlZiBzUkdCU3BhY2UgPSBD R0NvbG9yU3BhY2VDcmVhdGVXaXRoTmFtZShrQ0dDb2xvclNwYWNlU1JHQik7CiAjaWYgUExBVEZP Uk0oV0lOKQotICAgIHJldHVybiBkZXZpY2VSR0JDb2xvclNwYWNlUmVmKCk7Ci0jZWxzZQotICAg IHN0YXRpYyBDR0NvbG9yU3BhY2VSZWYgc1JHQlNwYWNlID0gQ0dDb2xvclNwYWNlQ3JlYXRlV2l0 aE5hbWUoa0NHQ29sb3JTcGFjZVNSR0IpOwotICAgIHJldHVybiBzUkdCU3BhY2U7CisgICAgLy8g T3V0LW9mLWRhdGUgQ0cgaW5zdGFsbGF0aW9ucyB3aWxsIG5vdCBob25vciBrQ0dDb2xvclNwYWNl U1JHQi4gVGhpcyBsb2dpYyBhdm9pZHMKKyAgICAvLyBjYXVzaW5nIGEgY3Jhc2ggdW5kZXIgdGhv c2UgY29uZGl0aW9ucy4gU2luY2UgdGhlIGRlZmF1bHQgY29sb3Igc3BhY2UgaW4gV2luZG93cwor ICAgIC8vIGlzIHNSR0IsIHRoaXMgYWxsIHdvcmtzIG91dCBuaWNlbHkuCisgICAgaWYgKCFzUkdC U3BhY2UpCisgICAgICAgIHNSR0JTcGFjZSA9IGRldmljZVJHQkNvbG9yU3BhY2VSZWYoKTsKICNl bmRpZgorICAgIHJldHVybiBzUkdCU3BhY2U7Cit9CisKK0NHQ29sb3JTcGFjZVJlZiBzUkdCQ29s b3JTcGFjZVJlZigpCit7CisgICAgc3RhdGljIENHQ29sb3JTcGFjZVJlZiBzUkdCU3BhY2UgPSBz YWZlUkdCQ29sb3JTcGFjZVJlZigpOworICAgIHJldHVybiBzUkdCU3BhY2U7CiB9CiAKICNpZiBQ TEFURk9STShXSU4pCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4v Rm9udENHV2luLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy93aW4vRm9udENHV2luLmNwcAkocmV2aXNpb24gMTU5NzA0KQorKysgU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0ZvbnRDR1dpbi5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDA2LCAyMDA3LCAyMDA4LCAyMDA5 IEFwcGxlIEluYy4gIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMDYs IDIwMDcsIDIwMDgsIDIwMDksIDIwMTMgQXBwbGUgSW5jLiAgQWxsIHJpZ2h0cyByZXNlcnZlZC4K ICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1z LCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRl ZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMTkxLDggKzE5MSw5IEBAIHZvaWQg Rm9udDo6ZHJhd0dseXBocyhHcmFwaGljc0NvbnRleHQqIGcKICAgICAgICAgLy8gUGFpbnQgc2lt cGxlIHNoYWRvd3Mgb3Vyc2VsdmVzIGluc3RlYWQgb2YgcmVseWluZyBvbiBDRyBzaGFkb3dzLCB0 byBhdm9pZCBsb3Npbmcgc3VicGl4ZWwgYW50aWFsaWFzaW5nLgogICAgICAgICBncmFwaGljc0Nv bnRleHQtPmNsZWFyU2hhZG93KCk7CiAgICAgICAgIENvbG9yIGZpbGxDb2xvciA9IGdyYXBoaWNz Q29udGV4dC0+ZmlsbENvbG9yKCk7CisgICAgICAgIENvbG9yU3BhY2UgZmlsbENvbG9yU3BhY2Ug PSBncmFwaGljc0NvbnRleHQtPmZpbGxDb2xvclNwYWNlKCk7CiAgICAgICAgIENvbG9yIHNoYWRv d0ZpbGxDb2xvcihzaGFkb3dDb2xvci5yZWQoKSwgc2hhZG93Q29sb3IuZ3JlZW4oKSwgc2hhZG93 Q29sb3IuYmx1ZSgpLCBzaGFkb3dDb2xvci5hbHBoYSgpICogZmlsbENvbG9yLmFscGhhKCkgLyAy NTUpOwotICAgICAgICBncmFwaGljc0NvbnRleHQtPnNldEZpbGxDb2xvcihzaGFkb3dGaWxsQ29s b3IsIENvbG9yU3BhY2VEZXZpY2VSR0IpOworICAgICAgICBncmFwaGljc0NvbnRleHQtPnNldEZp bGxDb2xvcihzaGFkb3dGaWxsQ29sb3IsIHNoYWRvd0NvbG9yU3BhY2UpOwogICAgICAgICBmbG9h dCBzaGFkb3dUZXh0WCA9IHBvaW50LngoKSArIHRyYW5zbGF0aW9uLndpZHRoKCkgKyBzaGFkb3dP ZmZzZXQud2lkdGgoKTsKICAgICAgICAgLy8gSWYgc2hhZG93cyBhcmUgaWdub3JpbmcgdHJhbnNm b3JtcywgdGhlbiB3ZSBoYXZlbid0IGFwcGxpZWQgdGhlIFkgY29vcmRpbmF0ZSBmbGlwIHlldCwg c28gZG93biBpcyBuZWdhdGl2ZS4KICAgICAgICAgZmxvYXQgc2hhZG93VGV4dFkgPSBwb2ludC55 KCkgKyB0cmFuc2xhdGlvbi5oZWlnaHQoKSArIHNoYWRvd09mZnNldC5oZWlnaHQoKSAqIChncmFw aGljc0NvbnRleHQtPnNoYWRvd3NJZ25vcmVUcmFuc2Zvcm1zKCkgPyAtMSA6IDEpOwpAQCAtMjAy LDcgKzIwMyw3IEBAIHZvaWQgRm9udDo6ZHJhd0dseXBocyhHcmFwaGljc0NvbnRleHQqIGcKICAg ICAgICAgICAgIENHQ29udGV4dFNldFRleHRQb3NpdGlvbihjZ0NvbnRleHQsIHBvaW50LngoKSAr IHRyYW5zbGF0aW9uLndpZHRoKCkgKyBzaGFkb3dPZmZzZXQud2lkdGgoKSArIGZvbnQtPnN5bnRo ZXRpY0JvbGRPZmZzZXQoKSwgcG9pbnQueSgpICsgdHJhbnNsYXRpb24uaGVpZ2h0KCkgKyBzaGFk b3dPZmZzZXQuaGVpZ2h0KCkpOwogICAgICAgICAgICAgQ0dDb250ZXh0U2hvd0dseXBoc1dpdGhB ZHZhbmNlcyhjZ0NvbnRleHQsIGdseXBoQnVmZmVyLmdseXBocyhmcm9tKSwgc3RhdGljX2Nhc3Q8 Y29uc3QgQ0dTaXplKj4oZ2x5cGhCdWZmZXIuYWR2YW5jZXMoZnJvbSkpLCBudW1HbHlwaHMpOwog ICAgICAgICB9Ci0gICAgICAgIGdyYXBoaWNzQ29udGV4dC0+c2V0RmlsbENvbG9yKGZpbGxDb2xv ciwgQ29sb3JTcGFjZURldmljZVJHQik7CisgICAgICAgIGdyYXBoaWNzQ29udGV4dC0+c2V0Rmls bENvbG9yKGZpbGxDb2xvciwgZmlsbENvbG9yU3BhY2UpOwogICAgIH0KIAogICAgIENHQ29udGV4 dFNldFRleHRQb3NpdGlvbihjZ0NvbnRleHQsIHBvaW50LngoKSArIHRyYW5zbGF0aW9uLndpZHRo KCksIHBvaW50LnkoKSArIHRyYW5zbGF0aW9uLmhlaWdodCgpKTsKQEAgLTIxMyw3ICsyMTQsNyBA QCB2b2lkIEZvbnQ6OmRyYXdHbHlwaHMoR3JhcGhpY3NDb250ZXh0KiBnCiAgICAgfQogCiAgICAg aWYgKGhhc1NpbXBsZVNoYWRvdykKLSAgICAgICAgZ3JhcGhpY3NDb250ZXh0LT5zZXRTaGFkb3co c2hhZG93T2Zmc2V0LCBzaGFkb3dCbHVyLCBzaGFkb3dDb2xvciwgQ29sb3JTcGFjZURldmljZVJH Qik7CisgICAgICAgIGdyYXBoaWNzQ29udGV4dC0+c2V0U2hhZG93KHNoYWRvd09mZnNldCwgc2hh ZG93Qmx1ciwgc2hhZG93Q29sb3IsIHNoYWRvd0NvbG9yU3BhY2UpOwogCiAgICAgd2tSZXN0b3Jl Rm9udFNtb290aGluZ1N0eWxlKGNnQ29udGV4dCwgb2xkRm9udFNtb290aGluZ1N0eWxlKTsKIH0K SW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9HcmFwaGljc0NvbnRl eHRDR1dpbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3Mvd2luL0dyYXBoaWNzQ29udGV4dENHV2luLmNwcAkocmV2aXNpb24gMTU5NzA0KQorKysgU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0dyYXBoaWNzQ29udGV4dENHV2luLmNw cAkod29ya2luZyBjb3B5KQpAQCAtODIsOCArODIsOCBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6 cGxhdGZvcm1Jbml0KEhEQyBoCiAgICAgc2V0UGFpbnRpbmdEaXNhYmxlZCghbV9kYXRhLT5tX2Nn Q29udGV4dCk7CiAgICAgaWYgKG1fZGF0YS0+bV9jZ0NvbnRleHQpIHsKICAgICAgICAgLy8gTWFr ZSBzdXJlIHRoZSBjb250ZXh0IHN0YXJ0cyBpbiBzeW5jIHdpdGggb3VyIHN0YXRlLgotICAgICAg ICBzZXRQbGF0Zm9ybUZpbGxDb2xvcihmaWxsQ29sb3IoKSwgQ29sb3JTcGFjZURldmljZVJHQik7 Ci0gICAgICAgIHNldFBsYXRmb3JtU3Ryb2tlQ29sb3Ioc3Ryb2tlQ29sb3IoKSwgQ29sb3JTcGFj ZURldmljZVJHQik7CisgICAgICAgIHNldFBsYXRmb3JtRmlsbENvbG9yKGZpbGxDb2xvcigpLCBm aWxsQ29sb3JTcGFjZSgpKTsKKyAgICAgICAgc2V0UGxhdGZvcm1TdHJva2VDb2xvcihzdHJva2VD b2xvcigpLCBzdHJva2VDb2xvclNwYWNlKCkpOwogICAgIH0KIH0KIAo=