97094 2012-09-19 04:35:13 -0700 [EFL][WK2] Same page navigation does not update view URI 2012-09-20 01:34:04 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 97081 1 cdumez cdumez gyuyoung.kim kenneth lucas.de.marchi rakuco ryuan.choi webkit.review.bot oldest_to_newest 723451 0 cdumez 2012-09-19 04:35:13 -0700 In case of same page navigation, the view URI is currently not updated because we don't handle didSameDocumentNavigationForFrame callback in WKPageLoaderClient. 723454 1 164712 cdumez 2012-09-19 04:40:55 -0700 Created attachment 164712 Patch 723651 2 164712 kenneth 2012-09-19 10:43:45 -0700 Comment on attachment 164712 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=164712&action=review > Source/WebKit2/UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.cpp:224 > +struct URIChangedData { > + URIChangedData(const char* uri, double timeoutSeconds, Ecore_Task_Cb callback) > + : expectedURI(uri) > + , done(false) > + , timer(0) > + , didTimeOut(false) > + { > + if (timeoutSeconds >= 0) > + timer = ecore_timer_add(timeoutSeconds, callback, this); > + } > + Maybe it is about time to make a base class? > Source/WebKit2/UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.cpp:237 > +static void onURIChanged(void* userData, Evas_Object* webView, void* eventInfo) Why are we callign it URI when everyone(?) else calls it URL in webkit? 724192 3 164712 cdumez 2012-09-19 23:13:01 -0700 Comment on attachment 164712 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=164712&action=review >> Source/WebKit2/UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.cpp:224 >> + > > Maybe it is about time to make a base class? Sure, I can clean this up. >> Source/WebKit2/UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.cpp:237 >> +static void onURIChanged(void* userData, Evas_Object* webView, void* eventInfo) > > Why are we callign it URI when everyone(?) else calls it URL in webkit? Probably out of consistency with EFL WebKit1. Considering the ewk_view method is called ewk_view_uri_get(), I think using URI here is consistent. 724197 4 164845 cdumez 2012-09-19 23:17:27 -0700 Created attachment 164845 Patch Refactor the callback data in Test framework. 724222 5 164845 kenneth 2012-09-20 00:08:04 -0700 Comment on attachment 164845 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=164845&action=review This looks so much better > Source/WebKit2/UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.cpp:174 > + if (strcmp(ewk_view_title_get(webView), data->expectedValue().data())) why not just value() ? 724227 6 164845 webkit.review.bot 2012-09-20 00:15:48 -0700 Comment on attachment 164845 Patch Clearing flags on attachment: 164845 Committed r129099: <http://trac.webkit.org/changeset/129099> 724228 7 webkit.review.bot 2012-09-20 00:15:53 -0700 All reviewed patches have been landed. Closing bug. 164712 2012-09-19 04:40:55 -0700 2012-09-19 23:17:27 -0700 Patch 97094_same_page_navigation.patch text/plain 8824 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAxODY0ODk4Li4wYzY3ZWUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUg QEAKKzIwMTItMDktMTkgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVs LmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIFNhbWUgcGFnZSBuYXZpZ2F0aW9uIGRvZXMgbm90 IHVwZGF0ZSB2aWV3IFVSSQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9OTcwOTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBIYW5kbGUgZGlkU2FtZURvY3VtZW50TmF2aWdhdGlvbkZvckZyYW1lIGNhbGxiYWNr IGluCisgICAgICAgIFdLUGFnZUxvYWRlckNsaWVudCBpbiBvcmRlciB0byB1cGRhdGUgdGhlIHZp ZXcgVVJJLgorICAgICAgICBUaGlzIGZpeGVzIGlzc3VlcyB3aXRoIHRoZSB2aWV3IFVSSSBub3Qg YmVpbmcgdXBkYXRlZAorICAgICAgICBpbiBjYXNlIG9mIGEgc2FtZSBwYWdlIG5hdmlnYXRpb24u CisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlld19sb2FkZXJfY2xpZW50LmNw cDoKKyAgICAgICAgKGRpZFNhbWVEb2N1bWVudE5hdmlnYXRpb25Gb3JGcmFtZSk6CisgICAgICAg IChld2tfdmlld19sb2FkZXJfY2xpZW50X2F0dGFjaCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQ SS9lZmwvZXdrX3ZpZXdfcHJpdmF0ZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL3Rl c3RzL1VuaXRUZXN0VXRpbHMvRVdLMlVuaXRUZXN0QmFzZS5jcHA6CisgICAgICAgIChFV0syVW5p dFRlc3Q6OlVSSUNoYW5nZWREYXRhOjpVUklDaGFuZ2VkRGF0YSk6CisgICAgICAgIChVUklDaGFu Z2VkRGF0YSk6CisgICAgICAgIChFV0syVW5pdFRlc3Q6OlVSSUNoYW5nZWREYXRhOjp+VVJJQ2hh bmdlZERhdGEpOgorICAgICAgICAoRVdLMlVuaXRUZXN0KToKKyAgICAgICAgKEVXSzJVbml0VGVz dDo6b25VUklDaGFuZ2VkKToKKyAgICAgICAgKEVXSzJVbml0VGVzdDo6dGltZU91dFdoaWxlV2Fp dGluZ1VudGlsVVJJQ2hhbmdlZFRvKToKKyAgICAgICAgKEVXSzJVbml0VGVzdDo6RVdLMlVuaXRU ZXN0QmFzZTo6d2FpdFVudGlsVVJJQ2hhbmdlZFRvKTogQWRkIGNvbnZlbmllbmNlIGZ1bmN0aW9u IHRvIHRlc3QKKyAgICAgICAgZnJhbWV3b3JrIGluIG9yZGVyIHRvIHdhaXQgdW50aWwgdGhlIHZp ZXcgVVJJIGNoYW5nZXMgdG8gYSBnaXZlbiB2YWx1ZS4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJ L2VmbC90ZXN0cy9Vbml0VGVzdFV0aWxzL0VXSzJVbml0VGVzdEJhc2UuaDoKKyAgICAgICAgKEVX SzJVbml0VGVzdEJhc2UpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Jlc291 cmNlcy9zYW1lX3BhZ2VfbmF2aWdhdGlvbi5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBVSVByb2Nl c3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfdmlldy5jcHA6CisgICAgICAgIChURVNUX0YpOiBB ZGQgY29ycmVzcG9uZGluZyB1bml0IHRlc3QgdG8gdmVyaWZ5IGZpeCBhbmQgcHJldmVudCByZWdy ZXNzaW9ucworICAgICAgICBpbiB0aGUgZnV0dXJlLgorCiAyMDEyLTA5LTE5ICBCeXVuZ3dvbyBM ZWUgIDxidzgwLmxlZUBzYW1zdW5nLmNvbT4KIAogICAgICAgICBbRUZMXVtXSzJdIHdhaXRVbnRp bFRpdGxlQ2hhbmdlZFRvKCkgYW5kIHdhaXRVbnRpbExvYWRGaW5pc2hlZCgpIG5lZWRzIHRpbWVv dXQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmll d19sb2FkZXJfY2xpZW50LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3 a192aWV3X2xvYWRlcl9jbGllbnQuY3BwCmluZGV4IDJkZWIzOGUuLmQxN2Q0NDUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3X2xvYWRlcl9jbGll bnQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3X2xv YWRlcl9jbGllbnQuY3BwCkBAIC0xMzMsNiArMTMzLDE1IEBAIHN0YXRpYyB2b2lkIGRpZENoYW5n ZUJhY2tGb3J3YXJkTGlzdChXS1BhZ2VSZWYgcGFnZSwgV0tCYWNrRm9yd2FyZExpc3RJdGVtUmVm IGFkCiAgICAgZXdrX2JhY2tfZm9yd2FyZF9saXN0X2NoYW5nZWQoZXdrX3ZpZXdfYmFja19mb3J3 YXJkX2xpc3RfZ2V0KGV3a1ZpZXcpLCBhZGRlZEl0ZW0sIHJlbW92ZWRJdGVtcyk7CiB9CiAKK3N0 YXRpYyB2b2lkIGRpZFNhbWVEb2N1bWVudE5hdmlnYXRpb25Gb3JGcmFtZShXS1BhZ2VSZWYgcGFn ZSwgV0tGcmFtZVJlZiBmcmFtZSwgV0tTYW1lRG9jdW1lbnROYXZpZ2F0aW9uVHlwZSwgV0tUeXBl UmVmLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKQoreworICAgIGlmICghV0tGcmFtZUlzTWFpbkZy YW1lKGZyYW1lKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgRXZhc19PYmplY3QqIGV3a1ZpZXcg PSBzdGF0aWNfY2FzdDxFdmFzX09iamVjdCo+KGNvbnN0X2Nhc3Q8dm9pZCo+KGNsaWVudEluZm8p KTsKKyAgICBld2tfdmlld191cmlfdXBkYXRlKGV3a1ZpZXcpOworfQorCiB2b2lkIGV3a192aWV3 X2xvYWRlcl9jbGllbnRfYXR0YWNoKFdLUGFnZVJlZiBwYWdlUmVmLCBFdmFzX09iamVjdCogZXdr VmlldykKIHsKICAgICBXS1BhZ2VMb2FkZXJDbGllbnQgbG9hZENsaWVudDsKQEAgLTE1NSw1ICsx NjQsNiBAQCB2b2lkIGV3a192aWV3X2xvYWRlcl9jbGllbnRfYXR0YWNoKFdLUGFnZVJlZiBwYWdl UmVmLCBFdmFzX09iamVjdCogZXdrVmlldykKICAgICBsb2FkQ2xpZW50LmRpZFJlY2VpdmVTZXJ2 ZXJSZWRpcmVjdEZvclByb3Zpc2lvbmFsTG9hZEZvckZyYW1lID0gZGlkUmVjZWl2ZVNlcnZlclJl ZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWU7CiAgICAgbG9hZENsaWVudC5kaWRGYWls UHJvdmlzaW9uYWxMb2FkV2l0aEVycm9yRm9yRnJhbWUgPSBkaWRGYWlsUHJvdmlzaW9uYWxMb2Fk V2l0aEVycm9yRm9yRnJhbWU7CiAgICAgbG9hZENsaWVudC5kaWRDaGFuZ2VCYWNrRm9yd2FyZExp c3QgPSBkaWRDaGFuZ2VCYWNrRm9yd2FyZExpc3Q7CisgICAgbG9hZENsaWVudC5kaWRTYW1lRG9j dW1lbnROYXZpZ2F0aW9uRm9yRnJhbWUgPSBkaWRTYW1lRG9jdW1lbnROYXZpZ2F0aW9uRm9yRnJh bWU7CiAgICAgV0tQYWdlU2V0UGFnZUxvYWRlckNsaWVudChwYWdlUmVmLCAmbG9hZENsaWVudCk7 CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmll d19wcml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlld19w cml2YXRlLmgKaW5kZXggMWNiNDNlYS4uNWQ2ODgxZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXdfcHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3X3ByaXZhdGUuaApAQCAtODIsNiArODIsNyBA QCB2b2lkIGV3a192aWV3X3Jlc291cmNlX2xvYWRfaW5pdGlhdGVkKEV2YXNfT2JqZWN0KiBld2tW aWV3LCB1aW50NjRfdCByZXNvdXJjZUlkZQogdm9pZCBld2tfdmlld19yZXNvdXJjZV9sb2FkX3Jl c3BvbnNlKEV2YXNfT2JqZWN0KiBld2tWaWV3LCB1aW50NjRfdCByZXNvdXJjZUlkZW50aWZpZXIs IEV3a19VcmxfUmVzcG9uc2UqIHJlc3BvbnNlKTsKIHZvaWQgZXdrX3ZpZXdfcmVzb3VyY2VfcmVx dWVzdF9zZW50KEV2YXNfT2JqZWN0KiBld2tWaWV3LCB1aW50NjRfdCByZXNvdXJjZUlkZW50aWZp ZXIsIEV3a19VcmxfUmVxdWVzdCogcmVxdWVzdCwgRXdrX1VybF9SZXNwb25zZSogcmVkaXJlY3RS ZXNwb25zZSk7CiB2b2lkIGV3a192aWV3X3RleHRfZm91bmQoRXZhc19PYmplY3QqIGV3a1ZpZXcs IHVuc2lnbmVkIGludCBtYXRjaENvdW50KTsKK3ZvaWQgZXdrX3ZpZXdfdXJpX3VwZGF0ZShFdmFz X09iamVjdCogZXdrVmlldyk7CiB2b2lkIGV3a192aWV3X2NvbnRlbnRzX3NpemVfY2hhbmdlZChj b25zdCBFdmFzX09iamVjdCogZXdrVmlldywgY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYpOwogCiBF dmFzX09iamVjdCogZXdrX3ZpZXdfYmFzZV9hZGQoRXZhcyogY2FudmFzLCBXS0NvbnRleHRSZWYs IFdLUGFnZUdyb3VwUmVmKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZWZsL3Rlc3RzL1VuaXRUZXN0VXRpbHMvRVdLMlVuaXRUZXN0QmFzZS5jcHAgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy9Vbml0VGVzdFV0aWxzL0VXSzJVbml0VGVz dEJhc2UuY3BwCmluZGV4IDdjOTA5ZmMuLjhkN2VkNGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL1VuaXRUZXN0VXRpbHMvRVdLMlVuaXRUZXN0QmFz ZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvVW5pdFRl c3RVdGlscy9FV0syVW5pdFRlc3RCYXNlLmNwcApAQCAtMjExLDYgKzIxMSw3MyBAQCBib29sIEVX SzJVbml0VGVzdEJhc2U6OndhaXRVbnRpbFRpdGxlQ2hhbmdlZFRvKGNvbnN0IGNoYXIqIGV4cGVj dGVkVGl0bGUsIGRvdWJsZQogICAgIHJldHVybiAhZGF0YS5kaWRUaW1lT3V0OwogfQogCitzdHJ1 Y3QgVVJJQ2hhbmdlZERhdGEgeworICAgIFVSSUNoYW5nZWREYXRhKGNvbnN0IGNoYXIqIHVyaSwg ZG91YmxlIHRpbWVvdXRTZWNvbmRzLCBFY29yZV9UYXNrX0NiIGNhbGxiYWNrKQorICAgICAgICA6 IGV4cGVjdGVkVVJJKHVyaSkKKyAgICAgICAgLCBkb25lKGZhbHNlKQorICAgICAgICAsIHRpbWVy KDApCisgICAgICAgICwgZGlkVGltZU91dChmYWxzZSkKKyAgICB7CisgICAgICAgIGlmICh0aW1l b3V0U2Vjb25kcyA+PSAwKQorICAgICAgICAgICAgdGltZXIgPSBlY29yZV90aW1lcl9hZGQodGlt ZW91dFNlY29uZHMsIGNhbGxiYWNrLCB0aGlzKTsKKyAgICB9CisKKyAgICB+VVJJQ2hhbmdlZERh dGEoKQorICAgIHsKKyAgICAgICAgaWYgKHRpbWVyKQorICAgICAgICAgICAgZWNvcmVfdGltZXJf ZGVsKHRpbWVyKTsKKyAgICB9CisKKyAgICBDU3RyaW5nIGV4cGVjdGVkVVJJOworICAgIGJvb2wg ZG9uZTsKKyAgICBFY29yZV9UaW1lciogdGltZXI7CisgICAgYm9vbCBkaWRUaW1lT3V0OworfTsK Kworc3RhdGljIHZvaWQgb25VUklDaGFuZ2VkKHZvaWQqIHVzZXJEYXRhLCBFdmFzX09iamVjdCog d2ViVmlldywgdm9pZCogZXZlbnRJbmZvKQoreworICAgIFVSSUNoYW5nZWREYXRhKiBkYXRhID0g c3RhdGljX2Nhc3Q8VVJJQ2hhbmdlZERhdGEqPih1c2VyRGF0YSk7CisKKyAgICBpZiAoc3RyY21w KGV3a192aWV3X3VyaV9nZXQod2ViVmlldyksIGRhdGEtPmV4cGVjdGVkVVJJLmRhdGEoKSkpCisg ICAgICAgIHJldHVybjsKKworICAgIGlmIChkYXRhLT50aW1lcikgeworICAgICAgICBlY29yZV90 aW1lcl9kZWwoZGF0YS0+dGltZXIpOworICAgICAgICBkYXRhLT50aW1lciA9IDA7CisgICAgfQor CisgICAgZGF0YS0+ZG9uZSA9IHRydWU7Cit9CisKK3N0YXRpYyBib29sIHRpbWVPdXRXaGlsZVdh aXRpbmdVbnRpbFVSSUNoYW5nZWRUbyh2b2lkKiB1c2VyRGF0YSkKK3sKKyAgICBVUklDaGFuZ2Vk RGF0YSogZGF0YSA9IHN0YXRpY19jYXN0PFVSSUNoYW5nZWREYXRhKj4odXNlckRhdGEpOworCisg ICAgZGF0YS0+dGltZXIgPSAwOworCisgICAgaWYgKGRhdGEtPmRvbmUpCisgICAgICAgIHJldHVy biBFQ09SRV9DQUxMQkFDS19DQU5DRUw7CisKKyAgICBkYXRhLT5kb25lID0gdHJ1ZTsKKyAgICBk YXRhLT5kaWRUaW1lT3V0ID0gdHJ1ZTsKKworICAgIHJldHVybiBFQ09SRV9DQUxMQkFDS19DQU5D RUw7Cit9CisKK2Jvb2wgRVdLMlVuaXRUZXN0QmFzZTo6d2FpdFVudGlsVVJJQ2hhbmdlZFRvKGNv bnN0IGNoYXIqIGV4cGVjdGVkVVJJLCBkb3VibGUgdGltZW91dFNlY29uZHMpCit7CisgICAgVVJJ Q2hhbmdlZERhdGEgZGF0YShleHBlY3RlZFVSSSwgdGltZW91dFNlY29uZHMsIHJlaW50ZXJwcmV0 X2Nhc3Q8RWNvcmVfVGFza19DYj4odGltZU91dFdoaWxlV2FpdGluZ1VudGlsVVJJQ2hhbmdlZFRv KSk7CisKKyAgICBldmFzX29iamVjdF9zbWFydF9jYWxsYmFja19hZGQobV93ZWJWaWV3LCAidXJp LGNoYW5nZWQiLCBvblVSSUNoYW5nZWQsICZkYXRhKTsKKworICAgIHdoaWxlICghZGF0YS5kb25l KQorICAgICAgICBlY29yZV9tYWluX2xvb3BfaXRlcmF0ZSgpOworCisgICAgZXZhc19vYmplY3Rf c21hcnRfY2FsbGJhY2tfZGVsKG1fd2ViVmlldywgInVyaSxjaGFuZ2VkIiwgb25VUklDaGFuZ2Vk KTsKKworICAgIHJldHVybiAhZGF0YS5kaWRUaW1lT3V0OworfQorCiB2b2lkIEVXSzJVbml0VGVz dEJhc2U6Om1vdXNlQ2xpY2soaW50IHgsIGludCB5KQogewogICAgIEV2YXMqIGV2YXMgPSBldmFz X29iamVjdF9ldmFzX2dldChtX3dlYlZpZXcpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvVW5pdFRlc3RVdGlscy9FV0syVW5pdFRlc3RCYXNlLmgg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy9Vbml0VGVzdFV0aWxzL0VX SzJVbml0VGVzdEJhc2UuaAppbmRleCBkYmRkMDg2Li40MGJjMjgyIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy9Vbml0VGVzdFV0aWxzL0VXSzJVbml0 VGVzdEJhc2UuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy9V bml0VGVzdFV0aWxzL0VXSzJVbml0VGVzdEJhc2UuaApAQCAtNDMsNiArNDMsNyBAQCBwcm90ZWN0 ZWQ6CiAgICAgdm9pZCBsb2FkVXJsU3luYyhjb25zdCBjaGFyKiB1cmwpOwogICAgIGJvb2wgd2Fp dFVudGlsTG9hZEZpbmlzaGVkKGRvdWJsZSB0aW1lb3V0U2Vjb25kcyA9IC0xKTsKICAgICBib29s IHdhaXRVbnRpbFRpdGxlQ2hhbmdlZFRvKGNvbnN0IGNoYXIqIGV4cGVjdGVkVGl0bGUsIGRvdWJs ZSB0aW1lb3V0U2Vjb25kcyA9IC0xKTsKKyAgICBib29sIHdhaXRVbnRpbFVSSUNoYW5nZWRUbyhj b25zdCBjaGFyKiBleHBlY3RlZFVSSSwgZG91YmxlIHRpbWVvdXRTZWNvbmRzID0gLTEpOwogICAg IHZvaWQgbW91c2VDbGljayhpbnQgeCwgaW50IHkpOwogCiBwcml2YXRlOgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvcmVzb3VyY2VzL3NhbWVfcGFn ZV9uYXZpZ2F0aW9uLmh0bWwgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0 cy9yZXNvdXJjZXMvc2FtZV9wYWdlX25hdmlnYXRpb24uaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0 NAppbmRleCAwMDAwMDAwLi43YjY0YjIxCi0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvcmVzb3VyY2VzL3NhbWVfcGFnZV9uYXZpZ2F0aW9u Lmh0bWwKQEAgLTAsMCArMSw1IEBACis8aHRtbD4KKzxib2R5PgorPGEgaWQ9Im15TGluayIgaHJl Zj0iIyI+PGRpdiBzdHlsZT0icG9zaXRpb246IGFic29sdXRlOyB0b3A6IDA7IGxlZnQ6IDA7IHdp ZHRoOiAxMDBweDsgaGVpZ2h0OiAxMDBweDsiPjwvZGl2PjwvYT4KKzwvYm9keT4KKzwvaHRtbD4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3Rf ZXdrMl92aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rl c3RfZXdrMl92aWV3LmNwcAppbmRleCBlZTEyZDM1Li5jODZlNWY4IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfdmlldy5jcHAKKysr IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX3ZpZXcu Y3BwCkBAIC0zMCw2ICszMCw3IEBACiAjaW5jbHVkZSA8d3RmL1Bhc3NPd25QdHIuaD4KICNpbmNs dWRlIDx3dGYvVW51c2VkUGFyYW0uaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9DU3RyaW5nLmg+Cisj aW5jbHVkZSA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CiAKIHVzaW5nIG5hbWVzcGFjZSBFV0syVW5p dFRlc3Q7CiAKQEAgLTM2MSw2ICszNjIsMTcgQEAgVEVTVF9GKEVXSzJVbml0VGVzdEJhc2UsIGV3 a192aWV3X2Z1bGxfc2NyZWVuX2V4aXQpCiAgICAgY2hlY2tGdWxsU2NyZWVuUHJvcGVydHkod2Vi VmlldygpLCBmYWxzZSk7CiB9CiAKK1RFU1RfRihFV0syVW5pdFRlc3RCYXNlLCBld2tfdmlld19z YW1lX3BhZ2VfbmF2aWdhdGlvbikKK3sKKyAgICAvLyBUZXN0cyB0aGF0IHNhbWUgcGFnZSBuYXZp Z2F0aW9uIHVwZGF0ZXMgdGhlIHBhZ2UgVVJJLgorICAgIFN0cmluZyB0ZXN0VXJsID0gZW52aXJv bm1lbnQtPnVybEZvclJlc291cmNlKCJzYW1lX3BhZ2VfbmF2aWdhdGlvbi5odG1sIikuZGF0YSgp OworICAgIGxvYWRVcmxTeW5jKHRlc3RVcmwudXRmOCgpLmRhdGEoKSk7CisgICAgQVNTRVJUX1NU UkVRKHRlc3RVcmwudXRmOCgpLmRhdGEoKSwgZXdrX3ZpZXdfdXJpX2dldCh3ZWJWaWV3KCkpKTsK KyAgICBtb3VzZUNsaWNrKDUwLCA1MCk7CisgICAgdGVzdFVybCA9IHRlc3RVcmwgKyAnIyc7Cisg ICAgQVNTRVJUX1RSVUUod2FpdFVudGlsVVJJQ2hhbmdlZFRvKHRlc3RVcmwudXRmOCgpLmRhdGEo KSwgMTApKTsKK30KKwogVEVTVF9GKEVXSzJVbml0VGVzdEJhc2UsIGV3a192aWV3X3RpdGxlX2No YW5nZWQpCiB7CiAgICAgY29uc3QgY2hhciogdGl0bGVDaGFuZ2VkSFRNTCA9Cg== 164845 2012-09-19 23:17:27 -0700 2012-09-20 00:15:48 -0700 Patch 97094_same_page_navigation.patch text/plain 14887 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBiMmMyYTk4Li5hMzc1YmNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDgg QEAKKzIwMTItMDktMTkgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVs LmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIFNhbWUgcGFnZSBuYXZpZ2F0aW9uIGRvZXMgbm90 IHVwZGF0ZSB2aWV3IFVSSQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9OTcwOTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBIYW5kbGUgZGlkU2FtZURvY3VtZW50TmF2aWdhdGlvbkZvckZyYW1lIGNhbGxiYWNr IGluCisgICAgICAgIFdLUGFnZUxvYWRlckNsaWVudCBpbiBvcmRlciB0byB1cGRhdGUgdGhlIHZp ZXcgVVJJLgorICAgICAgICBUaGlzIGZpeGVzIGlzc3VlcyB3aXRoIHRoZSB2aWV3IFVSSSBub3Qg YmVpbmcgdXBkYXRlZAorICAgICAgICBpbiBjYXNlIG9mIGEgc2FtZSBwYWdlIG5hdmlnYXRpb24u CisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlld19sb2FkZXJfY2xpZW50LmNw cDoKKyAgICAgICAgKGRpZFNhbWVEb2N1bWVudE5hdmlnYXRpb25Gb3JGcmFtZSk6CisgICAgICAg IChld2tfdmlld19sb2FkZXJfY2xpZW50X2F0dGFjaCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQ SS9lZmwvZXdrX3ZpZXdfcHJpdmF0ZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL3Rl c3RzL1VuaXRUZXN0VXRpbHMvRVdLMlVuaXRUZXN0QmFzZS5jcHA6CisgICAgICAgIChDYWxsYmFj a0RhdGFUaW1lcik6CisgICAgICAgIChFV0syVW5pdFRlc3Q6OkNhbGxiYWNrRGF0YVRpbWVyOjpD YWxsYmFja0RhdGFUaW1lcik6CisgICAgICAgIChFV0syVW5pdFRlc3Q6OkNhbGxiYWNrRGF0YVRp bWVyOjp+Q2FsbGJhY2tEYXRhVGltZXIpOgorICAgICAgICAoRVdLMlVuaXRUZXN0OjpDYWxsYmFj a0RhdGFUaW1lcjo6aXNEb25lKToKKyAgICAgICAgKEVXSzJVbml0VGVzdDo6Q2FsbGJhY2tEYXRh VGltZXI6OnNldERvbmUpOgorICAgICAgICAoRVdLMlVuaXRUZXN0OjpDYWxsYmFja0RhdGFUaW1l cjo6ZGlkVGltZU91dCk6CisgICAgICAgIChFV0syVW5pdFRlc3Q6OkNhbGxiYWNrRGF0YVRpbWVy OjpzZXRUaW1lZE91dCk6CisgICAgICAgIChFV0syVW5pdFRlc3QpOgorICAgICAgICAoQ2FsbGJh Y2tEYXRhRXhwZWN0ZWRWYWx1ZSk6CisgICAgICAgIChFV0syVW5pdFRlc3Q6OkNhbGxiYWNrRGF0 YUV4cGVjdGVkVmFsdWU6OkNhbGxiYWNrRGF0YUV4cGVjdGVkVmFsdWUpOgorICAgICAgICAoRVdL MlVuaXRUZXN0OjpDYWxsYmFja0RhdGFFeHBlY3RlZFZhbHVlOjpleHBlY3RlZFZhbHVlKToKKyAg ICAgICAgKEVXSzJVbml0VGVzdDo6b25Mb2FkRmluaXNoZWQpOgorICAgICAgICAoRVdLMlVuaXRU ZXN0Ojp0aW1lT3V0V2hpbGVXYWl0aW5nVW50aWxMb2FkRmluaXNoZWQpOgorICAgICAgICAoRVdL MlVuaXRUZXN0OjpFV0syVW5pdFRlc3RCYXNlOjp3YWl0VW50aWxMb2FkRmluaXNoZWQpOgorICAg ICAgICAoRVdLMlVuaXRUZXN0OjpvblRpdGxlQ2hhbmdlZCk6CisgICAgICAgIChFV0syVW5pdFRl c3Q6OnRpbWVPdXRXaGlsZVdhaXRpbmdVbnRpbFRpdGxlQ2hhbmdlZFRvKToKKyAgICAgICAgKEVX SzJVbml0VGVzdDo6RVdLMlVuaXRUZXN0QmFzZTo6d2FpdFVudGlsVGl0bGVDaGFuZ2VkVG8pOgor ICAgICAgICAoRVdLMlVuaXRUZXN0OjpvblVSSUNoYW5nZWQpOgorICAgICAgICAoRVdLMlVuaXRU ZXN0Ojp0aW1lT3V0V2hpbGVXYWl0aW5nVW50aWxVUklDaGFuZ2VkVG8pOgorICAgICAgICAoRVdL MlVuaXRUZXN0OjpFV0syVW5pdFRlc3RCYXNlOjp3YWl0VW50aWxVUklDaGFuZ2VkVG8pOiBBZGQg Y29udmVuaWVuY2UgZnVuY3Rpb24gdG8gdGVzdAorICAgICAgICBmcmFtZXdvcmsgaW4gb3JkZXIg dG8gd2FpdCB1bnRpbCB0aGUgdmlldyBVUkkgY2hhbmdlcyB0byBhIGdpdmVuIHZhbHVlLgorICAg ICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL1VuaXRUZXN0VXRpbHMvRVdLMlVuaXRUZXN0 QmFzZS5oOgorICAgICAgICAoRVdLMlVuaXRUZXN0QmFzZSk6CisgICAgICAgICogVUlQcm9jZXNz L0FQSS9lZmwvdGVzdHMvcmVzb3VyY2VzL3NhbWVfcGFnZV9uYXZpZ2F0aW9uLmh0bWw6IEFkZGVk LgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl92aWV3LmNwcDoK KyAgICAgICAgKFRFU1RfRik6IEFkZCBjb3JyZXNwb25kaW5nIHVuaXQgdGVzdCB0byB2ZXJpZnkg Zml4IGFuZCBwcmV2ZW50IHJlZ3Jlc3Npb25zCisgICAgICAgIGluIHRoZSBmdXR1cmUuCisKIDIw MTItMDktMTkgIFByYXRpayBTb2xhbmtpICA8cHNvbGFua2lAYXBwbGUuY29tPgogCiAgICAgICAg IFdhcm5pbmcgaW4gU2FuZGJveEV4dGVuc2lvbi5oIGlmIFdFQl9QUk9DRVNTX1NBTkRCT1ggaXMg bm90IGVuYWJsZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZs L2V3a192aWV3X2xvYWRlcl9jbGllbnQuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9lZmwvZXdrX3ZpZXdfbG9hZGVyX2NsaWVudC5jcHAKaW5kZXggMmRlYjM4ZS4uZDE3ZDQ0NSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXdfbG9h ZGVyX2NsaWVudC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdr X3ZpZXdfbG9hZGVyX2NsaWVudC5jcHAKQEAgLTEzMyw2ICsxMzMsMTUgQEAgc3RhdGljIHZvaWQg ZGlkQ2hhbmdlQmFja0ZvcndhcmRMaXN0KFdLUGFnZVJlZiBwYWdlLCBXS0JhY2tGb3J3YXJkTGlz dEl0ZW1SZWYgYWQKICAgICBld2tfYmFja19mb3J3YXJkX2xpc3RfY2hhbmdlZChld2tfdmlld19i YWNrX2ZvcndhcmRfbGlzdF9nZXQoZXdrVmlldyksIGFkZGVkSXRlbSwgcmVtb3ZlZEl0ZW1zKTsK IH0KIAorc3RhdGljIHZvaWQgZGlkU2FtZURvY3VtZW50TmF2aWdhdGlvbkZvckZyYW1lKFdLUGFn ZVJlZiBwYWdlLCBXS0ZyYW1lUmVmIGZyYW1lLCBXS1NhbWVEb2N1bWVudE5hdmlnYXRpb25UeXBl LCBXS1R5cGVSZWYsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCit7CisgICAgaWYgKCFXS0ZyYW1l SXNNYWluRnJhbWUoZnJhbWUpKQorICAgICAgICByZXR1cm47CisKKyAgICBFdmFzX09iamVjdCog ZXdrVmlldyA9IHN0YXRpY19jYXN0PEV2YXNfT2JqZWN0Kj4oY29uc3RfY2FzdDx2b2lkKj4oY2xp ZW50SW5mbykpOworICAgIGV3a192aWV3X3VyaV91cGRhdGUoZXdrVmlldyk7Cit9CisKIHZvaWQg ZXdrX3ZpZXdfbG9hZGVyX2NsaWVudF9hdHRhY2goV0tQYWdlUmVmIHBhZ2VSZWYsIEV2YXNfT2Jq ZWN0KiBld2tWaWV3KQogewogICAgIFdLUGFnZUxvYWRlckNsaWVudCBsb2FkQ2xpZW50OwpAQCAt MTU1LDUgKzE2NCw2IEBAIHZvaWQgZXdrX3ZpZXdfbG9hZGVyX2NsaWVudF9hdHRhY2goV0tQYWdl UmVmIHBhZ2VSZWYsIEV2YXNfT2JqZWN0KiBld2tWaWV3KQogICAgIGxvYWRDbGllbnQuZGlkUmVj ZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUgPSBkaWRSZWNlaXZl U2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbExvYWRGb3JGcmFtZTsKICAgICBsb2FkQ2xpZW50 LmRpZEZhaWxQcm92aXNpb25hbExvYWRXaXRoRXJyb3JGb3JGcmFtZSA9IGRpZEZhaWxQcm92aXNp b25hbExvYWRXaXRoRXJyb3JGb3JGcmFtZTsKICAgICBsb2FkQ2xpZW50LmRpZENoYW5nZUJhY2tG b3J3YXJkTGlzdCA9IGRpZENoYW5nZUJhY2tGb3J3YXJkTGlzdDsKKyAgICBsb2FkQ2xpZW50LmRp ZFNhbWVEb2N1bWVudE5hdmlnYXRpb25Gb3JGcmFtZSA9IGRpZFNhbWVEb2N1bWVudE5hdmlnYXRp b25Gb3JGcmFtZTsKICAgICBXS1BhZ2VTZXRQYWdlTG9hZGVyQ2xpZW50KHBhZ2VSZWYsICZsb2Fk Q2xpZW50KTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZs L2V3a192aWV3X3ByaXZhdGUuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3 a192aWV3X3ByaXZhdGUuaAppbmRleCAxY2I0M2VhLi41ZDY4ODFkIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlld19wcml2YXRlLmgKKysrIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXdfcHJpdmF0ZS5oCkBAIC04Miw2 ICs4Miw3IEBAIHZvaWQgZXdrX3ZpZXdfcmVzb3VyY2VfbG9hZF9pbml0aWF0ZWQoRXZhc19PYmpl Y3QqIGV3a1ZpZXcsIHVpbnQ2NF90IHJlc291cmNlSWRlCiB2b2lkIGV3a192aWV3X3Jlc291cmNl X2xvYWRfcmVzcG9uc2UoRXZhc19PYmplY3QqIGV3a1ZpZXcsIHVpbnQ2NF90IHJlc291cmNlSWRl bnRpZmllciwgRXdrX1VybF9SZXNwb25zZSogcmVzcG9uc2UpOwogdm9pZCBld2tfdmlld19yZXNv dXJjZV9yZXF1ZXN0X3NlbnQoRXZhc19PYmplY3QqIGV3a1ZpZXcsIHVpbnQ2NF90IHJlc291cmNl SWRlbnRpZmllciwgRXdrX1VybF9SZXF1ZXN0KiByZXF1ZXN0LCBFd2tfVXJsX1Jlc3BvbnNlKiBy ZWRpcmVjdFJlc3BvbnNlKTsKIHZvaWQgZXdrX3ZpZXdfdGV4dF9mb3VuZChFdmFzX09iamVjdCog ZXdrVmlldywgdW5zaWduZWQgaW50IG1hdGNoQ291bnQpOwordm9pZCBld2tfdmlld191cmlfdXBk YXRlKEV2YXNfT2JqZWN0KiBld2tWaWV3KTsKIHZvaWQgZXdrX3ZpZXdfY29udGVudHNfc2l6ZV9j aGFuZ2VkKGNvbnN0IEV2YXNfT2JqZWN0KiBld2tWaWV3LCBjb25zdCBXZWJDb3JlOjpJbnRTaXpl Jik7CiAKIEV2YXNfT2JqZWN0KiBld2tfdmlld19iYXNlX2FkZChFdmFzKiBjYW52YXMsIFdLQ29u dGV4dFJlZiwgV0tQYWdlR3JvdXBSZWYpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9lZmwvdGVzdHMvVW5pdFRlc3RVdGlscy9FV0syVW5pdFRlc3RCYXNlLmNwcCBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL1VuaXRUZXN0VXRpbHMvRVdL MlVuaXRUZXN0QmFzZS5jcHAKaW5kZXggN2M5MDlmYy4uMTY5MWYwZCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvVW5pdFRlc3RVdGlscy9FV0syVW5p dFRlc3RCYXNlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0 cy9Vbml0VGVzdFV0aWxzL0VXSzJVbml0VGVzdEJhc2UuY3BwCkBAIC04MCwyNSArODAsNjAgQEAg dm9pZCBFV0syVW5pdFRlc3RCYXNlOjpsb2FkVXJsU3luYyhjb25zdCBjaGFyKiB1cmwpCiAgICAg d2FpdFVudGlsTG9hZEZpbmlzaGVkKCk7CiB9CiAKLXN0cnVjdCBMb2FkRmluaXNoZWREYXRhIHsK LSAgICBMb2FkRmluaXNoZWREYXRhKGRvdWJsZSB0aW1lb3V0U2Vjb25kcywgRWNvcmVfVGFza19D YiBjYWxsYmFjaykKLSAgICAgICAgOiBsb2FkRmluaXNoZWQoZmFsc2UpCi0gICAgICAgICwgdGlt ZXIoMCkKLSAgICAgICAgLCBkaWRUaW1lT3V0KGZhbHNlKQorY2xhc3MgQ2FsbGJhY2tEYXRhVGlt ZXIgeworcHVibGljOgorICAgIENhbGxiYWNrRGF0YVRpbWVyKGRvdWJsZSB0aW1lb3V0U2Vjb25k cywgRWNvcmVfVGFza19DYiBjYWxsYmFjaykKKyAgICAgICAgOiBtX2RvbmUoZmFsc2UpCisgICAg ICAgICwgbV90aW1lcih0aW1lb3V0U2Vjb25kcyA+PSAwID8gZWNvcmVfdGltZXJfYWRkKHRpbWVv dXRTZWNvbmRzLCBjYWxsYmFjaywgdGhpcykgOiAwKQorICAgICAgICAsIG1fZGlkVGltZU91dChm YWxzZSkKICAgICB7Ci0gICAgICAgIGlmICh0aW1lb3V0U2Vjb25kcyA+PSAwKQotICAgICAgICAg ICAgdGltZXIgPSBlY29yZV90aW1lcl9hZGQodGltZW91dFNlY29uZHMsIGNhbGxiYWNrLCB0aGlz KTsKICAgICB9CiAKLSAgICB+TG9hZEZpbmlzaGVkRGF0YSgpCisgICAgdmlydHVhbCB+Q2FsbGJh Y2tEYXRhVGltZXIoKQogICAgIHsKLSAgICAgICAgaWYgKHRpbWVyKQotICAgICAgICAgICAgZWNv cmVfdGltZXJfZGVsKHRpbWVyKTsKKyAgICAgICAgaWYgKG1fdGltZXIpCisgICAgICAgICAgICBl Y29yZV90aW1lcl9kZWwobV90aW1lcik7CiAgICAgfQogCi0gICAgYm9vbCBsb2FkRmluaXNoZWQ7 Ci0gICAgRWNvcmVfVGltZXIqIHRpbWVyOwotICAgIGJvb2wgZGlkVGltZU91dDsKKyAgICBib29s IGlzRG9uZSgpIGNvbnN0IHsgcmV0dXJuIG1fZG9uZTsgfQorCisgICAgYm9vbCBzZXREb25lKCkK KyAgICB7CisgICAgICAgIGlmIChtX3RpbWVyKSB7CisgICAgICAgICAgICBlY29yZV90aW1lcl9k ZWwobV90aW1lcik7CisgICAgICAgICAgICBtX3RpbWVyID0gMDsKKyAgICAgICAgfQorICAgICAg ICBtX2RvbmUgPSB0cnVlOworICAgIH0KKworICAgIGJvb2wgZGlkVGltZU91dCgpIGNvbnN0IHsg cmV0dXJuIG1fZGlkVGltZU91dDsgfQorCisgICAgdm9pZCBzZXRUaW1lZE91dCgpCisgICAgewor ICAgICAgICBtX2RvbmUgPSB0cnVlOworICAgICAgICBtX3RpbWVyID0gMDsKKyAgICAgICAgbV9k aWRUaW1lT3V0ID0gdHJ1ZTsKKyAgICB9CisKK3Byb3RlY3RlZDoKKyAgICBib29sIG1fZG9uZTsK KyAgICBFY29yZV9UaW1lciogbV90aW1lcjsKKyAgICBib29sIG1fZGlkVGltZU91dDsKK307CisK K3RlbXBsYXRlIDxjbGFzcyBUPgorY2xhc3MgQ2FsbGJhY2tEYXRhRXhwZWN0ZWRWYWx1ZSA6IHB1 YmxpYyBDYWxsYmFja0RhdGFUaW1lciB7CitwdWJsaWM6CisgICAgQ2FsbGJhY2tEYXRhRXhwZWN0 ZWRWYWx1ZShjb25zdCBUJiBleHBlY3RlZFZhbHVlLCBkb3VibGUgdGltZW91dFNlY29uZHMsIEVj b3JlX1Rhc2tfQ2IgY2FsbGJhY2spCisgICAgICAgIDogQ2FsbGJhY2tEYXRhVGltZXIodGltZW91 dFNlY29uZHMsIGNhbGxiYWNrKQorICAgICAgICAsIG1fZXhwZWN0ZWRWYWx1ZShleHBlY3RlZFZh bHVlKQorICAgIHsKKyAgICB9CisKKyAgICBjb25zdCBUJiBleHBlY3RlZFZhbHVlKCkgY29uc3Qg eyByZXR1cm4gbV9leHBlY3RlZFZhbHVlOyB9CisKK3ByaXZhdGU6CisgICAgVCBtX2V4cGVjdGVk VmFsdWU7CiB9OwogCiBzdGF0aWMgdm9pZCBvbkxvYWRGaW5pc2hlZCh2b2lkKiB1c2VyRGF0YSwg RXZhc19PYmplY3QqIHdlYlZpZXcsIHZvaWQqIGV2ZW50SW5mbykKQEAgLTEwNiwxMDkgKzE0MSw5 NCBAQCBzdGF0aWMgdm9pZCBvbkxvYWRGaW5pc2hlZCh2b2lkKiB1c2VyRGF0YSwgRXZhc19PYmpl Y3QqIHdlYlZpZXcsIHZvaWQqIGV2ZW50SW5mbwogICAgIFVOVVNFRF9QQVJBTSh3ZWJWaWV3KTsK ICAgICBVTlVTRURfUEFSQU0oZXZlbnRJbmZvKTsKIAotICAgIExvYWRGaW5pc2hlZERhdGEqIGRh dGEgPSBzdGF0aWNfY2FzdDxMb2FkRmluaXNoZWREYXRhKj4odXNlckRhdGEpOwotICAgIGRhdGEt PmxvYWRGaW5pc2hlZCA9IHRydWU7Ci0KLSAgICBpZiAoZGF0YS0+dGltZXIpIHsKLSAgICAgICAg ZWNvcmVfdGltZXJfZGVsKGRhdGEtPnRpbWVyKTsKLSAgICAgICAgZGF0YS0+dGltZXIgPSAwOwot ICAgIH0KKyAgICBDYWxsYmFja0RhdGFUaW1lciogZGF0YSA9IHN0YXRpY19jYXN0PENhbGxiYWNr RGF0YVRpbWVyKj4odXNlckRhdGEpOworICAgIGRhdGEtPnNldERvbmUoKTsKIH0KIAogc3RhdGlj IGJvb2wgdGltZU91dFdoaWxlV2FpdGluZ1VudGlsTG9hZEZpbmlzaGVkKHZvaWQqIHVzZXJEYXRh KQogewotICAgIExvYWRGaW5pc2hlZERhdGEqIGRhdGEgPSBzdGF0aWNfY2FzdDxMb2FkRmluaXNo ZWREYXRhKj4odXNlckRhdGEpOwotCi0gICAgZGF0YS0+dGltZXIgPSAwOwotCi0gICAgaWYgKGRh dGEtPmxvYWRGaW5pc2hlZCkKLSAgICAgICAgcmV0dXJuIEVDT1JFX0NBTExCQUNLX0NBTkNFTDsK LQotICAgIGRhdGEtPmxvYWRGaW5pc2hlZCA9IHRydWU7Ci0gICAgZGF0YS0+ZGlkVGltZU91dCA9 IHRydWU7CisgICAgQ2FsbGJhY2tEYXRhVGltZXIqIGRhdGEgPSBzdGF0aWNfY2FzdDxDYWxsYmFj a0RhdGFUaW1lcio+KHVzZXJEYXRhKTsKKyAgICBkYXRhLT5zZXRUaW1lZE91dCgpOwogCiAgICAg cmV0dXJuIEVDT1JFX0NBTExCQUNLX0NBTkNFTDsKIH0KIAogYm9vbCBFV0syVW5pdFRlc3RCYXNl Ojp3YWl0VW50aWxMb2FkRmluaXNoZWQoZG91YmxlIHRpbWVvdXRTZWNvbmRzKQogewotICAgIExv YWRGaW5pc2hlZERhdGEgZGF0YSh0aW1lb3V0U2Vjb25kcywgcmVpbnRlcnByZXRfY2FzdDxFY29y ZV9UYXNrX0NiPih0aW1lT3V0V2hpbGVXYWl0aW5nVW50aWxMb2FkRmluaXNoZWQpKTsKKyAgICBD YWxsYmFja0RhdGFUaW1lciBkYXRhKHRpbWVvdXRTZWNvbmRzLCByZWludGVycHJldF9jYXN0PEVj b3JlX1Rhc2tfQ2I+KHRpbWVPdXRXaGlsZVdhaXRpbmdVbnRpbExvYWRGaW5pc2hlZCkpOwogCiAg ICAgZXZhc19vYmplY3Rfc21hcnRfY2FsbGJhY2tfYWRkKG1fd2ViVmlldywgImxvYWQsZmluaXNo ZWQiLCBvbkxvYWRGaW5pc2hlZCwgJmRhdGEpOwogCi0gICAgd2hpbGUgKCFkYXRhLmxvYWRGaW5p c2hlZCkKKyAgICB3aGlsZSAoIWRhdGEuaXNEb25lKCkpCiAgICAgICAgIGVjb3JlX21haW5fbG9v cF9pdGVyYXRlKCk7CiAKICAgICBldmFzX29iamVjdF9zbWFydF9jYWxsYmFja19kZWwobV93ZWJW aWV3LCAibG9hZCxmaW5pc2hlZCIsIG9uTG9hZEZpbmlzaGVkKTsKIAotICAgIHJldHVybiAhZGF0 YS5kaWRUaW1lT3V0OworICAgIHJldHVybiAhZGF0YS5kaWRUaW1lT3V0KCk7CiB9CiAKLXN0cnVj dCBUaXRsZUNoYW5nZWREYXRhIHsKLSAgICBUaXRsZUNoYW5nZWREYXRhKGNvbnN0IGNoYXIqIHRp dGxlLCBkb3VibGUgdGltZW91dFNlY29uZHMsIEVjb3JlX1Rhc2tfQ2IgY2FsbGJhY2spCi0gICAg ICAgIDogZXhwZWN0ZWRUaXRsZSh0aXRsZSkKLSAgICAgICAgLCBkb25lKGZhbHNlKQotICAgICAg ICAsIHRpbWVyKDApCi0gICAgICAgICwgZGlkVGltZU91dChmYWxzZSkKLSAgICB7Ci0gICAgICAg IGlmICh0aW1lb3V0U2Vjb25kcyA+PSAwKQotICAgICAgICAgICAgdGltZXIgPSBlY29yZV90aW1l cl9hZGQodGltZW91dFNlY29uZHMsIGNhbGxiYWNrLCB0aGlzKTsKLSAgICB9CitzdGF0aWMgdm9p ZCBvblRpdGxlQ2hhbmdlZCh2b2lkKiB1c2VyRGF0YSwgRXZhc19PYmplY3QqIHdlYlZpZXcsIHZv aWQqKQoreworICAgIENhbGxiYWNrRGF0YUV4cGVjdGVkVmFsdWU8Q1N0cmluZz4qIGRhdGEgPSBz dGF0aWNfY2FzdDxDYWxsYmFja0RhdGFFeHBlY3RlZFZhbHVlPENTdHJpbmc+Kj4odXNlckRhdGEp OwogCi0gICAgflRpdGxlQ2hhbmdlZERhdGEoKQotICAgIHsKLSAgICAgICAgaWYgKHRpbWVyKQot ICAgICAgICAgICAgZWNvcmVfdGltZXJfZGVsKHRpbWVyKTsKLSAgICB9CisgICAgaWYgKHN0cmNt cChld2tfdmlld190aXRsZV9nZXQod2ViVmlldyksIGRhdGEtPmV4cGVjdGVkVmFsdWUoKS5kYXRh KCkpKQorICAgICAgICByZXR1cm47CiAKLSAgICBDU3RyaW5nIGV4cGVjdGVkVGl0bGU7Ci0gICAg Ym9vbCBkb25lOwotICAgIEVjb3JlX1RpbWVyKiB0aW1lcjsKLSAgICBib29sIGRpZFRpbWVPdXQ7 Ci19OworICAgIGRhdGEtPnNldERvbmUoKTsKK30KIAotc3RhdGljIHZvaWQgb25UaXRsZUNoYW5n ZWQodm9pZCogdXNlckRhdGEsIEV2YXNfT2JqZWN0KiB3ZWJWaWV3LCB2b2lkKiBldmVudEluZm8p CitzdGF0aWMgYm9vbCB0aW1lT3V0V2hpbGVXYWl0aW5nVW50aWxUaXRsZUNoYW5nZWRUbyh2b2lk KiB1c2VyRGF0YSkKIHsKLSAgICBUaXRsZUNoYW5nZWREYXRhKiBkYXRhID0gc3RhdGljX2Nhc3Q8 VGl0bGVDaGFuZ2VkRGF0YSo+KHVzZXJEYXRhKTsKKyAgICBDYWxsYmFja0RhdGFFeHBlY3RlZFZh bHVlPENTdHJpbmc+KiBkYXRhID0gc3RhdGljX2Nhc3Q8Q2FsbGJhY2tEYXRhRXhwZWN0ZWRWYWx1 ZTxDU3RyaW5nPio+KHVzZXJEYXRhKTsKKyAgICBkYXRhLT5zZXRUaW1lZE91dCgpOwogCi0gICAg aWYgKHN0cmNtcChld2tfdmlld190aXRsZV9nZXQod2ViVmlldyksIGRhdGEtPmV4cGVjdGVkVGl0 bGUuZGF0YSgpKSkKLSAgICAgICAgcmV0dXJuOworICAgIHJldHVybiBFQ09SRV9DQUxMQkFDS19D QU5DRUw7Cit9CiAKLSAgICBpZiAoZGF0YS0+dGltZXIpIHsKLSAgICAgICAgZWNvcmVfdGltZXJf ZGVsKGRhdGEtPnRpbWVyKTsKLSAgICAgICAgZGF0YS0+dGltZXIgPSAwOwotICAgIH0KK2Jvb2wg RVdLMlVuaXRUZXN0QmFzZTo6d2FpdFVudGlsVGl0bGVDaGFuZ2VkVG8oY29uc3QgY2hhciogZXhw ZWN0ZWRUaXRsZSwgZG91YmxlIHRpbWVvdXRTZWNvbmRzKQoreworICAgIENhbGxiYWNrRGF0YUV4 cGVjdGVkVmFsdWU8Q1N0cmluZz4gZGF0YShleHBlY3RlZFRpdGxlLCB0aW1lb3V0U2Vjb25kcywg cmVpbnRlcnByZXRfY2FzdDxFY29yZV9UYXNrX0NiPih0aW1lT3V0V2hpbGVXYWl0aW5nVW50aWxU aXRsZUNoYW5nZWRUbykpOworCisgICAgZXZhc19vYmplY3Rfc21hcnRfY2FsbGJhY2tfYWRkKG1f d2ViVmlldywgInRpdGxlLGNoYW5nZWQiLCBvblRpdGxlQ2hhbmdlZCwgJmRhdGEpOwogCi0gICAg ZGF0YS0+ZG9uZSA9IHRydWU7CisgICAgd2hpbGUgKCFkYXRhLmlzRG9uZSgpKQorICAgICAgICBl Y29yZV9tYWluX2xvb3BfaXRlcmF0ZSgpOworCisgICAgZXZhc19vYmplY3Rfc21hcnRfY2FsbGJh Y2tfZGVsKG1fd2ViVmlldywgInRpdGxlLGNoYW5nZWQiLCBvblRpdGxlQ2hhbmdlZCk7CisKKyAg ICByZXR1cm4gIWRhdGEuZGlkVGltZU91dCgpOwogfQogCi1zdGF0aWMgYm9vbCB0aW1lT3V0V2hp bGVXYWl0aW5nVW50aWxUaXRsZUNoYW5nZWRUbyh2b2lkKiB1c2VyRGF0YSkKK3N0YXRpYyB2b2lk IG9uVVJJQ2hhbmdlZCh2b2lkKiB1c2VyRGF0YSwgRXZhc19PYmplY3QqIHdlYlZpZXcsIHZvaWQq KQogewotICAgIFRpdGxlQ2hhbmdlZERhdGEqIGRhdGEgPSBzdGF0aWNfY2FzdDxUaXRsZUNoYW5n ZWREYXRhKj4odXNlckRhdGEpOworICAgIENhbGxiYWNrRGF0YUV4cGVjdGVkVmFsdWU8Q1N0cmlu Zz4qIGRhdGEgPSBzdGF0aWNfY2FzdDxDYWxsYmFja0RhdGFFeHBlY3RlZFZhbHVlPENTdHJpbmc+ Kj4odXNlckRhdGEpOwogCi0gICAgZGF0YS0+dGltZXIgPSAwOworICAgIGlmIChzdHJjbXAoZXdr X3ZpZXdfdXJpX2dldCh3ZWJWaWV3KSwgZGF0YS0+ZXhwZWN0ZWRWYWx1ZSgpLmRhdGEoKSkpCisg ICAgICAgIHJldHVybjsKIAotICAgIGlmIChkYXRhLT5kb25lKQotICAgICAgICByZXR1cm4gRUNP UkVfQ0FMTEJBQ0tfQ0FOQ0VMOworICAgIGRhdGEtPnNldERvbmUoKTsKK30KIAotICAgIGRhdGEt PmRvbmUgPSB0cnVlOwotICAgIGRhdGEtPmRpZFRpbWVPdXQgPSB0cnVlOworc3RhdGljIGJvb2wg dGltZU91dFdoaWxlV2FpdGluZ1VudGlsVVJJQ2hhbmdlZFRvKHZvaWQqIHVzZXJEYXRhKQorewor ICAgIENhbGxiYWNrRGF0YUV4cGVjdGVkVmFsdWU8Q1N0cmluZz4qIGRhdGEgPSBzdGF0aWNfY2Fz dDxDYWxsYmFja0RhdGFFeHBlY3RlZFZhbHVlPENTdHJpbmc+Kj4odXNlckRhdGEpOworICAgIGRh dGEtPnNldFRpbWVkT3V0KCk7CiAKICAgICByZXR1cm4gRUNPUkVfQ0FMTEJBQ0tfQ0FOQ0VMOwog fQogCi1ib29sIEVXSzJVbml0VGVzdEJhc2U6OndhaXRVbnRpbFRpdGxlQ2hhbmdlZFRvKGNvbnN0 IGNoYXIqIGV4cGVjdGVkVGl0bGUsIGRvdWJsZSB0aW1lb3V0U2Vjb25kcykKK2Jvb2wgRVdLMlVu aXRUZXN0QmFzZTo6d2FpdFVudGlsVVJJQ2hhbmdlZFRvKGNvbnN0IGNoYXIqIGV4cGVjdGVkVVJJ LCBkb3VibGUgdGltZW91dFNlY29uZHMpCiB7Ci0gICAgVGl0bGVDaGFuZ2VkRGF0YSBkYXRhKGV4 cGVjdGVkVGl0bGUsIHRpbWVvdXRTZWNvbmRzLCByZWludGVycHJldF9jYXN0PEVjb3JlX1Rhc2tf Q2I+KHRpbWVPdXRXaGlsZVdhaXRpbmdVbnRpbFRpdGxlQ2hhbmdlZFRvKSk7CisgICAgQ2FsbGJh Y2tEYXRhRXhwZWN0ZWRWYWx1ZTxDU3RyaW5nPiBkYXRhKGV4cGVjdGVkVVJJLCB0aW1lb3V0U2Vj b25kcywgcmVpbnRlcnByZXRfY2FzdDxFY29yZV9UYXNrX0NiPih0aW1lT3V0V2hpbGVXYWl0aW5n VW50aWxVUklDaGFuZ2VkVG8pKTsKIAotICAgIGV2YXNfb2JqZWN0X3NtYXJ0X2NhbGxiYWNrX2Fk ZChtX3dlYlZpZXcsICJ0aXRsZSxjaGFuZ2VkIiwgb25UaXRsZUNoYW5nZWQsICZkYXRhKTsKKyAg ICBldmFzX29iamVjdF9zbWFydF9jYWxsYmFja19hZGQobV93ZWJWaWV3LCAidXJpLGNoYW5nZWQi LCBvblVSSUNoYW5nZWQsICZkYXRhKTsKIAotICAgIHdoaWxlICghZGF0YS5kb25lKQorICAgIHdo aWxlICghZGF0YS5pc0RvbmUoKSkKICAgICAgICAgZWNvcmVfbWFpbl9sb29wX2l0ZXJhdGUoKTsK IAotICAgIGV2YXNfb2JqZWN0X3NtYXJ0X2NhbGxiYWNrX2RlbChtX3dlYlZpZXcsICJ0aXRsZSxj aGFuZ2VkIiwgb25UaXRsZUNoYW5nZWQpOworICAgIGV2YXNfb2JqZWN0X3NtYXJ0X2NhbGxiYWNr X2RlbChtX3dlYlZpZXcsICJ1cmksY2hhbmdlZCIsIG9uVVJJQ2hhbmdlZCk7CiAKLSAgICByZXR1 cm4gIWRhdGEuZGlkVGltZU91dDsKKyAgICByZXR1cm4gIWRhdGEuZGlkVGltZU91dCgpOwogfQog CiB2b2lkIEVXSzJVbml0VGVzdEJhc2U6Om1vdXNlQ2xpY2soaW50IHgsIGludCB5KQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvVW5pdFRlc3RVdGls cy9FV0syVW5pdFRlc3RCYXNlLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90 ZXN0cy9Vbml0VGVzdFV0aWxzL0VXSzJVbml0VGVzdEJhc2UuaAppbmRleCBkYmRkMDg2Li40MGJj MjgyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy9V bml0VGVzdFV0aWxzL0VXSzJVbml0VGVzdEJhc2UuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2VmbC90ZXN0cy9Vbml0VGVzdFV0aWxzL0VXSzJVbml0VGVzdEJhc2UuaApAQCAt NDMsNiArNDMsNyBAQCBwcm90ZWN0ZWQ6CiAgICAgdm9pZCBsb2FkVXJsU3luYyhjb25zdCBjaGFy KiB1cmwpOwogICAgIGJvb2wgd2FpdFVudGlsTG9hZEZpbmlzaGVkKGRvdWJsZSB0aW1lb3V0U2Vj b25kcyA9IC0xKTsKICAgICBib29sIHdhaXRVbnRpbFRpdGxlQ2hhbmdlZFRvKGNvbnN0IGNoYXIq IGV4cGVjdGVkVGl0bGUsIGRvdWJsZSB0aW1lb3V0U2Vjb25kcyA9IC0xKTsKKyAgICBib29sIHdh aXRVbnRpbFVSSUNoYW5nZWRUbyhjb25zdCBjaGFyKiBleHBlY3RlZFVSSSwgZG91YmxlIHRpbWVv dXRTZWNvbmRzID0gLTEpOwogICAgIHZvaWQgbW91c2VDbGljayhpbnQgeCwgaW50IHkpOwogCiBw cml2YXRlOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVz dHMvcmVzb3VyY2VzL3NhbWVfcGFnZV9uYXZpZ2F0aW9uLmh0bWwgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2VmbC90ZXN0cy9yZXNvdXJjZXMvc2FtZV9wYWdlX25hdmlnYXRpb24uaHRt bApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi43YjY0YjIxCi0tLSAvZGV2L251 bGwKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvcmVzb3VyY2Vz L3NhbWVfcGFnZV9uYXZpZ2F0aW9uLmh0bWwKQEAgLTAsMCArMSw1IEBACis8aHRtbD4KKzxib2R5 PgorPGEgaWQ9Im15TGluayIgaHJlZj0iIyI+PGRpdiBzdHlsZT0icG9zaXRpb246IGFic29sdXRl OyB0b3A6IDA7IGxlZnQ6IDA7IHdpZHRoOiAxMDBweDsgaGVpZ2h0OiAxMDBweDsiPjwvZGl2Pjwv YT4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl92aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl92aWV3LmNwcAppbmRleCBlZTEyZDM1Li5jODZl NWY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90 ZXN0X2V3azJfdmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwv dGVzdHMvdGVzdF9ld2syX3ZpZXcuY3BwCkBAIC0zMCw2ICszMCw3IEBACiAjaW5jbHVkZSA8d3Rm L1Bhc3NPd25QdHIuaD4KICNpbmNsdWRlIDx3dGYvVW51c2VkUGFyYW0uaD4KICNpbmNsdWRlIDx3 dGYvdGV4dC9DU3RyaW5nLmg+CisjaW5jbHVkZSA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CiAKIHVz aW5nIG5hbWVzcGFjZSBFV0syVW5pdFRlc3Q7CiAKQEAgLTM2MSw2ICszNjIsMTcgQEAgVEVTVF9G KEVXSzJVbml0VGVzdEJhc2UsIGV3a192aWV3X2Z1bGxfc2NyZWVuX2V4aXQpCiAgICAgY2hlY2tG dWxsU2NyZWVuUHJvcGVydHkod2ViVmlldygpLCBmYWxzZSk7CiB9CiAKK1RFU1RfRihFV0syVW5p dFRlc3RCYXNlLCBld2tfdmlld19zYW1lX3BhZ2VfbmF2aWdhdGlvbikKK3sKKyAgICAvLyBUZXN0 cyB0aGF0IHNhbWUgcGFnZSBuYXZpZ2F0aW9uIHVwZGF0ZXMgdGhlIHBhZ2UgVVJJLgorICAgIFN0 cmluZyB0ZXN0VXJsID0gZW52aXJvbm1lbnQtPnVybEZvclJlc291cmNlKCJzYW1lX3BhZ2VfbmF2 aWdhdGlvbi5odG1sIikuZGF0YSgpOworICAgIGxvYWRVcmxTeW5jKHRlc3RVcmwudXRmOCgpLmRh dGEoKSk7CisgICAgQVNTRVJUX1NUUkVRKHRlc3RVcmwudXRmOCgpLmRhdGEoKSwgZXdrX3ZpZXdf dXJpX2dldCh3ZWJWaWV3KCkpKTsKKyAgICBtb3VzZUNsaWNrKDUwLCA1MCk7CisgICAgdGVzdFVy bCA9IHRlc3RVcmwgKyAnIyc7CisgICAgQVNTRVJUX1RSVUUod2FpdFVudGlsVVJJQ2hhbmdlZFRv KHRlc3RVcmwudXRmOCgpLmRhdGEoKSwgMTApKTsKK30KKwogVEVTVF9GKEVXSzJVbml0VGVzdEJh c2UsIGV3a192aWV3X3RpdGxlX2NoYW5nZWQpCiB7CiAgICAgY29uc3QgY2hhciogdGl0bGVDaGFu Z2VkSFRNTCA9Cg==