75598 2012-01-04 18:55:08 -0800 [Qt][Texmap] Convert shaders in TextureMapperGL to use a macro 2012-01-05 17:29:37 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 noam noam igor.oliveira kenneth webkit.review.bot xan.lopez oldest_to_newest 529946 0 noam 2012-01-04 18:55:08 -0800 The literal string representation with quotes makes it hard to read and add shader code. A SHADER macro like in Chromium is much more suitable and less uglified. 529949 1 121205 noam 2012-01-04 19:01:31 -0800 Created attachment 121205 Patch 530579 2 121319 noam 2012-01-05 13:18:26 -0800 Created attachment 121319 Patch 530582 3 noam 2012-01-05 13:19:53 -0800 Had to make some changes in order to apply the patch; I feel that those changes warrant a re-review. 530643 4 121319 mrobinson 2012-01-05 14:41:28 -0800 Comment on attachment 121319 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=121319&action=review This looks good to me. There are some style nits below, but feel free to fix them before landing. By the way, the TextureMapper seems to be working really well for the GTK+ port so far! > Source/WebCore/platform/graphics/opengl/TextureMapperGL.cpp:321 > +#define VERTEX_SHADER(Src...) OES2_PRECISION_DEFINITIONS#Src > +#define FRAGMENT_SHADER(Src...) OES2_PRECISION_DEFINITIONS\ I like how you've hidden the details of OES here. In many of the other macros with parameters I see in WebKit, the parameter name follows WebKit naming conventions. So in this case, I prefer src over Src, unless there is some other compelling reason to use the capitalized variant. > Source/WebCore/platform/graphics/opengl/TextureMapperGL.cpp:331 > + void main(void) > + { Similarly, I think the placement of curly braces in shader source should also follow WebKit C++/C/JavaScript style. > Source/WebCore/platform/graphics/opengl/TextureMapperGL.cpp:334 > + lowp float o = Opacity * maskColor.a; I'd prefer a name like fragmentAlpha or alpha instead of o. 530663 5 121339 noam 2012-01-05 15:03:26 -0800 Created attachment 121339 Patch 530827 6 121339 webkit.review.bot 2012-01-05 17:29:32 -0800 Comment on attachment 121339 Patch Clearing flags on attachment: 121339 Committed r104255: <http://trac.webkit.org/changeset/104255> 530828 7 webkit.review.bot 2012-01-05 17:29:37 -0800 All reviewed patches have been landed. Closing bug. 121205 2012-01-04 19:01:31 -0800 2012-01-05 13:18:21 -0800 Patch bug-75598-20120104190130.patch text/plain 7409 noam U3VidmVyc2lvbiBSZXZpc2lvbjogMTAzNjU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGYwNjI5YTFiZjZjZGQ5 NzlkMWEyYTI2NDk5NTg1YjlmMTZkNzFlZS4uNDQ5ODI5MDg5YTg0ZGQxNzY0MTc4NGExZjljNzNm YWFiMzJjODBhZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTAxLTA0ICBObydh bSBSb3NlbnRoYWwgIDxub2FtLnJvc2VudGhhbEBub2tpYS5jb20+CisKKyAgICAgICAgW1F0XVtU ZXhtYXBdIENvbnZlcnQgc2hhZGVycyBpbiBUZXh0dXJlTWFwcGVyR0wgdG8gdXNlIGEgbWFjcm8K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc1NTk4CisK KyAgICAgICAgVXNlIGEgU0hBREVSKCkgbWFjcm8gbGlrZSBDaHJvbWl1bSwgaW5zdGVhZCBvZiBx dW90ZWQgc3RyaW5nIGxpdGVyYWxzIHdoZW4gZGVjbGFyaW5nCisgICAgICAgIHNoYWRlcnMgaW4g VGV4dHVyZU1hcHBlckdMLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIE5vIG5ldyBmdW5jdGlvbmFsaXR5IHNvIG5vIG5ldyB0ZXN0cy4KKworICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL29wZW5nbC9UZXh0dXJlTWFwcGVyR0wuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6VGV4dHVyZU1hcHBlckdMOjppbml0aWFsaXplU2hhZGVycyk6CisKIDIwMTEt MTItMjMgIE5vZWwgR29yZG9uICA8bm9lbC5nb3Jkb25AZ21haWwuY29tPgogCiAgICAgICAgIEpQ RUcgZGVjb2RlcnMgc2hvdWxkIG9ubHkgc2F2ZSBjb2xvciBwcm9maWxlIG1hcmtlcnMgaWYgY29s b3IgbWFuYWdlbWVudCBpcyBlbmFibGVkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9vcGVuZ2wvVGV4dHVyZU1hcHBlckdMLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL29wZW5nbC9UZXh0dXJlTWFwcGVyR0wuY3BwCmluZGV4IGFjNTA3 NTAxZDQ5NTc4MGM0ZjU4YjcyOWY1OGI1NTBhYjA4MDYyNTAuLmYwNzI2M2UyYzQ1YjVhMjkzZjY0 MmU5YzBjMzU3NzRjZmYyYTAyNzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL29wZW5nbC9UZXh0dXJlTWFwcGVyR0wuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL29wZW5nbC9UZXh0dXJlTWFwcGVyR0wuY3BwCkBAIC0zMTQsNjAg KzMxNCw3NCBAQCB2b2lkIFRleHR1cmVNYXBwZXJHTDo6aW5pdGlhbGl6ZVNoYWRlcnMoKQogI2Rl ZmluZSBPRVMyX1BSRUNJU0lPTl9ERUZJTklUSU9OUwogI2VuZGlmCiAKKyNkZWZpbmUgU0hBREVS KFNyYy4uLikgT0VTMl9QUkVDSVNJT05fREVGSU5JVElPTlMjU3JjCisKICAgICBjb25zdCBjaGFy KiBmcmFnbWVudFNoYWRlclNvdXJjZU9wYWNpdHlBbmRNYXNrID0KLSAgICAgICAgICAgIE9FUzJf UFJFQ0lTSU9OX0RFRklOSVRJT05TCi0iICAgICAgICAgICAgICAgdW5pZm9ybSBzYW1wbGVyMkQg U291cmNlVGV4dHVyZSwgTWFza1RleHR1cmU7ICAgICAgICAgICAgICAgICAgICAgICBcbiIKLSIg ICAgICAgICAgICAgICB1bmlmb3JtIGxvd3AgZmxvYXQgT3BhY2l0eTsgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIFxuIgotIiAgICAgICAgICAgICAgIHZhcnlpbmcgaGln aHAgdmVjMiBPdXRUZXhDb29yZFNvdXJjZSwgT3V0VGV4Q29vcmRNYXNrOyAgICAgICAgICAgICAg XG4iCi0iICAgICAgICAgICAgICAgdm9pZCBtYWluKHZvaWQpICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcbiIKLSIgICAgICAgICAgICAgICB7ICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIFxuIgotIiAgICAgICAgICAgICAgICAgICBsb3dwIHZlYzQgY29sb3IgPSB0ZXh0dXJl MkQoU291cmNlVGV4dHVyZSwgT3V0VGV4Q29vcmRTb3VyY2UpOyAgXG4iCi0iICAgICAgICAgICAg ICAgICAgIGxvd3AgdmVjNCBtYXNrQ29sb3IgPSB0ZXh0dXJlMkQoTWFza1RleHR1cmUsIE91dFRl eENvb3JkTWFzayk7ICBcbiIKLSIgICAgICAgICAgICAgICAgICAgbG93cCBmbG9hdCBvID0gT3Bh Y2l0eSAqIG1hc2tDb2xvci5hOyAgICAgICAgICAgICAgICAgICAgICAgICAgIFxuIgotIiAgICAg ICAgICAgICAgICAgICBnbF9GcmFnQ29sb3IgPSB2ZWM0KGNvbG9yLnJnYiAqIG8sIGNvbG9yLmEg KiBvKTsgICAgICAgICAgICAgICAgXG4iCi0iICAgICAgICAgICAgICAgfSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcbiI7 CisgICAgICAgIFNIQURFUigKKyAgICAgICAgICAgIHVuaWZvcm0gc2FtcGxlcjJEIFNvdXJjZVRl eHR1cmUsIE1hc2tUZXh0dXJlOworICAgICAgICAgICAgdW5pZm9ybSBsb3dwIGZsb2F0IE9wYWNp dHk7CisgICAgICAgICAgICB2YXJ5aW5nIGhpZ2hwIHZlYzIgT3V0VGV4Q29vcmRTb3VyY2UsIE91 dFRleENvb3JkTWFzazsKKyAgICAgICAgICAgIHZvaWQgbWFpbih2b2lkKQorICAgICAgICAgICAg eworICAgICAgICAgICAgICAgIGxvd3AgdmVjNCBjb2xvciA9IHRleHR1cmUyRChTb3VyY2VUZXh0 dXJlLCBPdXRUZXhDb29yZFNvdXJjZSk7CisgICAgICAgICAgICAgICAgbG93cCB2ZWM0IG1hc2tD b2xvciA9IHRleHR1cmUyRChNYXNrVGV4dHVyZSwgT3V0VGV4Q29vcmRNYXNrKTsKKyAgICAgICAg ICAgICAgICBsb3dwIGZsb2F0IG8gPSBPcGFjaXR5ICogbWFza0NvbG9yLmE7CisgICAgICAgICAg ICAgICAgZ2xfRnJhZ0NvbG9yID0gdmVjNChjb2xvci5yZ2IgKiBvLCBjb2xvci5hICogbyk7Cisg ICAgICAgICAgICB9CisgICAgICAgICk7CiAKICAgICBjb25zdCBjaGFyKiB2ZXJ0ZXhTaGFkZXJT b3VyY2VPcGFjaXR5QW5kTWFzayA9Ci0gICAgICAgICAgICBPRVMyX1BSRUNJU0lPTl9ERUZJTklU SU9OUwotIiAgICAgICAgICAgICAgIHVuaWZvcm0gbWF0NCBJbk1hdHJpeCwgSW5Tb3VyY2VNYXRy aXgsIEluTWFza01hdHJpeDsgICAgICAgICAgICBcbiIKLSIgICAgICAgICAgICAgICBhdHRyaWJ1 dGUgdmVjNCBJblZlcnRleDsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg XG4iCi0iICAgICAgICAgICAgICAgdmFyeWluZyBoaWdocCB2ZWMyIE91dFRleENvb3JkU291cmNl LCBPdXRUZXhDb29yZE1hc2s7ICAgICAgICAgIFxuIgotIiAgICAgICAgICAgICAgIHZvaWQgbWFp bih2b2lkKSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBc biIKLSIgICAgICAgICAgICAgICB7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgXG4iCi0iICAgICAgICAgICAgICAgICAgIE91dFRl eENvb3JkU291cmNlID0gdmVjMihJblNvdXJjZU1hdHJpeCAqIEluVmVydGV4KTsgICAgICAgIFxu IgotIiAgICAgICAgICAgICAgICAgICBPdXRUZXhDb29yZE1hc2sgPSB2ZWMyKEluTWFza01hdHJp eCAqIEluVmVydGV4KTsgICAgICAgICAgICBcbiIKLSIgICAgICAgICAgICAgICAgICAgZ2xfUG9z aXRpb24gPSBJbk1hdHJpeCAqIEluVmVydGV4OyAgICAgICAgICAgICAgICAgICAgICAgICAgXG4i Ci0iICAgICAgICAgICAgICAgfSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIFxuIjsKKyAgICAgICAgU0hBREVSKAorICAgICAgICAg ICAgdW5pZm9ybSBtYXQ0IEluTWF0cml4LCBJblNvdXJjZU1hdHJpeCwgSW5NYXNrTWF0cml4Owor ICAgICAgICAgICAgYXR0cmlidXRlIHZlYzQgSW5WZXJ0ZXg7CisgICAgICAgICAgICB2YXJ5aW5n IGhpZ2hwIHZlYzIgT3V0VGV4Q29vcmRTb3VyY2UsIE91dFRleENvb3JkTWFzazsKKyAgICAgICAg ICAgIHZvaWQgbWFpbih2b2lkKQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIE91dFRl eENvb3JkU291cmNlID0gdmVjMihJblNvdXJjZU1hdHJpeCAqIEluVmVydGV4KTsKKyAgICAgICAg ICAgICAgICBPdXRUZXhDb29yZE1hc2sgPSB2ZWMyKEluTWFza01hdHJpeCAqIEluVmVydGV4KTsK KyAgICAgICAgICAgICAgICBnbF9Qb3NpdGlvbiA9IEluTWF0cml4ICogSW5WZXJ0ZXg7CisgICAg ICAgICAgICB9CisgICAgICAgICk7CiAKICAgICBjb25zdCBjaGFyKiBmcmFnbWVudFNoYWRlclNv dXJjZVNpbXBsZSA9Ci0gICAgICAgICAgICBPRVMyX1BSRUNJU0lPTl9ERUZJTklUSU9OUwotIiAg ICAgICAgICAgICAgIHVuaWZvcm0gc2FtcGxlcjJEIFNvdXJjZVRleHR1cmU7ICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgXG4iCi0iICAgICAgICAgICAgICAgdW5pZm9ybSBsb3dw IGZsb2F0IE9wYWNpdHk7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBc biIKLSIgICAgICAgICAgICAgICB2YXJ5aW5nIGhpZ2hwIHZlYzIgT3V0VGV4Q29vcmRTb3VyY2U7 ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFxuIgotIiAgICAgICAgICAgICAgIHZvaWQg bWFpbih2b2lkKSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgXG4iCi0iICAgICAgICAgICAgICAgeyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcbiIKLSIgICAgICAgICAgICAg ICAgICAgbG93cCB2ZWM0IGNvbG9yID0gdGV4dHVyZTJEKFNvdXJjZVRleHR1cmUsIE91dFRleENv b3JkU291cmNlKTsgIFxuIgotIiAgICAgICAgICAgICAgICAgICBnbF9GcmFnQ29sb3IgPSB2ZWM0 KGNvbG9yLnJnYiAqIE9wYWNpdHksIGNvbG9yLmEgKiBPcGFjaXR5KTsgICAgXG4iCi0iICAgICAg ICAgICAgICAgfSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBcbiI7Ci0KKyAgICAgICAgU0hBREVSKAorICAgICAgICAgICAg dW5pZm9ybSBzYW1wbGVyMkQgU291cmNlVGV4dHVyZTsKKyAgICAgICAgICAgIHVuaWZvcm0gbG93 cCBmbG9hdCBPcGFjaXR5OworICAgICAgICAgICAgdmFyeWluZyBoaWdocCB2ZWMyIE91dFRleENv b3JkU291cmNlOworICAgICAgICAgICAgdm9pZCBtYWluKHZvaWQpCisgICAgICAgICAgICB7Cisg ICAgICAgICAgICAgICAgbG93cCB2ZWM0IGNvbG9yID0gdGV4dHVyZTJEKFNvdXJjZVRleHR1cmUs IE91dFRleENvb3JkU291cmNlKTsKKyAgICAgICAgICAgICAgICBnbF9GcmFnQ29sb3IgPSB2ZWM0 KGNvbG9yLnJnYiAqIE9wYWNpdHksIGNvbG9yLmEgKiBPcGFjaXR5KTsKKyAgICAgICAgICAgIH0K KyAgICAgICAgKTsKICAgICBjb25zdCBjaGFyKiB2ZXJ0ZXhTaGFkZXJTb3VyY2VTaW1wbGUgPQot ICAgICAgICAgICAgT0VTMl9QUkVDSVNJT05fREVGSU5JVElPTlMKLSIgICAgICAgICAgICAgICB1 bmlmb3JtIG1hdDQgSW5NYXRyaXgsIEluU291cmNlTWF0cml4OyAgICAgICAgICAgICAgICAgICAg ICBcbiIKLSIgICAgICAgICAgICAgICBhdHRyaWJ1dGUgdmVjNCBJblZlcnRleDsgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBcbiIKLSIgICAgICAgICAgICAgICB2YXJ5aW5nIGhp Z2hwIHZlYzIgT3V0VGV4Q29vcmRTb3VyY2U7ICAgICAgICAgICAgICAgICAgICAgICBcbiIKLSIg ICAgICAgICAgICAgICB2b2lkIG1haW4odm9pZCkgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBcbiIKLSIgICAgICAgICAgICAgICB7ICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcbiIKLSIgICAgICAgICAg ICAgICAgICAgT3V0VGV4Q29vcmRTb3VyY2UgPSB2ZWMyKEluU291cmNlTWF0cml4ICogSW5WZXJ0 ZXgpOyAgICBcbiIKLSIgICAgICAgICAgICAgICAgICAgZ2xfUG9zaXRpb24gPSBJbk1hdHJpeCAq IEluVmVydGV4OyAgICAgICAgICAgICAgICAgICAgICBcbiIKLSIgICAgICAgICAgICAgICB9ICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBc biI7Ci0KKyAgICAgICAgU0hBREVSKAorICAgICAgICAgICAgdW5pZm9ybSBtYXQ0IEluTWF0cml4 LCBJblNvdXJjZU1hdHJpeDsKKyAgICAgICAgICAgIGF0dHJpYnV0ZSB2ZWM0IEluVmVydGV4Owor ICAgICAgICAgICAgdmFyeWluZyBoaWdocCB2ZWMyIE91dFRleENvb3JkU291cmNlOworICAgICAg ICAgICAgdm9pZCBtYWluKHZvaWQpCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgT3V0 VGV4Q29vcmRTb3VyY2UgPSB2ZWMyKEluU291cmNlTWF0cml4ICogSW5WZXJ0ZXgpOworICAgICAg ICAgICAgICAgIGdsX1Bvc2l0aW9uID0gSW5NYXRyaXggKiBJblZlcnRleDsKKyAgICAgICAgICAg IH0KKyAgICAgICAgKTsKICAgICBjb25zdCBjaGFyKiBmcmFnbWVudFNoYWRlclNvdXJjZUNsaXAg PQotIiAgICAgICAgICAgICAgIHZvaWQgbWFpbih2b2lkKSB7IGdsX0ZyYWdDb2xvciA9IHZlYzQo MC4wLCAwLjAsIDAuMCwgMC4wKTsgfSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIjsK KyAgICAgICAgU0hBREVSKAorICAgICAgICAgICAgdm9pZCBtYWluKHZvaWQpCisgICAgICAgICAg ICB7CisgICAgICAgICAgICAgICAgZ2xfRnJhZ0NvbG9yID0gdmVjNCgwLjAsIDAuMCwgMC4wLCAw LjApOworICAgICAgICAgICAgfQorICAgICAgICApOwogCiAgICAgY29uc3QgY2hhciogdmVydGV4 U2hhZGVyU291cmNlQ2xpcCA9Ci0iICAgICAgICAgICAgICAgdW5pZm9ybSBtYXQ0IEluTWF0cml4 OyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXG4iCi0iICAgICAgICAgICAg ICAgYXR0cmlidXRlIHZlYzQgSW5WZXJ0ZXg7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgXG4iCi0iICAgICAgICAgICAgICAgdm9pZCBtYWluKHZvaWQpIHsgZ2xfUG9zaXRpb24g PSBJbk1hdHJpeCAqIEluVmVydGV4OyB9ICAgICAgIjsKKyAgICAgICAgU0hBREVSKAorICAgICAg ICAgICAgdW5pZm9ybSBtYXQ0IEluTWF0cml4OworICAgICAgICAgICAgYXR0cmlidXRlIHZlYzQg SW5WZXJ0ZXg7CisgICAgICAgICAgICB2b2lkIG1haW4odm9pZCkKKyAgICAgICAgICAgIHsKKyAg ICAgICAgICAgICAgICBnbF9Qb3NpdGlvbiA9IEluTWF0cml4ICogSW5WZXJ0ZXg7CisgICAgICAg ICAgICB9CisgICAgICAgICk7CiAKIAogICAgIFRFWE1BUF9CVUlMRF9TSEFERVIoU2ltcGxlKQo= 121319 2012-01-05 13:18:26 -0800 2012-01-05 15:03:19 -0800 Patch bug-75598-20120105131824.patch text/plain 7723 noam U3VidmVyc2lvbiBSZXZpc2lvbjogMTA0MTY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjM2ZTc3NjYyZTI3ZTA4 ZTAyMmVkYWU2YmU4NjI1NTZjZWM5ZTM1NS4uNzU3OGM0NzMzOWZmNzdlYjE3ZTM5NjJhNjdlNjcy NzgwM2FjYTk5MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTAxLTA1ICBObydh bSBSb3NlbnRoYWwgIDxub2FtLnJvc2VudGhhbEBub2tpYS5jb20+CisKKyAgICAgICAgW1F0XVtU ZXhtYXBdIENvbnZlcnQgc2hhZGVycyBpbiBUZXh0dXJlTWFwcGVyR0wgdG8gdXNlIGEgbWFjcm8K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc1NTk4CisK KyAgICAgICAgVXNlIFZFUlRFWF9TSEFERVIoKSBhbmQgRlJBR01FTlRfU0hBREVSKCkgbWFjcm9z LCBpbnN0ZWFkIG9mIHF1b3RlZCBzdHJpbmcgbGl0ZXJhbHMgd2hlbgorICAgICAgICBkZWNsYXJp bmcgc2hhZGVycyBpbiBUZXh0dXJlTWFwcGVyR0wuCisKKyAgICAgICAgV2UgbmVlZCB0d28gbWFj cm9zIHRvIGFjY291bnQgZm9yIHRoZSBkaWZmZXJlbmNlcyBiZXR3ZWVuIE9wZW5HTCBhbmQgT3Bl bkdMIEVTMi4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwogMjAxMi0w MS0wNSAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBET00gQXR0 cmlidXRlIHRlc3RzIG9uIERyb21hZW8gc3BlbmRzIDIuNyUgb2YgdGltZSBpbiBoYXNTZWxlY3Rv ckZvckF0dHJpYnV0ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3Mvb3BlbmdsL1RleHR1cmVNYXBwZXJHTC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9vcGVuZ2wvVGV4dHVyZU1hcHBlckdMLmNwcAppbmRleCBmMmJlMjZmMjFhMzkyZmI4 ZmU0Mzc1MzYyZWM4NWQ5MDY0ZjU1ZjkwLi4xZGY3ZWRhNTQyZDIzMjg5OGEzMmM5ODkwNzZjZjYw YzhmMzc2M2Q2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9v cGVuZ2wvVGV4dHVyZU1hcHBlckdMLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9vcGVuZ2wvVGV4dHVyZU1hcHBlckdMLmNwcApAQCAtMzE3LDYzICszMTcsNzggQEAg dm9pZCBUZXh0dXJlTWFwcGVyR0w6OmluaXRpYWxpemVTaGFkZXJzKCkKICAgICAicHJlY2lzaW9u IG1lZGl1bXAgZmxvYXQ7IFxuIgogI2VuZGlmCiAKKyNkZWZpbmUgVkVSVEVYX1NIQURFUihTcmMu Li4pIE9FUzJfUFJFQ0lTSU9OX0RFRklOSVRJT05TI1NyYworI2RlZmluZSBGUkFHTUVOVF9TSEFE RVIoU3JjLi4uKSBPRVMyX1BSRUNJU0lPTl9ERUZJTklUSU9OU1wKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgT0VTMl9GUkFHTUVOVF9TSEFERVJfREVGQVVMVF9QUkVDSVNJT05cCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICNTcmMKKwogICAgIGNvbnN0IGNoYXIqIGZy YWdtZW50U2hhZGVyU291cmNlT3BhY2l0eUFuZE1hc2sgPQotICAgICAgICAgICAgT0VTMl9QUkVD SVNJT05fREVGSU5JVElPTlMKLSAgICAgICAgICAgIE9FUzJfRlJBR01FTlRfU0hBREVSX0RFRkFV TFRfUFJFQ0lTSU9OCi0iICAgICAgICAgICAgICAgdW5pZm9ybSBzYW1wbGVyMkQgU291cmNlVGV4 dHVyZSwgTWFza1RleHR1cmU7ICAgICAgICAgICAgICAgICAgICAgICBcbiIKLSIgICAgICAgICAg ICAgICB1bmlmb3JtIGxvd3AgZmxvYXQgT3BhY2l0eTsgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIFxuIgotIiAgICAgICAgICAgICAgIHZhcnlpbmcgaGlnaHAgdmVjMiBP dXRUZXhDb29yZFNvdXJjZSwgT3V0VGV4Q29vcmRNYXNrOyAgICAgICAgICAgICAgXG4iCi0iICAg ICAgICAgICAgICAgdm9pZCBtYWluKHZvaWQpICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBcbiIKLSIgICAgICAgICAgICAgICB7ICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFxu IgotIiAgICAgICAgICAgICAgICAgICBsb3dwIHZlYzQgY29sb3IgPSB0ZXh0dXJlMkQoU291cmNl VGV4dHVyZSwgT3V0VGV4Q29vcmRTb3VyY2UpOyAgXG4iCi0iICAgICAgICAgICAgICAgICAgIGxv d3AgdmVjNCBtYXNrQ29sb3IgPSB0ZXh0dXJlMkQoTWFza1RleHR1cmUsIE91dFRleENvb3JkTWFz ayk7ICBcbiIKLSIgICAgICAgICAgICAgICAgICAgbG93cCBmbG9hdCBvID0gT3BhY2l0eSAqIG1h c2tDb2xvci5hOyAgICAgICAgICAgICAgICAgICAgICAgICAgIFxuIgotIiAgICAgICAgICAgICAg ICAgICBnbF9GcmFnQ29sb3IgPSB2ZWM0KGNvbG9yLnJnYiAqIG8sIGNvbG9yLmEgKiBvKTsgICAg ICAgICAgICAgICAgXG4iCi0iICAgICAgICAgICAgICAgfSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcbiI7CisgICAgICAg IEZSQUdNRU5UX1NIQURFUigKKyAgICAgICAgICAgIHVuaWZvcm0gc2FtcGxlcjJEIFNvdXJjZVRl eHR1cmUsIE1hc2tUZXh0dXJlOworICAgICAgICAgICAgdW5pZm9ybSBsb3dwIGZsb2F0IE9wYWNp dHk7CisgICAgICAgICAgICB2YXJ5aW5nIGhpZ2hwIHZlYzIgT3V0VGV4Q29vcmRTb3VyY2UsIE91 dFRleENvb3JkTWFzazsKKyAgICAgICAgICAgIHZvaWQgbWFpbih2b2lkKQorICAgICAgICAgICAg eworICAgICAgICAgICAgICAgIGxvd3AgdmVjNCBjb2xvciA9IHRleHR1cmUyRChTb3VyY2VUZXh0 dXJlLCBPdXRUZXhDb29yZFNvdXJjZSk7CisgICAgICAgICAgICAgICAgbG93cCB2ZWM0IG1hc2tD b2xvciA9IHRleHR1cmUyRChNYXNrVGV4dHVyZSwgT3V0VGV4Q29vcmRNYXNrKTsKKyAgICAgICAg ICAgICAgICBsb3dwIGZsb2F0IG8gPSBPcGFjaXR5ICogbWFza0NvbG9yLmE7CisgICAgICAgICAg ICAgICAgZ2xfRnJhZ0NvbG9yID0gdmVjNChjb2xvci5yZ2IgKiBvLCBjb2xvci5hICogbyk7Cisg ICAgICAgICAgICB9CisgICAgICAgICk7CiAKICAgICBjb25zdCBjaGFyKiB2ZXJ0ZXhTaGFkZXJT b3VyY2VPcGFjaXR5QW5kTWFzayA9Ci0gICAgICAgICAgICBPRVMyX1BSRUNJU0lPTl9ERUZJTklU SU9OUwotIiAgICAgICAgICAgICAgIHVuaWZvcm0gbWF0NCBJbk1hdHJpeCwgSW5Tb3VyY2VNYXRy aXgsIEluTWFza01hdHJpeDsgICAgICAgICAgICBcbiIKLSIgICAgICAgICAgICAgICBhdHRyaWJ1 dGUgdmVjNCBJblZlcnRleDsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg XG4iCi0iICAgICAgICAgICAgICAgdmFyeWluZyBoaWdocCB2ZWMyIE91dFRleENvb3JkU291cmNl LCBPdXRUZXhDb29yZE1hc2s7ICAgICAgICAgIFxuIgotIiAgICAgICAgICAgICAgIHZvaWQgbWFp bih2b2lkKSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBc biIKLSIgICAgICAgICAgICAgICB7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgXG4iCi0iICAgICAgICAgICAgICAgICAgIE91dFRl eENvb3JkU291cmNlID0gdmVjMihJblNvdXJjZU1hdHJpeCAqIEluVmVydGV4KTsgICAgICAgIFxu IgotIiAgICAgICAgICAgICAgICAgICBPdXRUZXhDb29yZE1hc2sgPSB2ZWMyKEluTWFza01hdHJp eCAqIEluVmVydGV4KTsgICAgICAgICAgICBcbiIKLSIgICAgICAgICAgICAgICAgICAgZ2xfUG9z aXRpb24gPSBJbk1hdHJpeCAqIEluVmVydGV4OyAgICAgICAgICAgICAgICAgICAgICAgICAgXG4i Ci0iICAgICAgICAgICAgICAgfSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIFxuIjsKKyAgICAgICAgVkVSVEVYX1NIQURFUigKKyAg ICAgICAgICAgIHVuaWZvcm0gbWF0NCBJbk1hdHJpeCwgSW5Tb3VyY2VNYXRyaXgsIEluTWFza01h dHJpeDsKKyAgICAgICAgICAgIGF0dHJpYnV0ZSB2ZWM0IEluVmVydGV4OworICAgICAgICAgICAg dmFyeWluZyBoaWdocCB2ZWMyIE91dFRleENvb3JkU291cmNlLCBPdXRUZXhDb29yZE1hc2s7Cisg ICAgICAgICAgICB2b2lkIG1haW4odm9pZCkKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAg ICBPdXRUZXhDb29yZFNvdXJjZSA9IHZlYzIoSW5Tb3VyY2VNYXRyaXggKiBJblZlcnRleCk7Cisg ICAgICAgICAgICAgICAgT3V0VGV4Q29vcmRNYXNrID0gdmVjMihJbk1hc2tNYXRyaXggKiBJblZl cnRleCk7CisgICAgICAgICAgICAgICAgZ2xfUG9zaXRpb24gPSBJbk1hdHJpeCAqIEluVmVydGV4 OworICAgICAgICAgICAgfQorICAgICAgICApOwogCiAgICAgY29uc3QgY2hhciogZnJhZ21lbnRT aGFkZXJTb3VyY2VTaW1wbGUgPQotICAgICAgICAgICAgT0VTMl9QUkVDSVNJT05fREVGSU5JVElP TlMKLSAgICAgICAgICAgIE9FUzJfRlJBR01FTlRfU0hBREVSX0RFRkFVTFRfUFJFQ0lTSU9OCi0i ICAgICAgICAgICAgICAgdW5pZm9ybSBzYW1wbGVyMkQgU291cmNlVGV4dHVyZTsgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBcbiIKLSIgICAgICAgICAgICAgICB1bmlmb3JtIGxv d3AgZmxvYXQgT3BhY2l0eTsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IFxuIgotIiAgICAgICAgICAgICAgIHZhcnlpbmcgaGlnaHAgdmVjMiBPdXRUZXhDb29yZFNvdXJj ZTsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXG4iCi0iICAgICAgICAgICAgICAgdm9p ZCBtYWluKHZvaWQpICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBcbiIKLSIgICAgICAgICAgICAgICB7ICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFxuIgotIiAgICAgICAgICAg ICAgICAgICBsb3dwIHZlYzQgY29sb3IgPSB0ZXh0dXJlMkQoU291cmNlVGV4dHVyZSwgT3V0VGV4 Q29vcmRTb3VyY2UpOyAgXG4iCi0iICAgICAgICAgICAgICAgICAgIGdsX0ZyYWdDb2xvciA9IHZl YzQoY29sb3IucmdiICogT3BhY2l0eSwgY29sb3IuYSAqIE9wYWNpdHkpOyAgICBcbiIKLSIgICAg ICAgICAgICAgICB9ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIFxuIjsKKyAgICAgICAgRlJBR01FTlRfU0hBREVSKAorICAg ICAgICAgICAgdW5pZm9ybSBzYW1wbGVyMkQgU291cmNlVGV4dHVyZTsKKyAgICAgICAgICAgIHVu aWZvcm0gbG93cCBmbG9hdCBPcGFjaXR5OworICAgICAgICAgICAgdmFyeWluZyBoaWdocCB2ZWMy IE91dFRleENvb3JkU291cmNlOworICAgICAgICAgICAgdm9pZCBtYWluKHZvaWQpCisgICAgICAg ICAgICB7CisgICAgICAgICAgICAgICAgbG93cCB2ZWM0IGNvbG9yID0gdGV4dHVyZTJEKFNvdXJj ZVRleHR1cmUsIE91dFRleENvb3JkU291cmNlKTsKKyAgICAgICAgICAgICAgICBnbF9GcmFnQ29s b3IgPSB2ZWM0KGNvbG9yLnJnYiAqIE9wYWNpdHksIGNvbG9yLmEgKiBPcGFjaXR5KTsKKyAgICAg ICAgICAgIH0KKyAgICAgICAgKTsKIAogICAgIGNvbnN0IGNoYXIqIHZlcnRleFNoYWRlclNvdXJj ZVNpbXBsZSA9Ci0gICAgICAgICAgICBPRVMyX1BSRUNJU0lPTl9ERUZJTklUSU9OUwotIiAgICAg ICAgICAgICAgIHVuaWZvcm0gbWF0NCBJbk1hdHJpeCwgSW5Tb3VyY2VNYXRyaXg7ICAgICAgICAg ICAgICAgICAgICAgIFxuIgotIiAgICAgICAgICAgICAgIGF0dHJpYnV0ZSB2ZWM0IEluVmVydGV4 OyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFxuIgotIiAgICAgICAgICAgICAg IHZhcnlpbmcgaGlnaHAgdmVjMiBPdXRUZXhDb29yZFNvdXJjZTsgICAgICAgICAgICAgICAgICAg ICAgIFxuIgotIiAgICAgICAgICAgICAgIHZvaWQgbWFpbih2b2lkKSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIFxuIgotIiAgICAgICAgICAgICAgIHsgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFxuIgot IiAgICAgICAgICAgICAgICAgICBPdXRUZXhDb29yZFNvdXJjZSA9IHZlYzIoSW5Tb3VyY2VNYXRy aXggKiBJblZlcnRleCk7ICAgIFxuIgotIiAgICAgICAgICAgICAgICAgICBnbF9Qb3NpdGlvbiA9 IEluTWF0cml4ICogSW5WZXJ0ZXg7ICAgICAgICAgICAgICAgICAgICAgIFxuIgotIiAgICAgICAg ICAgICAgIH0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIFxuIjsKLQorICAgICAgICBWRVJURVhfU0hBREVSKAorICAgICAgICAgICAgdW5p Zm9ybSBtYXQ0IEluTWF0cml4LCBJblNvdXJjZU1hdHJpeDsKKyAgICAgICAgICAgIGF0dHJpYnV0 ZSB2ZWM0IEluVmVydGV4OworICAgICAgICAgICAgdmFyeWluZyBoaWdocCB2ZWMyIE91dFRleENv b3JkU291cmNlOworICAgICAgICAgICAgdm9pZCBtYWluKHZvaWQpCisgICAgICAgICAgICB7Cisg ICAgICAgICAgICAgICAgT3V0VGV4Q29vcmRTb3VyY2UgPSB2ZWMyKEluU291cmNlTWF0cml4ICog SW5WZXJ0ZXgpOworICAgICAgICAgICAgICAgIGdsX1Bvc2l0aW9uID0gSW5NYXRyaXggKiBJblZl cnRleDsKKyAgICAgICAgICAgIH0KKyAgICAgICAgKTsKICAgICBjb25zdCBjaGFyKiBmcmFnbWVu dFNoYWRlclNvdXJjZUNsaXAgPQotICAgICAgICAgICAgT0VTMl9GUkFHTUVOVF9TSEFERVJfREVG QVVMVF9QUkVDSVNJT04KLSIgICAgICAgICAgICAgICB2b2lkIG1haW4odm9pZCkgeyBnbF9GcmFn Q29sb3IgPSB2ZWM0KDAuMCwgMC4wLCAwLjAsIDAuMCk7IH0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICI7CisgICAgICAgIEZSQUdNRU5UX1NIQURFUigKKyAgICAgICAgICAgIHZvaWQg bWFpbih2b2lkKQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIGdsX0ZyYWdDb2xvciA9 IHZlYzQoMC4wLCAwLjAsIDAuMCwgMC4wKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgKTsKIAog ICAgIGNvbnN0IGNoYXIqIHZlcnRleFNoYWRlclNvdXJjZUNsaXAgPQotIiAgICAgICAgICAgICAg IHVuaWZvcm0gbWF0NCBJbk1hdHJpeDsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIFxuIgotIiAgICAgICAgICAgICAgIGF0dHJpYnV0ZSB2ZWM0IEluVmVydGV4OyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIFxuIgotIiAgICAgICAgICAgICAgIHZvaWQgbWFp bih2b2lkKSB7IGdsX1Bvc2l0aW9uID0gSW5NYXRyaXggKiBJblZlcnRleDsgfSAgICAgICI7Cisg ICAgICAgIFZFUlRFWF9TSEFERVIoCisgICAgICAgICAgICB1bmlmb3JtIG1hdDQgSW5NYXRyaXg7 CisgICAgICAgICAgICBhdHRyaWJ1dGUgdmVjNCBJblZlcnRleDsKKyAgICAgICAgICAgIHZvaWQg bWFpbih2b2lkKQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIGdsX1Bvc2l0aW9uID0g SW5NYXRyaXggKiBJblZlcnRleDsKKyAgICAgICAgICAgIH0KKyAgICAgICAgKTsKIAogCiAgICAg VEVYTUFQX0JVSUxEX1NIQURFUihTaW1wbGUpCg== 121339 2012-01-05 15:03:26 -0800 2012-01-05 17:29:32 -0800 Patch bug-75598-20120105150324.patch text/plain 7760 noam U3VidmVyc2lvbiBSZXZpc2lvbjogMTA0MTY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjM2ZTc3NjYyZTI3ZTA4 ZTAyMmVkYWU2YmU4NjI1NTZjZWM5ZTM1NS4uMmM1MmNhMTE1NTNiN2E5N2M3NzM0ZTEzYTI4OGNl YTZiNzllNDBjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTAxLTA1ICBObydh bSBSb3NlbnRoYWwgIDxub2FtLnJvc2VudGhhbEBub2tpYS5jb20+CisKKyAgICAgICAgW1F0XVtU ZXhtYXBdIENvbnZlcnQgc2hhZGVycyBpbiBUZXh0dXJlTWFwcGVyR0wgdG8gdXNlIGEgbWFjcm8K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc1NTk4CisK KyAgICAgICAgVXNlIFZFUlRFWF9TSEFERVIoKSBhbmQgRlJBR01FTlRfU0hBREVSKCkgbWFjcm9z LCBpbnN0ZWFkIG9mIHF1b3RlZCBzdHJpbmcgbGl0ZXJhbHMgd2hlbgorICAgICAgICBkZWNsYXJp bmcgc2hhZGVycyBpbiBUZXh0dXJlTWFwcGVyR0wuCisKKyAgICAgICAgV2UgbmVlZCB0d28gbWFj cm9zIHRvIGFjY291bnQgZm9yIHRoZSBkaWZmZXJlbmNlcyBiZXR3ZWVuIE9wZW5HTCBhbmQgT3Bl bkdMIEVTMi4KKworICAgICAgICBSZXZpZXdlZCBieSBNYXJ0aW4gUm9iaW5zb24uCisKIDIwMTIt MDEtMDUgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgRE9NIEF0 dHJpYnV0ZSB0ZXN0cyBvbiBEcm9tYWVvIHNwZW5kcyAyLjclIG9mIHRpbWUgaW4gaGFzU2VsZWN0 b3JGb3JBdHRyaWJ1dGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL29wZW5nbC9UZXh0dXJlTWFwcGVyR0wuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3Mvb3BlbmdsL1RleHR1cmVNYXBwZXJHTC5jcHAKaW5kZXggZjJiZTI2ZjIxYTM5MmZi OGZlNDM3NTM2MmVjODVkOTA2NGY1NWY5MC4uMjhlZTJiYTEwOTIwZWI3MjQzYWRmYjBjMzU5NWEy N2M4MTVjYjJhZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv b3BlbmdsL1RleHR1cmVNYXBwZXJHTC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3Mvb3BlbmdsL1RleHR1cmVNYXBwZXJHTC5jcHAKQEAgLTMxNyw2MyArMzE3LDc4IEBA IHZvaWQgVGV4dHVyZU1hcHBlckdMOjppbml0aWFsaXplU2hhZGVycygpCiAgICAgInByZWNpc2lv biBtZWRpdW1wIGZsb2F0OyBcbiIKICNlbmRpZgogCisjZGVmaW5lIFZFUlRFWF9TSEFERVIoc3Jj Li4uKSBPRVMyX1BSRUNJU0lPTl9ERUZJTklUSU9OUyNzcmMKKyNkZWZpbmUgRlJBR01FTlRfU0hB REVSKHNyYy4uLikgT0VTMl9QUkVDSVNJT05fREVGSU5JVElPTlNcCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIE9FUzJfRlJBR01FTlRfU0hBREVSX0RFRkFVTFRfUFJFQ0lTSU9OXAor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAjc3JjCisKICAgICBjb25zdCBjaGFyKiBm cmFnbWVudFNoYWRlclNvdXJjZU9wYWNpdHlBbmRNYXNrID0KLSAgICAgICAgICAgIE9FUzJfUFJF Q0lTSU9OX0RFRklOSVRJT05TCi0gICAgICAgICAgICBPRVMyX0ZSQUdNRU5UX1NIQURFUl9ERUZB VUxUX1BSRUNJU0lPTgotIiAgICAgICAgICAgICAgIHVuaWZvcm0gc2FtcGxlcjJEIFNvdXJjZVRl eHR1cmUsIE1hc2tUZXh0dXJlOyAgICAgICAgICAgICAgICAgICAgICAgXG4iCi0iICAgICAgICAg ICAgICAgdW5pZm9ybSBsb3dwIGZsb2F0IE9wYWNpdHk7ICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBcbiIKLSIgICAgICAgICAgICAgICB2YXJ5aW5nIGhpZ2hwIHZlYzIg T3V0VGV4Q29vcmRTb3VyY2UsIE91dFRleENvb3JkTWFzazsgICAgICAgICAgICAgIFxuIgotIiAg ICAgICAgICAgICAgIHZvaWQgbWFpbih2b2lkKSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgXG4iCi0iICAgICAgICAgICAgICAgeyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBc biIKLSIgICAgICAgICAgICAgICAgICAgbG93cCB2ZWM0IGNvbG9yID0gdGV4dHVyZTJEKFNvdXJj ZVRleHR1cmUsIE91dFRleENvb3JkU291cmNlKTsgIFxuIgotIiAgICAgICAgICAgICAgICAgICBs b3dwIHZlYzQgbWFza0NvbG9yID0gdGV4dHVyZTJEKE1hc2tUZXh0dXJlLCBPdXRUZXhDb29yZE1h c2spOyAgXG4iCi0iICAgICAgICAgICAgICAgICAgIGxvd3AgZmxvYXQgbyA9IE9wYWNpdHkgKiBt YXNrQ29sb3IuYTsgICAgICAgICAgICAgICAgICAgICAgICAgICBcbiIKLSIgICAgICAgICAgICAg ICAgICAgZ2xfRnJhZ0NvbG9yID0gdmVjNChjb2xvci5yZ2IgKiBvLCBjb2xvci5hICogbyk7ICAg ICAgICAgICAgICAgIFxuIgotIiAgICAgICAgICAgICAgIH0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXG4iOworICAgICAg ICBGUkFHTUVOVF9TSEFERVIoCisgICAgICAgICAgICB1bmlmb3JtIHNhbXBsZXIyRCBTb3VyY2VU ZXh0dXJlLCBNYXNrVGV4dHVyZTsKKyAgICAgICAgICAgIHVuaWZvcm0gbG93cCBmbG9hdCBPcGFj aXR5OworICAgICAgICAgICAgdmFyeWluZyBoaWdocCB2ZWMyIE91dFRleENvb3JkU291cmNlLCBP dXRUZXhDb29yZE1hc2s7CisgICAgICAgICAgICB2b2lkIG1haW4odm9pZCkKKyAgICAgICAgICAg IHsKKyAgICAgICAgICAgICAgICBsb3dwIHZlYzQgY29sb3IgPSB0ZXh0dXJlMkQoU291cmNlVGV4 dHVyZSwgT3V0VGV4Q29vcmRTb3VyY2UpOworICAgICAgICAgICAgICAgIGxvd3AgdmVjNCBtYXNr Q29sb3IgPSB0ZXh0dXJlMkQoTWFza1RleHR1cmUsIE91dFRleENvb3JkTWFzayk7CisgICAgICAg ICAgICAgICAgbG93cCBmbG9hdCBmcmFnbWVudEFscGhhID0gT3BhY2l0eSAqIG1hc2tDb2xvci5h OworICAgICAgICAgICAgICAgIGdsX0ZyYWdDb2xvciA9IHZlYzQoY29sb3IucmdiICogZnJhZ21l bnRBbHBoYSwgY29sb3IuYSAqIGZyYWdtZW50QWxwaGEpOworICAgICAgICAgICAgfQorICAgICAg ICApOwogCiAgICAgY29uc3QgY2hhciogdmVydGV4U2hhZGVyU291cmNlT3BhY2l0eUFuZE1hc2sg PQotICAgICAgICAgICAgT0VTMl9QUkVDSVNJT05fREVGSU5JVElPTlMKLSIgICAgICAgICAgICAg ICB1bmlmb3JtIG1hdDQgSW5NYXRyaXgsIEluU291cmNlTWF0cml4LCBJbk1hc2tNYXRyaXg7ICAg ICAgICAgICAgXG4iCi0iICAgICAgICAgICAgICAgYXR0cmlidXRlIHZlYzQgSW5WZXJ0ZXg7ICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFxuIgotIiAgICAgICAgICAgICAg IHZhcnlpbmcgaGlnaHAgdmVjMiBPdXRUZXhDb29yZFNvdXJjZSwgT3V0VGV4Q29vcmRNYXNrOyAg ICAgICAgICBcbiIKLSIgICAgICAgICAgICAgICB2b2lkIG1haW4odm9pZCkgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXG4iCi0iICAgICAgICAgICAgICAg eyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIFxuIgotIiAgICAgICAgICAgICAgICAgICBPdXRUZXhDb29yZFNvdXJjZSA9IHZlYzIo SW5Tb3VyY2VNYXRyaXggKiBJblZlcnRleCk7ICAgICAgICBcbiIKLSIgICAgICAgICAgICAgICAg ICAgT3V0VGV4Q29vcmRNYXNrID0gdmVjMihJbk1hc2tNYXRyaXggKiBJblZlcnRleCk7ICAgICAg ICAgICAgXG4iCi0iICAgICAgICAgICAgICAgICAgIGdsX1Bvc2l0aW9uID0gSW5NYXRyaXggKiBJ blZlcnRleDsgICAgICAgICAgICAgICAgICAgICAgICAgIFxuIgotIiAgICAgICAgICAgICAgIH0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBcbiI7CisgICAgICAgIFZFUlRFWF9TSEFERVIoCisgICAgICAgICAgICB1bmlmb3JtIG1h dDQgSW5NYXRyaXgsIEluU291cmNlTWF0cml4LCBJbk1hc2tNYXRyaXg7CisgICAgICAgICAgICBh dHRyaWJ1dGUgdmVjNCBJblZlcnRleDsKKyAgICAgICAgICAgIHZhcnlpbmcgaGlnaHAgdmVjMiBP dXRUZXhDb29yZFNvdXJjZSwgT3V0VGV4Q29vcmRNYXNrOworICAgICAgICAgICAgdm9pZCBtYWlu KHZvaWQpCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgT3V0VGV4Q29vcmRTb3VyY2Ug PSB2ZWMyKEluU291cmNlTWF0cml4ICogSW5WZXJ0ZXgpOworICAgICAgICAgICAgICAgIE91dFRl eENvb3JkTWFzayA9IHZlYzIoSW5NYXNrTWF0cml4ICogSW5WZXJ0ZXgpOworICAgICAgICAgICAg ICAgIGdsX1Bvc2l0aW9uID0gSW5NYXRyaXggKiBJblZlcnRleDsKKyAgICAgICAgICAgIH0KKyAg ICAgICAgKTsKIAogICAgIGNvbnN0IGNoYXIqIGZyYWdtZW50U2hhZGVyU291cmNlU2ltcGxlID0K LSAgICAgICAgICAgIE9FUzJfUFJFQ0lTSU9OX0RFRklOSVRJT05TCi0gICAgICAgICAgICBPRVMy X0ZSQUdNRU5UX1NIQURFUl9ERUZBVUxUX1BSRUNJU0lPTgotIiAgICAgICAgICAgICAgIHVuaWZv cm0gc2FtcGxlcjJEIFNvdXJjZVRleHR1cmU7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgXG4iCi0iICAgICAgICAgICAgICAgdW5pZm9ybSBsb3dwIGZsb2F0IE9wYWNpdHk7ICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcbiIKLSIgICAgICAgICAgICAg ICB2YXJ5aW5nIGhpZ2hwIHZlYzIgT3V0VGV4Q29vcmRTb3VyY2U7ICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIFxuIgotIiAgICAgICAgICAgICAgIHZvaWQgbWFpbih2b2lkKSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXG4iCi0iICAgICAg ICAgICAgICAgeyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBcbiIKLSIgICAgICAgICAgICAgICAgICAgbG93cCB2ZWM0IGNv bG9yID0gdGV4dHVyZTJEKFNvdXJjZVRleHR1cmUsIE91dFRleENvb3JkU291cmNlKTsgIFxuIgot IiAgICAgICAgICAgICAgICAgICBnbF9GcmFnQ29sb3IgPSB2ZWM0KGNvbG9yLnJnYiAqIE9wYWNp dHksIGNvbG9yLmEgKiBPcGFjaXR5KTsgICAgXG4iCi0iICAgICAgICAgICAgICAgfSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBcbiI7CisgICAgICAgIEZSQUdNRU5UX1NIQURFUigKKyAgICAgICAgICAgIHVuaWZvcm0gc2Ft cGxlcjJEIFNvdXJjZVRleHR1cmU7CisgICAgICAgICAgICB1bmlmb3JtIGxvd3AgZmxvYXQgT3Bh Y2l0eTsKKyAgICAgICAgICAgIHZhcnlpbmcgaGlnaHAgdmVjMiBPdXRUZXhDb29yZFNvdXJjZTsK KyAgICAgICAgICAgIHZvaWQgbWFpbih2b2lkKQorICAgICAgICAgICAgeworICAgICAgICAgICAg ICAgIGxvd3AgdmVjNCBjb2xvciA9IHRleHR1cmUyRChTb3VyY2VUZXh0dXJlLCBPdXRUZXhDb29y ZFNvdXJjZSk7CisgICAgICAgICAgICAgICAgZ2xfRnJhZ0NvbG9yID0gdmVjNChjb2xvci5yZ2Ig KiBPcGFjaXR5LCBjb2xvci5hICogT3BhY2l0eSk7CisgICAgICAgICAgICB9CisgICAgICAgICk7 CiAKICAgICBjb25zdCBjaGFyKiB2ZXJ0ZXhTaGFkZXJTb3VyY2VTaW1wbGUgPQotICAgICAgICAg ICAgT0VTMl9QUkVDSVNJT05fREVGSU5JVElPTlMKLSIgICAgICAgICAgICAgICB1bmlmb3JtIG1h dDQgSW5NYXRyaXgsIEluU291cmNlTWF0cml4OyAgICAgICAgICAgICAgICAgICAgICBcbiIKLSIg ICAgICAgICAgICAgICBhdHRyaWJ1dGUgdmVjNCBJblZlcnRleDsgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBcbiIKLSIgICAgICAgICAgICAgICB2YXJ5aW5nIGhpZ2hwIHZlYzIg T3V0VGV4Q29vcmRTb3VyY2U7ICAgICAgICAgICAgICAgICAgICAgICBcbiIKLSIgICAgICAgICAg ICAgICB2b2lkIG1haW4odm9pZCkgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBcbiIKLSIgICAgICAgICAgICAgICB7ICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcbiIKLSIgICAgICAgICAgICAgICAgICAg T3V0VGV4Q29vcmRTb3VyY2UgPSB2ZWMyKEluU291cmNlTWF0cml4ICogSW5WZXJ0ZXgpOyAgICBc biIKLSIgICAgICAgICAgICAgICAgICAgZ2xfUG9zaXRpb24gPSBJbk1hdHJpeCAqIEluVmVydGV4 OyAgICAgICAgICAgICAgICAgICAgICBcbiIKLSIgICAgICAgICAgICAgICB9ICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcbiI7Ci0KKyAg ICAgICAgVkVSVEVYX1NIQURFUigKKyAgICAgICAgICAgIHVuaWZvcm0gbWF0NCBJbk1hdHJpeCwg SW5Tb3VyY2VNYXRyaXg7CisgICAgICAgICAgICBhdHRyaWJ1dGUgdmVjNCBJblZlcnRleDsKKyAg ICAgICAgICAgIHZhcnlpbmcgaGlnaHAgdmVjMiBPdXRUZXhDb29yZFNvdXJjZTsKKyAgICAgICAg ICAgIHZvaWQgbWFpbih2b2lkKQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIE91dFRl eENvb3JkU291cmNlID0gdmVjMihJblNvdXJjZU1hdHJpeCAqIEluVmVydGV4KTsKKyAgICAgICAg ICAgICAgICBnbF9Qb3NpdGlvbiA9IEluTWF0cml4ICogSW5WZXJ0ZXg7CisgICAgICAgICAgICB9 CisgICAgICAgICk7CiAgICAgY29uc3QgY2hhciogZnJhZ21lbnRTaGFkZXJTb3VyY2VDbGlwID0K LSAgICAgICAgICAgIE9FUzJfRlJBR01FTlRfU0hBREVSX0RFRkFVTFRfUFJFQ0lTSU9OCi0iICAg ICAgICAgICAgICAgdm9pZCBtYWluKHZvaWQpIHsgZ2xfRnJhZ0NvbG9yID0gdmVjNCgwLjAsIDAu MCwgMC4wLCAwLjApOyB9ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiOworICAgICAg ICBGUkFHTUVOVF9TSEFERVIoCisgICAgICAgICAgICB2b2lkIG1haW4odm9pZCkKKyAgICAgICAg ICAgIHsKKyAgICAgICAgICAgICAgICBnbF9GcmFnQ29sb3IgPSB2ZWM0KDAuMCwgMC4wLCAwLjAs IDAuMCk7CisgICAgICAgICAgICB9CisgICAgICAgICk7CiAKICAgICBjb25zdCBjaGFyKiB2ZXJ0 ZXhTaGFkZXJTb3VyY2VDbGlwID0KLSIgICAgICAgICAgICAgICB1bmlmb3JtIG1hdDQgSW5NYXRy aXg7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcbiIKLSIgICAgICAgICAg ICAgICBhdHRyaWJ1dGUgdmVjNCBJblZlcnRleDsgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBcbiIKLSIgICAgICAgICAgICAgICB2b2lkIG1haW4odm9pZCkgeyBnbF9Qb3NpdGlv biA9IEluTWF0cml4ICogSW5WZXJ0ZXg7IH0gICAgICAiOworICAgICAgICBWRVJURVhfU0hBREVS KAorICAgICAgICAgICAgdW5pZm9ybSBtYXQ0IEluTWF0cml4OworICAgICAgICAgICAgYXR0cmli dXRlIHZlYzQgSW5WZXJ0ZXg7CisgICAgICAgICAgICB2b2lkIG1haW4odm9pZCkKKyAgICAgICAg ICAgIHsKKyAgICAgICAgICAgICAgICBnbF9Qb3NpdGlvbiA9IEluTWF0cml4ICogSW5WZXJ0ZXg7 CisgICAgICAgICAgICB9CisgICAgICAgICk7CiAKIAogICAgIFRFWE1BUF9CVUlMRF9TSEFERVIo U2ltcGxlKQo=