129417 2014-02-26 21:26:57 -0800 compile fix when not using TEXTURE_MAPPER_GL 2014-02-27 14:43:27 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) PC Windows 7 RESOLVED FIXED P2 Minor --- 1 alex.christensen webkit-unassigned cmarcelo commit-queue kondapallykalyan luiz noam oldest_to_newest 985059 0 alex.christensen 2014-02-26 21:26:57 -0800 Having two definitions for platformCreateAccelerated has caused compiler errors for ports not using TEXTURE_MAPPER_GL, such as WinCairo. I suggest the definitions be moved to the same place. Also, should WinCairo be using TEXTURE_MAPPER_GL for anything? 985060 1 225342 alex.christensen 2014-02-26 21:28:13 -0800 Created attachment 225342 Patch 985063 2 225344 alex.christensen 2014-02-26 22:27:39 -0800 Created attachment 225344 Patch 985271 3 225396 alex.christensen 2014-02-27 11:20:05 -0800 Created attachment 225396 Patch 985352 4 alex.christensen 2014-02-27 14:43:27 -0800 committed to http://trac.webkit.org/changeset/164825 225342 2014-02-26 21:28:13 -0800 2014-02-26 22:27:35 -0800 Patch bug-129417-20140226222813.patch text/plain 2212 alex.christensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NDc3NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDE0LTAyLTI2ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQ29tcGlsZSBm aXggd2hlbiBub3QgdXNpbmcgVEVYVFVSRV9NQVBQRVJfR0wuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjk0MTcKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9U ZXh0dXJlTWFwcGVyLmg6CisgICAgICAgIChXZWJDb3JlOjpUZXh0dXJlTWFwcGVyOjpwbGF0Zm9y bUNyZWF0ZUFjY2VsZXJhdGVkKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAv VGV4dHVyZU1hcHBlckdMLmNwcDoKKyAgICAgICAgTW92ZWQgcGxhdGZvcm1DcmVhdGVBY2NlbGVy YXRlZCB0byBUZXh0dXJlTWFwcGVyLmggcmVnYXJkbGVzcyBvZiB1c2luZyBURVhUVVJFX01BUFBF Ul9HTC4gCisKIDIwMTQtMDItMjYgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAK ICAgICAgICAgRXh0cmFjdCBuYW1lZCBpdGVtcyBjYWNoZXMgaW4gSFRNTENvbGxlY3Rpb24gYXMg YSBjbGFzcwpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1Rl eHR1cmVNYXBwZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlci5oCShyZXZpc2lvbiAxNjQ3NzQpCisrKyBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlci5oCSh3b3JraW5n IGNvcHkpCkBAIC0xNzEsMTQgKzE3MSwxNSBAQCBwcm90ZWN0ZWQ6CiAgICAgY29uc3QgVHJhbnNm b3JtYXRpb25NYXRyaXgmIHBhdHRlcm5UcmFuc2Zvcm0oKSBjb25zdCB7IHJldHVybiBtX3BhdHRl cm5UcmFuc2Zvcm07IH0KIAogcHJpdmF0ZToKLSNpZiBVU0UoVEVYVFVSRV9NQVBQRVJfR0wpCi0g ICAgc3RhdGljIFBhc3NPd25QdHI8VGV4dHVyZU1hcHBlcj4gcGxhdGZvcm1DcmVhdGVBY2NlbGVy YXRlZCgpOwotI2Vsc2UKICAgICBzdGF0aWMgUGFzc093blB0cjxUZXh0dXJlTWFwcGVyPiBwbGF0 Zm9ybUNyZWF0ZUFjY2VsZXJhdGVkKCkKICAgICB7CisjaWYgVVNFKFRFWFRVUkVfTUFQUEVSX0dM KQorICAgICAgICByZXR1cm4gVGV4dHVyZU1hcHBlckdMOjpjcmVhdGUoKTsKKyNlbHNlCiAgICAg ICAgIHJldHVybiBQYXNzT3duUHRyPFRleHR1cmVNYXBwZXI+KCk7Ci0gICAgfQogI2VuZGlmCisg ICAgfQorCiAgICAgSW50ZXJwb2xhdGlvblF1YWxpdHkgbV9pbnRlcnBvbGF0aW9uUXVhbGl0eTsK ICAgICBUZXh0RHJhd2luZ01vZGVGbGFncyBtX3RleHREcmF3aW5nTW9kZTsKICAgICBPd25QdHI8 Qml0bWFwVGV4dHVyZVBvb2w+IG1fdGV4dHVyZVBvb2w7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckdMLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckdM LmNwcAkocmV2aXNpb24gMTY0Nzc0KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvdGV4bWFwL1RleHR1cmVNYXBwZXJHTC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExMjgsMTAg KzExMjgsNSBAQCBQYXNzUmVmUHRyPEJpdG1hcFRleHR1cmU+IFRleHR1cmVNYXBwZXJHCiAgICAg cmV0dXJuIGFkb3B0UmVmKHRleHR1cmUpOwogfQogCi1QYXNzT3duUHRyPFRleHR1cmVNYXBwZXI+ IFRleHR1cmVNYXBwZXI6OnBsYXRmb3JtQ3JlYXRlQWNjZWxlcmF0ZWQoKQotewotICAgIHJldHVy biBUZXh0dXJlTWFwcGVyR0w6OmNyZWF0ZSgpOwotfQotCiB9OwogI2VuZGlmCg== 225344 2014-02-26 22:27:39 -0800 2014-02-27 11:20:02 -0800 Patch bug-129417-20140226232740.patch text/plain 2411 alex.christensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NDc3NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDE0LTAyLTI2ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQ29tcGlsZSBm aXggd2hlbiBub3QgdXNpbmcgVEVYVFVSRV9NQVBQRVJfR0wuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjk0MTcKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9U ZXh0dXJlTWFwcGVyLmg6CisgICAgICAgIChXZWJDb3JlOjpUZXh0dXJlTWFwcGVyOjpwbGF0Zm9y bUNyZWF0ZUFjY2VsZXJhdGVkKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAv VGV4dHVyZU1hcHBlckdMLmNwcDoKKyAgICAgICAgTW92ZWQgcGxhdGZvcm1DcmVhdGVBY2NlbGVy YXRlZCB0byBUZXh0dXJlTWFwcGVyLmggcmVnYXJkbGVzcyBvZiB1c2luZyBURVhUVVJFX01BUFBF Ul9HTC4gCisKIDIwMTQtMDItMjYgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAK ICAgICAgICAgRXh0cmFjdCBuYW1lZCBpdGVtcyBjYWNoZXMgaW4gSFRNTENvbGxlY3Rpb24gYXMg YSBjbGFzcwpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1Rl eHR1cmVNYXBwZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlci5oCShyZXZpc2lvbiAxNjQ3NzQpCisrKyBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlci5oCSh3b3JraW5n IGNvcHkpCkBAIC0yNiw2ICsyNiwxMCBAQAogI2RlZmluZSBURVhNQVBfT1BFTkdMX0VTXzIKICNl bmRpZgogCisjaWYgVVNFKFRFWFRVUkVfTUFQUEVSX0dMKQorI2luY2x1ZGUgIlRleHR1cmVNYXBw ZXJHTC5oIgorI2VuZGlmCisKICNpbmNsdWRlICJHcmFwaGljc0NvbnRleHQuaCIKICNpbmNsdWRl ICJJbnRSZWN0LmgiCiAjaW5jbHVkZSAiSW50U2l6ZS5oIgpAQCAtMTcxLDE0ICsxNzUsMTUgQEAg cHJvdGVjdGVkOgogICAgIGNvbnN0IFRyYW5zZm9ybWF0aW9uTWF0cml4JiBwYXR0ZXJuVHJhbnNm b3JtKCkgY29uc3QgeyByZXR1cm4gbV9wYXR0ZXJuVHJhbnNmb3JtOyB9CiAKIHByaXZhdGU6Ci0j aWYgVVNFKFRFWFRVUkVfTUFQUEVSX0dMKQotICAgIHN0YXRpYyBQYXNzT3duUHRyPFRleHR1cmVN YXBwZXI+IHBsYXRmb3JtQ3JlYXRlQWNjZWxlcmF0ZWQoKTsKLSNlbHNlCiAgICAgc3RhdGljIFBh c3NPd25QdHI8VGV4dHVyZU1hcHBlcj4gcGxhdGZvcm1DcmVhdGVBY2NlbGVyYXRlZCgpCiAgICAg eworI2lmIFVTRShURVhUVVJFX01BUFBFUl9HTCkKKyAgICAgICAgcmV0dXJuIFRleHR1cmVNYXBw ZXJHTDo6Y3JlYXRlKCk7CisjZWxzZQogICAgICAgICByZXR1cm4gUGFzc093blB0cjxUZXh0dXJl TWFwcGVyPigpOwotICAgIH0KICNlbmRpZgorICAgIH0KKwogICAgIEludGVycG9sYXRpb25RdWFs aXR5IG1faW50ZXJwb2xhdGlvblF1YWxpdHk7CiAgICAgVGV4dERyYXdpbmdNb2RlRmxhZ3MgbV90 ZXh0RHJhd2luZ01vZGU7CiAgICAgT3duUHRyPEJpdG1hcFRleHR1cmVQb29sPiBtX3RleHR1cmVQ b29sOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1 cmVNYXBwZXJHTC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJHTC5jcHAJKHJldmlzaW9uIDE2NDc3NCkKKysrIFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyR0wuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0xMTI4LDEwICsxMTI4LDUgQEAgUGFzc1JlZlB0cjxCaXRtYXBU ZXh0dXJlPiBUZXh0dXJlTWFwcGVyRwogICAgIHJldHVybiBhZG9wdFJlZih0ZXh0dXJlKTsKIH0K IAotUGFzc093blB0cjxUZXh0dXJlTWFwcGVyPiBUZXh0dXJlTWFwcGVyOjpwbGF0Zm9ybUNyZWF0 ZUFjY2VsZXJhdGVkKCkKLXsKLSAgICByZXR1cm4gVGV4dHVyZU1hcHBlckdMOjpjcmVhdGUoKTsK LX0KLQogfTsKICNlbmRpZgo= 225396 2014-02-27 11:20:05 -0800 2014-02-27 12:22:17 -0800 Patch bug-129417-20140227122009.patch text/plain 1225 alex.christensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NDc3NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDE0LTAyLTI2ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQ29tcGlsZSBm aXggd2hlbiBub3QgdXNpbmcgVEVYVFVSRV9NQVBQRVJfR0wuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjk0MTcKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9U ZXh0dXJlTWFwcGVyR0wuY3BwOgorICAgICAgICBQcm90ZWN0IHBsYXRmb3JtQ3JlYXRlQWNjZWxl cmF0ZWQgd2l0aCBVU0UoVEVYVFVSRV9NQVBQRVJfR0wpLgorCiAyMDE0LTAyLTI2ICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIEV4dHJhY3QgbmFtZWQgaXRlbXMg Y2FjaGVzIGluIEhUTUxDb2xsZWN0aW9uIGFzIGEgY2xhc3MKSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyR0wuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVy R0wuY3BwCShyZXZpc2lvbiAxNjQ3NzQpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckdMLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTEyOCwx MCArMTEyOCwxMiBAQCBQYXNzUmVmUHRyPEJpdG1hcFRleHR1cmU+IFRleHR1cmVNYXBwZXJHCiAg ICAgcmV0dXJuIGFkb3B0UmVmKHRleHR1cmUpOwogfQogCisjaWYgVVNFKFRFWFRVUkVfTUFQUEVS X0dMKQogUGFzc093blB0cjxUZXh0dXJlTWFwcGVyPiBUZXh0dXJlTWFwcGVyOjpwbGF0Zm9ybUNy ZWF0ZUFjY2VsZXJhdGVkKCkKIHsKICAgICByZXR1cm4gVGV4dHVyZU1hcHBlckdMOjpjcmVhdGUo KTsKIH0KKyNlbmRpZgogCiB9OwogI2VuZGlmCg==