28132 2009-08-09 10:22:19 -0700 FrameLoadType / WebFrameLoadType enums are out of sync 2009-08-09 15:12:07 -0700 1 1 1 Unclassified WebKit WebKit API 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 zimmermann zimmermann darin mjs staikos oldest_to_newest 138535 0 zimmermann 2009-08-09 10:22:19 -0700 WebCore/loader/FrameLoaderTypes.h defines the FrameLoadType enum. WebKit/mac/WebView/WebFramePrivate.h and WebKit/win/Interfaces/IWebFramePrivate.idl define their own public WebFrameLoadType enum. The enums are out of sync at the moment, and it's very dangerous because The FrameLoadType -> WebFrameLoadType conversions happen as c-casts. 138536 1 34425 zimmermann 2009-08-09 10:26:23 -0700 Created attachment 34425 Initial patch 138550 2 zimmermann 2009-08-09 13:39:15 -0700 A quick scan, when these problems have been introduced: #1) WebFrameLoadTypeReloadAllowingStaleData (affecting mac & win) http://trac.webkit.org/changeset/40353/trunk/WebCore/loader/FrameLoaderTypes.h #2) WebFrameLoadTypeReloadFromOrigin (affecting win only) http://trac.webkit.org/changeset/39304/trunk/WebCore/loader/FrameLoaderTypes.h 138552 3 34425 mjs 2009-08-09 13:52:47 -0700 Comment on attachment 34425 Initial patch This changes public API headers and may break source and/or binary compat. The better way to do this would be to restore the old value to FrameLoadType, even though it is unused. As discussed on IRC. r- for now, awaiting new patch. 138554 4 34429 zimmermann 2009-08-09 14:02:34 -0700 Created attachment 34429 Updated patch Fix Maciej's comments. 138555 5 34429 zimmermann 2009-08-09 14:15:31 -0700 Comment on attachment 34429 Updated patch Clearing review patch. This won't compile, the new enum value is not handled in the switch'es in FrameLoader. Need to find a better solution. 138558 6 34431 zimmermann 2009-08-09 14:52:17 -0700 Created attachment 34431 Updated patch v2 138560 7 34431 mjs 2009-08-09 14:56:42 -0700 Comment on attachment 34431 Updated patch v2 r=me 138562 8 zimmermann 2009-08-09 15:12:07 -0700 Landed in r46965. 34425 2009-08-09 10:26:23 -0700 2009-08-09 14:02:34 -0700 Initial patch FixEnums.diff text/plain 4827 zimmermann SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0Njk2NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTQgQEAKKzIwMDktMDgtMDkgIE5pa29sYXMgWmltbWVybWFubiAgPG5pa29sYXMu emltbWVybWFubkB0b3JjaG1vYmlsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgRnJhbWVMb2FkVHlwZSAvIFdlYkZyYW1lTG9hZFR5cGUgZW51 bXMgYXJlIG91dCBvZiBzeW5jCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yODEzMgorCisgICAgICAgIEFkZCBhIG5vdGUgdG8gdGhlIEZyYW1lTG9hZFR5 cGUgZW51bSB0byBrZWVwIGl0IGluIHN5bmMgd2l0aCBXZWJGcmFtZVByaXZhdGUuaCAmIElXZWJG cmFtZVByaXZhdGUuaWRsLgorCisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyVHlwZXMuaDoK KwogMjAwOS0wOC0wOSAgTmlrb2xhcyBaaW1tZXJtYW5uICA8bmlrb2xhcy56aW1tZXJtYW5uQHRv cmNobW9iaWxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBHZW9yZ2UgU3RhaWtvcy4KSW5k ZXg6IFdlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyVHlwZXMuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJD b3JlL2xvYWRlci9GcmFtZUxvYWRlclR5cGVzLmgJKHJldmlzaW9uIDQ2OTY0KQorKysgV2ViQ29y ZS9sb2FkZXIvRnJhbWVMb2FkZXJUeXBlcy5oCSh3b3JraW5nIGNvcHkpCkBAIC00NSw2ICs0NSw3 IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgUG9saWN5SWdub3JlLAogICAgIH07CiAK KyAgICAvLyBOT1RFOiBLZWVwIGluIHN5bmMgd2l0aCBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViRnJh bWVQcml2YXRlLmggYW5kIFdlYktpdC93aW4vSW50ZXJmYWNlcy9JV2ViRnJhbWVQcml2YXRlLmlk bAogICAgIGVudW0gRnJhbWVMb2FkVHlwZSB7CiAgICAgICAgIEZyYW1lTG9hZFR5cGVTdGFuZGFy ZCwKICAgICAgICAgRnJhbWVMb2FkVHlwZUJhY2ssCkluZGV4OiBXZWJLaXQvbWFjL0NoYW5nZUxv Zwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJLaXQvbWFjL0NoYW5nZUxvZwkocmV2aXNpb24gNDY5NjQpCisr KyBXZWJLaXQvbWFjL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisy MDA5LTA4LTA5ICBOaWtvbGFzIFppbW1lcm1hbm4gIDxuaWtvbGFzLnppbW1lcm1hbm5AdG9yY2ht b2JpbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEZyYW1lTG9hZFR5cGUgLyBXZWJGcmFtZUxvYWRUeXBlIGVudW1zIGFyZSBvdXQgb2Ygc3lu YworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjgxMzIK KworICAgICAgICBTeW5jaHJvbml6ZSBGcmFtZUxvYWRUeXBlIDwtPiBXZWJGcmFtZUxvYWRUeXBl IGVudW1zLgorICAgICAgICAtPiByZW1vdmUgV2ViRnJhbWVMb2FkVHlwZVJlbG9hZEFsbG93aW5n U3RhbGVEYXRhLgorCisgICAgICAgIEFkZCBhIG5vdGUgdG8ga2VlcCB0aGlzIGVudW0gaW4gc3lu YyB3aXRoIFdlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyVHlwZXMuaCwKKyAgICAgICAgYXMgdGhl IFdlYkNvcmUgZW51bSBpcyBjb252ZXJ0ZWQgdG8gdGhlIFdlYkZyYW1lTG9hZFR5cGUgZW51bSBi eSBhIGMtc3R5bGUgY2FzdC4KKworICAgICAgICAqIFdlYlZpZXcvV2ViRnJhbWVQcml2YXRlLmg6 CisKIDIwMDktMDgtMDcgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAK ICAgICAgICAgRml4IHRoZSBidWlsZCBvbiAxMC42LgpJbmRleDogV2ViS2l0L21hYy9XZWJWaWV3 L1dlYkZyYW1lUHJpdmF0ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMvV2ViVmlldy9XZWJG cmFtZVByaXZhdGUuaAkocmV2aXNpb24gNDY5NjQpCisrKyBXZWJLaXQvbWFjL1dlYlZpZXcvV2Vi RnJhbWVQcml2YXRlLmgJKHdvcmtpbmcgY29weSkKQEAgLTUzLDEzICs1MywxMyBAQCBleHRlcm4g TlNTdHJpbmcgKldlYkZyYW1lVXNlc0dlb2xvY2F0aW9uCiBleHRlcm4gTlNTdHJpbmcgKldlYkZy YW1lVXNlc0FwcGxpY2F0aW9uQ2FjaGU7CiBleHRlcm4gTlNTdHJpbmcgKldlYkZyYW1lQ2FuU3Vz cGVuZEFjdGl2ZURPTU9iamVjdHM7CiAKKy8vIE5PVEU6IEtlZXAgaW4gc3luYyB3aXRoIFdlYkNv cmUvbG9hZGVyL0ZyYW1lTG9hZGVyVHlwZXMuaAogdHlwZWRlZiBlbnVtIHsKICAgICBXZWJGcmFt ZUxvYWRUeXBlU3RhbmRhcmQsCiAgICAgV2ViRnJhbWVMb2FkVHlwZUJhY2ssCiAgICAgV2ViRnJh bWVMb2FkVHlwZUZvcndhcmQsCiAgICAgV2ViRnJhbWVMb2FkVHlwZUluZGV4ZWRCYWNrRm9yd2Fy ZCwgLy8gYSBtdWx0aS1pdGVtIGhvcCBpbiB0aGUgYmFja2ZvcndhcmQgbGlzdAogICAgIFdlYkZy YW1lTG9hZFR5cGVSZWxvYWQsCi0gICAgV2ViRnJhbWVMb2FkVHlwZVJlbG9hZEFsbG93aW5nU3Rh bGVEYXRhLAogICAgIFdlYkZyYW1lTG9hZFR5cGVTYW1lLCAgICAgICAgICAgICAgIC8vIHVzZXIg bG9hZHMgc2FtZSBVUkwgYWdhaW4gKGJ1dCBub3QgcmVsb2FkIGJ1dHRvbikKICAgICBXZWJGcmFt ZUxvYWRUeXBlSW50ZXJuYWwsICAgICAgICAgICAvLyBtYXBzIHRvIFdlYkNvcmU6OkZyYW1lTG9h ZFR5cGVSZWRpcmVjdFdpdGhMb2NrZWRCYWNrRm9yd2FyZExpc3QKICAgICBXZWJGcmFtZUxvYWRU eXBlUmVwbGFjZSwKSW5kZXg6IFdlYktpdC93aW4vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YktpdC93aW4vQ2hhbmdlTG9nCShyZXZpc2lvbiA0Njk2NCkKKysrIFdlYktpdC93aW4vQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMDktMDgtMDkgIE5pa29sYXMg WmltbWVybWFubiAgPG5pa29sYXMuemltbWVybWFubkB0b3JjaG1vYmlsZS5jb20+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRnJhbWVMb2FkVHlwZSAv IFdlYkZyYW1lTG9hZFR5cGUgZW51bXMgYXJlIG91dCBvZiBzeW5jCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yODEzMgorCisgICAgICAgIFN5bmNocm9u aXplIEZyYW1lTG9hZFR5cGUgPC0+IFdlYkZyYW1lTG9hZFR5cGUgZW51bXMuCisgICAgICAgIC0+ IHJlbW92ZSBXZWJGcmFtZUxvYWRUeXBlUmVsb2FkQWxsb3dpbmdTdGFsZURhdGEuCisgICAgICAg IC0+IGFkZCBXZWJGcmFtZUxvYWRUeXBlUmVsb2FkRnJvbU9yaWdpbi4KKworICAgICAgICBBZGQg YSBub3RlIHRvIGtlZXAgdGhpcyBlbnVtIGluIHN5bmMgd2l0aCBXZWJDb3JlL2xvYWRlci9GcmFt ZUxvYWRlclR5cGVzLmgsCisgICAgICAgIGFzIHRoZSBXZWJDb3JlIGVudW0gaXMgY29udmVydGVk IHRvIHRoZSBXZWJGcmFtZUxvYWRUeXBlIGVudW0gYnkgYSBjLXN0eWxlIGNhc3QuCisKKyAgICAg ICAgKiBJbnRlcmZhY2VzL0lXZWJGcmFtZVByaXZhdGUuaWRsOgorCiAyMDA5LTA4LTA2ICBBZGFt IEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCByZXZlcnQu CkluZGV4OiBXZWJLaXQvd2luL0ludGVyZmFjZXMvSVdlYkZyYW1lUHJpdmF0ZS5pZGwKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViS2l0L3dpbi9JbnRlcmZhY2VzL0lXZWJGcmFtZVByaXZhdGUuaWRsCShyZXZp c2lvbiA0Njk2NCkKKysrIFdlYktpdC93aW4vSW50ZXJmYWNlcy9JV2ViRnJhbWVQcml2YXRlLmlk bAkod29ya2luZyBjb3B5KQpAQCAtMzMsMTYgKzMzLDE3IEBAIGludGVyZmFjZSBJV2ViRnJhbWU7 CiBpbnRlcmZhY2UgSVdlYkljb25GZXRjaGVyOwogaW50ZXJmYWNlIElXZWJJY29uRmV0Y2hlckRl bGVnYXRlOwogCisvLyBOT1RFOiBLZWVwIGluIHN5bmMgd2l0aCBXZWJDb3JlL2xvYWRlci9GcmFt ZUxvYWRlclR5cGVzLmgKIHR5cGVkZWYgZW51bSB7CiAgICAgV2ViRnJhbWVMb2FkVHlwZVN0YW5k YXJkLAogICAgIFdlYkZyYW1lTG9hZFR5cGVCYWNrLAogICAgIFdlYkZyYW1lTG9hZFR5cGVGb3J3 YXJkLAogICAgIFdlYkZyYW1lTG9hZFR5cGVJbmRleGVkQmFja0ZvcndhcmQsIC8vIGEgbXVsdGkt aXRlbSBob3AgaW4gdGhlIGJhY2tmb3J3YXJkIGxpc3QKICAgICBXZWJGcmFtZUxvYWRUeXBlUmVs b2FkLAotICAgIFdlYkZyYW1lTG9hZFR5cGVSZWxvYWRBbGxvd2luZ1N0YWxlRGF0YSwKICAgICBX ZWJGcmFtZUxvYWRUeXBlU2FtZSwgICAgICAgICAgICAgICAvLyB1c2VyIGxvYWRzIHNhbWUgVVJM IGFnYWluIChidXQgbm90IHJlbG9hZCBidXR0b24pCiAgICAgV2ViRnJhbWVMb2FkVHlwZVJlZGly ZWN0V2l0aExvY2tlZEJhY2tGb3J3YXJkTGlzdCwKLSAgICBXZWJGcmFtZUxvYWRUeXBlUmVwbGFj ZQorICAgIFdlYkZyYW1lTG9hZFR5cGVSZXBsYWNlLAorICAgIFdlYkZyYW1lTG9hZFR5cGVSZWxv YWRGcm9tT3JpZ2luCiB9IFdlYkZyYW1lTG9hZFR5cGU7CiAKIFsK 34429 2009-08-09 14:02:34 -0700 2009-08-09 14:52:17 -0700 Updated patch FixEnums.diff text/plain 3173 zimmermann SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0Njk2NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMDktMDgtMDkgIE5pa29sYXMgWmltbWVybWFubiAgPG5pa29sYXMu emltbWVybWFubkB0b3JjaG1vYmlsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgRnJhbWVMb2FkVHlwZSAvIFdlYkZyYW1lTG9hZFR5cGUgZW51 bXMgYXJlIG91dCBvZiBzeW5jCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yODEzMgorCisgICAgICAgIEFkZCBhIG5vdGUgdG8gdGhlIEZyYW1lTG9hZFR5 cGUgZW51bSB0byBrZWVwIGl0IGluIHN5bmMgd2l0aCBXZWJGcmFtZVByaXZhdGUuaCAmIElXZWJG cmFtZVByaXZhdGUuaWRsLgorICAgICAgICBSZWFkZCAnRnJhbWVMb2FkVHlwZVJlbG9hZEFsbG93 aW5nU3RhbGVEYXRhJyBhZnRlciAnRnJhbWVMb2FkVHlwZVJlbG9hZCcgdG8gc3luY2hyb25pemUg YWdhaW4gd2l0aCB0aGUgcHVibGljIG1hYy93aW4gQVBJLgorCisgICAgICAgICogbG9hZGVyL0Zy YW1lTG9hZGVyVHlwZXMuaDoKKyAgICAgICAgKFdlYkNvcmU6Oik6CisKIDIwMDktMDgtMDkgIE5p a29sYXMgWmltbWVybWFubiAgPG5pa29sYXMuemltbWVybWFubkB0b3JjaG1vYmlsZS5jb20+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgR2VvcmdlIFN0YWlrb3MuCkluZGV4OiBXZWJDb3JlL2xvYWRl ci9GcmFtZUxvYWRlclR5cGVzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9sb2FkZXIvRnJhbWVM b2FkZXJUeXBlcy5oCShyZXZpc2lvbiA0Njk2NCkKKysrIFdlYkNvcmUvbG9hZGVyL0ZyYW1lTG9h ZGVyVHlwZXMuaAkod29ya2luZyBjb3B5KQpAQCAtNDUsMTIgKzQ1LDE0IEBAIG5hbWVzcGFjZSBX ZWJDb3JlIHsKICAgICAgICAgUG9saWN5SWdub3JlLAogICAgIH07CiAKKyAgICAvLyBOT1RFOiBL ZWVwIGluIHN5bmMgd2l0aCBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViRnJhbWVQcml2YXRlLmggYW5k IFdlYktpdC93aW4vSW50ZXJmYWNlcy9JV2ViRnJhbWVQcml2YXRlLmlkbAogICAgIGVudW0gRnJh bWVMb2FkVHlwZSB7CiAgICAgICAgIEZyYW1lTG9hZFR5cGVTdGFuZGFyZCwKICAgICAgICAgRnJh bWVMb2FkVHlwZUJhY2ssCiAgICAgICAgIEZyYW1lTG9hZFR5cGVGb3J3YXJkLAogICAgICAgICBG cmFtZUxvYWRUeXBlSW5kZXhlZEJhY2tGb3J3YXJkLCAvLyBhIG11bHRpLWl0ZW0gaG9wIGluIHRo ZSBiYWNrZm9yd2FyZCBsaXN0CiAgICAgICAgIEZyYW1lTG9hZFR5cGVSZWxvYWQsCisgICAgICAg IEZyYW1lTG9hZFR5cGVSZWxvYWRBbGxvd2luZ1N0YWxlRGF0YSwgLy8gRklYTUU6IEl0J3MgdW51 c2VkLiBUaGUgbWFjL3dpbiBwdWJsaWMgQVBJIGRlcGVuZHMgb24gdGhpcyB2YWx1ZSwgdGhvdWdo LgogICAgICAgICBGcmFtZUxvYWRUeXBlU2FtZSwgICAgICAgICAgICAgICAvLyB1c2VyIGxvYWRz IHNhbWUgVVJMIGFnYWluIChidXQgbm90IHJlbG9hZCBidXR0b24pCiAgICAgICAgIEZyYW1lTG9h ZFR5cGVSZWRpcmVjdFdpdGhMb2NrZWRCYWNrRm9yd2FyZExpc3QsIC8vIEZJWE1FOiBNZXJnZSAi bG9ja0JhY2tGb3J3YXJkTGlzdCIsICJsb2NrSGlzdG9yeSIsICJxdWlja1JlZGlyZWN0IiBhbmQg ImNsaWVudFJlZGlyZWN0IiBpbnRvIGEgc2luZ2xlIGNvbmNlcHQgb2YgcmVkaXJlY3QuCiAgICAg ICAgIEZyYW1lTG9hZFR5cGVSZXBsYWNlLApJbmRleDogV2ViS2l0L3dpbi9DaGFuZ2VMb2cKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViS2l0L3dpbi9DaGFuZ2VMb2cJKHJldmlzaW9uIDQ2OTY0KQorKysgV2Vi S2l0L3dpbi9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNCBAQAorMjAwOS0w OC0wOSAgTmlrb2xhcyBaaW1tZXJtYW5uICA8bmlrb2xhcy56aW1tZXJtYW5uQHRvcmNobW9iaWxl LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBG cmFtZUxvYWRUeXBlIC8gV2ViRnJhbWVMb2FkVHlwZSBlbnVtcyBhcmUgb3V0IG9mIHN5bmMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI4MTMyCisKKyAg ICAgICAgU3luY2hyb25pemUgRnJhbWVMb2FkVHlwZSA8LT4gV2ViRnJhbWVMb2FkVHlwZSBlbnVt cyAoYXBwZW5kIG1pc3NpbmcgJ1dlYkZyYW1lTG9hZFR5cGVSZWxvYWRGcm9tT3JpZ2luJyB2YWx1 ZSkKKworICAgICAgICAqIEludGVyZmFjZXMvSVdlYkZyYW1lUHJpdmF0ZS5pZGw6CisKIDIwMDkt MDgtMDYgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmll d2VkIHJldmVydC4KSW5kZXg6IFdlYktpdC93aW4vSW50ZXJmYWNlcy9JV2ViRnJhbWVQcml2YXRl LmlkbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvd2luL0ludGVyZmFjZXMvSVdlYkZyYW1lUHJpdmF0 ZS5pZGwJKHJldmlzaW9uIDQ2OTY0KQorKysgV2ViS2l0L3dpbi9JbnRlcmZhY2VzL0lXZWJGcmFt ZVByaXZhdGUuaWRsCSh3b3JraW5nIGNvcHkpCkBAIC00Miw3ICs0Miw4IEBAIHR5cGVkZWYgZW51 bSB7CiAgICAgV2ViRnJhbWVMb2FkVHlwZVJlbG9hZEFsbG93aW5nU3RhbGVEYXRhLAogICAgIFdl YkZyYW1lTG9hZFR5cGVTYW1lLCAgICAgICAgICAgICAgIC8vIHVzZXIgbG9hZHMgc2FtZSBVUkwg YWdhaW4gKGJ1dCBub3QgcmVsb2FkIGJ1dHRvbikKICAgICBXZWJGcmFtZUxvYWRUeXBlUmVkaXJl Y3RXaXRoTG9ja2VkQmFja0ZvcndhcmRMaXN0LAotICAgIFdlYkZyYW1lTG9hZFR5cGVSZXBsYWNl CisgICAgV2ViRnJhbWVMb2FkVHlwZVJlcGxhY2UsCisgICAgV2ViRnJhbWVMb2FkVHlwZVJlbG9h ZEZyb21PcmlnaW4KIH0gV2ViRnJhbWVMb2FkVHlwZTsKIAogWwo= 34431 2009-08-09 14:52:17 -0700 2009-08-09 14:56:42 -0700 Updated patch v2 FixEnums.diff text/plain 3565 zimmermann SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0Njk2NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTkgQEAKKzIwMDktMDgtMDkgIE5pa29sYXMgWmltbWVybWFubiAgPG5pa29sYXMu emltbWVybWFubkB0b3JjaG1vYmlsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgRnJhbWVMb2FkVHlwZSAvIFdlYkZyYW1lTG9hZFR5cGUgZW51 bXMgYXJlIG91dCBvZiBzeW5jCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yODEzMgorCisgICAgICAgIE1vZGlmeSBGcmFtZUxvYWRUeXBlIGVudW0gdG8g bWF0Y2ggdGhlIG9yZGVyIG9mIFdlYkZyYW1lTG9hZFR5cGUgaW4gV2ViRnJhbWVQcml2YXRlLmgg LyBJV2ViRnJhbWVQcml2YXRlLmlkbC4KKyAgICAgICAgVGhlIG1hYy93aW4gcHVibGljIEFQSSBl eHBvc2VzIHRoZSBvbGQgJ0ZyYW1lTG9hZFR5cGVSZWxvYWRBbGxvd2luZ1N0YWxlRGF0YScgdmFs dWUsIHdoaWNoIHJlc2lkZXMgYmV0d2VlbgorICAgICAgICAnRnJhbWVMb2FkVHlwZVJlbG9hZCcg YW5kICdGcmFtZUxvYWRUeXBlU2FtZScuIFdvcmsgYXJvdW5kIHRoaXMgcHJvYmxlbSwgYnkgYXNz aWduaW5nICdGcmFtZUxvYWRUeXBlU2FtZSA9IEZyYW1lTG9hZFR5cGVSZWxvYWQgKyAyJy4KKwor ICAgICAgICBBZGQgYSBub3RlIHRvIHRoZSBGcmFtZUxvYWRUeXBlIGVudW0gdG8ga2VlcCBpdCBp biBzeW5jIHdpdGggV2ViRnJhbWVQcml2YXRlLmggJiBJV2ViRnJhbWVQcml2YXRlLmlkbC4KKwor ICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlclR5cGVzLmg6CisgICAgICAgIChXZWJDb3JlOjop OgorCiAyMDA5LTA4LTA5ICBOaWtvbGFzIFppbW1lcm1hbm4gIDxuaWtvbGFzLnppbW1lcm1hbm5A dG9yY2htb2JpbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEdlb3JnZSBTdGFpa29zLgpJ bmRleDogV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXJUeXBlcy5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyVHlwZXMuaAkocmV2aXNpb24gNDY5NjQpCisrKyBXZWJD b3JlL2xvYWRlci9GcmFtZUxvYWRlclR5cGVzLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ1LDEzICs0 NSwxNSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIFBvbGljeUlnbm9yZSwKICAgICB9 OwogCisgICAgLy8gTk9URTogS2VlcCBpbiBzeW5jIHdpdGggV2ViS2l0L21hYy9XZWJWaWV3L1dl YkZyYW1lUHJpdmF0ZS5oIGFuZCBXZWJLaXQvd2luL0ludGVyZmFjZXMvSVdlYkZyYW1lUHJpdmF0 ZS5pZGwKICAgICBlbnVtIEZyYW1lTG9hZFR5cGUgewogICAgICAgICBGcmFtZUxvYWRUeXBlU3Rh bmRhcmQsCiAgICAgICAgIEZyYW1lTG9hZFR5cGVCYWNrLAogICAgICAgICBGcmFtZUxvYWRUeXBl Rm9yd2FyZCwKICAgICAgICAgRnJhbWVMb2FkVHlwZUluZGV4ZWRCYWNrRm9yd2FyZCwgLy8gYSBt dWx0aS1pdGVtIGhvcCBpbiB0aGUgYmFja2ZvcndhcmQgbGlzdAogICAgICAgICBGcmFtZUxvYWRU eXBlUmVsb2FkLAotICAgICAgICBGcmFtZUxvYWRUeXBlU2FtZSwgICAgICAgICAgICAgICAvLyB1 c2VyIGxvYWRzIHNhbWUgVVJMIGFnYWluIChidXQgbm90IHJlbG9hZCBidXR0b24pCisgICAgICAg IC8vIFNraXBwZWQgdmFsdWU6ICdGcmFtZUxvYWRUeXBlUmVsb2FkQWxsb3dpbmdTdGFsZURhdGEn LCBzdGlsbCBwcmVzZW50IGluIG1hYy93aW4gcHVibGljIEFQSS4gUmVhZHkgdG8gYmUgcmV1c2Vk CisgICAgICAgIEZyYW1lTG9hZFR5cGVTYW1lID0gRnJhbWVMb2FkVHlwZVJlbG9hZCArIDIsIC8v IHVzZXIgbG9hZHMgc2FtZSBVUkwgYWdhaW4gKGJ1dCBub3QgcmVsb2FkIGJ1dHRvbikKICAgICAg ICAgRnJhbWVMb2FkVHlwZVJlZGlyZWN0V2l0aExvY2tlZEJhY2tGb3J3YXJkTGlzdCwgLy8gRklY TUU6IE1lcmdlICJsb2NrQmFja0ZvcndhcmRMaXN0IiwgImxvY2tIaXN0b3J5IiwgInF1aWNrUmVk aXJlY3QiIGFuZCAiY2xpZW50UmVkaXJlY3QiIGludG8gYSBzaW5nbGUgY29uY2VwdCBvZiByZWRp cmVjdC4KICAgICAgICAgRnJhbWVMb2FkVHlwZVJlcGxhY2UsCiAgICAgICAgIEZyYW1lTG9hZFR5 cGVSZWxvYWRGcm9tT3JpZ2luCkluZGV4OiBXZWJLaXQvd2luL0NoYW5nZUxvZwo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJLaXQvd2luL0NoYW5nZUxvZwkocmV2aXNpb24gNDY5NjQpCisrKyBXZWJLaXQvd2lu L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDA5LTA4LTA5ICBO aWtvbGFzIFppbW1lcm1hbm4gIDxuaWtvbGFzLnppbW1lcm1hbm5AdG9yY2htb2JpbGUuY29tPgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZyYW1lTG9h ZFR5cGUgLyBXZWJGcmFtZUxvYWRUeXBlIGVudW1zIGFyZSBvdXQgb2Ygc3luYworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjgxMzIKKworICAgICAgICBT eW5jaHJvbml6ZSBGcmFtZUxvYWRUeXBlIDwtPiBXZWJGcmFtZUxvYWRUeXBlIGVudW1zIChhcHBl bmQgbWlzc2luZyAnV2ViRnJhbWVMb2FkVHlwZVJlbG9hZEZyb21PcmlnaW4nIHZhbHVlKQorCisg ICAgICAgICogSW50ZXJmYWNlcy9JV2ViRnJhbWVQcml2YXRlLmlkbDoKKwogMjAwOS0wOC0wNiAg QWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQgcmV2 ZXJ0LgpJbmRleDogV2ViS2l0L3dpbi9JbnRlcmZhY2VzL0lXZWJGcmFtZVByaXZhdGUuaWRsCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYktpdC93aW4vSW50ZXJmYWNlcy9JV2ViRnJhbWVQcml2YXRlLmlkbAko cmV2aXNpb24gNDY5NjQpCisrKyBXZWJLaXQvd2luL0ludGVyZmFjZXMvSVdlYkZyYW1lUHJpdmF0 ZS5pZGwJKHdvcmtpbmcgY29weSkKQEAgLTQyLDcgKzQyLDggQEAgdHlwZWRlZiBlbnVtIHsKICAg ICBXZWJGcmFtZUxvYWRUeXBlUmVsb2FkQWxsb3dpbmdTdGFsZURhdGEsCiAgICAgV2ViRnJhbWVM b2FkVHlwZVNhbWUsICAgICAgICAgICAgICAgLy8gdXNlciBsb2FkcyBzYW1lIFVSTCBhZ2FpbiAo YnV0IG5vdCByZWxvYWQgYnV0dG9uKQogICAgIFdlYkZyYW1lTG9hZFR5cGVSZWRpcmVjdFdpdGhM b2NrZWRCYWNrRm9yd2FyZExpc3QsCi0gICAgV2ViRnJhbWVMb2FkVHlwZVJlcGxhY2UKKyAgICBX ZWJGcmFtZUxvYWRUeXBlUmVwbGFjZSwKKyAgICBXZWJGcmFtZUxvYWRUeXBlUmVsb2FkRnJvbU9y aWdpbgogfSBXZWJGcmFtZUxvYWRUeXBlOwogCiBbCg==