54352 2011-02-13 02:41:46 -0800 [GTK] Match more various WebKit API enum values with WebCore enum values 2011-02-16 16:50:48 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 0 joone webkit-unassigned commit-queue gustavo mrobinson xan.lopez oldest_to_newest 350375 0 joone 2011-02-13 02:41:46 -0800 AssertMatchingEnums.cpp was added to assert that various WebKit API enum values continue matching WebCore defined enum values in the following changeset. http://trac.webkit.org/changeset/77868 I found more enum values to be asserted, so the attached patch includes them. 350382 1 82258 joone 2011-02-13 04:13:24 -0800 Created attachment 82258 Proposed Patch 350383 2 82259 joone 2011-02-13 04:19:54 -0800 Created attachment 82259 Proposed Patch2 350400 3 82259 mrobinson 2011-02-13 09:07:58 -0800 Comment on attachment 82259 Proposed Patch2 View in context: https://bugs.webkit.org/attachment.cgi?id=82259&action=review This is awesome, though we cannot break the ABI. Without the last change it's fine though. > Source/WebKit/gtk/webkit/webkitwebview.h:64 > + WEBKIT_WEB_VIEW_VIEW_MODE_INVALID, I think this might be an ABI break. :( 350468 4 joone 2011-02-13 15:30:26 -0800 (In reply to comment #3) > (From update of attachment 82259 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=82259&action=review > > This is awesome, though we cannot break the ABI. Without the last change it's fine though. > > > Source/WebKit/gtk/webkit/webkitwebview.h:64 > > + WEBKIT_WEB_VIEW_VIEW_MODE_INVALID, > > I think this might be an ABI break. :( If we keep the ABI, the patch should be updated as follows, But, I'm not sure if this is neat. COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_WEB_VIEW_VIEW_MODE_WINDOWED+1, Page::ViewModeWindowed); COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_WEB_VIEW_VIEW_MODE_FLOATING+1, Page::ViewModeFloating); COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_WEB_VIEW_VIEW_MODE_FULLSCREEN+1, Page::ViewModeFullscreen); COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_WEB_VIEW_VIEW_MODE_MAXIMIZED+1, Page::ViewModeMaximized); COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_WEB_VIEW_VIEW_MODE_MINIMIZED+1, Page::ViewModeMinimized); 351314 5 mrobinson 2011-02-15 08:53:03 -0800 (In reply to comment #4) > If we keep the ABI, the patch should be updated as follows, > But, I'm not sure if this is neat. > > COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_WEB_VIEW_VIEW_MODE_WINDOWED+1, Page::ViewModeWindowed); > COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_WEB_VIEW_VIEW_MODE_FLOATING+1, Page::ViewModeFloating); > COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_WEB_VIEW_VIEW_MODE_FULLSCREEN+1, Page::ViewModeFullscreen); > COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_WEB_VIEW_VIEW_MODE_MAXIMIZED+1, Page::ViewModeMaximized); > COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_WEB_VIEW_VIEW_MODE_MINIMIZED+1, Page::ViewModeMinimized); Essentially if there is no place where you cast directly between the two enum types, they do not need to be in AssertMatchingEnums.cpp. AssertMatchingEnums.cpp just ensures that a cast between the two types is valid. 351946 6 82605 joone 2011-02-16 02:33:31 -0800 Created attachment 82605 Proposed Patch3 I applied Martin's suggestion to the patch. Thanks! 351951 7 82605 xan.lopez 2011-02-16 02:54:31 -0800 Comment on attachment 82605 Proposed Patch3 r=me 352460 8 82605 commit-queue 2011-02-16 16:50:42 -0800 Comment on attachment 82605 Proposed Patch3 Clearing flags on attachment: 82605 Committed r78749: <http://trac.webkit.org/changeset/78749> 352462 9 commit-queue 2011-02-16 16:50:48 -0800 All reviewed patches have been landed. Closing bug. 82258 2011-02-13 04:13:24 -0800 2011-02-13 04:19:54 -0800 Proposed Patch assert_matching_enum.patch text/plain 7737 joone ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv Z3RrL0NoYW5nZUxvZwppbmRleCAyZmVmZDVkLi45Y2JiNDFkIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2d0ay9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjYgQEAKKzIwMTEtMDItMTMgIEpvb25lIEh1ciAgPGpvb25lLmh1ckBjb2xsYWJv cmEuY28udWs+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgW0dUS10gTWF0Y2ggbW9yZSB2YXJpb3VzIFdlYktpdCBBUEkgZW51bSB2YWx1ZXMgd2l0aCBX ZWJDb3JlIGVudW0gdmFsdWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD01NDM1MgorCisgICAgICAgIEFzc2VydE1hdGNoaW5nRW51bXMuY3BwIHdhcyBh ZGRlZCB0byBhc3NlcnQgdGhhdCB2YXJpb3VzIFdlYktpdCBBUEkgZW51bSB2YWx1ZXMgCisgICAg ICAgIGNvbnRpbnVlIG1hdGNoaW5nIFdlYkNvcmUgZGVmaW5lZCBlbnVtIHZhbHVlcyBpbiB0aGUg Zm9sbG93aW5nIGNoYW5nZXNldC4KKyAgICAgICAgaHR0cDovL3RyYWMud2Via2l0Lm9yZy9jaGFu Z2VzZXQvNzc4NjgKKyAgICAgICAgSG93ZXZlciwgdGhlcmUgYXJlIGFscmVhZHkgZW51bSB2YWx1 ZXMgdGhhdCBoYXZlIGJlZW4gYXNzZXJ0ZWQgaW4gb3RoZXIgZmlsZXMsIHNvIHRoZXNlIAorICAg ICAgICBhc3NlcnQgbWFjcm9zIGRlZmluZWQgbmVlZCB0byBiZSBtb3ZlZCB0byBBc3NlcnRNYXRj aGluZ0VudW0uY3BwLiBBbHNvLCB0aGUgZW51bSB2YWx1ZSAKKyAgICAgICAgdGhhdCBoYXMgbm90 IGJlZW4gYXNzZXJ0ZWQgc2hvdWxkIGJlIGFkZGVkIHRvIEFzc2VydE1hdGNoaW5nRW51bS5jcHAu CisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9Bc3NlcnRNYXRjaGluZ0VudW1zLmNwcDogQWRk IG1vcmUgZW51bSB2YWx1ZXMgdG8gYmUgYXNzZXJ0ZWQuCisgICAgICAgICogd2Via2l0L3dlYmtp dHdlYm5hdmlnYXRpb25hY3Rpb24uY3BwOiAgTW92ZSB0aGUgYXNzZXJ0IG1hY3JvcyBvZiAKKyAg ICAgICAgV0VCS0lUX1dFQl9OQVZJR0FUSU9OX1JFQVNPTl8qIHRvIEFzc2VydE1hdGNoaW5nRW51 bXMuY3BwLgorICAgICAgICAod2Via2l0X3dlYl9uYXZpZ2F0aW9uX2FjdGlvbl9jbGFzc19pbml0 KTogCisgICAgICAgICogd2Via2l0L3dlYmtpdHdlYnNldHRpbmdzLmNwcDogTW92ZSB0aGUgYXNz ZXJ0IG1hY3JvcyBvZiBXRUJLSVRfRURJVElOR19CRUhBVklPUl8qIHRvIAorICAgICAgICBBc3Nl cnRNYXRjaGluZ0VudW1zLmNwcC4KKyAgICAgICAgKHdlYmtpdF93ZWJfc2V0dGluZ3NfY2xhc3Nf aW5pdCk6CisgICAgICAgICogd2Via2l0L3dlYmtpdHdlYnZpZXcuaDogQWRkIFdFQktJVF9XRUJf VklFV19WSUVXX01PREVfSU5WQUxJRCBlbnVtIHZhbHVlLgorCiAyMDExLTAyLTExICBTaGVyaWZm IEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2Vk LCByb2xsaW5nIG91dCByNzgzMzEuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJD b3JlU3VwcG9ydC9Bc3NlcnRNYXRjaGluZ0VudW1zLmNwcCBiL1NvdXJjZS9XZWJLaXQvZ3RrL1dl YkNvcmVTdXBwb3J0L0Fzc2VydE1hdGNoaW5nRW51bXMuY3BwCmluZGV4IDljNTk2ZjguLjQ0YTJj NTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0Fzc2VydE1h dGNoaW5nRW51bXMuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0Fz c2VydE1hdGNoaW5nRW51bXMuY3BwCkBAIC0yMiwxNSArMjIsMzUgQEAKICNpbmNsdWRlICJjb25m aWcuaCIKIAogI2luY2x1ZGUgIkR1bXBSZW5kZXJUcmVlU3VwcG9ydEd0ay5oIgorI2luY2x1ZGUg IkVkaXRpbmdCZWhhdmlvclR5cGVzLmgiCiAjaW5jbHVkZSAiRmluZE9wdGlvbnMuaCIKKyNpbmNs dWRlICJQYWdlLmgiCisjaW5jbHVkZSAid2Via2l0d2VibmF2aWdhdGlvbmFjdGlvbi5oIgorI2lu Y2x1ZGUgIndlYmtpdHdlYnZpZXcuaCIKICNpbmNsdWRlIDx3dGYvQXNzZXJ0aW9ucy5oPgogCiAj ZGVmaW5lIENPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0od2Via2l0X25hbWUsIHdlYmNvcmVf bmFtZSkgXAotICAgIENPTVBJTEVfQVNTRVJUKGludChXZWJLaXQ6OndlYmtpdF9uYW1lKSA9PSBp bnQoV2ViQ29yZTo6d2ViY29yZV9uYW1lKSwgbWlzbWF0Y2hpbmdfZW51bXMpCi0KLUNPTVBJTEVf QVNTRVJUX01BVENISU5HX0VOVU0oV2ViRmluZE9wdGlvbnNDYXNlSW5zZW5zaXRpdmUgLCBDYXNl SW5zZW5zaXRpdmUpOwotQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShXZWJGaW5kT3B0aW9u c0F0V29yZFN0YXJ0cywgQXRXb3JkU3RhcnRzKTsKLUNPTVBJTEVfQVNTRVJUX01BVENISU5HX0VO VU0oV2ViRmluZE9wdGlvbnNUcmVhdE1lZGlhbENhcGl0YWxBc1dvcmRTdGFydCwgVHJlYXRNZWRp YWxDYXBpdGFsQXNXb3JkU3RhcnQpOwotQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShXZWJG aW5kT3B0aW9uc0JhY2t3YXJkcywgQmFja3dhcmRzKTsKLUNPTVBJTEVfQVNTRVJUX01BVENISU5H X0VOVU0oV2ViRmluZE9wdGlvbnNXcmFwQXJvdW5kLCBXcmFwQXJvdW5kKTsKLUNPTVBJTEVfQVNT RVJUX01BVENISU5HX0VOVU0oV2ViRmluZE9wdGlvbnNTdGFydEluU2VsZWN0aW9uLCBTdGFydElu U2VsZWN0aW9uKTsKKyAgICBDT01QSUxFX0FTU0VSVChpbnQod2Via2l0X25hbWUpID09IGludChX ZWJDb3JlOjp3ZWJjb3JlX25hbWUpLCBtaXNtYXRjaGluZ19lbnVtcykKKworQ09NUElMRV9BU1NF UlRfTUFUQ0hJTkdfRU5VTShXRUJLSVRfV0VCX1ZJRVdfVklFV19NT0RFX1dJTkRPV0VELCBQYWdl OjpWaWV3TW9kZVdpbmRvd2VkKTsKK0NPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oV0VCS0lU X1dFQl9WSUVXX1ZJRVdfTU9ERV9GTE9BVElORywgUGFnZTo6Vmlld01vZGVGbG9hdGluZyk7CitD T01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKFdFQktJVF9XRUJfVklFV19WSUVXX01PREVfRlVM TFNDUkVFTiwgUGFnZTo6Vmlld01vZGVGdWxsc2NyZWVuKTsKK0NPTVBJTEVfQVNTRVJUX01BVENI SU5HX0VOVU0oV0VCS0lUX1dFQl9WSUVXX1ZJRVdfTU9ERV9NQVhJTUlaRUQsIFBhZ2U6OlZpZXdN b2RlTWF4aW1pemVkKTsKK0NPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oV0VCS0lUX1dFQl9W SUVXX1ZJRVdfTU9ERV9NSU5JTUlaRUQsIFBhZ2U6OlZpZXdNb2RlTWluaW1pemVkKTsgCisKK0NP TVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oV0VCS0lUX0VESVRJTkdfQkVIQVZJT1JfTUFDLCBF ZGl0aW5nTWFjQmVoYXZpb3IpOworQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShXRUJLSVRf RURJVElOR19CRUhBVklPUl9XSU5ET1dTLCBFZGl0aW5nV2luZG93c0JlaGF2aW9yKTsKK0NPTVBJ TEVfQVNTRVJUX01BVENISU5HX0VOVU0oV0VCS0lUX0VESVRJTkdfQkVIQVZJT1JfVU5JWCwgRWRp dGluZ1VuaXhCZWhhdmlvcik7CisKK0NPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oV0VCS0lU X1dFQl9OQVZJR0FUSU9OX1JFQVNPTl9MSU5LX0NMSUNLRUQsIE5hdmlnYXRpb25UeXBlTGlua0Ns aWNrZWQpOworQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShXRUJLSVRfV0VCX05BVklHQVRJ T05fUkVBU09OX0ZPUk1fU1VCTUlUVEVELCBOYXZpZ2F0aW9uVHlwZUZvcm1TdWJtaXR0ZWQpOwor Q09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShXRUJLSVRfV0VCX05BVklHQVRJT05fUkVBU09O X0JBQ0tfRk9SV0FSRCwgTmF2aWdhdGlvblR5cGVCYWNrRm9yd2FyZCk7CitDT01QSUxFX0FTU0VS VF9NQVRDSElOR19FTlVNKFdFQktJVF9XRUJfTkFWSUdBVElPTl9SRUFTT05fUkVMT0FELCBOYXZp Z2F0aW9uVHlwZVJlbG9hZCk7CitDT01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKFdFQktJVF9X RUJfTkFWSUdBVElPTl9SRUFTT05fRk9STV9SRVNVQk1JVFRFRCwgTmF2aWdhdGlvblR5cGVGb3Jt UmVzdWJtaXR0ZWQpOworQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShXRUJLSVRfV0VCX05B VklHQVRJT05fUkVBU09OX09USEVSLCBOYXZpZ2F0aW9uVHlwZU90aGVyKTsKKworQ09NUElMRV9B U1NFUlRfTUFUQ0hJTkdfRU5VTShXZWJLaXQ6OldlYkZpbmRPcHRpb25zQXRXb3JkU3RhcnRzLCBB dFdvcmRTdGFydHMpOworQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShXZWJLaXQ6OldlYkZp bmRPcHRpb25zVHJlYXRNZWRpYWxDYXBpdGFsQXNXb3JkU3RhcnQsIFRyZWF0TWVkaWFsQ2FwaXRh bEFzV29yZFN0YXJ0KTsKK0NPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oV2ViS2l0OjpXZWJG aW5kT3B0aW9uc0JhY2t3YXJkcywgQmFja3dhcmRzKTsKK0NPTVBJTEVfQVNTRVJUX01BVENISU5H X0VOVU0oV2ViS2l0OjpXZWJGaW5kT3B0aW9uc1dyYXBBcm91bmQsIFdyYXBBcm91bmQpOworQ09N UElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShXZWJLaXQ6OldlYkZpbmRPcHRpb25zU3RhcnRJblNl bGVjdGlvbiwgU3RhcnRJblNlbGVjdGlvbik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0 ay93ZWJraXQvd2Via2l0d2VibmF2aWdhdGlvbmFjdGlvbi5jcHAgYi9Tb3VyY2UvV2ViS2l0L2d0 ay93ZWJraXQvd2Via2l0d2VibmF2aWdhdGlvbmFjdGlvbi5jcHAKaW5kZXggOWYxM2YyOC4uODY4 ZTQ5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYm5hdmln YXRpb25hY3Rpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJu YXZpZ2F0aW9uYWN0aW9uLmNwcApAQCAtMTMxLDEzICsxMzEsNiBAQCBzdGF0aWMgdm9pZCB3ZWJr aXRfd2ViX25hdmlnYXRpb25fYWN0aW9uX2NsYXNzX2luaXQoV2ViS2l0V2ViTmF2aWdhdGlvbkFj dGlvbkNsYQogewogICAgIEdPYmplY3RDbGFzcyogb2JqZWN0Q2xhc3MgPSBHX09CSkVDVF9DTEFT UyhyZXF1ZXN0Q2xhc3MpOwogCi0gICAgQ09NUElMRV9BU1NFUlQoc3RhdGljX2Nhc3Q8aW50PihX RUJLSVRfV0VCX05BVklHQVRJT05fUkVBU09OX0xJTktfQ0xJQ0tFRCkgPT0gc3RhdGljX2Nhc3Q8 aW50PihXZWJDb3JlOjpOYXZpZ2F0aW9uVHlwZUxpbmtDbGlja2VkKSwgbmF2aWdhdGlvbl90eXBl X2xpbmtfY2xpY2tlZF9lbnVtX21hdGNoKTsKLSAgICBDT01QSUxFX0FTU0VSVChzdGF0aWNfY2Fz dDxpbnQ+KFdFQktJVF9XRUJfTkFWSUdBVElPTl9SRUFTT05fRk9STV9TVUJNSVRURUQpID09IHN0 YXRpY19jYXN0PGludD4oV2ViQ29yZTo6TmF2aWdhdGlvblR5cGVGb3JtU3VibWl0dGVkKSwgbmF2 aWdhdGlvbl90eXBlX2Zvcm1fc3VibWl0dGVkX2VudW1fbWF0Y2gpOwotICAgIENPTVBJTEVfQVNT RVJUKHN0YXRpY19jYXN0PGludD4oV0VCS0lUX1dFQl9OQVZJR0FUSU9OX1JFQVNPTl9CQUNLX0ZP UldBUkQpID09IHN0YXRpY19jYXN0PGludD4oV2ViQ29yZTo6TmF2aWdhdGlvblR5cGVCYWNrRm9y d2FyZCksIG5hdmlnYXRpb25fdHlwZV9iYWNrX2ZvcndhcmRfZW51bV9tYXRjaCk7Ci0gICAgQ09N UElMRV9BU1NFUlQoc3RhdGljX2Nhc3Q8aW50PihXRUJLSVRfV0VCX05BVklHQVRJT05fUkVBU09O X1JFTE9BRCkgPT0gc3RhdGljX2Nhc3Q8aW50PihXZWJDb3JlOjpOYXZpZ2F0aW9uVHlwZVJlbG9h ZCksIG5hdmlnYXRpb25fdHlwZV9yZWxvYWRfZW51bV9tYXRjaCk7Ci0gICAgQ09NUElMRV9BU1NF UlQoc3RhdGljX2Nhc3Q8aW50PihXRUJLSVRfV0VCX05BVklHQVRJT05fUkVBU09OX0ZPUk1fUkVT VUJNSVRURUQpID09IHN0YXRpY19jYXN0PGludD4oV2ViQ29yZTo6TmF2aWdhdGlvblR5cGVGb3Jt UmVzdWJtaXR0ZWQpLCBuYXZpZ2F0aW9uX3R5cGVfZm9ybV9yZXN1Ym1pdHRlZF9lbnVtX21hdGNo KTsKLSAgICBDT01QSUxFX0FTU0VSVChzdGF0aWNfY2FzdDxpbnQ+KFdFQktJVF9XRUJfTkFWSUdB VElPTl9SRUFTT05fT1RIRVIpID09IHN0YXRpY19jYXN0PGludD4oV2ViQ29yZTo6TmF2aWdhdGlv blR5cGVPdGhlciksIG5hdmlnYXRpb25fdHlwZV9vdGhlcl9lbnVtX21hdGNoKTsKLQogICAgIG9i amVjdENsYXNzLT5nZXRfcHJvcGVydHkgPSB3ZWJraXRfd2ViX25hdmlnYXRpb25fYWN0aW9uX2dl dF9wcm9wZXJ0eTsKICAgICBvYmplY3RDbGFzcy0+c2V0X3Byb3BlcnR5ID0gd2Via2l0X3dlYl9u YXZpZ2F0aW9uX2FjdGlvbl9zZXRfcHJvcGVydHk7CiAgICAgb2JqZWN0Q2xhc3MtPmRpc3Bvc2Ug PSB3ZWJraXRfd2ViX25hdmlnYXRpb25fYWN0aW9uX2ZpbmFsaXplOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnNldHRpbmdzLmNwcCBiL1NvdXJjZS9XZWJL aXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJzZXR0aW5ncy5jcHAKaW5kZXggNDkyYzdiNi4uYjU1NTM4 MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnNldHRpbmdz LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vic2V0dGluZ3MuY3Bw CkBAIC02OTEsOSArNjkxLDYgQEAgc3RhdGljIHZvaWQgd2Via2l0X3dlYl9zZXR0aW5nc19jbGFz c19pbml0KFdlYktpdFdlYlNldHRpbmdzQ2xhc3MqIGtsYXNzKQogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgVFJVRSwKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZsYWdzKSk7CiAK LSAgICBDT01QSUxFX0FTU0VSVChzdGF0aWNfY2FzdDxpbnQ+KFdFQktJVF9FRElUSU5HX0JFSEFW SU9SX01BQykgPT0gc3RhdGljX2Nhc3Q8aW50PihXZWJDb3JlOjpFZGl0aW5nTWFjQmVoYXZpb3Ip LCBlZGl0aW5nX2JlaGF2aW9yX3R5cGVfbWFjX21hdGNoKTsKLSAgICBDT01QSUxFX0FTU0VSVChz dGF0aWNfY2FzdDxpbnQ+KFdFQktJVF9FRElUSU5HX0JFSEFWSU9SX1dJTkRPV1MpID09IHN0YXRp Y19jYXN0PGludD4oV2ViQ29yZTo6RWRpdGluZ1dpbmRvd3NCZWhhdmlvciksIGVkaXRpbmdfYmVo YXZpb3JfdHlwZV93aW5kb3dzX21hdGNoKTsKLSAgICBDT01QSUxFX0FTU0VSVChzdGF0aWNfY2Fz dDxpbnQ+KFdFQktJVF9FRElUSU5HX0JFSEFWSU9SX1VOSVgpID09IHN0YXRpY19jYXN0PGludD4o V2ViQ29yZTo6RWRpdGluZ1VuaXhCZWhhdmlvciksIGVkaXRpbmdfYmVoYXZpb3JfdHlwZV91bml4 X21hdGNoKTsKIAogICAgIC8qKgogICAgICogV2ViS2l0V2ViU2V0dGluZ3M6ZWRpdGluZy1iZWhh dmlvcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcu aCBiL1NvdXJjZS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmgKaW5kZXggMTgzOGJm ZS4uMDA0MzY2YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdl YnZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5oCkBA IC02MSw2ICs2MSw3IEBAIHR5cGVkZWYgZW51bQogCiB0eXBlZGVmIGVudW0KIHsKKyAgICBXRUJL SVRfV0VCX1ZJRVdfVklFV19NT0RFX0lOVkFMSUQsCiAgICAgV0VCS0lUX1dFQl9WSUVXX1ZJRVdf TU9ERV9XSU5ET1dFRCwKICAgICBXRUJLSVRfV0VCX1ZJRVdfVklFV19NT0RFX0ZMT0FUSU5HLAog ICAgIFdFQktJVF9XRUJfVklFV19WSUVXX01PREVfRlVMTFNDUkVFTiwK 82259 2011-02-13 04:19:54 -0800 2011-02-13 09:07:58 -0800 Proposed Patch2 assert_matching_enum.patch text/plain 7826 joone ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv Z3RrL0NoYW5nZUxvZwppbmRleCAyZmVmZDVkLi45Y2JiNDFkIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2d0ay9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjYgQEAKKzIwMTEtMDItMTMgIEpvb25lIEh1ciAgPGpvb25lLmh1ckBjb2xsYWJv cmEuY28udWs+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgW0dUS10gTWF0Y2ggbW9yZSB2YXJpb3VzIFdlYktpdCBBUEkgZW51bSB2YWx1ZXMgd2l0aCBX ZWJDb3JlIGVudW0gdmFsdWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD01NDM1MgorCisgICAgICAgIEFzc2VydE1hdGNoaW5nRW51bXMuY3BwIHdhcyBh ZGRlZCB0byBhc3NlcnQgdGhhdCB2YXJpb3VzIFdlYktpdCBBUEkgZW51bSB2YWx1ZXMgCisgICAg ICAgIGNvbnRpbnVlIG1hdGNoaW5nIFdlYkNvcmUgZGVmaW5lZCBlbnVtIHZhbHVlcyBpbiB0aGUg Zm9sbG93aW5nIGNoYW5nZXNldC4KKyAgICAgICAgaHR0cDovL3RyYWMud2Via2l0Lm9yZy9jaGFu Z2VzZXQvNzc4NjgKKyAgICAgICAgSG93ZXZlciwgdGhlcmUgYXJlIGFscmVhZHkgZW51bSB2YWx1 ZXMgdGhhdCBoYXZlIGJlZW4gYXNzZXJ0ZWQgaW4gb3RoZXIgZmlsZXMsIHNvIHRoZXNlIAorICAg ICAgICBhc3NlcnQgbWFjcm9zIGRlZmluZWQgbmVlZCB0byBiZSBtb3ZlZCB0byBBc3NlcnRNYXRj aGluZ0VudW0uY3BwLiBBbHNvLCB0aGUgZW51bSB2YWx1ZSAKKyAgICAgICAgdGhhdCBoYXMgbm90 IGJlZW4gYXNzZXJ0ZWQgc2hvdWxkIGJlIGFkZGVkIHRvIEFzc2VydE1hdGNoaW5nRW51bS5jcHAu CisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9Bc3NlcnRNYXRjaGluZ0VudW1zLmNwcDogQWRk IG1vcmUgZW51bSB2YWx1ZXMgdG8gYmUgYXNzZXJ0ZWQuCisgICAgICAgICogd2Via2l0L3dlYmtp dHdlYm5hdmlnYXRpb25hY3Rpb24uY3BwOiAgTW92ZSB0aGUgYXNzZXJ0IG1hY3JvcyBvZiAKKyAg ICAgICAgV0VCS0lUX1dFQl9OQVZJR0FUSU9OX1JFQVNPTl8qIHRvIEFzc2VydE1hdGNoaW5nRW51 bXMuY3BwLgorICAgICAgICAod2Via2l0X3dlYl9uYXZpZ2F0aW9uX2FjdGlvbl9jbGFzc19pbml0 KTogCisgICAgICAgICogd2Via2l0L3dlYmtpdHdlYnNldHRpbmdzLmNwcDogTW92ZSB0aGUgYXNz ZXJ0IG1hY3JvcyBvZiBXRUJLSVRfRURJVElOR19CRUhBVklPUl8qIHRvIAorICAgICAgICBBc3Nl cnRNYXRjaGluZ0VudW1zLmNwcC4KKyAgICAgICAgKHdlYmtpdF93ZWJfc2V0dGluZ3NfY2xhc3Nf aW5pdCk6CisgICAgICAgICogd2Via2l0L3dlYmtpdHdlYnZpZXcuaDogQWRkIFdFQktJVF9XRUJf VklFV19WSUVXX01PREVfSU5WQUxJRCBlbnVtIHZhbHVlLgorCiAyMDExLTAyLTExICBTaGVyaWZm IEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2Vk LCByb2xsaW5nIG91dCByNzgzMzEuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJD b3JlU3VwcG9ydC9Bc3NlcnRNYXRjaGluZ0VudW1zLmNwcCBiL1NvdXJjZS9XZWJLaXQvZ3RrL1dl YkNvcmVTdXBwb3J0L0Fzc2VydE1hdGNoaW5nRW51bXMuY3BwCmluZGV4IDljNTk2ZjguLjRjNDE2 MDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0Fzc2VydE1h dGNoaW5nRW51bXMuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0Fz c2VydE1hdGNoaW5nRW51bXMuY3BwCkBAIC0yMiwxNSArMjIsMzYgQEAKICNpbmNsdWRlICJjb25m aWcuaCIKIAogI2luY2x1ZGUgIkR1bXBSZW5kZXJUcmVlU3VwcG9ydEd0ay5oIgorI2luY2x1ZGUg IkVkaXRpbmdCZWhhdmlvclR5cGVzLmgiCiAjaW5jbHVkZSAiRmluZE9wdGlvbnMuaCIKKyNpbmNs dWRlICJQYWdlLmgiCisjaW5jbHVkZSAid2Via2l0d2VibmF2aWdhdGlvbmFjdGlvbi5oIgorI2lu Y2x1ZGUgIndlYmtpdHdlYnZpZXcuaCIKICNpbmNsdWRlIDx3dGYvQXNzZXJ0aW9ucy5oPgogCiAj ZGVmaW5lIENPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0od2Via2l0X25hbWUsIHdlYmNvcmVf bmFtZSkgXAotICAgIENPTVBJTEVfQVNTRVJUKGludChXZWJLaXQ6OndlYmtpdF9uYW1lKSA9PSBp bnQoV2ViQ29yZTo6d2ViY29yZV9uYW1lKSwgbWlzbWF0Y2hpbmdfZW51bXMpCi0KLUNPTVBJTEVf QVNTRVJUX01BVENISU5HX0VOVU0oV2ViRmluZE9wdGlvbnNDYXNlSW5zZW5zaXRpdmUgLCBDYXNl SW5zZW5zaXRpdmUpOwotQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShXZWJGaW5kT3B0aW9u c0F0V29yZFN0YXJ0cywgQXRXb3JkU3RhcnRzKTsKLUNPTVBJTEVfQVNTRVJUX01BVENISU5HX0VO VU0oV2ViRmluZE9wdGlvbnNUcmVhdE1lZGlhbENhcGl0YWxBc1dvcmRTdGFydCwgVHJlYXRNZWRp YWxDYXBpdGFsQXNXb3JkU3RhcnQpOwotQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShXZWJG aW5kT3B0aW9uc0JhY2t3YXJkcywgQmFja3dhcmRzKTsKLUNPTVBJTEVfQVNTRVJUX01BVENISU5H X0VOVU0oV2ViRmluZE9wdGlvbnNXcmFwQXJvdW5kLCBXcmFwQXJvdW5kKTsKLUNPTVBJTEVfQVNT RVJUX01BVENISU5HX0VOVU0oV2ViRmluZE9wdGlvbnNTdGFydEluU2VsZWN0aW9uLCBTdGFydElu U2VsZWN0aW9uKTsKKyAgICBDT01QSUxFX0FTU0VSVChpbnQod2Via2l0X25hbWUpID09IGludChX ZWJDb3JlOjp3ZWJjb3JlX25hbWUpLCBtaXNtYXRjaGluZ19lbnVtcykKKworQ09NUElMRV9BU1NF UlRfTUFUQ0hJTkdfRU5VTShXRUJLSVRfV0VCX1ZJRVdfVklFV19NT0RFX0lOVkFMSUQsIFBhZ2U6 OlZpZXdNb2RlSW52YWxpZCk7CitDT01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKFdFQktJVF9X RUJfVklFV19WSUVXX01PREVfV0lORE9XRUQsIFBhZ2U6OlZpZXdNb2RlV2luZG93ZWQpOworQ09N UElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShXRUJLSVRfV0VCX1ZJRVdfVklFV19NT0RFX0ZMT0FU SU5HLCBQYWdlOjpWaWV3TW9kZUZsb2F0aW5nKTsKK0NPTVBJTEVfQVNTRVJUX01BVENISU5HX0VO VU0oV0VCS0lUX1dFQl9WSUVXX1ZJRVdfTU9ERV9GVUxMU0NSRUVOLCBQYWdlOjpWaWV3TW9kZUZ1 bGxzY3JlZW4pOworQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShXRUJLSVRfV0VCX1ZJRVdf VklFV19NT0RFX01BWElNSVpFRCwgUGFnZTo6Vmlld01vZGVNYXhpbWl6ZWQpOworQ09NUElMRV9B U1NFUlRfTUFUQ0hJTkdfRU5VTShXRUJLSVRfV0VCX1ZJRVdfVklFV19NT0RFX01JTklNSVpFRCwg UGFnZTo6Vmlld01vZGVNaW5pbWl6ZWQpOyAKKworQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5V TShXRUJLSVRfRURJVElOR19CRUhBVklPUl9NQUMsIEVkaXRpbmdNYWNCZWhhdmlvcik7CitDT01Q SUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKFdFQktJVF9FRElUSU5HX0JFSEFWSU9SX1dJTkRPV1Ms IEVkaXRpbmdXaW5kb3dzQmVoYXZpb3IpOworQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShX RUJLSVRfRURJVElOR19CRUhBVklPUl9VTklYLCBFZGl0aW5nVW5peEJlaGF2aW9yKTsKKworQ09N UElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShXRUJLSVRfV0VCX05BVklHQVRJT05fUkVBU09OX0xJ TktfQ0xJQ0tFRCwgTmF2aWdhdGlvblR5cGVMaW5rQ2xpY2tlZCk7CitDT01QSUxFX0FTU0VSVF9N QVRDSElOR19FTlVNKFdFQktJVF9XRUJfTkFWSUdBVElPTl9SRUFTT05fRk9STV9TVUJNSVRURUQs IE5hdmlnYXRpb25UeXBlRm9ybVN1Ym1pdHRlZCk7CitDT01QSUxFX0FTU0VSVF9NQVRDSElOR19F TlVNKFdFQktJVF9XRUJfTkFWSUdBVElPTl9SRUFTT05fQkFDS19GT1JXQVJELCBOYXZpZ2F0aW9u VHlwZUJhY2tGb3J3YXJkKTsKK0NPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oV0VCS0lUX1dF Ql9OQVZJR0FUSU9OX1JFQVNPTl9SRUxPQUQsIE5hdmlnYXRpb25UeXBlUmVsb2FkKTsKK0NPTVBJ TEVfQVNTRVJUX01BVENISU5HX0VOVU0oV0VCS0lUX1dFQl9OQVZJR0FUSU9OX1JFQVNPTl9GT1JN X1JFU1VCTUlUVEVELCBOYXZpZ2F0aW9uVHlwZUZvcm1SZXN1Ym1pdHRlZCk7CitDT01QSUxFX0FT U0VSVF9NQVRDSElOR19FTlVNKFdFQktJVF9XRUJfTkFWSUdBVElPTl9SRUFTT05fT1RIRVIsIE5h dmlnYXRpb25UeXBlT3RoZXIpOworCitDT01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKFdlYktp dDo6V2ViRmluZE9wdGlvbnNBdFdvcmRTdGFydHMsIEF0V29yZFN0YXJ0cyk7CitDT01QSUxFX0FT U0VSVF9NQVRDSElOR19FTlVNKFdlYktpdDo6V2ViRmluZE9wdGlvbnNUcmVhdE1lZGlhbENhcGl0 YWxBc1dvcmRTdGFydCwgVHJlYXRNZWRpYWxDYXBpdGFsQXNXb3JkU3RhcnQpOworQ09NUElMRV9B U1NFUlRfTUFUQ0hJTkdfRU5VTShXZWJLaXQ6OldlYkZpbmRPcHRpb25zQmFja3dhcmRzLCBCYWNr d2FyZHMpOworQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShXZWJLaXQ6OldlYkZpbmRPcHRp b25zV3JhcEFyb3VuZCwgV3JhcEFyb3VuZCk7CitDT01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVN KFdlYktpdDo6V2ViRmluZE9wdGlvbnNTdGFydEluU2VsZWN0aW9uLCBTdGFydEluU2VsZWN0aW9u KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJuYXZpZ2F0 aW9uYWN0aW9uLmNwcCBiL1NvdXJjZS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJuYXZpZ2F0 aW9uYWN0aW9uLmNwcAppbmRleCA5ZjEzZjI4Li44NjhlNDljIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2VibmF2aWdhdGlvbmFjdGlvbi5jcHAKKysrIGIvU291 cmNlL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYm5hdmlnYXRpb25hY3Rpb24uY3BwCkBAIC0x MzEsMTMgKzEzMSw2IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJfbmF2aWdhdGlvbl9hY3Rpb25f Y2xhc3NfaW5pdChXZWJLaXRXZWJOYXZpZ2F0aW9uQWN0aW9uQ2xhCiB7CiAgICAgR09iamVjdENs YXNzKiBvYmplY3RDbGFzcyA9IEdfT0JKRUNUX0NMQVNTKHJlcXVlc3RDbGFzcyk7CiAKLSAgICBD T01QSUxFX0FTU0VSVChzdGF0aWNfY2FzdDxpbnQ+KFdFQktJVF9XRUJfTkFWSUdBVElPTl9SRUFT T05fTElOS19DTElDS0VEKSA9PSBzdGF0aWNfY2FzdDxpbnQ+KFdlYkNvcmU6Ok5hdmlnYXRpb25U eXBlTGlua0NsaWNrZWQpLCBuYXZpZ2F0aW9uX3R5cGVfbGlua19jbGlja2VkX2VudW1fbWF0Y2gp OwotICAgIENPTVBJTEVfQVNTRVJUKHN0YXRpY19jYXN0PGludD4oV0VCS0lUX1dFQl9OQVZJR0FU SU9OX1JFQVNPTl9GT1JNX1NVQk1JVFRFRCkgPT0gc3RhdGljX2Nhc3Q8aW50PihXZWJDb3JlOjpO YXZpZ2F0aW9uVHlwZUZvcm1TdWJtaXR0ZWQpLCBuYXZpZ2F0aW9uX3R5cGVfZm9ybV9zdWJtaXR0 ZWRfZW51bV9tYXRjaCk7Ci0gICAgQ09NUElMRV9BU1NFUlQoc3RhdGljX2Nhc3Q8aW50PihXRUJL SVRfV0VCX05BVklHQVRJT05fUkVBU09OX0JBQ0tfRk9SV0FSRCkgPT0gc3RhdGljX2Nhc3Q8aW50 PihXZWJDb3JlOjpOYXZpZ2F0aW9uVHlwZUJhY2tGb3J3YXJkKSwgbmF2aWdhdGlvbl90eXBlX2Jh Y2tfZm9yd2FyZF9lbnVtX21hdGNoKTsKLSAgICBDT01QSUxFX0FTU0VSVChzdGF0aWNfY2FzdDxp bnQ+KFdFQktJVF9XRUJfTkFWSUdBVElPTl9SRUFTT05fUkVMT0FEKSA9PSBzdGF0aWNfY2FzdDxp bnQ+KFdlYkNvcmU6Ok5hdmlnYXRpb25UeXBlUmVsb2FkKSwgbmF2aWdhdGlvbl90eXBlX3JlbG9h ZF9lbnVtX21hdGNoKTsKLSAgICBDT01QSUxFX0FTU0VSVChzdGF0aWNfY2FzdDxpbnQ+KFdFQktJ VF9XRUJfTkFWSUdBVElPTl9SRUFTT05fRk9STV9SRVNVQk1JVFRFRCkgPT0gc3RhdGljX2Nhc3Q8 aW50PihXZWJDb3JlOjpOYXZpZ2F0aW9uVHlwZUZvcm1SZXN1Ym1pdHRlZCksIG5hdmlnYXRpb25f dHlwZV9mb3JtX3Jlc3VibWl0dGVkX2VudW1fbWF0Y2gpOwotICAgIENPTVBJTEVfQVNTRVJUKHN0 YXRpY19jYXN0PGludD4oV0VCS0lUX1dFQl9OQVZJR0FUSU9OX1JFQVNPTl9PVEhFUikgPT0gc3Rh dGljX2Nhc3Q8aW50PihXZWJDb3JlOjpOYXZpZ2F0aW9uVHlwZU90aGVyKSwgbmF2aWdhdGlvbl90 eXBlX290aGVyX2VudW1fbWF0Y2gpOwotCiAgICAgb2JqZWN0Q2xhc3MtPmdldF9wcm9wZXJ0eSA9 IHdlYmtpdF93ZWJfbmF2aWdhdGlvbl9hY3Rpb25fZ2V0X3Byb3BlcnR5OwogICAgIG9iamVjdENs YXNzLT5zZXRfcHJvcGVydHkgPSB3ZWJraXRfd2ViX25hdmlnYXRpb25fYWN0aW9uX3NldF9wcm9w ZXJ0eTsKICAgICBvYmplY3RDbGFzcy0+ZGlzcG9zZSA9IHdlYmtpdF93ZWJfbmF2aWdhdGlvbl9h Y3Rpb25fZmluYWxpemU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0ay93ZWJraXQvd2Vi a2l0d2Vic2V0dGluZ3MuY3BwIGIvU291cmNlL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnNl dHRpbmdzLmNwcAppbmRleCA0OTJjN2I2Li5iNTU1MzgzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L2d0ay93ZWJraXQvd2Via2l0d2Vic2V0dGluZ3MuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv Z3RrL3dlYmtpdC93ZWJraXR3ZWJzZXR0aW5ncy5jcHAKQEAgLTY5MSw5ICs2OTEsNiBAQCBzdGF0 aWMgdm9pZCB3ZWJraXRfd2ViX3NldHRpbmdzX2NsYXNzX2luaXQoV2ViS2l0V2ViU2V0dGluZ3ND bGFzcyoga2xhc3MpCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBUUlVFLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgZmxhZ3MpKTsKIAotICAgIENPTVBJTEVfQVNTRVJUKHN0YXRp Y19jYXN0PGludD4oV0VCS0lUX0VESVRJTkdfQkVIQVZJT1JfTUFDKSA9PSBzdGF0aWNfY2FzdDxp bnQ+KFdlYkNvcmU6OkVkaXRpbmdNYWNCZWhhdmlvciksIGVkaXRpbmdfYmVoYXZpb3JfdHlwZV9t YWNfbWF0Y2gpOwotICAgIENPTVBJTEVfQVNTRVJUKHN0YXRpY19jYXN0PGludD4oV0VCS0lUX0VE SVRJTkdfQkVIQVZJT1JfV0lORE9XUykgPT0gc3RhdGljX2Nhc3Q8aW50PihXZWJDb3JlOjpFZGl0 aW5nV2luZG93c0JlaGF2aW9yKSwgZWRpdGluZ19iZWhhdmlvcl90eXBlX3dpbmRvd3NfbWF0Y2gp OwotICAgIENPTVBJTEVfQVNTRVJUKHN0YXRpY19jYXN0PGludD4oV0VCS0lUX0VESVRJTkdfQkVI QVZJT1JfVU5JWCkgPT0gc3RhdGljX2Nhc3Q8aW50PihXZWJDb3JlOjpFZGl0aW5nVW5peEJlaGF2 aW9yKSwgZWRpdGluZ19iZWhhdmlvcl90eXBlX3VuaXhfbWF0Y2gpOwogCiAgICAgLyoqCiAgICAg KiBXZWJLaXRXZWJTZXR0aW5nczplZGl0aW5nLWJlaGF2aW9yCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5oIGIvU291cmNlL1dlYktpdC9ndGsvd2Vi a2l0L3dlYmtpdHdlYnZpZXcuaAppbmRleCAxODM4YmZlLi4wMDQzNjZhIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5oCisrKyBiL1NvdXJjZS9XZWJL aXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmgKQEAgLTYxLDYgKzYxLDcgQEAgdHlwZWRlZiBl bnVtCiAKIHR5cGVkZWYgZW51bQogeworICAgIFdFQktJVF9XRUJfVklFV19WSUVXX01PREVfSU5W QUxJRCwKICAgICBXRUJLSVRfV0VCX1ZJRVdfVklFV19NT0RFX1dJTkRPV0VELAogICAgIFdFQktJ VF9XRUJfVklFV19WSUVXX01PREVfRkxPQVRJTkcsCiAgICAgV0VCS0lUX1dFQl9WSUVXX1ZJRVdf TU9ERV9GVUxMU0NSRUVOLAo= 82605 2011-02-16 02:33:31 -0800 2011-02-16 16:50:42 -0800 Proposed Patch3 assert_matching_enum.patch text/plain 6650 joone ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv Z3RrL0NoYW5nZUxvZwppbmRleCAwYWZiMmUwLi5iOWNiYThiIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2d0ay9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjQgQEAKKzIwMTEtMDItMTYgIEpvb25lIEh1ciAgPGpvb25lLmh1ckBjb2xsYWJv cmEuY28udWs+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgW0dUS10gTWF0Y2ggbW9yZSB2YXJpb3VzIFdlYktpdCBBUEkgZW51bSB2YWx1ZXMgd2l0aCBX ZWJDb3JlIGVudW0gdmFsdWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD01NDM1MgorCisgICAgICAgIEFzc2VydE1hdGNoaW5nRW51bXMuY3BwIHdhcyBh ZGRlZCB0byBhc3NlcnQgdGhhdCB2YXJpb3VzIFdlYktpdCBBUEkgZW51bSB2YWx1ZXMgCisgICAg ICAgIGNvbnRpbnVlIG1hdGNoaW5nIFdlYkNvcmUgZGVmaW5lZCBlbnVtIHZhbHVlcyBpbiB0aGUg Zm9sbG93aW5nIGNoYW5nZXNldC4KKyAgICAgICAgaHR0cDovL3RyYWMud2Via2l0Lm9yZy9jaGFu Z2VzZXQvNzc4NjgKKyAgICAgICAgSG93ZXZlciwgdGhlcmUgYXJlIGFscmVhZHkgZW51bSB2YWx1 ZXMgdGhhdCBoYXZlIGJlZW4gYXNzZXJ0ZWQgaW4gb3RoZXIgZmlsZXMsIAorICAgICAgICBzbyB0 aGVzZSBhc3NlcnQgbWFjcm9zIGRlZmluZWQgbmVlZCB0byBiZSBtb3ZlZCB0byBBc3NlcnRNYXRj aGluZ0VudW0uY3BwLiAgCisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9Bc3NlcnRNYXRjaGlu Z0VudW1zLmNwcDogQWRkIG1vcmUgZW51bSB2YWx1ZXMgdG8gYmUgYXNzZXJ0ZWQuCisgICAgICAg ICogd2Via2l0L3dlYmtpdHdlYm5hdmlnYXRpb25hY3Rpb24uY3BwOiAgCisgICAgICAgICh3ZWJr aXRfd2ViX25hdmlnYXRpb25fYWN0aW9uX2NsYXNzX2luaXQpOiBNb3ZlIHRoZSBhc3NlcnQgbWFj cm9zIG9mIAorICAgICAgICBXRUJLSVRfV0VCX05BVklHQVRJT05fUkVBU09OXyogdG8gQXNzZXJ0 TWF0Y2hpbmdFbnVtcy5jcHAuCisgICAgICAgICogd2Via2l0L3dlYmtpdHdlYnNldHRpbmdzLmNw cDoKKyAgICAgICAgKHdlYmtpdF93ZWJfc2V0dGluZ3NfY2xhc3NfaW5pdCk6IE1vdmUgdGhlIGFz c2VydCBtYWNyb3Mgb2YgV0VCS0lUX0VESVRJTkdfQkVIQVZJT1JfKiAKKyAgICAgICAgdG8gQXNz ZXJ0TWF0Y2hpbmdFbnVtcy5jcHAuCisKIDIwMTEtMDItMTUgIEtlbm5ldGggUnVzc2VsbCAgPGti ckBnb29nbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEZpc2hlci4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0Fzc2VydE1hdGNoaW5nRW51 bXMuY3BwIGIvU291cmNlL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvQXNzZXJ0TWF0Y2hpbmdF bnVtcy5jcHAKaW5kZXggOWM1OTZmOC4uMjk4ZjMyOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9ndGsvV2ViQ29yZVN1cHBvcnQvQXNzZXJ0TWF0Y2hpbmdFbnVtcy5jcHAKKysrIGIvU291cmNl L1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvQXNzZXJ0TWF0Y2hpbmdFbnVtcy5jcHAKQEAgLTIy LDE1ICsyMiwyOSBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogCiAjaW5jbHVkZSAiRHVtcFJlbmRl clRyZWVTdXBwb3J0R3RrLmgiCisjaW5jbHVkZSAiRWRpdGluZ0JlaGF2aW9yVHlwZXMuaCIKICNp bmNsdWRlICJGaW5kT3B0aW9ucy5oIgorI2luY2x1ZGUgIkZyYW1lTG9hZGVyVHlwZXMuaCIKKyNp bmNsdWRlICJ3ZWJraXR3ZWJuYXZpZ2F0aW9uYWN0aW9uLmgiCisjaW5jbHVkZSAid2Via2l0d2Vi c2V0dGluZ3MuaCIKICNpbmNsdWRlIDx3dGYvQXNzZXJ0aW9ucy5oPgogCiAjZGVmaW5lIENPTVBJ TEVfQVNTRVJUX01BVENISU5HX0VOVU0od2Via2l0X25hbWUsIHdlYmNvcmVfbmFtZSkgXAotICAg IENPTVBJTEVfQVNTRVJUKGludChXZWJLaXQ6OndlYmtpdF9uYW1lKSA9PSBpbnQoV2ViQ29yZTo6 d2ViY29yZV9uYW1lKSwgbWlzbWF0Y2hpbmdfZW51bXMpCisgICAgQ09NUElMRV9BU1NFUlQoaW50 KHdlYmtpdF9uYW1lKSA9PSBpbnQoV2ViQ29yZTo6d2ViY29yZV9uYW1lKSwgbWlzbWF0Y2hpbmdf ZW51bXMpCiAKLUNPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oV2ViRmluZE9wdGlvbnNDYXNl SW5zZW5zaXRpdmUgLCBDYXNlSW5zZW5zaXRpdmUpOwotQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdf RU5VTShXZWJGaW5kT3B0aW9uc0F0V29yZFN0YXJ0cywgQXRXb3JkU3RhcnRzKTsKLUNPTVBJTEVf QVNTRVJUX01BVENISU5HX0VOVU0oV2ViRmluZE9wdGlvbnNUcmVhdE1lZGlhbENhcGl0YWxBc1dv cmRTdGFydCwgVHJlYXRNZWRpYWxDYXBpdGFsQXNXb3JkU3RhcnQpOwotQ09NUElMRV9BU1NFUlRf TUFUQ0hJTkdfRU5VTShXZWJGaW5kT3B0aW9uc0JhY2t3YXJkcywgQmFja3dhcmRzKTsKLUNPTVBJ TEVfQVNTRVJUX01BVENISU5HX0VOVU0oV2ViRmluZE9wdGlvbnNXcmFwQXJvdW5kLCBXcmFwQXJv dW5kKTsKLUNPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oV2ViRmluZE9wdGlvbnNTdGFydElu U2VsZWN0aW9uLCBTdGFydEluU2VsZWN0aW9uKTsKK0NPTVBJTEVfQVNTRVJUX01BVENISU5HX0VO VU0oV0VCS0lUX0VESVRJTkdfQkVIQVZJT1JfTUFDLCBFZGl0aW5nTWFjQmVoYXZpb3IpOworQ09N UElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShXRUJLSVRfRURJVElOR19CRUhBVklPUl9XSU5ET1dT LCBFZGl0aW5nV2luZG93c0JlaGF2aW9yKTsKK0NPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0o V0VCS0lUX0VESVRJTkdfQkVIQVZJT1JfVU5JWCwgRWRpdGluZ1VuaXhCZWhhdmlvcik7CisKK0NP TVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oV0VCS0lUX1dFQl9OQVZJR0FUSU9OX1JFQVNPTl9M SU5LX0NMSUNLRUQsIE5hdmlnYXRpb25UeXBlTGlua0NsaWNrZWQpOworQ09NUElMRV9BU1NFUlRf TUFUQ0hJTkdfRU5VTShXRUJLSVRfV0VCX05BVklHQVRJT05fUkVBU09OX0ZPUk1fU1VCTUlUVEVE LCBOYXZpZ2F0aW9uVHlwZUZvcm1TdWJtaXR0ZWQpOworQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdf RU5VTShXRUJLSVRfV0VCX05BVklHQVRJT05fUkVBU09OX0JBQ0tfRk9SV0FSRCwgTmF2aWdhdGlv blR5cGVCYWNrRm9yd2FyZCk7CitDT01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKFdFQktJVF9X RUJfTkFWSUdBVElPTl9SRUFTT05fUkVMT0FELCBOYXZpZ2F0aW9uVHlwZVJlbG9hZCk7CitDT01Q SUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKFdFQktJVF9XRUJfTkFWSUdBVElPTl9SRUFTT05fRk9S TV9SRVNVQk1JVFRFRCwgTmF2aWdhdGlvblR5cGVGb3JtUmVzdWJtaXR0ZWQpOworQ09NUElMRV9B U1NFUlRfTUFUQ0hJTkdfRU5VTShXRUJLSVRfV0VCX05BVklHQVRJT05fUkVBU09OX09USEVSLCBO YXZpZ2F0aW9uVHlwZU90aGVyKTsKKworQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShXZWJL aXQ6OldlYkZpbmRPcHRpb25zQXRXb3JkU3RhcnRzLCBBdFdvcmRTdGFydHMpOworQ09NUElMRV9B U1NFUlRfTUFUQ0hJTkdfRU5VTShXZWJLaXQ6OldlYkZpbmRPcHRpb25zVHJlYXRNZWRpYWxDYXBp dGFsQXNXb3JkU3RhcnQsIFRyZWF0TWVkaWFsQ2FwaXRhbEFzV29yZFN0YXJ0KTsKK0NPTVBJTEVf QVNTRVJUX01BVENISU5HX0VOVU0oV2ViS2l0OjpXZWJGaW5kT3B0aW9uc0JhY2t3YXJkcywgQmFj a3dhcmRzKTsKK0NPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oV2ViS2l0OjpXZWJGaW5kT3B0 aW9uc1dyYXBBcm91bmQsIFdyYXBBcm91bmQpOworQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5V TShXZWJLaXQ6OldlYkZpbmRPcHRpb25zU3RhcnRJblNlbGVjdGlvbiwgU3RhcnRJblNlbGVjdGlv bik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2VibmF2aWdh dGlvbmFjdGlvbi5jcHAgYi9Tb3VyY2UvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2VibmF2aWdh dGlvbmFjdGlvbi5jcHAKaW5kZXggOWYxM2YyOC4uODY4ZTQ5YyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYm5hdmlnYXRpb25hY3Rpb24uY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJuYXZpZ2F0aW9uYWN0aW9uLmNwcApAQCAt MTMxLDEzICsxMzEsNiBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX25hdmlnYXRpb25fYWN0aW9u X2NsYXNzX2luaXQoV2ViS2l0V2ViTmF2aWdhdGlvbkFjdGlvbkNsYQogewogICAgIEdPYmplY3RD bGFzcyogb2JqZWN0Q2xhc3MgPSBHX09CSkVDVF9DTEFTUyhyZXF1ZXN0Q2xhc3MpOwogCi0gICAg Q09NUElMRV9BU1NFUlQoc3RhdGljX2Nhc3Q8aW50PihXRUJLSVRfV0VCX05BVklHQVRJT05fUkVB U09OX0xJTktfQ0xJQ0tFRCkgPT0gc3RhdGljX2Nhc3Q8aW50PihXZWJDb3JlOjpOYXZpZ2F0aW9u VHlwZUxpbmtDbGlja2VkKSwgbmF2aWdhdGlvbl90eXBlX2xpbmtfY2xpY2tlZF9lbnVtX21hdGNo KTsKLSAgICBDT01QSUxFX0FTU0VSVChzdGF0aWNfY2FzdDxpbnQ+KFdFQktJVF9XRUJfTkFWSUdB VElPTl9SRUFTT05fRk9STV9TVUJNSVRURUQpID09IHN0YXRpY19jYXN0PGludD4oV2ViQ29yZTo6 TmF2aWdhdGlvblR5cGVGb3JtU3VibWl0dGVkKSwgbmF2aWdhdGlvbl90eXBlX2Zvcm1fc3VibWl0 dGVkX2VudW1fbWF0Y2gpOwotICAgIENPTVBJTEVfQVNTRVJUKHN0YXRpY19jYXN0PGludD4oV0VC S0lUX1dFQl9OQVZJR0FUSU9OX1JFQVNPTl9CQUNLX0ZPUldBUkQpID09IHN0YXRpY19jYXN0PGlu dD4oV2ViQ29yZTo6TmF2aWdhdGlvblR5cGVCYWNrRm9yd2FyZCksIG5hdmlnYXRpb25fdHlwZV9i YWNrX2ZvcndhcmRfZW51bV9tYXRjaCk7Ci0gICAgQ09NUElMRV9BU1NFUlQoc3RhdGljX2Nhc3Q8 aW50PihXRUJLSVRfV0VCX05BVklHQVRJT05fUkVBU09OX1JFTE9BRCkgPT0gc3RhdGljX2Nhc3Q8 aW50PihXZWJDb3JlOjpOYXZpZ2F0aW9uVHlwZVJlbG9hZCksIG5hdmlnYXRpb25fdHlwZV9yZWxv YWRfZW51bV9tYXRjaCk7Ci0gICAgQ09NUElMRV9BU1NFUlQoc3RhdGljX2Nhc3Q8aW50PihXRUJL SVRfV0VCX05BVklHQVRJT05fUkVBU09OX0ZPUk1fUkVTVUJNSVRURUQpID09IHN0YXRpY19jYXN0 PGludD4oV2ViQ29yZTo6TmF2aWdhdGlvblR5cGVGb3JtUmVzdWJtaXR0ZWQpLCBuYXZpZ2F0aW9u X3R5cGVfZm9ybV9yZXN1Ym1pdHRlZF9lbnVtX21hdGNoKTsKLSAgICBDT01QSUxFX0FTU0VSVChz dGF0aWNfY2FzdDxpbnQ+KFdFQktJVF9XRUJfTkFWSUdBVElPTl9SRUFTT05fT1RIRVIpID09IHN0 YXRpY19jYXN0PGludD4oV2ViQ29yZTo6TmF2aWdhdGlvblR5cGVPdGhlciksIG5hdmlnYXRpb25f dHlwZV9vdGhlcl9lbnVtX21hdGNoKTsKLQogICAgIG9iamVjdENsYXNzLT5nZXRfcHJvcGVydHkg PSB3ZWJraXRfd2ViX25hdmlnYXRpb25fYWN0aW9uX2dldF9wcm9wZXJ0eTsKICAgICBvYmplY3RD bGFzcy0+c2V0X3Byb3BlcnR5ID0gd2Via2l0X3dlYl9uYXZpZ2F0aW9uX2FjdGlvbl9zZXRfcHJv cGVydHk7CiAgICAgb2JqZWN0Q2xhc3MtPmRpc3Bvc2UgPSB3ZWJraXRfd2ViX25hdmlnYXRpb25f YWN0aW9uX2ZpbmFsaXplOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ndGsvd2Via2l0L3dl YmtpdHdlYnNldHRpbmdzLmNwcCBiL1NvdXJjZS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJz ZXR0aW5ncy5jcHAKaW5kZXggNTMzYjM3Ny4uZmY1Mjg5YiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnNldHRpbmdzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 L2d0ay93ZWJraXQvd2Via2l0d2Vic2V0dGluZ3MuY3BwCkBAIC02OTEsOSArNjkxLDYgQEAgc3Rh dGljIHZvaWQgd2Via2l0X3dlYl9zZXR0aW5nc19jbGFzc19pbml0KFdlYktpdFdlYlNldHRpbmdz Q2xhc3MqIGtsYXNzKQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgVFJVRSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGZsYWdzKSk7CiAKLSAgICBDT01QSUxFX0FTU0VSVChzdGF0 aWNfY2FzdDxpbnQ+KFdFQktJVF9FRElUSU5HX0JFSEFWSU9SX01BQykgPT0gc3RhdGljX2Nhc3Q8 aW50PihXZWJDb3JlOjpFZGl0aW5nTWFjQmVoYXZpb3IpLCBlZGl0aW5nX2JlaGF2aW9yX3R5cGVf bWFjX21hdGNoKTsKLSAgICBDT01QSUxFX0FTU0VSVChzdGF0aWNfY2FzdDxpbnQ+KFdFQktJVF9F RElUSU5HX0JFSEFWSU9SX1dJTkRPV1MpID09IHN0YXRpY19jYXN0PGludD4oV2ViQ29yZTo6RWRp dGluZ1dpbmRvd3NCZWhhdmlvciksIGVkaXRpbmdfYmVoYXZpb3JfdHlwZV93aW5kb3dzX21hdGNo KTsKLSAgICBDT01QSUxFX0FTU0VSVChzdGF0aWNfY2FzdDxpbnQ+KFdFQktJVF9FRElUSU5HX0JF SEFWSU9SX1VOSVgpID09IHN0YXRpY19jYXN0PGludD4oV2ViQ29yZTo6RWRpdGluZ1VuaXhCZWhh dmlvciksIGVkaXRpbmdfYmVoYXZpb3JfdHlwZV91bml4X21hdGNoKTsKIAogICAgIC8qKgogICAg ICogV2ViS2l0V2ViU2V0dGluZ3M6ZWRpdGluZy1iZWhhdmlvcgo=