103885 2012-12-03 05:48:19 -0800 WebGL: use pointer to the source data for Image directly in texImage2D and texSubImage2D to avoid memory copy if no conversion is needed 2012-12-05 13:04:00 -0800 1 1 1 Unclassified WebKit WebGL 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 0 jun.a.jiang webkit-unassigned dino kbr ojan webkit.review.bot oldest_to_newest 781373 0 jun.a.jiang 2012-12-03 05:48:19 -0800 In current implementation of texImage2D() and texSubImage2D() in WebGL, there is a redundant memory copy from Image data to the intermediate vector when no conversion is needed. If the Image resource can be locked properly, it is better to use the pointer to the image source directly and hence avoid the memory copy to the intermediate vector. 781420 1 177248 jun.a.jiang 2012-12-03 07:11:32 -0800 Created attachment 177248 Patch 783251 2 177248 kbr 2012-12-04 19:08:17 -0800 Comment on attachment 177248 Patch Looks good. r=me 783281 3 177248 webkit.review.bot 2012-12-04 19:55:50 -0800 Comment on attachment 177248 Patch Rejecting attachment 177248 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: ripts/update-webkit line 152. Failed to run "['Tools/Scripts/update-webkit', '--chromium', '--force-update']" exit_code: 2 Updating OpenSource From http://git.chromium.org/external/Webkit cf46854..c0a4c3a HEAD -> origin/HEAD error: Ref refs/remotes/origin/master is at c0a4c3a40ce96884ae4c1472ef9d4edf6af9b111 but expected cf468540ddb668d426e32e33bac10f014c7390a6 ! cf46854..c0a4c3a master -> origin/master (unable to update local ref) Died at Tools/Scripts/update-webkit line 152. Full output: http://queues.webkit.org/results/15133667 783489 4 177691 jun.a.jiang 2012-12-05 00:59:21 -0800 Created attachment 177691 Patch 783494 5 jun.a.jiang 2012-12-05 01:05:01 -0800 Hi, Kenneth. The patch fail to land into the code base from commit queue and I can't find any clue about its failure. I just re-based the patch, test it and upload it again. Please help to review and land it. 784010 6 177691 kbr 2012-12-05 12:46:00 -0800 Comment on attachment 177691 Patch Let's try again. There were issues with the commit queue yesterday. 784033 7 177691 webkit.review.bot 2012-12-05 13:03:56 -0800 Comment on attachment 177691 Patch Clearing flags on attachment: 177691 Committed r136745: <http://trac.webkit.org/changeset/136745> 784034 8 webkit.review.bot 2012-12-05 13:04:00 -0800 All reviewed patches have been landed. Closing bug. 177248 2012-12-03 07:11:32 -0800 2012-12-05 00:59:14 -0800 Patch bug-103885-20121203230857.patch text/plain 10938 jun.a.jiang U3VidmVyc2lvbiBSZXZpc2lvbjogMTM2Mzk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWVkMGUzNzIwNGFiNDA2 YjFlZmEzMjdjYTJhNGQxY2JjNWRlNzc3Ni4uYThmYzBhZGM4MTU3Nzk3NmFjZDhkMzAwZWY3ODgz YjVkNzEzYTMzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEyLTEyLTAzICBKdW4g SmlhbmcgIDxqdW4uYS5qaWFuZ0BpbnRlbC5jb20+CisKKyAgICAgICAgV2ViR0w6IHVzZSBwb2lu dGVyIHRvIHRoZSBzb3VyY2UgZGF0YSBmb3IgSW1hZ2UgZGlyZWN0bHkgaW4gdGV4SW1hZ2UyRCBh bmQgdGV4U3ViSW1hZ2UyRCB0byBhdm9pZCBtZW1vcnkgY29weSBpZiBubyBjb252ZXJzaW9uIGlz IG5lZWRlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTAzODg1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg SW4gdGV4SW1hZ2UyRCgpIGFuZCB0ZXhTdWJJbWFnZTJEKCksIHRoZXJlIGlzIGEgcmVkdW5kYW50 IG1lbW9yeSBjb3B5IGZyb20gSW1hZ2UgZGF0YSB0byB0aGUgaW50ZXJtZWRpYXRlIHZlY3RvciB3 aGVuIG5vIGNvbnZlcnNpb24gaXMgbmVlZGVkLiBJZiB0aGUgSW1hZ2UgcmVzb3VyY2UgY2FuIGJl IGxvY2tlZCBwcm9wZXJseSwgaXQgaXMgYmV0dGVyIHRvIHVzZSB0aGUgcG9pbnRlciB0byB0aGUg aW1hZ2Ugc291cmNlIGRpcmVjdGx5IGFuZCBoZW5jZSBhdm9pZCB0aGUgbWVtb3J5IGNvcHkgYW5k IGltcHJvdmUgdGhlIHBlcmZvcm1hbmNlLiAgCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIGFkZGVk LiAKKworICAgICAgICAqIGh0bWwvY2FudmFzL1dlYkdMUmVuZGVyaW5nQ29udGV4dC5jcHA6Cisg ICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNvcmU6OldlYkdMUmVuZGVyaW5nQ29udGV4 dDo6dGV4SW1hZ2UyREJhc2UpOgorICAgICAgICAoV2ViQ29yZTo6V2ViR0xSZW5kZXJpbmdDb250 ZXh0Ojp0ZXhJbWFnZTJESW1wbCk6CisgICAgICAgIChXZWJDb3JlOjpXZWJHTFJlbmRlcmluZ0Nv bnRleHQ6OnRleFN1YkltYWdlMkRCYXNlKToKKyAgICAgICAgKFdlYkNvcmU6OldlYkdMUmVuZGVy aW5nQ29udGV4dDo6dGV4U3ViSW1hZ2UyREltcGwpOgorICAgICAgICAqIGh0bWwvY2FudmFzL1dl YkdMUmVuZGVyaW5nQ29udGV4dC5oOgorICAgICAgICAoV2ViR0xSZW5kZXJpbmdDb250ZXh0KToK KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQzRC5oOgorICAgICAg ICAoSW1hZ2VFeHRyYWN0b3IpOgorCiAyMDEyLTEyLTAzICBUb21teSBXaWRlbmZseWNodCAgPHRv bW15d0Bnb29nbGUuY29tPgogCiAgICAgICAgIFNwZWVjaCBSZWNvZ25pdGlvbiBBUEk6IFVwZGF0 ZSBTcGVlY2hSZWNvZ25pdGlvbkV2ZW50IHRvIG1hdGNoIHRoZSBzcGVjaWZpY2F0aW9uCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHQu Y3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0LmNw cAppbmRleCA1YThkYzk1ZjMxMGIxYThkZGZkYTU1ZTQ1OTg2NWU5YmViYzViYmJlLi41YmY3ZmY0 NmQ4MzE5MTI1YWY4NWY4MDFkODFjNzljNDVlOWYzY2Q0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9odG1sL2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMUmVuZGVyaW5nQ29udGV4dC5jcHAKQEAgLTM1NzEsOSAr MzU3MSw3IEBAIHZvaWQgV2ViR0xSZW5kZXJpbmdDb250ZXh0OjpzdGVuY2lsT3BTZXBhcmF0ZShH QzNEZW51bSBmYWNlLCBHQzNEZW51bSBmYWlsLCBHQzNECiAgICAgY2xlYW51cEFmdGVyR3JhcGhp Y3NDYWxsKGZhbHNlKTsKIH0KIAotdm9pZCBXZWJHTFJlbmRlcmluZ0NvbnRleHQ6OnRleEltYWdl MkRCYXNlKEdDM0RlbnVtIHRhcmdldCwgR0MzRGludCBsZXZlbCwgR0MzRGVudW0gaW50ZXJuYWxm b3JtYXQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgR0MzRHNp emVpIHdpZHRoLCBHQzNEc2l6ZWkgaGVpZ2h0LCBHQzNEaW50IGJvcmRlciwKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBHQzNEZW51bSBmb3JtYXQsIEdDM0RlbnVt IHR5cGUsIHZvaWQqIHBpeGVscywgRXhjZXB0aW9uQ29kZSYgZWMpCit2b2lkIFdlYkdMUmVuZGVy aW5nQ29udGV4dDo6dGV4SW1hZ2UyREJhc2UoR0MzRGVudW0gdGFyZ2V0LCBHQzNEaW50IGxldmVs LCBHQzNEZW51bSBpbnRlcm5hbGZvcm1hdCwgR0MzRHNpemVpIHdpZHRoLCBHQzNEc2l6ZWkgaGVp Z2h0LCBHQzNEaW50IGJvcmRlciwgR0MzRGVudW0gZm9ybWF0LCBHQzNEZW51bSB0eXBlLCBjb25z dCB2b2lkKiBwaXhlbHMsIEV4Y2VwdGlvbkNvZGUmIGVjKQogewogICAgIC8vIEZJWE1FOiBGb3Ig bm93IHdlIGlnbm9yZSBhbnkgZXJyb3JzIHJldHVybmVkCiAgICAgZWMgPSAwOwpAQCAtMzYyNCwx NiArMzYyMiwyMyBAQCB2b2lkIFdlYkdMUmVuZGVyaW5nQ29udGV4dDo6dGV4SW1hZ2UyREltcGwo R0MzRGVudW0gdGFyZ2V0LCBHQzNEaW50IGxldmVsLCBHQzNEZQogICAgICAgICBzeW50aGVzaXpl R0xFcnJvcihHcmFwaGljc0NvbnRleHQzRDo6SU5WQUxJRF9WQUxVRSwgInRleEltYWdlMkQiLCAi YmFkIGltYWdlIGRhdGEiKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KKyAgICBHcmFwaGljc0Nv bnRleHQzRDo6U291cmNlRGF0YUZvcm1hdCBzb3VyY2VEYXRhRm9ybWF0ID0gaW1hZ2VFeHRyYWN0 b3IuaW1hZ2VTb3VyY2VGb3JtYXQoKTsKKyAgICBHcmFwaGljc0NvbnRleHQzRDo6QWxwaGFPcCBh bHBoYU9wID0gaW1hZ2VFeHRyYWN0b3IuaW1hZ2VBbHBoYU9wKCk7CisgICAgY29uc3Qgdm9pZCog aW1hZ2VQaXhlbERhdGEgPSBpbWFnZUV4dHJhY3Rvci5pbWFnZVBpeGVsRGF0YSgpOwogCi0gICAg aWYgKCFtX2NvbnRleHQtPnBhY2tJbWFnZURhdGEoaW1hZ2UsIGltYWdlRXh0cmFjdG9yLmltYWdl UGl4ZWxEYXRhKCksIGZvcm1hdCwgdHlwZSwgZmxpcFksIGltYWdlRXh0cmFjdG9yLmltYWdlQWxw aGFPcCgpLCBpbWFnZUV4dHJhY3Rvci5pbWFnZVNvdXJjZUZvcm1hdCgpLCBpbWFnZUV4dHJhY3Rv ci5pbWFnZVdpZHRoKCksIGltYWdlRXh0cmFjdG9yLmltYWdlSGVpZ2h0KCksIGltYWdlRXh0cmFj dG9yLmltYWdlU291cmNlVW5wYWNrQWxpZ25tZW50KCksIGRhdGEpKSB7Ci0gICAgICAgIHN5bnRo ZXNpemVHTEVycm9yKEdyYXBoaWNzQ29udGV4dDNEOjpJTlZBTElEX1ZBTFVFLCAidGV4SW1hZ2Uy RCIsICJwYWNrSW1hZ2VEYXRhIGVycm9yIik7Ci0gICAgICAgIHJldHVybjsKKyAgICBib29sIG5l ZWRDb252ZXJzaW9uID0gdHJ1ZTsKKyAgICBpZiAodHlwZSA9PSBHcmFwaGljc0NvbnRleHQzRDo6 VU5TSUdORURfQllURSAmJiBzb3VyY2VEYXRhRm9ybWF0ID09IEdyYXBoaWNzQ29udGV4dDNEOjpT b3VyY2VGb3JtYXRSR0JBOCAmJiBmb3JtYXQgPT0gR3JhcGhpY3NDb250ZXh0M0Q6OlJHQkEgJiYg YWxwaGFPcCA9PSBHcmFwaGljc0NvbnRleHQzRDo6QWxwaGFEb05vdGhpbmcgJiYgIWZsaXBZKQor ICAgICAgICBuZWVkQ29udmVyc2lvbiA9IGZhbHNlOworICAgIGVsc2UgeworICAgICAgICBpZiAo IW1fY29udGV4dC0+cGFja0ltYWdlRGF0YShpbWFnZSwgaW1hZ2VQaXhlbERhdGEsIGZvcm1hdCwg dHlwZSwgZmxpcFksIGFscGhhT3AsIHNvdXJjZURhdGFGb3JtYXQsIGltYWdlRXh0cmFjdG9yLmlt YWdlV2lkdGgoKSwgaW1hZ2VFeHRyYWN0b3IuaW1hZ2VIZWlnaHQoKSwgaW1hZ2VFeHRyYWN0b3Iu aW1hZ2VTb3VyY2VVbnBhY2tBbGlnbm1lbnQoKSwgZGF0YSkpIHsKKyAgICAgICAgICAgIHN5bnRo ZXNpemVHTEVycm9yKEdyYXBoaWNzQ29udGV4dDNEOjpJTlZBTElEX1ZBTFVFLCAidGV4SW1hZ2Uy RCIsICJwYWNrSW1hZ2UgZXJyb3IiKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQog ICAgIH0KIAogICAgIGlmIChtX3VucGFja0FsaWdubWVudCAhPSAxKQogICAgICAgICBtX2NvbnRl eHQtPnBpeGVsU3RvcmVpKEdyYXBoaWNzQ29udGV4dDNEOjpVTlBBQ0tfQUxJR05NRU5ULCAxKTsK LSAgICB0ZXhJbWFnZTJEQmFzZSh0YXJnZXQsIGxldmVsLCBpbnRlcm5hbGZvcm1hdCwgaW1hZ2Ut PndpZHRoKCksIGltYWdlLT5oZWlnaHQoKSwgMCwKLSAgICAgICAgICAgICAgICAgICBmb3JtYXQs IHR5cGUsIGRhdGEuZGF0YSgpLCBlYyk7CisgICAgdGV4SW1hZ2UyREJhc2UodGFyZ2V0LCBsZXZl bCwgaW50ZXJuYWxmb3JtYXQsIGltYWdlLT53aWR0aCgpLCBpbWFnZS0+aGVpZ2h0KCksIDAsIGZv cm1hdCwgdHlwZSwgbmVlZENvbnZlcnNpb24gPyBkYXRhLmRhdGEoKSA6IGltYWdlUGl4ZWxEYXRh LCBlYyk7CiAgICAgaWYgKG1fdW5wYWNrQWxpZ25tZW50ICE9IDEpCiAgICAgICAgIG1fY29udGV4 dC0+cGl4ZWxTdG9yZWkoR3JhcGhpY3NDb250ZXh0M0Q6OlVOUEFDS19BTElHTk1FTlQsIG1fdW5w YWNrQWxpZ25tZW50KTsKIH0KQEAgLTM4MjUsOSArMzgzMCw3IEBAIHZvaWQgV2ViR0xSZW5kZXJp bmdDb250ZXh0Ojp0ZXhQYXJhbWV0ZXJpKEdDM0RlbnVtIHRhcmdldCwgR0MzRGVudW0gcG5hbWUs IEdDM0RpCiAgICAgdGV4UGFyYW1ldGVyKHRhcmdldCwgcG5hbWUsIDAsIHBhcmFtLCBmYWxzZSk7 CiB9CiAKLXZvaWQgV2ViR0xSZW5kZXJpbmdDb250ZXh0Ojp0ZXhTdWJJbWFnZTJEQmFzZShHQzNE ZW51bSB0YXJnZXQsIEdDM0RpbnQgbGV2ZWwsIEdDM0RpbnQgeG9mZnNldCwgR0MzRGludCB5b2Zm c2V0LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEdDM0Rz aXplaSB3aWR0aCwgR0MzRHNpemVpIGhlaWdodCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBHQzNEZW51bSBmb3JtYXQsIEdDM0RlbnVtIHR5cGUsIHZvaWQq IHBpeGVscywgRXhjZXB0aW9uQ29kZSYgZWMpCit2b2lkIFdlYkdMUmVuZGVyaW5nQ29udGV4dDo6 dGV4U3ViSW1hZ2UyREJhc2UoR0MzRGVudW0gdGFyZ2V0LCBHQzNEaW50IGxldmVsLCBHQzNEaW50 IHhvZmZzZXQsIEdDM0RpbnQgeW9mZnNldCwgR0MzRHNpemVpIHdpZHRoLCBHQzNEc2l6ZWkgaGVp Z2h0LCBHQzNEZW51bSBmb3JtYXQsIEdDM0RlbnVtIHR5cGUsIGNvbnN0IHZvaWQqIHBpeGVscywg RXhjZXB0aW9uQ29kZSYgZWMpCiB7CiAgICAgLy8gRklYTUU6IEZvciBub3cgd2UgaWdub3JlIGFu eSBlcnJvcnMgcmV0dXJuZWQKICAgICBlYyA9IDA7CkBAIC0zODY3LDE2ICszODcwLDIzIEBAIHZv aWQgV2ViR0xSZW5kZXJpbmdDb250ZXh0Ojp0ZXhTdWJJbWFnZTJESW1wbChHQzNEZW51bSB0YXJn ZXQsIEdDM0RpbnQgbGV2ZWwsIEdDCiAgICAgICAgIHN5bnRoZXNpemVHTEVycm9yKEdyYXBoaWNz Q29udGV4dDNEOjpJTlZBTElEX1ZBTFVFLCAidGV4U3ViSW1hZ2UyRCIsICJiYWQgaW1hZ2UiKTsK ICAgICAgICAgcmV0dXJuOwogICAgIH0KKyAgICBHcmFwaGljc0NvbnRleHQzRDo6U291cmNlRGF0 YUZvcm1hdCBzb3VyY2VEYXRhRm9ybWF0ID0gaW1hZ2VFeHRyYWN0b3IuaW1hZ2VTb3VyY2VGb3Jt YXQoKTsKKyAgICBHcmFwaGljc0NvbnRleHQzRDo6QWxwaGFPcCBhbHBoYU9wID0gaW1hZ2VFeHRy YWN0b3IuaW1hZ2VBbHBoYU9wKCk7CisgICAgY29uc3Qgdm9pZCogaW1hZ2VQaXhlbERhdGEgPSBp bWFnZUV4dHJhY3Rvci5pbWFnZVBpeGVsRGF0YSgpOwogCi0gICAgaWYgKCFtX2NvbnRleHQtPnBh Y2tJbWFnZURhdGEoaW1hZ2UsIGltYWdlRXh0cmFjdG9yLmltYWdlUGl4ZWxEYXRhKCksIGZvcm1h dCwgdHlwZSwgZmxpcFksIGltYWdlRXh0cmFjdG9yLmltYWdlQWxwaGFPcCgpLCBpbWFnZUV4dHJh Y3Rvci5pbWFnZVNvdXJjZUZvcm1hdCgpLCBpbWFnZUV4dHJhY3Rvci5pbWFnZVdpZHRoKCksIGlt YWdlRXh0cmFjdG9yLmltYWdlSGVpZ2h0KCksIGltYWdlRXh0cmFjdG9yLmltYWdlU291cmNlVW5w YWNrQWxpZ25tZW50KCksIGRhdGEpKSB7Ci0gICAgICAgIHN5bnRoZXNpemVHTEVycm9yKEdyYXBo aWNzQ29udGV4dDNEOjpJTlZBTElEX1ZBTFVFLCAidGV4SW1hZ2UyRCIsICJwYWNrSW1hZ2VEYXRh IGVycm9yIik7Ci0gICAgICAgIHJldHVybjsKKyAgICBib29sIG5lZWRDb252ZXJzaW9uID0gdHJ1 ZTsKKyAgICBpZiAodHlwZSA9PSBHcmFwaGljc0NvbnRleHQzRDo6VU5TSUdORURfQllURSAmJiBz b3VyY2VEYXRhRm9ybWF0ID09IEdyYXBoaWNzQ29udGV4dDNEOjpTb3VyY2VGb3JtYXRSR0JBOCAm JiBmb3JtYXQgPT0gR3JhcGhpY3NDb250ZXh0M0Q6OlJHQkEgJiYgYWxwaGFPcCA9PSBHcmFwaGlj c0NvbnRleHQzRDo6QWxwaGFEb05vdGhpbmcgJiYgIWZsaXBZKQorICAgICAgICBuZWVkQ29udmVy c2lvbiA9IGZhbHNlOworICAgIGVsc2UgeworICAgICAgICBpZiAoIW1fY29udGV4dC0+cGFja0lt YWdlRGF0YShpbWFnZSwgaW1hZ2VQaXhlbERhdGEsIGZvcm1hdCwgdHlwZSwgZmxpcFksIGFscGhh T3AsIHNvdXJjZURhdGFGb3JtYXQsIGltYWdlRXh0cmFjdG9yLmltYWdlV2lkdGgoKSwgaW1hZ2VF eHRyYWN0b3IuaW1hZ2VIZWlnaHQoKSwgaW1hZ2VFeHRyYWN0b3IuaW1hZ2VTb3VyY2VVbnBhY2tB bGlnbm1lbnQoKSwgZGF0YSkpIHsKKyAgICAgICAgICAgIHN5bnRoZXNpemVHTEVycm9yKEdyYXBo aWNzQ29udGV4dDNEOjpJTlZBTElEX1ZBTFVFLCAidGV4SW1hZ2UyRCIsICJiYWQgaW1hZ2UgZGF0 YSIpOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CiAgICAgfQogCiAgICAgaWYgKG1f dW5wYWNrQWxpZ25tZW50ICE9IDEpCiAgICAgICAgIG1fY29udGV4dC0+cGl4ZWxTdG9yZWkoR3Jh cGhpY3NDb250ZXh0M0Q6OlVOUEFDS19BTElHTk1FTlQsIDEpOwotICAgIHRleFN1YkltYWdlMkRC YXNlKHRhcmdldCwgbGV2ZWwsIHhvZmZzZXQsIHlvZmZzZXQsIGltYWdlLT53aWR0aCgpLCBpbWFn ZS0+aGVpZ2h0KCksCi0gICAgICAgICAgICAgICAgICAgICAgZm9ybWF0LCB0eXBlLCBkYXRhLmRh dGEoKSwgZWMpOworICAgIHRleFN1YkltYWdlMkRCYXNlKHRhcmdldCwgbGV2ZWwsIHhvZmZzZXQs IHlvZmZzZXQsIGltYWdlLT53aWR0aCgpLCBpbWFnZS0+aGVpZ2h0KCksIGZvcm1hdCwgdHlwZSwg IG5lZWRDb252ZXJzaW9uID8gZGF0YS5kYXRhKCkgOiBpbWFnZVBpeGVsRGF0YSwgZWMpOwogICAg IGlmIChtX3VucGFja0FsaWdubWVudCAhPSAxKQogICAgICAgICBtX2NvbnRleHQtPnBpeGVsU3Rv cmVpKEdyYXBoaWNzQ29udGV4dDNEOjpVTlBBQ0tfQUxJR05NRU5ULCBtX3VucGFja0FsaWdubWVu dCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFJlbmRl cmluZ0NvbnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMUmVuZGVyaW5n Q29udGV4dC5oCmluZGV4IDg2ZWI4MjlmMjI3MGNhMmJhZDA5ZmY0ODM4OWJhYmE0YjhkNjgwMDku LjJkYWUyM2Q4MzI4MjBhNjJkYzI2YTIzMWU0YTZlNTczODgzODg4ZmYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMUmVuZGVyaW5nQ29udGV4dC5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMUmVuZGVyaW5nQ29udGV4dC5oCkBAIC01MzAs MTUgKzUzMCwxMSBAQCBwdWJsaWM6CiAgICAgLy8gSGVscGVyIHRvIHJlc3RvcmUgc3RhdGUgdGhh dCBjbGVhcmluZyB0aGUgZnJhbWVidWZmZXIgbWF5IGRlc3Ryb3kuCiAgICAgdm9pZCByZXN0b3Jl U3RhdGVBZnRlckNsZWFyKCk7CiAKLSAgICB2b2lkIHRleEltYWdlMkRCYXNlKEdDM0RlbnVtIHRh cmdldCwgR0MzRGludCBsZXZlbCwgR0MzRGVudW0gaW50ZXJuYWxmb3JtYXQsCi0gICAgICAgICAg ICAgICAgICAgICAgICBHQzNEc2l6ZWkgd2lkdGgsIEdDM0RzaXplaSBoZWlnaHQsIEdDM0RpbnQg Ym9yZGVyLAotICAgICAgICAgICAgICAgICAgICAgICAgR0MzRGVudW0gZm9ybWF0LCBHQzNEZW51 bSB0eXBlLCB2b2lkKiBwaXhlbHMsIEV4Y2VwdGlvbkNvZGUmKTsKKyAgICB2b2lkIHRleEltYWdl MkRCYXNlKEdDM0RlbnVtIHRhcmdldCwgR0MzRGludCBsZXZlbCwgR0MzRGVudW0gaW50ZXJuYWxm b3JtYXQsIEdDM0RzaXplaSB3aWR0aCwgR0MzRHNpemVpIGhlaWdodCwgR0MzRGludCBib3JkZXIs IEdDM0RlbnVtIGZvcm1hdCwgR0MzRGVudW0gdHlwZSwgY29uc3Qgdm9pZCogcGl4ZWxzLCBFeGNl cHRpb25Db2RlJik7CiAgICAgdm9pZCB0ZXhJbWFnZTJESW1wbChHQzNEZW51bSB0YXJnZXQsIEdD M0RpbnQgbGV2ZWwsIEdDM0RlbnVtIGludGVybmFsZm9ybWF0LAogICAgICAgICAgICAgICAgICAg ICAgICAgR0MzRGVudW0gZm9ybWF0LCBHQzNEZW51bSB0eXBlLCBJbWFnZSosCiAgICAgICAgICAg ICAgICAgICAgICAgICBib29sIGZsaXBZLCBib29sIHByZW11bHRpcGx5QWxwaGEsIEV4Y2VwdGlv bkNvZGUmKTsKLSAgICB2b2lkIHRleFN1YkltYWdlMkRCYXNlKEdDM0RlbnVtIHRhcmdldCwgR0Mz RGludCBsZXZlbCwgR0MzRGludCB4b2Zmc2V0LCBHQzNEaW50IHlvZmZzZXQsCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICBHQzNEc2l6ZWkgd2lkdGgsIEdDM0RzaXplaSBoZWlnaHQsCi0gICAg ICAgICAgICAgICAgICAgICAgICAgICBHQzNEZW51bSBmb3JtYXQsIEdDM0RlbnVtIHR5cGUsIHZv aWQqIHBpeGVscywgRXhjZXB0aW9uQ29kZSYpOworICAgIHZvaWQgdGV4U3ViSW1hZ2UyREJhc2Uo R0MzRGVudW0gdGFyZ2V0LCBHQzNEaW50IGxldmVsLCBHQzNEaW50IHhvZmZzZXQsIEdDM0RpbnQg eW9mZnNldCwgR0MzRHNpemVpIHdpZHRoLCBHQzNEc2l6ZWkgaGVpZ2h0LCBHQzNEZW51bSBmb3Jt YXQsIEdDM0RlbnVtIHR5cGUsIGNvbnN0IHZvaWQqIHBpeGVscywgRXhjZXB0aW9uQ29kZSYpOwog ICAgIHZvaWQgdGV4U3ViSW1hZ2UyREltcGwoR0MzRGVudW0gdGFyZ2V0LCBHQzNEaW50IGxldmVs LCBHQzNEaW50IHhvZmZzZXQsIEdDM0RpbnQgeW9mZnNldCwKICAgICAgICAgICAgICAgICAgICAg ICAgICAgIEdDM0RlbnVtIGZvcm1hdCwgR0MzRGVudW0gdHlwZSwKICAgICAgICAgICAgICAgICAg ICAgICAgICAgIEltYWdlKiBpbWFnZSwgYm9vbCBmbGlwWSwgYm9vbCBwcmVtdWx0aXBseUFscGhh LCBFeGNlcHRpb25Db2RlJik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9HcmFwaGljc0NvbnRleHQzRC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvR3JhcGhpY3NDb250ZXh0M0QuaAppbmRleCA5NWVlYTdhYWE3NGYxMjJlZTkzOGMzYzA4 NWE3NDAwYjM5NWRlNmM0Li5hMzJjMTIwNDgwZDdlMTBkYjBhM2U4MzVhN2U5MjI5ZjJhMmZlZTIw IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0Nv bnRleHQzRC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNz Q29udGV4dDNELmgKQEAgLTg3NCw3ICs4NzQsNyBAQCBwdWJsaWM6CiAgICAgfTsKIAogICAgIC8v IFBhY2tzIHRoZSBjb250ZW50cyBvZiB0aGUgZ2l2ZW4gSW1hZ2Ugd2hpY2ggaXMgcGFzc2VkIGlu IHxwaXhlbHN8IGludG8gdGhlIHBhc3NlZCBWZWN0b3IKLSAgICAvLyBhY2NvcmRpbmcgdG8gdGhl IGdpdmVuIGZvcm1hdCBhbmQgdHlwZSwgYW5kIG9iZXlpbmcgdGhlIGZsaXBZIGFuZCBwcmVtdWx0 aXBseUFscGhhIGZsYWdzLgorICAgIC8vIGFjY29yZGluZyB0byB0aGUgZ2l2ZW4gZm9ybWF0IGFu ZCB0eXBlLCBhbmQgb2JleWluZyB0aGUgZmxpcFkgYW5kIEFscGhhT3AgZmxhZ3MuCiAgICAgLy8g UmV0dXJucyB0cnVlIHVwb24gc3VjY2Vzcy4KICAgICBzdGF0aWMgYm9vbCBwYWNrSW1hZ2VEYXRh KEltYWdlKiwgY29uc3Qgdm9pZCogcGl4ZWxzLCBHQzNEZW51bSBmb3JtYXQsIEdDM0RlbnVtIHR5 cGUsIGJvb2wgZmxpcFksIEFscGhhT3AsIFNvdXJjZURhdGFGb3JtYXQgc291cmNlRm9ybWF0LCB1 bnNpZ25lZCB3aWR0aCwgdW5zaWduZWQgaGVpZ2h0LCB1bnNpZ25lZCBzb3VyY2VVbnBhY2tBbGln bm1lbnQsIFZlY3Rvcjx1aW50OF90PiYgZGF0YSk7CiAKQEAgLTg5NSw5ICs4OTUsOCBAQCBwdWJs aWM6CiAgICAgICAgIHVuc2lnbmVkIGltYWdlU291cmNlVW5wYWNrQWxpZ25tZW50KCkgeyByZXR1 cm4gbV9pbWFnZVNvdXJjZVVucGFja0FsaWdubWVudDsgfSAKICAgICBwcml2YXRlOgogICAgICAg ICAvLyBFYWNoIHBsYXRmb3JtIG11c3QgcHJvdmlkZSBhbiBpbXBsZW1lbnRhdGlvbiBvZiB0aGlz IG1ldGhvZC4KLSAgICAgICAgLy8gRXh0cmFjdHMgdGhlIGltYWdlIGFuZCBrZWVwcyB0cmFjayBv ZiBpdHMgc3RhdHVzLCBzdWNoIGFzIHdpZHRoLCBoZWlnaHQsIFNvdXJjZSBBbGlnbm1lbnQsIGZv cm1hdCBhbmQgQWxwaGFPcCBldGMKLSAgICAgICAgLy8gbmVlZHMgdG8gbG9jayB0aGUgcmVzb3Vy Y2VzIG9yIHJlbGV2YW50IGRhdGEgaWYgbmVlZGVkCi0gICAgICAgIC8vIFJldHVybiB0cnVlIHVw b24gc3VjY2VzcworICAgICAgICAvLyBFeHRyYWN0cyB0aGUgaW1hZ2UgYW5kIGtlZXBzIHRyYWNr IG9mIGl0cyBzdGF0dXMsIHN1Y2ggYXMgd2lkdGgsIGhlaWdodCwgU291cmNlIEFsaWdubWVudCwg Zm9ybWF0IGFuZCBBbHBoYU9wIGV0YywKKyAgICAgICAgLy8gbmVlZHMgdG8gbG9jayB0aGUgcmVz b3VyY2VzIG9yIHJlbGV2YW50IGRhdGEgaWYgbmVlZGVkIGFuZCByZXR1cm5zIHRydWUgdXBvbiBz dWNjZXNzCiAgICAgICAgIGJvb2wgZXh0cmFjdEltYWdlKGJvb2wgcHJlbXVsdGlwbHlBbHBoYSwg Ym9vbCBpZ25vcmVHYW1tYUFuZENvbG9yUHJvZmlsZSk7CiAKICNpZiBVU0UoU0tJQSkK 177691 2012-12-05 00:59:21 -0800 2012-12-05 13:03:55 -0800 Patch bug-103885-20121205165803.patch text/plain 10934 jun.a.jiang U3VidmVyc2lvbiBSZXZpc2lvbjogMTM2NjUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDU0OTcxMzFmYWZkZGY0 Mzc5N2Q3OGNiMzEyZDcyNjQ3NjAyNzZiNi4uNzA3OTM4MTFmOGYwNzc2N2U4YTM4YzNlZjVlOGQy OTQyOGU3MDYzMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEyLTEyLTA1ICBKdW4g SmlhbmcgIDxqdW4uYS5qaWFuZ0BpbnRlbC5jb20+CisKKyAgICAgICAgV2ViR0w6IHVzZSBwb2lu dGVyIHRvIHRoZSBzb3VyY2UgZGF0YSBmb3IgSW1hZ2UgZGlyZWN0bHkgaW4gdGV4SW1hZ2UyRCBh bmQgdGV4U3ViSW1hZ2UyRCB0byBhdm9pZCBtZW1vcnkgY29weSBpZiBubyBjb252ZXJzaW9uIGlz IG5lZWRlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTAzODg1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg SW4gdGV4SW1hZ2UyRCgpIGFuZCB0ZXhTdWJJbWFnZTJEKCksIHRoZXJlIGlzIGEgcmVkdW5kYW50 IG1lbW9yeSBjb3B5IGZyb20gSW1hZ2UgZGF0YSB0byB0aGUgaW50ZXJtZWRpYXRlIHZlY3RvciB3 aGVuIG5vIGNvbnZlcnNpb24gaXMgbmVlZGVkLiBJZiB0aGUgSW1hZ2UgcmVzb3VyY2UgY2FuIGJl IGxvY2tlZCBwcm9wZXJseSwgaXQgaXMgYmV0dGVyIHRvIHVzZSB0aGUgcG9pbnRlciB0byB0aGUg aW1hZ2Ugc291cmNlIGRpcmVjdGx5IGFuZCBoZW5jZSBhdm9pZCB0aGUgbWVtb3J5IGNvcHkgYW5k IGltcHJvdmUgdGhlIHBlcmZvcm1hbmNlLiAKKworICAgICAgICBBbHJlYWR5IGNvdmVyZWQgYnkg Y3VycmVudCB0ZXN0cy4KKworICAgICAgICAqIGh0bWwvY2FudmFzL1dlYkdMUmVuZGVyaW5nQ29u dGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNvcmU6OldlYkdMUmVu ZGVyaW5nQ29udGV4dDo6dGV4SW1hZ2UyREJhc2UpOgorICAgICAgICAoV2ViQ29yZTo6V2ViR0xS ZW5kZXJpbmdDb250ZXh0Ojp0ZXhJbWFnZTJESW1wbCk6CisgICAgICAgIChXZWJDb3JlOjpXZWJH TFJlbmRlcmluZ0NvbnRleHQ6OnRleFN1YkltYWdlMkRCYXNlKToKKyAgICAgICAgKFdlYkNvcmU6 OldlYkdMUmVuZGVyaW5nQ29udGV4dDo6dGV4U3ViSW1hZ2UyREltcGwpOgorICAgICAgICAqIGh0 bWwvY2FudmFzL1dlYkdMUmVuZGVyaW5nQ29udGV4dC5oOgorICAgICAgICAoV2ViR0xSZW5kZXJp bmdDb250ZXh0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQz RC5oOgorICAgICAgICAoSW1hZ2VFeHRyYWN0b3IpOgorCiAyMDEyLTEyLTA1ICBBbmRyZXkgQWRh aWtpbiAgPGFhbmRyZXlAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFtD YW52YXNdIG5pdDogYWRkIG1vcmUgdHlwaXphdGlvbiBmb3IganMgY29tcGlsZXIKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMUmVuZGVyaW5nQ29udGV4dC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHQuY3BwCmlu ZGV4IGRiYWM0NDg2ZWY5OTI1ZWU5NmQ4ZWNkYTJjMWM0ZTU3YzExNGE1NjcuLjFjMmU4Mjg1NzQz NzgwNTBhYjc1MTk2NGMwYjlkOTVkYzZiYTVkZjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2h0bWwvY2FudmFzL1dlYkdMUmVuZGVyaW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0LmNwcApAQCAtMzU3MSw5ICszNTcx LDcgQEAgdm9pZCBXZWJHTFJlbmRlcmluZ0NvbnRleHQ6OnN0ZW5jaWxPcFNlcGFyYXRlKEdDM0Rl bnVtIGZhY2UsIEdDM0RlbnVtIGZhaWwsIEdDM0QKICAgICBjbGVhbnVwQWZ0ZXJHcmFwaGljc0Nh bGwoZmFsc2UpOwogfQogCi12b2lkIFdlYkdMUmVuZGVyaW5nQ29udGV4dDo6dGV4SW1hZ2UyREJh c2UoR0MzRGVudW0gdGFyZ2V0LCBHQzNEaW50IGxldmVsLCBHQzNEZW51bSBpbnRlcm5hbGZvcm1h dCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBHQzNEc2l6ZWkg d2lkdGgsIEdDM0RzaXplaSBoZWlnaHQsIEdDM0RpbnQgYm9yZGVyLAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIEdDM0RlbnVtIGZvcm1hdCwgR0MzRGVudW0gdHlw ZSwgdm9pZCogcGl4ZWxzLCBFeGNlcHRpb25Db2RlJiBlYykKK3ZvaWQgV2ViR0xSZW5kZXJpbmdD b250ZXh0Ojp0ZXhJbWFnZTJEQmFzZShHQzNEZW51bSB0YXJnZXQsIEdDM0RpbnQgbGV2ZWwsIEdD M0RlbnVtIGludGVybmFsZm9ybWF0LCBHQzNEc2l6ZWkgd2lkdGgsIEdDM0RzaXplaSBoZWlnaHQs IEdDM0RpbnQgYm9yZGVyLCBHQzNEZW51bSBmb3JtYXQsIEdDM0RlbnVtIHR5cGUsIGNvbnN0IHZv aWQqIHBpeGVscywgRXhjZXB0aW9uQ29kZSYgZWMpCiB7CiAgICAgLy8gRklYTUU6IEZvciBub3cg d2UgaWdub3JlIGFueSBlcnJvcnMgcmV0dXJuZWQKICAgICBlYyA9IDA7CkBAIC0zNjI0LDE2ICsz NjIyLDIzIEBAIHZvaWQgV2ViR0xSZW5kZXJpbmdDb250ZXh0Ojp0ZXhJbWFnZTJESW1wbChHQzNE ZW51bSB0YXJnZXQsIEdDM0RpbnQgbGV2ZWwsIEdDM0RlCiAgICAgICAgIHN5bnRoZXNpemVHTEVy cm9yKEdyYXBoaWNzQ29udGV4dDNEOjpJTlZBTElEX1ZBTFVFLCAidGV4SW1hZ2UyRCIsICJiYWQg aW1hZ2UgZGF0YSIpOwogICAgICAgICByZXR1cm47CiAgICAgfQorICAgIEdyYXBoaWNzQ29udGV4 dDNEOjpTb3VyY2VEYXRhRm9ybWF0IHNvdXJjZURhdGFGb3JtYXQgPSBpbWFnZUV4dHJhY3Rvci5p bWFnZVNvdXJjZUZvcm1hdCgpOworICAgIEdyYXBoaWNzQ29udGV4dDNEOjpBbHBoYU9wIGFscGhh T3AgPSBpbWFnZUV4dHJhY3Rvci5pbWFnZUFscGhhT3AoKTsKKyAgICBjb25zdCB2b2lkKiBpbWFn ZVBpeGVsRGF0YSA9IGltYWdlRXh0cmFjdG9yLmltYWdlUGl4ZWxEYXRhKCk7CiAKLSAgICBpZiAo IW1fY29udGV4dC0+cGFja0ltYWdlRGF0YShpbWFnZSwgaW1hZ2VFeHRyYWN0b3IuaW1hZ2VQaXhl bERhdGEoKSwgZm9ybWF0LCB0eXBlLCBmbGlwWSwgaW1hZ2VFeHRyYWN0b3IuaW1hZ2VBbHBoYU9w KCksIGltYWdlRXh0cmFjdG9yLmltYWdlU291cmNlRm9ybWF0KCksIGltYWdlRXh0cmFjdG9yLmlt YWdlV2lkdGgoKSwgaW1hZ2VFeHRyYWN0b3IuaW1hZ2VIZWlnaHQoKSwgaW1hZ2VFeHRyYWN0b3Iu aW1hZ2VTb3VyY2VVbnBhY2tBbGlnbm1lbnQoKSwgZGF0YSkpIHsKLSAgICAgICAgc3ludGhlc2l6 ZUdMRXJyb3IoR3JhcGhpY3NDb250ZXh0M0Q6OklOVkFMSURfVkFMVUUsICJ0ZXhJbWFnZTJEIiwg InBhY2tJbWFnZURhdGEgZXJyb3IiKTsKLSAgICAgICAgcmV0dXJuOworICAgIGJvb2wgbmVlZENv bnZlcnNpb24gPSB0cnVlOworICAgIGlmICh0eXBlID09IEdyYXBoaWNzQ29udGV4dDNEOjpVTlNJ R05FRF9CWVRFICYmIHNvdXJjZURhdGFGb3JtYXQgPT0gR3JhcGhpY3NDb250ZXh0M0Q6OlNvdXJj ZUZvcm1hdFJHQkE4ICYmIGZvcm1hdCA9PSBHcmFwaGljc0NvbnRleHQzRDo6UkdCQSAmJiBhbHBo YU9wID09IEdyYXBoaWNzQ29udGV4dDNEOjpBbHBoYURvTm90aGluZyAmJiAhZmxpcFkpCisgICAg ICAgIG5lZWRDb252ZXJzaW9uID0gZmFsc2U7CisgICAgZWxzZSB7CisgICAgICAgIGlmICghbV9j b250ZXh0LT5wYWNrSW1hZ2VEYXRhKGltYWdlLCBpbWFnZVBpeGVsRGF0YSwgZm9ybWF0LCB0eXBl LCBmbGlwWSwgYWxwaGFPcCwgc291cmNlRGF0YUZvcm1hdCwgaW1hZ2VFeHRyYWN0b3IuaW1hZ2VX aWR0aCgpLCBpbWFnZUV4dHJhY3Rvci5pbWFnZUhlaWdodCgpLCBpbWFnZUV4dHJhY3Rvci5pbWFn ZVNvdXJjZVVucGFja0FsaWdubWVudCgpLCBkYXRhKSkgeworICAgICAgICAgICAgc3ludGhlc2l6 ZUdMRXJyb3IoR3JhcGhpY3NDb250ZXh0M0Q6OklOVkFMSURfVkFMVUUsICJ0ZXhJbWFnZTJEIiwg InBhY2tJbWFnZSBlcnJvciIpOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CiAgICAg fQogCiAgICAgaWYgKG1fdW5wYWNrQWxpZ25tZW50ICE9IDEpCiAgICAgICAgIG1fY29udGV4dC0+ cGl4ZWxTdG9yZWkoR3JhcGhpY3NDb250ZXh0M0Q6OlVOUEFDS19BTElHTk1FTlQsIDEpOwotICAg IHRleEltYWdlMkRCYXNlKHRhcmdldCwgbGV2ZWwsIGludGVybmFsZm9ybWF0LCBpbWFnZS0+d2lk dGgoKSwgaW1hZ2UtPmhlaWdodCgpLCAwLAotICAgICAgICAgICAgICAgICAgIGZvcm1hdCwgdHlw ZSwgZGF0YS5kYXRhKCksIGVjKTsKKyAgICB0ZXhJbWFnZTJEQmFzZSh0YXJnZXQsIGxldmVsLCBp bnRlcm5hbGZvcm1hdCwgaW1hZ2UtPndpZHRoKCksIGltYWdlLT5oZWlnaHQoKSwgMCwgZm9ybWF0 LCB0eXBlLCBuZWVkQ29udmVyc2lvbiA/IGRhdGEuZGF0YSgpIDogaW1hZ2VQaXhlbERhdGEsIGVj KTsKICAgICBpZiAobV91bnBhY2tBbGlnbm1lbnQgIT0gMSkKICAgICAgICAgbV9jb250ZXh0LT5w aXhlbFN0b3JlaShHcmFwaGljc0NvbnRleHQzRDo6VU5QQUNLX0FMSUdOTUVOVCwgbV91bnBhY2tB bGlnbm1lbnQpOwogfQpAQCAtMzgyNSw5ICszODMwLDcgQEAgdm9pZCBXZWJHTFJlbmRlcmluZ0Nv bnRleHQ6OnRleFBhcmFtZXRlcmkoR0MzRGVudW0gdGFyZ2V0LCBHQzNEZW51bSBwbmFtZSwgR0Mz RGkKICAgICB0ZXhQYXJhbWV0ZXIodGFyZ2V0LCBwbmFtZSwgMCwgcGFyYW0sIGZhbHNlKTsKIH0K IAotdm9pZCBXZWJHTFJlbmRlcmluZ0NvbnRleHQ6OnRleFN1YkltYWdlMkRCYXNlKEdDM0RlbnVt IHRhcmdldCwgR0MzRGludCBsZXZlbCwgR0MzRGludCB4b2Zmc2V0LCBHQzNEaW50IHlvZmZzZXQs Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgR0MzRHNpemVp IHdpZHRoLCBHQzNEc2l6ZWkgaGVpZ2h0LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIEdDM0RlbnVtIGZvcm1hdCwgR0MzRGVudW0gdHlwZSwgdm9pZCogcGl4 ZWxzLCBFeGNlcHRpb25Db2RlJiBlYykKK3ZvaWQgV2ViR0xSZW5kZXJpbmdDb250ZXh0Ojp0ZXhT dWJJbWFnZTJEQmFzZShHQzNEZW51bSB0YXJnZXQsIEdDM0RpbnQgbGV2ZWwsIEdDM0RpbnQgeG9m ZnNldCwgR0MzRGludCB5b2Zmc2V0LCBHQzNEc2l6ZWkgd2lkdGgsIEdDM0RzaXplaSBoZWlnaHQs IEdDM0RlbnVtIGZvcm1hdCwgR0MzRGVudW0gdHlwZSwgY29uc3Qgdm9pZCogcGl4ZWxzLCBFeGNl cHRpb25Db2RlJiBlYykKIHsKICAgICAvLyBGSVhNRTogRm9yIG5vdyB3ZSBpZ25vcmUgYW55IGVy cm9ycyByZXR1cm5lZAogICAgIGVjID0gMDsKQEAgLTM4NjcsMTYgKzM4NzAsMjMgQEAgdm9pZCBX ZWJHTFJlbmRlcmluZ0NvbnRleHQ6OnRleFN1YkltYWdlMkRJbXBsKEdDM0RlbnVtIHRhcmdldCwg R0MzRGludCBsZXZlbCwgR0MKICAgICAgICAgc3ludGhlc2l6ZUdMRXJyb3IoR3JhcGhpY3NDb250 ZXh0M0Q6OklOVkFMSURfVkFMVUUsICJ0ZXhTdWJJbWFnZTJEIiwgImJhZCBpbWFnZSIpOwogICAg ICAgICByZXR1cm47CiAgICAgfQorICAgIEdyYXBoaWNzQ29udGV4dDNEOjpTb3VyY2VEYXRhRm9y bWF0IHNvdXJjZURhdGFGb3JtYXQgPSBpbWFnZUV4dHJhY3Rvci5pbWFnZVNvdXJjZUZvcm1hdCgp OworICAgIEdyYXBoaWNzQ29udGV4dDNEOjpBbHBoYU9wIGFscGhhT3AgPSBpbWFnZUV4dHJhY3Rv ci5pbWFnZUFscGhhT3AoKTsKKyAgICBjb25zdCB2b2lkKiBpbWFnZVBpeGVsRGF0YSA9IGltYWdl RXh0cmFjdG9yLmltYWdlUGl4ZWxEYXRhKCk7CiAKLSAgICBpZiAoIW1fY29udGV4dC0+cGFja0lt YWdlRGF0YShpbWFnZSwgaW1hZ2VFeHRyYWN0b3IuaW1hZ2VQaXhlbERhdGEoKSwgZm9ybWF0LCB0 eXBlLCBmbGlwWSwgaW1hZ2VFeHRyYWN0b3IuaW1hZ2VBbHBoYU9wKCksIGltYWdlRXh0cmFjdG9y LmltYWdlU291cmNlRm9ybWF0KCksIGltYWdlRXh0cmFjdG9yLmltYWdlV2lkdGgoKSwgaW1hZ2VF eHRyYWN0b3IuaW1hZ2VIZWlnaHQoKSwgaW1hZ2VFeHRyYWN0b3IuaW1hZ2VTb3VyY2VVbnBhY2tB bGlnbm1lbnQoKSwgZGF0YSkpIHsKLSAgICAgICAgc3ludGhlc2l6ZUdMRXJyb3IoR3JhcGhpY3ND b250ZXh0M0Q6OklOVkFMSURfVkFMVUUsICJ0ZXhJbWFnZTJEIiwgInBhY2tJbWFnZURhdGEgZXJy b3IiKTsKLSAgICAgICAgcmV0dXJuOworICAgIGJvb2wgbmVlZENvbnZlcnNpb24gPSB0cnVlOwor ICAgIGlmICh0eXBlID09IEdyYXBoaWNzQ29udGV4dDNEOjpVTlNJR05FRF9CWVRFICYmIHNvdXJj ZURhdGFGb3JtYXQgPT0gR3JhcGhpY3NDb250ZXh0M0Q6OlNvdXJjZUZvcm1hdFJHQkE4ICYmIGZv cm1hdCA9PSBHcmFwaGljc0NvbnRleHQzRDo6UkdCQSAmJiBhbHBoYU9wID09IEdyYXBoaWNzQ29u dGV4dDNEOjpBbHBoYURvTm90aGluZyAmJiAhZmxpcFkpCisgICAgICAgIG5lZWRDb252ZXJzaW9u ID0gZmFsc2U7CisgICAgZWxzZSB7CisgICAgICAgIGlmICghbV9jb250ZXh0LT5wYWNrSW1hZ2VE YXRhKGltYWdlLCBpbWFnZVBpeGVsRGF0YSwgZm9ybWF0LCB0eXBlLCBmbGlwWSwgYWxwaGFPcCwg c291cmNlRGF0YUZvcm1hdCwgaW1hZ2VFeHRyYWN0b3IuaW1hZ2VXaWR0aCgpLCBpbWFnZUV4dHJh Y3Rvci5pbWFnZUhlaWdodCgpLCBpbWFnZUV4dHJhY3Rvci5pbWFnZVNvdXJjZVVucGFja0FsaWdu bWVudCgpLCBkYXRhKSkgeworICAgICAgICAgICAgc3ludGhlc2l6ZUdMRXJyb3IoR3JhcGhpY3ND b250ZXh0M0Q6OklOVkFMSURfVkFMVUUsICJ0ZXhJbWFnZTJEIiwgImJhZCBpbWFnZSBkYXRhIik7 CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KICAgICB9CiAKICAgICBpZiAobV91bnBh Y2tBbGlnbm1lbnQgIT0gMSkKICAgICAgICAgbV9jb250ZXh0LT5waXhlbFN0b3JlaShHcmFwaGlj c0NvbnRleHQzRDo6VU5QQUNLX0FMSUdOTUVOVCwgMSk7Ci0gICAgdGV4U3ViSW1hZ2UyREJhc2Uo dGFyZ2V0LCBsZXZlbCwgeG9mZnNldCwgeW9mZnNldCwgaW1hZ2UtPndpZHRoKCksIGltYWdlLT5o ZWlnaHQoKSwKLSAgICAgICAgICAgICAgICAgICAgICBmb3JtYXQsIHR5cGUsIGRhdGEuZGF0YSgp LCBlYyk7CisgICAgdGV4U3ViSW1hZ2UyREJhc2UodGFyZ2V0LCBsZXZlbCwgeG9mZnNldCwgeW9m ZnNldCwgaW1hZ2UtPndpZHRoKCksIGltYWdlLT5oZWlnaHQoKSwgZm9ybWF0LCB0eXBlLCAgbmVl ZENvbnZlcnNpb24gPyBkYXRhLmRhdGEoKSA6IGltYWdlUGl4ZWxEYXRhLCBlYyk7CiAgICAgaWYg KG1fdW5wYWNrQWxpZ25tZW50ICE9IDEpCiAgICAgICAgIG1fY29udGV4dC0+cGl4ZWxTdG9yZWko R3JhcGhpY3NDb250ZXh0M0Q6OlVOUEFDS19BTElHTk1FTlQsIG1fdW5wYWNrQWxpZ25tZW50KTsK IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMUmVuZGVyaW5n Q29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250 ZXh0LmgKaW5kZXggODZlYjgyOWYyMjcwY2EyYmFkMDlmZjQ4Mzg5YmFiYTRiOGQ2ODAwOS4uMmRh ZTIzZDgzMjgyMGE2MmRjMjZhMjMxZTRhNmU1NzM4ODM4ODhmZiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0LmgKKysrIGIvU291cmNl L1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0LmgKQEAgLTUzMCwxNSAr NTMwLDExIEBAIHB1YmxpYzoKICAgICAvLyBIZWxwZXIgdG8gcmVzdG9yZSBzdGF0ZSB0aGF0IGNs ZWFyaW5nIHRoZSBmcmFtZWJ1ZmZlciBtYXkgZGVzdHJveS4KICAgICB2b2lkIHJlc3RvcmVTdGF0 ZUFmdGVyQ2xlYXIoKTsKIAotICAgIHZvaWQgdGV4SW1hZ2UyREJhc2UoR0MzRGVudW0gdGFyZ2V0 LCBHQzNEaW50IGxldmVsLCBHQzNEZW51bSBpbnRlcm5hbGZvcm1hdCwKLSAgICAgICAgICAgICAg ICAgICAgICAgIEdDM0RzaXplaSB3aWR0aCwgR0MzRHNpemVpIGhlaWdodCwgR0MzRGludCBib3Jk ZXIsCi0gICAgICAgICAgICAgICAgICAgICAgICBHQzNEZW51bSBmb3JtYXQsIEdDM0RlbnVtIHR5 cGUsIHZvaWQqIHBpeGVscywgRXhjZXB0aW9uQ29kZSYpOworICAgIHZvaWQgdGV4SW1hZ2UyREJh c2UoR0MzRGVudW0gdGFyZ2V0LCBHQzNEaW50IGxldmVsLCBHQzNEZW51bSBpbnRlcm5hbGZvcm1h dCwgR0MzRHNpemVpIHdpZHRoLCBHQzNEc2l6ZWkgaGVpZ2h0LCBHQzNEaW50IGJvcmRlciwgR0Mz RGVudW0gZm9ybWF0LCBHQzNEZW51bSB0eXBlLCBjb25zdCB2b2lkKiBwaXhlbHMsIEV4Y2VwdGlv bkNvZGUmKTsKICAgICB2b2lkIHRleEltYWdlMkRJbXBsKEdDM0RlbnVtIHRhcmdldCwgR0MzRGlu dCBsZXZlbCwgR0MzRGVudW0gaW50ZXJuYWxmb3JtYXQsCiAgICAgICAgICAgICAgICAgICAgICAg ICBHQzNEZW51bSBmb3JtYXQsIEdDM0RlbnVtIHR5cGUsIEltYWdlKiwKICAgICAgICAgICAgICAg ICAgICAgICAgIGJvb2wgZmxpcFksIGJvb2wgcHJlbXVsdGlwbHlBbHBoYSwgRXhjZXB0aW9uQ29k ZSYpOwotICAgIHZvaWQgdGV4U3ViSW1hZ2UyREJhc2UoR0MzRGVudW0gdGFyZ2V0LCBHQzNEaW50 IGxldmVsLCBHQzNEaW50IHhvZmZzZXQsIEdDM0RpbnQgeW9mZnNldCwKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgIEdDM0RzaXplaSB3aWR0aCwgR0MzRHNpemVpIGhlaWdodCwKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgIEdDM0RlbnVtIGZvcm1hdCwgR0MzRGVudW0gdHlwZSwgdm9pZCog cGl4ZWxzLCBFeGNlcHRpb25Db2RlJik7CisgICAgdm9pZCB0ZXhTdWJJbWFnZTJEQmFzZShHQzNE ZW51bSB0YXJnZXQsIEdDM0RpbnQgbGV2ZWwsIEdDM0RpbnQgeG9mZnNldCwgR0MzRGludCB5b2Zm c2V0LCBHQzNEc2l6ZWkgd2lkdGgsIEdDM0RzaXplaSBoZWlnaHQsIEdDM0RlbnVtIGZvcm1hdCwg R0MzRGVudW0gdHlwZSwgY29uc3Qgdm9pZCogcGl4ZWxzLCBFeGNlcHRpb25Db2RlJik7CiAgICAg dm9pZCB0ZXhTdWJJbWFnZTJESW1wbChHQzNEZW51bSB0YXJnZXQsIEdDM0RpbnQgbGV2ZWwsIEdD M0RpbnQgeG9mZnNldCwgR0MzRGludCB5b2Zmc2V0LAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgR0MzRGVudW0gZm9ybWF0LCBHQzNEZW51bSB0eXBlLAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgSW1hZ2UqIGltYWdlLCBib29sIGZsaXBZLCBib29sIHByZW11bHRpcGx5QWxwaGEsIEV4 Y2VwdGlvbkNvZGUmKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL0dyYXBoaWNzQ29udGV4dDNELmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9HcmFwaGljc0NvbnRleHQzRC5oCmluZGV4IDk5NGMwNzNiN2U1NGZjYTU0Mzc1NTcyZDM0NWUx ZDIwOWNkMWY5YWMuLjMxZjYwM2NiZTg2Njk5YTk1ZGQ2MjdiY2M1ZjFkYTZlMDZkZDUzNjQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4 dDNELmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250 ZXh0M0QuaApAQCAtODc2LDcgKzg3Niw3IEBAIHB1YmxpYzoKICAgICB9OwogCiAgICAgLy8gUGFj a3MgdGhlIGNvbnRlbnRzIG9mIHRoZSBnaXZlbiBJbWFnZSB3aGljaCBpcyBwYXNzZWQgaW4gfHBp eGVsc3wgaW50byB0aGUgcGFzc2VkIFZlY3RvcgotICAgIC8vIGFjY29yZGluZyB0byB0aGUgZ2l2 ZW4gZm9ybWF0IGFuZCB0eXBlLCBhbmQgb2JleWluZyB0aGUgZmxpcFkgYW5kIHByZW11bHRpcGx5 QWxwaGEgZmxhZ3MuCisgICAgLy8gYWNjb3JkaW5nIHRvIHRoZSBnaXZlbiBmb3JtYXQgYW5kIHR5 cGUsIGFuZCBvYmV5aW5nIHRoZSBmbGlwWSBhbmQgQWxwaGFPcCBmbGFncy4KICAgICAvLyBSZXR1 cm5zIHRydWUgdXBvbiBzdWNjZXNzLgogICAgIHN0YXRpYyBib29sIHBhY2tJbWFnZURhdGEoSW1h Z2UqLCBjb25zdCB2b2lkKiBwaXhlbHMsIEdDM0RlbnVtIGZvcm1hdCwgR0MzRGVudW0gdHlwZSwg Ym9vbCBmbGlwWSwgQWxwaGFPcCwgU291cmNlRGF0YUZvcm1hdCBzb3VyY2VGb3JtYXQsIHVuc2ln bmVkIHdpZHRoLCB1bnNpZ25lZCBoZWlnaHQsIHVuc2lnbmVkIHNvdXJjZVVucGFja0FsaWdubWVu dCwgVmVjdG9yPHVpbnQ4X3Q+JiBkYXRhKTsKIApAQCAtODk3LDkgKzg5Nyw4IEBAIHB1YmxpYzoK ICAgICAgICAgdW5zaWduZWQgaW1hZ2VTb3VyY2VVbnBhY2tBbGlnbm1lbnQoKSB7IHJldHVybiBt X2ltYWdlU291cmNlVW5wYWNrQWxpZ25tZW50OyB9IAogICAgIHByaXZhdGU6CiAgICAgICAgIC8v IEVhY2ggcGxhdGZvcm0gbXVzdCBwcm92aWRlIGFuIGltcGxlbWVudGF0aW9uIG9mIHRoaXMgbWV0 aG9kLgotICAgICAgICAvLyBFeHRyYWN0cyB0aGUgaW1hZ2UgYW5kIGtlZXBzIHRyYWNrIG9mIGl0 cyBzdGF0dXMsIHN1Y2ggYXMgd2lkdGgsIGhlaWdodCwgU291cmNlIEFsaWdubWVudCwgZm9ybWF0 IGFuZCBBbHBoYU9wIGV0YwotICAgICAgICAvLyBuZWVkcyB0byBsb2NrIHRoZSByZXNvdXJjZXMg b3IgcmVsZXZhbnQgZGF0YSBpZiBuZWVkZWQKLSAgICAgICAgLy8gUmV0dXJuIHRydWUgdXBvbiBz dWNjZXNzCisgICAgICAgIC8vIEV4dHJhY3RzIHRoZSBpbWFnZSBhbmQga2VlcHMgdHJhY2sgb2Yg aXRzIHN0YXR1cywgc3VjaCBhcyB3aWR0aCwgaGVpZ2h0LCBTb3VyY2UgQWxpZ25tZW50LCBmb3Jt YXQgYW5kIEFscGhhT3AgZXRjLAorICAgICAgICAvLyBuZWVkcyB0byBsb2NrIHRoZSByZXNvdXJj ZXMgb3IgcmVsZXZhbnQgZGF0YSBpZiBuZWVkZWQgYW5kIHJldHVybnMgdHJ1ZSB1cG9uIHN1Y2Nl c3MKICAgICAgICAgYm9vbCBleHRyYWN0SW1hZ2UoYm9vbCBwcmVtdWx0aXBseUFscGhhLCBib29s IGlnbm9yZUdhbW1hQW5kQ29sb3JQcm9maWxlKTsKIAogI2lmIFVTRShTS0lBKQo=