30868 2009-10-28 09:39:26 -0700 FrameLoaderClient::objectContentType often has copied code 2009-10-28 15:08:22 -0700 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 0 joenotcharles webkit-unassigned eric manyoso staikos oldest_to_newest 158596 0 joenotcharles 2009-10-28 09:39:26 -0700 The gtk and windows ports implement FrameLoaderClient::objectContentType using the exact same code, except for different variable names and comments. (The qt port uses almost the same code except that it checks for several more cases. The mac port is very different, with lots of Obj-C'isms. The wx and haiku ports don't implement it at all.) It would be good to move this shared code to a utility function, such as defaultObjectContentType. Ports could choose to implement objectContentType either by calling the utility function or doing their own processing. 158598 1 42037 joenotcharles 2009-10-28 09:43:40 -0700 Created attachment 42037 Move shared code to FrameLoader::defaultObjectContentType This patch moves the shared code to FrameLoader::defaultObjectContentType. The haiku and wx ports could now implement objectContentType by calling this function, but I didn't do that because I wanted to make sure I didn't make any functional changes. 158604 2 42038 joenotcharles 2009-10-28 09:50:46 -0700 Created attachment 42038 same patch, with build fix for gtk 158615 3 manyoso 2009-10-28 09:58:42 -0700 Please make sure to watch the buildbots like a hawk when this patch lands. 158642 4 staikos 2009-10-28 11:12:53 -0700 Committed revision 50225. 158648 5 42044 joenotcharles 2009-10-28 11:29:09 -0700 Created attachment 42044 build fix for windows 158650 6 42045 joenotcharles 2009-10-28 11:51:36 -0700 Created attachment 42045 build fix for mac 158722 7 eric 2009-10-28 15:00:53 -0700 Are these fixes still needed? If so, please attach them as a single patch with one ChangeLog. Otherwise please clear the review flags as this bug is closed. 158727 8 eric 2009-10-28 15:08:22 -0700 Thank you George! 42037 2009-10-28 09:43:40 -0700 2009-10-28 09:50:46 -0700 Move shared code to FrameLoader::defaultObjectContentType defaultObjectContentType.patch text/plain 11041 joenotcharles RnJvbSBlNWQwZGM4MDBiMzIyZWU1ZWFjMTRhMzUzZGRkNTU5NzUwZWNhNzUzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb2UgTWFzb24gPGptYXNvbkByaW0uY29tPgpEYXRlOiBXZWQs IDI4IE9jdCAyMDA5IDExOjU5OjIzIC0wNDAwClN1YmplY3Q6IFtQQVRDSCAxLzNdIFdlYkNvcmU6 CgoyMDA5LTEwLTI4ICBKb2UgTWFzb24gIDxqbWFzb25AcmltLmNvbT4KCiAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCgogICAgICAgIEFkZCBGcmFtZUxvYWRlcjo6ZGVmYXVsdE9i amVjdENvbnRlbnRUeXBlLCBjb250YWluaW5nIGNvbW1vbiBjb2RlIGZvcgogICAgICAgIGltcGxl bWVudGluZyBGcmFtZUxvYWRlckNsaWVudDo6b2JqZWN0Q29udGVudFR5cGUuICAoQ3VycmVudGx5 IHRoZSBndGsKICAgICAgICBhbmQgd2luIHBvcnRzIGhhdmUgY29waWVkIHRoaXMgY29kZSwgYW5k IHRoZSBxdCBwb3J0IHVzZXMgc2ltaWxhciBjb2RlCiAgICAgICAgd2l0aCBhIGZldyBleHRyYSBj bGF1c2VzLiAgTW92aW5nIHRoaXMgdG8gYSB1dGlsaXR5IGZ1bmN0aW9uIGN1dHMgZG93bgogICAg ICAgIG9uIGNvcGllZCBjb2RlLikgIFRoaXMgY2F1c2VzIG5vIGJlaGF2aW91cmFsIGNoYW5nZS4K CiAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIuY3BwOgogICAgICAgIChXZWJDb3JlOjpGcmFt ZUxvYWRlcjo6ZGVmYXVsdE9iamVjdENvbnRlbnRUeXBlKToKICAgICAgICAqIGxvYWRlci9GcmFt ZUxvYWRlci5oOgoKV2ViS2l0L2d0azoKCjIwMDktMTAtMjggIEpvZSBNYXNvbiAgPGptYXNvbkBy aW0uY29tPgoKICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCiAgICAgICAgQ2Fs bCB0aGUgc2hhcmVkIEZyYW1lTG9hZGVyOjpkZWZhdWx0T2JqZWN0Q29udGVudFR5cGUgaW5zdGVh ZCBvZgogICAgICAgIGNvcHlpbmcgY29kZSBpbnRvIEZyYW1lTG9hZGVyQ2xpZW50OjpvYmplY3RD b250ZW50VHlwZS4gIFRoaXMgY2F1c2VzIG5vCiAgICAgICAgYmVoYXZpb3VyYWwgY2hhbmdlLgoK ICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmNwcDoKICAgICAg ICAoV2ViS2l0OjpGcmFtZUxvYWRlckNsaWVudDo6b2JqZWN0Q29udGVudFR5cGUpOgoKV2ViS2l0 L3dpbjoKCjIwMDktMTAtMjggIEpvZSBNYXNvbiAgPGptYXNvbkByaW0uY29tPgoKICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCiAgICAgICAgQ2FsbCB0aGUgc2hhcmVkIEZyYW1l TG9hZGVyOjpkZWZhdWx0T2JqZWN0Q29udGVudFR5cGUgaW5zdGVhZCBvZgogICAgICAgIGNvcHlp bmcgY29kZSBpbnRvIEZyYW1lTG9hZGVyQ2xpZW50OjpvYmplY3RDb250ZW50VHlwZS4gIFRoaXMg Y2F1c2VzIG5vCiAgICAgICAgYmVoYXZpb3VyYWwgY2hhbmdlLgoKICAgICAgICAqIFdlYkZyYW1l LmNwcDoKICAgICAgICAoV2ViRnJhbWU6Om9iamVjdENvbnRlbnRUeXBlKToKLS0tCiBXZWJDb3Jl L0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMTQgKysrKysr KysrKysKIFdlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcCAgICAgICAgICAgICAgICAgICAg IHwgICAyNSArKysrKysrKysrKysrKysrKysrKwogV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIu aCAgICAgICAgICAgICAgICAgICAgICAgfCAgICAzICsrCiBXZWJLaXQvZ3RrL0NoYW5nZUxvZyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMTEgKysrKysrKysKIFdlYktpdC9ndGsv V2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwIHwgICAyMCArLS0tLS0tLS0t LS0tLS0KIFdlYktpdC93aW4vQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHwgICAxMSArKysrKysrKwogV2ViS2l0L3dpbi9XZWJGcmFtZS5jcHAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgfCAgIDIzICsrLS0tLS0tLS0tLS0tLS0tLQogNyBmaWxlcyBjaGFuZ2VkLCA2 OSBpbnNlcnRpb25zKCspLCAzOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9XZWJDb3JlL0No YW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDQ4M2UwZWUuLjNlMzZmYWIgMTAwNjQ0 Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMTcgQEAKKzIwMDktMTAtMjggIEpvZSBNYXNvbiAgPGptYXNvbkByaW0uY29tPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBGcmFtZUxvYWRl cjo6ZGVmYXVsdE9iamVjdENvbnRlbnRUeXBlLCBjb250YWluaW5nIGNvbW1vbiBjb2RlIGZvcgor ICAgICAgICBpbXBsZW1lbnRpbmcgRnJhbWVMb2FkZXJDbGllbnQ6Om9iamVjdENvbnRlbnRUeXBl LiAgKEN1cnJlbnRseSB0aGUgZ3RrCisgICAgICAgIGFuZCB3aW4gcG9ydHMgaGF2ZSBjb3BpZWQg dGhpcyBjb2RlLCBhbmQgdGhlIHF0IHBvcnQgdXNlcyBzaW1pbGFyIGNvZGUKKyAgICAgICAgd2l0 aCBhIGZldyBleHRyYSBjbGF1c2VzLiAgTW92aW5nIHRoaXMgdG8gYSB1dGlsaXR5IGZ1bmN0aW9u IGN1dHMgZG93bgorICAgICAgICBvbiBjb3BpZWQgY29kZS4pICAgVGhpcyBjYXVzZXMgbm8gYmVo YXZpb3VyYWwgY2hhbmdlLgorCisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpkZWZhdWx0T2JqZWN0Q29udGVudFR5cGUpOgor ICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlci5oOgorCiAyMDA5LTEwLTI2ICBTdGV2ZSBCbG9j ayAgPHN0ZXZlYmxvY2tAZ29vZ2xlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBFcmljIFNl aWRlbC4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcCBiL1dlYkNv cmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAppbmRleCAzNGE4ZjMyLi5iYjkwNGE1IDEwMDY0NAot LS0gYS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKKysrIGIvV2ViQ29yZS9sb2FkZXIv RnJhbWVMb2FkZXIuY3BwCkBAIC0yLDYgKzIsOCBAQAogICogQ29weXJpZ2h0IChDKSAyMDA2LCAy MDA3LCAyMDA4LCAyMDA5IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqIENvcHly aWdodCAoQykgMjAwOCBOb2tpYSBDb3Jwb3JhdGlvbiBhbmQvb3IgaXRzIHN1YnNpZGlhcnkoLWll cykKICAqIENvcHlyaWdodCAoQykgMjAwOCwgMjAwOSBUb3JjaCBNb2JpbGUgSW5jLiBBbGwgcmln aHRzIHJlc2VydmVkLiAoaHR0cDovL3d3dy50b3JjaG1vYmlsZS5jb20vKQorICogQ29weXJpZ2h0 IChDKSAyMDA4IEFscCBUb2tlciA8YWxwQGF0b2tlci5jb20+CisgKiBDb3B5cmlnaHQgKEMpIFJl c2VhcmNoIEluIE1vdGlvbiBMaW1pdGVkIDIwMDkuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgog ICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0 aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhh dCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTc1LDYgKzc3LDcgQEAKICNpbmNsdWRlICJQ YWdlVHJhbnNpdGlvbkV2ZW50LmgiCiAjaW5jbHVkZSAiUGxhY2Vob2xkZXJEb2N1bWVudC5oIgog I2luY2x1ZGUgIlBsdWdpbkRhdGEuaCIKKyNpbmNsdWRlICJQbHVnaW5EYXRhYmFzZS5oIgogI2lu Y2x1ZGUgIlBsdWdpbkRvY3VtZW50LmgiCiAjaW5jbHVkZSAiUHJvZ3Jlc3NUcmFja2VyLmgiCiAj aW5jbHVkZSAiUmVuZGVyUGFydC5oIgpAQCAtMTI5MCw2ICsxMjkzLDI4IEBAIGJvb2wgRnJhbWVM b2FkZXI6OnNob3VsZFVzZVBsdWdpbihjb25zdCBLVVJMJiB1cmwsIGNvbnN0IFN0cmluZyYgbWlt ZVR5cGUsIGJvb2wKICAgICByZXR1cm4gb2JqZWN0VHlwZSA9PSBPYmplY3RDb250ZW50Tm9uZSB8 fCBvYmplY3RUeXBlID09IE9iamVjdENvbnRlbnROZXRzY2FwZVBsdWdpbiB8fCBvYmplY3RUeXBl ID09IE9iamVjdENvbnRlbnRPdGhlclBsdWdpbjsKIH0KIAorT2JqZWN0Q29udGVudFR5cGUgRnJh bWVMb2FkZXI6OmRlZmF1bHRPYmplY3RDb250ZW50VHlwZShjb25zdCBLVVJMJiB1cmwsIGNvbnN0 IFN0cmluZyYgbWltZVR5cGVJbikKK3sKKyAgICBTdHJpbmcgbWltZVR5cGUgPSBtaW1lVHlwZUlu OworICAgIC8vIFdlIGRvbid0IHVzZSBNSU1FVHlwZVJlZ2lzdHJ5OjpnZXRNSU1FVHlwZUZvclBh dGgoKSBiZWNhdXNlIGl0IHJldHVybnMgImFwcGxpY2F0aW9uL29jdGV0LXN0cmVhbSIgdXBvbiBm YWlsdXJlCisgICAgaWYgKG1pbWVUeXBlLmlzRW1wdHkoKSkKKyAgICAgICAgbWltZVR5cGUgPSBN SU1FVHlwZVJlZ2lzdHJ5OjpnZXRNSU1FVHlwZUZvckV4dGVuc2lvbih1cmwucGF0aCgpLnN1YnN0 cmluZyh1cmwucGF0aCgpLnJldmVyc2VGaW5kKCcuJykgKyAxKSk7CisKKyAgICBpZiAobWltZVR5 cGUuaXNFbXB0eSgpKQorICAgICAgICByZXR1cm4gT2JqZWN0Q29udGVudEZyYW1lOyAvLyBHbyBh aGVhZCBhbmQgaG9wZSB0aGF0IHdlIGNhbiBkaXNwbGF5IHRoZSBjb250ZW50LgorCisgICAgaWYg KE1JTUVUeXBlUmVnaXN0cnk6OmlzU3VwcG9ydGVkSW1hZ2VNSU1FVHlwZShtaW1lVHlwZSkpCisg ICAgICAgIHJldHVybiBXZWJDb3JlOjpPYmplY3RDb250ZW50SW1hZ2U7CisKKyAgICBpZiAoUGx1 Z2luRGF0YWJhc2U6Omluc3RhbGxlZFBsdWdpbnMoKS0+aXNNSU1FVHlwZVJlZ2lzdGVyZWQobWlt ZVR5cGUpKQorICAgICAgICByZXR1cm4gV2ViQ29yZTo6T2JqZWN0Q29udGVudE5ldHNjYXBlUGx1 Z2luOworCisgICAgaWYgKE1JTUVUeXBlUmVnaXN0cnk6OmlzU3VwcG9ydGVkTm9uSW1hZ2VNSU1F VHlwZShtaW1lVHlwZSkpCisgICAgICAgIHJldHVybiBXZWJDb3JlOjpPYmplY3RDb250ZW50RnJh bWU7CisKKyAgICByZXR1cm4gV2ViQ29yZTo6T2JqZWN0Q29udGVudE5vbmU7Cit9CisKIHN0YXRp YyBIVE1MUGx1Z0luRWxlbWVudCogdG9QbHVnSW5FbGVtZW50KE5vZGUqIG5vZGUpCiB7CiAgICAg aWYgKCFub2RlKQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuaCBiL1dl YkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmgKaW5kZXggYzBjMTc1Yi4uM2JmNjE5NiAxMDA2NDQK LS0tIGEvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuaAorKysgYi9XZWJDb3JlL2xvYWRlci9G cmFtZUxvYWRlci5oCkBAIC0xLDYgKzEsNyBAQAogLyoKICAqIENvcHlyaWdodCAoQykgMjAwNiwg MjAwNywgMjAwOCwgMjAwOSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKiBDb3B5 cmlnaHQgKEMpIDIwMDgsIDIwMDkgVG9yY2ggTW9iaWxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZl ZC4gKGh0dHA6Ly93d3cudG9yY2htb2JpbGUuY29tLykKKyAqIENvcHlyaWdodCAoQykgUmVzZWFy Y2ggSW4gTW90aW9uIExpbWl0ZWQgMjAwOS4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBS ZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9y IHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRo ZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMzI1LDYgKzMyNiw4IEBAIHB1YmxpYzoKICAgICAK ICAgICBib29sIHN1cHByZXNzT3BlbmVySW5OZXdGcmFtZSgpIGNvbnN0IHsgcmV0dXJuIG1fc3Vw cHJlc3NPcGVuZXJJbk5ld0ZyYW1lOyB9CiAKKyAgICBzdGF0aWMgT2JqZWN0Q29udGVudFR5cGUg ZGVmYXVsdE9iamVjdENvbnRlbnRUeXBlKGNvbnN0IEtVUkwmIHVybCwgY29uc3QgU3RyaW5nJiBt aW1lVHlwZSk7CisKIHByaXZhdGU6CiAgICAgYm9vbCBjYW5DYWNoZVBhZ2VDb250YWluaW5nVGhp c0ZyYW1lKCk7CiAjaWZuZGVmIE5ERUJVRwpkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0ay9DaGFuZ2VM b2cgYi9XZWJLaXQvZ3RrL0NoYW5nZUxvZwppbmRleCA2ZWZlZGIyLi40YzJhYjZmIDEwMDY0NAot LS0gYS9XZWJLaXQvZ3RrL0NoYW5nZUxvZworKysgYi9XZWJLaXQvZ3RrL0NoYW5nZUxvZwpAQCAt MSwzICsxLDE0IEBACisyMDA5LTEwLTI4ICBKb2UgTWFzb24gIDxqbWFzb25AcmltLmNvbT4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDYWxsIHRoZSBz aGFyZWQgRnJhbWVMb2FkZXI6OmRlZmF1bHRPYmplY3RDb250ZW50VHlwZSBpbnN0ZWFkIG9mCisg ICAgICAgIGNvcHlpbmcgY29kZSBpbnRvIEZyYW1lTG9hZGVyQ2xpZW50OjpvYmplY3RDb250ZW50 VHlwZS4gIFRoaXMgY2F1c2VzIG5vCisgICAgICAgIGJlaGF2aW91cmFsIGNoYW5nZS4KKworICAg ICAgICAqIFdlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmNwcDoKKyAgICAgICAg KFdlYktpdDo6RnJhbWVMb2FkZXJDbGllbnQ6Om9iamVjdENvbnRlbnRUeXBlKToKKwogMjAwOS0x MC0yNiAgR3VzdGF2byBOb3JvbmhhIFNpbHZhICA8Z3VzdGF2by5ub3JvbmhhQGNvbGxhYm9yYS5j by51az4KIAogICAgICAgICBVbnJldmlld2VkLiBVcGRhdGUgZG9jdW1lbnRhdGlvbiBjb250cm9s IGZpbGVzIGZvciAxLjEuMTYuCmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0 L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmNwcCBiL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJh bWVMb2FkZXJDbGllbnRHdGsuY3BwCmluZGV4IGRjMTE1M2UuLjUxMzk0MmMgMTAwNjQ0Ci0tLSBh L1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwCisrKyBi L1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwCkBAIC00 LDYgKzQsNyBAQAogICogIENvcHlyaWdodCAoQykgMjAwNyBDaHJpc3RpYW4gRHl3YW4gPGNocmlz dGlhbkB0d290b2FzdHMuZGU+CiAgKiAgQ29weXJpZ2h0IChDKSAyMDA4LCAyMDA5IENvbGxhYm9y YSBMdGQuICBBbGwgcmlnaHRzIHJlc2VydmVkLgogICogIENvcHlyaWdodCAoQykgMjAwOSBHdXN0 YXZvIE5vcm9uaGEgU2lsdmEgPGduc0Bnbm9tZS5vcmc+CisgKiAgQ29weXJpZ2h0IChDKSBSZXNl YXJjaCBJbiBNb3Rpb24gTGltaXRlZCAyMDA5LiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAq ICBUaGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQg YW5kL29yCiAgKiAgbW9kaWZ5IGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExlc3NlciBH ZW5lcmFsIFB1YmxpYwpAQCAtNDkwLDI0ICs0OTEsNyBAQCBQYXNzUmVmUHRyPFdpZGdldD4gRnJh bWVMb2FkZXJDbGllbnQ6OmNyZWF0ZUphdmFBcHBsZXRXaWRnZXQoY29uc3QgSW50U2l6ZSYsIEhU TQogCiBPYmplY3RDb250ZW50VHlwZSBGcmFtZUxvYWRlckNsaWVudDo6b2JqZWN0Q29udGVudFR5 cGUoY29uc3QgS1VSTCYgdXJsLCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlKQogewotICAgIFN0cmlu ZyB0eXBlID0gbWltZVR5cGU7Ci0gICAgLy8gV2UgZG9uJ3QgdXNlIE1JTUVUeXBlUmVnaXN0cnk6 OmdldE1JTUVUeXBlRm9yUGF0aCgpIGJlY2F1c2UgaXQgcmV0dXJucyAiYXBwbGljYXRpb24vb2N0 ZXQtc3RyZWFtIiB1cG9uIGZhaWx1cmUKLSAgICBpZiAodHlwZS5pc0VtcHR5KCkpCi0gICAgICAg IHR5cGUgPSBNSU1FVHlwZVJlZ2lzdHJ5OjpnZXRNSU1FVHlwZUZvckV4dGVuc2lvbih1cmwucGF0 aCgpLnN1YnN0cmluZyh1cmwucGF0aCgpLnJldmVyc2VGaW5kKCcuJykgKyAxKSk7Ci0KLSAgICBp ZiAodHlwZS5pc0VtcHR5KCkpCi0gICAgICAgIHJldHVybiBXZWJDb3JlOjpPYmplY3RDb250ZW50 RnJhbWU7Ci0KLSAgICBpZiAoTUlNRVR5cGVSZWdpc3RyeTo6aXNTdXBwb3J0ZWRJbWFnZU1JTUVU eXBlKHR5cGUpKQotICAgICAgICByZXR1cm4gV2ViQ29yZTo6T2JqZWN0Q29udGVudEltYWdlOwot Ci0gICAgaWYgKFBsdWdpbkRhdGFiYXNlOjppbnN0YWxsZWRQbHVnaW5zKCktPmlzTUlNRVR5cGVS ZWdpc3RlcmVkKG1pbWVUeXBlKSkKLSAgICAgICAgcmV0dXJuIFdlYkNvcmU6Ok9iamVjdENvbnRl bnROZXRzY2FwZVBsdWdpbjsKLQotICAgIGlmIChNSU1FVHlwZVJlZ2lzdHJ5Ojppc1N1cHBvcnRl ZE5vbkltYWdlTUlNRVR5cGUodHlwZSkpCi0gICAgICAgIHJldHVybiBXZWJDb3JlOjpPYmplY3RD b250ZW50RnJhbWU7Ci0KLSAgICByZXR1cm4gV2ViQ29yZTo6T2JqZWN0Q29udGVudE5vbmU7Cisg ICAgcmV0dXJuIEZyYW1lTG9hZGVyQ2xpZW50OjpkZWZhdWx0T2JqZWN0Q29udGVudFR5cGUodXJs LCBtaW1lVHlwZSk7CiB9CiAKIFN0cmluZyBGcmFtZUxvYWRlckNsaWVudDo6b3ZlcnJpZGVNZWRp YVR5cGUoKSBjb25zdApkaWZmIC0tZ2l0IGEvV2ViS2l0L3dpbi9DaGFuZ2VMb2cgYi9XZWJLaXQv d2luL0NoYW5nZUxvZwppbmRleCBhNWQ0YjdlLi42ZGQ0ODljIDEwMDY0NAotLS0gYS9XZWJLaXQv d2luL0NoYW5nZUxvZworKysgYi9XZWJLaXQvd2luL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBA CisyMDA5LTEwLTI4ICBKb2UgTWFzb24gIDxqbWFzb25AcmltLmNvbT4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDYWxsIHRoZSBzaGFyZWQgRnJhbWVM b2FkZXI6OmRlZmF1bHRPYmplY3RDb250ZW50VHlwZSBpbnN0ZWFkIG9mCisgICAgICAgIGNvcHlp bmcgY29kZSBpbnRvIEZyYW1lTG9hZGVyQ2xpZW50OjpvYmplY3RDb250ZW50VHlwZS4gIFRoaXMg Y2F1c2VzIG5vCisgICAgICAgIGJlaGF2aW91cmFsIGNoYW5nZS4KKworICAgICAgICAqIFdlYkZy YW1lLmNwcDoKKyAgICAgICAgKFdlYkZyYW1lOjpvYmplY3RDb250ZW50VHlwZSk6CisKIDIwMDkt MTAtMjUgIERhbiBCZXJuc3RlaW4gIDxtaXR6QGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdl ZCBieSBKb2huIFN1bGxpdmFuLgpkaWZmIC0tZ2l0IGEvV2ViS2l0L3dpbi9XZWJGcmFtZS5jcHAg Yi9XZWJLaXQvd2luL1dlYkZyYW1lLmNwcAppbmRleCBlYTJjNGY5Li42ZTE2ZGU3IDEwMDY0NAot LS0gYS9XZWJLaXQvd2luL1dlYkZyYW1lLmNwcAorKysgYi9XZWJLaXQvd2luL1dlYkZyYW1lLmNw cApAQCAtMSw1ICsxLDYgQEAKIC8qCiAgKiBDb3B5cmlnaHQgKEMpIDIwMDYsIDIwMDcsIDIwMDgs IDIwMDkgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSBS ZXNlYXJjaCBJbiBNb3Rpb24gTGltaXRlZCAyMDA5LiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoK ICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdp dGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRo YXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC03NywxMyArNzgsMTEgQEAKICNpbmNsdWRl IDxXZWJDb3JlL0hUTUxQbHVnSW5FbGVtZW50Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9KU0RPTVdp bmRvdy5oPgogI2luY2x1ZGUgPFdlYkNvcmUvS2V5Ym9hcmRFdmVudC5oPgotI2luY2x1ZGUgPFdl YkNvcmUvTUlNRVR5cGVSZWdpc3RyeS5oPgogI2luY2x1ZGUgPFdlYkNvcmUvTW91c2VSZWxhdGVk RXZlbnQuaD4KICNpbmNsdWRlIDxXZWJDb3JlL05vdEltcGxlbWVudGVkLmg+CiAjaW5jbHVkZSA8 V2ViQ29yZS9QYWdlLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9QbGF0Zm9ybUtleWJvYXJkRXZlbnQu aD4KICNpbmNsdWRlIDxXZWJDb3JlL1BsdWdpbkluZm9TdG9yZS5oPgotI2luY2x1ZGUgPFdlYkNv cmUvUGx1Z2luRGF0YWJhc2UuaD4KICNpbmNsdWRlIDxXZWJDb3JlL1BsdWdpblZpZXcuaD4KICNp bmNsdWRlIDxXZWJDb3JlL1Jlc291cmNlSGFuZGxlLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9SZXNv dXJjZUhhbmRsZVdpbi5oPgpAQCAtMTY4MiwyNSArMTY4MSw5IEBAIFBhc3NSZWZQdHI8V2lkZ2V0 PiBXZWJGcmFtZTo6Y3JlYXRlSmF2YUFwcGxldFdpZGdldChjb25zdCBJbnRTaXplJiBwbHVnaW5T aXplLCBICiAgICAgcmV0dXJuIHBsdWdpblZpZXc7CiB9CiAKLU9iamVjdENvbnRlbnRUeXBlIFdl YkZyYW1lOjpvYmplY3RDb250ZW50VHlwZShjb25zdCBLVVJMJiB1cmwsIGNvbnN0IFN0cmluZyYg bWltZVR5cGVJbikKK09iamVjdENvbnRlbnRUeXBlIFdlYkZyYW1lOjpvYmplY3RDb250ZW50VHlw ZShjb25zdCBLVVJMJiB1cmwsIGNvbnN0IFN0cmluZyYgbWltZVR5cGUpCiB7Ci0gICAgU3RyaW5n IG1pbWVUeXBlID0gbWltZVR5cGVJbjsKLSAgICBpZiAobWltZVR5cGUuaXNFbXB0eSgpKQotICAg ICAgICBtaW1lVHlwZSA9IE1JTUVUeXBlUmVnaXN0cnk6OmdldE1JTUVUeXBlRm9yRXh0ZW5zaW9u KHVybC5wYXRoKCkuc3Vic3RyaW5nKHVybC5wYXRoKCkucmV2ZXJzZUZpbmQoJy4nKSArIDEpKTsK LQotICAgIGlmIChtaW1lVHlwZS5pc0VtcHR5KCkpCi0gICAgICAgIHJldHVybiBPYmplY3RDb250 ZW50RnJhbWU7IC8vIEdvIGFoZWFkIGFuZCBob3BlIHRoYXQgd2UgY2FuIGRpc3BsYXkgdGhlIGNv bnRlbnQuCi0KLSAgICBpZiAoTUlNRVR5cGVSZWdpc3RyeTo6aXNTdXBwb3J0ZWRJbWFnZU1JTUVU eXBlKG1pbWVUeXBlKSkKLSAgICAgICAgcmV0dXJuIFdlYkNvcmU6Ok9iamVjdENvbnRlbnRJbWFn ZTsKLQotICAgIGlmIChQbHVnaW5EYXRhYmFzZTo6aW5zdGFsbGVkUGx1Z2lucygpLT5pc01JTUVU eXBlUmVnaXN0ZXJlZChtaW1lVHlwZSkpCi0gICAgICAgIHJldHVybiBXZWJDb3JlOjpPYmplY3RD b250ZW50TmV0c2NhcGVQbHVnaW47Ci0KLSAgICBpZiAoTUlNRVR5cGVSZWdpc3RyeTo6aXNTdXBw b3J0ZWROb25JbWFnZU1JTUVUeXBlKG1pbWVUeXBlKSkKLSAgICAgICAgcmV0dXJuIFdlYkNvcmU6 Ok9iamVjdENvbnRlbnRGcmFtZTsKLQotICAgIHJldHVybiBXZWJDb3JlOjpPYmplY3RDb250ZW50 Tm9uZTsKKyAgICByZXR1cm4gV2ViQ29yZTo6RnJhbWVMb2FkZXI6OmRlZmF1bHRPYmplY3RDb250 ZW50VHlwZSh1cmwsIG1pbWVUeXBlKTsKIH0KIAogU3RyaW5nIFdlYkZyYW1lOjpvdmVycmlkZU1l ZGlhVHlwZSgpIGNvbnN0Ci0tIAoxLjYuNS4xLjEzNjcuZ2NkNDgKCg== 42038 2009-10-28 09:50:46 -0700 2009-10-28 15:06:42 -0700 same patch, with build fix for gtk defaultObjectContentType.patch text/plain 11035 joenotcharles RnJvbSAzYWI1Yzg5ZmRiM2M4YWU4N2MwNWI3MTczNDQ5ZDhmYmI1MjQ5NTlmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb2UgTWFzb24gPGptYXNvbkByaW0uY29tPgpEYXRlOiBXZWQs IDI4IE9jdCAyMDA5IDExOjU5OjIzIC0wNDAwClN1YmplY3Q6IFtQQVRDSCAxLzNdIFdlYkNvcmU6 CgoyMDA5LTEwLTI4ICBKb2UgTWFzb24gIDxqbWFzb25AcmltLmNvbT4KCiAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCgogICAgICAgIEFkZCBGcmFtZUxvYWRlcjo6ZGVmYXVsdE9i amVjdENvbnRlbnRUeXBlLCBjb250YWluaW5nIGNvbW1vbiBjb2RlIGZvcgogICAgICAgIGltcGxl bWVudGluZyBGcmFtZUxvYWRlckNsaWVudDo6b2JqZWN0Q29udGVudFR5cGUuICAoQ3VycmVudGx5 IHRoZSBndGsKICAgICAgICBhbmQgd2luIHBvcnRzIGhhdmUgY29waWVkIHRoaXMgY29kZSwgYW5k IHRoZSBxdCBwb3J0IHVzZXMgc2ltaWxhciBjb2RlCiAgICAgICAgd2l0aCBhIGZldyBleHRyYSBj bGF1c2VzLiAgTW92aW5nIHRoaXMgdG8gYSB1dGlsaXR5IGZ1bmN0aW9uIGN1dHMgZG93bgogICAg ICAgIG9uIGNvcGllZCBjb2RlLikgIFRoaXMgY2F1c2VzIG5vIGJlaGF2aW91cmFsIGNoYW5nZS4K CiAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIuY3BwOgogICAgICAgIChXZWJDb3JlOjpGcmFt ZUxvYWRlcjo6ZGVmYXVsdE9iamVjdENvbnRlbnRUeXBlKToKICAgICAgICAqIGxvYWRlci9GcmFt ZUxvYWRlci5oOgoKV2ViS2l0L2d0azoKCjIwMDktMTAtMjggIEpvZSBNYXNvbiAgPGptYXNvbkBy aW0uY29tPgoKICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCiAgICAgICAgQ2Fs bCB0aGUgc2hhcmVkIEZyYW1lTG9hZGVyOjpkZWZhdWx0T2JqZWN0Q29udGVudFR5cGUgaW5zdGVh ZCBvZgogICAgICAgIGNvcHlpbmcgY29kZSBpbnRvIEZyYW1lTG9hZGVyQ2xpZW50OjpvYmplY3RD b250ZW50VHlwZS4gIFRoaXMgY2F1c2VzIG5vCiAgICAgICAgYmVoYXZpb3VyYWwgY2hhbmdlLgoK ICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmNwcDoKICAgICAg ICAoV2ViS2l0OjpGcmFtZUxvYWRlckNsaWVudDo6b2JqZWN0Q29udGVudFR5cGUpOgoKV2ViS2l0 L3dpbjoKCjIwMDktMTAtMjggIEpvZSBNYXNvbiAgPGptYXNvbkByaW0uY29tPgoKICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCiAgICAgICAgQ2FsbCB0aGUgc2hhcmVkIEZyYW1l TG9hZGVyOjpkZWZhdWx0T2JqZWN0Q29udGVudFR5cGUgaW5zdGVhZCBvZgogICAgICAgIGNvcHlp bmcgY29kZSBpbnRvIEZyYW1lTG9hZGVyQ2xpZW50OjpvYmplY3RDb250ZW50VHlwZS4gIFRoaXMg Y2F1c2VzIG5vCiAgICAgICAgYmVoYXZpb3VyYWwgY2hhbmdlLgoKICAgICAgICAqIFdlYkZyYW1l LmNwcDoKICAgICAgICAoV2ViRnJhbWU6Om9iamVjdENvbnRlbnRUeXBlKToKLS0tCiBXZWJDb3Jl L0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMTQgKysrKysr KysrKysKIFdlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcCAgICAgICAgICAgICAgICAgICAg IHwgICAyNSArKysrKysrKysrKysrKysrKysrKwogV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIu aCAgICAgICAgICAgICAgICAgICAgICAgfCAgICAzICsrCiBXZWJLaXQvZ3RrL0NoYW5nZUxvZyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMTEgKysrKysrKysKIFdlYktpdC9ndGsv V2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwIHwgICAyMCArLS0tLS0tLS0t LS0tLS0KIFdlYktpdC93aW4vQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHwgICAxMSArKysrKysrKwogV2ViS2l0L3dpbi9XZWJGcmFtZS5jcHAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgfCAgIDIzICsrLS0tLS0tLS0tLS0tLS0tLQogNyBmaWxlcyBjaGFuZ2VkLCA2 OSBpbnNlcnRpb25zKCspLCAzOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9XZWJDb3JlL0No YW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDQ4M2UwZWUuLjNlMzZmYWIgMTAwNjQ0 Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMTcgQEAKKzIwMDktMTAtMjggIEpvZSBNYXNvbiAgPGptYXNvbkByaW0uY29tPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBGcmFtZUxvYWRl cjo6ZGVmYXVsdE9iamVjdENvbnRlbnRUeXBlLCBjb250YWluaW5nIGNvbW1vbiBjb2RlIGZvcgor ICAgICAgICBpbXBsZW1lbnRpbmcgRnJhbWVMb2FkZXJDbGllbnQ6Om9iamVjdENvbnRlbnRUeXBl LiAgKEN1cnJlbnRseSB0aGUgZ3RrCisgICAgICAgIGFuZCB3aW4gcG9ydHMgaGF2ZSBjb3BpZWQg dGhpcyBjb2RlLCBhbmQgdGhlIHF0IHBvcnQgdXNlcyBzaW1pbGFyIGNvZGUKKyAgICAgICAgd2l0 aCBhIGZldyBleHRyYSBjbGF1c2VzLiAgTW92aW5nIHRoaXMgdG8gYSB1dGlsaXR5IGZ1bmN0aW9u IGN1dHMgZG93bgorICAgICAgICBvbiBjb3BpZWQgY29kZS4pICAgVGhpcyBjYXVzZXMgbm8gYmVo YXZpb3VyYWwgY2hhbmdlLgorCisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpkZWZhdWx0T2JqZWN0Q29udGVudFR5cGUpOgor ICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlci5oOgorCiAyMDA5LTEwLTI2ICBTdGV2ZSBCbG9j ayAgPHN0ZXZlYmxvY2tAZ29vZ2xlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBFcmljIFNl aWRlbC4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcCBiL1dlYkNv cmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAppbmRleCAzNGE4ZjMyLi5iYjkwNGE1IDEwMDY0NAot LS0gYS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKKysrIGIvV2ViQ29yZS9sb2FkZXIv RnJhbWVMb2FkZXIuY3BwCkBAIC0yLDYgKzIsOCBAQAogICogQ29weXJpZ2h0IChDKSAyMDA2LCAy MDA3LCAyMDA4LCAyMDA5IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqIENvcHly aWdodCAoQykgMjAwOCBOb2tpYSBDb3Jwb3JhdGlvbiBhbmQvb3IgaXRzIHN1YnNpZGlhcnkoLWll cykKICAqIENvcHlyaWdodCAoQykgMjAwOCwgMjAwOSBUb3JjaCBNb2JpbGUgSW5jLiBBbGwgcmln aHRzIHJlc2VydmVkLiAoaHR0cDovL3d3dy50b3JjaG1vYmlsZS5jb20vKQorICogQ29weXJpZ2h0 IChDKSAyMDA4IEFscCBUb2tlciA8YWxwQGF0b2tlci5jb20+CisgKiBDb3B5cmlnaHQgKEMpIFJl c2VhcmNoIEluIE1vdGlvbiBMaW1pdGVkIDIwMDkuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgog ICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0 aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhh dCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTc1LDYgKzc3LDcgQEAKICNpbmNsdWRlICJQ YWdlVHJhbnNpdGlvbkV2ZW50LmgiCiAjaW5jbHVkZSAiUGxhY2Vob2xkZXJEb2N1bWVudC5oIgog I2luY2x1ZGUgIlBsdWdpbkRhdGEuaCIKKyNpbmNsdWRlICJQbHVnaW5EYXRhYmFzZS5oIgogI2lu Y2x1ZGUgIlBsdWdpbkRvY3VtZW50LmgiCiAjaW5jbHVkZSAiUHJvZ3Jlc3NUcmFja2VyLmgiCiAj aW5jbHVkZSAiUmVuZGVyUGFydC5oIgpAQCAtMTI5MCw2ICsxMjkzLDI4IEBAIGJvb2wgRnJhbWVM b2FkZXI6OnNob3VsZFVzZVBsdWdpbihjb25zdCBLVVJMJiB1cmwsIGNvbnN0IFN0cmluZyYgbWlt ZVR5cGUsIGJvb2wKICAgICByZXR1cm4gb2JqZWN0VHlwZSA9PSBPYmplY3RDb250ZW50Tm9uZSB8 fCBvYmplY3RUeXBlID09IE9iamVjdENvbnRlbnROZXRzY2FwZVBsdWdpbiB8fCBvYmplY3RUeXBl ID09IE9iamVjdENvbnRlbnRPdGhlclBsdWdpbjsKIH0KIAorT2JqZWN0Q29udGVudFR5cGUgRnJh bWVMb2FkZXI6OmRlZmF1bHRPYmplY3RDb250ZW50VHlwZShjb25zdCBLVVJMJiB1cmwsIGNvbnN0 IFN0cmluZyYgbWltZVR5cGVJbikKK3sKKyAgICBTdHJpbmcgbWltZVR5cGUgPSBtaW1lVHlwZUlu OworICAgIC8vIFdlIGRvbid0IHVzZSBNSU1FVHlwZVJlZ2lzdHJ5OjpnZXRNSU1FVHlwZUZvclBh dGgoKSBiZWNhdXNlIGl0IHJldHVybnMgImFwcGxpY2F0aW9uL29jdGV0LXN0cmVhbSIgdXBvbiBm YWlsdXJlCisgICAgaWYgKG1pbWVUeXBlLmlzRW1wdHkoKSkKKyAgICAgICAgbWltZVR5cGUgPSBN SU1FVHlwZVJlZ2lzdHJ5OjpnZXRNSU1FVHlwZUZvckV4dGVuc2lvbih1cmwucGF0aCgpLnN1YnN0 cmluZyh1cmwucGF0aCgpLnJldmVyc2VGaW5kKCcuJykgKyAxKSk7CisKKyAgICBpZiAobWltZVR5 cGUuaXNFbXB0eSgpKQorICAgICAgICByZXR1cm4gT2JqZWN0Q29udGVudEZyYW1lOyAvLyBHbyBh aGVhZCBhbmQgaG9wZSB0aGF0IHdlIGNhbiBkaXNwbGF5IHRoZSBjb250ZW50LgorCisgICAgaWYg KE1JTUVUeXBlUmVnaXN0cnk6OmlzU3VwcG9ydGVkSW1hZ2VNSU1FVHlwZShtaW1lVHlwZSkpCisg ICAgICAgIHJldHVybiBXZWJDb3JlOjpPYmplY3RDb250ZW50SW1hZ2U7CisKKyAgICBpZiAoUGx1 Z2luRGF0YWJhc2U6Omluc3RhbGxlZFBsdWdpbnMoKS0+aXNNSU1FVHlwZVJlZ2lzdGVyZWQobWlt ZVR5cGUpKQorICAgICAgICByZXR1cm4gV2ViQ29yZTo6T2JqZWN0Q29udGVudE5ldHNjYXBlUGx1 Z2luOworCisgICAgaWYgKE1JTUVUeXBlUmVnaXN0cnk6OmlzU3VwcG9ydGVkTm9uSW1hZ2VNSU1F VHlwZShtaW1lVHlwZSkpCisgICAgICAgIHJldHVybiBXZWJDb3JlOjpPYmplY3RDb250ZW50RnJh bWU7CisKKyAgICByZXR1cm4gV2ViQ29yZTo6T2JqZWN0Q29udGVudE5vbmU7Cit9CisKIHN0YXRp YyBIVE1MUGx1Z0luRWxlbWVudCogdG9QbHVnSW5FbGVtZW50KE5vZGUqIG5vZGUpCiB7CiAgICAg aWYgKCFub2RlKQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuaCBiL1dl YkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmgKaW5kZXggYzBjMTc1Yi4uM2JmNjE5NiAxMDA2NDQK LS0tIGEvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuaAorKysgYi9XZWJDb3JlL2xvYWRlci9G cmFtZUxvYWRlci5oCkBAIC0xLDYgKzEsNyBAQAogLyoKICAqIENvcHlyaWdodCAoQykgMjAwNiwg MjAwNywgMjAwOCwgMjAwOSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKiBDb3B5 cmlnaHQgKEMpIDIwMDgsIDIwMDkgVG9yY2ggTW9iaWxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZl ZC4gKGh0dHA6Ly93d3cudG9yY2htb2JpbGUuY29tLykKKyAqIENvcHlyaWdodCAoQykgUmVzZWFy Y2ggSW4gTW90aW9uIExpbWl0ZWQgMjAwOS4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBS ZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9y IHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRo ZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMzI1LDYgKzMyNiw4IEBAIHB1YmxpYzoKICAgICAK ICAgICBib29sIHN1cHByZXNzT3BlbmVySW5OZXdGcmFtZSgpIGNvbnN0IHsgcmV0dXJuIG1fc3Vw cHJlc3NPcGVuZXJJbk5ld0ZyYW1lOyB9CiAKKyAgICBzdGF0aWMgT2JqZWN0Q29udGVudFR5cGUg ZGVmYXVsdE9iamVjdENvbnRlbnRUeXBlKGNvbnN0IEtVUkwmIHVybCwgY29uc3QgU3RyaW5nJiBt aW1lVHlwZSk7CisKIHByaXZhdGU6CiAgICAgYm9vbCBjYW5DYWNoZVBhZ2VDb250YWluaW5nVGhp c0ZyYW1lKCk7CiAjaWZuZGVmIE5ERUJVRwpkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0ay9DaGFuZ2VM b2cgYi9XZWJLaXQvZ3RrL0NoYW5nZUxvZwppbmRleCA2ZWZlZGIyLi40YzJhYjZmIDEwMDY0NAot LS0gYS9XZWJLaXQvZ3RrL0NoYW5nZUxvZworKysgYi9XZWJLaXQvZ3RrL0NoYW5nZUxvZwpAQCAt MSwzICsxLDE0IEBACisyMDA5LTEwLTI4ICBKb2UgTWFzb24gIDxqbWFzb25AcmltLmNvbT4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDYWxsIHRoZSBz aGFyZWQgRnJhbWVMb2FkZXI6OmRlZmF1bHRPYmplY3RDb250ZW50VHlwZSBpbnN0ZWFkIG9mCisg ICAgICAgIGNvcHlpbmcgY29kZSBpbnRvIEZyYW1lTG9hZGVyQ2xpZW50OjpvYmplY3RDb250ZW50 VHlwZS4gIFRoaXMgY2F1c2VzIG5vCisgICAgICAgIGJlaGF2aW91cmFsIGNoYW5nZS4KKworICAg ICAgICAqIFdlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmNwcDoKKyAgICAgICAg KFdlYktpdDo6RnJhbWVMb2FkZXJDbGllbnQ6Om9iamVjdENvbnRlbnRUeXBlKToKKwogMjAwOS0x MC0yNiAgR3VzdGF2byBOb3JvbmhhIFNpbHZhICA8Z3VzdGF2by5ub3JvbmhhQGNvbGxhYm9yYS5j by51az4KIAogICAgICAgICBVbnJldmlld2VkLiBVcGRhdGUgZG9jdW1lbnRhdGlvbiBjb250cm9s IGZpbGVzIGZvciAxLjEuMTYuCmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0 L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmNwcCBiL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJh bWVMb2FkZXJDbGllbnRHdGsuY3BwCmluZGV4IGRjMTE1M2UuLmQ1M2RmODggMTAwNjQ0Ci0tLSBh L1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwCisrKyBi L1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwCkBAIC00 LDYgKzQsNyBAQAogICogIENvcHlyaWdodCAoQykgMjAwNyBDaHJpc3RpYW4gRHl3YW4gPGNocmlz dGlhbkB0d290b2FzdHMuZGU+CiAgKiAgQ29weXJpZ2h0IChDKSAyMDA4LCAyMDA5IENvbGxhYm9y YSBMdGQuICBBbGwgcmlnaHRzIHJlc2VydmVkLgogICogIENvcHlyaWdodCAoQykgMjAwOSBHdXN0 YXZvIE5vcm9uaGEgU2lsdmEgPGduc0Bnbm9tZS5vcmc+CisgKiAgQ29weXJpZ2h0IChDKSBSZXNl YXJjaCBJbiBNb3Rpb24gTGltaXRlZCAyMDA5LiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAq ICBUaGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQg YW5kL29yCiAgKiAgbW9kaWZ5IGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExlc3NlciBH ZW5lcmFsIFB1YmxpYwpAQCAtNDkwLDI0ICs0OTEsNyBAQCBQYXNzUmVmUHRyPFdpZGdldD4gRnJh bWVMb2FkZXJDbGllbnQ6OmNyZWF0ZUphdmFBcHBsZXRXaWRnZXQoY29uc3QgSW50U2l6ZSYsIEhU TQogCiBPYmplY3RDb250ZW50VHlwZSBGcmFtZUxvYWRlckNsaWVudDo6b2JqZWN0Q29udGVudFR5 cGUoY29uc3QgS1VSTCYgdXJsLCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlKQogewotICAgIFN0cmlu ZyB0eXBlID0gbWltZVR5cGU7Ci0gICAgLy8gV2UgZG9uJ3QgdXNlIE1JTUVUeXBlUmVnaXN0cnk6 OmdldE1JTUVUeXBlRm9yUGF0aCgpIGJlY2F1c2UgaXQgcmV0dXJucyAiYXBwbGljYXRpb24vb2N0 ZXQtc3RyZWFtIiB1cG9uIGZhaWx1cmUKLSAgICBpZiAodHlwZS5pc0VtcHR5KCkpCi0gICAgICAg IHR5cGUgPSBNSU1FVHlwZVJlZ2lzdHJ5OjpnZXRNSU1FVHlwZUZvckV4dGVuc2lvbih1cmwucGF0 aCgpLnN1YnN0cmluZyh1cmwucGF0aCgpLnJldmVyc2VGaW5kKCcuJykgKyAxKSk7Ci0KLSAgICBp ZiAodHlwZS5pc0VtcHR5KCkpCi0gICAgICAgIHJldHVybiBXZWJDb3JlOjpPYmplY3RDb250ZW50 RnJhbWU7Ci0KLSAgICBpZiAoTUlNRVR5cGVSZWdpc3RyeTo6aXNTdXBwb3J0ZWRJbWFnZU1JTUVU eXBlKHR5cGUpKQotICAgICAgICByZXR1cm4gV2ViQ29yZTo6T2JqZWN0Q29udGVudEltYWdlOwot Ci0gICAgaWYgKFBsdWdpbkRhdGFiYXNlOjppbnN0YWxsZWRQbHVnaW5zKCktPmlzTUlNRVR5cGVS ZWdpc3RlcmVkKG1pbWVUeXBlKSkKLSAgICAgICAgcmV0dXJuIFdlYkNvcmU6Ok9iamVjdENvbnRl bnROZXRzY2FwZVBsdWdpbjsKLQotICAgIGlmIChNSU1FVHlwZVJlZ2lzdHJ5Ojppc1N1cHBvcnRl ZE5vbkltYWdlTUlNRVR5cGUodHlwZSkpCi0gICAgICAgIHJldHVybiBXZWJDb3JlOjpPYmplY3RD b250ZW50RnJhbWU7Ci0KLSAgICByZXR1cm4gV2ViQ29yZTo6T2JqZWN0Q29udGVudE5vbmU7Cisg ICAgcmV0dXJuIEZyYW1lTG9hZGVyOjpkZWZhdWx0T2JqZWN0Q29udGVudFR5cGUodXJsLCBtaW1l VHlwZSk7CiB9CiAKIFN0cmluZyBGcmFtZUxvYWRlckNsaWVudDo6b3ZlcnJpZGVNZWRpYVR5cGUo KSBjb25zdApkaWZmIC0tZ2l0IGEvV2ViS2l0L3dpbi9DaGFuZ2VMb2cgYi9XZWJLaXQvd2luL0No YW5nZUxvZwppbmRleCBhNWQ0YjdlLi42ZGQ0ODljIDEwMDY0NAotLS0gYS9XZWJLaXQvd2luL0No YW5nZUxvZworKysgYi9XZWJLaXQvd2luL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDA5 LTEwLTI4ICBKb2UgTWFzb24gIDxqbWFzb25AcmltLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDYWxsIHRoZSBzaGFyZWQgRnJhbWVMb2FkZXI6 OmRlZmF1bHRPYmplY3RDb250ZW50VHlwZSBpbnN0ZWFkIG9mCisgICAgICAgIGNvcHlpbmcgY29k ZSBpbnRvIEZyYW1lTG9hZGVyQ2xpZW50OjpvYmplY3RDb250ZW50VHlwZS4gIFRoaXMgY2F1c2Vz IG5vCisgICAgICAgIGJlaGF2aW91cmFsIGNoYW5nZS4KKworICAgICAgICAqIFdlYkZyYW1lLmNw cDoKKyAgICAgICAgKFdlYkZyYW1lOjpvYmplY3RDb250ZW50VHlwZSk6CisKIDIwMDktMTAtMjUg IERhbiBCZXJuc3RlaW4gIDxtaXR6QGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBK b2huIFN1bGxpdmFuLgpkaWZmIC0tZ2l0IGEvV2ViS2l0L3dpbi9XZWJGcmFtZS5jcHAgYi9XZWJL aXQvd2luL1dlYkZyYW1lLmNwcAppbmRleCBlYTJjNGY5Li42ZTE2ZGU3IDEwMDY0NAotLS0gYS9X ZWJLaXQvd2luL1dlYkZyYW1lLmNwcAorKysgYi9XZWJLaXQvd2luL1dlYkZyYW1lLmNwcApAQCAt MSw1ICsxLDYgQEAKIC8qCiAgKiBDb3B5cmlnaHQgKEMpIDIwMDYsIDIwMDcsIDIwMDgsIDIwMDkg QXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSBSZXNlYXJj aCBJbiBNb3Rpb24gTGltaXRlZCAyMDA5LiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJl ZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Ig d2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhl IGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC03NywxMyArNzgsMTEgQEAKICNpbmNsdWRlIDxXZWJD b3JlL0hUTUxQbHVnSW5FbGVtZW50Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9KU0RPTVdpbmRvdy5o PgogI2luY2x1ZGUgPFdlYkNvcmUvS2V5Ym9hcmRFdmVudC5oPgotI2luY2x1ZGUgPFdlYkNvcmUv TUlNRVR5cGVSZWdpc3RyeS5oPgogI2luY2x1ZGUgPFdlYkNvcmUvTW91c2VSZWxhdGVkRXZlbnQu aD4KICNpbmNsdWRlIDxXZWJDb3JlL05vdEltcGxlbWVudGVkLmg+CiAjaW5jbHVkZSA8V2ViQ29y ZS9QYWdlLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9QbGF0Zm9ybUtleWJvYXJkRXZlbnQuaD4KICNp bmNsdWRlIDxXZWJDb3JlL1BsdWdpbkluZm9TdG9yZS5oPgotI2luY2x1ZGUgPFdlYkNvcmUvUGx1 Z2luRGF0YWJhc2UuaD4KICNpbmNsdWRlIDxXZWJDb3JlL1BsdWdpblZpZXcuaD4KICNpbmNsdWRl IDxXZWJDb3JlL1Jlc291cmNlSGFuZGxlLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9SZXNvdXJjZUhh bmRsZVdpbi5oPgpAQCAtMTY4MiwyNSArMTY4MSw5IEBAIFBhc3NSZWZQdHI8V2lkZ2V0PiBXZWJG cmFtZTo6Y3JlYXRlSmF2YUFwcGxldFdpZGdldChjb25zdCBJbnRTaXplJiBwbHVnaW5TaXplLCBI CiAgICAgcmV0dXJuIHBsdWdpblZpZXc7CiB9CiAKLU9iamVjdENvbnRlbnRUeXBlIFdlYkZyYW1l OjpvYmplY3RDb250ZW50VHlwZShjb25zdCBLVVJMJiB1cmwsIGNvbnN0IFN0cmluZyYgbWltZVR5 cGVJbikKK09iamVjdENvbnRlbnRUeXBlIFdlYkZyYW1lOjpvYmplY3RDb250ZW50VHlwZShjb25z dCBLVVJMJiB1cmwsIGNvbnN0IFN0cmluZyYgbWltZVR5cGUpCiB7Ci0gICAgU3RyaW5nIG1pbWVU eXBlID0gbWltZVR5cGVJbjsKLSAgICBpZiAobWltZVR5cGUuaXNFbXB0eSgpKQotICAgICAgICBt aW1lVHlwZSA9IE1JTUVUeXBlUmVnaXN0cnk6OmdldE1JTUVUeXBlRm9yRXh0ZW5zaW9uKHVybC5w YXRoKCkuc3Vic3RyaW5nKHVybC5wYXRoKCkucmV2ZXJzZUZpbmQoJy4nKSArIDEpKTsKLQotICAg IGlmIChtaW1lVHlwZS5pc0VtcHR5KCkpCi0gICAgICAgIHJldHVybiBPYmplY3RDb250ZW50RnJh bWU7IC8vIEdvIGFoZWFkIGFuZCBob3BlIHRoYXQgd2UgY2FuIGRpc3BsYXkgdGhlIGNvbnRlbnQu Ci0KLSAgICBpZiAoTUlNRVR5cGVSZWdpc3RyeTo6aXNTdXBwb3J0ZWRJbWFnZU1JTUVUeXBlKG1p bWVUeXBlKSkKLSAgICAgICAgcmV0dXJuIFdlYkNvcmU6Ok9iamVjdENvbnRlbnRJbWFnZTsKLQot ICAgIGlmIChQbHVnaW5EYXRhYmFzZTo6aW5zdGFsbGVkUGx1Z2lucygpLT5pc01JTUVUeXBlUmVn aXN0ZXJlZChtaW1lVHlwZSkpCi0gICAgICAgIHJldHVybiBXZWJDb3JlOjpPYmplY3RDb250ZW50 TmV0c2NhcGVQbHVnaW47Ci0KLSAgICBpZiAoTUlNRVR5cGVSZWdpc3RyeTo6aXNTdXBwb3J0ZWRO b25JbWFnZU1JTUVUeXBlKG1pbWVUeXBlKSkKLSAgICAgICAgcmV0dXJuIFdlYkNvcmU6Ok9iamVj dENvbnRlbnRGcmFtZTsKLQotICAgIHJldHVybiBXZWJDb3JlOjpPYmplY3RDb250ZW50Tm9uZTsK KyAgICByZXR1cm4gV2ViQ29yZTo6RnJhbWVMb2FkZXI6OmRlZmF1bHRPYmplY3RDb250ZW50VHlw ZSh1cmwsIG1pbWVUeXBlKTsKIH0KIAogU3RyaW5nIFdlYkZyYW1lOjpvdmVycmlkZU1lZGlhVHlw ZSgpIGNvbnN0Ci0tIAoxLjYuNS4xLjEzNjcuZ2NkNDgKCg== 42044 2009-10-28 11:29:09 -0700 2009-10-28 15:06:13 -0700 build fix for windows build-fix.patch text/plain 427 joenotcharles ZGlmZiAtLWdpdCBhL1dlYktpdC93aW4vV2ViRnJhbWUuY3BwIGIvV2ViS2l0L3dpbi9XZWJGcmFt ZS5jcHAKaW5kZXggNmUxNmRlNy4uMmYwOTY2MCAxMDA2NDQKLS0tIGEvV2ViS2l0L3dpbi9XZWJG cmFtZS5jcHAKKysrIGIvV2ViS2l0L3dpbi9XZWJGcmFtZS5jcHAKQEAgLTgzLDYgKzgzLDcgQEAK ICNpbmNsdWRlIDxXZWJDb3JlL1BhZ2UuaD4KICNpbmNsdWRlIDxXZWJDb3JlL1BsYXRmb3JtS2V5 Ym9hcmRFdmVudC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvUGx1Z2luSW5mb1N0b3JlLmg+CisjaW5j bHVkZSA8V2ViQ29yZS9QbHVnaW5EYXRhYmFzZS5oPgogI2luY2x1ZGUgPFdlYkNvcmUvUGx1Z2lu Vmlldy5oPgogI2luY2x1ZGUgPFdlYkNvcmUvUmVzb3VyY2VIYW5kbGUuaD4KICNpbmNsdWRlIDxX ZWJDb3JlL1Jlc291cmNlSGFuZGxlV2luLmg+Cg== 42045 2009-10-28 11:51:36 -0700 2009-10-28 15:06:28 -0700 build fix for mac mac-build-fix.patch text/plain 697 joenotcharles ZGlmZiAtLWdpdCBhL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcCBiL1dlYkNvcmUvbG9h ZGVyL0ZyYW1lTG9hZGVyLmNwcAppbmRleCBiYjkwNGE1Li44ODQzODc5IDEwMDY0NAotLS0gYS9X ZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKKysrIGIvV2ViQ29yZS9sb2FkZXIvRnJhbWVM b2FkZXIuY3BwCkBAIC0xMzA2LDggKzEzMDYsMTAgQEAgT2JqZWN0Q29udGVudFR5cGUgRnJhbWVM b2FkZXI6OmRlZmF1bHRPYmplY3RDb250ZW50VHlwZShjb25zdCBLVVJMJiB1cmwsIGNvbnN0IFMK ICAgICBpZiAoTUlNRVR5cGVSZWdpc3RyeTo6aXNTdXBwb3J0ZWRJbWFnZU1JTUVUeXBlKG1pbWVU eXBlKSkKICAgICAgICAgcmV0dXJuIFdlYkNvcmU6Ok9iamVjdENvbnRlbnRJbWFnZTsKIAorI2lm ICFQTEFURk9STShNQUMpICAvLyBNYWMgaGFzIG5vIFBsdWdpbkRhdGFiYXNlCiAgICAgaWYgKFBs dWdpbkRhdGFiYXNlOjppbnN0YWxsZWRQbHVnaW5zKCktPmlzTUlNRVR5cGVSZWdpc3RlcmVkKG1p bWVUeXBlKSkKICAgICAgICAgcmV0dXJuIFdlYkNvcmU6Ok9iamVjdENvbnRlbnROZXRzY2FwZVBs dWdpbjsKKyNlbmRpZgogCiAgICAgaWYgKE1JTUVUeXBlUmVnaXN0cnk6OmlzU3VwcG9ydGVkTm9u SW1hZ2VNSU1FVHlwZShtaW1lVHlwZSkpCiAgICAgICAgIHJldHVybiBXZWJDb3JlOjpPYmplY3RD b250ZW50RnJhbWU7Cg==