35276 2010-02-22 18:30:29 -0800 [Qt] Connect video with accelerated compositing 2010-02-23 01:47:27 -0800 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED Qt P2 Normal --- 1 noam webkit-unassigned commit-queue laszlo.gombos nicholas.young oldest_to_newest 192736 0 noam 2010-02-22 18:30:29 -0800 WebCore has a way of connecting video elements with accelerated compositing. This allows compositing videos together with other items using CSS animations, and in general supporting accelerated video inside a webpage without repainting the web-view. 192747 1 49258 noam 2010-02-22 19:14:13 -0800 Created attachment 49258 Patch together the QGraphicsVideoItem from MediaControlQt into the item in GraphicsLayerQt 192751 2 49259 noam 2010-02-22 19:31:03 -0800 Created attachment 49259 Take2: some ifdef massaging for healthier debugging 192755 3 49259 ariya.hidayat 2010-02-22 19:38:19 -0800 Comment on attachment 49259 Take2: some ifdef massaging for healthier debugging LGTM. 192765 4 49259 noam 2010-02-22 19:48:51 -0800 Comment on attachment 49259 Take2: some ifdef massaging for healthier debugging oops, something wrong with the patch. resubmitting. 192766 5 49261 noam 2010-02-22 19:49:53 -0800 Created attachment 49261 Re-submitting, had a glitch there 192836 6 49261 commit-queue 2010-02-23 01:47:22 -0800 Comment on attachment 49261 Re-submitting, had a glitch there Clearing flags on attachment: 49261 Committed r55132: <http://trac.webkit.org/changeset/55132> 192837 7 commit-queue 2010-02-23 01:47:27 -0800 All reviewed patches have been landed. Closing bug. 49258 2010-02-22 19:14:13 -0800 2010-02-22 19:31:03 -0800 Patch together the QGraphicsVideoItem from MediaControlQt into the item in GraphicsLayerQt patch-35276-1.diff text/plain 9472 noam SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NTExNykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzMgQEAKKzIwMTAtMDItMjIgIE5vYW0gUm9zZW50aGFsICA8bm9hbS5yb3NlbnRo YWxAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFtRdF0gQ29ubmVjdCB2aWRlbyB3aXRoIGFjY2VsZXJhdGVkIGNvbXBvc2l0aW5nCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNTI3NgorCisg ICAgICAgIE1lZGlhQ29udHJvbFByaXZhdGUgYW5kIEdyYXBoaWNzTGF5ZXIgYXJlIHBhdGNoZWQg dG9nZXRoZXIgdmlhCisgICAgICAgIGEgc2hhcmVkIFBsYXRmb3JtTGF5ZXIgKFFHcmFwaGljc0l0 ZW0pLiBUaGlzIHBhdGNoIG1ha2VzIHN1cmUgdGhhdCB0aGUKKyAgICAgICAgUUdyYXBoaWNzVmlk ZW9JdGVtIGZyb20gTWVkaWFDb250cm9sIGJlY29tZXMgcGFydCBvZiB0aGUgc2NlbmUgCisgICAg ICAgIGFzc29jaXNhdGVkIHdpdGggR3JhcGhpY3NMYXllcgorCisgICAgICAgIFRlc3Q6IGh0dHA6 Ly9kb3VibGUuY28ubnovdmlkZW9fdGVzdC90ZXN0MS5odG1sIHdpdGggQUMgdHVybmVkIG9uCisK KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0xheWVyUXQuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllclF0SW1wbDo6KTogbWVkaWFMYXllciBtZW1iZXIK KyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJRdEltcGw6Om9wYXF1ZUFyZWEpOiB2aWRl byBpcyBvcGFxdWUKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJRdEltcGw6OnBhaW50 KTogZG9uJ3QgcGFpbnQgdmlkZW8KKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJRdElt cGw6OmZsdXNoQ2hhbmdlcyk6IGZsdXNoIG1lZGlhTGF5ZXIKKyAgICAgICAgKFdlYkNvcmU6Okdy YXBoaWNzTGF5ZXJRdDo6c2V0Q29udGVudHNUb01lZGlhKTogbm90aWZ5CisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NMYXllclF0Lmg6IHJlaW1wIHNldENvbnRlbnRzVG9N ZWRpYQorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3F0L01lZGlhUGxheWVyUHJpdmF0ZVF0 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZTo6TWVkaWFQbGF5ZXJQ cml2YXRlKTogbV9jb21wb3NpdGluZworICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2 YXRlOjpwYWludCk6IGRvbid0IHBhaW50IGlmIGNvbXBvc2l0aW5nCisgICAgICAgIChXZWJDb3Jl OjpNZWRpYVBsYXllclByaXZhdGU6OmFjY2VsZXJhdGVkUmVuZGVyaW5nU3RhdGVDaGFuZ2VkKToK KyAgICAgICAgcmVpbXAgZnJvbSBNZWRpYVBsYXllclByaXZhdGVJbnRlcmZhY2UgdG8gc3VwcG9y dCBBQworICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlOjpwbGF0Zm9ybUxheWVy KTogZGl0dG8KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9xdC9NZWRpYVBsYXllclByaXZh dGVRdC5oOiAKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZTo6c3VwcG9ydHNB Y2NlbGVyYXRlZFJlbmRlcmluZyk6IGRpdHRvCisKIDIwMTAtMDItMjIgIFN0ZXBoYW4gQcOfbXVz ICA8c3VwZXJzdGlwcGlAZ214LmRlPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgU2VpZGVs LgpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0xheWVyUXQuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NMYXll clF0LmNwcAkocmV2aXNpb24gNTUxMTcpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0 L0dyYXBoaWNzTGF5ZXJRdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEyNSw3ICsxMjUsNyBAQCBw dWJsaWM6CiAgICAgfTsKIAogICAgIC8vIHRoZSBjb21wb3NpdG9yIGxldHMgdXMgc3BlY2lhbC1j YXNlIGltYWdlcyBhbmQgY29sb3JzLCBzbyB3ZSB0cnkgdG8gZG8gc28KLSAgICBlbnVtIFN0YXRp Y0NvbnRlbnRUeXBlIHsgSFRNTENvbnRlbnRUeXBlLCBQaXhtYXBDb250ZW50VHlwZSwgQ29sb3JD b250ZW50VHlwZX07CisgICAgZW51bSBTdGF0aWNDb250ZW50VHlwZSB7IEhUTUxDb250ZW50VHlw ZSwgUGl4bWFwQ29udGVudFR5cGUsIENvbG9yQ29udGVudFR5cGUsIE1lZGlhQ29udGVudFR5cGV9 OwogCiAgICAgR3JhcGhpY3NMYXllclF0SW1wbChHcmFwaGljc0xheWVyUXQqIG5ld0xheWVyKTsK ICAgICB2aXJ0dWFsIH5HcmFwaGljc0xheWVyUXRJbXBsKCk7CkBAIC0xNzksNiArMTc5LDcgQEAg cHVibGljOgogICAgICAgICBib29sIHVwZGF0ZUFsbDsKICAgICAgICAgUUNvbG9yIGNvbnRlbnRz QmFja2dyb3VuZENvbG9yOwogICAgICAgICBRQ29sb3IgYmFja2dyb3VuZENvbG9yOworICAgICAg ICBRV2Vha1BvaW50ZXI8UUdyYXBoaWNzT2JqZWN0PiBtZWRpYUxheWVyOwogICAgICAgICBTdGF0 aWNDb250ZW50VHlwZSBjb250ZW50VHlwZTsKICAgICAgICAgZmxvYXQgb3BhY2l0eTsKICAgICAg ICAgQ29udGVudERhdGEoKQpAQCAtMzUzLDYgKzM1NCw3IEBAIFFQYWludGVyUGF0aCBHcmFwaGlj c0xheWVyUXRJbXBsOjpvcGFxdWUKICAgICBlbHNlIHsKICAgICAgICAgaWYgKG1fc3RhdGUuY29u dGVudHNPcGFxdWUKICAgICAgICAgICAgIHx8IChtX2N1cnJlbnRDb250ZW50LmNvbnRlbnRUeXBl ID09IENvbG9yQ29udGVudFR5cGUgJiYgbV9jdXJyZW50Q29udGVudC5jb250ZW50c0JhY2tncm91 bmRDb2xvci5hbHBoYSgpID09IDB4ZmYpCisgICAgICAgICAgICB8fCAobV9jdXJyZW50Q29udGVu dC5jb250ZW50VHlwZSA9PSBNZWRpYUNvbnRlbnRUeXBlKQogICAgICAgICAgICAgfHwgKG1fY3Vy cmVudENvbnRlbnQuY29udGVudFR5cGUgPT0gUGl4bWFwQ29udGVudFR5cGUgJiYgIW1fY3VycmVu dENvbnRlbnQucGl4bWFwLmhhc0FscGhhKCkpKSB7CiAKICAgICAgICAgICAgIHBhaW50ZXJQYXRo LmFkZFJlY3QobV9zdGF0ZS5jb250ZW50c1JlY3QpOwpAQCAtMzg1LDYgKzM4Nyw5IEBAIHZvaWQg R3JhcGhpY3NMYXllclF0SW1wbDo6cGFpbnQoUVBhaW50ZXIKICAgICBjYXNlIENvbG9yQ29udGVu dFR5cGU6CiAgICAgICAgIHBhaW50ZXItPmZpbGxSZWN0KG1fc3RhdGUuY29udGVudHNSZWN0LCBt X2N1cnJlbnRDb250ZW50LmNvbnRlbnRzQmFja2dyb3VuZENvbG9yKTsKICAgICAgICAgYnJlYWs7 CisgICAgY2FzZSBNZWRpYUNvbnRlbnRUeXBlOgorICAgICAgICAvLyB3ZSBkb24ndCBuZWVkIHRv IHBhaW50IGFueXRoaW5nOiB3ZSBoYXZlIGEgUUdyYXBoaWNzSXRlbSBmcm9tIHRoZSBtZWRpYSBl bGVtZW50CisgICAgICAgIGJyZWFrOwogICAgIH0KIH0KIApAQCAtNDMzLDcgKzQzOCw3IEBAIHZv aWQgR3JhcGhpY3NMYXllclF0SW1wbDo6Zmx1c2hDaGFuZ2VzKGIKICAgICAgICAgICAgICAgICB3 LT5zZXRQYXJlbnRJdGVtKHRoaXMpOwogCiAgICAgICAgIGZvciAoUVNldDxRR3JhcGhpY3NJdGVt Kj46OmNvbnN0X2l0ZXJhdG9yIGl0ID0gY2hpbGRyZW5Ub1JlbW92ZS5iZWdpbigpOyBpdCAhPSBj aGlsZHJlblRvUmVtb3ZlLmVuZCgpOyArK2l0KQotICAgICAgICAgICAgIGlmIChRR3JhcGhpY3NJ dGVtKiB3ID0gKml0KQorICAgICAgICAgICAgIGlmIChHcmFwaGljc0xheWVyUXRJbXBsKiB3ID0g cW9iamVjdF9jYXN0PEdyYXBoaWNzTGF5ZXJRdEltcGwqPigoKml0KS0+dG9HcmFwaGljc09iamVj dCgpKSkKICAgICAgICAgICAgICAgICB3LT5zZXRQYXJlbnRJdGVtKDApOwogCiAgICAgICAgIC8v IGNoaWxkcmVuIGFyZSBvcmRlcmVkIGJ5IHotdmFsdWUsIGxldCBncmFwaGljcy12aWV3IGtub3cu CkBAIC00NjUsNyArNDcwLDYgQEAgdm9pZCBHcmFwaGljc0xheWVyUXRJbXBsOjpmbHVzaENoYW5n ZXMoYgogICAgICAgICAgICAgbV9zaXplID0gUVNpemVGKG1fbGF5ZXItPnNpemUoKS53aWR0aCgp LCBtX2xheWVyLT5zaXplKCkuaGVpZ2h0KCkpOwogICAgICAgICB9CiAgICAgfQotCiAgICAgLy8g RklYTUU6IHRoaXMgaXMgYSBoYWNrLCBkdWUgdG8gYSBwcm9iYWJsZSBRR3JhcGhpY3NTY2VuZSBi dWcgd2hlbiByYXBpZGx5IG1vZGlmeWluZyB0aGUgcGVyc3BlY3RpdmUKICAgICAvLyBidXQgd2l0 aG91dCB0aGlzIGxpbmUgd2UgZ2V0IGdyYXBoaWMgYXJ0aWZhY3RzCiAgICAgaWYgKChtX2NoYW5n ZU1hc2sgJiBDaGlsZHJlblRyYW5zZm9ybUNoYW5nZSkgJiYgbV9zdGF0ZS5jaGlsZHJlblRyYW5z Zm9ybSAhPSBtX2xheWVyLT5jaGlsZHJlblRyYW5zZm9ybSgpKQpAQCAtNDg0LDYgKzQ4OCwxMCBA QCB2b2lkIEdyYXBoaWNzTGF5ZXJRdEltcGw6OmZsdXNoQ2hhbmdlcyhiCiAgICAgICAgICAgICBz ZXRGbGFnKEl0ZW1IYXNOb0NvbnRlbnRzLCBmYWxzZSk7CiAKICAgICAgICAgICAgIGJyZWFrOwor ICAgICAgICBjYXNlIE1lZGlhQ29udGVudFR5cGU6CisgICAgICAgICAgICBzZXRGbGFnKEl0ZW1I YXNOb0NvbnRlbnRzLCB0cnVlKTsKKyAgICAgICAgICAgIG1fcGVuZGluZ0NvbnRlbnQubWVkaWFM YXllci5kYXRhKCktPnNldFBhcmVudEl0ZW0odGhpcyk7CisgICAgICAgICAgICBicmVhazsKIAog ICAgICAgICBjYXNlIENvbG9yQ29udGVudFR5cGU6CiAgICAgICAgICAgICAvLyBubyBwb2ludCBp biBjYWNoaW5nIGEgc29saWQtY29sb3IgcmVjdGFuZ2xlCkBAIC01NjksNiArNTc3LDcgQEAgdm9p ZCBHcmFwaGljc0xheWVyUXRJbXBsOjpmbHVzaENoYW5nZXMoYgogICAgIG1fc3RhdGUuY2hpbGRy ZW5UcmFuc2Zvcm0gPSBtX2xheWVyLT5jaGlsZHJlblRyYW5zZm9ybSgpOwogICAgIG1fY3VycmVu dENvbnRlbnQucGl4bWFwID0gbV9wZW5kaW5nQ29udGVudC5waXhtYXA7CiAgICAgbV9jdXJyZW50 Q29udGVudC5jb250ZW50VHlwZSA9IG1fcGVuZGluZ0NvbnRlbnQuY29udGVudFR5cGU7CisgICAg bV9jdXJyZW50Q29udGVudC5tZWRpYUxheWVyID0gbV9wZW5kaW5nQ29udGVudC5tZWRpYUxheWVy OwogICAgIG1fY3VycmVudENvbnRlbnQuYmFja2dyb3VuZENvbG9yID0gbV9wZW5kaW5nQ29udGVu dC5iYWNrZ3JvdW5kQ29sb3I7CiAgICAgbV9jdXJyZW50Q29udGVudC5yZWdpb25Ub1VwZGF0ZSB8 PSBtX3BlbmRpbmdDb250ZW50LnJlZ2lvblRvVXBkYXRlOwogICAgIG1fY3VycmVudENvbnRlbnQu Y29udGVudHNCYWNrZ3JvdW5kQ29sb3IgPSBtX3BlbmRpbmdDb250ZW50LmNvbnRlbnRzQmFja2dy b3VuZENvbG9yOwpAQCAtODQ1LDYgKzg1NCwxNSBAQCB2b2lkIEdyYXBoaWNzTGF5ZXJRdDo6c2V0 Q29udGVudHNCYWNrZ3JvCiAgICAgR3JhcGhpY3NMYXllcjo6c2V0Q29udGVudHNCYWNrZ3JvdW5k Q29sb3IoY29sb3IpOwogfQogCit2b2lkIEdyYXBoaWNzTGF5ZXJRdDo6c2V0Q29udGVudHNUb01l ZGlhKFBsYXRmb3JtTGF5ZXIqIG1lZGlhKQoreworICAgIG1faW1wbC0+bm90aWZ5Q2hhbmdlKEdy YXBoaWNzTGF5ZXJRdEltcGw6OkNvbnRlbnRDaGFuZ2UpOworICAgIG1faW1wbC0+bV9wZW5kaW5n Q29udGVudC5jb250ZW50VHlwZSA9IEdyYXBoaWNzTGF5ZXJRdEltcGw6Ok1lZGlhQ29udGVudFR5 cGU7CisgICAgbV9pbXBsLT5tX3BlbmRpbmdDb250ZW50Lm1lZGlhTGF5ZXIgPSBtZWRpYS0+dG9H cmFwaGljc09iamVjdCgpOworICAgIEdyYXBoaWNzTGF5ZXI6OnNldENvbnRlbnRzVG9NZWRpYSht ZWRpYSk7Cit9CisKKwogLy8gcmVpbXAgZnJvbSBHcmFwaGljc0xheWVyLmgKIHZvaWQgR3JhcGhp Y3NMYXllclF0OjpzZXRHZW9tZXRyeU9yaWVudGF0aW9uKENvbXBvc2l0aW5nQ29vcmRpbmF0ZXNP cmllbnRhdGlvbiBvcmllbnRhdGlvbikKIHsKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvcXQvR3JhcGhpY3NMYXllclF0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9xdC9HcmFwaGljc0xheWVyUXQuaAkocmV2aXNpb24gNTUxMTcpCisrKyBXZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzTGF5ZXJRdC5oCSh3b3JraW5nIGNvcHkpCkBA IC03MCw2ICs3MCw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgc3VzcGVuZEFuaW1hdGlv bnMoZG91YmxlIHRpbWUpOwogICAgIHZpcnR1YWwgdm9pZCByZXN1bWVBbmltYXRpb25zKCk7CiAg ICAgdmlydHVhbCB2b2lkIHNldENvbnRlbnRzVG9JbWFnZShJbWFnZSopOworICAgIHZpcnR1YWwg dm9pZCBzZXRDb250ZW50c1RvTWVkaWEoUGxhdGZvcm1MYXllciopOwogICAgIHZpcnR1YWwgdm9p ZCBzZXRDb250ZW50c0JhY2tncm91bmRDb2xvcihjb25zdCBDb2xvciYpOwogICAgIHZpcnR1YWwg dm9pZCBzZXRHZW9tZXRyeU9yaWVudGF0aW9uKENvbXBvc2l0aW5nQ29vcmRpbmF0ZXNPcmllbnRh dGlvbiBvcmllbnRhdGlvbik7CiAgICAgdmlydHVhbCB2b2lkIHNldENvbnRlbnRzT3JpZW50YXRp b24oQ29tcG9zaXRpbmdDb29yZGluYXRlc09yaWVudGF0aW9uIG9yaWVudGF0aW9uKTsKSW5kZXg6 IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvTWVkaWFQbGF5ZXJQcml2YXRlUXQuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvTWVkaWFQbGF5ZXJQcml2 YXRlUXQuY3BwCShyZXZpc2lvbiA1NTExNykKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv cXQvTWVkaWFQbGF5ZXJQcml2YXRlUXQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04Niw2ICs4Niw5 IEBAIE1lZGlhUGxheWVyUHJpdmF0ZTo6TWVkaWFQbGF5ZXJQcml2YXRlKE0KICAgICAsIG1fcmVh ZHlTdGF0ZShNZWRpYVBsYXllcjo6SGF2ZU5vdGhpbmcpCiAgICAgLCBtX2lzVmlzaWJsZShmYWxz ZSkKICAgICAsIG1faXNTZWVraW5nKGZhbHNlKQorI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJ VElORykKKyAgICAsIG1fY29tcG9zaXRlZChmYWxzZSkKKyNlbmRpZgogICAgICwgbV9xdWV1ZWRT ZWVrKC0xKQogewogICAgIG1fdmlkZW9JdGVtLT5zZXRNZWRpYU9iamVjdChtX21lZGlhUGxheWVy KTsKQEAgLTUxNiw2ICs1MTksMTAgQEAgSW50U2l6ZSBNZWRpYVBsYXllclByaXZhdGU6Om5hdHVy YWxTaXplKAogCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZTo6cGFpbnQoR3JhcGhpY3NDb250ZXh0 KiBjb250ZXh0LCBjb25zdCBJbnRSZWN0JiByZWN0KQogeworI2lmIFVTRShBQ0NFTEVSQVRFRF9D T01QT1NJVElORykKKyAgICBpZiAobV9jb21wb3NpdGVkKQorICAgICAgICByZXR1cm47CisjZW5k aWYKICAgICBpZiAoY29udGV4dC0+cGFpbnRpbmdEaXNhYmxlZCgpKQogICAgICAgICByZXR1cm47 CiAKQEAgLTUzNCw2ICs1NDEsMjYgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGU6OnJlcGFpbnQo KQogICAgIG1fcGxheWVyLT5yZXBhaW50KCk7CiB9CiAKKyNpZiBVU0UoQUNDRUxFUkFURURfQ09N UE9TSVRJTkcpCit2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZTo6YWNjZWxlcmF0ZWRSZW5kZXJpbmdT dGF0ZUNoYW5nZWQoKQoreworICAgIGJvb2wgY29tcG9zaXRlZCA9IG1fcGxheWVyLT5tZWRpYVBs YXllckNsaWVudCgpLT5tZWRpYVBsYXllclJlbmRlcmluZ0NhbkJlQWNjZWxlcmF0ZWQobV9wbGF5 ZXIpOworICAgIGlmIChjb21wb3NpdGVkID09IG1fY29tcG9zaXRlZCkKKyAgICAgICAgcmV0dXJu OworCisgICAgbV9jb21wb3NpdGVkID0gY29tcG9zaXRlZDsKKyAgICBpZiAoY29tcG9zaXRlZCkK KyAgICAgICAgbV92aWRlb1NjZW5lLT5yZW1vdmVJdGVtKG1fdmlkZW9JdGVtKTsKKyAgICBlbHNl CisgICAgICAgIG1fdmlkZW9TY2VuZS0+YWRkSXRlbShtX3ZpZGVvSXRlbSk7Cit9CisKK1BsYXRm b3JtTGF5ZXIqIE1lZGlhUGxheWVyUHJpdmF0ZTo6cGxhdGZvcm1MYXllcigpIGNvbnN0Cit7Cisg ICAgcmV0dXJuIG1fY29tcG9zaXRlZCA/IG1fdmlkZW9JdGVtIDogMDsKK30KKyNlbmRpZgorCiB9 IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKICNpbmNsdWRlICJtb2NfTWVkaWFQbGF5ZXJQcml2YXRl UXQuY3BwIgpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9NZWRpYVBsYXllclBy aXZhdGVRdC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvTWVk aWFQbGF5ZXJQcml2YXRlUXQuaAkocmV2aXNpb24gNTUxMTcpCisrKyBXZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL3F0L01lZGlhUGxheWVyUHJpdmF0ZVF0LmgJKHdvcmtpbmcgY29weSkKQEAgLTgz LDYgKzgzLDE1IEBAIHB1YmxpYzoKIAogICAgIGJvb2wgc3VwcG9ydHNGdWxsc2NyZWVuKCkgY29u c3QgeyByZXR1cm4gZmFsc2U7IH0KIAorI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykK KyAgICAvLyB3aGV0aGVyIGFjY2VsZXJhdGVkIHJlbmRlcmluZyBpcyBzdXBwb3J0ZWQgYnkgdGhl IG1lZGlhIGVuZ2luZSBmb3IgdGhlIGN1cnJlbnQgbWVkaWEuCisgICAgdmlydHVhbCBib29sIHN1 cHBvcnRzQWNjZWxlcmF0ZWRSZW5kZXJpbmcoKSBjb25zdCB7IHJldHVybiB0cnVlOyB9CisgICAg Ly8gY2FsbGVkIHdoZW4gdGhlIHJlbmRlcmluZyBzeXN0ZW0gZmxpcHMgdGhlIGludG8gb3Igb3V0 IG9mIGFjY2VsZXJhdGVkIHJlbmRlcmluZyBtb2RlLgorICAgIHZpcnR1YWwgdm9pZCBhY2NlbGVy YXRlZFJlbmRlcmluZ1N0YXRlQ2hhbmdlZCgpOworICAgIC8vIHJldHVybnMgYW4gb2JqZWN0IHRo YXQgY2FuIGJlIGRpcmVjdGx5IGNvbXBvc2l0ZWQgdmlhIEdyYXBoaWNzTGF5ZXJRdCAoZXNzZW50 aWFsbHkgYSBRR3JhcGhpY3NJdGVtKikKKyAgICB2aXJ0dWFsIFBsYXRmb3JtTGF5ZXIqIHBsYXRm b3JtTGF5ZXIoKSBjb25zdDsKKyNlbmRpZgorCiBwcml2YXRlIHNsb3RzOgogICAgIHZvaWQgbWVk aWFTdGF0dXNDaGFuZ2VkKFFNZWRpYVBsYXllcjo6TWVkaWFTdGF0dXMpOwogICAgIHZvaWQgaGFu ZGxlRXJyb3IoUU1lZGlhUGxheWVyOjpFcnJvcik7CkBAIC0xMTQsNiArMTIzLDExIEBAIHByaXZh dGU6CiAgICAgSW50U2l6ZSBtX2N1cnJlbnRTaXplOwogICAgIGJvb2wgbV9pc1Zpc2libGU7CiAg ICAgYm9vbCBtX2lzU2Vla2luZzsKKworI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykK KyAgICBib29sIG1fY29tcG9zaXRlZDsKKyNlbmRpZgorCiAgICAgcWludDY0IG1fcXVldWVkU2Vl azsKIH07CiB9Cg== 49259 2010-02-22 19:31:03 -0800 2010-02-22 19:49:53 -0800 Take2: some ifdef massaging for healthier debugging patch-35276-2.diff text/plain 9430 noam SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NTExNykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzMgQEAKKzIwMTAtMDItMjIgIE5vYW0gUm9zZW50aGFsICA8bm9hbS5yb3NlbnRo YWxAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFtRdF0gQ29ubmVjdCB2aWRlbyB3aXRoIGFjY2VsZXJhdGVkIGNvbXBvc2l0aW5nCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNTI3NgorCisg ICAgICAgIE1lZGlhQ29udHJvbFByaXZhdGUgYW5kIEdyYXBoaWNzTGF5ZXIgYXJlIHBhdGNoZWQg dG9nZXRoZXIgdmlhCisgICAgICAgIGEgc2hhcmVkIFBsYXRmb3JtTGF5ZXIgKFFHcmFwaGljc0l0 ZW0pLiBUaGlzIHBhdGNoIG1ha2VzIHN1cmUgdGhhdCB0aGUKKyAgICAgICAgUUdyYXBoaWNzVmlk ZW9JdGVtIGZyb20gTWVkaWFDb250cm9sIGJlY29tZXMgcGFydCBvZiB0aGUgc2NlbmUgCisgICAg ICAgIGFzc29jaXNhdGVkIHdpdGggR3JhcGhpY3NMYXllcgorCisgICAgICAgIFRlc3Q6IGh0dHA6 Ly9kb3VibGUuY28ubnovdmlkZW9fdGVzdC90ZXN0MS5odG1sIHdpdGggQUMgdHVybmVkIG9uCisK KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0xheWVyUXQuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllclF0SW1wbDo6KTogbWVkaWFMYXllciBtZW1iZXIK KyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJRdEltcGw6Om9wYXF1ZUFyZWEpOiB2aWRl byBpcyBvcGFxdWUKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJRdEltcGw6OnBhaW50 KTogZG9uJ3QgcGFpbnQgdmlkZW8KKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJRdElt cGw6OmZsdXNoQ2hhbmdlcyk6IGZsdXNoIG1lZGlhTGF5ZXIKKyAgICAgICAgKFdlYkNvcmU6Okdy YXBoaWNzTGF5ZXJRdDo6c2V0Q29udGVudHNUb01lZGlhKTogbm90aWZ5CisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NMYXllclF0Lmg6IHJlaW1wIHNldENvbnRlbnRzVG9N ZWRpYQorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3F0L01lZGlhUGxheWVyUHJpdmF0ZVF0 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZTo6TWVkaWFQbGF5ZXJQ cml2YXRlKTogbV9jb21wb3NpdGluZworICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2 YXRlOjpwYWludCk6IGRvbid0IHBhaW50IGlmIGNvbXBvc2l0aW5nCisgICAgICAgIChXZWJDb3Jl OjpNZWRpYVBsYXllclByaXZhdGU6OmFjY2VsZXJhdGVkUmVuZGVyaW5nU3RhdGVDaGFuZ2VkKToK KyAgICAgICAgcmVpbXAgZnJvbSBNZWRpYVBsYXllclByaXZhdGVJbnRlcmZhY2UgdG8gc3VwcG9y dCBBQworICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlOjpwbGF0Zm9ybUxheWVy KTogZGl0dG8KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9xdC9NZWRpYVBsYXllclByaXZh dGVRdC5oOiAKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZTo6c3VwcG9ydHNB Y2NlbGVyYXRlZFJlbmRlcmluZyk6IGRpdHRvCisKIDIwMTAtMDItMjIgIFN0ZXBoYW4gQcOfbXVz ICA8c3VwZXJzdGlwcGlAZ214LmRlPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgU2VpZGVs LgpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0xheWVyUXQuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NMYXll clF0LmNwcAkocmV2aXNpb24gNTUxMTcpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0 L0dyYXBoaWNzTGF5ZXJRdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEyNSw3ICsxMjUsNyBAQCBw dWJsaWM6CiAgICAgfTsKIAogICAgIC8vIHRoZSBjb21wb3NpdG9yIGxldHMgdXMgc3BlY2lhbC1j YXNlIGltYWdlcyBhbmQgY29sb3JzLCBzbyB3ZSB0cnkgdG8gZG8gc28KLSAgICBlbnVtIFN0YXRp Y0NvbnRlbnRUeXBlIHsgSFRNTENvbnRlbnRUeXBlLCBQaXhtYXBDb250ZW50VHlwZSwgQ29sb3JD b250ZW50VHlwZX07CisgICAgZW51bSBTdGF0aWNDb250ZW50VHlwZSB7IEhUTUxDb250ZW50VHlw ZSwgUGl4bWFwQ29udGVudFR5cGUsIENvbG9yQ29udGVudFR5cGUsIE1lZGlhQ29udGVudFR5cGV9 OwogCiAgICAgR3JhcGhpY3NMYXllclF0SW1wbChHcmFwaGljc0xheWVyUXQqIG5ld0xheWVyKTsK ICAgICB2aXJ0dWFsIH5HcmFwaGljc0xheWVyUXRJbXBsKCk7CkBAIC0xNzksNiArMTc5LDcgQEAg cHVibGljOgogICAgICAgICBib29sIHVwZGF0ZUFsbDsKICAgICAgICAgUUNvbG9yIGNvbnRlbnRz QmFja2dyb3VuZENvbG9yOwogICAgICAgICBRQ29sb3IgYmFja2dyb3VuZENvbG9yOworICAgICAg ICBRV2Vha1BvaW50ZXI8UUdyYXBoaWNzT2JqZWN0PiBtZWRpYUxheWVyOwogICAgICAgICBTdGF0 aWNDb250ZW50VHlwZSBjb250ZW50VHlwZTsKICAgICAgICAgZmxvYXQgb3BhY2l0eTsKICAgICAg ICAgQ29udGVudERhdGEoKQpAQCAtMzUzLDYgKzM1NCw3IEBAIFFQYWludGVyUGF0aCBHcmFwaGlj c0xheWVyUXRJbXBsOjpvcGFxdWUKICAgICBlbHNlIHsKICAgICAgICAgaWYgKG1fc3RhdGUuY29u dGVudHNPcGFxdWUKICAgICAgICAgICAgIHx8IChtX2N1cnJlbnRDb250ZW50LmNvbnRlbnRUeXBl ID09IENvbG9yQ29udGVudFR5cGUgJiYgbV9jdXJyZW50Q29udGVudC5jb250ZW50c0JhY2tncm91 bmRDb2xvci5hbHBoYSgpID09IDB4ZmYpCisgICAgICAgICAgICB8fCAobV9jdXJyZW50Q29udGVu dC5jb250ZW50VHlwZSA9PSBNZWRpYUNvbnRlbnRUeXBlKQogICAgICAgICAgICAgfHwgKG1fY3Vy cmVudENvbnRlbnQuY29udGVudFR5cGUgPT0gUGl4bWFwQ29udGVudFR5cGUgJiYgIW1fY3VycmVu dENvbnRlbnQucGl4bWFwLmhhc0FscGhhKCkpKSB7CiAKICAgICAgICAgICAgIHBhaW50ZXJQYXRo LmFkZFJlY3QobV9zdGF0ZS5jb250ZW50c1JlY3QpOwpAQCAtMzg1LDYgKzM4Nyw5IEBAIHZvaWQg R3JhcGhpY3NMYXllclF0SW1wbDo6cGFpbnQoUVBhaW50ZXIKICAgICBjYXNlIENvbG9yQ29udGVu dFR5cGU6CiAgICAgICAgIHBhaW50ZXItPmZpbGxSZWN0KG1fc3RhdGUuY29udGVudHNSZWN0LCBt X2N1cnJlbnRDb250ZW50LmNvbnRlbnRzQmFja2dyb3VuZENvbG9yKTsKICAgICAgICAgYnJlYWs7 CisgICAgY2FzZSBNZWRpYUNvbnRlbnRUeXBlOgorICAgICAgICAvLyB3ZSBkb24ndCBuZWVkIHRv IHBhaW50IGFueXRoaW5nOiB3ZSBoYXZlIGEgUUdyYXBoaWNzSXRlbSBmcm9tIHRoZSBtZWRpYSBl bGVtZW50CisgICAgICAgIGJyZWFrOwogICAgIH0KIH0KIApAQCAtNDMzLDcgKzQzOCw3IEBAIHZv aWQgR3JhcGhpY3NMYXllclF0SW1wbDo6Zmx1c2hDaGFuZ2VzKGIKICAgICAgICAgICAgICAgICB3 LT5zZXRQYXJlbnRJdGVtKHRoaXMpOwogCiAgICAgICAgIGZvciAoUVNldDxRR3JhcGhpY3NJdGVt Kj46OmNvbnN0X2l0ZXJhdG9yIGl0ID0gY2hpbGRyZW5Ub1JlbW92ZS5iZWdpbigpOyBpdCAhPSBj aGlsZHJlblRvUmVtb3ZlLmVuZCgpOyArK2l0KQotICAgICAgICAgICAgIGlmIChRR3JhcGhpY3NJ dGVtKiB3ID0gKml0KQorICAgICAgICAgICAgIGlmIChHcmFwaGljc0xheWVyUXRJbXBsKiB3ID0g cW9iamVjdF9jYXN0PEdyYXBoaWNzTGF5ZXJRdEltcGwqPigoKml0KS0+dG9HcmFwaGljc09iamVj dCgpKSkKICAgICAgICAgICAgICAgICB3LT5zZXRQYXJlbnRJdGVtKDApOwogCiAgICAgICAgIC8v IGNoaWxkcmVuIGFyZSBvcmRlcmVkIGJ5IHotdmFsdWUsIGxldCBncmFwaGljcy12aWV3IGtub3cu CkBAIC00NjUsNyArNDcwLDYgQEAgdm9pZCBHcmFwaGljc0xheWVyUXRJbXBsOjpmbHVzaENoYW5n ZXMoYgogICAgICAgICAgICAgbV9zaXplID0gUVNpemVGKG1fbGF5ZXItPnNpemUoKS53aWR0aCgp LCBtX2xheWVyLT5zaXplKCkuaGVpZ2h0KCkpOwogICAgICAgICB9CiAgICAgfQotCiAgICAgLy8g RklYTUU6IHRoaXMgaXMgYSBoYWNrLCBkdWUgdG8gYSBwcm9iYWJsZSBRR3JhcGhpY3NTY2VuZSBi dWcgd2hlbiByYXBpZGx5IG1vZGlmeWluZyB0aGUgcGVyc3BlY3RpdmUKICAgICAvLyBidXQgd2l0 aG91dCB0aGlzIGxpbmUgd2UgZ2V0IGdyYXBoaWMgYXJ0aWZhY3RzCiAgICAgaWYgKChtX2NoYW5n ZU1hc2sgJiBDaGlsZHJlblRyYW5zZm9ybUNoYW5nZSkgJiYgbV9zdGF0ZS5jaGlsZHJlblRyYW5z Zm9ybSAhPSBtX2xheWVyLT5jaGlsZHJlblRyYW5zZm9ybSgpKQpAQCAtNDg0LDYgKzQ4OCwxMCBA QCB2b2lkIEdyYXBoaWNzTGF5ZXJRdEltcGw6OmZsdXNoQ2hhbmdlcyhiCiAgICAgICAgICAgICBz ZXRGbGFnKEl0ZW1IYXNOb0NvbnRlbnRzLCBmYWxzZSk7CiAKICAgICAgICAgICAgIGJyZWFrOwor ICAgICAgICBjYXNlIE1lZGlhQ29udGVudFR5cGU6CisgICAgICAgICAgICBzZXRGbGFnKEl0ZW1I YXNOb0NvbnRlbnRzLCB0cnVlKTsKKyAgICAgICAgICAgIG1fcGVuZGluZ0NvbnRlbnQubWVkaWFM YXllci5kYXRhKCktPnNldFBhcmVudEl0ZW0odGhpcyk7CisgICAgICAgICAgICBicmVhazsKIAog ICAgICAgICBjYXNlIENvbG9yQ29udGVudFR5cGU6CiAgICAgICAgICAgICAvLyBubyBwb2ludCBp biBjYWNoaW5nIGEgc29saWQtY29sb3IgcmVjdGFuZ2xlCkBAIC01NjksNiArNTc3LDcgQEAgdm9p ZCBHcmFwaGljc0xheWVyUXRJbXBsOjpmbHVzaENoYW5nZXMoYgogICAgIG1fc3RhdGUuY2hpbGRy ZW5UcmFuc2Zvcm0gPSBtX2xheWVyLT5jaGlsZHJlblRyYW5zZm9ybSgpOwogICAgIG1fY3VycmVu dENvbnRlbnQucGl4bWFwID0gbV9wZW5kaW5nQ29udGVudC5waXhtYXA7CiAgICAgbV9jdXJyZW50 Q29udGVudC5jb250ZW50VHlwZSA9IG1fcGVuZGluZ0NvbnRlbnQuY29udGVudFR5cGU7CisgICAg bV9jdXJyZW50Q29udGVudC5tZWRpYUxheWVyID0gbV9wZW5kaW5nQ29udGVudC5tZWRpYUxheWVy OwogICAgIG1fY3VycmVudENvbnRlbnQuYmFja2dyb3VuZENvbG9yID0gbV9wZW5kaW5nQ29udGVu dC5iYWNrZ3JvdW5kQ29sb3I7CiAgICAgbV9jdXJyZW50Q29udGVudC5yZWdpb25Ub1VwZGF0ZSB8 PSBtX3BlbmRpbmdDb250ZW50LnJlZ2lvblRvVXBkYXRlOwogICAgIG1fY3VycmVudENvbnRlbnQu Y29udGVudHNCYWNrZ3JvdW5kQ29sb3IgPSBtX3BlbmRpbmdDb250ZW50LmNvbnRlbnRzQmFja2dy b3VuZENvbG9yOwpAQCAtODQ1LDYgKzg1NCwxNSBAQCB2b2lkIEdyYXBoaWNzTGF5ZXJRdDo6c2V0 Q29udGVudHNCYWNrZ3JvCiAgICAgR3JhcGhpY3NMYXllcjo6c2V0Q29udGVudHNCYWNrZ3JvdW5k Q29sb3IoY29sb3IpOwogfQogCit2b2lkIEdyYXBoaWNzTGF5ZXJRdDo6c2V0Q29udGVudHNUb01l ZGlhKFBsYXRmb3JtTGF5ZXIqIG1lZGlhKQoreworICAgIG1faW1wbC0+bm90aWZ5Q2hhbmdlKEdy YXBoaWNzTGF5ZXJRdEltcGw6OkNvbnRlbnRDaGFuZ2UpOworICAgIG1faW1wbC0+bV9wZW5kaW5n Q29udGVudC5jb250ZW50VHlwZSA9IEdyYXBoaWNzTGF5ZXJRdEltcGw6Ok1lZGlhQ29udGVudFR5 cGU7CisgICAgbV9pbXBsLT5tX3BlbmRpbmdDb250ZW50Lm1lZGlhTGF5ZXIgPSBtZWRpYS0+dG9H cmFwaGljc09iamVjdCgpOworICAgIEdyYXBoaWNzTGF5ZXI6OnNldENvbnRlbnRzVG9NZWRpYSht ZWRpYSk7Cit9CisKKwogLy8gcmVpbXAgZnJvbSBHcmFwaGljc0xheWVyLmgKIHZvaWQgR3JhcGhp Y3NMYXllclF0OjpzZXRHZW9tZXRyeU9yaWVudGF0aW9uKENvbXBvc2l0aW5nQ29vcmRpbmF0ZXNP cmllbnRhdGlvbiBvcmllbnRhdGlvbikKIHsKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvcXQvR3JhcGhpY3NMYXllclF0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9xdC9HcmFwaGljc0xheWVyUXQuaAkocmV2aXNpb24gNTUxMTcpCisrKyBXZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzTGF5ZXJRdC5oCSh3b3JraW5nIGNvcHkpCkBA IC03MCw2ICs3MCw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgc3VzcGVuZEFuaW1hdGlv bnMoZG91YmxlIHRpbWUpOwogICAgIHZpcnR1YWwgdm9pZCByZXN1bWVBbmltYXRpb25zKCk7CiAg ICAgdmlydHVhbCB2b2lkIHNldENvbnRlbnRzVG9JbWFnZShJbWFnZSopOworICAgIHZpcnR1YWwg dm9pZCBzZXRDb250ZW50c1RvTWVkaWEoUGxhdGZvcm1MYXllciopOwogICAgIHZpcnR1YWwgdm9p ZCBzZXRDb250ZW50c0JhY2tncm91bmRDb2xvcihjb25zdCBDb2xvciYpOwogICAgIHZpcnR1YWwg dm9pZCBzZXRHZW9tZXRyeU9yaWVudGF0aW9uKENvbXBvc2l0aW5nQ29vcmRpbmF0ZXNPcmllbnRh dGlvbiBvcmllbnRhdGlvbik7CiAgICAgdmlydHVhbCB2b2lkIHNldENvbnRlbnRzT3JpZW50YXRp b24oQ29tcG9zaXRpbmdDb29yZGluYXRlc09yaWVudGF0aW9uIG9yaWVudGF0aW9uKTsKSW5kZXg6 IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvTWVkaWFQbGF5ZXJQcml2YXRlUXQuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvTWVkaWFQbGF5ZXJQcml2 YXRlUXQuY3BwCShyZXZpc2lvbiA1NTExNykKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv cXQvTWVkaWFQbGF5ZXJQcml2YXRlUXQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04Niw2ICs4Niw3 IEBAIE1lZGlhUGxheWVyUHJpdmF0ZTo6TWVkaWFQbGF5ZXJQcml2YXRlKE0KICAgICAsIG1fcmVh ZHlTdGF0ZShNZWRpYVBsYXllcjo6SGF2ZU5vdGhpbmcpCiAgICAgLCBtX2lzVmlzaWJsZShmYWxz ZSkKICAgICAsIG1faXNTZWVraW5nKGZhbHNlKQorICAgICwgbV9jb21wb3NpdGVkKGZhbHNlKQog ICAgICwgbV9xdWV1ZWRTZWVrKC0xKQogewogICAgIG1fdmlkZW9JdGVtLT5zZXRNZWRpYU9iamVj dChtX21lZGlhUGxheWVyKTsKQEAgLTUxNiw2ICs1MTcsMTAgQEAgSW50U2l6ZSBNZWRpYVBsYXll clByaXZhdGU6Om5hdHVyYWxTaXplKAogCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZTo6cGFpbnQo R3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBJbnRSZWN0JiByZWN0KQogeworI2lmIFVT RShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKKyAgICBpZiAobV9jb21wb3NpdGVkKQorICAgICAg ICByZXR1cm47CisjZW5kaWYKICAgICBpZiAoY29udGV4dC0+cGFpbnRpbmdEaXNhYmxlZCgpKQog ICAgICAgICByZXR1cm47CiAKQEAgLTUzNCw2ICs1MzksMjYgQEAgdm9pZCBNZWRpYVBsYXllclBy aXZhdGU6OnJlcGFpbnQoKQogICAgIG1fcGxheWVyLT5yZXBhaW50KCk7CiB9CiAKKyNpZiBVU0Uo QUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCit2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZTo6YWNjZWxl cmF0ZWRSZW5kZXJpbmdTdGF0ZUNoYW5nZWQoKQoreworICAgIGJvb2wgY29tcG9zaXRlZCA9IG1f cGxheWVyLT5tZWRpYVBsYXllckNsaWVudCgpLT5tZWRpYVBsYXllclJlbmRlcmluZ0NhbkJlQWNj ZWxlcmF0ZWQobV9wbGF5ZXIpOworICAgIGlmIChjb21wb3NpdGVkID09IG1fY29tcG9zaXRlZCkK KyAgICAgICAgcmV0dXJuOworCisgICAgbV9jb21wb3NpdGVkID0gY29tcG9zaXRlZDsKKyAgICBp ZiAoY29tcG9zaXRlZCkKKyAgICAgICAgbV92aWRlb1NjZW5lLT5yZW1vdmVJdGVtKG1fdmlkZW9J dGVtKTsKKyAgICBlbHNlCisgICAgICAgIG1fdmlkZW9TY2VuZS0+YWRkSXRlbShtX3ZpZGVvSXRl bSk7Cit9CisKK1BsYXRmb3JtTGF5ZXIqIE1lZGlhUGxheWVyUHJpdmF0ZTo6cGxhdGZvcm1MYXll cigpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1fY29tcG9zaXRlZCA/IG1fdmlkZW9JdGVtIDogMDsK K30KKyNlbmRpZgorCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKICNpbmNsdWRlICJtb2NfTWVk aWFQbGF5ZXJQcml2YXRlUXQuY3BwIgpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9x dC9NZWRpYVBsYXllclByaXZhdGVRdC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvcXQvTWVkaWFQbGF5ZXJQcml2YXRlUXQuaAkocmV2aXNpb24gNTUxMTcpCisrKyBX ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L01lZGlhUGxheWVyUHJpdmF0ZVF0LmgJKHdvcmtp bmcgY29weSkKQEAgLTgzLDYgKzgzLDE1IEBAIHB1YmxpYzoKIAogICAgIGJvb2wgc3VwcG9ydHNG dWxsc2NyZWVuKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KIAorI2lmIFVTRShBQ0NFTEVSQVRF RF9DT01QT1NJVElORykKKyAgICAvLyB3aGV0aGVyIGFjY2VsZXJhdGVkIHJlbmRlcmluZyBpcyBz dXBwb3J0ZWQgYnkgdGhlIG1lZGlhIGVuZ2luZSBmb3IgdGhlIGN1cnJlbnQgbWVkaWEuCisgICAg dmlydHVhbCBib29sIHN1cHBvcnRzQWNjZWxlcmF0ZWRSZW5kZXJpbmcoKSBjb25zdCB7IHJldHVy biB0cnVlOyB9CisgICAgLy8gY2FsbGVkIHdoZW4gdGhlIHJlbmRlcmluZyBzeXN0ZW0gZmxpcHMg dGhlIGludG8gb3Igb3V0IG9mIGFjY2VsZXJhdGVkIHJlbmRlcmluZyBtb2RlLgorICAgIHZpcnR1 YWwgdm9pZCBhY2NlbGVyYXRlZFJlbmRlcmluZ1N0YXRlQ2hhbmdlZCgpOworICAgIC8vIHJldHVy bnMgYW4gb2JqZWN0IHRoYXQgY2FuIGJlIGRpcmVjdGx5IGNvbXBvc2l0ZWQgdmlhIEdyYXBoaWNz TGF5ZXJRdCAoZXNzZW50aWFsbHkgYSBRR3JhcGhpY3NJdGVtKikKKyAgICB2aXJ0dWFsIFBsYXRm b3JtTGF5ZXIqIHBsYXRmb3JtTGF5ZXIoKSBjb25zdDsKKyNlbmRpZgorCiBwcml2YXRlIHNsb3Rz OgogICAgIHZvaWQgbWVkaWFTdGF0dXNDaGFuZ2VkKFFNZWRpYVBsYXllcjo6TWVkaWFTdGF0dXMp OwogICAgIHZvaWQgaGFuZGxlRXJyb3IoUU1lZGlhUGxheWVyOjpFcnJvcik7CkBAIC0xMTQsNiAr MTIzLDExIEBAIHByaXZhdGU6CiAgICAgSW50U2l6ZSBtX2N1cnJlbnRTaXplOwogICAgIGJvb2wg bV9pc1Zpc2libGU7CiAgICAgYm9vbCBtX2lzU2Vla2luZzsKKworI2lmIFVTRShBQ0NFTEVSQVRF RF9DT01QT1NJVElORykKKyAgICBib29sIG1fY29tcG9zaXRlZDsKKyNlbmRpZgorCiAgICAgcWlu dDY0IG1fcXVldWVkU2VlazsKIH07CiB9Cg== 49261 2010-02-22 19:49:53 -0800 2010-02-23 01:47:22 -0800 Re-submitting, had a glitch there patch-35276-2.diff text/plain 9383 noam SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NTExNykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzMgQEAKKzIwMTAtMDItMjIgIE5vYW0gUm9zZW50aGFsICA8bm9hbS5yb3NlbnRo YWxAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFtRdF0gQ29ubmVjdCB2aWRlbyB3aXRoIGFjY2VsZXJhdGVkIGNvbXBvc2l0aW5nCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNTI3NgorCisg ICAgICAgIE1lZGlhQ29udHJvbFByaXZhdGUgYW5kIEdyYXBoaWNzTGF5ZXIgYXJlIHBhdGNoZWQg dG9nZXRoZXIgdmlhCisgICAgICAgIGEgc2hhcmVkIFBsYXRmb3JtTGF5ZXIgKFFHcmFwaGljc0l0 ZW0pLiBUaGlzIHBhdGNoIG1ha2VzIHN1cmUgdGhhdCB0aGUKKyAgICAgICAgUUdyYXBoaWNzVmlk ZW9JdGVtIGZyb20gTWVkaWFDb250cm9sIGJlY29tZXMgcGFydCBvZiB0aGUgc2NlbmUgCisgICAg ICAgIGFzc29jaXNhdGVkIHdpdGggR3JhcGhpY3NMYXllcgorCisgICAgICAgIFRlc3Q6IGh0dHA6 Ly9kb3VibGUuY28ubnovdmlkZW9fdGVzdC90ZXN0MS5odG1sIHdpdGggQUMgdHVybmVkIG9uCisK KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0xheWVyUXQuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllclF0SW1wbDo6KTogbWVkaWFMYXllciBtZW1iZXIK KyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJRdEltcGw6Om9wYXF1ZUFyZWEpOiB2aWRl byBpcyBvcGFxdWUKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJRdEltcGw6OnBhaW50 KTogZG9uJ3QgcGFpbnQgdmlkZW8KKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJRdElt cGw6OmZsdXNoQ2hhbmdlcyk6IGZsdXNoIG1lZGlhTGF5ZXIKKyAgICAgICAgKFdlYkNvcmU6Okdy YXBoaWNzTGF5ZXJRdDo6c2V0Q29udGVudHNUb01lZGlhKTogbm90aWZ5CisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NMYXllclF0Lmg6IHJlaW1wIHNldENvbnRlbnRzVG9N ZWRpYQorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3F0L01lZGlhUGxheWVyUHJpdmF0ZVF0 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZTo6TWVkaWFQbGF5ZXJQ cml2YXRlKTogbV9jb21wb3NpdGluZworICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2 YXRlOjpwYWludCk6IGRvbid0IHBhaW50IGlmIGNvbXBvc2l0aW5nCisgICAgICAgIChXZWJDb3Jl OjpNZWRpYVBsYXllclByaXZhdGU6OmFjY2VsZXJhdGVkUmVuZGVyaW5nU3RhdGVDaGFuZ2VkKToK KyAgICAgICAgcmVpbXAgZnJvbSBNZWRpYVBsYXllclByaXZhdGVJbnRlcmZhY2UgdG8gc3VwcG9y dCBBQworICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlOjpwbGF0Zm9ybUxheWVy KTogZGl0dG8KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9xdC9NZWRpYVBsYXllclByaXZh dGVRdC5oOiAKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZTo6c3VwcG9ydHNB Y2NlbGVyYXRlZFJlbmRlcmluZyk6IGRpdHRvCisKIDIwMTAtMDItMjIgIFN0ZXBoYW4gQcOfbXVz ICA8c3VwZXJzdGlwcGlAZ214LmRlPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgU2VpZGVs LgpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0xheWVyUXQuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NMYXll clF0LmNwcAkocmV2aXNpb24gNTUxMTcpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0 L0dyYXBoaWNzTGF5ZXJRdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEyNSw3ICsxMjUsNyBAQCBw dWJsaWM6CiAgICAgfTsKIAogICAgIC8vIHRoZSBjb21wb3NpdG9yIGxldHMgdXMgc3BlY2lhbC1j YXNlIGltYWdlcyBhbmQgY29sb3JzLCBzbyB3ZSB0cnkgdG8gZG8gc28KLSAgICBlbnVtIFN0YXRp Y0NvbnRlbnRUeXBlIHsgSFRNTENvbnRlbnRUeXBlLCBQaXhtYXBDb250ZW50VHlwZSwgQ29sb3JD b250ZW50VHlwZX07CisgICAgZW51bSBTdGF0aWNDb250ZW50VHlwZSB7IEhUTUxDb250ZW50VHlw ZSwgUGl4bWFwQ29udGVudFR5cGUsIENvbG9yQ29udGVudFR5cGUsIE1lZGlhQ29udGVudFR5cGV9 OwogCiAgICAgR3JhcGhpY3NMYXllclF0SW1wbChHcmFwaGljc0xheWVyUXQqIG5ld0xheWVyKTsK ICAgICB2aXJ0dWFsIH5HcmFwaGljc0xheWVyUXRJbXBsKCk7CkBAIC0xNzksNiArMTc5LDcgQEAg cHVibGljOgogICAgICAgICBib29sIHVwZGF0ZUFsbDsKICAgICAgICAgUUNvbG9yIGNvbnRlbnRz QmFja2dyb3VuZENvbG9yOwogICAgICAgICBRQ29sb3IgYmFja2dyb3VuZENvbG9yOworICAgICAg ICBRV2Vha1BvaW50ZXI8UUdyYXBoaWNzT2JqZWN0PiBtZWRpYUxheWVyOwogICAgICAgICBTdGF0 aWNDb250ZW50VHlwZSBjb250ZW50VHlwZTsKICAgICAgICAgZmxvYXQgb3BhY2l0eTsKICAgICAg ICAgQ29udGVudERhdGEoKQpAQCAtMzUzLDYgKzM1NCw3IEBAIFFQYWludGVyUGF0aCBHcmFwaGlj c0xheWVyUXRJbXBsOjpvcGFxdWUKICAgICBlbHNlIHsKICAgICAgICAgaWYgKG1fc3RhdGUuY29u dGVudHNPcGFxdWUKICAgICAgICAgICAgIHx8IChtX2N1cnJlbnRDb250ZW50LmNvbnRlbnRUeXBl ID09IENvbG9yQ29udGVudFR5cGUgJiYgbV9jdXJyZW50Q29udGVudC5jb250ZW50c0JhY2tncm91 bmRDb2xvci5hbHBoYSgpID09IDB4ZmYpCisgICAgICAgICAgICB8fCAobV9jdXJyZW50Q29udGVu dC5jb250ZW50VHlwZSA9PSBNZWRpYUNvbnRlbnRUeXBlKQogICAgICAgICAgICAgfHwgKG1fY3Vy cmVudENvbnRlbnQuY29udGVudFR5cGUgPT0gUGl4bWFwQ29udGVudFR5cGUgJiYgIW1fY3VycmVu dENvbnRlbnQucGl4bWFwLmhhc0FscGhhKCkpKSB7CiAKICAgICAgICAgICAgIHBhaW50ZXJQYXRo LmFkZFJlY3QobV9zdGF0ZS5jb250ZW50c1JlY3QpOwpAQCAtMzg1LDYgKzM4Nyw5IEBAIHZvaWQg R3JhcGhpY3NMYXllclF0SW1wbDo6cGFpbnQoUVBhaW50ZXIKICAgICBjYXNlIENvbG9yQ29udGVu dFR5cGU6CiAgICAgICAgIHBhaW50ZXItPmZpbGxSZWN0KG1fc3RhdGUuY29udGVudHNSZWN0LCBt X2N1cnJlbnRDb250ZW50LmNvbnRlbnRzQmFja2dyb3VuZENvbG9yKTsKICAgICAgICAgYnJlYWs7 CisgICAgY2FzZSBNZWRpYUNvbnRlbnRUeXBlOgorICAgICAgICAvLyB3ZSBkb24ndCBuZWVkIHRv IHBhaW50IGFueXRoaW5nOiB3ZSBoYXZlIGEgUUdyYXBoaWNzSXRlbSBmcm9tIHRoZSBtZWRpYSBl bGVtZW50CisgICAgICAgIGJyZWFrOwogICAgIH0KIH0KIApAQCAtNDMzLDcgKzQzOCw3IEBAIHZv aWQgR3JhcGhpY3NMYXllclF0SW1wbDo6Zmx1c2hDaGFuZ2VzKGIKICAgICAgICAgICAgICAgICB3 LT5zZXRQYXJlbnRJdGVtKHRoaXMpOwogCiAgICAgICAgIGZvciAoUVNldDxRR3JhcGhpY3NJdGVt Kj46OmNvbnN0X2l0ZXJhdG9yIGl0ID0gY2hpbGRyZW5Ub1JlbW92ZS5iZWdpbigpOyBpdCAhPSBj aGlsZHJlblRvUmVtb3ZlLmVuZCgpOyArK2l0KQotICAgICAgICAgICAgIGlmIChRR3JhcGhpY3NJ dGVtKiB3ID0gKml0KQorICAgICAgICAgICAgIGlmIChHcmFwaGljc0xheWVyUXRJbXBsKiB3ID0g cW9iamVjdF9jYXN0PEdyYXBoaWNzTGF5ZXJRdEltcGwqPigoKml0KS0+dG9HcmFwaGljc09iamVj dCgpKSkKICAgICAgICAgICAgICAgICB3LT5zZXRQYXJlbnRJdGVtKDApOwogCiAgICAgICAgIC8v IGNoaWxkcmVuIGFyZSBvcmRlcmVkIGJ5IHotdmFsdWUsIGxldCBncmFwaGljcy12aWV3IGtub3cu CkBAIC00NjUsNyArNDcwLDYgQEAgdm9pZCBHcmFwaGljc0xheWVyUXRJbXBsOjpmbHVzaENoYW5n ZXMoYgogICAgICAgICAgICAgbV9zaXplID0gUVNpemVGKG1fbGF5ZXItPnNpemUoKS53aWR0aCgp LCBtX2xheWVyLT5zaXplKCkuaGVpZ2h0KCkpOwogICAgICAgICB9CiAgICAgfQotCiAgICAgLy8g RklYTUU6IHRoaXMgaXMgYSBoYWNrLCBkdWUgdG8gYSBwcm9iYWJsZSBRR3JhcGhpY3NTY2VuZSBi dWcgd2hlbiByYXBpZGx5IG1vZGlmeWluZyB0aGUgcGVyc3BlY3RpdmUKICAgICAvLyBidXQgd2l0 aG91dCB0aGlzIGxpbmUgd2UgZ2V0IGdyYXBoaWMgYXJ0aWZhY3RzCiAgICAgaWYgKChtX2NoYW5n ZU1hc2sgJiBDaGlsZHJlblRyYW5zZm9ybUNoYW5nZSkgJiYgbV9zdGF0ZS5jaGlsZHJlblRyYW5z Zm9ybSAhPSBtX2xheWVyLT5jaGlsZHJlblRyYW5zZm9ybSgpKQpAQCAtNDg0LDYgKzQ4OCwxMCBA QCB2b2lkIEdyYXBoaWNzTGF5ZXJRdEltcGw6OmZsdXNoQ2hhbmdlcyhiCiAgICAgICAgICAgICBz ZXRGbGFnKEl0ZW1IYXNOb0NvbnRlbnRzLCBmYWxzZSk7CiAKICAgICAgICAgICAgIGJyZWFrOwor ICAgICAgICBjYXNlIE1lZGlhQ29udGVudFR5cGU6CisgICAgICAgICAgICBzZXRGbGFnKEl0ZW1I YXNOb0NvbnRlbnRzLCB0cnVlKTsKKyAgICAgICAgICAgIG1fcGVuZGluZ0NvbnRlbnQubWVkaWFM YXllci5kYXRhKCktPnNldFBhcmVudEl0ZW0odGhpcyk7CisgICAgICAgICAgICBicmVhazsKIAog ICAgICAgICBjYXNlIENvbG9yQ29udGVudFR5cGU6CiAgICAgICAgICAgICAvLyBubyBwb2ludCBp biBjYWNoaW5nIGEgc29saWQtY29sb3IgcmVjdGFuZ2xlCkBAIC01NjksNiArNTc3LDcgQEAgdm9p ZCBHcmFwaGljc0xheWVyUXRJbXBsOjpmbHVzaENoYW5nZXMoYgogICAgIG1fc3RhdGUuY2hpbGRy ZW5UcmFuc2Zvcm0gPSBtX2xheWVyLT5jaGlsZHJlblRyYW5zZm9ybSgpOwogICAgIG1fY3VycmVu dENvbnRlbnQucGl4bWFwID0gbV9wZW5kaW5nQ29udGVudC5waXhtYXA7CiAgICAgbV9jdXJyZW50 Q29udGVudC5jb250ZW50VHlwZSA9IG1fcGVuZGluZ0NvbnRlbnQuY29udGVudFR5cGU7CisgICAg bV9jdXJyZW50Q29udGVudC5tZWRpYUxheWVyID0gbV9wZW5kaW5nQ29udGVudC5tZWRpYUxheWVy OwogICAgIG1fY3VycmVudENvbnRlbnQuYmFja2dyb3VuZENvbG9yID0gbV9wZW5kaW5nQ29udGVu dC5iYWNrZ3JvdW5kQ29sb3I7CiAgICAgbV9jdXJyZW50Q29udGVudC5yZWdpb25Ub1VwZGF0ZSB8 PSBtX3BlbmRpbmdDb250ZW50LnJlZ2lvblRvVXBkYXRlOwogICAgIG1fY3VycmVudENvbnRlbnQu Y29udGVudHNCYWNrZ3JvdW5kQ29sb3IgPSBtX3BlbmRpbmdDb250ZW50LmNvbnRlbnRzQmFja2dy b3VuZENvbG9yOwpAQCAtODQ1LDYgKzg1NCwxNSBAQCB2b2lkIEdyYXBoaWNzTGF5ZXJRdDo6c2V0 Q29udGVudHNCYWNrZ3JvCiAgICAgR3JhcGhpY3NMYXllcjo6c2V0Q29udGVudHNCYWNrZ3JvdW5k Q29sb3IoY29sb3IpOwogfQogCit2b2lkIEdyYXBoaWNzTGF5ZXJRdDo6c2V0Q29udGVudHNUb01l ZGlhKFBsYXRmb3JtTGF5ZXIqIG1lZGlhKQoreworICAgIG1faW1wbC0+bm90aWZ5Q2hhbmdlKEdy YXBoaWNzTGF5ZXJRdEltcGw6OkNvbnRlbnRDaGFuZ2UpOworICAgIG1faW1wbC0+bV9wZW5kaW5n Q29udGVudC5jb250ZW50VHlwZSA9IEdyYXBoaWNzTGF5ZXJRdEltcGw6Ok1lZGlhQ29udGVudFR5 cGU7CisgICAgbV9pbXBsLT5tX3BlbmRpbmdDb250ZW50Lm1lZGlhTGF5ZXIgPSBtZWRpYS0+dG9H cmFwaGljc09iamVjdCgpOworICAgIEdyYXBoaWNzTGF5ZXI6OnNldENvbnRlbnRzVG9NZWRpYSht ZWRpYSk7Cit9CisKKwogLy8gcmVpbXAgZnJvbSBHcmFwaGljc0xheWVyLmgKIHZvaWQgR3JhcGhp Y3NMYXllclF0OjpzZXRHZW9tZXRyeU9yaWVudGF0aW9uKENvbXBvc2l0aW5nQ29vcmRpbmF0ZXNP cmllbnRhdGlvbiBvcmllbnRhdGlvbikKIHsKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvcXQvR3JhcGhpY3NMYXllclF0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9xdC9HcmFwaGljc0xheWVyUXQuaAkocmV2aXNpb24gNTUxMTcpCisrKyBXZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzTGF5ZXJRdC5oCSh3b3JraW5nIGNvcHkpCkBA IC03MCw2ICs3MCw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgc3VzcGVuZEFuaW1hdGlv bnMoZG91YmxlIHRpbWUpOwogICAgIHZpcnR1YWwgdm9pZCByZXN1bWVBbmltYXRpb25zKCk7CiAg ICAgdmlydHVhbCB2b2lkIHNldENvbnRlbnRzVG9JbWFnZShJbWFnZSopOworICAgIHZpcnR1YWwg dm9pZCBzZXRDb250ZW50c1RvTWVkaWEoUGxhdGZvcm1MYXllciopOwogICAgIHZpcnR1YWwgdm9p ZCBzZXRDb250ZW50c0JhY2tncm91bmRDb2xvcihjb25zdCBDb2xvciYpOwogICAgIHZpcnR1YWwg dm9pZCBzZXRHZW9tZXRyeU9yaWVudGF0aW9uKENvbXBvc2l0aW5nQ29vcmRpbmF0ZXNPcmllbnRh dGlvbiBvcmllbnRhdGlvbik7CiAgICAgdmlydHVhbCB2b2lkIHNldENvbnRlbnRzT3JpZW50YXRp b24oQ29tcG9zaXRpbmdDb29yZGluYXRlc09yaWVudGF0aW9uIG9yaWVudGF0aW9uKTsKSW5kZXg6 IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvTWVkaWFQbGF5ZXJQcml2YXRlUXQuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvTWVkaWFQbGF5ZXJQcml2 YXRlUXQuY3BwCShyZXZpc2lvbiA1NTExNykKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv cXQvTWVkaWFQbGF5ZXJQcml2YXRlUXQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04Niw2ICs4Niw3 IEBAIE1lZGlhUGxheWVyUHJpdmF0ZTo6TWVkaWFQbGF5ZXJQcml2YXRlKE0KICAgICAsIG1fcmVh ZHlTdGF0ZShNZWRpYVBsYXllcjo6SGF2ZU5vdGhpbmcpCiAgICAgLCBtX2lzVmlzaWJsZShmYWxz ZSkKICAgICAsIG1faXNTZWVraW5nKGZhbHNlKQorICAgICwgbV9jb21wb3NpdGVkKGZhbHNlKQog ICAgICwgbV9xdWV1ZWRTZWVrKC0xKQogewogICAgIG1fdmlkZW9JdGVtLT5zZXRNZWRpYU9iamVj dChtX21lZGlhUGxheWVyKTsKQEAgLTUxNiw2ICs1MTcsMTAgQEAgSW50U2l6ZSBNZWRpYVBsYXll clByaXZhdGU6Om5hdHVyYWxTaXplKAogCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZTo6cGFpbnQo R3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBJbnRSZWN0JiByZWN0KQogeworI2lmIFVT RShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKKyAgICBpZiAobV9jb21wb3NpdGVkKQorICAgICAg ICByZXR1cm47CisjZW5kaWYKICAgICBpZiAoY29udGV4dC0+cGFpbnRpbmdEaXNhYmxlZCgpKQog ICAgICAgICByZXR1cm47CiAKQEAgLTUzNCw2ICs1MzksMjYgQEAgdm9pZCBNZWRpYVBsYXllclBy aXZhdGU6OnJlcGFpbnQoKQogICAgIG1fcGxheWVyLT5yZXBhaW50KCk7CiB9CiAKKyNpZiBVU0Uo QUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCit2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZTo6YWNjZWxl cmF0ZWRSZW5kZXJpbmdTdGF0ZUNoYW5nZWQoKQoreworICAgIGJvb2wgY29tcG9zaXRlZCA9IG1f cGxheWVyLT5tZWRpYVBsYXllckNsaWVudCgpLT5tZWRpYVBsYXllclJlbmRlcmluZ0NhbkJlQWNj ZWxlcmF0ZWQobV9wbGF5ZXIpOworICAgIGlmIChjb21wb3NpdGVkID09IG1fY29tcG9zaXRlZCkK KyAgICAgICAgcmV0dXJuOworCisgICAgbV9jb21wb3NpdGVkID0gY29tcG9zaXRlZDsKKyAgICBp ZiAoY29tcG9zaXRlZCkKKyAgICAgICAgbV92aWRlb1NjZW5lLT5yZW1vdmVJdGVtKG1fdmlkZW9J dGVtKTsKKyAgICBlbHNlCisgICAgICAgIG1fdmlkZW9TY2VuZS0+YWRkSXRlbShtX3ZpZGVvSXRl bSk7Cit9CisKK1BsYXRmb3JtTGF5ZXIqIE1lZGlhUGxheWVyUHJpdmF0ZTo6cGxhdGZvcm1MYXll cigpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1fY29tcG9zaXRlZCA/IG1fdmlkZW9JdGVtIDogMDsK K30KKyNlbmRpZgorCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKICNpbmNsdWRlICJtb2NfTWVk aWFQbGF5ZXJQcml2YXRlUXQuY3BwIgpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9x dC9NZWRpYVBsYXllclByaXZhdGVRdC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvcXQvTWVkaWFQbGF5ZXJQcml2YXRlUXQuaAkocmV2aXNpb24gNTUxMTcpCisrKyBX ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L01lZGlhUGxheWVyUHJpdmF0ZVF0LmgJKHdvcmtp bmcgY29weSkKQEAgLTgzLDYgKzgzLDE1IEBAIHB1YmxpYzoKIAogICAgIGJvb2wgc3VwcG9ydHNG dWxsc2NyZWVuKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KIAorI2lmIFVTRShBQ0NFTEVSQVRF RF9DT01QT1NJVElORykKKyAgICAvLyB3aGV0aGVyIGFjY2VsZXJhdGVkIHJlbmRlcmluZyBpcyBz dXBwb3J0ZWQgYnkgdGhlIG1lZGlhIGVuZ2luZSBmb3IgdGhlIGN1cnJlbnQgbWVkaWEuCisgICAg dmlydHVhbCBib29sIHN1cHBvcnRzQWNjZWxlcmF0ZWRSZW5kZXJpbmcoKSBjb25zdCB7IHJldHVy biB0cnVlOyB9CisgICAgLy8gY2FsbGVkIHdoZW4gdGhlIHJlbmRlcmluZyBzeXN0ZW0gZmxpcHMg dGhlIGludG8gb3Igb3V0IG9mIGFjY2VsZXJhdGVkIHJlbmRlcmluZyBtb2RlLgorICAgIHZpcnR1 YWwgdm9pZCBhY2NlbGVyYXRlZFJlbmRlcmluZ1N0YXRlQ2hhbmdlZCgpOworICAgIC8vIHJldHVy bnMgYW4gb2JqZWN0IHRoYXQgY2FuIGJlIGRpcmVjdGx5IGNvbXBvc2l0ZWQgdmlhIEdyYXBoaWNz TGF5ZXJRdCAoZXNzZW50aWFsbHkgYSBRR3JhcGhpY3NJdGVtKikKKyAgICB2aXJ0dWFsIFBsYXRm b3JtTGF5ZXIqIHBsYXRmb3JtTGF5ZXIoKSBjb25zdDsKKyNlbmRpZgorCiBwcml2YXRlIHNsb3Rz OgogICAgIHZvaWQgbWVkaWFTdGF0dXNDaGFuZ2VkKFFNZWRpYVBsYXllcjo6TWVkaWFTdGF0dXMp OwogICAgIHZvaWQgaGFuZGxlRXJyb3IoUU1lZGlhUGxheWVyOjpFcnJvcik7CkBAIC0xMTQsNiAr MTIzLDcgQEAgcHJpdmF0ZToKICAgICBJbnRTaXplIG1fY3VycmVudFNpemU7CiAgICAgYm9vbCBt X2lzVmlzaWJsZTsKICAgICBib29sIG1faXNTZWVraW5nOworICAgIGJvb2wgbV9jb21wb3NpdGVk OwogICAgIHFpbnQ2NCBtX3F1ZXVlZFNlZWs7CiB9OwogfQo=