75662 2012-01-05 15:37:10 -0800 Pixel results from DumpRenderTree and WebKitTestRunner don't match because of colorspace issues 2012-01-08 12:15:25 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser ap darin jonlee mitz simon.fraser tony oldest_to_newest 530708 0 simon.fraser 2012-01-05 15:37:10 -0800 Pixel results from DumpRenderTree and WebKitTestRunner don't match, suffer colorspace issues 530716 1 121354 simon.fraser 2012-01-05 15:42:02 -0800 Created attachment 121354 Patch 530719 2 simon.fraser 2012-01-05 15:42:35 -0800 <rdar://problem/10640723> 530945 3 121354 ap 2012-01-05 23:06:58 -0800 Comment on attachment 121354 Patch How is this related to bug 72424? 531102 4 simon.fraser 2012-01-06 09:20:26 -0800 The patch here fixes bug 72424 too. 531104 5 simon.fraser 2012-01-06 09:20:30 -0800 *** Bug 72424 has been marked as a duplicate of this bug. *** 531373 6 121354 mitz 2012-01-06 13:56:30 -0800 Comment on attachment 121354 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=121354&action=review > Tools/ChangeLog:3 > + Pixel results from DumpRenderTree and WebKitTestRunner don't match, suffer colorspace issues I think it’s us who suffer. The pixel results are secretly enjoying it. > Tools/DumpRenderTree/mac/PixelDumpSupportMac.mm:55 > + // Creating this bitmap in the device color space should prevent any color conversion when the image of the web view is drawn into it. Can you say “prevents” instead of “should prevent”? Does it not really do what it should do? 531457 7 simon.fraser 2012-01-06 15:35:23 -0800 http://trac.webkit.org/changeset/104351 531790 8 darin 2012-01-08 12:15:25 -0800 Wow, what a great thing to do! Wish we had done this years ago. 121354 2012-01-05 15:42:02 -0800 2012-01-06 13:56:30 -0800 Patch bug-75662-20120105154200.patch text/plain 13272 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTA0MTk4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZjFlZmMxZDFiMDE4YmJlYWJhNWRlNmE4MDg1NWY3MzI5 YTcyOTI5Ni4uNjBjZWY1YzZmYWYxNzc5NDI3NDExMDA5MDFjMGUyMjhiODE5MTMzMCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMy IEBACisyMDEyLTAxLTA1ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgor CisgICAgICAgIFBpeGVsIHJlc3VsdHMgZnJvbSBEdW1wUmVuZGVyVHJlZSBhbmQgV2ViS2l0VGVz dFJ1bm5lciBkb24ndCBtYXRjaCwgc3VmZmVyIGNvbG9yc3BhY2UgaXNzdWVzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NTY2MgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAgVGhlIHBpeGVsIHJl c3VsdHMgZ2VuZXJhdGVkIGJ5IER1bXBSZW5kZXJUcmVlIGFuZCBXZWJLaXRUZXN0UnVubmVyIGRp ZmZlcmVkIGJlY2F1c2UKKyAgICAgICAgb2YgY29sb3IgcHJvZmlsZSBpc3N1ZXMuIEZpeCBieSBr ZWVwaW5nIGV2ZXJ5dGhpbmcgaW4gZGV2aWNlIFJHQiBhbmQgZW5zdXJpbmcgdGhhdCB0aGUKKyAg ICAgICAgdGVzdCB3aW5kb3cgdXNlcyB0aGUgbWFpbiBkaXNwbGF5J3MgY29sb3Igc3BhY2UsIHNv IHRoYXQgdGhlIHBpeGVsIHZhbHVlcyBpbiB0aGUgYml0bWFwCisgICAgICAgIHRoYXQgZ2V0cyBj aGVja3N1bW1lZCBhcmUgaWRlbnRpY2FsIHRvIHRoZSBDU1MgY29sb3JzLgorICAgICAgICAKKyAg ICAgICAgUmVtb3ZlZCB0aGUgY29kZSB0aGF0IHN3aXRjaGVzIHRoZSBkaXNwbGF5IHByb2ZpbGUg aW4gRFJULCBzaW5jZSB0aGF0IGlzIG5vIGxvbmdlciByZXF1aXJlZC4KKworICAgICAgICAqIER1 bXBSZW5kZXJUcmVlL1BpeGVsRHVtcFN1cHBvcnQuaDogUmVtb3ZlIHVudXNlZCBmdW5jdGlvbiBk ZWNsYXJhdGlvbnMuCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvbWFjL0R1bXBSZW5kZXJUcmVl Lm1tOgorICAgICAgICAoY3Jhc2hIYW5kbGVyKTogUmVtb3ZlIGNvZGUgdGhhdCBzd2l0Y2hlcyBk aXNwbGF5IHByb2ZpbGVzLgorICAgICAgICAocHJlcGFyZUNvbnNpc3RlbnRUZXN0aW5nRW52aXJv bm1lbnQpOiBEaXR0by4KKyAgICAgICAgKGR1bXBSZW5kZXJUcmVlKTogRGl0dG8uCisgICAgICAg ICogRHVtcFJlbmRlclRyZWUvbWFjL1BpeGVsRHVtcFN1cHBvcnRNYWMubW06IERpdHRvLgorICAg ICAgICAoY3JlYXRlQml0bWFwQ29udGV4dCk6IFVzZSBEZXZpY2VSR0IgZm9yIHRoZSBiaXRtYXAg Y29sb3JzcGFjZS4KKyAgICAgICAgKGNyZWF0ZUJpdG1hcENvbnRleHRGcm9tV2ViVmlldyk6IEFk ZCBjb21tZW50IGFib3V0IHRoZSBjb2xvcnNwYWNlIGhhbmRsaW5nLgorICAgICAgICAqIFdlYktp dFRlc3RSdW5uZXIvY2cvVGVzdEludm9jYXRpb25DRy5jcHA6CisgICAgICAgIChXVFI6OmNyZWF0 ZUNHQ29udGV4dEZyb21JbWFnZSk6IFVzZSBhIFJldGFpblB0ciwgYWRkIGNvbW1lbnQuCisgICAg ICAgIChXVFI6OmNvbXB1dGVNRDVIYXNoU3RyaW5nRm9yQ29udGV4dCk6IFNpbXBsaWZ5IHRoZSAj aWZkZWZzIGFyb3VuZCB0aGUgYnJhY2VzLgorICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvbWFj L1BsYXRmb3JtV2ViVmlld01hYy5tbToKKyAgICAgICAgKFdUUjo6UGxhdGZvcm1XZWJWaWV3OjpQ bGF0Zm9ybVdlYlZpZXcpOiBTZXQgdGhlIHdpbmRvdydzIGNvbG9yc3BhY2UgdG8gdGhhdCBvZiB0 aGUgbWFpbiBkaXNwbGF5LgorICAgICAgICAoV1RSOjpQbGF0Zm9ybVdlYlZpZXc6OndpbmRvd1Nu YXBzaG90SW1hZ2UpOiBBZGQgY29tbWVudCBhYm91dCBjb2xvcnNwYWNlcy4KKwogMjAxMi0wMS0w NSAgQWRhbSBSb2JlbiAgPGFyb2JlbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIHNvbWUg dW5uZWNlc3NhcnkgY29kZSBmcm9tIG9sZC1ydW4td2Via2l0LXRlc3RzCmRpZmYgLS1naXQgYS9U b29scy9EdW1wUmVuZGVyVHJlZS9QaXhlbER1bXBTdXBwb3J0LmggYi9Ub29scy9EdW1wUmVuZGVy VHJlZS9QaXhlbER1bXBTdXBwb3J0LmgKaW5kZXggODdlNjQwMjQzNTY2NTYzZTJhODczNmEwYTdk NjE4MTY3ODM5NTI3OS4uM2JkODgyMGM3ZDM3MzUyYmZlMDRkODEyNDhjODRiZTQ2MWVkYWRlZCAx MDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvUGl4ZWxEdW1wU3VwcG9ydC5oCisrKyBi L1Rvb2xzL0R1bXBSZW5kZXJUcmVlL1BpeGVsRHVtcFN1cHBvcnQuaApAQCAtNDIsMTQgKzQyLDQg QEAgdm9pZCBkdW1wQml0bWFwKEJpdG1hcENvbnRleHQqLCBjb25zdCBjaGFyKiBjaGVja3N1bSk7 CiB2b2lkIGR1bXBXZWJWaWV3QXNQaXhlbHNBbmRDb21wYXJlV2l0aEV4cGVjdGVkKGNvbnN0IHN0 ZDo6c3RyaW5nJiBleHBlY3RlZEhhc2gpOwogdm9pZCBwcmludFBORyhjb25zdCB1bnNpZ25lZCBj aGFyKiBkYXRhLCBjb25zdCBzaXplX3QgZGF0YUxlbmd0aCwgY29uc3QgY2hhciogY2hlY2tzdW0p OwogCi0jaWYgUExBVEZPUk0oTUFDKQotCi0vLyBDYW4gYmUgdXNlZCBhcyBhIHNpZ25hbCBoYW5k bGVyCi12b2lkIHJlc3RvcmVNYWluRGlzcGxheUNvbG9yUHJvZmlsZShpbnQgaWdub3JlZCk7Ci0K LS8vIE1heSBjaGFuZ2UgeW91ciBjb2xvciBzcGFjZSwgcmVxdWlyaW5nIGEgY2FsbCB0byByZXN0 b3JlTWFpbkRpc3BsYXlDb2xvclByb2ZpbGUKLXZvaWQgc2V0dXBNYWluRGlzcGxheUNvbG9yUHJv ZmlsZSgpOwotCi0jZW5kaWYKLQogI2VuZGlmIC8vIFBpeGVsRHVtcFN1cHBvcnRfaApkaWZmIC0t Z2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0R1bXBSZW5kZXJUcmVlLm1tIGIvVG9vbHMv RHVtcFJlbmRlclRyZWUvbWFjL0R1bXBSZW5kZXJUcmVlLm1tCmluZGV4IGIyNWZhMmE2MTAyOTZi YjBkZTc2OGZhYzFhNDBkMjMzZjBhYzczM2QuLjM1NTBlYzdhNDkzZTQzZDZhZWFlNTQzM2VkYzFl MGFhNWM2ODJlNTIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9EdW1wUmVu ZGVyVHJlZS5tbQorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9tYWMvRHVtcFJlbmRlclRyZWUu bW0KQEAgLTY0Myw3ICs2NDMsNiBAQCBzdGF0aWMgdm9pZCBjcmFzaEhhbmRsZXIoaW50IHNpZykK ICAgICBjaGFyICpzaWduYWxOYW1lID0gc3Ryc2lnbmFsKHNpZyk7CiAgICAgd3JpdGUoU1RERVJS X0ZJTEVOTywgc2lnbmFsTmFtZSwgc3RybGVuKHNpZ25hbE5hbWUpKTsKICAgICB3cml0ZShTVERF UlJfRklMRU5PLCAiXG4iLCAxKTsKLSAgICByZXN0b3JlTWFpbkRpc3BsYXlDb2xvclByb2ZpbGUo MCk7CiAgICAgZXhpdCgxMjggKyBzaWcpOwogfQogCkBAIC03NTMsOCArNzUyLDYgQEAgc3RhdGlj IHZvaWQgcHJlcGFyZUNvbnNpc3RlbnRUZXN0aW5nRW52aXJvbm1lbnQoKQogICAgIHNldERlZmF1 bHRzVG9Db25zaXN0ZW50VmFsdWVzRm9yVGVzdGluZygpOwogICAgIGFkanVzdEZvbnRzKCk7CiAg ICAgCi0gICAgaWYgKGR1bXBQaXhlbHMpCi0gICAgICAgIHNldHVwTWFpbkRpc3BsYXlDb2xvclBy b2ZpbGUoKTsKICAgICBhbGxvY2F0ZUdsb2JhbENvbnRyb2xsZXJzKCk7CiAgICAgCiAgICAgbWFr ZUxhcmdlTWFsbG9jRmFpbFNpbGVudGx5KCk7CkBAIC04MjIsOSArODE5LDYgQEAgdm9pZCBkdW1w UmVuZGVyVHJlZShpbnQgYXJnYywgY29uc3QgY2hhciAqYXJndltdKQogICAgICAgICBDRlJlbGVh c2UoZGlzYWxsb3dlZFVSTHMpOwogICAgICAgICBkaXNhbGxvd2VkVVJMcyA9IDA7CiAgICAgfQot Ci0gICAgaWYgKGR1bXBQaXhlbHMpCi0gICAgICAgIHJlc3RvcmVNYWluRGlzcGxheUNvbG9yUHJv ZmlsZSgwKTsKIH0KIAogaW50IG1haW4oaW50IGFyZ2MsIGNvbnN0IGNoYXIgKmFyZ3ZbXSkKZGlm ZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9QaXhlbER1bXBTdXBwb3J0TWFjLm1t IGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL1BpeGVsRHVtcFN1cHBvcnRNYWMubW0KaW5kZXgg M2Q2ZmJkZDU5NmYyMDllN2FlOGI4Yjc5N2QxNGE2ZTQ2MjEyMjNmZi4uNTI3NGNlYzQ0Yzc4Y2Iw Y2E1NTA1N2NlNzk1MDE5OGNiNzFkYjg1OSAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRy ZWUvbWFjL1BpeGVsRHVtcFN1cHBvcnRNYWMubW0KKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUv bWFjL1BpeGVsRHVtcFN1cHBvcnRNYWMubW0KQEAgLTQ0LDYzICs0NCw2IEBACiAjaW1wb3J0IDxX ZWJLaXQvV2ViS2l0Lmg+CiAjaW1wb3J0IDxXZWJLaXQvV2ViVmlld1ByaXZhdGUuaD4KIAotCi0v LyBUbyBlbnN1cmUgcGl4ZWwgdGVzdHMgY29uc2lzdGVuY3ksIHdlIG5lZWQgdG8gYWx3YXlzIHJl bmRlciBpbiB0aGUgc2FtZSBjb2xvcnNwYWNlLgotLy8gVW5mb3J0dW5hdGVseSwgYmVjYXVzZSBv ZiBBcHBLaXQgLyBXZWJLaXQgY29uc3RyYWludHMsIHdlIGNhbid0IHJlbmRlciBkaXJlY3RseSBp biB0aGUgY29sb3JzcGFjZSBvZiBvdXIgY2hvaWNlLgotLy8gVGhpcyBpbXBsaWVzIHdlIGhhdmUg dG8gdGVtcG9yYXJpbHkgY2hhbmdlIHRoZSBwcm9maWxlIG9mIHRoZSBtYWluIGRpc3BsYXkgdG8g dGhlIGNvbG9yc3BhY2Ugd2Ugd2FudCB0byByZW5kZXIgaW50by4KLS8vIFdlIGFsc28gbmVlZCB0 byBtYWtlIHN1cmUgdGhlIENHQml0bWFwQ29udGV4dCB3ZSByZXR1cm4gaXMgaW4gdGhhdCBzYW1l IGNvbG9yc3BhY2UuCi0KLSNkZWZpbmUgUFJPRklMRV9QQVRIICIvU3lzdGVtL0xpYnJhcnkvQ29s b3JTeW5jL1Byb2ZpbGVzL0dlbmVyaWMgUkdCIFByb2ZpbGUuaWNjIiAvLyBGSVhNRTogVGhpcyBj YW5ub3QgYmUgbW9yZSB0aGFuIENTX01BWF9QQVRIICgyNTYgY2hhcmFjdGVycykKLQotc3RhdGlj IENNUHJvZmlsZUxvY2F0aW9uIHNJbml0aWFsUHJvZmlsZUxvY2F0aW9uOyAvLyBUaGUgbG9jVHlw ZSBmaWVsZCBpcyBpbml0aWFsaXplZCB0byAwIHdoaWNoIGlzIHRoZSBzYW1lIGFzIGNtTm9Qcm9m aWxlQmFzZQotCi12b2lkIHJlc3RvcmVNYWluRGlzcGxheUNvbG9yUHJvZmlsZShpbnQgaWdub3Jl ZCkKLXsKLSAgICAvLyBUaGlzIGlzIHVzZWQgYXMgYSBzaWduYWwgaGFuZGxlciwgYW5kIHRodXMg dGhlIGNhbGxzIGludG8gQ29sb3JTeW5jIGFyZSB1bnNhZmUKLSAgICAvLyBCdXQgd2UgbWlnaHQg YXMgd2VsbCB0cnkgdG8gcmVzdG9yZSB0aGUgdXNlcidzIGNvbG9yIHByb2ZpbGUsIHdlJ3JlIGdv aW5nIGRvd24gYW55d2F5Li4uCi0gICAgaWYgKHNJbml0aWFsUHJvZmlsZUxvY2F0aW9uLmxvY1R5 cGUgIT0gY21Ob1Byb2ZpbGVCYXNlKSB7Ci0gICAgICAgIGNvbnN0IENNRGV2aWNlU2NvcGUgc2Nv cGUgPSB7IGtDRlByZWZlcmVuY2VzQ3VycmVudFVzZXIsIGtDRlByZWZlcmVuY2VzQ3VycmVudEhv c3QgfTsKLSAgICAgICAgaW50IGVycm9yID0gQ01TZXREZXZpY2VQcm9maWxlKGNtRGlzcGxheURl dmljZUNsYXNzLCAoQ01EZXZpY2VJRClrQ0dEaXJlY3RNYWluRGlzcGxheSwgJnNjb3BlLCBjbURl ZmF1bHRQcm9maWxlSUQsICZzSW5pdGlhbFByb2ZpbGVMb2NhdGlvbik7Ci0gICAgICAgIGlmIChl cnJvcikKLSAgICAgICAgICAgIGZwcmludGYoc3RkZXJyLCAiRmFpbGVkIHRvIHJlc3RvcmUgaW5p dGlhbCBjb2xvciBwcm9maWxlIGZvciBtYWluIGRpc3BsYXkhIE9wZW4gU3lzdGVtIFByZWZlcmVu Y2VzID4gRGlzcGxheXMgPiBDb2xvciBhbmQgbWFudWFsbHkgcmUtc2VsZWN0IHRoZSBwcm9maWxl LiAgKEVycm9yOiAlaSlcbiIsIGVycm9yKTsKLSAgICAgICAgc0luaXRpYWxQcm9maWxlTG9jYXRp b24ubG9jVHlwZSA9IGNtTm9Qcm9maWxlQmFzZTsKLSAgICB9Ci19Ci0KLXZvaWQgc2V0dXBNYWlu RGlzcGxheUNvbG9yUHJvZmlsZSgpCi17Ci0gICAgY29uc3QgQ01EZXZpY2VTY29wZSBzY29wZSA9 IHsga0NGUHJlZmVyZW5jZXNDdXJyZW50VXNlciwga0NGUHJlZmVyZW5jZXNDdXJyZW50SG9zdCB9 OwotICAgIGludCBlcnJvcjsKLSAgICAKLSAgICBDTVByb2ZpbGVSZWYgcHJvZmlsZSA9IDA7Ci0g ICAgZXJyb3IgPSBDTUdldFByb2ZpbGVCeUFWSUQoKENNRGlzcGxheUlEVHlwZSlrQ0dEaXJlY3RN YWluRGlzcGxheSwgJnByb2ZpbGUpOwotICAgIGlmICghZXJyb3IpIHsKLSAgICAgICAgVUludDMy IHNpemUgPSBzaXplb2YoQ01Qcm9maWxlTG9jYXRpb24pOwotICAgICAgICBlcnJvciA9IE5DTUdl dFByb2ZpbGVMb2NhdGlvbihwcm9maWxlLCAmc0luaXRpYWxQcm9maWxlTG9jYXRpb24sICZzaXpl KTsKLSAgICAgICAgQ01DbG9zZVByb2ZpbGUocHJvZmlsZSk7Ci0gICAgfQotICAgIGlmIChlcnJv cikgewotICAgICAgICBmcHJpbnRmKHN0ZGVyciwgIkZhaWxlZCB0byByZXRyaWV2ZSBjdXJyZW50 IGNvbG9yIHByb2ZpbGUgZm9yIG1haW4gZGlzcGxheSwgdGh1cyBpdCB3b24ndCBiZSBjaGFuZ2Vk LiAgTWFueSBwaXhlbCB0ZXN0cyBtYXkgZmFpbCBhcyBhIHJlc3VsdC4gIChFcnJvcjogJWkpXG4i LCBlcnJvcik7Ci0gICAgICAgIHNJbml0aWFsUHJvZmlsZUxvY2F0aW9uLmxvY1R5cGUgPSBjbU5v UHJvZmlsZUJhc2U7Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0gICAgCi0gICAgQ01Qcm9maWxl TG9jYXRpb24gbG9jYXRpb247Ci0gICAgbG9jYXRpb24ubG9jVHlwZSA9IGNtUGF0aEJhc2VkUHJv ZmlsZTsKLSAgICBzdHJjcHkobG9jYXRpb24udS5wYXRoTG9jLnBhdGgsIFBST0ZJTEVfUEFUSCk7 Ci0gICAgZXJyb3IgPSBDTVNldERldmljZVByb2ZpbGUoY21EaXNwbGF5RGV2aWNlQ2xhc3MsIChD TURldmljZUlEKWtDR0RpcmVjdE1haW5EaXNwbGF5LCAmc2NvcGUsIGNtRGVmYXVsdFByb2ZpbGVJ RCwgJmxvY2F0aW9uKTsKLSAgICBpZiAoZXJyb3IpIHsKLSAgICAgICAgZnByaW50ZihzdGRlcnIs ICJGYWlsZWQgdG8gc2V0IGNvbG9yIHByb2ZpbGUgZm9yIG1haW4gZGlzcGxheSEgIE1hbnkgcGl4 ZWwgdGVzdHMgbWF5IGZhaWwgYXMgYSByZXN1bHQuICAoRXJyb3I6ICVpKVxuIiwgZXJyb3IpOwot ICAgICAgICBzSW5pdGlhbFByb2ZpbGVMb2NhdGlvbi5sb2NUeXBlID0gY21Ob1Byb2ZpbGVCYXNl OwotICAgICAgICByZXR1cm47Ci0gICAgfQotICAgIAotICAgIC8vIE90aGVyIHNpZ25hbHMgYXJl IGhhbmRsZWQgaW4gaW5zdGFsbFNpZ25hbEhhbmRsZXJzKCkgd2hpY2ggYWxzbyBjYWxscyByZXN0 b3JlTWFpbkRpc3BsYXlDb2xvclByb2ZpbGUoKQotICAgIHNpZ25hbChTSUdJTlQsIHJlc3RvcmVN YWluRGlzcGxheUNvbG9yUHJvZmlsZSk7Ci0gICAgc2lnbmFsKFNJR0hVUCwgcmVzdG9yZU1haW5E aXNwbGF5Q29sb3JQcm9maWxlKTsKLSAgICBzaWduYWwoU0lHVEVSTSwgcmVzdG9yZU1haW5EaXNw bGF5Q29sb3JQcm9maWxlKTsKLX0KLQogc3RhdGljIFBhc3NSZWZQdHI8Qml0bWFwQ29udGV4dD4g Y3JlYXRlQml0bWFwQ29udGV4dChzaXplX3QgcGl4ZWxzV2lkZSwgc2l6ZV90IHBpeGVsc0hpZ2gs IHNpemVfdCYgcm93Qnl0ZXMsIHZvaWQqJiBidWZmZXIpCiB7CiAgICAgcm93Qnl0ZXMgPSAoNCAq IHBpeGVsc1dpZGUgKyA2MykgJiB+NjM7IC8vIFVzZSBhIG11bHRpcGxlIG9mIDY0IGJ5dGVzIHRv IGltcHJvdmUgQ0cgcGVyZm9ybWFuY2UKQEAgLTEwOSwxOSArNTIsOSBAQCBzdGF0aWMgUGFzc1Jl ZlB0cjxCaXRtYXBDb250ZXh0PiBjcmVhdGVCaXRtYXBDb250ZXh0KHNpemVfdCBwaXhlbHNXaWRl LCBzaXplX3QgcAogICAgIGlmICghYnVmZmVyKQogICAgICAgICByZXR1cm4gMDsKICAgICAKLSAg ICBzdGF0aWMgQ0dDb2xvclNwYWNlUmVmIGNvbG9yU3BhY2UgPSAwOwotICAgIGlmICghY29sb3JT cGFjZSkgewotICAgICAgICBDTVByb2ZpbGVMb2NhdGlvbiBsb2NhdGlvbjsKLSAgICAgICAgbG9j YXRpb24ubG9jVHlwZSA9IGNtUGF0aEJhc2VkUHJvZmlsZTsKLSAgICAgICAgc3RyY3B5KGxvY2F0 aW9uLnUucGF0aExvYy5wYXRoLCBQUk9GSUxFX1BBVEgpOwotICAgICAgICBDTVByb2ZpbGVSZWYg cHJvZmlsZTsKLSAgICAgICAgaWYgKENNT3BlblByb2ZpbGUoJnByb2ZpbGUsICZsb2NhdGlvbikg PT0gbm9FcnIpIHsKLSAgICAgICAgICAgIGNvbG9yU3BhY2UgPSBDR0NvbG9yU3BhY2VDcmVhdGVX aXRoUGxhdGZvcm1Db2xvclNwYWNlKHByb2ZpbGUpOwotICAgICAgICAgICAgQ01DbG9zZVByb2Zp bGUocHJvZmlsZSk7Ci0gICAgICAgIH0KLSAgICB9Ci0gICAgCi0gICAgQ0dDb250ZXh0UmVmIGNv bnRleHQgPSBDR0JpdG1hcENvbnRleHRDcmVhdGUoYnVmZmVyLCBwaXhlbHNXaWRlLCBwaXhlbHNI aWdoLCA4LCByb3dCeXRlcywgY29sb3JTcGFjZSwga0NHSW1hZ2VBbHBoYVByZW11bHRpcGxpZWRG aXJzdCB8IGtDR0JpdG1hcEJ5dGVPcmRlcjMySG9zdCk7IC8vIFVzZSBBUkdCOCBvbiBQUEMgb3Ig QkdSQTggb24gWDg2IHRvIGltcHJvdmUgQ0cgcGVyZm9ybWFuY2UKKyAgICAvLyBDcmVhdGluZyB0 aGlzIGJpdG1hcCBpbiB0aGUgZGV2aWNlIGNvbG9yIHNwYWNlIHNob3VsZCBwcmV2ZW50IGFueSBj b2xvciBjb252ZXJzaW9uIHdoZW4gdGhlIGltYWdlIG9mIHRoZSB3ZWIgdmlldyBpcyBkcmF3biBp bnRvIGl0LgorICAgIFJldGFpblB0cjxDR0NvbG9yU3BhY2VSZWY+IGNvbG9yU3BhY2UoQWRvcHRD RiwgQ0dDb2xvclNwYWNlQ3JlYXRlRGV2aWNlUkdCKCkpOworICAgIENHQ29udGV4dFJlZiBjb250 ZXh0ID0gQ0dCaXRtYXBDb250ZXh0Q3JlYXRlKGJ1ZmZlciwgcGl4ZWxzV2lkZSwgcGl4ZWxzSGln aCwgOCwgcm93Qnl0ZXMsIGNvbG9yU3BhY2UuZ2V0KCksIGtDR0ltYWdlQWxwaGFQcmVtdWx0aXBs aWVkRmlyc3QgfCBrQ0dCaXRtYXBCeXRlT3JkZXIzMkhvc3QpOyAvLyBVc2UgQVJHQjggb24gUFBD IG9yIEJHUkE4IG9uIFg4NiB0byBpbXByb3ZlIENHIHBlcmZvcm1hbmNlCiAgICAgaWYgKCFjb250 ZXh0KSB7CiAgICAgICAgIGZyZWUoYnVmZmVyKTsKICAgICAgICAgcmV0dXJuIDA7CkBAIC0yMDcs NyArMTQwLDcgQEAgUGFzc1JlZlB0cjxCaXRtYXBDb250ZXh0PiBjcmVhdGVCaXRtYXBDb250ZXh0 RnJvbVdlYlZpZXcoYm9vbCBvbnNjcmVlbiwgYm9vbCBpbmMKICAgICAgICAgICAgIFt2aWV3IGRp c3BsYXldOwogCiAgICAgICAgICAgICAvLyBBc2sgdGhlIHdpbmRvdyBzZXJ2ZXIgdG8gcHJvdmlk ZSB1cyBhIGNvbXBvc2l0ZWQgdmVyc2lvbiBvZiB0aGUgKnJlYWwqIHdpbmRvdyBjb250ZW50IGlu Y2x1ZGluZyBzdXJmYWNlcyAoaS5lLiBPcGVuR0wgY29udGVudCkKLSAgICAgICAgICAgIC8vIE5v dGUgdGhhdCB0aGUgcmV0dXJuZWQgaW1hZ2UgbWlnaHQgZGlmZmVyIHZlcnkgc2xpZ2h0bHkgZnJv bSB0aGUgd2luZG93IGJhY2tpbmcgYmVjYXVzZSBvZiBkaXRoZXJpbmcgYXJ0aWZhY3RzIGluIHRo ZSB3aW5kb3cgc2VydmVyIGNvbXBvc2l0b3IKKyAgICAgICAgICAgIC8vIE5vdGUgdGhhdCB0aGUg cmV0dXJuZWQgaW1hZ2UgbWlnaHQgZGlmZmVyIHZlcnkgc2xpZ2h0bHkgZnJvbSB0aGUgd2luZG93 IGJhY2tpbmcgYmVjYXVzZSBvZiBkaXRoZXJpbmcgYXJ0aWZhY3RzIGluIHRoZSB3aW5kb3cgc2Vy dmVyIGNvbXBvc2l0b3IuCiAgICAgICAgICAgICBDR0ltYWdlUmVmIGltYWdlID0gQ0dXaW5kb3dM aXN0Q3JlYXRlSW1hZ2UoQ0dSZWN0TnVsbCwga0NHV2luZG93TGlzdE9wdGlvbkluY2x1ZGluZ1dp bmRvdywgW1t2aWV3IHdpbmRvd10gd2luZG93TnVtYmVyXSwga0NHV2luZG93SW1hZ2VCb3VuZHNJ Z25vcmVGcmFtaW5nIHwga0NHV2luZG93SW1hZ2VTaG91bGRCZU9wYXF1ZSk7CiAgICAgICAgICAg ICBDR0NvbnRleHREcmF3SW1hZ2UoY29udGV4dCwgQ0dSZWN0TWFrZSgwLCAwLCBDR0ltYWdlR2V0 V2lkdGgoaW1hZ2UpLCBDR0ltYWdlR2V0SGVpZ2h0KGltYWdlKSksIGltYWdlKTsKICAgICAgICAg ICAgIENHSW1hZ2VSZWxlYXNlKGltYWdlKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RS dW5uZXIvY2cvVGVzdEludm9jYXRpb25DRy5jcHAgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL2Nn L1Rlc3RJbnZvY2F0aW9uQ0cuY3BwCmluZGV4IDYzMWEwMmVjNWFmOTBjMDVkMDY2YjczMzAwNGJi NWQ0OTBhNGMzZmEuLjc4Yjg3MTA1YjIzZjY1ODA5M2E3ZjhhODUzNGZkYjg2MGM3ZmM2YzIgMTAw NjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvY2cvVGVzdEludm9jYXRpb25DRy5jcHAK KysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9jZy9UZXN0SW52b2NhdGlvbkNHLmNwcApAQCAt NTksOSArNTksOSBAQCBzdGF0aWMgQ0dDb250ZXh0UmVmIGNyZWF0ZUNHQ29udGV4dEZyb21JbWFn ZShXS0ltYWdlUmVmIHdrSW1hZ2UsIEZsaXBHcmFwaGljc0NvbgogICAgIHNpemVfdCByb3dCeXRl cyA9ICg0ICogcGl4ZWxzV2lkZSArIDYzKSAmIH42MzsKICAgICB2b2lkKiBidWZmZXIgPSBjYWxs b2MocGl4ZWxzSGlnaCwgcm93Qnl0ZXMpOwogCi0gICAgQ0dDb2xvclNwYWNlUmVmIGNvbG9yU3Bh Y2UgPSBDR0NvbG9yU3BhY2VDcmVhdGVEZXZpY2VSR0IoKTsKLSAgICBDR0NvbnRleHRSZWYgY29u dGV4dCA9IENHQml0bWFwQ29udGV4dENyZWF0ZShidWZmZXIsIHBpeGVsc1dpZGUsIHBpeGVsc0hp Z2gsIDgsIHJvd0J5dGVzLCBjb2xvclNwYWNlLCBrQ0dJbWFnZUFscGhhUHJlbXVsdGlwbGllZEZp cnN0IHwga0NHQml0bWFwQnl0ZU9yZGVyMzJIb3N0KTsKLSAgICBDR0NvbG9yU3BhY2VSZWxlYXNl KGNvbG9yU3BhY2UpOworICAgIC8vIENyZWF0aW5nIHRoaXMgYml0bWFwIGluIHRoZSBkZXZpY2Ug Y29sb3Igc3BhY2Ugc2hvdWxkIHByZXZlbnQgYW55IGNvbG9yIGNvbnZlcnNpb24gd2hlbiB0aGUg aW1hZ2Ugb2YgdGhlIHdlYiB2aWV3IGlzIGRyYXduIGludG8gaXQuCisgICAgUmV0YWluUHRyPENH Q29sb3JTcGFjZVJlZj4gY29sb3JTcGFjZShBZG9wdENGLCBDR0NvbG9yU3BhY2VDcmVhdGVEZXZp Y2VSR0IoKSk7CisgICAgQ0dDb250ZXh0UmVmIGNvbnRleHQgPSBDR0JpdG1hcENvbnRleHRDcmVh dGUoYnVmZmVyLCBwaXhlbHNXaWRlLCBwaXhlbHNIaWdoLCA4LCByb3dCeXRlcywgY29sb3JTcGFj ZS5nZXQoKSwga0NHSW1hZ2VBbHBoYVByZW11bHRpcGxpZWRGaXJzdCB8IGtDR0JpdG1hcEJ5dGVP cmRlcjMySG9zdCk7CiAgICAgCiAgICAgaWYgKGZsaXAgPT0gRmxpcEdyYXBoaWNzQ29udGV4dCkg ewogICAgICAgICBDR0NvbnRleHRTYXZlR1N0YXRlKGNvbnRleHQpOwpAQCAtOTUsMTUgKzk1LDE0 IEBAIHZvaWQgY29tcHV0ZU1ENUhhc2hTdHJpbmdGb3JDb250ZXh0KENHQ29udGV4dFJlZiBiaXRt YXBDb250ZXh0LCBjaGFyIGhhc2hTdHJpbmdbCiAgICAgICAgICAgICBtZDUuYWRkQnl0ZXMoYnVm ZmVyKTsKICAgICAgICAgICAgIGJpdG1hcERhdGEgKz0gYnl0ZXNQZXJSb3c7CiAgICAgICAgIH0K LSAgICB9IGVsc2UgeworICAgIH0gZWxzZQogI2VuZGlmCisgICAgewogICAgICAgICBmb3IgKHVu c2lnbmVkIHJvdyA9IDA7IHJvdyA8IHBpeGVsc0hpZ2g7IHJvdysrKSB7CiAgICAgICAgICAgICBt ZDUuYWRkQnl0ZXMoYml0bWFwRGF0YSwgNCAqIHBpeGVsc1dpZGUpOwogICAgICAgICAgICAgYml0 bWFwRGF0YSArPSBieXRlc1BlclJvdzsKICAgICAgICAgfQotI2lmIFBMQVRGT1JNKE1BQykKICAg ICB9Ci0jZW5kaWYKIAogICAgIFZlY3Rvcjx1aW50OF90LCAxNj4gaGFzaDsKICAgICBtZDUuY2hl Y2tzdW0oaGFzaCk7CmRpZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL21hYy9QbGF0 Zm9ybVdlYlZpZXdNYWMubW0gYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL21hYy9QbGF0Zm9ybVdl YlZpZXdNYWMubW0KaW5kZXggNjMxNzc5MDcyNzdhZjUzY2QyM2I0NmNiYjhjNzA1ZTA4OTQzYTIy My4uZWI3ZTk4YjQxNzk1ZjYyMmE2OTU3NGZjMTViNDljZTdjNDU4OWM0OSAxMDA2NDQKLS0tIGEv VG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9tYWMvUGxhdGZvcm1XZWJWaWV3TWFjLm1tCisrKyBiL1Rv b2xzL1dlYktpdFRlc3RSdW5uZXIvbWFjL1BsYXRmb3JtV2ViVmlld01hYy5tbQpAQCAtNTYsNyAr NTYsNyBAQCBQbGF0Zm9ybVdlYlZpZXc6OlBsYXRmb3JtV2ViVmlldyhXS0NvbnRleHRSZWYgY29u dGV4dFJlZiwgV0tQYWdlR3JvdXBSZWYgcGFnZUdybwogICAgIE5TUmVjdCB3aW5kb3dSZWN0ID0g TlNPZmZzZXRSZWN0KHJlY3QsIC0xMDAwMCwgWyhOU1NjcmVlbiAqKVtbTlNTY3JlZW4gc2NyZWVu c10gb2JqZWN0QXRJbmRleDowXSBmcmFtZV0uc2l6ZS5oZWlnaHQgLSByZWN0LnNpemUuaGVpZ2h0 ICsgMTAwMDApOwogICAgIG1fd2luZG93ID0gW1tXZWJLaXRUZXN0UnVubmVyV2luZG93IGFsbG9j XSBpbml0V2l0aENvbnRlbnRSZWN0OndpbmRvd1JlY3Qgc3R5bGVNYXNrOk5TQm9yZGVybGVzc1dp bmRvd01hc2sgYmFja2luZzpOU0JhY2tpbmdTdG9yZUJ1ZmZlcmVkIGRlZmVyOllFU107CiAgICAg bV93aW5kb3cucGxhdGZvcm1XZWJWaWV3ID0gdGhpczsKLSAgICBbbV93aW5kb3cgc2V0Q29sb3JT cGFjZTpbTlNDb2xvclNwYWNlIGdlbmVyaWNSR0JDb2xvclNwYWNlXV07CisgICAgW21fd2luZG93 IHNldENvbG9yU3BhY2U6W1tOU1NjcmVlbiBtYWluU2NyZWVuXSBjb2xvclNwYWNlXV07CiAgICAg W1ttX3dpbmRvdyBjb250ZW50Vmlld10gYWRkU3VidmlldzptX3ZpZXddOwogICAgIFttX3dpbmRv dyBvcmRlckJhY2s6bmlsXTsKICAgICBbbV93aW5kb3cgc2V0UmVsZWFzZWRXaGVuQ2xvc2VkOk5P XTsKQEAgLTEzMiw2ICsxMzIsOSBAQCBXS1JldGFpblB0cjxXS0ltYWdlUmVmPiBQbGF0Zm9ybVdl YlZpZXc6OndpbmRvd1NuYXBzaG90SW1hZ2UoKQogewogICAgIFttX3ZpZXcgZGlzcGxheV07CiAg ICAgUmV0YWluUHRyPENHSW1hZ2VSZWY+IHdpbmRvd1NuYXBzaG90SW1hZ2UoQWRvcHRDRiwgQ0dX aW5kb3dMaXN0Q3JlYXRlSW1hZ2UoQ0dSZWN0TnVsbCwga0NHV2luZG93TGlzdE9wdGlvbkluY2x1 ZGluZ1dpbmRvdywgW21fd2luZG93IHdpbmRvd051bWJlcl0sIGtDR1dpbmRvd0ltYWdlQm91bmRz SWdub3JlRnJhbWluZyB8IGtDR1dpbmRvd0ltYWdlU2hvdWxkQmVPcGFxdWUpKTsKKyAgICAKKyAg ICAvLyB3aW5kb3dTbmFwc2hvdEltYWdlIHdpbGwgYmUgaW4gdGhlIGRpc3BsYXkncyBjb2xvciBz cGFjZSwgYnV0IFdLSW1hZ2VDcmVhdGVGcm9tQ0dJbWFnZSgpIHdpbGwgZHJhdworICAgIC8vIHRo aXMgaW1hZ2UgaW50byBhIEdlbmVyaWNSR0IgYml0bWFwIGNvbnRleHQsIHNvIHRoZSByZXR1cm5l ZCBpbWFnZSBpcyBHZW5lcmljUkdCLgogICAgIHJldHVybiBhZG9wdFdLKFdLSW1hZ2VDcmVhdGVG cm9tQ0dJbWFnZSh3aW5kb3dTbmFwc2hvdEltYWdlLmdldCgpLCAwKSk7CiB9CiAK