46470 2010-09-24 09:04:51 -0700 Pass parameters for creating a WebPage in a single struct 2010-09-24 10:27:19 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 46469 44428 1 aroben aroben andersca sam oldest_to_newest 284418 0 aroben 2010-09-24 09:04:51 -0700 Pass parameters for creating a WebPage in a single struct 284420 1 68689 aroben 2010-09-24 09:07:25 -0700 Created attachment 68689 Patch 284499 2 aroben 2010-09-24 10:27:19 -0700 Committed r68272: <http://trac.webkit.org/changeset/68272> 68689 2010-09-24 09:07:25 -0700 2010-09-24 09:14:18 -0700 Patch bug-46470-20100924120723.patch text/plain 19883 aroben ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg MGJkYmQ2MjhhZjczZWY3M2EzNTRlMTU5NzBlZTNjNTdhOTViNzA1Ni4uYTYzZDUyNjQwNWE5Mjkx Zjc5NDhjNWEyZTg5Mjg2MDI3YjhhOTc4YiAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSw0MyBAQAogMjAxMC0wOS0yNCAgQWRh bSBSb2JlbiAgPGFyb2JlbkBhcHBsZS5jb20+CiAKKyAgICAgICAgQWRkIFdlYlBhZ2VDcmVhdGlv blBhcmFtZXRlcnMKKworICAgICAgICBUaGlzIHN0cnVjdCBpcyB1c2VkIGluIGFueSBtZXNzYWdl cyB0aGF0IGVuZCB1cCBjcmVhdGluZyBhIFdlYlBhZ2UuCisgICAgICAgIFVzaW5nIGEgc3RydWN0 IGluc3RlYWQgb2YgaW5kaXZpZHVhbCBwYXJhbWV0ZXJzIHdpbGwgbWFrZSBpdCBlYXNpZXIgdG8K KyAgICAgICAgYWRkIHBsYXRmb3JtLXNwZWNpZmljIGRhdGEsIHN1Y2ggYXMgYW4gSFdORCBvbiBX aW5kb3dzLgorCisgICAgICAgIEZpeGVzIDxodHRwOi8vd2Via2l0Lm9yZy9iLzQ2NDcwPiBQYXNz IHBhcmFtZXRlcnMgZm9yIGNyZWF0aW5nIGEKKyAgICAgICAgV2ViUGFnZSBpbiBhIHNpbmdsZSBz dHJ1Y3QKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IFNoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcDogQWRkZWQuCisgICAgICAgIChX ZWJLaXQ6OldlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnM6OmVuY29kZSk6CisgICAgICAgIChXZWJL aXQ6OldlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnM6OmRlY29kZSk6CisgICAgICAgIFNpbXBsZSBl bmNvZGUvZGVjb2RlIGZ1bmN0aW9ucy4KKworICAgICAgICAqIFNoYXJlZC9XZWJQYWdlQ3JlYXRp b25QYXJhbWV0ZXJzLmg6IEFkZGVkLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6aW5pdGlhbGl6ZVdlYlBhZ2Up OgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnJlaW5pdGlhbGl6ZVdlYlBhZ2UpOgor ICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRpZFJlY2VpdmVTeW5jTWVzc2FnZSk6Cisg ICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuY3BwOgor ICAgICAgICAoV2ViS2l0OjpXZWJDaHJvbWVDbGllbnQ6OmNyZWF0ZVdpbmRvdyk6CisgICAgICAg ICogV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vz czo6Y3JlYXRlV2ViUGFnZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3M6OmRpZFJlY2Vp dmVNZXNzYWdlKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlByb2Nlc3MuaDoKKyAgICAgICAg Q2hhbmdlZCB0byB1c2UgV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycyBpbnN0ZWFkIG9mIHBhc3Np bmcgdGhlCisgICAgICAgIHZhbHVlcyBpbmRpdmlkdWFsbHkuCisKKyAgICAgICAgKiBXZWJLaXQy LnBybzoKKyAgICAgICAgKiBXZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisgICAg ICAgICogd2luL1dlYktpdDIudmNwcm9qOgorICAgICAgICBBZGRlZCBXZWJQYWdlQ3JlYXRpb25Q YXJhbWV0ZXJzLgorCisyMDEwLTA5LTI0ICBBZGFtIFJvYmVuICA8YXJvYmVuQGFwcGxlLmNvbT4K KwogICAgICAgICBTdG9wIHByZXRlbmRpbmcgdGhhdCB3ZSBrbm93IGhvdyB0byBlbmNvZGUgYSBE cmF3aW5nQXJlYSBhbmQganVzdAogICAgICAgICBlbmNvZGUgdGhlIERyYXdpbmdBcmVhSW5mbyBk aXJlY3RseQogCmRpZmYgLS1naXQgYS9XZWJLaXQyL1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJh bWV0ZXJzLmNwcCBiL1dlYktpdDIvU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuY3Bw Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAuLmI4YjA5YzM2YTA4MTQ2NmE4N2E0YzU4MmE1YzE1MjYyNzU1NTcwMWMKLS0t IC9kZXYvbnVsbAorKysgYi9XZWJLaXQyL1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJz LmNwcApAQCAtMCwwICsxLDUwIEBACisvKgorICogQ29weXJpZ2h0IChDKSAgMjAxMCBBcHBsZSBJ bmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBp biBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRp b24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMK KyAqIGFyZSBtZXQ6CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCBy ZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29u ZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRp b25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAq ICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlz Y2xhaW1lciBpbiB0aGUKKyAqICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFs cyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJ UyBQUk9WSURFRCBCWSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJwor ICogQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQg Tk9UIExJTUlURUQgVE8sCisgKiBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJ TElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQT1NFIEFSRSBESVNDTEFJ TUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMKKyAq IEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUws IEVYRU1QTEFSWSwgT1IKKyAqIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQg Tk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GCisgKiBTVUJTVElUVVRFIEdPT0RTIE9SIFNF UlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MKKyAqIElO VEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZ LCBXSEVUSEVSIElOCisgKiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAoSU5D TFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKQorICogQVJJU0lORyBJTiBBTlkgV0FZIE9V VCBPRiBUSEUgVVNFIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRgorICogVEhF IFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisKKyNpbmNsdWRlICJXZWJQYWdlQ3Jl YXRpb25QYXJhbWV0ZXJzLmgiCisKKyNpbmNsdWRlICJBcmd1bWVudEVuY29kZXIuaCIKKworbmFt ZXNwYWNlIFdlYktpdCB7CisKK3ZvaWQgV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVyczo6ZW5jb2Rl KENvcmVJUEM6OkFyZ3VtZW50RW5jb2RlciogZW5jb2RlcikgY29uc3QKK3sKKyAgICBlbmNvZGVy LT5lbmNvZGUodmlld1NpemUpOworICAgIGVuY29kZXItPmVuY29kZShzdG9yZSk7CisgICAgZW5j b2Rlci0+ZW5jb2RlKGRyYXdpbmdBcmVhSW5mbyk7Cit9CisKK2Jvb2wgV2ViUGFnZUNyZWF0aW9u UGFyYW1ldGVyczo6ZGVjb2RlKENvcmVJUEM6OkFyZ3VtZW50RGVjb2RlciogZGVjb2RlciwgV2Vi UGFnZUNyZWF0aW9uUGFyYW1ldGVycyYgcGFyYW1ldGVycykKK3sKKyAgICBpZiAoIWRlY29kZXIt PmRlY29kZShwYXJhbWV0ZXJzLnZpZXdTaXplKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAg IGlmICghZGVjb2Rlci0+ZGVjb2RlKHBhcmFtZXRlcnMuc3RvcmUpKQorICAgICAgICByZXR1cm4g ZmFsc2U7CisgICAgaWYgKCFkZWNvZGVyLT5kZWNvZGUocGFyYW1ldGVycy5kcmF3aW5nQXJlYUlu Zm8pKQorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgcmV0dXJuIHRydWU7Cit9CisKK30gLy8g bmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9TaGFyZWQvV2ViUGFnZUNyZWF0 aW9uUGFyYW1ldGVycy5oIGIvV2ViS2l0Mi9TaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVy cy5oCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAuLjljYjllNWRmZDczMzM2YTFmMWVmMjhkNGU1YWY1YjExMWIwNjJjNDgK LS0tIC9kZXYvbnVsbAorKysgYi9XZWJLaXQyL1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0 ZXJzLmgKQEAgLTAsMCArMSw1MSBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgIDIwMTAgQXBwbGUg SW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2Ug aW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0 aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25z CisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3Qg cmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNv bmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0 aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0Cisg KiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRp c2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlh bHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUg SVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycK KyAqIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVU IE5PVCBMSU1JVEVEIFRPLAorICogVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFC SUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9TRSBBUkUgRElTQ0xB SU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTCisg KiBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFM LCBFWEVNUExBUlksIE9SCisgKiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVU IE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRgorICogU1VCU1RJVFVURSBHT09EUyBPUiBT RVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTCisgKiBJ TlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElU WSwgV0hFVEhFUiBJTgorICogQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQgKElO Q0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkKKyAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBP VVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YKKyAqIFRI RSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisjaWZuZGVmIFdlYlBhZ2VDcmVh dGlvblBhcmFtZXRlcnNfaAorI2RlZmluZSBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzX2gKKwor I2luY2x1ZGUgIkRyYXdpbmdBcmVhQmFzZS5oIgorI2luY2x1ZGUgIldlYlByZWZlcmVuY2VzU3Rv cmUuaCIKKyNpbmNsdWRlIDxXZWJDb3JlL0ludFNpemUuaD4KKworbmFtZXNwYWNlIENvcmVJUEMg eworICAgIGNsYXNzIEFyZ3VtZW50RGVjb2RlcjsKKyAgICBjbGFzcyBBcmd1bWVudEVuY29kZXI7 Cit9CisKK25hbWVzcGFjZSBXZWJLaXQgeworCitzdHJ1Y3QgV2ViUGFnZUNyZWF0aW9uUGFyYW1l dGVycyB7CisgICAgdm9pZCBlbmNvZGUoQ29yZUlQQzo6QXJndW1lbnRFbmNvZGVyKikgY29uc3Q7 CisgICAgc3RhdGljIGJvb2wgZGVjb2RlKENvcmVJUEM6OkFyZ3VtZW50RGVjb2RlciosIFdlYlBh Z2VDcmVhdGlvblBhcmFtZXRlcnMmKTsKKworICAgIFdlYkNvcmU6OkludFNpemUgdmlld1NpemU7 CisgICAgV2ViUHJlZmVyZW5jZXNTdG9yZSBzdG9yZTsKKyAgICBEcmF3aW5nQXJlYUJhc2U6OkRy YXdpbmdBcmVhSW5mbyBkcmF3aW5nQXJlYUluZm87Cit9OworCit9IC8vIG5hbWVzcGFjZSBXZWJL aXQKKworI2VuZGlmIC8vIFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnNfaApkaWZmIC0tZ2l0IGEv V2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1dlYktpdDIvVUlQcm9jZXNzL1dl YlBhZ2VQcm94eS5jcHAKaW5kZXggNjI0NjQ0NzFjYWE1MWJkMTg5M2ZlODA3YTlkZTQxMDE3MGQ5 YjI4OS4uYzQ0OGIyMmYxOGQzMWJhNWFmMjU0MWU4NDg4MGVlMTZhOTRmOTQxOCAxMDA2NDQKLS0t IGEvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAorKysgYi9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJQYWdlUHJveHkuY3BwCkBAIC0zOSw2ICszOSw3IEBACiAjaW5jbHVkZSAiV2ViRXZl bnQuaCIKICNpbmNsdWRlICJXZWJGb3JtU3VibWlzc2lvbkxpc3RlbmVyUHJveHkuaCIKICNpbmNs dWRlICJXZWJGcmFtZVBvbGljeUxpc3RlbmVyUHJveHkuaCIKKyNpbmNsdWRlICJXZWJQYWdlQ3Jl YXRpb25QYXJhbWV0ZXJzLmgiCiAjaW5jbHVkZSAiV2ViUGFnZU1lc3NhZ2VzLmgiCiAjaW5jbHVk ZSAiV2ViUGFnZU5hbWVzcGFjZS5oIgogI2luY2x1ZGUgIldlYlBhZ2VQcm94eU1lc3NhZ2VLaW5k cy5oIgpAQCAtMTUzLDcgKzE1NCwxMiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6aW5pdGlhbGl6ZVdl YlBhZ2UoY29uc3QgSW50U2l6ZSYgc2l6ZSkKICAgICB9CiAKICAgICBBU1NFUlQobV9kcmF3aW5n QXJlYSk7Ci0gICAgcHJvY2VzcygpLT5zZW5kKFdlYlByb2Nlc3NNZXNzYWdlOjpDcmVhdGUsIG1f cGFnZUlELCBDb3JlSVBDOjpJbihzaXplLCBwYWdlTmFtZXNwYWNlKCktPmNvbnRleHQoKS0+cHJl ZmVyZW5jZXMoKS0+c3RvcmUoKSwgbV9kcmF3aW5nQXJlYS0+aW5mbygpKSk7CisKKyAgICBXZWJQ YWdlQ3JlYXRpb25QYXJhbWV0ZXJzIHBhcmFtZXRlcnM7CisgICAgcGFyYW1ldGVycy52aWV3U2l6 ZSA9IHNpemU7CisgICAgcGFyYW1ldGVycy5zdG9yZSA9IHBhZ2VOYW1lc3BhY2UoKS0+Y29udGV4 dCgpLT5wcmVmZXJlbmNlcygpLT5zdG9yZSgpOworICAgIHBhcmFtZXRlcnMuZHJhd2luZ0FyZWFJ bmZvID0gbV9kcmF3aW5nQXJlYS0+aW5mbygpOworICAgIHByb2Nlc3MoKS0+c2VuZChXZWJQcm9j ZXNzTWVzc2FnZTo6Q3JlYXRlLCBtX3BhZ2VJRCwgQ29yZUlQQzo6SW4ocGFyYW1ldGVycykpOwog fQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6cmVpbml0aWFsaXplV2ViUGFnZShjb25zdCBXZWJDb3Jl OjpJbnRTaXplJiBzaXplKQpAQCAtMTYyLDcgKzE2OCwxMiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6 cmVpbml0aWFsaXplV2ViUGFnZShjb25zdCBXZWJDb3JlOjpJbnRTaXplJiBzaXplKQogICAgICAg ICByZXR1cm47CiAKICAgICBBU1NFUlQobV9kcmF3aW5nQXJlYSk7Ci0gICAgcHJvY2VzcygpLT5z ZW5kKFdlYlByb2Nlc3NNZXNzYWdlOjpDcmVhdGUsIG1fcGFnZUlELCBDb3JlSVBDOjpJbihzaXpl LCBwYWdlTmFtZXNwYWNlKCktPmNvbnRleHQoKS0+cHJlZmVyZW5jZXMoKS0+c3RvcmUoKSwgbV9k cmF3aW5nQXJlYS0+aW5mbygpKSk7CisKKyAgICBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzIHBh cmFtZXRlcnM7CisgICAgcGFyYW1ldGVycy52aWV3U2l6ZSA9IHNpemU7CisgICAgcGFyYW1ldGVy cy5zdG9yZSA9IHBhZ2VOYW1lc3BhY2UoKS0+Y29udGV4dCgpLT5wcmVmZXJlbmNlcygpLT5zdG9y ZSgpOworICAgIHBhcmFtZXRlcnMuZHJhd2luZ0FyZWFJbmZvID0gbV9kcmF3aW5nQXJlYS0+aW5m bygpOworICAgIHByb2Nlc3MoKS0+c2VuZChXZWJQcm9jZXNzTWVzc2FnZTo6Q3JlYXRlLCBtX3Bh Z2VJRCwgQ29yZUlQQzo6SW4ocGFyYW1ldGVycykpOwogfQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6 Y2xvc2UoKQpAQCAtODY3LDEzICs4NzgsMTUgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZFJlY2Vp dmVTeW5jTWVzc2FnZShDb3JlSVBDOjpDb25uZWN0aW9uKiBjb25uZWN0aW9uLCBDb3JlSVAKICAg ICBzd2l0Y2ggKG1lc3NhZ2VJRC5nZXQ8V2ViUGFnZVByb3h5TWVzc2FnZTo6S2luZD4oKSkgewog ICAgICAgICBjYXNlIFdlYlBhZ2VQcm94eU1lc3NhZ2U6OkNyZWF0ZU5ld1BhZ2U6IHsKICAgICAg ICAgICAgIFJlZlB0cjxXZWJQYWdlUHJveHk+IG5ld1BhZ2UgPSBjcmVhdGVOZXdQYWdlKCk7Cisg ICAgICAgICAgICBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzIHBhcmFtZXRlcnM7CiAgICAgICAg ICAgICBpZiAobmV3UGFnZSkgewogICAgICAgICAgICAgICAgIC8vIEZJWE1FOiBQYXNzIHRoZSBy ZWFsIHNpemUuCi0gICAgICAgICAgICAgICAgcmVwbHktPmVuY29kZShDb3JlSVBDOjpJbihuZXdQ YWdlLT5wYWdlSUQoKSwgSW50U2l6ZSgxMDAsIDEwMCksIAotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgbmV3UGFnZS0+cGFnZU5hbWVzcGFjZSgpLT5jb250ZXh0KCkt PnByZWZlcmVuY2VzKCktPnN0b3JlKCksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBuZXdQYWdlLT5kcmF3aW5nQXJlYSgpLT5pbmZvKCkpKTsKKyAgICAgICAgICAg ICAgICBwYXJhbWV0ZXJzLnZpZXdTaXplID0gSW50U2l6ZSgxMDAsIDEwMCk7CisgICAgICAgICAg ICAgICAgcGFyYW1ldGVycy5zdG9yZSA9IG5ld1BhZ2UtPnBhZ2VOYW1lc3BhY2UoKS0+Y29udGV4 dCgpLT5wcmVmZXJlbmNlcygpLT5zdG9yZSgpOworICAgICAgICAgICAgICAgIHBhcmFtZXRlcnMu ZHJhd2luZ0FyZWFJbmZvID0gbmV3UGFnZS0+ZHJhd2luZ0FyZWEoKS0+aW5mbygpOworICAgICAg ICAgICAgICAgIHJlcGx5LT5lbmNvZGUoQ29yZUlQQzo6SW4obmV3UGFnZS0+cGFnZUlEKCksIHBh cmFtZXRlcnMpKTsKICAgICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAgICAgcmVwbHkt PmVuY29kZShDb3JlSVBDOjpJbihzdGF0aWNfY2FzdDx1aW50NjRfdD4oMCksIEludFNpemUoKSwg V2ViUHJlZmVyZW5jZXNTdG9yZSgpLCBEcmF3aW5nQXJlYUJhc2U6OkRyYXdpbmdBcmVhSW5mbygp KSk7CisgICAgICAgICAgICAgICAgcmVwbHktPmVuY29kZShDb3JlSVBDOjpJbihzdGF0aWNfY2Fz dDx1aW50NjRfdD4oMCksIHBhcmFtZXRlcnMpKTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAg IGJyZWFrOwogICAgICAgICB9CmRpZmYgLS1naXQgYS9XZWJLaXQyL1dlYktpdDIucHJvIGIvV2Vi S2l0Mi9XZWJLaXQyLnBybwppbmRleCA5Y2ZhZjdjY2MzODVhOWI4NGY4MWJjODM1Nzk3M2YyNjdl ODRmZGVkLi45NDRiNzIyY2Y2YWJkNjM0ZjQwYmFmMzQ4M2Y5MDFjYzVjOTk5MzgwIDEwMDY0NAot LS0gYS9XZWJLaXQyL1dlYktpdDIucHJvCisrKyBiL1dlYktpdDIvV2ViS2l0Mi5wcm8KQEAgLTE4 MCw2ICsxODAsNyBAQCBIRUFERVJTICs9IFwKICAgICBTaGFyZWQvV2ViRXZlbnQuaCBcCiAgICAg U2hhcmVkL1dlYk51bWJlci5oIFwKICAgICBTaGFyZWQvV2ViTmF2aWdhdGlvbkRhdGFTdG9yZS5o IFwKKyAgICBTaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5oIFwKICAgICBTaGFyZWQv V2ViUHJlZmVyZW5jZXNTdG9yZS5oIFwKICAgICBTaGFyZWQvV2ViVVJMUmVxdWVzdC5oIFwKICAg ICBTaGFyZWQvV2ViVVJMUmVzcG9uc2UuaCBcCkBAIC0yOTksNiArMzAwLDcgQEAgU09VUkNFUyAr PSBcCiAgICAgU2hhcmVkL011dGFibGVEaWN0aW9uYXJ5LmNwcCBcCiAgICAgU2hhcmVkL1Zpc2l0 ZWRMaW5rVGFibGUuY3BwIFwKICAgICBTaGFyZWQvV2ViRXZlbnRDb252ZXJzaW9uLmNwcCBcCisg ICAgU2hhcmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuY3BwIFwKICAgICBTaGFyZWQvV2Vi UHJlZmVyZW5jZXNTdG9yZS5jcHAgXAogICAgIFNoYXJlZC9XZWJVUkxSZXF1ZXN0LmNwcCBcCiAg ICAgU2hhcmVkL1dlYlVSTFJlc3BvbnNlLmNwcCBcCmRpZmYgLS1naXQgYS9XZWJLaXQyL1dlYktp dDIueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvaiBiL1dlYktpdDIvV2ViS2l0Mi54Y29kZXByb2ov cHJvamVjdC5wYnhwcm9qCmluZGV4IDIwMjAyMzA1NzMxNmFiNzlhYTQxZWRjOGIyYjYzMmIxM2Ey NmEyMTUuLmM1NTk4MTkzMTBjZjk3YWYzM2ZjYzM1ZDBlNWM5OTNlNTVkMmVjMjcgMTAwNjQ0Ci0t LSBhL1dlYktpdDIvV2ViS2l0Mi54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCisrKyBiL1dlYktp dDIvV2ViS2l0Mi54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCkBAIC0zNjksNiArMzY5LDcgQEAK IAkJQkNGNjlGQTMxMTc2RDAxNDAwNDcxQTUyIC8qIFdlYk5hdmlnYXRpb25EYXRhLmNwcCBpbiBT b3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEJDRjY5RkExMTE3NkQw MTQwMDQ3MUE1MiAvKiBXZWJOYXZpZ2F0aW9uRGF0YS5jcHAgKi87IH07CiAJCUJDRjY5RkE5MTE3 NkQxQ0IwMDQ3MUE1MiAvKiBXS05hdmlnYXRpb25EYXRhLmggaW4gSGVhZGVycyAqLyA9IHtpc2Eg PSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBCQ0Y2OUZBNzExNzZEMUNCMDA0NzFBNTIgLyogV0tO YXZpZ2F0aW9uRGF0YS5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFB1YmxpYywgKTsg fTsgfTsKIAkJQkNGNjlGQUExMTc2RDFDQjAwNDcxQTUyIC8qIFdLTmF2aWdhdGlvbkRhdGEuY3Bw IGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQkNGNjlGQTgx MTc2RDFDQjAwNDcxQTUyIC8qIFdLTmF2aWdhdGlvbkRhdGEuY3BwICovOyB9OworCQlDMDZDNjA5 NTEyNEMxNDRCMDAwMTY4MkYgLyogV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5jcHAgaW4gU291 cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBDMDZDNjA5MzEyNEMxNDQz MDAwMTY4MkYgLyogV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5jcHAgKi87IH07CiAJCUMwQ0U3 MkEwMTI0N0U3MUQwMEJDMEVDNCAvKiBXZWJQYWdlTWVzc2FnZVJlY2VpdmVyLmNwcCBpbiBTb3Vy Y2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEMwQ0U3MjlFMTI0N0U3MUQw MEJDMEVDNCAvKiBXZWJQYWdlTWVzc2FnZVJlY2VpdmVyLmNwcCAqLzsgfTsKIAkJQzBDRTcyQTEx MjQ3RTcxRDAwQkMwRUM0IC8qIFdlYlBhZ2VNZXNzYWdlcy5oIGluIEhlYWRlcnMgKi8gPSB7aXNh ID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQzBDRTcyOUYxMjQ3RTcxRDAwQkMwRUM0IC8qIFdl YlBhZ2VNZXNzYWdlcy5oICovOyB9OwogCQlDMENFNzJBRDEyNDdFNzhEMDBCQzBFQzQgLyogSGFu ZGxlTWVzc2FnZS5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVm ID0gQzBDRTcyQUMxMjQ3RTc4RDAwQkMwRUM0IC8qIEhhbmRsZU1lc3NhZ2UuaCAqLzsgfTsKQEAg LTc4MSw2ICs3ODIsOCBAQAogCQlCQ0Y2OUZBMTExNzZEMDE0MDA0NzFBNTIgLyogV2ViTmF2aWdh dGlvbkRhdGEuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9 IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gV2ViTmF2 aWdhdGlvbkRhdGEuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlCQ0Y2OUZBNzEx NzZEMUNCMDA0NzFBNTIgLyogV0tOYXZpZ2F0aW9uRGF0YS5oICovID0ge2lzYSA9IFBCWEZpbGVS ZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29k ZS5jLmg7IHBhdGggPSBXS05hdmlnYXRpb25EYXRhLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7 IH07CiAJCUJDRjY5RkE4MTE3NkQxQ0IwMDQ3MUE1MiAvKiBXS05hdmlnYXRpb25EYXRhLmNwcCAq LyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25G aWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFdLTmF2aWdhdGlvbkRhdGEuY3Bw OyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OworCQlDMDZDNjA5MzEyNEMxNDQzMDAwMTY4MkYg LyogV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVy ZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNw cC5jcHA7IHBhdGggPSBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcDsgc291cmNlVHJlZSA9 ICI8Z3JvdXA+IjsgfTsKKwkJQzA2QzYwOTQxMjRDMTQ0MzAwMDE2ODJGIC8qIFdlYlBhZ2VDcmVh dGlvblBhcmFtZXRlcnMuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rp bmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gV2ViUGFn ZUNyZWF0aW9uUGFyYW1ldGVycy5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlDMDhG REU4NzEyNEE4NTFDMDA3NjQ1QkQgLyogbWVzc2FnZXNfdW5pdHRlc3QucHkgKi8gPSB7aXNhID0g UEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSB0 ZXh0LnNjcmlwdC5weXRob247IHBhdGggPSBtZXNzYWdlc191bml0dGVzdC5weTsgc291cmNlVHJl ZSA9ICI8Z3JvdXA+IjsgfTsKIAkJQzBDRTcyNTgxMjQ3RTREQTAwQkMwRUM0IC8qIFdlYlBhZ2Uu bWVzc2FnZXMuaW4gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0g NDsgbGFzdEtub3duRmlsZVR5cGUgPSB0ZXh0OyBwYXRoID0gV2ViUGFnZS5tZXNzYWdlcy5pbjsg c291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJQzBDRTcyOUUxMjQ3RTcxRDAwQkMwRUM0IC8q IFdlYlBhZ2VNZXNzYWdlUmVjZWl2ZXIuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7 IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3Bw OyBwYXRoID0gV2ViUGFnZU1lc3NhZ2VSZWNlaXZlci5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3Vw PiI7IH07CkBAIC0xMDI2LDYgKzEwMjksOCBAQAogCQkJCUJDMDMyREIxMTBGNDM4MEYwMDU4QzE1 QSAvKiBXZWJFdmVudENvbnZlcnNpb24uaCAqLywKIAkJCQlCQ0Y2OUY5ODExNzZDRUQ2MDA0NzFB NTIgLyogV2ViTmF2aWdhdGlvbkRhdGFTdG9yZS5oICovLAogCQkJCUJDMzNERDY3MTIzODQ2NDYw MDM2MEYzRiAvKiBXZWJOdW1iZXIuaCAqLywKKwkJCQlDMDZDNjA5MzEyNEMxNDQzMDAwMTY4MkYg LyogV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5jcHAgKi8sCisJCQkJQzA2QzYwOTQxMjRDMTQ0 MzAwMDE2ODJGIC8qIFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuaCAqLywKIAkJCQlCQ0Q1OThB QjExMkI3RkRGMDBFQzhDMjMgLyogV2ViUHJlZmVyZW5jZXNTdG9yZS5jcHAgKi8sCiAJCQkJQkNE NTk4QUExMTJCN0ZERjAwRUM4QzIzIC8qIFdlYlByZWZlcmVuY2VzU3RvcmUuaCAqLywKIAkJCQlB NzJENUQ3RjEyMzZDQkE4MDBBODhCMTUgLyogV2ViU2VyaWFsaXplZFNjcmlwdFZhbHVlLmggKi8s CkBAIC0yMDM4LDYgKzIwNDMsNyBAQAogCQkJCTFBMEVDNjA0MTI0QTlGMkMwMDdFRjRBNSAvKiBQ bHVnaW5Qcm9jZXNzTWFuYWdlci5jcHAgaW4gU291cmNlcyAqLywKIAkJCQkxQTBFQzc1RjEyNEJD N0IyMDA3RUY0QTUgLyogUGx1Z2luUHJvY2Vzc1Byb3h5LmNwcCBpbiBTb3VyY2VzICovLAogCQkJ CTFBMEVDODAzMTI0QkQ0MUUwMDdFRjRBNSAvKiBQbHVnaW5Qcm9jZXNzTWFpbk1hYy5tbSBpbiBT b3VyY2VzICovLAorCQkJCUMwNkM2MDk1MTI0QzE0NEIwMDAxNjgyRiAvKiBXZWJQYWdlQ3JlYXRp b25QYXJhbWV0ZXJzLmNwcCBpbiBTb3VyY2VzICovLAogCQkJKTsKIAkJCXJ1bk9ubHlGb3JEZXBs b3ltZW50UG9zdHByb2Nlc3NpbmcgPSAwOwogCQl9OwpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5jcHAgYi9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcAppbmRleCAxZDI3NWZjNWFm OGVlYWZjNGZmYTExNjViMDM4MjU4ZDVmNDljMmVhLi5hZmIwOTYyZGM5YjQ4MWFhN2Y1MmE0ZWM2 ODUxNjQzYzZkZGY0YzY5IDEwMDY0NAotLS0gYS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1 cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcAorKysgYi9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29y ZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcApAQCAtMzQsNiArMzQsNyBAQAogI2luY2x1ZGUg IldlYkZyYW1lLmgiCiAjaW5jbHVkZSAiV2ViRnJhbWVMb2FkZXJDbGllbnQuaCIKICNpbmNsdWRl ICJXZWJQYWdlLmgiCisjaW5jbHVkZSAiV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5oIgogI2lu Y2x1ZGUgIldlYlBhZ2VQcm94eU1lc3NhZ2VLaW5kcy5oIgogI2luY2x1ZGUgIldlYlBvcHVwTWVu dS5oIgogI2luY2x1ZGUgIldlYlByZWZlcmVuY2VzU3RvcmUuaCIKQEAgLTEwOCwxMiArMTA5LDEw IEBAIHZvaWQgV2ViQ2hyb21lQ2xpZW50Ojpmb2N1c2VkTm9kZUNoYW5nZWQoTm9kZSopCiBQYWdl KiBXZWJDaHJvbWVDbGllbnQ6OmNyZWF0ZVdpbmRvdyhGcmFtZSosIGNvbnN0IEZyYW1lTG9hZFJl cXVlc3QmLCBjb25zdCBXaW5kb3dGZWF0dXJlcyYpCiB7CiAgICAgdWludDY0X3QgbmV3UGFnZUlE ID0gMDsKLSAgICBJbnRTaXplIHZpZXdTaXplOwotICAgIFdlYlByZWZlcmVuY2VzU3RvcmUgc3Rv cmU7Ci0gICAgRHJhd2luZ0FyZWFCYXNlOjpEcmF3aW5nQXJlYUluZm8gZHJhd2luZ0FyZWFJbmZv OworICAgIFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMgcGFyYW1ldGVyczsKICAgICBpZiAoIVdl YlByb2Nlc3M6OnNoYXJlZCgpLmNvbm5lY3Rpb24oKS0+c2VuZFN5bmMoV2ViUGFnZVByb3h5TWVz c2FnZTo6Q3JlYXRlTmV3UGFnZSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgbV9wYWdlLT5wYWdlSUQoKSwgQ29yZUlQQzo6SW4oKSwKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgQ29yZUlQQzo6 T3V0KG5ld1BhZ2VJRCwgdmlld1NpemUsIHN0b3JlLCBkcmF3aW5nQXJlYUluZm8pLAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBDb3JlSVBDOjpP dXQobmV3UGFnZUlELCBwYXJhbWV0ZXJzKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgQ29yZUlQQzo6Q29ubmVjdGlvbjo6Tm9UaW1lb3V0KSkg ewogICAgICAgICByZXR1cm4gMDsKICAgICB9CkBAIC0xMjEsNyArMTIwLDcgQEAgUGFnZSogV2Vi Q2hyb21lQ2xpZW50OjpjcmVhdGVXaW5kb3coRnJhbWUqLCBjb25zdCBGcmFtZUxvYWRSZXF1ZXN0 JiwgY29uc3QgV2luZG8KICAgICBpZiAoIW5ld1BhZ2VJRCkKICAgICAgICAgcmV0dXJuIDA7CiAK LSAgICBXZWJQYWdlKiBuZXdXZWJQYWdlID0gV2ViUHJvY2Vzczo6c2hhcmVkKCkuY3JlYXRlV2Vi UGFnZShuZXdQYWdlSUQsIHZpZXdTaXplLCBzdG9yZSwgZHJhd2luZ0FyZWFJbmZvKTsKKyAgICBX ZWJQYWdlKiBuZXdXZWJQYWdlID0gV2ViUHJvY2Vzczo6c2hhcmVkKCkuY3JlYXRlV2ViUGFnZShu ZXdQYWdlSUQsIHBhcmFtZXRlcnMpOwogICAgIHJldHVybiBuZXdXZWJQYWdlLT5jb3JlUGFnZSgp OwogfQogCmRpZmYgLS1naXQgYS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAgYi9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAKaW5kZXggOTYzNjcwNWQ3NGQ1YWVjOTRj NGFlNGE3ZTVjMWZmZDRiZTdkODA1Yi4uNzM0OTE4MzRlZjY5ZTQzOWU1NzNhNWZmOWY2NDdhOTE2 NWY1MDI0NCAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuY3BwCisr KyBiL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcApAQCAtMzEsNiArMzEsNyBAQAog I2luY2x1ZGUgIldlYkNvcmVBcmd1bWVudENvZGVycy5oIgogI2luY2x1ZGUgIldlYkZyYW1lLmgi CiAjaW5jbHVkZSAiV2ViUGFnZS5oIgorI2luY2x1ZGUgIldlYlBhZ2VDcmVhdGlvblBhcmFtZXRl cnMuaCIKICNpbmNsdWRlICJXZWJQbGF0Zm9ybVN0cmF0ZWdpZXMuaCIKICNpbmNsdWRlICJXZWJQ cmVmZXJlbmNlc1N0b3JlLmgiCiAjaW5jbHVkZSAiV2ViUHJvY2Vzc1Byb3h5TWVzc2FnZUtpbmRz LmgiCkBAIC0xODUsMTQgKzE4NiwxNCBAQCBXZWJQYWdlKiBXZWJQcm9jZXNzOjp3ZWJQYWdlKHVp bnQ2NF90IHBhZ2VJRCkgY29uc3QKICAgICByZXR1cm4gbV9wYWdlTWFwLmdldChwYWdlSUQpLmdl dCgpOwogfQogCi1XZWJQYWdlKiBXZWJQcm9jZXNzOjpjcmVhdGVXZWJQYWdlKHVpbnQ2NF90IHBh Z2VJRCwgY29uc3QgSW50U2l6ZSYgdmlld1NpemUsIGNvbnN0IFdlYlByZWZlcmVuY2VzU3RvcmUm IHN0b3JlLCBjb25zdCBEcmF3aW5nQXJlYUJhc2U6OkRyYXdpbmdBcmVhSW5mbyYgZHJhd2luZ0Fy ZWFJbmZvKQorV2ViUGFnZSogV2ViUHJvY2Vzczo6Y3JlYXRlV2ViUGFnZSh1aW50NjRfdCBwYWdl SUQsIGNvbnN0IFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMmIHBhcmFtZXRlcnMpCiB7CiAgICAg Ly8gSXQgaXMgbmVjZXNzYXJ5IHRvIGNoZWNrIGZvciBwYWdlIGV4aXN0ZW5jZSBoZXJlIHNpbmNl IGR1cmluZyBhIHdpbmRvdy5vcGVuKCkgKG9yIHRhcmdldGVkCiAgICAgLy8gbGluaykgdGhlIFdl YlBhZ2UgZ2V0cyBjcmVhdGVkIGJvdGggaW4gdGhlIHN5bmNocm9ub3VzIGhhbmRsZXIgYW5kIHRo cm91Z2ggdGhlIG5vcm1hbCB3YXkuIAogICAgIHN0ZDo6cGFpcjxIYXNoTWFwPHVpbnQ2NF90LCBS ZWZQdHI8V2ViUGFnZT4gPjo6aXRlcmF0b3IsIGJvb2w+IHJlc3VsdCA9IG1fcGFnZU1hcC5hZGQo cGFnZUlELCAwKTsKICAgICBpZiAocmVzdWx0LnNlY29uZCkgewogICAgICAgICBBU1NFUlQoIXJl c3VsdC5maXJzdC0+c2Vjb25kKTsKLSAgICAgICAgcmVzdWx0LmZpcnN0LT5zZWNvbmQgPSBXZWJQ YWdlOjpjcmVhdGUocGFnZUlELCB2aWV3U2l6ZSwgc3RvcmUsIGRyYXdpbmdBcmVhSW5mbyk7Cisg ICAgICAgIHJlc3VsdC5maXJzdC0+c2Vjb25kID0gV2ViUGFnZTo6Y3JlYXRlKHBhZ2VJRCwgcGFy YW1ldGVycy52aWV3U2l6ZSwgcGFyYW1ldGVycy5zdG9yZSwgcGFyYW1ldGVycy5kcmF3aW5nQXJl YUluZm8pOwogICAgIH0KIAogICAgIEFTU0VSVChyZXN1bHQuZmlyc3QtPnNlY29uZCk7CkBAIC0y OTEsMTMgKzI5MiwxMSBAQCB2b2lkIFdlYlByb2Nlc3M6OmRpZFJlY2VpdmVNZXNzYWdlKENvcmVJ UEM6OkNvbm5lY3Rpb24qIGNvbm5lY3Rpb24sIENvcmVJUEM6Ok1lcwogICAgICAgICAgICAgCiAg ICAgICAgICAgICBjYXNlIFdlYlByb2Nlc3NNZXNzYWdlOjpDcmVhdGU6IHsKICAgICAgICAgICAg ICAgICB1aW50NjRfdCBwYWdlSUQgPSBhcmd1bWVudHMtPmRlc3RpbmF0aW9uSUQoKTsKLSAgICAg ICAgICAgICAgICBJbnRTaXplIHZpZXdTaXplOwotICAgICAgICAgICAgICAgIFdlYlByZWZlcmVu Y2VzU3RvcmUgc3RvcmU7Ci0gICAgICAgICAgICAgICAgRHJhd2luZ0FyZWE6OkRyYXdpbmdBcmVh SW5mbyBkcmF3aW5nQXJlYUluZm87Ci0gICAgICAgICAgICAgICAgaWYgKCFhcmd1bWVudHMtPmRl Y29kZShDb3JlSVBDOjpPdXQodmlld1NpemUsIHN0b3JlLCBkcmF3aW5nQXJlYUluZm8pKSkKKyAg ICAgICAgICAgICAgICBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzIHBhcmFtZXRlcnM7CisgICAg ICAgICAgICAgICAgaWYgKCFhcmd1bWVudHMtPmRlY29kZShDb3JlSVBDOjpPdXQocGFyYW1ldGVy cykpKQogICAgICAgICAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgICAgICAgICBjcmVh dGVXZWJQYWdlKHBhZ2VJRCwgdmlld1NpemUsIHN0b3JlLCBkcmF3aW5nQXJlYUluZm8pOworICAg ICAgICAgICAgICAgIGNyZWF0ZVdlYlBhZ2UocGFnZUlELCBwYXJhbWV0ZXJzKTsKICAgICAgICAg ICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBjYXNlIFdlYlByb2Nl c3NNZXNzYWdlOjpSZWdpc3RlclVSTFNjaGVtZUFzRW1wdHlEb2N1bWVudDogewpkaWZmIC0tZ2l0 IGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuaCBiL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJQcm9jZXNzLmgKaW5kZXggYjE1ODM1YjFlNDc3YzA1YjZkODRiNjhlOGU5OTQ1ODk2YmNkZjg1 OS4uNWNmMjg2Y2MwODY4Y2QzMmY1MmNhZTdhZDA4ZjFjYzZlNjAyM2U4YyAxMDA2NDQKLS0tIGEv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuaAorKysgYi9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViUHJvY2Vzcy5oCkBAIC00NCw2ICs0NCw3IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogY2xhc3Mg SW5qZWN0ZWRCdW5kbGU7CiBjbGFzcyBXZWJGcmFtZTsKIGNsYXNzIFdlYlBhZ2U7CitzdHJ1Y3Qg V2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVyczsKIHN0cnVjdCBXZWJQcmVmZXJlbmNlc1N0b3JlOwog CiBjbGFzcyBXZWJQcm9jZXNzIDogQ29yZUlQQzo6Q29ubmVjdGlvbjo6Q2xpZW50IHsKQEAgLTU2 LDcgKzU3LDcgQEAgcHVibGljOgogICAgIFJ1bkxvb3AqIHJ1bkxvb3AoKSBjb25zdCB7IHJldHVy biBtX3J1bkxvb3A7IH0KIAogICAgIFdlYlBhZ2UqIHdlYlBhZ2UodWludDY0X3QgcGFnZUlEKSBj b25zdDsKLSAgICBXZWJQYWdlKiBjcmVhdGVXZWJQYWdlKHVpbnQ2NF90IHBhZ2VJRCwgY29uc3Qg V2ViQ29yZTo6SW50U2l6ZSYgdmlld1NpemUsIGNvbnN0IFdlYlByZWZlcmVuY2VzU3RvcmUmLCBj b25zdCBEcmF3aW5nQXJlYUJhc2U6OkRyYXdpbmdBcmVhSW5mbyYpOworICAgIFdlYlBhZ2UqIGNy ZWF0ZVdlYlBhZ2UodWludDY0X3QgcGFnZUlELCBjb25zdCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0 ZXJzJik7CiAgICAgdm9pZCByZW1vdmVXZWJQYWdlKHVpbnQ2NF90IHBhZ2VJRCk7CiAKICAgICBJ bmplY3RlZEJ1bmRsZSogaW5qZWN0ZWRCdW5kbGUoKSBjb25zdCB7IHJldHVybiBtX2luamVjdGVk QnVuZGxlLmdldCgpOyB9CmRpZmYgLS1naXQgYS9XZWJLaXQyL3dpbi9XZWJLaXQyLnZjcHJvaiBi L1dlYktpdDIvd2luL1dlYktpdDIudmNwcm9qCmluZGV4IDcyODQwNTU2ODZmYzVlMzBlZGRhYTBj OWYwZDJlMzQ3NTI5YWIwYWIuLjc1OTNlYjAwYmVmODJmOTNmMTk1MmY3Yjc2Njc0ZGRlNDcxOGNj OTIgMTAwNzU1Ci0tLSBhL1dlYktpdDIvd2luL1dlYktpdDIudmNwcm9qCisrKyBiL1dlYktpdDIv d2luL1dlYktpdDIudmNwcm9qCkBAIC00ODEsNiArNDgxLDE0IEBACiAJCQkJPg0KIAkJCTwvRmls ZT4NCiAJCQk8RmlsZQ0KKwkJCQlSZWxhdGl2ZVBhdGg9Ii4uXFNoYXJlZFxXZWJQYWdlQ3JlYXRp b25QYXJhbWV0ZXJzLmNwcCINCisJCQkJPg0KKwkJCTwvRmlsZT4NCisJCQk8RmlsZQ0KKwkJCQlS ZWxhdGl2ZVBhdGg9Ii4uXFNoYXJlZFxXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmgiDQorCQkJ CT4NCisJCQk8L0ZpbGU+DQorCQkJPEZpbGUNCiAJCQkJUmVsYXRpdmVQYXRoPSIuLlxTaGFyZWRc V2ViUHJlZmVyZW5jZXNTdG9yZS5jcHAiDQogCQkJCT4NCiAJCQk8L0ZpbGU+DQo=