100492 2012-10-26 03:33:29 -0700 [Qt] Remove QOpenGL specific code from GraphicsSurfaceGLX. 2012-10-26 05:21:09 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 100493 1 zeno zeno hausmann oldest_to_newest 751794 0 zeno 2012-10-26 03:33:29 -0700 [Qt] Remove QOpenGL specific code from GraphicsSurfaceGLX. 751805 1 170878 zeno 2012-10-26 03:43:28 -0700 Created attachment 170878 Patch This patch requires a change in Qt, which is currently staging but not available in Qt yet. Therefore it must be landed together with a separate patch that can be removed again, once the change has become available in Qt. 751922 2 hausmann 2012-10-26 05:21:09 -0700 Committed r132628: <http://trac.webkit.org/changeset/132628> 170878 2012-10-26 03:43:28 -0700 2012-10-26 03:46:54 -0700 Patch 100492_20121026-124039.patch text/plain 12271 zeno ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3ZDIzMmMwLi5mZjA3NTQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjgg QEAKKzIwMTItMTAtMjYgIFplbm8gQWxiaXNzZXIgIDx6ZW5vQHdlYmtpdC5vcmc+CisKKyAgICAg ICAgW1F0XSBSZW1vdmUgUU9wZW5HTCBzcGVjaWZpYyBjb2RlIGZyb20gR3JhcGhpY3NTdXJmYWNl R0xYLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAw NDkyCisKKyAgICAgICAgVGhpcyBwYXRjaCByZW1vdmVzIG1vc3Qgb2YgdGhlIFFPcGVuR0xDb250 ZXh0IHJlbGF0ZWQgY29kZQorICAgICAgICBmcm9tIEdyYXBoaWNzU3VyZmFjZUdMWC4gVGhpcyBh bGxvd3Mgc2hhcmluZyBhbG1vc3QgYWxsCisgICAgICAgIEdyYXBoaWNzU3VyZmFjZUdMWCBjb2Rl IHdpdGggRUZMLCBieSByZWx5aW5nIG9uIHB1cmUgR0xYLgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvc3VyZmFjZXMv cXQvR3JhcGhpY3NTdXJmYWNlR0xYLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok9mZlNjcmVlblJv b3RXaW5kb3c6OmdldCk6CisgICAgICAgIChXZWJDb3JlOjpPZmZTY3JlZW5Sb290V2luZG93Ojp+ T2ZmU2NyZWVuUm9vdFdpbmRvdyk6CisgICAgICAgIChPZmZTY3JlZW5Sb290V2luZG93KToKKyAg ICAgICAgKFdlYkNvcmUpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NTdXJmYWNlUHJpdmF0 ZTo6R3JhcGhpY3NTdXJmYWNlUHJpdmF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc1N1 cmZhY2VQcml2YXRlOjpjcmVhdGVTdXJmYWNlKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNz U3VyZmFjZVByaXZhdGU6Om1ha2VDdXJyZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNz U3VyZmFjZVByaXZhdGU6OmRvbmVDdXJyZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNz U3VyZmFjZVByaXZhdGU6OnN3YXBCdWZmZXJzKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNz U3VyZmFjZVByaXZhdGU6OmNvcHlGcm9tVGV4dHVyZSk6CisgICAgICAgIChHcmFwaGljc1N1cmZh Y2VQcml2YXRlKToKKyAgICAgICAgKFdlYkNvcmU6OnJlc29sdmVHTE1ldGhvZHMpOgorCiAyMDEy LTEwLTI2ICBNaWhuZWEgT3ZpZGVuaWUgIDxtaWhuZWFAYWRvYmUuY29tPgogCiAgICAgICAgIFtD U1NSZWdpb25zXSBBZGQgc3VwcG9ydCBmb3IgYXV0by1oZWlnaHQgcmVnaW9ucyB3aXRoIHJlZ2lv bi1icmVha3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3N1 cmZhY2VzL3F0L0dyYXBoaWNzU3VyZmFjZUdMWC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9zdXJmYWNlcy9xdC9HcmFwaGljc1N1cmZhY2VHTFguY3BwCmluZGV4IDkyOWZh MDAuLjRkMjkzMWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L3N1cmZhY2VzL3F0L0dyYXBoaWNzU3VyZmFjZUdMWC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3Mvc3VyZmFjZXMvcXQvR3JhcGhpY3NTdXJmYWNlR0xYLmNwcApAQCAt MjcsMTEgKzI3LDkgQEAKIAogI2lmIFBMQVRGT1JNKFFUKQogLy8gUXQgaGVhZGVycyBtdXN0IGJl IGluY2x1ZGVkIGJlZm9yZSBnbHggaGVhZGVycy4KLSNpbmNsdWRlIDxRQ29yZUFwcGxpY2F0aW9u PgorI2luY2x1ZGUgPFFHdWlBcHBsaWNhdGlvbj4KICNpbmNsdWRlIDxRT3BlbkdMQ29udGV4dD4K LSNpbmNsdWRlIDxRVmVjdG9yPgotI2luY2x1ZGUgPFFXaW5kb3c+Ci0jaW5jbHVkZSA8cXBhL3Fw bGF0Zm9ybXdpbmRvdy5oPgorI2luY2x1ZGUgPHFwYS9xcGxhdGZvcm1uYXRpdmVpbnRlcmZhY2Uu aD4KICNlbGlmIFBMQVRGT1JNKEVGTCkKICNpbmNsdWRlIDxHTC9nbC5oPgogI2VuZGlmCkBAIC02 MCwyMiArNTgsNiBAQCBwdWJsaWM6CiAgICAgICAgICsrcmVmQ291bnQ7CiAgICAgfQogCi0jaWYg UExBVEZPUk0oUVQpIAotICAgIFFXaW5kb3cqIGdldChEaXNwbGF5KiBkcHkpCi0gICAgewotICAg ICAgICBpZiAoIXdpbmRvdykgewotICAgICAgICAgICAgd2luZG93ID0gbmV3IFFXaW5kb3c7Ci0g ICAgICAgICAgICB3aW5kb3ctPnNldEdlb21ldHJ5KFFSZWN0KC0xLCAtMSwgMSwgMSkpOwotICAg ICAgICAgICAgd2luZG93LT5jcmVhdGUoKTsKLSAgICAgICAgICAgIFhTZXRXaW5kb3dBdHRyaWJ1 dGVzIGF0dHJpYnV0ZXM7Ci0gICAgICAgICAgICBhdHRyaWJ1dGVzLm92ZXJyaWRlX3JlZGlyZWN0 ID0gdHJ1ZTsKLSAgICAgICAgICAgIFhDaGFuZ2VXaW5kb3dBdHRyaWJ1dGVzKGRweSwgd2luZG93 LT5oYW5kbGUoKS0+d2luSWQoKSwgWDExT3ZlcnJpZGVSZWRpcmVjdCwgJmF0dHJpYnV0ZXMpOwot ICAgICAgICAgICAgd2luZG93LT5zaG93KCk7Ci0gICAgICAgIH0KLQotICAgICAgICByZXR1cm4g d2luZG93OwotICAgIH0KLSNlbGlmIFBMQVRGT1JNKEVGTCkKICAgICBXaW5kb3cqIGdldChEaXNw bGF5KiBkcHkpCiAgICAgewogICAgICAgICBpZiAoIXdpbmRvdykgewpAQCAtOTAsMzcgKzcyLDIz IEBAIHB1YmxpYzoKIAogICAgICAgICByZXR1cm4gJndpbmRvdzsKICAgICB9Ci0jZW5kaWYKIAog ICAgIH5PZmZTY3JlZW5Sb290V2luZG93KCkKICAgICB7CiAgICAgICAgIGlmICghLS1yZWZDb3Vu dCkgewotI2lmIFBMQVRGT1JNKFFUKQotICAgICAgICAgICAgZGVsZXRlIHdpbmRvdzsKLSAgICAg ICAgICAgIHdpbmRvdyA9IDA7Ci0jZWxpZiBQTEFURk9STShFRkwpCiAgICAgICAgICAgICBYVW5t YXBXaW5kb3coZGlzcGxheSwgd2luZG93KTsKICAgICAgICAgICAgIFhEZXN0cm95V2luZG93KGRp c3BsYXksIHdpbmRvdyk7Ci0jZW5kaWYKICAgICAgICAgfQogICAgIH0KIAogcHJpdmF0ZToKICAg ICBzdGF0aWMgaW50IHJlZkNvdW50OwotI2lmIFBMQVRGT1JNKFFUKQotICAgIHN0YXRpYyBRV2lu ZG93KiB3aW5kb3c7Ci0jZWxpZiBQTEFURk9STShFRkwpCiAgICAgc3RhdGljIFdpbmRvdyB3aW5k b3c7CiAgICAgRGlzcGxheSogZGlzcGxheTsKLSNlbmRpZgogfTsKIAogaW50IE9mZlNjcmVlblJv b3RXaW5kb3c6OnJlZkNvdW50ID0gMDsKLSNpZiBQTEFURk9STShRVCkKLVFXaW5kb3cqIE9mZlNj cmVlblJvb3RXaW5kb3c6OndpbmRvdyA9IDA7Ci0jZWxpZiBQTEFURk9STShFRkwpCiBXaW5kb3cg T2ZmU2NyZWVuUm9vdFdpbmRvdzo6d2luZG93ID0gMDsKLSNlbmRpZgogCiBzdGF0aWMgY29uc3Qg aW50IGdseFNwZWNbXSA9IHsKICAgICAvLyBUaGUgc3BlY2lmaWNhdGlvbiBpcyBhIHNldCBrZXkg dmFsdWUgcGFpcnMgc3RvcmVkIGluIGEgc2ltcGxlIGFycmF5LgpAQCAtMTUwLDIyICsxMTgsMTYg QEAgc3RydWN0IEdyYXBoaWNzU3VyZmFjZVByaXZhdGUgewogICAgICAgICAsIG1fdGV4dHVyZUlz WUludmVydGVkKGZhbHNlKQogICAgICAgICAsIG1faGFzQWxwaGEoZmFsc2UpCiAgICAgeworICAg ICAgICBHTFhDb250ZXh0IHNoYXJlQ29udGV4dE9iamVjdCA9IDA7CiAjaWYgUExBVEZPUk0oUVQp Ci0gICAgICAgIFFTdXJmYWNlKiBjdXJyZW50U3VyZmFjZSA9IDA7Ci0gICAgICAgIFFPcGVuR0xD b250ZXh0KiBjdXJyZW50Q29udGV4dCA9IFFPcGVuR0xDb250ZXh0OjpjdXJyZW50Q29udGV4dCgp OwotICAgICAgICBpZiAoY3VycmVudENvbnRleHQpCi0gICAgICAgICAgICBjdXJyZW50U3VyZmFj ZSA9IGN1cnJlbnRDb250ZXh0LT5zdXJmYWNlKCk7Ci0KLSAgICAgICAgbV9kaXNwbGF5ID0gWE9w ZW5EaXNwbGF5KDApOwotICAgICAgICBtX2dsQ29udGV4dCA9IGFkb3B0UHRyKG5ldyBRT3BlbkdM Q29udGV4dCk7Ci0gICAgICAgIG1fZ2xDb250ZXh0LT5zZXRTaGFyZUNvbnRleHQoc2hhcmVDb250 ZXh0KTsKLSAgICAgICAgbV9nbENvbnRleHQtPmNyZWF0ZSgpOwotCi0gICAgICAgIC8vIFRoZSBH TFggaW1wbGVtZW50YXRpb24gb2YgUU9wZW5HTENvbnRleHQgd2lsbCByZXNldCB0aGUgY3VycmVu dCBjb250ZXh0IHdoZW4gY3JlYXRlIGlzIGJlaW5nIGNhbGxlZC4KLSAgICAgICAgLy8gVGhlcmVm b3JlIHdlIGhhdmUgdG8gbWFrZSB0aGUgcHJldmlvdXMgY29udGV4dCBjdXJyZW50IGFnYWluLgot ICAgICAgICBpZiAoY3VycmVudENvbnRleHQpCi0gICAgICAgICAgICBjdXJyZW50Q29udGV4dC0+ bWFrZUN1cnJlbnQoY3VycmVudFN1cmZhY2UpOwotI2VsaWYgUExBVEZPUk0oRUZMKQorICAgICAg ICBpZiAoc2hhcmVDb250ZXh0KSB7CisgICAgICAgICAgICAvLyBUaGlzIGNvZGUgcGF0aCByZXF1 aXJlcyBRWGNiTmF0aXZlSW50ZXJmYWNlOjpuYXRpdmVSZXNvdXJjZUZvckNvbnRleHQoKSB3aGlj aCBpcyBub3QgYXZhaWxibGUgaW4gUXQ1IG9uIHRoZSBidWlsZCBib3RzIHlldC4KKyAgICAgICAg ICAgIFFQbGF0Zm9ybU5hdGl2ZUludGVyZmFjZSogbmF0aXZlSW50ZXJmYWNlID0gUUd1aUFwcGxp Y2F0aW9uOjpwbGF0Zm9ybU5hdGl2ZUludGVyZmFjZSgpOworICAgICAgICAgICAgc2hhcmVDb250 ZXh0T2JqZWN0ID0gc3RhdGljX2Nhc3Q8R0xYQ29udGV4dD4obmF0aXZlSW50ZXJmYWNlLT5uYXRp dmVSZXNvdXJjZUZvckNvbnRleHQoUUJ5dGVBcnJheUxpdGVyYWwoImdseGNvbnRleHQiKSwgc2hh cmVDb250ZXh0KSk7CisgICAgICAgICAgICBpZiAoIXNoYXJlQ29udGV4dE9iamVjdCkKKyAgICAg ICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyNlbmRpZgogICAgICAgICBtX2Rpc3BsYXkg PSBYT3BlbkRpc3BsYXkoMCk7CiAKICAgICAgICAgaW50IGF0dHJpYnV0ZXNbXSA9IHsKQEAgLTE4 Miw4ICsxNDQsNyBAQCBzdHJ1Y3QgR3JhcGhpY3NTdXJmYWNlUHJpdmF0ZSB7CiAgICAgICAgIGlu dCBudW1SZXR1cm5lZDsKICAgICAgICAgbV9mYkNvbmZpZ3MgPSBnbFhDaG9vc2VGQkNvbmZpZyht X2Rpc3BsYXksIERlZmF1bHRTY3JlZW4obV9kaXNwbGF5KSwgYXR0cmlidXRlcywgJm51bVJldHVy bmVkKTsKICAgICAgICAgLy8gQ3JlYXRlIGEgR0xYIGNvbnRleHQgZm9yIE9wZW5HTCByZW5kZXJp bmcKLSAgICAgICAgbV9nbENvbnRleHQgPSBnbFhDcmVhdGVOZXdDb250ZXh0KG1fZGlzcGxheSwg bV9mYkNvbmZpZ3NbMF0sIEdMWF9SR0JBX1RZUEUsIDAsIHRydWUpOwotI2VuZGlmCisgICAgICAg IG1fZ2xDb250ZXh0ID0gZ2xYQ3JlYXRlTmV3Q29udGV4dChtX2Rpc3BsYXksIG1fZmJDb25maWdz WzBdLCBHTFhfUkdCQV9UWVBFLCBzaGFyZUNvbnRleHRPYmplY3QsIHRydWUpOwogICAgIH0KIAog ICAgIH5HcmFwaGljc1N1cmZhY2VQcml2YXRlKCkKQEAgLTIwMywyMiArMTY0LDYgQEAgc3RydWN0 IEdyYXBoaWNzU3VyZmFjZVByaXZhdGUgewogCiAgICAgdWludDMyX3QgY3JlYXRlU3VyZmFjZShj b25zdCBJbnRTaXplJiBzaXplKQogICAgIHsKLSNpZiBQTEFURk9STShRVCkKLSAgICAgICAgbV9z dXJmYWNlID0gYWRvcHRQdHIobmV3IFFXaW5kb3cobV9vZmZTY3JlZW5XaW5kb3cuZ2V0KG1fZGlz cGxheSkpKTsKLSAgICAgICAgbV9zdXJmYWNlLT5zZXRTdXJmYWNlVHlwZShRU3VyZmFjZTo6T3Bl bkdMU3VyZmFjZSk7Ci0gICAgICAgIG1fc3VyZmFjZS0+c2V0R2VvbWV0cnkoMCwgMCwgc2l6ZS53 aWR0aCgpLCBzaXplLmhlaWdodCgpKTsKLSAgICAgICAgbV9zdXJmYWNlLT5jcmVhdGUoKTsKLSAg ICAgICAgWENvbXBvc2l0ZVJlZGlyZWN0V2luZG93KG1fZGlzcGxheSwgbV9zdXJmYWNlLT5oYW5k bGUoKS0+d2luSWQoKSwgQ29tcG9zaXRlUmVkaXJlY3RNYW51YWwpOwotCi0gICAgICAgIC8vIE1h a2Ugc3VyZSB0aGUgWFJlbmRlciBFeHRlbnNpb24gaXMgYXZhaWxhYmxlLgotICAgICAgICBpbnQg ZXZlbnRCYXNlcCwgZXJyb3JCYXNlcDsKLSAgICAgICAgaWYgKCFYUmVuZGVyUXVlcnlFeHRlbnNp b24obV9kaXNwbGF5LCAmZXZlbnRCYXNlcCwgJmVycm9yQmFzZXApKQotICAgICAgICAgICAgcmV0 dXJuIDA7Ci0KLSAgICAgICAgbV9zdXJmYWNlLT5zaG93KCk7Ci0KLSAgICAgICAgcmV0dXJuIG1f c3VyZmFjZS0+aGFuZGxlKCktPndpbklkKCk7Ci0jZWxpZiBQTEFURk9STShFRkwpCiAgICAgICAg IFhWaXN1YWxJbmZvKiB2aXN1YWxJbmZvID0gZ2xYR2V0VmlzdWFsRnJvbUZCQ29uZmlnKG1fZGlz cGxheSwgbV9mYkNvbmZpZ3NbMF0pOwogICAgICAgICBpZiAoIXZpc3VhbEluZm8pCiAgICAgICAg ICAgICByZXR1cm4gMDsKQEAgLTI0MSw3ICsxODYsNiBAQCBzdHJ1Y3QgR3JhcGhpY3NTdXJmYWNl UHJpdmF0ZSB7CiAKICAgICAgICAgWE1hcFdpbmRvdyhtX2Rpc3BsYXksIG1fc3VyZmFjZSk7CiAg ICAgICAgIHJldHVybiBtX3N1cmZhY2U7Ci0jZW5kaWYKICAgICB9CiAKICAgICB2b2lkIGNyZWF0 ZVBpeG1hcCh1aW50MzJfdCB3aW5JZCkKQEAgLTI2OCwyOSArMjEyLDE2IEBAIHN0cnVjdCBHcmFw aGljc1N1cmZhY2VQcml2YXRlIHsKIAogICAgIHZvaWQgbWFrZUN1cnJlbnQoKQogICAgIHsKLSNp ZiBQTEFURk9STShRVCkKLSAgICAgICAgbV9kZXRhY2hlZENvbnRleHQgPSBRT3BlbkdMQ29udGV4 dDo6Y3VycmVudENvbnRleHQoKTsKLSAgICAgICAgaWYgKG1fZGV0YWNoZWRDb250ZXh0KQotICAg ICAgICAgICAgbV9kZXRhY2hlZFN1cmZhY2UgPSBtX2RldGFjaGVkQ29udGV4dC0+c3VyZmFjZSgp OwotCi0gICAgICAgIGlmIChtX3N1cmZhY2UgJiYgbV9nbENvbnRleHQpCi0gICAgICAgICAgICBt X2dsQ29udGV4dC0+bWFrZUN1cnJlbnQobV9zdXJmYWNlLmdldCgpKTsKLSNlbGlmIFBMQVRGT1JN KEVGTCkKICAgICAgICAgbV9kZXRhY2hlZENvbnRleHQgPSBnbFhHZXRDdXJyZW50Q29udGV4dCgp OwogICAgICAgICBtX2RldGFjaGVkU3VyZmFjZSA9IGdsWEdldEN1cnJlbnREcmF3YWJsZSgpOwog ICAgICAgICBpZiAobV9zdXJmYWNlICYmIG1fZ2xDb250ZXh0KQogICAgICAgICAgICAgZ2xYTWFr ZUN1cnJlbnQobV9kaXNwbGF5LCBtX3N1cmZhY2UsIG1fZ2xDb250ZXh0KTsKLSNlbmRpZgogICAg IH0KIAogICAgIHZvaWQgZG9uZUN1cnJlbnQoKQogICAgIHsKICAgICAgICAgaWYgKG1fZGV0YWNo ZWRDb250ZXh0KQotI2lmIFBMQVRGT1JNKFFUKQotICAgICAgICAgICAgbV9kZXRhY2hlZENvbnRl eHQtPm1ha2VDdXJyZW50KG1fZGV0YWNoZWRTdXJmYWNlKTsKLSNlbGlmIFBMQVRGT1JNKEVGTCkK LSAgICAgICAgICAgIGdsWE1ha2VDdXJyZW50KG1fZGlzcGxheSwgbV9kZXRhY2hlZFN1cmZhY2Us IG1fZGV0YWNoZWRDb250ZXh0KTsgICAgCi0jZW5kaWYKKyAgICAgICAgICAgIGdsWE1ha2VDdXJy ZW50KG1fZGlzcGxheSwgbV9kZXRhY2hlZFN1cmZhY2UsIG1fZGV0YWNoZWRDb250ZXh0KTsKICAg ICAgICAgbV9kZXRhY2hlZENvbnRleHQgPSAwOwogICAgIH0KIApAQCAtMzAyLDI0ICsyMzMsNiBA QCBzdHJ1Y3QgR3JhcGhpY3NTdXJmYWNlUHJpdmF0ZSB7CiAgICAgICAgIGlmIChtX3hQaXhtYXAp CiAgICAgICAgICAgICByZXR1cm47CiAKLSNpZiBQTEFURk9STShRVCkKLSAgICAgICAgaWYgKCFt X3N1cmZhY2UtPmlzVmlzaWJsZSgpKQotICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAgIC8v IENyZWF0aW5nIGFuZCBleHBvc2luZyB0aGUgc3VyZmFjZSBpcyBhc3luY2hyb25vdXMuIFRoZXJl Zm9yZSB3ZSBoYXZlIHRvIHdhaXQgaGVyZQotICAgICAgICAvLyBiZWZvcmUgc3dhcHBpbmcgdGhl IGJ1ZmZlcnMuIFRoaXMgc2hvdWxkIG9ubHkgYmUgdGhlIGNhc2UgZm9yIHRoZSB2ZXJ5IGZpcnN0 IGZyYW1lLgotICAgICAgICB3aGlsZSAoIW1fc3VyZmFjZS0+aXNFeHBvc2VkKCkpCi0gICAgICAg ICAgICBRQ29yZUFwcGxpY2F0aW9uOjpwcm9jZXNzRXZlbnRzKCk7Ci0KLSAgICAgICAgUU9wZW5H TENvbnRleHQqIGdsQ29udGV4dCA9IFFPcGVuR0xDb250ZXh0OjpjdXJyZW50Q29udGV4dCgpOwot ICAgICAgICBpZiAobV9zdXJmYWNlICYmIGdsQ29udGV4dCkgewotICAgICAgICAgICAgR0xpbnQg b2xkRkJPOwotICAgICAgICAgICAgZ2xHZXRJbnRlZ2VydihHTF9GUkFNRUJVRkZFUl9CSU5ESU5H LCAmb2xkRkJPKTsKLSAgICAgICAgICAgIHBHbEJpbmRGcmFtZWJ1ZmZlcihHTF9GUkFNRUJVRkZF UiwgZ2xDb250ZXh0LT5kZWZhdWx0RnJhbWVidWZmZXJPYmplY3QoKSk7Ci0gICAgICAgICAgICBn bENvbnRleHQtPnN3YXBCdWZmZXJzKG1fc3VyZmFjZS5nZXQoKSk7Ci0gICAgICAgICAgICBwR2xC aW5kRnJhbWVidWZmZXIoR0xfRlJBTUVCVUZGRVIsIG9sZEZCTyk7Ci0gICAgICAgIH0KLSNlbGlm IFBMQVRGT1JNKEVGTCkKICAgICAgICAgR0xYQ29udGV4dCBnbENvbnRleHQgPSBnbFhHZXRDdXJy ZW50Q29udGV4dCgpOwogCiAgICAgICAgIGlmIChtX3N1cmZhY2UgJiYgZ2xDb250ZXh0KSB7CkBA IC0zMjksNyArMjQyLDYgQEAgc3RydWN0IEdyYXBoaWNzU3VyZmFjZVByaXZhdGUgewogICAgICAg ICAgICAgZ2xYU3dhcEJ1ZmZlcnMobV9kaXNwbGF5LCBtX3N1cmZhY2UpOwogICAgICAgICAgICAg cEdsQmluZEZyYW1lYnVmZmVyKEdMX0ZSQU1FQlVGRkVSLCBvbGRGQk8pOwogICAgICAgICB9Ci0j ZW5kaWYKICAgICB9CiAKICAgICB2b2lkIGNvcHlGcm9tVGV4dHVyZSh1aW50MzJfdCB0ZXh0dXJl LCBjb25zdCBJbnRSZWN0JiBzb3VyY2VSZWN0KQpAQCAtMzUwLDExICsyNjIsNyBAQCBzdHJ1Y3Qg R3JhcGhpY3NTdXJmYWNlUHJpdmF0ZSB7CiAgICAgICAgIGdsQmluZFRleHR1cmUoR0xfVEVYVFVS RV8yRCwgdGV4dHVyZSk7CiAgICAgICAgIHBHbEZyYW1lYnVmZmVyVGV4dHVyZTJEKEdMX1JFQURf RlJBTUVCVUZGRVIsIEdMX0NPTE9SX0FUVEFDSE1FTlQwLCBHTF9URVhUVVJFXzJELCB0ZXh0dXJl LCAwKTsKIAotI2lmIFBMQVRGT1JNKFFUKQotICAgICAgICBwR2xCaW5kRnJhbWVidWZmZXIoR0xf RFJBV19GUkFNRUJVRkZFUiwgZ2xDb250ZXh0KCktPmRlZmF1bHRGcmFtZWJ1ZmZlck9iamVjdCgp KTsKLSNlbGlmIFBMQVRGT1JNKEVGTCkKICAgICAgICAgcEdsQmluZEZyYW1lYnVmZmVyKEdMX0RS QVdfRlJBTUVCVUZGRVIsIDApOwotI2VuZGlmCiAgICAgICAgIHBHbEJsaXRGcmFtZWJ1ZmZlcih4 LCB5LCB3aWR0aCwgaGVpZ2h0LCB4LCB5LCB3aWR0aCwgaGVpZ2h0LCBHTF9DT0xPUl9CVUZGRVJf QklULCBHTF9MSU5FQVIpOwogCiAgICAgICAgIHBHbEZyYW1lYnVmZmVyVGV4dHVyZTJEKEdMX1JF QURfRlJBTUVCVUZGRVIsIEdMX0NPTE9SX0FUVEFDSE1FTlQwLCBHTF9URVhUVVJFXzJELCAwLCAw KTsKQEAgLTM3MiwyOCArMjgwLDE3IEBAIHN0cnVjdCBHcmFwaGljc1N1cmZhY2VQcml2YXRlIHsK IAogICAgIEludFNpemUgc2l6ZSgpIGNvbnN0IHsgcmV0dXJuIG1fc2l6ZTsgfQogCi0jaWYgUExB VEZPUk0oUVQpCi0gICAgUU9wZW5HTENvbnRleHQqIGdsQ29udGV4dCgpIHsgcmV0dXJuIG1fZ2xD b250ZXh0LmdldCgpOyB9Ci0jZW5kaWYKLQogcHJpdmF0ZToKICAgICBPZmZTY3JlZW5Sb290V2lu ZG93IG1fb2ZmU2NyZWVuV2luZG93OwogICAgIEludFNpemUgbV9zaXplOwogICAgIERpc3BsYXkq IG1fZGlzcGxheTsKICAgICBQaXhtYXAgbV94UGl4bWFwOwogICAgIEdMWFBpeG1hcCBtX2dseFBp eG1hcDsKLSNpZiBQTEFURk9STShRVCkKLSAgICBPd25QdHI8UVdpbmRvdz4gbV9zdXJmYWNlOwot ICAgIE93blB0cjxRT3BlbkdMQ29udGV4dD4gbV9nbENvbnRleHQ7Ci0gICAgUU9wZW5HTENvbnRl eHQqIG1fZGV0YWNoZWRDb250ZXh0OwotICAgIFFTdXJmYWNlKiBtX2RldGFjaGVkU3VyZmFjZTsK LSNlbGlmIFBMQVRGT1JNKEVGTCkKICAgICBXaW5kb3cgbV9zdXJmYWNlOwogICAgIEdMWENvbnRl eHQgbV9nbENvbnRleHQ7CiAgICAgR0xYQ29udGV4dCBtX2RldGFjaGVkQ29udGV4dDsKICAgICBH TFhEcmF3YWJsZSBtX2RldGFjaGVkU3VyZmFjZTsKICAgICBHTFhGQkNvbmZpZyogbV9mYkNvbmZp Z3M7Ci0jZW5kaWYKICAgICBib29sIG1fdGV4dHVyZUlzWUludmVydGVkOwogICAgIGJvb2wgbV9o YXNBbHBoYTsKIH07CkBAIC00MDMsMTcgKzMwMCw2IEBAIHN0YXRpYyBib29sIHJlc29sdmVHTE1l dGhvZHMoR3JhcGhpY3NTdXJmYWNlUHJpdmF0ZSogcCkKICAgICBzdGF0aWMgYm9vbCByZXNvbHZl ZCA9IGZhbHNlOwogICAgIGlmIChyZXNvbHZlZCkKICAgICAgICAgcmV0dXJuIHRydWU7Ci0jaWYg UExBVEZPUk0oUVQpCi0gICAgUU9wZW5HTENvbnRleHQqIGdsQ29udGV4dCA9IHAtPmdsQ29udGV4 dCgpOwotICAgIHBHbFhCaW5kVGV4SW1hZ2VFWFQgPSByZWludGVycHJldF9jYXN0PFBGTkdMWEJJ TkRURVhJTUFHRUVYVFBST0M+KGdsQ29udGV4dC0+Z2V0UHJvY0FkZHJlc3MoImdsWEJpbmRUZXhJ bWFnZUVYVCIpKTsKLSAgICBwR2xYUmVsZWFzZVRleEltYWdlRVhUID0gcmVpbnRlcnByZXRfY2Fz dDxQRk5HTFhSRUxFQVNFVEVYSU1BR0VFWFRQUk9DPihnbENvbnRleHQtPmdldFByb2NBZGRyZXNz KCJnbFhSZWxlYXNlVGV4SW1hZ2VFWFQiKSk7Ci0gICAgcEdsQmluZEZyYW1lYnVmZmVyID0gcmVp bnRlcnByZXRfY2FzdDxQRk5HTEJJTkRGUkFNRUJVRkZFUlBST0M+KGdsQ29udGV4dC0+Z2V0UHJv Y0FkZHJlc3MoImdsQmluZEZyYW1lYnVmZmVyIikpOwotICAgIHBHbEJsaXRGcmFtZWJ1ZmZlciA9 IHJlaW50ZXJwcmV0X2Nhc3Q8UEZOR0xCTElURlJBTUVCVUZGRVJQUk9DPihnbENvbnRleHQtPmdl dFByb2NBZGRyZXNzKCJnbEJsaXRGcmFtZWJ1ZmZlciIpKTsKLQotICAgIHBHbEdlbkZyYW1lYnVm ZmVycyA9IHJlaW50ZXJwcmV0X2Nhc3Q8UEZOR0xHRU5GUkFNRUJVRkZFUlNQUk9DPihnbENvbnRl eHQtPmdldFByb2NBZGRyZXNzKCJnbEdlbkZyYW1lYnVmZmVycyIpKTsKLSAgICBwR2xEZWxldGVG cmFtZWJ1ZmZlcnMgPSByZWludGVycHJldF9jYXN0PFBGTkdMREVMRVRFRlJBTUVCVUZGRVJTUFJP Qz4oZ2xDb250ZXh0LT5nZXRQcm9jQWRkcmVzcygiZ2xEZWxldGVGcmFtZWJ1ZmZlcnMiKSk7Ci0g ICAgcEdsRnJhbWVidWZmZXJUZXh0dXJlMkQgPSByZWludGVycHJldF9jYXN0PFBGTkdMRlJBTUVC VUZGRVJURVhUVVJFMkRQUk9DPihnbENvbnRleHQtPmdldFByb2NBZGRyZXNzKCJnbEZyYW1lYnVm ZmVyVGV4dHVyZTJEIikpOwotI2VsaWYgUExBVEZPUk0oRUZMKQogICAgIHBHbFhCaW5kVGV4SW1h Z2VFWFQgPSByZWludGVycHJldF9jYXN0PFBGTkdMWEJJTkRURVhJTUFHRUVYVFBST0M+KGdsWEdl dFByb2NBZGRyZXNzKHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgR0x1Ynl0ZSo+KCJnbFhCaW5kVGV4 SW1hZ2VFWFQiKSkpOwogICAgIHBHbFhSZWxlYXNlVGV4SW1hZ2VFWFQgPSByZWludGVycHJldF9j YXN0PFBGTkdMWFJFTEVBU0VURVhJTUFHRUVYVFBST0M+KGdsWEdldFByb2NBZGRyZXNzKHJlaW50 ZXJwcmV0X2Nhc3Q8Y29uc3QgR0x1Ynl0ZSo+KCJnbFhSZWxlYXNlVGV4SW1hZ2VFWFQiKSkpOwog ICAgIHBHbEJpbmRGcmFtZWJ1ZmZlciA9IHJlaW50ZXJwcmV0X2Nhc3Q8UEZOR0xCSU5ERlJBTUVC VUZGRVJQUk9DPihnbFhHZXRQcm9jQWRkcmVzcyhyZWludGVycHJldF9jYXN0PGNvbnN0IEdMdWJ5 dGUqPigiZ2xCaW5kRnJhbWVidWZmZXIiKSkpOwpAQCAtNDIyLDcgKzMwOCw2IEBAIHN0YXRpYyBi b29sIHJlc29sdmVHTE1ldGhvZHMoR3JhcGhpY3NTdXJmYWNlUHJpdmF0ZSogcCkKICAgICBwR2xH ZW5GcmFtZWJ1ZmZlcnMgPSByZWludGVycHJldF9jYXN0PFBGTkdMR0VORlJBTUVCVUZGRVJTUFJP Qz4oZ2xYR2V0UHJvY0FkZHJlc3MocmVpbnRlcnByZXRfY2FzdDxjb25zdCBHTHVieXRlKj4oImds R2VuRnJhbWVidWZmZXJzIikpKTsKICAgICBwR2xEZWxldGVGcmFtZWJ1ZmZlcnMgPSByZWludGVy cHJldF9jYXN0PFBGTkdMREVMRVRFRlJBTUVCVUZGRVJTUFJPQz4oZ2xYR2V0UHJvY0FkZHJlc3Mo cmVpbnRlcnByZXRfY2FzdDxjb25zdCBHTHVieXRlKj4oImdsRGVsZXRlRnJhbWVidWZmZXJzIikp KTsKICAgICBwR2xGcmFtZWJ1ZmZlclRleHR1cmUyRCA9IHJlaW50ZXJwcmV0X2Nhc3Q8UEZOR0xG UkFNRUJVRkZFUlRFWFRVUkUyRFBST0M+KGdsWEdldFByb2NBZGRyZXNzKHJlaW50ZXJwcmV0X2Nh c3Q8Y29uc3QgR0x1Ynl0ZSo+KCJnbEZyYW1lYnVmZmVyVGV4dHVyZTJEIikpKTsKLSNlbmRpZgog ICAgIHJlc29sdmVkID0gcEdsQmxpdEZyYW1lYnVmZmVyICYmIHBHbEJpbmRGcmFtZWJ1ZmZlciAm JiBwR2xYQmluZFRleEltYWdlRVhUICYmIHBHbFhSZWxlYXNlVGV4SW1hZ2VFWFQ7CiAKICAgICBy ZXR1cm4gcmVzb2x2ZWQ7Cg==