56132 2011-03-10 12:19:32 -0800 [Gtk] Add support for userscripts tests 2014-04-08 16:13:36 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC Linux RESOLVED INVALID Gtk, LayoutTestFailure P2 Normal --- 32789 0 zan webkit-unassigned a.butenka mrobinson oldest_to_newest 365415 0 zan 2011-03-10 12:19:32 -0800 This bug oversees adding support for testing the user script tests. 365436 1 85373 zan 2011-03-10 12:37:59 -0800 Created attachment 85373 Add support for testing user script tests This patch adds support for testing user script tests by adding methods for adding a user script to a page group and removing all the content from a page group to the DumpRenderTreeSupport class. These two methods are then used in DumpRenderTree tool for testing these tests. This patch also resets defaults to consistent values right after the test has finished, before loading about:blank. Without resetting these values a failure occurs when running tests in userscripts directory. We should rethink if loading about:blank after every test is actually needed and whether there's a better way of gaining benefits that loading about:blank brings. 367007 2 85373 mrobinson 2011-03-14 08:56:53 -0700 Comment on attachment 85373 Add support for testing user script tests View in context: https://bugs.webkit.org/attachment.cgi?id=85373&action=review Looks good, though I think these need to be clumped with the WebView-type methods in DRTSupport and receive the WebView as the first argument. > LayoutTests/platform/gtk/Skipped:-260 > -# We lack userscripts support. > -userscripts There are a few more tests that also rely on userscripts that are skipped here. Please unskip them as well when you land this patch. > Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp:330 > /** > + * addUserScript > + * @frame: a #WebKitWebFrame > + * @sourceCode: code of a user script > + * @runAtStart: whether to run the script at start > + * @allFrames: whether to inject the script in all frames > + * > + */ I don't think you need this documentation. It doesn't add anything beyond the variable names. > Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp:331 > +void DumpRenderTreeSupportGtk::addUserScript(WebKitWebFrame* frame, const char* sourceCode, bool runAtStart, bool allFrames) Please call runAtStart, injectAtDocumentStart and allFrames, injectInAllFrames. I think it makes sense to keep the names close to their actual meanings. > Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp:337 > + Frame* coreFrame = core(frame); > + if (!coreFrame) > + return; You don't use coreFrame. Why calculate it? > Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp:339 > + fprintf(stderr, "DumpRenderTreeSupportGtk::addUserScript\n"); This seems like it should be removed. > Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp:342 > + WebKitWebView* webView = getViewFromFrame(frame); > + Page* page = core(webView); > + page->group().addUserScriptToWorld(mainThreadNormalWorld(), sourceCode, KURL(), 0, 0, runAtStart ? InjectAtDocumentStart : InjectAtDocumentEnd, allFrames ? InjectInAllFrames : InjectInTopFrameOnly); You should just pass the WebView into this method, since DRT already has a handle on it. Please make this one statement, but split over multiple lines: core(webView)->group().addUserScriptToWorld(mainThreadNormalWorld(), sourceCode, KURL(), 0, 0 injectAtDocumentStart ? InjectAtDocumentStart : InjectAtDocumentEnd, injectInAllFrames ? InjectInAllFrames : InjectInTopFrameOnly); > Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp:368 > + * removeAllUserContent > + * @frame: a #WebKitWebFrame > + * > + */ Ditto on the removal. > Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp:376 > + Frame* coreFrame = core(frame); > + if (!coreFrame) > + return; > + You don't use coreFrame here. No need to cache it. > Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp:380 > + WebKitWebView* webView = getViewFromFrame(frame); > + Page* page = core(webView); > + page->group().removeAllUserContent(); > +} Again, you should pass the WebView here and just do this in one statement: core(webView)->group().removeAllUserContent(). 370129 3 a.butenka 2011-03-19 07:54:37 -0700 guys, why not to add public api for using userscripts from https://bugs.webkit.org/show_bug.cgi?id=32789 before adding this tests? This will provide usefull features + will simplify current patch. 370215 4 zan 2011-03-20 09:00:27 -0700 (In reply to comment #3) > guys, why not to add public api for using userscripts from https://bugs.webkit.org/show_bug.cgi?id=32789 before adding this tests? This will provide usefull features + will simplify current patch. I agree, I'll update the patch when that API lands. Also setting the dependency on #32789. 998862 5 mrobinson 2014-04-08 16:13:36 -0700 Sad that we never landed this, but DumpRenderTree is gone now. 85373 2011-03-10 12:37:59 -0800 2011-03-14 08:56:53 -0700 Add support for testing user script tests us.p text/plain 7870 zan ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBiNWI0MzAwLi43YTViZDZmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDMt MTAgIFphbiBEb2JlcnNlayAgPHphbmRvYmVyc2VrQGdtYWlsLmNvbT4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbR3RrXSBBZGQgc3VwcG9ydCBmb3Ig dXNlcnNjcmlwdHMgdGVzdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTU2MTMyCisKKyAgICAgICAgVW5za2lwIHVzZXIgc2NyaXB0IHRlc3RzIGFuZCBh ZGQgYW4gZXhwZWN0ZWQgcmVzdWx0LgorCisgICAgICAgICogcGxhdGZvcm0vZ3RrL1NraXBwZWQ6 CisgICAgICAgICogcGxhdGZvcm0vZ3RrL3VzZXJzY3JpcHRzL3NjcmlwdC1ydW4tYXQtZW5kLWV4 cGVjdGVkLnR4dDogQWRkZWQuCisKIDIwMTEtMDMtMTAgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1h bkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgTm90IHJldmlld2VkOiByb2xsaW5nIG91dCByODA0 NzggYW5kIGl0cyBmb2xsb3cgdXBzIGZvciBicmVha2luZwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvcGxhdGZvcm0vZ3RrL1NraXBwZWQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvU2tpcHBl ZAppbmRleCA3ODA5MTM1Li44ZWRmOGIyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9y bS9ndGsvU2tpcHBlZAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvU2tpcHBlZApAQCAt MjU2LDkgKzI1Niw2IEBAIGZhc3QvZG9tL0RldmljZU9yaWVudGF0aW9uCiBmYXN0L25vdGlmaWNh dGlvbnMKIGh0dHAvdGVzdHMvbm90aWZpY2F0aW9ucwogCi0jIFdlIGxhY2sgdXNlcnNjcmlwdHMg c3VwcG9ydC4KLXVzZXJzY3JpcHRzCi0KICMgVGVzdHMgcmVxdWlyaW5nIDNEX1JFTkRFUklORyBh bmQgQUNDRUxFUkFURURfQ09NUE9TSVRJTkcgc3VwcG9ydAogdHJhbnNmb3Jtcy8zZAogY29tcG9z aXRpbmcKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay91c2Vyc2NyaXB0cy9z Y3JpcHQtcnVuLWF0LWVuZC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsv dXNlcnNjcmlwdHMvc2NyaXB0LXJ1bi1hdC1lbmQtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAuLjdlZjIyZTkKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRU ZXN0cy9wbGF0Zm9ybS9ndGsvdXNlcnNjcmlwdHMvc2NyaXB0LXJ1bi1hdC1lbmQtZXhwZWN0ZWQu dHh0CkBAIC0wLDAgKzEgQEAKK1BBU1MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3RrL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZwppbmRleCA4MWZkYzA2Li4zY2Q5 YzRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKKysrIGIvU291cmNl L1dlYktpdC9ndGsvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDMtMTAgIFphbiBE b2JlcnNlayAgPHphbmRvYmVyc2VrQGdtYWlsLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbR3RrXSBBZGQgc3VwcG9ydCBmb3IgdXNlcnNjcmlw dHMgdGVzdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTU2MTMyCisKKyAgICAgICAgQWRkIGZ1bmN0aW9ucyB0byBEdW1wUmVuZGVyVHJlZVN1cHBvcnQg c3RydWN0dXJlIGZvcgorICAgICAgICBhZGRpbmcgdXNlciBzY3JpcHRzIGFuZCByZW1vdmluZyB1 c2VyIGNvbnRlbnQuCisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9EdW1wUmVuZGVyVHJlZVN1 cHBvcnRHdGsuY3BwOgorICAgICAgICAoRHVtcFJlbmRlclRyZWVTdXBwb3J0R3RrOjphZGRVc2Vy U2NyaXB0KToKKyAgICAgICAgKER1bXBSZW5kZXJUcmVlU3VwcG9ydEd0azo6cmVtb3ZlQWxsVXNl ckNvbnRlbnQpOgorICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0R1bXBSZW5kZXJUcmVlU3VwcG9y dEd0ay5oOgorCiAyMDExLTAzLTEwICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlh LmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBYYW4gTG9wZXouCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9EdW1wUmVuZGVyVHJlZVN1cHBvcnRHdGsuY3Bw IGIvU291cmNlL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRHVtcFJlbmRlclRyZWVTdXBwb3J0 R3RrLmNwcAppbmRleCBkZmUzMTkzLi4xNDhhZGNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2d0ay9XZWJDb3JlU3VwcG9ydC9EdW1wUmVuZGVyVHJlZVN1cHBvcnRHdGsuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0R1bXBSZW5kZXJUcmVlU3VwcG9ydEd0ay5j cHAKQEAgLTMyMSw2ICszMjEsMjggQEAgQ1N0cmluZyBEdW1wUmVuZGVyVHJlZVN1cHBvcnRHdGs6 OnBhZ2VTaXplQW5kTWFyZ2luc0luUGl4ZWxzKFdlYktpdFdlYkZyYW1lKiBmcmEKIH0KIAogLyoq CisgKiBhZGRVc2VyU2NyaXB0CisgKiBAZnJhbWU6IGEgI1dlYktpdFdlYkZyYW1lCisgKiBAc291 cmNlQ29kZTogY29kZSBvZiBhIHVzZXIgc2NyaXB0CisgKiBAcnVuQXRTdGFydDogd2hldGhlciB0 byBydW4gdGhlIHNjcmlwdCBhdCBzdGFydAorICogQGFsbEZyYW1lczogd2hldGhlciB0byBpbmpl Y3QgdGhlIHNjcmlwdCBpbiBhbGwgZnJhbWVzCisgKgorICovCit2b2lkIER1bXBSZW5kZXJUcmVl U3VwcG9ydEd0azo6YWRkVXNlclNjcmlwdChXZWJLaXRXZWJGcmFtZSogZnJhbWUsIGNvbnN0IGNo YXIqIHNvdXJjZUNvZGUsIGJvb2wgcnVuQXRTdGFydCwgYm9vbCBhbGxGcmFtZXMpCit7CisgICAg Z19yZXR1cm5faWZfZmFpbChXRUJLSVRfSVNfV0VCX0ZSQU1FKGZyYW1lKSk7CisKKyAgICBGcmFt ZSogY29yZUZyYW1lID0gY29yZShmcmFtZSk7CisgICAgaWYgKCFjb3JlRnJhbWUpCisgICAgICAg IHJldHVybjsKKworICAgIGZwcmludGYoc3RkZXJyLCAiRHVtcFJlbmRlclRyZWVTdXBwb3J0R3Rr OjphZGRVc2VyU2NyaXB0XG4iKTsKKyAgICBXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3ID0gZ2V0Vmll d0Zyb21GcmFtZShmcmFtZSk7CisgICAgUGFnZSogcGFnZSA9IGNvcmUod2ViVmlldyk7CisgICAg cGFnZS0+Z3JvdXAoKS5hZGRVc2VyU2NyaXB0VG9Xb3JsZChtYWluVGhyZWFkTm9ybWFsV29ybGQo KSwgc291cmNlQ29kZSwgS1VSTCgpLCAwLCAwLCBydW5BdFN0YXJ0ID8gSW5qZWN0QXREb2N1bWVu dFN0YXJ0IDogSW5qZWN0QXREb2N1bWVudEVuZCwgYWxsRnJhbWVzID8gSW5qZWN0SW5BbGxGcmFt ZXMgOiBJbmplY3RJblRvcEZyYW1lT25seSk7Cit9CisKKy8qKgogICogYWRkVXNlclN0eWxlU2hl ZXQKICAqIEBmcmFtZTogYSAjV2ViS2l0V2ViRnJhbWUKICAqIEBzb3VyY2VDb2RlOiBjb2RlIG9m IGEgdXNlciBzdHlsZXNoZWV0CkBAIC0zNDAsNiArMzYyLDI0IEBAIHZvaWQgRHVtcFJlbmRlclRy ZWVTdXBwb3J0R3RrOjphZGRVc2VyU3R5bGVTaGVldChXZWJLaXRXZWJGcmFtZSogZnJhbWUsIGNv bnN0IGNoCiB9CiAKIC8qKgorICogcmVtb3ZlQWxsVXNlckNvbnRlbnQKKyAqIEBmcmFtZTogYSAj V2ViS2l0V2ViRnJhbWUKKyAqCisgKi8KK3ZvaWQgRHVtcFJlbmRlclRyZWVTdXBwb3J0R3RrOjpy ZW1vdmVBbGxVc2VyQ29udGVudChXZWJLaXRXZWJGcmFtZSogZnJhbWUpCit7CisgICAgZ19yZXR1 cm5faWZfZmFpbChXRUJLSVRfSVNfV0VCX0ZSQU1FKGZyYW1lKSk7CisKKyAgICBGcmFtZSogY29y ZUZyYW1lID0gY29yZShmcmFtZSk7CisgICAgaWYgKCFjb3JlRnJhbWUpCisgICAgICAgIHJldHVy bjsKKworICAgIFdlYktpdFdlYlZpZXcqIHdlYlZpZXcgPSBnZXRWaWV3RnJvbUZyYW1lKGZyYW1l KTsKKyAgICBQYWdlKiBwYWdlID0gY29yZSh3ZWJWaWV3KTsKKyAgICBwYWdlLT5ncm91cCgpLnJl bW92ZUFsbFVzZXJDb250ZW50KCk7Cit9CisKKy8qKgogICogZ2V0UGVuZGluZ1VubG9hZEV2ZW50 Q291bnQ6CiAgKiBAZnJhbWU6IGEgI1dlYktpdFdlYkZyYW1lCiAgKgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRHVtcFJlbmRlclRyZWVTdXBwb3J0R3RrLmgg Yi9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9EdW1wUmVuZGVyVHJlZVN1cHBvcnRH dGsuaAppbmRleCBiYzQ1NDRmLi4xODJlOWM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2d0 ay9XZWJDb3JlU3VwcG9ydC9EdW1wUmVuZGVyVHJlZVN1cHBvcnRHdGsuaAorKysgYi9Tb3VyY2Uv V2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9EdW1wUmVuZGVyVHJlZVN1cHBvcnRHdGsuaApAQCAt NzEsNyArNzEsOSBAQCBwdWJsaWM6CiAgICAgc3RhdGljIFdURjo6Q1N0cmluZyBwYWdlUHJvcGVy dHkoV2ViS2l0V2ViRnJhbWUqLCBjb25zdCBjaGFyKiBwcm9wZXJ0eU5hbWUsIGludCBwYWdlTnVt YmVyKTsKICAgICBzdGF0aWMgYm9vbCBpc1BhZ2VCb3hWaXNpYmxlKFdlYktpdFdlYkZyYW1lKiwg aW50IHBhZ2VOdW1iZXIpOwogICAgIHN0YXRpYyBXVEY6OkNTdHJpbmcgcGFnZVNpemVBbmRNYXJn aW5zSW5QaXhlbHMoV2ViS2l0V2ViRnJhbWUqLCBpbnQgcGFnZU51bWJlciwgaW50IHdpZHRoLCBp bnQgaGVpZ2h0LCBpbnQgbWFyZ2luVG9wLCBpbnQgbWFyZ2luUmlnaHQsIGludCBtYXJnaW5Cb3R0 b20sIGludCBtYXJnaW5MZWZ0KTsKKyAgICBzdGF0aWMgdm9pZCBhZGRVc2VyU2NyaXB0KFdlYktp dFdlYkZyYW1lKiwgY29uc3QgY2hhciogc291cmNlQ29kZSwgYm9vbCBydW5BdFN0YXJ0LCBib29s IGFsbEZyYW1lcyk7CiAgICAgc3RhdGljIHZvaWQgYWRkVXNlclN0eWxlU2hlZXQoV2ViS2l0V2Vi RnJhbWUqLCBjb25zdCBjaGFyKiBzb3VyY2VDb2RlLCBib29sIGFsbEZyYW1lcyk7CisgICAgc3Rh dGljIHZvaWQgcmVtb3ZlQWxsVXNlckNvbnRlbnQoV2ViS2l0V2ViRnJhbWUqKTsKICAgICBzdGF0 aWMgZ3VpbnQgZ2V0UGVuZGluZ1VubG9hZEV2ZW50Q291bnQoV2ViS2l0V2ViRnJhbWUqKTsKICAg ICBzdGF0aWMgYm9vbCBwYXVzZUFuaW1hdGlvbihXZWJLaXRXZWJGcmFtZSosIGNvbnN0IGNoYXIq IG5hbWUsIGRvdWJsZSB0aW1lLCBjb25zdCBjaGFyKiBlbGVtZW50KTsKICAgICBzdGF0aWMgYm9v bCBwYXVzZVRyYW5zaXRpb24oV2ViS2l0V2ViRnJhbWUqLCBjb25zdCBjaGFyKiBuYW1lLCBkb3Vi bGUgdGltZSwgY29uc3QgY2hhciogZWxlbWVudCk7CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VM b2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOTdkMmRlMi4uOGYzZDJjNyAxMDA2NDQKLS0tIGEv VG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisy MDExLTAzLTEwICBaYW4gRG9iZXJzZWsgIDx6YW5kb2JlcnNla0BnbWFpbC5jb20+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0d0a10gQWRkIHN1cHBv cnQgZm9yIHVzZXJzY3JpcHRzIHRlc3RzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD01NjEzMgorCisgICAgICAgIEltcGxlbWVudCBzdXBwb3J0IGZvciB0 ZXN0aW5nIHVzZXIgc2NyaXB0cyB0ZXN0cy4KKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL2d0 ay9EdW1wUmVuZGVyVHJlZS5jcHA6CisgICAgICAgIChyZXNldERlZmF1bHRzVG9Db25zaXN0ZW50 VmFsdWVzKTogUmVtb3ZlIGFsbCB1c2VyIGNvbnRlbnQgdGhyb3VnaAorICAgICAgICBEdW1wUmVu ZGVyVHJlZVN1cHBvcnQgc3RydWN0dXJlLgorICAgICAgICAocnVuVGVzdCk6IFJlc2V0IGRlZmF1 bHRzIGJhY2sgdG8gY29uc2lzdGVudCB2YWx1ZXMgYWxzbyBiZWZvcmUgbG9hZGluZyBhYm91dDpi bGFuay4KKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9ndGsvTGF5b3V0VGVzdENvbnRyb2xsZXJH dGsuY3BwOgorICAgICAgICAoTGF5b3V0VGVzdENvbnRyb2xsZXI6OmFkZFVzZXJTY3JpcHQpOiBB ZGQgdXNlciBzY3JpcHQgdGhyb3VnaAorICAgICAgICBEdW1wUmVuZGVyVHJlZVN1cHBvcnQgc3Ry dWN0dXJlLgorCiAyMDExLTAzLTEwICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlh LmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBHdXN0YXZvIE5vcm9uaGEgU2lsdmEuCmRpZmYg LS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9ndGsvRHVtcFJlbmRlclRyZWUuY3BwIGIvVG9v bHMvRHVtcFJlbmRlclRyZWUvZ3RrL0R1bXBSZW5kZXJUcmVlLmNwcAppbmRleCBjY2YyOTVmLi5h NDJmOWEwIDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9ndGsvRHVtcFJlbmRlclRy ZWUuY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2d0ay9EdW1wUmVuZGVyVHJlZS5jcHAK QEAgLTQ2NSw2ICs0NjUsNyBAQCBzdGF0aWMgdm9pZCByZXNldERlZmF1bHRzVG9Db25zaXN0ZW50 VmFsdWVzKCkKICAgICAgICAgYXhDb250cm9sbGVyLT5yZXNldFRvQ29uc2lzdGVudFN0YXRlKCk7 CiAKICAgICBEdW1wUmVuZGVyVHJlZVN1cHBvcnRHdGs6OmNsZWFyT3BlbmVyKG1haW5GcmFtZSk7 CisgICAgRHVtcFJlbmRlclRyZWVTdXBwb3J0R3RrOjpyZW1vdmVBbGxVc2VyQ29udGVudChtYWlu RnJhbWUpOwogfQogCiBzdGF0aWMgYm9vbCB1c2VMb25nUnVubmluZ1NlcnZlck1vZGUoaW50IGFy Z2MsIGNoYXIgKmFyZ3ZbXSkKQEAgLTY5NCw2ICs2OTUsOCBAQCBzdGF0aWMgdm9pZCBydW5UZXN0 KGNvbnN0IHN0cmluZyYgdGVzdFBhdGhPclVSTCkKICAgICAgICAgd2ViVmlld0xpc3QgPSAwOwog ICAgIH0KIAorICAgIHJlc2V0RGVmYXVsdHNUb0NvbnNpc3RlbnRWYWx1ZXMoKTsKKwogICAgIC8v IEEgYmxhbmsgbG9hZCBzZWVtcyB0byBiZSBuZWNlc3NhcnkgdG8gcmVzZXQgc3RhdGUgYWZ0ZXIg Y2VydGFpbiB0ZXN0cy4KICAgICB3ZWJraXRfd2ViX3ZpZXdfb3Blbih3ZWJWaWV3LCAiYWJvdXQ6 YmxhbmsiKTsKIApkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvZ3RrL0xheW91dFRl c3RDb250cm9sbGVyR3RrLmNwcCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2d0ay9MYXlvdXRUZXN0 Q29udHJvbGxlckd0ay5jcHAKaW5kZXggNzY5N2NhYi4uZDlmMDcxYyAxMDA2NDQKLS0tIGEvVG9v bHMvRHVtcFJlbmRlclRyZWUvZ3RrL0xheW91dFRlc3RDb250cm9sbGVyR3RrLmNwcAorKysgYi9U b29scy9EdW1wUmVuZGVyVHJlZS9ndGsvTGF5b3V0VGVzdENvbnRyb2xsZXJHdGsuY3BwCkBAIC03 NjgsNyArNzY4LDggQEAgdm9pZCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6b3ZlcnJpZGVQcmVmZXJl bmNlKEpTU3RyaW5nUmVmIGtleSwgSlNTdHJpbmdSZWYgdmFsdWUKIAogdm9pZCBMYXlvdXRUZXN0 Q29udHJvbGxlcjo6YWRkVXNlclNjcmlwdChKU1N0cmluZ1JlZiBzb3VyY2UsIGJvb2wgcnVuQXRT dGFydCwgYm9vbCBhbGxGcmFtZXMpCiB7Ci0gICAgcHJpbnRmKCJMYXlvdXRUZXN0Q29udHJvbGxl cjo6YWRkVXNlclNjcmlwdCBub3QgaW1wbGVtZW50ZWQuXG4iKTsKKyAgICBHT3duUHRyPGdjaGFy PiBzb3VyY2VDb2RlKEpTU3RyaW5nQ29weVVURjhDU3RyaW5nKHNvdXJjZSkpOworICAgIER1bXBS ZW5kZXJUcmVlU3VwcG9ydEd0azo6YWRkVXNlclNjcmlwdChtYWluRnJhbWUsIHNvdXJjZUNvZGUu Z2V0KCksIHJ1bkF0U3RhcnQsIGFsbEZyYW1lcyk7CiB9CiAKIHZvaWQgTGF5b3V0VGVzdENvbnRy b2xsZXI6OmFkZFVzZXJTdHlsZVNoZWV0KEpTU3RyaW5nUmVmIHNvdXJjZSwgYm9vbCBhbGxGcmFt ZXMpCg==