124653 2013-11-20 07:04:45 -0800 [texmap] Borders on rotating images are hidden/wrongly rendered with edge distance antialiasing 2022-09-21 21:56:54 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) All Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=245514 P2 Normal --- 1 jdapena jdapena cmarcelo commit-queue jdapena kondapallykalyan luiz noam prabhusundar oldest_to_newest 952557 0 217424 jdapena 2013-11-20 07:04:45 -0800 Created attachment 217424 Test case: rotating green box and circle are most obvious artifacts When TextureMapperGL has enabled edgeDistanceAntialiasing, the borders of the image fail to render properly, showing different artifacts. It is pretty obvious on circle images where the borders of the circle are exactly touching the image border. This is reproducible at least in WebKit Qt and WebKit Gtk (though I expect it to also fail on WebKitEFL as it uses coordinated graphics). 955327 1 218159 jdapena 2013-12-02 03:45:36 -0800 Created attachment 218159 Patch 955581 2 218159 noam 2013-12-02 14:21:49 -0800 Comment on attachment 218159 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=218159&action=review Nice, see comments > Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp:328 > + vec4 clampedPosition = clamp(vec4(v_texCoord, 0., 1.), 0., 1.); > + vec2 texCoord = (u_textureSpaceMatrix * clampedPosition).xy; It's not a good idea to do this for every pixel. We should only do this when there's an actual texture. You should figure that into the other "optional" functions. 955836 3 218282 jdapena 2013-12-03 02:55:22 -0800 Created attachment 218282 Patch 955837 4 218283 jdapena 2013-12-03 03:02:44 -0800 Created attachment 218283 Patch 955838 5 jdapena 2013-12-03 03:04:03 -0800 (In reply to comment #4) > Created an attachment (id=218283) [details] > Patch New patch: * Now it only clamps on fragment shader when we have ENABLE_Texture and ENABLE_Antialiasing. 956414 6 218283 commit-queue 2013-12-04 09:46:41 -0800 Comment on attachment 218283 Patch Clearing flags on attachment: 218283 Committed r160096: <http://trac.webkit.org/changeset/160096> 956415 7 commit-queue 2013-12-04 09:46:43 -0800 All reviewed patches have been landed. Closing bug. 1007738 8 231095 prabhusundar 2014-05-08 13:09:40 -0700 Created attachment 231095 Fix to match the uniform precision qualifiers in Vertex and fragment 1007740 9 prabhusundar 2014-05-08 13:10:30 -0700 When the vertex and fragment shaders are linked together, then they will share a single global uniform name space. Hence, types and precisions of uniforms with the same name must match across all shaders that are linked into a single executable. As per GLSL_ES_Specification_3.00.3.pdf Page 124 12.3 Numeric Precision The fragment language has no default precision qualifier for floating point types. Hence for float, floating point vector and matrix variable declarations, either the declaration must include a precision qualifier or the default float precision must have been previously declared. 217424 2013-11-20 07:04:45 -0800 2013-11-20 07:04:45 -0800 Test case: rotating green box and circle are most obvious artifacts test_spinner.html text/html 2269 jdapena PCFET0NUWVBFIGh0bWw+DQo8aHRtbD4NCjxoZWFkPg0KPHN0eWxlPg0KI3Rlc3Qgew0KICAgIHdp ZHRoOiAzMnB4Ow0KICAgIGhlaWdodDogMzJweDsNCiAgICBiYWNrZ3JvdW5kOiB1cmwoJ3JlZnJl c2gucG5nJyk7DQp9DQoNCkAtd2Via2l0LWtleWZyYW1lcyByb3RhdGluZyB7DQogICAgZnJvbXsN CiAgICAgICAgLXdlYmtpdC10cmFuc2Zvcm06IHJvdGF0ZSgwZGVnKTsNCiAgICB9DQogICAgdG97 DQogICAgICAgIC13ZWJraXQtdHJhbnNmb3JtOiByb3RhdGUoMzYwZGVnKTsNCiAgICB9DQp9DQoN Ci5yb3RhdGluZyB7DQogICAgLXdlYmtpdC1hbmltYXRpb246IHJvdGF0aW5nIDJzIGxpbmVhciBp bmZpbml0ZTsNCn0NCjwvc3R5bGU+DQo8L2hlYWQ+DQo8Ym9keT4NCjxpbWcgc3JjPSJodHRwOi8v ZXN0YXRpY29zMDQubWFyY2EuY29tL2ltYWdlbmVzLzIwMTMvMDkvMzAvcG9ydGFkYS8xMzQ3NTM1 MDM1XzIuanBnIiBpZD0ndGVzdCcgY2xhc3M9J3JvdGF0aW5nJyBzdHlsZT0ibWFyZ2luOjRweDsg d2lkdGg6ODRweDsgaGVpZ2h0OjUwcHg7Ij4NCjxpbWcgc3JjPSJodHRwOi8vZXN0YXRpY29zMDQu bWFyY2EuY29tL2ltYWdlbmVzLzIwMTMvMDkvMzAvcG9ydGFkYS8xMzQ3NTM1MDM1XzIuanBnIiBp ZD0ndGVzdCcgc3R5bGU9Im1hcmdpbjo0cHg7IHdpZHRoOjg0cHg7IGhlaWdodDo1MHB4OyI+DQo8 aW1nIHNyYz0iaHR0cDovL2VzdGF0aWNvczA0Lm1hcmNhLmNvbS9pbWFnZW5lcy8yMDEzLzA5LzMw L3BvcnRhZGEvMTM0NzUzNTAzNV8yLmpwZyIgaWQ9J3Rlc3QnIHN0eWxlPSJtYXJnaW46NHB4OyB3 aWR0aDo4NHB4OyBoZWlnaHQ6NTBweDsgLXdlYmtpdC10cmFuc2Zvcm06cm90YXRlKDFkZWcpOyI+ DQo8aW1nIHNyYz0iaHR0cDovL2VzdGF0aWNvczAzLm1hcmNhLmNvbS9pbWFnZW5lcy8yMDEyLzA2 LzEwL3BvcnRhZGEvMTMzODU3MzY0NV8wLmpwZyIgaWQ9J3Rlc3QnIGNsYXNzPSdyb3RhdGluZycg c3R5bGU9Im1hcmdpbjo0cHg7IHdpZHRoOjg0cHg7IGhlaWdodDo1MHB4OyI+DQo8aW1nIHNyYz0i aHR0cDovL2VzdGF0aWNvczAzLm1hcmNhLmNvbS9pbWFnZW5lcy8yMDEyLzA2LzEwL3BvcnRhZGEv MTMzODU3MzY0NV8wLmpwZyIgaWQ9J3Rlc3QnIHN0eWxlPSJtYXJnaW46NHB4OyB3aWR0aDo4NHB4 OyBoZWlnaHQ6NTBweDsiPg0KPGltZyBzcmM9Imh0dHA6Ly9lc3RhdGljb3MwMy5tYXJjYS5jb20v aW1hZ2VuZXMvMjAxMi8wNi8xMC9wb3J0YWRhLzEzMzg1NzM2NDVfMC5qcGciIGlkPSd0ZXN0JyBz dHlsZT0ibWFyZ2luOjRweDsgd2lkdGg6ODRweDsgaGVpZ2h0OjUwcHg7IC13ZWJraXQtdHJhbnNm b3JtOnJvdGF0ZSgxZGVnKTsiPg0KPGltZyBzcmM9Imh0dHA6Ly9kZXZlbG9wZXIuemVuZGVzay5j b20vaW1hZ2VzL2FwcHMvaWNvbi1leGFtcGxlLXNxdWFyZS5wbmciIGlkPSd0ZXN0JyBjbGFzcz0n cm90YXRpbmcnIHN0eWxlPSJtYXJnaW46NHB4OyB3aWR0aDoxMjhweDsgaGVpZ2h0OjEyOHB4OyI+ DQo8aW1nIHNyYz0iaHR0cDovL2RldmVsb3Blci56ZW5kZXNrLmNvbS9pbWFnZXMvYXBwcy9pY29u LWV4YW1wbGUtc3F1YXJlLnBuZyIgaWQ9J3Rlc3QnIHN0eWxlPSJtYXJnaW46NHB4OyB3aWR0aDox MjhweDsgaGVpZ2h0OjEyOHB4OyI+DQo8aW1nIHNyYz0iaHR0cDovL2RldmVsb3Blci56ZW5kZXNr LmNvbS9pbWFnZXMvYXBwcy9pY29uLWV4YW1wbGUtc3F1YXJlLnBuZyIgaWQ9J3Rlc3QnIHN0eWxl PSJtYXJnaW46NHB4OyB3aWR0aDoxMjhweDsgaGVpZ2h0OjEyOHB4OyAtd2Via2l0LXRyYW5zZm9y bTpyb3RhdGUoMWRlZyk7Ij4NCjxpbWcgc3JjPSJodHRwOi8vZGV2ZWxvcGVyLnplbmRlc2suY29t L2ltYWdlcy9hcHBzL2ljb24tZXhhbXBsZS1iYWQtemVuZGVzay5wbmciIGlkPSd0ZXN0JyBjbGFz cz0ncm90YXRpbmcnIHN0eWxlPSJtYXJnaW46NHB4OyB3aWR0aDo4M3B4OyBoZWlnaHQ6ODNweDsi Pg0KPGltZyBzcmM9Imh0dHA6Ly9kZXZlbG9wZXIuemVuZGVzay5jb20vaW1hZ2VzL2FwcHMvaWNv bi1leGFtcGxlLWJhZC16ZW5kZXNrLnBuZyIgaWQ9J3Rlc3QnIHN0eWxlPSJtYXJnaW46NHB4OyB3 aWR0aDo4M3B4OyBoZWlnaHQ6ODNweDsiPg0KPGltZyBzcmM9Imh0dHA6Ly9kZXZlbG9wZXIuemVu ZGVzay5jb20vaW1hZ2VzL2FwcHMvaWNvbi1leGFtcGxlLWJhZC16ZW5kZXNrLnBuZyIgaWQ9J3Rl c3QnIHN0eWxlPSJtYXJnaW46NHB4OyB3aWR0aDo4M3B4OyBoZWlnaHQ6ODNweDsgLXdlYmtpdC10 cmFuc2Zvcm06cm90YXRlKDFkZWcpOyI+DQo8L2JvZHk+DQo8L2h0bWw+DQoNCg== 218159 2013-12-02 03:45:36 -0800 2013-12-03 02:55:16 -0800 Patch bug-124653-20131202124650.patch text/plain 7490 jdapena U3VidmVyc2lvbiBSZXZpc2lvbjogMTU5OTE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTM3OWQwMWViOTI1NGIz NzM0ZTg5YWUxZDY4ZWVkNDE4NDI5NDRlOC4uMGRjYmRjZTljYmFmNWI3MWU0ZjNlMjU5MTkyOWEw YjZmZDNlZDZiOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEzLTEyLTAyICBKb3PD qSBEYXBlbmEgUGF6ICA8amRhcGVuYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFt0ZXhtYXBdIEJv cmRlcnMgb24gcm90YXRpbmcgaW1hZ2VzIGFyZSBoaWRkZW4vd3JvbmdseSByZW5kZXJlZCB3aXRo IGVkZ2UgZGlzdGFuY2UgYW50aWFsaWFzaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMjQ2NTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBUZXh0dXJlIG1hcHBlciBlZGdlIGRpc3RhbmNlIGFudGlhbGlh c2luZyB0ZXh0dXJlIHNhbXBsaW5nIHdhcyBjYXVzaW5nCisgICAgICAgIGJvcmRlcnMgdG8gYmUg c2hhZGVkIChhbmQgbWFkZSB0aGVtIGFsbW9zdCBkaXNhcHBlYXIgaW4gc29tZSBjYXNlcykuCisg ICAgICAgIFRoaXMgd2FzIGJlY2F1c2UgY2FsY3VsYXRpb24gb2Ygc2FtcGxpbmcgaGFwcGVuZWQg b24gdmVydGV4IHNoYWRlciwgc28KKyAgICAgICAgdGhlIGJvcmRlciBvZiB0aGUgdGV4dHVyZSB3 b3VsZCBnbyB0byB0aGUgYm9yZGVyIG9mIHRoZSBpbmZsYXRpb24gYXJlYS4KKworICAgICAgICBX aGF0IGFsZ29yaXRobSBzaG91bGQgZG8gaXMgc2FtcGxpbmcgdGhlIGJvcmRlciBwaXhlbCBmb3Ig YWxsIHRoZQorICAgICAgICBpbmZsYXRpb24gYXJlYSAoaXQgaXMgdGhlIGNsb3Nlc3QgcGl4ZWwg dG8gYWxsIHRoZSBzYW1wbGVzIGluCisgICAgICAgIGluZmxhdGlvbiBhcmVhKSwgYW5kIHRoZW4g dXNlIHRoZSBzdGFuZGFyZCBzYW1wbGluZyBmb3IgdGhlIG90aGVyCisgICAgICAgIHBhcnRzIG9m IHRoZSB0ZXh0dXJlLgorCisgICAgICAgIE5vIG5ldyB0ZXN0IGJlY2F1c2UgdGhpcyBpcyBhbHJl YWR5IGNvdmVyZWQgYnkgdGVzdAorICAgICAgICB0cmFuc2Zvcm1zLzNkL3BvaW50LW1hcHBpbmcv M2QtcG9pbnQtbWFwcGluZy5odG1sCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90ZXht YXAvVGV4dHVyZU1hcHBlclNoYWRlclByb2dyYW0uY3BwOiBmaXggZWRnZQorICAgICAgICBkaXN0 YW5jZSBhbnRpYWxpYXNpbmcgdGV4dHVyZSBzYW1wbGluZy4KKwogMjAxMy0xMi0wMiAgQXR0aWxh IER1c25va2kgIDxhZHVzbm9raUBpbmYudS1zemVnZWQuaHU+CiAKICAgICAgICAgSFRNTDUgcmVx dWlyZWQgYXR0cmlidXRlIHZhbGlkYXRpb24gbWVzc2FnZXMgaW1wbGVtZW50ZWQuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBl clNoYWRlclByb2dyYW0uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4 bWFwL1RleHR1cmVNYXBwZXJTaGFkZXJQcm9ncmFtLmNwcAppbmRleCAzZjY0YzRiOGEzOWMxYjVh ZGI2ODk5ZjMwMjBlN2M4YWM0NTQyZjAyLi4xYjIxMzMwM2VlMzIzZWJmN2M0ZDliYTYwMjk3MWI2 NmMzNGYzNGM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90 ZXhtYXAvVGV4dHVyZU1hcHBlclNoYWRlclByb2dyYW0uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyU2hhZGVyUHJvZ3JhbS5jcHAK QEAgLTE3Miw5ICsxNzIsNyBAQCBzdGF0aWMgY29uc3QgY2hhciogdmVydGV4VGVtcGxhdGUgPQog ICAgICAgICAgICAgdmVjMiBwb3NpdGlvbiA9IGFfdmVydGV4Lnh5OwogICAgICAgICAgICAgYXBw bHlBbnRpYWxpYXNpbmdJZk5lZWRlZChwb3NpdGlvbik7CiAKLSAgICAgICAgICAgIC8vIFRoZSB0 ZXh0dXJlIHBvc2l0aW9uIG5lZWRzIHRvIGJlIGNsYW1wZWQgdG8gMC4uMSBiZWZvcmUgdGhlIHRl eHR1cmUgbWF0cml4IGlzIGFwcGxpZWQuCi0gICAgICAgICAgICB2ZWM0IGNsYW1wZWRQb3NpdGlv biA9IGNsYW1wKHZlYzQocG9zaXRpb24sIDAuLCAxLiksIDAuLCAxLik7Ci0gICAgICAgICAgICB2 X3RleENvb3JkID0gKHVfdGV4dHVyZVNwYWNlTWF0cml4ICogY2xhbXBlZFBvc2l0aW9uKS54eTsK KyAgICAgICAgICAgIHZfdGV4Q29vcmQgPSBwb3NpdGlvbjsKICAgICAgICAgICAgIGdsX1Bvc2l0 aW9uID0gdV9wcm9qZWN0aW9uTWF0cml4ICogdV9tb2RlbFZpZXdNYXRyaXggKiB2ZWM0KHBvc2l0 aW9uLCAwLiwgMS4pOwogICAgICAgICB9CiAgICAgKTsKQEAgLTIxMCwxMiArMjA4LDE0IEBAIHN0 YXRpYyBjb25zdCBjaGFyKiBmcmFnbWVudFRlbXBsYXRlID0KICAgICAgICAgdW5pZm9ybSB2ZWMy IHVfc2hhZG93T2Zmc2V0OwogICAgICAgICB1bmlmb3JtIHZlYzQgdV9jb2xvcjsKICAgICAgICAg dW5pZm9ybSBmbG9hdCB1X2dhdXNzaWFuS2VybmVsW0dBVVNTSUFOX0tFUk5FTF9IQUxGX1dJRFRI XTsKKyAgICAgICAgdW5pZm9ybSBtYXQ0IHVfdGV4dHVyZVNwYWNlTWF0cml4OwogCiAgICAgICAg IHZvaWQgbm9vcChpbm91dCB2ZWM0IGR1bW15UGFyYW1ldGVyKSB7IH0KKyAgICAgICAgdm9pZCBu b29wKGlub3V0IHZlYzQgZHVtbXlQYXJhbWV0ZXIsIHZlYzIgdGV4Q29vcmQpIHsgfQogCi0gICAg ICAgIGZsb2F0IGFudGlhbGlhcygpIHsgcmV0dXJuIHNtb290aHN0ZXAodl9hbnRpYWxpYXMsIDAu LCAxLik7IH0KKyAgICAgICAgZmxvYXQgYW50aWFsaWFzKCkgeyByZXR1cm4gc21vb3Roc3RlcCgw LiwgMS4sIHZfYW50aWFsaWFzKTsgfQogCi0gICAgICAgIHZvaWQgYXBwbHlUZXh0dXJlKGlub3V0 IHZlYzQgY29sb3IpIHsgY29sb3IgPSBTYW1wbGVyRnVuY3Rpb24oc19zYW1wbGVyLCB2X3RleENv b3JkKTsgfQorICAgICAgICB2b2lkIGFwcGx5VGV4dHVyZShpbm91dCB2ZWM0IGNvbG9yLCB2ZWMy IHRleENvb3JkKSB7IGNvbG9yID0gU2FtcGxlckZ1bmN0aW9uKHNfc2FtcGxlciwgdGV4Q29vcmQp OyB9CiAgICAgICAgIHZvaWQgYXBwbHlPcGFjaXR5KGlub3V0IHZlYzQgY29sb3IpIHsgY29sb3Ig Kj0gdV9vcGFjaXR5OyB9CiAgICAgICAgIHZvaWQgYXBwbHlBbnRpYWxpYXNpbmcoaW5vdXQgdmVj NCBjb2xvcikgeyBjb2xvciAqPSBhbnRpYWxpYXMoKTsgfQogCkBAIC0yNzgsMzUgKzI3OCwzNSBA QCBzdGF0aWMgY29uc3QgY2hhciogZnJhZ21lbnRUZW1wbGF0ZSA9CiAgICAgICAgICAgICBjb2xv ciA9IHZlYzQoY29sb3IuciwgY29sb3IuZywgY29sb3IuYiwgY29sb3IuYSAqIHVfZmlsdGVyQW1v dW50KTsKICAgICAgICAgfQogCi0gICAgICAgIHZlYzQgc2FtcGxlQ29sb3JBdFJhZGl1cyhmbG9h dCByYWRpdXMpCisgICAgICAgIHZlYzQgc2FtcGxlQ29sb3JBdFJhZGl1cyhmbG9hdCByYWRpdXMs IHZlYzIgdGV4Q29vcmQpCiAgICAgICAgIHsKLSAgICAgICAgICAgIHZlYzIgY29vcmQgPSB2X3Rl eENvb3JkICsgcmFkaXVzICogdV9ibHVyUmFkaXVzOworICAgICAgICAgICAgdmVjMiBjb29yZCA9 IHRleENvb3JkICsgcmFkaXVzICogdV9ibHVyUmFkaXVzOwogICAgICAgICAgICAgcmV0dXJuIFNh bXBsZXJGdW5jdGlvbihzX3NhbXBsZXIsIGNvb3JkKSAqIGZsb2F0KGNvb3JkLnggPiAwLiAmJiBj b29yZC55ID4gMC4gJiYgY29vcmQueCA8IDEuICYmIGNvb3JkLnkgPCAxLik7CiAgICAgICAgIH0K IAotICAgICAgICBmbG9hdCBzYW1wbGVBbHBoYUF0UmFkaXVzKGZsb2F0IHJhZGl1cykKKyAgICAg ICAgZmxvYXQgc2FtcGxlQWxwaGFBdFJhZGl1cyhmbG9hdCByYWRpdXMsIHZlYzIgdGV4Q29vcmQp CiAgICAgICAgIHsKLSAgICAgICAgICAgIHZlYzIgY29vcmQgPSB2X3RleENvb3JkIC0gdV9zaGFk b3dPZmZzZXQgKyByYWRpdXMgKiB1X2JsdXJSYWRpdXM7CisgICAgICAgICAgICB2ZWMyIGNvb3Jk ID0gdGV4Q29vcmQgLSB1X3NoYWRvd09mZnNldCArIHJhZGl1cyAqIHVfYmx1clJhZGl1czsKICAg ICAgICAgICAgIHJldHVybiBTYW1wbGVyRnVuY3Rpb24oc19zYW1wbGVyLCBjb29yZCkuYSAqIGZs b2F0KGNvb3JkLnggPiAwLiAmJiBjb29yZC55ID4gMC4gJiYgY29vcmQueCA8IDEuICYmIGNvb3Jk LnkgPCAxLik7CiAgICAgICAgIH0KIAotICAgICAgICB2b2lkIGFwcGx5Qmx1ckZpbHRlcihpbm91 dCB2ZWM0IGNvbG9yKQorICAgICAgICB2b2lkIGFwcGx5Qmx1ckZpbHRlcihpbm91dCB2ZWM0IGNv bG9yLCB2ZWMyIHRleENvb3JkKQogICAgICAgICB7Ci0gICAgICAgICAgICB2ZWM0IHRvdGFsID0g c2FtcGxlQ29sb3JBdFJhZGl1cygwLikgKiB1X2dhdXNzaWFuS2VybmVsWzBdOworICAgICAgICAg ICAgdmVjNCB0b3RhbCA9IHNhbXBsZUNvbG9yQXRSYWRpdXMoMC4sIHRleENvb3JkKSAqIHVfZ2F1 c3NpYW5LZXJuZWxbMF07CiAgICAgICAgICAgICBmb3IgKGludCBpID0gMTsgaSA8IEdBVVNTSUFO X0tFUk5FTF9IQUxGX1dJRFRIOyBpKyspIHsKLSAgICAgICAgICAgICAgICB0b3RhbCArPSBzYW1w bGVDb2xvckF0UmFkaXVzKGZsb2F0KGkpICogR0FVU1NJQU5fS0VSTkVMX1NURVApICogdV9nYXVz c2lhbktlcm5lbFtpXTsKLSAgICAgICAgICAgICAgICB0b3RhbCArPSBzYW1wbGVDb2xvckF0UmFk aXVzKGZsb2F0KC0xICogaSkgKiBHQVVTU0lBTl9LRVJORUxfU1RFUCkgKiB1X2dhdXNzaWFuS2Vy bmVsW2ldOworICAgICAgICAgICAgICAgIHRvdGFsICs9IHNhbXBsZUNvbG9yQXRSYWRpdXMoZmxv YXQoaSkgKiBHQVVTU0lBTl9LRVJORUxfU1RFUCwgdGV4Q29vcmQpICogdV9nYXVzc2lhbktlcm5l bFtpXTsKKyAgICAgICAgICAgICAgICB0b3RhbCArPSBzYW1wbGVDb2xvckF0UmFkaXVzKGZsb2F0 KC0xICogaSkgKiBHQVVTU0lBTl9LRVJORUxfU1RFUCwgdGV4Q29vcmQpICogdV9nYXVzc2lhbktl cm5lbFtpXTsKICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgY29sb3IgPSB0b3RhbDsKICAg ICAgICAgfQogCi0gICAgICAgIHZvaWQgYXBwbHlBbHBoYUJsdXIoaW5vdXQgdmVjNCBjb2xvcikK KyAgICAgICAgdm9pZCBhcHBseUFscGhhQmx1cihpbm91dCB2ZWM0IGNvbG9yLCB2ZWMyIHRleENv b3JkKQogICAgICAgICB7Ci0gICAgICAgICAgICBmbG9hdCB0b3RhbCA9IHNhbXBsZUFscGhhQXRS YWRpdXMoMC4pICogdV9nYXVzc2lhbktlcm5lbFswXTsKKyAgICAgICAgICAgIGZsb2F0IHRvdGFs ID0gc2FtcGxlQWxwaGFBdFJhZGl1cygwLiwgdGV4Q29vcmQpICogdV9nYXVzc2lhbktlcm5lbFsw XTsKICAgICAgICAgICAgIGZvciAoaW50IGkgPSAxOyBpIDwgR0FVU1NJQU5fS0VSTkVMX0hBTEZf V0lEVEg7IGkrKykgewotICAgICAgICAgICAgICAgIHRvdGFsICs9IHNhbXBsZUFscGhhQXRSYWRp dXMoZmxvYXQoaSkgKiBHQVVTU0lBTl9LRVJORUxfU1RFUCkgKiB1X2dhdXNzaWFuS2VybmVsW2ld OwotICAgICAgICAgICAgICAgIHRvdGFsICs9IHNhbXBsZUFscGhhQXRSYWRpdXMoZmxvYXQoLTEg KiBpKSAqIEdBVVNTSUFOX0tFUk5FTF9TVEVQKSAqIHVfZ2F1c3NpYW5LZXJuZWxbaV07CisgICAg ICAgICAgICAgICAgdG90YWwgKz0gc2FtcGxlQWxwaGFBdFJhZGl1cyhmbG9hdChpKSAqIEdBVVNT SUFOX0tFUk5FTF9TVEVQLCB0ZXhDb29yZCkgKiB1X2dhdXNzaWFuS2VybmVsW2ldOworICAgICAg ICAgICAgICAgIHRvdGFsICs9IHNhbXBsZUFscGhhQXRSYWRpdXMoZmxvYXQoLTEgKiBpKSAqIEdB VVNTSUFOX0tFUk5FTF9TVEVQLCB0ZXhDb29yZCkgKiB1X2dhdXNzaWFuS2VybmVsW2ldOwogICAg ICAgICAgICAgfQogCiAgICAgICAgICAgICBjb2xvciAqPSB0b3RhbDsKQEAgLTMxNCw5ICszMTQs OSBAQCBzdGF0aWMgY29uc3QgY2hhciogZnJhZ21lbnRUZW1wbGF0ZSA9CiAKICAgICAgICAgdmVj NCBzb3VyY2VPdmVyKHZlYzQgc3JjLCB2ZWM0IGRzdCkgeyByZXR1cm4gc3JjICsgZHN0ICogKDEu IC0gZHN0LmEpOyB9CiAKLSAgICAgICAgdm9pZCBhcHBseUNvbnRlbnRUZXh0dXJlKGlub3V0IHZl YzQgY29sb3IpCisgICAgICAgIHZvaWQgYXBwbHlDb250ZW50VGV4dHVyZShpbm91dCB2ZWM0IGNv bG9yLCB2ZWMyIHRleENvb3JkKQogICAgICAgICB7Ci0gICAgICAgICAgICB2ZWM0IGNvbnRlbnRD b2xvciA9IHRleHR1cmUyRChzX2NvbnRlbnRUZXh0dXJlLCB2X3RleENvb3JkKTsKKyAgICAgICAg ICAgIHZlYzQgY29udGVudENvbG9yID0gdGV4dHVyZTJEKHNfY29udGVudFRleHR1cmUsIHRleENv b3JkKTsKICAgICAgICAgICAgIGNvbG9yID0gc291cmNlT3Zlcihjb250ZW50Q29sb3IsIGNvbG9y KTsKICAgICAgICAgfQogCkBAIC0zMjQsOCArMzI0LDEwIEBAIHN0YXRpYyBjb25zdCBjaGFyKiBm cmFnbWVudFRlbXBsYXRlID0KIAogICAgICAgICB2b2lkIG1haW4odm9pZCkKICAgICAgICAgewor ICAgICAgICAgICAgdmVjNCBjbGFtcGVkUG9zaXRpb24gPSBjbGFtcCh2ZWM0KHZfdGV4Q29vcmQs IDAuLCAxLiksIDAuLCAxLik7CisgICAgICAgICAgICB2ZWMyIHRleENvb3JkID0gKHVfdGV4dHVy ZVNwYWNlTWF0cml4ICogY2xhbXBlZFBvc2l0aW9uKS54eTsKICAgICAgICAgICAgIHZlYzQgY29s b3IgPSB2ZWM0KDEuLCAxLiwgMS4sIDEuKTsKLSAgICAgICAgICAgIGFwcGx5VGV4dHVyZUlmTmVl ZGVkKGNvbG9yKTsKKyAgICAgICAgICAgIGFwcGx5VGV4dHVyZUlmTmVlZGVkKGNvbG9yLCB0ZXhD b29yZCk7CiAgICAgICAgICAgICBhcHBseVNvbGlkQ29sb3JJZk5lZWRlZChjb2xvcik7CiAgICAg ICAgICAgICBhcHBseUFudGlhbGlhc2luZ0lmTmVlZGVkKGNvbG9yKTsKICAgICAgICAgICAgIGFw cGx5T3BhY2l0eUlmTmVlZGVkKGNvbG9yKTsKQEAgLTMzNyw5ICszMzksOSBAQCBzdGF0aWMgY29u c3QgY2hhciogZnJhZ21lbnRUZW1wbGF0ZSA9CiAgICAgICAgICAgICBhcHBseUJyaWdodG5lc3NG aWx0ZXJJZk5lZWRlZChjb2xvcik7CiAgICAgICAgICAgICBhcHBseUNvbnRyYXN0RmlsdGVySWZO ZWVkZWQoY29sb3IpOwogICAgICAgICAgICAgYXBwbHlPcGFjaXR5RmlsdGVySWZOZWVkZWQoY29s b3IpOwotICAgICAgICAgICAgYXBwbHlCbHVyRmlsdGVySWZOZWVkZWQoY29sb3IpOwotICAgICAg ICAgICAgYXBwbHlBbHBoYUJsdXJJZk5lZWRlZChjb2xvcik7Ci0gICAgICAgICAgICBhcHBseUNv bnRlbnRUZXh0dXJlSWZOZWVkZWQoY29sb3IpOworICAgICAgICAgICAgYXBwbHlCbHVyRmlsdGVy SWZOZWVkZWQoY29sb3IsIHRleENvb3JkKTsKKyAgICAgICAgICAgIGFwcGx5QWxwaGFCbHVySWZO ZWVkZWQoY29sb3IsIHRleENvb3JkKTsKKyAgICAgICAgICAgIGFwcGx5Q29udGVudFRleHR1cmVJ Zk5lZWRlZChjb2xvciwgdGV4Q29vcmQpOwogICAgICAgICAgICAgZ2xfRnJhZ0NvbG9yID0gY29s b3I7CiAgICAgICAgIH0KICAgICApOwo= 218282 2013-12-03 02:55:22 -0800 2013-12-03 03:02:37 -0800 Patch bug-124653-20131203115637.patch text/plain 9123 jdapena U3VidmVyc2lvbiBSZXZpc2lvbjogMTU5OTE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTM3OWQwMWViOTI1NGIz NzM0ZTg5YWUxZDY4ZWVkNDE4NDI5NDRlOC4uMGRjYmRjZTljYmFmNWI3MWU0ZjNlMjU5MTkyOWEw YjZmZDNlZDZiOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEzLTEyLTAyICBKb3PD qSBEYXBlbmEgUGF6ICA8amRhcGVuYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFt0ZXhtYXBdIEJv cmRlcnMgb24gcm90YXRpbmcgaW1hZ2VzIGFyZSBoaWRkZW4vd3JvbmdseSByZW5kZXJlZCB3aXRo IGVkZ2UgZGlzdGFuY2UgYW50aWFsaWFzaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMjQ2NTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBUZXh0dXJlIG1hcHBlciBlZGdlIGRpc3RhbmNlIGFudGlhbGlh c2luZyB0ZXh0dXJlIHNhbXBsaW5nIHdhcyBjYXVzaW5nCisgICAgICAgIGJvcmRlcnMgdG8gYmUg c2hhZGVkIChhbmQgbWFkZSB0aGVtIGFsbW9zdCBkaXNhcHBlYXIgaW4gc29tZSBjYXNlcykuCisg ICAgICAgIFRoaXMgd2FzIGJlY2F1c2UgY2FsY3VsYXRpb24gb2Ygc2FtcGxpbmcgaGFwcGVuZWQg b24gdmVydGV4IHNoYWRlciwgc28KKyAgICAgICAgdGhlIGJvcmRlciBvZiB0aGUgdGV4dHVyZSB3 b3VsZCBnbyB0byB0aGUgYm9yZGVyIG9mIHRoZSBpbmZsYXRpb24gYXJlYS4KKworICAgICAgICBX aGF0IGFsZ29yaXRobSBzaG91bGQgZG8gaXMgc2FtcGxpbmcgdGhlIGJvcmRlciBwaXhlbCBmb3Ig YWxsIHRoZQorICAgICAgICBpbmZsYXRpb24gYXJlYSAoaXQgaXMgdGhlIGNsb3Nlc3QgcGl4ZWwg dG8gYWxsIHRoZSBzYW1wbGVzIGluCisgICAgICAgIGluZmxhdGlvbiBhcmVhKSwgYW5kIHRoZW4g dXNlIHRoZSBzdGFuZGFyZCBzYW1wbGluZyBmb3IgdGhlIG90aGVyCisgICAgICAgIHBhcnRzIG9m IHRoZSB0ZXh0dXJlLgorCisgICAgICAgIE5vIG5ldyB0ZXN0IGJlY2F1c2UgdGhpcyBpcyBhbHJl YWR5IGNvdmVyZWQgYnkgdGVzdAorICAgICAgICB0cmFuc2Zvcm1zLzNkL3BvaW50LW1hcHBpbmcv M2QtcG9pbnQtbWFwcGluZy5odG1sCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90ZXht YXAvVGV4dHVyZU1hcHBlclNoYWRlclByb2dyYW0uY3BwOiBmaXggZWRnZQorICAgICAgICBkaXN0 YW5jZSBhbnRpYWxpYXNpbmcgdGV4dHVyZSBzYW1wbGluZy4KKwogMjAxMy0xMi0wMiAgQXR0aWxh IER1c25va2kgIDxhZHVzbm9raUBpbmYudS1zemVnZWQuaHU+CiAKICAgICAgICAgSFRNTDUgcmVx dWlyZWQgYXR0cmlidXRlIHZhbGlkYXRpb24gbWVzc2FnZXMgaW1wbGVtZW50ZWQuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBl clNoYWRlclByb2dyYW0uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4 bWFwL1RleHR1cmVNYXBwZXJTaGFkZXJQcm9ncmFtLmNwcAppbmRleCAzZjY0YzRiOGEzOWMxYjVh ZGI2ODk5ZjMwMjBlN2M4YWM0NTQyZjAyLi44M2U5Y2MzOGI0NTgzMTA4ZWJlNDUwMzk5NmM5M2Q4 ZWQ3MjI1ZDFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90 ZXhtYXAvVGV4dHVyZU1hcHBlclNoYWRlclByb2dyYW0uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyU2hhZGVyUHJvZ3JhbS5jcHAK QEAgLTEyNyw2ICsxMjcsNyBAQCBzdGF0aWMgY29uc3QgY2hhciogdmVydGV4VGVtcGxhdGUgPQog ICAgICAgICB1bmlmb3JtIG1hdDQgdV90ZXh0dXJlU3BhY2VNYXRyaXg7CiAKICAgICAgICAgdmFy eWluZyB2ZWMyIHZfdGV4Q29vcmQ7CisgICAgICAgIHZhcnlpbmcgdmVjMiB2X3RyYW5zZm9ybWVk VGV4Q29vcmQ7CiAgICAgICAgIHZhcnlpbmcgZmxvYXQgdl9hbnRpYWxpYXM7CiAKICAgICAgICAg dm9pZCBub29wKGlub3V0IHZlYzIgZHVtbXlQYXJhbWV0ZXIpIHsgfQpAQCAtMTcyLDkgKzE3Myw5 IEBAIHN0YXRpYyBjb25zdCBjaGFyKiB2ZXJ0ZXhUZW1wbGF0ZSA9CiAgICAgICAgICAgICB2ZWMy IHBvc2l0aW9uID0gYV92ZXJ0ZXgueHk7CiAgICAgICAgICAgICBhcHBseUFudGlhbGlhc2luZ0lm TmVlZGVkKHBvc2l0aW9uKTsKIAotICAgICAgICAgICAgLy8gVGhlIHRleHR1cmUgcG9zaXRpb24g bmVlZHMgdG8gYmUgY2xhbXBlZCB0byAwLi4xIGJlZm9yZSB0aGUgdGV4dHVyZSBtYXRyaXggaXMg YXBwbGllZC4KKyAgICAgICAgICAgIHZfdGV4Q29vcmQgPSBwb3NpdGlvbjsKICAgICAgICAgICAg IHZlYzQgY2xhbXBlZFBvc2l0aW9uID0gY2xhbXAodmVjNChwb3NpdGlvbiwgMC4sIDEuKSwgMC4s IDEuKTsKLSAgICAgICAgICAgIHZfdGV4Q29vcmQgPSAodV90ZXh0dXJlU3BhY2VNYXRyaXggKiBj bGFtcGVkUG9zaXRpb24pLnh5OworICAgICAgICAgICAgdl90cmFuc2Zvcm1lZFRleENvb3JkID0g KHVfdGV4dHVyZVNwYWNlTWF0cml4ICogY2xhbXBlZFBvc2l0aW9uKS54eTsKICAgICAgICAgICAg IGdsX1Bvc2l0aW9uID0gdV9wcm9qZWN0aW9uTWF0cml4ICogdV9tb2RlbFZpZXdNYXRyaXggKiB2 ZWM0KHBvc2l0aW9uLCAwLiwgMS4pOwogICAgICAgICB9CiAgICAgKTsKQEAgLTE4OCw2ICsxODks MTMgQEAgc3RhdGljIGNvbnN0IGNoYXIqIHZlcnRleFRlbXBsYXRlID0KICAgICAgICAgR0xTTF9E SVJFQ1RJVkUoZGVmaW5lIFNhbXBsZXJGdW5jdGlvbiB0ZXh0dXJlMkQpIFwKICAgICBHTFNMX0RJ UkVDVElWRShlbmRpZikKIAorI2RlZmluZSBBTlRJQUxJQVNJTkdfVEVYX0NPT1JEX0RJUkVDVElW RSBcCisgICAgR0xTTF9ESVJFQ1RJVkUoaWZkZWYgRU5BQkxFX0FudGlhbGlhc2luZykgXAorICAg ICAgICBHTFNMX0RJUkVDVElWRShkZWZpbmUgdHJhbnNmb3JtVGV4Q29vcmQgZnJhZ21lbnRUcmFu c2Zvcm1UZXhDb29yZCkgXAorICAgIEdMU0xfRElSRUNUSVZFKGVsc2UpIFwKKyAgICAgICAgR0xT TF9ESVJFQ1RJVkUoZGVmaW5lIHRyYW5zZm9ybVRleENvb3JkIHZlcnRleFRyYW5zZm9ybVRleENv b3JkKSBcCisgICAgR0xTTF9ESVJFQ1RJVkUoZW5kaWYpCisKICNkZWZpbmUgRU5BQkxFX0FQUExJ RVIoTmFtZSkgIiNkZWZpbmUgRU5BQkxFXyIjTmFtZSJcbiNkZWZpbmUgYXBwbHkiI05hbWUiSWZO ZWVkZWQgYXBwbHkiI05hbWUiXG4iCiAjZGVmaW5lIERJU0FCTEVfQVBQTElFUihOYW1lKSAiI2Rl ZmluZSBhcHBseSIjTmFtZSJJZk5lZWRlZCBub29wXG4iCiAjZGVmaW5lIEJMVVJfQ09OU1RBTlRT IFwKQEAgLTE5Nyw2ICsyMDUsNyBAQCBzdGF0aWMgY29uc3QgY2hhciogdmVydGV4VGVtcGxhdGUg PQogCiBzdGF0aWMgY29uc3QgY2hhciogZnJhZ21lbnRUZW1wbGF0ZSA9CiAgICAgUkVDVF9URVhU VVJFX0RJUkVDVElWRQorICAgIEFOVElBTElBU0lOR19URVhfQ09PUkRfRElSRUNUSVZFCiAgICAg QkxVUl9DT05TVEFOVFMKICAgICBTVFJJTkdJRlkoCiAgICAgICAgIHByZWNpc2lvbiBtZWRpdW1w IGZsb2F0OwpAQCAtMjA1LDE3ICsyMTQsMjggQEAgc3RhdGljIGNvbnN0IGNoYXIqIGZyYWdtZW50 VGVtcGxhdGUgPQogICAgICAgICB1bmlmb3JtIGZsb2F0IHVfb3BhY2l0eTsKICAgICAgICAgdmFy eWluZyBmbG9hdCB2X2FudGlhbGlhczsKICAgICAgICAgdmFyeWluZyB2ZWMyIHZfdGV4Q29vcmQ7 CisgICAgICAgIHZhcnlpbmcgdmVjMiB2X3RyYW5zZm9ybWVkVGV4Q29vcmQ7CiAgICAgICAgIHVu aWZvcm0gZmxvYXQgdV9maWx0ZXJBbW91bnQ7CiAgICAgICAgIHVuaWZvcm0gdmVjMiB1X2JsdXJS YWRpdXM7CiAgICAgICAgIHVuaWZvcm0gdmVjMiB1X3NoYWRvd09mZnNldDsKICAgICAgICAgdW5p Zm9ybSB2ZWM0IHVfY29sb3I7CiAgICAgICAgIHVuaWZvcm0gZmxvYXQgdV9nYXVzc2lhbktlcm5l bFtHQVVTU0lBTl9LRVJORUxfSEFMRl9XSURUSF07CisgICAgICAgIHVuaWZvcm0gbWF0NCB1X3Rl eHR1cmVTcGFjZU1hdHJpeDsKIAogICAgICAgICB2b2lkIG5vb3AoaW5vdXQgdmVjNCBkdW1teVBh cmFtZXRlcikgeyB9CisgICAgICAgIHZvaWQgbm9vcChpbm91dCB2ZWM0IGR1bW15UGFyYW1ldGVy LCB2ZWMyIHRleENvb3JkKSB7IH0KKworICAgICAgICBmbG9hdCBhbnRpYWxpYXMoKSB7IHJldHVy biBzbW9vdGhzdGVwKDAuLCAxLiwgdl9hbnRpYWxpYXMpOyB9CisKKyAgICAgICAgdmVjMiBmcmFn bWVudFRyYW5zZm9ybVRleENvb3JkKCkKKyAgICAgICAgeworICAgICAgICAgICAgdmVjNCBjbGFt cGVkUG9zaXRpb24gPSBjbGFtcCh2ZWM0KHZfdGV4Q29vcmQsIDAuLCAxLiksIDAuLCAxLik7Cisg ICAgICAgICAgICByZXR1cm4gKHVfdGV4dHVyZVNwYWNlTWF0cml4ICogY2xhbXBlZFBvc2l0aW9u KS54eTsKKyAgICAgICAgfQogCi0gICAgICAgIGZsb2F0IGFudGlhbGlhcygpIHsgcmV0dXJuIHNt b290aHN0ZXAodl9hbnRpYWxpYXMsIDAuLCAxLik7IH0KKyAgICAgICAgdmVjMiB2ZXJ0ZXhUcmFu c2Zvcm1UZXhDb29yZCgpIHsgcmV0dXJuIHZfdHJhbnNmb3JtZWRUZXhDb29yZDsgfQogCi0gICAg ICAgIHZvaWQgYXBwbHlUZXh0dXJlKGlub3V0IHZlYzQgY29sb3IpIHsgY29sb3IgPSBTYW1wbGVy RnVuY3Rpb24oc19zYW1wbGVyLCB2X3RleENvb3JkKTsgfQorICAgICAgICB2b2lkIGFwcGx5VGV4 dHVyZShpbm91dCB2ZWM0IGNvbG9yLCB2ZWMyIHRleENvb3JkKSB7IGNvbG9yID0gU2FtcGxlckZ1 bmN0aW9uKHNfc2FtcGxlciwgdGV4Q29vcmQpOyB9CiAgICAgICAgIHZvaWQgYXBwbHlPcGFjaXR5 KGlub3V0IHZlYzQgY29sb3IpIHsgY29sb3IgKj0gdV9vcGFjaXR5OyB9CiAgICAgICAgIHZvaWQg YXBwbHlBbnRpYWxpYXNpbmcoaW5vdXQgdmVjNCBjb2xvcikgeyBjb2xvciAqPSBhbnRpYWxpYXMo KTsgfQogCkBAIC0yNzgsMzUgKzI5OCwzNSBAQCBzdGF0aWMgY29uc3QgY2hhciogZnJhZ21lbnRU ZW1wbGF0ZSA9CiAgICAgICAgICAgICBjb2xvciA9IHZlYzQoY29sb3IuciwgY29sb3IuZywgY29s b3IuYiwgY29sb3IuYSAqIHVfZmlsdGVyQW1vdW50KTsKICAgICAgICAgfQogCi0gICAgICAgIHZl YzQgc2FtcGxlQ29sb3JBdFJhZGl1cyhmbG9hdCByYWRpdXMpCisgICAgICAgIHZlYzQgc2FtcGxl Q29sb3JBdFJhZGl1cyhmbG9hdCByYWRpdXMsIHZlYzIgdGV4Q29vcmQpCiAgICAgICAgIHsKLSAg ICAgICAgICAgIHZlYzIgY29vcmQgPSB2X3RleENvb3JkICsgcmFkaXVzICogdV9ibHVyUmFkaXVz OworICAgICAgICAgICAgdmVjMiBjb29yZCA9IHRleENvb3JkICsgcmFkaXVzICogdV9ibHVyUmFk aXVzOwogICAgICAgICAgICAgcmV0dXJuIFNhbXBsZXJGdW5jdGlvbihzX3NhbXBsZXIsIGNvb3Jk KSAqIGZsb2F0KGNvb3JkLnggPiAwLiAmJiBjb29yZC55ID4gMC4gJiYgY29vcmQueCA8IDEuICYm IGNvb3JkLnkgPCAxLik7CiAgICAgICAgIH0KIAotICAgICAgICBmbG9hdCBzYW1wbGVBbHBoYUF0 UmFkaXVzKGZsb2F0IHJhZGl1cykKKyAgICAgICAgZmxvYXQgc2FtcGxlQWxwaGFBdFJhZGl1cyhm bG9hdCByYWRpdXMsIHZlYzIgdGV4Q29vcmQpCiAgICAgICAgIHsKLSAgICAgICAgICAgIHZlYzIg Y29vcmQgPSB2X3RleENvb3JkIC0gdV9zaGFkb3dPZmZzZXQgKyByYWRpdXMgKiB1X2JsdXJSYWRp dXM7CisgICAgICAgICAgICB2ZWMyIGNvb3JkID0gdGV4Q29vcmQgLSB1X3NoYWRvd09mZnNldCAr IHJhZGl1cyAqIHVfYmx1clJhZGl1czsKICAgICAgICAgICAgIHJldHVybiBTYW1wbGVyRnVuY3Rp b24oc19zYW1wbGVyLCBjb29yZCkuYSAqIGZsb2F0KGNvb3JkLnggPiAwLiAmJiBjb29yZC55ID4g MC4gJiYgY29vcmQueCA8IDEuICYmIGNvb3JkLnkgPCAxLik7CiAgICAgICAgIH0KIAotICAgICAg ICB2b2lkIGFwcGx5Qmx1ckZpbHRlcihpbm91dCB2ZWM0IGNvbG9yKQorICAgICAgICB2b2lkIGFw cGx5Qmx1ckZpbHRlcihpbm91dCB2ZWM0IGNvbG9yLCB2ZWMyIHRleENvb3JkKQogICAgICAgICB7 Ci0gICAgICAgICAgICB2ZWM0IHRvdGFsID0gc2FtcGxlQ29sb3JBdFJhZGl1cygwLikgKiB1X2dh dXNzaWFuS2VybmVsWzBdOworICAgICAgICAgICAgdmVjNCB0b3RhbCA9IHNhbXBsZUNvbG9yQXRS YWRpdXMoMC4sIHRleENvb3JkKSAqIHVfZ2F1c3NpYW5LZXJuZWxbMF07CiAgICAgICAgICAgICBm b3IgKGludCBpID0gMTsgaSA8IEdBVVNTSUFOX0tFUk5FTF9IQUxGX1dJRFRIOyBpKyspIHsKLSAg ICAgICAgICAgICAgICB0b3RhbCArPSBzYW1wbGVDb2xvckF0UmFkaXVzKGZsb2F0KGkpICogR0FV U1NJQU5fS0VSTkVMX1NURVApICogdV9nYXVzc2lhbktlcm5lbFtpXTsKLSAgICAgICAgICAgICAg ICB0b3RhbCArPSBzYW1wbGVDb2xvckF0UmFkaXVzKGZsb2F0KC0xICogaSkgKiBHQVVTU0lBTl9L RVJORUxfU1RFUCkgKiB1X2dhdXNzaWFuS2VybmVsW2ldOworICAgICAgICAgICAgICAgIHRvdGFs ICs9IHNhbXBsZUNvbG9yQXRSYWRpdXMoZmxvYXQoaSkgKiBHQVVTU0lBTl9LRVJORUxfU1RFUCwg dGV4Q29vcmQpICogdV9nYXVzc2lhbktlcm5lbFtpXTsKKyAgICAgICAgICAgICAgICB0b3RhbCAr PSBzYW1wbGVDb2xvckF0UmFkaXVzKGZsb2F0KC0xICogaSkgKiBHQVVTU0lBTl9LRVJORUxfU1RF UCwgdGV4Q29vcmQpICogdV9nYXVzc2lhbktlcm5lbFtpXTsKICAgICAgICAgICAgIH0KIAogICAg ICAgICAgICAgY29sb3IgPSB0b3RhbDsKICAgICAgICAgfQogCi0gICAgICAgIHZvaWQgYXBwbHlB bHBoYUJsdXIoaW5vdXQgdmVjNCBjb2xvcikKKyAgICAgICAgdm9pZCBhcHBseUFscGhhQmx1cihp bm91dCB2ZWM0IGNvbG9yLCB2ZWMyIHRleENvb3JkKQogICAgICAgICB7Ci0gICAgICAgICAgICBm bG9hdCB0b3RhbCA9IHNhbXBsZUFscGhhQXRSYWRpdXMoMC4pICogdV9nYXVzc2lhbktlcm5lbFsw XTsKKyAgICAgICAgICAgIGZsb2F0IHRvdGFsID0gc2FtcGxlQWxwaGFBdFJhZGl1cygwLiwgdGV4 Q29vcmQpICogdV9nYXVzc2lhbktlcm5lbFswXTsKICAgICAgICAgICAgIGZvciAoaW50IGkgPSAx OyBpIDwgR0FVU1NJQU5fS0VSTkVMX0hBTEZfV0lEVEg7IGkrKykgewotICAgICAgICAgICAgICAg IHRvdGFsICs9IHNhbXBsZUFscGhhQXRSYWRpdXMoZmxvYXQoaSkgKiBHQVVTU0lBTl9LRVJORUxf U1RFUCkgKiB1X2dhdXNzaWFuS2VybmVsW2ldOwotICAgICAgICAgICAgICAgIHRvdGFsICs9IHNh bXBsZUFscGhhQXRSYWRpdXMoZmxvYXQoLTEgKiBpKSAqIEdBVVNTSUFOX0tFUk5FTF9TVEVQKSAq IHVfZ2F1c3NpYW5LZXJuZWxbaV07CisgICAgICAgICAgICAgICAgdG90YWwgKz0gc2FtcGxlQWxw aGFBdFJhZGl1cyhmbG9hdChpKSAqIEdBVVNTSUFOX0tFUk5FTF9TVEVQLCB0ZXhDb29yZCkgKiB1 X2dhdXNzaWFuS2VybmVsW2ldOworICAgICAgICAgICAgICAgIHRvdGFsICs9IHNhbXBsZUFscGhh QXRSYWRpdXMoZmxvYXQoLTEgKiBpKSAqIEdBVVNTSUFOX0tFUk5FTF9TVEVQLCB0ZXhDb29yZCkg KiB1X2dhdXNzaWFuS2VybmVsW2ldOwogICAgICAgICAgICAgfQogCiAgICAgICAgICAgICBjb2xv ciAqPSB0b3RhbDsKQEAgLTMxNCw5ICszMzQsOSBAQCBzdGF0aWMgY29uc3QgY2hhciogZnJhZ21l bnRUZW1wbGF0ZSA9CiAKICAgICAgICAgdmVjNCBzb3VyY2VPdmVyKHZlYzQgc3JjLCB2ZWM0IGRz dCkgeyByZXR1cm4gc3JjICsgZHN0ICogKDEuIC0gZHN0LmEpOyB9CiAKLSAgICAgICAgdm9pZCBh cHBseUNvbnRlbnRUZXh0dXJlKGlub3V0IHZlYzQgY29sb3IpCisgICAgICAgIHZvaWQgYXBwbHlD b250ZW50VGV4dHVyZShpbm91dCB2ZWM0IGNvbG9yLCB2ZWMyIHRleENvb3JkKQogICAgICAgICB7 Ci0gICAgICAgICAgICB2ZWM0IGNvbnRlbnRDb2xvciA9IHRleHR1cmUyRChzX2NvbnRlbnRUZXh0 dXJlLCB2X3RleENvb3JkKTsKKyAgICAgICAgICAgIHZlYzQgY29udGVudENvbG9yID0gdGV4dHVy ZTJEKHNfY29udGVudFRleHR1cmUsIHRleENvb3JkKTsKICAgICAgICAgICAgIGNvbG9yID0gc291 cmNlT3Zlcihjb250ZW50Q29sb3IsIGNvbG9yKTsKICAgICAgICAgfQogCkBAIC0zMjUsNyArMzQ1 LDggQEAgc3RhdGljIGNvbnN0IGNoYXIqIGZyYWdtZW50VGVtcGxhdGUgPQogICAgICAgICB2b2lk IG1haW4odm9pZCkKICAgICAgICAgewogICAgICAgICAgICAgdmVjNCBjb2xvciA9IHZlYzQoMS4s IDEuLCAxLiwgMS4pOwotICAgICAgICAgICAgYXBwbHlUZXh0dXJlSWZOZWVkZWQoY29sb3IpOwor ICAgICAgICAgICAgdmVjMiB0ZXhDb29yZCA9IHRyYW5zZm9ybVRleENvb3JkKCk7CisgICAgICAg ICAgICBhcHBseVRleHR1cmVJZk5lZWRlZChjb2xvciwgdGV4Q29vcmQpOwogICAgICAgICAgICAg YXBwbHlTb2xpZENvbG9ySWZOZWVkZWQoY29sb3IpOwogICAgICAgICAgICAgYXBwbHlBbnRpYWxp YXNpbmdJZk5lZWRlZChjb2xvcik7CiAgICAgICAgICAgICBhcHBseU9wYWNpdHlJZk5lZWRlZChj b2xvcik7CkBAIC0zMzcsOSArMzU4LDkgQEAgc3RhdGljIGNvbnN0IGNoYXIqIGZyYWdtZW50VGVt cGxhdGUgPQogICAgICAgICAgICAgYXBwbHlCcmlnaHRuZXNzRmlsdGVySWZOZWVkZWQoY29sb3Ip OwogICAgICAgICAgICAgYXBwbHlDb250cmFzdEZpbHRlcklmTmVlZGVkKGNvbG9yKTsKICAgICAg ICAgICAgIGFwcGx5T3BhY2l0eUZpbHRlcklmTmVlZGVkKGNvbG9yKTsKLSAgICAgICAgICAgIGFw cGx5Qmx1ckZpbHRlcklmTmVlZGVkKGNvbG9yKTsKLSAgICAgICAgICAgIGFwcGx5QWxwaGFCbHVy SWZOZWVkZWQoY29sb3IpOwotICAgICAgICAgICAgYXBwbHlDb250ZW50VGV4dHVyZUlmTmVlZGVk KGNvbG9yKTsKKyAgICAgICAgICAgIGFwcGx5Qmx1ckZpbHRlcklmTmVlZGVkKGNvbG9yLCB0ZXhD b29yZCk7CisgICAgICAgICAgICBhcHBseUFscGhhQmx1cklmTmVlZGVkKGNvbG9yLCB0ZXhDb29y ZCk7CisgICAgICAgICAgICBhcHBseUNvbnRlbnRUZXh0dXJlSWZOZWVkZWQoY29sb3IsIHRleENv b3JkKTsKICAgICAgICAgICAgIGdsX0ZyYWdDb2xvciA9IGNvbG9yOwogICAgICAgICB9CiAgICAg KTsK 218283 2013-12-03 03:02:44 -0800 2013-12-04 09:46:40 -0800 Patch bug-124653-20131203120359.patch text/plain 9156 jdapena U3VidmVyc2lvbiBSZXZpc2lvbjogMTU5OTE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTM3OWQwMWViOTI1NGIz NzM0ZTg5YWUxZDY4ZWVkNDE4NDI5NDRlOC4uMGRjYmRjZTljYmFmNWI3MWU0ZjNlMjU5MTkyOWEw YjZmZDNlZDZiOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEzLTEyLTAyICBKb3PD qSBEYXBlbmEgUGF6ICA8amRhcGVuYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFt0ZXhtYXBdIEJv cmRlcnMgb24gcm90YXRpbmcgaW1hZ2VzIGFyZSBoaWRkZW4vd3JvbmdseSByZW5kZXJlZCB3aXRo IGVkZ2UgZGlzdGFuY2UgYW50aWFsaWFzaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMjQ2NTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBUZXh0dXJlIG1hcHBlciBlZGdlIGRpc3RhbmNlIGFudGlhbGlh c2luZyB0ZXh0dXJlIHNhbXBsaW5nIHdhcyBjYXVzaW5nCisgICAgICAgIGJvcmRlcnMgdG8gYmUg c2hhZGVkIChhbmQgbWFkZSB0aGVtIGFsbW9zdCBkaXNhcHBlYXIgaW4gc29tZSBjYXNlcykuCisg ICAgICAgIFRoaXMgd2FzIGJlY2F1c2UgY2FsY3VsYXRpb24gb2Ygc2FtcGxpbmcgaGFwcGVuZWQg b24gdmVydGV4IHNoYWRlciwgc28KKyAgICAgICAgdGhlIGJvcmRlciBvZiB0aGUgdGV4dHVyZSB3 b3VsZCBnbyB0byB0aGUgYm9yZGVyIG9mIHRoZSBpbmZsYXRpb24gYXJlYS4KKworICAgICAgICBX aGF0IGFsZ29yaXRobSBzaG91bGQgZG8gaXMgc2FtcGxpbmcgdGhlIGJvcmRlciBwaXhlbCBmb3Ig YWxsIHRoZQorICAgICAgICBpbmZsYXRpb24gYXJlYSAoaXQgaXMgdGhlIGNsb3Nlc3QgcGl4ZWwg dG8gYWxsIHRoZSBzYW1wbGVzIGluCisgICAgICAgIGluZmxhdGlvbiBhcmVhKSwgYW5kIHRoZW4g dXNlIHRoZSBzdGFuZGFyZCBzYW1wbGluZyBmb3IgdGhlIG90aGVyCisgICAgICAgIHBhcnRzIG9m IHRoZSB0ZXh0dXJlLgorCisgICAgICAgIE5vIG5ldyB0ZXN0IGJlY2F1c2UgdGhpcyBpcyBhbHJl YWR5IGNvdmVyZWQgYnkgdGVzdAorICAgICAgICB0cmFuc2Zvcm1zLzNkL3BvaW50LW1hcHBpbmcv M2QtcG9pbnQtbWFwcGluZy5odG1sCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90ZXht YXAvVGV4dHVyZU1hcHBlclNoYWRlclByb2dyYW0uY3BwOiBmaXggZWRnZQorICAgICAgICBkaXN0 YW5jZSBhbnRpYWxpYXNpbmcgdGV4dHVyZSBzYW1wbGluZy4KKwogMjAxMy0xMi0wMiAgQXR0aWxh IER1c25va2kgIDxhZHVzbm9raUBpbmYudS1zemVnZWQuaHU+CiAKICAgICAgICAgSFRNTDUgcmVx dWlyZWQgYXR0cmlidXRlIHZhbGlkYXRpb24gbWVzc2FnZXMgaW1wbGVtZW50ZWQuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBl clNoYWRlclByb2dyYW0uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4 bWFwL1RleHR1cmVNYXBwZXJTaGFkZXJQcm9ncmFtLmNwcAppbmRleCAzZjY0YzRiOGEzOWMxYjVh ZGI2ODk5ZjMwMjBlN2M4YWM0NTQyZjAyLi5mNGI5YTdlOTgzMDI1Y2VjOTQyOGMzYmQwMDdkZTQz MWU5MDkyMzA0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90 ZXhtYXAvVGV4dHVyZU1hcHBlclNoYWRlclByb2dyYW0uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyU2hhZGVyUHJvZ3JhbS5jcHAK QEAgLTEyNyw2ICsxMjcsNyBAQCBzdGF0aWMgY29uc3QgY2hhciogdmVydGV4VGVtcGxhdGUgPQog ICAgICAgICB1bmlmb3JtIG1hdDQgdV90ZXh0dXJlU3BhY2VNYXRyaXg7CiAKICAgICAgICAgdmFy eWluZyB2ZWMyIHZfdGV4Q29vcmQ7CisgICAgICAgIHZhcnlpbmcgdmVjMiB2X3RyYW5zZm9ybWVk VGV4Q29vcmQ7CiAgICAgICAgIHZhcnlpbmcgZmxvYXQgdl9hbnRpYWxpYXM7CiAKICAgICAgICAg dm9pZCBub29wKGlub3V0IHZlYzIgZHVtbXlQYXJhbWV0ZXIpIHsgfQpAQCAtMTcyLDkgKzE3Myw5 IEBAIHN0YXRpYyBjb25zdCBjaGFyKiB2ZXJ0ZXhUZW1wbGF0ZSA9CiAgICAgICAgICAgICB2ZWMy IHBvc2l0aW9uID0gYV92ZXJ0ZXgueHk7CiAgICAgICAgICAgICBhcHBseUFudGlhbGlhc2luZ0lm TmVlZGVkKHBvc2l0aW9uKTsKIAotICAgICAgICAgICAgLy8gVGhlIHRleHR1cmUgcG9zaXRpb24g bmVlZHMgdG8gYmUgY2xhbXBlZCB0byAwLi4xIGJlZm9yZSB0aGUgdGV4dHVyZSBtYXRyaXggaXMg YXBwbGllZC4KKyAgICAgICAgICAgIHZfdGV4Q29vcmQgPSBwb3NpdGlvbjsKICAgICAgICAgICAg IHZlYzQgY2xhbXBlZFBvc2l0aW9uID0gY2xhbXAodmVjNChwb3NpdGlvbiwgMC4sIDEuKSwgMC4s IDEuKTsKLSAgICAgICAgICAgIHZfdGV4Q29vcmQgPSAodV90ZXh0dXJlU3BhY2VNYXRyaXggKiBj bGFtcGVkUG9zaXRpb24pLnh5OworICAgICAgICAgICAgdl90cmFuc2Zvcm1lZFRleENvb3JkID0g KHVfdGV4dHVyZVNwYWNlTWF0cml4ICogY2xhbXBlZFBvc2l0aW9uKS54eTsKICAgICAgICAgICAg IGdsX1Bvc2l0aW9uID0gdV9wcm9qZWN0aW9uTWF0cml4ICogdV9tb2RlbFZpZXdNYXRyaXggKiB2 ZWM0KHBvc2l0aW9uLCAwLiwgMS4pOwogICAgICAgICB9CiAgICAgKTsKQEAgLTE4OCw2ICsxODks MTMgQEAgc3RhdGljIGNvbnN0IGNoYXIqIHZlcnRleFRlbXBsYXRlID0KICAgICAgICAgR0xTTF9E SVJFQ1RJVkUoZGVmaW5lIFNhbXBsZXJGdW5jdGlvbiB0ZXh0dXJlMkQpIFwKICAgICBHTFNMX0RJ UkVDVElWRShlbmRpZikKIAorI2RlZmluZSBBTlRJQUxJQVNJTkdfVEVYX0NPT1JEX0RJUkVDVElW RSBcCisgICAgR0xTTF9ESVJFQ1RJVkUoaWYgZGVmaW5lZChFTkFCTEVfQW50aWFsaWFzaW5nKSAm JiBkZWZpbmVkKEVOQUJMRV9UZXh0dXJlKSkgXAorICAgICAgICBHTFNMX0RJUkVDVElWRShkZWZp bmUgdHJhbnNmb3JtVGV4Q29vcmQgZnJhZ21lbnRUcmFuc2Zvcm1UZXhDb29yZCkgXAorICAgIEdM U0xfRElSRUNUSVZFKGVsc2UpIFwKKyAgICAgICAgR0xTTF9ESVJFQ1RJVkUoZGVmaW5lIHRyYW5z Zm9ybVRleENvb3JkIHZlcnRleFRyYW5zZm9ybVRleENvb3JkKSBcCisgICAgR0xTTF9ESVJFQ1RJ VkUoZW5kaWYpCisKICNkZWZpbmUgRU5BQkxFX0FQUExJRVIoTmFtZSkgIiNkZWZpbmUgRU5BQkxF XyIjTmFtZSJcbiNkZWZpbmUgYXBwbHkiI05hbWUiSWZOZWVkZWQgYXBwbHkiI05hbWUiXG4iCiAj ZGVmaW5lIERJU0FCTEVfQVBQTElFUihOYW1lKSAiI2RlZmluZSBhcHBseSIjTmFtZSJJZk5lZWRl ZCBub29wXG4iCiAjZGVmaW5lIEJMVVJfQ09OU1RBTlRTIFwKQEAgLTE5Nyw2ICsyMDUsNyBAQCBz dGF0aWMgY29uc3QgY2hhciogdmVydGV4VGVtcGxhdGUgPQogCiBzdGF0aWMgY29uc3QgY2hhciog ZnJhZ21lbnRUZW1wbGF0ZSA9CiAgICAgUkVDVF9URVhUVVJFX0RJUkVDVElWRQorICAgIEFOVElB TElBU0lOR19URVhfQ09PUkRfRElSRUNUSVZFCiAgICAgQkxVUl9DT05TVEFOVFMKICAgICBTVFJJ TkdJRlkoCiAgICAgICAgIHByZWNpc2lvbiBtZWRpdW1wIGZsb2F0OwpAQCAtMjA1LDE3ICsyMTQs MjggQEAgc3RhdGljIGNvbnN0IGNoYXIqIGZyYWdtZW50VGVtcGxhdGUgPQogICAgICAgICB1bmlm b3JtIGZsb2F0IHVfb3BhY2l0eTsKICAgICAgICAgdmFyeWluZyBmbG9hdCB2X2FudGlhbGlhczsK ICAgICAgICAgdmFyeWluZyB2ZWMyIHZfdGV4Q29vcmQ7CisgICAgICAgIHZhcnlpbmcgdmVjMiB2 X3RyYW5zZm9ybWVkVGV4Q29vcmQ7CiAgICAgICAgIHVuaWZvcm0gZmxvYXQgdV9maWx0ZXJBbW91 bnQ7CiAgICAgICAgIHVuaWZvcm0gdmVjMiB1X2JsdXJSYWRpdXM7CiAgICAgICAgIHVuaWZvcm0g dmVjMiB1X3NoYWRvd09mZnNldDsKICAgICAgICAgdW5pZm9ybSB2ZWM0IHVfY29sb3I7CiAgICAg ICAgIHVuaWZvcm0gZmxvYXQgdV9nYXVzc2lhbktlcm5lbFtHQVVTU0lBTl9LRVJORUxfSEFMRl9X SURUSF07CisgICAgICAgIHVuaWZvcm0gbWF0NCB1X3RleHR1cmVTcGFjZU1hdHJpeDsKIAogICAg ICAgICB2b2lkIG5vb3AoaW5vdXQgdmVjNCBkdW1teVBhcmFtZXRlcikgeyB9CisgICAgICAgIHZv aWQgbm9vcChpbm91dCB2ZWM0IGR1bW15UGFyYW1ldGVyLCB2ZWMyIHRleENvb3JkKSB7IH0KKwor ICAgICAgICBmbG9hdCBhbnRpYWxpYXMoKSB7IHJldHVybiBzbW9vdGhzdGVwKDAuLCAxLiwgdl9h bnRpYWxpYXMpOyB9CisKKyAgICAgICAgdmVjMiBmcmFnbWVudFRyYW5zZm9ybVRleENvb3JkKCkK KyAgICAgICAgeworICAgICAgICAgICAgdmVjNCBjbGFtcGVkUG9zaXRpb24gPSBjbGFtcCh2ZWM0 KHZfdGV4Q29vcmQsIDAuLCAxLiksIDAuLCAxLik7CisgICAgICAgICAgICByZXR1cm4gKHVfdGV4 dHVyZVNwYWNlTWF0cml4ICogY2xhbXBlZFBvc2l0aW9uKS54eTsKKyAgICAgICAgfQogCi0gICAg ICAgIGZsb2F0IGFudGlhbGlhcygpIHsgcmV0dXJuIHNtb290aHN0ZXAodl9hbnRpYWxpYXMsIDAu LCAxLik7IH0KKyAgICAgICAgdmVjMiB2ZXJ0ZXhUcmFuc2Zvcm1UZXhDb29yZCgpIHsgcmV0dXJu IHZfdHJhbnNmb3JtZWRUZXhDb29yZDsgfQogCi0gICAgICAgIHZvaWQgYXBwbHlUZXh0dXJlKGlu b3V0IHZlYzQgY29sb3IpIHsgY29sb3IgPSBTYW1wbGVyRnVuY3Rpb24oc19zYW1wbGVyLCB2X3Rl eENvb3JkKTsgfQorICAgICAgICB2b2lkIGFwcGx5VGV4dHVyZShpbm91dCB2ZWM0IGNvbG9yLCB2 ZWMyIHRleENvb3JkKSB7IGNvbG9yID0gU2FtcGxlckZ1bmN0aW9uKHNfc2FtcGxlciwgdGV4Q29v cmQpOyB9CiAgICAgICAgIHZvaWQgYXBwbHlPcGFjaXR5KGlub3V0IHZlYzQgY29sb3IpIHsgY29s b3IgKj0gdV9vcGFjaXR5OyB9CiAgICAgICAgIHZvaWQgYXBwbHlBbnRpYWxpYXNpbmcoaW5vdXQg dmVjNCBjb2xvcikgeyBjb2xvciAqPSBhbnRpYWxpYXMoKTsgfQogCkBAIC0yNzgsMzUgKzI5OCwz NSBAQCBzdGF0aWMgY29uc3QgY2hhciogZnJhZ21lbnRUZW1wbGF0ZSA9CiAgICAgICAgICAgICBj b2xvciA9IHZlYzQoY29sb3IuciwgY29sb3IuZywgY29sb3IuYiwgY29sb3IuYSAqIHVfZmlsdGVy QW1vdW50KTsKICAgICAgICAgfQogCi0gICAgICAgIHZlYzQgc2FtcGxlQ29sb3JBdFJhZGl1cyhm bG9hdCByYWRpdXMpCisgICAgICAgIHZlYzQgc2FtcGxlQ29sb3JBdFJhZGl1cyhmbG9hdCByYWRp dXMsIHZlYzIgdGV4Q29vcmQpCiAgICAgICAgIHsKLSAgICAgICAgICAgIHZlYzIgY29vcmQgPSB2 X3RleENvb3JkICsgcmFkaXVzICogdV9ibHVyUmFkaXVzOworICAgICAgICAgICAgdmVjMiBjb29y ZCA9IHRleENvb3JkICsgcmFkaXVzICogdV9ibHVyUmFkaXVzOwogICAgICAgICAgICAgcmV0dXJu IFNhbXBsZXJGdW5jdGlvbihzX3NhbXBsZXIsIGNvb3JkKSAqIGZsb2F0KGNvb3JkLnggPiAwLiAm JiBjb29yZC55ID4gMC4gJiYgY29vcmQueCA8IDEuICYmIGNvb3JkLnkgPCAxLik7CiAgICAgICAg IH0KIAotICAgICAgICBmbG9hdCBzYW1wbGVBbHBoYUF0UmFkaXVzKGZsb2F0IHJhZGl1cykKKyAg ICAgICAgZmxvYXQgc2FtcGxlQWxwaGFBdFJhZGl1cyhmbG9hdCByYWRpdXMsIHZlYzIgdGV4Q29v cmQpCiAgICAgICAgIHsKLSAgICAgICAgICAgIHZlYzIgY29vcmQgPSB2X3RleENvb3JkIC0gdV9z aGFkb3dPZmZzZXQgKyByYWRpdXMgKiB1X2JsdXJSYWRpdXM7CisgICAgICAgICAgICB2ZWMyIGNv b3JkID0gdGV4Q29vcmQgLSB1X3NoYWRvd09mZnNldCArIHJhZGl1cyAqIHVfYmx1clJhZGl1czsK ICAgICAgICAgICAgIHJldHVybiBTYW1wbGVyRnVuY3Rpb24oc19zYW1wbGVyLCBjb29yZCkuYSAq IGZsb2F0KGNvb3JkLnggPiAwLiAmJiBjb29yZC55ID4gMC4gJiYgY29vcmQueCA8IDEuICYmIGNv b3JkLnkgPCAxLik7CiAgICAgICAgIH0KIAotICAgICAgICB2b2lkIGFwcGx5Qmx1ckZpbHRlcihp bm91dCB2ZWM0IGNvbG9yKQorICAgICAgICB2b2lkIGFwcGx5Qmx1ckZpbHRlcihpbm91dCB2ZWM0 IGNvbG9yLCB2ZWMyIHRleENvb3JkKQogICAgICAgICB7Ci0gICAgICAgICAgICB2ZWM0IHRvdGFs ID0gc2FtcGxlQ29sb3JBdFJhZGl1cygwLikgKiB1X2dhdXNzaWFuS2VybmVsWzBdOworICAgICAg ICAgICAgdmVjNCB0b3RhbCA9IHNhbXBsZUNvbG9yQXRSYWRpdXMoMC4sIHRleENvb3JkKSAqIHVf Z2F1c3NpYW5LZXJuZWxbMF07CiAgICAgICAgICAgICBmb3IgKGludCBpID0gMTsgaSA8IEdBVVNT SUFOX0tFUk5FTF9IQUxGX1dJRFRIOyBpKyspIHsKLSAgICAgICAgICAgICAgICB0b3RhbCArPSBz YW1wbGVDb2xvckF0UmFkaXVzKGZsb2F0KGkpICogR0FVU1NJQU5fS0VSTkVMX1NURVApICogdV9n YXVzc2lhbktlcm5lbFtpXTsKLSAgICAgICAgICAgICAgICB0b3RhbCArPSBzYW1wbGVDb2xvckF0 UmFkaXVzKGZsb2F0KC0xICogaSkgKiBHQVVTU0lBTl9LRVJORUxfU1RFUCkgKiB1X2dhdXNzaWFu S2VybmVsW2ldOworICAgICAgICAgICAgICAgIHRvdGFsICs9IHNhbXBsZUNvbG9yQXRSYWRpdXMo ZmxvYXQoaSkgKiBHQVVTU0lBTl9LRVJORUxfU1RFUCwgdGV4Q29vcmQpICogdV9nYXVzc2lhbktl cm5lbFtpXTsKKyAgICAgICAgICAgICAgICB0b3RhbCArPSBzYW1wbGVDb2xvckF0UmFkaXVzKGZs b2F0KC0xICogaSkgKiBHQVVTU0lBTl9LRVJORUxfU1RFUCwgdGV4Q29vcmQpICogdV9nYXVzc2lh bktlcm5lbFtpXTsKICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgY29sb3IgPSB0b3RhbDsK ICAgICAgICAgfQogCi0gICAgICAgIHZvaWQgYXBwbHlBbHBoYUJsdXIoaW5vdXQgdmVjNCBjb2xv cikKKyAgICAgICAgdm9pZCBhcHBseUFscGhhQmx1cihpbm91dCB2ZWM0IGNvbG9yLCB2ZWMyIHRl eENvb3JkKQogICAgICAgICB7Ci0gICAgICAgICAgICBmbG9hdCB0b3RhbCA9IHNhbXBsZUFscGhh QXRSYWRpdXMoMC4pICogdV9nYXVzc2lhbktlcm5lbFswXTsKKyAgICAgICAgICAgIGZsb2F0IHRv dGFsID0gc2FtcGxlQWxwaGFBdFJhZGl1cygwLiwgdGV4Q29vcmQpICogdV9nYXVzc2lhbktlcm5l bFswXTsKICAgICAgICAgICAgIGZvciAoaW50IGkgPSAxOyBpIDwgR0FVU1NJQU5fS0VSTkVMX0hB TEZfV0lEVEg7IGkrKykgewotICAgICAgICAgICAgICAgIHRvdGFsICs9IHNhbXBsZUFscGhhQXRS YWRpdXMoZmxvYXQoaSkgKiBHQVVTU0lBTl9LRVJORUxfU1RFUCkgKiB1X2dhdXNzaWFuS2VybmVs W2ldOwotICAgICAgICAgICAgICAgIHRvdGFsICs9IHNhbXBsZUFscGhhQXRSYWRpdXMoZmxvYXQo LTEgKiBpKSAqIEdBVVNTSUFOX0tFUk5FTF9TVEVQKSAqIHVfZ2F1c3NpYW5LZXJuZWxbaV07Cisg ICAgICAgICAgICAgICAgdG90YWwgKz0gc2FtcGxlQWxwaGFBdFJhZGl1cyhmbG9hdChpKSAqIEdB VVNTSUFOX0tFUk5FTF9TVEVQLCB0ZXhDb29yZCkgKiB1X2dhdXNzaWFuS2VybmVsW2ldOworICAg ICAgICAgICAgICAgIHRvdGFsICs9IHNhbXBsZUFscGhhQXRSYWRpdXMoZmxvYXQoLTEgKiBpKSAq IEdBVVNTSUFOX0tFUk5FTF9TVEVQLCB0ZXhDb29yZCkgKiB1X2dhdXNzaWFuS2VybmVsW2ldOwog ICAgICAgICAgICAgfQogCiAgICAgICAgICAgICBjb2xvciAqPSB0b3RhbDsKQEAgLTMxNCw5ICsz MzQsOSBAQCBzdGF0aWMgY29uc3QgY2hhciogZnJhZ21lbnRUZW1wbGF0ZSA9CiAKICAgICAgICAg dmVjNCBzb3VyY2VPdmVyKHZlYzQgc3JjLCB2ZWM0IGRzdCkgeyByZXR1cm4gc3JjICsgZHN0ICog KDEuIC0gZHN0LmEpOyB9CiAKLSAgICAgICAgdm9pZCBhcHBseUNvbnRlbnRUZXh0dXJlKGlub3V0 IHZlYzQgY29sb3IpCisgICAgICAgIHZvaWQgYXBwbHlDb250ZW50VGV4dHVyZShpbm91dCB2ZWM0 IGNvbG9yLCB2ZWMyIHRleENvb3JkKQogICAgICAgICB7Ci0gICAgICAgICAgICB2ZWM0IGNvbnRl bnRDb2xvciA9IHRleHR1cmUyRChzX2NvbnRlbnRUZXh0dXJlLCB2X3RleENvb3JkKTsKKyAgICAg ICAgICAgIHZlYzQgY29udGVudENvbG9yID0gdGV4dHVyZTJEKHNfY29udGVudFRleHR1cmUsIHRl eENvb3JkKTsKICAgICAgICAgICAgIGNvbG9yID0gc291cmNlT3Zlcihjb250ZW50Q29sb3IsIGNv bG9yKTsKICAgICAgICAgfQogCkBAIC0zMjUsNyArMzQ1LDggQEAgc3RhdGljIGNvbnN0IGNoYXIq IGZyYWdtZW50VGVtcGxhdGUgPQogICAgICAgICB2b2lkIG1haW4odm9pZCkKICAgICAgICAgewog ICAgICAgICAgICAgdmVjNCBjb2xvciA9IHZlYzQoMS4sIDEuLCAxLiwgMS4pOwotICAgICAgICAg ICAgYXBwbHlUZXh0dXJlSWZOZWVkZWQoY29sb3IpOworICAgICAgICAgICAgdmVjMiB0ZXhDb29y ZCA9IHRyYW5zZm9ybVRleENvb3JkKCk7CisgICAgICAgICAgICBhcHBseVRleHR1cmVJZk5lZWRl ZChjb2xvciwgdGV4Q29vcmQpOwogICAgICAgICAgICAgYXBwbHlTb2xpZENvbG9ySWZOZWVkZWQo Y29sb3IpOwogICAgICAgICAgICAgYXBwbHlBbnRpYWxpYXNpbmdJZk5lZWRlZChjb2xvcik7CiAg ICAgICAgICAgICBhcHBseU9wYWNpdHlJZk5lZWRlZChjb2xvcik7CkBAIC0zMzcsOSArMzU4LDkg QEAgc3RhdGljIGNvbnN0IGNoYXIqIGZyYWdtZW50VGVtcGxhdGUgPQogICAgICAgICAgICAgYXBw bHlCcmlnaHRuZXNzRmlsdGVySWZOZWVkZWQoY29sb3IpOwogICAgICAgICAgICAgYXBwbHlDb250 cmFzdEZpbHRlcklmTmVlZGVkKGNvbG9yKTsKICAgICAgICAgICAgIGFwcGx5T3BhY2l0eUZpbHRl cklmTmVlZGVkKGNvbG9yKTsKLSAgICAgICAgICAgIGFwcGx5Qmx1ckZpbHRlcklmTmVlZGVkKGNv bG9yKTsKLSAgICAgICAgICAgIGFwcGx5QWxwaGFCbHVySWZOZWVkZWQoY29sb3IpOwotICAgICAg ICAgICAgYXBwbHlDb250ZW50VGV4dHVyZUlmTmVlZGVkKGNvbG9yKTsKKyAgICAgICAgICAgIGFw cGx5Qmx1ckZpbHRlcklmTmVlZGVkKGNvbG9yLCB0ZXhDb29yZCk7CisgICAgICAgICAgICBhcHBs eUFscGhhQmx1cklmTmVlZGVkKGNvbG9yLCB0ZXhDb29yZCk7CisgICAgICAgICAgICBhcHBseUNv bnRlbnRUZXh0dXJlSWZOZWVkZWQoY29sb3IsIHRleENvb3JkKTsKICAgICAgICAgICAgIGdsX0Zy YWdDb2xvciA9IGNvbG9yOwogICAgICAgICB9CiAgICAgKTsK 231095 2014-05-08 13:09:40 -0700 2014-05-08 13:09:40 -0700 Fix to match the uniform precision qualifiers in Vertex and fragment 0001-Fix-to-match-the-uniform-precision-qualifiers-in-ver.patch text/plain 1783 prabhusundar RnJvbSA2NmRhYjk4YzNmNDJlYjcwYTRjNjc2MWE4Njk0ZTM3NGI4NTc4ZTk5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQcmFiaHUgU3VuZGFyYXJhaiA8cHJhYmh1LnN1bmRhcmFyYWpA ZnJlZXNjYWxlLmNvbT4KRGF0ZTogVGh1LCA4IE1heSAyMDE0IDA5OjI3OjA0IC0wNzAwClN1Ympl Y3Q6IFtQQVRDSF0gRml4IHRvIG1hdGNoIHRoZSB1bmlmb3JtIHByZWNpc2lvbiBxdWFsaWZpZXJz IGluIHZlcnRleCBhbmQKIGZyYWdtZW50IHNoYWRlcnMKCldoZW4gdGhlIHZlcnRleCBhbmQgZnJh Z21lbnQgc2hhZGVycyBhcmUgbGlua2VkIHRvZ2V0aGVyLCB0aGVuIHRoZXkgd2lsbApzaGFyZSBh IHNpbmdsZSBnbG9iYWwgdW5pZm9ybSBuYW1lIHNwYWNlLiBIZW5jZSwgdHlwZXMgYW5kIHByZWNp c2lvbnMgb2YKdW5pZm9ybXMgd2l0aCB0aGUgc2FtZSBuYW1lIG11c3QgbWF0Y2ggYWNyb3NzIGFs bCBzaGFkZXJzIHRoYXQgYXJlIGxpbmtlZAppbnRvIGEgc2luZ2xlIGV4ZWN1dGFibGUuCgpBcyBw ZXIgR0xTTF9FU19TcGVjaWZpY2F0aW9uXzMuMDAuMy5wZGYKUGFnZSAxMjQgMTIuMyBOdW1lcmlj IFByZWNpc2lvbgpUaGUgZnJhZ21lbnQgbGFuZ3VhZ2UgaGFzIG5vIGRlZmF1bHQgcHJlY2lzaW9u IHF1YWxpZmllciBmb3IgZmxvYXRpbmcgcG9pbnQgdHlwZXMuCkhlbmNlIGZvciBmbG9hdCwgZmxv YXRpbmcgcG9pbnQgdmVjdG9yIGFuZCBtYXRyaXggdmFyaWFibGUgZGVjbGFyYXRpb25zLCBlaXRo ZXIKdGhlIGRlY2xhcmF0aW9uIG11c3QgaW5jbHVkZSBhIHByZWNpc2lvbiBxdWFsaWZpZXIgb3Ig dGhlIGRlZmF1bHQgZmxvYXQKcHJlY2lzaW9uIG11c3QgaGF2ZSBiZWVuIHByZXZpb3VzbHkgZGVj bGFyZWQuCgpDaGFuZ2UtSWQ6IEk0ZWIzMzYzYjNiY2E4YmMzYzgzOTIxMmVjN2M5NjYyMDFhM2U2 NWUyClNpZ25lZC1vZmYtYnk6IFByYWJodSBTdW5kYXJhcmFqIDxwcmFiaHUuc3VuZGFyYXJhakBm cmVlc2NhbGUuY29tPgotLS0KIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1h cC9UZXh0dXJlTWFwcGVyU2hhZGVyUHJvZ3JhbS5jcHAgfCAyICstCiAxIGZpbGUgY2hhbmdlZCwg MSBpbnNlcnRpb24oKyksIDEgZGVsZXRpb24oLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlclNoYWRlclByb2dyYW0uY3Bw IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJT aGFkZXJQcm9ncmFtLmNwcAppbmRleCBmNGI5YTdlLi43ZTk5MWJmIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlclNoYWRlclBy b2dyYW0uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9U ZXh0dXJlTWFwcGVyU2hhZGVyUHJvZ3JhbS5jcHAKQEAgLTIwOCw3ICsyMDgsNyBAQCBzdGF0aWMg Y29uc3QgY2hhciogZnJhZ21lbnRUZW1wbGF0ZSA9CiAgICAgQU5USUFMSUFTSU5HX1RFWF9DT09S RF9ESVJFQ1RJVkUKICAgICBCTFVSX0NPTlNUQU5UUwogICAgIFNUUklOR0lGWSgKLSAgICAgICAg cHJlY2lzaW9uIG1lZGl1bXAgZmxvYXQ7CisgICAgICAgIHByZWNpc2lvbiBoaWdocCBmbG9hdDsK ICAgICAgICAgdW5pZm9ybSBTYW1wbGVyVHlwZSBzX3NhbXBsZXI7CiAgICAgICAgIHVuaWZvcm0g c2FtcGxlcjJEIHNfY29udGVudFRleHR1cmU7CiAgICAgICAgIHVuaWZvcm0gZmxvYXQgdV9vcGFj aXR5OwotLSAKMS45LjEKCg==