23691 2009-02-02 12:29:54 -0800 REGRESSION: New GraphicsContextCGWin members needed in all Windows builds. 2009-02-02 13:36:04 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) PC Windows XP RESOLVED FIXED P2 Normal --- 23623 1 bfulgham webkit-unassigned aroben oldest_to_newest 108001 0 bfulgham 2009-02-02 12:29:54 -0800 Fix for 23623 added two new methods (setShouldIncludeChildWindows and shouldIncludeChildWindows) to the GraphicsContext for Windows builds, but only defined them for the CG Windows build. This patch moves the implementation from GraphicsContextCG to GraphicsContextWin, where the Cairo and CG builds can use them. 108020 1 27257 bfulgham 2009-02-02 13:14:21 -0800 Created attachment 27257 Move common code up in the hierarchy to clean up implementation and resolve build issue. 108026 2 bfulgham 2009-02-02 13:36:04 -0800 Committed in r40490. 27257 2009-02-02 13:14:21 -0800 2009-02-02 13:16:09 -0800 Move common code up in the hierarchy to clean up implementation and resolve build issue. bug_23691.patch text/plain 3950 bfulgham SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0MDQ4NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjcgQEAKKzIwMDktMDItMDIgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUB3ZWJr aXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEZpeGVzIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzY5MS4KKyAg ICAgICAgQ29ycmVjdCBidWlsZCBicmVhayBjYXVzZWQgYnkgQHI0MDM2NiBieSBtb3ZpbmcgdGhl CisgICAgICAgIGNvbW1vbiBjb2RlIGltcGxtZW50YXRpb25zIGZyb20gR3JhcGhpY3NDb250ZXh0 Q0dXaW4uY3BwCisgICAgICAgIGludG8gdGhlIGJhc2UgV2luZG93cyBjbGFzcyAoR3JhcGhpY3ND b250ZXh0V2luLmNwcCkuICBBbHNvCisgICAgICAgIG1vdmUgaW5UcmFuc3BhcmVuY3lMYXllciBz aW5jZSBpdCBpcyBpZGVudGljYWwgaW4gYm90aAorICAgICAgICBjaGlsZHJlbi4KKworICAgICAg ICBXQVJOSU5HOiBOTyBURVNUIENBU0VTIEFEREVEIE9SIENIQU5HRUQKKworICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL3dpbi9HcmFwaGljc0NvbnRleHRDR1dpbi5jcHA6IFJlbW92ZSB0aGUK KyAgICAgICAgICBpbXBsZW1lbnRhdGlvbnMgb2Ygc2hvdWxkSW5jbHVkZUNoaWxkV2luZG93cywK KyAgICAgICAgICBzZXRTaG91bGRJbmNsdWRlQ2hpbGRXaW5kb3dzLCBhbmQgaW5UcmFuc3BhcmVu Y3lMYXllci4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy93aW4vR3JhcGhpY3NDb250ZXh0 Q2Fpcm9XaW4uY3BwOiBSZW1vdmUKKyAgICAgICAgICB0aGUgaW1wbGVtZW50YXRpb24gb2YgaW5U cmFuc3BhcmVuY3lMYXllci4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy93aW4vR3JhcGhp Y3NDb250ZXh0V2luLmNwcDogTW92ZSBjb21tb24gY29kZQorICAgICAgICAgIGZyb20gR3JhcGhp Y3NDb250ZXh0Q0dXaW4uY3BwIGFuZCBHcmFwaGljc0NvbnRleHRDYWlyb1dpbi5jcHAuIAorICAg ICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjppblRyYW5zcGFyZW5jeUxheWVyKToKKyAg ICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDo6c2V0U2hvdWxkSW5jbHVkZUNoaWxkV2lu ZG93cyk6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OnNob3VsZEluY2x1ZGVD aGlsZFdpbmRvd3MpOgorCiAyMDA5LTAyLTAyICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxlLmNv bT4KIAogICAgICAgICBSZXZpZXdlZCBieSBOaWtvIFppbW1lcm1hbm4uCkluZGV4OiBXZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9HcmFwaGljc0NvbnRleHRDR1dpbi5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vR3JhcGhpY3NDb250ZXh0Q0dXaW4u Y3BwCShyZXZpc2lvbiA0MDQ4MSkKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0dy YXBoaWNzQ29udGV4dENHV2luLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzYsOCArNzYsNiBAQCBH cmFwaGljc0NvbnRleHQ6OkdyYXBoaWNzQ29udGV4dChIREMgaGRjCiAgICAgfQogfQogCi1ib29s IEdyYXBoaWNzQ29udGV4dDo6aW5UcmFuc3BhcmVuY3lMYXllcigpIGNvbnN0IHsgcmV0dXJuIG1f ZGF0YS0+bV90cmFuc3BhcmVuY3lDb3VudDsgfQotCiAvLyBGSVhNRTogSXMgaXQgcG9zc2libGUg dG8gbWVyZ2UgZ2V0V2luZG93c0NvbnRleHQgYW5kIGNyZWF0ZVdpbmRvd3NCaXRtYXAgaW50byBh IHNpbmdsZSBBUEkKIC8vIHN1aXRhYmxlIGZvciBhbGwgY2xpZW50cz8KIEhEQyBHcmFwaGljc0Nv bnRleHQ6OmdldFdpbmRvd3NDb250ZXh0KGNvbnN0IEludFJlY3QmIGRzdFJlY3QsIGJvb2wgc3Vw cG9ydEFscGhhQmxlbmQsIGJvb2wgbWF5Q3JlYXRlQml0bWFwKQpAQCAtMTczLDE2ICsxNzEsNiBA QCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6cmVsZWFzZVdpbmRvd3NDb250CiAgICAgbV9kYXRhLT5y ZXN0b3JlKCk7CiB9CiAKLXZvaWQgR3JhcGhpY3NDb250ZXh0OjpzZXRTaG91bGRJbmNsdWRlQ2hp bGRXaW5kb3dzKGJvb2wgaW5jbHVkZSkKLXsKLSAgICBtX2RhdGEtPm1fc2hvdWxkSW5jbHVkZUNo aWxkV2luZG93cyA9IGluY2x1ZGU7Ci19Ci0KLWJvb2wgR3JhcGhpY3NDb250ZXh0OjpzaG91bGRJ bmNsdWRlQ2hpbGRXaW5kb3dzKCkgY29uc3QKLXsKLSAgICByZXR1cm4gbV9kYXRhLT5tX3Nob3Vs ZEluY2x1ZGVDaGlsZFdpbmRvd3M7Ci19Ci0KIEdyYXBoaWNzQ29udGV4dDo6V2luZG93c0JpdG1h cDo6V2luZG93c0JpdG1hcChIREMgaGRjLCBJbnRTaXplIHNpemUpCiAgICAgOiBtX2hkYygwKQog ICAgICwgbV9zaXplKHNpemUpCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9H cmFwaGljc0NvbnRleHRDYWlyb1dpbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy93aW4vR3JhcGhpY3NDb250ZXh0Q2Fpcm9XaW4uY3BwCShyZXZpc2lvbiA0MDQ4 MSkKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0dyYXBoaWNzQ29udGV4dENhaXJv V2luLmNwcAkod29ya2luZyBjb3B5KQpAQCAtODcsOCArODcsNiBAQCBIREMgR3JhcGhpY3NDb250 ZXh0OjpnZXRXaW5kb3dzQ29udGV4dChjCiAgICAgcmV0dXJuIGhkYzsKIH0KIAotYm9vbCBHcmFw aGljc0NvbnRleHQ6OmluVHJhbnNwYXJlbmN5TGF5ZXIoKSBjb25zdCB7IHJldHVybiBtX2RhdGEt Pm1fdHJhbnNwYXJlbmN5Q291bnQ7IH0KLQogdm9pZCBHcmFwaGljc0NvbnRleHQ6OnJlbGVhc2VX aW5kb3dzQ29udGV4dChIREMgaGRjLCBjb25zdCBJbnRSZWN0JiBkc3RSZWN0LCBib29sIHN1cHBv cnRBbHBoYUJsZW5kLCBib29sIG1heUNyZWF0ZUJpdG1hcCkKIHsKICAgICAvLyBGSVhNRTogIFdl IGFyZW4ndCByZWFsbHkgZG9pbmcgYW55dGhpbmcgd2l0aCB0aGUgJ21heUNyZWF0ZUJpdG1hcCcg ZmxhZy4gIFRoaXMgbmVlZHMKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0dy YXBoaWNzQ29udGV4dFdpbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy93aW4vR3JhcGhpY3NDb250ZXh0V2luLmNwcAkocmV2aXNpb24gNDA0ODEpCisrKyBXZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9HcmFwaGljc0NvbnRleHRXaW4uY3BwCSh3b3JraW5n IGNvcHkpCkBAIC00Myw2ICs0MywxOCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIGNsYXNzIFNW R1Jlc291cmNlSW1hZ2U7CiAKK2Jvb2wgR3JhcGhpY3NDb250ZXh0OjppblRyYW5zcGFyZW5jeUxh eWVyKCkgY29uc3QgeyByZXR1cm4gbV9kYXRhLT5tX3RyYW5zcGFyZW5jeUNvdW50OyB9CisKK3Zv aWQgR3JhcGhpY3NDb250ZXh0OjpzZXRTaG91bGRJbmNsdWRlQ2hpbGRXaW5kb3dzKGJvb2wgaW5j bHVkZSkKK3sKKyAgICBtX2RhdGEtPm1fc2hvdWxkSW5jbHVkZUNoaWxkV2luZG93cyA9IGluY2x1 ZGU7Cit9CisKK2Jvb2wgR3JhcGhpY3NDb250ZXh0OjpzaG91bGRJbmNsdWRlQ2hpbGRXaW5kb3dz KCkgY29uc3QKK3sKKyAgICByZXR1cm4gbV9kYXRhLT5tX3Nob3VsZEluY2x1ZGVDaGlsZFdpbmRv d3M7Cit9CisKIHZvaWQgR3JhcGhpY3NDb250ZXh0UGxhdGZvcm1Qcml2YXRlOjpzYXZlKCkKIHsK ICAgICBpZiAoIW1faGRjKQo=