98470 2012-10-04 17:47:51 -0700 [WebGL] [Mac] queried attributes and uniforms need to return the original variable name (not the mapped name) 2012-10-10 18:02:24 -0700 1 1 1 Unclassified WebKit WebGL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 dino dino gtk-ews gustavo noam roger_fong thorton webkit-bug-importer webkit.review.bot xan.lopez oldest_to_newest 735188 0 dino 2012-10-04 17:47:51 -0700 conformance/glsl/misc/glsl-long-variable-names.html is still failing on Mac, even after r130417. It seems that I didn't update the queried attribute name when recording the mapping. 735190 1 webkit-bug-importer 2012-10-04 17:48:32 -0700 <rdar://problem/12439435> 738204 2 167851 roger_fong 2012-10-09 14:38:39 -0700 Created attachment 167851 Patch 738205 3 roger_fong 2012-10-09 14:40:34 -0700 Alternative I can add another hash map going the other way instead of searching through the current one (assuming that the mappings are one to one) 738206 4 dino 2012-10-09 14:42:22 -0700 They are 1:1, but I don't think should worry about a reverse map unless this turns out to be a hot path. 738209 5 167851 dino 2012-10-09 14:48:04 -0700 Comment on attachment 167851 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=167851&action=review > Source/WebCore/ChangeLog:7 > + Reviewed by NOBODY (OOPS!). > + I usually write a paragraph here saying what I did (although the title is pretty obvious in this case). For example "When a variable name in a shader is long, we translate it into a short form and keep a mapping between the new and old names. However, we were accidentally telling the client-side code the translated name. It should always use the original names" > Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:635 > + String origName = originalSymbolName(program, SHADER_SYMBOL_TYPE_ATTRIBUTE, String(name.get(), nameLength)); > + > + info.name = origName; Use long names in variables: originalName > Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:662 > + String origName = originalSymbolName(program, SHADER_SYMBOL_TYPE_UNIFORM, String(name.get(), nameLength)); > + > + info.name = origName; Ditto. 738213 6 167851 thorton 2012-10-09 14:50:48 -0700 Comment on attachment 167851 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=167851&action=review > Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:712 > + if (symbolEntry->second.mappedName == name) > + return symbolEntry->first; Didn't we (first, second) -> (key, value)? 738215 7 167851 gtk-ews 2012-10-09 14:52:28 -0700 Comment on attachment 167851 Patch Attachment 167851 did not pass gtk-ews (gtk): Output: http://queues.webkit.org/results/14250063 738231 8 167855 roger_fong 2012-10-09 15:06:57 -0700 Created attachment 167855 Patch 738274 9 167855 webkit-ews 2012-10-09 15:46:30 -0700 Comment on attachment 167855 Patch Attachment 167855 did not pass qt-ews (qt): Output: http://queues.webkit.org/results/14250079 738292 10 167855 thorton 2012-10-09 16:05:59 -0700 Comment on attachment 167855 Patch r- so the bots stop trying 738317 11 167875 roger_fong 2012-10-09 16:37:34 -0700 Created attachment 167875 Patch 738318 12 167875 thorton 2012-10-09 16:39:07 -0700 Comment on attachment 167875 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=167875&action=review Carrying over Dino's r+ from before, assuming it builds now. > Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:-660 > - ? 739455 13 roger_fong 2012-10-10 18:02:24 -0700 resolved: http://trac.webkit.org/changeset/130985 167851 2012-10-09 14:38:39 -0700 2012-10-09 15:06:54 -0700 Patch bug-98470-20121009143740.patch text/plain 4484 roger_fong U3VidmVyc2lvbiBSZXZpc2lvbjogMTMwNDE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTE5ZGY1NzE2ZGI4NDYw MTAzNmNhYTFmNjNhOWI4ZTg0NzIzMjRkMi4uOTlkY2IxODNiMTJmYzkzZmY0NzE3YmU2NGVjNzky OWJhNjVjMzAzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEyLTEwLTA5ICBSb2dl ciBGb25nICA8cm9nZXJfZm9uZ0BhcHBsZS5jb20+CisKKyAgICAgICAgW1dlYkdMXSBbT24gTWFj XSBxdWVyaWVkIGF0dHJpYnV0ZXMgYW5kIHVuaWZvcm1zIG5lZWQgdG8gcmV0dXJuIHRoZSBvcmln aW5hbCB2YXJpYWJsZSBuYW1lLCBub3QgdGhlIG1hcHBlZCBuYW1lLgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTg0NzAKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0ZWQgdXNpbmcgS2hyb25vcyBXZWJH TCBjb25mb3JtYW5jZSBzdWl0ZToKKyAgICAgICAgY29uZm9ybWFuY2UvZ2xzbC9taXNjL2dsc2wt bG9uZy12YXJpYWJsZS1uYW1lcy5odG1sCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9H cmFwaGljc0NvbnRleHQzRC5oOgorICAgICAgICAoR3JhcGhpY3NDb250ZXh0M0QpOgorICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL29wZW5nbC9HcmFwaGljc0NvbnRleHQzRE9wZW5HTENvbW1v bi5jcHA6IGdldEFjdGl2ZUF0dHJpYiBhbmQgZ2V0QWN0aXZlVW5pZm9ybQorICAgICAgICBub3cg dXNlIEdyYXBoaWNzQ29udGV4dDNEOjpvcmlnaW5hbFN5bWJvbE5hbWUgdG8gZmluZCB0aGUgb3Jp Z2luYWwgdmFyaWFibGUgbmFtZS4KKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDNE OjpnZXRBY3RpdmVBdHRyaWIpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0M0Q6 OmdldEFjdGl2ZVVuaWZvcm0pOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3Jl OjpHcmFwaGljc0NvbnRleHQzRDo6b3JpZ2luYWxTeW1ib2xOYW1lKTogVGhpcyBtZXRob2QgcmV0 dXJucyB0aGUgb3JpZ2luYWwgdmFyaWFibGUgbmFtZSBnaXZlbiAKKyAgICAgICAgdGhlIG1hcHBl ZCBuYW1lLgorCiAyMDEyLTEwLTA0ICBEZWFuIEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KIAog ICAgICAgICBBdHRyaWJ1dGUgYW5kIFVuaWZvcm0gdmFyaWFibGUgbmFtZXMgbmVlZCB0cmFuc2xh dGlvbiBpbiBzaGFkZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL0dyYXBoaWNzQ29udGV4dDNELmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9HcmFwaGljc0NvbnRleHQzRC5oCmluZGV4IDRkY2IyZDBlMmM0MWQ5OWMyNzNmOWQzNzM5MDFm YTUwZDA0OTlhOTEuLjdiZDhiNmUyZDBhNmFjYWVmNDRmZTE4ZDAyMTI0YzE5MWZiNzY0NmEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4 dDNELmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250 ZXh0M0QuaApAQCAtMTAxNyw2ICsxMDE3LDcgQEAgcHVibGljOgogICAgIFNoYWRlclNvdXJjZU1h cCBtX3NoYWRlclNvdXJjZU1hcDsKIAogICAgIFN0cmluZyBtYXBwZWRTeW1ib2xOYW1lKFBsYXRm b3JtM0RPYmplY3QgcHJvZ3JhbSwgQU5HTEVTaGFkZXJTeW1ib2xUeXBlLCBjb25zdCBTdHJpbmcm IG5hbWUpOworICAgIFN0cmluZyBvcmlnaW5hbFN5bWJvbE5hbWUoUGxhdGZvcm0zRE9iamVjdCBw cm9ncmFtLCBBTkdMRVNoYWRlclN5bWJvbFR5cGUsIGNvbnN0IFN0cmluZyYgbmFtZSk7CiAKICAg ICBBTkdMRVdlYktpdEJyaWRnZSBtX2NvbXBpbGVyOwogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9vcGVuZ2wvR3JhcGhpY3NDb250ZXh0M0RPcGVu R0xDb21tb24uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0dy YXBoaWNzQ29udGV4dDNET3BlbkdMQ29tbW9uLmNwcAppbmRleCAxNTE2ZWEyNjA4NGFlY2VjZjhk NWU2MDczNzZjZDUxMjI0OTIxYjkwLi44NTk4MmQwNTZmNGNmMDQ5YjcxNDM3ZGUwMjQ5Zjc1MjI2 ZjU2MjUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9vcGVu Z2wvR3JhcGhpY3NDb250ZXh0M0RPcGVuR0xDb21tb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL29wZW5nbC9HcmFwaGljc0NvbnRleHQzRE9wZW5HTENvbW1vbi5j cHAKQEAgLTYyOSw3ICs2MjksMTAgQEAgYm9vbCBHcmFwaGljc0NvbnRleHQzRDo6Z2V0QWN0aXZl QXR0cmliKFBsYXRmb3JtM0RPYmplY3QgcHJvZ3JhbSwgR0MzRHVpbnQgaW5kZXgKICAgICA6Omds R2V0QWN0aXZlQXR0cmliKHByb2dyYW0sIGluZGV4LCBtYXhBdHRyaWJ1dGVTaXplLCAmbmFtZUxl bmd0aCwgJnNpemUsICZ0eXBlLCBuYW1lLmdldCgpKTsKICAgICBpZiAoIW5hbWVMZW5ndGgpCiAg ICAgICAgIHJldHVybiBmYWxzZTsKLSAgICBpbmZvLm5hbWUgPSBTdHJpbmcobmFtZS5nZXQoKSwg bmFtZUxlbmd0aCk7CisgICAgCisgICAgU3RyaW5nIG9yaWdOYW1lID0gb3JpZ2luYWxTeW1ib2xO YW1lKHByb2dyYW0sIFNIQURFUl9TWU1CT0xfVFlQRV9BVFRSSUJVVEUsIFN0cmluZyhuYW1lLmdl dCgpLCBuYW1lTGVuZ3RoKSk7CisgICAgCisgICAgaW5mby5uYW1lID0gb3JpZ05hbWU7CiAgICAg aW5mby50eXBlID0gdHlwZTsKICAgICBpbmZvLnNpemUgPSBzaXplOwogICAgIHJldHVybiB0cnVl OwpAQCAtNjUzLDExICs2NTYsMTIgQEAgYm9vbCBHcmFwaGljc0NvbnRleHQzRDo6Z2V0QWN0aXZl VW5pZm9ybShQbGF0Zm9ybTNET2JqZWN0IHByb2dyYW0sIEdDM0R1aW50IGluZGUKICAgICA6Omds R2V0QWN0aXZlVW5pZm9ybShwcm9ncmFtLCBpbmRleCwgbWF4VW5pZm9ybVNpemUsICZuYW1lTGVu Z3RoLCAmc2l6ZSwgJnR5cGUsIG5hbWUuZ2V0KCkpOwogICAgIGlmICghbmFtZUxlbmd0aCkKICAg ICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgaW5mby5uYW1lID0gU3RyaW5nKG5hbWUuZ2V0KCks IG5hbWVMZW5ndGgpOworICAgIAorICAgIFN0cmluZyBvcmlnTmFtZSA9IG9yaWdpbmFsU3ltYm9s TmFtZShwcm9ncmFtLCBTSEFERVJfU1lNQk9MX1RZUEVfVU5JRk9STSwgU3RyaW5nKG5hbWUuZ2V0 KCksIG5hbWVMZW5ndGgpKTsKKyAgICAKKyAgICBpbmZvLm5hbWUgPSBvcmlnTmFtZTsKICAgICBp bmZvLnR5cGUgPSB0eXBlOwogICAgIGluZm8uc2l6ZSA9IHNpemU7Ci0KICAgICByZXR1cm4gdHJ1 ZTsKIH0KICAgICAKQEAgLTY4OSw2ICs2OTMsMjcgQEAgU3RyaW5nIEdyYXBoaWNzQ29udGV4dDNE OjptYXBwZWRTeW1ib2xOYW1lKFBsYXRmb3JtM0RPYmplY3QgcHJvZ3JhbSwgQU5HTEVTaGFkZXIK ICAgICB9CiAgICAgcmV0dXJuIG5hbWU7CiB9CisgICAgCitTdHJpbmcgR3JhcGhpY3NDb250ZXh0 M0Q6Om9yaWdpbmFsU3ltYm9sTmFtZShQbGF0Zm9ybTNET2JqZWN0IHByb2dyYW0sIEFOR0xFU2hh ZGVyU3ltYm9sVHlwZSBzeW1ib2xUeXBlLCBjb25zdCBTdHJpbmcmIG5hbWUpCit7CisgICAgR0Mz RHNpemVpIGNvdW50OworICAgIFBsYXRmb3JtM0RPYmplY3Qgc2hhZGVyc1syXTsKKyAgICBnZXRB dHRhY2hlZFNoYWRlcnMocHJvZ3JhbSwgMiwgJmNvdW50LCBzaGFkZXJzKTsKKyAgICAKKyAgICBm b3IgKEdDM0RzaXplaSBpID0gMDsgaSA8IGNvdW50OyArK2kpIHsKKyAgICAgICAgU2hhZGVyU291 cmNlTWFwOjppdGVyYXRvciByZXN1bHQgPSBtX3NoYWRlclNvdXJjZU1hcC5maW5kKHNoYWRlcnNb aV0pOworICAgICAgICBpZiAocmVzdWx0ID09IG1fc2hhZGVyU291cmNlTWFwLmVuZCgpKQorICAg ICAgICAgICAgY29udGludWU7CisgICAgICAgIAorICAgICAgICBjb25zdCBTaGFkZXJTeW1ib2xN YXAmIHN5bWJvbE1hcCA9IHJlc3VsdC0+c2Vjb25kLnN5bWJvbE1hcChzeW1ib2xUeXBlKTsKKyAg ICAgICAgU2hhZGVyU3ltYm9sTWFwOjpjb25zdF9pdGVyYXRvciBzeW1ib2xFbnRyeTsKKyAgICAg ICAgZm9yIChzeW1ib2xFbnRyeSA9IHN5bWJvbE1hcC5iZWdpbigpOyBzeW1ib2xFbnRyeSAhPSBz eW1ib2xNYXAuZW5kKCk7ICsrc3ltYm9sRW50cnkpIHsKKyAgICAgICAgICAgIGlmIChzeW1ib2xF bnRyeS0+c2Vjb25kLm1hcHBlZE5hbWUgPT0gbmFtZSkKKyAgICAgICAgICAgICAgICByZXR1cm4g c3ltYm9sRW50cnktPmZpcnN0OworICAgICAgICB9CisgICAgfQorICAgIHJldHVybiBuYW1lOwor fQogCiBpbnQgR3JhcGhpY3NDb250ZXh0M0Q6OmdldEF0dHJpYkxvY2F0aW9uKFBsYXRmb3JtM0RP YmplY3QgcHJvZ3JhbSwgY29uc3QgU3RyaW5nJiBuYW1lKQogewo= 167855 2012-10-09 15:06:57 -0700 2012-10-09 16:37:32 -0700 Patch bug-98470-20121009150558.patch text/plain 4853 roger_fong U3VidmVyc2lvbiBSZXZpc2lvbjogMTMwNDE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTE5ZGY1NzE2ZGI4NDYw MTAzNmNhYTFmNjNhOWI4ZTg0NzIzMjRkMi4uZmJkYjQ0ZTAwMjQxYTA5NTU0NDUyZjZiYmEwNzYy MmYyODYxZjZlYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEyLTEwLTA5ICBSb2dl ciBGb25nICA8cm9nZXJfZm9uZ0BhcHBsZS5jb20+CisKKyAgICAgICAgW1dlYkdMXSBbT24gTWFj XSBxdWVyaWVkIGF0dHJpYnV0ZXMgYW5kIHVuaWZvcm1zIG5lZWQgdG8gcmV0dXJuIHRoZSBvcmln aW5hbCB2YXJpYWJsZSBuYW1lLCBub3QgdGhlIG1hcHBlZCBuYW1lLgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTg0NzAKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIGEgdmFyaWFibGUgbmFtZSBpcyB0 b28gbG9uZyB3ZSB0cmFuc2xhdGUgdG8gYSBzaG9ydGVyIHZlcnNpb24gYW5kIGtlZXAgYSBtYXBw aW5nIGJldHdlZW4gdGhlIGxvbmcgYW5kIHNob3J0IG5hbWVzLgorICAgICAgICBIb3dldmVyLCB3 aGVuIHF1ZXJ5aW5nIGZvciBhIHZhcmlhYmxlIGNsaWVudCBzaWRlIHVzaW5nIGdldEFjdGl2ZUF0 dHJpYiBvciBnZXRBY3RpdmVVbmlmb3JtLCB3ZSBhY2NpZGVudGFsbHkgcmV0dXJuIHRoZSAKKyAg ICAgICAgdHJhbnNsYXRlZCBuYW1lcy4gVGhpcyBmaXggbWFrZXMgdGhlc2UgbWV0aG9kcyByZXR1 cm4gdGhlIG9yaWdpbmFsIHZhcmlhYmxlIG5hbWVzLgorCisgICAgICAgIFRlc3RlZCB1c2luZyBL aHJvbm9zIFdlYkdMIGNvbmZvcm1hbmNlIHN1aXRlOgorICAgICAgICBjb25mb3JtYW5jZS9nbHNs L21pc2MvZ2xzbC1sb25nLXZhcmlhYmxlLW5hbWVzLmh0bWwKKworICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dDNELmg6CisgICAgICAgIChHcmFwaGljc0NvbnRleHQz RCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0dyYXBoaWNzQ29udGV4dDNE T3BlbkdMQ29tbW9uLmNwcDogZ2V0QWN0aXZlQXR0cmliIGFuZCBnZXRBY3RpdmVVbmlmb3JtCisg ICAgICAgIG5vdyB1c2UgR3JhcGhpY3NDb250ZXh0M0Q6Om9yaWdpbmFsU3ltYm9sTmFtZSB0byBm aW5kIHRoZSBvcmlnaW5hbCB2YXJpYWJsZSBuYW1lLgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhp Y3NDb250ZXh0M0Q6OmdldEFjdGl2ZUF0dHJpYik6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGlj c0NvbnRleHQzRDo6Z2V0QWN0aXZlVW5pZm9ybSk6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAg ICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDNEOjpvcmlnaW5hbFN5bWJvbE5hbWUpOiBUaGlz IG1ldGhvZCByZXR1cm5zIHRoZSBvcmlnaW5hbCB2YXJpYWJsZSBuYW1lIGdpdmVuIAorICAgICAg ICB0aGUgbWFwcGVkIG5hbWUuCisKIDIwMTItMTAtMDQgIERlYW4gSmFja3NvbiAgPGRpbm9AYXBw bGUuY29tPgogCiAgICAgICAgIEF0dHJpYnV0ZSBhbmQgVW5pZm9ybSB2YXJpYWJsZSBuYW1lcyBu ZWVkIHRyYW5zbGF0aW9uIGluIHNoYWRlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0M0QuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dDNELmgKaW5kZXggNGRjYjJkMGUyYzQxZDk5YzI3 M2Y5ZDM3MzkwMWZhNTBkMDQ5OWE5MS4uN2JkOGI2ZTJkMGE2YWNhZWY0NGZlMThkMDIxMjRjMTkx ZmI3NjQ2YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3Jh cGhpY3NDb250ZXh0M0QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9H cmFwaGljc0NvbnRleHQzRC5oCkBAIC0xMDE3LDYgKzEwMTcsNyBAQCBwdWJsaWM6CiAgICAgU2hh ZGVyU291cmNlTWFwIG1fc2hhZGVyU291cmNlTWFwOwogCiAgICAgU3RyaW5nIG1hcHBlZFN5bWJv bE5hbWUoUGxhdGZvcm0zRE9iamVjdCBwcm9ncmFtLCBBTkdMRVNoYWRlclN5bWJvbFR5cGUsIGNv bnN0IFN0cmluZyYgbmFtZSk7CisgICAgU3RyaW5nIG9yaWdpbmFsU3ltYm9sTmFtZShQbGF0Zm9y bTNET2JqZWN0IHByb2dyYW0sIEFOR0xFU2hhZGVyU3ltYm9sVHlwZSwgY29uc3QgU3RyaW5nJiBu YW1lKTsKIAogICAgIEFOR0xFV2ViS2l0QnJpZGdlIG1fY29tcGlsZXI7CiAjZW5kaWYKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL29wZW5nbC9HcmFwaGljc0Nv bnRleHQzRE9wZW5HTENvbW1vbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9vcGVuZ2wvR3JhcGhpY3NDb250ZXh0M0RPcGVuR0xDb21tb24uY3BwCmluZGV4IDE1MTZlYTI2 MDg0YWVjZWNmOGQ1ZTYwNzM3NmNkNTEyMjQ5MjFiOTAuLmIxZWU1MDhkZTI2MDU3YjFlMmM2NTZk OTVkYmE5N2U5YmQ3YjJjYjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL29wZW5nbC9HcmFwaGljc0NvbnRleHQzRE9wZW5HTENvbW1vbi5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0dyYXBoaWNzQ29udGV4dDNET3Bl bkdMQ29tbW9uLmNwcApAQCAtNjI5LDcgKzYyOSwxMCBAQCBib29sIEdyYXBoaWNzQ29udGV4dDNE OjpnZXRBY3RpdmVBdHRyaWIoUGxhdGZvcm0zRE9iamVjdCBwcm9ncmFtLCBHQzNEdWludCBpbmRl eAogICAgIDo6Z2xHZXRBY3RpdmVBdHRyaWIocHJvZ3JhbSwgaW5kZXgsIG1heEF0dHJpYnV0ZVNp emUsICZuYW1lTGVuZ3RoLCAmc2l6ZSwgJnR5cGUsIG5hbWUuZ2V0KCkpOwogICAgIGlmICghbmFt ZUxlbmd0aCkKICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIGluZm8ubmFtZSA9IFN0cmluZyhu YW1lLmdldCgpLCBuYW1lTGVuZ3RoKTsKKyAgICAKKyAgICBTdHJpbmcgb3JpZ2luYWxOYW1lID0g b3JpZ2luYWxTeW1ib2xOYW1lKHByb2dyYW0sIFNIQURFUl9TWU1CT0xfVFlQRV9BVFRSSUJVVEUs IFN0cmluZyhuYW1lLmdldCgpLCBuYW1lTGVuZ3RoKSk7CisgICAgCisgICAgaW5mby5uYW1lID0g b3JpZ2luYWxOYW1lOwogICAgIGluZm8udHlwZSA9IHR5cGU7CiAgICAgaW5mby5zaXplID0gc2l6 ZTsKICAgICByZXR1cm4gdHJ1ZTsKQEAgLTY1MywxMSArNjU2LDEyIEBAIGJvb2wgR3JhcGhpY3ND b250ZXh0M0Q6OmdldEFjdGl2ZVVuaWZvcm0oUGxhdGZvcm0zRE9iamVjdCBwcm9ncmFtLCBHQzNE dWludCBpbmRlCiAgICAgOjpnbEdldEFjdGl2ZVVuaWZvcm0ocHJvZ3JhbSwgaW5kZXgsIG1heFVu aWZvcm1TaXplLCAmbmFtZUxlbmd0aCwgJnNpemUsICZ0eXBlLCBuYW1lLmdldCgpKTsKICAgICBp ZiAoIW5hbWVMZW5ndGgpCiAgICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgIGluZm8ubmFtZSA9 IFN0cmluZyhuYW1lLmdldCgpLCBuYW1lTGVuZ3RoKTsKKyAgICAKKyAgICBTdHJpbmcgb3JpZ2lu YWxOYW1lID0gb3JpZ2luYWxTeW1ib2xOYW1lKHByb2dyYW0sIFNIQURFUl9TWU1CT0xfVFlQRV9V TklGT1JNLCBTdHJpbmcobmFtZS5nZXQoKSwgbmFtZUxlbmd0aCkpOworICAgIAorICAgIGluZm8u bmFtZSA9IG9yaWdpbmFsTmFtZTsKICAgICBpbmZvLnR5cGUgPSB0eXBlOwogICAgIGluZm8uc2l6 ZSA9IHNpemU7Ci0KICAgICByZXR1cm4gdHJ1ZTsKIH0KICAgICAKQEAgLTY4OSw2ICs2OTMsMjcg QEAgU3RyaW5nIEdyYXBoaWNzQ29udGV4dDNEOjptYXBwZWRTeW1ib2xOYW1lKFBsYXRmb3JtM0RP YmplY3QgcHJvZ3JhbSwgQU5HTEVTaGFkZXIKICAgICB9CiAgICAgcmV0dXJuIG5hbWU7CiB9Cisg ICAgCitTdHJpbmcgR3JhcGhpY3NDb250ZXh0M0Q6Om9yaWdpbmFsU3ltYm9sTmFtZShQbGF0Zm9y bTNET2JqZWN0IHByb2dyYW0sIEFOR0xFU2hhZGVyU3ltYm9sVHlwZSBzeW1ib2xUeXBlLCBjb25z dCBTdHJpbmcmIG5hbWUpCit7CisgICAgR0MzRHNpemVpIGNvdW50OworICAgIFBsYXRmb3JtM0RP YmplY3Qgc2hhZGVyc1syXTsKKyAgICBnZXRBdHRhY2hlZFNoYWRlcnMocHJvZ3JhbSwgMiwgJmNv dW50LCBzaGFkZXJzKTsKKyAgICAKKyAgICBmb3IgKEdDM0RzaXplaSBpID0gMDsgaSA8IGNvdW50 OyArK2kpIHsKKyAgICAgICAgU2hhZGVyU291cmNlTWFwOjppdGVyYXRvciByZXN1bHQgPSBtX3No YWRlclNvdXJjZU1hcC5maW5kKHNoYWRlcnNbaV0pOworICAgICAgICBpZiAocmVzdWx0ID09IG1f c2hhZGVyU291cmNlTWFwLmVuZCgpKQorICAgICAgICAgICAgY29udGludWU7CisgICAgICAgIAor ICAgICAgICBjb25zdCBTaGFkZXJTeW1ib2xNYXAmIHN5bWJvbE1hcCA9IHJlc3VsdC0+c2Vjb25k LnN5bWJvbE1hcChzeW1ib2xUeXBlKTsKKyAgICAgICAgU2hhZGVyU3ltYm9sTWFwOjpjb25zdF9p dGVyYXRvciBzeW1ib2xFbnRyeTsKKyAgICAgICAgZm9yIChzeW1ib2xFbnRyeSA9IHN5bWJvbE1h cC5iZWdpbigpOyBzeW1ib2xFbnRyeSAhPSBzeW1ib2xNYXAuZW5kKCk7ICsrc3ltYm9sRW50cnkp IHsKKyAgICAgICAgICAgIGlmIChzeW1ib2xFbnRyeS0+c2Vjb25kLm1hcHBlZE5hbWUgPT0gbmFt ZSkKKyAgICAgICAgICAgICAgICByZXR1cm4gc3ltYm9sRW50cnktPmZpcnN0OworICAgICAgICB9 CisgICAgfQorICAgIHJldHVybiBuYW1lOworfQogCiBpbnQgR3JhcGhpY3NDb250ZXh0M0Q6Omdl dEF0dHJpYkxvY2F0aW9uKFBsYXRmb3JtM0RPYmplY3QgcHJvZ3JhbSwgY29uc3QgU3RyaW5nJiBu YW1lKQogewo= 167875 2012-10-09 16:37:34 -0700 2012-10-09 16:39:07 -0700 Patch bug-98470-20121009163635.patch text/plain 4849 roger_fong U3VidmVyc2lvbiBSZXZpc2lvbjogMTMwODE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTg3ZTBlNWE0YzYyN2Qz NzdmZTdmYjI0MmMyZmRjODM1M2IzMDU0NC4uMGNhZTc1M2E0OWRiZTAzYWE0ODA5ZTNkZmZhMzYw ZTljMjYzOWFhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEyLTEwLTA5ICBSb2dl ciBGb25nICA8cm9nZXJfZm9uZ0BhcHBsZS5jb20+CisKKyAgICAgICAgW1dlYkdMXSBbT24gTWFj XSBxdWVyaWVkIGF0dHJpYnV0ZXMgYW5kIHVuaWZvcm1zIG5lZWQgdG8gcmV0dXJuIHRoZSBvcmln aW5hbCB2YXJpYWJsZSBuYW1lLCBub3QgdGhlIG1hcHBlZCBuYW1lLgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTg0NzAKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIGEgdmFyaWFibGUgbmFtZSBpcyB0 b28gbG9uZyB3ZSB0cmFuc2xhdGUgdG8gYSBzaG9ydGVyIHZlcnNpb24gYW5kIGtlZXAgYSBtYXBw aW5nIGJldHdlZW4gdGhlIGxvbmcgYW5kIHNob3J0IG5hbWVzLgorICAgICAgICBIb3dldmVyLCB3 aGVuIHF1ZXJ5aW5nIGZvciBhIHZhcmlhYmxlIGNsaWVudCBzaWRlIHVzaW5nIGdldEFjdGl2ZUF0 dHJpYiBvciBnZXRBY3RpdmVVbmlmb3JtLCB3ZSBhY2NpZGVudGFsbHkgcmV0dXJuIHRoZSAKKyAg ICAgICAgdHJhbnNsYXRlZCBuYW1lcy4gVGhpcyBmaXggbWFrZXMgdGhlc2UgbWV0aG9kcyByZXR1 cm4gdGhlIG9yaWdpbmFsIHZhcmlhYmxlIG5hbWVzLgorCisgICAgICAgIFRlc3RlZCB1c2luZyBL aHJvbm9zIFdlYkdMIGNvbmZvcm1hbmNlIHN1aXRlOgorICAgICAgICBjb25mb3JtYW5jZS9nbHNs L21pc2MvZ2xzbC1sb25nLXZhcmlhYmxlLW5hbWVzLmh0bWwKKworICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dDNELmg6CisgICAgICAgIChHcmFwaGljc0NvbnRleHQz RCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0dyYXBoaWNzQ29udGV4dDNE T3BlbkdMQ29tbW9uLmNwcDogZ2V0QWN0aXZlQXR0cmliIGFuZCBnZXRBY3RpdmVVbmlmb3JtCisg ICAgICAgIG5vdyB1c2UgR3JhcGhpY3NDb250ZXh0M0Q6Om9yaWdpbmFsU3ltYm9sTmFtZSB0byBm aW5kIHRoZSBvcmlnaW5hbCB2YXJpYWJsZSBuYW1lLgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhp Y3NDb250ZXh0M0Q6OmdldEFjdGl2ZUF0dHJpYik6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGlj c0NvbnRleHQzRDo6Z2V0QWN0aXZlVW5pZm9ybSk6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAg ICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDNEOjpvcmlnaW5hbFN5bWJvbE5hbWUpOiBUaGlz IG1ldGhvZCByZXR1cm5zIHRoZSBvcmlnaW5hbCB2YXJpYWJsZSBuYW1lIGdpdmVuIAorICAgICAg ICB0aGUgbWFwcGVkIG5hbWUuCisKIDIwMTItMTAtMDkgIE5hdGUgQ2hhcGluICA8amFwaGV0QGNo cm9taXVtLm9yZz4KIAogICAgICAgICBNYWtlIENhY2hlZFJlc291cmNlTG9hZGVyIFJlZkNvdW50 ZWQgYW5kIGhhdmUgYm90aCBEb2N1bWVudApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0M0QuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dDNELmgKaW5kZXggODYwODIzNGU2ZjJkZjI4NDRm NjdjMTYxYzM4MzRkYTY5ZTY4ZjNmMi4uYTBiYTkxOWQ0OGYwY2VkZTZlMTU4NWEyMmY2ZjBlNDU5 NGJkYTNlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3Jh cGhpY3NDb250ZXh0M0QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9H cmFwaGljc0NvbnRleHQzRC5oCkBAIC0xMDE4LDYgKzEwMTgsNyBAQCBwdWJsaWM6CiAgICAgU2hh ZGVyU291cmNlTWFwIG1fc2hhZGVyU291cmNlTWFwOwogCiAgICAgU3RyaW5nIG1hcHBlZFN5bWJv bE5hbWUoUGxhdGZvcm0zRE9iamVjdCBwcm9ncmFtLCBBTkdMRVNoYWRlclN5bWJvbFR5cGUsIGNv bnN0IFN0cmluZyYgbmFtZSk7CisgICAgU3RyaW5nIG9yaWdpbmFsU3ltYm9sTmFtZShQbGF0Zm9y bTNET2JqZWN0IHByb2dyYW0sIEFOR0xFU2hhZGVyU3ltYm9sVHlwZSwgY29uc3QgU3RyaW5nJiBu YW1lKTsKIAogICAgIEFOR0xFV2ViS2l0QnJpZGdlIG1fY29tcGlsZXI7CiAjZW5kaWYKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL29wZW5nbC9HcmFwaGljc0Nv bnRleHQzRE9wZW5HTENvbW1vbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9vcGVuZ2wvR3JhcGhpY3NDb250ZXh0M0RPcGVuR0xDb21tb24uY3BwCmluZGV4IDBlODFjYzVm OGY2ZGY5NjA4MDg3NjgyZjZjYzRhYmE3YzhlOTg3ZTkuLmQxYjI3NjZkNTU3YmQ3NjVjZGU5ZThk ZWE5YTVmOWM0ZTJmZjVkMTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL29wZW5nbC9HcmFwaGljc0NvbnRleHQzRE9wZW5HTENvbW1vbi5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0dyYXBoaWNzQ29udGV4dDNET3Bl bkdMQ29tbW9uLmNwcApAQCAtNjI5LDcgKzYyOSwxMCBAQCBib29sIEdyYXBoaWNzQ29udGV4dDNE OjpnZXRBY3RpdmVBdHRyaWIoUGxhdGZvcm0zRE9iamVjdCBwcm9ncmFtLCBHQzNEdWludCBpbmRl eAogICAgIDo6Z2xHZXRBY3RpdmVBdHRyaWIocHJvZ3JhbSwgaW5kZXgsIG1heEF0dHJpYnV0ZVNp emUsICZuYW1lTGVuZ3RoLCAmc2l6ZSwgJnR5cGUsIG5hbWUuZ2V0KCkpOwogICAgIGlmICghbmFt ZUxlbmd0aCkKICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIGluZm8ubmFtZSA9IFN0cmluZyhu YW1lLmdldCgpLCBuYW1lTGVuZ3RoKTsKKyAgICAKKyAgICBTdHJpbmcgb3JpZ2luYWxOYW1lID0g b3JpZ2luYWxTeW1ib2xOYW1lKHByb2dyYW0sIFNIQURFUl9TWU1CT0xfVFlQRV9BVFRSSUJVVEUs IFN0cmluZyhuYW1lLmdldCgpLCBuYW1lTGVuZ3RoKSk7CisgICAgCisgICAgaW5mby5uYW1lID0g b3JpZ2luYWxOYW1lOwogICAgIGluZm8udHlwZSA9IHR5cGU7CiAgICAgaW5mby5zaXplID0gc2l6 ZTsKICAgICByZXR1cm4gdHJ1ZTsKQEAgLTY1MywxMSArNjU2LDEyIEBAIGJvb2wgR3JhcGhpY3ND b250ZXh0M0Q6OmdldEFjdGl2ZVVuaWZvcm0oUGxhdGZvcm0zRE9iamVjdCBwcm9ncmFtLCBHQzNE dWludCBpbmRlCiAgICAgOjpnbEdldEFjdGl2ZVVuaWZvcm0ocHJvZ3JhbSwgaW5kZXgsIG1heFVu aWZvcm1TaXplLCAmbmFtZUxlbmd0aCwgJnNpemUsICZ0eXBlLCBuYW1lLmdldCgpKTsKICAgICBp ZiAoIW5hbWVMZW5ndGgpCiAgICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgIGluZm8ubmFtZSA9 IFN0cmluZyhuYW1lLmdldCgpLCBuYW1lTGVuZ3RoKTsKKyAgICAKKyAgICBTdHJpbmcgb3JpZ2lu YWxOYW1lID0gb3JpZ2luYWxTeW1ib2xOYW1lKHByb2dyYW0sIFNIQURFUl9TWU1CT0xfVFlQRV9V TklGT1JNLCBTdHJpbmcobmFtZS5nZXQoKSwgbmFtZUxlbmd0aCkpOworICAgIAorICAgIGluZm8u bmFtZSA9IG9yaWdpbmFsTmFtZTsKICAgICBpbmZvLnR5cGUgPSB0eXBlOwogICAgIGluZm8uc2l6 ZSA9IHNpemU7Ci0KICAgICByZXR1cm4gdHJ1ZTsKIH0KICAgICAKQEAgLTY4OSw2ICs2OTMsMjcg QEAgU3RyaW5nIEdyYXBoaWNzQ29udGV4dDNEOjptYXBwZWRTeW1ib2xOYW1lKFBsYXRmb3JtM0RP YmplY3QgcHJvZ3JhbSwgQU5HTEVTaGFkZXIKICAgICB9CiAgICAgcmV0dXJuIG5hbWU7CiB9Cisg ICAgCitTdHJpbmcgR3JhcGhpY3NDb250ZXh0M0Q6Om9yaWdpbmFsU3ltYm9sTmFtZShQbGF0Zm9y bTNET2JqZWN0IHByb2dyYW0sIEFOR0xFU2hhZGVyU3ltYm9sVHlwZSBzeW1ib2xUeXBlLCBjb25z dCBTdHJpbmcmIG5hbWUpCit7CisgICAgR0MzRHNpemVpIGNvdW50OworICAgIFBsYXRmb3JtM0RP YmplY3Qgc2hhZGVyc1syXTsKKyAgICBnZXRBdHRhY2hlZFNoYWRlcnMocHJvZ3JhbSwgMiwgJmNv dW50LCBzaGFkZXJzKTsKKyAgICAKKyAgICBmb3IgKEdDM0RzaXplaSBpID0gMDsgaSA8IGNvdW50 OyArK2kpIHsKKyAgICAgICAgU2hhZGVyU291cmNlTWFwOjppdGVyYXRvciByZXN1bHQgPSBtX3No YWRlclNvdXJjZU1hcC5maW5kKHNoYWRlcnNbaV0pOworICAgICAgICBpZiAocmVzdWx0ID09IG1f c2hhZGVyU291cmNlTWFwLmVuZCgpKQorICAgICAgICAgICAgY29udGludWU7CisgICAgICAgIAor ICAgICAgICBjb25zdCBTaGFkZXJTeW1ib2xNYXAmIHN5bWJvbE1hcCA9IHJlc3VsdC0+dmFsdWUu c3ltYm9sTWFwKHN5bWJvbFR5cGUpOworICAgICAgICBTaGFkZXJTeW1ib2xNYXA6OmNvbnN0X2l0 ZXJhdG9yIHN5bWJvbEVudHJ5OworICAgICAgICBmb3IgKHN5bWJvbEVudHJ5ID0gc3ltYm9sTWFw LmJlZ2luKCk7IHN5bWJvbEVudHJ5ICE9IHN5bWJvbE1hcC5lbmQoKTsgKytzeW1ib2xFbnRyeSkg eworICAgICAgICAgICAgaWYgKHN5bWJvbEVudHJ5LT52YWx1ZS5tYXBwZWROYW1lID09IG5hbWUp CisgICAgICAgICAgICAgICAgcmV0dXJuIHN5bWJvbEVudHJ5LT5rZXk7CisgICAgICAgIH0KKyAg ICB9CisgICAgcmV0dXJuIG5hbWU7Cit9CiAKIGludCBHcmFwaGljc0NvbnRleHQzRDo6Z2V0QXR0 cmliTG9jYXRpb24oUGxhdGZvcm0zRE9iamVjdCBwcm9ncmFtLCBjb25zdCBTdHJpbmcmIG5hbWUp CiB7Cg==