132805 2014-05-11 13:01:52 -0700 Need function to copy favicon data without image conversion. 2014-05-12 00:53:06 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P1 Normal --- 1 gordon_sheridan gordon_sheridan commit-queue darin oldest_to_newest 1008441 0 gordon_sheridan 2014-05-11 13:01:52 -0700 With WKIconDatabaseSetIconDataForIconURL(), we have a function that can *set* the data for an icon in the destination database. In order to copy a favicon between icon databases, without potential image conversion, we need a function that can get a copy of the data for an icon in the source database. 1008442 1 231264 gordon_sheridan 2014-05-11 13:25:01 -0700 Created attachment 231264 Patch 1008444 2 231264 darin 2014-05-11 13:29:16 -0700 Comment on attachment 231264 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=231264&action=review > Source/WebKit2/UIProcess/API/C/WKIconDatabase.cpp:77 > + WebCore::Image *image = toImpl(iconDatabaseRef)->imageForPageURL(toWTFString(pageURL)); Formatted wrong. Should be Image* rather than Image * with a space. > Source/WebKit2/UIProcess/API/C/WKIconDatabase.cpp:79 > + return 0; Should be nullptr. > Source/WebKit2/UIProcess/API/C/WKIconDatabase.cpp:81 > + WebCore::SharedBuffer *iconData = image->data(); Formatted wrong. Should be SharedBuffer* rather than SharedBuffer * with a space. 1008446 3 gordon_sheridan 2014-05-11 13:43:05 -0700 Thanks Darin! I'll update it and post a new patch. 1008448 4 231265 gordon_sheridan 2014-05-11 13:50:07 -0700 Created attachment 231265 Patch 1008454 5 231265 gordon_sheridan 2014-05-11 15:00:43 -0700 Comment on attachment 231265 Patch I need to update the patch handle when there is no image data. 1008459 6 231268 gordon_sheridan 2014-05-11 15:27:20 -0700 Created attachment 231268 Patch 1008485 7 231268 commit-queue 2014-05-11 23:31:09 -0700 Comment on attachment 231268 Patch Clearing flags on attachment: 231268 Committed r168609: <http://trac.webkit.org/changeset/168609> 1008486 8 commit-queue 2014-05-11 23:31:12 -0700 All reviewed patches have been landed. Closing bug. 1008487 9 231268 darin 2014-05-11 23:39:24 -0700 Comment on attachment 231268 Patch There is one thing wrong with this patch that I did not notice until after it was landed. Generally, API files are not supposed to have substantive code in them. They just have bindings. So this patch should have added a copyIconDataForPageURL member function to WebIconDatabase, rather than putting the code into the bindings file itself. Then the bindings file would just have the binding. 1008488 10 gordon_sheridan 2014-05-11 23:41:25 -0700 I can submit a new patch. Can this bug be reopened for that, or should I create a new bug? 1008501 11 darin 2014-05-12 00:53:06 -0700 (In reply to comment #10) > I can submit a new patch. Can this bug be reopened for that, or should I create a new bug? I took care of it and did some other icon database improvements. It’s in bug 132812. 231264 2014-05-11 13:25:01 -0700 2014-05-11 13:50:05 -0700 Patch bug-132805-20140511132438.patch text/plain 3080 gordon_sheridan U3VidmVyc2lvbiBSZXZpc2lvbjogMTY4NTk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYzY2N2FjNTZmYmYzMzA2 NjBjY2NjMzdjMmM5OWRjNDNjNzVjY2JlNC4uOTFhZTJjZmY1MjYyZGZlYmZhZjgyZTQyNWQ5ZThk MjAzNjVjY2ViNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE0LTA1LTExICBHb3Jk b24gU2hlcmlkYW4gIDxnb3Jkb25fc2hlcmlkYW5AYXBwbGUuY29tPgorCisgICAgICAgIEV4cG9z ZSBhIGZ1bmN0aW9uIHRvIGNvcHkgZmF2aWNvbiBkYXRhIHdpdGhvdXQgaW1hZ2UgY29udmVyc2lv bi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMjgw NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQ cm9jZXNzL0FQSS9DL1dLSWNvbkRhdGFiYXNlLmNwcDoKKyAgICAgICAgKFdLSWNvbkRhdGFiYXNl Q29weUljb25EYXRhRm9yUGFnZVVSTCk6CisgICAgICAgIEFkZCBhIGZ1bmN0aW9uIHRvIGNvcHkg dGhlIGRhdGEgZnJvbSB0aGUgaW1hZ2Ugb2YgYSBmYXZpY29uIGZvciBhbiBhc3NvY2lhdGVkIHBh Z2UgdXJsLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dLSWNvbkRhdGFiYXNlLmg6Cisg ICAgICAgIERlY2xhcmUgV0tJY29uRGF0YWJhc2VDb3B5SWNvbkRhdGFGb3JQYWdlVVJMLgorCiAy MDE0LTA1LTEwICBDc2FiYSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CiAKICAgICAg ICAgW1dLMl0gVVJUQkYgYWZ0ZXIgcjE2ODU4NS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvQy9XS0ljb25EYXRhYmFzZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL0MvV0tJY29uRGF0YWJhc2UuY3BwCmluZGV4IDE0MmQxMmRhNjJkOGU0OGJiZmRk OGRjM2UyNjI2MGQyMmQ1ZjA2MDguLjk5NDQ4Y2E1ZGIwZDc2MGI5M2YxMWMwZTM3OGI3YWY0MDNm ZjY1NTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS0ljb25E YXRhYmFzZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLSWNvbkRh dGFiYXNlLmNwcApAQCAtMjksNiArMjksOSBAQAogI2luY2x1ZGUgIkFQSURhdGEuaCIKICNpbmNs dWRlICJXS0FQSUNhc3QuaCIKICNpbmNsdWRlICJXZWJJY29uRGF0YWJhc2UuaCIKKyNpbmNsdWRl IDxXZWJDb3JlL0ltYWdlLmg+CisjaW5jbHVkZSA8V2ViQ29yZS9TaGFyZWRCdWZmZXIuaD4KKyNp bmNsdWRlIDxXZWJLaXQvV0tEYXRhLmg+CiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAKQEAg LTY5LDYgKzcyLDE2IEBAIFdLVVJMUmVmIFdLSWNvbkRhdGFiYXNlQ29weUljb25VUkxGb3JQYWdl VVJMKFdLSWNvbkRhdGFiYXNlUmVmIGljb25EYXRhYmFzZVJlZiwKICAgICByZXR1cm4gdG9Db3Bp ZWRVUkxBUEkoaWNvblVSTFN0cmluZyk7CiB9CiAKK1dLRGF0YVJlZiBXS0ljb25EYXRhYmFzZUNv cHlJY29uRGF0YUZvclBhZ2VVUkwoV0tJY29uRGF0YWJhc2VSZWYgaWNvbkRhdGFiYXNlUmVmLCBX S1VSTFJlZiBwYWdlVVJMKQoreworICAgIFdlYkNvcmU6OkltYWdlICppbWFnZSA9IHRvSW1wbChp Y29uRGF0YWJhc2VSZWYpLT5pbWFnZUZvclBhZ2VVUkwodG9XVEZTdHJpbmcocGFnZVVSTCkpOwor ICAgIGlmICghaW1hZ2UpCisgICAgICAgIHJldHVybiAwOworCisgICAgV2ViQ29yZTo6U2hhcmVk QnVmZmVyICppY29uRGF0YSA9IGltYWdlLT5kYXRhKCk7CisgICAgcmV0dXJuIFdLRGF0YUNyZWF0 ZShyZWludGVycHJldF9jYXN0PGNvbnN0IHVuc2lnbmVkIGNoYXIqPihpY29uRGF0YS0+ZGF0YSgp KSwgaWNvbkRhdGEtPnNpemUoKSk7Cit9CisKIHZvaWQgV0tJY29uRGF0YWJhc2VFbmFibGVEYXRh YmFzZUNsZWFudXAoV0tJY29uRGF0YWJhc2VSZWYgaWNvbkRhdGFiYXNlUmVmKQogewogICAgIHRv SW1wbChpY29uRGF0YWJhc2VSZWYpLT5lbmFibGVEYXRhYmFzZUNsZWFudXAoKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS0ljb25EYXRhYmFzZS5oIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLSWNvbkRhdGFiYXNlLmgKaW5kZXggZDViNzI5 MmI0ZDliNGEzNTA5M2UyMzk4Y2I1ODE4Yzc5Yzg3NTg2ZC4uOTdkYzQxYzZkODA2OGFiMDdhMWY4 ZDE3ZGIzMDY5MTJmOGQ5Mjk0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9DL1dLSWNvbkRhdGFiYXNlLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9DL1dLSWNvbkRhdGFiYXNlLmgKQEAgLTgzLDYgKzgzLDcgQEAgV0tfRVhQT1JUIHZvaWQgV0tJ Y29uRGF0YWJhc2VSZWxlYXNlSWNvbkZvclVSTChXS0ljb25EYXRhYmFzZVJlZiBpY29uRGF0YWJh c2UsIFcKIFdLX0VYUE9SVCB2b2lkIFdLSWNvbkRhdGFiYXNlU2V0SWNvbkRhdGFGb3JJY29uVVJM KFdLSWNvbkRhdGFiYXNlUmVmIGljb25EYXRhYmFzZSwgV0tEYXRhUmVmIGljb25EYXRhLCBXS1VS TFJlZiBpY29uVVJMKTsKIFdLX0VYUE9SVCB2b2lkIFdLSWNvbkRhdGFiYXNlU2V0SWNvblVSTEZv clBhZ2VVUkwoV0tJY29uRGF0YWJhc2VSZWYgaWNvbkRhdGFiYXNlUmVmLCBXS1VSTFJlZiBpY29u VVJMUmVmLCBXS1VSTFJlZiBwYWdlVVJMUmVmKTsKIFdLX0VYUE9SVCBXS1VSTFJlZiBXS0ljb25E YXRhYmFzZUNvcHlJY29uVVJMRm9yUGFnZVVSTChXS0ljb25EYXRhYmFzZVJlZiBpY29uRGF0YWJh c2VSZWYsIFdLVVJMUmVmIHBhZ2VVUkxSZWYpOworV0tfRVhQT1JUIFdLRGF0YVJlZiBXS0ljb25E YXRhYmFzZUNvcHlJY29uRGF0YUZvclBhZ2VVUkwoV0tJY29uRGF0YWJhc2VSZWYgaWNvbkRhdGFi YXNlUmVmLCBXS1VSTFJlZiBwYWdlVVJMKTsKIAogV0tfRVhQT1JUIHZvaWQgV0tJY29uRGF0YWJh c2VFbmFibGVEYXRhYmFzZUNsZWFudXAoV0tJY29uRGF0YWJhc2VSZWYgaWNvbkRhdGFiYXNlKTsK IAo= 231265 2014-05-11 13:50:07 -0700 2014-05-11 15:27:18 -0700 Patch bug-132805-20140511134944.patch text/plain 3086 gordon_sheridan U3VidmVyc2lvbiBSZXZpc2lvbjogMTY4NTk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYzY2N2FjNTZmYmYzMzA2 NjBjY2NjMzdjMmM5OWRjNDNjNzVjY2JlNC4uOTFhZTJjZmY1MjYyZGZlYmZhZjgyZTQyNWQ5ZThk MjAzNjVjY2ViNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE0LTA1LTExICBHb3Jk b24gU2hlcmlkYW4gIDxnb3Jkb25fc2hlcmlkYW5AYXBwbGUuY29tPgorCisgICAgICAgIEV4cG9z ZSBhIGZ1bmN0aW9uIHRvIGNvcHkgZmF2aWNvbiBkYXRhIHdpdGhvdXQgaW1hZ2UgY29udmVyc2lv bi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMjgw NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQ cm9jZXNzL0FQSS9DL1dLSWNvbkRhdGFiYXNlLmNwcDoKKyAgICAgICAgKFdLSWNvbkRhdGFiYXNl Q29weUljb25EYXRhRm9yUGFnZVVSTCk6CisgICAgICAgIEFkZCBhIGZ1bmN0aW9uIHRvIGNvcHkg dGhlIGRhdGEgZnJvbSB0aGUgaW1hZ2Ugb2YgYSBmYXZpY29uIGZvciBhbiBhc3NvY2lhdGVkIHBh Z2UgdXJsLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dLSWNvbkRhdGFiYXNlLmg6Cisg ICAgICAgIERlY2xhcmUgV0tJY29uRGF0YWJhc2VDb3B5SWNvbkRhdGFGb3JQYWdlVVJMLgorCiAy MDE0LTA1LTEwICBDc2FiYSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CiAKICAgICAg ICAgW1dLMl0gVVJUQkYgYWZ0ZXIgcjE2ODU4NS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvQy9XS0ljb25EYXRhYmFzZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL0MvV0tJY29uRGF0YWJhc2UuY3BwCmluZGV4IDE0MmQxMmRhNjJkOGU0OGJiZmRk OGRjM2UyNjI2MGQyMmQ1ZjA2MDguLmNkMjNjNWRiNDk1ZTE3OWMyNmIxZWYzZmY1MjUzNGMwODIx MGM2ZDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS0ljb25E YXRhYmFzZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLSWNvbkRh dGFiYXNlLmNwcApAQCAtMjksNiArMjksOSBAQAogI2luY2x1ZGUgIkFQSURhdGEuaCIKICNpbmNs dWRlICJXS0FQSUNhc3QuaCIKICNpbmNsdWRlICJXZWJJY29uRGF0YWJhc2UuaCIKKyNpbmNsdWRl IDxXZWJDb3JlL0ltYWdlLmg+CisjaW5jbHVkZSA8V2ViQ29yZS9TaGFyZWRCdWZmZXIuaD4KKyNp bmNsdWRlIDxXZWJLaXQvV0tEYXRhLmg+CiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAKQEAg LTY5LDYgKzcyLDE2IEBAIFdLVVJMUmVmIFdLSWNvbkRhdGFiYXNlQ29weUljb25VUkxGb3JQYWdl VVJMKFdLSWNvbkRhdGFiYXNlUmVmIGljb25EYXRhYmFzZVJlZiwKICAgICByZXR1cm4gdG9Db3Bp ZWRVUkxBUEkoaWNvblVSTFN0cmluZyk7CiB9CiAKK1dLRGF0YVJlZiBXS0ljb25EYXRhYmFzZUNv cHlJY29uRGF0YUZvclBhZ2VVUkwoV0tJY29uRGF0YWJhc2VSZWYgaWNvbkRhdGFiYXNlUmVmLCBX S1VSTFJlZiBwYWdlVVJMKQoreworICAgIFdlYkNvcmU6OkltYWdlKiBpbWFnZSA9IHRvSW1wbChp Y29uRGF0YWJhc2VSZWYpLT5pbWFnZUZvclBhZ2VVUkwodG9XVEZTdHJpbmcocGFnZVVSTCkpOwor ICAgIGlmICghaW1hZ2UpCisgICAgICAgIHJldHVybiBudWxscHRyOworCisgICAgV2ViQ29yZTo6 U2hhcmVkQnVmZmVyKiBpY29uRGF0YSA9IGltYWdlLT5kYXRhKCk7CisgICAgcmV0dXJuIFdLRGF0 YUNyZWF0ZShyZWludGVycHJldF9jYXN0PGNvbnN0IHVuc2lnbmVkIGNoYXIqPihpY29uRGF0YS0+ ZGF0YSgpKSwgaWNvbkRhdGEtPnNpemUoKSk7Cit9CisKIHZvaWQgV0tJY29uRGF0YWJhc2VFbmFi bGVEYXRhYmFzZUNsZWFudXAoV0tJY29uRGF0YWJhc2VSZWYgaWNvbkRhdGFiYXNlUmVmKQogewog ICAgIHRvSW1wbChpY29uRGF0YWJhc2VSZWYpLT5lbmFibGVEYXRhYmFzZUNsZWFudXAoKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS0ljb25EYXRhYmFzZS5o IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLSWNvbkRhdGFiYXNlLmgKaW5kZXgg ZDViNzI5MmI0ZDliNGEzNTA5M2UyMzk4Y2I1ODE4Yzc5Yzg3NTg2ZC4uOTdkYzQxYzZkODA2OGFi MDdhMWY4ZDE3ZGIzMDY5MTJmOGQ5Mjk0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9DL1dLSWNvbkRhdGFiYXNlLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9DL1dLSWNvbkRhdGFiYXNlLmgKQEAgLTgzLDYgKzgzLDcgQEAgV0tfRVhQT1JUIHZv aWQgV0tJY29uRGF0YWJhc2VSZWxlYXNlSWNvbkZvclVSTChXS0ljb25EYXRhYmFzZVJlZiBpY29u RGF0YWJhc2UsIFcKIFdLX0VYUE9SVCB2b2lkIFdLSWNvbkRhdGFiYXNlU2V0SWNvbkRhdGFGb3JJ Y29uVVJMKFdLSWNvbkRhdGFiYXNlUmVmIGljb25EYXRhYmFzZSwgV0tEYXRhUmVmIGljb25EYXRh LCBXS1VSTFJlZiBpY29uVVJMKTsKIFdLX0VYUE9SVCB2b2lkIFdLSWNvbkRhdGFiYXNlU2V0SWNv blVSTEZvclBhZ2VVUkwoV0tJY29uRGF0YWJhc2VSZWYgaWNvbkRhdGFiYXNlUmVmLCBXS1VSTFJl ZiBpY29uVVJMUmVmLCBXS1VSTFJlZiBwYWdlVVJMUmVmKTsKIFdLX0VYUE9SVCBXS1VSTFJlZiBX S0ljb25EYXRhYmFzZUNvcHlJY29uVVJMRm9yUGFnZVVSTChXS0ljb25EYXRhYmFzZVJlZiBpY29u RGF0YWJhc2VSZWYsIFdLVVJMUmVmIHBhZ2VVUkxSZWYpOworV0tfRVhQT1JUIFdLRGF0YVJlZiBX S0ljb25EYXRhYmFzZUNvcHlJY29uRGF0YUZvclBhZ2VVUkwoV0tJY29uRGF0YWJhc2VSZWYgaWNv bkRhdGFiYXNlUmVmLCBXS1VSTFJlZiBwYWdlVVJMKTsKIAogV0tfRVhQT1JUIHZvaWQgV0tJY29u RGF0YWJhc2VFbmFibGVEYXRhYmFzZUNsZWFudXAoV0tJY29uRGF0YWJhc2VSZWYgaWNvbkRhdGFi YXNlKTsKIAo= 231268 2014-05-11 15:27:20 -0700 2014-05-11 23:39:24 -0700 Patch bug-132805-20140511152657.patch text/plain 3133 gordon_sheridan U3VidmVyc2lvbiBSZXZpc2lvbjogMTY4NTk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYzY2N2FjNTZmYmYzMzA2 NjBjY2NjMzdjMmM5OWRjNDNjNzVjY2JlNC4uOTFhZTJjZmY1MjYyZGZlYmZhZjgyZTQyNWQ5ZThk MjAzNjVjY2ViNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE0LTA1LTExICBHb3Jk b24gU2hlcmlkYW4gIDxnb3Jkb25fc2hlcmlkYW5AYXBwbGUuY29tPgorCisgICAgICAgIEV4cG9z ZSBhIGZ1bmN0aW9uIHRvIGNvcHkgZmF2aWNvbiBkYXRhIHdpdGhvdXQgaW1hZ2UgY29udmVyc2lv bi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMjgw NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQ cm9jZXNzL0FQSS9DL1dLSWNvbkRhdGFiYXNlLmNwcDoKKyAgICAgICAgKFdLSWNvbkRhdGFiYXNl Q29weUljb25EYXRhRm9yUGFnZVVSTCk6CisgICAgICAgIEFkZCBhIGZ1bmN0aW9uIHRvIGNvcHkg dGhlIGRhdGEgZnJvbSB0aGUgaW1hZ2Ugb2YgYSBmYXZpY29uIGZvciBhbiBhc3NvY2lhdGVkIHBh Z2UgdXJsLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dLSWNvbkRhdGFiYXNlLmg6Cisg ICAgICAgIERlY2xhcmUgV0tJY29uRGF0YWJhc2VDb3B5SWNvbkRhdGFGb3JQYWdlVVJMLgorCiAy MDE0LTA1LTEwICBDc2FiYSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CiAKICAgICAg ICAgW1dLMl0gVVJUQkYgYWZ0ZXIgcjE2ODU4NS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvQy9XS0ljb25EYXRhYmFzZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL0MvV0tJY29uRGF0YWJhc2UuY3BwCmluZGV4IDE0MmQxMmRhNjJkOGU0OGJiZmRk OGRjM2UyNjI2MGQyMmQ1ZjA2MDguLmE3Y2Y2MWU5OTRiOGE3MjlmZTQwMTc5NTdlMjk5ZDIzYzM1 YmNjY2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS0ljb25E YXRhYmFzZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLSWNvbkRh dGFiYXNlLmNwcApAQCAtMjksNiArMjksOSBAQAogI2luY2x1ZGUgIkFQSURhdGEuaCIKICNpbmNs dWRlICJXS0FQSUNhc3QuaCIKICNpbmNsdWRlICJXZWJJY29uRGF0YWJhc2UuaCIKKyNpbmNsdWRl IDxXZWJDb3JlL0ltYWdlLmg+CisjaW5jbHVkZSA8V2ViQ29yZS9TaGFyZWRCdWZmZXIuaD4KKyNp bmNsdWRlIDxXZWJLaXQvV0tEYXRhLmg+CiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAKQEAg LTY5LDYgKzcyLDE5IEBAIFdLVVJMUmVmIFdLSWNvbkRhdGFiYXNlQ29weUljb25VUkxGb3JQYWdl VVJMKFdLSWNvbkRhdGFiYXNlUmVmIGljb25EYXRhYmFzZVJlZiwKICAgICByZXR1cm4gdG9Db3Bp ZWRVUkxBUEkoaWNvblVSTFN0cmluZyk7CiB9CiAKK1dLRGF0YVJlZiBXS0ljb25EYXRhYmFzZUNv cHlJY29uRGF0YUZvclBhZ2VVUkwoV0tJY29uRGF0YWJhc2VSZWYgaWNvbkRhdGFiYXNlUmVmLCBX S1VSTFJlZiBwYWdlVVJMKQoreworICAgIFdlYkNvcmU6OkltYWdlKiBpbWFnZSA9IHRvSW1wbChp Y29uRGF0YWJhc2VSZWYpLT5pbWFnZUZvclBhZ2VVUkwodG9XVEZTdHJpbmcocGFnZVVSTCkpOwor ICAgIGlmICghaW1hZ2UpCisgICAgICAgIHJldHVybiBudWxscHRyOworCisgICAgV2ViQ29yZTo6 U2hhcmVkQnVmZmVyKiBpY29uRGF0YSA9IGltYWdlLT5kYXRhKCk7CisgICAgaWYgKCFpY29uRGF0 YSkKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisKKyAgICByZXR1cm4gV0tEYXRhQ3JlYXRlKHJl aW50ZXJwcmV0X2Nhc3Q8Y29uc3QgdW5zaWduZWQgY2hhcio+KGljb25EYXRhLT5kYXRhKCkpLCBp Y29uRGF0YS0+c2l6ZSgpKTsKK30KKwogdm9pZCBXS0ljb25EYXRhYmFzZUVuYWJsZURhdGFiYXNl Q2xlYW51cChXS0ljb25EYXRhYmFzZVJlZiBpY29uRGF0YWJhc2VSZWYpCiB7CiAgICAgdG9JbXBs KGljb25EYXRhYmFzZVJlZiktPmVuYWJsZURhdGFiYXNlQ2xlYW51cCgpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLSWNvbkRhdGFiYXNlLmggYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tJY29uRGF0YWJhc2UuaAppbmRleCBkNWI3MjkyYjRk OWI0YTM1MDkzZTIzOThjYjU4MThjNzljODc1ODZkLi45N2RjNDFjNmQ4MDY4YWIwN2ExZjhkMTdk YjMwNjkxMmY4ZDkyOTQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L0MvV0tJY29uRGF0YWJhc2UuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0Mv V0tJY29uRGF0YWJhc2UuaApAQCAtODMsNiArODMsNyBAQCBXS19FWFBPUlQgdm9pZCBXS0ljb25E YXRhYmFzZVJlbGVhc2VJY29uRm9yVVJMKFdLSWNvbkRhdGFiYXNlUmVmIGljb25EYXRhYmFzZSwg VwogV0tfRVhQT1JUIHZvaWQgV0tJY29uRGF0YWJhc2VTZXRJY29uRGF0YUZvckljb25VUkwoV0tJ Y29uRGF0YWJhc2VSZWYgaWNvbkRhdGFiYXNlLCBXS0RhdGFSZWYgaWNvbkRhdGEsIFdLVVJMUmVm IGljb25VUkwpOwogV0tfRVhQT1JUIHZvaWQgV0tJY29uRGF0YWJhc2VTZXRJY29uVVJMRm9yUGFn ZVVSTChXS0ljb25EYXRhYmFzZVJlZiBpY29uRGF0YWJhc2VSZWYsIFdLVVJMUmVmIGljb25VUkxS ZWYsIFdLVVJMUmVmIHBhZ2VVUkxSZWYpOwogV0tfRVhQT1JUIFdLVVJMUmVmIFdLSWNvbkRhdGFi YXNlQ29weUljb25VUkxGb3JQYWdlVVJMKFdLSWNvbkRhdGFiYXNlUmVmIGljb25EYXRhYmFzZVJl ZiwgV0tVUkxSZWYgcGFnZVVSTFJlZik7CitXS19FWFBPUlQgV0tEYXRhUmVmIFdLSWNvbkRhdGFi YXNlQ29weUljb25EYXRhRm9yUGFnZVVSTChXS0ljb25EYXRhYmFzZVJlZiBpY29uRGF0YWJhc2VS ZWYsIFdLVVJMUmVmIHBhZ2VVUkwpOwogCiBXS19FWFBPUlQgdm9pZCBXS0ljb25EYXRhYmFzZUVu YWJsZURhdGFiYXNlQ2xlYW51cChXS0ljb25EYXRhYmFzZVJlZiBpY29uRGF0YWJhc2UpOwogCg==