120404 2013-08-28 05:52:42 -0700 [GTK] [WK2] TestWebKitWebView snapshot fails 2015-01-19 05:34:03 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 121162 117689 1 brian.holt brian.holt cgarcia commit-queue csaavedra gustavo mario mrobinson zan oldest_to_newest 921954 0 brian.holt 2013-08-28 05:52:42 -0700 The unit test for snapshots fails on the expected size of the snapshot. ERROR:../../Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebView.cpp:553:void testWebViewSnapshot(SnapshotWebViewTest*, gconstpointer): assertion failed (width <= 50): (200 <= 50) 922841 1 brian.holt 2013-08-30 01:46:44 -0700 The problem is that gtk_widget_size_allocate() no longer resizes the widget in WebViewTest::resizeView(). Its not clear to me what the right function is, or if its even possible to resize a widget that's not a window. Options now are 1) find a function that resizes a widget 2) disable the test 3) rewrite the test to avoid resizing (although Claudio felt that this was necessary to test the functionality) What is the best course of action here? 922880 2 cgarcia 2013-08-30 04:51:56 -0700 You can try resizing the window instead of the view. 922890 3 zan 2013-08-30 05:12:57 -0700 GTK's DumpRenderTree works around the resizing issues by spinning the main loop while the events are pending, simply because resizing is done asynchronously. http://trac.webkit.org/browser/trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp#L622 Could you give that a try? 922923 4 csaavedra 2013-08-30 06:47:13 -0700 (In reply to comment #3) > GTK's DumpRenderTree works around the resizing issues by spinning the main loop while the events are pending, simply because resizing is done asynchronously. > http://trac.webkit.org/browser/trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp#L622 > > Could you give that a try? That probably needs to be added to the resizeView() method (or whatever is called) in WebViewTest. 923001 5 brian.holt 2013-08-30 09:34:43 -0700 (In reply to comment #3) > GTK's DumpRenderTree works around the resizing issues by spinning the main loop while the events are pending, simply because resizing is done asynchronously. > http://trac.webkit.org/browser/trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp#L622 > > Could you give that a try? Just tried that -> it successfully pumps all the events but the webview doesn't get resized. 923017 6 brian.holt 2013-08-30 09:48:13 -0700 (In reply to comment #2) > You can try resizing the window instead of the view. That solves it, but only when used with the event pump! Thanks everyone for the help, patch coming soon... 923023 7 210125 brian.holt 2013-08-30 09:56:17 -0700 Created attachment 210125 Patch 923024 8 210125 commit-queue 2013-08-30 09:57:22 -0700 Comment on attachment 210125 Patch Rejecting attachment 210125 from commit-queue. brian.holt@samsung.com does not have committer permissions according to http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/contributors.json. - If you do not have committer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags. - If you have committer rights please correct the error in Tools/Scripts/webkitpy/common/config/contributors.json by adding yourself to the file (no review needed). The commit-queue restarts itself every 2 hours. After restart the commit-queue will correctly respect your committer rights. 923027 9 brian.holt 2013-08-30 09:58:17 -0700 (In reply to comment #8) > (From update of attachment 210125 [details]) > Rejecting attachment 210125 [details] from commit-queue. > > brian.holt@samsung.com does not have committer permissions according to http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/contributors.json. > > - If you do not have committer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags. > > - If you have committer rights please correct the error in Tools/Scripts/webkitpy/common/config/contributors.json by adding yourself to the file (no review needed). The commit-queue restarts itself every 2 hours. After restart the commit-queue will correctly respect your committer rights. Sorry, that was a mistake -> wanted to set the cq? flag. 923029 10 commit-queue 2013-08-30 09:58:36 -0700 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 923030 11 210125 darin 2013-08-30 09:59:16 -0700 Comment on attachment 210125 Patch While I’m not a GTK expert, I feel I know enough to OK this, especially given that it’s in the test code. 923050 12 csaavedra 2013-08-30 10:25:40 -0700 If we don't understand what exactly changed in WK that requires this method to be changed, it seems to me that this is more a workaround than an actual fix. 923079 13 210125 commit-queue 2013-08-30 10:59:34 -0700 Comment on attachment 210125 Patch Clearing flags on attachment: 210125 Committed r154899: <http://trac.webkit.org/changeset/154899> 923080 14 commit-queue 2013-08-30 10:59:37 -0700 All reviewed patches have been landed. Closing bug. 927219 15 210125 cgarcia 2013-09-10 01:46:00 -0700 Comment on attachment 210125 Patch Sorry to be late here (again), but this is not correct. WebViewTest::resizeView() might be used by tests not using a window, so we can't assume m_parentWindow is non-NULL pointer. This also broke the inspector unit tests here that also use resizeView, but I don't know exactly why, because inspector test uses a window. 927795 16 brian.holt 2013-09-11 08:45:39 -0700 (In reply to comment #15) > (From update of attachment 210125 [details]) > Sorry to be late here (again), but this is not correct. WebViewTest::resizeView() might be used by tests not using a window, so we can't assume m_parentWindow is non-NULL pointer. This also broke the inspector unit tests here that also use resizeView, but I don't know exactly why, because inspector test uses a window. After discussion with Carlos on IRC it seems we should roll this out. It looks like the patch has exactly the same behaviour as the previous code the snapshot test fails first time under xvfb for both old and new code, but passes on subsequent runs, whereas the test passes every time under X for both old and new. So its an Xvfb issue and this patch doesn't resolve it. 927797 17 commit-queue 2013-09-11 08:48:06 -0700 Re-opened since this is blocked by bug 121162 1062327 18 cgarcia 2015-01-19 04:14:45 -0800 There are at least problems here: 1.- Resizing the web view works, but since we are using a size smaller than the window size, the web view is then resized again to fill the parent container. That's why we need to resize the window instead. 2.- When the WebView is resized, a message is sent to the WebProcess, but since we use injected bundle message to implement snapshots, it can happen that the GetSnapshot message is received before the resize one, and we create the snapshot with the previous size. We should make sure the web view is mapped in the window at the desired size. I also think we should use fixed values for the document size and visible area, setting the doc size using CSS and disabling the scrollbars in CSS as well. I'll rework the test, it has been skipped for too long 1062328 19 244894 cgarcia 2015-01-19 04:26:02 -0800 Created attachment 244894 Patch 1062341 20 cgarcia 2015-01-19 05:34:03 -0800 Committed r178644: <http://trac.webkit.org/changeset/178644> 210125 2013-08-30 09:56:17 -0700 2015-01-19 04:26:02 -0800 Patch bug-120404-20130830175701.patch text/plain 1856 brian.holt U3VidmVyc2lvbiBSZXZpc2lvbjogMTU0ODg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNGQ4NDVlNmUwN2UyNDVi MTViMmIyNWFkNjE4YWFhYjBhMDNkOWY1Yy4uOWQyN2RkODZlMDM2NjgzMTU1OTZkODRkZTc4MTll MTQ3ZGM1NzBkMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEzLTA4LTMwICBCcmlh biBIb2x0ICA8YnJpYW4uaG9sdEBzYW1zdW5nLmNvbT4KKworICAgICAgICBbR1RLXSBbV0syXSBU ZXN0V2ViS2l0V2ViVmlldyBzbmFwc2hvdCBmYWlscworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIwNDA0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgRml4ZWQgdGhlIHNuYXBzaG90IHRlc3QgZmFpbHVyZSBj YXVzZWQgYnkgR1RLIG5vIGxvbmdlciBhbGxvd2luZworICAgICAgICB3aWRnZXRzIHRvIHJlc2l6 ZS4gIEluc3RlYWQsIHJlc2l6ZSB0aGUgV2ViVmlldyBieSByZXNpemluZyB0aGUKKyAgICAgICAg d2luZG93IGFuZCB3YWl0aW5nIGZvciB0aGUgZXZlbnQgdG8gY29tcGxldGUgYXN5bmNocm9ub3Vz bHkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9XZWJWaWV3VGVzdC5jcHA6 CisgICAgICAgIChXZWJWaWV3VGVzdDo6cmVzaXplVmlldyk6CisKIDIwMTMtMDgtMzAgIEdhYm9y IEFicmFoYW0gIDxhYnJobUBpbmYudS1zemVnZWQuaHU+CiAKICAgICAgICAgRml4LCByZW1vdmUg dW51c2VkIHBhcmFtZXRlciBpbiBVSVByb2Nlc3MvV2ViQ29sb3JQaWNrZXIuY3BwLgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvV2ViVmlld1Rlc3Qu Y3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvV2ViVmlld1Rlc3Qu Y3BwCmluZGV4IGU2Yzg0MzQ1NmYzNWMwZjFhOWIzMDFmODc2MTIxNWU4NDQ5MmVmZGUuLjVhZDdm YTZiOTM3MGU1N2U4ODUwYjljMTczYzU2ZTRlZTFlZTRiNDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1dlYlZpZXdUZXN0LmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9XZWJWaWV3VGVzdC5jcHAKQEAgLTIw MSwxMyArMjAxLDEwIEBAIHZvaWQgV2ViVmlld1Rlc3Q6OnNob3dJbldpbmRvd0FuZFdhaXRVbnRp bE1hcHBlZChHdGtXaW5kb3dUeXBlIHdpbmRvd1R5cGUpCiAKIHZvaWQgV2ViVmlld1Rlc3Q6OnJl c2l6ZVZpZXcoaW50IHdpZHRoLCBpbnQgaGVpZ2h0KQogewotICAgIEd0a0FsbG9jYXRpb24gYWxs b2NhdGlvbjsKLSAgICBndGtfd2lkZ2V0X2dldF9hbGxvY2F0aW9uKEdUS19XSURHRVQobV93ZWJW aWV3KSwgJmFsbG9jYXRpb24pOwotICAgIGlmICh3aWR0aCAhPSAtMSkKLSAgICAgICAgYWxsb2Nh dGlvbi53aWR0aCA9IHdpZHRoOwotICAgIGlmIChoZWlnaHQgIT0gLTEpCi0gICAgICAgIGFsbG9j YXRpb24uaGVpZ2h0ID0gaGVpZ2h0OwotICAgIGd0a193aWRnZXRfc2l6ZV9hbGxvY2F0ZShHVEtf V0lER0VUKG1fd2ViVmlldyksICZhbGxvY2F0aW9uKTsKKyAgICBndGtfd2luZG93X3Jlc2l6ZShH VEtfV0lORE9XKG1fcGFyZW50V2luZG93KSwgd2lkdGgsIGhlaWdodCk7CisKKyAgICB3aGlsZSAo Z3RrX2V2ZW50c19wZW5kaW5nKCkpCisgICAgICAgIGd0a19tYWluX2l0ZXJhdGlvbigpOwogfQog CiB2b2lkIFdlYlZpZXdUZXN0OjpzZWxlY3RBbGwoKQo= 244894 2015-01-19 04:26:02 -0800 2015-01-19 04:35:24 -0800 Patch wk2-snapshot-test.diff text/plain 8754 cgarcia ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA1Yjkx MTFiLi5lZDRhOTM4IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDUgKzEsMjYgQEAKIDIwMTUtMDEtMTkgIENhcmxvcyBHYXJjaWEgQ2FtcG9z ICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCisgICAgICAgIFtHVEtdIFtXSzJdIFRlc3RXZWJLaXRX ZWJWaWV3IHNuYXBzaG90IGZhaWxzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMjA0MDQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBSZXdvcmsgdGhlIHRlc3QgdG8gbWFrZSBzdXJlIHRoZSBzbmFwc2hvdCBp cyBhbHdheXMgY3JlYXRlZCBhdCB0aGUKKyAgICAgICAgZGVzaXJlZCBzaXplLgorCisgICAgICAg ICogU2NyaXB0cy9ydW4tZ3RrLXRlc3RzOgorICAgICAgICAoVGVzdFJ1bm5lcik6IFVuc2tpcCAv d2Via2l0Mi9XZWJLaXRXZWJWaWV3L3NuYXBzaG90LgorICAgICAgICAqIFRlc3RXZWJLaXRBUEkv VGVzdHMvV2ViS2l0Mkd0ay9UZXN0V2ViS2l0V2ViVmlldy5jcHA6CisgICAgICAgICh0ZXN0V2Vi Vmlld1NuYXBzaG90KTogVXNlIGEgZml4ZWQgc2l6ZSBmb3IgdGhlIGRvY3VtZW50LCBhbmQKKyAg ICAgICAgZGlzYWJsZSBzY3JvbGxiYXJzIHRvIG1ha2Ugc3VyZSB0aGUgdmlzaWJsZSBhcmVhIGlz IGFsd2F5cyB0aGUKKyAgICAgICAgV2ViVmlldyBzaXplLgorICAgICAgICAqIFRlc3RXZWJLaXRB UEkvZ3RrL1dlYktpdDJHdGsvV2ViVmlld1Rlc3QuY3BwOgorICAgICAgICAoV2ViVmlld1Rlc3Q6 OnNob3dJbldpbmRvd0FuZFdhaXRVbnRpbE1hcHBlZCk6IEFkZCBvcHRpb25hbCB3aWR0aAorICAg ICAgICBhbmQgaGVpZ2h0IHBhcmFtZXRlcnMgdG8gY3JlYXRlIHRoZSB3aW5kb3cgd2l0aCBhIGdp dmVuIHNpemUuCisgICAgICAgICogVGVzdFdlYktpdEFQSS9ndGsvV2ViS2l0Mkd0ay9XZWJWaWV3 VGVzdC5oOgorCisyMDE1LTAxLTE5ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdh bGlhLmNvbT4KKwogICAgICAgICBbR1RLXSBBZGQgQVBJIHRvIGNoYW5nZSB0aGUgV2ViS2l0V2Vi VmlldyBiYWNrZ3JvdW5kIGNvbG9yCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNDA2MTAKIApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9ydW4tZ3Rr LXRlc3RzIGIvVG9vbHMvU2NyaXB0cy9ydW4tZ3RrLXRlc3RzCmluZGV4IGU2ZjVlYTQuLjEwMzk1 OTIgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvcnVuLWd0ay10ZXN0cworKysgYi9Ub29scy9T Y3JpcHRzL3J1bi1ndGstdGVzdHMKQEAgLTY0LDcgKzY0LDYgQEAgY2xhc3MgVGVzdFJ1bm5lcjoK ICAgICAgICAgU2tpcHBlZFRlc3QoIldlYktpdDJHdGsvVGVzdFVJQ2xpZW50IiwgIi93ZWJraXQy L1dlYktpdFdlYlZpZXcvbW91c2UtdGFyZ2V0IiwgIlRlc3QgdGltZXMgb3V0IGFmdGVyIHIxNTA4 OTAiLCAxMTc2ODkpLAogICAgICAgICBTa2lwcGVkVGVzdCgiV2ViS2l0Mkd0ay9UZXN0Q29udGV4 dE1lbnUiLCBTa2lwcGVkVGVzdC5FTlRJUkVfU1VJVEUsICJUZXN0IHRpbWVzIG91dCBhZnRlciBy MTUwODkwIiwgMTE3Njg5KSwKICAgICAgICAgU2tpcHBlZFRlc3QoIldlYktpdDJBUElUZXN0cy9U ZXN0V2ViS2l0QWNjZXNzaWJpbGl0eSIsICIvd2Via2l0Mi9XZWJLaXRBY2Nlc3NpYmlsaXR5L2F0 c3BpLWJhc2ljLWhpZXJhcmNoeSIsICJUZXN0IGlzIGZsYWt5IiwgMTMyMTM0KSwKLSAgICAgICAg U2tpcHBlZFRlc3QoIldlYktpdDJHdGsvVGVzdFdlYktpdFdlYlZpZXciLCAiL3dlYmtpdDIvV2Vi S2l0V2ViVmlldy9zbmFwc2hvdCIsICJUZXN0IGZhaWxzIiwgMTIwNDA0KSwKICAgICAgICAgU2tp cHBlZFRlc3QoIldlYktpdDJHdGsvVGVzdFdlYktpdFdlYlZpZXciLCAiL3dlYmtpdDIvV2ViS2l0 V2ViVmlldy9wYWdlLXZpc2liaWxpdHkiLCAiVGVzdCBmYWlscyBvciB0aW1lcyBvdXQiLCAxMzE3 MzEpLAogICAgICAgICBTa2lwcGVkVGVzdCgiV2ViS2l0Mkd0ay9UZXN0Q29va2llTWFuYWdlciIs ICIvd2Via2l0Mi9XZWJLaXRDb29raWVNYW5hZ2VyL3BlcnNpc3RlbnQtc3RvcmFnZSIsICJUZXN0 IGlzIGZsYWt5IiwgMTM0NTgwKSwKICAgICAgICAgU2tpcHBlZFRlc3QoIldlYktpdDIvVGVzdFdl YktpdDIiLCAiV2ViS2l0Mi5Nb3VzZU1vdmVBZnRlckNyYXNoIiwgIlRlc3QgaXMgZmxha3kiLCA4 NTA2NiksCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJHdGsv VGVzdFdlYktpdFdlYlZpZXcuY3BwIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQy R3RrL1Rlc3RXZWJLaXRXZWJWaWV3LmNwcAppbmRleCAxNzdhNmJiLi4zNzBiYmQ0IDEwMDY0NAot LS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJHdGsvVGVzdFdlYktpdFdlYlZp ZXcuY3BwCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mkd0ay9UZXN0V2Vi S2l0V2ViVmlldy5jcHAKQEAgLTU0Niw1OSArNTQ2LDQ0IEBAIHB1YmxpYzoKIAogc3RhdGljIHZv aWQgdGVzdFdlYlZpZXdTbmFwc2hvdChTbmFwc2hvdFdlYlZpZXdUZXN0KiB0ZXN0LCBnY29uc3Rw b2ludGVyKQogewotICAgIHRlc3QtPmxvYWRIdG1sKCI8aHRtbD48Ym9keT48cD5XaGF0ZXZlcjwv cD48L2JvZHk+PC9odG1sPiIsIDApOworICAgIHRlc3QtPmxvYWRIdG1sKCI8aHRtbD48aGVhZD48 c3R5bGU+aHRtbCB7IHdpZHRoOiAyMDBweDsgaGVpZ2h0OiAxMDBweDsgfSA6Oi13ZWJraXQtc2Ny b2xsYmFyIHsgZGlzcGxheTogbm9uZTsgfTwvc3R5bGU+PC9oZWFkPjxib2R5PjxwPldoYXRldmVy PC9wPjwvYm9keT48L2h0bWw+IiwgbnVsbHB0cik7CiAgICAgdGVzdC0+d2FpdFVudGlsTG9hZEZp bmlzaGVkKCk7CiAKLSAgICAvLyBXZWJWaWV3IG5vdCB2aXNpYmxlLgorICAgIC8vIFdFQktJVF9T TkFQU0hPVF9SRUdJT05fVklTSUJMRSByZXR1cm5zIGEgbnVsbCBzdXJmYWNlIHdoZW4gdGhlIHZp ZXcgaXMgbm90IHZpc2libGUuCiAgICAgY2Fpcm9fc3VyZmFjZV90KiBzdXJmYWNlMSA9IHRlc3Qt PmdldFNuYXBzaG90QW5kV2FpdFVudGlsUmVhZHkoV0VCS0lUX1NOQVBTSE9UX1JFR0lPTl9WSVNJ QkxFLCBXRUJLSVRfU05BUFNIT1RfT1BUSU9OU19OT05FKTsKICAgICBnX2Fzc2VydCghc3VyZmFj ZTEpOwogCi0gICAgLy8gU2hvdyBzdXJmYWNlLCByZXNpemUgdG8gNTB4NTAsIHRyeSBhZ2Fpbi4K LSAgICB0ZXN0LT5zaG93SW5XaW5kb3dBbmRXYWl0VW50aWxNYXBwZWQoKTsKLSAgICB0ZXN0LT5y ZXNpemVWaWV3KDUwLCA1MCk7Ci0gICAgc3VyZmFjZTEgPSB0ZXN0LT5nZXRTbmFwc2hvdEFuZFdh aXRVbnRpbFJlYWR5KFdFQktJVF9TTkFQU0hPVF9SRUdJT05fVklTSUJMRSwgV0VCS0lUX1NOQVBT SE9UX09QVElPTlNfTk9ORSk7CisgICAgLy8gV0VCS0lUX1NOQVBTSE9UX1JFR0lPTl9GVUxMX0RP Q1VNRU5UIHdvcmtzIGV2ZW4gaWYgdGhlIHdpbmRvdyBpcyBub3QgdmlzaWJsZS4KKyAgICBzdXJm YWNlMSA9IHRlc3QtPmdldFNuYXBzaG90QW5kV2FpdFVudGlsUmVhZHkoV0VCS0lUX1NOQVBTSE9U X1JFR0lPTl9GVUxMX0RPQ1VNRU5ULCBXRUJLSVRfU05BUFNIT1RfT1BUSU9OU19OT05FKTsKICAg ICBnX2Fzc2VydChzdXJmYWNlMSk7CisgICAgZ19hc3NlcnRfY21wdWludChjYWlyb19zdXJmYWNl X2dldF90eXBlKHN1cmZhY2UxKSwgPT0sIENBSVJPX1NVUkZBQ0VfVFlQRV9JTUFHRSk7CisgICAg Z19hc3NlcnRfY21waW50KGNhaXJvX2ltYWdlX3N1cmZhY2VfZ2V0X3dpZHRoKHN1cmZhY2UxKSwg PT0sIDIwMCk7CisgICAgZ19hc3NlcnRfY21waW50KGNhaXJvX2ltYWdlX3N1cmZhY2VfZ2V0X2hl aWdodChzdXJmYWNlMSksID09LCAxMDApOwogCi0gICAgLy8gb2J0YWluZWQgc3VyZmFjZSBzaG91 bGQgYmUgYXQgdGhlIG1vc3QgNTB4NTAuIFN0b3JlIHRoZSBzaXplCi0gICAgLy8gZm9yIGNvbXBh cmlzb24gbGF0ZXIuCi0gICAgaW50IHdpZHRoID0gY2Fpcm9faW1hZ2Vfc3VyZmFjZV9nZXRfd2lk dGgoc3VyZmFjZTEpOwotICAgIGludCBoZWlnaHQgPSBjYWlyb19pbWFnZV9zdXJmYWNlX2dldF9o ZWlnaHQoc3VyZmFjZTEpOwotICAgIGdfYXNzZXJ0X2NtcGludCh3aWR0aCwgPD0sIDUwKTsKLSAg ICBnX2Fzc2VydF9jbXBpbnQoaGVpZ2h0LCA8PSwgNTApOwotCi0gICAgLy8gU2VsZWN0IGFsbCB0 ZXh0IGluIHRoZSBXZWJWaWV3LCByZXF1ZXN0IGEgc25hcHNob3QgaWdub3Jpbmcgc2VsZWN0aW9u LgotICAgIHRlc3QtPnNlbGVjdEFsbCgpOworICAgIC8vIFNob3cgdGhlIFdlYlZpZXcgaW4gYSBw b3B1cCB3aWRvdyBvZiA1MHg1MCBhbmQgdHJ5IGFnYWluIHdpdGggV0VCS0lUX1NOQVBTSE9UX1JF R0lPTl9WSVNJQkxFLgorICAgIHRlc3QtPnNob3dJbldpbmRvd0FuZFdhaXRVbnRpbE1hcHBlZChH VEtfV0lORE9XX1BPUFVQLCA1MCwgNTApOwogICAgIHN1cmZhY2UxID0gY2Fpcm9fc3VyZmFjZV9y ZWZlcmVuY2UodGVzdC0+Z2V0U25hcHNob3RBbmRXYWl0VW50aWxSZWFkeShXRUJLSVRfU05BUFNI T1RfUkVHSU9OX1ZJU0lCTEUsIFdFQktJVF9TTkFQU0hPVF9PUFRJT05TX05PTkUpKTsKICAgICBn X2Fzc2VydChzdXJmYWNlMSk7Ci0gICAgZ19hc3NlcnRfY21waW50KGNhaXJvX2ltYWdlX3N1cmZh Y2VfZ2V0X3dpZHRoKHN1cmZhY2UxKSwgPT0sIHdpZHRoKTsKLSAgICBnX2Fzc2VydF9jbXBpbnQo Y2Fpcm9faW1hZ2Vfc3VyZmFjZV9nZXRfaGVpZ2h0KHN1cmZhY2UxKSwgPT0sIGhlaWdodCk7Cisg ICAgZ19hc3NlcnRfY21wdWludChjYWlyb19zdXJmYWNlX2dldF90eXBlKHN1cmZhY2UxKSwgPT0s IENBSVJPX1NVUkZBQ0VfVFlQRV9JTUFHRSk7CisgICAgZ19hc3NlcnRfY21waW50KGNhaXJvX2lt YWdlX3N1cmZhY2VfZ2V0X3dpZHRoKHN1cmZhY2UxKSwgPT0sIDUwKTsKKyAgICBnX2Fzc2VydF9j bXBpbnQoY2Fpcm9faW1hZ2Vfc3VyZmFjZV9nZXRfaGVpZ2h0KHN1cmZhY2UxKSwgPT0sIDUwKTsK IAotICAgIC8vIENyZWF0ZSBpZGVudGljYWwgc3VyZmFjZS4KKyAgICAvLyBTZWxlY3QgYWxsIHRl eHQgaW4gdGhlIFdlYlZpZXcsIHJlcXVlc3QgYSBzbmFwc2hvdCBpZ25vcmluZyBzZWxlY3Rpb24u CisgICAgdGVzdC0+c2VsZWN0QWxsKCk7CiAgICAgY2Fpcm9fc3VyZmFjZV90KiBzdXJmYWNlMiA9 IHRlc3QtPmdldFNuYXBzaG90QW5kV2FpdFVudGlsUmVhZHkoV0VCS0lUX1NOQVBTSE9UX1JFR0lP Tl9WSVNJQkxFLCBXRUJLSVRfU05BUFNIT1RfT1BUSU9OU19OT05FKTsKICAgICBnX2Fzc2VydChz dXJmYWNlMik7Ci0KLSAgICAvLyBDb21wYXJlIHRoZXNlIHR3bywgdGhleSBzaG91bGQgYmUgaWRl bnRpY2FsLgogICAgIGdfYXNzZXJ0KFRlc3Q6OmNhaXJvU3VyZmFjZXNFcXVhbChzdXJmYWNlMSwg c3VyZmFjZTIpKTsKIAotICAgIC8vIFJlcXVlc3QgYSBuZXcgc25hcHNob3QsIGluY2x1ZGluZyB0 aGUgc2VsZWN0aW9uIHRoaXMgdGltZS4gVGhlCi0gICAgLy8gc2l6ZSBzaG91bGQgYmUgdGhlIHNh bWUgYnV0IHRoZSByZXN1bHQgbXVzdCBiZSBkaWZmZXJlbnQgdG8gdGhlCi0gICAgLy8gb25lIHBy ZXZpb3VzbHkgb2J0YWluZWQuCisgICAgLy8gUmVxdWVzdCBhIG5ldyBzbmFwc2hvdCwgaW5jbHVk aW5nIHRoZSBzZWxlY3Rpb24gdGhpcyB0aW1lLiBUaGUgc2l6ZSBzaG91bGQgYmUgdGhlIHNhbWUg YnV0IHRoZSByZXN1bHQKKyAgICAvLyBtdXN0IGJlIGRpZmZlcmVudCB0byB0aGUgb25lIHByZXZp b3VzbHkgb2J0YWluZWQuCiAgICAgc3VyZmFjZTIgPSB0ZXN0LT5nZXRTbmFwc2hvdEFuZFdhaXRV bnRpbFJlYWR5KFdFQktJVF9TTkFQU0hPVF9SRUdJT05fVklTSUJMRSwgV0VCS0lUX1NOQVBTSE9U X09QVElPTlNfSU5DTFVERV9TRUxFQ1RJT05fSElHSExJR0hUSU5HKTsKLSAgICBnX2Fzc2VydChz dXJmYWNlMik7Ci0gICAgZ19hc3NlcnRfY21waW50KGNhaXJvX2ltYWdlX3N1cmZhY2VfZ2V0X3dp ZHRoKHN1cmZhY2UyKSwgPT0sIHdpZHRoKTsKLSAgICBnX2Fzc2VydF9jbXBpbnQoY2Fpcm9faW1h Z2Vfc3VyZmFjZV9nZXRfaGVpZ2h0KHN1cmZhY2UyKSwgPT0sIGhlaWdodCk7Ci0gICAgZ19hc3Nl cnQoIVRlc3Q6OmNhaXJvU3VyZmFjZXNFcXVhbChzdXJmYWNlMSwgc3VyZmFjZTIpKTsKLQotICAg IC8vIFJlcXVlc3QgYSBzbmFwc2hvdCBvZiB0aGUgd2hvbGUgZG9jdW1lbnQgaW4gdGhlIFdlYlZp ZXcuIFRoZQotICAgIC8vIHJlc3VsdCBzaG91bGQgYmUgZGlmZmVyZW50IGZyb20gdGhlIHNpemUg b2J0YWluZWQgcHJldmlvdXNseS4KLSAgICBzdXJmYWNlMiA9IHRlc3QtPmdldFNuYXBzaG90QW5k V2FpdFVudGlsUmVhZHkoV0VCS0lUX1NOQVBTSE9UX1JFR0lPTl9GVUxMX0RPQ1VNRU5ULCBXRUJL SVRfU05BUFNIT1RfT1BUSU9OU19OT05FKTsKLSAgICBnX2Fzc2VydChzdXJmYWNlMik7Ci0gICAg Z19hc3NlcnRfY21waW50KGNhaXJvX2ltYWdlX3N1cmZhY2VfZ2V0X3dpZHRoKHN1cmZhY2UyKSwg ID4sIHdpZHRoKTsKLSAgICBnX2Fzc2VydF9jbXBpbnQoY2Fpcm9faW1hZ2Vfc3VyZmFjZV9nZXRf aGVpZ2h0KHN1cmZhY2UyKSwgPiwgaGVpZ2h0KTsKKyAgICBnX2Fzc2VydF9jbXB1aW50KGNhaXJv X3N1cmZhY2VfZ2V0X3R5cGUoc3VyZmFjZTIpLCA9PSwgQ0FJUk9fU1VSRkFDRV9UWVBFX0lNQUdF KTsKKyAgICBnX2Fzc2VydF9jbXBpbnQoY2Fpcm9faW1hZ2Vfc3VyZmFjZV9nZXRfd2lkdGgoc3Vy ZmFjZTEpLCA9PSwgY2Fpcm9faW1hZ2Vfc3VyZmFjZV9nZXRfd2lkdGgoc3VyZmFjZTIpKTsKKyAg ICBnX2Fzc2VydF9jbXBpbnQoY2Fpcm9faW1hZ2Vfc3VyZmFjZV9nZXRfaGVpZ2h0KHN1cmZhY2Ux KSwgPT0sIGNhaXJvX2ltYWdlX3N1cmZhY2VfZ2V0X2hlaWdodChzdXJmYWNlMikpOwogICAgIGdf YXNzZXJ0KCFUZXN0OjpjYWlyb1N1cmZhY2VzRXF1YWwoc3VyZmFjZTEsIHN1cmZhY2UyKSk7Ci0K ICAgICBjYWlyb19zdXJmYWNlX2Rlc3Ryb3koc3VyZmFjZTEpOwogCisgICAgLy8gVGVzdCB0aGF0 IGNhbmNlbGxhdGlvbiB3b3Jrcy4KICAgICBnX2Fzc2VydCh0ZXN0LT5nZXRTbmFwc2hvdEFuZENh bmNlbCgpKTsKIH0KIApkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9ndGsvV2ViS2l0 Mkd0ay9XZWJWaWV3VGVzdC5jcHAgYi9Ub29scy9UZXN0V2ViS2l0QVBJL2d0ay9XZWJLaXQyR3Rr L1dlYlZpZXdUZXN0LmNwcAppbmRleCBlYThiNmIzLi5kYmFjMmQ2IDEwMDY0NAotLS0gYS9Ub29s cy9UZXN0V2ViS2l0QVBJL2d0ay9XZWJLaXQyR3RrL1dlYlZpZXdUZXN0LmNwcAorKysgYi9Ub29s cy9UZXN0V2ViS2l0QVBJL2d0ay9XZWJLaXQyR3RrL1dlYlZpZXdUZXN0LmNwcApAQCAtMjMyLDEw ICsyMzIsMTIgQEAgdm9pZCBXZWJWaWV3VGVzdDo6c2hvd0luV2luZG93KEd0a1dpbmRvd1R5cGUg d2luZG93VHlwZSkKICAgICBndGtfd2lkZ2V0X3Nob3cobV9wYXJlbnRXaW5kb3cpOwogfQogCi12 b2lkIFdlYlZpZXdUZXN0OjpzaG93SW5XaW5kb3dBbmRXYWl0VW50aWxNYXBwZWQoR3RrV2luZG93 VHlwZSB3aW5kb3dUeXBlKQordm9pZCBXZWJWaWV3VGVzdDo6c2hvd0luV2luZG93QW5kV2FpdFVu dGlsTWFwcGVkKEd0a1dpbmRvd1R5cGUgd2luZG93VHlwZSwgaW50IHdpZHRoLCBpbnQgaGVpZ2h0 KQogewogICAgIGdfYXNzZXJ0KCFtX3BhcmVudFdpbmRvdyk7CiAgICAgbV9wYXJlbnRXaW5kb3cg PSBndGtfd2luZG93X25ldyh3aW5kb3dUeXBlKTsKKyAgICBpZiAod2lkdGggJiYgaGVpZ2h0KQor ICAgICAgICBndGtfd2luZG93X3Jlc2l6ZShHVEtfV0lORE9XKG1fcGFyZW50V2luZG93KSwgd2lk dGgsIGhlaWdodCk7CiAgICAgZ3RrX2NvbnRhaW5lcl9hZGQoR1RLX0NPTlRBSU5FUihtX3BhcmVu dFdpbmRvdyksIEdUS19XSURHRVQobV93ZWJWaWV3KSk7CiAgICAgZ3RrX3dpZGdldF9zaG93KEdU S19XSURHRVQobV93ZWJWaWV3KSk7CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkv Z3RrL1dlYktpdDJHdGsvV2ViVmlld1Rlc3QuaCBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvZ3RrL1dl YktpdDJHdGsvV2ViVmlld1Rlc3QuaAppbmRleCAyYzM2OTJhLi44ZTA2MDM4IDEwMDY0NAotLS0g YS9Ub29scy9UZXN0V2ViS2l0QVBJL2d0ay9XZWJLaXQyR3RrL1dlYlZpZXdUZXN0LmgKKysrIGIv VG9vbHMvVGVzdFdlYktpdEFQSS9ndGsvV2ViS2l0Mkd0ay9XZWJWaWV3VGVzdC5oCkBAIC00OCw3 ICs0OCw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHdhaXRVbnRpbFRpdGxlQ2hhbmdlZFRvKGNvbnN0 IGNoYXIqIGV4cGVjdGVkVGl0bGUpOwogICAgIHZvaWQgd2FpdFVudGlsVGl0bGVDaGFuZ2VkKCk7 CiAgICAgdm9pZCBzaG93SW5XaW5kb3coR3RrV2luZG93VHlwZSA9IEdUS19XSU5ET1dfUE9QVVAp OwotICAgIHZvaWQgc2hvd0luV2luZG93QW5kV2FpdFVudGlsTWFwcGVkKEd0a1dpbmRvd1R5cGUg PSBHVEtfV0lORE9XX1BPUFVQKTsKKyAgICB2b2lkIHNob3dJbldpbmRvd0FuZFdhaXRVbnRpbE1h cHBlZChHdGtXaW5kb3dUeXBlID0gR1RLX1dJTkRPV19QT1BVUCwgaW50IHdpZHRoID0gMCwgaW50 IGhlaWdodCA9IDApOwogICAgIHZvaWQgcmVzaXplVmlldyhpbnQgd2lkdGgsIGludCBoZWlnaHQp OwogICAgIHZvaWQgc2VsZWN0QWxsKCk7CiAgICAgY29uc3QgY2hhciogbWFpblJlc291cmNlRGF0 YShzaXplX3QmIG1haW5SZXNvdXJjZURhdGFTaXplKTsK