105928 2013-01-02 10:20:49 -0800 [Qt] Use WebPageProxy::postMessageToInjectedBundle when passing messages to a specific page in the builtin bundle 2013-01-03 15:10:16 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cmarcelo cmarcelo abecsi hausmann menard webkit.review.bot oldest_to_newest 798711 0 cmarcelo 2013-01-02 10:20:49 -0800 [Qt] Use WebPageProxy::postMessageToInjectedBundle when passing messages to a specific page in the builtin bundle 798737 1 181036 cmarcelo 2013-01-02 11:01:30 -0800 Created attachment 181036 Patch 799509 2 cmarcelo 2013-01-03 11:25:58 -0800 Committed r138723: <http://trac.webkit.org/changeset/138723> 799719 3 181036 ossy 2013-01-03 15:06:21 -0800 Comment on attachment 181036 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=181036&action=review It broke the debug build and I fixed it - https://trac.webkit.org/changeset/138749 ( Please check the debug build next time if you modify an assertion. ) > Source/WebKit2/WebProcess/qt/QtBuiltinBundle.cpp:101 > + ASSERT(WKGetTypeID(messageBody) == WKStringGetTypeID()); > + WKStringRef contents = static_cast<WKStringRef>(messageBody); /home/webkitbuildbot/slaves/debug64bit/buildslave/qt-linux-64-debug/build/Source/WebKit2/WebProcess/qt/QtBuiltinBundle.cpp: In member function 'void WebKit::QtBuiltinBundle::handleMessageToNavigatorQtObject(const OpaqueWKBundlePage*, const void*)': /home/webkitbuildbot/slaves/debug64bit/buildslave/qt-linux-64-debug/build/Source/WebKit2/WebProcess/qt/QtBuiltinBundle.cpp:100: error: 'WKGetTypeID' was not declared in this scope > Source/WebKit2/WebProcess/qt/QtBuiltinBundle.cpp:113 > + ASSERT(WKGetTypeID(messageBody) == WKBooleanGetTypeID()); > + WKBooleanRef enabled = static_cast<WKBooleanRef>(messageBody); /home/webkitbuildbot/slaves/debug64bit/buildslave/qt-linux-64-debug/build/Source/WebKit2/WebProcess/qt/QtBuiltinBundle.cpp: In member function 'void WebKit::QtBuiltinBundle::handleSetNavigatorQtObjectEnabled(const OpaqueWKBundlePage*, const void*)': /home/webkitbuildbot/slaves/debug64bit/buildslave/qt-linux-64-debug/build/Source/WebKit2/WebProcess/qt/QtBuiltinBundle.cpp:112: error: 'WKGetTypeID' was not declared in this scope 799722 4 cmarcelo 2013-01-03 15:10:16 -0800 (In reply to comment #3) > (From update of attachment 181036 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=181036&action=review > > It broke the debug build and I fixed it - https://trac.webkit.org/changeset/138749 > ( Please check the debug build next time if you modify an assertion. ) Thanks, Ossy. Sorry for the noise. 181036 2013-01-02 11:01:30 -0800 2013-01-03 15:06:21 -0800 Patch bug-105928-20130102155837.patch text/plain 12395 cmarcelo U3VidmVyc2lvbiBSZXZpc2lvbjogMTM4NjIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNmUyN2ZkNzRmNDk5NzI0 NDI3OGJkYzgxYmVhNmJmNDYxMjUxYjc5OC4uYzczYTMwYjRhNTExZTYzZWE3ZjEwMzE0MGFjYzRj OTJhN2Q5YWVmNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDEzLTAxLTAyICBDYWlv IE1hcmNlbG8gZGUgT2xpdmVpcmEgRmlsaG8gIDxjYWlvLm9saXZlaXJhQG9wZW5ib3NzYS5vcmc+ CisKKyAgICAgICAgW1F0XSBVc2UgV2ViUGFnZVByb3h5Ojpwb3N0TWVzc2FnZVRvSW5qZWN0ZWRC dW5kbGUgd2hlbiBwYXNzaW5nIG1lc3NhZ2VzIHRvIGEgc3BlY2lmaWMgcGFnZSBpbiB0aGUgYnVp bHRpbiBidW5kbGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEwNTkyOAorCisgICAgICAgIFNpbXBsaWZ5IHRoZSBjb2RlIHNpbmNlIHdlIG5vdyBjYW4g c2VuZCB0aGUgY29udGVudHMgYXMgaXMsIGluc3RlYWQgb2YgcGFja2FnaW5nIGl0IGluc2lkZQor ICAgICAgICBhbiBhcnJheSB0aGF0IGFsc28gY29udGFpbmVkIHRoZSByZWZlcmVuY2UgZm9yIHRo ZSBwYWdlLiBUaGlzIHdhcyBtYWRlIHBvc3NpYmxlIGFmdGVyCisgICAgICAgIHIxMjYzMTEuCisK KyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXcuY3BwOgorICAgICAgICAo UVF1aWNrV2ViVmlld1ByaXZhdGU6OnNldE5hdmlnYXRvclF0T2JqZWN0RW5hYmxlZCk6CisgICAg ICAgIChRUXVpY2tXZWJWaWV3RXhwZXJpbWVudGFsOjpwb3N0TWVzc2FnZSk6CisgICAgICAgIEJ1 aWx0IHRoZSBtZXNzYWdlcyBhbmQgdXNlZCBXZWJQYWdlUHJveHk6OnBvc3RNZXNzYWdlVG9Jbmpl Y3RlZEJ1bmRsZSgpIGRpcmVjdGx5LgorCisgICAgICAgICogVUlQcm9jZXNzL3F0L1F0V2ViQ29u dGV4dC5jcHA6IFJlbW92ZWQgZnVuY3Rpb25zIHRoYXQgbm93IGFyZSBzaW1wbGVyIGFuZCB3ZXJl IGlubGluZWQgaW4KKyAgICAgICAgcXF1aWNrd2Vidmlldy5jcHAuCisgICAgICAgICogVUlQcm9j ZXNzL3F0L1F0V2ViQ29udGV4dC5oOiBEaXR0by4KKyAgICAgICAgKiBXZWJQcm9jZXNzL3F0L1F0 QnVpbHRpbkJ1bmRsZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OlF0QnVpbHRpbkJ1bmRsZTo6aW5p dGlhbGl6ZSk6IFVzZWQgdGhlIGNhbGxiYWNrIHRoYXQgZ2V0cyBtZXNzYWdlcyBmb3Igc3BlY2lm aWMKKyAgICAgICAgcGFnZXMuIEFsc28gY2hhbmdlZCB0aGUgd2F5IHdlIGNyZWF0ZSB0aGUgYnVu ZGxlIGNsaWVudDogbm93IHdlIGZpbGwgdGhlIHN0cnVjdCB3aXRoIHplcm9zLAorICAgICAgICBh bmQgdGhlbiBzZXQgdGhlIGZpZWxkcyB3ZSBjYXJlIGFib3V0LiBUaGlzIHdheSBpZiBhbm90aGVy IGZpZWxkIGlzIGFkZGVkIHRvIHRoYXQgY2xpZW50LAorICAgICAgICB0aGlzIGNvZGUgZG9lc24n dCBuZWVkIHRvIGJlIGNoYW5nZWQuCisgICAgICAgIChXZWJLaXQ6OlF0QnVpbHRpbkJ1bmRsZTo6 ZGlkUmVjZWl2ZU1lc3NhZ2VUb1BhZ2UpOgorICAgICAgICAoV2ViS2l0OjpRdEJ1aWx0aW5CdW5k bGU6OmhhbmRsZU1lc3NhZ2VUb05hdmlnYXRvclF0T2JqZWN0KTogQ2hhbmdlZCB0byBub3QgcmVh ZCB0aGUgcGFnZQorICAgICAgICByZWZlcmVuY2UgZnJvbSB0aGUgbWVzc2FnZSwgc2luY2Ugd2Ug Z2V0IGl0IGluIHRoZSBjYWxsYmFjayBhbHJlYWR5LgorICAgICAgICAoV2ViS2l0OjpRdEJ1aWx0 aW5CdW5kbGU6OmhhbmRsZVNldE5hdmlnYXRvclF0T2JqZWN0RW5hYmxlZCk6IERpdHRvLgorICAg ICAgICAqIFdlYlByb2Nlc3MvcXQvUXRCdWlsdGluQnVuZGxlLmg6CisgICAgICAgIChRdEJ1aWx0 aW5CdW5kbGUpOgorCiAyMDEzLTAxLTAyICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFA aWdhbGlhLmNvbT4KIAogICAgICAgICBbV0syXSBSZW5hbWUgU2V0RnJhbWVJblZpZXdTb3VyY2VN b2RlIHRvIFNldE1haW5GcmFtZUluVmlld1NvdXJjZU1vZGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXcuY3BwCmluZGV4IDI1MDJhODFmNjUyODRm N2JjODAxZWM1OGJlYWFjZDI5NzI5YTczZTAuLjIwNTMwNzliMGI0MmVjZWI4MTgyYmQwYThlNjY3 MjhjNTk5MTllMzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQv cXF1aWNrd2Vidmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9x cXVpY2t3ZWJ2aWV3LmNwcApAQCAtNzI3LDcgKzcyNywxMCBAQCB2b2lkIFFRdWlja1dlYlZpZXdQ cml2YXRlOjpzZXROYXZpZ2F0b3JRdE9iamVjdEVuYWJsZWQoYm9vbCBlbmFibGVkKQogICAgIEFT U0VSVChlbmFibGVkICE9IG1fbmF2aWdhdG9yUXRPYmplY3RFbmFibGVkKTsKICAgICAvLyBGSVhN RTogQ3VycmVudGx5IHdlIGhhdmUgdG8ga2VlcCB0aGlzIGluZm9ybWF0aW9uIGluIGJvdGggcHJv Y2Vzc2VzIGFuZCB0aGUgc2V0dGluZyBpcyBhc3luY2hyb25vdXMuCiAgICAgbV9uYXZpZ2F0b3JR dE9iamVjdEVuYWJsZWQgPSBlbmFibGVkOwotICAgIGNvbnRleHQtPnNldE5hdmlnYXRvclF0T2Jq ZWN0RW5hYmxlZCh3ZWJQYWdlUHJveHkuZ2V0KCksIGVuYWJsZWQpOworCisgICAgc3RhdGljIFN0 cmluZyBtZXNzYWdlTmFtZSgiU2V0TmF2aWdhdG9yUXRPYmplY3RFbmFibGVkIik7CisgICAgUmVm UHRyPFdlYkJvb2xlYW4+IHdlYkVuYWJsZWQgPSBXZWJCb29sZWFuOjpjcmVhdGUoZW5hYmxlZCk7 CisgICAgd2ViUGFnZVByb3h5LT5wb3N0TWVzc2FnZVRvSW5qZWN0ZWRCdW5kbGUobWVzc2FnZU5h bWUsIHdlYkVuYWJsZWQuZ2V0KCkpOwogfQogCiBzdGF0aWMgUVN0cmluZyByZWFkVXNlclNjcmlw dChjb25zdCBRVXJsJiB1cmwpCkBAIC0xMDA0LDcgKzEwMDcsOSBAQCBib29sIFFRdWlja1dlYlZp ZXdFeHBlcmltZW50YWw6OmZsaWNrYWJsZVZpZXdwb3J0RW5hYmxlZCgpCiB2b2lkIFFRdWlja1dl YlZpZXdFeHBlcmltZW50YWw6OnBvc3RNZXNzYWdlKGNvbnN0IFFTdHJpbmcmIG1lc3NhZ2UpCiB7 CiAgICAgUV9EKFFRdWlja1dlYlZpZXcpOwotICAgIGQtPmNvbnRleHQtPnBvc3RNZXNzYWdlVG9O YXZpZ2F0b3JRdE9iamVjdChkLT53ZWJQYWdlUHJveHkuZ2V0KCksIG1lc3NhZ2UpOworICAgIHN0 YXRpYyBTdHJpbmcgbWVzc2FnZU5hbWUoIk1lc3NhZ2VUb05hdmlnYXRvclF0T2JqZWN0Iik7Cisg ICAgUmVmUHRyPFdlYlN0cmluZz4gY29udGVudHMgPSBXZWJTdHJpbmc6OmNyZWF0ZShTdHJpbmco bWVzc2FnZSkpOworICAgIGQtPndlYlBhZ2VQcm94eS0+cG9zdE1lc3NhZ2VUb0luamVjdGVkQnVu ZGxlKG1lc3NhZ2VOYW1lLCBjb250ZW50cy5nZXQoKSk7CiB9CiAKIFFRbWxDb21wb25lbnQqIFFR dWlja1dlYlZpZXdFeHBlcmltZW50YWw6OmFsZXJ0RGlhbG9nKCkgY29uc3QKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYkNvbnRleHQuY3BwIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViQ29udGV4dC5jcHAKaW5kZXggN2ViM2I3MTk2OGJlYWI1 N2FiZWZlMmFkN2M4MzlhOGJmYjQ3NWQ4My4uZmFhY2E5MWIyZmU4NmFhNTMzY2NhZjI2Y2JjMDVj ODYxYzk1ZGQyMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2Vi Q29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViQ29udGV4 dC5jcHAKQEAgLTIxLDcgKzIxLDYgQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJR dFdlYkNvbnRleHQuaCIKIAotI2luY2x1ZGUgIk11dGFibGVBcnJheS5oIgogI2luY2x1ZGUgIlF0 RG93bmxvYWRNYW5hZ2VyLmgiCiAjaW5jbHVkZSAiUXRXZWJJY29uRGF0YWJhc2VDbGllbnQuaCIK ICNpbmNsdWRlICJXS0FQSUNhc3QuaCIKQEAgLTE2OSwyNiArMTY4LDYgQEAgUGFzc1JlZlB0cjxX ZWJQYWdlUHJveHk+IFF0V2ViQ29udGV4dDo6Y3JlYXRlV2ViUGFnZShQYWdlQ2xpZW50KiBjbGll bnQsIFdlYlBhZ2UKICAgICByZXR1cm4gbV9jb250ZXh0LT5jcmVhdGVXZWJQYWdlKGNsaWVudCwg cGFnZUdyb3VwKTsKIH0KIAotdm9pZCBRdFdlYkNvbnRleHQ6OnNldE5hdmlnYXRvclF0T2JqZWN0 RW5hYmxlZChXZWJQYWdlUHJveHkqIHdlYlBhZ2VQcm94eSwgYm9vbCBlbmFibGVkKQotewotICAg IHN0YXRpYyBTdHJpbmcgbWVzc2FnZU5hbWUoIlNldE5hdmlnYXRvclF0T2JqZWN0RW5hYmxlZCIp OwotICAgIFJlZlB0cjxNdXRhYmxlQXJyYXk+IGJvZHkgPSBNdXRhYmxlQXJyYXk6OmNyZWF0ZSgp OwotICAgIGJvZHktPmFwcGVuZCh3ZWJQYWdlUHJveHkpOwotICAgIFJlZlB0cjxXZWJCb29sZWFu PiB3ZWJFbmFibGVkID0gV2ViQm9vbGVhbjo6Y3JlYXRlKGVuYWJsZWQpOwotICAgIGJvZHktPmFw cGVuZCh3ZWJFbmFibGVkLmdldCgpKTsKLSAgICBtX2NvbnRleHQtPnBvc3RNZXNzYWdlVG9Jbmpl Y3RlZEJ1bmRsZShtZXNzYWdlTmFtZSwgYm9keS5nZXQoKSk7Ci19Ci0KLXZvaWQgUXRXZWJDb250 ZXh0Ojpwb3N0TWVzc2FnZVRvTmF2aWdhdG9yUXRPYmplY3QoV2ViUGFnZVByb3h5KiB3ZWJQYWdl UHJveHksIGNvbnN0IFFTdHJpbmcmIG1lc3NhZ2UpCi17Ci0gICAgc3RhdGljIFN0cmluZyBtZXNz YWdlTmFtZSgiTWVzc2FnZVRvTmF2aWdhdG9yUXRPYmplY3QiKTsKLSAgICBSZWZQdHI8TXV0YWJs ZUFycmF5PiBib2R5ID0gTXV0YWJsZUFycmF5OjpjcmVhdGUoKTsKLSAgICBib2R5LT5hcHBlbmQo d2ViUGFnZVByb3h5KTsKLSAgICBSZWZQdHI8V2ViU3RyaW5nPiBjb250ZW50cyA9IFdlYlN0cmlu Zzo6Y3JlYXRlKFN0cmluZyhtZXNzYWdlKSk7Ci0gICAgYm9keS0+YXBwZW5kKGNvbnRlbnRzLmdl dCgpKTsKLSAgICBtX2NvbnRleHQtPnBvc3RNZXNzYWdlVG9JbmplY3RlZEJ1bmRsZShtZXNzYWdl TmFtZSwgYm9keS5nZXQoKSk7Ci19Ci0KIFF0RG93bmxvYWRNYW5hZ2VyKiBRdFdlYkNvbnRleHQ6 OmRvd25sb2FkTWFuYWdlcigpCiB7CiAgICAgQVNTRVJUKHNfZG93bmxvYWRNYW5hZ2VyKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYkNvbnRleHQuaCBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYkNvbnRleHQuaAppbmRleCAyZmEzOWY4YzBh YTYzNmEyYjg5NzJmN2JhZTJiODdiY2UyNzZjNmFmLi5iZDNjY2E3M2Q1NjkwODY5NzYyMTlkNTQz OGEwNWFlMjAyNDI3NTAxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQv UXRXZWJDb250ZXh0LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViQ29u dGV4dC5oCkBAIC0yOCwxMCArMjgsNiBAQAogI2luY2x1ZGUgPHd0Zi9SZWZDb3VudGVkLmg+CiAj aW5jbHVkZSA8d3RmL1JlZlB0ci5oPgogCi1RVF9CRUdJTl9OQU1FU1BBQ0UKLWNsYXNzIFFTdHJp bmc7Ci1RVF9FTkRfTkFNRVNQQUNFCi0KIG5hbWVzcGFjZSBXZWJLaXQgewogCiBjbGFzcyBQYWdl Q2xpZW50OwpAQCAtNTIsOSArNDgsNiBAQCBwdWJsaWM6CiAKICAgICBXZWJDb250ZXh0KiBjb250 ZXh0KCkgeyByZXR1cm4gbV9jb250ZXh0LmdldCgpOyB9CiAKLSAgICB2b2lkIHNldE5hdmlnYXRv clF0T2JqZWN0RW5hYmxlZChXZWJQYWdlUHJveHkqLCBib29sKTsKLSAgICB2b2lkIHBvc3RNZXNz YWdlVG9OYXZpZ2F0b3JRdE9iamVjdChXZWJQYWdlUHJveHkqLCBjb25zdCBRU3RyaW5nJik7Ci0K ICAgICBzdGF0aWMgUXREb3dubG9hZE1hbmFnZXIqIGRvd25sb2FkTWFuYWdlcigpOwogICAgIHN0 YXRpYyBRdFdlYkljb25EYXRhYmFzZUNsaWVudCogaWNvbkRhdGFiYXNlKCk7CiAgICAgc3RhdGlj IHZvaWQgaW52YWxpZGF0ZUNvbnRleHQoV2ViQ29udGV4dCopOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9xdC9RdEJ1aWx0aW5CdW5kbGUuY3BwIGIvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9xdC9RdEJ1aWx0aW5CdW5kbGUuY3BwCmluZGV4IDg4NDdjOGI5OTcwZmE0 OTIyMGVmNmNmOWRiYTM3YTg2ZTEzODQ5ZDkuLmE2NzFiYjUxYjczODZlNzhjMjY3ZWE2Y2RkMzdi MWJiYzI2MDcwMzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvcXQvUXRC dWlsdGluQnVuZGxlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL3F0L1F0QnVp bHRpbkJ1bmRsZS5jcHAKQEAgLTI4LDEwICsyOCw4IEBACiAjaW5jbHVkZSAiUXRCdWlsdGluQnVu ZGxlLmgiCiAKICNpbmNsdWRlICJRdEJ1aWx0aW5CdW5kbGVQYWdlLmgiCi0jaW5jbHVkZSAiV0tB cnJheS5oIgogI2luY2x1ZGUgIldLQnVuZGxlUGFnZS5oIgogI2luY2x1ZGUgIldLTnVtYmVyLmgi Ci0jaW5jbHVkZSAiV0tSZXRhaW5QdHIuaCIKICNpbmNsdWRlICJXS1N0cmluZy5oIgogI2luY2x1 ZGUgIldLU3RyaW5nUXQuaCIKICNpbmNsdWRlIDx3dGYvUGFzc093blB0ci5oPgpAQCAtNTIsMTUg KzUwLDE0IEBAIFF0QnVpbHRpbkJ1bmRsZSYgUXRCdWlsdGluQnVuZGxlOjpzaGFyZWQoKQogdm9p ZCBRdEJ1aWx0aW5CdW5kbGU6OmluaXRpYWxpemUoV0tCdW5kbGVSZWYgYnVuZGxlKQogewogICAg IG1fYnVuZGxlID0gYnVuZGxlOwotICAgIFdLQnVuZGxlQ2xpZW50IGNsaWVudCA9IHsKLSAgICAg ICAga1dLQnVuZGxlQ2xpZW50Q3VycmVudFZlcnNpb24sCi0gICAgICAgIHRoaXMsCi0gICAgICAg IGRpZENyZWF0ZVBhZ2UsCi0gICAgICAgIHdpbGxEZXN0cm95UGFnZSwKLSAgICAgICAgMCwgLy8g ZGlkSW5pdGlhbGl6ZVBhZ2VHcm91cAotICAgICAgICBkaWRSZWNlaXZlTWVzc2FnZSwKLSAgICAg ICAgMCAvLyBkaWRSZWNlaXZlTWVzc2FnZVRvUGFnZQotICAgIH07CisKKyAgICBXS0J1bmRsZUNs aWVudCBjbGllbnQ7CisgICAgbWVtc2V0KCZjbGllbnQsIDAsIHNpemVvZihXS0J1bmRsZUNsaWVu dCkpOworICAgIGNsaWVudC52ZXJzaW9uID0ga1dLQnVuZGxlQ2xpZW50Q3VycmVudFZlcnNpb247 CisgICAgY2xpZW50LmNsaWVudEluZm8gPSB0aGlzOworICAgIGNsaWVudC5kaWRDcmVhdGVQYWdl ID0gUXRCdWlsdGluQnVuZGxlOjpkaWRDcmVhdGVQYWdlOworICAgIGNsaWVudC53aWxsRGVzdHJv eVBhZ2UgPSBRdEJ1aWx0aW5CdW5kbGU6OndpbGxEZXN0cm95UGFnZTsKKyAgICBjbGllbnQuZGlk UmVjZWl2ZU1lc3NhZ2VUb1BhZ2UgPSBRdEJ1aWx0aW5CdW5kbGU6OmRpZFJlY2VpdmVNZXNzYWdl VG9QYWdlOwogICAgIFdLQnVuZGxlU2V0Q2xpZW50KG1fYnVuZGxlLCAmY2xpZW50KTsKIH0KIApA QCAtNzQsOSArNzEsOSBAQCB2b2lkIFF0QnVpbHRpbkJ1bmRsZTo6d2lsbERlc3Ryb3lQYWdlKFdL QnVuZGxlUmVmLCBXS0J1bmRsZVBhZ2VSZWYgcGFnZSwgY29uc3QgdgogICAgIHN0YXRpY19jYXN0 PFF0QnVpbHRpbkJ1bmRsZSo+KGNvbnN0X2Nhc3Q8dm9pZCo+KGNsaWVudEluZm8pKS0+d2lsbERl c3Ryb3lQYWdlKHBhZ2UpOwogfQogCi12b2lkIFF0QnVpbHRpbkJ1bmRsZTo6ZGlkUmVjZWl2ZU1l c3NhZ2UoV0tCdW5kbGVSZWYgYnVuZGxlLCBXS1N0cmluZ1JlZiBtZXNzYWdlTmFtZSwgV0tUeXBl UmVmIG1lc3NhZ2VCb2R5LCBjb25zdCB2b2lkICpjbGllbnRJbmZvKQordm9pZCBRdEJ1aWx0aW5C dW5kbGU6OmRpZFJlY2VpdmVNZXNzYWdlVG9QYWdlKFdLQnVuZGxlUmVmLCBXS0J1bmRsZVBhZ2VS ZWYgcGFnZSwgV0tTdHJpbmdSZWYgbWVzc2FnZU5hbWUsIFdLVHlwZVJlZiBtZXNzYWdlQm9keSwg Y29uc3Qgdm9pZCogY2xpZW50SW5mbykKIHsKLSAgICBzdGF0aWNfY2FzdDxRdEJ1aWx0aW5CdW5k bGUqPihjb25zdF9jYXN0PHZvaWQqPihjbGllbnRJbmZvKSktPmRpZFJlY2VpdmVNZXNzYWdlKG1l c3NhZ2VOYW1lLCBtZXNzYWdlQm9keSk7CisgICAgc3RhdGljX2Nhc3Q8UXRCdWlsdGluQnVuZGxl Kj4oY29uc3RfY2FzdDx2b2lkKj4oY2xpZW50SW5mbykpLT5kaWRSZWNlaXZlTWVzc2FnZVRvUGFn ZShwYWdlLCBtZXNzYWdlTmFtZSwgbWVzc2FnZUJvZHkpOwogfQogCiB2b2lkIFF0QnVpbHRpbkJ1 bmRsZTo6ZGlkQ3JlYXRlUGFnZShXS0J1bmRsZVBhZ2VSZWYgcGFnZSkKQEAgLTg5LDI2ICs4Niwx OSBAQCB2b2lkIFF0QnVpbHRpbkJ1bmRsZTo6d2lsbERlc3Ryb3lQYWdlKFdLQnVuZGxlUGFnZVJl ZiBwYWdlKQogICAgIG1fcGFnZXMucmVtb3ZlKHBhZ2UpOwogfQogCi12b2lkIFF0QnVpbHRpbkJ1 bmRsZTo6ZGlkUmVjZWl2ZU1lc3NhZ2UoV0tTdHJpbmdSZWYgbWVzc2FnZU5hbWUsIFdLVHlwZVJl ZiBtZXNzYWdlQm9keSkKK3ZvaWQgUXRCdWlsdGluQnVuZGxlOjpkaWRSZWNlaXZlTWVzc2FnZVRv UGFnZShXS0J1bmRsZVBhZ2VSZWYgcGFnZSwgV0tTdHJpbmdSZWYgbWVzc2FnZU5hbWUsIFdLVHlw ZVJlZiBtZXNzYWdlQm9keSkKIHsKICAgICBpZiAoV0tTdHJpbmdJc0VxdWFsVG9VVEY4Q1N0cmlu ZyhtZXNzYWdlTmFtZSwgIk1lc3NhZ2VUb05hdmlnYXRvclF0T2JqZWN0IikpCi0gICAgICAgIGhh bmRsZU1lc3NhZ2VUb05hdmlnYXRvclF0T2JqZWN0KG1lc3NhZ2VCb2R5KTsKKyAgICAgICAgaGFu ZGxlTWVzc2FnZVRvTmF2aWdhdG9yUXRPYmplY3QocGFnZSwgbWVzc2FnZUJvZHkpOwogICAgIGVs c2UgaWYgKFdLU3RyaW5nSXNFcXVhbFRvVVRGOENTdHJpbmcobWVzc2FnZU5hbWUsICJTZXROYXZp Z2F0b3JRdE9iamVjdEVuYWJsZWQiKSkKLSAgICAgICAgaGFuZGxlU2V0TmF2aWdhdG9yUXRPYmpl Y3RFbmFibGVkKG1lc3NhZ2VCb2R5KTsKKyAgICAgICAgaGFuZGxlU2V0TmF2aWdhdG9yUXRPYmpl Y3RFbmFibGVkKHBhZ2UsIG1lc3NhZ2VCb2R5KTsKIH0KIAotdm9pZCBRdEJ1aWx0aW5CdW5kbGU6 OmhhbmRsZU1lc3NhZ2VUb05hdmlnYXRvclF0T2JqZWN0KFdLVHlwZVJlZiBtZXNzYWdlQm9keSkK K3ZvaWQgUXRCdWlsdGluQnVuZGxlOjpoYW5kbGVNZXNzYWdlVG9OYXZpZ2F0b3JRdE9iamVjdChX S0J1bmRsZVBhZ2VSZWYgcGFnZSwgV0tUeXBlUmVmIG1lc3NhZ2VCb2R5KQogewogICAgIEFTU0VS VChtZXNzYWdlQm9keSk7Ci0gICAgQVNTRVJUKFdLR2V0VHlwZUlEKG1lc3NhZ2VCb2R5KSA9PSBX S0FycmF5R2V0VHlwZUlEKCkpOwotCi0gICAgV0tBcnJheVJlZiBib2R5ID0gc3RhdGljX2Nhc3Q8 V0tBcnJheVJlZj4obWVzc2FnZUJvZHkpOwotICAgIEFTU0VSVChXS0FycmF5R2V0U2l6ZShib2R5 KSA9PSAyKTsKLSAgICBBU1NFUlQoV0tHZXRUeXBlSUQoV0tBcnJheUdldEl0ZW1BdEluZGV4KGJv ZHksIDApKSA9PSBXS0J1bmRsZVBhZ2VHZXRUeXBlSUQoKSk7Ci0gICAgQVNTRVJUKFdLR2V0VHlw ZUlEKFdLQXJyYXlHZXRJdGVtQXRJbmRleChib2R5LCAxKSkgPT0gV0tTdHJpbmdHZXRUeXBlSUQo KSk7Ci0KLSAgICBXS0J1bmRsZVBhZ2VSZWYgcGFnZSA9IHN0YXRpY19jYXN0PFdLQnVuZGxlUGFn ZVJlZj4oV0tBcnJheUdldEl0ZW1BdEluZGV4KGJvZHksIDApKTsKLSAgICBXS1N0cmluZ1JlZiBj b250ZW50cyA9IHN0YXRpY19jYXN0PFdLU3RyaW5nUmVmPihXS0FycmF5R2V0SXRlbUF0SW5kZXgo Ym9keSwgMSkpOworICAgIEFTU0VSVChXS0dldFR5cGVJRChtZXNzYWdlQm9keSkgPT0gV0tTdHJp bmdHZXRUeXBlSUQoKSk7CisgICAgV0tTdHJpbmdSZWYgY29udGVudHMgPSBzdGF0aWNfY2FzdDxX S1N0cmluZ1JlZj4obWVzc2FnZUJvZHkpOwogCiAgICAgUXRCdWlsdGluQnVuZGxlUGFnZSogYnVu ZGxlUGFnZSA9IG1fcGFnZXMuZ2V0KHBhZ2UpOwogICAgIGlmICghYnVuZGxlUGFnZSkKQEAgLTEx NiwxOCArMTA2LDExIEBAIHZvaWQgUXRCdWlsdGluQnVuZGxlOjpoYW5kbGVNZXNzYWdlVG9OYXZp Z2F0b3JRdE9iamVjdChXS1R5cGVSZWYgbWVzc2FnZUJvZHkpCiAgICAgYnVuZGxlUGFnZS0+ZGlk UmVjZWl2ZU1lc3NhZ2VUb05hdmlnYXRvclF0T2JqZWN0KGNvbnRlbnRzKTsKIH0KIAotdm9pZCBR dEJ1aWx0aW5CdW5kbGU6OmhhbmRsZVNldE5hdmlnYXRvclF0T2JqZWN0RW5hYmxlZChXS1R5cGVS ZWYgbWVzc2FnZUJvZHkpCit2b2lkIFF0QnVpbHRpbkJ1bmRsZTo6aGFuZGxlU2V0TmF2aWdhdG9y UXRPYmplY3RFbmFibGVkKFdLQnVuZGxlUGFnZVJlZiBwYWdlLCBXS1R5cGVSZWYgbWVzc2FnZUJv ZHkpCiB7CiAgICAgQVNTRVJUKG1lc3NhZ2VCb2R5KTsKLSAgICBBU1NFUlQoV0tHZXRUeXBlSUQo bWVzc2FnZUJvZHkpID09IFdLQXJyYXlHZXRUeXBlSUQoKSk7Ci0KLSAgICBXS0FycmF5UmVmIGJv ZHkgPSBzdGF0aWNfY2FzdDxXS0FycmF5UmVmPihtZXNzYWdlQm9keSk7Ci0gICAgQVNTRVJUKFdL QXJyYXlHZXRTaXplKGJvZHkpID09IDIpOwotICAgIEFTU0VSVChXS0dldFR5cGVJRChXS0FycmF5 R2V0SXRlbUF0SW5kZXgoYm9keSwgMCkpID09IFdLQnVuZGxlUGFnZUdldFR5cGVJRCgpKTsKLSAg ICBBU1NFUlQoV0tHZXRUeXBlSUQoV0tBcnJheUdldEl0ZW1BdEluZGV4KGJvZHksIDEpKSA9PSBX S0Jvb2xlYW5HZXRUeXBlSUQoKSk7Ci0KLSAgICBXS0J1bmRsZVBhZ2VSZWYgcGFnZSA9IHN0YXRp Y19jYXN0PFdLQnVuZGxlUGFnZVJlZj4oV0tBcnJheUdldEl0ZW1BdEluZGV4KGJvZHksIDApKTsK LSAgICBXS0Jvb2xlYW5SZWYgZW5hYmxlZCA9IHN0YXRpY19jYXN0PFdLQm9vbGVhblJlZj4oV0tB cnJheUdldEl0ZW1BdEluZGV4KGJvZHksIDEpKTsKKyAgICBBU1NFUlQoV0tHZXRUeXBlSUQobWVz c2FnZUJvZHkpID09IFdLQm9vbGVhbkdldFR5cGVJRCgpKTsKKyAgICBXS0Jvb2xlYW5SZWYgZW5h YmxlZCA9IHN0YXRpY19jYXN0PFdLQm9vbGVhblJlZj4obWVzc2FnZUJvZHkpOwogCiAgICAgUXRC dWlsdGluQnVuZGxlUGFnZSogYnVuZGxlUGFnZSA9IG1fcGFnZXMuZ2V0KHBhZ2UpOwogICAgIGlm ICghYnVuZGxlUGFnZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvcXQv UXRCdWlsdGluQnVuZGxlLmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL3F0L1F0QnVpbHRp bkJ1bmRsZS5oCmluZGV4IDQ5OGZlYzdjMjI2NjJjYzRjNWUwMTdiYTBiMzM3NjZiZTczZGRkYjYu LjJhNmE0MTRmM2E1Yzg5YzhjMWRjZWY2MTM0OTc4MDA4NTA2NDMzMzcgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvcXQvUXRCdWlsdGluQnVuZGxlLmgKKysrIGIvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9xdC9RdEJ1aWx0aW5CdW5kbGUuaApAQCAtNDgsMTUgKzQ4LDE1 IEBAIHB1YmxpYzoKICAgICAvLyBCdW5kbGUgQ2xpZW50LgogICAgIHN0YXRpYyB2b2lkIGRpZENy ZWF0ZVBhZ2UoV0tCdW5kbGVSZWYsIFdLQnVuZGxlUGFnZVJlZiwgY29uc3Qgdm9pZCopOwogICAg IHN0YXRpYyB2b2lkIHdpbGxEZXN0cm95UGFnZShXS0J1bmRsZVJlZiwgV0tCdW5kbGVQYWdlUmVm LCBjb25zdCB2b2lkKik7Ci0gICAgc3RhdGljIHZvaWQgZGlkUmVjZWl2ZU1lc3NhZ2UoV0tCdW5k bGVSZWYsIFdLU3RyaW5nUmVmIG1lc3NhZ2VOYW1lLCBXS1R5cGVSZWYgbWVzc2FnZUJvZHksIGNv bnN0IHZvaWQqKTsKKyAgICBzdGF0aWMgdm9pZCBkaWRSZWNlaXZlTWVzc2FnZVRvUGFnZShXS0J1 bmRsZVJlZiwgV0tCdW5kbGVQYWdlUmVmLCBXS1N0cmluZ1JlZiBtZXNzYWdlTmFtZSwgV0tUeXBl UmVmIG1lc3NhZ2VCb2R5LCBjb25zdCB2b2lkKik7CiAKICAgICB2b2lkIGRpZENyZWF0ZVBhZ2Uo V0tCdW5kbGVQYWdlUmVmKTsKICAgICB2b2lkIHdpbGxEZXN0cm95UGFnZShXS0J1bmRsZVBhZ2VS ZWYpOwotICAgIHZvaWQgZGlkUmVjZWl2ZU1lc3NhZ2UoV0tTdHJpbmdSZWYgbWVzc2FnZU5hbWUs IFdLVHlwZVJlZiBtZXNzYWdlQm9keSk7CisgICAgdm9pZCBkaWRSZWNlaXZlTWVzc2FnZVRvUGFn ZShXS0J1bmRsZVBhZ2VSZWYsIFdLU3RyaW5nUmVmIG1lc3NhZ2VOYW1lLCBXS1R5cGVSZWYgbWVz c2FnZUJvZHkpOwogCiBwcml2YXRlOgotICAgIHZvaWQgaGFuZGxlTWVzc2FnZVRvTmF2aWdhdG9y UXRPYmplY3QoV0tUeXBlUmVmIG1lc3NhZ2VCb2R5KTsKLSAgICB2b2lkIGhhbmRsZVNldE5hdmln YXRvclF0T2JqZWN0RW5hYmxlZChXS1R5cGVSZWYgbWVzc2FnZUJvZHkpOworICAgIHZvaWQgaGFu ZGxlTWVzc2FnZVRvTmF2aWdhdG9yUXRPYmplY3QoV0tCdW5kbGVQYWdlUmVmLCBXS1R5cGVSZWYg bWVzc2FnZUJvZHkpOworICAgIHZvaWQgaGFuZGxlU2V0TmF2aWdhdG9yUXRPYmplY3RFbmFibGVk KFdLQnVuZGxlUGFnZVJlZiwgV0tUeXBlUmVmIG1lc3NhZ2VCb2R5KTsKIAogICAgIEhhc2hNYXA8 V0tCdW5kbGVQYWdlUmVmLCBPd25QdHI8UXRCdWlsdGluQnVuZGxlUGFnZT4gPiBtX3BhZ2VzOwog ICAgIFdLQnVuZGxlUmVmIG1fYnVuZGxlOwo=