66814 2011-08-23 15:41:24 -0700 [chromium] Renderer crashes when about:gpucrash is loaded 2011-08-23 18:18:27 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 66820 0 husky webkit-unassigned husky kbr nduca webkit.review.bot oldest_to_newest 455755 0 husky 2011-08-23 15:41:24 -0700 about:gpucrash simulates a GPU process crash. The renderer should recover seamlessly. 455775 1 104924 husky 2011-08-23 16:04:46 -0700 Created attachment 104924 Patch 455783 2 104924 jamesr 2011-08-23 16:10:04 -0700 Comment on attachment 104924 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=104924&action=review > Source/WebKit/chromium/src/WebViewImpl.cpp:2667 > + // Force ViewHostMsg_DidActivateAcceleratedCompositing to be sent so > + // that the browser process can reacquire surfaces. > + m_isAcceleratedCompositingActive = false; > + setIsAcceleratedCompositingActive(success); why is this different from the previous logic? looks like you broke page overlays here, any particular reason to change that logic too? 455822 3 104924 husky 2011-08-23 16:58:44 -0700 Comment on attachment 104924 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=104924&action=review >> Source/WebKit/chromium/src/WebViewImpl.cpp:2667 >> + setIsAcceleratedCompositingActive(success); > > why is this different from the previous logic? > > looks like you broke page overlays here, any particular reason to change that logic too? setRootGraphicsLayer was calling setIsAcceleratedCompositingActive, in addition to the stuff that was causing the crash. It looked to me like the page overlay update was redundant, because that is called on line 2628 inside setIsAcceleratedCompositingActive, but that only happens if m_layerTreeHost is null. So you're right, it's still needed here -- I'll add it back in. 455834 4 104934 husky 2011-08-23 17:03:47 -0700 Created attachment 104934 Patch 455846 5 104934 jamesr 2011-08-23 17:15:13 -0700 Comment on attachment 104934 Patch Ah, I see. Very subtle. It seems like we've done something wrong with setIsAcceleratedCompositingActive() if we need it do have side effects for true->true transitions. Maybe we need a separate notion of 'toggling compositing on/off' vs 'please update yourself due to some compositing change'. That would be for a different patch, though. 455903 6 104934 webkit.review.bot 2011-08-23 18:18:13 -0700 Comment on attachment 104934 Patch Clearing flags on attachment: 104934 Committed r93679: <http://trac.webkit.org/changeset/93679> 455904 7 webkit.review.bot 2011-08-23 18:18:17 -0700 All reviewed patches have been landed. Closing bug. 104924 2011-08-23 16:04:46 -0700 2011-08-23 17:03:43 -0700 Patch bug-66814-20110823160445.patch text/plain 5916 husky SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDkzNjQzKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTEtMDgtMjMgIElhaW4gTWVy cmljayAgPGh1c2t5QGdvb2dsZS5jb20+CisKKyAgICAgICAgW2Nocm9taXVtXSBSZW5kZXJlciBj cmFzaGVzIHdoZW4gYWJvdXQ6Z3B1Y3Jhc2ggaXMgbG9hZGVkCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NjgxNAorCisgICAgICAgIFdlYlZpZXdJbXBs OjpkaWRSZWNyZWF0ZUdyYXBoaWNzQ29udGV4dCgpIHdhcyBjYWxsaW5nCisgICAgICAgIHNldFJv b3RMYXllcigpIG9uIHRoZSBDQyBsYXllciB0cmVlLCBidXQgdGhlIHJvb3QgbGF5ZXIgCisgICAg ICAgIGRvZXNuJ3QgYWN0dWFsbHkgY2hhbmdlIGFuZCB0aGUgY29kZSB3YXNuJ3QgZGVmZW5zaXZl ICAgICAgICAKKyAgICAgICAgYWdhaW5zdCB0aGlzLiBUaGlzIENMIGFkZHMgc29tZSBhc3NlcnRz IHRvIGNhdGNoIHRyZWUKKyAgICAgICAgY29ycnVwdGlvbiBhbmQgcmVtb3ZlcyB0aGUgdW5uZWNl c3NhcnkgY2FsbHMuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0xheWVyLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkdyYXBoaWNzTGF5ZXI6OnNldFBhcmVudCk6CisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvR3JhcGhpY3NMYXllci5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9t aXVtL0xheWVyQ2hyb21pdW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5ZXJDaHJvbWl1bTo6 c2V0UGFyZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkxheWVyQ2hyb21pdW06Omhhc0FuY2VzdG9y KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllckNocm9taXVtLmg6 CisKIDIwMTEtMDgtMjMgIEFkcmllbm5lIFdhbGtlciAgPGVubmVAZ29vZ2xlLmNvbT4KIAogICAg ICAgICBbY2hyb21pdW1dIEZpeCBwb3RlbnRpYWwgbnVsbHB0ciBkZXJlZiBpbiBUaWxlZExheWVy Q2hyb21pdW06OnB1c2hQcm9wZXJ0aWVzVG8KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXIuY3BwCShyZXZpc2lvbiA5MzY0MSkKKysr IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXIuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC05Miw2ICs5MiwxMiBAQCBHcmFwaGljc0xheWVyOjp+R3JhcGhpY3NMYXll cigpCiAgICAgcmVtb3ZlRnJvbVBhcmVudCgpOwogfQogCit2b2lkIEdyYXBoaWNzTGF5ZXI6OnNl dFBhcmVudChHcmFwaGljc0xheWVyKiBsYXllcikKK3sKKyAgICBBU1NFUlQoIWxheWVyIHx8ICFs YXllci0+aGFzQW5jZXN0b3IodGhpcykpOworICAgIG1fcGFyZW50ID0gbGF5ZXI7Cit9CisKIGJv b2wgR3JhcGhpY3NMYXllcjo6aGFzQW5jZXN0b3IoR3JhcGhpY3NMYXllciogYW5jZXN0b3IpIGNv bnN0CiB7CiAgICAgZm9yIChHcmFwaGljc0xheWVyKiBjdXJyID0gcGFyZW50KCk7IGN1cnI7IGN1 cnIgPSBjdXJyLT5wYXJlbnQoKSkgewpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvR3JhcGhpY3NMYXllci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXIuaAkocmV2aXNpb24gOTM2NDEpCisrKyBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0xheWVyLmgJKHdvcmtpbmcgY29weSkK QEAgLTE5Niw3ICsxOTYsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHNldE5hbWUoY29u c3QgU3RyaW5nJiBuYW1lKSB7IG1fbmFtZSA9IG5hbWU7IH0KIAogICAgIEdyYXBoaWNzTGF5ZXIq IHBhcmVudCgpIGNvbnN0IHsgcmV0dXJuIG1fcGFyZW50OyB9OwotICAgIHZvaWQgc2V0UGFyZW50 KEdyYXBoaWNzTGF5ZXIqIGxheWVyKSB7IG1fcGFyZW50ID0gbGF5ZXI7IH0gLy8gSW50ZXJuYWwg dXNlIG9ubHkuCisgICAgdm9pZCBzZXRQYXJlbnQoR3JhcGhpY3NMYXllciopOyAvLyBJbnRlcm5h bCB1c2Ugb25seS4KICAgICAKICAgICAvLyBSZXR1cm5zIHRydWUgaWYgdGhlIGxheWVyIGhhcyB0 aGUgZ2l2ZW4gbGF5ZXIgYXMgYW4gYW5jZXN0b3IgKGV4Y2x1ZGluZyBzZWxmKS4KICAgICBib29s IGhhc0FuY2VzdG9yKEdyYXBoaWNzTGF5ZXIqKSBjb25zdDsKSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyQ2hyb21pdW0uY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyQ2hyb21p dW0uY3BwCShyZXZpc2lvbiA5MzY0MSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2Nocm9taXVtL0xheWVyQ2hyb21pdW0uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMjUsNiAr MTI1LDIxIEBAIHZvaWQgTGF5ZXJDaHJvbWl1bTo6c2V0TmVlZHNDb21taXQoKQogICAgICAgICBt X293bmVyLT5ub3RpZnlTeW5jUmVxdWlyZWQoKTsKIH0KIAordm9pZCBMYXllckNocm9taXVtOjpz ZXRQYXJlbnQoTGF5ZXJDaHJvbWl1bSogbGF5ZXIpCit7CisgICAgQVNTRVJUKCFsYXllciB8fCAh bGF5ZXItPmhhc0FuY2VzdG9yKHRoaXMpKTsKKyAgICBtX3BhcmVudCA9IGxheWVyOworfQorCiti b29sIExheWVyQ2hyb21pdW06Omhhc0FuY2VzdG9yKExheWVyQ2hyb21pdW0qIGFuY2VzdG9yKSBj b25zdAoreworICAgIGZvciAoTGF5ZXJDaHJvbWl1bSogbGF5ZXIgPSBwYXJlbnQoKTsgbGF5ZXI7 IGxheWVyID0gbGF5ZXItPnBhcmVudCgpKSB7CisgICAgICAgIGlmIChsYXllciA9PSBhbmNlc3Rv cikKKyAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgIH0KKyAgICByZXR1cm4gZmFsc2U7Cit9 CisKIHZvaWQgTGF5ZXJDaHJvbWl1bTo6YWRkQ2hpbGQoUGFzc1JlZlB0cjxMYXllckNocm9taXVt PiBjaGlsZCkKIHsKICAgICBpbnNlcnRDaGlsZChjaGlsZCwgbnVtQ2hpbGRyZW4oKSk7CkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllckNocm9taXVt LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vTGF5ZXJDaHJvbWl1bS5oCShyZXZpc2lvbiA5MzY0MSkKKysrIFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyQ2hyb21pdW0uaAkod29ya2luZyBjb3B5KQpA QCAtMjQ4LDcgKzI0OCw4IEBAIHByb3RlY3RlZDoKIHByaXZhdGU6CiAgICAgdm9pZCBzZXROZWVk c0NvbW1pdCgpOwogCi0gICAgdm9pZCBzZXRQYXJlbnQoTGF5ZXJDaHJvbWl1bSogcGFyZW50KSB7 IG1fcGFyZW50ID0gcGFyZW50OyB9CisgICAgdm9pZCBzZXRQYXJlbnQoTGF5ZXJDaHJvbWl1bSop OworICAgIGJvb2wgaGFzQW5jZXN0b3IoTGF5ZXJDaHJvbWl1bSopIGNvbnN0OwogCiAgICAgc2l6 ZV90IG51bUNoaWxkcmVuKCkgY29uc3QKICAgICB7CkluZGV4OiBTb3VyY2UvV2ViS2l0L2Nocm9t aXVtL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5n ZUxvZwkocmV2aXNpb24gOTM2NDMpCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDExLTA4LTIzICBJYWluIE1lcnJp Y2sgIDxodXNreUBnb29nbGUuY29tPgorCisgICAgICAgIFtjaHJvbWl1bV0gUmVuZGVyZXIgY3Jh c2hlcyB3aGVuIGFib3V0OmdwdWNyYXNoIGlzIGxvYWRlZAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjY4MTQKKworICAgICAgICBXZWJWaWV3SW1wbDo6 ZGlkUmVjcmVhdGVHcmFwaGljc0NvbnRleHQoKSB3YXMgY2FsbGluZworICAgICAgICBzZXRSb290 TGF5ZXIoKSBvbiB0aGUgQ0MgbGF5ZXIgdHJlZSwgYnV0IHRoZSByb290IGxheWVyCisgICAgICAg IGRvZXNuJ3QgYWN0dWFsbHkgY2hhbmdlIGFuZCB0aGUgY29kZSB3YXNuJ3QgZGVmZW5zaXZlCisg ICAgICAgIGFnYWluc3QgdGhpcy4gVGhpcyBDTCBhZGRzIHNvbWUgYXNzZXJ0cyB0byBjYXRjaCB0 cmVlCisgICAgICAgIGNvcnJ1cHRpb24gYW5kIHJlbW92ZXMgdGhlIHVubmVjZXNzYXJ5IGNhbGxz LgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogc3Jj L1dlYlZpZXdJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OmRpZFJlY3Jl YXRlR3JhcGhpY3NDb250ZXh0KToKKwogMjAxMS0wOC0yMyAgQWRhbSBLbGVpbiAgPGFkYW1rQGNo cm9taXVtLm9yZz4KIAogICAgICAgICBbY2hyb21pdW1dIFJlbW92ZSBhIGZldyBGSVhNRSAjZGVm aW5lcyBpbiBBUEkgaGVhZGVycwpJbmRleDogU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2Vi Vmlld0ltcGwuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dl YlZpZXdJbXBsLmNwcAkocmV2aXNpb24gOTM2NDEpCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJWaWV3SW1wbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI2NjEsMTUgKzI2NjEsMTAg QEAgdm9pZCBXZWJWaWV3SW1wbDo6YW5pbWF0ZUFuZExheW91dChkb3VibAogCiB2b2lkIFdlYlZp ZXdJbXBsOjpkaWRSZWNyZWF0ZUdyYXBoaWNzQ29udGV4dChib29sIHN1Y2Nlc3MpCiB7Ci0gICAg c2V0Um9vdEdyYXBoaWNzTGF5ZXIoc3VjY2VzcyA/IG1fbGF5ZXJUcmVlSG9zdC0+cm9vdExheWVy KCkgOiAwKTsKLQotICAgIGlmIChzdWNjZXNzKSB7Ci0gICAgICAvLyBGb3JjZXMgVmlld0hvc3RN c2dfRGlkQWN0aXZhdGVBY2NlbGVyYXRlZENvbXBvc2l0aW5nIHRvIGJlIHNlbnQgc28KLSAgICAg IC8vIHRoYXQgdGhlIGJyb3dzZXIgcHJvY2VzcyBjYW4gcmVhY3F1aXJlIHN1cmZhY2VzLgotICAg ICAgbV9jbGllbnQtPmRpZEFjdGl2YXRlQWNjZWxlcmF0ZWRDb21wb3NpdGluZyh0cnVlKTsKLSAg ICAgIGlmIChtX3BhZ2VPdmVybGF5KQotICAgICAgICAgIG1fcGFnZU92ZXJsYXktPnVwZGF0ZSgp OwotICAgIH0KKyAgICAvLyBGb3JjZSBWaWV3SG9zdE1zZ19EaWRBY3RpdmF0ZUFjY2VsZXJhdGVk Q29tcG9zaXRpbmcgdG8gYmUgc2VudCBzbworICAgIC8vIHRoYXQgdGhlIGJyb3dzZXIgcHJvY2Vz cyBjYW4gcmVhY3F1aXJlIHN1cmZhY2VzLgorICAgIG1faXNBY2NlbGVyYXRlZENvbXBvc2l0aW5n QWN0aXZlID0gZmFsc2U7CisgICAgc2V0SXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nQWN0aXZlKHN1 Y2Nlc3MpOwogfQogCiAjaWYgIVVTRShUSFJFQURFRF9DT01QT1NJVElORykK 104934 2011-08-23 17:03:47 -0700 2011-08-23 18:18:13 -0700 Patch bug-66814-20110823170346.patch text/plain 5985 husky SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDkzNjQzKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTEtMDgtMjMgIElhaW4gTWVy cmljayAgPGh1c2t5QGdvb2dsZS5jb20+CisKKyAgICAgICAgW2Nocm9taXVtXSBSZW5kZXJlciBj cmFzaGVzIHdoZW4gYWJvdXQ6Z3B1Y3Jhc2ggaXMgbG9hZGVkCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NjgxNAorCisgICAgICAgIFdlYlZpZXdJbXBs OjpkaWRSZWNyZWF0ZUdyYXBoaWNzQ29udGV4dCgpIHdhcyBjYWxsaW5nCisgICAgICAgIHNldFJv b3RMYXllcigpIG9uIHRoZSBDQyBsYXllciB0cmVlLCBidXQgdGhlIHJvb3QgbGF5ZXIgCisgICAg ICAgIGRvZXNuJ3QgYWN0dWFsbHkgY2hhbmdlIGFuZCB0aGUgY29kZSB3YXNuJ3QgZGVmZW5zaXZl ICAgICAgICAKKyAgICAgICAgYWdhaW5zdCB0aGlzLiBUaGlzIENMIGFkZHMgc29tZSBhc3NlcnRz IHRvIGNhdGNoIHRyZWUKKyAgICAgICAgY29ycnVwdGlvbiBhbmQgcmVtb3ZlcyB0aGUgdW5uZWNl c3NhcnkgY2FsbHMuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0xheWVyLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkdyYXBoaWNzTGF5ZXI6OnNldFBhcmVudCk6CisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvR3JhcGhpY3NMYXllci5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9t aXVtL0xheWVyQ2hyb21pdW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5ZXJDaHJvbWl1bTo6 c2V0UGFyZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkxheWVyQ2hyb21pdW06Omhhc0FuY2VzdG9y KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllckNocm9taXVtLmg6 CisKIDIwMTEtMDgtMjMgIEFkcmllbm5lIFdhbGtlciAgPGVubmVAZ29vZ2xlLmNvbT4KIAogICAg ICAgICBbY2hyb21pdW1dIEZpeCBwb3RlbnRpYWwgbnVsbHB0ciBkZXJlZiBpbiBUaWxlZExheWVy Q2hyb21pdW06OnB1c2hQcm9wZXJ0aWVzVG8KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXIuY3BwCShyZXZpc2lvbiA5MzY0MSkKKysr IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXIuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC05Miw2ICs5MiwxMiBAQCBHcmFwaGljc0xheWVyOjp+R3JhcGhpY3NMYXll cigpCiAgICAgcmVtb3ZlRnJvbVBhcmVudCgpOwogfQogCit2b2lkIEdyYXBoaWNzTGF5ZXI6OnNl dFBhcmVudChHcmFwaGljc0xheWVyKiBsYXllcikKK3sKKyAgICBBU1NFUlQoIWxheWVyIHx8ICFs YXllci0+aGFzQW5jZXN0b3IodGhpcykpOworICAgIG1fcGFyZW50ID0gbGF5ZXI7Cit9CisKIGJv b2wgR3JhcGhpY3NMYXllcjo6aGFzQW5jZXN0b3IoR3JhcGhpY3NMYXllciogYW5jZXN0b3IpIGNv bnN0CiB7CiAgICAgZm9yIChHcmFwaGljc0xheWVyKiBjdXJyID0gcGFyZW50KCk7IGN1cnI7IGN1 cnIgPSBjdXJyLT5wYXJlbnQoKSkgewpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvR3JhcGhpY3NMYXllci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXIuaAkocmV2aXNpb24gOTM2NDEpCisrKyBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0xheWVyLmgJKHdvcmtpbmcgY29weSkK QEAgLTE5Niw3ICsxOTYsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHNldE5hbWUoY29u c3QgU3RyaW5nJiBuYW1lKSB7IG1fbmFtZSA9IG5hbWU7IH0KIAogICAgIEdyYXBoaWNzTGF5ZXIq IHBhcmVudCgpIGNvbnN0IHsgcmV0dXJuIG1fcGFyZW50OyB9OwotICAgIHZvaWQgc2V0UGFyZW50 KEdyYXBoaWNzTGF5ZXIqIGxheWVyKSB7IG1fcGFyZW50ID0gbGF5ZXI7IH0gLy8gSW50ZXJuYWwg dXNlIG9ubHkuCisgICAgdm9pZCBzZXRQYXJlbnQoR3JhcGhpY3NMYXllciopOyAvLyBJbnRlcm5h bCB1c2Ugb25seS4KICAgICAKICAgICAvLyBSZXR1cm5zIHRydWUgaWYgdGhlIGxheWVyIGhhcyB0 aGUgZ2l2ZW4gbGF5ZXIgYXMgYW4gYW5jZXN0b3IgKGV4Y2x1ZGluZyBzZWxmKS4KICAgICBib29s IGhhc0FuY2VzdG9yKEdyYXBoaWNzTGF5ZXIqKSBjb25zdDsKSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyQ2hyb21pdW0uY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyQ2hyb21p dW0uY3BwCShyZXZpc2lvbiA5MzY0MSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2Nocm9taXVtL0xheWVyQ2hyb21pdW0uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMjUsNiAr MTI1LDIxIEBAIHZvaWQgTGF5ZXJDaHJvbWl1bTo6c2V0TmVlZHNDb21taXQoKQogICAgICAgICBt X293bmVyLT5ub3RpZnlTeW5jUmVxdWlyZWQoKTsKIH0KIAordm9pZCBMYXllckNocm9taXVtOjpz ZXRQYXJlbnQoTGF5ZXJDaHJvbWl1bSogbGF5ZXIpCit7CisgICAgQVNTRVJUKCFsYXllciB8fCAh bGF5ZXItPmhhc0FuY2VzdG9yKHRoaXMpKTsKKyAgICBtX3BhcmVudCA9IGxheWVyOworfQorCiti b29sIExheWVyQ2hyb21pdW06Omhhc0FuY2VzdG9yKExheWVyQ2hyb21pdW0qIGFuY2VzdG9yKSBj b25zdAoreworICAgIGZvciAoTGF5ZXJDaHJvbWl1bSogbGF5ZXIgPSBwYXJlbnQoKTsgbGF5ZXI7 IGxheWVyID0gbGF5ZXItPnBhcmVudCgpKSB7CisgICAgICAgIGlmIChsYXllciA9PSBhbmNlc3Rv cikKKyAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgIH0KKyAgICByZXR1cm4gZmFsc2U7Cit9 CisKIHZvaWQgTGF5ZXJDaHJvbWl1bTo6YWRkQ2hpbGQoUGFzc1JlZlB0cjxMYXllckNocm9taXVt PiBjaGlsZCkKIHsKICAgICBpbnNlcnRDaGlsZChjaGlsZCwgbnVtQ2hpbGRyZW4oKSk7CkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllckNocm9taXVt LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vTGF5ZXJDaHJvbWl1bS5oCShyZXZpc2lvbiA5MzY0MSkKKysrIFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyQ2hyb21pdW0uaAkod29ya2luZyBjb3B5KQpA QCAtMjQ4LDcgKzI0OCw4IEBAIHByb3RlY3RlZDoKIHByaXZhdGU6CiAgICAgdm9pZCBzZXROZWVk c0NvbW1pdCgpOwogCi0gICAgdm9pZCBzZXRQYXJlbnQoTGF5ZXJDaHJvbWl1bSogcGFyZW50KSB7 IG1fcGFyZW50ID0gcGFyZW50OyB9CisgICAgdm9pZCBzZXRQYXJlbnQoTGF5ZXJDaHJvbWl1bSop OworICAgIGJvb2wgaGFzQW5jZXN0b3IoTGF5ZXJDaHJvbWl1bSopIGNvbnN0OwogCiAgICAgc2l6 ZV90IG51bUNoaWxkcmVuKCkgY29uc3QKICAgICB7CkluZGV4OiBTb3VyY2UvV2ViS2l0L2Nocm9t aXVtL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5n ZUxvZwkocmV2aXNpb24gOTM2NDMpCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDExLTA4LTIzICBJYWluIE1lcnJp Y2sgIDxodXNreUBnb29nbGUuY29tPgorCisgICAgICAgIFtjaHJvbWl1bV0gUmVuZGVyZXIgY3Jh c2hlcyB3aGVuIGFib3V0OmdwdWNyYXNoIGlzIGxvYWRlZAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjY4MTQKKworICAgICAgICBXZWJWaWV3SW1wbDo6 ZGlkUmVjcmVhdGVHcmFwaGljc0NvbnRleHQoKSB3YXMgY2FsbGluZworICAgICAgICBzZXRSb290 TGF5ZXIoKSBvbiB0aGUgQ0MgbGF5ZXIgdHJlZSwgYnV0IHRoZSByb290IGxheWVyCisgICAgICAg IGRvZXNuJ3QgYWN0dWFsbHkgY2hhbmdlIGFuZCB0aGUgY29kZSB3YXNuJ3QgZGVmZW5zaXZlCisg ICAgICAgIGFnYWluc3QgdGhpcy4gVGhpcyBDTCBhZGRzIHNvbWUgYXNzZXJ0cyB0byBjYXRjaCB0 cmVlCisgICAgICAgIGNvcnJ1cHRpb24gYW5kIHJlbW92ZXMgdGhlIHVubmVjZXNzYXJ5IGNhbGxz LgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogc3Jj L1dlYlZpZXdJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OmRpZFJlY3Jl YXRlR3JhcGhpY3NDb250ZXh0KToKKwogMjAxMS0wOC0yMyAgQWRhbSBLbGVpbiAgPGFkYW1rQGNo cm9taXVtLm9yZz4KIAogICAgICAgICBbY2hyb21pdW1dIFJlbW92ZSBhIGZldyBGSVhNRSAjZGVm aW5lcyBpbiBBUEkgaGVhZGVycwpJbmRleDogU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2Vi Vmlld0ltcGwuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dl YlZpZXdJbXBsLmNwcAkocmV2aXNpb24gOTM2NDEpCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJWaWV3SW1wbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI2NjEsMTUgKzI2NjEsMTIg QEAgdm9pZCBXZWJWaWV3SW1wbDo6YW5pbWF0ZUFuZExheW91dChkb3VibAogCiB2b2lkIFdlYlZp ZXdJbXBsOjpkaWRSZWNyZWF0ZUdyYXBoaWNzQ29udGV4dChib29sIHN1Y2Nlc3MpCiB7Ci0gICAg c2V0Um9vdEdyYXBoaWNzTGF5ZXIoc3VjY2VzcyA/IG1fbGF5ZXJUcmVlSG9zdC0+cm9vdExheWVy KCkgOiAwKTsKLQotICAgIGlmIChzdWNjZXNzKSB7Ci0gICAgICAvLyBGb3JjZXMgVmlld0hvc3RN c2dfRGlkQWN0aXZhdGVBY2NlbGVyYXRlZENvbXBvc2l0aW5nIHRvIGJlIHNlbnQgc28KLSAgICAg IC8vIHRoYXQgdGhlIGJyb3dzZXIgcHJvY2VzcyBjYW4gcmVhY3F1aXJlIHN1cmZhY2VzLgotICAg ICAgbV9jbGllbnQtPmRpZEFjdGl2YXRlQWNjZWxlcmF0ZWRDb21wb3NpdGluZyh0cnVlKTsKLSAg ICAgIGlmIChtX3BhZ2VPdmVybGF5KQotICAgICAgICAgIG1fcGFnZU92ZXJsYXktPnVwZGF0ZSgp OwotICAgIH0KKyAgICAvLyBGb3JjZSBWaWV3SG9zdE1zZ19EaWRBY3RpdmF0ZUFjY2VsZXJhdGVk Q29tcG9zaXRpbmcgdG8gYmUgc2VudCBzbworICAgIC8vIHRoYXQgdGhlIGJyb3dzZXIgcHJvY2Vz cyBjYW4gcmVhY3F1aXJlIHN1cmZhY2VzLgorICAgIG1faXNBY2NlbGVyYXRlZENvbXBvc2l0aW5n QWN0aXZlID0gZmFsc2U7CisgICAgc2V0SXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nQWN0aXZlKHN1 Y2Nlc3MpOworICAgIGlmIChzdWNjZXNzICYmIG1fcGFnZU92ZXJsYXkpCisgICAgICAgIG1fcGFn ZU92ZXJsYXktPnVwZGF0ZSgpOwogfQogCiAjaWYgIVVTRShUSFJFQURFRF9DT01QT1NJVElORykK