133715 2014-06-10 20:45:34 -0700 [EFL][WK2] Add missing test cases for EWK2ViewTest 2014-06-11 21:57:08 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 shiva.jm webkit-unassigned bunhere cdumez commit-queue gyuyoung.kim lucas.de.marchi ossy rakuco sergio oldest_to_newest 1014649 0 shiva.jm 2014-06-10 20:45:34 -0700 Add missing test cases for ewk_view.h APIs, ewk_view_stop(), ewk_view_html_string_load(), ewk_view_theme_get(), ewk_view_feed_touch_event(), ewk_view_text_find_highlight_clear(), ewk_view_text_find(), ewk_view_text_matches_count(), ewk_view_page_contents_get(), ewk_view_script_execute(). 1014706 1 232858 shiva.jm 2014-06-11 03:24:34 -0700 Created attachment 232858 Patch Patch for Adding the missing test cases for EWK2ViewTest 1014707 2 232858 gyuyoung.kim 2014-06-11 03:31:20 -0700 Comment on attachment 232858 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=232858&action=review LGTM except for minor nits. > Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp:414 > + Unnecessary line. > Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp:1052 > + EXPECT_FALSE(ewk_view_page_contents_get(webView(), (Ewk_Page_Contents_Type) 2, PageContentsAsStringCallback, 0)); Use static_cast<Ewk_Page_Contents_Type> instead of (Ewk_Page_Contents_Type). 1014711 3 232860 shiva.jm 2014-06-11 03:51:11 -0700 Created attachment 232860 Patch for landing Updated with review comments 1014716 4 232860 commit-queue 2014-06-11 04:56:39 -0700 Comment on attachment 232860 Patch for landing Clearing flags on attachment: 232860 Committed r169801: <http://trac.webkit.org/changeset/169801> 1014717 5 commit-queue 2014-06-11 04:56:43 -0700 All reviewed patches have been landed. Closing bug. 1014828 6 ossy 2014-06-11 11:45:37 -0700 (In reply to comment #4) > (From update of attachment 232860 [details]) > Clearing flags on attachment: 232860 > > Committed r169801: <http://trac.webkit.org/changeset/169801> It broke the EFL WK2 build: CMake Error at Source/WebKit2/PlatformEfl.cmake:502 (add_executable): add_executable cannot create target "test_ewk2_view" because another target with the same name already exists. The existing target is an executable created in source directory "/mnt/buildbot/WebKit-BuildSlave/efl-linux-64-release-wk2/build/Source/WebKit2". See documentation for policy CMP0002 for more details. Call Stack (most recent call first): Source/cmake/WebKitMacros.cmake:4 (include) Source/cmake/WebKitMacros.cmake:203 (INCLUDE_IF_EXISTS) Source/WebKit2/CMakeLists.txt:688 (WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS) 1015005 7 gyuyoung.kim 2014-06-11 18:20:29 -0700 (In reply to comment #6) > (In reply to comment #4) > > (From update of attachment 232860 [details] [details]) > > Clearing flags on attachment: 232860 > > > > Committed r169801: <http://trac.webkit.org/changeset/169801> > > It broke the EFL WK2 build: > > CMake Error at Source/WebKit2/PlatformEfl.cmake:502 (add_executable): > add_executable cannot create target "test_ewk2_view" because another target > with the same name already exists. The existing target is an executable > created in source directory > "/mnt/buildbot/WebKit-BuildSlave/efl-linux-64-release-wk2/build/Source/WebKit2". > See documentation for policy CMP0002 for more details. > Call Stack (most recent call first): > Source/cmake/WebKitMacros.cmake:4 (include) > Source/cmake/WebKitMacros.cmake:203 (INCLUDE_IF_EXISTS) > Source/WebKit2/CMakeLists.txt:688 (WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS) Weird. There is no this build problem locally. Restarted efl-wk2 bot. 1015018 8 shiva.jm 2014-06-11 21:57:08 -0700 yes observed the same thing, There is no such build problem in my local machine 232858 2014-06-11 03:24:34 -0700 2014-06-11 03:51:11 -0700 Patch bug-133715.patch text/plain 6208 shiva.jm SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2OTc5OSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE0LTA2LTExICBTaGl2YWt1 bWFyIEpNICA8c2hpdmEuam1Ac2Ftc3VuZy5jb20+CisKKyAgICAgICAgW0VGTF1bV0syXSBBZGQg bWlzc2luZyB0ZXN0IGNhc2VzIGZvciBFV0syVmlld1Rlc3QuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzM3MTUKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgbWlzc2luZyB0ZXN0IGNhc2VzIGZvciBl d2tfdmlldy5oIEFQSXMsIGV3a192aWV3X3N0b3AoKSwgZXdrX3ZpZXdfaHRtbF9zdHJpbmdfbG9h ZCgpLCBld2tfdmlld190aGVtZV9nZXQoKSwgCisgICAgICAgIGV3a192aWV3X2ZlZWRfdG91Y2hf ZXZlbnQoKSwgZXdrX3ZpZXdfdGV4dF9maW5kX2hpZ2hsaWdodF9jbGVhcigpLCBld2tfdmlld190 ZXh0X2ZpbmQoKSwgZXdrX3ZpZXdfdGV4dF9tYXRjaGVzX2NvdW50KCksCisgICAgICAgIGV3a192 aWV3X3BhZ2VfY29udGVudHNfZ2V0KCksIGV3a192aWV3X3NjcmlwdF9leGVjdXRlKCkuCisKKyAg ICAgICAgKiBQbGF0Zm9ybUVmbC5jbWFrZToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC90 ZXN0cy90ZXN0X2V3azJfdmlldy5jcHA6CisgICAgICAgIChURVNUX0YpOgorCiAyMDE0LTA2LTEx ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBb R1RLXSBVc2UgYSBkaWZmZXJlbnQgdXNlciBhZ2VudCBzdHJpbmcgZGVwZW5kaW5nIG9uIHRoZSBz aXRlCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybUVmbC5jbWFrZQo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybUVmbC5jbWFrZQkocmV2aXNpb24gMTY5Nzk5KQorKysg U291cmNlL1dlYktpdDIvUGxhdGZvcm1FZmwuY21ha2UJKHdvcmtpbmcgY29weSkKQEAgLTQ4NSw2 ICs0ODUsNyBAQCBzZXQoRVdLMlVuaXRUZXN0c19CSU5BUklFUwogICAgIHRlc3RfZXdrMl9zc2wK ICAgICB0ZXN0X2V3azJfc3RvcmFnZV9tYW5hZ2VyCiAgICAgdGVzdF9ld2syX3dpbmRvd19mZWF0 dXJlcworICAgIHRlc3RfZXdrMl92aWV3CiApCiAKICMgU2tpcHBlZCB1bml0IHRlc3RzIGxpc3Q6 CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJf dmlldy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwv dGVzdHMvdGVzdF9ld2syX3ZpZXcuY3BwCShyZXZpc2lvbiAxNjk3OTkpCisrKyBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfdmlldy5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTI1Miw2ICsyNTIsOCBAQCBURVNUX0YoRVdLMlZpZXdUZXN0LCBld2tfdmlld19h ZGQpCiB7CiAgICAgRXZhc19PYmplY3QqIHZpZXcgPSBld2tfdmlld19hZGQoY2FudmFzKCkpOwog ICAgIEFTU0VSVF9FUShld2tfY29udGV4dF9kZWZhdWx0X2dldCgpLCBld2tfdmlld19jb250ZXh0 X2dldCh2aWV3KSk7CisKKyAgICBFWFBFQ1RfVFJVRShld2tfdmlld19zdG9wKHZpZXcpKTsKICAg ICBldmFzX29iamVjdF9kZWwodmlldyk7CiB9CiAKQEAgLTI5MSw2ICsyOTMsMTAgQEAgVEVTVF9G KEVXSzJWaWV3VGVzdCwgZXdrX3ZpZXdfaHRtbF9zdHJpbgogICAgIGV3a192aWV3X2h0bWxfc3Ry aW5nX2xvYWQod2ViVmlldygpLCAiPGh0bWw+PGhlYWQ+PHRpdGxlPkJhcjwvdGl0bGU+PC9oZWFk Pjxib2R5PkZvbzwvYm9keT48L2h0bWw+IiwgMCwgMCk7CiAgICAgQVNTRVJUX1RSVUUod2FpdFVu dGlsVGl0bGVDaGFuZ2VkVG8oIkJhciIpKTsKICAgICBBU1NFUlRfU1RSRVEoIkJhciIsIGV3a192 aWV3X3RpdGxlX2dldCh3ZWJWaWV3KCkpKTsKKworICAgIC8vIENoZWNraW5nIGluIGNhc2Ugb2Yg bnVsbCBmb3IgaHRtbCBhbmQgd2VidmlldworICAgIEFTU0VSVF9GQUxTRShld2tfdmlld19odG1s X3N0cmluZ19sb2FkKDAsICI8aHRtbD48aGVhZD48dGl0bGU+Rm9vPC90aXRsZT48L2hlYWQ+PGJv ZHk+QmFyPC9ib2R5PjwvaHRtbD4iLCAwLCAwKSk7CisgICAgQVNTRVJUX0ZBTFNFKGV3a192aWV3 X2h0bWxfc3RyaW5nX2xvYWQod2ViVmlldygpLCAwLCAwLCAwKSk7CiB9CiAKIFRFU1RfRihFV0sy Vmlld1Rlc3QsIGV3a192aWV3X25hdmlnYXRpb24pCkBAIC00MDMsNiArNDA5LDkgQEAgVEVTVF9G KEVXSzJWaWV3VGVzdCwgZXdrX3ZpZXdfdGhlbWVfc2V0KQogICAgIGV3a192aWV3X3RoZW1lX3Nl dCh3ZWJWaWV3KCksIGVudmlyb25tZW50LT5wYXRoRm9yVGhlbWUoImJpZ19idXR0b25fdGhlbWUu ZWRqIikuZGF0YSgpKTsKICAgICBld2tfdmlld19odG1sX3N0cmluZ19sb2FkKHdlYlZpZXcoKSwg YnV0dG9uSFRNTCwgImZpbGU6Ly8vIiwgMCk7CiAgICAgRVhQRUNUX1RSVUUod2FpdFVudGlsVGl0 bGVDaGFuZ2VkVG8oIjI5OSIpKTsgLy8gYnV0dG9uIG9mIGJpZyBidXR0b24gdGhlbWUgaGFzIDI5 OXB4IGFzIHBhZGRpbmcgKDE1IHRvIC0yODUpCisKKyAgICBFWFBFQ1RfU1RSRVEoZW52aXJvbm1l bnQtPnBhdGhGb3JUaGVtZSgiYmlnX2J1dHRvbl90aGVtZS5lZGoiKS5kYXRhKCksIGV3a192aWV3 X3RoZW1lX2dldCh3ZWJWaWV3KCkpKTsKKwogfQogCiBURVNUX0YoRVdLMlZpZXdUZXN0LCBld2tf dmlld19tb3VzZV9ldmVudHNfZW5hYmxlZCkKQEAgLTcyMCw2ICs3MjksMTAgQEAgVEVTVF9GKEVX SzJWaWV3VGVzdCwgZXdrX3ZpZXdfZmVlZF90b3VjaAogICAgIEFTU0VSVF9UUlVFKGV3a192aWV3 X2ZlZWRfdG91Y2hfZXZlbnQod2ViVmlldygpLCBFV0tfVE9VQ0hfQ0FOQ0VMLCBwb2ludHMsIGV2 YXNfa2V5X21vZGlmaWVyX2dldChldmFzX29iamVjdF9ldmFzX2dldCh3ZWJWaWV3KCkpKSkpOwog ICAgIHBvaW50cyA9IGVpbmFfbGlzdF9yZW1vdmUocG9pbnRzLCAmcG9pbnQxKTsKIAorICAgIC8v IENoZWNraW5nIGluIGNhc2Ugb2YgbnVsbCBmb3IgcG9pbnRzIGFuZCB3ZWJ2aWV3CisgICAgRVhQ RUNUX0ZBTFNFKGV3a192aWV3X2ZlZWRfdG91Y2hfZXZlbnQoMCwgRVdLX1RPVUNIX0NBTkNFTCwg cG9pbnRzLCBldmFzX2tleV9tb2RpZmllcl9nZXQoZXZhc19vYmplY3RfZXZhc19nZXQod2ViVmll dygpKSkpKTsKKyAgICBFWFBFQ1RfRkFMU0UoZXdrX3ZpZXdfZmVlZF90b3VjaF9ldmVudCh3ZWJW aWV3KCksIEVXS19UT1VDSF9DQU5DRUwsIDAsIGV2YXNfa2V5X21vZGlmaWVyX2dldChldmFzX29i amVjdF9ldmFzX2dldCh3ZWJWaWV3KCkpKSkpOworCiAgICAgZWluYV9saXN0X2ZyZWUocG9pbnRz KTsKIH0KIApAQCAtNzQxLDEyICs3NTQsMjQgQEAgVEVTVF9GKEVXSzJWaWV3VGVzdCwgZXdrX3Zp ZXdfdGV4dF9maW5kKQogICAgICAgICBlY29yZV9tYWluX2xvb3BfaXRlcmF0ZSgpOwogICAgIEVY UEVDVF9FUSgzLCBtYXRjaENvdW50KTsKIAorICAgIEVYUEVDVF9UUlVFKGV3a192aWV3X3RleHRf ZmluZF9oaWdobGlnaHRfY2xlYXIod2ViVmlldygpKSk7CisKICAgICBtYXRjaENvdW50ID0gLTE7 CiAgICAgZXdrX3ZpZXdfdGV4dF9maW5kKHdlYlZpZXcoKSwgIm1hbmdvIiwgRVdLX0ZJTkRfT1BU SU9OU19TSE9XX09WRVJMQVksIDEwMCk7CiAgICAgd2hpbGUgKG1hdGNoQ291bnQgPCAwKQogICAg ICAgICBlY29yZV9tYWluX2xvb3BfaXRlcmF0ZSgpOwogICAgIEVYUEVDVF9FUSgwLCBtYXRjaENv dW50KTsKIAorICAgIG1hdGNoQ291bnQgPSAtMTsKKyAgICBld2tfdmlld190ZXh0X2ZpbmQod2Vi VmlldygpLCAiYmFuYW5hIiwgRVdLX0ZJTkRfT1BUSU9OU19TSE9XX0hJR0hMSUdIVCwgMTAwKTsK KyAgICB3aGlsZSAobWF0Y2hDb3VudCA8IDApCisgICAgICAgIGVjb3JlX21haW5fbG9vcF9pdGVy YXRlKCk7CisgICAgRVhQRUNUX0VRKDIsIG1hdGNoQ291bnQpOworCisgICAgLy8gQ2hlY2tpbmcg aW4gY2FzZSBvZiBudWxsIGZvciB0ZXh0IGFuZCB3ZWJ2aWV3CisgICAgQVNTRVJUX0ZBTFNFKGV3 a192aWV3X3RleHRfZmluZCgwLCAiYXBwbGUiLCBFV0tfRklORF9PUFRJT05TX1NIT1dfT1ZFUkxB WSwgMTAwKSk7CisgICAgQVNTRVJUX0ZBTFNFKGV3a192aWV3X3RleHRfZmluZCh3ZWJWaWV3KCks IDAsIEVXS19GSU5EX09QVElPTlNfU0hPV19PVkVSTEFZLCAxMDApKTsKKwogICAgIGV2YXNfb2Jq ZWN0X3NtYXJ0X2NhbGxiYWNrX2RlbCh3ZWJWaWV3KCksICJ0ZXh0LGZvdW5kIiwgb25UZXh0Rm91 bmQpOwogfQogCkBAIC03OTksNiArODI0LDEwIEBAIFRFU1RfRihFV0syVmlld1Rlc3QsIGV3a192 aWV3X3RleHRfbWF0Y2gKICAgICAgICAgZWNvcmVfbWFpbl9sb29wX2l0ZXJhdGUoKTsKICAgICBF WFBFQ1RfRVEoLTEsIG1hdGNoQ291bnQpOwogCisgICAgLy8gQ2hlY2tpbmcgaW4gY2FzZSBvZiBu dWxsIGZvciB0ZXh0IGFuZCB3ZWJ2aWV3CisgICAgRVhQRUNUX0ZBTFNFKGV3a192aWV3X3RleHRf bWF0Y2hlc19jb3VudCgwLCAiYXBwbGUiLCBFV0tfRklORF9PUFRJT05TX05PTkUsIDEwMCkpOwor ICAgIEVYUEVDVF9GQUxTRShld2tfdmlld190ZXh0X21hdGNoZXNfY291bnQod2ViVmlldygpLCAw LCBFV0tfRklORF9PUFRJT05TX05PTkUsIDEwMCkpOworCiAgICAgZXZhc19vYmplY3Rfc21hcnRf Y2FsbGJhY2tfZGVsKHdlYlZpZXcoKSwgInRleHQsZm91bmQiLCBvblRleHRGb3VuZCk7CiB9CiAK QEAgLTEwMTYsNiArMTA0NSwxMSBAQCBURVNUX0YoRVdLMlZpZXdUZXN0LCBld2tfdmlld19wYWdl X2NvbnRlCiAgICAgb2J0YWluZWRQYWdlQ29udGVudHMgPSBmYWxzZTsKICAgICBBU1NFUlRfVFJV RShld2tfdmlld19wYWdlX2NvbnRlbnRzX2dldCh3ZWJWaWV3KCksIEVXS19QQUdFX0NPTlRFTlRT X1RZUEVfU1RSSU5HLCBQYWdlQ29udGVudHNBc1N0cmluZ0NhbGxiYWNrLCAwKSk7CiAgICAgd2Fp dFVudGlsVHJ1ZShvYnRhaW5lZFBhZ2VDb250ZW50cyk7CisKKyAgICAvLyBDaGVja2luZyBpbiBj YXNlIG9mIG51bGwgZm9yIGNhbGxiYWNrIGFuZCB3ZWJ2aWV3CisgICAgRVhQRUNUX0ZBTFNFKGV3 a192aWV3X3BhZ2VfY29udGVudHNfZ2V0KHdlYlZpZXcoKSwgRVdLX1BBR0VfQ09OVEVOVFNfVFlQ RV9TVFJJTkcsIDAsIDApKTsKKyAgICBFWFBFQ1RfRkFMU0UoZXdrX3ZpZXdfcGFnZV9jb250ZW50 c19nZXQoMCwgRVdLX1BBR0VfQ09OVEVOVFNfVFlQRV9TVFJJTkcsIFBhZ2VDb250ZW50c0FzU3Ry aW5nQ2FsbGJhY2ssIDApKTsKKyAgICBFWFBFQ1RfRkFMU0UoZXdrX3ZpZXdfcGFnZV9jb250ZW50 c19nZXQod2ViVmlldygpLCAoRXdrX1BhZ2VfQ29udGVudHNfVHlwZSkgMiwgUGFnZUNvbnRlbnRz QXNTdHJpbmdDYWxsYmFjaywgMCkpOwogfQogCiBURVNUX0YoRVdLMlZpZXdUZXN0LCBld2tfdmll d191c2VyX2FnZW50KQpAQCAtMTA3Niw2ICsxMTEwLDEwIEBAIFRFU1RfRihFV0syVW5pdFRlc3RC YXNlLCBld2tfdmlld19zY3JpcHQKICAgICB3YWl0VW50aWxUcnVlKHNjcmlwdEV4ZWN1dGVDYWxs YmFja0NhbGxlZCk7CiAgICAgQVNTRVJUX1NUUkVRKCJ0ZXN0IiwgZWluYV9zdHJidWZfc3RyaW5n X2dldChyZXN1bHQpKTsKIAorICAgIC8vIENoZWNraW5nIGluIGNhc2Ugb2YgbnVsbCBmb3Igc2Ny aXB0IGFuZCB3ZWJ2aWV3CisgICAgRVhQRUNUX0ZBTFNFKGV3a192aWV3X3NjcmlwdF9leGVjdXRl KDAsIGdldERhdGFTY3JpcHQsIHNjcmlwdEV4ZWN1dGVDYWxsYmFjaywgc3RhdGljX2Nhc3Q8dm9p ZCo+KHJlc3VsdCkpKTsKKyAgICBFWFBFQ1RfRkFMU0UoZXdrX3ZpZXdfc2NyaXB0X2V4ZWN1dGUo d2ViVmlldygpLCAwLCBzY3JpcHRFeGVjdXRlQ2FsbGJhY2ssIHN0YXRpY19jYXN0PHZvaWQqPihy ZXN1bHQpKSk7CisKICAgICBlaW5hX3N0cmJ1Zl9mcmVlKHJlc3VsdCk7CiAKICAgICBBU1NFUlRf RkFMU0UoZXdrX3ZpZXdfc2NyaXB0X2V4ZWN1dGUod2ViVmlldygpLCAwLCAwLCAwKSk7Cg== 232860 2014-06-11 03:51:11 -0700 2014-06-11 04:56:39 -0700 Patch for landing bug-133715-updated.patch text/plain 6216 shiva.jm SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2OTc5OSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE0LTA2LTExICBTaGl2YWt1 bWFyIEpNICA8c2hpdmEuam1Ac2Ftc3VuZy5jb20+CisKKyAgICAgICAgW0VGTF1bV0syXSBBZGQg bWlzc2luZyB0ZXN0IGNhc2VzIGZvciBFV0syVmlld1Rlc3QuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzM3MTUKKworICAgICAgICBSZXZpZXdlZCBi eSBHeXV5b3VuZyBLaW0uCisKKyAgICAgICAgQWRkIG1pc3NpbmcgdGVzdCBjYXNlcyBmb3IgZXdr X3ZpZXcuaCBBUElzLCBld2tfdmlld19zdG9wKCksIGV3a192aWV3X2h0bWxfc3RyaW5nX2xvYWQo KSwgZXdrX3ZpZXdfdGhlbWVfZ2V0KCksIAorICAgICAgICBld2tfdmlld19mZWVkX3RvdWNoX2V2 ZW50KCksIGV3a192aWV3X3RleHRfZmluZF9oaWdobGlnaHRfY2xlYXIoKSwgZXdrX3ZpZXdfdGV4 dF9maW5kKCksIGV3a192aWV3X3RleHRfbWF0Y2hlc19jb3VudCgpLAorICAgICAgICBld2tfdmll d19wYWdlX2NvbnRlbnRzX2dldCgpLCBld2tfdmlld19zY3JpcHRfZXhlY3V0ZSgpLgorCisgICAg ICAgICogUGxhdGZvcm1FZmwuY21ha2U6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvdGVz dHMvdGVzdF9ld2syX3ZpZXcuY3BwOgorICAgICAgICAoVEVTVF9GKToKKwogMjAxNC0wNi0xMSAg Q2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dU S10gVXNlIGEgZGlmZmVyZW50IHVzZXIgYWdlbnQgc3RyaW5nIGRlcGVuZGluZyBvbiB0aGUgc2l0 ZQpJbmRleDogU291cmNlL1dlYktpdDIvUGxhdGZvcm1FZmwuY21ha2UKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdDIvUGxhdGZvcm1FZmwuY21ha2UJKHJldmlzaW9uIDE2OTc5OSkKKysrIFNv dXJjZS9XZWJLaXQyL1BsYXRmb3JtRWZsLmNtYWtlCSh3b3JraW5nIGNvcHkpCkBAIC00ODUsNiAr NDg1LDcgQEAgc2V0KEVXSzJVbml0VGVzdHNfQklOQVJJRVMKICAgICB0ZXN0X2V3azJfc3NsCiAg ICAgdGVzdF9ld2syX3N0b3JhZ2VfbWFuYWdlcgogICAgIHRlc3RfZXdrMl93aW5kb3dfZmVhdHVy ZXMKKyAgICB0ZXN0X2V3azJfdmlldwogKQogCiAjIFNraXBwZWQgdW5pdCB0ZXN0cyBsaXN0OgpJ bmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX3Zp ZXcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rl c3RzL3Rlc3RfZXdrMl92aWV3LmNwcAkocmV2aXNpb24gMTY5Nzk5KQorKysgU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX3ZpZXcuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0yNTIsNiArMjUyLDggQEAgVEVTVF9GKEVXSzJWaWV3VGVzdCwgZXdrX3ZpZXdfYWRk KQogewogICAgIEV2YXNfT2JqZWN0KiB2aWV3ID0gZXdrX3ZpZXdfYWRkKGNhbnZhcygpKTsKICAg ICBBU1NFUlRfRVEoZXdrX2NvbnRleHRfZGVmYXVsdF9nZXQoKSwgZXdrX3ZpZXdfY29udGV4dF9n ZXQodmlldykpOworCisgICAgRVhQRUNUX1RSVUUoZXdrX3ZpZXdfc3RvcCh2aWV3KSk7CiAgICAg ZXZhc19vYmplY3RfZGVsKHZpZXcpOwogfQogCkBAIC0yOTEsNiArMjkzLDEwIEBAIFRFU1RfRihF V0syVmlld1Rlc3QsIGV3a192aWV3X2h0bWxfc3RyaW4KICAgICBld2tfdmlld19odG1sX3N0cmlu Z19sb2FkKHdlYlZpZXcoKSwgIjxodG1sPjxoZWFkPjx0aXRsZT5CYXI8L3RpdGxlPjwvaGVhZD48 Ym9keT5Gb288L2JvZHk+PC9odG1sPiIsIDAsIDApOwogICAgIEFTU0VSVF9UUlVFKHdhaXRVbnRp bFRpdGxlQ2hhbmdlZFRvKCJCYXIiKSk7CiAgICAgQVNTRVJUX1NUUkVRKCJCYXIiLCBld2tfdmll d190aXRsZV9nZXQod2ViVmlldygpKSk7CisKKyAgICAvLyBDaGVja2luZyBpbiBjYXNlIG9mIG51 bGwgZm9yIGh0bWwgYW5kIHdlYnZpZXcKKyAgICBBU1NFUlRfRkFMU0UoZXdrX3ZpZXdfaHRtbF9z dHJpbmdfbG9hZCgwLCAiPGh0bWw+PGhlYWQ+PHRpdGxlPkZvbzwvdGl0bGU+PC9oZWFkPjxib2R5 PkJhcjwvYm9keT48L2h0bWw+IiwgMCwgMCkpOworICAgIEFTU0VSVF9GQUxTRShld2tfdmlld19o dG1sX3N0cmluZ19sb2FkKHdlYlZpZXcoKSwgMCwgMCwgMCkpOwogfQogCiBURVNUX0YoRVdLMlZp ZXdUZXN0LCBld2tfdmlld19uYXZpZ2F0aW9uKQpAQCAtNDAzLDYgKzQwOSw4IEBAIFRFU1RfRihF V0syVmlld1Rlc3QsIGV3a192aWV3X3RoZW1lX3NldCkKICAgICBld2tfdmlld190aGVtZV9zZXQo d2ViVmlldygpLCBlbnZpcm9ubWVudC0+cGF0aEZvclRoZW1lKCJiaWdfYnV0dG9uX3RoZW1lLmVk aiIpLmRhdGEoKSk7CiAgICAgZXdrX3ZpZXdfaHRtbF9zdHJpbmdfbG9hZCh3ZWJWaWV3KCksIGJ1 dHRvbkhUTUwsICJmaWxlOi8vLyIsIDApOwogICAgIEVYUEVDVF9UUlVFKHdhaXRVbnRpbFRpdGxl Q2hhbmdlZFRvKCIyOTkiKSk7IC8vIGJ1dHRvbiBvZiBiaWcgYnV0dG9uIHRoZW1lIGhhcyAyOTlw eCBhcyBwYWRkaW5nICgxNSB0byAtMjg1KQorCisgICAgRVhQRUNUX1NUUkVRKGVudmlyb25tZW50 LT5wYXRoRm9yVGhlbWUoImJpZ19idXR0b25fdGhlbWUuZWRqIikuZGF0YSgpLCBld2tfdmlld190 aGVtZV9nZXQod2ViVmlldygpKSk7CiB9CiAKIFRFU1RfRihFV0syVmlld1Rlc3QsIGV3a192aWV3 X21vdXNlX2V2ZW50c19lbmFibGVkKQpAQCAtNzIwLDYgKzcyOCwxMCBAQCBURVNUX0YoRVdLMlZp ZXdUZXN0LCBld2tfdmlld19mZWVkX3RvdWNoCiAgICAgQVNTRVJUX1RSVUUoZXdrX3ZpZXdfZmVl ZF90b3VjaF9ldmVudCh3ZWJWaWV3KCksIEVXS19UT1VDSF9DQU5DRUwsIHBvaW50cywgZXZhc19r ZXlfbW9kaWZpZXJfZ2V0KGV2YXNfb2JqZWN0X2V2YXNfZ2V0KHdlYlZpZXcoKSkpKSk7CiAgICAg cG9pbnRzID0gZWluYV9saXN0X3JlbW92ZShwb2ludHMsICZwb2ludDEpOwogCisgICAgLy8gQ2hl Y2tpbmcgaW4gY2FzZSBvZiBudWxsIGZvciBwb2ludHMgYW5kIHdlYnZpZXcKKyAgICBFWFBFQ1Rf RkFMU0UoZXdrX3ZpZXdfZmVlZF90b3VjaF9ldmVudCgwLCBFV0tfVE9VQ0hfQ0FOQ0VMLCBwb2lu dHMsIGV2YXNfa2V5X21vZGlmaWVyX2dldChldmFzX29iamVjdF9ldmFzX2dldCh3ZWJWaWV3KCkp KSkpOworICAgIEVYUEVDVF9GQUxTRShld2tfdmlld19mZWVkX3RvdWNoX2V2ZW50KHdlYlZpZXco KSwgRVdLX1RPVUNIX0NBTkNFTCwgMCwgZXZhc19rZXlfbW9kaWZpZXJfZ2V0KGV2YXNfb2JqZWN0 X2V2YXNfZ2V0KHdlYlZpZXcoKSkpKSk7CisKICAgICBlaW5hX2xpc3RfZnJlZShwb2ludHMpOwog fQogCkBAIC03NDEsMTIgKzc1MywyNCBAQCBURVNUX0YoRVdLMlZpZXdUZXN0LCBld2tfdmlld190 ZXh0X2ZpbmQpCiAgICAgICAgIGVjb3JlX21haW5fbG9vcF9pdGVyYXRlKCk7CiAgICAgRVhQRUNU X0VRKDMsIG1hdGNoQ291bnQpOwogCisgICAgRVhQRUNUX1RSVUUoZXdrX3ZpZXdfdGV4dF9maW5k X2hpZ2hsaWdodF9jbGVhcih3ZWJWaWV3KCkpKTsKKwogICAgIG1hdGNoQ291bnQgPSAtMTsKICAg ICBld2tfdmlld190ZXh0X2ZpbmQod2ViVmlldygpLCAibWFuZ28iLCBFV0tfRklORF9PUFRJT05T X1NIT1dfT1ZFUkxBWSwgMTAwKTsKICAgICB3aGlsZSAobWF0Y2hDb3VudCA8IDApCiAgICAgICAg IGVjb3JlX21haW5fbG9vcF9pdGVyYXRlKCk7CiAgICAgRVhQRUNUX0VRKDAsIG1hdGNoQ291bnQp OwogCisgICAgbWF0Y2hDb3VudCA9IC0xOworICAgIGV3a192aWV3X3RleHRfZmluZCh3ZWJWaWV3 KCksICJiYW5hbmEiLCBFV0tfRklORF9PUFRJT05TX1NIT1dfSElHSExJR0hULCAxMDApOworICAg IHdoaWxlIChtYXRjaENvdW50IDwgMCkKKyAgICAgICAgZWNvcmVfbWFpbl9sb29wX2l0ZXJhdGUo KTsKKyAgICBFWFBFQ1RfRVEoMiwgbWF0Y2hDb3VudCk7CisKKyAgICAvLyBDaGVja2luZyBpbiBj YXNlIG9mIG51bGwgZm9yIHRleHQgYW5kIHdlYnZpZXcKKyAgICBBU1NFUlRfRkFMU0UoZXdrX3Zp ZXdfdGV4dF9maW5kKDAsICJhcHBsZSIsIEVXS19GSU5EX09QVElPTlNfU0hPV19PVkVSTEFZLCAx MDApKTsKKyAgICBBU1NFUlRfRkFMU0UoZXdrX3ZpZXdfdGV4dF9maW5kKHdlYlZpZXcoKSwgMCwg RVdLX0ZJTkRfT1BUSU9OU19TSE9XX09WRVJMQVksIDEwMCkpOworCiAgICAgZXZhc19vYmplY3Rf c21hcnRfY2FsbGJhY2tfZGVsKHdlYlZpZXcoKSwgInRleHQsZm91bmQiLCBvblRleHRGb3VuZCk7 CiB9CiAKQEAgLTc5OSw2ICs4MjMsMTAgQEAgVEVTVF9GKEVXSzJWaWV3VGVzdCwgZXdrX3ZpZXdf dGV4dF9tYXRjaAogICAgICAgICBlY29yZV9tYWluX2xvb3BfaXRlcmF0ZSgpOwogICAgIEVYUEVD VF9FUSgtMSwgbWF0Y2hDb3VudCk7CiAKKyAgICAvLyBDaGVja2luZyBpbiBjYXNlIG9mIG51bGwg Zm9yIHRleHQgYW5kIHdlYnZpZXcKKyAgICBFWFBFQ1RfRkFMU0UoZXdrX3ZpZXdfdGV4dF9tYXRj aGVzX2NvdW50KDAsICJhcHBsZSIsIEVXS19GSU5EX09QVElPTlNfTk9ORSwgMTAwKSk7CisgICAg RVhQRUNUX0ZBTFNFKGV3a192aWV3X3RleHRfbWF0Y2hlc19jb3VudCh3ZWJWaWV3KCksIDAsIEVX S19GSU5EX09QVElPTlNfTk9ORSwgMTAwKSk7CisKICAgICBldmFzX29iamVjdF9zbWFydF9jYWxs YmFja19kZWwod2ViVmlldygpLCAidGV4dCxmb3VuZCIsIG9uVGV4dEZvdW5kKTsKIH0KIApAQCAt MTAxNiw2ICsxMDQ0LDExIEBAIFRFU1RfRihFV0syVmlld1Rlc3QsIGV3a192aWV3X3BhZ2VfY29u dGUKICAgICBvYnRhaW5lZFBhZ2VDb250ZW50cyA9IGZhbHNlOwogICAgIEFTU0VSVF9UUlVFKGV3 a192aWV3X3BhZ2VfY29udGVudHNfZ2V0KHdlYlZpZXcoKSwgRVdLX1BBR0VfQ09OVEVOVFNfVFlQ RV9TVFJJTkcsIFBhZ2VDb250ZW50c0FzU3RyaW5nQ2FsbGJhY2ssIDApKTsKICAgICB3YWl0VW50 aWxUcnVlKG9idGFpbmVkUGFnZUNvbnRlbnRzKTsKKworICAgIC8vIENoZWNraW5nIGluIGNhc2Ug b2YgbnVsbCBmb3IgY2FsbGJhY2sgYW5kIHdlYnZpZXcKKyAgICBFWFBFQ1RfRkFMU0UoZXdrX3Zp ZXdfcGFnZV9jb250ZW50c19nZXQod2ViVmlldygpLCBFV0tfUEFHRV9DT05URU5UU19UWVBFX1NU UklORywgMCwgMCkpOworICAgIEVYUEVDVF9GQUxTRShld2tfdmlld19wYWdlX2NvbnRlbnRzX2dl dCgwLCBFV0tfUEFHRV9DT05URU5UU19UWVBFX1NUUklORywgUGFnZUNvbnRlbnRzQXNTdHJpbmdD YWxsYmFjaywgMCkpOworICAgIEVYUEVDVF9GQUxTRShld2tfdmlld19wYWdlX2NvbnRlbnRzX2dl dCh3ZWJWaWV3KCksIHN0YXRpY19jYXN0PEV3a19QYWdlX0NvbnRlbnRzX1R5cGU+KDIpLCBQYWdl Q29udGVudHNBc1N0cmluZ0NhbGxiYWNrLCAwKSk7CiB9CiAKIFRFU1RfRihFV0syVmlld1Rlc3Qs IGV3a192aWV3X3VzZXJfYWdlbnQpCkBAIC0xMDc2LDYgKzExMDksMTAgQEAgVEVTVF9GKEVXSzJV bml0VGVzdEJhc2UsIGV3a192aWV3X3NjcmlwdAogICAgIHdhaXRVbnRpbFRydWUoc2NyaXB0RXhl Y3V0ZUNhbGxiYWNrQ2FsbGVkKTsKICAgICBBU1NFUlRfU1RSRVEoInRlc3QiLCBlaW5hX3N0cmJ1 Zl9zdHJpbmdfZ2V0KHJlc3VsdCkpOwogCisgICAgLy8gQ2hlY2tpbmcgaW4gY2FzZSBvZiBudWxs IGZvciBzY3JpcHQgYW5kIHdlYnZpZXcKKyAgICBFWFBFQ1RfRkFMU0UoZXdrX3ZpZXdfc2NyaXB0 X2V4ZWN1dGUoMCwgZ2V0RGF0YVNjcmlwdCwgc2NyaXB0RXhlY3V0ZUNhbGxiYWNrLCBzdGF0aWNf Y2FzdDx2b2lkKj4ocmVzdWx0KSkpOworICAgIEVYUEVDVF9GQUxTRShld2tfdmlld19zY3JpcHRf ZXhlY3V0ZSh3ZWJWaWV3KCksIDAsIHNjcmlwdEV4ZWN1dGVDYWxsYmFjaywgc3RhdGljX2Nhc3Q8 dm9pZCo+KHJlc3VsdCkpKTsKKwogICAgIGVpbmFfc3RyYnVmX2ZyZWUocmVzdWx0KTsKIAogICAg IEFTU0VSVF9GQUxTRShld2tfdmlld19zY3JpcHRfZXhlY3V0ZSh3ZWJWaWV3KCksIDAsIDAsIDAp KTsK