72423 2011-11-15 14:30:16 -0800 [Chromium] Crash executing the WebGL conformance tests 2011-11-15 21:12:52 -0800 1 1 1 Unclassified WebKit WebGL 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 twiz twiz cc-bugs jamesr senorblanco twiz webkit.review.bot zmo oldest_to_newest 503288 0 twiz 2011-11-15 14:30:16 -0800 During WebGLRenderingContext tear down, the WebGLLayerChromium is attempting to stop a timer for a NULL context. See chromium tracking issue here: crbug.com\104367 503292 1 115248 twiz 2011-11-15 14:33:06 -0800 Created attachment 115248 Patch 503408 2 115273 twiz 2011-11-15 16:25:11 -0800 Created attachment 115273 Patch 503425 3 115276 twiz 2011-11-15 16:33:30 -0800 Created attachment 115276 Patch 503433 4 115276 kbr 2011-11-15 16:41:37 -0800 Comment on attachment 115276 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=115276&action=review Looks good to me; minor comment nit. Could you upload a final patch? Also, did you get an email about what the style failure is? (Did you upload with webkit-patch upload? That checks style before uploading.) > Source/WebCore/ChangeLog:4 > + [chromium] During tear down, prevent the WebGLLayerChromium instance > + from attempting to stop a timer for a NULL context. Does this need to be one line? > Source/WebCore/platform/graphics/chromium/WebGLLayerChromium.cpp:131 > + // The GraphicsContext3D used by the layer is the context associated with > + // with the drawing buffer. If the drawing buffer is changing, make sure with with -> with 503443 5 115281 twiz 2011-11-15 16:47:37 -0800 Created attachment 115281 Patch 503446 6 115276 twiz 2011-11-15 16:48:38 -0800 Comment on attachment 115276 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=115276&action=review >> Source/WebCore/ChangeLog:4 >> + from attempting to stop a timer for a NULL context. > > Does this need to be one line? Done. >> Source/WebCore/platform/graphics/chromium/WebGLLayerChromium.cpp:131 >> + // with the drawing buffer. If the drawing buffer is changing, make sure > > with with -> with Thanks for catching that. Done. 503447 7 twiz 2011-11-15 16:51:54 -0800 (In reply to comment #4) > (From update of attachment 115276 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=115276&action=review > > Looks good to me; minor comment nit. Could you upload a final patch? Also, did you get an email about what the style failure is? (Did you upload with webkit-patch upload? That checks style before uploading.) Yes, I used webkit-patch upload to upload all of these patches. I also ran check-webkit-style before uploading. It reported no errors. I have yet to receive the style failure notification, so I'm not sure what is up. Fortunately, the most recent patch seems to be passing the style check. > > > Source/WebCore/ChangeLog:4 > > + [chromium] During tear down, prevent the WebGLLayerChromium instance > > + from attempting to stop a timer for a NULL context. > > Does this need to be one line? > > > Source/WebCore/platform/graphics/chromium/WebGLLayerChromium.cpp:131 > > + // The GraphicsContext3D used by the layer is the context associated with > > + // with the drawing buffer. If the drawing buffer is changing, make sure > > with with -> with 503536 8 115281 kbr 2011-11-15 19:57:11 -0800 Comment on attachment 115281 Patch Looks good. r=me 503568 9 115281 webkit.review.bot 2011-11-15 21:12:47 -0800 Comment on attachment 115281 Patch Clearing flags on attachment: 115281 Committed r100401: <http://trac.webkit.org/changeset/100401> 503569 10 webkit.review.bot 2011-11-15 21:12:52 -0800 All reviewed patches have been landed. Closing bug. 115248 2011-11-15 14:33:06 -0800 2011-11-15 16:25:07 -0800 Patch bug-72423-20111115173304.patch text/plain 1915 twiz SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwMDMyNCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDExLTExLTE1ICBKZWZmIFRp bWFudXMgIDx0d2l6QGNocm9taXVtLm9yZz4KKworICAgICAgICBbY2hyb21pdW1dIER1cmluZyB0 ZWFyIGRvd24sIHByZXZlbnQgdGhlIFdlYkdMTGF5ZXJDaHJvbWl1bSBpbnN0YW5jZQorICAgICAg ICBmcm9tIGF0dGVtcHRpbmcgdG8gc3RvcCBhIHRpbWVyIGZvciBhIE5VTEwgY29udGV4dC4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcyNDIzCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9XZWJHTExheWVyQ2hyb21pdW0uY3BwOgorICAgICAgICAoV2ViQ29y ZTo6V2ViR0xMYXllckNocm9taXVtOjpzZXREcmF3aW5nQnVmZmVyKToKKwogMjAxMS0xMC0yOCAg T2phbiBWYWZhaSAgPG9qYW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIE92ZXJmbG93IGFuZCBy ZWxheW91dCBhcmUgYnJva2VuIGluIHRoZSBuZXcgZmxleGJveGVzCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9XZWJHTExheWVyQ2hyb21pdW0uY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1dl YkdMTGF5ZXJDaHJvbWl1bS5jcHAJKHJldmlzaW9uIDEwMDMxMykKKysrIFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1dlYkdMTGF5ZXJDaHJvbWl1bS5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTEyNyw4ICsxMjcsOSBAQCB2b2lkIFdlYkdMTGF5ZXJDaHJvbWl1bTo6c2V0 RHJhd2luZ0J1ZmZlCiAgICAgYm9vbCBkcmF3aW5nQnVmZmVyQ2hhbmdlZCA9IChtX2RyYXdpbmdC dWZmZXIgIT0gZHJhd2luZ0J1ZmZlcik7CiAgICAgbV9kcmF3aW5nQnVmZmVyID0gZHJhd2luZ0J1 ZmZlcjsKIAotICAgIGlmIChsYXllclRyZWVIb3N0KCkgJiYgZHJhd2luZ0J1ZmZlckNoYW5nZWQp Ci0gICAgICAgIGxheWVyVHJlZUhvc3QoKS0+c3RvcFJhdGVMaW1pdGVyKGNvbnRleHQoKSk7Cisg ICAgR3JhcGhpY3NDb250ZXh0M0QqIGNvbnRleHQzRCA9IGNvbnRleHQoKTsKKyAgICBpZiAobGF5 ZXJUcmVlSG9zdCgpICYmIGRyYXdpbmdCdWZmZXJDaGFuZ2VkICYmIGNvbnRleHQzRCkKKyAgICAg ICAgbGF5ZXJUcmVlSG9zdCgpLT5zdG9wUmF0ZUxpbWl0ZXIoY29udGV4dDNEKTsKIAogICAgIGlm ICghbV9kcmF3aW5nQnVmZmVyKQogICAgICAgICByZXR1cm47CkBAIC0xMzksNyArMTQwLDcgQEAg dm9pZCBXZWJHTExheWVyQ2hyb21pdW06OnNldERyYXdpbmdCdWZmZQogICAgICAgICBtX3RleHR1 cmVVcGRhdGVkID0gdHJ1ZTsKICAgICB9CiAgICAgbV90ZXh0dXJlSWQgPSB0ZXh0dXJlSWQ7Ci0g ICAgR3JhcGhpY3NDb250ZXh0M0Q6OkF0dHJpYnV0ZXMgYXR0cmlidXRlcyA9IGNvbnRleHQoKS0+ Z2V0Q29udGV4dEF0dHJpYnV0ZXMoKTsKKyAgICBHcmFwaGljc0NvbnRleHQzRDo6QXR0cmlidXRl cyBhdHRyaWJ1dGVzID0gY29udGV4dDNELT5nZXRDb250ZXh0QXR0cmlidXRlcygpOwogICAgIG1f aGFzQWxwaGEgPSBhdHRyaWJ1dGVzLmFscGhhOwogICAgIG1fcHJlbXVsdGlwbGllZEFscGhhID0g YXR0cmlidXRlcy5wcmVtdWx0aXBsaWVkQWxwaGE7CiB9Cg== 115273 2011-11-15 16:25:11 -0800 2011-11-15 16:33:26 -0800 Patch bug-72423-20111115192510.patch text/plain 2095 twiz SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwMDMyNCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDExLTExLTE1ICBKZWZmIFRp bWFudXMgIDx0d2l6QGNocm9taXVtLm9yZz4KKworICAgICAgICBbY2hyb21pdW1dIER1cmluZyB0 ZWFyIGRvd24sIHByZXZlbnQgdGhlIFdlYkdMTGF5ZXJDaHJvbWl1bSBpbnN0YW5jZQorICAgICAg ICBmcm9tIGF0dGVtcHRpbmcgdG8gc3RvcCBhIHRpbWVyIGZvciBhIE5VTEwgY29udGV4dC4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcyNDIzCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9XZWJHTExheWVyQ2hyb21pdW0uY3BwOgorICAgICAgICAoV2ViQ29y ZTo6V2ViR0xMYXllckNocm9taXVtOjpzZXREcmF3aW5nQnVmZmVyKToKKwogMjAxMS0xMC0yOCAg T2phbiBWYWZhaSAgPG9qYW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIE92ZXJmbG93IGFuZCBy ZWxheW91dCBhcmUgYnJva2VuIGluIHRoZSBuZXcgZmxleGJveGVzCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9XZWJHTExheWVyQ2hyb21pdW0uY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1dl YkdMTGF5ZXJDaHJvbWl1bS5jcHAJKHJldmlzaW9uIDEwMDMxMykKKysrIFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1dlYkdMTGF5ZXJDaHJvbWl1bS5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTUxLDYgKzUxLDcgQEAgV2ViR0xMYXllckNocm9taXVtOjpXZWJHTExheWVy Q2hyb21pdW0oQwogICAgIDogQ2FudmFzTGF5ZXJDaHJvbWl1bShkZWxlZ2F0ZSkKICAgICAsIG1f dGV4dHVyZUNoYW5nZWQodHJ1ZSkKICAgICAsIG1fdGV4dHVyZVVwZGF0ZWQoZmFsc2UpCisgICAg LCBtX2RyYXdpbmdCdWZmZXIoMCkKIHsKIH0KIApAQCAtMTI1LDExICsxMjYsMTYgQEAgdm9pZCBX ZWJHTExheWVyQ2hyb21pdW06OmNvbnRlbnRDaGFuZ2VkKAogdm9pZCBXZWJHTExheWVyQ2hyb21p dW06OnNldERyYXdpbmdCdWZmZXIoRHJhd2luZ0J1ZmZlciogZHJhd2luZ0J1ZmZlcikKIHsKICAg ICBib29sIGRyYXdpbmdCdWZmZXJDaGFuZ2VkID0gKG1fZHJhd2luZ0J1ZmZlciAhPSBkcmF3aW5n QnVmZmVyKTsKLSAgICBtX2RyYXdpbmdCdWZmZXIgPSBkcmF3aW5nQnVmZmVyOwogCi0gICAgaWYg KGxheWVyVHJlZUhvc3QoKSAmJiBkcmF3aW5nQnVmZmVyQ2hhbmdlZCkKLSAgICAgICAgbGF5ZXJU cmVlSG9zdCgpLT5zdG9wUmF0ZUxpbWl0ZXIoY29udGV4dCgpKTsKKyAgICAvLyBUaGUgR3JhcGhp Y3NDb250ZXh0M0QgdXNlZCBieSB0aGUgbGF5ZXIgaXMgdGhlIGNvbnRleHQgYXNzb2NpYXRlZCB3 aXRoCisgICAgLy8gd2l0aCB0aGUgZHJhd2luZyBidWZmZXIuIElmIHRoZSBkcmF3aW5nIGJ1ZmZl ciBpcyBjaGFuZ2luZywgbWFrZSBzdXJlCisgICAgLy8gdG8gc3RvcCB0aGUgcmF0ZSBsaW1pdGVy IG9uIHRoZSBvbGQgY29udGV4dCwgbm90IHRoZSBuZXcgY29udGV4dCBmcm9tIHRoZQorICAgIC8v IG5ldyBkcmF3aW5nIGJ1ZmZlci4KKyAgICBHcmFwaGljc0NvbnRleHQzRCogY29udGV4dDNEID0g Y29udGV4dCgpOworICAgIGlmIChsYXllclRyZWVIb3N0KCkgJiYgZHJhd2luZ0J1ZmZlckNoYW5n ZWQgJiYgY29udGV4dDNEKQorICAgICAgICBsYXllclRyZWVIb3N0KCktPnN0b3BSYXRlTGltaXRl cihjb250ZXh0M0QpOwogCisgICAgbV9kcmF3aW5nQnVmZmVyID0gZHJhd2luZ0J1ZmZlcjsKICAg ICBpZiAoIW1fZHJhd2luZ0J1ZmZlcikKICAgICAgICAgcmV0dXJuOwogCg== 115276 2011-11-15 16:33:30 -0800 2011-11-15 16:49:08 -0800 Patch bug-72423-20111115193328.patch text/plain 2095 twiz SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwMDMyNCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDExLTExLTE1ICBKZWZmIFRp bWFudXMgIDx0d2l6QGNocm9taXVtLm9yZz4KKworICAgICAgICBbY2hyb21pdW1dIER1cmluZyB0 ZWFyIGRvd24sIHByZXZlbnQgdGhlIFdlYkdMTGF5ZXJDaHJvbWl1bSBpbnN0YW5jZQorICAgICAg ICBmcm9tIGF0dGVtcHRpbmcgdG8gc3RvcCBhIHRpbWVyIGZvciBhIE5VTEwgY29udGV4dC4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcyNDIzCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9XZWJHTExheWVyQ2hyb21pdW0uY3BwOgorICAgICAgICAoV2ViQ29y ZTo6V2ViR0xMYXllckNocm9taXVtOjpzZXREcmF3aW5nQnVmZmVyKToKKwogMjAxMS0xMC0yOCAg T2phbiBWYWZhaSAgPG9qYW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIE92ZXJmbG93IGFuZCBy ZWxheW91dCBhcmUgYnJva2VuIGluIHRoZSBuZXcgZmxleGJveGVzCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9XZWJHTExheWVyQ2hyb21pdW0uY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1dl YkdMTGF5ZXJDaHJvbWl1bS5jcHAJKHJldmlzaW9uIDEwMDMxMykKKysrIFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1dlYkdMTGF5ZXJDaHJvbWl1bS5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTUxLDYgKzUxLDcgQEAgV2ViR0xMYXllckNocm9taXVtOjpXZWJHTExheWVy Q2hyb21pdW0oQwogICAgIDogQ2FudmFzTGF5ZXJDaHJvbWl1bShkZWxlZ2F0ZSkKICAgICAsIG1f dGV4dHVyZUNoYW5nZWQodHJ1ZSkKICAgICAsIG1fdGV4dHVyZVVwZGF0ZWQoZmFsc2UpCisgICAg LCBtX2RyYXdpbmdCdWZmZXIoMCkKIHsKIH0KIApAQCAtMTI1LDExICsxMjYsMTYgQEAgdm9pZCBX ZWJHTExheWVyQ2hyb21pdW06OmNvbnRlbnRDaGFuZ2VkKAogdm9pZCBXZWJHTExheWVyQ2hyb21p dW06OnNldERyYXdpbmdCdWZmZXIoRHJhd2luZ0J1ZmZlciogZHJhd2luZ0J1ZmZlcikKIHsKICAg ICBib29sIGRyYXdpbmdCdWZmZXJDaGFuZ2VkID0gKG1fZHJhd2luZ0J1ZmZlciAhPSBkcmF3aW5n QnVmZmVyKTsKLSAgICBtX2RyYXdpbmdCdWZmZXIgPSBkcmF3aW5nQnVmZmVyOwogCi0gICAgaWYg KGxheWVyVHJlZUhvc3QoKSAmJiBkcmF3aW5nQnVmZmVyQ2hhbmdlZCkKLSAgICAgICAgbGF5ZXJU cmVlSG9zdCgpLT5zdG9wUmF0ZUxpbWl0ZXIoY29udGV4dCgpKTsKKyAgICAvLyBUaGUgR3JhcGhp Y3NDb250ZXh0M0QgdXNlZCBieSB0aGUgbGF5ZXIgaXMgdGhlIGNvbnRleHQgYXNzb2NpYXRlZCB3 aXRoCisgICAgLy8gd2l0aCB0aGUgZHJhd2luZyBidWZmZXIuIElmIHRoZSBkcmF3aW5nIGJ1ZmZl ciBpcyBjaGFuZ2luZywgbWFrZSBzdXJlCisgICAgLy8gdG8gc3RvcCB0aGUgcmF0ZSBsaW1pdGVy IG9uIHRoZSBvbGQgY29udGV4dCwgbm90IHRoZSBuZXcgY29udGV4dCBmcm9tIHRoZQorICAgIC8v IG5ldyBkcmF3aW5nIGJ1ZmZlci4KKyAgICBHcmFwaGljc0NvbnRleHQzRCogY29udGV4dDNEID0g Y29udGV4dCgpOworICAgIGlmIChsYXllclRyZWVIb3N0KCkgJiYgZHJhd2luZ0J1ZmZlckNoYW5n ZWQgJiYgY29udGV4dDNEKQorICAgICAgICBsYXllclRyZWVIb3N0KCktPnN0b3BSYXRlTGltaXRl cihjb250ZXh0M0QpOwogCisgICAgbV9kcmF3aW5nQnVmZmVyID0gZHJhd2luZ0J1ZmZlcjsKICAg ICBpZiAoIW1fZHJhd2luZ0J1ZmZlcikKICAgICAgICAgcmV0dXJuOwogCg== 115281 2011-11-15 16:47:37 -0800 2011-11-15 21:12:47 -0800 Patch bug-72423-20111115194735.patch text/plain 2081 twiz SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwMDMyNCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDExLTExLTE1ICBKZWZmIFRp bWFudXMgIDx0d2l6QGNocm9taXVtLm9yZz4KKworICAgICAgICBbY2hyb21pdW1dIER1cmluZyB0 ZWFyIGRvd24sIHByZXZlbnQgdGhlIFdlYkdMTGF5ZXJDaHJvbWl1bSBpbnN0YW5jZSBmcm9tIGF0 dGVtcHRpbmcgdG8gc3RvcCBhIHRpbWVyIGZvciBhIE5VTEwgY29udGV4dC4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcyNDIzCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9j aHJvbWl1bS9XZWJHTExheWVyQ2hyb21pdW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6V2ViR0xM YXllckNocm9taXVtOjpzZXREcmF3aW5nQnVmZmVyKToKKwogMjAxMS0xMC0yOCAgT2phbiBWYWZh aSAgPG9qYW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIE92ZXJmbG93IGFuZCByZWxheW91dCBh cmUgYnJva2VuIGluIHRoZSBuZXcgZmxleGJveGVzCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9XZWJHTExheWVyQ2hyb21pdW0uY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1dlYkdMTGF5ZXJD aHJvbWl1bS5jcHAJKHJldmlzaW9uIDEwMDMxMykKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2Nocm9taXVtL1dlYkdMTGF5ZXJDaHJvbWl1bS5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTUxLDYgKzUxLDcgQEAgV2ViR0xMYXllckNocm9taXVtOjpXZWJHTExheWVyQ2hyb21pdW0o QwogICAgIDogQ2FudmFzTGF5ZXJDaHJvbWl1bShkZWxlZ2F0ZSkKICAgICAsIG1fdGV4dHVyZUNo YW5nZWQodHJ1ZSkKICAgICAsIG1fdGV4dHVyZVVwZGF0ZWQoZmFsc2UpCisgICAgLCBtX2RyYXdp bmdCdWZmZXIoMCkKIHsKIH0KIApAQCAtMTI1LDExICsxMjYsMTYgQEAgdm9pZCBXZWJHTExheWVy Q2hyb21pdW06OmNvbnRlbnRDaGFuZ2VkKAogdm9pZCBXZWJHTExheWVyQ2hyb21pdW06OnNldERy YXdpbmdCdWZmZXIoRHJhd2luZ0J1ZmZlciogZHJhd2luZ0J1ZmZlcikKIHsKICAgICBib29sIGRy YXdpbmdCdWZmZXJDaGFuZ2VkID0gKG1fZHJhd2luZ0J1ZmZlciAhPSBkcmF3aW5nQnVmZmVyKTsK LSAgICBtX2RyYXdpbmdCdWZmZXIgPSBkcmF3aW5nQnVmZmVyOwogCi0gICAgaWYgKGxheWVyVHJl ZUhvc3QoKSAmJiBkcmF3aW5nQnVmZmVyQ2hhbmdlZCkKLSAgICAgICAgbGF5ZXJUcmVlSG9zdCgp LT5zdG9wUmF0ZUxpbWl0ZXIoY29udGV4dCgpKTsKKyAgICAvLyBUaGUgR3JhcGhpY3NDb250ZXh0 M0QgdXNlZCBieSB0aGUgbGF5ZXIgaXMgdGhlIGNvbnRleHQgYXNzb2NpYXRlZCB3aXRoCisgICAg Ly8gdGhlIGRyYXdpbmcgYnVmZmVyLiBJZiB0aGUgZHJhd2luZyBidWZmZXIgaXMgY2hhbmdpbmcs IG1ha2Ugc3VyZQorICAgIC8vIHRvIHN0b3AgdGhlIHJhdGUgbGltaXRlciBvbiB0aGUgb2xkIGNv bnRleHQsIG5vdCB0aGUgbmV3IGNvbnRleHQgZnJvbSB0aGUKKyAgICAvLyBuZXcgZHJhd2luZyBi dWZmZXIuCisgICAgR3JhcGhpY3NDb250ZXh0M0QqIGNvbnRleHQzRCA9IGNvbnRleHQoKTsKKyAg ICBpZiAobGF5ZXJUcmVlSG9zdCgpICYmIGRyYXdpbmdCdWZmZXJDaGFuZ2VkICYmIGNvbnRleHQz RCkKKyAgICAgICAgbGF5ZXJUcmVlSG9zdCgpLT5zdG9wUmF0ZUxpbWl0ZXIoY29udGV4dDNEKTsK IAorICAgIG1fZHJhd2luZ0J1ZmZlciA9IGRyYXdpbmdCdWZmZXI7CiAgICAgaWYgKCFtX2RyYXdp bmdCdWZmZXIpCiAgICAgICAgIHJldHVybjsKIAo=