85350 2012-05-02 00:51:08 -0700 [Qt] QQuickWebView does not allow for input from virtual keyboard 2012-06-02 00:17:06 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 hausmann hausmann kenneth lauro.neto menard michael.bruning rafael.lobo webkit.review.bot zoltan oldest_to_newest 614064 0 hausmann 2012-05-02 00:51:08 -0700 [Qt] QQuickWebView does not allow for input from virtual keyboard 614066 1 hausmann 2012-05-02 00:52:13 -0700 As Michael analyzed correctly, the issue is that QQuickWebView never sets the ItemAcceptsInputMethod flag correctly, which leads the input method to believe that the item doesn't accept input method events at all. 614068 2 139761 hausmann 2012-05-02 00:54:52 -0700 Created attachment 139761 Patch 614072 3 139761 kenneth 2012-05-02 01:03:04 -0700 Comment on attachment 139761 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=139761&action=review > Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp:1618 > +void QQuickWebView::runJavaScriptInMainFrame(const QString &script, QObject *receiver, const char *method) I saw that BB10 Cascades added a similar method, could you verify that we are using more or less the same API for this? 614074 4 139763 hausmann 2012-05-02 01:06:03 -0700 Created attachment 139763 Patch Rebased 614075 5 139761 hausmann 2012-05-02 01:07:59 -0700 Comment on attachment 139761 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=139761&action=review >> Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp:1618 >> +void QQuickWebView::runJavaScriptInMainFrame(const QString &script, QObject *receiver, const char *method) > > I saw that BB10 Cascades added a similar method, could you verify that we are using more or less the same API for this? Hmm, this isn't public API though, just private for testing. I think a more JavaScript style API for this would be much better, along the lines of: webView.runJavaScript("script here", function(result) { ... }) 614076 6 139763 hausmann 2012-05-02 01:08:24 -0700 Comment on attachment 139763 Patch Oops, clear this. Kenneth r+'ed the earlier patch, will land rebase right away. 614077 7 hausmann 2012-05-02 01:10:55 -0700 Committed r115801: <http://trac.webkit.org/changeset/115801> 614560 8 lauro.neto 2012-05-02 12:56:27 -0700 After r115831 WebKit on N9 still has some problems regarding vkb. Here's the steps: - Go to www.google.com - Search something (vkb works fine) - On the search result page, tap the input field. - VKB does not shows, even after returning to the main page. 639985 9 hausmann 2012-06-02 00:17:06 -0700 *** Bug 82736 has been marked as a duplicate of this bug. *** 139761 2012-05-02 00:54:52 -0700 2012-05-02 01:07:59 -0700 Patch bug-85350-20120502095505.patch text/plain 6724 hausmann U3VidmVyc2lvbiBSZXZpc2lvbjogMTE1NjA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMDY5N2YxNzU4NDQ4N2Nl NzlmZGIzYzRiMGIwOGI2ZjJiYjNlYTU3OC4uN2NmNGRlOTM1MDMxYWQ4YzEzNDc5ZmZkNzVhNDQ3 YTVlOTVlOTUyMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEyLTA1LTAyICBTaW1v biBIYXVzbWFubiAgPHNpbW9uLmhhdXNtYW5uQG5va2lhLmNvbT4KKworICAgICAgICBbUXRdIFFR dWlja1dlYlZpZXcgZG9lcyBub3QgYWxsb3cgZm9yIGlucHV0IGZyb20gdmlydHVhbCBrZXlib2Fy ZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODUzNTAK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJdCBpcyBu ZWNlc3NhcnkgdG8gc2V0IHRoZSBJdGVtQWNjZXB0c0lucHV0TWV0aG9kIGZsYWcgb24gdGhlIFFR dWlja1dlYlZpZXcgaWYgd2UgaGF2ZSBlZGl0YWJsZQorICAgICAgICBjb250ZW50LCBpbiBvcmRl ciBmb3IgdGhlIGlucHV0IG1ldGhvZCB0byByZWNvZ25pemUgdGhhdCB3ZSBjYW4gaGFuZGxlIGlu cHV0IG1ldGhvZCBldmVudHMuCisKKyAgICAgICAgQW5hbHl6ZWQgYnkgTWljaGFlbCBCcsO8bmlu Zy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHA6IEFkZCBz aW1wbGUgaG9vayBmb3IgZXhlY3V0aW5nIEpTIGFzIHByaXZhdGUgQysrIEFQSS4KKyAgICAgICAg KEpTQ2FsbGJhY2tDbG9zdXJlKToKKyAgICAgICAgKGphdmFTY3JpcHRDYWxsYmFjayk6CisgICAg ICAgIChRUXVpY2tXZWJWaWV3OjpydW5KYXZhU2NyaXB0SW5NYWluRnJhbWUpOgorICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlld19wLmg6CisgICAgICAgICogVUlQcm9jZXNz L0FQSS9xdC90ZXN0cy9odG1sL2lucHV0bWV0aG9kLmh0bWw6IEFkZGVkLgorICAgICAgICAqIFVJ UHJvY2Vzcy9BUEkvcXQvdGVzdHMvcXF1aWNrd2Vidmlldy90c3RfcXF1aWNrd2Vidmlldy5jcHA6 CisgICAgICAgICh0c3RfUVF1aWNrV2ViVmlldyk6CisgICAgICAgICh0c3RfUVF1aWNrV2ViVmll dzo6cnVuSmF2YVNjcmlwdCk6IFNpbXBsZSBoZWxwZXIgZm9yIHJ1bm5pbmcgSlMuCisgICAgICAg ICh0c3RfUVF1aWNrV2ViVmlldzo6aW5wdXRNZXRob2QpOiBBZGRlZCBzaW1wbGUgdGVzdCBmb3Ig SXRlbUFjY2VwdHNJbnB1dE1ldGhvZCB0b2dnbGluZy4KKyAgICAgICAgKiBVSVByb2Nlc3MvcXQv UXRXZWJQYWdlRXZlbnRIYW5kbGVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UXRXZWJQYWdlRXZl bnRIYW5kbGVyOjp1cGRhdGVUZXh0SW5wdXRTdGF0ZSk6IFNldCBJdGVtQWNjZXB0c0lucHV0TWV0 aG9kIGFzIHNvb24gYXMgd2UKKyAgICAgICAgaGF2ZSBlZGl0YWJsZSBjb250ZW50LgorCiAyMDEy LTA0LTI4ICBZdXJ5IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgogCiAgICAgICAg IFVucmV2aWV3ZWQuIEFkZGVkIG5ldyBleHBvcnRlZCBzeW1ib2xzIGFmdGVyIHIxMTU1NTMuCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXcu Y3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcApp bmRleCBmYTdmZWJjYTcxOTY5MmMwYTRlNjQ1OTQyNGIxZTg4OTNlZGE1NjkwLi5iN2U5ZTdkNmM4 MzExYzlkMjAwZTJjYjhmZTczZDQzNWI0ODQxYzg5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHAKQEAgLTE2MDMsNCArMTYwMywyNSBA QCB2b2lkIFFRdWlja1dlYlZpZXc6OnNldFpvb21GYWN0b3IocXJlYWwgZmFjdG9yKQogICAgIGQt PnNldFpvb21GYWN0b3IoZmFjdG9yKTsKIH0KIAorc3RydWN0IEpTQ2FsbGJhY2tDbG9zdXJlIHsK KyAgICBRUG9pbnRlcjxRT2JqZWN0PiByZWNlaXZlcjsKKyAgICBRQnl0ZUFycmF5IG1ldGhvZDsK K307CisKK3N0YXRpYyB2b2lkIGphdmFTY3JpcHRDYWxsYmFjayhXS1NlcmlhbGl6ZWRTY3JpcHRW YWx1ZVJlZiwgV0tFcnJvclJlZiwgdm9pZCogY29udGV4dCkKK3sKKyAgICBKU0NhbGxiYWNrQ2xv c3VyZSogY2xvc3VyZSA9IHJlaW50ZXJwcmV0X2Nhc3Q8SlNDYWxsYmFja0Nsb3N1cmUqPihjb250 ZXh0KTsKKyAgICBRTWV0YU9iamVjdDo6aW52b2tlTWV0aG9kKGNsb3N1cmUtPnJlY2VpdmVyLCBj bG9zdXJlLT5tZXRob2QpOworICAgIGRlbGV0ZSBjbG9zdXJlOworfQorCit2b2lkIFFRdWlja1dl YlZpZXc6OnJ1bkphdmFTY3JpcHRJbk1haW5GcmFtZShjb25zdCBRU3RyaW5nICZzY3JpcHQsIFFP YmplY3QgKnJlY2VpdmVyLCBjb25zdCBjaGFyICptZXRob2QpCit7CisgICAgUV9EKFFRdWlja1dl YlZpZXcpOworICAgIEpTQ2FsbGJhY2tDbG9zdXJlKiBjbG9zdXJlID0gbmV3IEpTQ2FsbGJhY2tD bG9zdXJlOworICAgIGNsb3N1cmUtPnJlY2VpdmVyID0gcmVjZWl2ZXI7CisgICAgY2xvc3VyZS0+ bWV0aG9kID0gbWV0aG9kOworICAgIGQtPndlYlBhZ2VQcm94eS5nZXQoKS0+cnVuSmF2YVNjcmlw dEluTWFpbkZyYW1lKHNjcmlwdCwgU2NyaXB0VmFsdWVDYWxsYmFjazo6Y3JlYXRlKGNsb3N1cmUs IGphdmFTY3JpcHRDYWxsYmFjaykpOworfQorCiAjaW5jbHVkZSAibW9jX3FxdWlja3dlYnZpZXdf cC5jcHAiCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlj a3dlYnZpZXdfcC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2 aWV3X3AuaAppbmRleCBjNjNjNjAwMTJjZGI1NWQ1ZjM4YWFhMmYzOTdhYzQwZThiZGM0YWMxLi44 MDg3ZTAzNjQ2MTc1ZmRkNTlmMDkyODYzMThjY2M0YmU1NDFhYzFjIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXdfcC5oCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlld19wLmgKQEAgLTE0Nyw2ICsx NDcsNyBAQCBwdWJsaWM6CiAgICAgLy8gUHJpdmF0ZSBDKystb25seSBBUEkuCiAgICAgcXJlYWwg em9vbUZhY3RvcigpIGNvbnN0OwogICAgIHZvaWQgc2V0Wm9vbUZhY3RvcihxcmVhbCk7CisgICAg dm9pZCBydW5KYXZhU2NyaXB0SW5NYWluRnJhbWUoY29uc3QgUVN0cmluZyYgc2NyaXB0LCBRT2Jq ZWN0KiByZWNlaXZlciwgY29uc3QgY2hhciogbWV0aG9kKTsKIAogcHVibGljIFFfU0xPVFM6CiAg ICAgdm9pZCBsb2FkSHRtbChjb25zdCBRU3RyaW5nJiBodG1sLCBjb25zdCBRVXJsJiBiYXNlVXJs ID0gUVVybCgpLCBjb25zdCBRVXJsJiB1bnJlYWNoYWJsZVVybCA9IFFVcmwoKSk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3Rlc3RzL2h0bWwvaW5wdXRtZXRo b2QuaHRtbCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvdGVzdHMvaHRtbC9pbnB1 dG1ldGhvZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmYzY2E5MzdkMjVlYjhmMDMwZjYwNTAzMWMwNzFiNzVi ZTUyYjU1ZTIKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L3F0L3Rlc3RzL2h0bWwvaW5wdXRtZXRob2QuaHRtbApAQCAtMCwwICsxLDkgQEAKKzxodG1sPgor PGhlYWQ+Cis8dGl0bGU+QmFzaWMgUGFnZSBGb3IgSW5wdXQgTWV0aG9kIFRlc3Rpbmc8L3RpdGxl PgorPC9oZWFkPgorPGJvZHk+Cis8aDE+QmFzaWMgcGFnZTwvaDE+Cis8aW5wdXQgaWQ9ImlucHV0 RmllbGQiIC8+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL3F0L3Rlc3RzL3FxdWlja3dlYnZpZXcvdHN0X3FxdWlja3dlYnZpZXcuY3Bw IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC90ZXN0cy9xcXVpY2t3ZWJ2aWV3L3Rz dF9xcXVpY2t3ZWJ2aWV3LmNwcAppbmRleCBkNTg2YTJkMGIyOWU1ODYzY2Y4NzQyNGQ1ZGE4MGQ0 YTlkODdjNmY2Li43Y2Q0ZTAxZmExOTNmNGExODg3OGMwNzQ0NmYyZmRkODU5ZDI3YjhmIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3Rlc3RzL3FxdWlja3dlYnZp ZXcvdHN0X3FxdWlja3dlYnZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvcXQvdGVzdHMvcXF1aWNrd2Vidmlldy90c3RfcXF1aWNrd2Vidmlldy5jcHAKQEAgLTU3LDEw ICs1NywxMyBAQCBwcml2YXRlIHNsb3RzOgogICAgIHZvaWQgdGl0bGVVcGRhdGUoKTsKICAgICB2 b2lkIHRyYW5zcGFyZW50V2ViVmlld3MoKTsKIAorICAgIHZvaWQgaW5wdXRNZXRob2QoKTsKKwog cHJpdmF0ZToKICAgICB2b2lkIHByZXBhcmVXZWJWaWV3Q29tcG9uZW50KCk7CiAgICAgaW5saW5l IFFRdWlja1dlYlZpZXcqIG5ld1dlYlZpZXcoKTsKICAgICBpbmxpbmUgUVF1aWNrV2ViVmlldyog d2ViVmlldygpIGNvbnN0OworICAgIHZvaWQgcnVuSmF2YVNjcmlwdChjb25zdCBRU3RyaW5nJiBz Y3JpcHQpOwogICAgIFFTY29wZWRQb2ludGVyPFRlc3RXaW5kb3c+IG1fd2luZG93OwogICAgIFFT Y29wZWRQb2ludGVyPFFRbWxDb21wb25lbnQ+IG1fY29tcG9uZW50OwogfTsKQEAgLTEwNiw2ICsx MDksMTMgQEAgaW5saW5lIFFRdWlja1dlYlZpZXcqIHRzdF9RUXVpY2tXZWJWaWV3Ojp3ZWJWaWV3 KCkgY29uc3QKICAgICByZXR1cm4gc3RhdGljX2Nhc3Q8UVF1aWNrV2ViVmlldyo+KG1fd2luZG93 LT53ZWJWaWV3LmRhdGEoKSk7CiB9CiAKK3ZvaWQgdHN0X1FRdWlja1dlYlZpZXc6OnJ1bkphdmFT Y3JpcHQoY29uc3QgUVN0cmluZyAmc2NyaXB0KQoreworICAgIFFFdmVudExvb3AgbG9vcDsKKyAg ICB3ZWJWaWV3KCktPnJ1bkphdmFTY3JpcHRJbk1haW5GcmFtZShzY3JpcHQsICZsb29wLCAicXVp dCIpOworICAgIGxvb3AuZXhlYygpOworfQorCiB2b2lkIHRzdF9RUXVpY2tXZWJWaWV3OjphY2Nl c3NQYWdlKCkKIHsKICAgICBRUXVpY2tXZWJQYWdlKiBjb25zdCBwYWdlRGlyZWN0QWNjZXNzID0g d2ViVmlldygpLT5wYWdlKCk7CkBAIC0zNjMsNiArMzczLDE5IEBAIHZvaWQgdHN0X1FRdWlja1dl YlZpZXc6OnRyYW5zcGFyZW50V2ViVmlld3MoKQogICAgIC8vIEZJWE1FOiB0ZXN0IGFjdHVhbCBy ZW5kZXJpbmcgcmVzdWx0czsgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTgwNjA5LgogfQogCit2b2lkIHRzdF9RUXVpY2tXZWJWaWV3OjppbnB1dE1ldGhvZCgpCit7Cisg ICAgUVF1aWNrV2ViVmlldyogdmlldyA9IHdlYlZpZXcoKTsKKyAgICB2aWV3LT5zZXRVcmwoUVVy bDo6ZnJvbUxvY2FsRmlsZShRTGF0aW4xU3RyaW5nKFRFU1RTX1NPVVJDRV9ESVIgIi9odG1sL2lu cHV0bWV0aG9kLmh0bWwiKSkpOworICAgIFFWRVJJRlkod2FpdEZvckxvYWRTdWNjZWVkZWQodmll dykpOworCisgICAgUVZFUklGWSghdmlldy0+ZmxhZ3MoKS50ZXN0RmxhZyhRUXVpY2tJdGVtOjpJ dGVtQWNjZXB0c0lucHV0TWV0aG9kKSk7CisgICAgcnVuSmF2YVNjcmlwdCgiZG9jdW1lbnQuZ2V0 RWxlbWVudEJ5SWQoJ2lucHV0RmllbGQnKS5mb2N1cygpOyIpOworICAgIFFWRVJJRlkodmlldy0+ ZmxhZ3MoKS50ZXN0RmxhZyhRUXVpY2tJdGVtOjpJdGVtQWNjZXB0c0lucHV0TWV0aG9kKSk7Cisg ICAgcnVuSmF2YVNjcmlwdCgiZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2lucHV0RmllbGQnKS5i bHVyKCk7Iik7CisgICAgUVZFUklGWSghdmlldy0+ZmxhZ3MoKS50ZXN0RmxhZyhRUXVpY2tJdGVt OjpJdGVtQWNjZXB0c0lucHV0TWV0aG9kKSk7Cit9CisKIHZvaWQgdHN0X1FRdWlja1dlYlZpZXc6 OnNjcm9sbFJlcXVlc3QoKQogewogICAgIHdlYlZpZXcoKS0+c2V0U2l6ZShRU2l6ZUYoMzAwLCA0 MDApKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VF dmVudEhhbmRsZXIuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFnZUV2 ZW50SGFuZGxlci5jcHAKaW5kZXggNWNkMDQxNmZkNTExNjJjNzgwMGM1ZTNmMzIzYzdkM2I1Njlm NmMzMy4uOWVjYzY4NmIyN2UzNDJjMDA5NTRkYjhhZTQ5ZGYzZmRiN2M1YTg2YSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFnZUV2ZW50SGFuZGxlci5jcHAK KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFnZUV2ZW50SGFuZGxlci5j cHAKQEAgLTQwOSw2ICs0MDksOCBAQCB2b2lkIFF0V2ViUGFnZUV2ZW50SGFuZGxlcjo6dXBkYXRl VGV4dElucHV0U3RhdGUoKQogCiAgICAgY29uc3QgRWRpdG9yU3RhdGUmIGVkaXRvciA9IG1fd2Vi UGFnZVByb3h5LT5lZGl0b3JTdGF0ZSgpOwogCisgICAgbV93ZWJWaWV3LT5zZXRGbGFnKFFRdWlj a0l0ZW06Okl0ZW1BY2NlcHRzSW5wdXRNZXRob2QsIGVkaXRvci5pc0NvbnRlbnRFZGl0YWJsZSk7 CisKICAgICBpZiAoIW1fd2ViVmlldy0+aGFzRm9jdXMoKSkKICAgICAgICAgcmV0dXJuOwogCg== 139763 2012-05-02 01:06:03 -0700 2012-05-02 01:08:24 -0700 Patch bug-85350-20120502100601.patch text/plain 6752 hausmann U3VidmVyc2lvbiBSZXZpc2lvbjogMTE1ODAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYTczMTVjYTFkYjIzN2Vh OWFkNzc0ODU1NWYwMjRmNDIwMWFjOWRlNy4uMGM5NmIzZTYwZmU5ZmJkODQ5YmQwZGIyN2Q0MjUw ZWJhOWNkMGVmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEyLTA1LTAyICBTaW1v biBIYXVzbWFubiAgPHNpbW9uLmhhdXNtYW5uQG5va2lhLmNvbT4KKworICAgICAgICBbUXRdIFFR dWlja1dlYlZpZXcgZG9lcyBub3QgYWxsb3cgZm9yIGlucHV0IGZyb20gdmlydHVhbCBrZXlib2Fy ZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODUzNTAK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJdCBpcyBu ZWNlc3NhcnkgdG8gc2V0IHRoZSBJdGVtQWNjZXB0c0lucHV0TWV0aG9kIGZsYWcgb24gdGhlIFFR dWlja1dlYlZpZXcgaWYgd2UgaGF2ZSBlZGl0YWJsZQorICAgICAgICBjb250ZW50LCBpbiBvcmRl ciBmb3IgdGhlIGlucHV0IG1ldGhvZCB0byByZWNvZ25pemUgdGhhdCB3ZSBjYW4gaGFuZGxlIGlu cHV0IG1ldGhvZCBldmVudHMuCisKKyAgICAgICAgQW5hbHl6ZWQgYnkgTWljaGFlbCBCcsO8bmlu Zy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHA6IEFkZCBz aW1wbGUgaG9vayBmb3IgZXhlY3V0aW5nIEpTIGFzIHByaXZhdGUgQysrIEFQSS4KKyAgICAgICAg KEpTQ2FsbGJhY2tDbG9zdXJlKToKKyAgICAgICAgKGphdmFTY3JpcHRDYWxsYmFjayk6CisgICAg ICAgIChRUXVpY2tXZWJWaWV3OjpydW5KYXZhU2NyaXB0SW5NYWluRnJhbWUpOgorICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlld19wLmg6CisgICAgICAgICogVUlQcm9jZXNz L0FQSS9xdC90ZXN0cy9odG1sL2lucHV0bWV0aG9kLmh0bWw6IEFkZGVkLgorICAgICAgICAqIFVJ UHJvY2Vzcy9BUEkvcXQvdGVzdHMvcXF1aWNrd2Vidmlldy90c3RfcXF1aWNrd2Vidmlldy5jcHA6 CisgICAgICAgICh0c3RfUVF1aWNrV2ViVmlldyk6CisgICAgICAgICh0c3RfUVF1aWNrV2ViVmll dzo6cnVuSmF2YVNjcmlwdCk6IFNpbXBsZSBoZWxwZXIgZm9yIHJ1bm5pbmcgSlMuCisgICAgICAg ICh0c3RfUVF1aWNrV2ViVmlldzo6aW5wdXRNZXRob2QpOiBBZGRlZCBzaW1wbGUgdGVzdCBmb3Ig SXRlbUFjY2VwdHNJbnB1dE1ldGhvZCB0b2dnbGluZy4KKyAgICAgICAgKiBVSVByb2Nlc3MvcXQv UXRXZWJQYWdlRXZlbnRIYW5kbGVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UXRXZWJQYWdlRXZl bnRIYW5kbGVyOjp1cGRhdGVUZXh0SW5wdXRTdGF0ZSk6IFNldCBJdGVtQWNjZXB0c0lucHV0TWV0 aG9kIGFzIHNvb24gYXMgd2UKKyAgICAgICAgaGF2ZSBlZGl0YWJsZSBjb250ZW50LgorCiAyMDEy LTA1LTAxICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAg aW5zcGVjdG9yUmVhbGx5VXNlc1dlYktpdFVzZXJJbnRlcmZhY2Ugc2hvdWxkIGJlIG1vcmUgcm9i dXN0IGFnYWluc3QgbWlzc2luZyBmaWxlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHAKaW5kZXggYjI5ZGQ0Mjk1NmUwMjg3YTAzNmM4MDNj ODI1OTQ1ZDJiMWU2MzBkZC4uOTZjNTJhMmJhMzc3OTczZGZkYzk5YWY5ODEzMWJjMDI1MzIxZDZm MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2 aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZp ZXcuY3BwCkBAIC0xNjM1LDQgKzE2MzUsMjUgQEAgdm9pZCBRUXVpY2tXZWJWaWV3OjpzZXRab29t RmFjdG9yKHFyZWFsIGZhY3RvcikKICAgICBkLT5zZXRab29tRmFjdG9yKGZhY3Rvcik7CiB9CiAK K3N0cnVjdCBKU0NhbGxiYWNrQ2xvc3VyZSB7CisgICAgUVBvaW50ZXI8UU9iamVjdD4gcmVjZWl2 ZXI7CisgICAgUUJ5dGVBcnJheSBtZXRob2Q7Cit9OworCitzdGF0aWMgdm9pZCBqYXZhU2NyaXB0 Q2FsbGJhY2soV0tTZXJpYWxpemVkU2NyaXB0VmFsdWVSZWYsIFdLRXJyb3JSZWYsIHZvaWQqIGNv bnRleHQpCit7CisgICAgSlNDYWxsYmFja0Nsb3N1cmUqIGNsb3N1cmUgPSByZWludGVycHJldF9j YXN0PEpTQ2FsbGJhY2tDbG9zdXJlKj4oY29udGV4dCk7CisgICAgUU1ldGFPYmplY3Q6Omludm9r ZU1ldGhvZChjbG9zdXJlLT5yZWNlaXZlciwgY2xvc3VyZS0+bWV0aG9kKTsKKyAgICBkZWxldGUg Y2xvc3VyZTsKK30KKwordm9pZCBRUXVpY2tXZWJWaWV3OjpydW5KYXZhU2NyaXB0SW5NYWluRnJh bWUoY29uc3QgUVN0cmluZyAmc2NyaXB0LCBRT2JqZWN0ICpyZWNlaXZlciwgY29uc3QgY2hhciAq bWV0aG9kKQoreworICAgIFFfRChRUXVpY2tXZWJWaWV3KTsKKyAgICBKU0NhbGxiYWNrQ2xvc3Vy ZSogY2xvc3VyZSA9IG5ldyBKU0NhbGxiYWNrQ2xvc3VyZTsKKyAgICBjbG9zdXJlLT5yZWNlaXZl ciA9IHJlY2VpdmVyOworICAgIGNsb3N1cmUtPm1ldGhvZCA9IG1ldGhvZDsKKyAgICBkLT53ZWJQ YWdlUHJveHkuZ2V0KCktPnJ1bkphdmFTY3JpcHRJbk1haW5GcmFtZShzY3JpcHQsIFNjcmlwdFZh bHVlQ2FsbGJhY2s6OmNyZWF0ZShjbG9zdXJlLCBqYXZhU2NyaXB0Q2FsbGJhY2spKTsKK30KKwog I2luY2x1ZGUgIm1vY19xcXVpY2t3ZWJ2aWV3X3AuY3BwIgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3X3AuaCBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlld19wLmgKaW5kZXggYzYwMWIwNDZlYWViMTVj NGI1ZDg1MjQxODBjMTAyNjQ2N2Q2NmU5NS4uM2QzODg2ZWI1NDc1ZmI3ZDMwNWIzMTc5MDQ5ODk3 NTM1NjQxMWRmNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9x cXVpY2t3ZWJ2aWV3X3AuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3Fx dWlja3dlYnZpZXdfcC5oCkBAIC0xNDcsNiArMTQ3LDcgQEAgcHVibGljOgogICAgIC8vIFByaXZh dGUgQysrLW9ubHkgQVBJLgogICAgIHFyZWFsIHpvb21GYWN0b3IoKSBjb25zdDsKICAgICB2b2lk IHNldFpvb21GYWN0b3IocXJlYWwpOworICAgIHZvaWQgcnVuSmF2YVNjcmlwdEluTWFpbkZyYW1l KGNvbnN0IFFTdHJpbmcmIHNjcmlwdCwgUU9iamVjdCogcmVjZWl2ZXIsIGNvbnN0IGNoYXIqIG1l dGhvZCk7CiAKIHB1YmxpYyBRX1NMT1RTOgogICAgIHZvaWQgbG9hZEh0bWwoY29uc3QgUVN0cmlu ZyYgaHRtbCwgY29uc3QgUVVybCYgYmFzZVVybCA9IFFVcmwoKSwgY29uc3QgUVVybCYgdW5yZWFj aGFibGVVcmwgPSBRVXJsKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9xdC90ZXN0cy9odG1sL2lucHV0bWV0aG9kLmh0bWwgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL3F0L3Rlc3RzL2h0bWwvaW5wdXRtZXRob2QuaHRtbApuZXcgZmlsZSBtb2RlIDEw MDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5mM2Nh OTM3ZDI1ZWI4ZjAzMGY2MDUwMzFjMDcxYjc1YmU1MmI1NWUyCi0tLSAvZGV2L251bGwKKysrIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC90ZXN0cy9odG1sL2lucHV0bWV0aG9kLmh0 bWwKQEAgLTAsMCArMSw5IEBACis8aHRtbD4KKzxoZWFkPgorPHRpdGxlPkJhc2ljIFBhZ2UgRm9y IElucHV0IE1ldGhvZCBUZXN0aW5nPC90aXRsZT4KKzwvaGVhZD4KKzxib2R5PgorPGgxPkJhc2lj IHBhZ2U8L2gxPgorPGlucHV0IGlkPSJpbnB1dEZpZWxkIiAvPgorPC9ib2R5PgorPC9odG1sPgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC90ZXN0cy9xcXVpY2t3 ZWJ2aWV3L3RzdF9xcXVpY2t3ZWJ2aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvcXQvdGVzdHMvcXF1aWNrd2Vidmlldy90c3RfcXF1aWNrd2Vidmlldy5jcHAKaW5kZXggZDU4 NmEyZDBiMjllNTg2M2NmODc0MjRkNWRhODBkNGE5ZDg3YzZmNi4uN2NkNGUwMWZhMTkzZjRhMTg4 NzhjMDc0NDZmMmZkZDg1OWQyN2I4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9xdC90ZXN0cy9xcXVpY2t3ZWJ2aWV3L3RzdF9xcXVpY2t3ZWJ2aWV3LmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3Rlc3RzL3FxdWlja3dlYnZpZXcvdHN0 X3FxdWlja3dlYnZpZXcuY3BwCkBAIC01NywxMCArNTcsMTMgQEAgcHJpdmF0ZSBzbG90czoKICAg ICB2b2lkIHRpdGxlVXBkYXRlKCk7CiAgICAgdm9pZCB0cmFuc3BhcmVudFdlYlZpZXdzKCk7CiAK KyAgICB2b2lkIGlucHV0TWV0aG9kKCk7CisKIHByaXZhdGU6CiAgICAgdm9pZCBwcmVwYXJlV2Vi Vmlld0NvbXBvbmVudCgpOwogICAgIGlubGluZSBRUXVpY2tXZWJWaWV3KiBuZXdXZWJWaWV3KCk7 CiAgICAgaW5saW5lIFFRdWlja1dlYlZpZXcqIHdlYlZpZXcoKSBjb25zdDsKKyAgICB2b2lkIHJ1 bkphdmFTY3JpcHQoY29uc3QgUVN0cmluZyYgc2NyaXB0KTsKICAgICBRU2NvcGVkUG9pbnRlcjxU ZXN0V2luZG93PiBtX3dpbmRvdzsKICAgICBRU2NvcGVkUG9pbnRlcjxRUW1sQ29tcG9uZW50PiBt X2NvbXBvbmVudDsKIH07CkBAIC0xMDYsNiArMTA5LDEzIEBAIGlubGluZSBRUXVpY2tXZWJWaWV3 KiB0c3RfUVF1aWNrV2ViVmlldzo6d2ViVmlldygpIGNvbnN0CiAgICAgcmV0dXJuIHN0YXRpY19j YXN0PFFRdWlja1dlYlZpZXcqPihtX3dpbmRvdy0+d2ViVmlldy5kYXRhKCkpOwogfQogCit2b2lk IHRzdF9RUXVpY2tXZWJWaWV3OjpydW5KYXZhU2NyaXB0KGNvbnN0IFFTdHJpbmcgJnNjcmlwdCkK K3sKKyAgICBRRXZlbnRMb29wIGxvb3A7CisgICAgd2ViVmlldygpLT5ydW5KYXZhU2NyaXB0SW5N YWluRnJhbWUoc2NyaXB0LCAmbG9vcCwgInF1aXQiKTsKKyAgICBsb29wLmV4ZWMoKTsKK30KKwog dm9pZCB0c3RfUVF1aWNrV2ViVmlldzo6YWNjZXNzUGFnZSgpCiB7CiAgICAgUVF1aWNrV2ViUGFn ZSogY29uc3QgcGFnZURpcmVjdEFjY2VzcyA9IHdlYlZpZXcoKS0+cGFnZSgpOwpAQCAtMzYzLDYg KzM3MywxOSBAQCB2b2lkIHRzdF9RUXVpY2tXZWJWaWV3Ojp0cmFuc3BhcmVudFdlYlZpZXdzKCkK ICAgICAvLyBGSVhNRTogdGVzdCBhY3R1YWwgcmVuZGVyaW5nIHJlc3VsdHM7IGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MDYwOS4KIH0KIAordm9pZCB0c3RfUVF1aWNr V2ViVmlldzo6aW5wdXRNZXRob2QoKQoreworICAgIFFRdWlja1dlYlZpZXcqIHZpZXcgPSB3ZWJW aWV3KCk7CisgICAgdmlldy0+c2V0VXJsKFFVcmw6OmZyb21Mb2NhbEZpbGUoUUxhdGluMVN0cmlu ZyhURVNUU19TT1VSQ0VfRElSICIvaHRtbC9pbnB1dG1ldGhvZC5odG1sIikpKTsKKyAgICBRVkVS SUZZKHdhaXRGb3JMb2FkU3VjY2VlZGVkKHZpZXcpKTsKKworICAgIFFWRVJJRlkoIXZpZXctPmZs YWdzKCkudGVzdEZsYWcoUVF1aWNrSXRlbTo6SXRlbUFjY2VwdHNJbnB1dE1ldGhvZCkpOworICAg IHJ1bkphdmFTY3JpcHQoImRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdpbnB1dEZpZWxkJykuZm9j dXMoKTsiKTsKKyAgICBRVkVSSUZZKHZpZXctPmZsYWdzKCkudGVzdEZsYWcoUVF1aWNrSXRlbTo6 SXRlbUFjY2VwdHNJbnB1dE1ldGhvZCkpOworICAgIHJ1bkphdmFTY3JpcHQoImRvY3VtZW50Lmdl dEVsZW1lbnRCeUlkKCdpbnB1dEZpZWxkJykuYmx1cigpOyIpOworICAgIFFWRVJJRlkoIXZpZXct PmZsYWdzKCkudGVzdEZsYWcoUVF1aWNrSXRlbTo6SXRlbUFjY2VwdHNJbnB1dE1ldGhvZCkpOwor fQorCiB2b2lkIHRzdF9RUXVpY2tXZWJWaWV3OjpzY3JvbGxSZXF1ZXN0KCkKIHsKICAgICB3ZWJW aWV3KCktPnNldFNpemUoUVNpemVGKDMwMCwgNDAwKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlRXZlbnRIYW5kbGVyLmNwcCBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VFdmVudEhhbmRsZXIuY3BwCmluZGV4IDVjZDA0MTZm ZDUxMTYyYzc4MDBjNWUzZjMyM2M3ZDNiNTY5ZjZjMzMuLjllY2M2ODZiMjdlMzQyYzAwOTU0ZGI4 YWU0OWRmM2ZkYjdjNWE4NmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9x dC9RdFdlYlBhZ2VFdmVudEhhbmRsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9xdC9RdFdlYlBhZ2VFdmVudEhhbmRsZXIuY3BwCkBAIC00MDksNiArNDA5LDggQEAgdm9pZCBR dFdlYlBhZ2VFdmVudEhhbmRsZXI6OnVwZGF0ZVRleHRJbnB1dFN0YXRlKCkKIAogICAgIGNvbnN0 IEVkaXRvclN0YXRlJiBlZGl0b3IgPSBtX3dlYlBhZ2VQcm94eS0+ZWRpdG9yU3RhdGUoKTsKIAor ICAgIG1fd2ViVmlldy0+c2V0RmxhZyhRUXVpY2tJdGVtOjpJdGVtQWNjZXB0c0lucHV0TWV0aG9k LCBlZGl0b3IuaXNDb250ZW50RWRpdGFibGUpOworCiAgICAgaWYgKCFtX3dlYlZpZXctPmhhc0Zv Y3VzKCkpCiAgICAgICAgIHJldHVybjsKIAo=