130955 2014-03-30 21:33:45 -0700 [WebGL][OpenGLES] Enable MSAA support for WebGL Canvas 2014-03-31 22:37:42 -0700 1 1 1 Unclassified WebKit WebGL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sun.shin webkit-unassigned bfulgham commit-queue dino kondapallykalyan noam roger_fong oldest_to_newest 995742 0 sun.shin 2014-03-30 21:33:45 -0700 [WebGL][OpenGLES]Enable MSAA support for WebGL Canvas 995743 1 228146 sun.shin 2014-03-30 21:46:52 -0700 Created attachment 228146 Patch 995744 2 commit-queue 2014-03-30 21:48:05 -0700 Attachment 228146 did not pass style-queue: ERROR: Source/WebCore/platform/graphics/Extensions3D.h:116: enum members should use InterCaps with an initial capital letter. [readability/enum_casing] [4] ERROR: Source/WebCore/platform/graphics/Extensions3D.h:117: enum members should use InterCaps with an initial capital letter. [readability/enum_casing] [4] ERROR: Source/WebCore/platform/graphics/Extensions3D.h:118: enum members should use InterCaps with an initial capital letter. [readability/enum_casing] [4] ERROR: Source/WebCore/platform/graphics/Extensions3D.h:119: enum members should use InterCaps with an initial capital letter. [readability/enum_casing] [4] Total errors found: 4 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 996069 3 228146 dino 2014-03-31 17:53:54 -0700 Comment on attachment 228146 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=228146&action=review It would be great if we could write a test for this. > Source/WebCore/ChangeLog:10 > + - Imagination OpenGLES GPU Driver alreay support MSAA, so we Typo: already > Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp:118 > + GLint sampleCount = std::min(8, maxSampleCount); > + if (sampleCount > maxSampleCount) > + sampleCount = maxSampleCount; You don't need the if clause. sampleCount is already less than or equal to maxSampleCount. 996075 4 228225 sun.shin 2014-03-31 18:09:35 -0700 Created attachment 228225 Patch 996077 5 commit-queue 2014-03-31 18:11:07 -0700 Attachment 228225 did not pass style-queue: ERROR: Source/WebCore/platform/graphics/Extensions3D.h:116: enum members should use InterCaps with an initial capital letter. [readability/enum_casing] [4] ERROR: Source/WebCore/platform/graphics/Extensions3D.h:117: enum members should use InterCaps with an initial capital letter. [readability/enum_casing] [4] ERROR: Source/WebCore/platform/graphics/Extensions3D.h:118: enum members should use InterCaps with an initial capital letter. [readability/enum_casing] [4] ERROR: Source/WebCore/platform/graphics/Extensions3D.h:119: enum members should use InterCaps with an initial capital letter. [readability/enum_casing] [4] Total errors found: 4 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 996078 6 228226 sun.shin 2014-03-31 18:13:34 -0700 Created attachment 228226 Patch 996079 7 sun.shin 2014-03-31 18:14:22 -0700 @Dean, thanks for the review. About creating test case for it, I promise to do it as a separate commit. Because it might need more work to do. :) 996080 8 commit-queue 2014-03-31 18:15:57 -0700 Attachment 228226 did not pass style-queue: ERROR: Source/WebCore/platform/graphics/Extensions3D.h:116: enum members should use InterCaps with an initial capital letter. [readability/enum_casing] [4] ERROR: Source/WebCore/platform/graphics/Extensions3D.h:117: enum members should use InterCaps with an initial capital letter. [readability/enum_casing] [4] ERROR: Source/WebCore/platform/graphics/Extensions3D.h:118: enum members should use InterCaps with an initial capital letter. [readability/enum_casing] [4] ERROR: Source/WebCore/platform/graphics/Extensions3D.h:119: enum members should use InterCaps with an initial capital letter. [readability/enum_casing] [4] Total errors found: 4 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 996128 9 228226 commit-queue 2014-03-31 22:37:38 -0700 Comment on attachment 228226 Patch Clearing flags on attachment: 228226 Committed r166563: <http://trac.webkit.org/changeset/166563> 996129 10 commit-queue 2014-03-31 22:37:42 -0700 All reviewed patches have been landed. Closing bug. 228146 2014-03-30 21:46:52 -0700 2014-03-31 18:09:28 -0700 Patch bug-130955-20140331134616.patch text/plain 10214 sun.shin U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2NDY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDliYWVhMThjMDgzMGU2 ZTYzNzk0OTM2ZDBlYzk1MDM3NzhlZjVlYi4uNDVjM2MzNGY2YzE1MTQ3ZWJlMTg2MzViYjgwZmEx MzY1NWJlNmFhNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE0LTAzLTMwICBCeXVu Z3Nlb24gU2hpbiAgPHN1bi5zaGluQGxnZS5jb20+CisKKyAgICAgICAgW1dlYkdMXVtPcGVuR0xF U10gRW5hYmxlIE1TQUEgc3VwcG9ydCBmb3IgV2ViR0wgQ2FudmFzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzA5NTUKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUbyBhdm9pZCBhbGlhc2luZyBpc3N1ZXMg d2hlbiB3ZSByZW5kZXIgY29udGVudCB0byBXZWJHTCBjYW52YXMsCisgICAgICAgICB3ZSBuZWVk IHRvIGltcGxlbWVudCBNU0FBIHN1cHBvcnQuCisgICAgICAgIC0gSW1hZ2luYXRpb24gT3BlbkdM RVMgR1BVIERyaXZlciBhbHJlYXkgc3VwcG9ydCBNU0FBLCBzbyB3ZQorICAgICAgICAgbmVlZCBh IHNlcGFyYXRlIGNvZGUgcGF0aCB0byBlbmFibGUgaXQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9FeHRlbnNpb25zM0QuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9vcGVu Z2wvRXh0ZW5zaW9uczNET3BlbkdMQ29tbW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkV4dGVu c2lvbnMzRE9wZW5HTENvbW1vbjo6RXh0ZW5zaW9uczNET3BlbkdMQ29tbW9uKToKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9vcGVuZ2wvRXh0ZW5zaW9uczNET3BlbkdMQ29tbW9uLmg6Cisg ICAgICAgIChXZWJDb3JlOjpFeHRlbnNpb25zM0RPcGVuR0xDb21tb246OmlzSW1hZ2luYXRpb24p OgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL29wZW5nbC9HcmFwaGljc0NvbnRleHQzRE9w ZW5HTEVTLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDNEOjpyZXNoYXBl RkJPcyk6CisKIDIwMTQtMDMtMzAgIEJlbmphbWluIFBvdWxhaW4gIDxiZW5qYW1pbkB3ZWJraXQu b3JnPgogCiAgICAgICAgIEF0dGVtcHQgdG8gZml4IDMyYml0cyBidWlsZCBhZnRlciByMTY2NDY1 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9FeHRlbnNpb25z M0QuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0V4dGVuc2lvbnMzRC5oCmlu ZGV4IDQyZmE0NTExYmM5NGQyMmM2ZTEwOTkyYzkyYTI1NzNkOWZiMWQ4ZGIuLjFiYWNmMzI1MzFj MDUwMWExMGEzN2JhNzlhYjBkZGI1ZGIwNmQwMDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL0V4dGVuc2lvbnMzRC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL0V4dGVuc2lvbnMzRC5oCkBAIC01Miw2ICs1Miw3IEBAIHB1YmxpYzoK ICAgICAvLyAgIEdMX0FSQl90ZXh0dXJlX25vbl9wb3dlcl9vZl90d28gLyBHTF9PRVNfdGV4dHVy ZV9ucG90CiAgICAgLy8gICBHTF9FWFRfcGFja2VkX2RlcHRoX3N0ZW5jaWwgLyBHTF9PRVNfcGFj a2VkX2RlcHRoX3N0ZW5jaWwKICAgICAvLyAgIEdMX0FOR0xFX2ZyYW1lYnVmZmVyX2JsaXQgLyBH TF9BTkdMRV9mcmFtZWJ1ZmZlcl9tdWx0aXNhbXBsZQorICAgIC8vICAgR0xfSU1HX211bHRpc2Ft cGxlZF9yZW5kZXJfdG9fdGV4dHVyZQogICAgIC8vICAgR0xfT0VTX3RleHR1cmVfZmxvYXQKICAg ICAvLyAgIEdMX09FU190ZXh0dXJlX2Zsb2F0X2xpbmVhcgogICAgIC8vICAgR0xfT0VTX3RleHR1 cmVfaGFsZl9mbG9hdApAQCAtMTExLDYgKzExMiwxMiBAQCBwdWJsaWM6CiAgICAgICAgIEZSQU1F QlVGRkVSX0lOQ09NUExFVEVfTVVMVElTQU1QTEUgPSAweDhENTYsCiAgICAgICAgIE1BWF9TQU1Q TEVTID0gMHg4RDU3LAogCisgICAgICAgIC8vIEdMX0lNR19tdWx0aXNhbXBsZWRfcmVuZGVyX3Rv X3RleHR1cmUKKyAgICAgICAgUkVOREVSQlVGRkVSX1NBTVBMRVNfSU1HID0gMHg5MTMzLAorICAg ICAgICBGUkFNRUJVRkZFUl9JTkNPTVBMRVRFX01VTFRJU0FNUExFX0lNRyA9IDB4OTEzNCwKKyAg ICAgICAgTUFYX1NBTVBMRVNfSU1HID0gMHg5MTM1LAorICAgICAgICBURVhUVVJFX1NBTVBMRVNf SU1HID0gMHg5MTM2LAorCiAgICAgICAgIC8vIEdMX09FU19zdGFuZGFyZF9kZXJpdmF0aXZlcyBu YW1lcwogICAgICAgICBGUkFHTUVOVF9TSEFERVJfREVSSVZBVElWRV9ISU5UX09FUyA9IDB4OEI4 QiwKIApAQCAtMjM1LDYgKzI0Miw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIGJvb2wgaXNOVklE SUEoKSA9IDA7CiAgICAgdmlydHVhbCBib29sIGlzQU1EKCkgPSAwOwogICAgIHZpcnR1YWwgYm9v bCBpc0ludGVsKCkgPSAwOworICAgIHZpcnR1YWwgYm9vbCBpc0ltYWdpbmF0aW9uKCkgPSAwOwog ICAgIHZpcnR1YWwgU3RyaW5nIHZlbmRvcigpID0gMDsKIAogICAgIC8vIElmIHRoaXMgbWV0aG9k IHJldHVybnMgZmFsc2UgdGhlbiB0aGUgc3lzdGVtICpkZWZpbml0ZWx5KiBkb2VzIG5vdCBzdXBw b3J0IG11bHRpc2FtcGxpbmcuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9vcGVuZ2wvRXh0ZW5zaW9uczNET3BlbkdMQ29tbW9uLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL29wZW5nbC9FeHRlbnNpb25zM0RPcGVuR0xDb21tb24uY3Bw CmluZGV4IDVkYTQwNzJiNmY5NmRlOWVmNzQ3ZGI5MzgxMDNiZTY3ZGJmN2VkYTQuLjFhZDdkMzM5 NGY0YjVmMTNmNjA2Y2IwOTgzNzE5OTg1ODM1MGFmYTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL29wZW5nbC9FeHRlbnNpb25zM0RPcGVuR0xDb21tb24uY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL29wZW5nbC9FeHRlbnNpb25z M0RPcGVuR0xDb21tb24uY3BwCkBAIC01Nyw2ICs1Nyw3IEBAIEV4dGVuc2lvbnMzRE9wZW5HTENv bW1vbjo6RXh0ZW5zaW9uczNET3BlbkdMQ29tbW9uKEdyYXBoaWNzQ29udGV4dDNEKiBjb250ZXh0 KQogICAgICwgbV9pc05WSURJQShmYWxzZSkKICAgICAsIG1faXNBTUQoZmFsc2UpCiAgICAgLCBt X2lzSW50ZWwoZmFsc2UpCisgICAgLCBtX2lzSW1hZ2luYXRpb24oZmFsc2UpCiAgICAgLCBtX21h eVN1cHBvcnRNdWx0aXNhbXBsaW5nKHRydWUpCiAgICAgLCBtX3JlcXVpcmVzQnVpbHRJbkZ1bmN0 aW9uRW11bGF0aW9uKGZhbHNlKQogewpAQCAtNzAsNiArNzEsOCBAQCBFeHRlbnNpb25zM0RPcGVu R0xDb21tb246OkV4dGVuc2lvbnMzRE9wZW5HTENvbW1vbihHcmFwaGljc0NvbnRleHQzRCogY29u dGV4dCkKICAgICAgICAgbV9pc0FNRCA9IHRydWU7CiAgICAgaWYgKHZlbmRvckNvbXBvbmVudHMu Y29udGFpbnMoImludGVsIikpCiAgICAgICAgIG1faXNJbnRlbCA9IHRydWU7CisgICAgaWYgKHZl bmRvckNvbXBvbmVudHMuY29udGFpbnMoImltYWdpbmF0aW9uIikpCisgICAgICAgIG1faXNJbWFn aW5hdGlvbiA9IHRydWU7CiAKICNpZiBQTEFURk9STShNQUMpCiAgICAgaWYgKG1faXNBTUQgfHwg bV9pc0ludGVsKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv b3BlbmdsL0V4dGVuc2lvbnMzRE9wZW5HTENvbW1vbi5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3Mvb3BlbmdsL0V4dGVuc2lvbnMzRE9wZW5HTENvbW1vbi5oCmluZGV4IDRjYzhk YmFjMWFiYjg1ZWExNWM2YWJlM2Q2YmNlZjRkZDJiOTZmMTguLmU3YzRiOTc1Yjk2OWUzYzU0MDhm ZGEwODk5MmU5MTI0YzIyNTQ3M2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL29wZW5nbC9FeHRlbnNpb25zM0RPcGVuR0xDb21tb24uaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9vcGVuZ2wvRXh0ZW5zaW9uczNET3BlbkdMQ29tbW9u LmgKQEAgLTYyLDYgKzYyLDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgYm9vbCBpc05WSURJQSgp IHsgcmV0dXJuIG1faXNOVklESUE7IH0KICAgICB2aXJ0dWFsIGJvb2wgaXNBTUQoKSB7IHJldHVy biBtX2lzQU1EOyB9CiAgICAgdmlydHVhbCBib29sIGlzSW50ZWwoKSB7IHJldHVybiBtX2lzSW50 ZWw7IH0KKyAgICB2aXJ0dWFsIGJvb2wgaXNJbWFnaW5hdGlvbigpIHsgcmV0dXJuIG1faXNJbWFn aW5hdGlvbjsgfQogICAgIHZpcnR1YWwgU3RyaW5nIHZlbmRvcigpIHsgcmV0dXJuIG1fdmVuZG9y OyB9CiAKICAgICB2aXJ0dWFsIGJvb2wgbWF5U3VwcG9ydE11bHRpc2FtcGxpbmcoKSB7IHJldHVy biBtX21heVN1cHBvcnRNdWx0aXNhbXBsaW5nOyB9CkBAIC04NCw2ICs4NSw3IEBAIHByb3RlY3Rl ZDoKICAgICBib29sIG1faXNOVklESUE7CiAgICAgYm9vbCBtX2lzQU1EOwogICAgIGJvb2wgbV9p c0ludGVsOworICAgIGJvb2wgbV9pc0ltYWdpbmF0aW9uOwogICAgIGJvb2wgbV9tYXlTdXBwb3J0 TXVsdGlzYW1wbGluZzsKICAgICBib29sIG1fcmVxdWlyZXNCdWlsdEluRnVuY3Rpb25FbXVsYXRp b247CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL29wZW5n bC9HcmFwaGljc0NvbnRleHQzRE9wZW5HTEVTLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL29wZW5nbC9HcmFwaGljc0NvbnRleHQzRE9wZW5HTEVTLmNwcAppbmRleCA2NmI2 ZDdmNDAyZTg1NTA0MGU2NTFjZTliZWQ5MDI3ZmUzOTc5ZmRlLi5mOTZmNTU3N2U3N2MyNTAwYWM3 MjFhYjBkMzc3NjdkODVlNjNjNDVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9vcGVuZ2wvR3JhcGhpY3NDb250ZXh0M0RPcGVuR0xFUy5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0dyYXBoaWNzQ29udGV4dDNET3Bl bkdMRVMuY3BwCkBAIC0xMTAsMjkgKzExMCw1OSBAQCBib29sIEdyYXBoaWNzQ29udGV4dDNEOjpy ZXNoYXBlRkJPcyhjb25zdCBJbnRTaXplJiBzaXplKQogICAgICAgICA6OmdsQmluZFRleHR1cmUo R0xfVEVYVFVSRV8yRCwgMCk7CiAgICAgfQogCi0gICAgLy8gV2UgZG9uJ3Qgc3VwcG9ydCBhbnRp YWxpYXNpbmcgeWV0LiBTZWUgR3JhcGhpY3NDb250ZXh0M0Q6OnZhbGlkYXRlQXR0cmlidXRlcy4K LSAgICBBU1NFUlQoIW1fYXR0cnMuYW50aWFsaWFzKTsKLQotICAgIGlmIChtX2F0dHJzLnN0ZW5j aWwgfHwgbV9hdHRycy5kZXB0aCkgewotICAgICAgICAvLyBVc2UgYSAyNCBiaXQgZGVwdGggYnVm ZmVyIHdoZXJlIHdlIGtub3cgd2UgaGF2ZSBpdC4KLSAgICAgICAgaWYgKHN1cHBvcnRQYWNrZWRE ZXB0aFN0ZW5jaWxCdWZmZXIpIHsKLSAgICAgICAgICAgIDo6Z2xCaW5kUmVuZGVyYnVmZmVyKEdM X1JFTkRFUkJVRkZFUiwgbV9kZXB0aFN0ZW5jaWxCdWZmZXIpOwotICAgICAgICAgICAgOjpnbFJl bmRlcmJ1ZmZlclN0b3JhZ2UoR0xfUkVOREVSQlVGRkVSLCBHTF9ERVBUSDI0X1NURU5DSUw4X09F Uywgd2lkdGgsIGhlaWdodCk7Ci0gICAgICAgICAgICBpZiAobV9hdHRycy5zdGVuY2lsKQotICAg ICAgICAgICAgICAgIDo6Z2xGcmFtZWJ1ZmZlclJlbmRlcmJ1ZmZlcihHTF9GUkFNRUJVRkZFUiwg R0xfU1RFTkNJTF9BVFRBQ0hNRU5ULCBHTF9SRU5ERVJCVUZGRVIsIG1fZGVwdGhTdGVuY2lsQnVm ZmVyKTsKLSAgICAgICAgICAgIGlmIChtX2F0dHJzLmRlcHRoKQotICAgICAgICAgICAgICAgIDo6 Z2xGcmFtZWJ1ZmZlclJlbmRlcmJ1ZmZlcihHTF9GUkFNRUJVRkZFUiwgR0xfREVQVEhfQVRUQUNI TUVOVCwgR0xfUkVOREVSQlVGRkVSLCBtX2RlcHRoU3RlbmNpbEJ1ZmZlcik7Ci0gICAgICAgICAg ICA6OmdsQmluZFJlbmRlcmJ1ZmZlcihHTF9SRU5ERVJCVUZGRVIsIDApOwotICAgICAgICB9IGVs c2UgewotICAgICAgICAgICAgaWYgKG1fYXR0cnMuc3RlbmNpbCkgewotICAgICAgICAgICAgICAg IDo6Z2xCaW5kUmVuZGVyYnVmZmVyKEdMX1JFTkRFUkJVRkZFUiwgbV9zdGVuY2lsQnVmZmVyKTsK LSAgICAgICAgICAgICAgICA6OmdsUmVuZGVyYnVmZmVyU3RvcmFnZShHTF9SRU5ERVJCVUZGRVIs IEdMX1NURU5DSUxfSU5ERVg4LCB3aWR0aCwgaGVpZ2h0KTsKLSAgICAgICAgICAgICAgICA6Omds RnJhbWVidWZmZXJSZW5kZXJidWZmZXIoR0xfRlJBTUVCVUZGRVIsIEdMX1NURU5DSUxfQVRUQUNI TUVOVCwgR0xfUkVOREVSQlVGRkVSLCBtX3N0ZW5jaWxCdWZmZXIpOworICAgIGlmIChleHRlbnNp b25zLT5pc0ltYWdpbmF0aW9uKCkgJiYgbV9hdHRycy5hbnRpYWxpYXMpIHsKKyAgICAgICAgR0xp bnQgbWF4U2FtcGxlQ291bnQ7CisgICAgICAgIDo6Z2xHZXRJbnRlZ2VydihFeHRlbnNpb25zM0Q6 Ok1BWF9TQU1QTEVTX0lNRywgJm1heFNhbXBsZUNvdW50KTsgCisgICAgICAgIEdMaW50IHNhbXBs ZUNvdW50ID0gc3RkOjptaW4oOCwgbWF4U2FtcGxlQ291bnQpOworICAgICAgICBpZiAoc2FtcGxl Q291bnQgPiBtYXhTYW1wbGVDb3VudCkKKyAgICAgICAgICAgIHNhbXBsZUNvdW50ID0gbWF4U2Ft cGxlQ291bnQ7CisKKyAgICAgICAgZXh0ZW5zaW9ucy0+ZnJhbWVidWZmZXJUZXh0dXJlMkRNdWx0 aXNhbXBsZUlNRyhHTF9GUkFNRUJVRkZFUiwgR0xfQ09MT1JfQVRUQUNITUVOVDAsIEdMX1RFWFRV UkVfMkQsIG1fdGV4dHVyZSwgMCwgc2FtcGxlQ291bnQpOworCisgICAgICAgIGlmIChtX2F0dHJz LnN0ZW5jaWwgfHwgbV9hdHRycy5kZXB0aCkgeworICAgICAgICAgICAgLy8gVXNlIGEgMjQgYml0 IGRlcHRoIGJ1ZmZlciB3aGVyZSB3ZSBrbm93IHdlIGhhdmUgaXQuCisgICAgICAgICAgICBpZiAo c3VwcG9ydFBhY2tlZERlcHRoU3RlbmNpbEJ1ZmZlcikgeworICAgICAgICAgICAgICAgIDo6Z2xC aW5kUmVuZGVyYnVmZmVyKEdMX1JFTkRFUkJVRkZFUiwgbV9kZXB0aFN0ZW5jaWxCdWZmZXIpOwor ICAgICAgICAgICAgICAgIGV4dGVuc2lvbnMtPnJlbmRlcmJ1ZmZlclN0b3JhZ2VNdWx0aXNhbXBs ZShHTF9SRU5ERVJCVUZGRVIsIHNhbXBsZUNvdW50LCBHTF9ERVBUSDI0X1NURU5DSUw4X09FUywg d2lkdGgsIGhlaWdodCk7CisgICAgICAgICAgICAgICAgaWYgKG1fYXR0cnMuc3RlbmNpbCkKKyAg ICAgICAgICAgICAgICAgICAgOjpnbEZyYW1lYnVmZmVyUmVuZGVyYnVmZmVyKEdMX0ZSQU1FQlVG RkVSLCBHTF9TVEVOQ0lMX0FUVEFDSE1FTlQsIEdMX1JFTkRFUkJVRkZFUiwgbV9kZXB0aFN0ZW5j aWxCdWZmZXIpOworICAgICAgICAgICAgICAgIGlmIChtX2F0dHJzLmRlcHRoKQorICAgICAgICAg ICAgICAgICAgICA6OmdsRnJhbWVidWZmZXJSZW5kZXJidWZmZXIoR0xfRlJBTUVCVUZGRVIsIEdM X0RFUFRIX0FUVEFDSE1FTlQsIEdMX1JFTkRFUkJVRkZFUiwgbV9kZXB0aFN0ZW5jaWxCdWZmZXIp OworICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgICBpZiAobV9hdHRycy5zdGVu Y2lsKSB7CisgICAgICAgICAgICAgICAgICAgIDo6Z2xCaW5kUmVuZGVyYnVmZmVyKEdMX1JFTkRF UkJVRkZFUiwgbV9zdGVuY2lsQnVmZmVyKTsKKyAgICAgICAgICAgICAgICAgICAgZXh0ZW5zaW9u cy0+cmVuZGVyYnVmZmVyU3RvcmFnZU11bHRpc2FtcGxlKEdMX1JFTkRFUkJVRkZFUiwgc2FtcGxl Q291bnQsIEdMX1NURU5DSUxfSU5ERVg4LCB3aWR0aCwgaGVpZ2h0KTsKKyAgICAgICAgICAgICAg ICAgICAgOjpnbEZyYW1lYnVmZmVyUmVuZGVyYnVmZmVyKEdMX0ZSQU1FQlVGRkVSLCBHTF9TVEVO Q0lMX0FUVEFDSE1FTlQsIEdMX1JFTkRFUkJVRkZFUiwgbV9zdGVuY2lsQnVmZmVyKTsKKyAgICAg ICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgaWYgKG1fYXR0cnMuZGVwdGgpIHsKKyAgICAg ICAgICAgICAgICAgICAgOjpnbEJpbmRSZW5kZXJidWZmZXIoR0xfUkVOREVSQlVGRkVSLCBtX2Rl cHRoQnVmZmVyKTsKKyAgICAgICAgICAgICAgICAgICAgZXh0ZW5zaW9ucy0+cmVuZGVyYnVmZmVy U3RvcmFnZU11bHRpc2FtcGxlKEdMX1JFTkRFUkJVRkZFUiwgc2FtcGxlQ291bnQsIEdMX0RFUFRI X0NPTVBPTkVOVDE2LCB3aWR0aCwgaGVpZ2h0KTsKKyAgICAgICAgICAgICAgICAgICAgOjpnbEZy YW1lYnVmZmVyUmVuZGVyYnVmZmVyKEdMX0ZSQU1FQlVGRkVSLCBHTF9ERVBUSF9BVFRBQ0hNRU5U LCBHTF9SRU5ERVJCVUZGRVIsIG1fZGVwdGhCdWZmZXIpOworICAgICAgICAgICAgICAgIH0KICAg ICAgICAgICAgIH0KLSAgICAgICAgICAgIGlmIChtX2F0dHJzLmRlcHRoKSB7Ci0gICAgICAgICAg ICAgICAgOjpnbEJpbmRSZW5kZXJidWZmZXIoR0xfUkVOREVSQlVGRkVSLCBtX2RlcHRoQnVmZmVy KTsKLSAgICAgICAgICAgICAgICA6OmdsUmVuZGVyYnVmZmVyU3RvcmFnZShHTF9SRU5ERVJCVUZG RVIsIEdMX0RFUFRIX0NPTVBPTkVOVDE2LCB3aWR0aCwgaGVpZ2h0KTsKLSAgICAgICAgICAgICAg ICA6OmdsRnJhbWVidWZmZXJSZW5kZXJidWZmZXIoR0xfRlJBTUVCVUZGRVIsIEdMX0RFUFRIX0FU VEFDSE1FTlQsIEdMX1JFTkRFUkJVRkZFUiwgbV9kZXB0aEJ1ZmZlcik7CisgICAgICAgICAgICA6 OmdsQmluZFJlbmRlcmJ1ZmZlcihHTF9SRU5ERVJCVUZGRVIsIDApOworICAgICAgICB9CisgICAg fSBlbHNlIHsKKyAgICAgICAgaWYgKG1fYXR0cnMuc3RlbmNpbCB8fCBtX2F0dHJzLmRlcHRoKSB7 CisgICAgICAgICAgICAvLyBVc2UgYSAyNCBiaXQgZGVwdGggYnVmZmVyIHdoZXJlIHdlIGtub3cg d2UgaGF2ZSBpdC4KKyAgICAgICAgICAgIGlmIChzdXBwb3J0UGFja2VkRGVwdGhTdGVuY2lsQnVm ZmVyKSB7CisgICAgICAgICAgICAgICAgOjpnbEJpbmRSZW5kZXJidWZmZXIoR0xfUkVOREVSQlVG RkVSLCBtX2RlcHRoU3RlbmNpbEJ1ZmZlcik7CisgICAgICAgICAgICAgICAgOjpnbFJlbmRlcmJ1 ZmZlclN0b3JhZ2UoR0xfUkVOREVSQlVGRkVSLCBHTF9ERVBUSDI0X1NURU5DSUw4X09FUywgd2lk dGgsIGhlaWdodCk7CisgICAgICAgICAgICAgICAgaWYgKG1fYXR0cnMuc3RlbmNpbCkKKyAgICAg ICAgICAgICAgICAgICAgOjpnbEZyYW1lYnVmZmVyUmVuZGVyYnVmZmVyKEdMX0ZSQU1FQlVGRkVS LCBHTF9TVEVOQ0lMX0FUVEFDSE1FTlQsIEdMX1JFTkRFUkJVRkZFUiwgbV9kZXB0aFN0ZW5jaWxC dWZmZXIpOworICAgICAgICAgICAgICAgIGlmIChtX2F0dHJzLmRlcHRoKQorICAgICAgICAgICAg ICAgICAgICA6OmdsRnJhbWVidWZmZXJSZW5kZXJidWZmZXIoR0xfRlJBTUVCVUZGRVIsIEdMX0RF UFRIX0FUVEFDSE1FTlQsIEdMX1JFTkRFUkJVRkZFUiwgbV9kZXB0aFN0ZW5jaWxCdWZmZXIpOwor ICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgICBpZiAobV9hdHRycy5zdGVuY2ls KSB7CisgICAgICAgICAgICAgICAgICAgIDo6Z2xCaW5kUmVuZGVyYnVmZmVyKEdMX1JFTkRFUkJV RkZFUiwgbV9zdGVuY2lsQnVmZmVyKTsKKyAgICAgICAgICAgICAgICAgICAgOjpnbFJlbmRlcmJ1 ZmZlclN0b3JhZ2UoR0xfUkVOREVSQlVGRkVSLCBHTF9TVEVOQ0lMX0lOREVYOCwgd2lkdGgsIGhl aWdodCk7CisgICAgICAgICAgICAgICAgICAgIDo6Z2xGcmFtZWJ1ZmZlclJlbmRlcmJ1ZmZlcihH TF9GUkFNRUJVRkZFUiwgR0xfU1RFTkNJTF9BVFRBQ0hNRU5ULCBHTF9SRU5ERVJCVUZGRVIsIG1f c3RlbmNpbEJ1ZmZlcik7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIGlmICht X2F0dHJzLmRlcHRoKSB7CisgICAgICAgICAgICAgICAgICAgIDo6Z2xCaW5kUmVuZGVyYnVmZmVy KEdMX1JFTkRFUkJVRkZFUiwgbV9kZXB0aEJ1ZmZlcik7CisgICAgICAgICAgICAgICAgICAgIDo6 Z2xSZW5kZXJidWZmZXJTdG9yYWdlKEdMX1JFTkRFUkJVRkZFUiwgR0xfREVQVEhfQ09NUE9ORU5U MTYsIHdpZHRoLCBoZWlnaHQpOworICAgICAgICAgICAgICAgICAgICA6OmdsRnJhbWVidWZmZXJS ZW5kZXJidWZmZXIoR0xfRlJBTUVCVUZGRVIsIEdMX0RFUFRIX0FUVEFDSE1FTlQsIEdMX1JFTkRF UkJVRkZFUiwgbV9kZXB0aEJ1ZmZlcik7CisgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAg fQogICAgICAgICAgICAgOjpnbEJpbmRSZW5kZXJidWZmZXIoR0xfUkVOREVSQlVGRkVSLCAwKTsK ICAgICAgICAgfQo= 228225 2014-03-31 18:09:35 -0700 2014-03-31 18:13:26 -0700 Patch bug-130955-20140401100858.patch text/plain 10204 sun.shin U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2NTUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjYzODFlMzE5NTJjYzg5 YjQ0MGM4MWY1Yjg1MDM3NmQ3YmFjYjFjOC4uYjFiMGI0N2E1ZGY3YjNiMzE2MTU2YzU2YWU0MTA5 Njc1YjY5NmU2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE0LTAzLTMxICBCeXVu Z3Nlb24gU2hpbiAgPHN1bi5zaGluQGxnZS5jb20+CisKKyAgICAgICAgW1dlYkdMXVtPcGVuR0xF U10gRW5hYmxlIE1TQUEgc3VwcG9ydCBmb3IgV2ViR0wgQ2FudmFzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzA5NTUKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUbyBhdm9pZCBhbGlhc2luZyBpc3N1ZXMg d2hlbiB3ZSByZW5kZXIgY29udGVudCB0byBXZWJHTCBjYW52YXMsCisgICAgICAgICB3ZSBuZWVk IHRvIGltcGxlbWVudCBNU0FBIHN1cHBvcnQuCisgICAgICAgIC0gSW1hZ2luYXRpb24gT3BlbkdM RVMgR1BVIERyaXZlciBhbHJlYWR5IHN1cHBvcnQgTVNBQSwgc28gd2UKKyAgICAgICAgIG5lZWQg YSBzZXBhcmF0ZSBjb2RlIHBhdGggdG8gZW5hYmxlIGl0LgorCisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3MvRXh0ZW5zaW9uczNELmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvb3Bl bmdsL0V4dGVuc2lvbnMzRE9wZW5HTENvbW1vbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFeHRl bnNpb25zM0RPcGVuR0xDb21tb246OkV4dGVuc2lvbnMzRE9wZW5HTENvbW1vbik6CisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0V4dGVuc2lvbnMzRE9wZW5HTENvbW1vbi5oOgor ICAgICAgICAoV2ViQ29yZTo6RXh0ZW5zaW9uczNET3BlbkdMQ29tbW9uOjppc0ltYWdpbmF0aW9u KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9vcGVuZ2wvR3JhcGhpY3NDb250ZXh0M0RP cGVuR0xFUy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQzRDo6cmVzaGFw ZUZCT3MpOgorCiAyMDE0LTAzLTMxICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29t PgogCiAgICAgICAgIENyYXNoZXMgaW4gUGFnZUNvbnNvbGU6OmFkZE1lc3NhZ2UKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0V4dGVuc2lvbnMzRC5oIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRXh0ZW5zaW9uczNELmgKaW5kZXggNDJmYTQ1 MTFiYzk0ZDIyYzZlMTA5OTJjOTJhMjU3M2Q5ZmIxZDhkYi4uMWJhY2YzMjUzMWMwNTAxYTEwYTM3 YmE3OWFiMGRkYjVkYjA2ZDAwNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvRXh0ZW5zaW9uczNELmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvRXh0ZW5zaW9uczNELmgKQEAgLTUyLDYgKzUyLDcgQEAgcHVibGljOgogICAgIC8vICAg R0xfQVJCX3RleHR1cmVfbm9uX3Bvd2VyX29mX3R3byAvIEdMX09FU190ZXh0dXJlX25wb3QKICAg ICAvLyAgIEdMX0VYVF9wYWNrZWRfZGVwdGhfc3RlbmNpbCAvIEdMX09FU19wYWNrZWRfZGVwdGhf c3RlbmNpbAogICAgIC8vICAgR0xfQU5HTEVfZnJhbWVidWZmZXJfYmxpdCAvIEdMX0FOR0xFX2Zy YW1lYnVmZmVyX211bHRpc2FtcGxlCisgICAgLy8gICBHTF9JTUdfbXVsdGlzYW1wbGVkX3JlbmRl cl90b190ZXh0dXJlCiAgICAgLy8gICBHTF9PRVNfdGV4dHVyZV9mbG9hdAogICAgIC8vICAgR0xf T0VTX3RleHR1cmVfZmxvYXRfbGluZWFyCiAgICAgLy8gICBHTF9PRVNfdGV4dHVyZV9oYWxmX2Zs b2F0CkBAIC0xMTEsNiArMTEyLDEyIEBAIHB1YmxpYzoKICAgICAgICAgRlJBTUVCVUZGRVJfSU5D T01QTEVURV9NVUxUSVNBTVBMRSA9IDB4OEQ1NiwKICAgICAgICAgTUFYX1NBTVBMRVMgPSAweDhE NTcsCiAKKyAgICAgICAgLy8gR0xfSU1HX211bHRpc2FtcGxlZF9yZW5kZXJfdG9fdGV4dHVyZQor ICAgICAgICBSRU5ERVJCVUZGRVJfU0FNUExFU19JTUcgPSAweDkxMzMsCisgICAgICAgIEZSQU1F QlVGRkVSX0lOQ09NUExFVEVfTVVMVElTQU1QTEVfSU1HID0gMHg5MTM0LAorICAgICAgICBNQVhf U0FNUExFU19JTUcgPSAweDkxMzUsCisgICAgICAgIFRFWFRVUkVfU0FNUExFU19JTUcgPSAweDkx MzYsCisKICAgICAgICAgLy8gR0xfT0VTX3N0YW5kYXJkX2Rlcml2YXRpdmVzIG5hbWVzCiAgICAg ICAgIEZSQUdNRU5UX1NIQURFUl9ERVJJVkFUSVZFX0hJTlRfT0VTID0gMHg4QjhCLAogCkBAIC0y MzUsNiArMjQyLDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgYm9vbCBpc05WSURJQSgpID0gMDsK ICAgICB2aXJ0dWFsIGJvb2wgaXNBTUQoKSA9IDA7CiAgICAgdmlydHVhbCBib29sIGlzSW50ZWwo KSA9IDA7CisgICAgdmlydHVhbCBib29sIGlzSW1hZ2luYXRpb24oKSA9IDA7CiAgICAgdmlydHVh bCBTdHJpbmcgdmVuZG9yKCkgPSAwOwogCiAgICAgLy8gSWYgdGhpcyBtZXRob2QgcmV0dXJucyBm YWxzZSB0aGVuIHRoZSBzeXN0ZW0gKmRlZmluaXRlbHkqIGRvZXMgbm90IHN1cHBvcnQgbXVsdGlz YW1wbGluZy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL29w ZW5nbC9FeHRlbnNpb25zM0RPcGVuR0xDb21tb24uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3Mvb3BlbmdsL0V4dGVuc2lvbnMzRE9wZW5HTENvbW1vbi5jcHAKaW5kZXggNWRh NDA3MmI2Zjk2ZGU5ZWY3NDdkYjkzODEwM2JlNjdkYmY3ZWRhNC4uMWFkN2QzMzk0ZjRiNWYxM2Y2 MDZjYjA5ODM3MTk5ODU4MzUwYWZhNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3Mvb3BlbmdsL0V4dGVuc2lvbnMzRE9wZW5HTENvbW1vbi5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0V4dGVuc2lvbnMzRE9wZW5HTENv bW1vbi5jcHAKQEAgLTU3LDYgKzU3LDcgQEAgRXh0ZW5zaW9uczNET3BlbkdMQ29tbW9uOjpFeHRl bnNpb25zM0RPcGVuR0xDb21tb24oR3JhcGhpY3NDb250ZXh0M0QqIGNvbnRleHQpCiAgICAgLCBt X2lzTlZJRElBKGZhbHNlKQogICAgICwgbV9pc0FNRChmYWxzZSkKICAgICAsIG1faXNJbnRlbChm YWxzZSkKKyAgICAsIG1faXNJbWFnaW5hdGlvbihmYWxzZSkKICAgICAsIG1fbWF5U3VwcG9ydE11 bHRpc2FtcGxpbmcodHJ1ZSkKICAgICAsIG1fcmVxdWlyZXNCdWlsdEluRnVuY3Rpb25FbXVsYXRp b24oZmFsc2UpCiB7CkBAIC03MCw2ICs3MSw4IEBAIEV4dGVuc2lvbnMzRE9wZW5HTENvbW1vbjo6 RXh0ZW5zaW9uczNET3BlbkdMQ29tbW9uKEdyYXBoaWNzQ29udGV4dDNEKiBjb250ZXh0KQogICAg ICAgICBtX2lzQU1EID0gdHJ1ZTsKICAgICBpZiAodmVuZG9yQ29tcG9uZW50cy5jb250YWlucygi aW50ZWwiKSkKICAgICAgICAgbV9pc0ludGVsID0gdHJ1ZTsKKyAgICBpZiAodmVuZG9yQ29tcG9u ZW50cy5jb250YWlucygiaW1hZ2luYXRpb24iKSkKKyAgICAgICAgbV9pc0ltYWdpbmF0aW9uID0g dHJ1ZTsKIAogI2lmIFBMQVRGT1JNKE1BQykKICAgICBpZiAobV9pc0FNRCB8fCBtX2lzSW50ZWwp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9vcGVuZ2wvRXh0 ZW5zaW9uczNET3BlbkdMQ29tbW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9vcGVuZ2wvRXh0ZW5zaW9uczNET3BlbkdMQ29tbW9uLmgKaW5kZXggNGNjOGRiYWMxYWJiODVl YTE1YzZhYmUzZDZiY2VmNGRkMmI5NmYxOC4uZTdjNGI5NzViOTY5ZTNjNTQwOGZkYTA4OTkyZTkx MjRjMjI1NDczZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv b3BlbmdsL0V4dGVuc2lvbnMzRE9wZW5HTENvbW1vbi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL29wZW5nbC9FeHRlbnNpb25zM0RPcGVuR0xDb21tb24uaApAQCAtNjIs NiArNjIsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBib29sIGlzTlZJRElBKCkgeyByZXR1cm4g bV9pc05WSURJQTsgfQogICAgIHZpcnR1YWwgYm9vbCBpc0FNRCgpIHsgcmV0dXJuIG1faXNBTUQ7 IH0KICAgICB2aXJ0dWFsIGJvb2wgaXNJbnRlbCgpIHsgcmV0dXJuIG1faXNJbnRlbDsgfQorICAg IHZpcnR1YWwgYm9vbCBpc0ltYWdpbmF0aW9uKCkgeyByZXR1cm4gbV9pc0ltYWdpbmF0aW9uOyB9 CiAgICAgdmlydHVhbCBTdHJpbmcgdmVuZG9yKCkgeyByZXR1cm4gbV92ZW5kb3I7IH0KIAogICAg IHZpcnR1YWwgYm9vbCBtYXlTdXBwb3J0TXVsdGlzYW1wbGluZygpIHsgcmV0dXJuIG1fbWF5U3Vw cG9ydE11bHRpc2FtcGxpbmc7IH0KQEAgLTg0LDYgKzg1LDcgQEAgcHJvdGVjdGVkOgogICAgIGJv b2wgbV9pc05WSURJQTsKICAgICBib29sIG1faXNBTUQ7CiAgICAgYm9vbCBtX2lzSW50ZWw7Cisg ICAgYm9vbCBtX2lzSW1hZ2luYXRpb247CiAgICAgYm9vbCBtX21heVN1cHBvcnRNdWx0aXNhbXBs aW5nOwogICAgIGJvb2wgbV9yZXF1aXJlc0J1aWx0SW5GdW5jdGlvbkVtdWxhdGlvbjsKIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0dyYXBoaWNz Q29udGV4dDNET3BlbkdMRVMuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv b3BlbmdsL0dyYXBoaWNzQ29udGV4dDNET3BlbkdMRVMuY3BwCmluZGV4IDY2YjZkN2Y0MDJlODU1 MDQwZTY1MWNlOWJlZDkwMjdmZTM5NzlmZGUuLmY5NmY1NTc3ZTc3YzI1MDBhYzcyMWFiMGQzNzc2 N2Q4NWU2M2M0NWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L29wZW5nbC9HcmFwaGljc0NvbnRleHQzRE9wZW5HTEVTLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9vcGVuZ2wvR3JhcGhpY3NDb250ZXh0M0RPcGVuR0xFUy5jcHAK QEAgLTExMCwyOSArMTEwLDU5IEBAIGJvb2wgR3JhcGhpY3NDb250ZXh0M0Q6OnJlc2hhcGVGQk9z KGNvbnN0IEludFNpemUmIHNpemUpCiAgICAgICAgIDo6Z2xCaW5kVGV4dHVyZShHTF9URVhUVVJF XzJELCAwKTsKICAgICB9CiAKLSAgICAvLyBXZSBkb24ndCBzdXBwb3J0IGFudGlhbGlhc2luZyB5 ZXQuIFNlZSBHcmFwaGljc0NvbnRleHQzRDo6dmFsaWRhdGVBdHRyaWJ1dGVzLgotICAgIEFTU0VS VCghbV9hdHRycy5hbnRpYWxpYXMpOwotCi0gICAgaWYgKG1fYXR0cnMuc3RlbmNpbCB8fCBtX2F0 dHJzLmRlcHRoKSB7Ci0gICAgICAgIC8vIFVzZSBhIDI0IGJpdCBkZXB0aCBidWZmZXIgd2hlcmUg d2Uga25vdyB3ZSBoYXZlIGl0LgotICAgICAgICBpZiAoc3VwcG9ydFBhY2tlZERlcHRoU3RlbmNp bEJ1ZmZlcikgewotICAgICAgICAgICAgOjpnbEJpbmRSZW5kZXJidWZmZXIoR0xfUkVOREVSQlVG RkVSLCBtX2RlcHRoU3RlbmNpbEJ1ZmZlcik7Ci0gICAgICAgICAgICA6OmdsUmVuZGVyYnVmZmVy U3RvcmFnZShHTF9SRU5ERVJCVUZGRVIsIEdMX0RFUFRIMjRfU1RFTkNJTDhfT0VTLCB3aWR0aCwg aGVpZ2h0KTsKLSAgICAgICAgICAgIGlmIChtX2F0dHJzLnN0ZW5jaWwpCi0gICAgICAgICAgICAg ICAgOjpnbEZyYW1lYnVmZmVyUmVuZGVyYnVmZmVyKEdMX0ZSQU1FQlVGRkVSLCBHTF9TVEVOQ0lM X0FUVEFDSE1FTlQsIEdMX1JFTkRFUkJVRkZFUiwgbV9kZXB0aFN0ZW5jaWxCdWZmZXIpOwotICAg ICAgICAgICAgaWYgKG1fYXR0cnMuZGVwdGgpCi0gICAgICAgICAgICAgICAgOjpnbEZyYW1lYnVm ZmVyUmVuZGVyYnVmZmVyKEdMX0ZSQU1FQlVGRkVSLCBHTF9ERVBUSF9BVFRBQ0hNRU5ULCBHTF9S RU5ERVJCVUZGRVIsIG1fZGVwdGhTdGVuY2lsQnVmZmVyKTsKLSAgICAgICAgICAgIDo6Z2xCaW5k UmVuZGVyYnVmZmVyKEdMX1JFTkRFUkJVRkZFUiwgMCk7Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAg ICAgICAgICBpZiAobV9hdHRycy5zdGVuY2lsKSB7Ci0gICAgICAgICAgICAgICAgOjpnbEJpbmRS ZW5kZXJidWZmZXIoR0xfUkVOREVSQlVGRkVSLCBtX3N0ZW5jaWxCdWZmZXIpOwotICAgICAgICAg ICAgICAgIDo6Z2xSZW5kZXJidWZmZXJTdG9yYWdlKEdMX1JFTkRFUkJVRkZFUiwgR0xfU1RFTkNJ TF9JTkRFWDgsIHdpZHRoLCBoZWlnaHQpOwotICAgICAgICAgICAgICAgIDo6Z2xGcmFtZWJ1ZmZl clJlbmRlcmJ1ZmZlcihHTF9GUkFNRUJVRkZFUiwgR0xfU1RFTkNJTF9BVFRBQ0hNRU5ULCBHTF9S RU5ERVJCVUZGRVIsIG1fc3RlbmNpbEJ1ZmZlcik7CisgICAgaWYgKGV4dGVuc2lvbnMtPmlzSW1h Z2luYXRpb24oKSAmJiBtX2F0dHJzLmFudGlhbGlhcykgeworICAgICAgICBHTGludCBtYXhTYW1w bGVDb3VudDsKKyAgICAgICAgOjpnbEdldEludGVnZXJ2KEV4dGVuc2lvbnMzRDo6TUFYX1NBTVBM RVNfSU1HLCAmbWF4U2FtcGxlQ291bnQpOyAKKyAgICAgICAgR0xpbnQgc2FtcGxlQ291bnQgPSBz dGQ6Om1pbig4LCBtYXhTYW1wbGVDb3VudCk7CisgICAgICAgIGlmIChzYW1wbGVDb3VudCA+IG1h eFNhbXBsZUNvdW50KQorICAgICAgICAgICAgc2FtcGxlQ291bnQgPSBtYXhTYW1wbGVDb3VudDsK KworICAgICAgICBleHRlbnNpb25zLT5mcmFtZWJ1ZmZlclRleHR1cmUyRE11bHRpc2FtcGxlSU1H KEdMX0ZSQU1FQlVGRkVSLCBHTF9DT0xPUl9BVFRBQ0hNRU5UMCwgR0xfVEVYVFVSRV8yRCwgbV90 ZXh0dXJlLCAwLCBzYW1wbGVDb3VudCk7CisKKyAgICAgICAgaWYgKG1fYXR0cnMuc3RlbmNpbCB8 fCBtX2F0dHJzLmRlcHRoKSB7CisgICAgICAgICAgICAvLyBVc2UgYSAyNCBiaXQgZGVwdGggYnVm ZmVyIHdoZXJlIHdlIGtub3cgd2UgaGF2ZSBpdC4KKyAgICAgICAgICAgIGlmIChzdXBwb3J0UGFj a2VkRGVwdGhTdGVuY2lsQnVmZmVyKSB7CisgICAgICAgICAgICAgICAgOjpnbEJpbmRSZW5kZXJi dWZmZXIoR0xfUkVOREVSQlVGRkVSLCBtX2RlcHRoU3RlbmNpbEJ1ZmZlcik7CisgICAgICAgICAg ICAgICAgZXh0ZW5zaW9ucy0+cmVuZGVyYnVmZmVyU3RvcmFnZU11bHRpc2FtcGxlKEdMX1JFTkRF UkJVRkZFUiwgc2FtcGxlQ291bnQsIEdMX0RFUFRIMjRfU1RFTkNJTDhfT0VTLCB3aWR0aCwgaGVp Z2h0KTsKKyAgICAgICAgICAgICAgICBpZiAobV9hdHRycy5zdGVuY2lsKQorICAgICAgICAgICAg ICAgICAgICA6OmdsRnJhbWVidWZmZXJSZW5kZXJidWZmZXIoR0xfRlJBTUVCVUZGRVIsIEdMX1NU RU5DSUxfQVRUQUNITUVOVCwgR0xfUkVOREVSQlVGRkVSLCBtX2RlcHRoU3RlbmNpbEJ1ZmZlcik7 CisgICAgICAgICAgICAgICAgaWYgKG1fYXR0cnMuZGVwdGgpCisgICAgICAgICAgICAgICAgICAg IDo6Z2xGcmFtZWJ1ZmZlclJlbmRlcmJ1ZmZlcihHTF9GUkFNRUJVRkZFUiwgR0xfREVQVEhfQVRU QUNITUVOVCwgR0xfUkVOREVSQlVGRkVSLCBtX2RlcHRoU3RlbmNpbEJ1ZmZlcik7CisgICAgICAg ICAgICB9IGVsc2UgeworICAgICAgICAgICAgICAgIGlmIChtX2F0dHJzLnN0ZW5jaWwpIHsKKyAg ICAgICAgICAgICAgICAgICAgOjpnbEJpbmRSZW5kZXJidWZmZXIoR0xfUkVOREVSQlVGRkVSLCBt X3N0ZW5jaWxCdWZmZXIpOworICAgICAgICAgICAgICAgICAgICBleHRlbnNpb25zLT5yZW5kZXJi dWZmZXJTdG9yYWdlTXVsdGlzYW1wbGUoR0xfUkVOREVSQlVGRkVSLCBzYW1wbGVDb3VudCwgR0xf U1RFTkNJTF9JTkRFWDgsIHdpZHRoLCBoZWlnaHQpOworICAgICAgICAgICAgICAgICAgICA6Omds RnJhbWVidWZmZXJSZW5kZXJidWZmZXIoR0xfRlJBTUVCVUZGRVIsIEdMX1NURU5DSUxfQVRUQUNI TUVOVCwgR0xfUkVOREVSQlVGRkVSLCBtX3N0ZW5jaWxCdWZmZXIpOworICAgICAgICAgICAgICAg IH0KKyAgICAgICAgICAgICAgICBpZiAobV9hdHRycy5kZXB0aCkgeworICAgICAgICAgICAgICAg ICAgICA6OmdsQmluZFJlbmRlcmJ1ZmZlcihHTF9SRU5ERVJCVUZGRVIsIG1fZGVwdGhCdWZmZXIp OworICAgICAgICAgICAgICAgICAgICBleHRlbnNpb25zLT5yZW5kZXJidWZmZXJTdG9yYWdlTXVs dGlzYW1wbGUoR0xfUkVOREVSQlVGRkVSLCBzYW1wbGVDb3VudCwgR0xfREVQVEhfQ09NUE9ORU5U MTYsIHdpZHRoLCBoZWlnaHQpOworICAgICAgICAgICAgICAgICAgICA6OmdsRnJhbWVidWZmZXJS ZW5kZXJidWZmZXIoR0xfRlJBTUVCVUZGRVIsIEdMX0RFUFRIX0FUVEFDSE1FTlQsIEdMX1JFTkRF UkJVRkZFUiwgbV9kZXB0aEJ1ZmZlcik7CisgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAg fQotICAgICAgICAgICAgaWYgKG1fYXR0cnMuZGVwdGgpIHsKLSAgICAgICAgICAgICAgICA6Omds QmluZFJlbmRlcmJ1ZmZlcihHTF9SRU5ERVJCVUZGRVIsIG1fZGVwdGhCdWZmZXIpOwotICAgICAg ICAgICAgICAgIDo6Z2xSZW5kZXJidWZmZXJTdG9yYWdlKEdMX1JFTkRFUkJVRkZFUiwgR0xfREVQ VEhfQ09NUE9ORU5UMTYsIHdpZHRoLCBoZWlnaHQpOwotICAgICAgICAgICAgICAgIDo6Z2xGcmFt ZWJ1ZmZlclJlbmRlcmJ1ZmZlcihHTF9GUkFNRUJVRkZFUiwgR0xfREVQVEhfQVRUQUNITUVOVCwg R0xfUkVOREVSQlVGRkVSLCBtX2RlcHRoQnVmZmVyKTsKKyAgICAgICAgICAgIDo6Z2xCaW5kUmVu ZGVyYnVmZmVyKEdMX1JFTkRFUkJVRkZFUiwgMCk7CisgICAgICAgIH0KKyAgICB9IGVsc2Ugewor ICAgICAgICBpZiAobV9hdHRycy5zdGVuY2lsIHx8IG1fYXR0cnMuZGVwdGgpIHsKKyAgICAgICAg ICAgIC8vIFVzZSBhIDI0IGJpdCBkZXB0aCBidWZmZXIgd2hlcmUgd2Uga25vdyB3ZSBoYXZlIGl0 LgorICAgICAgICAgICAgaWYgKHN1cHBvcnRQYWNrZWREZXB0aFN0ZW5jaWxCdWZmZXIpIHsKKyAg ICAgICAgICAgICAgICA6OmdsQmluZFJlbmRlcmJ1ZmZlcihHTF9SRU5ERVJCVUZGRVIsIG1fZGVw dGhTdGVuY2lsQnVmZmVyKTsKKyAgICAgICAgICAgICAgICA6OmdsUmVuZGVyYnVmZmVyU3RvcmFn ZShHTF9SRU5ERVJCVUZGRVIsIEdMX0RFUFRIMjRfU1RFTkNJTDhfT0VTLCB3aWR0aCwgaGVpZ2h0 KTsKKyAgICAgICAgICAgICAgICBpZiAobV9hdHRycy5zdGVuY2lsKQorICAgICAgICAgICAgICAg ICAgICA6OmdsRnJhbWVidWZmZXJSZW5kZXJidWZmZXIoR0xfRlJBTUVCVUZGRVIsIEdMX1NURU5D SUxfQVRUQUNITUVOVCwgR0xfUkVOREVSQlVGRkVSLCBtX2RlcHRoU3RlbmNpbEJ1ZmZlcik7Cisg ICAgICAgICAgICAgICAgaWYgKG1fYXR0cnMuZGVwdGgpCisgICAgICAgICAgICAgICAgICAgIDo6 Z2xGcmFtZWJ1ZmZlclJlbmRlcmJ1ZmZlcihHTF9GUkFNRUJVRkZFUiwgR0xfREVQVEhfQVRUQUNI TUVOVCwgR0xfUkVOREVSQlVGRkVSLCBtX2RlcHRoU3RlbmNpbEJ1ZmZlcik7CisgICAgICAgICAg ICB9IGVsc2UgeworICAgICAgICAgICAgICAgIGlmIChtX2F0dHJzLnN0ZW5jaWwpIHsKKyAgICAg ICAgICAgICAgICAgICAgOjpnbEJpbmRSZW5kZXJidWZmZXIoR0xfUkVOREVSQlVGRkVSLCBtX3N0 ZW5jaWxCdWZmZXIpOworICAgICAgICAgICAgICAgICAgICA6OmdsUmVuZGVyYnVmZmVyU3RvcmFn ZShHTF9SRU5ERVJCVUZGRVIsIEdMX1NURU5DSUxfSU5ERVg4LCB3aWR0aCwgaGVpZ2h0KTsKKyAg ICAgICAgICAgICAgICAgICAgOjpnbEZyYW1lYnVmZmVyUmVuZGVyYnVmZmVyKEdMX0ZSQU1FQlVG RkVSLCBHTF9TVEVOQ0lMX0FUVEFDSE1FTlQsIEdMX1JFTkRFUkJVRkZFUiwgbV9zdGVuY2lsQnVm ZmVyKTsKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgaWYgKG1fYXR0cnMuZGVw dGgpIHsKKyAgICAgICAgICAgICAgICAgICAgOjpnbEJpbmRSZW5kZXJidWZmZXIoR0xfUkVOREVS QlVGRkVSLCBtX2RlcHRoQnVmZmVyKTsKKyAgICAgICAgICAgICAgICAgICAgOjpnbFJlbmRlcmJ1 ZmZlclN0b3JhZ2UoR0xfUkVOREVSQlVGRkVSLCBHTF9ERVBUSF9DT01QT05FTlQxNiwgd2lkdGgs IGhlaWdodCk7CisgICAgICAgICAgICAgICAgICAgIDo6Z2xGcmFtZWJ1ZmZlclJlbmRlcmJ1ZmZl cihHTF9GUkFNRUJVRkZFUiwgR0xfREVQVEhfQVRUQUNITUVOVCwgR0xfUkVOREVSQlVGRkVSLCBt X2RlcHRoQnVmZmVyKTsKKyAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CiAgICAgICAg ICAgICA6OmdsQmluZFJlbmRlcmJ1ZmZlcihHTF9SRU5ERVJCVUZGRVIsIDApOwogICAgICAgICB9 Cg== 228226 2014-03-31 18:13:34 -0700 2014-03-31 22:37:38 -0700 Patch bug-130955-20140401101257.patch text/plain 10118 sun.shin U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2NTUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjYzODFlMzE5NTJjYzg5 YjQ0MGM4MWY1Yjg1MDM3NmQ3YmFjYjFjOC4uYjFiMGI0N2E1ZGY3YjNiMzE2MTU2YzU2YWU0MTA5 Njc1YjY5NmU2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE0LTAzLTMxICBCeXVu Z3Nlb24gU2hpbiAgPHN1bi5zaGluQGxnZS5jb20+CisKKyAgICAgICAgW1dlYkdMXVtPcGVuR0xF U10gRW5hYmxlIE1TQUEgc3VwcG9ydCBmb3IgV2ViR0wgQ2FudmFzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzA5NTUKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUbyBhdm9pZCBhbGlhc2luZyBpc3N1ZXMg d2hlbiB3ZSByZW5kZXIgY29udGVudCB0byBXZWJHTCBjYW52YXMsCisgICAgICAgICB3ZSBuZWVk IHRvIGltcGxlbWVudCBNU0FBIHN1cHBvcnQuCisgICAgICAgIC0gSW1hZ2luYXRpb24gT3BlbkdM RVMgR1BVIERyaXZlciBhbHJlYWR5IHN1cHBvcnQgTVNBQSwgc28gd2UKKyAgICAgICAgIG5lZWQg YSBzZXBhcmF0ZSBjb2RlIHBhdGggdG8gZW5hYmxlIGl0LgorCisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3MvRXh0ZW5zaW9uczNELmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvb3Bl bmdsL0V4dGVuc2lvbnMzRE9wZW5HTENvbW1vbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFeHRl bnNpb25zM0RPcGVuR0xDb21tb246OkV4dGVuc2lvbnMzRE9wZW5HTENvbW1vbik6CisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0V4dGVuc2lvbnMzRE9wZW5HTENvbW1vbi5oOgor ICAgICAgICAoV2ViQ29yZTo6RXh0ZW5zaW9uczNET3BlbkdMQ29tbW9uOjppc0ltYWdpbmF0aW9u KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9vcGVuZ2wvR3JhcGhpY3NDb250ZXh0M0RP cGVuR0xFUy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQzRDo6cmVzaGFw ZUZCT3MpOgorCiAyMDE0LTAzLTMxICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29t PgogCiAgICAgICAgIENyYXNoZXMgaW4gUGFnZUNvbnNvbGU6OmFkZE1lc3NhZ2UKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0V4dGVuc2lvbnMzRC5oIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRXh0ZW5zaW9uczNELmgKaW5kZXggNDJmYTQ1 MTFiYzk0ZDIyYzZlMTA5OTJjOTJhMjU3M2Q5ZmIxZDhkYi4uMWJhY2YzMjUzMWMwNTAxYTEwYTM3 YmE3OWFiMGRkYjVkYjA2ZDAwNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvRXh0ZW5zaW9uczNELmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvRXh0ZW5zaW9uczNELmgKQEAgLTUyLDYgKzUyLDcgQEAgcHVibGljOgogICAgIC8vICAg R0xfQVJCX3RleHR1cmVfbm9uX3Bvd2VyX29mX3R3byAvIEdMX09FU190ZXh0dXJlX25wb3QKICAg ICAvLyAgIEdMX0VYVF9wYWNrZWRfZGVwdGhfc3RlbmNpbCAvIEdMX09FU19wYWNrZWRfZGVwdGhf c3RlbmNpbAogICAgIC8vICAgR0xfQU5HTEVfZnJhbWVidWZmZXJfYmxpdCAvIEdMX0FOR0xFX2Zy YW1lYnVmZmVyX211bHRpc2FtcGxlCisgICAgLy8gICBHTF9JTUdfbXVsdGlzYW1wbGVkX3JlbmRl cl90b190ZXh0dXJlCiAgICAgLy8gICBHTF9PRVNfdGV4dHVyZV9mbG9hdAogICAgIC8vICAgR0xf T0VTX3RleHR1cmVfZmxvYXRfbGluZWFyCiAgICAgLy8gICBHTF9PRVNfdGV4dHVyZV9oYWxmX2Zs b2F0CkBAIC0xMTEsNiArMTEyLDEyIEBAIHB1YmxpYzoKICAgICAgICAgRlJBTUVCVUZGRVJfSU5D T01QTEVURV9NVUxUSVNBTVBMRSA9IDB4OEQ1NiwKICAgICAgICAgTUFYX1NBTVBMRVMgPSAweDhE NTcsCiAKKyAgICAgICAgLy8gR0xfSU1HX211bHRpc2FtcGxlZF9yZW5kZXJfdG9fdGV4dHVyZQor ICAgICAgICBSRU5ERVJCVUZGRVJfU0FNUExFU19JTUcgPSAweDkxMzMsCisgICAgICAgIEZSQU1F QlVGRkVSX0lOQ09NUExFVEVfTVVMVElTQU1QTEVfSU1HID0gMHg5MTM0LAorICAgICAgICBNQVhf U0FNUExFU19JTUcgPSAweDkxMzUsCisgICAgICAgIFRFWFRVUkVfU0FNUExFU19JTUcgPSAweDkx MzYsCisKICAgICAgICAgLy8gR0xfT0VTX3N0YW5kYXJkX2Rlcml2YXRpdmVzIG5hbWVzCiAgICAg ICAgIEZSQUdNRU5UX1NIQURFUl9ERVJJVkFUSVZFX0hJTlRfT0VTID0gMHg4QjhCLAogCkBAIC0y MzUsNiArMjQyLDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgYm9vbCBpc05WSURJQSgpID0gMDsK ICAgICB2aXJ0dWFsIGJvb2wgaXNBTUQoKSA9IDA7CiAgICAgdmlydHVhbCBib29sIGlzSW50ZWwo KSA9IDA7CisgICAgdmlydHVhbCBib29sIGlzSW1hZ2luYXRpb24oKSA9IDA7CiAgICAgdmlydHVh bCBTdHJpbmcgdmVuZG9yKCkgPSAwOwogCiAgICAgLy8gSWYgdGhpcyBtZXRob2QgcmV0dXJucyBm YWxzZSB0aGVuIHRoZSBzeXN0ZW0gKmRlZmluaXRlbHkqIGRvZXMgbm90IHN1cHBvcnQgbXVsdGlz YW1wbGluZy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL29w ZW5nbC9FeHRlbnNpb25zM0RPcGVuR0xDb21tb24uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3Mvb3BlbmdsL0V4dGVuc2lvbnMzRE9wZW5HTENvbW1vbi5jcHAKaW5kZXggNWRh NDA3MmI2Zjk2ZGU5ZWY3NDdkYjkzODEwM2JlNjdkYmY3ZWRhNC4uMWFkN2QzMzk0ZjRiNWYxM2Y2 MDZjYjA5ODM3MTk5ODU4MzUwYWZhNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3Mvb3BlbmdsL0V4dGVuc2lvbnMzRE9wZW5HTENvbW1vbi5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0V4dGVuc2lvbnMzRE9wZW5HTENv bW1vbi5jcHAKQEAgLTU3LDYgKzU3LDcgQEAgRXh0ZW5zaW9uczNET3BlbkdMQ29tbW9uOjpFeHRl bnNpb25zM0RPcGVuR0xDb21tb24oR3JhcGhpY3NDb250ZXh0M0QqIGNvbnRleHQpCiAgICAgLCBt X2lzTlZJRElBKGZhbHNlKQogICAgICwgbV9pc0FNRChmYWxzZSkKICAgICAsIG1faXNJbnRlbChm YWxzZSkKKyAgICAsIG1faXNJbWFnaW5hdGlvbihmYWxzZSkKICAgICAsIG1fbWF5U3VwcG9ydE11 bHRpc2FtcGxpbmcodHJ1ZSkKICAgICAsIG1fcmVxdWlyZXNCdWlsdEluRnVuY3Rpb25FbXVsYXRp b24oZmFsc2UpCiB7CkBAIC03MCw2ICs3MSw4IEBAIEV4dGVuc2lvbnMzRE9wZW5HTENvbW1vbjo6 RXh0ZW5zaW9uczNET3BlbkdMQ29tbW9uKEdyYXBoaWNzQ29udGV4dDNEKiBjb250ZXh0KQogICAg ICAgICBtX2lzQU1EID0gdHJ1ZTsKICAgICBpZiAodmVuZG9yQ29tcG9uZW50cy5jb250YWlucygi aW50ZWwiKSkKICAgICAgICAgbV9pc0ludGVsID0gdHJ1ZTsKKyAgICBpZiAodmVuZG9yQ29tcG9u ZW50cy5jb250YWlucygiaW1hZ2luYXRpb24iKSkKKyAgICAgICAgbV9pc0ltYWdpbmF0aW9uID0g dHJ1ZTsKIAogI2lmIFBMQVRGT1JNKE1BQykKICAgICBpZiAobV9pc0FNRCB8fCBtX2lzSW50ZWwp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9vcGVuZ2wvRXh0 ZW5zaW9uczNET3BlbkdMQ29tbW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9vcGVuZ2wvRXh0ZW5zaW9uczNET3BlbkdMQ29tbW9uLmgKaW5kZXggNGNjOGRiYWMxYWJiODVl YTE1YzZhYmUzZDZiY2VmNGRkMmI5NmYxOC4uZTdjNGI5NzViOTY5ZTNjNTQwOGZkYTA4OTkyZTkx MjRjMjI1NDczZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv b3BlbmdsL0V4dGVuc2lvbnMzRE9wZW5HTENvbW1vbi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL29wZW5nbC9FeHRlbnNpb25zM0RPcGVuR0xDb21tb24uaApAQCAtNjIs NiArNjIsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBib29sIGlzTlZJRElBKCkgeyByZXR1cm4g bV9pc05WSURJQTsgfQogICAgIHZpcnR1YWwgYm9vbCBpc0FNRCgpIHsgcmV0dXJuIG1faXNBTUQ7 IH0KICAgICB2aXJ0dWFsIGJvb2wgaXNJbnRlbCgpIHsgcmV0dXJuIG1faXNJbnRlbDsgfQorICAg IHZpcnR1YWwgYm9vbCBpc0ltYWdpbmF0aW9uKCkgeyByZXR1cm4gbV9pc0ltYWdpbmF0aW9uOyB9 CiAgICAgdmlydHVhbCBTdHJpbmcgdmVuZG9yKCkgeyByZXR1cm4gbV92ZW5kb3I7IH0KIAogICAg IHZpcnR1YWwgYm9vbCBtYXlTdXBwb3J0TXVsdGlzYW1wbGluZygpIHsgcmV0dXJuIG1fbWF5U3Vw cG9ydE11bHRpc2FtcGxpbmc7IH0KQEAgLTg0LDYgKzg1LDcgQEAgcHJvdGVjdGVkOgogICAgIGJv b2wgbV9pc05WSURJQTsKICAgICBib29sIG1faXNBTUQ7CiAgICAgYm9vbCBtX2lzSW50ZWw7Cisg ICAgYm9vbCBtX2lzSW1hZ2luYXRpb247CiAgICAgYm9vbCBtX21heVN1cHBvcnRNdWx0aXNhbXBs aW5nOwogICAgIGJvb2wgbV9yZXF1aXJlc0J1aWx0SW5GdW5jdGlvbkVtdWxhdGlvbjsKIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0dyYXBoaWNz Q29udGV4dDNET3BlbkdMRVMuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv b3BlbmdsL0dyYXBoaWNzQ29udGV4dDNET3BlbkdMRVMuY3BwCmluZGV4IDY2YjZkN2Y0MDJlODU1 MDQwZTY1MWNlOWJlZDkwMjdmZTM5NzlmZGUuLmVhYzllZTE0YzY4NmUwODg4YWZiOWJkZThjMjE1 NWJhZWFjMWNlOTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L29wZW5nbC9HcmFwaGljc0NvbnRleHQzRE9wZW5HTEVTLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9vcGVuZ2wvR3JhcGhpY3NDb250ZXh0M0RPcGVuR0xFUy5jcHAK QEAgLTExMCwyOSArMTEwLDU3IEBAIGJvb2wgR3JhcGhpY3NDb250ZXh0M0Q6OnJlc2hhcGVGQk9z KGNvbnN0IEludFNpemUmIHNpemUpCiAgICAgICAgIDo6Z2xCaW5kVGV4dHVyZShHTF9URVhUVVJF XzJELCAwKTsKICAgICB9CiAKLSAgICAvLyBXZSBkb24ndCBzdXBwb3J0IGFudGlhbGlhc2luZyB5 ZXQuIFNlZSBHcmFwaGljc0NvbnRleHQzRDo6dmFsaWRhdGVBdHRyaWJ1dGVzLgotICAgIEFTU0VS VCghbV9hdHRycy5hbnRpYWxpYXMpOwotCi0gICAgaWYgKG1fYXR0cnMuc3RlbmNpbCB8fCBtX2F0 dHJzLmRlcHRoKSB7Ci0gICAgICAgIC8vIFVzZSBhIDI0IGJpdCBkZXB0aCBidWZmZXIgd2hlcmUg d2Uga25vdyB3ZSBoYXZlIGl0LgotICAgICAgICBpZiAoc3VwcG9ydFBhY2tlZERlcHRoU3RlbmNp bEJ1ZmZlcikgewotICAgICAgICAgICAgOjpnbEJpbmRSZW5kZXJidWZmZXIoR0xfUkVOREVSQlVG RkVSLCBtX2RlcHRoU3RlbmNpbEJ1ZmZlcik7Ci0gICAgICAgICAgICA6OmdsUmVuZGVyYnVmZmVy U3RvcmFnZShHTF9SRU5ERVJCVUZGRVIsIEdMX0RFUFRIMjRfU1RFTkNJTDhfT0VTLCB3aWR0aCwg aGVpZ2h0KTsKLSAgICAgICAgICAgIGlmIChtX2F0dHJzLnN0ZW5jaWwpCi0gICAgICAgICAgICAg ICAgOjpnbEZyYW1lYnVmZmVyUmVuZGVyYnVmZmVyKEdMX0ZSQU1FQlVGRkVSLCBHTF9TVEVOQ0lM X0FUVEFDSE1FTlQsIEdMX1JFTkRFUkJVRkZFUiwgbV9kZXB0aFN0ZW5jaWxCdWZmZXIpOwotICAg ICAgICAgICAgaWYgKG1fYXR0cnMuZGVwdGgpCi0gICAgICAgICAgICAgICAgOjpnbEZyYW1lYnVm ZmVyUmVuZGVyYnVmZmVyKEdMX0ZSQU1FQlVGRkVSLCBHTF9ERVBUSF9BVFRBQ0hNRU5ULCBHTF9S RU5ERVJCVUZGRVIsIG1fZGVwdGhTdGVuY2lsQnVmZmVyKTsKLSAgICAgICAgICAgIDo6Z2xCaW5k UmVuZGVyYnVmZmVyKEdMX1JFTkRFUkJVRkZFUiwgMCk7Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAg ICAgICAgICBpZiAobV9hdHRycy5zdGVuY2lsKSB7Ci0gICAgICAgICAgICAgICAgOjpnbEJpbmRS ZW5kZXJidWZmZXIoR0xfUkVOREVSQlVGRkVSLCBtX3N0ZW5jaWxCdWZmZXIpOwotICAgICAgICAg ICAgICAgIDo6Z2xSZW5kZXJidWZmZXJTdG9yYWdlKEdMX1JFTkRFUkJVRkZFUiwgR0xfU1RFTkNJ TF9JTkRFWDgsIHdpZHRoLCBoZWlnaHQpOwotICAgICAgICAgICAgICAgIDo6Z2xGcmFtZWJ1ZmZl clJlbmRlcmJ1ZmZlcihHTF9GUkFNRUJVRkZFUiwgR0xfU1RFTkNJTF9BVFRBQ0hNRU5ULCBHTF9S RU5ERVJCVUZGRVIsIG1fc3RlbmNpbEJ1ZmZlcik7CisgICAgaWYgKGV4dGVuc2lvbnMtPmlzSW1h Z2luYXRpb24oKSAmJiBtX2F0dHJzLmFudGlhbGlhcykgeworICAgICAgICBHTGludCBtYXhTYW1w bGVDb3VudDsKKyAgICAgICAgOjpnbEdldEludGVnZXJ2KEV4dGVuc2lvbnMzRDo6TUFYX1NBTVBM RVNfSU1HLCAmbWF4U2FtcGxlQ291bnQpOyAKKyAgICAgICAgR0xpbnQgc2FtcGxlQ291bnQgPSBz dGQ6Om1pbig4LCBtYXhTYW1wbGVDb3VudCk7CisKKyAgICAgICAgZXh0ZW5zaW9ucy0+ZnJhbWVi dWZmZXJUZXh0dXJlMkRNdWx0aXNhbXBsZUlNRyhHTF9GUkFNRUJVRkZFUiwgR0xfQ09MT1JfQVRU QUNITUVOVDAsIEdMX1RFWFRVUkVfMkQsIG1fdGV4dHVyZSwgMCwgc2FtcGxlQ291bnQpOworCisg ICAgICAgIGlmIChtX2F0dHJzLnN0ZW5jaWwgfHwgbV9hdHRycy5kZXB0aCkgeworICAgICAgICAg ICAgLy8gVXNlIGEgMjQgYml0IGRlcHRoIGJ1ZmZlciB3aGVyZSB3ZSBrbm93IHdlIGhhdmUgaXQu CisgICAgICAgICAgICBpZiAoc3VwcG9ydFBhY2tlZERlcHRoU3RlbmNpbEJ1ZmZlcikgeworICAg ICAgICAgICAgICAgIDo6Z2xCaW5kUmVuZGVyYnVmZmVyKEdMX1JFTkRFUkJVRkZFUiwgbV9kZXB0 aFN0ZW5jaWxCdWZmZXIpOworICAgICAgICAgICAgICAgIGV4dGVuc2lvbnMtPnJlbmRlcmJ1ZmZl clN0b3JhZ2VNdWx0aXNhbXBsZShHTF9SRU5ERVJCVUZGRVIsIHNhbXBsZUNvdW50LCBHTF9ERVBU SDI0X1NURU5DSUw4X09FUywgd2lkdGgsIGhlaWdodCk7CisgICAgICAgICAgICAgICAgaWYgKG1f YXR0cnMuc3RlbmNpbCkKKyAgICAgICAgICAgICAgICAgICAgOjpnbEZyYW1lYnVmZmVyUmVuZGVy YnVmZmVyKEdMX0ZSQU1FQlVGRkVSLCBHTF9TVEVOQ0lMX0FUVEFDSE1FTlQsIEdMX1JFTkRFUkJV RkZFUiwgbV9kZXB0aFN0ZW5jaWxCdWZmZXIpOworICAgICAgICAgICAgICAgIGlmIChtX2F0dHJz LmRlcHRoKQorICAgICAgICAgICAgICAgICAgICA6OmdsRnJhbWVidWZmZXJSZW5kZXJidWZmZXIo R0xfRlJBTUVCVUZGRVIsIEdMX0RFUFRIX0FUVEFDSE1FTlQsIEdMX1JFTkRFUkJVRkZFUiwgbV9k ZXB0aFN0ZW5jaWxCdWZmZXIpOworICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAg ICBpZiAobV9hdHRycy5zdGVuY2lsKSB7CisgICAgICAgICAgICAgICAgICAgIDo6Z2xCaW5kUmVu ZGVyYnVmZmVyKEdMX1JFTkRFUkJVRkZFUiwgbV9zdGVuY2lsQnVmZmVyKTsKKyAgICAgICAgICAg ICAgICAgICAgZXh0ZW5zaW9ucy0+cmVuZGVyYnVmZmVyU3RvcmFnZU11bHRpc2FtcGxlKEdMX1JF TkRFUkJVRkZFUiwgc2FtcGxlQ291bnQsIEdMX1NURU5DSUxfSU5ERVg4LCB3aWR0aCwgaGVpZ2h0 KTsKKyAgICAgICAgICAgICAgICAgICAgOjpnbEZyYW1lYnVmZmVyUmVuZGVyYnVmZmVyKEdMX0ZS QU1FQlVGRkVSLCBHTF9TVEVOQ0lMX0FUVEFDSE1FTlQsIEdMX1JFTkRFUkJVRkZFUiwgbV9zdGVu Y2lsQnVmZmVyKTsKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgaWYgKG1fYXR0 cnMuZGVwdGgpIHsKKyAgICAgICAgICAgICAgICAgICAgOjpnbEJpbmRSZW5kZXJidWZmZXIoR0xf UkVOREVSQlVGRkVSLCBtX2RlcHRoQnVmZmVyKTsKKyAgICAgICAgICAgICAgICAgICAgZXh0ZW5z aW9ucy0+cmVuZGVyYnVmZmVyU3RvcmFnZU11bHRpc2FtcGxlKEdMX1JFTkRFUkJVRkZFUiwgc2Ft cGxlQ291bnQsIEdMX0RFUFRIX0NPTVBPTkVOVDE2LCB3aWR0aCwgaGVpZ2h0KTsKKyAgICAgICAg ICAgICAgICAgICAgOjpnbEZyYW1lYnVmZmVyUmVuZGVyYnVmZmVyKEdMX0ZSQU1FQlVGRkVSLCBH TF9ERVBUSF9BVFRBQ0hNRU5ULCBHTF9SRU5ERVJCVUZGRVIsIG1fZGVwdGhCdWZmZXIpOworICAg ICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIGlmIChtX2F0dHJzLmRl cHRoKSB7Ci0gICAgICAgICAgICAgICAgOjpnbEJpbmRSZW5kZXJidWZmZXIoR0xfUkVOREVSQlVG RkVSLCBtX2RlcHRoQnVmZmVyKTsKLSAgICAgICAgICAgICAgICA6OmdsUmVuZGVyYnVmZmVyU3Rv cmFnZShHTF9SRU5ERVJCVUZGRVIsIEdMX0RFUFRIX0NPTVBPTkVOVDE2LCB3aWR0aCwgaGVpZ2h0 KTsKLSAgICAgICAgICAgICAgICA6OmdsRnJhbWVidWZmZXJSZW5kZXJidWZmZXIoR0xfRlJBTUVC VUZGRVIsIEdMX0RFUFRIX0FUVEFDSE1FTlQsIEdMX1JFTkRFUkJVRkZFUiwgbV9kZXB0aEJ1ZmZl cik7CisgICAgICAgICAgICA6OmdsQmluZFJlbmRlcmJ1ZmZlcihHTF9SRU5ERVJCVUZGRVIsIDAp OworICAgICAgICB9CisgICAgfSBlbHNlIHsKKyAgICAgICAgaWYgKG1fYXR0cnMuc3RlbmNpbCB8 fCBtX2F0dHJzLmRlcHRoKSB7CisgICAgICAgICAgICAvLyBVc2UgYSAyNCBiaXQgZGVwdGggYnVm ZmVyIHdoZXJlIHdlIGtub3cgd2UgaGF2ZSBpdC4KKyAgICAgICAgICAgIGlmIChzdXBwb3J0UGFj a2VkRGVwdGhTdGVuY2lsQnVmZmVyKSB7CisgICAgICAgICAgICAgICAgOjpnbEJpbmRSZW5kZXJi dWZmZXIoR0xfUkVOREVSQlVGRkVSLCBtX2RlcHRoU3RlbmNpbEJ1ZmZlcik7CisgICAgICAgICAg ICAgICAgOjpnbFJlbmRlcmJ1ZmZlclN0b3JhZ2UoR0xfUkVOREVSQlVGRkVSLCBHTF9ERVBUSDI0 X1NURU5DSUw4X09FUywgd2lkdGgsIGhlaWdodCk7CisgICAgICAgICAgICAgICAgaWYgKG1fYXR0 cnMuc3RlbmNpbCkKKyAgICAgICAgICAgICAgICAgICAgOjpnbEZyYW1lYnVmZmVyUmVuZGVyYnVm ZmVyKEdMX0ZSQU1FQlVGRkVSLCBHTF9TVEVOQ0lMX0FUVEFDSE1FTlQsIEdMX1JFTkRFUkJVRkZF UiwgbV9kZXB0aFN0ZW5jaWxCdWZmZXIpOworICAgICAgICAgICAgICAgIGlmIChtX2F0dHJzLmRl cHRoKQorICAgICAgICAgICAgICAgICAgICA6OmdsRnJhbWVidWZmZXJSZW5kZXJidWZmZXIoR0xf RlJBTUVCVUZGRVIsIEdMX0RFUFRIX0FUVEFDSE1FTlQsIEdMX1JFTkRFUkJVRkZFUiwgbV9kZXB0 aFN0ZW5jaWxCdWZmZXIpOworICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgICBp ZiAobV9hdHRycy5zdGVuY2lsKSB7CisgICAgICAgICAgICAgICAgICAgIDo6Z2xCaW5kUmVuZGVy YnVmZmVyKEdMX1JFTkRFUkJVRkZFUiwgbV9zdGVuY2lsQnVmZmVyKTsKKyAgICAgICAgICAgICAg ICAgICAgOjpnbFJlbmRlcmJ1ZmZlclN0b3JhZ2UoR0xfUkVOREVSQlVGRkVSLCBHTF9TVEVOQ0lM X0lOREVYOCwgd2lkdGgsIGhlaWdodCk7CisgICAgICAgICAgICAgICAgICAgIDo6Z2xGcmFtZWJ1 ZmZlclJlbmRlcmJ1ZmZlcihHTF9GUkFNRUJVRkZFUiwgR0xfU1RFTkNJTF9BVFRBQ0hNRU5ULCBH TF9SRU5ERVJCVUZGRVIsIG1fc3RlbmNpbEJ1ZmZlcik7CisgICAgICAgICAgICAgICAgfQorICAg ICAgICAgICAgICAgIGlmIChtX2F0dHJzLmRlcHRoKSB7CisgICAgICAgICAgICAgICAgICAgIDo6 Z2xCaW5kUmVuZGVyYnVmZmVyKEdMX1JFTkRFUkJVRkZFUiwgbV9kZXB0aEJ1ZmZlcik7CisgICAg ICAgICAgICAgICAgICAgIDo6Z2xSZW5kZXJidWZmZXJTdG9yYWdlKEdMX1JFTkRFUkJVRkZFUiwg R0xfREVQVEhfQ09NUE9ORU5UMTYsIHdpZHRoLCBoZWlnaHQpOworICAgICAgICAgICAgICAgICAg ICA6OmdsRnJhbWVidWZmZXJSZW5kZXJidWZmZXIoR0xfRlJBTUVCVUZGRVIsIEdMX0RFUFRIX0FU VEFDSE1FTlQsIEdMX1JFTkRFUkJVRkZFUiwgbV9kZXB0aEJ1ZmZlcik7CisgICAgICAgICAgICAg ICAgfQogICAgICAgICAgICAgfQogICAgICAgICAgICAgOjpnbEJpbmRSZW5kZXJidWZmZXIoR0xf UkVOREVSQlVGRkVSLCAwKTsKICAgICAgICAgfQo=