112221 2013-03-12 18:49:01 -0700 [chromium] Make zoom filter independent of the layer size. 2013-04-08 17:00:13 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 danakj danakj abarth backer dglazkov fishd jamesr peter+ews piman schenney senorblanco tkent+wkapi webkit.review.bot zork oldest_to_newest 853979 0 danakj 2013-03-12 18:49:01 -0700 [chromium] Make zoom filter independent of the layer size. 853982 1 danakj 2013-03-12 18:51:03 -0700 This makes the zoom filter independent of the layer size. You just give a zoom amount and an inset, and the actual width/height computation is done based on the texture size being filtered. I think since we have no tests or production using the zoom filter yet (right?) I could maybe skip one round of patches and just put a #define in this patch. On the chromium side, I'll just #ifndef the same thing around all the zoom code, basically disabling it temporarily until webkit rolls with this patch. Is that okay? 853983 2 192852 danakj 2013-03-12 18:51:32 -0700 Created attachment 192852 Patch 853984 3 192853 danakj 2013-03-12 18:52:23 -0700 Created attachment 192853 Patch 853988 4 webkit.review.bot 2013-03-12 18:55:14 -0700 Please wait for approval from abarth@webkit.org, dglazkov@chromium.org, fishd@chromium.org, jamesr@chromium.org or tkent@chromium.org before submitting, as this patch contains changes to the Chromium public API. See also https://trac.webkit.org/wiki/ChromiumWebKitAPI. 853992 5 192853 webkit.review.bot 2013-03-12 19:00:42 -0700 Comment on attachment 192853 Patch Attachment 192853 did not pass cr-linux-debug-ews (chromium-xvfb): Output: http://webkit-commit-queue.appspot.com/results/17139191 853993 6 192853 webkit.review.bot 2013-03-12 19:01:09 -0700 Comment on attachment 192853 Patch Attachment 192853 did not pass chromium-ews (chromium-xvfb): Output: http://webkit-commit-queue.appspot.com/results/17118095 853995 7 192853 peter+ews 2013-03-12 19:09:19 -0700 Comment on attachment 192853 Patch Attachment 192853 did not pass cr-android-ews (chromium-android): Output: http://webkit-commit-queue.appspot.com/results/17036677 854004 8 danakj 2013-03-12 19:17:28 -0700 I added rect.h to render_pass.h in https://codereview.chromium.org/12816002/ to appease the build errors here: ../../Source/WebKit/chromium/cc/render_pass.h:74: error: 'gfx::Rect' has not been declared 854128 9 zork 2013-03-13 01:47:02 -0700 (In reply to comment #1) > This makes the zoom filter independent of the layer size. You just give a zoom amount and an inset, and the actual width/height computation is done based on the texture size being filtered. > > I think since we have no tests or production using the zoom filter yet (right?) I could maybe skip one round of patches and just put a #define in this patch. On the chromium side, I'll just #ifndef the same thing around all the zoom code, basically disabling it temporarily until webkit rolls with this patch. > > Is that okay? Sounds good to me. 854315 10 192853 senorblanco 2013-03-13 08:29:58 -0700 Comment on attachment 192853 Patch Seems a little strange that the offset is an int and not a float, but if Zach is ok with it, I'm ok with it. r=me 855369 11 193163 danakj 2013-03-14 11:41:32 -0700 Created attachment 193163 Patch for the bots 855555 12 193163 webkit.review.bot 2013-03-14 16:31:48 -0700 Comment on attachment 193163 Patch Clearing flags on attachment: 193163 Committed r145855: <http://trac.webkit.org/changeset/145855> 192852 2013-03-12 18:51:32 -0700 2013-03-12 18:52:21 -0700 Patch bug-112221-20130312214730.patch text/plain 6569 danakj U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1NTY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v Q2hhbmdlTG9nIGIvU291cmNlL1BsYXRmb3JtL0NoYW5nZUxvZwppbmRleCAxNDcxYWFjN2YyODNk ZjZhN2YyYzU0YjhiYjExYjJlMzgxZWYwODVlLi42MTNjZjNlZmFkZGZlOTE3OWU0ZDA3ZjJiNDgz OTJkNmVmOGRjZGY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9QbGF0Zm9ybS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMy0wMy0xMiAg RGFuYSBKYW5zZW5zICA8ZGFuYWtqQGNocm9taXVtLm9yZz4KKworICAgICAgICBbY2hyb21pdW1d IE1ha2Ugem9vbSBmaWx0ZXIgaW5kZXBlbmRlbnQgb2YgdGhlIGxheWVyIHNpemUuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTIyMjEKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWtlIHRoZSB6b29tIGZp bHRlciBob2xkIGEgem9vbSBhbW91bnQgYW5kIGFuIGluc2V0LgorCisgICAgICAgICogY2hyb21p dW0vcHVibGljL1dlYkZpbHRlck9wZXJhdGlvbi5oOgorICAgICAgICAoV2ViS2l0OjpXZWJGaWx0 ZXJPcGVyYXRpb246Onpvb21JbnNldCk6CisgICAgICAgIChXZWJGaWx0ZXJPcGVyYXRpb24pOgor ICAgICAgICAoV2ViS2l0OjpXZWJGaWx0ZXJPcGVyYXRpb246OmNyZWF0ZVpvb21GaWx0ZXIpOgor ICAgICAgICAoV2ViS2l0OjpXZWJGaWx0ZXJPcGVyYXRpb246OnNldFpvb21JbnNldCk6CisgICAg ICAgIChXZWJLaXQ6OldlYkZpbHRlck9wZXJhdGlvbjo6V2ViRmlsdGVyT3BlcmF0aW9uKToKKwog MjAxMy0wMy0xMiAgWmFuIERvYmVyc2VrICA8emRvYmVyc2VrQGlnYWxpYS5jb20+CiAKICAgICAg ICAgW0dUS10gU2V0IHVwIHRoZSBsaWJQbGF0Zm9ybUd0ay5sYSBsaWJyYXJ5CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vQ2hhbmdlTG9nCmluZGV4IDdjM2UwOTk3ZTI0Zjg2YzhjZDE1YTBhMzkxZTJiZmM1OGMzMGY5 YTEuLmMzYTE2OWM3YmVkY2JjNTFjYWI3N2EwNmM0YTY1ODA3MmJlZmYxM2UgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTMtMDMtMTIgIERhbmEgSmFuc2Vu cyAgPGRhbmFrakBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBNYWtlIHpvb20g ZmlsdGVyIGluZGVwZW5kZW50IG9mIHRoZSBsYXllciBzaXplLgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEyMjIxCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiB0ZXN0cy9GaWx0ZXJPcGVyYXRpb25zVGVz dC5jcHA6CisgICAgICAgIChXZWJLaXQpOgorICAgICAgICAoV2ViS2l0OjpURVNUKToKKwogMjAx My0wMy0xMiAgQWJoaXNoZWsgQXJ5YSAgPGluZmVybm9AY2hyb21pdW0ub3JnPgogCiAgICAgICAg IFJlcGxhY2Ugc3RhdGljX2Nhc3RzIHdpdGggdG8qIGZ1bmN0aW9ucy4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9QbGF0Zm9ybS9jaHJvbWl1bS9wdWJsaWMvV2ViRmlsdGVyT3BlcmF0aW9uLmggYi9Tb3Vy Y2UvUGxhdGZvcm0vY2hyb21pdW0vcHVibGljL1dlYkZpbHRlck9wZXJhdGlvbi5oCmluZGV4IDZm NjI4ZjVmZDVkMDE2NzhmNmQ4ZWJmZGZiYjIxYjMyZGZlZWEwZDkuLjMzOGUzMzljNTQwYjMxOGQ0 OWM3M2ZiMTU0ODcwZjdkMTQzZjFmNWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9QbGF0Zm9ybS9jaHJv bWl1bS9wdWJsaWMvV2ViRmlsdGVyT3BlcmF0aW9uLmgKKysrIGIvU291cmNlL1BsYXRmb3JtL2No cm9taXVtL3B1YmxpYy9XZWJGaWx0ZXJPcGVyYXRpb24uaApAQCAtODYsMTIgKzg2LDE1IEBAIHB1 YmxpYzoKICAgICAgICAgcmV0dXJuIG1fbWF0cml4OwogICAgIH0KIAotICAgIFdlYlJlY3Qgem9v bVJlY3QoKSBjb25zdAorICAgIGludCB6b29tSW5zZXQoKSBjb25zdAogICAgIHsKICAgICAgICAg V0VCS0lUX0FTU0VSVChtX3R5cGUgPT0gRmlsdGVyVHlwZVpvb20pOwotICAgICAgICByZXR1cm4g bV96b29tUmVjdDsKKyAgICAgICAgcmV0dXJuIG1fem9vbUluc2V0OwogICAgIH0KIAorICAgIC8v IEZJWE1FOiBSZW1vdmUgdGhpcyBhbmQgdGhlIGNoZWNrIGZvciBpdCBpbiBjaHJvbWl1bS4KKyNk ZWZpbmUgTkVXX1pPT01fRklMVEVSCisKICAgICBzdGF0aWMgV2ViRmlsdGVyT3BlcmF0aW9uIGNy ZWF0ZUdyYXlzY2FsZUZpbHRlcihmbG9hdCBhbW91bnQpIHsgcmV0dXJuIFdlYkZpbHRlck9wZXJh dGlvbihGaWx0ZXJUeXBlR3JheXNjYWxlLCBhbW91bnQpOyB9CiAgICAgc3RhdGljIFdlYkZpbHRl ck9wZXJhdGlvbiBjcmVhdGVTZXBpYUZpbHRlcihmbG9hdCBhbW91bnQpIHsgcmV0dXJuIFdlYkZp bHRlck9wZXJhdGlvbihGaWx0ZXJUeXBlU2VwaWEsIGFtb3VudCk7IH0KICAgICBzdGF0aWMgV2Vi RmlsdGVyT3BlcmF0aW9uIGNyZWF0ZVNhdHVyYXRlRmlsdGVyKGZsb2F0IGFtb3VudCkgeyByZXR1 cm4gV2ViRmlsdGVyT3BlcmF0aW9uKEZpbHRlclR5cGVTYXR1cmF0ZSwgYW1vdW50KTsgfQpAQCAt MTAzLDcgKzEwNiw3IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgV2ViRmlsdGVyT3BlcmF0aW9uIGNy ZWF0ZUJsdXJGaWx0ZXIoZmxvYXQgYW1vdW50KSB7IHJldHVybiBXZWJGaWx0ZXJPcGVyYXRpb24o RmlsdGVyVHlwZUJsdXIsIGFtb3VudCk7IH0KICAgICBzdGF0aWMgV2ViRmlsdGVyT3BlcmF0aW9u IGNyZWF0ZURyb3BTaGFkb3dGaWx0ZXIoV2ViUG9pbnQgb2Zmc2V0LCBmbG9hdCBzdGREZXZpYXRp b24sIFdlYkNvbG9yIGNvbG9yKSB7IHJldHVybiBXZWJGaWx0ZXJPcGVyYXRpb24oRmlsdGVyVHlw ZURyb3BTaGFkb3csIG9mZnNldCwgc3RkRGV2aWF0aW9uLCBjb2xvcik7IH0KICAgICBzdGF0aWMg V2ViRmlsdGVyT3BlcmF0aW9uIGNyZWF0ZUNvbG9yTWF0cml4RmlsdGVyKFNrU2NhbGFyIG1hdHJp eFsyMF0pIHsgcmV0dXJuIFdlYkZpbHRlck9wZXJhdGlvbihGaWx0ZXJUeXBlQ29sb3JNYXRyaXgs IG1hdHJpeCk7IH0KLSAgICBzdGF0aWMgV2ViRmlsdGVyT3BlcmF0aW9uIGNyZWF0ZVpvb21GaWx0 ZXIoV2ViUmVjdCByZWN0LCBpbnQgaW5zZXQpIHsgcmV0dXJuIFdlYkZpbHRlck9wZXJhdGlvbihG aWx0ZXJUeXBlWm9vbSwgcmVjdCwgaW5zZXQpOyB9CisgICAgc3RhdGljIFdlYkZpbHRlck9wZXJh dGlvbiBjcmVhdGVab29tRmlsdGVyKGZsb2F0IGFtb3VudCwgaW50IGluc2V0KSB7IHJldHVybiBX ZWJGaWx0ZXJPcGVyYXRpb24oRmlsdGVyVHlwZVpvb20sIGFtb3VudCwgaW5zZXQpOyB9CiAgICAg c3RhdGljIFdlYkZpbHRlck9wZXJhdGlvbiBjcmVhdGVTYXR1cmF0aW5nQnJpZ2h0bmVzc0ZpbHRl cihmbG9hdCBhbW91bnQpIHsgcmV0dXJuIFdlYkZpbHRlck9wZXJhdGlvbihGaWx0ZXJUeXBlU2F0 dXJhdGluZ0JyaWdodG5lc3MsIGFtb3VudCk7IH0KIAogICAgIGJvb2wgZXF1YWxzKGNvbnN0IFdl YkZpbHRlck9wZXJhdGlvbiYgb3RoZXIpIGNvbnN0OwpAQCAtMTQzLDEwICsxNDYsMTAgQEAgcHVi bGljOgogICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgMjA7ICsraSkKICAgICAgICAg ICAgIG1fbWF0cml4W2ldID0gbWF0cml4W2ldOwogICAgIH0KLSAgICB2b2lkIHNldFpvb21SZWN0 KFdlYlJlY3QgcmVjdCkKKyAgICB2b2lkIHNldFpvb21JbnNldChpbnQgaW5zZXQpCiAgICAgewog ICAgICAgICBXRUJLSVRfQVNTRVJUKG1fdHlwZSA9PSBGaWx0ZXJUeXBlWm9vbSk7Ci0gICAgICAg IG1fem9vbVJlY3QgPSByZWN0OworICAgICAgICBtX3pvb21JbnNldCA9IGluc2V0OwogICAgIH0K IAogcHJpdmF0ZToKQEAgLTE1Niw3ICsxNTksNyBAQCBwcml2YXRlOgogICAgIFdlYlBvaW50IG1f ZHJvcFNoYWRvd09mZnNldDsKICAgICBXZWJDb2xvciBtX2Ryb3BTaGFkb3dDb2xvcjsKICAgICBT a1NjYWxhciBtX21hdHJpeFsyMF07Ci0gICAgV2ViUmVjdCBtX3pvb21SZWN0OworICAgIGludCBt X3pvb21JbnNldDsKIAogICAgIFdlYkZpbHRlck9wZXJhdGlvbihGaWx0ZXJUeXBlIHR5cGUsIGZs b2F0IGFtb3VudCkKICAgICB7CkBAIC0xNzcsMTIgKzE4MCwxMiBAQCBwcml2YXRlOgogCiAgICAg V0VCS0lUX0VYUE9SVCBXZWJGaWx0ZXJPcGVyYXRpb24oRmlsdGVyVHlwZSwgU2tTY2FsYXIgbWF0 cml4WzIwXSk7CiAKLSAgICBXZWJGaWx0ZXJPcGVyYXRpb24oRmlsdGVyVHlwZSB0eXBlLCBXZWJS ZWN0IHJlY3QsIGZsb2F0IGluc2V0KQorICAgIFdlYkZpbHRlck9wZXJhdGlvbihGaWx0ZXJUeXBl IHR5cGUsIGZsb2F0IGFtb3VudCwgaW50IGluc2V0KQogICAgIHsKICAgICAgICAgV0VCS0lUX0FT U0VSVCh0eXBlID09IEZpbHRlclR5cGVab29tKTsKICAgICAgICAgbV90eXBlID0gdHlwZTsKLSAg ICAgICAgbV9hbW91bnQgPSBpbnNldDsKLSAgICAgICAgbV96b29tUmVjdCA9IHJlY3Q7CisgICAg ICAgIG1fYW1vdW50ID0gYW1vdW50OworICAgICAgICBtX3pvb21JbnNldCA9IGluc2V0OwogICAg IH0KIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvRmlsdGVy T3BlcmF0aW9uc1Rlc3QuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9GaWx0ZXJP cGVyYXRpb25zVGVzdC5jcHAKaW5kZXggMGQyZWVlNmRmNDI4NTJmNTAzMGMwMWVlYmQ5NzNjOTVi YmQzMjExMi4uNGEwZmQ4ZTU1MzAwMzA5N2JkNGUyYjJjNzgyMTdiZTUzNTFjMmFmZSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9GaWx0ZXJPcGVyYXRpb25zVGVzdC5j cHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9GaWx0ZXJPcGVyYXRpb25zVGVz dC5jcHAKQEAgLTE0NywyNSArMTQ3LDI1IEBAIFRFU1QoV2ViRmlsdGVyT3BlcmF0aW9uc1Rlc3Qs IGdldE91dHNldHNEcm9wU2hhZG93KQogICAgICAgICAgICAgRVhQRUNUX0VRKGFbaV0sIG9wLm1h dHJpeCgpW2ldKTsgXAogICAgIH0KIAotI2RlZmluZSBTQVZFX1JFU1RPUkVfWk9PTVJFQ1RfQU1P VU5UKFR5cGUsIGEsIGIpIFwKKyNkZWZpbmUgU0FWRV9SRVNUT1JFX0FNT1VOVF9JTlNFVChUeXBl LCBhLCBiKSBcCiAgICAgeyBcCiAgICAgICAgIFdlYkZpbHRlck9wZXJhdGlvbiBvcCA9IFdlYkZp bHRlck9wZXJhdGlvbjo6Y3JlYXRlIyNUeXBlIyNGaWx0ZXIoYSwgYik7IFwKICAgICAgICAgRVhQ RUNUX0VRKFdlYkZpbHRlck9wZXJhdGlvbjo6RmlsdGVyVHlwZSMjVHlwZSwgb3AudHlwZSgpKTsg XAotICAgICAgICBFWFBFQ1RfRVEoYSwgb3Auem9vbVJlY3QoKSk7IFwKLSAgICAgICAgRVhQRUNU X0VRKGIsIG9wLmFtb3VudCgpKTsgXAorICAgICAgICBFWFBFQ1RfRVEoYSwgb3AuYW1vdW50KCkp OyBcCisgICAgICAgIEVYUEVDVF9FUShiLCBvcC56b29tSW5zZXQoKSk7IFwKICAgICAgICAgXAog ICAgICAgICBXZWJGaWx0ZXJPcGVyYXRpb24gb3AyID0gV2ViRmlsdGVyT3BlcmF0aW9uOjpjcmVh dGVFbXB0eUZpbHRlcigpOyBcCiAgICAgICAgIG9wMi5zZXRUeXBlKFdlYkZpbHRlck9wZXJhdGlv bjo6RmlsdGVyVHlwZSMjVHlwZSk7IFwKICAgICAgICAgXAotICAgICAgICBFWFBFQ1RfTkUoYSwg b3AyLnpvb21SZWN0KCkpOyBcCi0gICAgICAgIEVYUEVDVF9ORShiLCBvcDIuYW1vdW50KCkpOyBc CisgICAgICAgIEVYUEVDVF9ORShhLCBvcDIuYW1vdW50KCkpOyBcCisgICAgICAgIEVYUEVDVF9O RShiLCBvcDIuem9vbUluc2V0KCkpOyBcCiAgICAgICAgIFwKLSAgICAgICAgb3AyLnNldFpvb21S ZWN0KGEpOyBcCi0gICAgICAgIG9wMi5zZXRBbW91bnQoYik7IFwKKyAgICAgICAgb3AyLnNldEFt b3VudChhKTsgXAorICAgICAgICBvcDIuc2V0Wm9vbUluc2V0KGIpOyBcCiAgICAgICAgIFwKICAg ICAgICAgRVhQRUNUX0VRKFdlYkZpbHRlck9wZXJhdGlvbjo6RmlsdGVyVHlwZSMjVHlwZSwgb3Ay LnR5cGUoKSk7IFwKLSAgICAgICAgRVhQRUNUX0VRKGEsIG9wMi56b29tUmVjdCgpKTsgXAotICAg ICAgICBFWFBFQ1RfRVEoYiwgb3AyLmFtb3VudCgpKTsgXAorICAgICAgICBFWFBFQ1RfRVEoYSwg b3AyLmFtb3VudCgpKTsgXAorICAgICAgICBFWFBFQ1RfRVEoYiwgb3AyLnpvb21JbnNldCgpKTsg XAogICAgIH0KIAogCkBAIC0xODUsNyArMTg1LDcgQEAgVEVTVChXZWJGaWx0ZXJPcGVyYXRpb25z VGVzdCwgc2F2ZUFuZFJlc3RvcmUpCiAgICAgU2tTY2FsYXIgbWF0cml4WzIwXSA9IHsgMSwgMiwg MywgNCwgNSwgNiwgNywgOCwgOSwgMTAsIDExLCAxMiwgMTMsIDE0LCAxNSwgMTYsIDE3LCAxOCwg MTksIDIwIH07CiAgICAgU0FWRV9SRVNUT1JFX01BVFJJWChDb2xvck1hdHJpeCwgbWF0cml4KTsK IAotICAgIFNBVkVfUkVTVE9SRV9aT09NUkVDVF9BTU9VTlQoWm9vbSwgV2ViUmVjdCgyMCwgMTks IDE4LCAxNyksIDMyKTsKKyAgICBTQVZFX1JFU1RPUkVfQU1PVU5UX0lOU0VUKFpvb20sIDAuNWYs IDMyKTsKIH0KIAogfQo= 192853 2013-03-12 18:52:23 -0700 2013-03-13 08:29:57 -0700 Patch bug-112221-20130312214821.patch text/plain 6703 danakj U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1NTY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v Q2hhbmdlTG9nIGIvU291cmNlL1BsYXRmb3JtL0NoYW5nZUxvZwppbmRleCAxNDcxYWFjN2YyODNk ZjZhN2YyYzU0YjhiYjExYjJlMzgxZWYwODVlLi42MTNjZjNlZmFkZGZlOTE3OWU0ZDA3ZjJiNDgz OTJkNmVmOGRjZGY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9QbGF0Zm9ybS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMy0wMy0xMiAg RGFuYSBKYW5zZW5zICA8ZGFuYWtqQGNocm9taXVtLm9yZz4KKworICAgICAgICBbY2hyb21pdW1d IE1ha2Ugem9vbSBmaWx0ZXIgaW5kZXBlbmRlbnQgb2YgdGhlIGxheWVyIHNpemUuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTIyMjEKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWtlIHRoZSB6b29tIGZp bHRlciBob2xkIGEgem9vbSBhbW91bnQgYW5kIGFuIGluc2V0LgorCisgICAgICAgICogY2hyb21p dW0vcHVibGljL1dlYkZpbHRlck9wZXJhdGlvbi5oOgorICAgICAgICAoV2ViS2l0OjpXZWJGaWx0 ZXJPcGVyYXRpb246Onpvb21JbnNldCk6CisgICAgICAgIChXZWJGaWx0ZXJPcGVyYXRpb24pOgor ICAgICAgICAoV2ViS2l0OjpXZWJGaWx0ZXJPcGVyYXRpb246OmNyZWF0ZVpvb21GaWx0ZXIpOgor ICAgICAgICAoV2ViS2l0OjpXZWJGaWx0ZXJPcGVyYXRpb246OnNldFpvb21JbnNldCk6CisgICAg ICAgIChXZWJLaXQ6OldlYkZpbHRlck9wZXJhdGlvbjo6V2ViRmlsdGVyT3BlcmF0aW9uKToKKwog MjAxMy0wMy0xMiAgWmFuIERvYmVyc2VrICA8emRvYmVyc2VrQGlnYWxpYS5jb20+CiAKICAgICAg ICAgW0dUS10gU2V0IHVwIHRoZSBsaWJQbGF0Zm9ybUd0ay5sYSBsaWJyYXJ5CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vQ2hhbmdlTG9nCmluZGV4IDdjM2UwOTk3ZTI0Zjg2YzhjZDE1YTBhMzkxZTJiZmM1OGMzMGY5 YTEuLmMzYTE2OWM3YmVkY2JjNTFjYWI3N2EwNmM0YTY1ODA3MmJlZmYxM2UgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTMtMDMtMTIgIERhbmEgSmFuc2Vu cyAgPGRhbmFrakBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBNYWtlIHpvb20g ZmlsdGVyIGluZGVwZW5kZW50IG9mIHRoZSBsYXllciBzaXplLgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEyMjIxCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiB0ZXN0cy9GaWx0ZXJPcGVyYXRpb25zVGVz dC5jcHA6CisgICAgICAgIChXZWJLaXQpOgorICAgICAgICAoV2ViS2l0OjpURVNUKToKKwogMjAx My0wMy0xMiAgQWJoaXNoZWsgQXJ5YSAgPGluZmVybm9AY2hyb21pdW0ub3JnPgogCiAgICAgICAg IFJlcGxhY2Ugc3RhdGljX2Nhc3RzIHdpdGggdG8qIGZ1bmN0aW9ucy4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9QbGF0Zm9ybS9jaHJvbWl1bS9wdWJsaWMvV2ViRmlsdGVyT3BlcmF0aW9uLmggYi9Tb3Vy Y2UvUGxhdGZvcm0vY2hyb21pdW0vcHVibGljL1dlYkZpbHRlck9wZXJhdGlvbi5oCmluZGV4IDZm NjI4ZjVmZDVkMDE2NzhmNmQ4ZWJmZGZiYjIxYjMyZGZlZWEwZDkuLmJiNWJiMmRhNmIzNDk2ZjA0 YTE2ZDZmYjgwMmViYjQ3MjA4MTJlNTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9QbGF0Zm9ybS9jaHJv bWl1bS9wdWJsaWMvV2ViRmlsdGVyT3BlcmF0aW9uLmgKKysrIGIvU291cmNlL1BsYXRmb3JtL2No cm9taXVtL3B1YmxpYy9XZWJGaWx0ZXJPcGVyYXRpb24uaApAQCAtMzAsNyArMzAsNiBAQAogI2lu Y2x1ZGUgIldlYkNvbW1vbi5oIgogI2luY2x1ZGUgIldlYkNvbG9yLmgiCiAjaW5jbHVkZSAiV2Vi UG9pbnQuaCIKLSNpbmNsdWRlICJXZWJSZWN0LmgiCiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCkBA IC04NiwxMiArODUsMTUgQEAgcHVibGljOgogICAgICAgICByZXR1cm4gbV9tYXRyaXg7CiAgICAg fQogCi0gICAgV2ViUmVjdCB6b29tUmVjdCgpIGNvbnN0CisgICAgaW50IHpvb21JbnNldCgpIGNv bnN0CiAgICAgewogICAgICAgICBXRUJLSVRfQVNTRVJUKG1fdHlwZSA9PSBGaWx0ZXJUeXBlWm9v bSk7Ci0gICAgICAgIHJldHVybiBtX3pvb21SZWN0OworICAgICAgICByZXR1cm4gbV96b29tSW5z ZXQ7CiAgICAgfQogCisgICAgLy8gRklYTUU6IFJlbW92ZSB0aGlzIGFuZCB0aGUgY2hlY2sgZm9y IGl0IGluIGNocm9taXVtLgorI2RlZmluZSBORVdfWk9PTV9GSUxURVIKKwogICAgIHN0YXRpYyBX ZWJGaWx0ZXJPcGVyYXRpb24gY3JlYXRlR3JheXNjYWxlRmlsdGVyKGZsb2F0IGFtb3VudCkgeyBy ZXR1cm4gV2ViRmlsdGVyT3BlcmF0aW9uKEZpbHRlclR5cGVHcmF5c2NhbGUsIGFtb3VudCk7IH0K ICAgICBzdGF0aWMgV2ViRmlsdGVyT3BlcmF0aW9uIGNyZWF0ZVNlcGlhRmlsdGVyKGZsb2F0IGFt b3VudCkgeyByZXR1cm4gV2ViRmlsdGVyT3BlcmF0aW9uKEZpbHRlclR5cGVTZXBpYSwgYW1vdW50 KTsgfQogICAgIHN0YXRpYyBXZWJGaWx0ZXJPcGVyYXRpb24gY3JlYXRlU2F0dXJhdGVGaWx0ZXIo ZmxvYXQgYW1vdW50KSB7IHJldHVybiBXZWJGaWx0ZXJPcGVyYXRpb24oRmlsdGVyVHlwZVNhdHVy YXRlLCBhbW91bnQpOyB9CkBAIC0xMDMsNyArMTA1LDcgQEAgcHVibGljOgogICAgIHN0YXRpYyBX ZWJGaWx0ZXJPcGVyYXRpb24gY3JlYXRlQmx1ckZpbHRlcihmbG9hdCBhbW91bnQpIHsgcmV0dXJu IFdlYkZpbHRlck9wZXJhdGlvbihGaWx0ZXJUeXBlQmx1ciwgYW1vdW50KTsgfQogICAgIHN0YXRp YyBXZWJGaWx0ZXJPcGVyYXRpb24gY3JlYXRlRHJvcFNoYWRvd0ZpbHRlcihXZWJQb2ludCBvZmZz ZXQsIGZsb2F0IHN0ZERldmlhdGlvbiwgV2ViQ29sb3IgY29sb3IpIHsgcmV0dXJuIFdlYkZpbHRl ck9wZXJhdGlvbihGaWx0ZXJUeXBlRHJvcFNoYWRvdywgb2Zmc2V0LCBzdGREZXZpYXRpb24sIGNv bG9yKTsgfQogICAgIHN0YXRpYyBXZWJGaWx0ZXJPcGVyYXRpb24gY3JlYXRlQ29sb3JNYXRyaXhG aWx0ZXIoU2tTY2FsYXIgbWF0cml4WzIwXSkgeyByZXR1cm4gV2ViRmlsdGVyT3BlcmF0aW9uKEZp bHRlclR5cGVDb2xvck1hdHJpeCwgbWF0cml4KTsgfQotICAgIHN0YXRpYyBXZWJGaWx0ZXJPcGVy YXRpb24gY3JlYXRlWm9vbUZpbHRlcihXZWJSZWN0IHJlY3QsIGludCBpbnNldCkgeyByZXR1cm4g V2ViRmlsdGVyT3BlcmF0aW9uKEZpbHRlclR5cGVab29tLCByZWN0LCBpbnNldCk7IH0KKyAgICBz dGF0aWMgV2ViRmlsdGVyT3BlcmF0aW9uIGNyZWF0ZVpvb21GaWx0ZXIoZmxvYXQgYW1vdW50LCBp bnQgaW5zZXQpIHsgcmV0dXJuIFdlYkZpbHRlck9wZXJhdGlvbihGaWx0ZXJUeXBlWm9vbSwgYW1v dW50LCBpbnNldCk7IH0KICAgICBzdGF0aWMgV2ViRmlsdGVyT3BlcmF0aW9uIGNyZWF0ZVNhdHVy YXRpbmdCcmlnaHRuZXNzRmlsdGVyKGZsb2F0IGFtb3VudCkgeyByZXR1cm4gV2ViRmlsdGVyT3Bl cmF0aW9uKEZpbHRlclR5cGVTYXR1cmF0aW5nQnJpZ2h0bmVzcywgYW1vdW50KTsgfQogCiAgICAg Ym9vbCBlcXVhbHMoY29uc3QgV2ViRmlsdGVyT3BlcmF0aW9uJiBvdGhlcikgY29uc3Q7CkBAIC0x NDMsMTAgKzE0NSwxMCBAQCBwdWJsaWM6CiAgICAgICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkg PCAyMDsgKytpKQogICAgICAgICAgICAgbV9tYXRyaXhbaV0gPSBtYXRyaXhbaV07CiAgICAgfQot ICAgIHZvaWQgc2V0Wm9vbVJlY3QoV2ViUmVjdCByZWN0KQorICAgIHZvaWQgc2V0Wm9vbUluc2V0 KGludCBpbnNldCkKICAgICB7CiAgICAgICAgIFdFQktJVF9BU1NFUlQobV90eXBlID09IEZpbHRl clR5cGVab29tKTsKLSAgICAgICAgbV96b29tUmVjdCA9IHJlY3Q7CisgICAgICAgIG1fem9vbUlu c2V0ID0gaW5zZXQ7CiAgICAgfQogCiBwcml2YXRlOgpAQCAtMTU2LDcgKzE1OCw3IEBAIHByaXZh dGU6CiAgICAgV2ViUG9pbnQgbV9kcm9wU2hhZG93T2Zmc2V0OwogICAgIFdlYkNvbG9yIG1fZHJv cFNoYWRvd0NvbG9yOwogICAgIFNrU2NhbGFyIG1fbWF0cml4WzIwXTsKLSAgICBXZWJSZWN0IG1f em9vbVJlY3Q7CisgICAgaW50IG1fem9vbUluc2V0OwogCiAgICAgV2ViRmlsdGVyT3BlcmF0aW9u KEZpbHRlclR5cGUgdHlwZSwgZmxvYXQgYW1vdW50KQogICAgIHsKQEAgLTE3NywxMiArMTc5LDEy IEBAIHByaXZhdGU6CiAKICAgICBXRUJLSVRfRVhQT1JUIFdlYkZpbHRlck9wZXJhdGlvbihGaWx0 ZXJUeXBlLCBTa1NjYWxhciBtYXRyaXhbMjBdKTsKIAotICAgIFdlYkZpbHRlck9wZXJhdGlvbihG aWx0ZXJUeXBlIHR5cGUsIFdlYlJlY3QgcmVjdCwgZmxvYXQgaW5zZXQpCisgICAgV2ViRmlsdGVy T3BlcmF0aW9uKEZpbHRlclR5cGUgdHlwZSwgZmxvYXQgYW1vdW50LCBpbnQgaW5zZXQpCiAgICAg ewogICAgICAgICBXRUJLSVRfQVNTRVJUKHR5cGUgPT0gRmlsdGVyVHlwZVpvb20pOwogICAgICAg ICBtX3R5cGUgPSB0eXBlOwotICAgICAgICBtX2Ftb3VudCA9IGluc2V0OwotICAgICAgICBtX3pv b21SZWN0ID0gcmVjdDsKKyAgICAgICAgbV9hbW91bnQgPSBhbW91bnQ7CisgICAgICAgIG1fem9v bUluc2V0ID0gaW5zZXQ7CiAgICAgfQogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9j aHJvbWl1bS90ZXN0cy9GaWx0ZXJPcGVyYXRpb25zVGVzdC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3Rlc3RzL0ZpbHRlck9wZXJhdGlvbnNUZXN0LmNwcAppbmRleCAwZDJlZWU2ZGY0Mjg1 MmY1MDMwYzAxZWViZDk3M2M5NWJiZDMyMTEyLi40YTBmZDhlNTUzMDAzMDk3YmQ0ZTJiMmM3ODIx N2JlNTM1MWMyYWZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0Zp bHRlck9wZXJhdGlvbnNUZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3Rz L0ZpbHRlck9wZXJhdGlvbnNUZXN0LmNwcApAQCAtMTQ3LDI1ICsxNDcsMjUgQEAgVEVTVChXZWJG aWx0ZXJPcGVyYXRpb25zVGVzdCwgZ2V0T3V0c2V0c0Ryb3BTaGFkb3cpCiAgICAgICAgICAgICBF WFBFQ1RfRVEoYVtpXSwgb3AubWF0cml4KClbaV0pOyBcCiAgICAgfQogCi0jZGVmaW5lIFNBVkVf UkVTVE9SRV9aT09NUkVDVF9BTU9VTlQoVHlwZSwgYSwgYikgXAorI2RlZmluZSBTQVZFX1JFU1RP UkVfQU1PVU5UX0lOU0VUKFR5cGUsIGEsIGIpIFwKICAgICB7IFwKICAgICAgICAgV2ViRmlsdGVy T3BlcmF0aW9uIG9wID0gV2ViRmlsdGVyT3BlcmF0aW9uOjpjcmVhdGUjI1R5cGUjI0ZpbHRlcihh LCBiKTsgXAogICAgICAgICBFWFBFQ1RfRVEoV2ViRmlsdGVyT3BlcmF0aW9uOjpGaWx0ZXJUeXBl IyNUeXBlLCBvcC50eXBlKCkpOyBcCi0gICAgICAgIEVYUEVDVF9FUShhLCBvcC56b29tUmVjdCgp KTsgXAotICAgICAgICBFWFBFQ1RfRVEoYiwgb3AuYW1vdW50KCkpOyBcCisgICAgICAgIEVYUEVD VF9FUShhLCBvcC5hbW91bnQoKSk7IFwKKyAgICAgICAgRVhQRUNUX0VRKGIsIG9wLnpvb21JbnNl dCgpKTsgXAogICAgICAgICBcCiAgICAgICAgIFdlYkZpbHRlck9wZXJhdGlvbiBvcDIgPSBXZWJG aWx0ZXJPcGVyYXRpb246OmNyZWF0ZUVtcHR5RmlsdGVyKCk7IFwKICAgICAgICAgb3AyLnNldFR5 cGUoV2ViRmlsdGVyT3BlcmF0aW9uOjpGaWx0ZXJUeXBlIyNUeXBlKTsgXAogICAgICAgICBcCi0g ICAgICAgIEVYUEVDVF9ORShhLCBvcDIuem9vbVJlY3QoKSk7IFwKLSAgICAgICAgRVhQRUNUX05F KGIsIG9wMi5hbW91bnQoKSk7IFwKKyAgICAgICAgRVhQRUNUX05FKGEsIG9wMi5hbW91bnQoKSk7 IFwKKyAgICAgICAgRVhQRUNUX05FKGIsIG9wMi56b29tSW5zZXQoKSk7IFwKICAgICAgICAgXAot ICAgICAgICBvcDIuc2V0Wm9vbVJlY3QoYSk7IFwKLSAgICAgICAgb3AyLnNldEFtb3VudChiKTsg XAorICAgICAgICBvcDIuc2V0QW1vdW50KGEpOyBcCisgICAgICAgIG9wMi5zZXRab29tSW5zZXQo Yik7IFwKICAgICAgICAgXAogICAgICAgICBFWFBFQ1RfRVEoV2ViRmlsdGVyT3BlcmF0aW9uOjpG aWx0ZXJUeXBlIyNUeXBlLCBvcDIudHlwZSgpKTsgXAotICAgICAgICBFWFBFQ1RfRVEoYSwgb3Ay Lnpvb21SZWN0KCkpOyBcCi0gICAgICAgIEVYUEVDVF9FUShiLCBvcDIuYW1vdW50KCkpOyBcCisg ICAgICAgIEVYUEVDVF9FUShhLCBvcDIuYW1vdW50KCkpOyBcCisgICAgICAgIEVYUEVDVF9FUShi LCBvcDIuem9vbUluc2V0KCkpOyBcCiAgICAgfQogCiAKQEAgLTE4NSw3ICsxODUsNyBAQCBURVNU KFdlYkZpbHRlck9wZXJhdGlvbnNUZXN0LCBzYXZlQW5kUmVzdG9yZSkKICAgICBTa1NjYWxhciBt YXRyaXhbMjBdID0geyAxLCAyLCAzLCA0LCA1LCA2LCA3LCA4LCA5LCAxMCwgMTEsIDEyLCAxMywg MTQsIDE1LCAxNiwgMTcsIDE4LCAxOSwgMjAgfTsKICAgICBTQVZFX1JFU1RPUkVfTUFUUklYKENv bG9yTWF0cml4LCBtYXRyaXgpOwogCi0gICAgU0FWRV9SRVNUT1JFX1pPT01SRUNUX0FNT1VOVCha b29tLCBXZWJSZWN0KDIwLCAxOSwgMTgsIDE3KSwgMzIpOworICAgIFNBVkVfUkVTVE9SRV9BTU9V TlRfSU5TRVQoWm9vbSwgMC41ZiwgMzIpOwogfQogCiB9Cg== 193163 2013-03-14 11:41:32 -0700 2013-03-14 16:31:48 -0700 Patch bug-112221-20130314143728.patch text/plain 6725 danakj U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1Nzc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v Q2hhbmdlTG9nIGIvU291cmNlL1BsYXRmb3JtL0NoYW5nZUxvZwppbmRleCA0MmZiMTYxMTMzNjg0 YTdkM2NkYTdkZTMxMTc3OTliNTJiMGQ2ZWRmLi5jNjllNDM1MTdiNjhkOWVmYjE2MzA5M2QxZWY0 ZmFiMWY0NzBkYjdkIDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9QbGF0Zm9ybS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMy0wMy0xMiAg RGFuYSBKYW5zZW5zICA8ZGFuYWtqQGNocm9taXVtLm9yZz4KKworICAgICAgICBbY2hyb21pdW1d IE1ha2Ugem9vbSBmaWx0ZXIgaW5kZXBlbmRlbnQgb2YgdGhlIGxheWVyIHNpemUuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTIyMjEKKworICAgICAg ICBSZXZpZXdlZCBieSBTdGVwaGVuIFdoaXRlLgorCisgICAgICAgIE1ha2UgdGhlIHpvb20gZmls dGVyIGhvbGQgYSB6b29tIGFtb3VudCBhbmQgYW4gaW5zZXQuCisKKyAgICAgICAgKiBjaHJvbWl1 bS9wdWJsaWMvV2ViRmlsdGVyT3BlcmF0aW9uLmg6CisgICAgICAgIChXZWJLaXQ6OldlYkZpbHRl ck9wZXJhdGlvbjo6em9vbUluc2V0KToKKyAgICAgICAgKFdlYkZpbHRlck9wZXJhdGlvbik6Cisg ICAgICAgIChXZWJLaXQ6OldlYkZpbHRlck9wZXJhdGlvbjo6Y3JlYXRlWm9vbUZpbHRlcik6Cisg ICAgICAgIChXZWJLaXQ6OldlYkZpbHRlck9wZXJhdGlvbjo6c2V0Wm9vbUluc2V0KToKKyAgICAg ICAgKFdlYktpdDo6V2ViRmlsdGVyT3BlcmF0aW9uOjpXZWJGaWx0ZXJPcGVyYXRpb24pOgorCiAy MDEzLTAzLTEzICBUb21teSBXaWRlbmZseWNodCAgPHRvbW15d0Bnb29nbGUuY29tPgogCiAgICAg ICAgIFtjaHJvbWl1bV0gTWVkaWFTdHJlYW0gQVBJOiBDbGVhbmluZyBhd2F5IGRlcHJlY2F0ZWQg YW5kIHVudXNlZCBzdGF0ZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggY2ZkNWY0ZDY1 YzNjMzMxY2UyZjcyYWZiYzU3ZGMzNDI1Mjk1OTQ1Yi4uMWM1MGI2MmZjMzk2YjkzMDY4Mjc3NjA2 NDgwOTI2NmY0YzBhOGZlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFu Z2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx NCBAQAorMjAxMy0wMy0xMiAgRGFuYSBKYW5zZW5zICA8ZGFuYWtqQGNocm9taXVtLm9yZz4KKwor ICAgICAgICBbY2hyb21pdW1dIE1ha2Ugem9vbSBmaWx0ZXIgaW5kZXBlbmRlbnQgb2YgdGhlIGxh eWVyIHNpemUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMTIyMjEKKworICAgICAgICBSZXZpZXdlZCBieSBTdGVwaGVuIFdoaXRlLgorCisgICAgICAg ICogdGVzdHMvRmlsdGVyT3BlcmF0aW9uc1Rlc3QuY3BwOgorICAgICAgICAoV2ViS2l0KToKKyAg ICAgICAgKFdlYktpdDo6VEVTVCk6CisKIDIwMTMtMDMtMTMgIENocmlzIFBhbG1lciAgPHBhbG1l ckBnb29nbGUuY29tPgogCiAgICAgICAgIEVuYWJsZSBWOCBiaW5kaW5nIGludGVncml5IG9uIEFu ZHJvaWQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0vY2hyb21pdW0vcHVibGljL1dlYkZp bHRlck9wZXJhdGlvbi5oIGIvU291cmNlL1BsYXRmb3JtL2Nocm9taXVtL3B1YmxpYy9XZWJGaWx0 ZXJPcGVyYXRpb24uaAppbmRleCA2ZjYyOGY1ZmQ1ZDAxNjc4ZjZkOGViZmRmYmIyMWIzMmRmZWVh MGQ5Li5iYjViYjJkYTZiMzQ5NmYwNGExNmQ2ZmI4MDJlYmI0NzIwODEyZTUzIDEwMDY0NAotLS0g YS9Tb3VyY2UvUGxhdGZvcm0vY2hyb21pdW0vcHVibGljL1dlYkZpbHRlck9wZXJhdGlvbi5oCisr KyBiL1NvdXJjZS9QbGF0Zm9ybS9jaHJvbWl1bS9wdWJsaWMvV2ViRmlsdGVyT3BlcmF0aW9uLmgK QEAgLTMwLDcgKzMwLDYgQEAKICNpbmNsdWRlICJXZWJDb21tb24uaCIKICNpbmNsdWRlICJXZWJD b2xvci5oIgogI2luY2x1ZGUgIldlYlBvaW50LmgiCi0jaW5jbHVkZSAiV2ViUmVjdC5oIgogCiBu YW1lc3BhY2UgV2ViS2l0IHsKIApAQCAtODYsMTIgKzg1LDE1IEBAIHB1YmxpYzoKICAgICAgICAg cmV0dXJuIG1fbWF0cml4OwogICAgIH0KIAotICAgIFdlYlJlY3Qgem9vbVJlY3QoKSBjb25zdAor ICAgIGludCB6b29tSW5zZXQoKSBjb25zdAogICAgIHsKICAgICAgICAgV0VCS0lUX0FTU0VSVCht X3R5cGUgPT0gRmlsdGVyVHlwZVpvb20pOwotICAgICAgICByZXR1cm4gbV96b29tUmVjdDsKKyAg ICAgICAgcmV0dXJuIG1fem9vbUluc2V0OwogICAgIH0KIAorICAgIC8vIEZJWE1FOiBSZW1vdmUg dGhpcyBhbmQgdGhlIGNoZWNrIGZvciBpdCBpbiBjaHJvbWl1bS4KKyNkZWZpbmUgTkVXX1pPT01f RklMVEVSCisKICAgICBzdGF0aWMgV2ViRmlsdGVyT3BlcmF0aW9uIGNyZWF0ZUdyYXlzY2FsZUZp bHRlcihmbG9hdCBhbW91bnQpIHsgcmV0dXJuIFdlYkZpbHRlck9wZXJhdGlvbihGaWx0ZXJUeXBl R3JheXNjYWxlLCBhbW91bnQpOyB9CiAgICAgc3RhdGljIFdlYkZpbHRlck9wZXJhdGlvbiBjcmVh dGVTZXBpYUZpbHRlcihmbG9hdCBhbW91bnQpIHsgcmV0dXJuIFdlYkZpbHRlck9wZXJhdGlvbihG aWx0ZXJUeXBlU2VwaWEsIGFtb3VudCk7IH0KICAgICBzdGF0aWMgV2ViRmlsdGVyT3BlcmF0aW9u IGNyZWF0ZVNhdHVyYXRlRmlsdGVyKGZsb2F0IGFtb3VudCkgeyByZXR1cm4gV2ViRmlsdGVyT3Bl cmF0aW9uKEZpbHRlclR5cGVTYXR1cmF0ZSwgYW1vdW50KTsgfQpAQCAtMTAzLDcgKzEwNSw3IEBA IHB1YmxpYzoKICAgICBzdGF0aWMgV2ViRmlsdGVyT3BlcmF0aW9uIGNyZWF0ZUJsdXJGaWx0ZXIo ZmxvYXQgYW1vdW50KSB7IHJldHVybiBXZWJGaWx0ZXJPcGVyYXRpb24oRmlsdGVyVHlwZUJsdXIs IGFtb3VudCk7IH0KICAgICBzdGF0aWMgV2ViRmlsdGVyT3BlcmF0aW9uIGNyZWF0ZURyb3BTaGFk b3dGaWx0ZXIoV2ViUG9pbnQgb2Zmc2V0LCBmbG9hdCBzdGREZXZpYXRpb24sIFdlYkNvbG9yIGNv bG9yKSB7IHJldHVybiBXZWJGaWx0ZXJPcGVyYXRpb24oRmlsdGVyVHlwZURyb3BTaGFkb3csIG9m ZnNldCwgc3RkRGV2aWF0aW9uLCBjb2xvcik7IH0KICAgICBzdGF0aWMgV2ViRmlsdGVyT3BlcmF0 aW9uIGNyZWF0ZUNvbG9yTWF0cml4RmlsdGVyKFNrU2NhbGFyIG1hdHJpeFsyMF0pIHsgcmV0dXJu IFdlYkZpbHRlck9wZXJhdGlvbihGaWx0ZXJUeXBlQ29sb3JNYXRyaXgsIG1hdHJpeCk7IH0KLSAg ICBzdGF0aWMgV2ViRmlsdGVyT3BlcmF0aW9uIGNyZWF0ZVpvb21GaWx0ZXIoV2ViUmVjdCByZWN0 LCBpbnQgaW5zZXQpIHsgcmV0dXJuIFdlYkZpbHRlck9wZXJhdGlvbihGaWx0ZXJUeXBlWm9vbSwg cmVjdCwgaW5zZXQpOyB9CisgICAgc3RhdGljIFdlYkZpbHRlck9wZXJhdGlvbiBjcmVhdGVab29t RmlsdGVyKGZsb2F0IGFtb3VudCwgaW50IGluc2V0KSB7IHJldHVybiBXZWJGaWx0ZXJPcGVyYXRp b24oRmlsdGVyVHlwZVpvb20sIGFtb3VudCwgaW5zZXQpOyB9CiAgICAgc3RhdGljIFdlYkZpbHRl ck9wZXJhdGlvbiBjcmVhdGVTYXR1cmF0aW5nQnJpZ2h0bmVzc0ZpbHRlcihmbG9hdCBhbW91bnQp IHsgcmV0dXJuIFdlYkZpbHRlck9wZXJhdGlvbihGaWx0ZXJUeXBlU2F0dXJhdGluZ0JyaWdodG5l c3MsIGFtb3VudCk7IH0KIAogICAgIGJvb2wgZXF1YWxzKGNvbnN0IFdlYkZpbHRlck9wZXJhdGlv biYgb3RoZXIpIGNvbnN0OwpAQCAtMTQzLDEwICsxNDUsMTAgQEAgcHVibGljOgogICAgICAgICBm b3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgMjA7ICsraSkKICAgICAgICAgICAgIG1fbWF0cml4W2ld ID0gbWF0cml4W2ldOwogICAgIH0KLSAgICB2b2lkIHNldFpvb21SZWN0KFdlYlJlY3QgcmVjdCkK KyAgICB2b2lkIHNldFpvb21JbnNldChpbnQgaW5zZXQpCiAgICAgewogICAgICAgICBXRUJLSVRf QVNTRVJUKG1fdHlwZSA9PSBGaWx0ZXJUeXBlWm9vbSk7Ci0gICAgICAgIG1fem9vbVJlY3QgPSBy ZWN0OworICAgICAgICBtX3pvb21JbnNldCA9IGluc2V0OwogICAgIH0KIAogcHJpdmF0ZToKQEAg LTE1Niw3ICsxNTgsNyBAQCBwcml2YXRlOgogICAgIFdlYlBvaW50IG1fZHJvcFNoYWRvd09mZnNl dDsKICAgICBXZWJDb2xvciBtX2Ryb3BTaGFkb3dDb2xvcjsKICAgICBTa1NjYWxhciBtX21hdHJp eFsyMF07Ci0gICAgV2ViUmVjdCBtX3pvb21SZWN0OworICAgIGludCBtX3pvb21JbnNldDsKIAog ICAgIFdlYkZpbHRlck9wZXJhdGlvbihGaWx0ZXJUeXBlIHR5cGUsIGZsb2F0IGFtb3VudCkKICAg ICB7CkBAIC0xNzcsMTIgKzE3OSwxMiBAQCBwcml2YXRlOgogCiAgICAgV0VCS0lUX0VYUE9SVCBX ZWJGaWx0ZXJPcGVyYXRpb24oRmlsdGVyVHlwZSwgU2tTY2FsYXIgbWF0cml4WzIwXSk7CiAKLSAg ICBXZWJGaWx0ZXJPcGVyYXRpb24oRmlsdGVyVHlwZSB0eXBlLCBXZWJSZWN0IHJlY3QsIGZsb2F0 IGluc2V0KQorICAgIFdlYkZpbHRlck9wZXJhdGlvbihGaWx0ZXJUeXBlIHR5cGUsIGZsb2F0IGFt b3VudCwgaW50IGluc2V0KQogICAgIHsKICAgICAgICAgV0VCS0lUX0FTU0VSVCh0eXBlID09IEZp bHRlclR5cGVab29tKTsKICAgICAgICAgbV90eXBlID0gdHlwZTsKLSAgICAgICAgbV9hbW91bnQg PSBpbnNldDsKLSAgICAgICAgbV96b29tUmVjdCA9IHJlY3Q7CisgICAgICAgIG1fYW1vdW50ID0g YW1vdW50OworICAgICAgICBtX3pvb21JbnNldCA9IGluc2V0OwogICAgIH0KIH07CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvRmlsdGVyT3BlcmF0aW9uc1Rlc3Qu Y3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9GaWx0ZXJPcGVyYXRpb25zVGVzdC5j cHAKaW5kZXggMGQyZWVlNmRmNDI4NTJmNTAzMGMwMWVlYmQ5NzNjOTViYmQzMjExMi4uNGEwZmQ4 ZTU1MzAwMzA5N2JkNGUyYjJjNzgyMTdiZTUzNTFjMmFmZSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9jaHJvbWl1bS90ZXN0cy9GaWx0ZXJPcGVyYXRpb25zVGVzdC5jcHAKKysrIGIvU291cmNl L1dlYktpdC9jaHJvbWl1bS90ZXN0cy9GaWx0ZXJPcGVyYXRpb25zVGVzdC5jcHAKQEAgLTE0Nywy NSArMTQ3LDI1IEBAIFRFU1QoV2ViRmlsdGVyT3BlcmF0aW9uc1Rlc3QsIGdldE91dHNldHNEcm9w U2hhZG93KQogICAgICAgICAgICAgRVhQRUNUX0VRKGFbaV0sIG9wLm1hdHJpeCgpW2ldKTsgXAog ICAgIH0KIAotI2RlZmluZSBTQVZFX1JFU1RPUkVfWk9PTVJFQ1RfQU1PVU5UKFR5cGUsIGEsIGIp IFwKKyNkZWZpbmUgU0FWRV9SRVNUT1JFX0FNT1VOVF9JTlNFVChUeXBlLCBhLCBiKSBcCiAgICAg eyBcCiAgICAgICAgIFdlYkZpbHRlck9wZXJhdGlvbiBvcCA9IFdlYkZpbHRlck9wZXJhdGlvbjo6 Y3JlYXRlIyNUeXBlIyNGaWx0ZXIoYSwgYik7IFwKICAgICAgICAgRVhQRUNUX0VRKFdlYkZpbHRl ck9wZXJhdGlvbjo6RmlsdGVyVHlwZSMjVHlwZSwgb3AudHlwZSgpKTsgXAotICAgICAgICBFWFBF Q1RfRVEoYSwgb3Auem9vbVJlY3QoKSk7IFwKLSAgICAgICAgRVhQRUNUX0VRKGIsIG9wLmFtb3Vu dCgpKTsgXAorICAgICAgICBFWFBFQ1RfRVEoYSwgb3AuYW1vdW50KCkpOyBcCisgICAgICAgIEVY UEVDVF9FUShiLCBvcC56b29tSW5zZXQoKSk7IFwKICAgICAgICAgXAogICAgICAgICBXZWJGaWx0 ZXJPcGVyYXRpb24gb3AyID0gV2ViRmlsdGVyT3BlcmF0aW9uOjpjcmVhdGVFbXB0eUZpbHRlcigp OyBcCiAgICAgICAgIG9wMi5zZXRUeXBlKFdlYkZpbHRlck9wZXJhdGlvbjo6RmlsdGVyVHlwZSMj VHlwZSk7IFwKICAgICAgICAgXAotICAgICAgICBFWFBFQ1RfTkUoYSwgb3AyLnpvb21SZWN0KCkp OyBcCi0gICAgICAgIEVYUEVDVF9ORShiLCBvcDIuYW1vdW50KCkpOyBcCisgICAgICAgIEVYUEVD VF9ORShhLCBvcDIuYW1vdW50KCkpOyBcCisgICAgICAgIEVYUEVDVF9ORShiLCBvcDIuem9vbUlu c2V0KCkpOyBcCiAgICAgICAgIFwKLSAgICAgICAgb3AyLnNldFpvb21SZWN0KGEpOyBcCi0gICAg ICAgIG9wMi5zZXRBbW91bnQoYik7IFwKKyAgICAgICAgb3AyLnNldEFtb3VudChhKTsgXAorICAg ICAgICBvcDIuc2V0Wm9vbUluc2V0KGIpOyBcCiAgICAgICAgIFwKICAgICAgICAgRVhQRUNUX0VR KFdlYkZpbHRlck9wZXJhdGlvbjo6RmlsdGVyVHlwZSMjVHlwZSwgb3AyLnR5cGUoKSk7IFwKLSAg ICAgICAgRVhQRUNUX0VRKGEsIG9wMi56b29tUmVjdCgpKTsgXAotICAgICAgICBFWFBFQ1RfRVEo Yiwgb3AyLmFtb3VudCgpKTsgXAorICAgICAgICBFWFBFQ1RfRVEoYSwgb3AyLmFtb3VudCgpKTsg XAorICAgICAgICBFWFBFQ1RfRVEoYiwgb3AyLnpvb21JbnNldCgpKTsgXAogICAgIH0KIAogCkBA IC0xODUsNyArMTg1LDcgQEAgVEVTVChXZWJGaWx0ZXJPcGVyYXRpb25zVGVzdCwgc2F2ZUFuZFJl c3RvcmUpCiAgICAgU2tTY2FsYXIgbWF0cml4WzIwXSA9IHsgMSwgMiwgMywgNCwgNSwgNiwgNywg OCwgOSwgMTAsIDExLCAxMiwgMTMsIDE0LCAxNSwgMTYsIDE3LCAxOCwgMTksIDIwIH07CiAgICAg U0FWRV9SRVNUT1JFX01BVFJJWChDb2xvck1hdHJpeCwgbWF0cml4KTsKIAotICAgIFNBVkVfUkVT VE9SRV9aT09NUkVDVF9BTU9VTlQoWm9vbSwgV2ViUmVjdCgyMCwgMTksIDE4LCAxNyksIDMyKTsK KyAgICBTQVZFX1JFU1RPUkVfQU1PVU5UX0lOU0VUKFpvb20sIDAuNWYsIDMyKTsKIH0KIAogfQo=