50224 2010-11-30 04:26:49 -0800 Upstream recent changes to WebCore/platform/network/android 2010-12-01 13:23:26 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Android Android RESOLVED FIXED P2 Normal --- 1 steveblock webkit-unassigned benm jorlow steveblock oldest_to_newest 314951 0 steveblock 2010-11-30 04:26:49 -0800 NetworkingContext::isPrivateBrowsingEnabled() is no longer required due to refactoring of Android code not yet upstreamed. 314992 1 steveblock 2010-11-30 06:32:39 -0800 It turns out the no-longer-needed method isn't present upstream, so I'm broadening this bug to cover more general upstreaming in WebCore/platform/network/android. 315000 2 75139 steveblock 2010-11-30 06:44:29 -0800 Created attachment 75139 Patch 315009 3 75139 jorlow 2010-11-30 06:53:25 -0800 Comment on attachment 75139 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=75139&action=review r=me > WebCore/platform/network/android/ResourceHandleAndroid.cpp:85 > +// TODO: this needs upstreaming. FIXME 315855 4 steveblock 2010-12-01 13:23:26 -0800 Landed as r73062 <http://trac.webkit.org/changeset/73062> 75139 2010-11-30 06:44:29 -0800 2010-11-30 06:53:25 -0800 Patch bug-50224-20101130144427.patch text/plain 9792 steveblock SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3MjkwOSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjYgQEAKKzIwMTAtMTEtMzAgIFN0ZXZlIEJsb2NrICA8c3RldmVibG9ja0Bnb29n bGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFVwc3RyZWFtIHJlY2VudCBjaGFuZ2VzIHRvIFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9hbmRy b2lkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MDIy NAorCisgICAgICAgIEFuZHJvaWQgaW1wbGVtZW50YXRpb24gY2hhbmdlcyBvbmx5LCBubyBuZXcg dGVzdHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL05ldHdvcmtpbmdDb250ZXh0Lmg6 CisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9hbmRyb2lkL0Nvb2tpZUphckFuZHJvaWQuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6c2V0Q29va2llcyk6CisgICAgICAgIChXZWJDb3JlOjpjb29r aWVzKToKKyAgICAgICAgKFdlYkNvcmU6OmNvb2tpZVJlcXVlc3RIZWFkZXJGaWVsZFZhbHVlKToK KyAgICAgICAgKFdlYkNvcmU6OmNvb2tpZXNFbmFibGVkKToKKyAgICAgICAgKiBwbGF0Zm9ybS9u ZXR3b3JrL2FuZHJvaWQvUHJveHlTZXJ2ZXJBbmRyb2lkLmNwcDogQWRkZWQuCisgICAgICAgIChX ZWJDb3JlOjpwcm94eVNlcnZlcnNGb3JVUkwpOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsv YW5kcm9pZC9SZXNvdXJjZUhhbmRsZUFuZHJvaWQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVz b3VyY2VIYW5kbGU6OnN0YXJ0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlSGFuZGxlOjps b2FkUmVzb3VyY2VTeW5jaHJvbm91c2x5KToKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2Fu ZHJvaWQvUmVzb3VyY2VSZXF1ZXN0QW5kcm9pZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjppbml0 aWFsaXplTWF4aW11bUhUVFBDb25uZWN0aW9uQ291bnRQZXJIb3N0KToKKwogMjAxMC0xMS0zMCAg UmVuYXRhIEhvZG92YW4gIDxyZW5pQGluZi51LXN6ZWdlZC5odT4KIAogICAgICAgICBSZXZpZXdl ZCBieSBBbmRyZWFzIEtsaW5nLgpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL05ldHdv cmtpbmdDb250ZXh0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL05l dHdvcmtpbmdDb250ZXh0LmgJKHJldmlzaW9uIDcyOTA4KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9u ZXR3b3JrL05ldHdvcmtpbmdDb250ZXh0LmgJKHdvcmtpbmcgY29weSkKQEAgLTMzLDYgKzMzLDEw IEBAIGNsYXNzIFFOZXR3b3JrQWNjZXNzTWFuYWdlcjsKIAogbmFtZXNwYWNlIFdlYkNvcmUgewog CisjaWYgUExBVEZPUk0oQU5EUk9JRCkKK2NsYXNzIEZyYW1lTG9hZGVyQ2xpZW50OworY2xhc3Mg TWFpblJlc291cmNlTG9hZGVyOworI2VuZGlmCiBjbGFzcyBSZXNvdXJjZUVycm9yOwogY2xhc3Mg UmVzb3VyY2VSZXF1ZXN0OwogCkBAIC02MCw2ICs2NCwxMSBAQCBwdWJsaWM6CiAgICAgdmlydHVh bCBSZXNvdXJjZUVycm9yIGJsb2NrZWRFcnJvcihjb25zdCBSZXNvdXJjZVJlcXVlc3QmKSBjb25z dCA9IDA7CiAjZW5kaWYKIAorI2lmIFBMQVRGT1JNKEFORFJPSUQpCisgICAgdmlydHVhbCBNYWlu UmVzb3VyY2VMb2FkZXIqIG1haW5SZXNvdXJjZUxvYWRlcigpIGNvbnN0ID0gMDsKKyAgICB2aXJ0 dWFsIEZyYW1lTG9hZGVyQ2xpZW50KiBmcmFtZUxvYWRlckNsaWVudCgpIGNvbnN0ID0gMDsKKyNl bmRpZgorCiBwcm90ZWN0ZWQ6CiAgICAgTmV0d29ya2luZ0NvbnRleHQoKSB7IH0KIH07CkluZGV4 OiBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvYW5kcm9pZC9Db29raWVKYXJBbmRyb2lkLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvYW5kcm9pZC9Db29raWVKYXJB bmRyb2lkLmNwcAkocmV2aXNpb24gNzI5MDgpCisrKyBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsv YW5kcm9pZC9Db29raWVKYXJBbmRyb2lkLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzEsMjUgKzMx LDI1IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotdm9pZCBzZXRDb29raWVzKERvY3VtZW50 KiwgY29uc3QgS1VSTCYgdXJsLCBjb25zdCBTdHJpbmcmIHZhbHVlKQordm9pZCBzZXRDb29raWVz KERvY3VtZW50KiBkb2N1bWVudCwgY29uc3QgS1VSTCYgdXJsLCBjb25zdCBTdHJpbmcmIHZhbHVl KQogewotICAgIFBsYXRmb3JtQnJpZGdlOjpzZXRDb29raWVzKHVybCwgdmFsdWUpOworICAgIFBs YXRmb3JtQnJpZGdlOjpzZXRDb29raWVzKGRvY3VtZW50LCB1cmwsIHZhbHVlKTsKIH0KIAotU3Ry aW5nIGNvb2tpZXMoY29uc3QgRG9jdW1lbnQqLCBjb25zdCBLVVJMJiB1cmwpCitTdHJpbmcgY29v a2llcyhjb25zdCBEb2N1bWVudCogZG9jdW1lbnQsIGNvbnN0IEtVUkwmIHVybCkKIHsKLSAgICBy ZXR1cm4gUGxhdGZvcm1CcmlkZ2U6OmNvb2tpZXModXJsKTsKKyAgICByZXR1cm4gUGxhdGZvcm1C cmlkZ2U6OmNvb2tpZXMoZG9jdW1lbnQsIHVybCk7CiB9CiAKLVN0cmluZyBjb29raWVSZXF1ZXN0 SGVhZGVyRmllbGRWYWx1ZShjb25zdCBEb2N1bWVudCosIGNvbnN0IEtVUkwmIHVybCkKK1N0cmlu ZyBjb29raWVSZXF1ZXN0SGVhZGVyRmllbGRWYWx1ZShjb25zdCBEb2N1bWVudCogZG9jdW1lbnQs IGNvbnN0IEtVUkwmIHVybCkKIHsKICAgICAvLyBGSVhNRTogaW5jbHVkZSBIdHRwT25seSBjb29r aWUuCi0gICAgcmV0dXJuIFBsYXRmb3JtQnJpZGdlOjpjb29raWVzKHVybCk7CisgICAgcmV0dXJu IFBsYXRmb3JtQnJpZGdlOjpjb29raWVzKGRvY3VtZW50LCB1cmwpOwogfQogCi1ib29sIGNvb2tp ZXNFbmFibGVkKGNvbnN0IERvY3VtZW50KikKK2Jvb2wgY29va2llc0VuYWJsZWQoY29uc3QgRG9j dW1lbnQqIGRvY3VtZW50KQogewotICAgIHJldHVybiBQbGF0Zm9ybUJyaWRnZTo6Y29va2llc0Vu YWJsZWQoKTsKKyAgICByZXR1cm4gUGxhdGZvcm1CcmlkZ2U6OmNvb2tpZXNFbmFibGVkKGRvY3Vt ZW50KTsKIH0KIAogfQpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2FuZHJvaWQvUHJv eHlTZXJ2ZXJBbmRyb2lkLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL25ldHdv cmsvYW5kcm9pZC9Qcm94eVNlcnZlckFuZHJvaWQuY3BwCShyZXZpc2lvbiAwKQorKysgV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL2FuZHJvaWQvUHJveHlTZXJ2ZXJBbmRyb2lkLmNwcAkocmV2aXNp b24gMCkKQEAgLTAsMCArMSw0MCBAQAorLyoKKyAqIENvcHlyaWdodCAyMDEwLCBUaGUgQW5kcm9p ZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJl ZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Ig d2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhl IGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRpb25z IG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5v dGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1l ci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0 aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25z IGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9u IGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgor ICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgVEhFIENPUFlSSUdIVCBIT0xERVJT IGBgQVMgSVMnJyBBTkQgQU5ZCisgKiBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5D TFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFRIRQorICogSU1QTElFRCBXQVJSQU5USUVTIE9G IE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQT1NF IEFSRSBESVNDTEFJTUVELiAgSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgQ09NUFVURVIsIElOQy4g T1IKKyAqIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJ TkNJREVOVEFMLCBTUEVDSUFMLAorICogRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFH RVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogUFJPQ1VSRU1FTlQgT0YgU1VC U1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SCisgKiBQUk9G SVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkg VEhFT1JZCisgKiBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFC SUxJVFksIE9SIFRPUlQKKyAqIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFS SVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQorICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZF TiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisj aW5jbHVkZSAiY29uZmlnLmgiCisjaW5jbHVkZSAiUHJveHlTZXJ2ZXIuaCIKKworI2luY2x1ZGUg Ik5vdEltcGxlbWVudGVkLmgiCisKK25hbWVzcGFjZSBXZWJDb3JlIHsKKworVmVjdG9yPFByb3h5 U2VydmVyPiBwcm94eVNlcnZlcnNGb3JVUkwoY29uc3QgS1VSTCYsIGNvbnN0IE5ldHdvcmtpbmdD b250ZXh0KikKK3sKKyAgICBub3RJbXBsZW1lbnRlZCgpOworICAgIHJldHVybiBWZWN0b3I8UHJv eHlTZXJ2ZXI+KCk7Cit9CisKK30KSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9hbmRy b2lkL1Jlc291cmNlSGFuZGxlQW5kcm9pZC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0 Zm9ybS9uZXR3b3JrL2FuZHJvaWQvUmVzb3VyY2VIYW5kbGVBbmRyb2lkLmNwcAkocmV2aXNpb24g NzI5MDgpCisrKyBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvYW5kcm9pZC9SZXNvdXJjZUhhbmRs ZUFuZHJvaWQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNCw3ICsyNCw2IEBACiAgKi8KIAogI2lu Y2x1ZGUgImNvbmZpZy5oIgotCiAjaW5jbHVkZSAiUmVzb3VyY2VIYW5kbGUuaCIKIAogI2luY2x1 ZGUgIkNhY2hlZFJlc291cmNlTG9hZGVyLmgiCkBAIC0zNiw2ICszNSw3IEBACiAjaW5jbHVkZSAi UmVzb3VyY2VIYW5kbGVDbGllbnQuaCIKICNpbmNsdWRlICJSZXNvdXJjZUhhbmRsZUludGVybmFs LmgiCiAjaW5jbHVkZSAiUmVzb3VyY2VMb2FkZXJBbmRyb2lkLmgiCisjaW5jbHVkZSAiU2V0dGlu Z3MuaCIKICNpbmNsdWRlIDx3dGYvdGV4dC9DU3RyaW5nLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3Jl IHsKQEAgLTQ4LDE2ICs0OCwxNCBAQCBSZXNvdXJjZUhhbmRsZTo6flJlc291cmNlSGFuZGxlKCkK IHsKIH0KIAotYm9vbCBSZXNvdXJjZUhhbmRsZTo6c3RhcnQoRnJhbWUqIGZyYW1lKQorYm9vbCBS ZXNvdXJjZUhhbmRsZTo6c3RhcnQoTmV0d29ya2luZ0NvbnRleHQqIGNvbnRleHQpCiB7Ci0gICAg RG9jdW1lbnRMb2FkZXIqIGRvY3VtZW50TG9hZGVyID0gZnJhbWUtPmxvYWRlcigpLT5hY3RpdmVE b2N1bWVudExvYWRlcigpOwotICAgIE1haW5SZXNvdXJjZUxvYWRlciogbWFpbkxvYWRlciA9IGRv Y3VtZW50TG9hZGVyLT5tYWluUmVzb3VyY2VMb2FkZXIoKTsKLSAgICBib29sIGlzTWFpblJlc291 cmNlID0gbWFpbkxvYWRlciAmJiAobWFpbkxvYWRlci0+aGFuZGxlKCkgPT0gdGhpcyk7Ci0KLSAg ICBQYXNzUmVmUHRyPFJlc291cmNlTG9hZGVyQW5kcm9pZD4gbG9hZGVyID0gUmVzb3VyY2VMb2Fk ZXJBbmRyb2lkOjpzdGFydCh0aGlzLCBkLT5tX3JlcXVlc3QsIGZyYW1lLT5sb2FkZXIoKS0+Y2xp ZW50KCksIGlzTWFpblJlc291cmNlLCBmYWxzZSk7CisgICAgTWFpblJlc291cmNlTG9hZGVyKiBt YWluTG9hZGVyID0gY29udGV4dC0+bWFpblJlc291cmNlTG9hZGVyKCk7CisgICAgYm9vbCBpc01h aW5SZXNvdXJjZSA9IHN0YXRpY19jYXN0PHZvaWQqPihtYWluTG9hZGVyKSA9PSBzdGF0aWNfY2Fz dDx2b2lkKj4oY2xpZW50KCkpOworICAgIFJlZlB0cjxSZXNvdXJjZUxvYWRlckFuZHJvaWQ+IGxv YWRlciA9IFJlc291cmNlTG9hZGVyQW5kcm9pZDo6c3RhcnQodGhpcywgZC0+bV9maXJzdFJlcXVl c3QsIGNvbnRleHQtPmZyYW1lTG9hZGVyQ2xpZW50KCksIGlzTWFpblJlc291cmNlLCBmYWxzZSk7 CiAKICAgICBpZiAobG9hZGVyKSB7Ci0gICAgICAgIGQtPm1fbG9hZGVyID0gbG9hZGVyOworICAg ICAgICBkLT5tX2xvYWRlciA9IGxvYWRlci5yZWxlYXNlKCk7CiAgICAgICAgIHJldHVybiB0cnVl OwogICAgIH0KIApAQCAtODMsNiArODEsMTUgQEAgYm9vbCBSZXNvdXJjZUhhbmRsZTo6c3VwcG9y dHNCdWZmZXJlZERhdAogICAgIHJldHVybiBmYWxzZTsKIH0KIAorI2lmIFBMQVRGT1JNKEFORFJP SUQpCisvLyBUT0RPOiB0aGlzIG5lZWRzIHVwc3RyZWFtaW5nLgordm9pZCBSZXNvdXJjZUhhbmRs ZTo6cGF1c2VMb2FkKGJvb2wgcGF1c2UpCit7CisgICAgaWYgKGQtPm1fbG9hZGVyKQorICAgICAg ICBkLT5tX2xvYWRlci0+cGF1c2VMb2FkKHBhdXNlKTsKK30KKyNlbmRpZgorCiB2b2lkIFJlc291 cmNlSGFuZGxlOjpwbGF0Zm9ybVNldERlZmVyc0xvYWRpbmcoYm9vbCkKIHsKICAgICBub3RJbXBs ZW1lbnRlZCgpOwpAQCAtMTAxLDExICsxMDgsMTEgQEAgYm9vbCBSZXNvdXJjZUhhbmRsZTo6d2ls bExvYWRGcm9tQ2FjaGUoUgogICAgIHJldHVybiBSZXNvdXJjZUxvYWRlckFuZHJvaWQ6OndpbGxM b2FkRnJvbUNhY2hlKHJlcXVlc3QudXJsKCksIGZvcm1EYXRhID8gZm9ybURhdGEtPmlkZW50aWZp ZXIoKSA6IDApOwogfQogCi1ib29sIFJlc291cmNlSGFuZGxlOjpsb2Fkc0Jsb2NrZWQoKSAKK2Jv b2wgUmVzb3VyY2VIYW5kbGU6OmxvYWRzQmxvY2tlZCgpCiB7CiAgICAgLy8gRklYTUUsIG5lZWQg dG8gY2hlY2sgd2hldGhlciBjb25uZWN0aW9uIHBpcGUgaXMgYmxvY2tlZC4KICAgICAvLyByZXR1 cm4gZmFsc2UgZm9yIG5vdwotICAgIHJldHVybiBmYWxzZTsgCisgICAgcmV0dXJuIGZhbHNlOwog fQogCiAvLyBDbGFzcyB0byBoYW5kbGUgc3luY2hyb25pemVkIGxvYWRpbmcgb2YgcmVzb3VyY2Vz LgpAQCAtMTQwLDE1ICsxNDcsMTcgQEAgcHJpdmF0ZToKICAgICBXVEY6OlZlY3RvcjxjaGFyPiog bV9kYXRhOwogfTsKIAotdm9pZCBSZXNvdXJjZUhhbmRsZTo6bG9hZFJlc291cmNlU3luY2hyb25v dXNseShjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsCi0gICAgICAgIFN0b3JlZENyZWRl bnRpYWxzIC8qc3RvcmVkQ3JlZGVudGlhbHMqLywKLSAgICAgICAgUmVzb3VyY2VFcnJvciYgZXJy b3IsIFJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNlLCBXVEY6OlZlY3RvcjxjaGFyPiYgZGF0YSwK LSAgICAgICAgRnJhbWUqIGZyYW1lKSAKK3ZvaWQgUmVzb3VyY2VIYW5kbGU6OmxvYWRSZXNvdXJj ZVN5bmNocm9ub3VzbHkoTmV0d29ya2luZ0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IFJlc291cmNl UmVxdWVzdCYgcmVxdWVzdCwKKyAgICAgICAgU3RvcmVkQ3JlZGVudGlhbHMsIFJlc291cmNlRXJy b3ImIGVycm9yLCBSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSwgV1RGOjpWZWN0b3I8Y2hhcj4m IGRhdGEpCiB7CiAgICAgU3luY0xvYWRlciBzKGVycm9yLCByZXNwb25zZSwgZGF0YSk7Ci0gICAg UmVmUHRyPFJlc291cmNlSGFuZGxlPiBoID0gYWRvcHRSZWYobmV3IFJlc291cmNlSGFuZGxlKHJl cXVlc3QsICZzLCBmYWxzZSwgZmFsc2UsIGZhbHNlKSk7CisgICAgUmVmUHRyPFJlc291cmNlSGFu ZGxlPiBoID0gYWRvcHRSZWYobmV3IFJlc291cmNlSGFuZGxlKHJlcXVlc3QsICZzLCBmYWxzZSwg ZmFsc2UpKTsKICAgICAvLyBUaGlzIGJsb2NrcyB1bnRpbCB0aGUgbG9hZCBpcyBmaW5pc2hlZC4K LSAgICBSZXNvdXJjZUxvYWRlckFuZHJvaWQ6OnN0YXJ0KGguZ2V0KCksIHJlcXVlc3QsIGZyYW1l LT5sb2FkZXIoKS0+Y2xpZW50KCksIGZhbHNlLCB0cnVlKTsKKyAgICAvLyBVc2UgdGhlIHJlcXVl c3Qgb3duZWQgYnkgdGhlIFJlc291cmNlSGFuZGxlLiBUaGlzIGhhcyBoYWQgdGhlIHVzZXJuYW1l CisgICAgLy8gYW5kIHBhc3N3b3JkIChpZiBwcmVzZW50KSBzdHJpcHBlZCBmcm9tIHRoZSBVUkwg aW4KKyAgICAvLyBSZXNvdXJjZUhhbmRsZUludGVybmFsOjpSZXNvdXJjZUhhbmRsZUludGVybmFs KCkuIFRoaXMgbWF0Y2hlcyB0aGUKKyAgICAvLyBiZWhhdmlvdXIgaW4gdGhlIGFzeW5jaHJvbm91 cyBjYXNlLgorICAgIFJlc291cmNlTG9hZGVyQW5kcm9pZDo6c3RhcnQoaC5nZXQoKSwgcmVxdWVz dCwgY29udGV4dC0+ZnJhbWVMb2FkZXJDbGllbnQoKSwgZmFsc2UsIHRydWUpOwogfQogCiB9IC8v IG5hbWVzcGFjZSBXZWJDb3JlCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvYW5kcm9p ZC9SZXNvdXJjZVJlcXVlc3RBbmRyb2lkLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRm b3JtL25ldHdvcmsvYW5kcm9pZC9SZXNvdXJjZVJlcXVlc3RBbmRyb2lkLmNwcAkocmV2aXNpb24g NzI5MDgpCisrKyBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvYW5kcm9pZC9SZXNvdXJjZVJlcXVl c3RBbmRyb2lkLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzAsMTAgKzMwLDE3IEBAIG5hbWVzcGFj ZSBXZWJDb3JlIHsKIAogdW5zaWduZWQgaW5pdGlhbGl6ZU1heGltdW1IVFRQQ29ubmVjdGlvbkNv dW50UGVySG9zdCgpCiB7CisjaWYgVVNFKENIUk9NRV9ORVRXT1JLX1NUQUNLKQorICAgIC8vIFRo ZSBjaHJvbWl1bSBuZXR3b3JrIHN0YWNrIGFscmVhZHkgaGFuZGxlcyBsaW1pdGluZyB0aGUgbnVt YmVyIG9mCisgICAgLy8gcGFyYWxsZWwgcmVxdWVzdHMgcGVyIGhvc3QsIHNvIHRoZXJlJ3Mgbm8g bmVlZCB0byBkbyBpdCBoZXJlLiAgVGhlcmVmb3JlLAorICAgIC8vIHRoaXMgaXMgc2V0IHRvIGEg aGlnaCB2YWx1ZSB0aGF0IHNob3VsZCBuZXZlciBiZSBoaXQgaW4gcHJhY3RpY2UuCisgICAgcmV0 dXJuIDEwMDAwOworI2Vsc2UKICAgICAvLyBUaGlzIGlzIHVzZWQgYnkgdGhlIGxvYWRlciB0byBj b250cm9sIHRoZSBudW1iZXIgb2YgcGFyYWxsZWwgbG9hZAogICAgIC8vIHJlcXVlc3RzLiBPdXIg amF2YSBmcmFtZXdvcmsgaGFzIDQgdGhyZWFkcyB0aGF0IGNhbiBlYWNoIHBpcGVsaW5lIHVwIHRv CiAgICAgLy8gNSByZXF1ZXN0cy4gVXNlIDIwIGFzIGEgbWF4aW11bSBudW1iZXIuCiAgICAgcmV0 dXJuIDIwOworI2VuZGlmCiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK