123520 2013-10-30 11:44:49 -0700 REGRESSION(r158243): Change was wrong (Requested by smfr on #webkit). 2013-10-30 11:51:42 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 123310 1 commit-queue commit-queue mmaxfield simon.fraser oldest_to_newest 945076 0 commit-queue 2013-10-30 11:44:49 -0700 http://trac.webkit.org/changeset/158243 broke the build: Change was wrong (Requested by smfr on #webkit). This is an automatic bug report generated by webkitbot. If this bug report was created because of a flaky test, please file a bug for the flaky test (if we don't already have one on file) and dup this bug against that bug so that we can track how often these flaky tests fail. 945078 1 215540 commit-queue 2013-10-30 11:45:05 -0700 Created attachment 215540 ROLLOUT of r158243 Any committer can land this patch automatically by marking it commit-queue+. The commit-queue will build and test the patch before landing to ensure that the rollout will be successful. This process takes approximately 15 minutes. If you would like to land the rollout faster, you can use the following command: webkit-patch land-attachment ATTACHMENT_ID where ATTACHMENT_ID is the ID of this attachment. 945080 2 simon.fraser 2013-10-30 11:46:16 -0700 *** Bug 123519 has been marked as a duplicate of this bug. *** 945082 3 215540 commit-queue 2013-10-30 11:47:44 -0700 Comment on attachment 215540 ROLLOUT of r158243 Clearing flags on attachment: 215540 Committed r158294: <http://trac.webkit.org/changeset/158294> 945083 4 commit-queue 2013-10-30 11:47:47 -0700 All reviewed patches have been landed. Closing bug. 945091 5 simon.fraser 2013-10-30 11:51:42 -0700 The change was wrong because it made code that should have been CG-specific cross-platform. 215540 2013-10-30 11:45:05 -0700 2013-10-30 11:47:44 -0700 ROLLOUT of r158243 bug-123520-20131030114504.patch text/plain 15582 commit-queue U3VidmVyc2lvbiBSZXZpc2lvbjogMTU4MjkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmFiYzQ1NGY0YjA0N2Vh MjQ0NGNiZDRlY2NjNDdjMjA4YjE1YTgxMS4uMTdhMWZlZjZmZTMzZmU3YjRkZTMzZDhiZmQzNTc3 MTk1OTg5MzY1MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEzLTEwLTMwICBDb21t aXQgUXVldWUgIDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KKworICAgICAgICBVbnJldmlld2Vk LCByb2xsaW5nIG91dCByMTU4MjQzLgorICAgICAgICBodHRwOi8vdHJhYy53ZWJraXQub3JnL2No YW5nZXNldC8xNTgyNDMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTEyMzUyMAorCisgICAgICAgIENoYW5nZSB3YXMgd3JvbmcgKFJlcXVlc3RlZCBieSBz bWZyIG9uICN3ZWJraXQpLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3ND b250ZXh0Lmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJyeS9QYXRoQmxh Y2tCZXJyeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OmRyYXdMaW5l Rm9yVGV4dCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vR3JhcGhpY3NDb250 ZXh0Q2Fpcm8uY3BwOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpkcmF3TGlu ZUZvclRleHQpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NnL0dyYXBoaWNzQ29udGV4 dENHLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDo6ZHJhd0xpbmVGb3JU ZXh0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy93aW5jZS9HcmFwaGljc0NvbnRleHRX aW5DRS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OmRyYXdMaW5lRm9y VGV4dCk6CisgICAgICAgICogcGxhdGZvcm0vd2luL1dlYkNvcmVUZXh0UmVuZGVyZXIuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6ZG9EcmF3VGV4dEF0UG9pbnQpOgorICAgICAgICAqIHJlbmRlcmlu Zy9JbmxpbmVUZXh0Qm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OklubGluZVRleHRCb3g6OnBh aW50RGVjb3JhdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpJbmxpbmVUZXh0Qm94OjpwYWludENv bXBvc2l0aW9uVW5kZXJsaW5lKToKKwogMjAxMy0xMC0zMCAgcGVhdm9Ab3V0bG9vay5jb20gIDxw ZWF2b0BvdXRsb29rLmNvbT4KIAogICAgICAgICBGYXZpY29ucyBhcmUgZmxpcHBlZCBpbiB2ZXJ0 aWNhbCBkaXJlY3Rpb24gaW4gV2luQ2Fpcm8gYnVpbGRzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmggYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuaAppbmRleCAwMzllZWZmMTcxNjUy N2QzNjRjOWRlZGNhODEzNWEzNjBjNGM2Yzc5Li5jMzA4Y2JkMGI3ZDg1NGYzZDhlYjBiZWZkM2E5 ZjNmNGQ0YTc5N2E4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9HcmFwaGljc0NvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9HcmFwaGljc0NvbnRleHQuaApAQCAtMzMwLDcgKzMzMCw3IEBAIG5hbWVzcGFjZSBXZWJDb3Jl IHsKICAgICAgICAgfTsKICAgICAgICAgRmxvYXRSZWN0IHJvdW5kVG9EZXZpY2VQaXhlbHMoY29u c3QgRmxvYXRSZWN0JiwgUm91bmRpbmdNb2RlID0gUm91bmRBbGxTaWRlcyk7CiAKLSAgICAgICAg dm9pZCBkcmF3TGluZUZvclRleHQoY29uc3QgRmxvYXRSZWN0JiBib3VuZHMsIGJvb2wgcHJpbnRp bmcpOworICAgICAgICB2b2lkIGRyYXdMaW5lRm9yVGV4dChjb25zdCBGbG9hdFBvaW50JiwgZmxv YXQgd2lkdGgsIGJvb2wgcHJpbnRpbmcpOwogICAgICAgICBlbnVtIERvY3VtZW50TWFya2VyTGlu ZVN0eWxlIHsKICAgICAgICAgICAgIERvY3VtZW50TWFya2VyU3BlbGxpbmdMaW5lU3R5bGUsCiAg ICAgICAgICAgICBEb2N1bWVudE1hcmtlckdyYW1tYXJMaW5lU3R5bGUsCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L1BhdGhCbGFja0JlcnJ5 LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkvUGF0aEJs YWNrQmVycnkuY3BwCmluZGV4IGZhZWM2OGJkZTVjYzY2ZmYyMTFmZmVhNzE1OGI0MzRlNDQ2Zjk3 MjQuLmFjNmQ2YmE2NGRmZmNhMGExNTZmYWY4MDBiOTdjZGRkZDg5ZDU0ZTYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkvUGF0aEJsYWNrQmVy cnkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkv UGF0aEJsYWNrQmVycnkuY3BwCkBAIC0yNjMsMTIgKzI2MywxMiBAQCB2b2lkIEdyYXBoaWNzQ29u dGV4dDo6ZHJhd0xpbmVGb3JEb2N1bWVudE1hcmtlcihjb25zdCBGbG9hdFBvaW50JiBwdCwgZmxv YXQgd2lkdAogICAgIHBsYXRmb3JtQ29udGV4dCgpLT5hZGREcmF3TGluZUZvckRvY3VtZW50TWFy a2VyKHB0LCB3aWR0aCwgKEJsYWNrQmVycnk6OlBsYXRmb3JtOjpHcmFwaGljczo6RG9jdW1lbnRN YXJrZXJMaW5lU3R5bGUpc3R5bGUpOwogfQogCi12b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0xp bmVGb3JUZXh0KGNvbnN0IEZsb2F0UmVjdCYgYm91bmRzLCBib29sIHByaW50aW5nKQordm9pZCBH cmFwaGljc0NvbnRleHQ6OmRyYXdMaW5lRm9yVGV4dChjb25zdCBGbG9hdFBvaW50JiBwdCwgZmxv YXQgd2lkdGgsIGJvb2wgcHJpbnRpbmcpCiB7CiAgICAgaWYgKHBhaW50aW5nRGlzYWJsZWQoKSkK ICAgICAgICAgcmV0dXJuOwogCi0gICAgcGxhdGZvcm1Db250ZXh0KCktPmFkZERyYXdMaW5lRm9y VGV4dChib3VuZHMubG9jYXRpb24sIGJvdW5kcy53aWR0aCgpLCBwcmludGluZyk7CisgICAgcGxh dGZvcm1Db250ZXh0KCktPmFkZERyYXdMaW5lRm9yVGV4dChwdCwgd2lkdGgsIHByaW50aW5nKTsK IH0KIAogLy8gRklYTUU6IGRvbid0IGlnbm9yZSB0aGUgd2luZGluZyBydWxlLiBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA3MDY0CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9HcmFwaGljc0NvbnRleHRDYWlyby5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9HcmFwaGljc0NvbnRleHRD YWlyby5jcHAKaW5kZXggYTcxYjE0NWI0M2NkYTVhZDcyNjEyZjI0ODFlYjE3OTRjOWVlMmJhNC4u NzAzNjBlZDdlYzg3NTJlNjA0MmVmYmM0ZjM4ODcxOWY0ZjIxYzEwYSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vR3JhcGhpY3NDb250ZXh0Q2Fpcm8u Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0dyYXBoaWNz Q29udGV4dENhaXJvLmNwcApAQCAtNjE0LDcgKzYxNCw3IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0 OjpkcmF3Rm9jdXNSaW5nKGNvbnN0IFZlY3RvcjxJbnRSZWN0PiYgcmVjdHMsIGludCB3aWR0aCwg aW50CiAgICAgY2Fpcm9fcmVzdG9yZShjcik7CiB9CiAKLXZvaWQgR3JhcGhpY3NDb250ZXh0Ojpk cmF3TGluZUZvclRleHQoY29uc3QgRmxvYXRSZWN0JiBib3VuZHMsIGJvb2wpCit2b2lkIEdyYXBo aWNzQ29udGV4dDo6ZHJhd0xpbmVGb3JUZXh0KGNvbnN0IEZsb2F0UG9pbnQmIG9yaWdpbiwgZmxv YXQgd2lkdGgsIGJvb2wpCiB7CiAgICAgaWYgKHBhaW50aW5nRGlzYWJsZWQoKSkKICAgICAgICAg cmV0dXJuOwpAQCAtNjIzLDE2ICs2MjMsMTYgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6OmRyYXdM aW5lRm9yVGV4dChjb25zdCBGbG9hdFJlY3QmIGJvdW5kcywgYm9vbCkKICAgICBjYWlyb19zYXZl KGNhaXJvQ29udGV4dCk7CiAKICAgICAvLyBUaGlzIGJ1bXBpbmcgb2YgPDEgc3Ryb2tlIHRoaWNr bmVzc2VzIG1hdGNoZXMgdGhlIG9uZSBpbiBkcmF3TGluZU9uQ2Fpcm9Db250ZXh0LgotICAgIEZs b2F0UG9pbnQgZW5kUG9pbnQoYm91bmRzLmxvY2F0aW9uKCkgKyBJbnRTaXplKGJvdW5kcy53aWR0 aCgpLCAwKSk7Ci0gICAgRmxvYXRSZWN0IGxpbmVFeHRlbnRzKGJvdW5kcy5sb2NhdGlvbigpLCBG bG9hdFNpemUoYm91bmRzLndpZHRoKCksIHN0cm9rZVRoaWNrbmVzcygpKSk7CisgICAgRmxvYXRQ b2ludCBlbmRQb2ludChvcmlnaW4gKyBJbnRTaXplKHdpZHRoLCAwKSk7CisgICAgRmxvYXRSZWN0 IGxpbmVFeHRlbnRzKG9yaWdpbiwgRmxvYXRTaXplKHdpZHRoLCBzdHJva2VUaGlja25lc3MoKSkp OwogCiAgICAgU2hhZG93Qmx1ciYgc2hhZG93ID0gcGxhdGZvcm1Db250ZXh0KCktPnNoYWRvd0Js dXIoKTsKICAgICBpZiAoR3JhcGhpY3NDb250ZXh0KiBzaGFkb3dDb250ZXh0ID0gc2hhZG93LmJl Z2luU2hhZG93TGF5ZXIodGhpcywgbGluZUV4dGVudHMpKSB7Ci0gICAgICAgIGRyYXdMaW5lT25D YWlyb0NvbnRleHQodGhpcywgc2hhZG93Q29udGV4dC0+cGxhdGZvcm1Db250ZXh0KCktPmNyKCks IGJvdW5kcy5sb2NhdGlvbigpLCBlbmRQb2ludCk7CisgICAgICAgIGRyYXdMaW5lT25DYWlyb0Nv bnRleHQodGhpcywgc2hhZG93Q29udGV4dC0+cGxhdGZvcm1Db250ZXh0KCktPmNyKCksIG9yaWdp biwgZW5kUG9pbnQpOwogICAgICAgICBzaGFkb3cuZW5kU2hhZG93TGF5ZXIodGhpcyk7CiAgICAg fQogCi0gICAgZHJhd0xpbmVPbkNhaXJvQ29udGV4dCh0aGlzLCBjYWlyb0NvbnRleHQsIGJvdW5k cy5sb2NhdGlvbigpLCBlbmRQb2ludCk7CisgICAgZHJhd0xpbmVPbkNhaXJvQ29udGV4dCh0aGlz LCBjYWlyb0NvbnRleHQsIG9yaWdpbiwgZW5kUG9pbnQpOwogICAgIGNhaXJvX3Jlc3RvcmUoY2Fp cm9Db250ZXh0KTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2cvR3JhcGhpY3NDb250ZXh0Q0cuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2cvR3JhcGhpY3NDb250ZXh0Q0cuY3BwCmluZGV4IGU3NTI5M2QzN2Q4NTM4Y2Ew YzliNjJmNGVkZGVjODNkYzExNzAwYjcuLjFhOWM5MDU1ZTZjOTIwM2ZiNTQwMzk5MWJlYmI3NGNl OTgzZWQ1NWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nn L0dyYXBoaWNzQ29udGV4dENHLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jZy9HcmFwaGljc0NvbnRleHRDRy5jcHAKQEAgLTEyMzUsMTYgKzEyMzUsNTMgQEAgRmxv YXRSZWN0IEdyYXBoaWNzQ29udGV4dDo6cm91bmRUb0RldmljZVBpeGVscyhjb25zdCBGbG9hdFJl Y3QmIHJlY3QsIFJvdW5kaW5nTW8KICAgICByZXR1cm4gRmxvYXRSZWN0KHJvdW5kZWRPcmlnaW4s IHJvdW5kZWRMb3dlclJpZ2h0IC0gcm91bmRlZE9yaWdpbik7CiB9CiAKLXZvaWQgR3JhcGhpY3ND b250ZXh0OjpkcmF3TGluZUZvclRleHQoY29uc3QgRmxvYXRSZWN0JiBib3VuZHMsIGJvb2wpCit2 b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0xpbmVGb3JUZXh0KGNvbnN0IEZsb2F0UG9pbnQmIHBv aW50LCBmbG9hdCB3aWR0aCwgYm9vbCBwcmludGluZykKIHsKICAgICBpZiAocGFpbnRpbmdEaXNh YmxlZCgpKQogICAgICAgICByZXR1cm47CiAKKyAgICBpZiAod2lkdGggPD0gMCkKKyAgICAgICAg cmV0dXJuOworCisgICAgZmxvYXQgeCA9IHBvaW50LngoKTsKKyAgICBmbG9hdCB5ID0gcG9pbnQu eSgpOworICAgIGZsb2F0IGxpbmVMZW5ndGggPSB3aWR0aDsKKworICAgIC8vIFVzZSBhIG1pbmlt dW0gdGhpY2tuZXNzIG9mIDAuNSBpbiB1c2VyIHNwYWNlLgorICAgIC8vIFNlZSBodHRwOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MjU1IGZvciBkZXRhaWxzIG9mIHdoeSAwLjUg aXMgdGhlIHJpZ2h0IG1pbmltdW0gdGhpY2tuZXNzIHRvIHVzZS4KKyAgICBmbG9hdCB0aGlja25l c3MgPSBtYXgoc3Ryb2tlVGhpY2tuZXNzKCksIDAuNWYpOworCisgICAgYm9vbCByZXN0b3JlQW50 aWFsaWFzTW9kZSA9IGZhbHNlOworCisgICAgaWYgKCFwcmludGluZyAmJiBnZXRDVE0oR3JhcGhp Y3NDb250ZXh0OjpEZWZpbml0ZWx5SW5jbHVkZURldmljZVNjYWxlKS5wcmVzZXJ2ZXNBeGlzQWxp Z25tZW50KCkpIHsKKyAgICAgICAgLy8gT24gc2NyZWVuLCB1c2UgYSBtaW5pbXVtIHRoaWNrbmVz cyBvZiAxLjAgaW4gdXNlciBzcGFjZSAobGF0ZXIgcm91bmRlZCB0byBhbiBpbnRlZ3JhbCBudW1i ZXIgaW4gZGV2aWNlIHNwYWNlKS4KKyAgICAgICAgZmxvYXQgYWRqdXN0ZWRUaGlja25lc3MgPSBt YXgodGhpY2tuZXNzLCAxLjBmKTsKKworICAgICAgICAvLyBGSVhNRTogVGhpcyBzaG91bGQgYmUg ZG9uZSBhIGJldHRlciB3YXkuCisgICAgICAgIC8vIFdlIHRyeSB0byByb3VuZCBhbGwgcGFyYW1l dGVycyB0byBpbnRlZ2VyIGJvdW5kYXJpZXMgaW4gZGV2aWNlIHNwYWNlLiBJZiByb3VuZGluZyBw aXhlbHMgaW4gZGV2aWNlIHNwYWNlCisgICAgICAgIC8vIG1ha2VzIG91ciB0aGlja25lc3MgbW9y ZSB0aGFuIGRvdWJsZSwgdGhlbiB0aGVyZSBtdXN0IGJlIGEgc2hyaW5raW5nLXNjYWxlIGZhY3Rv ciBhbmQgcm91bmRpbmcgdG8gcGl4ZWxzCisgICAgICAgIC8vIGluIGRldmljZSBzcGFjZSB3aWxs IG1ha2UgdGhlIHVuZGVybGluZXMgdG9vIHRoaWNrLgorICAgICAgICBDR1JlY3QgbGluZVJlY3Qg PSByb3VuZFRvRGV2aWNlUGl4ZWxzKEZsb2F0UmVjdCh4LCB5LCBsaW5lTGVuZ3RoLCBhZGp1c3Rl ZFRoaWNrbmVzcyksIFJvdW5kQWxsU2lkZXMpOworICAgICAgICBpZiAobGluZVJlY3Quc2l6ZS5o ZWlnaHQgPCB0aGlja25lc3MgKiAyLjApIHsKKyAgICAgICAgICAgIHggPSBsaW5lUmVjdC5vcmln aW4ueDsKKyAgICAgICAgICAgIHkgPSBsaW5lUmVjdC5vcmlnaW4ueTsKKyAgICAgICAgICAgIGxp bmVMZW5ndGggPSBsaW5lUmVjdC5zaXplLndpZHRoOworICAgICAgICAgICAgdGhpY2tuZXNzID0g bGluZVJlY3Quc2l6ZS5oZWlnaHQ7CisgICAgICAgICAgICBpZiAoc2hvdWxkQW50aWFsaWFzKCkp IHsKKyAgICAgICAgICAgICAgICBDR0NvbnRleHRTZXRTaG91bGRBbnRpYWxpYXMocGxhdGZvcm1D b250ZXh0KCksIGZhbHNlKTsKKyAgICAgICAgICAgICAgICByZXN0b3JlQW50aWFsaWFzTW9kZSA9 IHRydWU7CisgICAgICAgICAgICB9CisgICAgICAgIH0KKyAgICB9CisKICAgICBpZiAoZmlsbENv bG9yKCkgIT0gc3Ryb2tlQ29sb3IoKSkKICAgICAgICAgc2V0Q0dGaWxsQ29sb3IocGxhdGZvcm1D b250ZXh0KCksIHN0cm9rZUNvbG9yKCksIHN0cm9rZUNvbG9yU3BhY2UoKSk7Ci0gICAgQ0dDb250 ZXh0RmlsbFJlY3QocGxhdGZvcm1Db250ZXh0KCksIENHUmVjdE1ha2UoYm91bmRzLmxvY2F0aW9u KCkueCgpLCBib3VuZHMubG9jYXRpb24oKS55KCksIGJvdW5kcy53aWR0aCgpLCBib3VuZHMuaGVp Z2h0KCkpKTsKKyAgICBDR0NvbnRleHRGaWxsUmVjdChwbGF0Zm9ybUNvbnRleHQoKSwgQ0dSZWN0 TWFrZSh4LCB5LCBsaW5lTGVuZ3RoLCB0aGlja25lc3MpKTsKICAgICBpZiAoZmlsbENvbG9yKCkg IT0gc3Ryb2tlQ29sb3IoKSkKICAgICAgICAgc2V0Q0dGaWxsQ29sb3IocGxhdGZvcm1Db250ZXh0 KCksIGZpbGxDb2xvcigpLCBmaWxsQ29sb3JTcGFjZSgpKTsKKworICAgIGlmIChyZXN0b3JlQW50 aWFsaWFzTW9kZSkKKyAgICAgICAgQ0dDb250ZXh0U2V0U2hvdWxkQW50aWFsaWFzKHBsYXRmb3Jt Q29udGV4dCgpLCB0cnVlKTsKIH0KIAogdm9pZCBHcmFwaGljc0NvbnRleHQ6OnNldFVSTEZvclJl Y3QoY29uc3QgVVJMJiBsaW5rLCBjb25zdCBJbnRSZWN0JiBkZXN0UmVjdCkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbmNlL0dyYXBoaWNzQ29udGV4dFdp bkNFLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbmNlL0dyYXBoaWNz Q29udGV4dFdpbkNFLmNwcAppbmRleCAxNTdmYWU0OGE3OWRkMzNiMGUyNzg2MWMyMzg5M2FhNGRm OGIxZjk4Li4xZmYzZmFlMWFkOTMyNTA1MDRkYWVhYjU3NzQwYWYxZjc4YTY4MWNmIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW5jZS9HcmFwaGljc0NvbnRl eHRXaW5DRS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luY2Uv R3JhcGhpY3NDb250ZXh0V2luQ0UuY3BwCkBAIC05NTAsMTQgKzk1MCwxNCBAQCB2b2lkIEdyYXBo aWNzQ29udGV4dDo6ZHJhd0ZvY3VzUmluZyhjb25zdCBWZWN0b3I8SW50UmVjdD4mIHJlY3RzLCBp bnQgd2lkdGgsIGludAogICAgIERyYXdGb2N1c1JlY3QoZGMsICZyZWN0KTsKIH0KIAotdm9pZCBH cmFwaGljc0NvbnRleHQ6OmRyYXdMaW5lRm9yVGV4dChjb25zdCBGbG9hdFJlY3QmIGJvdW5kcywg Ym9vbCkKK3ZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3TGluZUZvclRleHQoY29uc3QgRmxvYXRQ b2ludCYgb3JpZ2luLCBmbG9hdCB3aWR0aCwgYm9vbCBwcmludGluZykKIHsKICAgICBpZiAocGFp bnRpbmdEaXNhYmxlZCgpKQogICAgICAgICByZXR1cm47CiAKICAgICBTdHJva2VTdHlsZSBvbGRT dHlsZSA9IHN0cm9rZVN0eWxlKCk7CiAgICAgc2V0U3Ryb2tlU3R5bGUoU29saWRTdHJva2UpOwot ICAgIGRyYXdMaW5lKHJvdW5kZWRJbnRQb2ludChib3VuZHMubG9jYXRpb24oKSksIHJvdW5kZWRJ bnRQb2ludChib3VuZHMubG9jYXRpb24oKSArIEZsb2F0U2l6ZShib3VuZHMud2lkdGgoKSwgMCkp KTsKKyAgICBkcmF3TGluZShyb3VuZGVkSW50UG9pbnQob3JpZ2luKSwgcm91bmRlZEludFBvaW50 KG9yaWdpbiArIEZsb2F0U2l6ZSh3aWR0aCwgMCkpKTsKICAgICBzZXRTdHJva2VTdHlsZShvbGRT dHlsZSk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dpbi9XZWJD b3JlVGV4dFJlbmRlcmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dpbi9XZWJDb3Jl VGV4dFJlbmRlcmVyLmNwcAppbmRleCAzZDAwN2NmZjljNjkzOTJhOGQ3NmI4OWRiOGViOWNlZTNh MzQyZjg1Li5mNTQwZmZiZjAyMTk3ZTQxYTc3NjNiYWFmYWQ4OTViY2Y0MDBlZjNhIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93aW4vV2ViQ29yZVRleHRSZW5kZXJlci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vd2luL1dlYkNvcmVUZXh0UmVuZGVyZXIuY3Bw CkBAIC03Niw4ICs3Niw3IEBAIHN0YXRpYyB2b2lkIGRvRHJhd1RleHRBdFBvaW50KEdyYXBoaWNz Q29udGV4dCYgY29udGV4dCwgY29uc3QgU3RyaW5nJiB0ZXh0LCBjb25zCiAgICAgICAgIHVuZGVy bGluZVBvaW50Lm1vdmUoYmVmb3JlV2lkdGgsIDEpOwogCiAgICAgICAgIGNvbnRleHQuc2V0U3Ry b2tlQ29sb3IoY29sb3IsIENvbG9yU3BhY2VEZXZpY2VSR0IpOwotICAgICAgICBGbG9hdFJlY3Qg Ym91bmRzKHVuZGVybGluZVBvaW50LCBGbG9hdFNpemUodW5kZXJsaW5lZFdpZHRoLCBjb250ZXh0 LnN0cm9rZVRoaWNrbmVzcygpKSk7Ci0gICAgICAgIGNvbnRleHQuZHJhd0xpbmVGb3JUZXh0KGJv dW5kcywgZmFsc2UpOworICAgICAgICBjb250ZXh0LmRyYXdMaW5lRm9yVGV4dCh1bmRlcmxpbmVQ b2ludCwgdW5kZXJsaW5lZFdpZHRoLCBmYWxzZSk7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lVGV4dEJveC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvSW5saW5lVGV4dEJveC5jcHAKaW5kZXggOWY3YWQ5YmRjNDBlODJkODMwYmVh NDYyYmU4ZDkyY2EzODNkMDE4Yi4uOTVhN2NhZWM1MDJhNDk2YjhhNzYwNzg1NmY2NjA5NTNiYzRm ZjNjZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZVRleHRCb3gu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVUZXh0Qm94LmNwcApAQCAt NjcsNDkgKzY3LDYgQEAgQ09NUElMRV9BU1NFUlQoc2l6ZW9mKElubGluZVRleHRCb3gpID09IHNp emVvZihTYW1lU2l6ZUFzSW5saW5lVGV4dEJveCksIElubGluZVQKIHR5cGVkZWYgV1RGOjpIYXNo TWFwPGNvbnN0IElubGluZVRleHRCb3gqLCBMYXlvdXRSZWN0PiBJbmxpbmVUZXh0Qm94T3ZlcmZs b3dNYXA7CiBzdGF0aWMgSW5saW5lVGV4dEJveE92ZXJmbG93TWFwKiBnVGV4dEJveGVzV2l0aE92 ZXJmbG93OwogCi1zdGF0aWMgRmxvYXRSZWN0IGNvbXB1dGVCb3VuZHNGb3JVbmRlcmxpbmUoR3Jh cGhpY3NDb250ZXh0JiBjb250ZXh0LCBjb25zdCBGbG9hdFBvaW50JiB0b3BsZWZ0LCBmbG9hdCBs ZW5ndGgsIGJvb2wgcHJpbnRpbmcsIGJvb2wmIHNob3VsZEFudGlhbGlhcykKLXsKLSAgICBmbG9h dCB0aGlja25lc3MgPSBzdGQ6Om1heChjb250ZXh0LnN0cm9rZVRoaWNrbmVzcygpLCAwLjVmKTsK LSAgICAKLSAgICBGbG9hdFJlY3QgYm91bmRzKHRvcGxlZnQsIEZsb2F0U2l6ZShsZW5ndGgsIHRo aWNrbmVzcykpOwotCi0gICAgc2hvdWxkQW50aWFsaWFzID0gdHJ1ZTsKLSAgICAKLSAgICBpZiAo cHJpbnRpbmcgfHwgY29udGV4dC5wYWludGluZ0Rpc2FibGVkKCkgfHwgIWNvbnRleHQuZ2V0Q1RN KEdyYXBoaWNzQ29udGV4dDo6RGVmaW5pdGVseUluY2x1ZGVEZXZpY2VTY2FsZSkucHJlc2VydmVz QXhpc0FsaWdubWVudCgpKQotICAgICAgICByZXR1cm4gYm91bmRzOwotCi0gICAgLy8gT24gc2Ny ZWVuLCB1c2UgYSBtaW5pbXVtIHRoaWNrbmVzcyBvZiAxLjAgaW4gdXNlciBzcGFjZSAobGF0ZXIg cm91bmRlZCB0byBhbiBpbnRlZ3JhbCBudW1iZXIgaW4gZGV2aWNlIHNwYWNlKS4KLSAgICBGbG9h dFJlY3QgYWRqdXN0ZWRCb3VuZHMgPSBib3VuZHM7Ci0gICAgYWRqdXN0ZWRCb3VuZHMuc2V0SGVp Z2h0KHN0ZDo6bWF4KHRoaWNrbmVzcywgMS4wZikpOwotCi0gICAgLy8gRklYTUU6IFRoaXMgc2hv dWxkIGJlIGRvbmUgYSBiZXR0ZXIgd2F5LgotICAgIC8vIFdlIHRyeSB0byByb3VuZCBhbGwgcGFy YW1ldGVycyB0byBpbnRlZ2VyIGJvdW5kYXJpZXMgaW4gZGV2aWNlIHNwYWNlLiBJZiByb3VuZGlu ZyBwaXhlbHMgaW4gZGV2aWNlIHNwYWNlCi0gICAgLy8gbWFrZXMgb3VyIHRoaWNrbmVzcyBtb3Jl IHRoYW4gZG91YmxlLCB0aGVuIHRoZXJlIG11c3QgYmUgYSBzaHJpbmtpbmctc2NhbGUgZmFjdG9y IGFuZCByb3VuZGluZyB0byBwaXhlbHMKLSAgICAvLyBpbiBkZXZpY2Ugc3BhY2Ugd2lsbCBtYWtl IHRoZSB1bmRlcmxpbmVzIHRvbyB0aGljay4KLSAgICBGbG9hdFJlY3QgbGluZVJlY3QgPSBjb250 ZXh0LnJvdW5kVG9EZXZpY2VQaXhlbHMoYWRqdXN0ZWRCb3VuZHMsIEdyYXBoaWNzQ29udGV4dDo6 Um91bmRBbGxTaWRlcyk7Ci0gICAgaWYgKGxpbmVSZWN0LmhlaWdodCgpIDwgdGhpY2tuZXNzICog Mi4wKSB7Ci0gICAgICAgIHNob3VsZEFudGlhbGlhcyA9IGZhbHNlOwotICAgICAgICByZXR1cm4g bGluZVJlY3Q7Ci0gICAgfQotCi0gICAgcmV0dXJuIGJvdW5kczsKLX0KLQotc3RhdGljIHZvaWQg ZHJhd0xpbmVGb3JUZXh0KEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCwgY29uc3QgRmxvYXRQb2lu dCYgdG9wbGVmdCwgZmxvYXQgd2lkdGgsIGJvb2wgcHJpbnRpbmcpCi17Ci0gICAgaWYgKHdpZHRo IDw9IDApCi0gICAgICAgIHJldHVybjsKLSAgICAKLSAgICBib29sIHNob3VsZEFudGlhbGlhczsK LSAgICAKLSAgICBGbG9hdFJlY3QgdW5kZXJsaW5lQm91bmRzID0gY29tcHV0ZUJvdW5kc0ZvclVu ZGVybGluZShjb250ZXh0LCB0b3BsZWZ0LCB3aWR0aCwgcHJpbnRpbmcsIHNob3VsZEFudGlhbGlh cyk7Ci0gICAgCi0gICAgYm9vbCB3YXNBbnRpYWxpYXNpbmcgPSBjb250ZXh0LnNob3VsZEFudGlh bGlhcygpOwotICAgIGNvbnRleHQuc2V0U2hvdWxkQW50aWFsaWFzKHNob3VsZEFudGlhbGlhcyk7 Ci0gICAgY29udGV4dC5kcmF3TGluZUZvclRleHQodW5kZXJsaW5lQm91bmRzLCBwcmludGluZyk7 Ci0gICAgY29udGV4dC5zZXRTaG91bGRBbnRpYWxpYXMod2FzQW50aWFsaWFzaW5nKTsKLX0KLQog dm9pZCBJbmxpbmVUZXh0Qm94OjpkZXN0cm95KFJlbmRlckFyZW5hJiBhcmVuYSkKIHsKICAgICBp ZiAoIWtub3duVG9IYXZlTm9PdmVyZmxvdygpICYmIGdUZXh0Qm94ZXNXaXRoT3ZlcmZsb3cpCkBA IC0xMDQ3LDE0ICsxMDA0LDE0IEBAIHZvaWQgSW5saW5lVGV4dEJveDo6cGFpbnREZWNvcmF0aW9u KEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgRmxvYXRQb2ludCYKICAgICAgICAgICAg ICAgICBicmVhazsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGRlZmF1bHQ6Ci0gICAgICAg ICAgICAgICAgZHJhd0xpbmVGb3JUZXh0KCpjb250ZXh0LCBGbG9hdFBvaW50KGxvY2FsT3JpZ2lu LngoKSwgbG9jYWxPcmlnaW4ueSgpICsgdW5kZXJsaW5lT2Zmc2V0KSwgd2lkdGgsIGlzUHJpbnRp bmcpOworICAgICAgICAgICAgICAgIGNvbnRleHQtPmRyYXdMaW5lRm9yVGV4dChGbG9hdFBvaW50 KGxvY2FsT3JpZ2luLngoKSwgbG9jYWxPcmlnaW4ueSgpICsgdW5kZXJsaW5lT2Zmc2V0KSwgd2lk dGgsIGlzUHJpbnRpbmcpOwogCiAgICAgICAgICAgICAgICAgaWYgKGRlY29yYXRpb25TdHlsZSA9 PSBUZXh0RGVjb3JhdGlvblN0eWxlRG91YmxlKQotICAgICAgICAgICAgICAgICAgICBkcmF3TGlu ZUZvclRleHQoKmNvbnRleHQsIEZsb2F0UG9pbnQobG9jYWxPcmlnaW4ueCgpLCBsb2NhbE9yaWdp bi55KCkgKyB1bmRlcmxpbmVPZmZzZXQgKyBkb3VibGVPZmZzZXQpLCB3aWR0aCwgaXNQcmludGlu Zyk7CisgICAgICAgICAgICAgICAgICAgIGNvbnRleHQtPmRyYXdMaW5lRm9yVGV4dChGbG9hdFBv aW50KGxvY2FsT3JpZ2luLngoKSwgbG9jYWxPcmlnaW4ueSgpICsgdW5kZXJsaW5lT2Zmc2V0ICsg ZG91YmxlT2Zmc2V0KSwgd2lkdGgsIGlzUHJpbnRpbmcpOwogICAgICAgICAgICAgfQogI2Vsc2UK ICAgICAgICAgICAgIC8vIExlYXZlIG9uZSBwaXhlbCBvZiB3aGl0ZSBiZXR3ZWVuIHRoZSBiYXNl bGluZSBhbmQgdGhlIHVuZGVybGluZS4KLSAgICAgICAgICAgIGRyYXdMaW5lRm9yVGV4dCgqY29u dGV4dCwgRmxvYXRQb2ludChsb2NhbE9yaWdpbi54KCksIGxvY2FsT3JpZ2luLnkoKSArIGJhc2Vs aW5lICsgMSksIHdpZHRoLCBpc1ByaW50aW5nKTsKKyAgICAgICAgICAgIGNvbnRleHQtPmRyYXdM aW5lRm9yVGV4dChGbG9hdFBvaW50KGxvY2FsT3JpZ2luLngoKSwgbG9jYWxPcmlnaW4ueSgpICsg YmFzZWxpbmUgKyAxKSwgd2lkdGgsIGlzUHJpbnRpbmcpOwogI2VuZGlmIC8vIENTUzNfVEVYVAog ICAgICAgICB9CiAgICAgICAgIGlmIChkZWNvICYgVGV4dERlY29yYXRpb25PdmVybGluZSkgewpA QCAtMTA2OSwxMCArMTAyNiwxMCBAQCB2b2lkIElubGluZVRleHRCb3g6OnBhaW50RGVjb3JhdGlv bihHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IEZsb2F0UG9pbnQmCiAgICAgICAgICAg ICB9CiAgICAgICAgICAgICBkZWZhdWx0OgogI2VuZGlmIC8vIENTUzNfVEVYVAotICAgICAgICAg ICAgICAgIGRyYXdMaW5lRm9yVGV4dCgqY29udGV4dCwgbG9jYWxPcmlnaW4sIHdpZHRoLCBpc1By aW50aW5nKTsKKyAgICAgICAgICAgICAgICBjb250ZXh0LT5kcmF3TGluZUZvclRleHQobG9jYWxP cmlnaW4sIHdpZHRoLCBpc1ByaW50aW5nKTsKICNpZiBFTkFCTEUoQ1NTM19URVhUKQogICAgICAg ICAgICAgICAgIGlmIChkZWNvcmF0aW9uU3R5bGUgPT0gVGV4dERlY29yYXRpb25TdHlsZURvdWJs ZSkKLSAgICAgICAgICAgICAgICAgICAgZHJhd0xpbmVGb3JUZXh0KCpjb250ZXh0LCBGbG9hdFBv aW50KGxvY2FsT3JpZ2luLngoKSwgbG9jYWxPcmlnaW4ueSgpIC0gZG91YmxlT2Zmc2V0KSwgd2lk dGgsIGlzUHJpbnRpbmcpOworICAgICAgICAgICAgICAgICAgICBjb250ZXh0LT5kcmF3TGluZUZv clRleHQoRmxvYXRQb2ludChsb2NhbE9yaWdpbi54KCksIGxvY2FsT3JpZ2luLnkoKSAtIGRvdWJs ZU9mZnNldCksIHdpZHRoLCBpc1ByaW50aW5nKTsKICAgICAgICAgICAgIH0KICNlbmRpZiAvLyBD U1MzX1RFWFQKICAgICAgICAgfQpAQCAtMTA4OCwxMCArMTA0NSwxMCBAQCB2b2lkIElubGluZVRl eHRCb3g6OnBhaW50RGVjb3JhdGlvbihHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IEZs b2F0UG9pbnQmCiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBkZWZhdWx0OgogI2VuZGlmIC8v IENTUzNfVEVYVAotICAgICAgICAgICAgICAgIGRyYXdMaW5lRm9yVGV4dCgqY29udGV4dCwgRmxv YXRQb2ludChsb2NhbE9yaWdpbi54KCksIGxvY2FsT3JpZ2luLnkoKSArIDIgKiBiYXNlbGluZSAv IDMpLCB3aWR0aCwgaXNQcmludGluZyk7CisgICAgICAgICAgICAgICAgY29udGV4dC0+ZHJhd0xp bmVGb3JUZXh0KEZsb2F0UG9pbnQobG9jYWxPcmlnaW4ueCgpLCBsb2NhbE9yaWdpbi55KCkgKyAy ICogYmFzZWxpbmUgLyAzKSwgd2lkdGgsIGlzUHJpbnRpbmcpOwogI2lmIEVOQUJMRShDU1MzX1RF WFQpCiAgICAgICAgICAgICAgICAgaWYgKGRlY29yYXRpb25TdHlsZSA9PSBUZXh0RGVjb3JhdGlv blN0eWxlRG91YmxlKQotICAgICAgICAgICAgICAgICAgICBkcmF3TGluZUZvclRleHQoKmNvbnRl eHQsIEZsb2F0UG9pbnQobG9jYWxPcmlnaW4ueCgpLCBsb2NhbE9yaWdpbi55KCkgKyBkb3VibGVP ZmZzZXQgKyAyICogYmFzZWxpbmUgLyAzKSwgd2lkdGgsIGlzUHJpbnRpbmcpOworICAgICAgICAg ICAgICAgICAgICBjb250ZXh0LT5kcmF3TGluZUZvclRleHQoRmxvYXRQb2ludChsb2NhbE9yaWdp bi54KCksIGxvY2FsT3JpZ2luLnkoKSArIGRvdWJsZU9mZnNldCArIDIgKiBiYXNlbGluZSAvIDMp LCB3aWR0aCwgaXNQcmludGluZyk7CiAgICAgICAgICAgICB9CiAjZW5kaWYgLy8gQ1NTM19URVhU CiAgICAgICAgIH0KQEAgLTEzMzksNyArMTI5Niw3IEBAIHZvaWQgSW5saW5lVGV4dEJveDo6cGFp bnRDb21wb3NpdGlvblVuZGVybGluZShHcmFwaGljc0NvbnRleHQqIGN0eCwgY29uc3QgRmxvYXRQ CiAKICAgICBjdHgtPnNldFN0cm9rZUNvbG9yKHVuZGVybGluZS5jb2xvciwgcmVuZGVyZXIoKS5z dHlsZSgpLmNvbG9yU3BhY2UoKSk7CiAgICAgY3R4LT5zZXRTdHJva2VUaGlja25lc3MobGluZVRo aWNrbmVzcyk7Ci0gICAgZHJhd0xpbmVGb3JUZXh0KCpjdHgsIEZsb2F0UG9pbnQoYm94T3JpZ2lu LngoKSArIHN0YXJ0LCBib3hPcmlnaW4ueSgpICsgbG9naWNhbEhlaWdodCgpIC0gbGluZVRoaWNr bmVzcyksIHdpZHRoLCByZW5kZXJlcigpLmRvY3VtZW50KCkucHJpbnRpbmcoKSk7CisgICAgY3R4 LT5kcmF3TGluZUZvclRleHQoRmxvYXRQb2ludChib3hPcmlnaW4ueCgpICsgc3RhcnQsIGJveE9y aWdpbi55KCkgKyBsb2dpY2FsSGVpZ2h0KCkgLSBsaW5lVGhpY2tuZXNzKSwgd2lkdGgsIHJlbmRl cmVyKCkuZG9jdW1lbnQoKS5wcmludGluZygpKTsKIH0KIAogaW50IElubGluZVRleHRCb3g6OmNh cmV0TWluT2Zmc2V0KCkgY29uc3QK