64433 2011-07-12 22:10:39 -0700 Improve names of some ApplicationCacheStorage accessor methods 2011-07-13 14:42:55 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 joepeck webkit-unassigned ap joepeck oldest_to_newest 436247 0 joepeck 2011-07-12 22:10:39 -0700 In an earlier patch review Alexey mentioned: > > Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp:827 > > + // Failed to determine what is left in the quota. Fallback to allowing anything. > > It's a bad coding style violation that a function called remainingSizeForOriginExcludingCache() > returns a boolean, not the remaining size. This is a pre-existing issue, and not something you > did in this patch. There are a few functions that should be updated: quotaForOrigin, usageForOrigin, and remainingSizeForOriginExcludingCache I'll fix them with the suggested rename calculate...() 436252 1 100629 joepeck 2011-07-12 22:28:43 -0700 Created attachment 100629 [PATCH] Rename the functions 436669 2 joepeck 2011-07-13 14:42:55 -0700 Landed in r90948 <http://trac.webkit.org/changeset/90948>. 100629 2011-07-12 22:28:43 -0700 2011-07-12 23:09:50 -0700 [PATCH] Rename the functions rename.patch text/plain 12204 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3OWZjMDJhLi4zN2E0NzA2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzMg QEAKIDIwMTEtMDctMTIgIEpvc2VwaCBQZWNvcmFybyAgPGpvZXBlY2tAd2Via2l0Lm9yZz4KIAor ICAgICAgICBJbXByb3ZlIG5hbWVzIG9mIHNvbWUgQXBwbGljYXRpb25DYWNoZVN0b3JhZ2UgYWNj ZXNzb3IgbWV0aG9kcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NjQ0MzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBTb21lIG1ldGhvZHMgcmV0dXJuZWQgYSBib29sIGZvciBzdWNjZXNzL2ZhaWx1cmUgYW5k CisgICAgICAgIGFjdHVhbGx5IHJldHVybmVkIGEgdmFsdWUgYXMgYW4gb3V0IHBhcmFtZXRlciBz byB0aGVpcgorICAgICAgICBuYW1lIHdhcyBjb25mdXNpbmcuIFJlbmFtZSB0aGVzZSBtZXRob2Rz IHRvIG1ha2UgdGhlbQorICAgICAgICBtb3JlIGNsZWFyLgorCisgICAgICAgIChXZWJDb3JlOjpB cHBsaWNhdGlvbkNhY2hlOjpkaXNrVXNhZ2VGb3JPcmlnaW4pOgorICAgICAgICAqIGxvYWRlci9h cHBjYWNoZS9BcHBsaWNhdGlvbkNhY2hlR3JvdXAuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QXBw bGljYXRpb25DYWNoZUdyb3VwOjpyZWNhbGN1bGF0ZUF2YWlsYWJsZVNwYWNlSW5RdW90YSk6Cisg ICAgICAgICogbG9hZGVyL2FwcGNhY2hlL0FwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlOjpjYWxjdWxhdGVRdW90YUZv ck9yaWdpbik6CisgICAgICAgIChXZWJDb3JlOjpBcHBsaWNhdGlvbkNhY2hlU3RvcmFnZTo6Y2Fs Y3VsYXRlVXNhZ2VGb3JPcmlnaW4pOgorICAgICAgICAoV2ViQ29yZTo6QXBwbGljYXRpb25DYWNo ZVN0b3JhZ2U6OmNhbGN1bGF0ZVJlbWFpbmluZ1NpemVGb3JPcmlnaW5FeGNsdWRpbmdDYWNoZSk6 CisgICAgICAgIChXZWJDb3JlOjpBcHBsaWNhdGlvbkNhY2hlU3RvcmFnZTo6Y2hlY2tPcmlnaW5R dW90YSk6CisgICAgICAgICogbG9hZGVyL2FwcGNhY2hlL0FwcGxpY2F0aW9uQ2FjaGVTdG9yYWdl Lmg6CisgICAgICAgICogbG9hZGVyL2FwcGNhY2hlL0FwcGxpY2F0aW9uQ2FjaGUuY3BwOgorICAg ICAgICBSZW5hbWUgdGhlIG1ldGhvZHMuCisKKyAgICAgICAgKiBXZWJDb3JlLmV4cC5pbjoKKyAg ICAgICAgUmVwbGFjZWQgb2xkIHZlcnNpb25zLiBBbHNvLCBjYWxjdWxhdGVSZW1haW5pbmcgd2Fz bid0IG5lZWRlZAorICAgICAgICBvdXRzaWRlIFdlYkNvcmUsIHNvIG5vIGxvbmdlciBleHBvcnQg aXQuCisKKzIwMTEtMDctMTIgIEpvc2VwaCBQZWNvcmFybyAgPGpvZXBlY2tAd2Via2l0Lm9yZz4K KwogICAgICAgICBTb21lIEFwcGxpY2F0aW9uQ2FjaGUgT3JpZ2luIENsZWFudXAKICAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY0NDMxCiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluIGIvU291cmNlL1dlYkNvcmUvV2ViQ29y ZS5leHAuaW4KaW5kZXggNTdlOTIwMy4uMWMwNTZhYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvV2ViQ29yZS5leHAuaW4KKysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KQEAg LTE4NjgsMTcgKzE4NjgsMTYgQEAgX19aTks3V2ViQ29yZTROb2RlMTZ0cmF2ZXJzZU5leHROb2Rl RVBLUzBfCiAjaWYgRU5BQkxFKE9GRkxJTkVfV0VCX0FQUExJQ0FUSU9OUykKIF9fWk43V2ViQ29y ZTE2QXBwbGljYXRpb25DYWNoZTE4ZGlza1VzYWdlRm9yT3JpZ2luRVBOU18xNFNlY3VyaXR5T3Jp Z2luRQogX19aTjdXZWJDb3JlMTZBcHBsaWNhdGlvbkNhY2hlMjBkZWxldGVDYWNoZUZvck9yaWdp bkVQTlNfMTRTZWN1cml0eU9yaWdpbkUKLV9fWk43V2ViQ29yZTIzQXBwbGljYXRpb25DYWNoZVN0 b3JhZ2UxNHF1b3RhRm9yT3JpZ2luRVBLTlNfMTRTZWN1cml0eU9yaWdpbkVSeAogX19aTjdXZWJD b3JlMjNBcHBsaWNhdGlvbkNhY2hlU3RvcmFnZTE0c2V0TWF4aW11bVNpemVFeAotX19aTjdXZWJD b3JlMjNBcHBsaWNhdGlvbkNhY2hlU3RvcmFnZTE0dXNhZ2VGb3JPcmlnaW5FUEtOU18xNFNlY3Vy aXR5T3JpZ2luRVJ4CiBfX1pON1dlYkNvcmUyM0FwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlMTZkZWxl dGVBbGxFbnRyaWVzRXYKIF9fWk43V2ViQ29yZTIzQXBwbGljYXRpb25DYWNoZVN0b3JhZ2UxNnN0 b3JlQ29weU9mQ2FjaGVFUktOM1dURjZTdHJpbmdFUE5TXzIwQXBwbGljYXRpb25DYWNoZUhvc3RF CiBfX1pON1dlYkNvcmUyM0FwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlMTdzZXRDYWNoZURpcmVjdG9y eUVSS04zV1RGNlN0cmluZ0UKIF9fWk43V2ViQ29yZTIzQXBwbGljYXRpb25DYWNoZVN0b3JhZ2Ux OHZhY3V1bURhdGFiYXNlRmlsZUV2CiBfX1pON1dlYkNvcmUyM0FwcGxpY2F0aW9uQ2FjaGVTdG9y YWdlMTlnZXRPcmlnaW5zV2l0aENhY2hlRVJOM1dURjdIYXNoU2V0SU5TMV82UmVmUHRySU5TXzE0 U2VjdXJpdHlPcmlnaW5FRUVOU18xOFNlY3VyaXR5T3JpZ2luSGFzaEVOUzFfMTBIYXNoVHJhaXRz SVM1X0VFRUUKIF9fWk43V2ViQ29yZTIzQXBwbGljYXRpb25DYWNoZVN0b3JhZ2UyMXNldERlZmF1 bHRPcmlnaW5RdW90YUV4CitfX1pON1dlYkNvcmUyM0FwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlMjNj YWxjdWxhdGVRdW90YUZvck9yaWdpbkVQS05TXzE0U2VjdXJpdHlPcmlnaW5FUngKK19fWk43V2Vi Q29yZTIzQXBwbGljYXRpb25DYWNoZVN0b3JhZ2UyM2NhbGN1bGF0ZVVzYWdlRm9yT3JpZ2luRVBL TlNfMTRTZWN1cml0eU9yaWdpbkVSeAogX19aTjdXZWJDb3JlMjNBcHBsaWNhdGlvbkNhY2hlU3Rv cmFnZTI2c3RvcmVVcGRhdGVkUXVvdGFGb3JPcmlnaW5FUEtOU18xNFNlY3VyaXR5T3JpZ2luRXgK LV9fWk43V2ViQ29yZTIzQXBwbGljYXRpb25DYWNoZVN0b3JhZ2UzNnJlbWFpbmluZ1NpemVGb3JP cmlnaW5FeGNsdWRpbmdDYWNoZUVQS05TXzE0U2VjdXJpdHlPcmlnaW5FUE5TXzE2QXBwbGljYXRp b25DYWNoZUVSeAogX19aTjdXZWJDb3JlMjNBcHBsaWNhdGlvbkNhY2hlU3RvcmFnZTVlbXB0eUV2 CiBfX1pOSzdXZWJDb3JlMjNBcHBsaWNhdGlvbkNhY2hlU3RvcmFnZTExbWF4aW11bVNpemVFdgog I2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvYXBwY2FjaGUvQXBwbGlj YXRpb25DYWNoZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvYXBwY2FjaGUvQXBwbGljYXRp b25DYWNoZS5jcHAKaW5kZXggM2I1YTBjNC4uYTEzODcyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbG9hZGVyL2FwcGNhY2hlL0FwcGxpY2F0aW9uQ2FjaGUuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2xvYWRlci9hcHBjYWNoZS9BcHBsaWNhdGlvbkNhY2hlLmNwcApAQCAtMjEwLDcgKzIx MCw3IEBAIHZvaWQgQXBwbGljYXRpb25DYWNoZTo6ZGVsZXRlQ2FjaGVGb3JPcmlnaW4oU2VjdXJp dHlPcmlnaW4qIG9yaWdpbikKIGludDY0X3QgQXBwbGljYXRpb25DYWNoZTo6ZGlza1VzYWdlRm9y T3JpZ2luKFNlY3VyaXR5T3JpZ2luKiBvcmlnaW4pCiB7CiAgICAgaW50NjRfdCB1c2FnZSA9IDA7 Ci0gICAgY2FjaGVTdG9yYWdlKCkudXNhZ2VGb3JPcmlnaW4ob3JpZ2luLCB1c2FnZSk7CisgICAg Y2FjaGVTdG9yYWdlKCkuY2FsY3VsYXRlVXNhZ2VGb3JPcmlnaW4ob3JpZ2luLCB1c2FnZSk7CiAg ICAgcmV0dXJuIHVzYWdlOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIv YXBwY2FjaGUvQXBwbGljYXRpb25DYWNoZUdyb3VwLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9hcHBjYWNoZS9BcHBsaWNhdGlvbkNhY2hlR3JvdXAuY3BwCmluZGV4IDkyZDk1ODUuLjk4ZDVl YmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9hcHBjYWNoZS9BcHBsaWNhdGlv bkNhY2hlR3JvdXAuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9hcHBjYWNoZS9BcHBs aWNhdGlvbkNhY2hlR3JvdXAuY3BwCkBAIC04MDksNyArODA5LDcgQEAgdm9pZCBBcHBsaWNhdGlv bkNhY2hlR3JvdXA6OmNhY2hlVXBkYXRlRmFpbGVkKCkKIAogdm9pZCBBcHBsaWNhdGlvbkNhY2hl R3JvdXA6OnJlY2FsY3VsYXRlQXZhaWxhYmxlU3BhY2VJblF1b3RhKCkKIHsKLSAgICBpZiAoIWNh Y2hlU3RvcmFnZSgpLnJlbWFpbmluZ1NpemVGb3JPcmlnaW5FeGNsdWRpbmdDYWNoZShtX29yaWdp bi5nZXQoKSwgbV9uZXdlc3RDYWNoZS5nZXQoKSwgbV9hdmFpbGFibGVTcGFjZUluUXVvdGEpKSB7 CisgICAgaWYgKCFjYWNoZVN0b3JhZ2UoKS5jYWxjdWxhdGVSZW1haW5pbmdTaXplRm9yT3JpZ2lu RXhjbHVkaW5nQ2FjaGUobV9vcmlnaW4uZ2V0KCksIG1fbmV3ZXN0Q2FjaGUuZ2V0KCksIG1fYXZh aWxhYmxlU3BhY2VJblF1b3RhKSkgewogICAgICAgICAvLyBGYWlsZWQgdG8gZGV0ZXJtaW5lIHdo YXQgaXMgbGVmdCBpbiB0aGUgcXVvdGEuIEZhbGxiYWNrIHRvIGFsbG93aW5nIGFueXRoaW5nLgog ICAgICAgICBtX2F2YWlsYWJsZVNwYWNlSW5RdW90YSA9IEFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdl Ojpub1F1b3RhKCk7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2Fw cGNhY2hlL0FwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9hcHBjYWNoZS9BcHBsaWNhdGlvbkNhY2hlU3RvcmFnZS5jcHAKaW5kZXggZTJhMTQyOS4uZDg5 OWMxZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2FwcGNhY2hlL0FwcGxpY2F0 aW9uQ2FjaGVTdG9yYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvYXBwY2FjaGUv QXBwbGljYXRpb25DYWNoZVN0b3JhZ2UuY3BwCkBAIC00MzMsNyArNDMzLDcgQEAgdm9pZCBBcHBs aWNhdGlvbkNhY2hlU3RvcmFnZTo6c2V0RGVmYXVsdE9yaWdpblF1b3RhKGludDY0X3QgcXVvdGEp CiAgICAgbV9kZWZhdWx0T3JpZ2luUXVvdGEgPSBxdW90YTsKIH0KIAotYm9vbCBBcHBsaWNhdGlv bkNhY2hlU3RvcmFnZTo6cXVvdGFGb3JPcmlnaW4oY29uc3QgU2VjdXJpdHlPcmlnaW4qIG9yaWdp biwgaW50NjRfdCYgcXVvdGEpCitib29sIEFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlOjpjYWxjdWxh dGVRdW90YUZvck9yaWdpbihjb25zdCBTZWN1cml0eU9yaWdpbiogb3JpZ2luLCBpbnQ2NF90JiBx dW90YSkKIHsKICAgICAvLyBJZiBhbiBPcmlnaW4gcmVjb3JkIGRvZXNuJ3QgZXhpc3QsIHRoZW4g dGhlIENPVU5UIHdpbGwgYmUgMCBhbmQgcXVvdGEgd2lsbCBiZSAwLgogICAgIC8vIFVzaW5nIHRo ZSBjb3VudCB0byBkZXRlcm1pbmUgaWYgYSByZWNvcmQgZXhpc3RlZCBvciBub3QgaXMgYSBzYWZl IHdheSB0byBkZXRlcm1pbmUKQEAgLTQ1Niw3ICs0NTYsNyBAQCBib29sIEFwcGxpY2F0aW9uQ2Fj aGVTdG9yYWdlOjpxdW90YUZvck9yaWdpbihjb25zdCBTZWN1cml0eU9yaWdpbiogb3JpZ2luLCBp bnQ2NAogICAgIHJldHVybiBmYWxzZTsKIH0KIAotYm9vbCBBcHBsaWNhdGlvbkNhY2hlU3RvcmFn ZTo6dXNhZ2VGb3JPcmlnaW4oY29uc3QgU2VjdXJpdHlPcmlnaW4qIG9yaWdpbiwgaW50NjRfdCYg dXNhZ2UpCitib29sIEFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlOjpjYWxjdWxhdGVVc2FnZUZvck9y aWdpbihjb25zdCBTZWN1cml0eU9yaWdpbiogb3JpZ2luLCBpbnQ2NF90JiB1c2FnZSkKIHsKICAg ICAvLyBJZiBhbiBPcmlnaW5zIHJlY29yZCBkb2Vzbid0IGV4aXN0LCB0aGVuIHRoZSBTVU0gd2ls bCBiZSBudWxsLAogICAgIC8vIHdoaWNoIHdpbGwgYmVjb21lIDAsIGFzIGV4cGVjdGVkLCB3aGVu IGNvbnZlcnRpbmcgdG8gYSBudW1iZXIuCkBAIC00ODAsNyArNDgwLDcgQEAgYm9vbCBBcHBsaWNh dGlvbkNhY2hlU3RvcmFnZTo6dXNhZ2VGb3JPcmlnaW4oY29uc3QgU2VjdXJpdHlPcmlnaW4qIG9y aWdpbiwgaW50NjQKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKLWJvb2wgQXBwbGljYXRpb25DYWNo ZVN0b3JhZ2U6OnJlbWFpbmluZ1NpemVGb3JPcmlnaW5FeGNsdWRpbmdDYWNoZShjb25zdCBTZWN1 cml0eU9yaWdpbiogb3JpZ2luLCBBcHBsaWNhdGlvbkNhY2hlKiBjYWNoZSwgaW50NjRfdCYgcmVt YWluaW5nU2l6ZSkKK2Jvb2wgQXBwbGljYXRpb25DYWNoZVN0b3JhZ2U6OmNhbGN1bGF0ZVJlbWFp bmluZ1NpemVGb3JPcmlnaW5FeGNsdWRpbmdDYWNoZShjb25zdCBTZWN1cml0eU9yaWdpbiogb3Jp Z2luLCBBcHBsaWNhdGlvbkNhY2hlKiBjYWNoZSwgaW50NjRfdCYgcmVtYWluaW5nU2l6ZSkKIHsK ICAgICBvcGVuRGF0YWJhc2UoZmFsc2UpOwogICAgIGlmICghbV9kYXRhYmFzZS5pc09wZW4oKSkK QEAgLTUxOSw3ICs1MTksNyBAQCBib29sIEFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlOjpyZW1haW5p bmdTaXplRm9yT3JpZ2luRXhjbHVkaW5nQ2FjaGUoY29uc3QgU2VjdXJpdAogICAgIGlmIChyZXN1 bHQgPT0gU1FMUmVzdWx0Um93KSB7CiAgICAgICAgIGludDY0X3QgbnVtYmVyT2ZDYWNoZXMgPSBz dGF0ZW1lbnQuZ2V0Q29sdW1uSW50NjQoMCk7CiAgICAgICAgIGlmIChudW1iZXJPZkNhY2hlcyA9 PSAwKQotICAgICAgICAgICAgcXVvdGFGb3JPcmlnaW4ob3JpZ2luLCByZW1haW5pbmdTaXplKTsK KyAgICAgICAgICAgIGNhbGN1bGF0ZVF1b3RhRm9yT3JpZ2luKG9yaWdpbiwgcmVtYWluaW5nU2l6 ZSk7CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIHJlbWFpbmluZ1NpemUgPSBzdGF0ZW1lbnQu Z2V0Q29sdW1uSW50NjQoMSk7CiAgICAgICAgIHJldHVybiB0cnVlOwpAQCAtOTYwLDEwICs5NjAs MTAgQEAgYm9vbCBBcHBsaWNhdGlvbkNhY2hlU3RvcmFnZTo6Y2hlY2tPcmlnaW5RdW90YShBcHBs aWNhdGlvbkNhY2hlR3JvdXAqIGdyb3VwLCBBcHAKICAgICAvLyBDaGVjayBpZiB0aGUgb2xkQ2Fj aGUgd2l0aCB0aGUgbmV3Q2FjaGUgd291bGQgcmVhY2ggdGhlIHBlci1vcmlnaW4gcXVvdGEuCiAg ICAgaW50NjRfdCByZW1haW5pbmdTcGFjZUluT3JpZ2luOwogICAgIGNvbnN0IFNlY3VyaXR5T3Jp Z2luKiBvcmlnaW4gPSBncm91cC0+b3JpZ2luKCk7Ci0gICAgaWYgKHJlbWFpbmluZ1NpemVGb3JP cmlnaW5FeGNsdWRpbmdDYWNoZShvcmlnaW4sIG9sZENhY2hlLCByZW1haW5pbmdTcGFjZUluT3Jp Z2luKSkgeworICAgIGlmIChjYWxjdWxhdGVSZW1haW5pbmdTaXplRm9yT3JpZ2luRXhjbHVkaW5n Q2FjaGUob3JpZ2luLCBvbGRDYWNoZSwgcmVtYWluaW5nU3BhY2VJbk9yaWdpbikpIHsKICAgICAg ICAgaWYgKHJlbWFpbmluZ1NwYWNlSW5PcmlnaW4gPCBuZXdDYWNoZS0+ZXN0aW1hdGVkU2l6ZUlu U3RvcmFnZSgpKSB7CiAgICAgICAgICAgICBpbnQ2NF90IHF1b3RhOwotICAgICAgICAgICAgaWYg KHF1b3RhRm9yT3JpZ2luKG9yaWdpbiwgcXVvdGEpKSB7CisgICAgICAgICAgICBpZiAoY2FsY3Vs YXRlUXVvdGFGb3JPcmlnaW4ob3JpZ2luLCBxdW90YSkpIHsKICAgICAgICAgICAgICAgICB0b3Rh bFNwYWNlTmVlZGVkID0gcXVvdGEgLSByZW1haW5pbmdTcGFjZUluT3JpZ2luICsgbmV3Q2FjaGUt PmVzdGltYXRlZFNpemVJblN0b3JhZ2UoKTsKICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7 CiAgICAgICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvYXBwY2Fj aGUvQXBwbGljYXRpb25DYWNoZVN0b3JhZ2UuaCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9hcHBj YWNoZS9BcHBsaWNhdGlvbkNhY2hlU3RvcmFnZS5oCmluZGV4IDMxZmU4NjkuLjQyMmYyMzA4IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvYXBwY2FjaGUvQXBwbGljYXRpb25DYWNo ZVN0b3JhZ2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvYXBwY2FjaGUvQXBwbGljYXRp b25DYWNoZVN0b3JhZ2UuaApAQCAtNjUsOSArNjUsOSBAQCBwdWJsaWM6CiAKICAgICBpbnQ2NF90 IGRlZmF1bHRPcmlnaW5RdW90YSgpIGNvbnN0IHsgcmV0dXJuIG1fZGVmYXVsdE9yaWdpblF1b3Rh OyB9CiAgICAgdm9pZCBzZXREZWZhdWx0T3JpZ2luUXVvdGEoaW50NjRfdCBxdW90YSk7Ci0gICAg Ym9vbCB1c2FnZUZvck9yaWdpbihjb25zdCBTZWN1cml0eU9yaWdpbiosIGludDY0X3QmIHVzYWdl KTsKLSAgICBib29sIHF1b3RhRm9yT3JpZ2luKGNvbnN0IFNlY3VyaXR5T3JpZ2luKiwgaW50NjRf dCYgcXVvdGEpOwotICAgIGJvb2wgcmVtYWluaW5nU2l6ZUZvck9yaWdpbkV4Y2x1ZGluZ0NhY2hl KGNvbnN0IFNlY3VyaXR5T3JpZ2luKiwgQXBwbGljYXRpb25DYWNoZSosIGludDY0X3QmIHJlbWFp bmluZ1NpemUpOworICAgIGJvb2wgY2FsY3VsYXRlVXNhZ2VGb3JPcmlnaW4oY29uc3QgU2VjdXJp dHlPcmlnaW4qLCBpbnQ2NF90JiB1c2FnZSk7CisgICAgYm9vbCBjYWxjdWxhdGVRdW90YUZvck9y aWdpbihjb25zdCBTZWN1cml0eU9yaWdpbiosIGludDY0X3QmIHF1b3RhKTsKKyAgICBib29sIGNh bGN1bGF0ZVJlbWFpbmluZ1NpemVGb3JPcmlnaW5FeGNsdWRpbmdDYWNoZShjb25zdCBTZWN1cml0 eU9yaWdpbiosIEFwcGxpY2F0aW9uQ2FjaGUqLCBpbnQ2NF90JiByZW1haW5pbmdTaXplKTsKICAg ICBib29sIHN0b3JlVXBkYXRlZFF1b3RhRm9yT3JpZ2luKGNvbnN0IFNlY3VyaXR5T3JpZ2luKiwg aW50NjRfdCBxdW90YSk7CiAgICAgYm9vbCBjaGVja09yaWdpblF1b3RhKEFwcGxpY2F0aW9uQ2Fj aGVHcm91cCosIEFwcGxpY2F0aW9uQ2FjaGUqIG9sZENhY2hlLCBBcHBsaWNhdGlvbkNhY2hlKiBu ZXdDYWNoZSwgaW50NjRfdCYgdG90YWxTcGFjZU5lZWRlZCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvbWFjL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwppbmRl eCBhNzRlNmI1Li5iMWJlNzQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VM b2cKKysrIGIvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTcgQEAKIDIw MTEtMDctMTIgIEpvc2VwaCBQZWNvcmFybyAgPGpvZXBlY2tAd2Via2l0Lm9yZz4KIAorICAgICAg ICBJbXByb3ZlIG5hbWVzIG9mIHNvbWUgQXBwbGljYXRpb25DYWNoZVN0b3JhZ2UgYWNjZXNzb3Ig bWV0aG9kcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NjQ0MzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IFdlYkNvcmVTdXBwb3J0L1dlYkFwcGxpY2F0aW9uQ2FjaGVRdW90YU1hbmFnZXIubW06CisgICAg ICAgICgtW1dlYkFwcGxpY2F0aW9uQ2FjaGVRdW90YU1hbmFnZXIgdXNhZ2VdKToKKyAgICAgICAg KC1bV2ViQXBwbGljYXRpb25DYWNoZVF1b3RhTWFuYWdlciBxdW90YV0pOgorICAgICAgICBSZW5h bWVkIG1ldGhvZHMuCisKKzIwMTEtMDctMTIgIEpvc2VwaCBQZWNvcmFybyAgPGpvZXBlY2tAd2Vi a2l0Lm9yZz4KKwogICAgICAgICBBcHBsaWNhdGlvbkNhY2hlIHVwZGF0ZSBzaG91bGQgbm90IGlt bWVkaWF0ZWx5IGZhaWwgd2hlbiByZWFjaGluZyBwZXItb3JpZ2luIHF1b3RhCiAgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NDE3NwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJBcHBsaWNhdGlvbkNhY2hlUXVv dGFNYW5hZ2VyLm1tIGIvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViQXBwbGlj YXRpb25DYWNoZVF1b3RhTWFuYWdlci5tbQppbmRleCA1NjJiYjI5Li5iYTkyYzliIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJBcHBsaWNhdGlvbkNhY2hl UXVvdGFNYW5hZ2VyLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dl YkFwcGxpY2F0aW9uQ2FjaGVRdW90YU1hbmFnZXIubW0KQEAgLTUxLDcgKzUxLDcgQEAgdXNpbmcg bmFtZXNwYWNlIFdlYkNvcmU7CiB7CiAjaWYgRU5BQkxFKE9GRkxJTkVfV0VCX0FQUExJQ0FUSU9O UykKICAgICBsb25nIGxvbmcgdXNhZ2U7Ci0gICAgaWYgKGNhY2hlU3RvcmFnZSgpLnVzYWdlRm9y T3JpZ2luKFtfb3JpZ2luIF9jb3JlXSwgdXNhZ2UpKQorICAgIGlmIChjYWNoZVN0b3JhZ2UoKS5j YWxjdWxhdGVVc2FnZUZvck9yaWdpbihbX29yaWdpbiBfY29yZV0sIHVzYWdlKSkKICAgICAgICAg cmV0dXJuIHVzYWdlOwogICAgIHJldHVybiAwOwogI2Vsc2UKQEAgLTYzLDcgKzYzLDcgQEAgdXNp bmcgbmFtZXNwYWNlIFdlYkNvcmU7CiB7CiAjaWYgRU5BQkxFKE9GRkxJTkVfV0VCX0FQUExJQ0FU SU9OUykKICAgICBsb25nIGxvbmcgcXVvdGE7Ci0gICAgaWYgKGNhY2hlU3RvcmFnZSgpLnF1b3Rh Rm9yT3JpZ2luKFtfb3JpZ2luIF9jb3JlXSwgcXVvdGEpKQorICAgIGlmIChjYWNoZVN0b3JhZ2Uo KS5jYWxjdWxhdGVRdW90YUZvck9yaWdpbihbX29yaWdpbiBfY29yZV0sIHF1b3RhKSkKICAgICAg ICAgcmV0dXJuIHF1b3RhOwogICAgIHJldHVybiAwOwogI2Vsc2UKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvcXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKaW5kZXgg ZDE2Yjg1MS4uMTYzODE4MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEsNSArMSwxNiBAQAogMjAxMS0w Ny0xMiAgSm9zZXBoIFBlY29yYXJvICA8am9lcGVja0B3ZWJraXQub3JnPgogCisgICAgICAgIElt cHJvdmUgbmFtZXMgb2Ygc29tZSBBcHBsaWNhdGlvbkNhY2hlU3RvcmFnZSBhY2Nlc3NvciBtZXRo b2RzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NDQz MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2Vi Q29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50UXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2hyb21l Q2xpZW50UXQ6OnJlYWNoZWRBcHBsaWNhdGlvbkNhY2hlT3JpZ2luUXVvdGEpOgorICAgICAgICBS ZW5hbWVkIG1ldGhvZC4KKworMjAxMS0wNy0xMiAgSm9zZXBoIFBlY29yYXJvICA8am9lcGVja0B3 ZWJraXQub3JnPgorCiAgICAgICAgIEFwcGxpY2F0aW9uQ2FjaGUgdXBkYXRlIHNob3VsZCBub3Qg aW1tZWRpYXRlbHkgZmFpbCB3aGVuIHJlYWNoaW5nIHBlci1vcmlnaW4gcXVvdGEKICAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY0MTc3CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50UXQuY3BwIGIv U291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRRdC5jcHAKaW5kZXgg Nzk0NTcyZC4uNWUzNjdhZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3Vw cG9ydC9DaHJvbWVDbGllbnRRdC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3Vw cG9ydC9DaHJvbWVDbGllbnRRdC5jcHAKQEAgLTU2Myw3ICs1NjMsNyBAQCB2b2lkIENocm9tZUNs aWVudFF0OjpyZWFjaGVkQXBwbGljYXRpb25DYWNoZU9yaWdpblF1b3RhKFNlY3VyaXR5T3JpZ2lu KiBvcmlnaW4sCiAgICAgUVdlYlNlY3VyaXR5T3JpZ2luUHJpdmF0ZSogcHJpdiA9IG5ldyBRV2Vi U2VjdXJpdHlPcmlnaW5Qcml2YXRlKG9yaWdpbik7CiAgICAgUVdlYlNlY3VyaXR5T3JpZ2luKiBz ZWN1cml0eU9yaWdpbiA9IG5ldyBRV2ViU2VjdXJpdHlPcmlnaW4ocHJpdik7CiAKLSAgICBpZiAo IVdlYkNvcmU6OmNhY2hlU3RvcmFnZSgpLnF1b3RhRm9yT3JpZ2luKG9yaWdpbiwgcXVvdGEpKQor ICAgIGlmICghV2ViQ29yZTo6Y2FjaGVTdG9yYWdlKCkuY2FsY3VsYXRlUXVvdGFGb3JPcmlnaW4o b3JpZ2luLCBxdW90YSkpCiAgICAgICAgV2ViQ29yZTo6Y2FjaGVTdG9yYWdlKCkuc3RvcmVVcGRh dGVkUXVvdGFGb3JPcmlnaW4ob3JpZ2luLCBkZWZhdWx0T3JpZ2luUXVvdGEpOwogCiAgICAgZW1p dCBtX3dlYlBhZ2UtPmFwcGxpY2F0aW9uQ2FjaGVRdW90YUV4Y2VlZGVkKHNlY3VyaXR5T3JpZ2lu LCBkZWZhdWx0T3JpZ2luUXVvdGEsIHN0YXRpY19jYXN0PHF1aW50NjQ+KHRvdGFsU3BhY2VOZWVk ZWQpKTsK