91037 2012-07-11 17:45:28 -0700 REGRESSION(r122358): Build break on WebKit Win (Requested by hayato on #webkit). 2012-07-11 18:03:07 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 90996 1 webkit.review.bot webkit.review.bot abarth hayato tony oldest_to_newest 667255 0 webkit.review.bot 2012-07-11 17:45:28 -0700 http://trac.webkit.org/changeset/122358 broke the build: Build break on WebKit Win (Requested by hayato on #webkit). This is an automatic bug report generated by the sheriff-bot. 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 case pain. "Only you can prevent forest fires." -- Smokey the Bear 667257 1 151826 webkit.review.bot 2012-07-11 17:46:07 -0700 Created attachment 151826 ROLLOUT of r122358 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. 667260 2 hayato 2012-07-11 17:50:06 -0700 WebKit Win builder started to fail after r27168. Build Log: http://build.chromium.org/p/chromium.webkit/builders/Webkit%20Win%20Builder/builds/27168 11> webview_host_win.cc 11>tools\test_shell\drop_delegate.cc(35): error C2660: 'WebKit::WebView::dragTargetDragEnter' : function does not take 4 arguments 11>tools\test_shell\drop_delegate.cc(50): error C2660: 'WebKit::WebView::dragTargetDragOver' : function does not take 3 arguments 11>tools\test_shell\drop_delegate.cc(68): error C2660: 'WebKit::WebView::dragTargetDrop' : function does not take 2 arguments 11> 11>Build FAILED. I guess we have to update webview_host_win.cc also. Let me roll out r122358 for safety. 667264 3 151826 webkit.review.bot 2012-07-11 17:54:26 -0700 Comment on attachment 151826 ROLLOUT of r122358 Clearing flags on attachment: 151826 Committed r122395: <http://trac.webkit.org/changeset/122395> 667265 4 webkit.review.bot 2012-07-11 17:54:31 -0700 All reviewed patches have been landed. Closing bug. 667270 5 tony 2012-07-11 18:03:07 -0700 Sorry about that, thanks for rolling out. 151826 2012-07-11 17:46:07 -0700 2012-07-11 17:54:26 -0700 ROLLOUT of r122358 bug-91037-20120712005130.patch text/plain 9288 webkit.review.bot U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyMzkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IGRkNTBmZmNlOWMxZGNkOTEyMzQ1N2RhYjcwZTYzMDljZTRlOGM3ZTguLmFkOGJjNGVlNjMwOTU2 N2IwY2ZlOTIxMDMyYjJjY2ExNTFhYjc3YzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjEgQEAKKzIwMTItMDctMTEgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5i b3RAZ21haWwuY29tPgorCisgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIxMjIzNTgu CisgICAgICAgIGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzEyMjM1OAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTEwMzcKKworICAgICAg ICBCdWlsZCBicmVhayBvbiBXZWJLaXQgV2luIChSZXF1ZXN0ZWQgYnkgaGF5YXRvIG9uICN3ZWJr aXQpLgorCisgICAgICAgICogcHVibGljL1dlYlZpZXcuaDoKKyAgICAgICAgKFdlYlZpZXcpOgor ICAgICAgICAqIHNyYy9XZWJWaWV3SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJ bXBsOjpkcmFnVGFyZ2V0RHJhZ0VudGVyKToKKyAgICAgICAgKFdlYktpdCk6CisgICAgICAgIChX ZWJLaXQ6OldlYlZpZXdJbXBsOjpkcmFnVGFyZ2V0RHJhZ092ZXIpOgorICAgICAgICAoV2ViS2l0 OjpXZWJWaWV3SW1wbDo6ZHJhZ1RhcmdldERyb3ApOgorICAgICAgICAqIHNyYy9XZWJWaWV3SW1w bC5oOgorICAgICAgICAoV2ViVmlld0ltcGwpOgorCiAyMDEyLTA3LTExICBBbGV4YW5kcmUgRWxp YXMgIDxhZWxpYXNAZ29vZ2xlLmNvbT4KIAogICAgICAgICBbY2hyb21pdW1dIE1vdmUgY29tcG9z aXRvciBxdWFkcyB0byBQbGF0Zm9ybS9jaHJvbWl1bS9wdWJsaWMKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlZpZXcuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vcHVibGljL1dlYlZpZXcuaAppbmRleCAzYmE1ZGEyNGZhZTZlMGM3ZDZkNTYzNDI0MDY0YzM4 ZjZiZjVlZWE1Li45NjY0MmY2NjY4ZGZkNTgzMzgzMTBmM2YwYmY1ZjI4YmJhOGY2MWVhIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJWaWV3LmgKKysrIGIvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVmlldy5oCkBAIC0zMTcsMTYgKzMxNywyOCBA QCBwdWJsaWM6CiAKICAgICAvLyBDYWxsYmFjayBtZXRob2RzIHdoZW4gYSBkcmFnLWFuZC1kcm9w IG9wZXJhdGlvbiBpcyB0cnlpbmcgdG8gZHJvcAogICAgIC8vIHNvbWV0aGluZyBvbiB0aGUgV2Vi Vmlldy4KKyAgICAvLyBGSVhNRTogUmVtb3ZlIHRoaXMgbWV0aG9kIGFmdGVyIGNocm9taXVtIGNo YW5nZXMgY2F0Y2ggdXAuCisgICAgdmlydHVhbCBXZWJEcmFnT3BlcmF0aW9uIGRyYWdUYXJnZXRE cmFnRW50ZXIoCisgICAgICAgIGNvbnN0IFdlYkRyYWdEYXRhJiwKKyAgICAgICAgY29uc3QgV2Vi UG9pbnQmIGNsaWVudFBvaW50LCBjb25zdCBXZWJQb2ludCYgc2NyZWVuUG9pbnQsCisgICAgICAg IFdlYkRyYWdPcGVyYXRpb25zTWFzayBvcGVyYXRpb25zQWxsb3dlZCkgPSAwOwogICAgIHZpcnR1 YWwgV2ViRHJhZ09wZXJhdGlvbiBkcmFnVGFyZ2V0RHJhZ0VudGVyKAogICAgICAgICBjb25zdCBX ZWJEcmFnRGF0YSYsCiAgICAgICAgIGNvbnN0IFdlYlBvaW50JiBjbGllbnRQb2ludCwgY29uc3Qg V2ViUG9pbnQmIHNjcmVlblBvaW50LAogICAgICAgICBXZWJEcmFnT3BlcmF0aW9uc01hc2sgb3Bl cmF0aW9uc0FsbG93ZWQsCiAgICAgICAgIGludCBrZXlNb2RpZmllcnMpID0gMDsKKyAgICAvLyBG SVhNRTogUmVtb3ZlIHRoaXMgbWV0aG9kIGFmdGVyIGNocm9taXVtIGNoYW5nZXMgY2F0Y2ggdXAu CisgICAgdmlydHVhbCBXZWJEcmFnT3BlcmF0aW9uIGRyYWdUYXJnZXREcmFnT3ZlcigKKyAgICAg ICAgY29uc3QgV2ViUG9pbnQmIGNsaWVudFBvaW50LCBjb25zdCBXZWJQb2ludCYgc2NyZWVuUG9p bnQsCisgICAgICAgIFdlYkRyYWdPcGVyYXRpb25zTWFzayBvcGVyYXRpb25zQWxsb3dlZCkgPSAw OwogICAgIHZpcnR1YWwgV2ViRHJhZ09wZXJhdGlvbiBkcmFnVGFyZ2V0RHJhZ092ZXIoCiAgICAg ICAgIGNvbnN0IFdlYlBvaW50JiBjbGllbnRQb2ludCwgY29uc3QgV2ViUG9pbnQmIHNjcmVlblBv aW50LAogICAgICAgICBXZWJEcmFnT3BlcmF0aW9uc01hc2sgb3BlcmF0aW9uc0FsbG93ZWQsCiAg ICAgICAgIGludCBrZXlNb2RpZmllcnMpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgZHJhZ1Rhcmdl dERyYWdMZWF2ZSgpID0gMDsKKyAgICAvLyBGSVhNRTogUmVtb3ZlIHRoaXMgbWV0aG9kIGFmdGVy IGNocm9taXVtIGNoYW5nZXMgY2F0Y2ggdXAuCisgICAgdmlydHVhbCB2b2lkIGRyYWdUYXJnZXRE cm9wKAorICAgICAgICBjb25zdCBXZWJQb2ludCYgY2xpZW50UG9pbnQsIGNvbnN0IFdlYlBvaW50 JiBzY3JlZW5Qb2ludCkgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBkcmFnVGFyZ2V0RHJvcCgKICAg ICAgICAgY29uc3QgV2ViUG9pbnQmIGNsaWVudFBvaW50LCBjb25zdCBXZWJQb2ludCYgc2NyZWVu UG9pbnQsCiAgICAgICAgIGludCBrZXlNb2RpZmllcnMpID0gMDsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAppbmRleCA3MjFiZmMxZDY4Njc5ZjU2YWQ0OGRlNmUz M2RlZGZmYjQ3MDExNjZjLi5kZDMzMTVmZjkwYTBkNGIzYzM1NzNhNzVlOWQzYTQwMTYxZjAxODIx IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAK KysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCkBAIC0yNzk2 LDYgKzI3OTYsMTUgQEAgV2ViRHJhZ09wZXJhdGlvbiBXZWJWaWV3SW1wbDo6ZHJhZ1RhcmdldERy YWdFbnRlcigKICAgICBjb25zdCBXZWJEcmFnRGF0YSYgd2ViRHJhZ0RhdGEsCiAgICAgY29uc3Qg V2ViUG9pbnQmIGNsaWVudFBvaW50LAogICAgIGNvbnN0IFdlYlBvaW50JiBzY3JlZW5Qb2ludCwK KyAgICBXZWJEcmFnT3BlcmF0aW9uc01hc2sgb3BlcmF0aW9uc0FsbG93ZWQpCit7CisgICAgcmV0 dXJuIGRyYWdUYXJnZXREcmFnRW50ZXIod2ViRHJhZ0RhdGEsIGNsaWVudFBvaW50LCBzY3JlZW5Q b2ludCwgb3BlcmF0aW9uc0FsbG93ZWQsIDApOworfQorCitXZWJEcmFnT3BlcmF0aW9uIFdlYlZp ZXdJbXBsOjpkcmFnVGFyZ2V0RHJhZ0VudGVyKAorICAgIGNvbnN0IFdlYkRyYWdEYXRhJiB3ZWJE cmFnRGF0YSwKKyAgICBjb25zdCBXZWJQb2ludCYgY2xpZW50UG9pbnQsCisgICAgY29uc3QgV2Vi UG9pbnQmIHNjcmVlblBvaW50LAogICAgIFdlYkRyYWdPcGVyYXRpb25zTWFzayBvcGVyYXRpb25z QWxsb3dlZCwKICAgICBpbnQga2V5TW9kaWZpZXJzKQogewpAQCAtMjgxMCw2ICsyODE5LDE0IEBA IFdlYkRyYWdPcGVyYXRpb24gV2ViVmlld0ltcGw6OmRyYWdUYXJnZXREcmFnRW50ZXIoCiBXZWJE cmFnT3BlcmF0aW9uIFdlYlZpZXdJbXBsOjpkcmFnVGFyZ2V0RHJhZ092ZXIoCiAgICAgY29uc3Qg V2ViUG9pbnQmIGNsaWVudFBvaW50LAogICAgIGNvbnN0IFdlYlBvaW50JiBzY3JlZW5Qb2ludCwK KyAgICBXZWJEcmFnT3BlcmF0aW9uc01hc2sgb3BlcmF0aW9uc0FsbG93ZWQpCit7CisgICAgcmV0 dXJuIGRyYWdUYXJnZXREcmFnT3ZlcihjbGllbnRQb2ludCwgc2NyZWVuUG9pbnQsIG9wZXJhdGlv bnNBbGxvd2VkLCAwKTsKK30KKworV2ViRHJhZ09wZXJhdGlvbiBXZWJWaWV3SW1wbDo6ZHJhZ1Rh cmdldERyYWdPdmVyKAorICAgIGNvbnN0IFdlYlBvaW50JiBjbGllbnRQb2ludCwKKyAgICBjb25z dCBXZWJQb2ludCYgc2NyZWVuUG9pbnQsCiAgICAgV2ViRHJhZ09wZXJhdGlvbnNNYXNrIG9wZXJh dGlvbnNBbGxvd2VkLAogICAgIGludCBrZXlNb2RpZmllcnMpCiB7CkBAIC0yODM3LDYgKzI4NTQs MTIgQEAgdm9pZCBXZWJWaWV3SW1wbDo6ZHJhZ1RhcmdldERyYWdMZWF2ZSgpCiB9CiAKIHZvaWQg V2ViVmlld0ltcGw6OmRyYWdUYXJnZXREcm9wKGNvbnN0IFdlYlBvaW50JiBjbGllbnRQb2ludCwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IFdlYlBvaW50JiBzY3JlZW5Q b2ludCkKK3sKKyAgICBkcmFnVGFyZ2V0RHJvcChjbGllbnRQb2ludCwgc2NyZWVuUG9pbnQsIDAp OworfQorCit2b2lkIFdlYlZpZXdJbXBsOjpkcmFnVGFyZ2V0RHJvcChjb25zdCBXZWJQb2ludCYg Y2xpZW50UG9pbnQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBXZWJQ b2ludCYgc2NyZWVuUG9pbnQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbnQg a2V5TW9kaWZpZXJzKQogewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMv V2ViVmlld0ltcGwuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmgK aW5kZXggZGQ1N2Y0NDRmNWRkNTM2NmRkMDUxMzdlOWJhN2Y3ZTgxMzkzNTFkOC4uZjY1NzUwNGYy YWRkZGRlYmRhMjBiYzgyZjI3ZWJhNWIzYWY4Mjg4MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJWaWV3SW1wbC5oCkBAIC0yMzksMTYgKzIzOSwyOCBAQCBwdWJsaWM6CiAgICAgICAg IGNvbnN0IFdlYkRyYWdEYXRhJiwKICAgICAgICAgY29uc3QgV2ViUG9pbnQmIGNsaWVudFBvaW50 LAogICAgICAgICBjb25zdCBXZWJQb2ludCYgc2NyZWVuUG9pbnQsCisgICAgICAgIFdlYkRyYWdP cGVyYXRpb25zTWFzayBvcGVyYXRpb25zQWxsb3dlZCk7CisgICAgdmlydHVhbCBXZWJEcmFnT3Bl cmF0aW9uIGRyYWdUYXJnZXREcmFnRW50ZXIoCisgICAgICAgIGNvbnN0IFdlYkRyYWdEYXRhJiwK KyAgICAgICAgY29uc3QgV2ViUG9pbnQmIGNsaWVudFBvaW50LAorICAgICAgICBjb25zdCBXZWJQ b2ludCYgc2NyZWVuUG9pbnQsCiAgICAgICAgIFdlYkRyYWdPcGVyYXRpb25zTWFzayBvcGVyYXRp b25zQWxsb3dlZCwKICAgICAgICAgaW50IGtleU1vZGlmaWVycyk7CiAgICAgdmlydHVhbCBXZWJE cmFnT3BlcmF0aW9uIGRyYWdUYXJnZXREcmFnT3ZlcigKICAgICAgICAgY29uc3QgV2ViUG9pbnQm IGNsaWVudFBvaW50LAogICAgICAgICBjb25zdCBXZWJQb2ludCYgc2NyZWVuUG9pbnQsCisgICAg ICAgIFdlYkRyYWdPcGVyYXRpb25zTWFzayBvcGVyYXRpb25zQWxsb3dlZCk7CisgICAgdmlydHVh bCBXZWJEcmFnT3BlcmF0aW9uIGRyYWdUYXJnZXREcmFnT3ZlcigKKyAgICAgICAgY29uc3QgV2Vi UG9pbnQmIGNsaWVudFBvaW50LAorICAgICAgICBjb25zdCBXZWJQb2ludCYgc2NyZWVuUG9pbnQs CiAgICAgICAgIFdlYkRyYWdPcGVyYXRpb25zTWFzayBvcGVyYXRpb25zQWxsb3dlZCwKICAgICAg ICAgaW50IGtleU1vZGlmaWVycyk7CiAgICAgdmlydHVhbCB2b2lkIGRyYWdUYXJnZXREcmFnTGVh dmUoKTsKICAgICB2aXJ0dWFsIHZvaWQgZHJhZ1RhcmdldERyb3AoCiAgICAgICAgIGNvbnN0IFdl YlBvaW50JiBjbGllbnRQb2ludCwKKyAgICAgICAgY29uc3QgV2ViUG9pbnQmIHNjcmVlblBvaW50 KTsKKyAgICB2aXJ0dWFsIHZvaWQgZHJhZ1RhcmdldERyb3AoCisgICAgICAgIGNvbnN0IFdlYlBv aW50JiBjbGllbnRQb2ludCwKICAgICAgICAgY29uc3QgV2ViUG9pbnQmIHNjcmVlblBvaW50LAog ICAgICAgICBpbnQga2V5TW9kaWZpZXJzKTsKICAgICB2aXJ0dWFsIHVuc2lnbmVkIGxvbmcgY3Jl YXRlVW5pcXVlSWRlbnRpZmllckZvclJlcXVlc3QoKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5n ZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAyY2FmNDhiMjEwZDAxMjAxNzk4MWQwOGM4OGY5 MjU1MmQ2ZWExNmI0Li4wN2M3NzRjY2Y0YWI5NDY5Y2U5ODEzNjBlZjJmZjJkOTZiODI5YjFmIDEw MDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMTcgQEAKKzIwMTItMDctMTEgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21h aWwuY29tPgorCisgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIxMjIzNTguCisgICAg ICAgIGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzEyMjM1OAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTEwMzcKKworICAgICAgICBCdWls ZCBicmVhayBvbiBXZWJLaXQgV2luIChSZXF1ZXN0ZWQgYnkgaGF5YXRvIG9uICN3ZWJraXQpLgor CisgICAgICAgICogRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vRXZlbnRTZW5kZXIuY3BwOgorICAg ICAgICAoRXZlbnRTZW5kZXI6OmRvRHJhZ0Ryb3ApOgorICAgICAgICAoRXZlbnRTZW5kZXI6OmRv TW91c2VVcCk6CisgICAgICAgIChFdmVudFNlbmRlcjo6ZG9Nb3VzZU1vdmUpOgorICAgICAgICAo RXZlbnRTZW5kZXI6OmJlZ2luRHJhZ1dpdGhGaWxlcyk6CisKIDIwMTItMDctMTEgIFNpbW9uIEZy YXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgQWRkIGFuIG9wdGlvbiB0 byBlbnRlciBwYWdpbmF0ZWQgbW9kZSBpbiBNaW5pQnJvd3NlcgpkaWZmIC0tZ2l0IGEvVG9vbHMv RHVtcFJlbmRlclRyZWUvY2hyb21pdW0vRXZlbnRTZW5kZXIuY3BwIGIvVG9vbHMvRHVtcFJlbmRl clRyZWUvY2hyb21pdW0vRXZlbnRTZW5kZXIuY3BwCmluZGV4IDY2MjgzN2Y5Y2NmMmU1MWE5OTI4 NzA4OTg2NTQyMDVhMjRhNWRhNjIuLjQ3YmVjMmE3MThkZDliYWRiOGY5NGY3MDRhNzM4ZmU1YmYz ZWJhZDEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL0V2ZW50U2Vu ZGVyLmNwcAorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9FdmVudFNlbmRlci5j cHAKQEAgLTM1MSw3ICszNTEsNyBAQCB2b2lkIEV2ZW50U2VuZGVyOjpkb0RyYWdEcm9wKGNvbnN0 IFdlYkRyYWdEYXRhJiBkcmFnRGF0YSwgV2ViRHJhZ09wZXJhdGlvbnNNYXNrCiAgICAgV2ViUG9p bnQgc2NyZWVuUG9pbnQoZXZlbnQuZ2xvYmFsWCwgZXZlbnQuZ2xvYmFsWSk7CiAgICAgY3VycmVu dERyYWdEYXRhID0gZHJhZ0RhdGE7CiAgICAgY3VycmVudERyYWdFZmZlY3RzQWxsb3dlZCA9IG1h c2s7Ci0gICAgY3VycmVudERyYWdFZmZlY3QgPSB3ZWJ2aWV3KCktPmRyYWdUYXJnZXREcmFnRW50 ZXIoZHJhZ0RhdGEsIGNsaWVudFBvaW50LCBzY3JlZW5Qb2ludCwgY3VycmVudERyYWdFZmZlY3Rz QWxsb3dlZCwgMCk7CisgICAgY3VycmVudERyYWdFZmZlY3QgPSB3ZWJ2aWV3KCktPmRyYWdUYXJn ZXREcmFnRW50ZXIoZHJhZ0RhdGEsIGNsaWVudFBvaW50LCBzY3JlZW5Qb2ludCwgY3VycmVudERy YWdFZmZlY3RzQWxsb3dlZCk7CiAKICAgICAvLyBGaW5pc2ggcHJvY2Vzc2luZyBldmVudHMuCiAg ICAgcmVwbGF5U2F2ZWRFdmVudHMoKTsKQEAgLTQ2Niw5ICs0NjYsOSBAQCB2b2lkIEV2ZW50U2Vu ZGVyOjpkb01vdXNlVXAoY29uc3QgV2ViTW91c2VFdmVudCYgZSkKICAgICBXZWJQb2ludCBjbGll bnRQb2ludChlLngsIGUueSk7CiAgICAgV2ViUG9pbnQgc2NyZWVuUG9pbnQoZS5nbG9iYWxYLCBl Lmdsb2JhbFkpOwogCi0gICAgY3VycmVudERyYWdFZmZlY3QgPSB3ZWJ2aWV3KCktPmRyYWdUYXJn ZXREcmFnT3ZlcihjbGllbnRQb2ludCwgc2NyZWVuUG9pbnQsIGN1cnJlbnREcmFnRWZmZWN0c0Fs bG93ZWQsIDApOworICAgIGN1cnJlbnREcmFnRWZmZWN0ID0gd2VidmlldygpLT5kcmFnVGFyZ2V0 RHJhZ092ZXIoY2xpZW50UG9pbnQsIHNjcmVlblBvaW50LCBjdXJyZW50RHJhZ0VmZmVjdHNBbGxv d2VkKTsKICAgICBpZiAoY3VycmVudERyYWdFZmZlY3QpCi0gICAgICAgIHdlYnZpZXcoKS0+ZHJh Z1RhcmdldERyb3AoY2xpZW50UG9pbnQsIHNjcmVlblBvaW50LCAwKTsKKyAgICAgICAgd2Vidmll dygpLT5kcmFnVGFyZ2V0RHJvcChjbGllbnRQb2ludCwgc2NyZWVuUG9pbnQpOwogICAgIGVsc2UK ICAgICAgICAgd2VidmlldygpLT5kcmFnVGFyZ2V0RHJhZ0xlYXZlKCk7CiAgICAgd2Vidmlldygp LT5kcmFnU291cmNlRW5kZWRBdChjbGllbnRQb2ludCwgc2NyZWVuUG9pbnQsIGN1cnJlbnREcmFn RWZmZWN0KTsKQEAgLTUwOSw3ICs1MDksNyBAQCB2b2lkIEV2ZW50U2VuZGVyOjpkb01vdXNlTW92 ZShjb25zdCBXZWJNb3VzZUV2ZW50JiBlKQogICAgICAgICByZXR1cm47CiAgICAgV2ViUG9pbnQg Y2xpZW50UG9pbnQoZS54LCBlLnkpOwogICAgIFdlYlBvaW50IHNjcmVlblBvaW50KGUuZ2xvYmFs WCwgZS5nbG9iYWxZKTsKLSAgICBjdXJyZW50RHJhZ0VmZmVjdCA9IHdlYnZpZXcoKS0+ZHJhZ1Rh cmdldERyYWdPdmVyKGNsaWVudFBvaW50LCBzY3JlZW5Qb2ludCwgY3VycmVudERyYWdFZmZlY3Rz QWxsb3dlZCwgMCk7CisgICAgY3VycmVudERyYWdFZmZlY3QgPSB3ZWJ2aWV3KCktPmRyYWdUYXJn ZXREcmFnT3ZlcihjbGllbnRQb2ludCwgc2NyZWVuUG9pbnQsIGN1cnJlbnREcmFnRWZmZWN0c0Fs bG93ZWQpOwogfQogCiB2b2lkIEV2ZW50U2VuZGVyOjprZXlEb3duKGNvbnN0IENwcEFyZ3VtZW50 TGlzdCYgYXJndW1lbnRzLCBDcHBWYXJpYW50KiByZXN1bHQpCkBAIC05MTIsNyArOTEyLDcgQEAg dm9pZCBFdmVudFNlbmRlcjo6YmVnaW5EcmFnV2l0aEZpbGVzKGNvbnN0IENwcEFyZ3VtZW50TGlz dCYgYXJndW1lbnRzLCBDcHBWYXJpYW4KICAgICBjdXJyZW50RHJhZ0VmZmVjdHNBbGxvd2VkID0g V2ViS2l0OjpXZWJEcmFnT3BlcmF0aW9uQ29weTsKIAogICAgIC8vIFByb3ZpZGUgYSBkcmFnIHNv dXJjZS4KLSAgICB3ZWJ2aWV3KCktPmRyYWdUYXJnZXREcmFnRW50ZXIoY3VycmVudERyYWdEYXRh LCBsYXN0TW91c2VQb3MsIGxhc3RNb3VzZVBvcywgY3VycmVudERyYWdFZmZlY3RzQWxsb3dlZCwg MCk7CisgICAgd2VidmlldygpLT5kcmFnVGFyZ2V0RHJhZ0VudGVyKGN1cnJlbnREcmFnRGF0YSwg bGFzdE1vdXNlUG9zLCBsYXN0TW91c2VQb3MsIGN1cnJlbnREcmFnRWZmZWN0c0FsbG93ZWQpOwog CiAgICAgLy8gZHJhZ01vZGUgc2F2ZXMgZXZlbnRzIGFuZCB0aGVuIHJlcGxheXMgdGhlbSBsYXRl ci4gV2UgZG9uJ3QgbmVlZC93YW50IHRoYXQuCiAgICAgZHJhZ01vZGUuc2V0KGZhbHNlKTsK