81103 2012-03-14 07:25:55 -0700 [Texmap] Implement BGRA swizzling detection 2013-02-04 13:50:57 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 hausmann webkit-unassigned igor.oliveira jturcotte noam ostap73 webkit.review.bot oldest_to_newest 578367 0 hausmann 2012-03-14 07:25:55 -0700 We used to check if GL_EXT_texture_format_BGRA8888 is listed in the extensions to assume that the driver supports swizzling from GL_BGRA to the GL_RGBA texture format. Unfortunately this does not work reliably with all chipsets. 579228 1 hausmann 2012-03-15 02:34:04 -0700 r110703 removed the swizzling for GLES. 579231 2 hausmann 2012-03-15 02:42:46 -0700 From http://www.khronos.org/opengles/sdk/docs/man/xhtml/glTexSubImage2D.xml it appears that the format passed to glTexSubImage2D is supposed to be the same: "GL_INVALID_OPERATION is generated if the texture array has not been defined by a previous glTexImage2D or glCopyTexImage2D operation whose internalformat matches the format of glTexSubImage2D." 579233 3 hausmann 2012-03-15 02:48:28 -0700 Another interesting point: <k5kangas> You might also want to quote OpenGLES2 spec, v2.0.25, page 72, "Each of the TexSubImage commands <k5kangas> interprets and processes pixel groups in exactly the manner of its TexImage coun- <k5kangas> terpart, except that the assignment of R, G, B, and A pixel group values to the <k5kangas> texture components is controlled by the internalformat of the texture array, not <k5kangas> by an argument to the command. 579236 4 noam 2012-03-15 02:55:24 -0700 (In reply to comment #3) > Another interesting point: > > <k5kangas> You might also want to quote OpenGLES2 spec, v2.0.25, page 72, "Each of the TexSubImage commands > <k5kangas> interprets and processes pixel groups in exactly the manner of its TexImage coun- > <k5kangas> terpart, except that the assignment of R, G, B, and A pixel group values to the > <k5kangas> texture components is controlled by the internalformat of the texture array, not > <k5kangas> by an argument to the command. Interesting. I wonder why this is the only thing that had worked for desktop and Harmattan then :) 823361 5 186167 igor.oliveira 2013-02-01 15:36:23 -0800 Created attachment 186167 Patch Proposed patch 823376 6 186167 ostap73 2013-02-01 15:46:40 -0800 Comment on attachment 186167 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=186167&action=review > Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp:589 > + return context->getExtensions()->supports("GL_EXT_texture_format_BGRA8888"); It is called so many times. I doubt that swizzling support can change during app execution and would cache result here. Something like this: static bool canSwizzle = context->getExtensions()->supports("GL_EXT_texture_format_BGRA8888"); return canSwizzle; 823383 7 186175 igor.oliveira 2013-02-01 15:55:08 -0800 Created attachment 186175 Patch V2 Proposed patch. 823390 8 186178 igor.oliveira 2013-02-01 15:59:32 -0800 Created attachment 186178 Patch v3 Fix left over from other patch. 823565 9 186178 noam 2013-02-01 22:57:20 -0800 Comment on attachment 186178 Patch v3 View in context: https://bugs.webkit.org/attachment.cgi?id=186178&action=review I remember this kind of patch had a tendency to break stuff :) Can someone validate it on more than one GLES2 hardware? > Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp:591 > #if defined(TEXMAP_OPENGL_ES_2) > - // FIXME: Implement reliable detection. See also https://bugs.webkit.org/show_bug.cgi?id=81103. > - return false; > + static bool supportsExternalTextureBGRA = context->getExtensions()->supports("GL_EXT_texture_format_BGRA8888"); > + return supportsExternalTextureBGRA; > #else I think we shoul switch here to isGLES2Compliant() instead of an #ifdef 823586 10 igor.oliveira 2013-02-02 00:16:28 -0800 (In reply to comment #9) > (From update of attachment 186178 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=186178&action=review > > I remember this kind of patch had a tendency to break stuff :) > Can someone validate it on more than one GLES2 hardware? I tested in mesa3d llvmpipe, intel and mali t400. The reverted implementation(changeset r110703) was slightly different. Basically it was just using BGRA in the external format, however in the GLESv2 case, when BGRA is used it also needs to be used in the internal texture format. > > > Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp:591 > > #if defined(TEXMAP_OPENGL_ES_2) > > - // FIXME: Implement reliable detection. See also https://bugs.webkit.org/show_bug.cgi?id=81103. > > - return false; > > + static bool supportsExternalTextureBGRA = context->getExtensions()->supports("GL_EXT_texture_format_BGRA8888"); > > + return supportsExternalTextureBGRA; > > #else > > I think we shoul switch here to isGLES2Compliant() instead of an #ifdef 823611 11 noam 2013-02-02 01:45:26 -0800 (In reply to comment #10) > (In reply to comment #9) > > (From update of attachment 186178 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=186178&action=review > > > > I remember this kind of patch had a tendency to break stuff :) > > Can someone validate it on more than one GLES2 hardware? > > I tested in mesa3d llvmpipe, intel and mali t400. > The reverted implementation(changeset r110703) was slightly different. Basically it was just using BGRA in the external format, however in the GLESv2 case, when BGRA is used it also needs to be used in the internal texture format. Yes, in the N9 case that's the only thing that worked (and N9 was the only GLESv2 device running TextureMapper at the time). But I think this should be ok, if you can address the other comment :) 823781 12 186178 noam 2013-02-03 01:14:56 -0800 Comment on attachment 186178 Patch v3 See previous comment. 824624 13 186427 igor.oliveira 2013-02-04 11:55:20 -0800 Created attachment 186427 Patch Patch for landing. 824720 14 186427 webkit.review.bot 2013-02-04 13:50:53 -0800 Comment on attachment 186427 Patch Clearing flags on attachment: 186427 Committed r141807: <http://trac.webkit.org/changeset/141807> 824721 15 webkit.review.bot 2013-02-04 13:50:57 -0800 All reviewed patches have been landed. Closing bug. 186167 2013-02-01 15:36:23 -0800 2013-02-01 15:55:08 -0800 Patch 0001-https-bugs.webkit.org-show_bug.cgi-id-81103.patch text/plain 5421 igor.oliveira RnJvbSBiZTdiMjlhMDNjMmJhNDE3NGZiNDg3YTRlMTc4M2MyZTg1YWM0YWFhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBJZ29yIE9saXZlaXJhIDxpZ29yLm9Ac2lzYS5zYW1zdW5nLmNv bT4KRGF0ZTogRnJpLCAxIEZlYiAyMDEzIDE0OjQ3OjUxIC0wODAwClN1YmplY3Q6IFtQQVRDSF0g aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgxMTAzCgotLS0KIFNvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAxNiArKysr KysrKysrKysrCiAuLi4vcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJHTC5j cHAgICB8ICAgMjUgKysrKysrKysrKysrKy0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgMzMgaW5z ZXJ0aW9ucygrKSwgOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2E5MzdiOS4uNTgxOTI0 YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEzLTAyLTAxICBJZ29yIE9saXZlaXJh ICA8aWdvci5vQHNpc2Euc2Ftc3VuZy5jb20+CisKKyAgICAgICAgW1RleG1hcF0gSW1wbGVtZW50 IEJHUkEgc3dpenpsaW5nIGRldGVjdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9ODExMDMKKworICAgICAgICBGb3IgT3BlbkdMRVMgaWYgdGhlIGV4 dGVuc2lvbiBFWFRfdGV4dHVyZV9mb3JtYXRfQkdSQTg4ODggaXMgc3VwcG9ydGVkCisgICAgICAg IHRoZSBpbnRlcm5hbCBhbmQgZXh0ZXJuYWwgZm9ybWF0cyBuZWVkIHRvIGJlIEJHUkEuCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckdMLmNwcDoKKyAgICAgICAgKFdlYkNvcmUpOgor ICAgICAgICAoV2ViQ29yZTo6ZHJpdmVyU3VwcG9ydHNFeHRlcm5hbFRleHR1cmVCR1JBKToKKyAg ICAgICAgKFdlYkNvcmU6OmRyaXZlclN1cHBvcnRzU3ViSW1hZ2UpOgorICAgICAgICAoV2ViQ29y ZTo6Qml0bWFwVGV4dHVyZUdMOjpkaWRSZXNldCk6CisKIDIwMTMtMDItMDEgIFJ5b3N1a2UgTml3 YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgU21hcnQgbGluayBjYW4gZXJyb25lb3Vz bHkgbW92ZSBjYXJldCBhZnRlciBhbiBVUkwgd2hlbiB0eXBpbmcgaW1tZWRpYXRlbHkgYmVmb3Jl IGl0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAv VGV4dHVyZU1hcHBlckdMLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3Rl eG1hcC9UZXh0dXJlTWFwcGVyR0wuY3BwCmluZGV4IDM3OGU3MzIuLmJkODRlNDkgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVy R0wuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0 dXJlTWFwcGVyR0wuY3BwCkBAIC01ODEsMTEgKzU4MSwxMiBAQCBzdGF0aWMgdm9pZCBzd2l6emxl QkdSQVRvUkdCQSh1aW50MzJfdCogZGF0YSwgY29uc3QgSW50UmVjdCYgcmVjdCwgaW50IHN0cmlk ZSA9CiAgICAgfQogfQogCi1zdGF0aWMgYm9vbCBkcml2ZXJTdXBwb3J0c0JHUkFTd2l6emxpbmco KQorLy8gSWYgR0xfRVhUX3RleHR1cmVfZm9ybWF0X0JHUkE4ODg4IGlzIHN1cHBvcnRlZCBpbiB0 aGUgT3BlbkdMRVMKKy8vIGludGVybmFsIGFuZCBleHRlcm5hbCBmb3JtYXRzIG5lZWQgdG8gYmUg QkdSQQorc3RhdGljIGJvb2wgZHJpdmVyU3VwcG9ydHNFeHRlcm5hbFRleHR1cmVCR1JBKEdyYXBo aWNzQ29udGV4dDNEKiBjb250ZXh0KQogewogI2lmIGRlZmluZWQoVEVYTUFQX09QRU5HTF9FU18y KQotICAgIC8vIEZJWE1FOiBJbXBsZW1lbnQgcmVsaWFibGUgZGV0ZWN0aW9uLiBTZWUgYWxzbyBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODExMDMuCi0gICAgcmV0dXJu IGZhbHNlOworICAgIHJldHVybiBjb250ZXh0LT5nZXRFeHRlbnNpb25zKCktPnN1cHBvcnRzKCJH TF9FWFRfdGV4dHVyZV9mb3JtYXRfQkdSQTg4ODgiKTsKICNlbHNlCiAgICAgcmV0dXJuIHRydWU7 CiAjZW5kaWYKQEAgLTU5NCw3ICs1OTUsNiBAQCBzdGF0aWMgYm9vbCBkcml2ZXJTdXBwb3J0c0JH UkFTd2l6emxpbmcoKQogc3RhdGljIGJvb2wgZHJpdmVyU3VwcG9ydHNTdWJJbWFnZSgpCiB7CiAj aWYgZGVmaW5lZChURVhNQVBfT1BFTkdMX0VTXzIpCi0gICAgLy8gRklYTUU6IEltcGxlbWVudCBy ZWxpYWJsZSBkZXRlY3Rpb24uCiAgICAgcmV0dXJuIGZhbHNlOwogI2Vsc2UKICAgICByZXR1cm4g dHJ1ZTsKQEAgLTYxMCw3ICs2MTAsNiBAQCB2b2lkIEJpdG1hcFRleHR1cmVHTDo6ZGlkUmVzZXQo KQogICAgIGlmIChtX3RleHR1cmVTaXplID09IGNvbnRlbnRTaXplKCkpCiAgICAgICAgIHJldHVy bjsKIAotICAgIFBsYXRmb3JtM0RPYmplY3QgZm9ybWF0ID0gZHJpdmVyU3VwcG9ydHNCR1JBU3dp enpsaW5nKCkgPyBHcmFwaGljc0NvbnRleHQzRDo6QkdSQSA6IEdyYXBoaWNzQ29udGV4dDNEOjpS R0JBOwogCiAgICAgbV90ZXh0dXJlU2l6ZSA9IGNvbnRlbnRTaXplKCk7CiAgICAgbV9jb250ZXh0 M0QtPmJpbmRUZXh0dXJlKEdyYXBoaWNzQ29udGV4dDNEOjpURVhUVVJFXzJELCBtX2lkKTsKQEAg LTYxOCw3ICs2MTcsMTcgQEAgdm9pZCBCaXRtYXBUZXh0dXJlR0w6OmRpZFJlc2V0KCkKICAgICBt X2NvbnRleHQzRC0+dGV4UGFyYW1ldGVyaShHcmFwaGljc0NvbnRleHQzRDo6VEVYVFVSRV8yRCwg R3JhcGhpY3NDb250ZXh0M0Q6OlRFWFRVUkVfTUFHX0ZJTFRFUiwgR3JhcGhpY3NDb250ZXh0M0Q6 OkxJTkVBUik7CiAgICAgbV9jb250ZXh0M0QtPnRleFBhcmFtZXRlcmkoR3JhcGhpY3NDb250ZXh0 M0Q6OlRFWFRVUkVfMkQsIEdyYXBoaWNzQ29udGV4dDNEOjpURVhUVVJFX1dSQVBfUywgR3JhcGhp Y3NDb250ZXh0M0Q6OkNMQU1QX1RPX0VER0UpOwogICAgIG1fY29udGV4dDNELT50ZXhQYXJhbWV0 ZXJpKEdyYXBoaWNzQ29udGV4dDNEOjpURVhUVVJFXzJELCBHcmFwaGljc0NvbnRleHQzRDo6VEVY VFVSRV9XUkFQX1QsIEdyYXBoaWNzQ29udGV4dDNEOjpDTEFNUF9UT19FREdFKTsKLSAgICBtX2Nv bnRleHQzRC0+dGV4SW1hZ2UyRERpcmVjdChHcmFwaGljc0NvbnRleHQzRDo6VEVYVFVSRV8yRCwg MCwgR3JhcGhpY3NDb250ZXh0M0Q6OlJHQkEsIG1fdGV4dHVyZVNpemUud2lkdGgoKSwgbV90ZXh0 dXJlU2l6ZS5oZWlnaHQoKSwgMCwgZm9ybWF0LCBERUZBVUxUX1RFWFRVUkVfUElYRUxfVFJBTlNG RVJfVFlQRSwgMCk7CisKKyAgICBQbGF0Zm9ybTNET2JqZWN0IGludGVybmFsRm9ybWF0ID0gR3Jh cGhpY3NDb250ZXh0M0Q6OlJHQkE7CisgICAgUGxhdGZvcm0zRE9iamVjdCBleHRlcm5hbEZvcm1h dCA9IEdyYXBoaWNzQ29udGV4dDNEOjpCR1JBOworICAgIGlmIChtX2NvbnRleHQzRC0+aXNHTEVT MkNvbXBsaWFudCgpKSB7CisgICAgICAgIGlmIChkcml2ZXJTdXBwb3J0c0V4dGVybmFsVGV4dHVy ZUJHUkEobV9jb250ZXh0M0QuZ2V0KCkpKQorICAgICAgICAgICAgaW50ZXJuYWxGb3JtYXQgPSBH cmFwaGljc0NvbnRleHQzRDo6QkdSQTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgZXh0ZXJu YWxGb3JtYXQgPSBHcmFwaGljc0NvbnRleHQzRDo6UkdCQTsKKyAgICB9CisKKyAgICBtX2NvbnRl eHQzRC0+dGV4SW1hZ2UyRERpcmVjdChHcmFwaGljc0NvbnRleHQzRDo6VEVYVFVSRV8yRCwgMCwg aW50ZXJuYWxGb3JtYXQsIG1fdGV4dHVyZVNpemUud2lkdGgoKSwgbV90ZXh0dXJlU2l6ZS5oZWln aHQoKSwgMCwgZXh0ZXJuYWxGb3JtYXQsIERFRkFVTFRfVEVYVFVSRV9QSVhFTF9UUkFOU0ZFUl9U WVBFLCAwKTsKIH0KIAogdm9pZCBCaXRtYXBUZXh0dXJlR0w6OnVwZGF0ZUNvbnRlbnRzTm9Td2l6 emxlKGNvbnN0IHZvaWQqIHNyY0RhdGEsIGNvbnN0IEludFJlY3QmIHRhcmdldFJlY3QsIGNvbnN0 IEludFBvaW50JiBzb3VyY2VPZmZzZXQsIGludCBieXRlc1BlckxpbmUsIHVuc2lnbmVkIGJ5dGVz UGVyUGl4ZWwsIFBsYXRmb3JtM0RPYmplY3QgZ2xGb3JtYXQpCkBAIC02NTcsNyArNjY2LDcgQEAg dm9pZCBCaXRtYXBUZXh0dXJlR0w6OnVwZGF0ZUNvbnRlbnRzKGNvbnN0IHZvaWQqIHNyY0RhdGEs IGNvbnN0IEludFJlY3QmIHRhcmdldFIKICAgICAgICAgJiYgIShieXRlc1BlckxpbmUgPT0gc3Rh dGljX2Nhc3Q8aW50Pih0YXJnZXRSZWN0LndpZHRoKCkgKiBieXRlc1BlclBpeGVsKSAmJiBhZGp1 c3RlZFNvdXJjZU9mZnNldCA9PSBJbnRQb2ludDo6emVybygpKTsKIAogICAgIC8vIHByZXBhcmUg dGVtcG9yYXJ5RGF0YSBpZiBuZWNlc3NhcnkKLSAgICBpZiAoKCFkcml2ZXJTdXBwb3J0c0JHUkFT d2l6emxpbmcoKSAmJiB1cGRhdGVDb250ZW50c0ZsYWcgPT0gVXBkYXRlQ2Fubm90TW9kaWZ5T3Jp Z2luYWxJbWFnZURhdGEpIHx8IHJlcXVpcmVTdWJJbWFnZUJ1ZmZlcikgeworICAgIGlmICgoIWRy aXZlclN1cHBvcnRzRXh0ZXJuYWxUZXh0dXJlQkdSQShtX2NvbnRleHQzRC5nZXQoKSkgJiYgdXBk YXRlQ29udGVudHNGbGFnID09IFVwZGF0ZUNhbm5vdE1vZGlmeU9yaWdpbmFsSW1hZ2VEYXRhKSB8 fCByZXF1aXJlU3ViSW1hZ2VCdWZmZXIpIHsKICAgICAgICAgdGVtcG9yYXJ5RGF0YS5yZXNpemUo dGFyZ2V0UmVjdC53aWR0aCgpICogdGFyZ2V0UmVjdC5oZWlnaHQoKSAqIGJ5dGVzUGVyUGl4ZWwp OwogICAgICAgICBkYXRhID0gdGVtcG9yYXJ5RGF0YS5kYXRhKCk7CiAgICAgICAgIGNvbnN0IGNo YXIqIGJpdHMgPSBzdGF0aWNfY2FzdDxjb25zdCBjaGFyKj4oc3JjRGF0YSk7CkBAIC02NzQsNyAr NjgzLDcgQEAgdm9pZCBCaXRtYXBUZXh0dXJlR0w6OnVwZGF0ZUNvbnRlbnRzKGNvbnN0IHZvaWQq IHNyY0RhdGEsIGNvbnN0IEludFJlY3QmIHRhcmdldFIKICAgICAgICAgYWRqdXN0ZWRTb3VyY2VP ZmZzZXQgPSBJbnRQb2ludCgwLCAwKTsKICAgICB9CiAKLSAgICBpZiAoZHJpdmVyU3VwcG9ydHNC R1JBU3dpenpsaW5nKCkpCisgICAgaWYgKGRyaXZlclN1cHBvcnRzRXh0ZXJuYWxUZXh0dXJlQkdS QShtX2NvbnRleHQzRC5nZXQoKSkpCiAgICAgICAgIGdsRm9ybWF0ID0gR3JhcGhpY3NDb250ZXh0 M0Q6OkJHUkE7CiAgICAgZWxzZQogICAgICAgICBzd2l6emxlQkdSQVRvUkdCQShyZWludGVycHJl dF9jYXN0PHVpbnQzMl90Kj4oZGF0YSksIEludFJlY3QoYWRqdXN0ZWRTb3VyY2VPZmZzZXQsIHRh cmdldFJlY3Quc2l6ZSgpKSwgYnl0ZXNQZXJMaW5lIC8gYnl0ZXNQZXJQaXhlbCk7Ci0tIAoxLjcu MTAuNAoK 186175 2013-02-01 15:55:08 -0800 2013-02-01 15:59:32 -0800 Patch V2 0001-https-bugs.webkit.org-show_bug.cgi-id-81103.patch text/plain 5496 igor.oliveira RnJvbSBiNWRiZjEyZTFmMDliNDBhM2VhMGJjMjlkZDJkZTEyYmZmZTMxYTQ4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBJZ29yIE9saXZlaXJhIDxpZ29yLm9Ac2lzYS5zYW1zdW5nLmNv bT4KRGF0ZTogRnJpLCAxIEZlYiAyMDEzIDE0OjQ3OjUxIC0wODAwClN1YmplY3Q6IFtQQVRDSF0g aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgxMTAzCgotLS0KIFNvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAxNiArKysr KysrKysrKysKIC4uLi9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckdMLmNw cCAgIHwgICAyNiArKysrKysrKysrKysrKy0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCAzNCBpbnNl cnRpb25zKCspLCA4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA3YTkzN2I5Li41ODE5MjRj IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTMtMDItMDEgIElnb3IgT2xpdmVpcmEg IDxpZ29yLm9Ac2lzYS5zYW1zdW5nLmNvbT4KKworICAgICAgICBbVGV4bWFwXSBJbXBsZW1lbnQg QkdSQSBzd2l6emxpbmcgZGV0ZWN0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD04MTEwMworCisgICAgICAgIEZvciBPcGVuR0xFUyBpZiB0aGUgZXh0 ZW5zaW9uIEVYVF90ZXh0dXJlX2Zvcm1hdF9CR1JBODg4OCBpcyBzdXBwb3J0ZWQKKyAgICAgICAg dGhlIGludGVybmFsIGFuZCBleHRlcm5hbCBmb3JtYXRzIG5lZWQgdG8gYmUgQkdSQS4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyR0wuY3BwOgorICAgICAgICAoV2ViQ29yZSk6Cisg ICAgICAgIChXZWJDb3JlOjpkcml2ZXJTdXBwb3J0c0V4dGVybmFsVGV4dHVyZUJHUkEpOgorICAg ICAgICAoV2ViQ29yZTo6ZHJpdmVyU3VwcG9ydHNTdWJJbWFnZSk6CisgICAgICAgIChXZWJDb3Jl OjpCaXRtYXBUZXh0dXJlR0w6OmRpZFJlc2V0KToKKwogMjAxMy0wMi0wMSAgUnlvc3VrZSBOaXdh ICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBTbWFydCBsaW5rIGNhbiBlcnJvbmVvdXNs eSBtb3ZlIGNhcmV0IGFmdGVyIGFuIFVSTCB3aGVuIHR5cGluZyBpbW1lZGlhdGVseSBiZWZvcmUg aXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9U ZXh0dXJlTWFwcGVyR0wuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4 bWFwL1RleHR1cmVNYXBwZXJHTC5jcHAKaW5kZXggMzc4ZTczMi4uZDc3Yzg4MSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJH TC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1 cmVNYXBwZXJHTC5jcHAKQEAgLTU4MSwxMSArNTgxLDEzIEBAIHN0YXRpYyB2b2lkIHN3aXp6bGVC R1JBVG9SR0JBKHVpbnQzMl90KiBkYXRhLCBjb25zdCBJbnRSZWN0JiByZWN0LCBpbnQgc3RyaWRl ID0KICAgICB9CiB9CiAKLXN0YXRpYyBib29sIGRyaXZlclN1cHBvcnRzQkdSQVN3aXp6bGluZygp CisvLyBJZiBHTF9FWFRfdGV4dHVyZV9mb3JtYXRfQkdSQTg4ODggaXMgc3VwcG9ydGVkIGluIHRo ZSBPcGVuR0xFUworLy8gaW50ZXJuYWwgYW5kIGV4dGVybmFsIGZvcm1hdHMgbmVlZCB0byBiZSBC R1JBCitzdGF0aWMgYm9vbCBkcml2ZXJTdXBwb3J0c0V4dGVybmFsVGV4dHVyZUJHUkEoR3JhcGhp Y3NDb250ZXh0M0QqIGNvbnRleHQpCiB7CiAjaWYgZGVmaW5lZChURVhNQVBfT1BFTkdMX0VTXzIp Ci0gICAgLy8gRklYTUU6IEltcGxlbWVudCByZWxpYWJsZSBkZXRlY3Rpb24uIFNlZSBhbHNvIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MTEwMy4KLSAgICByZXR1cm4g ZmFsc2U7CisgICAgc3RhdGljIGJvb2wgc3VwcG9ydHNFeHRlcm5hbFRleHR1cmVCR1JBID0gY29u dGV4dC0+Z2V0RXh0ZW5zaW9ucygpLT5zdXBwb3J0cygiR0xfRVhUX3RleHR1cmVfZm9ybWF0X0JH UkE4ODg4Iik7CisgICAgcmV0dXJuIHN1cHBvcnRzRXh0ZXJuYWxUZXh0dXJlQkdSQTsKICNlbHNl CiAgICAgcmV0dXJuIHRydWU7CiAjZW5kaWYKQEAgLTU5NCw3ICs1OTYsNiBAQCBzdGF0aWMgYm9v bCBkcml2ZXJTdXBwb3J0c0JHUkFTd2l6emxpbmcoKQogc3RhdGljIGJvb2wgZHJpdmVyU3VwcG9y dHNTdWJJbWFnZSgpCiB7CiAjaWYgZGVmaW5lZChURVhNQVBfT1BFTkdMX0VTXzIpCi0gICAgLy8g RklYTUU6IEltcGxlbWVudCByZWxpYWJsZSBkZXRlY3Rpb24uCiAgICAgcmV0dXJuIGZhbHNlOwog I2Vsc2UKICAgICByZXR1cm4gdHJ1ZTsKQEAgLTYxMCw3ICs2MTEsNiBAQCB2b2lkIEJpdG1hcFRl eHR1cmVHTDo6ZGlkUmVzZXQoKQogICAgIGlmIChtX3RleHR1cmVTaXplID09IGNvbnRlbnRTaXpl KCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIFBsYXRmb3JtM0RPYmplY3QgZm9ybWF0ID0gZHJp dmVyU3VwcG9ydHNCR1JBU3dpenpsaW5nKCkgPyBHcmFwaGljc0NvbnRleHQzRDo6QkdSQSA6IEdy YXBoaWNzQ29udGV4dDNEOjpSR0JBOwogCiAgICAgbV90ZXh0dXJlU2l6ZSA9IGNvbnRlbnRTaXpl KCk7CiAgICAgbV9jb250ZXh0M0QtPmJpbmRUZXh0dXJlKEdyYXBoaWNzQ29udGV4dDNEOjpURVhU VVJFXzJELCBtX2lkKTsKQEAgLTYxOCw3ICs2MTgsMTcgQEAgdm9pZCBCaXRtYXBUZXh0dXJlR0w6 OmRpZFJlc2V0KCkKICAgICBtX2NvbnRleHQzRC0+dGV4UGFyYW1ldGVyaShHcmFwaGljc0NvbnRl eHQzRDo6VEVYVFVSRV8yRCwgR3JhcGhpY3NDb250ZXh0M0Q6OlRFWFRVUkVfTUFHX0ZJTFRFUiwg R3JhcGhpY3NDb250ZXh0M0Q6OkxJTkVBUik7CiAgICAgbV9jb250ZXh0M0QtPnRleFBhcmFtZXRl cmkoR3JhcGhpY3NDb250ZXh0M0Q6OlRFWFRVUkVfMkQsIEdyYXBoaWNzQ29udGV4dDNEOjpURVhU VVJFX1dSQVBfUywgR3JhcGhpY3NDb250ZXh0M0Q6OkNMQU1QX1RPX0VER0UpOwogICAgIG1fY29u dGV4dDNELT50ZXhQYXJhbWV0ZXJpKEdyYXBoaWNzQ29udGV4dDNEOjpURVhUVVJFXzJELCBHcmFw aGljc0NvbnRleHQzRDo6VEVYVFVSRV9XUkFQX1QsIEdyYXBoaWNzQ29udGV4dDNEOjpDTEFNUF9U T19FREdFKTsKLSAgICBtX2NvbnRleHQzRC0+dGV4SW1hZ2UyRERpcmVjdChHcmFwaGljc0NvbnRl eHQzRDo6VEVYVFVSRV8yRCwgMCwgR3JhcGhpY3NDb250ZXh0M0Q6OlJHQkEsIG1fdGV4dHVyZVNp emUud2lkdGgoKSwgbV90ZXh0dXJlU2l6ZS5oZWlnaHQoKSwgMCwgZm9ybWF0LCBERUZBVUxUX1RF WFRVUkVfUElYRUxfVFJBTlNGRVJfVFlQRSwgMCk7CisKKyAgICBQbGF0Zm9ybTNET2JqZWN0IGlu dGVybmFsRm9ybWF0ID0gR3JhcGhpY3NDb250ZXh0M0Q6OlJHQkE7CisgICAgUGxhdGZvcm0zRE9i amVjdCBleHRlcm5hbEZvcm1hdCA9IEdyYXBoaWNzQ29udGV4dDNEOjpCR1JBOworICAgIGlmICht X2NvbnRleHQzRC0+aXNHTEVTMkNvbXBsaWFudCgpKSB7CisgICAgICAgIGlmIChkcml2ZXJTdXBw b3J0c0V4dGVybmFsVGV4dHVyZUJHUkEobV9jb250ZXh0M0QuZ2V0KCkpKQorICAgICAgICAgICAg aW50ZXJuYWxGb3JtYXQgPSBHcmFwaGljc0NvbnRleHQzRDo6QkdSQTsKKyAgICAgICAgZWxzZQor ICAgICAgICAgICAgZXh0ZXJuYWxGb3JtYXQgPSBHcmFwaGljc0NvbnRleHQzRDo6UkdCQTsKKyAg ICB9CisKKyAgICBtX2NvbnRleHQzRC0+dGV4SW1hZ2UyRERpcmVjdChHcmFwaGljc0NvbnRleHQz RDo6VEVYVFVSRV8yRCwgMCwgaW50ZXJuYWxGb3JtYXQsIG1fdGV4dHVyZVNpemUud2lkdGgoKSwg bV90ZXh0dXJlU2l6ZS5oZWlnaHQoKSwgMCwgZXh0ZXJuYWxGb3JtYXQsIERFRkFVTFRfVEVYVFVS RV9QSVhFTF9UUkFOU0ZFUl9UWVBFLCAwKTsKIH0KIAogdm9pZCBCaXRtYXBUZXh0dXJlR0w6OnVw ZGF0ZUNvbnRlbnRzTm9Td2l6emxlKGNvbnN0IHZvaWQqIHNyY0RhdGEsIGNvbnN0IEludFJlY3Qm IHRhcmdldFJlY3QsIGNvbnN0IEludFBvaW50JiBzb3VyY2VPZmZzZXQsIGludCBieXRlc1Blckxp bmUsIHVuc2lnbmVkIGJ5dGVzUGVyUGl4ZWwsIFBsYXRmb3JtM0RPYmplY3QgZ2xGb3JtYXQpCkBA IC02NTcsNyArNjY3LDcgQEAgdm9pZCBCaXRtYXBUZXh0dXJlR0w6OnVwZGF0ZUNvbnRlbnRzKGNv bnN0IHZvaWQqIHNyY0RhdGEsIGNvbnN0IEludFJlY3QmIHRhcmdldFIKICAgICAgICAgJiYgIShi eXRlc1BlckxpbmUgPT0gc3RhdGljX2Nhc3Q8aW50Pih0YXJnZXRSZWN0LndpZHRoKCkgKiBieXRl c1BlclBpeGVsKSAmJiBhZGp1c3RlZFNvdXJjZU9mZnNldCA9PSBJbnRQb2ludDo6emVybygpKTsK IAogICAgIC8vIHByZXBhcmUgdGVtcG9yYXJ5RGF0YSBpZiBuZWNlc3NhcnkKLSAgICBpZiAoKCFk cml2ZXJTdXBwb3J0c0JHUkFTd2l6emxpbmcoKSAmJiB1cGRhdGVDb250ZW50c0ZsYWcgPT0gVXBk YXRlQ2Fubm90TW9kaWZ5T3JpZ2luYWxJbWFnZURhdGEpIHx8IHJlcXVpcmVTdWJJbWFnZUJ1ZmZl cikgeworICAgIGlmICgoIWRyaXZlclN1cHBvcnRzRXh0ZXJuYWxUZXh0dXJlQkdSQShtX2NvbnRl eHQzRC5nZXQoKSkgJiYgdXBkYXRlQ29udGVudHNGbGFnID09IFVwZGF0ZUNhbm5vdE1vZGlmeU9y aWdpbmFsSW1hZ2VEYXRhKSB8fCByZXF1aXJlU3ViSW1hZ2VCdWZmZXIpIHsKICAgICAgICAgdGVt cG9yYXJ5RGF0YS5yZXNpemUodGFyZ2V0UmVjdC53aWR0aCgpICogdGFyZ2V0UmVjdC5oZWlnaHQo KSAqIGJ5dGVzUGVyUGl4ZWwpOwogICAgICAgICBkYXRhID0gdGVtcG9yYXJ5RGF0YS5kYXRhKCk7 CiAgICAgICAgIGNvbnN0IGNoYXIqIGJpdHMgPSBzdGF0aWNfY2FzdDxjb25zdCBjaGFyKj4oc3Jj RGF0YSk7CkBAIC02NzQsNyArNjg0LDcgQEAgdm9pZCBCaXRtYXBUZXh0dXJlR0w6OnVwZGF0ZUNv bnRlbnRzKGNvbnN0IHZvaWQqIHNyY0RhdGEsIGNvbnN0IEludFJlY3QmIHRhcmdldFIKICAgICAg ICAgYWRqdXN0ZWRTb3VyY2VPZmZzZXQgPSBJbnRQb2ludCgwLCAwKTsKICAgICB9CiAKLSAgICBp ZiAoZHJpdmVyU3VwcG9ydHNCR1JBU3dpenpsaW5nKCkpCisgICAgaWYgKGRyaXZlclN1cHBvcnRz RXh0ZXJuYWxUZXh0dXJlQkdSQShtX2NvbnRleHQzRC5nZXQoKSkpCiAgICAgICAgIGdsRm9ybWF0 ID0gR3JhcGhpY3NDb250ZXh0M0Q6OkJHUkE7CiAgICAgZWxzZQogICAgICAgICBzd2l6emxlQkdS QVRvUkdCQShyZWludGVycHJldF9jYXN0PHVpbnQzMl90Kj4oZGF0YSksIEludFJlY3QoYWRqdXN0 ZWRTb3VyY2VPZmZzZXQsIHRhcmdldFJlY3Quc2l6ZSgpKSwgYnl0ZXNQZXJMaW5lIC8gYnl0ZXNQ ZXJQaXhlbCk7Ci0tIAoxLjcuMTAuNAoK 186178 2013-02-01 15:59:32 -0800 2013-02-04 11:55:20 -0800 Patch v3 0001-https-bugs.webkit.org-show_bug.cgi-id-81103.patch text/plain 5272 igor.oliveira RnJvbSA2ZmNkZGM4ZWE3NDdlN2ZlZTRkZTc4NjFhODI2YmEyMDdlZDE2YTNmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBJZ29yIE9saXZlaXJhIDxpZ29yLm9Ac2lzYS5zYW1zdW5nLmNv bT4KRGF0ZTogRnJpLCAxIEZlYiAyMDEzIDE0OjQ3OjUxIC0wODAwClN1YmplY3Q6IFtQQVRDSF0g aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgxMTAzCgotLS0KIFNvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAxNiArKysr KysrKysrKysrCiAuLi4vcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJHTC5j cHAgICB8ICAgMjUgKysrKysrKysrKysrKystLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgMzQgaW5z ZXJ0aW9ucygrKSwgNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2E5MzdiOS4uNTgxOTI0 YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEzLTAyLTAxICBJZ29yIE9saXZlaXJh ICA8aWdvci5vQHNpc2Euc2Ftc3VuZy5jb20+CisKKyAgICAgICAgW1RleG1hcF0gSW1wbGVtZW50 IEJHUkEgc3dpenpsaW5nIGRldGVjdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9ODExMDMKKworICAgICAgICBGb3IgT3BlbkdMRVMgaWYgdGhlIGV4 dGVuc2lvbiBFWFRfdGV4dHVyZV9mb3JtYXRfQkdSQTg4ODggaXMgc3VwcG9ydGVkCisgICAgICAg IHRoZSBpbnRlcm5hbCBhbmQgZXh0ZXJuYWwgZm9ybWF0cyBuZWVkIHRvIGJlIEJHUkEuCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckdMLmNwcDoKKyAgICAgICAgKFdlYkNvcmUpOgor ICAgICAgICAoV2ViQ29yZTo6ZHJpdmVyU3VwcG9ydHNFeHRlcm5hbFRleHR1cmVCR1JBKToKKyAg ICAgICAgKFdlYkNvcmU6OmRyaXZlclN1cHBvcnRzU3ViSW1hZ2UpOgorICAgICAgICAoV2ViQ29y ZTo6Qml0bWFwVGV4dHVyZUdMOjpkaWRSZXNldCk6CisKIDIwMTMtMDItMDEgIFJ5b3N1a2UgTml3 YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgU21hcnQgbGluayBjYW4gZXJyb25lb3Vz bHkgbW92ZSBjYXJldCBhZnRlciBhbiBVUkwgd2hlbiB0eXBpbmcgaW1tZWRpYXRlbHkgYmVmb3Jl IGl0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAv VGV4dHVyZU1hcHBlckdMLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3Rl eG1hcC9UZXh0dXJlTWFwcGVyR0wuY3BwCmluZGV4IDM3OGU3MzIuLjc1Y2Q0M2IgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVy R0wuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0 dXJlTWFwcGVyR0wuY3BwCkBAIC01ODEsMTEgKzU4MSwxMyBAQCBzdGF0aWMgdm9pZCBzd2l6emxl QkdSQVRvUkdCQSh1aW50MzJfdCogZGF0YSwgY29uc3QgSW50UmVjdCYgcmVjdCwgaW50IHN0cmlk ZSA9CiAgICAgfQogfQogCi1zdGF0aWMgYm9vbCBkcml2ZXJTdXBwb3J0c0JHUkFTd2l6emxpbmco KQorLy8gSWYgR0xfRVhUX3RleHR1cmVfZm9ybWF0X0JHUkE4ODg4IGlzIHN1cHBvcnRlZCBpbiB0 aGUgT3BlbkdMRVMKKy8vIGludGVybmFsIGFuZCBleHRlcm5hbCBmb3JtYXRzIG5lZWQgdG8gYmUg QkdSQQorc3RhdGljIGJvb2wgZHJpdmVyU3VwcG9ydHNFeHRlcm5hbFRleHR1cmVCR1JBKEdyYXBo aWNzQ29udGV4dDNEKiBjb250ZXh0KQogewogI2lmIGRlZmluZWQoVEVYTUFQX09QRU5HTF9FU18y KQotICAgIC8vIEZJWE1FOiBJbXBsZW1lbnQgcmVsaWFibGUgZGV0ZWN0aW9uLiBTZWUgYWxzbyBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODExMDMuCi0gICAgcmV0dXJu IGZhbHNlOworICAgIHN0YXRpYyBib29sIHN1cHBvcnRzRXh0ZXJuYWxUZXh0dXJlQkdSQSA9IGNv bnRleHQtPmdldEV4dGVuc2lvbnMoKS0+c3VwcG9ydHMoIkdMX0VYVF90ZXh0dXJlX2Zvcm1hdF9C R1JBODg4OCIpOworICAgIHJldHVybiBzdXBwb3J0c0V4dGVybmFsVGV4dHVyZUJHUkE7CiAjZWxz ZQogICAgIHJldHVybiB0cnVlOwogI2VuZGlmCkBAIC02MTAsNyArNjEyLDYgQEAgdm9pZCBCaXRt YXBUZXh0dXJlR0w6OmRpZFJlc2V0KCkKICAgICBpZiAobV90ZXh0dXJlU2l6ZSA9PSBjb250ZW50 U2l6ZSgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBQbGF0Zm9ybTNET2JqZWN0IGZvcm1hdCA9 IGRyaXZlclN1cHBvcnRzQkdSQVN3aXp6bGluZygpID8gR3JhcGhpY3NDb250ZXh0M0Q6OkJHUkEg OiBHcmFwaGljc0NvbnRleHQzRDo6UkdCQTsKIAogICAgIG1fdGV4dHVyZVNpemUgPSBjb250ZW50 U2l6ZSgpOwogICAgIG1fY29udGV4dDNELT5iaW5kVGV4dHVyZShHcmFwaGljc0NvbnRleHQzRDo6 VEVYVFVSRV8yRCwgbV9pZCk7CkBAIC02MTgsNyArNjE5LDE3IEBAIHZvaWQgQml0bWFwVGV4dHVy ZUdMOjpkaWRSZXNldCgpCiAgICAgbV9jb250ZXh0M0QtPnRleFBhcmFtZXRlcmkoR3JhcGhpY3ND b250ZXh0M0Q6OlRFWFRVUkVfMkQsIEdyYXBoaWNzQ29udGV4dDNEOjpURVhUVVJFX01BR19GSUxU RVIsIEdyYXBoaWNzQ29udGV4dDNEOjpMSU5FQVIpOwogICAgIG1fY29udGV4dDNELT50ZXhQYXJh bWV0ZXJpKEdyYXBoaWNzQ29udGV4dDNEOjpURVhUVVJFXzJELCBHcmFwaGljc0NvbnRleHQzRDo6 VEVYVFVSRV9XUkFQX1MsIEdyYXBoaWNzQ29udGV4dDNEOjpDTEFNUF9UT19FREdFKTsKICAgICBt X2NvbnRleHQzRC0+dGV4UGFyYW1ldGVyaShHcmFwaGljc0NvbnRleHQzRDo6VEVYVFVSRV8yRCwg R3JhcGhpY3NDb250ZXh0M0Q6OlRFWFRVUkVfV1JBUF9ULCBHcmFwaGljc0NvbnRleHQzRDo6Q0xB TVBfVE9fRURHRSk7Ci0gICAgbV9jb250ZXh0M0QtPnRleEltYWdlMkREaXJlY3QoR3JhcGhpY3ND b250ZXh0M0Q6OlRFWFRVUkVfMkQsIDAsIEdyYXBoaWNzQ29udGV4dDNEOjpSR0JBLCBtX3RleHR1 cmVTaXplLndpZHRoKCksIG1fdGV4dHVyZVNpemUuaGVpZ2h0KCksIDAsIGZvcm1hdCwgREVGQVVM VF9URVhUVVJFX1BJWEVMX1RSQU5TRkVSX1RZUEUsIDApOworCisgICAgUGxhdGZvcm0zRE9iamVj dCBpbnRlcm5hbEZvcm1hdCA9IEdyYXBoaWNzQ29udGV4dDNEOjpSR0JBOworICAgIFBsYXRmb3Jt M0RPYmplY3QgZXh0ZXJuYWxGb3JtYXQgPSBHcmFwaGljc0NvbnRleHQzRDo6QkdSQTsKKyAgICBp ZiAobV9jb250ZXh0M0QtPmlzR0xFUzJDb21wbGlhbnQoKSkgeworICAgICAgICBpZiAoZHJpdmVy U3VwcG9ydHNFeHRlcm5hbFRleHR1cmVCR1JBKG1fY29udGV4dDNELmdldCgpKSkKKyAgICAgICAg ICAgIGludGVybmFsRm9ybWF0ID0gR3JhcGhpY3NDb250ZXh0M0Q6OkJHUkE7CisgICAgICAgIGVs c2UKKyAgICAgICAgICAgIGV4dGVybmFsRm9ybWF0ID0gR3JhcGhpY3NDb250ZXh0M0Q6OlJHQkE7 CisgICAgfQorCisgICAgbV9jb250ZXh0M0QtPnRleEltYWdlMkREaXJlY3QoR3JhcGhpY3NDb250 ZXh0M0Q6OlRFWFRVUkVfMkQsIDAsIGludGVybmFsRm9ybWF0LCBtX3RleHR1cmVTaXplLndpZHRo KCksIG1fdGV4dHVyZVNpemUuaGVpZ2h0KCksIDAsIGV4dGVybmFsRm9ybWF0LCBERUZBVUxUX1RF WFRVUkVfUElYRUxfVFJBTlNGRVJfVFlQRSwgMCk7CiB9CiAKIHZvaWQgQml0bWFwVGV4dHVyZUdM Ojp1cGRhdGVDb250ZW50c05vU3dpenpsZShjb25zdCB2b2lkKiBzcmNEYXRhLCBjb25zdCBJbnRS ZWN0JiB0YXJnZXRSZWN0LCBjb25zdCBJbnRQb2ludCYgc291cmNlT2Zmc2V0LCBpbnQgYnl0ZXNQ ZXJMaW5lLCB1bnNpZ25lZCBieXRlc1BlclBpeGVsLCBQbGF0Zm9ybTNET2JqZWN0IGdsRm9ybWF0 KQpAQCAtNjU3LDcgKzY2OCw3IEBAIHZvaWQgQml0bWFwVGV4dHVyZUdMOjp1cGRhdGVDb250ZW50 cyhjb25zdCB2b2lkKiBzcmNEYXRhLCBjb25zdCBJbnRSZWN0JiB0YXJnZXRSCiAgICAgICAgICYm ICEoYnl0ZXNQZXJMaW5lID09IHN0YXRpY19jYXN0PGludD4odGFyZ2V0UmVjdC53aWR0aCgpICog Ynl0ZXNQZXJQaXhlbCkgJiYgYWRqdXN0ZWRTb3VyY2VPZmZzZXQgPT0gSW50UG9pbnQ6Onplcm8o KSk7CiAKICAgICAvLyBwcmVwYXJlIHRlbXBvcmFyeURhdGEgaWYgbmVjZXNzYXJ5Ci0gICAgaWYg KCghZHJpdmVyU3VwcG9ydHNCR1JBU3dpenpsaW5nKCkgJiYgdXBkYXRlQ29udGVudHNGbGFnID09 IFVwZGF0ZUNhbm5vdE1vZGlmeU9yaWdpbmFsSW1hZ2VEYXRhKSB8fCByZXF1aXJlU3ViSW1hZ2VC dWZmZXIpIHsKKyAgICBpZiAoKCFkcml2ZXJTdXBwb3J0c0V4dGVybmFsVGV4dHVyZUJHUkEobV9j b250ZXh0M0QuZ2V0KCkpICYmIHVwZGF0ZUNvbnRlbnRzRmxhZyA9PSBVcGRhdGVDYW5ub3RNb2Rp ZnlPcmlnaW5hbEltYWdlRGF0YSkgfHwgcmVxdWlyZVN1YkltYWdlQnVmZmVyKSB7CiAgICAgICAg IHRlbXBvcmFyeURhdGEucmVzaXplKHRhcmdldFJlY3Qud2lkdGgoKSAqIHRhcmdldFJlY3QuaGVp Z2h0KCkgKiBieXRlc1BlclBpeGVsKTsKICAgICAgICAgZGF0YSA9IHRlbXBvcmFyeURhdGEuZGF0 YSgpOwogICAgICAgICBjb25zdCBjaGFyKiBiaXRzID0gc3RhdGljX2Nhc3Q8Y29uc3QgY2hhcio+ KHNyY0RhdGEpOwpAQCAtNjc0LDcgKzY4NSw3IEBAIHZvaWQgQml0bWFwVGV4dHVyZUdMOjp1cGRh dGVDb250ZW50cyhjb25zdCB2b2lkKiBzcmNEYXRhLCBjb25zdCBJbnRSZWN0JiB0YXJnZXRSCiAg ICAgICAgIGFkanVzdGVkU291cmNlT2Zmc2V0ID0gSW50UG9pbnQoMCwgMCk7CiAgICAgfQogCi0g ICAgaWYgKGRyaXZlclN1cHBvcnRzQkdSQVN3aXp6bGluZygpKQorICAgIGlmIChkcml2ZXJTdXBw b3J0c0V4dGVybmFsVGV4dHVyZUJHUkEobV9jb250ZXh0M0QuZ2V0KCkpKQogICAgICAgICBnbEZv cm1hdCA9IEdyYXBoaWNzQ29udGV4dDNEOjpCR1JBOwogICAgIGVsc2UKICAgICAgICAgc3dpenps ZUJHUkFUb1JHQkEocmVpbnRlcnByZXRfY2FzdDx1aW50MzJfdCo+KGRhdGEpLCBJbnRSZWN0KGFk anVzdGVkU291cmNlT2Zmc2V0LCB0YXJnZXRSZWN0LnNpemUoKSksIGJ5dGVzUGVyTGluZSAvIGJ5 dGVzUGVyUGl4ZWwpOwotLSAKMS43LjEwLjQKCg== 186427 2013-02-04 11:55:20 -0800 2013-02-04 13:50:53 -0800 Patch 0001-https-bugs.webkit.org-show_bug.cgi-id-81103.patch text/plain 5370 igor.oliveira RnJvbSBhN2U0MGE4ZWIwNmViY2NlY2UwZjZkZDYxZjJjNzAyZmYwM2NjNDg0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBJZ29yIE9saXZlaXJhIDxpZ29yLm9Ac2lzYS5zYW1zdW5nLmNv bT4KRGF0ZTogRnJpLCAxIEZlYiAyMDEzIDE0OjQ3OjUxIC0wODAwClN1YmplY3Q6IFtQQVRDSF0g aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgxMTAzCgotLS0KIFNvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAxNiArKysr KysrKysrCiAuLi4vcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJHTC5jcHAg ICB8ICAgMzEgKysrKysrKysrKysrKy0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgMzcgaW5zZXJ0 aW9ucygrKSwgMTAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDdhOTM3YjkuLmJjMDA2ZDUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMy0wMi0wMSAgSWdvciBPbGl2ZWlyYSAg PGlnb3Iub0BzaXNhLnNhbXN1bmcuY29tPgorCisgICAgICAgIFtUZXhtYXBdIEltcGxlbWVudCBC R1JBIHN3aXp6bGluZyBkZXRlY3Rpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTgxMTAzCisKKyAgICAgICAgRm9yIE9wZW5HTEVTIGlmIHRoZSBleHRl bnNpb24gRVhUX3RleHR1cmVfZm9ybWF0X0JHUkE4ODg4IGlzIHN1cHBvcnRlZAorICAgICAgICB0 aGUgaW50ZXJuYWwgYW5kIGV4dGVybmFsIGZvcm1hdHMgbmVlZCB0byBiZSBCR1JBLgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5vYW0gUm9zZW50aGFsLgorCisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJHTC5jcHA6CisgICAgICAgIChXZWJDb3JlKToKKyAg ICAgICAgKFdlYkNvcmU6OmRyaXZlclN1cHBvcnRzRXh0ZXJuYWxUZXh0dXJlQkdSQSk6CisgICAg ICAgIChXZWJDb3JlOjpkcml2ZXJTdXBwb3J0c1N1YkltYWdlKToKKyAgICAgICAgKFdlYkNvcmU6 OkJpdG1hcFRleHR1cmVHTDo6ZGlkUmVzZXQpOgorCiAyMDEzLTAyLTAxICBSeW9zdWtlIE5pd2Eg IDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIFNtYXJ0IGxpbmsgY2FuIGVycm9uZW91c2x5 IG1vdmUgY2FyZXQgYWZ0ZXIgYW4gVVJMIHdoZW4gdHlwaW5nIGltbWVkaWF0ZWx5IGJlZm9yZSBp dApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1Rl eHR1cmVNYXBwZXJHTC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXht YXAvVGV4dHVyZU1hcHBlckdMLmNwcAppbmRleCAzNzhlNzMyLi5iMmUwZTA1IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckdM LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVy ZU1hcHBlckdMLmNwcApAQCAtNTgxLDE0ICs1ODEsMTYgQEAgc3RhdGljIHZvaWQgc3dpenpsZUJH UkFUb1JHQkEodWludDMyX3QqIGRhdGEsIGNvbnN0IEludFJlY3QmIHJlY3QsIGludCBzdHJpZGUg PQogICAgIH0KIH0KIAotc3RhdGljIGJvb2wgZHJpdmVyU3VwcG9ydHNCR1JBU3dpenpsaW5nKCkK Ky8vIElmIEdMX0VYVF90ZXh0dXJlX2Zvcm1hdF9CR1JBODg4OCBpcyBzdXBwb3J0ZWQgaW4gdGhl IE9wZW5HTEVTCisvLyBpbnRlcm5hbCBhbmQgZXh0ZXJuYWwgZm9ybWF0cyBuZWVkIHRvIGJlIEJH UkEKK3N0YXRpYyBib29sIGRyaXZlclN1cHBvcnRzRXh0ZXJuYWxUZXh0dXJlQkdSQShHcmFwaGlj c0NvbnRleHQzRCogY29udGV4dCkKIHsKLSNpZiBkZWZpbmVkKFRFWE1BUF9PUEVOR0xfRVNfMikK LSAgICAvLyBGSVhNRTogSW1wbGVtZW50IHJlbGlhYmxlIGRldGVjdGlvbi4gU2VlIGFsc28gaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgxMTAzLgotICAgIHJldHVybiBm YWxzZTsKLSNlbHNlCisgICAgaWYgKGNvbnRleHQtPmlzR0xFUzJDb21wbGlhbnQoKSkgeworICAg ICAgICBzdGF0aWMgYm9vbCBzdXBwb3J0c0V4dGVybmFsVGV4dHVyZUJHUkEgPSBjb250ZXh0LT5n ZXRFeHRlbnNpb25zKCktPnN1cHBvcnRzKCJHTF9FWFRfdGV4dHVyZV9mb3JtYXRfQkdSQTg4ODgi KTsKKyAgICAgICAgcmV0dXJuIHN1cHBvcnRzRXh0ZXJuYWxUZXh0dXJlQkdSQTsKKyAgICB9CisK ICAgICByZXR1cm4gdHJ1ZTsKLSNlbmRpZgogfQogCiBzdGF0aWMgYm9vbCBkcml2ZXJTdXBwb3J0 c1N1YkltYWdlKCkKQEAgLTYxMCw3ICs2MTIsNiBAQCB2b2lkIEJpdG1hcFRleHR1cmVHTDo6ZGlk UmVzZXQoKQogICAgIGlmIChtX3RleHR1cmVTaXplID09IGNvbnRlbnRTaXplKCkpCiAgICAgICAg IHJldHVybjsKIAotICAgIFBsYXRmb3JtM0RPYmplY3QgZm9ybWF0ID0gZHJpdmVyU3VwcG9ydHNC R1JBU3dpenpsaW5nKCkgPyBHcmFwaGljc0NvbnRleHQzRDo6QkdSQSA6IEdyYXBoaWNzQ29udGV4 dDNEOjpSR0JBOwogCiAgICAgbV90ZXh0dXJlU2l6ZSA9IGNvbnRlbnRTaXplKCk7CiAgICAgbV9j b250ZXh0M0QtPmJpbmRUZXh0dXJlKEdyYXBoaWNzQ29udGV4dDNEOjpURVhUVVJFXzJELCBtX2lk KTsKQEAgLTYxOCw3ICs2MTksMTcgQEAgdm9pZCBCaXRtYXBUZXh0dXJlR0w6OmRpZFJlc2V0KCkK ICAgICBtX2NvbnRleHQzRC0+dGV4UGFyYW1ldGVyaShHcmFwaGljc0NvbnRleHQzRDo6VEVYVFVS RV8yRCwgR3JhcGhpY3NDb250ZXh0M0Q6OlRFWFRVUkVfTUFHX0ZJTFRFUiwgR3JhcGhpY3NDb250 ZXh0M0Q6OkxJTkVBUik7CiAgICAgbV9jb250ZXh0M0QtPnRleFBhcmFtZXRlcmkoR3JhcGhpY3ND b250ZXh0M0Q6OlRFWFRVUkVfMkQsIEdyYXBoaWNzQ29udGV4dDNEOjpURVhUVVJFX1dSQVBfUywg R3JhcGhpY3NDb250ZXh0M0Q6OkNMQU1QX1RPX0VER0UpOwogICAgIG1fY29udGV4dDNELT50ZXhQ YXJhbWV0ZXJpKEdyYXBoaWNzQ29udGV4dDNEOjpURVhUVVJFXzJELCBHcmFwaGljc0NvbnRleHQz RDo6VEVYVFVSRV9XUkFQX1QsIEdyYXBoaWNzQ29udGV4dDNEOjpDTEFNUF9UT19FREdFKTsKLSAg ICBtX2NvbnRleHQzRC0+dGV4SW1hZ2UyRERpcmVjdChHcmFwaGljc0NvbnRleHQzRDo6VEVYVFVS RV8yRCwgMCwgR3JhcGhpY3NDb250ZXh0M0Q6OlJHQkEsIG1fdGV4dHVyZVNpemUud2lkdGgoKSwg bV90ZXh0dXJlU2l6ZS5oZWlnaHQoKSwgMCwgZm9ybWF0LCBERUZBVUxUX1RFWFRVUkVfUElYRUxf VFJBTlNGRVJfVFlQRSwgMCk7CisKKyAgICBQbGF0Zm9ybTNET2JqZWN0IGludGVybmFsRm9ybWF0 ID0gR3JhcGhpY3NDb250ZXh0M0Q6OlJHQkE7CisgICAgUGxhdGZvcm0zRE9iamVjdCBleHRlcm5h bEZvcm1hdCA9IEdyYXBoaWNzQ29udGV4dDNEOjpCR1JBOworICAgIGlmIChtX2NvbnRleHQzRC0+ aXNHTEVTMkNvbXBsaWFudCgpKSB7CisgICAgICAgIGlmIChkcml2ZXJTdXBwb3J0c0V4dGVybmFs VGV4dHVyZUJHUkEobV9jb250ZXh0M0QuZ2V0KCkpKQorICAgICAgICAgICAgaW50ZXJuYWxGb3Jt YXQgPSBHcmFwaGljc0NvbnRleHQzRDo6QkdSQTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAg ZXh0ZXJuYWxGb3JtYXQgPSBHcmFwaGljc0NvbnRleHQzRDo6UkdCQTsKKyAgICB9CisKKyAgICBt X2NvbnRleHQzRC0+dGV4SW1hZ2UyRERpcmVjdChHcmFwaGljc0NvbnRleHQzRDo6VEVYVFVSRV8y RCwgMCwgaW50ZXJuYWxGb3JtYXQsIG1fdGV4dHVyZVNpemUud2lkdGgoKSwgbV90ZXh0dXJlU2l6 ZS5oZWlnaHQoKSwgMCwgZXh0ZXJuYWxGb3JtYXQsIERFRkFVTFRfVEVYVFVSRV9QSVhFTF9UUkFO U0ZFUl9UWVBFLCAwKTsKIH0KIAogdm9pZCBCaXRtYXBUZXh0dXJlR0w6OnVwZGF0ZUNvbnRlbnRz Tm9Td2l6emxlKGNvbnN0IHZvaWQqIHNyY0RhdGEsIGNvbnN0IEludFJlY3QmIHRhcmdldFJlY3Qs IGNvbnN0IEludFBvaW50JiBzb3VyY2VPZmZzZXQsIGludCBieXRlc1BlckxpbmUsIHVuc2lnbmVk IGJ5dGVzUGVyUGl4ZWwsIFBsYXRmb3JtM0RPYmplY3QgZ2xGb3JtYXQpCkBAIC02NTcsNyArNjY4 LDcgQEAgdm9pZCBCaXRtYXBUZXh0dXJlR0w6OnVwZGF0ZUNvbnRlbnRzKGNvbnN0IHZvaWQqIHNy Y0RhdGEsIGNvbnN0IEludFJlY3QmIHRhcmdldFIKICAgICAgICAgJiYgIShieXRlc1BlckxpbmUg PT0gc3RhdGljX2Nhc3Q8aW50Pih0YXJnZXRSZWN0LndpZHRoKCkgKiBieXRlc1BlclBpeGVsKSAm JiBhZGp1c3RlZFNvdXJjZU9mZnNldCA9PSBJbnRQb2ludDo6emVybygpKTsKIAogICAgIC8vIHBy ZXBhcmUgdGVtcG9yYXJ5RGF0YSBpZiBuZWNlc3NhcnkKLSAgICBpZiAoKCFkcml2ZXJTdXBwb3J0 c0JHUkFTd2l6emxpbmcoKSAmJiB1cGRhdGVDb250ZW50c0ZsYWcgPT0gVXBkYXRlQ2Fubm90TW9k aWZ5T3JpZ2luYWxJbWFnZURhdGEpIHx8IHJlcXVpcmVTdWJJbWFnZUJ1ZmZlcikgeworICAgIGlm ICgoIWRyaXZlclN1cHBvcnRzRXh0ZXJuYWxUZXh0dXJlQkdSQShtX2NvbnRleHQzRC5nZXQoKSkg JiYgdXBkYXRlQ29udGVudHNGbGFnID09IFVwZGF0ZUNhbm5vdE1vZGlmeU9yaWdpbmFsSW1hZ2VE YXRhKSB8fCByZXF1aXJlU3ViSW1hZ2VCdWZmZXIpIHsKICAgICAgICAgdGVtcG9yYXJ5RGF0YS5y ZXNpemUodGFyZ2V0UmVjdC53aWR0aCgpICogdGFyZ2V0UmVjdC5oZWlnaHQoKSAqIGJ5dGVzUGVy UGl4ZWwpOwogICAgICAgICBkYXRhID0gdGVtcG9yYXJ5RGF0YS5kYXRhKCk7CiAgICAgICAgIGNv bnN0IGNoYXIqIGJpdHMgPSBzdGF0aWNfY2FzdDxjb25zdCBjaGFyKj4oc3JjRGF0YSk7CkBAIC02 NzQsNyArNjg1LDcgQEAgdm9pZCBCaXRtYXBUZXh0dXJlR0w6OnVwZGF0ZUNvbnRlbnRzKGNvbnN0 IHZvaWQqIHNyY0RhdGEsIGNvbnN0IEludFJlY3QmIHRhcmdldFIKICAgICAgICAgYWRqdXN0ZWRT b3VyY2VPZmZzZXQgPSBJbnRQb2ludCgwLCAwKTsKICAgICB9CiAKLSAgICBpZiAoZHJpdmVyU3Vw cG9ydHNCR1JBU3dpenpsaW5nKCkpCisgICAgaWYgKGRyaXZlclN1cHBvcnRzRXh0ZXJuYWxUZXh0 dXJlQkdSQShtX2NvbnRleHQzRC5nZXQoKSkpCiAgICAgICAgIGdsRm9ybWF0ID0gR3JhcGhpY3ND b250ZXh0M0Q6OkJHUkE7CiAgICAgZWxzZQogICAgICAgICBzd2l6emxlQkdSQVRvUkdCQShyZWlu dGVycHJldF9jYXN0PHVpbnQzMl90Kj4oZGF0YSksIEludFJlY3QoYWRqdXN0ZWRTb3VyY2VPZmZz ZXQsIHRhcmdldFJlY3Quc2l6ZSgpKSwgYnl0ZXNQZXJMaW5lIC8gYnl0ZXNQZXJQaXhlbCk7Ci0t IAoxLjcuMTAuNAoK