105809 2012-12-27 15:20:38 -0800 [Texmap] Use a transform uniform instead of u_flip/u_textureSize 2012-12-28 21:11:41 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 105377 1 noam noam jturcotte kenneth mrobinson webkit.review.bot oldest_to_newest 797690 0 noam 2012-12-27 15:20:38 -0800 [Texmap] Use a transform uniform instead of u_flip/u_textureSize 797691 1 180826 noam 2012-12-27 15:24:18 -0800 Created attachment 180826 Patch 797697 2 180826 mrobinson 2012-12-27 15:45:57 -0800 Comment on attachment 180826 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=180826&action=review Looks good to me, but I have a couple questions. > Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp:505 > + patternTransform.setM22(-1); Why not patternTransform.flipY() ? > Source/WebCore/platform/graphics/texmap/TextureMapperShaderManager.cpp:176 > + // Clamp in the shader, we can't rely on the texture wrap mode to clamp. > + vec4 clampedPosition = clamp(vec4(position, 0., 1.), 0., 1.); Hrm. I don't really understand this bit of code... 797699 3 noam 2012-12-27 15:54:54 -0800 (In reply to comment #2) > (From update of attachment 180826 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=180826&action=review > > Looks good to me, but I have a couple questions. > > > Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp:505 > > + patternTransform.setM22(-1); > > Why not patternTransform.flipY() ? > > > Source/WebCore/platform/graphics/texmap/TextureMapperShaderManager.cpp:176 > > + // Clamp in the shader, we can't rely on the texture wrap mode to clamp. > > + vec4 clampedPosition = clamp(vec4(position, 0., 1.), 0., 1.); > > Hrm. I don't really understand this bit of code... 797700 4 180828 noam 2012-12-27 16:01:06 -0800 Created attachment 180828 Patch 798032 5 180912 noam 2012-12-28 20:34:26 -0800 Created attachment 180912 Patch 798037 6 180912 webkit.review.bot 2012-12-28 21:11:37 -0800 Comment on attachment 180912 Patch Clearing flags on attachment: 180912 Committed r138556: <http://trac.webkit.org/changeset/138556> 798039 7 webkit.review.bot 2012-12-28 21:11:41 -0800 All reviewed patches have been landed. Closing bug. 180826 2012-12-27 15:24:18 -0800 2012-12-27 16:01:04 -0800 Patch bug-105809-20121227152140.patch text/plain 4788 noam U3VidmVyc2lvbiBSZXZpc2lvbjogMTM4NTEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmQxM2Q2ODEwMWNmODlk ZjIzODc0MTFlZDdkNzg4NjM2NzA4NDc4ZS4uNWY0ZDBlZTRlMGM5OWNkNDI2NWZhZmQ1ZDJlYzZi NTc5NGIzMzRlNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTEyLTI3ICBObydh bSBSb3NlbnRoYWwgIDxub2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW1RleG1hcF0gVXNlIGEg dHJhbnNmb3JtIHVuaWZvcm0gaW5zdGVhZCBvZiB1X2ZsaXAvdV90ZXh0dXJlU2l6ZQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA1ODA5CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW4gb3JkZXIgdG8gc3Vw cG9ydCB0aWxlZC1wYXR0ZXJucywgd2UnZCBoYXZlIHRvIGFwcGx5IHRleHR1cmUtc3BhY2UgdHJh bnNmb3JtYXRpb25zIGluIHRoZSB2ZXJ0ZXggc2hhZGVyLiBUaGlzIHBhdGNoIGNsZWFucyB1cCB0 aGUgY3VycmVudCB0ZXh0dXJlLXNwYWNlIHRyYW5zZm9ybWF0aW9ucywgYW5kIHVzZXMgYSBzaW5n bGUgbWF0cml4IHVuaWZvcm0gaW5zdGVhZCBvZiB0aGUgY3VycmVudCB1bmlmb3Jtcy4KKworICAg ICAgICBObyBuZXcgdGVzdHMsIHJlZmFjdG9yIG9ubHkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckdMLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRl eHR1cmVNYXBwZXJHTDo6ZHJhd1RleHR1cmVkUXVhZFdpdGhQcm9ncmFtKToKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlclNoYWRlck1hbmFnZXIuY3BwOgor ICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1Rl eHR1cmVNYXBwZXJTaGFkZXJNYW5hZ2VyLmg6CisgICAgICAgIChUZXh0dXJlTWFwcGVyU2hhZGVy UHJvZ3JhbSk6CisKIDIwMTItMTItMTggIE5vJ2FtIFJvc2VudGhhbCAgPG5vYW1Ad2Via2l0Lm9y Zz4KIAogICAgICAgICBbVGV4bWFwXSBFZGdlIGFudGlhbGlhc2luZyBpbiBUZXh0dXJlTWFwcGVy IGNvdWxkIGJlIGRvbmUgd2l0aCBsZXNzIHBlci1waXhlbCBjYWxscwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJHTC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckdM LmNwcAppbmRleCBmZTVkNTUyMDU4ZDI3ZjNlYjJjYWE2YWE1Yzg1ZTdiYjhjYTNiYjI3Li42Y2Jj OTQyNzhiM2RlNzdhMWE1Yzk1MWRkOWQzZTc0ZDZkN2YyMTQ0IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckdMLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckdM LmNwcApAQCAtNTAwLDkgKzUwMCwxNiBAQCB2b2lkIFRleHR1cmVNYXBwZXJHTDo6ZHJhd1RleHR1 cmVkUXVhZFdpdGhQcm9ncmFtKFRleHR1cmVNYXBwZXJTaGFkZXJQcm9ncmFtKiBwcgogICAgIG1f Y29udGV4dDNELT5iaW5kVGV4dHVyZSh0YXJnZXQsIHRleHR1cmUpOwogICAgIG1fY29udGV4dDNE LT51bmlmb3JtMWkocHJvZ3JhbS0+c2FtcGxlckxvY2F0aW9uKCksIDApOwogCi0gICAgRmxvYXRT aXplIHNpemVQYXJhbWV0ZXIgPSBmbGFncyAmIFNob3VsZFVzZUFSQlRleHR1cmVSZWN0ID8gc2l6 ZSA6IEZsb2F0U2l6ZSgxLCAxKTsKLSAgICBtX2NvbnRleHQzRC0+dW5pZm9ybTJmKHByb2dyYW0t PnRleHR1cmVTaXplTG9jYXRpb24oKSwgc2l6ZVBhcmFtZXRlci53aWR0aCgpLCBzaXplUGFyYW1l dGVyLmhlaWdodCgpKTsKLSAgICBtX2NvbnRleHQzRC0+dW5pZm9ybTFmKHByb2dyYW0tPmZsaXBM b2NhdGlvbigpLCAhIShmbGFncyAmIFNob3VsZEZsaXBUZXh0dXJlKSk7CisgICAgVHJhbnNmb3Jt YXRpb25NYXRyaXggcGF0dGVyblRyYW5zZm9ybTsKKyAgICBpZiAoZmxhZ3MgJiBTaG91bGRGbGlw VGV4dHVyZSkKKyAgICAgICAgcGF0dGVyblRyYW5zZm9ybS5zZXRNMjIoLTEpOworICAgIGlmIChm bGFncyAmIFNob3VsZFVzZUFSQlRleHR1cmVSZWN0KQorICAgICAgICBwYXR0ZXJuVHJhbnNmb3Jt LnNjYWxlTm9uVW5pZm9ybShzaXplLndpZHRoKCksIHNpemUuaGVpZ2h0KCkpOworICAgIGlmIChm bGFncyAmIFNob3VsZEZsaXBUZXh0dXJlKQorICAgICAgICBwYXR0ZXJuVHJhbnNmb3JtLnRyYW5z bGF0ZSgwLCAtMSk7CisKKworICAgIHByb2dyYW0tPnNldE1hdHJpeChwcm9ncmFtLT50ZXh0dXJl U3BhY2VNYXRyaXhMb2NhdGlvbigpLCBwYXR0ZXJuVHJhbnNmb3JtKTsKICAgICBtX2NvbnRleHQz RC0+dW5pZm9ybTFmKHByb2dyYW0tPm9wYWNpdHlMb2NhdGlvbigpLCBvcGFjaXR5KTsKIAogICAg IGlmIChtYXNrVGV4dHVyZSAmJiBtYXNrVGV4dHVyZS0+aXNWYWxpZCgpKSB7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlclNo YWRlck1hbmFnZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFw L1RleHR1cmVNYXBwZXJTaGFkZXJNYW5hZ2VyLmNwcAppbmRleCAyOGIzM2I0ZTJiMWJlYWU3MTQz NmM4ZGIzY2MwNTAyNTEwMTdmN2NiLi5mYWQyNDI2MjQ1M2M2MmI3YzNkMjhmMjJmMTcyMjc3MGQz MDExNWM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXht YXAvVGV4dHVyZU1hcHBlclNoYWRlck1hbmFnZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyU2hhZGVyTWFuYWdlci5jcHAKQEAg LTEyNCw4ICsxMjQsNyBAQCBzdGF0aWMgY29uc3QgY2hhciogdmVydGV4VGVtcGxhdGUgPQogICAg ICAgICBhdHRyaWJ1dGUgdmVjNCBhX3ZlcnRleDsKICAgICAgICAgdW5pZm9ybSBtYXQ0IHVfbW9k ZWxWaWV3TWF0cml4OwogICAgICAgICB1bmlmb3JtIG1hdDQgdV9wcm9qZWN0aW9uTWF0cml4Owot ICAgICAgICB1bmlmb3JtIGZsb2F0IHVfZmxpcDsKLSAgICAgICAgdW5pZm9ybSB2ZWMyIHVfdGV4 dHVyZVNpemU7CisgICAgICAgIHVuaWZvcm0gbWF0NCB1X3RleHR1cmVTcGFjZU1hdHJpeDsKIAog ICAgICAgICB2YXJ5aW5nIHZlYzIgdl90ZXhDb29yZDsKICAgICAgICAgdmFyeWluZyB2ZWMyIHZf bWFza1RleENvb3JkOwpAQCAtMTcyLDcgKzE3MSwxMSBAQCBzdGF0aWMgY29uc3QgY2hhciogdmVy dGV4VGVtcGxhdGUgPQogICAgICAgICB7CiAgICAgICAgICAgICB2ZWMyIHBvc2l0aW9uID0gYV92 ZXJ0ZXgueHk7CiAgICAgICAgICAgICBhcHBseUFudGlhbGlhc0lmTmVlZGVkKHBvc2l0aW9uKTsK LSAgICAgICAgICAgIHZfdGV4Q29vcmQgPSB2ZWMyKHBvc2l0aW9uLngsIG1peChwb3NpdGlvbi55 LCAxLiAtIHBvc2l0aW9uLnksIHVfZmxpcCkpICogdV90ZXh0dXJlU2l6ZTsKKworICAgICAgICAg ICAgLy8gQ2xhbXAgaW4gdGhlIHNoYWRlciwgd2UgY2FuJ3QgcmVseSBvbiB0aGUgdGV4dHVyZSB3 cmFwIG1vZGUgdG8gY2xhbXAuCisgICAgICAgICAgICB2ZWM0IGNsYW1wZWRQb3NpdGlvbiA9IGNs YW1wKHZlYzQocG9zaXRpb24sIDAuLCAxLiksIDAuLCAxLik7CisgICAgICAgICAgICB2X3RleENv b3JkID0gKHVfdGV4dHVyZVNwYWNlTWF0cml4ICogY2xhbXBlZFBvc2l0aW9uKS54eTsKKwogICAg ICAgICAgICAgdl9tYXNrVGV4Q29vcmQgPSBwb3NpdGlvbjsKICAgICAgICAgICAgIGdsX1Bvc2l0 aW9uID0gdV9wcm9qZWN0aW9uTWF0cml4ICogdV9tb2RlbFZpZXdNYXRyaXggKiB2ZWM0KHBvc2l0 aW9uLCAwLiwgMS4pOwogICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlclNoYWRlck1hbmFnZXIuaCBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyU2hhZGVyTWFu YWdlci5oCmluZGV4IDU2NWQxMWNlOTcwNmZmOGU4YjBjOWFmMTg0ODU2NTNiOTUxM2VlNDMuLjc3 ODg1MzUzMzhhNmJmMmQ1ODBjY2YxMDljMTE2NjJhN2U1MjAzMTIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyU2hhZGVyTWFu YWdlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0 dXJlTWFwcGVyU2hhZGVyTWFuYWdlci5oCkBAIC01MCw4ICs1MCw3IEBAIHB1YmxpYzoKIAogICAg IFRFWE1BUF9ERUNMQVJFX1VOSUZPUk0obW9kZWxWaWV3TWF0cml4KQogICAgIFRFWE1BUF9ERUNM QVJFX1VOSUZPUk0ocHJvamVjdGlvbk1hdHJpeCkKLSAgICBURVhNQVBfREVDTEFSRV9VTklGT1JN KGZsaXApCi0gICAgVEVYTUFQX0RFQ0xBUkVfVU5JRk9STSh0ZXh0dXJlU2l6ZSkKKyAgICBURVhN QVBfREVDTEFSRV9VTklGT1JNKHRleHR1cmVTcGFjZU1hdHJpeCkKICAgICBURVhNQVBfREVDTEFS RV9VTklGT1JNKG9wYWNpdHkpCiAgICAgVEVYTUFQX0RFQ0xBUkVfVU5JRk9STShjb2xvcikKICAg ICBURVhNQVBfREVDTEFSRV9VTklGT1JNKGV4cGFuZGVkUXVhZEVkZ2VzSW5TY3JlZW5TcGFjZSkK 180828 2012-12-27 16:01:06 -0800 2012-12-28 20:34:22 -0800 Patch bug-105809-20121227155819.patch text/plain 4829 noam U3VidmVyc2lvbiBSZXZpc2lvbjogMTM4NTEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmQxM2Q2ODEwMWNmODlk ZjIzODc0MTFlZDdkNzg4NjM2NzA4NDc4ZS4uZjEwMGNhZDFlMmIyZWQxNjIwMzMxYjkyZTIyNWVl MWZkODZiMDdkMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTEyLTI3ICBObydh bSBSb3NlbnRoYWwgIDxub2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW1RleG1hcF0gVXNlIGEg dHJhbnNmb3JtIHVuaWZvcm0gaW5zdGVhZCBvZiB1X2ZsaXAvdV90ZXh0dXJlU2l6ZQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA1ODA5CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW4gb3JkZXIgdG8gc3Vw cG9ydCB0aWxlZC1wYXR0ZXJucywgd2UnZCBoYXZlIHRvIGFwcGx5IHRleHR1cmUtc3BhY2UgdHJh bnNmb3JtYXRpb25zIGluIHRoZQorICAgICAgICB2ZXJ0ZXggc2hhZGVyLiAKKyAgICAgICAgVGhp cyBwYXRjaCBjbGVhbnMgdXAgdGhlIGN1cnJlbnQgdGV4dHVyZS1zcGFjZSB0cmFuc2Zvcm1hdGlv bnMsIGFuZCB1c2VzIAorICAgICAgICBzaW5nbGUgbWF0cml4IHVuaWZvcm0gaW5zdGVhZCBvZiB0 aGUgY3VycmVudCB1bmlmb3Jtcy4KKworICAgICAgICBObyBuZXcgdGVzdHMsIHJlZmFjdG9yIG9u bHkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckdM LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRleHR1cmVNYXBwZXJHTDo6ZHJhd1RleHR1cmVkUXVh ZFdpdGhQcm9ncmFtKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVy ZU1hcHBlclNoYWRlck1hbmFnZXIuY3BwOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJTaGFkZXJNYW5hZ2VyLmg6Cisg ICAgICAgIChUZXh0dXJlTWFwcGVyU2hhZGVyUHJvZ3JhbSk6CisKIDIwMTItMTItMTggIE5vJ2Ft IFJvc2VudGhhbCAgPG5vYW1Ad2Via2l0Lm9yZz4KIAogICAgICAgICBbVGV4bWFwXSBFZGdlIGFu dGlhbGlhc2luZyBpbiBUZXh0dXJlTWFwcGVyIGNvdWxkIGJlIGRvbmUgd2l0aCBsZXNzIHBlci1w aXhlbCBjYWxscwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv dGV4bWFwL1RleHR1cmVNYXBwZXJHTC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckdMLmNwcAppbmRleCBmZTVkNTUyMDU4ZDI3ZjNlYjJj YWE2YWE1Yzg1ZTdiYjhjYTNiYjI3Li4zZWY2ODMwZDRmNzc4NjYwZWQ4YTNkYzY5YTA3ZDg3ZDYy YTFhMzQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXht YXAvVGV4dHVyZU1hcHBlckdMLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckdMLmNwcApAQCAtNTAwLDkgKzUwMCwxNiBAQCB2b2lk IFRleHR1cmVNYXBwZXJHTDo6ZHJhd1RleHR1cmVkUXVhZFdpdGhQcm9ncmFtKFRleHR1cmVNYXBw ZXJTaGFkZXJQcm9ncmFtKiBwcgogICAgIG1fY29udGV4dDNELT5iaW5kVGV4dHVyZSh0YXJnZXQs IHRleHR1cmUpOwogICAgIG1fY29udGV4dDNELT51bmlmb3JtMWkocHJvZ3JhbS0+c2FtcGxlckxv Y2F0aW9uKCksIDApOwogCi0gICAgRmxvYXRTaXplIHNpemVQYXJhbWV0ZXIgPSBmbGFncyAmIFNo b3VsZFVzZUFSQlRleHR1cmVSZWN0ID8gc2l6ZSA6IEZsb2F0U2l6ZSgxLCAxKTsKLSAgICBtX2Nv bnRleHQzRC0+dW5pZm9ybTJmKHByb2dyYW0tPnRleHR1cmVTaXplTG9jYXRpb24oKSwgc2l6ZVBh cmFtZXRlci53aWR0aCgpLCBzaXplUGFyYW1ldGVyLmhlaWdodCgpKTsKLSAgICBtX2NvbnRleHQz RC0+dW5pZm9ybTFmKHByb2dyYW0tPmZsaXBMb2NhdGlvbigpLCAhIShmbGFncyAmIFNob3VsZEZs aXBUZXh0dXJlKSk7CisgICAgVHJhbnNmb3JtYXRpb25NYXRyaXggcGF0dGVyblRyYW5zZm9ybTsK KyAgICBpZiAoZmxhZ3MgJiBTaG91bGRGbGlwVGV4dHVyZSkKKyAgICAgICAgcGF0dGVyblRyYW5z Zm9ybS5mbGlwWSgpOworICAgIGlmIChmbGFncyAmIFNob3VsZFVzZUFSQlRleHR1cmVSZWN0KQor ICAgICAgICBwYXR0ZXJuVHJhbnNmb3JtLnNjYWxlTm9uVW5pZm9ybShzaXplLndpZHRoKCksIHNp emUuaGVpZ2h0KCkpOworICAgIGlmIChmbGFncyAmIFNob3VsZEZsaXBUZXh0dXJlKQorICAgICAg ICBwYXR0ZXJuVHJhbnNmb3JtLnRyYW5zbGF0ZSgwLCAtMSk7CisKKworICAgIHByb2dyYW0tPnNl dE1hdHJpeChwcm9ncmFtLT50ZXh0dXJlU3BhY2VNYXRyaXhMb2NhdGlvbigpLCBwYXR0ZXJuVHJh bnNmb3JtKTsKICAgICBtX2NvbnRleHQzRC0+dW5pZm9ybTFmKHByb2dyYW0tPm9wYWNpdHlMb2Nh dGlvbigpLCBvcGFjaXR5KTsKIAogICAgIGlmIChtYXNrVGV4dHVyZSAmJiBtYXNrVGV4dHVyZS0+ aXNWYWxpZCgpKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy90ZXhtYXAvVGV4dHVyZU1hcHBlclNoYWRlck1hbmFnZXIuY3BwIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJTaGFkZXJNYW5hZ2VyLmNwcApp bmRleCAyOGIzM2I0ZTJiMWJlYWU3MTQzNmM4ZGIzY2MwNTAyNTEwMTdmN2NiLi5kZjJhMTQ3NTUz MGFjNDY2ZTY4YTJhODg2NDc5OGZhMDRmNWU2N2Y4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlclNoYWRlck1hbmFnZXIuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFw cGVyU2hhZGVyTWFuYWdlci5jcHAKQEAgLTEyNCw4ICsxMjQsNyBAQCBzdGF0aWMgY29uc3QgY2hh ciogdmVydGV4VGVtcGxhdGUgPQogICAgICAgICBhdHRyaWJ1dGUgdmVjNCBhX3ZlcnRleDsKICAg ICAgICAgdW5pZm9ybSBtYXQ0IHVfbW9kZWxWaWV3TWF0cml4OwogICAgICAgICB1bmlmb3JtIG1h dDQgdV9wcm9qZWN0aW9uTWF0cml4OwotICAgICAgICB1bmlmb3JtIGZsb2F0IHVfZmxpcDsKLSAg ICAgICAgdW5pZm9ybSB2ZWMyIHVfdGV4dHVyZVNpemU7CisgICAgICAgIHVuaWZvcm0gbWF0NCB1 X3RleHR1cmVTcGFjZU1hdHJpeDsKIAogICAgICAgICB2YXJ5aW5nIHZlYzIgdl90ZXhDb29yZDsK ICAgICAgICAgdmFyeWluZyB2ZWMyIHZfbWFza1RleENvb3JkOwpAQCAtMTcyLDcgKzE3MSwxMSBA QCBzdGF0aWMgY29uc3QgY2hhciogdmVydGV4VGVtcGxhdGUgPQogICAgICAgICB7CiAgICAgICAg ICAgICB2ZWMyIHBvc2l0aW9uID0gYV92ZXJ0ZXgueHk7CiAgICAgICAgICAgICBhcHBseUFudGlh bGlhc0lmTmVlZGVkKHBvc2l0aW9uKTsKLSAgICAgICAgICAgIHZfdGV4Q29vcmQgPSB2ZWMyKHBv c2l0aW9uLngsIG1peChwb3NpdGlvbi55LCAxLiAtIHBvc2l0aW9uLnksIHVfZmxpcCkpICogdV90 ZXh0dXJlU2l6ZTsKKworICAgICAgICAgICAgLy8gVGhlIHRleHR1cmUgcG9zaXRpb24gbmVlZHMg dG8gYmUgY2xhbXBlZCB0byAwLi4xIGJlZm9yZSB0aGUgdGV4dHVyZSBtYXRyaXggaXMgYXBwbGll ZC4KKyAgICAgICAgICAgIHZlYzQgY2xhbXBlZFBvc2l0aW9uID0gY2xhbXAodmVjNChwb3NpdGlv biwgMC4sIDEuKSwgMC4sIDEuKTsKKyAgICAgICAgICAgIHZfdGV4Q29vcmQgPSAodV90ZXh0dXJl U3BhY2VNYXRyaXggKiBjbGFtcGVkUG9zaXRpb24pLnh5OworCiAgICAgICAgICAgICB2X21hc2tU ZXhDb29yZCA9IHBvc2l0aW9uOwogICAgICAgICAgICAgZ2xfUG9zaXRpb24gPSB1X3Byb2plY3Rp b25NYXRyaXggKiB1X21vZGVsVmlld01hdHJpeCAqIHZlYzQocG9zaXRpb24sIDAuLCAxLik7CiAg ICAgICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3Rl eG1hcC9UZXh0dXJlTWFwcGVyU2hhZGVyTWFuYWdlci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJTaGFkZXJNYW5hZ2VyLmgKaW5kZXggNTY1 ZDExY2U5NzA2ZmY4ZThiMGM5YWYxODQ4NTY1M2I5NTEzZWU0My4uNzc4ODUzNTMzOGE2YmYyZDU4 MGNjZjEwOWMxMTY2MmE3ZTUyMDMxMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJTaGFkZXJNYW5hZ2VyLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJTaGFkZXJN YW5hZ2VyLmgKQEAgLTUwLDggKzUwLDcgQEAgcHVibGljOgogCiAgICAgVEVYTUFQX0RFQ0xBUkVf VU5JRk9STShtb2RlbFZpZXdNYXRyaXgpCiAgICAgVEVYTUFQX0RFQ0xBUkVfVU5JRk9STShwcm9q ZWN0aW9uTWF0cml4KQotICAgIFRFWE1BUF9ERUNMQVJFX1VOSUZPUk0oZmxpcCkKLSAgICBURVhN QVBfREVDTEFSRV9VTklGT1JNKHRleHR1cmVTaXplKQorICAgIFRFWE1BUF9ERUNMQVJFX1VOSUZP Uk0odGV4dHVyZVNwYWNlTWF0cml4KQogICAgIFRFWE1BUF9ERUNMQVJFX1VOSUZPUk0ob3BhY2l0 eSkKICAgICBURVhNQVBfREVDTEFSRV9VTklGT1JNKGNvbG9yKQogICAgIFRFWE1BUF9ERUNMQVJF X1VOSUZPUk0oZXhwYW5kZWRRdWFkRWRnZXNJblNjcmVlblNwYWNlKQo= 180912 2012-12-28 20:34:26 -0800 2012-12-28 21:11:36 -0800 Patch bug-105809-20121228203139.patch text/plain 4833 noam U3VidmVyc2lvbiBSZXZpc2lvbjogMTM4NTEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjg5YTViMjFiZGE0NzU3 YWJkN2FlZDI4N2Y3OGZhYjQwMDE5MjE2Mi4uOTU2M2M5NTMzNGU3YmY1OTg5ZjM2MTk4YWE4YTky NGU4ZmZhODY2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTEyLTI3ICBObydh bSBSb3NlbnRoYWwgIDxub2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW1RleG1hcF0gVXNlIGEg dHJhbnNmb3JtIHVuaWZvcm0gaW5zdGVhZCBvZiB1X2ZsaXAvdV90ZXh0dXJlU2l6ZQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA1ODA5CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTWFydGluIFJvYmluc29uLgorCisgICAgICAgIEluIG9yZGVyIHRvIHN1 cHBvcnQgdGlsZWQtcGF0dGVybnMsIHdlJ2QgaGF2ZSB0byBhcHBseSB0ZXh0dXJlLXNwYWNlIHRy YW5zZm9ybWF0aW9ucyBpbiB0aGUKKyAgICAgICAgdmVydGV4IHNoYWRlci4gCisgICAgICAgIFRo aXMgcGF0Y2ggY2xlYW5zIHVwIHRoZSBjdXJyZW50IHRleHR1cmUtc3BhY2UgdHJhbnNmb3JtYXRp b25zLCBhbmQgdXNlcyAKKyAgICAgICAgc2luZ2xlIG1hdHJpeCB1bmlmb3JtIGluc3RlYWQgb2Yg dGhlIGN1cnJlbnQgdW5pZm9ybXMuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCByZWZhY3RvciBv bmx5LgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJH TC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpUZXh0dXJlTWFwcGVyR0w6OmRyYXdUZXh0dXJlZFF1 YWRXaXRoUHJvZ3JhbSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1 cmVNYXBwZXJTaGFkZXJNYW5hZ2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyU2hhZGVyTWFuYWdlci5oOgor ICAgICAgICAoVGV4dHVyZU1hcHBlclNoYWRlclByb2dyYW0pOgorCiAyMDEyLTEyLTE4ICBObydh bSBSb3NlbnRoYWwgIDxub2FtQHdlYmtpdC5vcmc+CiAKICAgICAgICAgW1RleG1hcF0gRWRnZSBh bnRpYWxpYXNpbmcgaW4gVGV4dHVyZU1hcHBlciBjb3VsZCBiZSBkb25lIHdpdGggbGVzcyBwZXIt cGl4ZWwgY2FsbHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L3RleG1hcC9UZXh0dXJlTWFwcGVyR0wuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJHTC5jcHAKaW5kZXggNzk2OTdmN2E5YmJhNjEyMTE5 NjhmOTM1ZDE0YzRjYzY1ZGUzYzBjMC4uZmE0MzdkMzcxMGI4Nzk4OTVlYzUzMzMxYjc4ZDNhZTE5 NThkNGRkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4 bWFwL1RleHR1cmVNYXBwZXJHTC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJHTC5jcHAKQEAgLTUwNyw5ICs1MDcsMTYgQEAgdm9p ZCBUZXh0dXJlTWFwcGVyR0w6OmRyYXdUZXh0dXJlZFF1YWRXaXRoUHJvZ3JhbShUZXh0dXJlTWFw cGVyU2hhZGVyUHJvZ3JhbSogcHIKICAgICBtX2NvbnRleHQzRC0+YmluZFRleHR1cmUodGFyZ2V0 LCB0ZXh0dXJlKTsKICAgICBtX2NvbnRleHQzRC0+dW5pZm9ybTFpKHByb2dyYW0tPnNhbXBsZXJM b2NhdGlvbigpLCAwKTsKIAotICAgIEZsb2F0U2l6ZSBzaXplUGFyYW1ldGVyID0gZmxhZ3MgJiBT aG91bGRVc2VBUkJUZXh0dXJlUmVjdCA/IHNpemUgOiBGbG9hdFNpemUoMSwgMSk7Ci0gICAgbV9j b250ZXh0M0QtPnVuaWZvcm0yZihwcm9ncmFtLT50ZXh0dXJlU2l6ZUxvY2F0aW9uKCksIHNpemVQ YXJhbWV0ZXIud2lkdGgoKSwgc2l6ZVBhcmFtZXRlci5oZWlnaHQoKSk7Ci0gICAgbV9jb250ZXh0 M0QtPnVuaWZvcm0xZihwcm9ncmFtLT5mbGlwTG9jYXRpb24oKSwgISEoZmxhZ3MgJiBTaG91bGRG bGlwVGV4dHVyZSkpOworICAgIFRyYW5zZm9ybWF0aW9uTWF0cml4IHBhdHRlcm5UcmFuc2Zvcm07 CisgICAgaWYgKGZsYWdzICYgU2hvdWxkRmxpcFRleHR1cmUpCisgICAgICAgIHBhdHRlcm5UcmFu c2Zvcm0uZmxpcFkoKTsKKyAgICBpZiAoZmxhZ3MgJiBTaG91bGRVc2VBUkJUZXh0dXJlUmVjdCkK KyAgICAgICAgcGF0dGVyblRyYW5zZm9ybS5zY2FsZU5vblVuaWZvcm0oc2l6ZS53aWR0aCgpLCBz aXplLmhlaWdodCgpKTsKKyAgICBpZiAoZmxhZ3MgJiBTaG91bGRGbGlwVGV4dHVyZSkKKyAgICAg ICAgcGF0dGVyblRyYW5zZm9ybS50cmFuc2xhdGUoMCwgLTEpOworCisKKyAgICBwcm9ncmFtLT5z ZXRNYXRyaXgocHJvZ3JhbS0+dGV4dHVyZVNwYWNlTWF0cml4TG9jYXRpb24oKSwgcGF0dGVyblRy YW5zZm9ybSk7CiAgICAgbV9jb250ZXh0M0QtPnVuaWZvcm0xZihwcm9ncmFtLT5vcGFjaXR5TG9j YXRpb24oKSwgb3BhY2l0eSk7CiAKICAgICBpZiAobWFza1RleHR1cmUgJiYgbWFza1RleHR1cmUt PmlzVmFsaWQoKSkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvdGV4bWFwL1RleHR1cmVNYXBwZXJTaGFkZXJNYW5hZ2VyLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyU2hhZGVyTWFuYWdlci5jcHAK aW5kZXggMTg1NWJlYjZlMDI4ZmQ0ZGQwNmE4YWFmMjU4ZGE1MDk2MzZjOGVjYi4uNmYxZDczMDNj YWNkMGI5NDZkYTE0OWY1YTUzMzY2NWZjNWM5OTMwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJTaGFkZXJNYW5hZ2VyLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1h cHBlclNoYWRlck1hbmFnZXIuY3BwCkBAIC0xMjQsOCArMTI0LDcgQEAgc3RhdGljIGNvbnN0IGNo YXIqIHZlcnRleFRlbXBsYXRlID0KICAgICAgICAgYXR0cmlidXRlIHZlYzQgYV92ZXJ0ZXg7CiAg ICAgICAgIHVuaWZvcm0gbWF0NCB1X21vZGVsVmlld01hdHJpeDsKICAgICAgICAgdW5pZm9ybSBt YXQ0IHVfcHJvamVjdGlvbk1hdHJpeDsKLSAgICAgICAgdW5pZm9ybSBmbG9hdCB1X2ZsaXA7Ci0g ICAgICAgIHVuaWZvcm0gdmVjMiB1X3RleHR1cmVTaXplOworICAgICAgICB1bmlmb3JtIG1hdDQg dV90ZXh0dXJlU3BhY2VNYXRyaXg7CiAKICAgICAgICAgdmFyeWluZyB2ZWMyIHZfdGV4Q29vcmQ7 CiAgICAgICAgIHZhcnlpbmcgdmVjMiB2X21hc2tUZXhDb29yZDsKQEAgLTE3Myw3ICsxNzIsMTEg QEAgc3RhdGljIGNvbnN0IGNoYXIqIHZlcnRleFRlbXBsYXRlID0KICAgICAgICAgewogICAgICAg ICAgICAgdmVjMiBwb3NpdGlvbiA9IGFfdmVydGV4Lnh5OwogICAgICAgICAgICAgYXBwbHlBbnRp YWxpYXNpbmdJZk5lZWRlZChwb3NpdGlvbik7Ci0gICAgICAgICAgICB2X3RleENvb3JkID0gdmVj Mihwb3NpdGlvbi54LCBtaXgocG9zaXRpb24ueSwgMS4gLSBwb3NpdGlvbi55LCB1X2ZsaXApKSAq IHVfdGV4dHVyZVNpemU7CisKKyAgICAgICAgICAgIC8vIFRoZSB0ZXh0dXJlIHBvc2l0aW9uIG5l ZWRzIHRvIGJlIGNsYW1wZWQgdG8gMC4uMSBiZWZvcmUgdGhlIHRleHR1cmUgbWF0cml4IGlzIGFw cGxpZWQuCisgICAgICAgICAgICB2ZWM0IGNsYW1wZWRQb3NpdGlvbiA9IGNsYW1wKHZlYzQocG9z aXRpb24sIDAuLCAxLiksIDAuLCAxLik7CisgICAgICAgICAgICB2X3RleENvb3JkID0gKHVfdGV4 dHVyZVNwYWNlTWF0cml4ICogY2xhbXBlZFBvc2l0aW9uKS54eTsKKwogICAgICAgICAgICAgdl9t YXNrVGV4Q29vcmQgPSBwb3NpdGlvbjsKICAgICAgICAgICAgIGdsX1Bvc2l0aW9uID0gdV9wcm9q ZWN0aW9uTWF0cml4ICogdV9tb2RlbFZpZXdNYXRyaXggKiB2ZWM0KHBvc2l0aW9uLCAwLiwgMS4p OwogICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy90ZXhtYXAvVGV4dHVyZU1hcHBlclNoYWRlck1hbmFnZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyU2hhZGVyTWFuYWdlci5oCmluZGV4 IDNmNWFlNjhhMWU0ZTU3MzI0YzAzNTg4NmNlM2E4Y2EyYTE0ZTc4YmMuLmZmMTc0OTgzZGRjNWU2 NjQxNzk4ZDg5OWQ2OWM0ZGVlZmFlNTZmZjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyU2hhZGVyTWFuYWdlci5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyU2hh ZGVyTWFuYWdlci5oCkBAIC01MCw4ICs1MCw3IEBAIHB1YmxpYzoKIAogICAgIFRFWE1BUF9ERUNM QVJFX1VOSUZPUk0obW9kZWxWaWV3TWF0cml4KQogICAgIFRFWE1BUF9ERUNMQVJFX1VOSUZPUk0o cHJvamVjdGlvbk1hdHJpeCkKLSAgICBURVhNQVBfREVDTEFSRV9VTklGT1JNKGZsaXApCi0gICAg VEVYTUFQX0RFQ0xBUkVfVU5JRk9STSh0ZXh0dXJlU2l6ZSkKKyAgICBURVhNQVBfREVDTEFSRV9V TklGT1JNKHRleHR1cmVTcGFjZU1hdHJpeCkKICAgICBURVhNQVBfREVDTEFSRV9VTklGT1JNKG9w YWNpdHkpCiAgICAgVEVYTUFQX0RFQ0xBUkVfVU5JRk9STShjb2xvcikKICAgICBURVhNQVBfREVD TEFSRV9VTklGT1JNKGV4cGFuZGVkUXVhZEVkZ2VzSW5TY3JlZW5TcGFjZSkK