84589 2012-04-23 06:12:08 -0700 [EFL][DRT] Implementation of showModalDialog needed 2012-10-30 07:09:13 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED WONTFIX P2 Normal --- 85962 1 d-r cdumez antognolli+webkit cdumez gyuyoung.kim lucas.de.marchi rakuco sw0524.lee tmpsantos webkit.review.bot oldest_to_newest 607623 0 d-r 2012-04-23 06:12:08 -0700 Several tests rely on showModalDialog - need an implementation to unskip. See also bug 53676. 609660 1 cdumez 2012-04-25 05:16:44 -0700 Dominik, I'll work on this one if you don't mind. 610369 2 138936 cdumez 2012-04-25 22:52:55 -0700 Created attachment 138936 Patch This patch fixes the following test cases which are not skipped: - http/tests/security/cross-frame-access-call.html - http/tests/security/cross-frame-access-get.html - http/tests/xmlhttprequest/access-control-basic-allow-preflight-cache-invalidation-by-header.html - http/tests/xmlhttprequest/access-control-basic-allow-preflight-cache-invalidation-by-method.html - http/tests/xmlhttprequest/access-control-basic-allow-preflight-cache-timeout.html - http/tests/xmlhttprequest/access-control-basic-allow-preflight-cache.html It allows to remove several test cases from the skipped list as well. Some more tests could be unskipped if we implement support for LayoutTestController.abortModal() but I will handle this in a separate patch. 610371 3 cdumez 2012-04-25 22:54:28 -0700 I should mention that the implementation is based on the one in Qt port. 616157 4 cdumez 2012-05-04 06:44:48 -0700 rakuco or gyuyoung: Could I please get informal review on this one? 616168 5 tmpsantos 2012-05-04 06:58:16 -0700 (In reply to comment #2) > Created an attachment (id=138936) [details] > Patch > > This patch fixes the following test cases which are not skipped: > - http/tests/security/cross-frame-access-call.html > - http/tests/security/cross-frame-access-get.html Yes. > - http/tests/xmlhttprequest/access-control-basic-allow-preflight-cache-invalidation-by-header.html > - http/tests/xmlhttprequest/access-control-basic-allow-preflight-cache-invalidation-by-method.html > - http/tests/xmlhttprequest/access-control-basic-allow-preflight-cache-timeout.html > - http/tests/xmlhttprequest/access-control-basic-allow-preflight-cache.html > I don't think so. It's likely to be bug 85613. > It allows to remove several test cases from the skipped list as well. > Some more tests could be unskipped if we implement support for LayoutTestController.abortModal() but I will handle this in a separate patch. 616235 6 rakuco 2012-05-04 08:12:03 -0700 I've CC'ed Rafael Antognolli in case he remembers anything about the work done on modal stuff a few years ago (was it Lucas de Marchi who did it?). At the time there were some problems with nested event loops that I don't remember very well and might have already been solved. I, for one, am not sure if ecore_thread_main_loop is the right solution here (I've never used it before) -- if it is, remember to bump the minimum ecore version in FindEFL.cmake to 1.1.x. 618540 7 cdumez 2012-05-08 08:35:07 -0700 Any update on this? We need it to make the tree green. 618656 8 rakuco 2012-05-08 11:28:11 -0700 From my side, I'm still unsure about using ecore_thread_main_loop_{begin,end} here. There isn't much documentation for it besides <http://docs.enlightenment.org/auto/elementary/efl_thread_1.html>, which doesn't really seem to be our case here. 618867 9 138936 eric 2012-05-08 15:26:10 -0700 Comment on attachment 138936 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=138936&action=review Difficult for me to know if this is the right way to do modal dialogs in EFL. > Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp:86 > + : m_view(view), m_isRunningModal(false) Normally this goes on the next line, starting with a "," 619225 10 138936 gyuyoung.kim 2012-05-09 00:18:08 -0700 Comment on attachment 138936 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=138936&action=review > Source/WebKit/efl/ewk/ewk_private.h:134 > +void ewk_view_modal_get(Evas_Object* ewkView, bool* modal); Add const keyword to _get function. 619274 11 140885 cdumez 2012-05-09 01:48:58 -0700 Created attachment 140885 Patch Take feedback into consideration. 619275 12 cdumez 2012-05-09 01:50:36 -0700 (In reply to comment #10) > (From update of attachment 138936 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=138936&action=review > > > Source/WebKit/efl/ewk/ewk_private.h:134 > > +void ewk_view_modal_get(Evas_Object* ewkView, bool* modal); > > Add const keyword to _get function. I don't think I can because I'm calling evas_object_smart_callback_call() on the view in this method (or am I supposed to const_cast?). If you look at methods around in ewk_private.h, they don't use const either. 702417 13 140885 eric 2012-08-22 15:25:59 -0700 Comment on attachment 140885 Patch rs=me. 702434 14 140885 rakuco 2012-08-22 15:30:03 -0700 Comment on attachment 140885 Patch Not yet, please. My doubts persist. 702452 15 cdumez 2012-08-22 15:39:28 -0700 (In reply to comment #14) > (From update of attachment 140885 [details]) > Not yet, please. My doubts persist. This patch is really old. Completely forgot about it. I'll take a look at it again tomorrow (getting late here). 754337 16 cdumez 2012-10-30 07:08:53 -0700 Will probably not fix it for WK1 EFL since focus has moved to WK2 EFL. 138936 2012-04-25 22:52:55 -0700 2012-05-09 01:48:58 -0700 Patch 84589_showModalDialog.patch text/plain 13191 cdumez ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAwZTVjOTcyLi45NGI3MmJiIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTItMDQt MjUgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVsLmNvbT4KKworICAg ICAgICBbRUZMXVtEUlRdIEltcGxlbWVudGF0aW9uIG9mIHNob3dNb2RhbERpYWxvZyBuZWVkZWQK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg0NTg5CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVW5za2lwIHRl c3QgY2FzZXMgd2hpY2ggcmVxdWlyZSBzdXBwb3J0IGZvciBzaG93aW5nIG1vZGFsIGRpYWxvZ3Mg bm93CisgICAgICAgIHRoYXQgaXQgaGFzIGJlZW4gaW1wbGVtZW50ZWQgaW4gRUZMIHBvcnQuCisK KyAgICAgICAgKiBwbGF0Zm9ybS9lZmwvU2tpcHBlZDoKKwogMjAxMi0wNC0yNSAgTWFyayBIYWhu ZW5iZXJnICA8bWhhaG5lbmJlcmdAYXBwbGUuY29tPgogCiAgICAgICAgIGZhc3QvanMvcmFuZG9t LWFycmF5LWdjLXN0cmVzcyB0aW1lcyBvdXQgaW4gZGVidWcgbW9kZQpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvcGxhdGZvcm0vZWZsL1NraXBwZWQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9lZmwv U2tpcHBlZAppbmRleCAxMGQzY2UxLi4zYWExN2U5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9w bGF0Zm9ybS9lZmwvU2tpcHBlZAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9lZmwvU2tpcHBl ZApAQCAtMTkzLDM2ICsxOTMsNiBAQCBmYXN0L2V2ZW50cy9zZWxlY3RzdGFydC1wcmV2ZW50LXNl bGVjdGlvbi1vbi1yaWdodC1jbGljay5odG1sCiBtZWRpYS9jb250ZXh0LW1lbnUtYWN0aW9ucy5o dG1sCiBtZWRpYS9jb250cm9scy1yaWdodC1jbGljay1vbi10aW1lYmFyLmh0bWwKIAotIyBFRkwn cyBEUlQgbmVlZHMgdG8gc2hvdyBtb2RhbCBkaWFsb2dzCi1mYXN0L2V2ZW50cy9zaG93LW1vZGFs LWRpYWxvZy1vbmJsdXItb25mb2N1cy5odG1sCi1mYXN0L2V2ZW50cy9zY3JvbGwtZXZlbnQtZHVy aW5nLW1vZGFsLWRpYWxvZy5odG1sCi1mYXN0L2hhcm5lc3Mvc2hvdy1tb2RhbC1kaWFsb2cuaHRt bAotCi0jIFNwdXRuaWsgdGVzdHMgcmVseSBvbiBzaG93TW9kYWxEaWFsb2cgdG9vCi0jIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MzY3Ngotc3B1dG5pay9Db25mb3Jt YW5jZS8xMF9FeGVjdXRpb25fQ29udGV4dHMvMTAuMl9FbnRlcmluZ19Bbl9FeGVjdXRpb25fQ29u dGV4dC8xMC4yLjJfRXZhbF9Db2RlL1MxMC4yLjJfQTEuMV9UMS5odG1sCi1zcHV0bmlrL0NvbmZv cm1hbmNlLzEwX0V4ZWN1dGlvbl9Db250ZXh0cy8xMC4yX0VudGVyaW5nX0FuX0V4ZWN1dGlvbl9D b250ZXh0LzEwLjIuMl9FdmFsX0NvZGUvUzEwLjIuMl9BMS4xX1QxMC5odG1sCi1zcHV0bmlrL0Nv bmZvcm1hbmNlLzEwX0V4ZWN1dGlvbl9Db250ZXh0cy8xMC4yX0VudGVyaW5nX0FuX0V4ZWN1dGlv bl9Db250ZXh0LzEwLjIuMl9FdmFsX0NvZGUvUzEwLjIuMl9BMS4xX1QxMS5odG1sCi1zcHV0bmlr L0NvbmZvcm1hbmNlLzEwX0V4ZWN1dGlvbl9Db250ZXh0cy8xMC4yX0VudGVyaW5nX0FuX0V4ZWN1 dGlvbl9Db250ZXh0LzEwLjIuMl9FdmFsX0NvZGUvUzEwLjIuMl9BMS4xX1QyLmh0bWwKLXNwdXRu aWsvQ29uZm9ybWFuY2UvMTBfRXhlY3V0aW9uX0NvbnRleHRzLzEwLjJfRW50ZXJpbmdfQW5fRXhl Y3V0aW9uX0NvbnRleHQvMTAuMi4yX0V2YWxfQ29kZS9TMTAuMi4yX0ExLjFfVDMuaHRtbAotc3B1 dG5pay9Db25mb3JtYW5jZS8xMF9FeGVjdXRpb25fQ29udGV4dHMvMTAuMl9FbnRlcmluZ19Bbl9F eGVjdXRpb25fQ29udGV4dC8xMC4yLjJfRXZhbF9Db2RlL1MxMC4yLjJfQTEuMV9UNC5odG1sCi1z cHV0bmlrL0NvbmZvcm1hbmNlLzEwX0V4ZWN1dGlvbl9Db250ZXh0cy8xMC4yX0VudGVyaW5nX0Fu X0V4ZWN1dGlvbl9Db250ZXh0LzEwLjIuMl9FdmFsX0NvZGUvUzEwLjIuMl9BMS4xX1Q1Lmh0bWwK LXNwdXRuaWsvQ29uZm9ybWFuY2UvMTBfRXhlY3V0aW9uX0NvbnRleHRzLzEwLjJfRW50ZXJpbmdf QW5fRXhlY3V0aW9uX0NvbnRleHQvMTAuMi4yX0V2YWxfQ29kZS9TMTAuMi4yX0ExLjFfVDYuaHRt bAotc3B1dG5pay9Db25mb3JtYW5jZS8xMF9FeGVjdXRpb25fQ29udGV4dHMvMTAuMl9FbnRlcmlu Z19Bbl9FeGVjdXRpb25fQ29udGV4dC8xMC4yLjJfRXZhbF9Db2RlL1MxMC4yLjJfQTEuMV9UNy5o dG1sCi1zcHV0bmlrL0NvbmZvcm1hbmNlLzEwX0V4ZWN1dGlvbl9Db250ZXh0cy8xMC4yX0VudGVy aW5nX0FuX0V4ZWN1dGlvbl9Db250ZXh0LzEwLjIuMl9FdmFsX0NvZGUvUzEwLjIuMl9BMS4xX1Q4 Lmh0bWwKLXNwdXRuaWsvQ29uZm9ybWFuY2UvMTBfRXhlY3V0aW9uX0NvbnRleHRzLzEwLjJfRW50 ZXJpbmdfQW5fRXhlY3V0aW9uX0NvbnRleHQvMTAuMi4yX0V2YWxfQ29kZS9TMTAuMi4yX0ExLjFf VDkuaHRtbAotc3B1dG5pay9Db25mb3JtYW5jZS8xMF9FeGVjdXRpb25fQ29udGV4dHMvMTAuMl9F bnRlcmluZ19Bbl9FeGVjdXRpb25fQ29udGV4dC8xMC4yLjJfRXZhbF9Db2RlL1MxMC4yLjJfQTEu Ml9UMS5odG1sCi1zcHV0bmlrL0NvbmZvcm1hbmNlLzEwX0V4ZWN1dGlvbl9Db250ZXh0cy8xMC4y X0VudGVyaW5nX0FuX0V4ZWN1dGlvbl9Db250ZXh0LzEwLjIuMl9FdmFsX0NvZGUvUzEwLjIuMl9B MS4yX1QxMC5odG1sCi1zcHV0bmlrL0NvbmZvcm1hbmNlLzEwX0V4ZWN1dGlvbl9Db250ZXh0cy8x MC4yX0VudGVyaW5nX0FuX0V4ZWN1dGlvbl9Db250ZXh0LzEwLjIuMl9FdmFsX0NvZGUvUzEwLjIu Ml9BMS4yX1QxMS5odG1sCi1zcHV0bmlrL0NvbmZvcm1hbmNlLzEwX0V4ZWN1dGlvbl9Db250ZXh0 cy8xMC4yX0VudGVyaW5nX0FuX0V4ZWN1dGlvbl9Db250ZXh0LzEwLjIuMl9FdmFsX0NvZGUvUzEw LjIuMl9BMS4yX1QyLmh0bWwKLXNwdXRuaWsvQ29uZm9ybWFuY2UvMTBfRXhlY3V0aW9uX0NvbnRl eHRzLzEwLjJfRW50ZXJpbmdfQW5fRXhlY3V0aW9uX0NvbnRleHQvMTAuMi4yX0V2YWxfQ29kZS9T MTAuMi4yX0ExLjJfVDMuaHRtbAotc3B1dG5pay9Db25mb3JtYW5jZS8xMF9FeGVjdXRpb25fQ29u dGV4dHMvMTAuMl9FbnRlcmluZ19Bbl9FeGVjdXRpb25fQ29udGV4dC8xMC4yLjJfRXZhbF9Db2Rl L1MxMC4yLjJfQTEuMl9UNC5odG1sCi1zcHV0bmlrL0NvbmZvcm1hbmNlLzEwX0V4ZWN1dGlvbl9D b250ZXh0cy8xMC4yX0VudGVyaW5nX0FuX0V4ZWN1dGlvbl9Db250ZXh0LzEwLjIuMl9FdmFsX0Nv ZGUvUzEwLjIuMl9BMS4yX1Q1Lmh0bWwKLXNwdXRuaWsvQ29uZm9ybWFuY2UvMTBfRXhlY3V0aW9u X0NvbnRleHRzLzEwLjJfRW50ZXJpbmdfQW5fRXhlY3V0aW9uX0NvbnRleHQvMTAuMi4yX0V2YWxf Q29kZS9TMTAuMi4yX0ExLjJfVDYuaHRtbAotc3B1dG5pay9Db25mb3JtYW5jZS8xMF9FeGVjdXRp b25fQ29udGV4dHMvMTAuMl9FbnRlcmluZ19Bbl9FeGVjdXRpb25fQ29udGV4dC8xMC4yLjJfRXZh bF9Db2RlL1MxMC4yLjJfQTEuMl9UNy5odG1sCi1zcHV0bmlrL0NvbmZvcm1hbmNlLzEwX0V4ZWN1 dGlvbl9Db250ZXh0cy8xMC4yX0VudGVyaW5nX0FuX0V4ZWN1dGlvbl9Db250ZXh0LzEwLjIuMl9F dmFsX0NvZGUvUzEwLjIuMl9BMS4yX1Q4Lmh0bWwKLXNwdXRuaWsvQ29uZm9ybWFuY2UvMTBfRXhl Y3V0aW9uX0NvbnRleHRzLzEwLjJfRW50ZXJpbmdfQW5fRXhlY3V0aW9uX0NvbnRleHQvMTAuMi4y X0V2YWxfQ29kZS9TMTAuMi4yX0ExLjJfVDkuaHRtbAotCiAjIEVGTCdzIERSVCBuZWVkcyBDT05G SVJNIE5BVklHQVRJT04gbWVzc2FnZXMKIGZhc3QvbG9hZGVyL2Zvcm0tc3VibWlzc2lvbi1hZnRl ci1iZWZvcmV1bmxvYWQtY2FuY2VsLmh0bWwKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9l ZmwvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCmluZGV4IDc0NDNmZjUu Ljg3NzllZmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZworKysgYi9T b3VyY2UvV2ViS2l0L2VmbC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNyBAQAorMjAxMi0wNC0yNSAg Q2hyaXN0b3BoZSBEdW1leiAgPGNocmlzdG9waGUuZHVtZXpAaW50ZWwuY29tPgorCisgICAgICAg IFtFRkxdW0RSVF0gSW1wbGVtZW50YXRpb24gb2Ygc2hvd01vZGFsRGlhbG9nIG5lZWRlZAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODQ1ODkKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgc3VwcG9ydCBm b3IgaGFuZGxpbmcgbW9kYWwgZGlhbG9ncyBpbiBDaHJvbWVDbGllbnRFZmwgYW5kIEV3a1ZpZXcu CisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRFZmwuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6Q2hyb21lQ2xpZW50RWZsOjpDaHJvbWVDbGllbnRFZmwpOgorICAgICAgICAo V2ViQ29yZTo6Q2hyb21lQ2xpZW50RWZsOjp+Q2hyb21lQ2xpZW50RWZsKToKKyAgICAgICAgKFdl YkNvcmU6OkNocm9tZUNsaWVudEVmbDo6Y3JlYXRlV2luZG93KToKKyAgICAgICAgKFdlYkNvcmU6 OkNocm9tZUNsaWVudEVmbDo6Y2FuUnVuTW9kYWwpOgorICAgICAgICAoV2ViQ29yZTo6Q2hyb21l Q2xpZW50RWZsOjpydW5Nb2RhbCk6CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xp ZW50RWZsLmg6CisgICAgICAgIChDaHJvbWVDbGllbnRFZmwpOgorICAgICAgICAqIGV3ay9ld2tf cHJpdmF0ZS5oOgorICAgICAgICAqIGV3ay9ld2tfdmlldy5jcHA6CisgICAgICAgIChfRXdrX1Zp ZXdfUHJpdmF0ZV9EYXRhKToKKyAgICAgICAgKGV3a192aWV3X21vZGFsX3NldCk6CisgICAgICAg IChld2tfdmlld19tb2RhbF9nZXQpOgorICAgICAgICAqIGV3ay9ld2tfdmlldy5oOgorCiAyMDEy LTA0LTIzICBDaHJpc3RvcGhlIER1bWV6ICA8Y2hyaXN0b3BoZS5kdW1lekBpbnRlbC5jb20+CiAK ICAgICAgICAgW0VGTF0gRUZMJ3MgTGF5b3V0VGVzdENvbnRyb2xsZXIgZG9lcyBub3QgaW1wbGVt ZW50IGVsZW1lbnREb2VzQXV0b0NvbXBsZXRlRm9yRWxlbWVudFdpdGhJZApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50RWZsLmNwcCBiL1Nv dXJjZS9XZWJLaXQvZWZsL1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEVmbC5jcHAKaW5kZXgg ZDAyYjkzMS4uYjM5ZTA4NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvV2ViQ29yZVN1 cHBvcnQvQ2hyb21lQ2xpZW50RWZsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3Jl U3VwcG9ydC9DaHJvbWVDbGllbnRFZmwuY3BwCkBAIC01MSw2ICs1MSw3IEBACiAjaW5jbHVkZSAi Vmlld3BvcnRBcmd1bWVudHMuaCIKICNpbmNsdWRlICJXaW5kb3dGZWF0dXJlcy5oIgogI2luY2x1 ZGUgImV3a19wcml2YXRlLmgiCisjaW5jbHVkZSA8RWNvcmUuaD4KICNpbmNsdWRlIDxFY29yZV9F dmFzLmg+CiAjaW5jbHVkZSA8RXZhcy5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4K QEAgLTgyLDEzICs4MywxNSBAQCBzdGF0aWMgaW5saW5lIEV2YXNfT2JqZWN0KiBraXQoRnJhbWUq IGZyYW1lKQogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBDaHJvbWVDbGllbnRFZmw6OkNocm9tZUNs aWVudEVmbChFdmFzX09iamVjdCogdmlldykKLSAgICA6IG1fdmlldyh2aWV3KQorICAgIDogbV92 aWV3KHZpZXcpLCBtX2lzUnVubmluZ01vZGFsKGZhbHNlKQogewogICAgIEFTU0VSVChtX3ZpZXcp OwogfQogCiBDaHJvbWVDbGllbnRFZmw6On5DaHJvbWVDbGllbnRFZmwoKQogeworICAgIGlmICht X2lzUnVubmluZ01vZGFsKQorICAgICAgICBlY29yZV90aHJlYWRfbWFpbl9sb29wX2VuZCgpOwog fQogCiB2b2lkIENocm9tZUNsaWVudEVmbDo6Y2hyb21lRGVzdHJveWVkKCkKQEAgLTE0OSw2ICsx NTIsOSBAQCBQYWdlKiBDaHJvbWVDbGllbnRFZmw6OmNyZWF0ZVdpbmRvdyhGcmFtZSosIGNvbnN0 IEZyYW1lTG9hZFJlcXVlc3QmIGZyYW1lTG9hZFJlcQogICAgIGlmICghbmV3VmlldykKICAgICAg ICAgcmV0dXJuIDA7CiAKKyAgICBpZiAoZmVhdHVyZXMuZGlhbG9nKQorICAgICAgICBld2tfdmll d19tb2RhbF9zZXQobmV3VmlldywgdHJ1ZSk7CisKICAgICByZXR1cm4gZXdrX3ZpZXdfY29yZV9w YWdlX2dldChuZXdWaWV3KTsKIH0KIApAQCAtMTU5LDEzICsxNjUsMTMgQEAgdm9pZCBDaHJvbWVD bGllbnRFZmw6OnNob3coKQogCiBib29sIENocm9tZUNsaWVudEVmbDo6Y2FuUnVuTW9kYWwoKQog ewotICAgIG5vdEltcGxlbWVudGVkKCk7Ci0gICAgcmV0dXJuIGZhbHNlOworICAgIHJldHVybiB0 cnVlOwogfQogCiB2b2lkIENocm9tZUNsaWVudEVmbDo6cnVuTW9kYWwoKQogewotICAgIG5vdElt cGxlbWVudGVkKCk7CisgICAgbV9pc1J1bm5pbmdNb2RhbCA9IHRydWU7CisgICAgZWNvcmVfdGhy ZWFkX21haW5fbG9vcF9iZWdpbigpOwogfQogCiB2b2lkIENocm9tZUNsaWVudEVmbDo6c2V0VG9v bGJhcnNWaXNpYmxlKGJvb2wgdmlzaWJsZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZs L1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEVmbC5oIGIvU291cmNlL1dlYktpdC9lZmwvV2Vi Q29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50RWZsLmgKaW5kZXggNjVlYWViMy4uZmNmOWFmMCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50RWZs LmgKKysrIGIvU291cmNlL1dlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50RWZs LmgKQEAgLTE4MSw2ICsxODEsNyBAQCBwdWJsaWM6CiAKICAgICBFdmFzX09iamVjdCogbV92aWV3 OwogICAgIEtVUkwgbV9ob3ZlcmVkTGlua1VSTDsKKyAgICBib29sIG1faXNSdW5uaW5nTW9kYWw7 CiB9OwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ByaXZhdGUu aCBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfcHJpdmF0ZS5oCmluZGV4IGY0Yjk5YWNlLi40 MzIzZTdkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ByaXZhdGUuaAor KysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ByaXZhdGUuaApAQCAtMTMwLDYgKzEzMCw5 IEBAIHZvaWQgZXdrX3ZpZXdfbW91c2VfbGlua19ob3Zlcl9vdXQoRXZhc19PYmplY3QqIGV3a1Zp ZXcpOwogdm9pZCBld2tfdmlld190b29sYmFyc192aXNpYmxlX3NldChFdmFzX09iamVjdCogZXdr VmlldywgYm9vbCB2aXNpYmxlKTsKIHZvaWQgZXdrX3ZpZXdfdG9vbGJhcnNfdmlzaWJsZV9nZXQo RXZhc19PYmplY3QqIGV3a1ZpZXcsIGJvb2wqIHZpc2libGUpOwogCit2b2lkIGV3a192aWV3X21v ZGFsX3NldChFdmFzX09iamVjdCogZXdrVmlldywgYm9vbCBtb2RhbCk7Cit2b2lkIGV3a192aWV3 X21vZGFsX2dldChFdmFzX09iamVjdCogZXdrVmlldywgYm9vbCogbW9kYWwpOworCiB2b2lkIGV3 a192aWV3X3N0YXR1c2Jhcl92aXNpYmxlX3NldChFdmFzX09iamVjdCogZXdrVmlldywgYm9vbCB2 aXNpYmxlKTsKIHZvaWQgZXdrX3ZpZXdfc3RhdHVzYmFyX3Zpc2libGVfZ2V0KEV2YXNfT2JqZWN0 KiBld2tWaWV3LCBib29sKiB2aXNpYmxlKTsKIHZvaWQgZXdrX3ZpZXdfc3RhdHVzYmFyX3RleHRf c2V0KEV2YXNfT2JqZWN0KiBld2tWaWV3LCBjb25zdCBjaGFyKiB0ZXh0KTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0L2VmbC9l d2svZXdrX3ZpZXcuY3BwCmluZGV4IGY3ZjkzZDkuLmY4YTJhMjcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9lZmwvZXdr L2V3a192aWV3LmNwcApAQCAtMTI5LDYgKzEyOSw4IEBAIHN0YXRpYyBjb25zdCBFdmFzX1NtYXJ0 X0NiX0Rlc2NyaXB0aW9uIF9ld2tfdmlld19jYWxsYmFja19uYW1lc1tdID0gewogICAgIHsgImxv YWQsc3RhcnRlZCIsICIiIH0sCiAgICAgeyAibWVudWJhcix2aXNpYmxlLGdldCIsICJiIiB9LAog ICAgIHsgIm1lbnViYXIsdmlzaWJsZSxzZXQiLCAiYiIgfSwKKyAgICB7ICJtb2RhbCxnZXQiLCAi YiIgfSwKKyAgICB7ICJtb2RhbCxzZXQiLCAiYiJ9LAogICAgIHsgInBvcHVwLGNyZWF0ZWQiLCAi cCIgfSwKICAgICB7ICJwb3B1cCx3aWxsZGVsZXRlIiwgInAiIH0sCiAgICAgeyAicmVhZHkiLCAi IiB9LApAQCAtMzE3MCw2ICszMTcyLDM4IEBAIHZvaWQgZXdrX3ZpZXdfc2Nyb2xsYmFyc192aXNp YmxlX2dldChFdmFzX09iamVjdCogZXdrVmlldywgYm9vbCogdmlzaWJsZSkKIAogLyoqCiAgKiBA aW50ZXJuYWwKKyAqIFNldCB3aW5kb3cgbW9kYWxpdHkuCisgKgorICogQHBhcmFtIGV3a1ZpZXcg Vmlldy4KKyAqIEBwYXJhbSBtb2RhbCBAYyBUUlVFIGlmIHdpbmRvdyBpcyBtb2RhbCwgQGMgRkFM U0Ugb3RoZXJ3aXNlLgorICoKKyAqIEVtaXRzIHNpZ25hbDogIm1vZGFsLHNldCIgd2l0aCBhIHBv aW50ZXIgdG8gYSBib29sZWFuLgorICovCit2b2lkIGV3a192aWV3X21vZGFsX3NldChFdmFzX09i amVjdCogZXdrVmlldywgYm9vbCBtb2RhbCkKK3sKKyAgICBEQkcoImV3a1ZpZXc9JXAgKG1vZGFs PSVkKSIsIGV3a1ZpZXcsICEhbW9kYWwpOworICAgIGV2YXNfb2JqZWN0X3NtYXJ0X2NhbGxiYWNr X2NhbGwoZXdrVmlldywgIm1vZGFsLHNldCIsICZtb2RhbCk7Cit9CisKKy8qKgorICogQGludGVy bmFsCisgKiBHZXQgd2luZG93IG1vZGFsaXR5LgorICoKKyAqIEBwYXJhbSBld2tWaWV3IFZpZXcu CisgKiBAcGFyYW0gbW9kYWwgYm9vbGVhbiBwb2ludGVyIGluIHdoaWNoIHRvIHNhdmUgdGhlIHJl c3VsdC4gSXQgZGVmYXVsdHMKKyAqIHRvIEBjIEZBTFNFLCBpLmUuIGlmIGJyb3dzZXIgZG9lcyBu b3QgbGlzdGVuIHRvIGVtaXR0ZWQgc2lnbmFsLgorICoKKyAqIEVtaXRzIHNpZ25hbDogIm1vZGFs LGdldCIgd2l0aCBhIHBvaW50ZXIgdG8gYSBib29sZWFuLgorICovCit2b2lkIGV3a192aWV3X21v ZGFsX2dldChFdmFzX09iamVjdCogZXdrVmlldywgYm9vbCogbW9kYWwpCit7CisgICAgREJHKCIl cywgZXdrVmlldz0lcCIsIF9fZnVuY19fLCBld2tWaWV3KTsKKyAgICAqbW9kYWwgPSBmYWxzZTsK KyAgICBldmFzX29iamVjdF9zbWFydF9jYWxsYmFja19jYWxsKGV3a1ZpZXcsICJtb2RhbCxnZXQi LCBtb2RhbCk7Cit9CisKKy8qKgorICogQGludGVybmFsCiAgKiBTZXQgbWVudWJhciB2aXNpYmxl LgogICoKICAqIEBwYXJhbSBld2tWaWV3IFZpZXcuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L2VmbC9ld2svZXdrX3ZpZXcuaCBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5oCmlu ZGV4IGYyZjBiZTEuLmU2NTc5ZTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9l d2tfdmlldy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5oCkBAIC02NCw2 ICs2NCw4IEBACiAgKiAgLSAibWVudWJhcix2aXNpYmxlLGdldCIsIEVpbmFfQm9vbCAqOiBleHBl Y3RzIGEgQGMgRUlOQV9UUlVFIGlmIG1lbnViYXIgaXMKICAqICAgIHZpc2libGU7IEBjIEVJTkFf RkFMU0UsIG90aGVyd2lzZS4KICAqICAtICJtZW51YmFyLHZpc2libGUsc2V0IiwgRWluYV9Cb29s OiBzZXRzIG1lbnViYXIgdmlzaWJpbGl0eS4KKyAqICAtICJtb2RhbCxnZXQiLCBFaW5hX0Jvb2wg KjogZXhwZWN0cyBhIEBjIEVJTkFfVFJVRSBpZiB3aW5kb3cgaXMgbW9kYWw7IEBjIEVJTkFfRkFM U0UsIG90aGVyd2lzZS4KKyAqICAtICJtb2RhbCxzZXQiLCBFaW5hX0Jvb2w6IHNldHMgd2luZG93 IG1vZGFsaXR5LgogICogIC0gIm1peGVkY29udGVudCxkaXNwbGF5ZWQiLCB2b2lkOiBhbnkgb2Yg dGhlIGNvbnRhaW5pbmcgZnJhbWVzIGhhcyBsb2FkZWQgYW5kIGRpc3BsYXllZCBtaXhlZCBjb250 ZW50LgogICogIC0gIm1peGVkY29udGVudCxydW4iLCB2b2lkOiBhbnkgb2YgdGhlIGNvbnRhaW5p bmcgZnJhbWVzIGhhcyBsb2FkZWQgYW5kIHJ1biBtaXhlZCBjb250ZW50LgogICogIC0gIm9ubG9h ZCxldmVudCIsIEV2YXNfT2JqZWN0KjogYSBmcmFtZSBvbmxvYWQgZXZlbnQgaGFzIGJlZW4gcmVj ZWl2ZWQuCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5k ZXggNzE4MmMzZC4uOTZlODEwMSAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rv b2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTA0LTI1ICBDaHJpc3RvcGhlIER1 bWV6ICA8Y2hyaXN0b3BoZS5kdW1lekBpbnRlbC5jb20+CisKKyAgICAgICAgW0VGTF1bRFJUXSBJ bXBsZW1lbnRhdGlvbiBvZiBzaG93TW9kYWxEaWFsb2cgbmVlZGVkCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NDU4OQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEltcGxlbWVudCB0aGUgbW9kYWwgZGlhbG9n cyBoYW5kbGluZyBpbiBFV2ViTGF1bmNoZXIuCisKKyAgICAgICAgKiBFV2ViTGF1bmNoZXIvbWFp bi5jOgorICAgICAgICAoX1dpbmRvd19Qcm9wZXJ0aWVzKToKKyAgICAgICAgKG9uX21vZGFsX3Nl dCk6CisgICAgICAgIChvbl9tb2RhbF9nZXQpOgorICAgICAgICAoYnJvd3NlckNyZWF0ZSk6CisK IDIwMTItMDQtMjUgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgog CiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIxMTUyNDAuCmRpZmYgLS1naXQgYS9U b29scy9FV2ViTGF1bmNoZXIvbWFpbi5jIGIvVG9vbHMvRVdlYkxhdW5jaGVyL21haW4uYwppbmRl eCA4Y2MyMjgzLi41ZGRjZjViIDEwMDY0NAotLS0gYS9Ub29scy9FV2ViTGF1bmNoZXIvbWFpbi5j CisrKyBiL1Rvb2xzL0VXZWJMYXVuY2hlci9tYWluLmMKQEAgLTg0LDEzICs4NCwxNSBAQCB0eXBl ZGVmIHN0cnVjdCBfV2luZG93X1Byb3BlcnRpZXMgewogICAgIEVpbmFfQm9vbCBzdGF0dXNiYXJW aXNpYmxlOjE7CiAgICAgRWluYV9Cb29sIHNjcm9sbGJhcnNWaXNpYmxlOjE7CiAgICAgRWluYV9C b29sIG1lbnViYXJWaXNpYmxlOjE7CisgICAgRWluYV9Cb29sIGlzTW9kYWw6MTsKIH0gV2luZG93 X1Byb3BlcnRpZXM7CiAKIFdpbmRvd19Qcm9wZXJ0aWVzIHdpbmRvd1Byb3BlcnRpZXMgPSB7IC8q IFByZXRlbmQgd2UgaGF2ZSB0aGVtIGFuZCB0aGV5IGFyZSBpbml0aWFsbHkgdmlzaWJsZSAqLwog ICAgIEVJTkFfVFJVRSwKICAgICBFSU5BX1RSVUUsCiAgICAgRUlOQV9UUlVFLAotICAgIEVJTkFf VFJVRQorICAgIEVJTkFfVFJVRSwKKyAgICBFSU5BX0ZBTFNFCiB9OwogCiBzdGF0aWMgY29uc3Qg RWNvcmVfR2V0b3B0IG9wdGlvbnMgPSB7CkBAIC0zNTYsNiArMzU4LDI2IEBAIG9uX3Njcm9sbGJh cnNfdmlzaWJsZV9nZXQodm9pZCogdXNlcl9kYXRhLCBFdmFzX09iamVjdCogd2Vidmlldywgdm9p ZCogZXZlbnRfaW5mCiB9CiAKIHN0YXRpYyB2b2lkCitvbl9tb2RhbF9zZXQodm9pZCogdXNlcl9k YXRhLCBFdmFzX09iamVjdCogd2Vidmlldywgdm9pZCogZXZlbnRfaW5mbykKK3sKKyAgICBFaW5h X0Jvb2wgKm1vZGFsID0gKEVpbmFfQm9vbCAqKWV2ZW50X2luZm87CisgICAgaWYgKCptb2RhbCkg eworICAgICAgICBpbmZvKCJXaW5kb3cgbW9kYWxpdHkgY2hhbmdlZDogbW9kYWwiKTsKKyAgICAg ICAgd2luZG93UHJvcGVydGllcy5pc01vZGFsID0gRUlOQV9UUlVFOworICAgIH0gZWxzZSB7Cisg ICAgICAgIGluZm8oIldpbmRvdyBtb2RhbGl0eSBjaGFuZ2VkOiBub3QgbW9kYWwiKTsKKyAgICAg ICAgd2luZG93UHJvcGVydGllcy5pc01vZGFsID0gRUlOQV9GQUxTRTsKKyAgICB9Cit9CisKK3N0 YXRpYyB2b2lkCitvbl9tb2RhbF9nZXQodm9pZCogdXNlcl9kYXRhLCBFdmFzX09iamVjdCogd2Vi dmlldywgdm9pZCogZXZlbnRfaW5mbykKK3sKKyAgICBFaW5hX0Jvb2wgKm1vZGFsID0gKEVpbmFf Qm9vbCAqKWV2ZW50X2luZm87CisgICAgKm1vZGFsID0gd2luZG93UHJvcGVydGllcy5pc01vZGFs OworfQorCitzdGF0aWMgdm9pZAogb25fbWVudWJhcl92aXNpYmxlX3NldCh2b2lkKiB1c2VyX2Rh dGEsIEV2YXNfT2JqZWN0KiB3ZWJ2aWV3LCB2b2lkKiBldmVudF9pbmZvKQogewogICAgIEVpbmFf Qm9vbCAqdmlzaWJsZSA9IChFaW5hX0Jvb2wgKilldmVudF9pbmZvOwpAQCAtNjU3LDYgKzY3OSw4 IEBAIGJyb3dzZXJDcmVhdGUoY29uc3QgY2hhciAqdXJsLCBjb25zdCBjaGFyICp0aGVtZSwgY29u c3QgY2hhciAqdXNlckFnZW50LCBFaW5hX1JlCiAgICAgZXZhc19vYmplY3Rfc21hcnRfY2FsbGJh Y2tfYWRkKGFwcC0+YnJvd3NlciwgInN0YXR1c2Jhcix2aXNpYmxlLGdldCIsIG9uX3N0YXR1c2Jh cl92aXNpYmxlX2dldCwgYXBwKTsKICAgICBldmFzX29iamVjdF9zbWFydF9jYWxsYmFja19hZGQo YXBwLT5icm93c2VyLCAic2Nyb2xsYmFycyx2aXNpYmxlLHNldCIsIG9uX3Njcm9sbGJhcnNfdmlz aWJsZV9zZXQsIGFwcCk7CiAgICAgZXZhc19vYmplY3Rfc21hcnRfY2FsbGJhY2tfYWRkKGFwcC0+ YnJvd3NlciwgInNjcm9sbGJhcnMsdmlzaWJsZSxnZXQiLCBvbl9zY3JvbGxiYXJzX3Zpc2libGVf Z2V0LCBhcHApOworICAgIGV2YXNfb2JqZWN0X3NtYXJ0X2NhbGxiYWNrX2FkZChhcHAtPmJyb3dz ZXIsICJtb2RhbCxzZXQiLCBvbl9tb2RhbF9zZXQsIGFwcCk7CisgICAgZXZhc19vYmplY3Rfc21h cnRfY2FsbGJhY2tfYWRkKGFwcC0+YnJvd3NlciwgIm1vZGFsLGdldCIsIG9uX21vZGFsX2dldCwg YXBwKTsKICAgICBldmFzX29iamVjdF9zbWFydF9jYWxsYmFja19hZGQoYXBwLT5icm93c2VyLCAi bWVudWJhcix2aXNpYmxlLHNldCIsIG9uX21lbnViYXJfdmlzaWJsZV9zZXQsIGFwcCk7CiAgICAg ZXZhc19vYmplY3Rfc21hcnRfY2FsbGJhY2tfYWRkKGFwcC0+YnJvd3NlciwgIm1lbnViYXIsdmlz aWJsZSxnZXQiLCBvbl9tZW51YmFyX3Zpc2libGVfZ2V0LCBhcHApOwogICAgIGV2YXNfb2JqZWN0 X3NtYXJ0X2NhbGxiYWNrX2FkZChhcHAtPmJyb3dzZXIsICJ0b29sdGlwLHRleHQsc2V0Iiwgb25f dG9vbHRpcF90ZXh0X3NldCwgYXBwKTsK 140885 2012-05-09 01:48:58 -0700 2012-10-30 07:09:13 -0700 Patch 84589_showModalDialog.patch text/plain 15722 cdumez ZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCAzMjY4MjM1Li5lOWNmMGFi IDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cKKysrIGIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAK KzIwMTItMDUtMDkgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVsLmNv bT4KKworICAgICAgICBbRUZMXVtEUlRdIEltcGxlbWVudGF0aW9uIG9mIHNob3dNb2RhbERpYWxv ZyBuZWVkZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTg0NTg5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg QnVtcCB2ZXJzaW9uIG9mIG1pbmltdW0gRUZMIGVjb3JlIGRlcGVuZGVuY3kgdG8gdjEuMS4wCisg ICAgICAgIHNpbmNlIHdlIG5lZWQgZWNvcmVfdGhyZWFkX21haW5fbG9vcCgpLgorCisgICAgICAg ICogU291cmNlL2NtYWtlL0ZpbmRFRkwuY21ha2U6CisKIDIwMTItMDUtMDggIFJhcGhhZWwgS3Vi byBkYSBDb3N0YSAgPHJha3Vjb0B3ZWJraXQub3JnPgogCiAgICAgICAgIFtDTWFrZV0gRmluZEdT dHJlYW1lcjogRml4IHRoZSBidWlsZCB3aXRoIHN0YXRpYyBXZWJDb3JlLgpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDg4ZGFl NmYuLmU4ZTFiNjUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsNSArMSwxOCBAQAogMjAxMi0wNS0wOSAgQ2hyaXN0b3Bo ZSBEdW1leiAgPGNocmlzdG9waGUuZHVtZXpAaW50ZWwuY29tPgogCisgICAgICAgIFtFRkxdW0RS VF0gSW1wbGVtZW50YXRpb24gb2Ygc2hvd01vZGFsRGlhbG9nIG5lZWRlZAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODQ1ODkKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVbnNraXAgdGVzdCBjYXNlcyB3aGlj aCByZXF1aXJlIHN1cHBvcnQgZm9yIHNob3dpbmcgbW9kYWwgZGlhbG9ncyBub3cKKyAgICAgICAg dGhhdCBpdCBoYXMgYmVlbiBpbXBsZW1lbnRlZCBpbiBFRkwgcG9ydC4KKworICAgICAgICAqIHBs YXRmb3JtL2VmbC9Ta2lwcGVkOgorICAgICAgICAqIHBsYXRmb3JtL2VmbC90ZXN0X2V4cGVjdGF0 aW9ucy50eHQ6CisKKzIwMTItMDUtMDkgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1 bWV6QGludGVsLmNvbT4KKwogICAgICAgICBbRUZMXSBodHRwL3Rlc3RzL2xvYWRpbmcvcGRmLWNv bW1pdC1sb2FkLWNhbGxiYWNrcy5odG1sIGlzIGZhaWxpbmcKICAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg1OTU3CiAKZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL3BsYXRmb3JtL2VmbC9Ta2lwcGVkIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZWZsL1NraXBw ZWQKaW5kZXggMGY1ODk3Yy4uMTViNWFlMyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZv cm0vZWZsL1NraXBwZWQKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZWZsL1NraXBwZWQKQEAg LTE3MywzNiArMTczLDYgQEAgZmFzdC9ldmVudHMvc2VsZWN0c3RhcnQtcHJldmVudC1zZWxlY3Rp b24tb24tcmlnaHQtY2xpY2suaHRtbAogbWVkaWEvY29udGV4dC1tZW51LWFjdGlvbnMuaHRtbAog bWVkaWEvY29udHJvbHMtcmlnaHQtY2xpY2stb24tdGltZWJhci5odG1sCiAKLSMgRUZMJ3MgRFJU IG5lZWRzIHRvIHNob3cgbW9kYWwgZGlhbG9ncwotZmFzdC9ldmVudHMvc2hvdy1tb2RhbC1kaWFs b2ctb25ibHVyLW9uZm9jdXMuaHRtbAotZmFzdC9ldmVudHMvc2Nyb2xsLWV2ZW50LWR1cmluZy1t b2RhbC1kaWFsb2cuaHRtbAotZmFzdC9oYXJuZXNzL3Nob3ctbW9kYWwtZGlhbG9nLmh0bWwKLQot IyBTcHV0bmlrIHRlc3RzIHJlbHkgb24gc2hvd01vZGFsRGlhbG9nIHRvbwotIyBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTM2NzYKLXNwdXRuaWsvQ29uZm9ybWFuY2Uv MTBfRXhlY3V0aW9uX0NvbnRleHRzLzEwLjJfRW50ZXJpbmdfQW5fRXhlY3V0aW9uX0NvbnRleHQv MTAuMi4yX0V2YWxfQ29kZS9TMTAuMi4yX0ExLjFfVDEuaHRtbAotc3B1dG5pay9Db25mb3JtYW5j ZS8xMF9FeGVjdXRpb25fQ29udGV4dHMvMTAuMl9FbnRlcmluZ19Bbl9FeGVjdXRpb25fQ29udGV4 dC8xMC4yLjJfRXZhbF9Db2RlL1MxMC4yLjJfQTEuMV9UMTAuaHRtbAotc3B1dG5pay9Db25mb3Jt YW5jZS8xMF9FeGVjdXRpb25fQ29udGV4dHMvMTAuMl9FbnRlcmluZ19Bbl9FeGVjdXRpb25fQ29u dGV4dC8xMC4yLjJfRXZhbF9Db2RlL1MxMC4yLjJfQTEuMV9UMTEuaHRtbAotc3B1dG5pay9Db25m b3JtYW5jZS8xMF9FeGVjdXRpb25fQ29udGV4dHMvMTAuMl9FbnRlcmluZ19Bbl9FeGVjdXRpb25f Q29udGV4dC8xMC4yLjJfRXZhbF9Db2RlL1MxMC4yLjJfQTEuMV9UMi5odG1sCi1zcHV0bmlrL0Nv bmZvcm1hbmNlLzEwX0V4ZWN1dGlvbl9Db250ZXh0cy8xMC4yX0VudGVyaW5nX0FuX0V4ZWN1dGlv bl9Db250ZXh0LzEwLjIuMl9FdmFsX0NvZGUvUzEwLjIuMl9BMS4xX1QzLmh0bWwKLXNwdXRuaWsv Q29uZm9ybWFuY2UvMTBfRXhlY3V0aW9uX0NvbnRleHRzLzEwLjJfRW50ZXJpbmdfQW5fRXhlY3V0 aW9uX0NvbnRleHQvMTAuMi4yX0V2YWxfQ29kZS9TMTAuMi4yX0ExLjFfVDQuaHRtbAotc3B1dG5p ay9Db25mb3JtYW5jZS8xMF9FeGVjdXRpb25fQ29udGV4dHMvMTAuMl9FbnRlcmluZ19Bbl9FeGVj dXRpb25fQ29udGV4dC8xMC4yLjJfRXZhbF9Db2RlL1MxMC4yLjJfQTEuMV9UNS5odG1sCi1zcHV0 bmlrL0NvbmZvcm1hbmNlLzEwX0V4ZWN1dGlvbl9Db250ZXh0cy8xMC4yX0VudGVyaW5nX0FuX0V4 ZWN1dGlvbl9Db250ZXh0LzEwLjIuMl9FdmFsX0NvZGUvUzEwLjIuMl9BMS4xX1Q2Lmh0bWwKLXNw dXRuaWsvQ29uZm9ybWFuY2UvMTBfRXhlY3V0aW9uX0NvbnRleHRzLzEwLjJfRW50ZXJpbmdfQW5f RXhlY3V0aW9uX0NvbnRleHQvMTAuMi4yX0V2YWxfQ29kZS9TMTAuMi4yX0ExLjFfVDcuaHRtbAot c3B1dG5pay9Db25mb3JtYW5jZS8xMF9FeGVjdXRpb25fQ29udGV4dHMvMTAuMl9FbnRlcmluZ19B bl9FeGVjdXRpb25fQ29udGV4dC8xMC4yLjJfRXZhbF9Db2RlL1MxMC4yLjJfQTEuMV9UOC5odG1s Ci1zcHV0bmlrL0NvbmZvcm1hbmNlLzEwX0V4ZWN1dGlvbl9Db250ZXh0cy8xMC4yX0VudGVyaW5n X0FuX0V4ZWN1dGlvbl9Db250ZXh0LzEwLjIuMl9FdmFsX0NvZGUvUzEwLjIuMl9BMS4xX1Q5Lmh0 bWwKLXNwdXRuaWsvQ29uZm9ybWFuY2UvMTBfRXhlY3V0aW9uX0NvbnRleHRzLzEwLjJfRW50ZXJp bmdfQW5fRXhlY3V0aW9uX0NvbnRleHQvMTAuMi4yX0V2YWxfQ29kZS9TMTAuMi4yX0ExLjJfVDEu aHRtbAotc3B1dG5pay9Db25mb3JtYW5jZS8xMF9FeGVjdXRpb25fQ29udGV4dHMvMTAuMl9FbnRl cmluZ19Bbl9FeGVjdXRpb25fQ29udGV4dC8xMC4yLjJfRXZhbF9Db2RlL1MxMC4yLjJfQTEuMl9U MTAuaHRtbAotc3B1dG5pay9Db25mb3JtYW5jZS8xMF9FeGVjdXRpb25fQ29udGV4dHMvMTAuMl9F bnRlcmluZ19Bbl9FeGVjdXRpb25fQ29udGV4dC8xMC4yLjJfRXZhbF9Db2RlL1MxMC4yLjJfQTEu Ml9UMTEuaHRtbAotc3B1dG5pay9Db25mb3JtYW5jZS8xMF9FeGVjdXRpb25fQ29udGV4dHMvMTAu Ml9FbnRlcmluZ19Bbl9FeGVjdXRpb25fQ29udGV4dC8xMC4yLjJfRXZhbF9Db2RlL1MxMC4yLjJf QTEuMl9UMi5odG1sCi1zcHV0bmlrL0NvbmZvcm1hbmNlLzEwX0V4ZWN1dGlvbl9Db250ZXh0cy8x MC4yX0VudGVyaW5nX0FuX0V4ZWN1dGlvbl9Db250ZXh0LzEwLjIuMl9FdmFsX0NvZGUvUzEwLjIu Ml9BMS4yX1QzLmh0bWwKLXNwdXRuaWsvQ29uZm9ybWFuY2UvMTBfRXhlY3V0aW9uX0NvbnRleHRz LzEwLjJfRW50ZXJpbmdfQW5fRXhlY3V0aW9uX0NvbnRleHQvMTAuMi4yX0V2YWxfQ29kZS9TMTAu Mi4yX0ExLjJfVDQuaHRtbAotc3B1dG5pay9Db25mb3JtYW5jZS8xMF9FeGVjdXRpb25fQ29udGV4 dHMvMTAuMl9FbnRlcmluZ19Bbl9FeGVjdXRpb25fQ29udGV4dC8xMC4yLjJfRXZhbF9Db2RlL1Mx MC4yLjJfQTEuMl9UNS5odG1sCi1zcHV0bmlrL0NvbmZvcm1hbmNlLzEwX0V4ZWN1dGlvbl9Db250 ZXh0cy8xMC4yX0VudGVyaW5nX0FuX0V4ZWN1dGlvbl9Db250ZXh0LzEwLjIuMl9FdmFsX0NvZGUv UzEwLjIuMl9BMS4yX1Q2Lmh0bWwKLXNwdXRuaWsvQ29uZm9ybWFuY2UvMTBfRXhlY3V0aW9uX0Nv bnRleHRzLzEwLjJfRW50ZXJpbmdfQW5fRXhlY3V0aW9uX0NvbnRleHQvMTAuMi4yX0V2YWxfQ29k ZS9TMTAuMi4yX0ExLjJfVDcuaHRtbAotc3B1dG5pay9Db25mb3JtYW5jZS8xMF9FeGVjdXRpb25f Q29udGV4dHMvMTAuMl9FbnRlcmluZ19Bbl9FeGVjdXRpb25fQ29udGV4dC8xMC4yLjJfRXZhbF9D b2RlL1MxMC4yLjJfQTEuMl9UOC5odG1sCi1zcHV0bmlrL0NvbmZvcm1hbmNlLzEwX0V4ZWN1dGlv bl9Db250ZXh0cy8xMC4yX0VudGVyaW5nX0FuX0V4ZWN1dGlvbl9Db250ZXh0LzEwLjIuMl9FdmFs X0NvZGUvUzEwLjIuMl9BMS4yX1Q5Lmh0bWwKLQogIyBFRkwncyBEUlQgbmVlZHMgQ09ORklSTSBO QVZJR0FUSU9OIG1lc3NhZ2VzCiBmYXN0L2xvYWRlci9mb3JtLXN1Ym1pc3Npb24tYWZ0ZXItYmVm b3JldW5sb2FkLWNhbmNlbC5odG1sCiAKQEAgLTM4MywxMCArMzUzLDYgQEAgbWVkaWEvdmlkZW8t dm9sdW1lLXNsaWRlci5odG1sCiAjIEVGTCdzIExheW91dFRlc3RDb250cm9sbGVyIGRvZXMgbm90 IGltcGxlbWVudCBhdXRoZW50aWNhdGVTZXNzaW9uCiBodHRwL3Rlc3RzL3htbGh0dHByZXF1ZXN0 L2Nyb3NzLW9yaWdpbi1hdXRob3JpemF0aW9uLXdpdGgtZW1iZWRkZXIuaHRtbAogCi0jIEVGTCdz IExheW91dFRlc3RDb250cm9sbGVyIGRvZXMgbm90IGltcGxlbWVudCBhYm9ydE1vZGFsCi1mYXN0 L2V2ZW50cy9zaG93LW1vZGFsLWRpYWxvZy1vbmJsdXItb25mb2N1cy5odG1sCi1mYXN0L2hhcm5l c3Mvc2hvdy1tb2RhbC1kaWFsb2cuaHRtbAotCiAjIE1pc3NpbmcgVGV4dENoZWNrZXJDbGllbnQg aW1wbGVtZW50YXRpb24gKEVmbCdzIHBvcnQgZG9lcyBub3Qgc3VwcG9ydCBzcGVsbCBjaGVja2lu ZywgR3RrIHBvcnQgdXNlcyBFbmNoYW50IGxpYnJhcnkgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTYxNzg3KQogZWRpdGluZy9zcGVsbGluZy9kZXNpZ24tbW9kZS1zcGVs bGNoZWNrLW9mZi5odG1sCiBlZGl0aW5nL3NwZWxsaW5nL3NwZWxsY2hlY2stYXR0cmlidXRlLmh0 bWwKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2VmbC90ZXN0X2V4cGVjdGF0aW9u cy50eHQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9lZmwvdGVzdF9leHBlY3RhdGlvbnMudHh0Cmlu ZGV4IDI3NjAwOTcuLjIwMDcyZjkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2Vm bC90ZXN0X2V4cGVjdGF0aW9ucy50eHQKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZWZsL3Rl c3RfZXhwZWN0YXRpb25zLnR4dApAQCAtMzczLDYgKzM3MywxMCBAQCBCVUdXSzg1OTU2IDogaHR0 cC90ZXN0cy9sb2FkaW5nL3BkZi1jb21taXQtbG9hZC1jYWxsYmFja3MuaHRtbCA9IFRFWFQKIEJV R1dLODU4NzAgU0tJUCA6IGZ1bGxzY3JlZW4gPSBGQUlMCiBCVUdXSzg1ODcwIDogbWVkaWEvdmlk ZW8tcGxheS1yZXF1aXJlLXVzZXItZ2VzdHVyZS5odG1sID0gVEVYVAogCisvLyBUaGUgRUZMIHBv cnQgaGFzIG5vIHN1cHBvcnQgZm9yIGFib3J0TW9kYWwKK0JVR1dLODU5NjIgOiBmYXN0L2V2ZW50 cy9zaG93LW1vZGFsLWRpYWxvZy1vbmJsdXItb25mb2N1cy5odG1sID0gVEVYVAorQlVHV0s4NTk2 MiA6IGZhc3QvaGFybmVzcy9zaG93LW1vZGFsLWRpYWxvZy5odG1sID0gVEVYVAorCiAvLyBJbnB1 dCBhdHRyaWJ1dGUgcGxhY2Vob2xkZXIgcmVmdGVzdHMgYXJlIGZhaWxpbmcuCiBCVUdXSzg1NjAz IDogZmFzdC9mb3Jtcy9wbGFjZWhvbGRlci13aXRoLXBvc2l0aW9uZWQtZWxlbWVudC5odG1sID0g SU1BR0UKIEJVR1dLODU2MDMgOiBmYXN0L2Zvcm1zL2lzaW5kZXgtcGxhY2Vob2xkZXIuaHRtbCA9 IElNQUdFCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2VmbC9DaGFuZ2VMb2cgYi9Tb3VyY2Uv V2ViS2l0L2VmbC9DaGFuZ2VMb2cKaW5kZXggNzc2NzE1Yi4uNmI1MmZiMiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEyLTA1LTA5ICBDaHJpc3RvcGhlIER1bWV6ICA8Y2hy aXN0b3BoZS5kdW1lekBpbnRlbC5jb20+CisKKyAgICAgICAgW0VGTF1bRFJUXSBJbXBsZW1lbnRh dGlvbiBvZiBzaG93TW9kYWxEaWFsb2cgbmVlZGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NDU4OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEFkZCBzdXBwb3J0IGZvciBoYW5kbGluZyBtb2RhbCBkaWFs b2dzIGluIENocm9tZUNsaWVudEVmbCBhbmQgRXdrVmlldy4KKworICAgICAgICAqIFdlYkNvcmVT dXBwb3J0L0Nocm9tZUNsaWVudEVmbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDaHJvbWVDbGll bnRFZmw6OkNocm9tZUNsaWVudEVmbCk6CisgICAgICAgIChXZWJDb3JlOjpDaHJvbWVDbGllbnRF Zmw6On5DaHJvbWVDbGllbnRFZmwpOgorICAgICAgICAoV2ViQ29yZTo6Q2hyb21lQ2xpZW50RWZs OjpjcmVhdGVXaW5kb3cpOgorICAgICAgICAoV2ViQ29yZTo6Q2hyb21lQ2xpZW50RWZsOjpjYW5S dW5Nb2RhbCk6CisgICAgICAgIChXZWJDb3JlOjpDaHJvbWVDbGllbnRFZmw6OnJ1bk1vZGFsKToK KyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRFZmwuaDoKKyAgICAgICAgKENo cm9tZUNsaWVudEVmbCk6CisgICAgICAgICogZXdrL2V3a19wcml2YXRlLmg6CisgICAgICAgICog ZXdrL2V3a192aWV3LmNwcDoKKyAgICAgICAgKF9Fd2tfVmlld19Qcml2YXRlX0RhdGEpOgorICAg ICAgICAoZXdrX3ZpZXdfbW9kYWxfc2V0KToKKyAgICAgICAgKGV3a192aWV3X21vZGFsX2dldCk6 CisgICAgICAgICogZXdrL2V3a192aWV3Lmg6CisKIDIwMTItMDUtMDggIEthbmdpbCBIYW4gIDxr YW5naWwuaGFuQHNhbXN1bmcuY29tPgogCiAgICAgICAgIFtFRkxdW0RSVF0gSW1wbGVtZW50IFRl eHRJbnB1dENvbnRyb2xsZXIuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3Jl U3VwcG9ydC9DaHJvbWVDbGllbnRFZmwuY3BwIGIvU291cmNlL1dlYktpdC9lZmwvV2ViQ29yZVN1 cHBvcnQvQ2hyb21lQ2xpZW50RWZsLmNwcAppbmRleCAxZTc2MTBhLi4wMjRkYTNhIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRFZmwuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQvZWZsL1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEVmbC5j cHAKQEAgLTUxLDYgKzUxLDcgQEAKICNpbmNsdWRlICJWaWV3cG9ydEFyZ3VtZW50cy5oIgogI2lu Y2x1ZGUgIldpbmRvd0ZlYXR1cmVzLmgiCiAjaW5jbHVkZSAiZXdrX3ByaXZhdGUuaCIKKyNpbmNs dWRlIDxFY29yZS5oPgogI2luY2x1ZGUgPEVjb3JlX0V2YXMuaD4KICNpbmNsdWRlIDxFdmFzLmg+ CiAjaW5jbHVkZSA8d3RmL3RleHQvQ1N0cmluZy5oPgpAQCAtODMsMTIgKzg0LDE1IEBAIG5hbWVz cGFjZSBXZWJDb3JlIHsKIAogQ2hyb21lQ2xpZW50RWZsOjpDaHJvbWVDbGllbnRFZmwoRXZhc19P YmplY3QqIHZpZXcpCiAgICAgOiBtX3ZpZXcodmlldykKKyAgICAsIG1faXNSdW5uaW5nTW9kYWwo ZmFsc2UpCiB7CiAgICAgQVNTRVJUKG1fdmlldyk7CiB9CiAKIENocm9tZUNsaWVudEVmbDo6fkNo cm9tZUNsaWVudEVmbCgpCiB7CisgICAgaWYgKG1faXNSdW5uaW5nTW9kYWwpCisgICAgICAgIGVj b3JlX3RocmVhZF9tYWluX2xvb3BfZW5kKCk7CiB9CiAKIHZvaWQgQ2hyb21lQ2xpZW50RWZsOjpj aHJvbWVEZXN0cm95ZWQoKQpAQCAtMTQ5LDYgKzE1Myw5IEBAIFBhZ2UqIENocm9tZUNsaWVudEVm bDo6Y3JlYXRlV2luZG93KEZyYW1lKiwgY29uc3QgRnJhbWVMb2FkUmVxdWVzdCYgZnJhbWVMb2Fk UmVxCiAgICAgaWYgKCFuZXdWaWV3KQogICAgICAgICByZXR1cm4gMDsKIAorICAgIGlmIChmZWF0 dXJlcy5kaWFsb2cpCisgICAgICAgIGV3a192aWV3X21vZGFsX3NldChuZXdWaWV3LCB0cnVlKTsK KwogICAgIHJldHVybiBld2tfdmlld19jb3JlX3BhZ2VfZ2V0KG5ld1ZpZXcpOwogfQogCkBAIC0x NTksMTMgKzE2NiwxMyBAQCB2b2lkIENocm9tZUNsaWVudEVmbDo6c2hvdygpCiAKIGJvb2wgQ2hy b21lQ2xpZW50RWZsOjpjYW5SdW5Nb2RhbCgpCiB7Ci0gICAgbm90SW1wbGVtZW50ZWQoKTsKLSAg ICByZXR1cm4gZmFsc2U7CisgICAgcmV0dXJuIHRydWU7CiB9CiAKIHZvaWQgQ2hyb21lQ2xpZW50 RWZsOjpydW5Nb2RhbCgpCiB7Ci0gICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICBtX2lzUnVubmlu Z01vZGFsID0gdHJ1ZTsKKyAgICBlY29yZV90aHJlYWRfbWFpbl9sb29wX2JlZ2luKCk7CiB9CiAK IHZvaWQgQ2hyb21lQ2xpZW50RWZsOjpzZXRUb29sYmFyc1Zpc2libGUoYm9vbCB2aXNpYmxlKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50 RWZsLmggYi9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRFZmwu aAppbmRleCA2NWVhZWIzLi5mY2Y5YWYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9X ZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRFZmwuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9X ZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRFZmwuaApAQCAtMTgxLDYgKzE4MSw3IEBAIHB1Ymxp YzoKIAogICAgIEV2YXNfT2JqZWN0KiBtX3ZpZXc7CiAgICAgS1VSTCBtX2hvdmVyZWRMaW5rVVJM OworICAgIGJvb2wgbV9pc1J1bm5pbmdNb2RhbDsKIH07CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvZWZsL2V3ay9ld2tfcHJpdmF0ZS5oIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3 a19wcml2YXRlLmgKaW5kZXggMjZkNDQ4ZC4uNzBkNjU4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9lZmwvZXdrL2V3a19wcml2YXRlLmgKKysrIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3 a19wcml2YXRlLmgKQEAgLTEzMCw2ICsxMzAsOSBAQCB2b2lkIGV3a192aWV3X21vdXNlX2xpbmtf aG92ZXJfb3V0KEV2YXNfT2JqZWN0KiBld2tWaWV3KTsKIHZvaWQgZXdrX3ZpZXdfdG9vbGJhcnNf dmlzaWJsZV9zZXQoRXZhc19PYmplY3QqIGV3a1ZpZXcsIGJvb2wgdmlzaWJsZSk7CiB2b2lkIGV3 a192aWV3X3Rvb2xiYXJzX3Zpc2libGVfZ2V0KEV2YXNfT2JqZWN0KiBld2tWaWV3LCBib29sKiB2 aXNpYmxlKTsKIAordm9pZCBld2tfdmlld19tb2RhbF9zZXQoRXZhc19PYmplY3QqIGV3a1ZpZXcs IGJvb2wgbW9kYWwpOwordm9pZCBld2tfdmlld19tb2RhbF9nZXQoRXZhc19PYmplY3QqIGV3a1Zp ZXcsIGJvb2wqIG1vZGFsKTsKKwogdm9pZCBld2tfdmlld19zdGF0dXNiYXJfdmlzaWJsZV9zZXQo RXZhc19PYmplY3QqIGV3a1ZpZXcsIGJvb2wgdmlzaWJsZSk7CiB2b2lkIGV3a192aWV3X3N0YXR1 c2Jhcl92aXNpYmxlX2dldChFdmFzX09iamVjdCogZXdrVmlldywgYm9vbCogdmlzaWJsZSk7CiB2 b2lkIGV3a192aWV3X3N0YXR1c2Jhcl90ZXh0X3NldChFdmFzX09iamVjdCogZXdrVmlldywgY29u c3QgY2hhciogdGV4dCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3Zp ZXcuY3BwIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3LmNwcAppbmRleCA3YTBlZTFl Li4xOTE5ZmQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5jcHAKQEAgLTEyOSw2ICsxMjks OCBAQCBzdGF0aWMgY29uc3QgRXZhc19TbWFydF9DYl9EZXNjcmlwdGlvbiBfZXdrX3ZpZXdfY2Fs bGJhY2tfbmFtZXNbXSA9IHsKICAgICB7ICJsb2FkLHN0YXJ0ZWQiLCAiIiB9LAogICAgIHsgIm1l bnViYXIsdmlzaWJsZSxnZXQiLCAiYiIgfSwKICAgICB7ICJtZW51YmFyLHZpc2libGUsc2V0Iiwg ImIiIH0sCisgICAgeyAibW9kYWwsZ2V0IiwgImIiIH0sCisgICAgeyAibW9kYWwsc2V0IiwgImIi fSwKICAgICB7ICJwb3B1cCxjcmVhdGVkIiwgInAiIH0sCiAgICAgeyAicG9wdXAsd2lsbGRlbGV0 ZSIsICJwIiB9LAogICAgIHsgInJlYWR5IiwgIiIgfSwKQEAgLTMyNzEsNiArMzI3MywzOCBAQCB2 b2lkIGV3a192aWV3X3Njcm9sbGJhcnNfdmlzaWJsZV9nZXQoRXZhc19PYmplY3QqIGV3a1ZpZXcs IGJvb2wqIHZpc2libGUpCiAKIC8qKgogICogQGludGVybmFsCisgKiBTZXQgd2luZG93IG1vZGFs aXR5LgorICoKKyAqIEBwYXJhbSBld2tWaWV3IFZpZXcuCisgKiBAcGFyYW0gbW9kYWwgQGMgVFJV RSBpZiB3aW5kb3cgaXMgbW9kYWwsIEBjIEZBTFNFIG90aGVyd2lzZS4KKyAqCisgKiBFbWl0cyBz aWduYWw6ICJtb2RhbCxzZXQiIHdpdGggYSBwb2ludGVyIHRvIGEgYm9vbGVhbi4KKyAqLwordm9p ZCBld2tfdmlld19tb2RhbF9zZXQoRXZhc19PYmplY3QqIGV3a1ZpZXcsIGJvb2wgbW9kYWwpCit7 CisgICAgREJHKCJld2tWaWV3PSVwIChtb2RhbD0lZCkiLCBld2tWaWV3LCAhIW1vZGFsKTsKKyAg ICBldmFzX29iamVjdF9zbWFydF9jYWxsYmFja19jYWxsKGV3a1ZpZXcsICJtb2RhbCxzZXQiLCAm bW9kYWwpOworfQorCisvKioKKyAqIEBpbnRlcm5hbAorICogR2V0IHdpbmRvdyBtb2RhbGl0eS4K KyAqCisgKiBAcGFyYW0gZXdrVmlldyBWaWV3LgorICogQHBhcmFtIG1vZGFsIGJvb2xlYW4gcG9p bnRlciBpbiB3aGljaCB0byBzYXZlIHRoZSByZXN1bHQuIEl0IGRlZmF1bHRzCisgKiB0byBAYyBG QUxTRSwgaS5lLiBpZiBicm93c2VyIGRvZXMgbm90IGxpc3RlbiB0byBlbWl0dGVkIHNpZ25hbC4K KyAqCisgKiBFbWl0cyBzaWduYWw6ICJtb2RhbCxnZXQiIHdpdGggYSBwb2ludGVyIHRvIGEgYm9v bGVhbi4KKyAqLwordm9pZCBld2tfdmlld19tb2RhbF9nZXQoRXZhc19PYmplY3QqIGV3a1ZpZXcs IGJvb2wqIG1vZGFsKQoreworICAgIERCRygiJXMsIGV3a1ZpZXc9JXAiLCBfX2Z1bmNfXywgZXdr Vmlldyk7CisgICAgKm1vZGFsID0gZmFsc2U7CisgICAgZXZhc19vYmplY3Rfc21hcnRfY2FsbGJh Y2tfY2FsbChld2tWaWV3LCAibW9kYWwsZ2V0IiwgbW9kYWwpOworfQorCisvKioKKyAqIEBpbnRl cm5hbAogICogU2V0IG1lbnViYXIgdmlzaWJsZS4KICAqCiAgKiBAcGFyYW0gZXdrVmlldyBWaWV3 LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3LmggYi9Tb3VyY2Uv V2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuaAppbmRleCA5ODIxMGY4Li43OTVlODE0IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0 L2VmbC9ld2svZXdrX3ZpZXcuaApAQCAtNjgsNiArNjgsOCBAQAogICogIC0gIm1lbnViYXIsdmlz aWJsZSxnZXQiLCBFaW5hX0Jvb2wgKjogZXhwZWN0cyBhIEBjIEVJTkFfVFJVRSBpZiBtZW51YmFy IGlzCiAgKiAgICB2aXNpYmxlOyBAYyBFSU5BX0ZBTFNFLCBvdGhlcndpc2UuCiAgKiAgLSAibWVu dWJhcix2aXNpYmxlLHNldCIsIEVpbmFfQm9vbDogc2V0cyBtZW51YmFyIHZpc2liaWxpdHkuCisg KiAgLSAibW9kYWwsZ2V0IiwgRWluYV9Cb29sICo6IGV4cGVjdHMgYSBAYyBFSU5BX1RSVUUgaWYg d2luZG93IGlzIG1vZGFsOyBAYyBFSU5BX0ZBTFNFLCBvdGhlcndpc2UuCisgKiAgLSAibW9kYWws c2V0IiwgRWluYV9Cb29sOiBzZXRzIHdpbmRvdyBtb2RhbGl0eS4KICAqICAtICJtaXhlZGNvbnRl bnQsZGlzcGxheWVkIiwgdm9pZDogYW55IG9mIHRoZSBjb250YWluaW5nIGZyYW1lcyBoYXMgbG9h ZGVkIGFuZCBkaXNwbGF5ZWQgbWl4ZWQgY29udGVudC4KICAqICAtICJtaXhlZGNvbnRlbnQscnVu Iiwgdm9pZDogYW55IG9mIHRoZSBjb250YWluaW5nIGZyYW1lcyBoYXMgbG9hZGVkIGFuZCBydW4g bWl4ZWQgY29udGVudC4KICAqICAtICJvbmxvYWQsZXZlbnQiLCBFdmFzX09iamVjdCo6IGEgZnJh bWUgb25sb2FkIGV2ZW50IGhhcyBiZWVuIHJlY2VpdmVkLgpkaWZmIC0tZ2l0IGEvU291cmNlL2Nt YWtlL0ZpbmRFRkwuY21ha2UgYi9Tb3VyY2UvY21ha2UvRmluZEVGTC5jbWFrZQppbmRleCBjZGQ2 NGE2Li40YzVkNDRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvY21ha2UvRmluZEVGTC5jbWFrZQorKysg Yi9Tb3VyY2UvY21ha2UvRmluZEVGTC5jbWFrZQpAQCAtMSw3ICsxLDcgQEAKIElOQ0xVREUoRmlu ZFBrZ0NvbmZpZykKIAogUEtHX0NIRUNLX01PRFVMRVMgKEVESkUgUkVRVUlSRUQgZWRqZT49MS4w LjApCi1QS0dfQ0hFQ0tfTU9EVUxFUyAoRUNPUkUgUkVRVUlSRUQgZWNvcmU+PTEuMC4wKQorUEtH X0NIRUNLX01PRFVMRVMgKEVDT1JFIFJFUVVJUkVEIGVjb3JlPj0xLjEuMCkKIFBLR19DSEVDS19N T0RVTEVTIChFQ09SRV9FVkFTIFJFUVVJUkVEIGVjb3JlLWV2YXM+PTEuMC4wKQogUEtHX0NIRUNL X01PRFVMRVMgKEVGTERFUFMgUkVRVUlSRUQKICAgZWluYT49MS4wLjk5OS42MzU2OApkaWZmIC0t Z2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGY0YWFhZmMuLjlk MDE4ZWMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cK QEAgLTEsMyArMSwxOCBAQAorMjAxMi0wNS0wOSAgQ2hyaXN0b3BoZSBEdW1leiAgPGNocmlzdG9w aGUuZHVtZXpAaW50ZWwuY29tPgorCisgICAgICAgIFtFRkxdW0RSVF0gSW1wbGVtZW50YXRpb24g b2Ygc2hvd01vZGFsRGlhbG9nIG5lZWRlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9ODQ1ODkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBJbXBsZW1lbnQgdGhlIG1vZGFsIGRpYWxvZ3MgaGFuZGxpbmcgaW4g RVdlYkxhdW5jaGVyLgorCisgICAgICAgICogRVdlYkxhdW5jaGVyL21haW4uYzoKKyAgICAgICAg KF9XaW5kb3dfUHJvcGVydGllcyk6CisgICAgICAgIChvbl9tb2RhbF9zZXQpOgorICAgICAgICAo b25fbW9kYWxfZ2V0KToKKyAgICAgICAgKGJyb3dzZXJDcmVhdGUpOgorCiAyMDEyLTA1LTA5ICBE YW4gQmVybnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CiAKICAgICAgICAgTWFkZSBidWlsZC13ZWJr aXQgY29weSBXZWJLaXRMaWJyYXJpZXMgdG8gdGhlIHJpZ2h0IGxvY2F0aW9uIGFnYWluIGFmdGVy IHIxMTYyNTcKZGlmZiAtLWdpdCBhL1Rvb2xzL0VXZWJMYXVuY2hlci9tYWluLmMgYi9Ub29scy9F V2ViTGF1bmNoZXIvbWFpbi5jCmluZGV4IDhjYzIyODMuLjVkZGNmNWIgMTAwNjQ0Ci0tLSBhL1Rv b2xzL0VXZWJMYXVuY2hlci9tYWluLmMKKysrIGIvVG9vbHMvRVdlYkxhdW5jaGVyL21haW4uYwpA QCAtODQsMTMgKzg0LDE1IEBAIHR5cGVkZWYgc3RydWN0IF9XaW5kb3dfUHJvcGVydGllcyB7CiAg ICAgRWluYV9Cb29sIHN0YXR1c2JhclZpc2libGU6MTsKICAgICBFaW5hX0Jvb2wgc2Nyb2xsYmFy c1Zpc2libGU6MTsKICAgICBFaW5hX0Jvb2wgbWVudWJhclZpc2libGU6MTsKKyAgICBFaW5hX0Jv b2wgaXNNb2RhbDoxOwogfSBXaW5kb3dfUHJvcGVydGllczsKIAogV2luZG93X1Byb3BlcnRpZXMg d2luZG93UHJvcGVydGllcyA9IHsgLyogUHJldGVuZCB3ZSBoYXZlIHRoZW0gYW5kIHRoZXkgYXJl IGluaXRpYWxseSB2aXNpYmxlICovCiAgICAgRUlOQV9UUlVFLAogICAgIEVJTkFfVFJVRSwKICAg ICBFSU5BX1RSVUUsCi0gICAgRUlOQV9UUlVFCisgICAgRUlOQV9UUlVFLAorICAgIEVJTkFfRkFM U0UKIH07CiAKIHN0YXRpYyBjb25zdCBFY29yZV9HZXRvcHQgb3B0aW9ucyA9IHsKQEAgLTM1Niw2 ICszNTgsMjYgQEAgb25fc2Nyb2xsYmFyc192aXNpYmxlX2dldCh2b2lkKiB1c2VyX2RhdGEsIEV2 YXNfT2JqZWN0KiB3ZWJ2aWV3LCB2b2lkKiBldmVudF9pbmYKIH0KIAogc3RhdGljIHZvaWQKK29u X21vZGFsX3NldCh2b2lkKiB1c2VyX2RhdGEsIEV2YXNfT2JqZWN0KiB3ZWJ2aWV3LCB2b2lkKiBl dmVudF9pbmZvKQoreworICAgIEVpbmFfQm9vbCAqbW9kYWwgPSAoRWluYV9Cb29sICopZXZlbnRf aW5mbzsKKyAgICBpZiAoKm1vZGFsKSB7CisgICAgICAgIGluZm8oIldpbmRvdyBtb2RhbGl0eSBj aGFuZ2VkOiBtb2RhbCIpOworICAgICAgICB3aW5kb3dQcm9wZXJ0aWVzLmlzTW9kYWwgPSBFSU5B X1RSVUU7CisgICAgfSBlbHNlIHsKKyAgICAgICAgaW5mbygiV2luZG93IG1vZGFsaXR5IGNoYW5n ZWQ6IG5vdCBtb2RhbCIpOworICAgICAgICB3aW5kb3dQcm9wZXJ0aWVzLmlzTW9kYWwgPSBFSU5B X0ZBTFNFOworICAgIH0KK30KKworc3RhdGljIHZvaWQKK29uX21vZGFsX2dldCh2b2lkKiB1c2Vy X2RhdGEsIEV2YXNfT2JqZWN0KiB3ZWJ2aWV3LCB2b2lkKiBldmVudF9pbmZvKQoreworICAgIEVp bmFfQm9vbCAqbW9kYWwgPSAoRWluYV9Cb29sICopZXZlbnRfaW5mbzsKKyAgICAqbW9kYWwgPSB3 aW5kb3dQcm9wZXJ0aWVzLmlzTW9kYWw7Cit9CisKK3N0YXRpYyB2b2lkCiBvbl9tZW51YmFyX3Zp c2libGVfc2V0KHZvaWQqIHVzZXJfZGF0YSwgRXZhc19PYmplY3QqIHdlYnZpZXcsIHZvaWQqIGV2 ZW50X2luZm8pCiB7CiAgICAgRWluYV9Cb29sICp2aXNpYmxlID0gKEVpbmFfQm9vbCAqKWV2ZW50 X2luZm87CkBAIC02NTcsNiArNjc5LDggQEAgYnJvd3NlckNyZWF0ZShjb25zdCBjaGFyICp1cmws IGNvbnN0IGNoYXIgKnRoZW1lLCBjb25zdCBjaGFyICp1c2VyQWdlbnQsIEVpbmFfUmUKICAgICBl dmFzX29iamVjdF9zbWFydF9jYWxsYmFja19hZGQoYXBwLT5icm93c2VyLCAic3RhdHVzYmFyLHZp c2libGUsZ2V0Iiwgb25fc3RhdHVzYmFyX3Zpc2libGVfZ2V0LCBhcHApOwogICAgIGV2YXNfb2Jq ZWN0X3NtYXJ0X2NhbGxiYWNrX2FkZChhcHAtPmJyb3dzZXIsICJzY3JvbGxiYXJzLHZpc2libGUs c2V0Iiwgb25fc2Nyb2xsYmFyc192aXNpYmxlX3NldCwgYXBwKTsKICAgICBldmFzX29iamVjdF9z bWFydF9jYWxsYmFja19hZGQoYXBwLT5icm93c2VyLCAic2Nyb2xsYmFycyx2aXNpYmxlLGdldCIs IG9uX3Njcm9sbGJhcnNfdmlzaWJsZV9nZXQsIGFwcCk7CisgICAgZXZhc19vYmplY3Rfc21hcnRf Y2FsbGJhY2tfYWRkKGFwcC0+YnJvd3NlciwgIm1vZGFsLHNldCIsIG9uX21vZGFsX3NldCwgYXBw KTsKKyAgICBldmFzX29iamVjdF9zbWFydF9jYWxsYmFja19hZGQoYXBwLT5icm93c2VyLCAibW9k YWwsZ2V0Iiwgb25fbW9kYWxfZ2V0LCBhcHApOwogICAgIGV2YXNfb2JqZWN0X3NtYXJ0X2NhbGxi YWNrX2FkZChhcHAtPmJyb3dzZXIsICJtZW51YmFyLHZpc2libGUsc2V0Iiwgb25fbWVudWJhcl92 aXNpYmxlX3NldCwgYXBwKTsKICAgICBldmFzX29iamVjdF9zbWFydF9jYWxsYmFja19hZGQoYXBw LT5icm93c2VyLCAibWVudWJhcix2aXNpYmxlLGdldCIsIG9uX21lbnViYXJfdmlzaWJsZV9nZXQs IGFwcCk7CiAgICAgZXZhc19vYmplY3Rfc21hcnRfY2FsbGJhY2tfYWRkKGFwcC0+YnJvd3Nlciwg InRvb2x0aXAsdGV4dCxzZXQiLCBvbl90b29sdGlwX3RleHRfc2V0LCBhcHApOwo=