94623 2012-08-21 11:56:41 -0700 [WK2] Make RegisterIntentServiceForFrame and DeliverIntentToFrame messages synchronous 2012-10-08 01:38:30 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED INVALID http://www.w3.org/TR/web-intents/#user-agent-behavior P2 Normal --- 90451 1 cdumez cdumez andersca gbillock gyuyoung.kim hausmann kenneth sam tmpsantos webkit.review.bot oldest_to_newest 700972 0 cdumez 2012-08-21 11:56:41 -0700 We currently test Web intent requests, Web intent service registration but not yet Web intent delivery. We need to test this functionality to fully cover Web Intents. 701674 1 cdumez 2012-08-22 01:41:27 -0700 According to the spec (http://www.w3.org/TR/web-intents/#user-agent-behavior): "When the User Agent delivers an intent payload to a web application, it must make the window.intent object available as the document is loaded and parsed, so that scripts on the page may process the intent data as they load. User agents must not place a window.intent object in the scope of pages which do not have registration metadata declaring themselves as intent handlers." We don't currently have a reliable way of delivering a Intent to a page before the "onload" event since the related messages are asynchronous in WebKit2. Since according to the spec, we not deliver the intent to the page until it declares itself as an intent handler, I propose to make the two following messages synchronous: RegisterIntentServiceForFrame: The page registered itself as an intent handler (i.e. the <intent> tag was parsed) DeliverIntentToFrame: Intent delivery to the page (exposing it via window.intent). This way, we have a reliable way of delivering the Intent *while* the page is loaded but *after* the page registered itself as an intent handler. 701719 2 159890 cdumez 2012-08-22 03:05:51 -0700 Created attachment 159890 Patch 701735 3 159890 kenneth 2012-08-22 03:27:29 -0700 Comment on attachment 159890 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=159890&action=review > Source/WebKit2/ChangeLog:4 > + [WK2] Make RegisterIntentServiceForFrame and DeliverIntentToFrame messages synchronous > + https://bugs.webkit.org/show_bug.cgi?id=94623 We really would like to avoid sync calls during load. Is there any way the spec can be changed to accomplish this? > Source/WebKit2/ChangeLog:12 > + Web intent is delivered in time. According to the spec, > + the intent delivery (exposing it via window.intent) should > + happen as the document is loaded and parsed, so that scripts can't this be an event? > Source/WebKit2/UIProcess/API/efl/tests/resources/intent-service.html:1 > <html> html5 doctype? > Source/WebKit2/UIProcess/API/efl/tests/resources/intent-service.html:4 > +<script type="text/javascript"> no reason to specify that it is javascript 701740 4 159890 hausmann 2012-08-22 03:36:22 -0700 Comment on attachment 159890 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=159890&action=review > Source/WebKit2/UIProcess/WebPageProxy.cpp:1641 > - m_process->send(Messages::WebPage::DeliverIntentToFrame(frame->frameID(), webIntentData->store()), m_pageID); > + m_process->sendSync(Messages::WebPage::DeliverIntentToFrame(frame->frameID(), webIntentData->store()), Messages::WebPage::DeliverIntentToFrame::Reply(), m_pageID); Sending a synchronous message from the ui process to the web process is asking for trouble and I suggest it should be avoided at all cost. We've had many problems/crashes doing synchronous calls in the Qt port going in that direction, when entering slightly more complex situations. So: Why exactly does the ui process have to block here? 702101 5 159890 sam 2012-08-22 11:31:31 -0700 Comment on attachment 159890 Patch Sync messages should be avoided. r-. 159890 2012-08-22 03:05:51 -0700 2012-08-23 23:07:09 -0700 Patch 94623_intent_delivery_sync.patch text/plain 9257 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAzNmQ1ZDQ2Li4zY2U1ODMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDQg QEAKKzIwMTItMDgtMjIgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVs LmNvbT4KKworICAgICAgICBbV0syXSBNYWtlIFJlZ2lzdGVySW50ZW50U2VydmljZUZvckZyYW1l IGFuZCBEZWxpdmVySW50ZW50VG9GcmFtZSBtZXNzYWdlcyBzeW5jaHJvbm91cworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTQ2MjMKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWtlIFJlZ2lzdGVySW50ZW50 U2VydmljZUZvckZyYW1lIGFuZCBEZWxpdmVySW50ZW50VG9GcmFtZQorICAgICAgICBJUEMgbWVz c2FnZXMgc3luY2hyb25vdXMgc28gdGhhdCB3ZSBjYW4gZ3VhcmFudGVlIHRoZQorICAgICAgICBX ZWIgaW50ZW50IGlzIGRlbGl2ZXJlZCBpbiB0aW1lLiBBY2NvcmRpbmcgdG8gdGhlIHNwZWMsCisg ICAgICAgIHRoZSBpbnRlbnQgZGVsaXZlcnkgKGV4cG9zaW5nIGl0IHZpYSB3aW5kb3cuaW50ZW50 KSBzaG91bGQKKyAgICAgICAgaGFwcGVuIGFzIHRoZSBkb2N1bWVudCBpcyBsb2FkZWQgYW5kIHBh cnNlZCwgc28gdGhhdCBzY3JpcHRzCisgICAgICAgIG9uIHRoZSBwYWdlIG1heSBwcm9jZXNzIHRo ZSBpbnRlbnQgZGF0YSBhcyB0aGV5IGxvYWQuIFRoZQorICAgICAgICBzcGVjIGFsc28gc2F5cyB3 ZSBtdXN0IG5vdCBwbGFjZSBhIHdpbmRvdy5pbnRlbnQgb2JqZWN0IGluCisgICAgICAgIHRoZSBz Y29wZSBvZiBwYWdlcyB3aGljaCBkbyBub3QgaGF2ZSByZWdpc3RyYXRpb24gbWV0YWRhdGEKKyAg ICAgICAgZGVjbGFyaW5nIHRoZW1zZWx2ZXMgYXMgaW50ZW50IGhhbmRsZXJzLgorCisgICAgICAg IEJ5IG1ha2luZyBSZWdpc3RlckludGVudFNlcnZpY2VGb3JGcmFtZSwgd2UgY2FuIGd1YXJhbnRl ZQorICAgICAgICB0aGF0IHdlIGNhbiB3YWl0IHVudGlsIHRoZSBwYWdlIHJlZ2lzdGVyZWQgaXRz ZWxmIGFzIGFuCisgICAgICAgIGludGVudCBzZXJ2aWNlICg8aW50ZW50PiB0YWcgd2FzIHByZXNl bnQgYW5kIHBhcnNlZCkuIFRoZQorICAgICAgICBjbGllbnQgYXBwbGljYXRpb24gY2FuIHdhaXQg Zm9yIHNlcnZpY2UgcmVnaXN0cmF0aW9uIGFuZAorICAgICAgICB0aGVuIGRlbGl2ZXIgc3luY2hy b25vdXNseSB0aGUgaW50ZW50IHRvIHRoYXQgcGFnZS4gV2UKKyAgICAgICAgY2FuIHRoZXJlZm9y ZSBtYWtlIHN1cmUgdGhlIHdpbmRvdy5pbnRlbnQgaXMgZXhwb3NlIGluCisgICAgICAgIHRpbWUg Zm9yIHRoZSBzY3JpcHRzIGluIHRoZSBwYWdlIHRvIHByb2Nlc3MgaXQuCisKKyAgICAgICAgKiBQ bGF0Zm9ybS9Db3JlSVBDL0hhbmRsZU1lc3NhZ2UuaDoKKyAgICAgICAgKENvcmVJUEMpOgorICAg ICAgICAoQ29yZUlQQzo6Y2FsbE1lbWJlckZ1bmN0aW9uKToKKyAgICAgICAgKiBVSVByb2Nlc3Mv QVBJL2VmbC90ZXN0cy9yZXNvdXJjZXMvaW50ZW50LXNlcnZpY2UuaHRtbDoKKyAgICAgICAgKiBV SVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfaW50ZW50cy5jcHA6IEFkZCB1bml0IHRl c3QKKyAgICAgICAgdG8gY2hlY2sgaW50ZW50IGRlbGl2ZXJ5IGZ1bmN0aW9uYWxpdHkgaW4gRUZM IHBvcnQuCisgICAgICAgIChvbkludGVudFJlcXVlc3QpOgorICAgICAgICAoZGVsaXZlckludGVu dCk6CisgICAgICAgIChURVNUX0YpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHku Y3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRlbGl2ZXJJbnRlbnRUb0ZyYW1l KToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluOgorICAgICAg ICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwOgor ICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZUxvYWRlckNsaWVudDo6cmVnaXN0ZXJJbnRlbnRTZXJ2 aWNlKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbjoK KwogMjAxMi0wOC0yMSAgU2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+ CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjEyNjIxNi4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0NvcmVJUEMvSGFuZGxlTWVzc2FnZS5oIGIvU291cmNl L1dlYktpdDIvUGxhdGZvcm0vQ29yZUlQQy9IYW5kbGVNZXNzYWdlLmgKaW5kZXggYjg1YzliNy4u NDFmNjUxZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vQ29yZUlQQy9IYW5k bGVNZXNzYWdlLmgKKysrIGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vQ29yZUlQQy9IYW5kbGVN ZXNzYWdlLmgKQEAgLTI3Myw2ICsyNzMsMTIgQEAgdm9pZCBjYWxsTWVtYmVyRnVuY3Rpb24oY29u c3QgQXJndW1lbnRzNzxQMSwgUDIsIFAzLCBQNCwgUDUsIFA2LCBQNz4mIGFyZ3MsIEFyZ3UKIAog Ly8gVmFyaWFkaWMgZGlzcGF0Y2ggZnVuY3Rpb25zIHdpdGggbm9uLXZhcmlhZGljIHJlcGx5IGFy Z3VtZW50cy4KIAordGVtcGxhdGU8dHlwZW5hbWUgQywgdHlwZW5hbWUgTUYsIHR5cGVuYW1lIFAx LCB0eXBlbmFtZSBQMj4KK3ZvaWQgY2FsbE1lbWJlckZ1bmN0aW9uKGNvbnN0IEFyZ3VtZW50czI8 UDEsIFAyPiYgYXJncywgQXJndW1lbnREZWNvZGVyKiBhcmd1bWVudERlY29kZXIsIEFyZ3VtZW50 czAmIHJlcGx5QXJncywgQyogb2JqZWN0LCBNRiBmdW5jdGlvbikKK3sKKyAgICAob2JqZWN0LT4q ZnVuY3Rpb24pKGFyZ3MuYXJndW1lbnQxLCBhcmdzLmFyZ3VtZW50MiwgYXJndW1lbnREZWNvZGVy KTsKK30KKwogdGVtcGxhdGU8dHlwZW5hbWUgQywgdHlwZW5hbWUgTUYsIHR5cGVuYW1lIFAxLCB0 eXBlbmFtZSBQMiwgdHlwZW5hbWUgUDMsIHR5cGVuYW1lIFA0LCB0eXBlbmFtZSBSMSwgdHlwZW5h bWUgUjIsIHR5cGVuYW1lIFIzPgogdm9pZCBjYWxsTWVtYmVyRnVuY3Rpb24oY29uc3QgQXJndW1l bnRzNDxQMSwgUDIsIFAzLCBQND4mIGFyZ3MsIEFyZ3VtZW50RGVjb2RlciogYXJndW1lbnREZWNv ZGVyLCBBcmd1bWVudHMzPFIxLCBSMiwgUjM+JiByZXBseUFyZ3MsIEMqIG9iamVjdCwgTUYgZnVu Y3Rpb24pCiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90 ZXN0cy9yZXNvdXJjZXMvaW50ZW50LXNlcnZpY2UuaHRtbCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZWZsL3Rlc3RzL3Jlc291cmNlcy9pbnRlbnQtc2VydmljZS5odG1sCmluZGV4IDFk OWZhMmEuLjdiYzEzNGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv ZWZsL3Rlc3RzL3Jlc291cmNlcy9pbnRlbnQtc2VydmljZS5odG1sCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Jlc291cmNlcy9pbnRlbnQtc2VydmljZS5odG1s CkBAIC0xLDggKzEsMTQgQEAKIDxodG1sPgogPGhlYWQ+CiA8dGl0bGU+V2ViIEludGVudCBzZXJ2 aWNlIHJlZ2lzdHJhdGlvbiB0ZXN0PC90aXRsZT4KKzxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2Ny aXB0Ij4KK2Z1bmN0aW9uIGhhbmRsZUludGVudCgpIHsKKyAgaWYgKHdpbmRvdy53ZWJraXRJbnRl bnQpCisgICAgZG9jdW1lbnQudGl0bGUgPSAiUmVjZWl2ZWQgaW50ZW50IHdpdGggYWN0aW9uOiAi ICsgd2luZG93LndlYmtpdEludGVudC5hY3Rpb247Cit9Cis8L3NjcmlwdD4KIDwvaGVhZD4KLSAg PGJvZHk+CisgIDxib2R5IG9ubG9hZD0iaGFuZGxlSW50ZW50KCkiPgogICAgIDxpbnRlbnQgYWN0 aW9uPSJhY3Rpb24iIHR5cGU9InR5cGUiIHRpdGxlPSJUaXRsZSIgaHJlZj0iaHR0cDovL2V4YW1w bGUuY29tL3NlcnZpY2UiIGRpc3Bvc2l0aW9uPSJpbmxpbmUiPjwvaW50ZW50PgogICAgIFJlZ2lz dGVyZWQgSW50ZW50IFNlcnZpY2UuCiAgIDwvYm9keT4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl9pbnRlbnRzLmNwcCBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl9pbnRlbnRzLmNwcApp bmRleCBmZGY3ZmRmLi4yYTE3ODJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfaW50ZW50cy5jcHAKKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX2ludGVudHMuY3BwCkBAIC0xMTQs MyArMTE0LDQ0IEBAIFRFU1RfRihFV0syVW5pdFRlc3RCYXNlLCBld2tfaW50ZW50X3JlcXVlc3Qp CiAgICAgQVNTRVJUX0VRKGludGVudFJlY2VpdmVkQ291bnQsIDIpOwogICAgIGV2YXNfb2JqZWN0 X3NtYXJ0X2NhbGxiYWNrX2RlbCh3ZWJWaWV3KCksICJpbnRlbnQscmVxdWVzdCxuZXciLCBvbklu dGVudFJlY2VpdmVkKTsKIH0KKworc3RhdGljIHZvaWQgb25JbnRlbnRSZXF1ZXN0KHZvaWQqIHVz ZXJEYXRhLCBFdmFzX09iamVjdCosIHZvaWQqIGV2ZW50SW5mbykKK3sKKyAgICBFd2tfSW50ZW50 KiBpbnRlbnQgPSBzdGF0aWNfY2FzdDxFd2tfSW50ZW50Kj4oZXZlbnRJbmZvKTsKKyAgICBBU1NF UlRfVFJVRShpbnRlbnQpOworCisgICAgRXdrX0ludGVudCoqIHJldHVybmVkSW50ZW50ID0gc3Rh dGljX2Nhc3Q8RXdrX0ludGVudCoqPih1c2VyRGF0YSk7CisgICAgZXdrX2ludGVudF9yZWYoaW50 ZW50KTsKKyAgICAqcmV0dXJuZWRJbnRlbnQgPSBpbnRlbnQ7Cit9CisKK3N0YXRpYyB2b2lkIGRl bGl2ZXJJbnRlbnQodm9pZCogdXNlckRhdGEsIEV2YXNfT2JqZWN0KiB2aWV3LCB2b2lkKiBldmVu dEluZm8pCit7CisgICAgZnByaW50ZihzdGRlcnIsICJkZWxpdmVySW50ZW50XG4iKTsKKyAgICBF d2tfSW50ZW50KiBpbnRlbnQgPSBzdGF0aWNfY2FzdDxFd2tfSW50ZW50Kj4odXNlckRhdGEpOwor ICAgIGV3a192aWV3X2ludGVudF9kZWxpdmVyKHZpZXcsIGludGVudCk7Cit9CisKK1RFU1RfRihF V0syVW5pdFRlc3RCYXNlLCBld2tfaW50ZW50X2RlbGl2ZXJ5KQoreworICAgIEV3a19JbnRlbnQq IGludGVudCA9IDA7CisKKyAgICAvLyBMb2FkIHBhZ2Ugd2hpY2ggc3RhcnRzIGFuIGludGVudCBy ZXF1ZXN0CisgICAgZXZhc19vYmplY3Rfc21hcnRfY2FsbGJhY2tfYWRkKHdlYlZpZXcoKSwgImlu dGVudCxyZXF1ZXN0LG5ldyIsIG9uSW50ZW50UmVxdWVzdCwgJmludGVudCk7CisgICAgbG9hZFVy bFN5bmMoZW52aXJvbm1lbnQtPnVybEZvclJlc291cmNlKCJpbnRlbnQtcmVxdWVzdC5odG1sIiku ZGF0YSgpKTsKKyAgICAvLyBBIHVzZXIgZ2VzdHVyZSBpcyByZXF1aXJlZCBmb3IgdGhlIGludGVu dCB0byBzdGFydC4KKyAgICBtb3VzZUNsaWNrKDUsIDUpOworICAgIHdoaWxlICghaW50ZW50KQor ICAgICAgICBlY29yZV9tYWluX2xvb3BfaXRlcmF0ZSgpOworICAgIEFTU0VSVF9UUlVFKGludGVu dCk7CisgICAgZXZhc19vYmplY3Rfc21hcnRfY2FsbGJhY2tfZGVsKHdlYlZpZXcoKSwgImludGVu dCxyZXF1ZXN0LG5ldyIsIG9uSW50ZW50UmVxdWVzdCk7CisKKyAgICAvLyBEZWxpdmVyIHRoZSBp bnRlbnQgdG8gYSBzZXJ2aWNlCisgICAgZXZhc19vYmplY3Rfc21hcnRfY2FsbGJhY2tfYWRkKHdl YlZpZXcoKSwgImludGVudCxzZXJ2aWNlLHJlZ2lzdGVyIiwgZGVsaXZlckludGVudCwgaW50ZW50 KTsKKyAgICBld2tfdmlld191cmlfc2V0KHdlYlZpZXcoKSwgZW52aXJvbm1lbnQtPnVybEZvclJl c291cmNlKCJpbnRlbnQtc2VydmljZS5odG1sIikuZGF0YSgpKTsKKyAgICB3YWl0VW50aWxUaXRs ZUNoYW5nZWRUbygiUmVjZWl2ZWQgaW50ZW50IHdpdGggYWN0aW9uOiBhY3Rpb24xIik7CisgICAg QVNTRVJUX1NUUkVRKGV3a192aWV3X3RpdGxlX2dldCh3ZWJWaWV3KCkpLCAiUmVjZWl2ZWQgaW50 ZW50IHdpdGggYWN0aW9uOiBhY3Rpb24xIik7CisgICAgZXZhc19vYmplY3Rfc21hcnRfY2FsbGJh Y2tfZGVsKHdlYlZpZXcoKSwgImludGVudCxzZXJ2aWNlLHJlZ2lzdGVyIiwgZGVsaXZlckludGVu dCk7CisKKyAgICBld2tfaW50ZW50X3VucmVmKGludGVudCk7Cit9CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCmluZGV4IDhkNWNjMzIuLjQwZDQ4OTYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCkBAIC0xNjM4LDcgKzE2MzgsNyBA QCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGVsaXZlckludGVudFRvRnJhbWUoV2ViRnJhbWVQcm94eSog ZnJhbWUsIFdlYkludGVudERhdGEqIHdlYgogICAgIGlmICghaXNWYWxpZCgpKQogICAgICAgICBy ZXR1cm47CiAKLSAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkRlbGl2ZXJJ bnRlbnRUb0ZyYW1lKGZyYW1lLT5mcmFtZUlEKCksIHdlYkludGVudERhdGEtPnN0b3JlKCkpLCBt X3BhZ2VJRCk7CisgICAgbV9wcm9jZXNzLT5zZW5kU3luYyhNZXNzYWdlczo6V2ViUGFnZTo6RGVs aXZlckludGVudFRvRnJhbWUoZnJhbWUtPmZyYW1lSUQoKSwgd2ViSW50ZW50RGF0YS0+c3RvcmUo KSksIE1lc3NhZ2VzOjpXZWJQYWdlOjpEZWxpdmVySW50ZW50VG9GcmFtZTo6UmVwbHkoKSwgbV9w YWdlSUQpOwogfQogI2VuZGlmCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW4gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi UGFnZVByb3h5Lm1lc3NhZ2VzLmluCmluZGV4IDdmYTgxYmUuLjQ5OTQ1MGQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW4KKysrIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbgpAQCAtMTA0 LDcgKzEwNCw3IEBAIG1lc3NhZ2VzIC0+IFdlYlBhZ2VQcm94eSB7CiAgICAgRGlkUmVjZWl2ZUlu dGVudEZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIFdlYktpdDo6SW50ZW50RGF0YSBpbnRlbnQs IFdlYktpdDo6SW5qZWN0ZWRCdW5kbGVVc2VyTWVzc2FnZUVuY29kZXIgdXNlckRhdGEpCiAjZW5k aWYKICNpZiBFTkFCTEUoV0VCX0lOVEVOVFNfVEFHKQotICAgIFJlZ2lzdGVySW50ZW50U2Vydmlj ZUZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQsIFdlYktpdDo6SW50ZW50U2VydmljZUluZm8gc2Vy dmljZUluZm8sIFdlYktpdDo6SW5qZWN0ZWRCdW5kbGVVc2VyTWVzc2FnZUVuY29kZXIgdXNlckRh dGEpOworICAgIFJlZ2lzdGVySW50ZW50U2VydmljZUZvckZyYW1lKHVpbnQ2NF90IGZyYW1lSUQs IFdlYktpdDo6SW50ZW50U2VydmljZUluZm8gc2VydmljZUluZm8sIFdlYktpdDo6SW5qZWN0ZWRC dW5kbGVVc2VyTWVzc2FnZUVuY29kZXIgdXNlckRhdGEpIC0+ICgpCiAjZW5kaWYKIAogICAgICMg UHJvZ3Jlc3MgbWVzc2FnZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwIGIvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKaW5kZXgg YTNjMGNjMS4uZDk0ZTMxYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKKysrIGIvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKQEAg LTE1ODUsNyArMTU4NSw3IEBAIHZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OnJlZ2lzdGVySW50 ZW50U2VydmljZShjb25zdCBTdHJpbmcmIGFjdGlvbiwgY29uc3QgU3RyCiAgICAgUmVmUHRyPFdl YkludGVudFNlcnZpY2VJbmZvPiB3ZWJJbnRlbnRTZXJ2aWNlSW5mbyA9IFdlYkludGVudFNlcnZp Y2VJbmZvOjpjcmVhdGUoc2VydmljZUluZm8pOwogICAgIHdlYlBhZ2UtPmluamVjdGVkQnVuZGxl TG9hZGVyQ2xpZW50KCkucmVnaXN0ZXJJbnRlbnRTZXJ2aWNlRm9yRnJhbWUod2ViUGFnZSwgbV9m cmFtZSwgd2ViSW50ZW50U2VydmljZUluZm8uZ2V0KCksIHVzZXJEYXRhKTsKIAotICAgIHdlYlBh Z2UtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6UmVnaXN0ZXJJbnRlbnRTZXJ2aWNlRm9y RnJhbWUobV9mcmFtZS0+ZnJhbWVJRCgpLCBzZXJ2aWNlSW5mbywgSW5qZWN0ZWRCdW5kbGVVc2Vy TWVzc2FnZUVuY29kZXIodXNlckRhdGEuZ2V0KCkpKSk7CisgICAgd2ViUGFnZS0+c2VuZFN5bmMo TWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6UmVnaXN0ZXJJbnRlbnRTZXJ2aWNlRm9yRnJhbWUobV9m cmFtZS0+ZnJhbWVJRCgpLCBzZXJ2aWNlSW5mbywgSW5qZWN0ZWRCdW5kbGVVc2VyTWVzc2FnZUVu Y29kZXIodXNlckRhdGEuZ2V0KCkpKSwgTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6UmVnaXN0ZXJJ bnRlbnRTZXJ2aWNlRm9yRnJhbWU6OlJlcGx5KCkpOwogfQogI2VuZGlmCiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluIGIv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4KaW5k ZXggZTNmZjIzYy4uYWViNDg1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4KKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4KQEAgLTIzNCw3ICsyMzQsNyBAQCBtZXNz YWdlcyAtPiBXZWJQYWdlIHsKIAogICAgICMgV2ViIEludGVudHMKICNpZiBFTkFCTEUoV0VCX0lO VEVOVFMpCi0gICAgRGVsaXZlckludGVudFRvRnJhbWUodWludDY0X3QgZnJhbWVJRCwgV2ViS2l0 OjpJbnRlbnREYXRhIGludGVudERhdGEpOworICAgIERlbGl2ZXJJbnRlbnRUb0ZyYW1lKHVpbnQ2 NF90IGZyYW1lSUQsIFdlYktpdDo6SW50ZW50RGF0YSBpbnRlbnREYXRhKSAtPiAoKTsKICNlbmRp ZgogCiAjaWYgUExBVEZPUk0oRUZMKQo=