169037 2017-03-01 07:41:00 -0800 [WK2] Missing C API for UserContentExtensionStore prevents instantiating content extensions 2018-12-13 00:12:40 -0800 1 1 1 Unclassified WebKit WebKit2 Other Unspecified All RESOLVED DUPLICATE 167941 P2 Normal --- 154553 169607 1 aperez aperez achristensen beidson bugs-noreply mcatanzaro sam ysuzuki zan oldest_to_newest 1282274 0 aperez 2017-03-01 07:41:00 -0800 The WebKit2 C API does not provide a way to instantiate an UserContentExtensionStore, nor provides any other means of compiling content extensions. Having this would allow using the C API in WKTR to handle tests which make use of content extensions. In turn, this would make it unnecessary to use the Cocoa API in WKTR, and by using the C API it would be trivial for the GTK+ port to unskip the content extensions layout tests. 1282277 1 aperez 2017-03-01 07:50:18 -0800 I have already a WIP patch for this, as a side effect of working on bug #167941 and wanting to unskip the layout tests in the GTK+ port. Once I figure out a couple of rough edges and can run the tests I will upload the patch. The API bits being added would be: // Source/WebKit2/UIProcess/API/C/WKUserContentExtensionStoreRef.h WK_EXPORT WKUserContentExtensionStoreRef WKUserContentExtensionStoreCreate(WKStringRef path); enum { kWKUserContentExtensionStoreSuccess = 0, kWKUserContentExtensionStoreLookupFailed, kWKUserContentExtensionStoreVersionMismatch, kWKUserContentExtensionStoreCompileFailed, kWKUserContentExtensionStoreRemoveFailed, }; typedef uint32_t WKUserContentExtensionStoreResult; typedef void (*WKUserContentExtensionStoreFilterFunction)(WKUserContentExtensionStoreRef, WKUserContentFilterRef, WKUserContentExtensionStoreResult, void*); void WKUserContentExtensionStoreCompileFilter(WKUserContentExtensionStoreRef, WKStringRef identifier, WKStringRef jsonSource, void* context, WKUserContentExtensionStoreFilterFunction callback); void WKUserContentExtensionStoreLookupFilter(WKUserContentExtensionStoreRef, WKStringRef identifier, void* context, WKUserContentExtensionStoreFilterFunction callback); void WKUserContentExtensionStoreRemoveFilter(WKUserContentExtensionStoreRef, WKStringRef identifier, void* context, WKUserContentExtensionStoreFilterFunction callback); The order of parameters follows the underlying API::UserContentExtensionsStore methods, and where a C++ lambda is accepted, a callback function is used instead. As in other functions in the C API which take callbacks, the “context” parameter (a “void*” passed back to the callback) appears in the signature _before_ the “callback” parameter. 1287363 2 aperez 2017-03-13 15:00:19 -0700 Ping. Any comment regarding this? Unless stated otherwise, I'll go ahead and upload a patch adding the proposed API in the next days. 1287457 3 304335 aperez 2017-03-13 19:19:36 -0700 Created attachment 304335 Patch 1287461 4 aperez 2017-03-13 19:29:58 -0700 I have uploaded the patch in its current state to gather some feedback. In particular, I have two questions/doubts: - How would one go about adding unit tests for this? There is no “Tools/TestWebKitAPI/Tests/WebKit2C/*” or similar. - Should the patch include also a function “WKUserContentExtensionStoreGetDefaultUserContentExtensionStore()”? - With this API added, the usage of the Objective-C API in WKTR to test content extensions could be dropped. Should that be included here, or in a follow-up patch/bug? 1287481 5 mcatanzaro 2017-03-13 20:33:47 -0700 (In reply to comment #4) > I have uploaded the patch in its current state to gather some feedback. > In particular, I have two questions/doubts: > > - How would one go about adding unit tests for this? There is no > “Tools/TestWebKitAPI/Tests/WebKit2C/*” or similar. Put them in Tools/TestWebKitAPI/Tests/WebKit2/. > - Should the patch include also a function > “WKUserContentExtensionStoreGetDefaultUserContentExtensionStore()”? Probably. Why not? > - With this API added, the usage of the Objective-C API in WKTR to test > content extensions could be dropped. Should that be included here, or > in a follow-up patch/bug? I think either approach is fine, but my preference is for two different patches. 1287618 6 aperez 2017-03-14 08:19:25 -0700 (In reply to comment #5) > (In reply to comment #4) > > I have uploaded the patch in its current state to gather some feedback. > > In particular, I have two questions/doubts: > > > > - How would one go about adding unit tests for this? There is no > > “Tools/TestWebKitAPI/Tests/WebKit2C/*” or similar. Oh, somehow I didn't check this one directory. Thanks! > Put them in Tools/TestWebKitAPI/Tests/WebKit2/. > > > - Should the patch include also a function > > “WKUserContentExtensionStoreGetDefaultUserContentExtensionStore()”? > > Probably. Why not? The idea so far is that the GTK+ port will require specifying always the path, but given that the C API can be used by other ports, it is probably better to add it as well. > > - With this API added, the usage of the Objective-C API in WKTR to test > > content extensions could be dropped. Should that be included here, or > > in a follow-up patch/bug? > > I think either approach is fine, but my preference is for two different > patches. I also prefer to handle it separately. It is now filed as bug #169607 1287805 7 304335 achristensen 2017-03-14 14:48:01 -0700 Comment on attachment 304335 Patch I assume this is for WebKitTestRunner, right? Could this be adopted in the same patch? Is there an intent to add a gtk-specific C API corresponding to this? 1287835 8 aperez 2017-03-14 15:32:15 -0700 (In reply to comment #7) > Comment on attachment 304335 [details] > Patch > > I assume this is for WebKitTestRunner, right? Yes, I tend to abbreviate WebKitTestRunner == WKTR. O:-) > [...] Could this be adopted in the same patch? Our plan was to do the WebKitTestRunner part as bug #169607, as it seemed easier for review smaller but I do not have a strong opinion for doing two separate patches/bugs. I'll add the WebKitTestRunner changes together with this, hopefully that would ease the process. > Is there an intent to add a gtk-specific C API corresponding to this? Absolutely. That is being tracked as bug #169037. There's a preview patch there with a tentative API. Our plan is to add the C API and put it to use in WebKitTestRunner first; then try using the proposed GTK+ API in Epiphany, see how it feels and improve it if needed, and then land the new GTK+ API. 1287901 9 achristensen 2017-03-14 17:25:17 -0700 I think these changes and WKTR changes should be in the same patch so we can see why we are making the changes and that they actually work. Sometimes with callbacks that need to capture things like lambda captures we use a listener object in the C API. I'm not sure if you'll want to do that here. Right now we probably don't need state, but it would probably be useful to know at least which request to compile a content extension you are responding to. For example, if you initiate the compiling of two different content extensions, then with your proposed API the completion handler wouldn't be able to know which content extension compiling just completed at runtime. 1287918 10 aperez 2017-03-14 18:09:24 -0700 (In reply to comment #9) > I think these changes and WKTR changes should be in the same patch so we can > see why we are making the changes and that they actually work. Let's do it that way, then. > Sometimes with callbacks that need to capture things like lambda captures we > use a listener object in the C API. I'm not sure if you'll want to do that > here. Right now we probably don't need state, but it would probably be > useful to know at least which request to compile a content extension you are > responding to. For example, if you initiate the compiling of two different > content extensions, then with your proposed API the completion handler > wouldn't be able to know which content extension compiling just completed at > runtime. I did briefly considered adding a listener, but it seemed a bit too heavy in this case. As for knowing which request has completed, one could save the identifier string into a “struct” passed as the “context” pointer that gets passed back to the completion callback... But even when that's possible, I have to agree that it is far from having good ergonomics. Probably passing back the identifier string to the completion callback is a very reasonable option, using the following signature for callback the completion callback functions: typedef void (*WKUserContentExtensionStoreFilterFunction)(WKUserContentExtensionStoreRef, WKStringRef identifier, WKUserContentFilterRef, WKUserContentExtensionStoreResult, void*); The “identifier” argument passed to callbacks would always be non-NULL. How does this sound? 1287922 11 aperez 2017-03-14 18:11:17 -0700 *** Bug 169607 has been marked as a duplicate of this bug. *** 1389360 12 304335 mcatanzaro 2018-01-15 12:54:54 -0800 Comment on attachment 304335 Patch Every bot is red here ;) 1487526 13 aperez 2018-12-13 00:12:40 -0800 I'll be handling this as part of #167941 *** This bug has been marked as a duplicate of bug 167941 *** 304335 2017-03-13 19:19:36 -0700 2018-01-15 12:54:54 -0800 Patch bug-169037-20170314041934.patch text/plain 7887 aperez U3VidmVyc2lvbiBSZXZpc2lvbjogMjEzODU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMjExODE0M2IxMDI5MzFm MGYwMzY5ZjQ5OTIwZWNhMDYxYjg4ZDIyNi4uOTBjM2ViNmZiN2RhYjZkYWRlYTYzY2Q3NTE1NGM0 NGIyZWU1NzkyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE3LTAzLTEzICBBZHJp YW4gUGVyZXogZGUgQ2FzdHJvICA8YXBlcmV6QGlnYWxpYS5jb20+CisKKyAgICAgICAgW1dLMl0g TWlzc2luZyBDIEFQSSBmb3IgVXNlckNvbnRlbnRFeHRlbnNpb25TdG9yZSBwcmV2ZW50cyBpbnN0 YW50aWF0aW5nIGNvbnRlbnQgZXh0ZW5zaW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY5MDM3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgVGhpcyBhZGRzIHRoZSBuZWVkZWQgZnVuY3Rpb25zIHRvIGlu c3RhbnRpYXRlIGFuZCByZXR1cm4gYSBXS1VzZXJDb250ZW50RXh0ZW5zaW9uU3RvcmVSZWYsIGFu ZCB0aGUKKyAgICAgICAgZnVuY3Rpb25zIHdoaWNoIG9wZXJhdGUgb24gaXQgdG8gY29tcGlsZSwg bG9va3VwLCBhbmQgcmVtb3ZlIFdLVXNlckNvbnRlbnRGaWx0ZXJSZWYgb2JqZWN0cy4gVGhlc2UK KyAgICAgICAgYWxsb3cgdXNpbmcgY29udGVudCBleHRlbnNpb25zIHdpdGggdGhlIEMgQVBJLgor CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dLVXNlckNvbnRlbnRFeHRlbnNpb25TdG9yZVJl Zi5jcHA6CisgICAgICAgICh0b1Jlc3VsdCk6IEhlbHBlciBmdW5jdGlvbiB0byBjb252ZXJ0IHN0 ZDo6ZXJyb3IgaW50byBhIFdLVXNlckNvbnRlbnRFeHRlbnNpb25TdG9yZVJlc3VsdC4KKworICAg ICAgICAoV0tVc2VyQ29udGVudEV4dGVuc2lvblN0b3JlQ3JlYXRlKToKKyAgICAgICAgKFdLVXNl ckNvbnRlbnRFeHRlbnNpb25TdG9yZUNvbXBpbGVGaWx0ZXIpOgorICAgICAgICAoV0tVc2VyQ29u dGVudEV4dGVuc2lvblN0b3JlTG9va3VwRmlsdGVyKToKKyAgICAgICAgKFdLVXNlckNvbnRlbnRF eHRlbnNpb25TdG9yZVJlbW92ZUZpbHRlcik6CisgICAgICAgIEFkZCBpbXBsZW1lbnRhdGlvbiBm b3IgdGhlIG5ldyBDIEFQSSBmdW5jdGlvbnMuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0Mv V0tVc2VyQ29udGVudEV4dGVuc2lvblN0b3JlUmVmLmg6IEFkZCBkZWNsYXJhdGlvbnMgZm9yIHRo ZSBuZXcgQyBBUEkgZnVuY3Rpb25zLAorICAgICAgICB0eXBlIGRlZmluaXRpb25zIGZvciB0aGUg Y2FsbGJhY2sgZnVuY3Rpb25zIGludm9rZWQgb24gYXN5bmNocm9ub3VzIGNvbXBsZXRpb24sIGFu ZCB0aGUgZGVmaW5pdGlvbgorICAgICAgICBvZiB0aGUgV0tVc2VyQ29udGVudEV4dGVuc2lvblN0 b3JlUmVzdWx0IGVudW0uCisKKyAgICAgICAgKiBDTWFrZUxpc3RzLnR4dDoKKyAgICAgICAgQWRk IFdLVXNlckNvbnRlbnRFeHRlbnNpb25TdG9yZVJlZi5jcHAgdG8gdGhlIGJ1aWxkLgorCiAyMDE3 LTAzLTEzICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgQWxsb3cg dGVybWluYXRpb24gb2YgYmFja2dyb3VuZCBXZWJQcm9jZXNzZXMgdGhhdCBnbyBvdmVyIGEgZ2l2 ZW4gQ1BVIHVzYWdlIHRocmVzaG9sZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ01ha2VM aXN0cy50eHQgYi9Tb3VyY2UvV2ViS2l0Mi9DTWFrZUxpc3RzLnR4dAppbmRleCA2MGVmOWVmMmE0 Y2Y5YWNiODAwY2E2NDM4YTBiODJlMTIyODg1YTNjLi41ZTA3MWE4OGRhNWQ1MjliNWRiYmNhNzlj NDMzMmVlYzBkOWU3NDhkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DTWFrZUxpc3RzLnR4 dAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9DTWFrZUxpc3RzLnR4dApAQCAtMzg5LDYgKzM4OSw3IEBA IHNldChXZWJLaXQyX1NPVVJDRVMKICAgICBVSVByb2Nlc3MvQVBJL0MvV0tSZXNvdXJjZUNhY2hl TWFuYWdlci5jcHAKICAgICBVSVByb2Nlc3MvQVBJL0MvV0tTZXNzaW9uU3RhdGVSZWYuY3BwCiAg ICAgVUlQcm9jZXNzL0FQSS9DL1dLVGV4dENoZWNrZXIuY3BwCisgICAgVUlQcm9jZXNzL0FQSS9D L1dLVXNlckNvbnRlbnRFeHRlbnNpb25TdG9yZVJlZi5jcHAKICAgICBVSVByb2Nlc3MvQVBJL0Mv V0tVc2VyQ29udGVudENvbnRyb2xsZXJSZWYuY3BwCiAgICAgVUlQcm9jZXNzL0FQSS9DL1dLVXNl ck1lZGlhUGVybWlzc2lvbkNoZWNrLmNwcAogICAgIFVJUHJvY2Vzcy9BUEkvQy9XS1VzZXJNZWRp YVBlcm1pc3Npb25SZXF1ZXN0LmNwcApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9DL1dLVXNlckNvbnRlbnRFeHRlbnNpb25TdG9yZVJlZi5jcHAgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tVc2VyQ29udGVudEV4dGVuc2lvblN0b3JlUmVmLmNwcApp bmRleCA0ZDRmOGViMjg2ODUzNzA5NDAxMjBiNzcwOTk1MTg4ODQyNzBhNzkzLi44NzE1NjAwODI2 NTZlZDc3NTYwNzZlY2FmNDEwNTEwYjY0MDVhOTdmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL0MvV0tVc2VyQ29udGVudEV4dGVuc2lvblN0b3JlUmVmLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tVc2VyQ29udGVudEV4dGVuc2lvblN0 b3JlUmVmLmNwcApAQCAtMjYsOCArMjYsMTAgQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNs dWRlICJXS1VzZXJDb250ZW50RXh0ZW5zaW9uU3RvcmVSZWYuaCIKIAorI2luY2x1ZGUgIkFQSUNv bnRlbnRFeHRlbnNpb24uaCIKICNpbmNsdWRlICJBUElDb250ZW50RXh0ZW5zaW9uU3RvcmUuaCIK ICNpbmNsdWRlICJXS0FQSUNhc3QuaCIKKyNpbmNsdWRlICJXS1R5cGUuaCIKIAogdXNpbmcgbmFt ZXNwYWNlIFdlYktpdDsKIApAQCAtMzksMyArNDEsNjUgQEAgV0tUeXBlSUQgV0tVc2VyQ29udGVu dEV4dGVuc2lvblN0b3JlR2V0VHlwZUlEKCkKICAgICByZXR1cm4gMDsKICNlbmRpZgogfQorCitX S1VzZXJDb250ZW50RXh0ZW5zaW9uU3RvcmVSZWYgV0tVc2VyQ29udGVudEV4dGVuc2lvblN0b3Jl Q3JlYXRlKFdLU3RyaW5nUmVmIHBhdGgpCit7CisjaWYgRU5BQkxFKENPTlRFTlRfRVhURU5TSU9O UykKKyAgICBSZWZQdHI8QVBJOjpDb250ZW50RXh0ZW5zaW9uU3RvcmU+IHVzZXJDb250ZW50RXh0 ZW5zaW9uU3RvcmUgPSBhZG9wdFJlZihuZXcgQVBJOjpDb250ZW50RXh0ZW5zaW9uU3RvcmUodG9X VEZTdHJpbmcocGF0aCkpKTsKKyAgICByZXR1cm4gdG9BUEkodXNlckNvbnRlbnRFeHRlbnNpb25T dG9yZS5sZWFrUmVmKCkpOworI2Vsc2UKKyAgICByZXR1cm4gbnVsbHB0cjsKKyNlbmRpZgorfQor CisjaWYgRU5BQkxFKENPTlRFTlRfRVhURU5TSU9OUykKK3N0YXRpYyBpbmxpbmUgV0tVc2VyQ29u dGVudEV4dGVuc2lvblN0b3JlUmVzdWx0IHRvUmVzdWx0KGNvbnN0IHN0ZDo6ZXJyb3JfY29kZSYg ZXJyb3IpCit7CisgICAgaWYgKGVycm9yKSB7CisgICAgICAgIHN3aXRjaCAoc3RhdGljX2Nhc3Q8 QVBJOjpDb250ZW50RXh0ZW5zaW9uU3RvcmU6OkVycm9yPihlcnJvci52YWx1ZSgpKSkgeworICAg ICAgICBjYXNlIEFQSTo6Q29udGVudEV4dGVuc2lvblN0b3JlOjpFcnJvcjo6TG9va3VwRmFpbGVk OgorICAgICAgICAgICAgcmV0dXJuIGtXS1VzZXJDb250ZW50RXh0ZW5zaW9uU3RvcmVMb29rdXBG YWlsZWQ7CisgICAgICAgIGNhc2UgQVBJOjpDb250ZW50RXh0ZW5zaW9uU3RvcmU6OkVycm9yOjpW ZXJzaW9uTWlzbWF0Y2g6CisgICAgICAgICAgICByZXR1cm4ga1dLVXNlckNvbnRlbnRFeHRlbnNp b25TdG9yZVZlcnNpb25NaXNtYXRjaDsKKyAgICAgICAgY2FzZSBBUEk6OkNvbnRlbnRFeHRlbnNp b25TdG9yZTo6RXJyb3I6OkNvbXBpbGVGYWlsZWQ6CisgICAgICAgICAgICByZXR1cm4ga1dLVXNl ckNvbnRlbnRFeHRlbnNpb25TdG9yZUNvbXBpbGVGYWlsZWQ7CisgICAgICAgIGNhc2UgQVBJOjpD b250ZW50RXh0ZW5zaW9uU3RvcmU6OkVycm9yOjpSZW1vdmVGYWlsZWQ6CisgICAgICAgICAgICBy ZXR1cm4ga1dLVXNlckNvbnRlbnRFeHRlbnNpb25TdG9yZVJlbW92ZUZhaWxlZDsKKyAgICAgICAg fQorICAgIH0gZWxzZQorICAgICAgICByZXR1cm4ga1dLVXNlckNvbnRlbnRFeHRlbnNpb25TdG9y ZVN1Y2Nlc3M7Cit9CisjZW5kaWYKKwordm9pZCBXS1VzZXJDb250ZW50RXh0ZW5zaW9uU3RvcmVD b21waWxlRmlsdGVyKFdLVXNlckNvbnRlbnRFeHRlbnNpb25TdG9yZVJlZiB1c2VyQ29udGVudEV4 dGVuc2lvblN0b3JlLCBXS1N0cmluZ1JlZiBpZGVudGlmaWVyLCBXS1N0cmluZ1JlZiBqc29uU291 cmNlLCB2b2lkKiBjb250ZXh0LCBXS1VzZXJDb250ZW50RXh0ZW5zaW9uU3RvcmVGaWx0ZXJGdW5j dGlvbiBjYWxsYmFjaykKK3sKKyNpZiBFTkFCTEUoQ09OVEVOVF9FWFRFTlNJT05TKQorICAgIFdL UmV0YWluKHVzZXJDb250ZW50RXh0ZW5zaW9uU3RvcmUpOworICAgIHRvSW1wbCh1c2VyQ29udGVu dEV4dGVuc2lvblN0b3JlKS0+Y29tcGlsZUNvbnRlbnRFeHRlbnNpb24odG9XVEZTdHJpbmcoaWRl bnRpZmllciksIHRvV1RGU3RyaW5nKGpzb25Tb3VyY2UpLCBbdXNlckNvbnRlbnRFeHRlbnNpb25T dG9yZSwgY29udGV4dCwgY2FsbGJhY2tdKFJlZlB0cjxBUEk6OkNvbnRlbnRFeHRlbnNpb24+IGNv bnRlbnRFeHRlbnNpb24sIHN0ZDplcnJvcl9jb2RlIGVycm9yKSB7CisgICAgICAgIGNhbGxiYWNr KHVzZXJDb250ZW50RXh0ZW5zaW9uU3RvcmUsIGVycm9yID8gbnVsbHB0ciA6IHRvQVBJKGNvbnRl bnRFeHRlbnNpb24uZ2V0KCkpLCB0b1Jlc3VsdChlcnJvciksIGNvbnRleHQpOworICAgICAgICBX S1JlbGVhc2UodXNlckNvbnRlbnRFeHRlbnNpb25TdG9yZSk7CisgICAgfSk7CisjZW5kaWYKK30K Kwordm9pZCBXS1VzZXJDb250ZW50RXh0ZW5zaW9uU3RvcmVMb29rdXBGaWx0ZXIoV0tVc2VyQ29u dGVudEV4dGVuc2lvblN0b3JlUmVmIHVzZXJDb250ZW50RXh0ZW5zaW9uU3RvcmUsIFdLU3RyaW5n UmVmIGlkZW50aWZpZXIsIHZvaWQqIGNvbnRleHQsIFdLVXNlckNvbnRlbnRFeHRlbnNpb25TdG9y ZUZpbHRlckZ1bmN0aW9uIGNhbGxiYWNrKQoreworI2lmIEVOQUJMRShDT05URU5UX0VYVEVOU0lP TlMpCisgICAgV0tSZXRhaW4odXNlckNvbnRlbnRFeHRlbnNpb25TdG9yZSk7CisgICAgdG9JbXBs KHVzZXJDb250ZW50RXh0ZW5zaW9uU3RvcmUpLT5sb29rdXBDb250ZW50RXh0ZW5zaW9uKHRvV1RG U3RyaW5nKGlkZW50aWZpZXIpLCBbdXNlckNvbnRlbnRFeHRlbnNpb25TdG9yZSwgY29udGV4dCwg Y2FsbGJhY2tdKFJlZlB0cjxBUEk6OkNvbnRlbnRFeHRlbnNpb24+IGNvbnRlbnRFeHRlbnNpb24s IHN0ZDo6ZXJyb3JfY29kZSBlcnJvcikgeworICAgICAgICBjYWxsYmFjayh1c2VyQ29udGVudEV4 dGVuc2lvblN0b3JlLCBlcnJvciA/IG51bGxwdHIgOiB0b0FQSShjb250ZW50RXh0ZW5zaW9uLmdl dCgpKSwgdG9SZXN1bHQoZXJyb3IpLCBjb250ZXh0KTsKKyAgICAgICAgV0tSZWxlYXNlKHVzZXJD b250ZW50RXh0ZW5zaW9uU3RvcmUpOworICAgIH0pOworI2VuZGlmCit9CisKK3ZvaWQgV0tVc2Vy Q29udGVudEV4dGVuc2lvblN0b3JlUmVtb3ZlRmlsdGVyKFdLVXNlckNvbnRlbnRFeHRlbnNpb25T dG9yZVJlZiB1c2VyQ29udGVudEV4dGVuc2lvblN0b3JlLCBXS1N0cmluZ1JlZiBpZGVudGlmaWVy LCB2b2lkKiBjb250ZXh0LCBXS1VzZXJDb250ZW50RXh0ZW5zaW9uU3RvcmVGaWx0ZXJGdW5jdGlv biBjYWxsYmFjaykKK3sKKyNpZiBFTkFCTEUoQ09OVEVOVF9FWFRFTlNJT05TKQorICAgIFdLUmV0 YWluKHVzZXJDb250ZW50RXh0ZW5zaW9uU3RvcmUpOworICAgIHRvSW1wbCh1c2VyQ29udGVudEV4 dGVuc2lvblN0b3JlKS0+cmVtb3ZlQ29udGVudEV4dGVuc2lvbih0b1dURlN0cmluZyhpZGVudGlm aWVyKSwgW3VzZXJDb250ZW50RXh0ZW5zaW9uU3RvcmUsIGNvbnRleHQsIGNhbGxiYWNrXShzdGQ6 OmVycm9yX2NvZGUgZXJyb3IpIHsKKyAgICAgICAgY2FsbGJhY2sodXNlckNvbnRlbnRFeHRlbnNp b25TdG9yZSwgbnVsbHB0ciwgdG9SZXN1bHQoZXJyb3IpLCBjb250ZXh0KTsKKyAgICAgICAgV0tS ZWxlYXNlKHVzZXJDb250ZW50RXh0ZW5zaW9uU3RvcmUpOworICAgIH0pOworI2VuZGlmCit9CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tVc2VyQ29udGVudEV4 dGVuc2lvblN0b3JlUmVmLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tVc2Vy Q29udGVudEV4dGVuc2lvblN0b3JlUmVmLmgKaW5kZXggNTM1OThlYzgwOWE3MmI3ZjYzYzkzZTgy YmQ4Y2EyOGI0ZjliNTg2NS4uMDQ2NmZiNWY0NTA2NDdhMjk2NmQ0NzA2ZTg0NDk2NzIzZjQ2MTFh ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLVXNlckNvbnRl bnRFeHRlbnNpb25TdG9yZVJlZi5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Qy9XS1VzZXJDb250ZW50RXh0ZW5zaW9uU3RvcmVSZWYuaApAQCAtMzQsNiArMzQsMjIgQEAgZXh0 ZXJuICJDIiB7CiAKIFdLX0VYUE9SVCBXS1R5cGVJRCBXS1VzZXJDb250ZW50RXh0ZW5zaW9uU3Rv cmVHZXRUeXBlSUQoKTsKIAorV0tfRVhQT1JUIFdLVXNlckNvbnRlbnRFeHRlbnNpb25TdG9yZVJl ZiBXS1VzZXJDb250ZW50RXh0ZW5zaW9uU3RvcmVDcmVhdGUoV0tTdHJpbmdSZWYgcGF0aCk7CisK K2VudW0geworICAgIGtXS1VzZXJDb250ZW50RXh0ZW5zaW9uU3RvcmVTdWNjZXNzID0gMCwKKyAg ICBrV0tVc2VyQ29udGVudEV4dGVuc2lvblN0b3JlTG9va3VwRmFpbGVkLAorICAgIGtXS1VzZXJD b250ZW50RXh0ZW5zaW9uU3RvcmVWZXJzaW9uTWlzbWF0Y2gsCisgICAga1dLVXNlckNvbnRlbnRF eHRlbnNpb25TdG9yZUNvbXBpbGVGYWlsZWQsCisgICAga1dLVXNlckNvbnRlbnRFeHRlbnNpb25T dG9yZVJlbW92ZUZhaWxlZCwKK307Cit0eXBlZGVmIHVpbnQzMl90IFdLVXNlckNvbnRlbnRFeHRl bnNpb25TdG9yZVJlc3VsdDsKKwordHlwZWRlZiB2b2lkICgqV0tVc2VyQ29udGVudEV4dGVuc2lv blN0b3JlRmlsdGVyRnVuY3Rpb24pKFdLVXNlckNvbnRlbnRFeHRlbnNpb25TdG9yZVJlZiwgV0tV c2VyQ29udGVudEZpbHRlclJlZiwgdm9pZCopOworV0tfRVhQT1JUIHZvaWQgV0tVc2VyQ29udGVu dEV4dGVuc2lvblN0b3JlQ29tcGlsZUZpbHRlcihXS1VzZXJDb250ZW50RXh0ZW5zaW9uU3RvcmVS ZWYgdXNlckNvbnRlbnRFeHRlbnNpb25TdG9yZSwgV0tTdHJpbmdSZWYgaWRlbnRpZmllciwgV0tT dHJpbmdSZWYganNvblNvdXJjZSwgdm9pZCogY29udGV4dCwgV0tVc2VyQ29udGVudEV4dGVuc2lv blN0b3JlRmlsdGVyRnVuY3Rpb24gY2FsbGJhY2spOworV0tfRVhQT1JUIHZvaWQgV0tVc2VyQ29u dGVudEV4dGVuc2lvblN0b3JlTG9va3VwRmlsdGVyKFdLVXNlckNvbnRlbnRFeHRlbnNpb25TdG9y ZVJlZiB1c2VyQ29udGVudEV4dGVuc2lvblN0b3JlLCBXS1N0cmluZ1JlZiBpZGVudGlmaWVyLCB2 b2lkKiBjb250ZXh0LCBXS1VzZXJDb250ZW50RXh0ZW5zaW9uU3RvcmVGaWx0ZXJGdW5jdGlvbiBj YWxsYmFjayk7CitXS19FWFBPUlQgdm9pZCBXS1VzZXJDb250ZW50RXh0ZW5zaW9uU3RvcmVSZW1v dmVGaWx0ZXIoV0tVc2VyQ29udGVudEV4dGVuc2lvblN0b3JlUmVmIHVzZXJDb250ZW50RXh0ZW5z aW9uU3RvcmUsIFdLU3RyaW5nUmVmIGlkZW50aWZpZXIsIHZvaWQqIGNvbnRleHQsIFdLVXNlckNv bnRlbnRFeHRlbnNpb25TdG9yZUZpbHRlckZ1bmN0aW9uIGNhbGxiYWNrKTsKKwogI2lmZGVmIF9f Y3BsdXNwbHVzCiB9CiAjZW5kaWYK