30986 2009-10-31 20:36:42 -0700 Fix layering violations in GraphicsContext3D 2023-06-13 14:05:41 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 oliver oliver ahmad.saleem792 cmarrin oldest_to_newest 159609 0 oliver 2009-10-31 20:36:42 -0700 There are multiple uses of DOM objects in the GraphicsContext3D object which are a significant layering violation. These need to be fixed. 159612 1 42266 oliver 2009-10-31 21:36:00 -0700 Created attachment 42266 Remove canvas and image element uses from CanvasRenderingContext3D 159613 2 42267 oliver 2009-10-31 21:37:55 -0700 Created attachment 42267 Remove canvas and image element uses from CanvasRenderingContext3D 159656 3 42267 darin 2009-11-01 13:18:17 -0800 Comment on attachment 42267 Remove canvas and image element uses from CanvasRenderingContext3D > + CachedImage* cachedImage = image->cachedImage(); > + if (!cachedImage) > + return; > + m_context->texSubImage2D(target, level, xoffset, yoffset, width, height, cachedImage->image(), flipY, premultiplyAlpha); > cleanupAfterGraphicsCall(false); All the other cases you put a blank line after the early return. r=me 159698 4 oliver 2009-11-01 18:10:36 -0800 Committed r50394 1961405 5 ahmad.saleem792 2023-06-13 14:05:41 -0700 https://github.com/WebKit/WebKit/commit/966e02e441e1039e708cb9bb54e6c4c11cd7badd and checking by bug number and commit id ‘50394' seems to indicate that it was not backed out. Marking ‘RESOLVED FIXED’. 42266 2009-10-31 21:36:00 -0700 2009-10-31 21:37:51 -0700 Remove canvas and image element uses from CanvasRenderingContext3D bug-30986-20091031213559.patch text/plain 9936 oliver ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MjNmMjRmZS4uNzNiOThhYSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyMiBAQAogMjAwOS0xMC0zMSAgT2xpdmVyIEh1bnQg IDxvbGl2ZXJAYXBwbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEZpeCBsYXllcmluZyB2aW9sYXRpb25zIGluIEdyYXBoaWNzQ29udGV4dDNE CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMDk4Ngor CisgICAgICAgIE5vIG5ldyB0ZXN0cy4gKE9PUFMhKQorCisgICAgICAgICogaHRtbC9jYW52YXMv Q2FudmFzUmVuZGVyaW5nQ29udGV4dDNELmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNhbnZhc1Jl bmRlcmluZ0NvbnRleHQzRDo6dGV4SW1hZ2UyRCk6CisgICAgICAgIChXZWJDb3JlOjpDYW52YXNS ZW5kZXJpbmdDb250ZXh0M0Q6OnRleFN1YkltYWdlMkQpOgorICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL0dyYXBoaWNzQ29udGV4dDNELmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv bWFjL0dyYXBoaWNzQ29udGV4dDNETWFjLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNz Q29udGV4dDNEOjp0ZXhJbWFnZTJEKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4 dDNEOjp0ZXhTdWJJbWFnZTJEKToKKworMjAwOS0xMC0zMSAgT2xpdmVyIEh1bnQgIDxvbGl2ZXJA YXBwbGUuY29tPgorCiAgICAgICAgIEJ1aWxkIGZpeAogCiAgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvbWFjL0dyYXBoaWNzQ29udGV4dDNETWFjLmNwcDoKZGlmZiAtLWdpdCBhL1dlYkNvcmUv aHRtbC9jYW52YXMvQ2FudmFzUmVuZGVyaW5nQ29udGV4dDNELmNwcCBiL1dlYkNvcmUvaHRtbC9j YW52YXMvQ2FudmFzUmVuZGVyaW5nQ29udGV4dDNELmNwcAppbmRleCA4NGNjZjRjLi40NzNmNjBi IDEwMDY0NAotLS0gYS9XZWJDb3JlL2h0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRleHQz RC5jcHAKKysrIGIvV2ViQ29yZS9odG1sL2NhbnZhcy9DYW52YXNSZW5kZXJpbmdDb250ZXh0M0Qu Y3BwCkBAIC0zNyw2ICszNyw4IEBACiAjaW5jbHVkZSAiQ2FudmFzVGV4dHVyZS5oIgogI2luY2x1 ZGUgIkNhbnZhc1NoYWRlci5oIgogI2luY2x1ZGUgIkhUTUxDYW52YXNFbGVtZW50LmgiCisjaW5j bHVkZSAiSFRNTEltYWdlRWxlbWVudC5oIgorI2luY2x1ZGUgIkltYWdlQnVmZmVyLmgiCiAjaW5j bHVkZSAiUmVuZGVyQm94LmgiCiAjaW5jbHVkZSAiUmVuZGVyTGF5ZXIuaCIKIApAQCAtMTAwNSwx OCArMTAwNywzNiBAQCB2b2lkIENhbnZhc1JlbmRlcmluZ0NvbnRleHQzRDo6dGV4SW1hZ2UyRCh1 bnNpZ25lZCB0YXJnZXQsIHVuc2lnbmVkIGxldmVsLCB1bnNpZwogdm9pZCBDYW52YXNSZW5kZXJp bmdDb250ZXh0M0Q6OnRleEltYWdlMkQodW5zaWduZWQgdGFyZ2V0LCB1bnNpZ25lZCBsZXZlbCwg SFRNTEltYWdlRWxlbWVudCogaW1hZ2UsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBib29sIGZsaXBZLCBib29sIHByZW11bHRpcGx5QWxwaGEsIEV4Y2VwdGlvbkNv ZGUmIGVjKQogewotICAgIC8vIEZJWE1FOiBGb3Igbm93IHdlIGlnbm9yZSBhbnkgZXJyb3JzIHJl dHVybmVkCiAgICAgZWMgPSAwOwotICAgIG1fY29udGV4dC0+dGV4SW1hZ2UyRCh0YXJnZXQsIGxl dmVsLCBpbWFnZSwgZmxpcFksIHByZW11bHRpcGx5QWxwaGEpOworICAgIGlmICghaW1hZ2UpIHsK KyAgICAgICAgZWMgPSBUWVBFX01JU01BVENIX0VSUjsKKyAgICAgICAgcmV0dXJuOworICAgIH0K KworICAgIENhY2hlZEltYWdlKiBjYWNoZWRJbWFnZSA9IGltYWdlLT5jYWNoZWRJbWFnZSgpOwor ICAgIGlmICghY2FjaGVkSW1hZ2UpCisgICAgICAgIHJldHVybjsKKworICAgIC8vIEZJWE1FOiBG b3Igbm93IHdlIGlnbm9yZSBhbnkgZXJyb3JzIHJldHVybmVkCisgICAgbV9jb250ZXh0LT50ZXhJ bWFnZTJEKHRhcmdldCwgbGV2ZWwsIGNhY2hlZEltYWdlLT5pbWFnZSgpLCBmbGlwWSwgcHJlbXVs dGlwbHlBbHBoYSk7CiAgICAgY2xlYW51cEFmdGVyR3JhcGhpY3NDYWxsKGZhbHNlKTsKIH0KIAog dm9pZCBDYW52YXNSZW5kZXJpbmdDb250ZXh0M0Q6OnRleEltYWdlMkQodW5zaWduZWQgdGFyZ2V0 LCB1bnNpZ25lZCBsZXZlbCwgSFRNTENhbnZhc0VsZW1lbnQqIGNhbnZhcywKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJvb2wgZmxpcFksIGJvb2wgcHJlbXVsdGlw bHlBbHBoYSwgRXhjZXB0aW9uQ29kZSYgZWMpCiB7Ci0gICAgLy8gRklYTUU6IEZvciBub3cgd2Ug aWdub3JlIGFueSBlcnJvcnMgcmV0dXJuZWQKICAgICBlYyA9IDA7Ci0gICAgbV9jb250ZXh0LT50 ZXhJbWFnZTJEKHRhcmdldCwgbGV2ZWwsIGNhbnZhcywgZmxpcFksIHByZW11bHRpcGx5QWxwaGEp OworICAgIGlmICghY2FudmFzKSB7CisgICAgICAgIGVjID0gVFlQRV9NSVNNQVRDSF9FUlI7Cisg ICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBJbWFnZUJ1ZmZlciogYnVmZmVyID0gY2FudmFz LT5idWZmZXIoKTsKKyAgICBpZiAoIWJ1ZmZlcikKKyAgICAgICAgcmV0dXJuOworCisgICAgLy8g RklYTUU6IEZvciBub3cgd2UgaWdub3JlIGFueSBlcnJvcnMgcmV0dXJuZWQKKyAgICBtX2NvbnRl eHQtPnRleEltYWdlMkQodGFyZ2V0LCBsZXZlbCwgYnVmZmVyLT5pbWFnZSgpLCBmbGlwWSwgcHJl bXVsdGlwbHlBbHBoYSk7CiAgICAgY2xlYW51cEFmdGVyR3JhcGhpY3NDYWxsKGZhbHNlKTsKIH0K IApAQCAtMTA2Nyw3ICsxMDg3LDE1IEBAIHZvaWQgQ2FudmFzUmVuZGVyaW5nQ29udGV4dDNEOjp0 ZXhTdWJJbWFnZTJEKHVuc2lnbmVkIHRhcmdldCwgdW5zaWduZWQgbGV2ZWwsIHVuCiB7CiAgICAg Ly8gRklYTUU6IEZvciBub3cgd2UgaWdub3JlIGFueSBlcnJvcnMgcmV0dXJuZWQKICAgICBlYyA9 IDA7Ci0gICAgbV9jb250ZXh0LT50ZXhTdWJJbWFnZTJEKHRhcmdldCwgbGV2ZWwsIHhvZmZzZXQs IHlvZmZzZXQsIHdpZHRoLCBoZWlnaHQsIGltYWdlLCBmbGlwWSwgcHJlbXVsdGlwbHlBbHBoYSk7 CisgICAgaWYgKCFpbWFnZSkgeworICAgICAgICBlYyA9IFRZUEVfTUlTTUFUQ0hfRVJSOworICAg ICAgICByZXR1cm47CisgICAgfQorICAgIAorICAgIENhY2hlZEltYWdlKiBjYWNoZWRJbWFnZSA9 IGltYWdlLT5jYWNoZWRJbWFnZSgpOworICAgIGlmICghY2FjaGVkSW1hZ2UpCisgICAgICAgIHJl dHVybjsKKyAgICBtX2NvbnRleHQtPnRleFN1YkltYWdlMkQodGFyZ2V0LCBsZXZlbCwgeG9mZnNl dCwgeW9mZnNldCwgd2lkdGgsIGhlaWdodCwgY2FjaGVkSW1hZ2UtPmltYWdlKCksIGZsaXBZLCBw cmVtdWx0aXBseUFscGhhKTsKICAgICBjbGVhbnVwQWZ0ZXJHcmFwaGljc0NhbGwoZmFsc2UpOwog fQogCkBAIC0xMDc1LDkgKzExMDMsMTggQEAgdm9pZCBDYW52YXNSZW5kZXJpbmdDb250ZXh0M0Q6 OnRleFN1YkltYWdlMkQodW5zaWduZWQgdGFyZ2V0LCB1bnNpZ25lZCBsZXZlbCwgdW4KICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIHdpZHRoLCB1 bnNpZ25lZCBoZWlnaHQsIEhUTUxDYW52YXNFbGVtZW50KiBjYW52YXMsCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBib29sIGZsaXBZLCBib29sIHByZW11bHRp cGx5QWxwaGEsIEV4Y2VwdGlvbkNvZGUmIGVjKQogewotICAgIC8vIEZJWE1FOiBGb3Igbm93IHdl IGlnbm9yZSBhbnkgZXJyb3JzIHJldHVybmVkCiAgICAgZWMgPSAwOwotICAgIG1fY29udGV4dC0+ dGV4U3ViSW1hZ2UyRCh0YXJnZXQsIGxldmVsLCB4b2Zmc2V0LCB5b2Zmc2V0LCB3aWR0aCwgaGVp Z2h0LCBjYW52YXMsIGZsaXBZLCBwcmVtdWx0aXBseUFscGhhKTsKKyAgICBpZiAoIWNhbnZhcykg eworICAgICAgICBlYyA9IFRZUEVfTUlTTUFUQ0hfRVJSOworICAgICAgICByZXR1cm47CisgICAg fQorICAgIAorICAgIEltYWdlQnVmZmVyKiBidWZmZXIgPSBjYW52YXMtPmJ1ZmZlcigpOworICAg IGlmICghYnVmZmVyKQorICAgICAgICByZXR1cm47CisgICAgCisgICAgLy8gRklYTUU6IEZvciBu b3cgd2UgaWdub3JlIGFueSBlcnJvcnMgcmV0dXJuZWQKKyAgICBtX2NvbnRleHQtPnRleFN1Yklt YWdlMkQodGFyZ2V0LCBsZXZlbCwgeG9mZnNldCwgeW9mZnNldCwgd2lkdGgsIGhlaWdodCwgYnVm ZmVyLT5pbWFnZSgpLCBmbGlwWSwgcHJlbXVsdGlwbHlBbHBoYSk7CiAgICAgY2xlYW51cEFmdGVy R3JhcGhpY3NDYWxsKGZhbHNlKTsKIH0KIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9HcmFwaGljc0NvbnRleHQzRC5oIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9H cmFwaGljc0NvbnRleHQzRC5oCmluZGV4IDA3ZWMwNGQuLjExNzRjMDEgMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0M0QuaAorKysgYi9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dDNELmgKQEAgLTU4LDggKzU4LDcgQEAg bmFtZXNwYWNlIFdlYkNvcmUgewogICAgIGNsYXNzIENhbnZhc1JlbmRlcmluZ0NvbnRleHQzRDsK ICAgICBjbGFzcyBDYW52YXNTaGFkZXI7CiAgICAgY2xhc3MgQ2FudmFzVGV4dHVyZTsKLSAgICBj bGFzcyBIVE1MQ2FudmFzRWxlbWVudDsKLSAgICBjbGFzcyBIVE1MSW1hZ2VFbGVtZW50OworICAg IGNsYXNzIEltYWdlOwogICAgIGNsYXNzIEhUTUxWaWRlb0VsZW1lbnQ7CiAgICAgY2xhc3MgSW1h Z2VEYXRhOwogICAgIGNsYXNzIFdlYktpdENTU01hdHJpeDsKQEAgLTIzNiw5ICsyMzUsNyBAQCBu YW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIGludCB0ZXhJbWFnZTJEKHVuc2lnbmVkIHRhcmdl dCwgdW5zaWduZWQgbGV2ZWwsIHVuc2lnbmVkIGludGVybmFsZm9ybWF0LAogICAgICAgICAgICAg ICAgICAgICAgICB1bnNpZ25lZCB3aWR0aCwgdW5zaWduZWQgaGVpZ2h0LCB1bnNpZ25lZCBib3Jk ZXIsCiAgICAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIGZvcm1hdCwgdW5zaWduZWQgdHlw ZSwgSW1hZ2VEYXRhKiBwaXhlbHMpOwotICAgICAgICBpbnQgdGV4SW1hZ2UyRCh1bnNpZ25lZCB0 YXJnZXQsIHVuc2lnbmVkIGxldmVsLCBIVE1MSW1hZ2VFbGVtZW50KiBpbWFnZSwKLSAgICAgICAg ICAgICAgICAgICAgICAgYm9vbCBmbGlwWSwgYm9vbCBwcmVtdWx0aXBseUFscGhhKTsKLSAgICAg ICAgaW50IHRleEltYWdlMkQodW5zaWduZWQgdGFyZ2V0LCB1bnNpZ25lZCBsZXZlbCwgSFRNTENh bnZhc0VsZW1lbnQqIGNhbnZhcywKKyAgICAgICAgaW50IHRleEltYWdlMkQodW5zaWduZWQgdGFy Z2V0LCB1bnNpZ25lZCBsZXZlbCwgSW1hZ2UqIGltYWdlLAogICAgICAgICAgICAgICAgICAgICAg ICBib29sIGZsaXBZLCBib29sIHByZW11bHRpcGx5QWxwaGEpOwogICAgICAgICBpbnQgdGV4SW1h Z2UyRCh1bnNpZ25lZCB0YXJnZXQsIHVuc2lnbmVkIGxldmVsLCBIVE1MVmlkZW9FbGVtZW50KiB2 aWRlbywKICAgICAgICAgICAgICAgICAgICAgICAgYm9vbCBmbGlwWSwgYm9vbCBwcmVtdWx0aXBs eUFscGhhKTsKQEAgLTI1MywxMCArMjUwLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAg ICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCB3aWR0aCwgdW5zaWduZWQgaGVpZ2h0LAogICAg ICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBmb3JtYXQsIHVuc2lnbmVkIHR5cGUsIElt YWdlRGF0YSogcGl4ZWxzKTsKICAgICAgICAgaW50IHRleFN1YkltYWdlMkQodW5zaWduZWQgdGFy Z2V0LCB1bnNpZ25lZCBsZXZlbCwgdW5zaWduZWQgeG9mZnNldCwgdW5zaWduZWQgeW9mZnNldCwK LSAgICAgICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgd2lkdGgsIHVuc2lnbmVkIGhlaWdo dCwgSFRNTEltYWdlRWxlbWVudCogaW1hZ2UsCi0gICAgICAgICAgICAgICAgICAgICAgICAgIGJv b2wgZmxpcFksIGJvb2wgcHJlbXVsdGlwbHlBbHBoYSk7Ci0gICAgICAgIGludCB0ZXhTdWJJbWFn ZTJEKHVuc2lnbmVkIHRhcmdldCwgdW5zaWduZWQgbGV2ZWwsIHVuc2lnbmVkIHhvZmZzZXQsIHVu c2lnbmVkIHlvZmZzZXQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIHdpZHRo LCB1bnNpZ25lZCBoZWlnaHQsIEhUTUxDYW52YXNFbGVtZW50KiBjYW52YXMsCisgICAgICAgICAg ICAgICAgICAgICAgICAgIHVuc2lnbmVkIHdpZHRoLCB1bnNpZ25lZCBoZWlnaHQsIEltYWdlKiBp bWFnZSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgYm9vbCBmbGlwWSwgYm9vbCBwcmVtdWx0 aXBseUFscGhhKTsKICAgICAgICAgaW50IHRleFN1YkltYWdlMkQodW5zaWduZWQgdGFyZ2V0LCB1 bnNpZ25lZCBsZXZlbCwgdW5zaWduZWQgeG9mZnNldCwgdW5zaWduZWQgeW9mZnNldCwKICAgICAg ICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgd2lkdGgsIHVuc2lnbmVkIGhlaWdodCwgSFRN TFZpZGVvRWxlbWVudCogdmlkZW8sCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL21hYy9HcmFwaGljc0NvbnRleHQzRE1hYy5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL21hYy9HcmFwaGljc0NvbnRleHQzRE1hYy5jcHAKaW5kZXggMTFjNmZiOS4uOWFmYzBiNiAx MDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvR3JhcGhpY3NDb250ZXh0 M0RNYWMuY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0dyYXBoaWNzQ29u dGV4dDNETWFjLmNwcApAQCAtMTU2OCwzOSArMTU2OCwxNSBAQCBpbnQgR3JhcGhpY3NDb250ZXh0 M0Q6OnRleEltYWdlMkQodW5zaWduZWQgdGFyZ2V0LCB1bnNpZ25lZCBsZXZlbCwgdW5zaWduZWQg aW50ZQogICAgIHJldHVybiAtMTsKIH0KIAotaW50IEdyYXBoaWNzQ29udGV4dDNEOjp0ZXhJbWFn ZTJEKHVuc2lnbmVkIHRhcmdldCwgdW5zaWduZWQgbGV2ZWwsIEhUTUxJbWFnZUVsZW1lbnQqIGlt YWdlLCBib29sIGZsaXBZLCBib29sIHByZW11bHRpcGx5QWxwaGEpCitpbnQgR3JhcGhpY3NDb250 ZXh0M0Q6OnRleEltYWdlMkQodW5zaWduZWQgdGFyZ2V0LCB1bnNpZ25lZCBsZXZlbCwgSW1hZ2Uq IGltYWdlLCBib29sIGZsaXBZLCBib29sIHByZW11bHRpcGx5QWxwaGEpCiB7CiAgICAgLy8gRklY TUU6IG5lZWQgdG8gc3VwcG9ydCBmbGlwWSBhbmQgcHJlbXVsdGlwbHlBbHBoYQogICAgIFVOVVNF RF9QQVJBTShmbGlwWSk7CiAgICAgVU5VU0VEX1BBUkFNKHByZW11bHRpcGx5QWxwaGEpOwotICAg IAotICAgIGlmICghaW1hZ2UpCi0gICAgICAgIHJldHVybiAtMTsKKyAgICBBU1NFUlQoaW1hZ2Up OwogICAgIAogICAgIGVuc3VyZUNvbnRleHQobV9jb250ZXh0T2JqKTsKLSAgICBDYWNoZWRJbWFn ZSogY2FjaGVkSW1hZ2UgPSBpbWFnZS0+Y2FjaGVkSW1hZ2UoKTsKLSAgICBpZiAoIWNhY2hlZElt YWdlKQotICAgICAgICByZXR1cm4gLTE7Ci0gICAgCi0gICAgaW1hZ2VUb1RleHR1cmUoY2FjaGVk SW1hZ2UtPmltYWdlKCksIHRhcmdldCwgbGV2ZWwpOwotICAgIHJldHVybiAwOwotfQotCi1pbnQg R3JhcGhpY3NDb250ZXh0M0Q6OnRleEltYWdlMkQodW5zaWduZWQgdGFyZ2V0LCB1bnNpZ25lZCBs ZXZlbCwgSFRNTENhbnZhc0VsZW1lbnQqIGNhbnZhcywgYm9vbCBmbGlwWSwgYm9vbCBwcmVtdWx0 aXBseUFscGhhKQotewotICAgIC8vIEZJWE1FOiBuZWVkIHRvIHN1cHBvcnQgZmxpcFkgYW5kIHBy ZW11bHRpcGx5QWxwaGEKLSAgICBVTlVTRURfUEFSQU0oZmxpcFkpOwotICAgIFVOVVNFRF9QQVJB TShwcmVtdWx0aXBseUFscGhhKTsKLSAgICAKLSAgICBpZiAoIWNhbnZhcykKLSAgICAgICAgcmV0 dXJuIC0xOwotICAgIAotICAgIGVuc3VyZUNvbnRleHQobV9jb250ZXh0T2JqKTsKLSAgICBJbWFn ZUJ1ZmZlciogYnVmZmVyID0gY2FudmFzLT5idWZmZXIoKTsKLSAgICBpZiAoIWJ1ZmZlcikKLSAg ICAgICAgcmV0dXJuIC0xOwotICAgIAotICAgIGltYWdlVG9UZXh0dXJlKGJ1ZmZlci0+aW1hZ2Uo KSwgdGFyZ2V0LCBsZXZlbCk7CisgICAgaW1hZ2VUb1RleHR1cmUoaW1hZ2UsIHRhcmdldCwgbGV2 ZWwpOwogICAgIHJldHVybiAwOwogfQogCkBAIC0xNjQ3LDcgKzE2MjMsNyBAQCBpbnQgR3JhcGhp Y3NDb250ZXh0M0Q6OnRleFN1YkltYWdlMkQodW5zaWduZWQgdGFyZ2V0LCB1bnNpZ25lZCBsZXZl bCwgdW5zaWduZWQgeAogICAgIHJldHVybiAtMTsKIH0KIAotaW50IEdyYXBoaWNzQ29udGV4dDNE Ojp0ZXhTdWJJbWFnZTJEKHVuc2lnbmVkIHRhcmdldCwgdW5zaWduZWQgbGV2ZWwsIHVuc2lnbmVk IHhvZmYsIHVuc2lnbmVkIHlvZmYsIHVuc2lnbmVkIHdpZHRoLCB1bnNpZ25lZCBoZWlnaHQsIEhU TUxJbWFnZUVsZW1lbnQqIGltYWdlLCBib29sIGZsaXBZLCBib29sIHByZW11bHRpcGx5QWxwaGEp CitpbnQgR3JhcGhpY3NDb250ZXh0M0Q6OnRleFN1YkltYWdlMkQodW5zaWduZWQgdGFyZ2V0LCB1 bnNpZ25lZCBsZXZlbCwgdW5zaWduZWQgeG9mZiwgdW5zaWduZWQgeW9mZiwgdW5zaWduZWQgd2lk dGgsIHVuc2lnbmVkIGhlaWdodCwgSW1hZ2UqIGltYWdlLCBib29sIGZsaXBZLCBib29sIHByZW11 bHRpcGx5QWxwaGEpCiB7CiAgICAgLy8gRklYTUU6IHdlIHdpbGwgbmVlZCB0byBkZWFsIHdpdGgg UGl4ZWxTdG9yZSBwYXJhbXMgd2hlbiBkZWFsaW5nIHdpdGggaW1hZ2UgYnVmZmVycyB0aGF0IGRp ZmZlciBmcm9tIHRoZSBzdWJpbWFnZSBzaXplCiAgICAgVU5VU0VEX1BBUkFNKHRhcmdldCk7CkBA IC0xNjY0LDIzICsxNjQwLDYgQEAgaW50IEdyYXBoaWNzQ29udGV4dDNEOjp0ZXhTdWJJbWFnZTJE KHVuc2lnbmVkIHRhcmdldCwgdW5zaWduZWQgbGV2ZWwsIHVuc2lnbmVkIHgKICAgICByZXR1cm4g LTE7CiB9CiAKLWludCBHcmFwaGljc0NvbnRleHQzRDo6dGV4U3ViSW1hZ2UyRCh1bnNpZ25lZCB0 YXJnZXQsIHVuc2lnbmVkIGxldmVsLCB1bnNpZ25lZCB4b2ZmLCB1bnNpZ25lZCB5b2ZmLCB1bnNp Z25lZCB3aWR0aCwgdW5zaWduZWQgaGVpZ2h0LCBIVE1MQ2FudmFzRWxlbWVudCogY2FudmFzLCBi b29sIGZsaXBZLCBib29sIHByZW11bHRpcGx5QWxwaGEpCi17Ci0gICAgLy8gRklYTUU6IHdlIHdp bGwgbmVlZCB0byBkZWFsIHdpdGggUGl4ZWxTdG9yZSBwYXJhbXMgd2hlbiBkZWFsaW5nIHdpdGgg aW1hZ2UgYnVmZmVycyB0aGF0IGRpZmZlciBmcm9tIHRoZSBzdWJpbWFnZSBzaXplCi0gICAgVU5V U0VEX1BBUkFNKHRhcmdldCk7Ci0gICAgVU5VU0VEX1BBUkFNKGxldmVsKTsKLSAgICBVTlVTRURf UEFSQU0oeG9mZik7Ci0gICAgVU5VU0VEX1BBUkFNKHlvZmYpOwotICAgIFVOVVNFRF9QQVJBTSh3 aWR0aCk7Ci0gICAgVU5VU0VEX1BBUkFNKGhlaWdodCk7Ci0gICAgVU5VU0VEX1BBUkFNKGNhbnZh cyk7Ci0KLSAgICAvLyBGSVhNRTogbmVlZCB0byBzdXBwb3J0IGZsaXBZIGFuZCBwcmVtdWx0aXBs eUFscGhhICAgIAotICAgIFVOVVNFRF9QQVJBTShmbGlwWSk7Ci0gICAgVU5VU0VEX1BBUkFNKHBy ZW11bHRpcGx5QWxwaGEpOwotICAgIHJldHVybiAtMTsKLX0KLQogaW50IEdyYXBoaWNzQ29udGV4 dDNEOjp0ZXhTdWJJbWFnZTJEKHVuc2lnbmVkIHRhcmdldCwgdW5zaWduZWQgbGV2ZWwsIHVuc2ln bmVkIHhvZmYsIHVuc2lnbmVkIHlvZmYsIHVuc2lnbmVkIHdpZHRoLCB1bnNpZ25lZCBoZWlnaHQs IEhUTUxWaWRlb0VsZW1lbnQqIHZpZGVvLCBib29sIGZsaXBZLCBib29sIHByZW11bHRpcGx5QWxw aGEpCiB7CiAgICAgLy8gRklYTUU6IHdlIHdpbGwgbmVlZCB0byBkZWFsIHdpdGggUGl4ZWxTdG9y ZSBwYXJhbXMgd2hlbiBkZWFsaW5nIHdpdGggaW1hZ2UgYnVmZmVycyB0aGF0IGRpZmZlciBmcm9t IHRoZSBzdWJpbWFnZSBzaXpl 42267 2009-10-31 21:37:55 -0700 2009-11-01 18:12:18 -0800 Remove canvas and image element uses from CanvasRenderingContext3D bug-30986-20091031213754.patch text/plain 9968 oliver ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MjNmMjRmZS4uZWE0MTU3MCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyMiBAQAogMjAwOS0xMC0zMSAgT2xpdmVyIEh1bnQg IDxvbGl2ZXJAYXBwbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEZpeCBsYXllcmluZyB2aW9sYXRpb25zIGluIEdyYXBoaWNzQ29udGV4dDNE CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMDk4Ngor CisgICAgICAgIFJlbW92ZSB1c2VzIG9mIEhUTUxJbWFnZUVsZW1lbnQgYW5kIEhUTUxDYW52YXNF bGVtZW50CisKKyAgICAgICAgKiBodG1sL2NhbnZhcy9DYW52YXNSZW5kZXJpbmdDb250ZXh0M0Qu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2FudmFzUmVuZGVyaW5nQ29udGV4dDNEOjp0ZXhJbWFn ZTJEKToKKyAgICAgICAgKFdlYkNvcmU6OkNhbnZhc1JlbmRlcmluZ0NvbnRleHQzRDo6dGV4U3Vi SW1hZ2UyRCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0M0Qu aDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9tYWMvR3JhcGhpY3NDb250ZXh0M0RNYWMu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0M0Q6OnRleEltYWdlMkQpOgor ICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0M0Q6OnRleFN1YkltYWdlMkQpOgorCisy MDA5LTEwLTMxICBPbGl2ZXIgSHVudCAgPG9saXZlckBhcHBsZS5jb20+CisKICAgICAgICAgQnVp bGQgZml4CiAKICAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9tYWMvR3JhcGhpY3NDb250ZXh0 M0RNYWMuY3BwOgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9odG1sL2NhbnZhcy9DYW52YXNSZW5kZXJp bmdDb250ZXh0M0QuY3BwIGIvV2ViQ29yZS9odG1sL2NhbnZhcy9DYW52YXNSZW5kZXJpbmdDb250 ZXh0M0QuY3BwCmluZGV4IDg0Y2NmNGMuLjQ3M2Y2MGIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRt bC9jYW52YXMvQ2FudmFzUmVuZGVyaW5nQ29udGV4dDNELmNwcAorKysgYi9XZWJDb3JlL2h0bWwv Y2FudmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRleHQzRC5jcHAKQEAgLTM3LDYgKzM3LDggQEAKICNp bmNsdWRlICJDYW52YXNUZXh0dXJlLmgiCiAjaW5jbHVkZSAiQ2FudmFzU2hhZGVyLmgiCiAjaW5j bHVkZSAiSFRNTENhbnZhc0VsZW1lbnQuaCIKKyNpbmNsdWRlICJIVE1MSW1hZ2VFbGVtZW50Lmgi CisjaW5jbHVkZSAiSW1hZ2VCdWZmZXIuaCIKICNpbmNsdWRlICJSZW5kZXJCb3guaCIKICNpbmNs dWRlICJSZW5kZXJMYXllci5oIgogCkBAIC0xMDA1LDE4ICsxMDA3LDM2IEBAIHZvaWQgQ2FudmFz UmVuZGVyaW5nQ29udGV4dDNEOjp0ZXhJbWFnZTJEKHVuc2lnbmVkIHRhcmdldCwgdW5zaWduZWQg bGV2ZWwsIHVuc2lnCiB2b2lkIENhbnZhc1JlbmRlcmluZ0NvbnRleHQzRDo6dGV4SW1hZ2UyRCh1 bnNpZ25lZCB0YXJnZXQsIHVuc2lnbmVkIGxldmVsLCBIVE1MSW1hZ2VFbGVtZW50KiBpbWFnZSwK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJvb2wgZmxpcFksIGJv b2wgcHJlbXVsdGlwbHlBbHBoYSwgRXhjZXB0aW9uQ29kZSYgZWMpCiB7Ci0gICAgLy8gRklYTUU6 IEZvciBub3cgd2UgaWdub3JlIGFueSBlcnJvcnMgcmV0dXJuZWQKICAgICBlYyA9IDA7Ci0gICAg bV9jb250ZXh0LT50ZXhJbWFnZTJEKHRhcmdldCwgbGV2ZWwsIGltYWdlLCBmbGlwWSwgcHJlbXVs dGlwbHlBbHBoYSk7CisgICAgaWYgKCFpbWFnZSkgeworICAgICAgICBlYyA9IFRZUEVfTUlTTUFU Q0hfRVJSOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgQ2FjaGVkSW1hZ2UqIGNhY2hl ZEltYWdlID0gaW1hZ2UtPmNhY2hlZEltYWdlKCk7CisgICAgaWYgKCFjYWNoZWRJbWFnZSkKKyAg ICAgICAgcmV0dXJuOworCisgICAgLy8gRklYTUU6IEZvciBub3cgd2UgaWdub3JlIGFueSBlcnJv cnMgcmV0dXJuZWQKKyAgICBtX2NvbnRleHQtPnRleEltYWdlMkQodGFyZ2V0LCBsZXZlbCwgY2Fj aGVkSW1hZ2UtPmltYWdlKCksIGZsaXBZLCBwcmVtdWx0aXBseUFscGhhKTsKICAgICBjbGVhbnVw QWZ0ZXJHcmFwaGljc0NhbGwoZmFsc2UpOwogfQogCiB2b2lkIENhbnZhc1JlbmRlcmluZ0NvbnRl eHQzRDo6dGV4SW1hZ2UyRCh1bnNpZ25lZCB0YXJnZXQsIHVuc2lnbmVkIGxldmVsLCBIVE1MQ2Fu dmFzRWxlbWVudCogY2FudmFzLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgYm9vbCBmbGlwWSwgYm9vbCBwcmVtdWx0aXBseUFscGhhLCBFeGNlcHRpb25Db2RlJiBl YykKIHsKLSAgICAvLyBGSVhNRTogRm9yIG5vdyB3ZSBpZ25vcmUgYW55IGVycm9ycyByZXR1cm5l ZAogICAgIGVjID0gMDsKLSAgICBtX2NvbnRleHQtPnRleEltYWdlMkQodGFyZ2V0LCBsZXZlbCwg Y2FudmFzLCBmbGlwWSwgcHJlbXVsdGlwbHlBbHBoYSk7CisgICAgaWYgKCFjYW52YXMpIHsKKyAg ICAgICAgZWMgPSBUWVBFX01JU01BVENIX0VSUjsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKwor ICAgIEltYWdlQnVmZmVyKiBidWZmZXIgPSBjYW52YXMtPmJ1ZmZlcigpOworICAgIGlmICghYnVm ZmVyKQorICAgICAgICByZXR1cm47CisKKyAgICAvLyBGSVhNRTogRm9yIG5vdyB3ZSBpZ25vcmUg YW55IGVycm9ycyByZXR1cm5lZAorICAgIG1fY29udGV4dC0+dGV4SW1hZ2UyRCh0YXJnZXQsIGxl dmVsLCBidWZmZXItPmltYWdlKCksIGZsaXBZLCBwcmVtdWx0aXBseUFscGhhKTsKICAgICBjbGVh bnVwQWZ0ZXJHcmFwaGljc0NhbGwoZmFsc2UpOwogfQogCkBAIC0xMDY3LDcgKzEwODcsMTUgQEAg dm9pZCBDYW52YXNSZW5kZXJpbmdDb250ZXh0M0Q6OnRleFN1YkltYWdlMkQodW5zaWduZWQgdGFy Z2V0LCB1bnNpZ25lZCBsZXZlbCwgdW4KIHsKICAgICAvLyBGSVhNRTogRm9yIG5vdyB3ZSBpZ25v cmUgYW55IGVycm9ycyByZXR1cm5lZAogICAgIGVjID0gMDsKLSAgICBtX2NvbnRleHQtPnRleFN1 YkltYWdlMkQodGFyZ2V0LCBsZXZlbCwgeG9mZnNldCwgeW9mZnNldCwgd2lkdGgsIGhlaWdodCwg aW1hZ2UsIGZsaXBZLCBwcmVtdWx0aXBseUFscGhhKTsKKyAgICBpZiAoIWltYWdlKSB7CisgICAg ICAgIGVjID0gVFlQRV9NSVNNQVRDSF9FUlI7CisgICAgICAgIHJldHVybjsKKyAgICB9CisgICAg CisgICAgQ2FjaGVkSW1hZ2UqIGNhY2hlZEltYWdlID0gaW1hZ2UtPmNhY2hlZEltYWdlKCk7Cisg ICAgaWYgKCFjYWNoZWRJbWFnZSkKKyAgICAgICAgcmV0dXJuOworICAgIG1fY29udGV4dC0+dGV4 U3ViSW1hZ2UyRCh0YXJnZXQsIGxldmVsLCB4b2Zmc2V0LCB5b2Zmc2V0LCB3aWR0aCwgaGVpZ2h0 LCBjYWNoZWRJbWFnZS0+aW1hZ2UoKSwgZmxpcFksIHByZW11bHRpcGx5QWxwaGEpOwogICAgIGNs ZWFudXBBZnRlckdyYXBoaWNzQ2FsbChmYWxzZSk7CiB9CiAKQEAgLTEwNzUsOSArMTEwMywxOCBA QCB2b2lkIENhbnZhc1JlbmRlcmluZ0NvbnRleHQzRDo6dGV4U3ViSW1hZ2UyRCh1bnNpZ25lZCB0 YXJnZXQsIHVuc2lnbmVkIGxldmVsLCB1bgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgdW5zaWduZWQgd2lkdGgsIHVuc2lnbmVkIGhlaWdodCwgSFRNTENhbnZh c0VsZW1lbnQqIGNhbnZhcywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGJvb2wgZmxpcFksIGJvb2wgcHJlbXVsdGlwbHlBbHBoYSwgRXhjZXB0aW9uQ29kZSYg ZWMpCiB7Ci0gICAgLy8gRklYTUU6IEZvciBub3cgd2UgaWdub3JlIGFueSBlcnJvcnMgcmV0dXJu ZWQKICAgICBlYyA9IDA7Ci0gICAgbV9jb250ZXh0LT50ZXhTdWJJbWFnZTJEKHRhcmdldCwgbGV2 ZWwsIHhvZmZzZXQsIHlvZmZzZXQsIHdpZHRoLCBoZWlnaHQsIGNhbnZhcywgZmxpcFksIHByZW11 bHRpcGx5QWxwaGEpOworICAgIGlmICghY2FudmFzKSB7CisgICAgICAgIGVjID0gVFlQRV9NSVNN QVRDSF9FUlI7CisgICAgICAgIHJldHVybjsKKyAgICB9CisgICAgCisgICAgSW1hZ2VCdWZmZXIq IGJ1ZmZlciA9IGNhbnZhcy0+YnVmZmVyKCk7CisgICAgaWYgKCFidWZmZXIpCisgICAgICAgIHJl dHVybjsKKyAgICAKKyAgICAvLyBGSVhNRTogRm9yIG5vdyB3ZSBpZ25vcmUgYW55IGVycm9ycyBy ZXR1cm5lZAorICAgIG1fY29udGV4dC0+dGV4U3ViSW1hZ2UyRCh0YXJnZXQsIGxldmVsLCB4b2Zm c2V0LCB5b2Zmc2V0LCB3aWR0aCwgaGVpZ2h0LCBidWZmZXItPmltYWdlKCksIGZsaXBZLCBwcmVt dWx0aXBseUFscGhhKTsKICAgICBjbGVhbnVwQWZ0ZXJHcmFwaGljc0NhbGwoZmFsc2UpOwogfQog CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dDNE LmggYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dDNELmgKaW5kZXgg MDdlYzA0ZC4uMTE3NGMwMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9H cmFwaGljc0NvbnRleHQzRC5oCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhp Y3NDb250ZXh0M0QuaApAQCAtNTgsOCArNTgsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAg Y2xhc3MgQ2FudmFzUmVuZGVyaW5nQ29udGV4dDNEOwogICAgIGNsYXNzIENhbnZhc1NoYWRlcjsK ICAgICBjbGFzcyBDYW52YXNUZXh0dXJlOwotICAgIGNsYXNzIEhUTUxDYW52YXNFbGVtZW50Owot ICAgIGNsYXNzIEhUTUxJbWFnZUVsZW1lbnQ7CisgICAgY2xhc3MgSW1hZ2U7CiAgICAgY2xhc3Mg SFRNTFZpZGVvRWxlbWVudDsKICAgICBjbGFzcyBJbWFnZURhdGE7CiAgICAgY2xhc3MgV2ViS2l0 Q1NTTWF0cml4OwpAQCAtMjM2LDkgKzIzNSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAg ICAgaW50IHRleEltYWdlMkQodW5zaWduZWQgdGFyZ2V0LCB1bnNpZ25lZCBsZXZlbCwgdW5zaWdu ZWQgaW50ZXJuYWxmb3JtYXQsCiAgICAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIHdpZHRo LCB1bnNpZ25lZCBoZWlnaHQsIHVuc2lnbmVkIGJvcmRlciwKICAgICAgICAgICAgICAgICAgICAg ICAgdW5zaWduZWQgZm9ybWF0LCB1bnNpZ25lZCB0eXBlLCBJbWFnZURhdGEqIHBpeGVscyk7Ci0g ICAgICAgIGludCB0ZXhJbWFnZTJEKHVuc2lnbmVkIHRhcmdldCwgdW5zaWduZWQgbGV2ZWwsIEhU TUxJbWFnZUVsZW1lbnQqIGltYWdlLAotICAgICAgICAgICAgICAgICAgICAgICBib29sIGZsaXBZ LCBib29sIHByZW11bHRpcGx5QWxwaGEpOwotICAgICAgICBpbnQgdGV4SW1hZ2UyRCh1bnNpZ25l ZCB0YXJnZXQsIHVuc2lnbmVkIGxldmVsLCBIVE1MQ2FudmFzRWxlbWVudCogY2FudmFzLAorICAg ICAgICBpbnQgdGV4SW1hZ2UyRCh1bnNpZ25lZCB0YXJnZXQsIHVuc2lnbmVkIGxldmVsLCBJbWFn ZSogaW1hZ2UsCiAgICAgICAgICAgICAgICAgICAgICAgIGJvb2wgZmxpcFksIGJvb2wgcHJlbXVs dGlwbHlBbHBoYSk7CiAgICAgICAgIGludCB0ZXhJbWFnZTJEKHVuc2lnbmVkIHRhcmdldCwgdW5z aWduZWQgbGV2ZWwsIEhUTUxWaWRlb0VsZW1lbnQqIHZpZGVvLAogICAgICAgICAgICAgICAgICAg ICAgICBib29sIGZsaXBZLCBib29sIHByZW11bHRpcGx5QWxwaGEpOwpAQCAtMjUzLDEwICsyNTAs NyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgICAgICAgICAgICAgICAgICAgIHVuc2ln bmVkIHdpZHRoLCB1bnNpZ25lZCBoZWlnaHQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgIHVu c2lnbmVkIGZvcm1hdCwgdW5zaWduZWQgdHlwZSwgSW1hZ2VEYXRhKiBwaXhlbHMpOwogICAgICAg ICBpbnQgdGV4U3ViSW1hZ2UyRCh1bnNpZ25lZCB0YXJnZXQsIHVuc2lnbmVkIGxldmVsLCB1bnNp Z25lZCB4b2Zmc2V0LCB1bnNpZ25lZCB5b2Zmc2V0LAotICAgICAgICAgICAgICAgICAgICAgICAg ICB1bnNpZ25lZCB3aWR0aCwgdW5zaWduZWQgaGVpZ2h0LCBIVE1MSW1hZ2VFbGVtZW50KiBpbWFn ZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgYm9vbCBmbGlwWSwgYm9vbCBwcmVtdWx0aXBs eUFscGhhKTsKLSAgICAgICAgaW50IHRleFN1YkltYWdlMkQodW5zaWduZWQgdGFyZ2V0LCB1bnNp Z25lZCBsZXZlbCwgdW5zaWduZWQgeG9mZnNldCwgdW5zaWduZWQgeW9mZnNldCwKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgdW5zaWduZWQgd2lkdGgsIHVuc2lnbmVkIGhlaWdodCwgSFRNTENh bnZhc0VsZW1lbnQqIGNhbnZhcywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQg d2lkdGgsIHVuc2lnbmVkIGhlaWdodCwgSW1hZ2UqIGltYWdlLAogICAgICAgICAgICAgICAgICAg ICAgICAgICBib29sIGZsaXBZLCBib29sIHByZW11bHRpcGx5QWxwaGEpOwogICAgICAgICBpbnQg dGV4U3ViSW1hZ2UyRCh1bnNpZ25lZCB0YXJnZXQsIHVuc2lnbmVkIGxldmVsLCB1bnNpZ25lZCB4 b2Zmc2V0LCB1bnNpZ25lZCB5b2Zmc2V0LAogICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNp Z25lZCB3aWR0aCwgdW5zaWduZWQgaGVpZ2h0LCBIVE1MVmlkZW9FbGVtZW50KiB2aWRlbywKZGlm ZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0dyYXBoaWNzQ29udGV4dDNE TWFjLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0dyYXBoaWNzQ29udGV4dDNE TWFjLmNwcAppbmRleCAxMWM2ZmI5Li45YWZjMGI2IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL21hYy9HcmFwaGljc0NvbnRleHQzRE1hYy5jcHAKKysrIGIvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9tYWMvR3JhcGhpY3NDb250ZXh0M0RNYWMuY3BwCkBAIC0xNTY4LDM5 ICsxNTY4LDE1IEBAIGludCBHcmFwaGljc0NvbnRleHQzRDo6dGV4SW1hZ2UyRCh1bnNpZ25lZCB0 YXJnZXQsIHVuc2lnbmVkIGxldmVsLCB1bnNpZ25lZCBpbnRlCiAgICAgcmV0dXJuIC0xOwogfQog Ci1pbnQgR3JhcGhpY3NDb250ZXh0M0Q6OnRleEltYWdlMkQodW5zaWduZWQgdGFyZ2V0LCB1bnNp Z25lZCBsZXZlbCwgSFRNTEltYWdlRWxlbWVudCogaW1hZ2UsIGJvb2wgZmxpcFksIGJvb2wgcHJl bXVsdGlwbHlBbHBoYSkKK2ludCBHcmFwaGljc0NvbnRleHQzRDo6dGV4SW1hZ2UyRCh1bnNpZ25l ZCB0YXJnZXQsIHVuc2lnbmVkIGxldmVsLCBJbWFnZSogaW1hZ2UsIGJvb2wgZmxpcFksIGJvb2wg cHJlbXVsdGlwbHlBbHBoYSkKIHsKICAgICAvLyBGSVhNRTogbmVlZCB0byBzdXBwb3J0IGZsaXBZ IGFuZCBwcmVtdWx0aXBseUFscGhhCiAgICAgVU5VU0VEX1BBUkFNKGZsaXBZKTsKICAgICBVTlVT RURfUEFSQU0ocHJlbXVsdGlwbHlBbHBoYSk7Ci0gICAgCi0gICAgaWYgKCFpbWFnZSkKLSAgICAg ICAgcmV0dXJuIC0xOworICAgIEFTU0VSVChpbWFnZSk7CiAgICAgCiAgICAgZW5zdXJlQ29udGV4 dChtX2NvbnRleHRPYmopOwotICAgIENhY2hlZEltYWdlKiBjYWNoZWRJbWFnZSA9IGltYWdlLT5j YWNoZWRJbWFnZSgpOwotICAgIGlmICghY2FjaGVkSW1hZ2UpCi0gICAgICAgIHJldHVybiAtMTsK LSAgICAKLSAgICBpbWFnZVRvVGV4dHVyZShjYWNoZWRJbWFnZS0+aW1hZ2UoKSwgdGFyZ2V0LCBs ZXZlbCk7Ci0gICAgcmV0dXJuIDA7Ci19Ci0KLWludCBHcmFwaGljc0NvbnRleHQzRDo6dGV4SW1h Z2UyRCh1bnNpZ25lZCB0YXJnZXQsIHVuc2lnbmVkIGxldmVsLCBIVE1MQ2FudmFzRWxlbWVudCog Y2FudmFzLCBib29sIGZsaXBZLCBib29sIHByZW11bHRpcGx5QWxwaGEpCi17Ci0gICAgLy8gRklY TUU6IG5lZWQgdG8gc3VwcG9ydCBmbGlwWSBhbmQgcHJlbXVsdGlwbHlBbHBoYQotICAgIFVOVVNF RF9QQVJBTShmbGlwWSk7Ci0gICAgVU5VU0VEX1BBUkFNKHByZW11bHRpcGx5QWxwaGEpOwotICAg IAotICAgIGlmICghY2FudmFzKQotICAgICAgICByZXR1cm4gLTE7Ci0gICAgCi0gICAgZW5zdXJl Q29udGV4dChtX2NvbnRleHRPYmopOwotICAgIEltYWdlQnVmZmVyKiBidWZmZXIgPSBjYW52YXMt PmJ1ZmZlcigpOwotICAgIGlmICghYnVmZmVyKQotICAgICAgICByZXR1cm4gLTE7Ci0gICAgCi0g ICAgaW1hZ2VUb1RleHR1cmUoYnVmZmVyLT5pbWFnZSgpLCB0YXJnZXQsIGxldmVsKTsKKyAgICBp bWFnZVRvVGV4dHVyZShpbWFnZSwgdGFyZ2V0LCBsZXZlbCk7CiAgICAgcmV0dXJuIDA7CiB9CiAK QEAgLTE2NDcsNyArMTYyMyw3IEBAIGludCBHcmFwaGljc0NvbnRleHQzRDo6dGV4U3ViSW1hZ2Uy RCh1bnNpZ25lZCB0YXJnZXQsIHVuc2lnbmVkIGxldmVsLCB1bnNpZ25lZCB4CiAgICAgcmV0dXJu IC0xOwogfQogCi1pbnQgR3JhcGhpY3NDb250ZXh0M0Q6OnRleFN1YkltYWdlMkQodW5zaWduZWQg dGFyZ2V0LCB1bnNpZ25lZCBsZXZlbCwgdW5zaWduZWQgeG9mZiwgdW5zaWduZWQgeW9mZiwgdW5z aWduZWQgd2lkdGgsIHVuc2lnbmVkIGhlaWdodCwgSFRNTEltYWdlRWxlbWVudCogaW1hZ2UsIGJv b2wgZmxpcFksIGJvb2wgcHJlbXVsdGlwbHlBbHBoYSkKK2ludCBHcmFwaGljc0NvbnRleHQzRDo6 dGV4U3ViSW1hZ2UyRCh1bnNpZ25lZCB0YXJnZXQsIHVuc2lnbmVkIGxldmVsLCB1bnNpZ25lZCB4 b2ZmLCB1bnNpZ25lZCB5b2ZmLCB1bnNpZ25lZCB3aWR0aCwgdW5zaWduZWQgaGVpZ2h0LCBJbWFn ZSogaW1hZ2UsIGJvb2wgZmxpcFksIGJvb2wgcHJlbXVsdGlwbHlBbHBoYSkKIHsKICAgICAvLyBG SVhNRTogd2Ugd2lsbCBuZWVkIHRvIGRlYWwgd2l0aCBQaXhlbFN0b3JlIHBhcmFtcyB3aGVuIGRl YWxpbmcgd2l0aCBpbWFnZSBidWZmZXJzIHRoYXQgZGlmZmVyIGZyb20gdGhlIHN1YmltYWdlIHNp emUKICAgICBVTlVTRURfUEFSQU0odGFyZ2V0KTsKQEAgLTE2NjQsMjMgKzE2NDAsNiBAQCBpbnQg R3JhcGhpY3NDb250ZXh0M0Q6OnRleFN1YkltYWdlMkQodW5zaWduZWQgdGFyZ2V0LCB1bnNpZ25l ZCBsZXZlbCwgdW5zaWduZWQgeAogICAgIHJldHVybiAtMTsKIH0KIAotaW50IEdyYXBoaWNzQ29u dGV4dDNEOjp0ZXhTdWJJbWFnZTJEKHVuc2lnbmVkIHRhcmdldCwgdW5zaWduZWQgbGV2ZWwsIHVu c2lnbmVkIHhvZmYsIHVuc2lnbmVkIHlvZmYsIHVuc2lnbmVkIHdpZHRoLCB1bnNpZ25lZCBoZWln aHQsIEhUTUxDYW52YXNFbGVtZW50KiBjYW52YXMsIGJvb2wgZmxpcFksIGJvb2wgcHJlbXVsdGlw bHlBbHBoYSkKLXsKLSAgICAvLyBGSVhNRTogd2Ugd2lsbCBuZWVkIHRvIGRlYWwgd2l0aCBQaXhl bFN0b3JlIHBhcmFtcyB3aGVuIGRlYWxpbmcgd2l0aCBpbWFnZSBidWZmZXJzIHRoYXQgZGlmZmVy IGZyb20gdGhlIHN1YmltYWdlIHNpemUKLSAgICBVTlVTRURfUEFSQU0odGFyZ2V0KTsKLSAgICBV TlVTRURfUEFSQU0obGV2ZWwpOwotICAgIFVOVVNFRF9QQVJBTSh4b2ZmKTsKLSAgICBVTlVTRURf UEFSQU0oeW9mZik7Ci0gICAgVU5VU0VEX1BBUkFNKHdpZHRoKTsKLSAgICBVTlVTRURfUEFSQU0o aGVpZ2h0KTsKLSAgICBVTlVTRURfUEFSQU0oY2FudmFzKTsKLQotICAgIC8vIEZJWE1FOiBuZWVk IHRvIHN1cHBvcnQgZmxpcFkgYW5kIHByZW11bHRpcGx5QWxwaGEgICAgCi0gICAgVU5VU0VEX1BB UkFNKGZsaXBZKTsKLSAgICBVTlVTRURfUEFSQU0ocHJlbXVsdGlwbHlBbHBoYSk7Ci0gICAgcmV0 dXJuIC0xOwotfQotCiBpbnQgR3JhcGhpY3NDb250ZXh0M0Q6OnRleFN1YkltYWdlMkQodW5zaWdu ZWQgdGFyZ2V0LCB1bnNpZ25lZCBsZXZlbCwgdW5zaWduZWQgeG9mZiwgdW5zaWduZWQgeW9mZiwg dW5zaWduZWQgd2lkdGgsIHVuc2lnbmVkIGhlaWdodCwgSFRNTFZpZGVvRWxlbWVudCogdmlkZW8s IGJvb2wgZmxpcFksIGJvb2wgcHJlbXVsdGlwbHlBbHBoYSkKIHsKICAgICAvLyBGSVhNRTogd2Ug d2lsbCBuZWVkIHRvIGRlYWwgd2l0aCBQaXhlbFN0b3JlIHBhcmFtcyB3aGVuIGRlYWxpbmcgd2l0 aCBpbWFnZSBidWZmZXJzIHRoYXQgZGlmZmVyIGZyb20gdGhlIHN1YmltYWdlIHNpemU=