46469 2010-09-24 08:50:47 -0700 Code to encode/decode a DrawingAreaInfo is confusing 2010-09-24 10:26:04 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 46468 46470 1 aroben aroben andersca sam oldest_to_newest 284407 0 aroben 2010-09-24 08:50:47 -0700 Code to encode/decode a DrawingAreaInfo is confusing 284409 1 68688 aroben 2010-09-24 08:52:01 -0700 Created attachment 68688 Patch 284497 2 aroben 2010-09-24 10:26:04 -0700 Committed r68271: <http://trac.webkit.org/changeset/68271> 68688 2010-09-24 08:52:01 -0700 2010-09-24 09:12:42 -0700 Patch bug-46469-20100924115200.patch text/plain 12322 aroben ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg NDBkNmUyMjdhZmFkZDYzZTIyMGZmMTdkNWU1ZjJhNWViMDZlZmNhMS4uMGJkYmQ2MjhhZjczZWY3 M2EzNTRlMTU5NzBlZTNjNTdhOTViNzA1NiAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSwzNCBAQAogMjAxMC0wOS0yNCAgQWRh bSBSb2JlbiAgPGFyb2JlbkBhcHBsZS5jb20+CiAKKyAgICAgICAgU3RvcCBwcmV0ZW5kaW5nIHRo YXQgd2Uga25vdyBob3cgdG8gZW5jb2RlIGEgRHJhd2luZ0FyZWEgYW5kIGp1c3QKKyAgICAgICAg ZW5jb2RlIHRoZSBEcmF3aW5nQXJlYUluZm8gZGlyZWN0bHkKKworICAgICAgICBEcmF3aW5nQXJl YUJhc2UgYW5kIGZyaWVuZHMgd2VyZSB0cnlpbmcgdG8gaGlkZSB0aGUgZmFjdCB0aGF0IHRoZXkK KyAgICAgICAgd2VyZSBqdXN0IGVuY29kaW5nL2RlY29kaW5nIGEgRHJhd2luZ0FyZWFJbmZvIGJl aGluZCB0aGUgc2NlbmVzLCBidXQKKyAgICAgICAgZXZlcnlvbmUga25ldyB3aGF0IHdhcyBnb2lu ZyBvbiBhbmQgaXQgd2FzIGdldHRpbmcgZW1iYXJhc3NpbmcuCisKKyAgICAgICAgRml4ZXMgPGh0 dHA6Ly93ZWJraXQub3JnL2IvNDY0Njk+IENvZGUgdG8gZW5jb2RlL2RlY29kZSBhCisgICAgICAg IERyYXdpbmdBcmVhSW5mbyBpcyBjb25mdXNpbmcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIFNoYXJlZC9EcmF3aW5nQXJlYUJhc2UuY3BwOiBSZW1v dmVkLgorICAgICAgICAqIFNoYXJlZC9EcmF3aW5nQXJlYUJhc2UuaDogUmVtb3ZlZCBlbmNvZGUv ZGVjb2RlLgorICAgICAgICAqIFVJUHJvY2Vzcy9DaHVua2VkVXBkYXRlRHJhd2luZ0FyZWFQcm94 eS5oOiBSZW1vdmVkIGVuY29kZSBvdmVycmlkZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQ YWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmluaXRpYWxpemVX ZWJQYWdlKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpyZWluaXRpYWxpemVXZWJQ YWdlKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkaWRSZWNlaXZlU3luY01lc3Nh Z2UpOgorICAgICAgICBDaGFuZ2VkIHRvIGVuY29kZSB0aGUgRHJhd2luZ0FyZWFJbmZvIGRpcmVj dGx5LgorCisgICAgICAgICogV2ViS2l0Mi5wcm86CisgICAgICAgICogV2ViS2l0Mi54Y29kZXBy b2ovcHJvamVjdC5wYnhwcm9qOgorICAgICAgICAqIHdpbi9XZWJLaXQyLnZjcHJvajoKKyAgICAg ICAgUmVtb3ZlZCBEcmF3aW5nQXJlYUJhc2UuY3BwLgorCisyMDEwLTA5LTI0ICBBZGFtIFJvYmVu ICA8YXJvYmVuQGFwcGxlLmNvbT4KKwogICAgICAgICBFeHBvc2UgYSB3aG9sZSBEcmF3aW5nQXJl YUluZm8gaW5zdGVhZCBvZiBpdHMgY29uc3RpdHVlbnQgcGFydHMgZnJvbQogICAgICAgICBEcmF3 aW5nQXJlYUJhc2UKIApkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9TaGFyZWQvRHJhd2luZ0FyZWFCYXNl LmNwcCBiL1dlYktpdDIvU2hhcmVkL0RyYXdpbmdBcmVhQmFzZS5jcHAKZGVsZXRlZCBmaWxlIG1v ZGUgMTAwNjQ0CmluZGV4IGUwYzNjY2MwODkwYjlkMWE3YTJiOGQyNGQzYjZlYWY1ZGU0YThjMTAu LjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAKLS0tIGEvV2ViS2l0Mi9T aGFyZWQvRHJhd2luZ0FyZWFCYXNlLmNwcAorKysgL2Rldi9udWxsCkBAIC0xLDUxICswLDAgQEAK LS8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTAgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVk LgotICoKLSAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9y bXMsIHdpdGggb3Igd2l0aG91dAotICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3Zp ZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCi0gKiBhcmUgbWV0OgotICogMS4gUmVk aXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmln aHQKLSAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dp bmcgZGlzY2xhaW1lci4KLSAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0 IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0Ci0gKiAgICBub3RpY2UsIHRoaXMgbGlzdCBv ZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCi0gKiAgICBk b2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlz dHJpYnV0aW9uLgotICoKLSAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5D LiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycKLSAqIEFORCBBTlkgRVhQUkVTUyBPUiBJ TVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAotICogVEhF IElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEg UEFSVElDVUxBUgotICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwg QVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTCi0gKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJF Q1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCi0gKiBDT05T RVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJF TUVOVCBPRgotICogU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERB VEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTCi0gKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FV U0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgotICogQ09OVFJB Q1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9U SEVSV0lTRSkKLSAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNP RlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YKLSAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERB TUFHRS4KLSAqLwotCi0jaW5jbHVkZSAiRHJhd2luZ0FyZWFCYXNlLmgiCi0KLW5hbWVzcGFjZSBX ZWJLaXQgewotCi12b2lkIERyYXdpbmdBcmVhQmFzZTo6ZW5jb2RlKENvcmVJUEM6OkFyZ3VtZW50 RW5jb2RlciogZW5jb2RlcikgY29uc3QKLXsKLSAgICBlbmNvZGVyLT5lbmNvZGUoaW5mbygpKTsK LX0KLQotYm9vbCBEcmF3aW5nQXJlYUJhc2U6OmRlY29kZShDb3JlSVBDOjpBcmd1bWVudERlY29k ZXIqIGRlY29kZXIsIERyYXdpbmdBcmVhSW5mbyYgaW5mbykKLXsKLSAgICB1aW50MzJfdCBkcmF3 aW5nQXJlYVR5cGU7Ci0gICAgaWYgKCFkZWNvZGVyLT5kZWNvZGUoZHJhd2luZ0FyZWFUeXBlKSkK LSAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgRHJhd2luZ0FyZWFJRCBkcmF3aW5nQXJlYUlE OwotICAgIGlmICghZGVjb2Rlci0+ZGVjb2RlKGRyYXdpbmdBcmVhSUQpKQotICAgICAgICByZXR1 cm4gZmFsc2U7Ci0KLSAgICBpbmZvLnR5cGUgPSBzdGF0aWNfY2FzdDxUeXBlPihkcmF3aW5nQXJl YVR5cGUpOwotICAgIGluZm8uaWQgPSBkcmF3aW5nQXJlYUlEOwotCi0gICAgcmV0dXJuIHRydWU7 Ci19Ci0KLX0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9TaGFyZWQv RHJhd2luZ0FyZWFCYXNlLmggYi9XZWJLaXQyL1NoYXJlZC9EcmF3aW5nQXJlYUJhc2UuaAppbmRl eCAwYTIzNTAyYzRlMWNmYTZjZWM1Njg5NjI3MGFhNTlkMWI3NjQ3NWUxLi40MTY1NmQ4ZmU1Y2Iy NGYwODNjODJkZDI2ZDlhNDQ1ZWNjYzY2M2U4IDEwMDY0NAotLS0gYS9XZWJLaXQyL1NoYXJlZC9E cmF3aW5nQXJlYUJhc2UuaAorKysgYi9XZWJLaXQyL1NoYXJlZC9EcmF3aW5nQXJlYUJhc2UuaApA QCAtNjMsMTAgKzYzLDYgQEAgcHVibGljOgogICAgIAogICAgIGNvbnN0IERyYXdpbmdBcmVhSW5m byYgaW5mbygpIGNvbnN0IHsgcmV0dXJuIG1faW5mbzsgfQogICAgIAotICAgIC8vIFRoZSBEcmF3 aW5nQXJlYVByb3h5IHNob3VsZCBuZXZlciBiZSBkZWNvZGVkIGl0c2VsZi4gSW5zdGVhZCwgdGhl IERyYXdpbmdBcmVhIHNob3VsZCBiZSBkZWNvZGVkLgotICAgIHZvaWQgZW5jb2RlKENvcmVJUEM6 OkFyZ3VtZW50RW5jb2RlciogZW5jb2RlcikgY29uc3Q7Ci0gICAgc3RhdGljIGJvb2wgZGVjb2Rl KENvcmVJUEM6OkFyZ3VtZW50RGVjb2RlciosIERyYXdpbmdBcmVhSW5mbyYpOwotCiBwcm90ZWN0 ZWQ6CiAgICAgRHJhd2luZ0FyZWFCYXNlKFR5cGUgdHlwZSwgRHJhd2luZ0FyZWFJRCBpZGVudGlm aWVyKQogICAgICAgICA6IG1faW5mbyh0eXBlLCBpZGVudGlmaWVyKQpkaWZmIC0tZ2l0IGEvV2Vi S2l0Mi9VSVByb2Nlc3MvQ2h1bmtlZFVwZGF0ZURyYXdpbmdBcmVhUHJveHkuaCBiL1dlYktpdDIv VUlQcm9jZXNzL0NodW5rZWRVcGRhdGVEcmF3aW5nQXJlYVByb3h5LmgKaW5kZXggNzhmMWJkMDIw MzI3MjdkZjkzMjNjMDM5M2JjYjcxZjIzNjA3NjkyOC4uOTk2M2YwMjdmOTRkNmFlYWM2Y2M2NzNm ZTUyODIyOTMzNmVlNjk1OCAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9VSVByb2Nlc3MvQ2h1bmtlZFVw ZGF0ZURyYXdpbmdBcmVhUHJveHkuaAorKysgYi9XZWJLaXQyL1VJUHJvY2Vzcy9DaHVua2VkVXBk YXRlRHJhd2luZ0FyZWFQcm94eS5oCkBAIC02MSwxMiArNjEsNiBAQCBwdWJsaWM6CiAKICAgICB2 aXJ0dWFsIH5DaHVua2VkVXBkYXRlRHJhd2luZ0FyZWFQcm94eSgpOwogCi0gICAgLy8gVGhlIERy YXdpbmdBcmVhUHJveHkgc2hvdWxkIG5ldmVyIGJlIGRlY29kZWQgaXRzZWxmLiBJbnN0ZWFkLCB0 aGUgRHJhd2luZ0FyZWEgc2hvdWxkIGJlIGRlY29kZWQuCi0gICAgdmlydHVhbCB2b2lkIGVuY29k ZShDb3JlSVBDOjpBcmd1bWVudEVuY29kZXIqIGVuY29kZXIpIGNvbnN0Ci0gICAgewotICAgICAg ICBEcmF3aW5nQXJlYVByb3h5OjplbmNvZGUoZW5jb2Rlcik7Ci0gICAgfQotCiBwcml2YXRlOgog ICAgIENodW5rZWRVcGRhdGVEcmF3aW5nQXJlYVByb3h5KFBsYXRmb3JtV2ViVmlldyopOwogCmRp ZmYgLS1naXQgYS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwIGIvV2ViS2l0Mi9V SVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAppbmRleCBjODI3MDUzMjJkZWExNmZhNWFlMmRmNjU1 YjNhNWQyNmVhOTM3MzVhLi42MjQ2NDQ3MWNhYTUxYmQxODkzZmU4MDdhOWRlNDEwMTcwZDliMjg5 IDEwMDY0NAotLS0gYS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCisrKyBiL1dl YktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAgLTE1Myw3ICsxNTMsNyBAQCB2b2lk IFdlYlBhZ2VQcm94eTo6aW5pdGlhbGl6ZVdlYlBhZ2UoY29uc3QgSW50U2l6ZSYgc2l6ZSkKICAg ICB9CiAKICAgICBBU1NFUlQobV9kcmF3aW5nQXJlYSk7Ci0gICAgcHJvY2VzcygpLT5zZW5kKFdl YlByb2Nlc3NNZXNzYWdlOjpDcmVhdGUsIG1fcGFnZUlELCBDb3JlSVBDOjpJbihzaXplLCBwYWdl TmFtZXNwYWNlKCktPmNvbnRleHQoKS0+cHJlZmVyZW5jZXMoKS0+c3RvcmUoKSwgKihtX2RyYXdp bmdBcmVhLmdldCgpKSkpOworICAgIHByb2Nlc3MoKS0+c2VuZChXZWJQcm9jZXNzTWVzc2FnZTo6 Q3JlYXRlLCBtX3BhZ2VJRCwgQ29yZUlQQzo6SW4oc2l6ZSwgcGFnZU5hbWVzcGFjZSgpLT5jb250 ZXh0KCktPnByZWZlcmVuY2VzKCktPnN0b3JlKCksIG1fZHJhd2luZ0FyZWEtPmluZm8oKSkpOwog fQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6cmVpbml0aWFsaXplV2ViUGFnZShjb25zdCBXZWJDb3Jl OjpJbnRTaXplJiBzaXplKQpAQCAtMTYyLDcgKzE2Miw3IEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpy ZWluaXRpYWxpemVXZWJQYWdlKGNvbnN0IFdlYkNvcmU6OkludFNpemUmIHNpemUpCiAgICAgICAg IHJldHVybjsKIAogICAgIEFTU0VSVChtX2RyYXdpbmdBcmVhKTsKLSAgICBwcm9jZXNzKCktPnNl bmQoV2ViUHJvY2Vzc01lc3NhZ2U6OkNyZWF0ZSwgbV9wYWdlSUQsIENvcmVJUEM6OkluKHNpemUs IHBhZ2VOYW1lc3BhY2UoKS0+Y29udGV4dCgpLT5wcmVmZXJlbmNlcygpLT5zdG9yZSgpLCAqKG1f ZHJhd2luZ0FyZWEuZ2V0KCkpKSk7CisgICAgcHJvY2VzcygpLT5zZW5kKFdlYlByb2Nlc3NNZXNz YWdlOjpDcmVhdGUsIG1fcGFnZUlELCBDb3JlSVBDOjpJbihzaXplLCBwYWdlTmFtZXNwYWNlKCkt PmNvbnRleHQoKS0+cHJlZmVyZW5jZXMoKS0+c3RvcmUoKSwgbV9kcmF3aW5nQXJlYS0+aW5mbygp KSk7CiB9CiAKIHZvaWQgV2ViUGFnZVByb3h5OjpjbG9zZSgpCkBAIC04NzEsNyArODcxLDcgQEAg dm9pZCBXZWJQYWdlUHJveHk6OmRpZFJlY2VpdmVTeW5jTWVzc2FnZShDb3JlSVBDOjpDb25uZWN0 aW9uKiBjb25uZWN0aW9uLCBDb3JlSVAKICAgICAgICAgICAgICAgICAvLyBGSVhNRTogUGFzcyB0 aGUgcmVhbCBzaXplLgogICAgICAgICAgICAgICAgIHJlcGx5LT5lbmNvZGUoQ29yZUlQQzo6SW4o bmV3UGFnZS0+cGFnZUlEKCksIEludFNpemUoMTAwLCAxMDApLCAKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIG5ld1BhZ2UtPnBhZ2VOYW1lc3BhY2UoKS0+Y29udGV4 dCgpLT5wcmVmZXJlbmNlcygpLT5zdG9yZSgpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgKihuZXdQYWdlLT5kcmF3aW5nQXJlYSgpKSkpOworICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbmV3UGFnZS0+ZHJhd2luZ0FyZWEoKS0+aW5m bygpKSk7CiAgICAgICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgICAgIHJlcGx5LT5lbmNv ZGUoQ29yZUlQQzo6SW4oc3RhdGljX2Nhc3Q8dWludDY0X3Q+KDApLCBJbnRTaXplKCksIFdlYlBy ZWZlcmVuY2VzU3RvcmUoKSwgRHJhd2luZ0FyZWFCYXNlOjpEcmF3aW5nQXJlYUluZm8oKSkpOwog ICAgICAgICAgICAgfQpAQCAtOTU0LDcgKzk1NCw3IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRS ZWNlaXZlU3luY01lc3NhZ2UoQ29yZUlQQzo6Q29ubmVjdGlvbiogY29ubmVjdGlvbiwgQ29yZUlQ CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAgICAgICBkaWRDaGFuZ2VBY2NlbGVy YXRlZENvbXBvc2l0aW5nKGNvbXBvc2l0aW5nKTsKLSAgICAgICAgICAgIHJlcGx5LT5lbmNvZGUo KihkcmF3aW5nQXJlYSgpKSk7CisgICAgICAgICAgICByZXBseS0+ZW5jb2RlKGRyYXdpbmdBcmVh KCktPmluZm8oKSk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogI2VuZGlmIC8vIFVT RShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKZGlmZiAtLWdpdCBhL1dlYktpdDIvV2ViS2l0Mi5w cm8gYi9XZWJLaXQyL1dlYktpdDIucHJvCmluZGV4IGU5MzA4MmE0Y2M4ZTQ4YzJkMmQyZmMwZjMy YzEyZjMxNWY0YzI5YzYuLjljZmFmN2NjYzM4NWE5Yjg0ZjgxYmM4MzU3OTczZjI2N2U4NGZkZWQg MTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2ViS2l0Mi5wcm8KKysrIGIvV2ViS2l0Mi9XZWJLaXQyLnBy bwpAQCAtMjkzLDcgKzI5Myw2IEBAIFNPVVJDRVMgKz0gXAogICAgIFBsYXRmb3JtL3F0L1J1bkxv b3BRdC5jcHAgXAogICAgIFBsYXRmb3JtL3F0L1NoYXJlZE1lbW9yeVF0LmNwcCBcCiAgICAgUGxh dGZvcm0vcXQvV29ya1F1ZXVlUXQuY3BwIFwKLSAgICBTaGFyZWQvRHJhd2luZ0FyZWFCYXNlLmNw cCBcCiAgICAgU2hhcmVkL0ltbXV0YWJsZUFycmF5LmNwcCBcCiAgICAgU2hhcmVkL0ltbXV0YWJs ZURpY3Rpb25hcnkuY3BwIFwKICAgICBTaGFyZWQvTXV0YWJsZUFycmF5LmNwcCBcCmRpZmYgLS1n aXQgYS9XZWJLaXQyL1dlYktpdDIueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvaiBiL1dlYktpdDIv V2ViS2l0Mi54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCmluZGV4IGM0YTE0YjZkZTAxMDhlODk1 YzdiZTMyMDE0NzE0Nzg2ZmM5MTU2NzEuLjIwMjAyMzA1NzMxNmFiNzlhYTQxZWRjOGIyYjYzMmIx M2EyNmEyMTUgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2ViS2l0Mi54Y29kZXByb2ovcHJvamVjdC5w Ynhwcm9qCisrKyBiL1dlYktpdDIvV2ViS2l0Mi54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCkBA IC00Myw3ICs0Myw2IEBACiAJCTBGNTI2NUJDMTFERDM3ODYwMDA2RDMzQyAvKiBMYXllckJhY2tl ZERyYXdpbmdBcmVhUHJveHlNYWMubW0gaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZp bGU7IGZpbGVSZWYgPSAwRjUyNjVCQjExREQzNzg2MDAwNkQzM0MgLyogTGF5ZXJCYWNrZWREcmF3 aW5nQXJlYVByb3h5TWFjLm1tICovOyB9OwogCQkwRjUyNjY3NDExREQ0QTQ5MDAwNkQzM0MgLyog V2ViUHJvY2Vzc1Byb3h5TWFjLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxl OyBmaWxlUmVmID0gMEY1MjY2NzMxMURENEE0OTAwMDZEMzNDIC8qIFdlYlByb2Nlc3NQcm94eU1h Yy5tbSAqLzsgfTsKIAkJMEZCNjU5MjMxMjA4QjREQjAwNDQ4MTZDIC8qIERyYXdpbmdBcmVhQmFz ZS5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMEZCNjU5 MjIxMjA4QjREQjAwNDQ4MTZDIC8qIERyYXdpbmdBcmVhQmFzZS5oICovOyB9OwotCQkwRkI2NTlB NjEyMDhCOUVFMDA0NDgxNkMgLyogRHJhd2luZ0FyZWFCYXNlLmNwcCBpbiBTb3VyY2VzICovID0g e2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDBGQjY1OUE1MTIwOEI5RUUwMDQ0ODE2QyAv KiBEcmF3aW5nQXJlYUJhc2UuY3BwICovOyB9OwogCQkxQTBFQzYwMzEyNEE5RjJDMDA3RUY0QTUg LyogUGx1Z2luUHJvY2Vzc01hbmFnZXIuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxk RmlsZTsgZmlsZVJlZiA9IDFBMEVDNjAxMTI0QTlGMkMwMDdFRjRBNSAvKiBQbHVnaW5Qcm9jZXNz TWFuYWdlci5oICovOyB9OwogCQkxQTBFQzYwNDEyNEE5RjJDMDA3RUY0QTUgLyogUGx1Z2luUHJv Y2Vzc01hbmFnZXIuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxl UmVmID0gMUEwRUM2MDIxMjRBOUYyQzAwN0VGNEE1IC8qIFBsdWdpblByb2Nlc3NNYW5hZ2VyLmNw cCAqLzsgfTsKIAkJMUEwRUM2QzAxMjRCQkQ5QjAwN0VGNEE1IC8qIFBsdWdpblByb2Nlc3NNZXNz YWdlcy5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUEw RUM2QkUxMjRCQkQ5QjAwN0VGNEE1IC8qIFBsdWdpblByb2Nlc3NNZXNzYWdlcy5oICovOyB9OwpA QCAtNDQwLDcgKzQzOSw2IEBACiAJCTBGNTI2NUJCMTFERDM3ODYwMDA2RDMzQyAvKiBMYXllckJh Y2tlZERyYXdpbmdBcmVhUHJveHlNYWMubW0gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsg ZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpj cHA7IHBhdGggPSBMYXllckJhY2tlZERyYXdpbmdBcmVhUHJveHlNYWMubW07IHNvdXJjZVRyZWUg PSAiPGdyb3VwPiI7IH07CiAJCTBGNTI2NjczMTFERDRBNDkwMDA2RDMzQyAvKiBXZWJQcm9jZXNz UHJveHlNYWMubW0gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0g NDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7IHBhdGggPSBXZWJQ cm9jZXNzUHJveHlNYWMubW07IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTBGQjY1OTIy MTIwOEI0REIwMDQ0ODE2QyAvKiBEcmF3aW5nQXJlYUJhc2UuaCAqLyA9IHtpc2EgPSBQQlhGaWxl UmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNv ZGUuYy5oOyBwYXRoID0gRHJhd2luZ0FyZWFCYXNlLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7 IH07Ci0JCTBGQjY1OUE1MTIwOEI5RUUwMDQ0ODE2QyAvKiBEcmF3aW5nQXJlYUJhc2UuY3BwICov ID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZp bGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gRHJhd2luZ0FyZWFCYXNlLmNwcDsg c291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMTA1OEM3QjFGRUE1NTg1RTExQ0EyQ0JCIC8q IENvY29hLmZyYW1ld29yayAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25vd25G aWxlVHlwZSA9IHdyYXBwZXIuZnJhbWV3b3JrOyBuYW1lID0gQ29jb2EuZnJhbWV3b3JrOyBwYXRo ID0gL1N5c3RlbS9MaWJyYXJ5L0ZyYW1ld29ya3MvQ29jb2EuZnJhbWV3b3JrOyBzb3VyY2VUcmVl ID0gIjxhYnNvbHV0ZT4iOyB9OwogCQkxQTBFQzYwMTEyNEE5RjJDMDA3RUY0QTUgLyogUGx1Z2lu UHJvY2Vzc01hbmFnZXIuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rp bmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gUGx1Z2lu UHJvY2Vzc01hbmFnZXIuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMUEwRUM2MDIx MjRBOUYyQzAwN0VGNEE1IC8qIFBsdWdpblByb2Nlc3NNYW5hZ2VyLmNwcCAqLyA9IHtpc2EgPSBQ QlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNv dXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFBsdWdpblByb2Nlc3NNYW5hZ2VyLmNwcDsgc291cmNl VHJlZSA9ICI8Z3JvdXA+IjsgfTsKQEAgLTEwMDUsNyArMTAwMyw2IEBACiAJCQkJQkMxMTFCNUEx MTJGNjI4MjAwMzM3QkFCIC8qIG1hYyAqLywKIAkJCQlCQ0YwNEM4QzExRkY5QjdEMDBGODZBNTgg LyogQVBJT2JqZWN0LmggKi8sCiAJCQkJMUE2RjlGOEUxMUUxM0VGQzAwREIxMzcxIC8qIENvbW1h bmRMaW5lLmggKi8sCi0JCQkJMEZCNjU5QTUxMjA4QjlFRTAwNDQ4MTZDIC8qIERyYXdpbmdBcmVh QmFzZS5jcHAgKi8sCiAJCQkJMEZCNjU5MjIxMjA4QjREQjAwNDQ4MTZDIC8qIERyYXdpbmdBcmVh QmFzZS5oICovLAogCQkJCTc2MkI3NDgxMTIwQkJBMDEwMDgxOTMzOSAvKiBGb250U21vb3RoaW5n TGV2ZWwuaCAqLywKIAkJCQlCQzY0Njk2RDExREJFNjAzMDA2NDU1QjAgLyogSW1tdXRhYmxlQXJy YXkuY3BwICovLApAQCAtMTgxOCw3ICsxODE1LDYgQEAKIAkJCWlzYSA9IFBCWFByb2plY3Q7CiAJ CQlidWlsZENvbmZpZ3VyYXRpb25MaXN0ID0gMURFQjkxQjEwODczM0RBNTAwMTBFOUNEIC8qIEJ1 aWxkIGNvbmZpZ3VyYXRpb24gbGlzdCBmb3IgUEJYUHJvamVjdCAiV2ViS2l0MiIgKi87CiAJCQlj b21wYXRpYmlsaXR5VmVyc2lvbiA9ICJYY29kZSAzLjEiOwotCQkJZGV2ZWxvcG1lbnRSZWdpb24g PSBFbmdsaXNoOwogCQkJaGFzU2Nhbm5lZEZvckVuY29kaW5ncyA9IDE7CiAJCQlrbm93blJlZ2lv bnMgPSAoCiAJCQkJRW5nbGlzaCwKQEAgLTE5OTQsNyArMTk5MCw2IEBACiAJCQkJQkNEQjg1ODMx MjAwRUM1NzAwNzI1NEJFIC8qIFdLVHlwZS5jcHAgaW4gU291cmNlcyAqLywKIAkJCQlEM0I5NDg0 NjExRkY0QjY1MDAwMzJCMzkgLyogV2ViUG9wdXBNZW51LmNwcCBpbiBTb3VyY2VzICovLAogCQkJ CUQzQjk0ODQ4MTFGRjRCNjUwMDAzMkIzOSAvKiBXZWJTZWFyY2hQb3B1cE1lbnUuY3BwIGluIFNv dXJjZXMgKi8sCi0JCQkJMEZCNjU5QTYxMjA4QjlFRTAwNDQ4MTZDIC8qIERyYXdpbmdBcmVhQmFz ZS5jcHAgaW4gU291cmNlcyAqLywKIAkJCQk1MTRBRjZDODEyMDlFRTczMDBBMjZDOTcgLyogV0tE YXRhLmNwcCBpbiBTb3VyY2VzICovLAogCQkJCUMwRTNBQTdBMTIwOUU4MzAwMEE0OUQwMSAvKiBN b2R1bGVNYWMubW0gaW4gU291cmNlcyAqLywKIAkJCQlDMEUzQUE3QjEyMDlFODM1MDBBNDlEMDEg LyogTW9kdWxlLmNwcCBpbiBTb3VyY2VzICovLApkaWZmIC0tZ2l0IGEvV2ViS2l0Mi93aW4vV2Vi S2l0Mi52Y3Byb2ogYi9XZWJLaXQyL3dpbi9XZWJLaXQyLnZjcHJvagppbmRleCA0YzFlNjg5MTRm NTQ0YjBiZjhkNjU5OWYwMjM4MGQzNDRlODhlOTRmLi43Mjg0MDU1Njg2ZmM1ZTMwZWRkYWEwYzlm MGQyZTM0NzUyOWFiMGFiIDEwMDc1NQotLS0gYS9XZWJLaXQyL3dpbi9XZWJLaXQyLnZjcHJvagor KysgYi9XZWJLaXQyL3dpbi9XZWJLaXQyLnZjcHJvagpAQCAtMzk3LDEwICszOTcsNiBAQAogCQkJ CT4NCiAJCQk8L0ZpbGU+DQogCQkJPEZpbGUNCi0JCQkJUmVsYXRpdmVQYXRoPSIuLlxTaGFyZWRc RHJhd2luZ0FyZWFCYXNlLmNwcCINCi0JCQkJPg0KLQkJCTwvRmlsZT4NCi0JCQk8RmlsZQ0KIAkJ CQlSZWxhdGl2ZVBhdGg9Ii4uXFNoYXJlZFxEcmF3aW5nQXJlYUJhc2UuaCINCiAJCQkJPg0KIAkJ CTwvRmlsZT4NCg==