141392 2015-02-09 10:37:08 -0800 [GTK] Add default color chooser implementation using GtkColorChooserDialog 2015-02-19 05:31:35 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 98935 1 cgarcia webkit-unassigned fvallee gustavo zan oldest_to_newest 1067854 0 cgarcia 2015-02-09 10:37:08 -0800 Implement WebColorPicker and enable INPUT_TYPE_COLOR by default. API to override the default implementation will be added in bug #98935 1067857 1 246276 cgarcia 2015-02-09 10:42:56 -0800 Created attachment 246276 Patch 1068301 2 cgarcia 2015-02-11 01:03:17 -0800 Committed r179922: <http://trac.webkit.org/changeset/179922> 1068302 3 cgarcia 2015-02-11 01:04:12 -0800 Also unskipped the input color tests when landing the patch, that I had forgotten :-) 1068313 4 gustavo 2015-02-11 03:23:03 -0800 Hah, I thought the layout tests would be independent of the platform implementation. 1068315 5 cgarcia 2015-02-11 03:27:18 -0800 (In reply to comment #4) > Hah, I thought the layout tests would be independent of the platform > implementation. Yes, but the patch enables INPUT_TYPE_COLOR, so now we render a color button instead of a text entry and all the logic behind ENABLE(INPUT_TYPE_COLOR) works as well. 1070378 6 fvallee 2015-02-19 03:09:06 -0800 FYI, webkitgtk cannot build anymore if INPUT_TYPE_COLOR is deactivated manually. For instance WebKitColorChooser is not under ENABLE(INPUT_TYPE_COLOR) compile flag but is inheriting from WebColorPickerGtk under INPUT_TYPE_COLOR. Is it done on purpose ? ( = INPUT_TYPE_COLOR is now mandatory) or should we support INPUT_TYPE_COLOR on/off ? (= INPUT_TYPE_COLOR check should be added everywhere) Thanks for your feedback :) 1070381 7 cgarcia 2015-02-19 03:30:10 -0800 (In reply to comment #6) > FYI, webkitgtk cannot build anymore if INPUT_TYPE_COLOR is deactivated > manually. > > For instance WebKitColorChooser is not under ENABLE(INPUT_TYPE_COLOR) > compile flag but is inheriting from WebColorPickerGtk under INPUT_TYPE_COLOR. > > Is it done on purpose ? > ( = INPUT_TYPE_COLOR is now mandatory) Yes, it's on purpose, why do you want to disable it? > or should we support INPUT_TYPE_COLOR on/off ? > (= INPUT_TYPE_COLOR check should be added everywhere) > > Thanks for your feedback :) 1070388 8 fvallee 2015-02-19 05:31:35 -0800 I don't want to deactivate it (though I guess I don't really need it). Anyway use the default webkitgtk configuration (INPUT_TYPE_COLOR = ON) is ok, thanks for answer. 246276 2015-02-09 10:42:56 -0800 2015-02-10 06:20:45 -0800 Patch wk2-color-chooser.diff text/plain 13239 cgarcia ZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCAyZDFiODBmLi44YmQ5N2M5 IDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cKKysrIGIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAK KzIwMTUtMDItMDkgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgor CisgICAgICAgIFtHVEtdIEFkZCBkZWZhdWx0IGNvbG9yIGNob29zZXIgaW1wbGVtZW50YXRpb24g dXNpbmcgR3RrQ29sb3JDaG9vc2VyRGlhbG9nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNDEzOTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBFbmFibGUgSU5QVVRfVFlQRV9DT0xPUiBieSBkZWZhdWx0IGZv ciBHVEsrIHBvcnQuCisKKyAgICAgICAgKiBTb3VyY2UvY21ha2UvT3B0aW9uc0dUSy5jbWFrZToK KwogMjAxNS0wMi0wNSAgWW91ZW5uIEZhYmxldCAgPHlvdWVubi5mYWJsZXRAY3JmLmNhbm9uLmZy PiBhbmQgWGFiaWVyIFJvZHJpZ3VleiBDYWx2YXIgPGNhbHZhcmlzQGlnYWxpYS5jb20+CiAKICAg ICAgICAgW1N0cmVhbXMgQVBJXSBJbXBsZW1lbnQgYSBiYXJlYm9uZSBSZWFkYWJsZVN0cmVhbSBp bnRlcmZhY2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9X ZWJLaXQyL0NoYW5nZUxvZwppbmRleCBkNTY0ZTU5Li5mYWVlZWVlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0x LDUgKzEsMzEgQEAKIDIwMTUtMDItMDkgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBp Z2FsaWEuY29tPgogCisgICAgICAgIFtHVEtdIEFkZCBkZWZhdWx0IGNvbG9yIGNob29zZXIgaW1w bGVtZW50YXRpb24gdXNpbmcgR3RrQ29sb3JDaG9vc2VyRGlhbG9nCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDEzOTIKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFBsYXRmb3JtR1RLLmNtYWtlOiBBZGQg bmV3IGZpbGVzIHRvIGNvbXBpbGF0aW9uLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1Bh Z2VDbGllbnRJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UGFnZUNsaWVudEltcGw6OmNyZWF0 ZUNvbG9yUGlja2VyKTogQ2FsbCBXZWJDb2xvclBpY2tlckd0azo6Y3JlYXRlKCkuCisgICAgICAg ICogVUlQcm9jZXNzL2d0ay9XZWJDb2xvclBpY2tlckd0ay5jcHA6IEFkZGVkLgorICAgICAgICAo V2ViS2l0OjpXZWJDb2xvclBpY2tlckd0azo6Y3JlYXRlKToKKyAgICAgICAgKFdlYktpdDo6V2Vi Q29sb3JQaWNrZXJHdGs6OldlYkNvbG9yUGlja2VyR3RrKToKKyAgICAgICAgKFdlYktpdDo6V2Vi Q29sb3JQaWNrZXJHdGs6On5XZWJDb2xvclBpY2tlckd0ayk6CisgICAgICAgIChXZWJLaXQ6Oldl YkNvbG9yUGlja2VyR3RrOjpjYW5jZWwpOiBTZXQgaW5pdGlhbCBjb2xvci4KKyAgICAgICAgKFdl YktpdDo6V2ViQ29sb3JQaWNrZXJHdGs6OmVuZFBpY2tlcik6IERlc3Ryb3kgdGhlIGNvbG9yIGNo b29zZXIgZGlhbG9nLgorICAgICAgICAoV2ViS2l0OjpXZWJDb2xvclBpY2tlckd0azo6ZGlkQ2hv b3NlQ29sb3IpOiBOb3RpZnkgdGhlIGNsaWVudC4KKyAgICAgICAgKFdlYktpdDo6V2ViQ29sb3JQ aWNrZXJHdGs6OmNvbG9yQ2hvb3NlckRpYWxvZ1JHQkFDaGFuZ2VkQ2FsbGJhY2spOgorICAgICAg ICBVcGRhdGUgdGhlIHNlbGVjdGVkIGNvbG9yLgorICAgICAgICAoV2ViS2l0OjpXZWJDb2xvclBp Y2tlckd0azo6Y29sb3JDaG9vc2VyRGlhbG9nUmVzcG9uc2VDYWxsYmFjayk6CisgICAgICAgIENh bmNlbCBvciBmaW5pc2ggdGhlIG9wZXJhdGlvbiBkZXBlbmRpbmcgb24gdGhlIGRpYWxvZyByZXNw b25zZS4KKyAgICAgICAgKFdlYktpdDo6V2ViQ29sb3JQaWNrZXJHdGs6OnNob3dDb2xvclBpY2tl cik6IENyZWF0ZSBhCisgICAgICAgIEd0a0NvbG9yQ2hvb3NlckRpYWxvZyB0byBoYW5kbGUgdGhl IGNvbG9yIHBpY2tlciBvcGVyYXRpb24uCisgICAgICAgICogVUlQcm9jZXNzL2d0ay9XZWJDb2xv clBpY2tlckd0ay5oOiBBZGRlZC4KKyAgICAgICAgKFdlYktpdDo6V2ViQ29sb3JQaWNrZXJHdGs6 OmluaXRpYWxDb2xvcik6CisKKzIwMTUtMDItMDkgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dh cmNpYUBpZ2FsaWEuY29tPgorCiAgICAgICAgIFJFR1JFU1NJT04ocjE3OTcwNSk6IFtHVEtdIFRo ZSBXZWIgSW5zcGVjdG9yIGRvZXNuJ3Qgd29yayBhZnRlciByMTc5NzA1CiAgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDEzMzMKIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvUGxhdGZvcm1HVEsuY21ha2UgYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9y bUdUSy5jbWFrZQppbmRleCA0MDNkM2YwLi5iNDEwY2I2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9QbGF0Zm9ybUdUSy5jbWFrZQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybUdUSy5j bWFrZQpAQCAtMjc0LDYgKzI3NCw3IEBAIGxpc3QoQVBQRU5EIFdlYktpdDJfU09VUkNFUwogICAg IFVJUHJvY2Vzcy9ndGsvSW5wdXRNZXRob2RGaWx0ZXIuY3BwCiAgICAgVUlQcm9jZXNzL2d0ay9S ZWRpcmVjdGVkWENvbXBvc2l0ZVdpbmRvdy5jcHAKICAgICBVSVByb2Nlc3MvZ3RrL1RleHRDaGVj a2VyR3RrLmNwcAorICAgIFVJUHJvY2Vzcy9ndGsvV2ViQ29sb3JQaWNrZXJHdGsuY3BwCiAgICAg VUlQcm9jZXNzL2d0ay9XZWJDb250ZXh0TWVudVByb3h5R3RrLmNwcAogICAgIFVJUHJvY2Vzcy9n dGsvV2ViRnVsbFNjcmVlbkNsaWVudEd0ay5jcHAKICAgICBVSVByb2Nlc3MvZ3RrL1dlYkluc3Bl Y3RvckNsaWVudEd0ay5jcHAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZ3RrL1BhZ2VDbGllbnRJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Z3RrL1BhZ2VDbGllbnRJbXBsLmNwcAppbmRleCA5Mjk5NjA4Li5lNzM4OGI0IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9QYWdlQ2xpZW50SW1wbC5jcHAKKysr IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNsaWVudEltcGwuY3BwCkBA IC0zMiw2ICszMiw3IEBACiAjaW5jbHVkZSAiTmF0aXZlV2ViS2V5Ym9hcmRFdmVudC5oIgogI2lu Y2x1ZGUgIk5hdGl2ZVdlYk1vdXNlRXZlbnQuaCIKICNpbmNsdWRlICJOb3RJbXBsZW1lbnRlZC5o IgorI2luY2x1ZGUgIldlYkNvbG9yUGlja2VyR3RrLmgiCiAjaW5jbHVkZSAiV2ViQ29udGV4dE1l bnVQcm94eUd0ay5oIgogI2luY2x1ZGUgIldlYkV2ZW50RmFjdG9yeS5oIgogI2luY2x1ZGUgIldl YktpdFdlYlZpZXdCYXNlUHJpdmF0ZS5oIgpAQCAtMjI2LDEwICsyMjcsOSBAQCBQYXNzUmVmUHRy PFdlYkNvbnRleHRNZW51UHJveHk+IFBhZ2VDbGllbnRJbXBsOjpjcmVhdGVDb250ZXh0TWVudVBy b3h5KFdlYlBhZ2VQcgogfQogCiAjaWYgRU5BQkxFKElOUFVUX1RZUEVfQ09MT1IpCi1QYXNzUmVm UHRyPFdlYkNvbG9yUGlja2VyPiBQYWdlQ2xpZW50SW1wbDo6Y3JlYXRlQ29sb3JQaWNrZXIoV2Vi UGFnZVByb3h5KiwgY29uc3QgV2ViQ29yZTo6Q29sb3ImLCBjb25zdCBXZWJDb3JlOjpJbnRSZWN0 JikKK1Bhc3NSZWZQdHI8V2ViQ29sb3JQaWNrZXI+IFBhZ2VDbGllbnRJbXBsOjpjcmVhdGVDb2xv clBpY2tlcihXZWJQYWdlUHJveHkqIHBhZ2UsIGNvbnN0IFdlYkNvcmU6OkNvbG9yJiBjb2xvciwg Y29uc3QgV2ViQ29yZTo6SW50UmVjdCYgcmVjdCkKIHsKLSAgICBub3RJbXBsZW1lbnRlZCgpOwot ICAgIHJldHVybiAwOworICAgIHJldHVybiBXZWJDb2xvclBpY2tlckd0azo6Y3JlYXRlKCpwYWdl LCBjb2xvciwgcmVjdCk7CiB9CiAjZW5kaWYKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL2d0ay9XZWJDb2xvclBpY2tlckd0ay5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvZ3RrL1dlYkNvbG9yUGlja2VyR3RrLmNwcApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRl eCAwMDAwMDAwLi5jNGY2NTgzCi0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL2d0ay9XZWJDb2xvclBpY2tlckd0ay5jcHAKQEAgLTAsMCArMSwxMTUgQEAKKy8qCisg KiBDb3B5cmlnaHQgKEMpIDIwMTUgSWdhbGlhIFMuTC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBh bmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1v ZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29u ZGl0aW9ucworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29k ZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlz dCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiBSZWRp c3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHly aWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxv d2luZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIg bWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElTIFNP RlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMgQVMg SVMnJworICogQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5H LCBCVVQgTk9UIExJTUlURUQgVE8sCisgKiBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNI QU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQT1NFIEFSRSBE SVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRP UlMKKyAqIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQ RUNJQUwsIEVYRU1QTEFSWSwgT1IKKyAqIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5H LCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GCisgKiBTVUJTVElUVVRFIEdPT0RT IE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MK KyAqIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElB QklMSVRZLCBXSEVUSEVSIElOCisgKiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9S VCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKQorICogQVJJU0lORyBJTiBBTlkg V0FZIE9VVCBPRiBUSEUgVVNFIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRgor ICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisKKyNpbmNsdWRlICJjb25m aWcuaCIKKyNpbmNsdWRlICJXZWJDb2xvclBpY2tlckd0ay5oIgorCisjaWYgRU5BQkxFKElOUFVU X1RZUEVfQ09MT1IpCisKKyNpbmNsdWRlICJXZWJQYWdlUHJveHkuaCIKKyNpbmNsdWRlIDxXZWJD b3JlL0d0a1V0aWxpdGllcy5oPgorI2luY2x1ZGUgPGdsaWIvZ2kxOG4tbGliLmg+CisjaW5jbHVk ZSA8Z3RrL2d0ay5oPgorCit1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKKworbmFtZXNwYWNlIFdl YktpdCB7CisKK1Bhc3NSZWZQdHI8V2ViQ29sb3JQaWNrZXJHdGs+IFdlYkNvbG9yUGlja2VyR3Rr OjpjcmVhdGUoV2ViUGFnZVByb3h5JiBwYWdlLCBjb25zdCBDb2xvciYgaW5pdGlhbENvbG9yLCBj b25zdCBJbnRSZWN0JiByZWN0KQoreworICAgIHJldHVybiBhZG9wdFJlZihuZXcgV2ViQ29sb3JQ aWNrZXJHdGsocGFnZSwgaW5pdGlhbENvbG9yLCByZWN0KSk7Cit9CisKK1dlYkNvbG9yUGlja2Vy R3RrOjpXZWJDb2xvclBpY2tlckd0ayhXZWJQYWdlUHJveHkmIHBhZ2UsIGNvbnN0IENvbG9yJiBp bml0aWFsQ29sb3IsIGNvbnN0IEludFJlY3QmKQorICAgIDogV2ViQ29sb3JQaWNrZXIoJnBhZ2Up CisgICAgLCBtX2luaXRpYWxDb2xvcihpbml0aWFsQ29sb3IpCisgICAgLCBtX3dlYlZpZXcocGFn ZS52aWV3V2lkZ2V0KCkpCisgICAgLCBtX2NvbG9yQ2hvb3NlcihudWxscHRyKQoreworfQorCitX ZWJDb2xvclBpY2tlckd0azo6fldlYkNvbG9yUGlja2VyR3RrKCkKK3sKKyAgICBlbmRQaWNrZXIo KTsKK30KKwordm9pZCBXZWJDb2xvclBpY2tlckd0azo6Y2FuY2VsKCkKK3sKKyAgICBzZXRTZWxl Y3RlZENvbG9yKG1faW5pdGlhbENvbG9yKTsKK30KKwordm9pZCBXZWJDb2xvclBpY2tlckd0azo6 ZW5kUGlja2VyKCkKK3sKKyAgICBpZiAoIW1fY29sb3JDaG9vc2VyKQorICAgICAgICByZXR1cm47 CisKKyAgICBndGtfd2lkZ2V0X2Rlc3Ryb3kobV9jb2xvckNob29zZXIpOworICAgIG1fY29sb3JD aG9vc2VyID0gbnVsbHB0cjsKK30KKwordm9pZCBXZWJDb2xvclBpY2tlckd0azo6ZGlkQ2hvb3Nl Q29sb3IoY29uc3QgQ29sb3ImIGNvbG9yKQoreworICAgIGlmICghbV9jbGllbnQpCisgICAgICAg IHJldHVybjsKKworICAgIG1fY2xpZW50LT5kaWRDaG9vc2VDb2xvcihjb2xvcik7Cit9CisKK3Zv aWQgV2ViQ29sb3JQaWNrZXJHdGs6OmNvbG9yQ2hvb3NlckRpYWxvZ1JHQkFDaGFuZ2VkQ2FsbGJh Y2soR3RrQ29sb3JDaG9vc2VyKiBjb2xvckNob29zZXIsIEdQYXJhbVNwZWMqLCBXZWJDb2xvclBp Y2tlckd0ayogY29sb3JQaWNrZXIpCit7CisgICAgR2RrUkdCQSByZ2JhOworICAgIGd0a19jb2xv cl9jaG9vc2VyX2dldF9yZ2JhKGNvbG9yQ2hvb3NlciwgJnJnYmEpOworICAgIGNvbG9yUGlja2Vy LT5kaWRDaG9vc2VDb2xvcihyZ2JhKTsKK30KKwordm9pZCBXZWJDb2xvclBpY2tlckd0azo6Y29s b3JDaG9vc2VyRGlhbG9nUmVzcG9uc2VDYWxsYmFjayhHdGtDb2xvckNob29zZXIqLCBpbnQgcmVz cG9uc2VJRCwgV2ViQ29sb3JQaWNrZXJHdGsqIGNvbG9yUGlja2VyKQoreworICAgIGlmIChyZXNw b25zZUlEICE9IEdUS19SRVNQT05TRV9PSykKKyAgICAgICAgY29sb3JQaWNrZXItPmNhbmNlbCgp OworICAgIGNvbG9yUGlja2VyLT5lbmRQaWNrZXIoKTsKK30KKwordm9pZCBXZWJDb2xvclBpY2tl ckd0azo6c2hvd0NvbG9yUGlja2VyKGNvbnN0IENvbG9yJiBjb2xvcikKK3sKKyAgICBpZiAoIW1f Y2xpZW50KQorICAgICAgICByZXR1cm47CisKKyAgICBtX2luaXRpYWxDb2xvciA9IGNvbG9yOwor CisgICAgaWYgKCFtX2NvbG9yQ2hvb3NlcikgeworICAgICAgICBHdGtXaWRnZXQqIHRvcGxldmVs ID0gZ3RrX3dpZGdldF9nZXRfdG9wbGV2ZWwobV93ZWJWaWV3KTsKKyAgICAgICAgbV9jb2xvckNo b29zZXIgPSBndGtfY29sb3JfY2hvb3Nlcl9kaWFsb2dfbmV3KF8oIlNlbGVjdCBDb2xvciIpLCBX ZWJDb3JlOjp3aWRnZXRJc09uc2NyZWVuVG9wbGV2ZWxXaW5kb3codG9wbGV2ZWwpID8gR1RLX1dJ TkRPVyh0b3BsZXZlbCkgOiBudWxscHRyKTsKKyAgICAgICAgZ3RrX2NvbG9yX2Nob29zZXJfc2V0 X3JnYmEoR1RLX0NPTE9SX0NIT09TRVIobV9jb2xvckNob29zZXIpLCAmbV9pbml0aWFsQ29sb3Ip OworICAgICAgICBnX3NpZ25hbF9jb25uZWN0KG1fY29sb3JDaG9vc2VyLCAibm90aWZ5OjpyZ2Jh IiwgR19DQUxMQkFDSyhXZWJDb2xvclBpY2tlckd0azo6Y29sb3JDaG9vc2VyRGlhbG9nUkdCQUNo YW5nZWRDYWxsYmFjayksIHRoaXMpOworICAgICAgICBnX3NpZ25hbF9jb25uZWN0KG1fY29sb3JD aG9vc2VyLCAicmVzcG9uc2UiLCBHX0NBTExCQUNLKFdlYkNvbG9yUGlja2VyR3RrOjpjb2xvckNo b29zZXJEaWFsb2dSZXNwb25zZUNhbGxiYWNrKSwgdGhpcyk7CisgICAgfSBlbHNlCisgICAgICAg IGd0a19jb2xvcl9jaG9vc2VyX3NldF9yZ2JhKEdUS19DT0xPUl9DSE9PU0VSKG1fY29sb3JDaG9v c2VyKSwgJm1faW5pdGlhbENvbG9yKTsKKworICAgIGd0a193aWRnZXRfc2hvdyhtX2NvbG9yQ2hv b3Nlcik7Cit9CisKK30gLy8gbmFtZXNwYWNlIFdlYktpdAorCisjZW5kaWYgLy8gRU5BQkxFKElO UFVUX1RZUEVfQ09MT1IpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3Rr L1dlYkNvbG9yUGlja2VyR3RrLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL1dlYkNv bG9yUGlja2VyR3RrLmgKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNjcwMTgx NQotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9ndGsvV2ViQ29s b3JQaWNrZXJHdGsuaApAQCAtMCwwICsxLDczIEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDE1 IElnYWxpYSBTLkwuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5k IGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJt aXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6 CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFi b3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQg dGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFy eSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwg dGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0 aGUKKyAqICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3 aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBC WSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIEFTIElTJycKKyAqIEFORCBBTlkgRVhQ UkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRP LAorICogVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5F U1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZF TlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTCisgKiBCRSBMSUFCTEUgRk9S IEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9S CisgKiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRP LCBQUk9DVVJFTUVOVCBPRgorICogU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBP RiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTCisgKiBJTlRFUlJVUFRJT04pIEhP V0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgor ICogQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdF TkNFIE9SIE9USEVSV0lTRSkKKyAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBP RiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YKKyAqIFRIRSBQT1NTSUJJTElUWSBP RiBTVUNIIERBTUFHRS4KKyAqLworCisjaWZuZGVmIFdlYkNvbG9yUGlja2VyR3RrX2gKKyNkZWZp bmUgV2ViQ29sb3JQaWNrZXJHdGtfaAorCisjaWYgRU5BQkxFKElOUFVUX1RZUEVfQ09MT1IpCisK KyNpbmNsdWRlICJXZWJDb2xvclBpY2tlci5oIgorI2luY2x1ZGUgPGdkay9nZGsuaD4KKwordHlw ZWRlZiBzdHJ1Y3QgX0d0a0NvbG9yQ2hvb3NlciBHdGtDb2xvckNob29zZXI7CisKK25hbWVzcGFj ZSBXZWJDb3JlIHsKK2NsYXNzIENvbG9yOworY2xhc3MgSW50UmVjdDsKK30KKworbmFtZXNwYWNl IFdlYktpdCB7CisKK2NsYXNzIFdlYkNvbG9yUGlja2VyR3RrIDogcHVibGljIFdlYkNvbG9yUGlj a2VyIHsKK3B1YmxpYzoKKyAgICBzdGF0aWMgUGFzc1JlZlB0cjxXZWJDb2xvclBpY2tlckd0az4g Y3JlYXRlKFdlYlBhZ2VQcm94eSYsIGNvbnN0IFdlYkNvcmU6OkNvbG9yJiwgY29uc3QgV2ViQ29y ZTo6SW50UmVjdCYpOworICAgIHZpcnR1YWwgfldlYkNvbG9yUGlja2VyR3RrKCk7CisKKyAgICB2 aXJ0dWFsIHZvaWQgZW5kUGlja2VyKCkgb3ZlcnJpZGU7CisgICAgdmlydHVhbCB2b2lkIHNob3dD b2xvclBpY2tlcihjb25zdCBXZWJDb3JlOjpDb2xvciYpIG92ZXJyaWRlOworCisgICAgdm9pZCBj YW5jZWwoKTsKKworICAgIGNvbnN0IEdka1JHQkEqIGluaXRpYWxDb2xvcigpIGNvbnN0IHsgcmV0 dXJuICZtX2luaXRpYWxDb2xvcjsgfQorCitwcm90ZWN0ZWQ6CisgICAgV2ViQ29sb3JQaWNrZXJH dGsoV2ViUGFnZVByb3h5JiwgY29uc3QgV2ViQ29yZTo6Q29sb3ImLCBjb25zdCBXZWJDb3JlOjpJ bnRSZWN0Jik7CisKKyAgICB2b2lkIGRpZENob29zZUNvbG9yKGNvbnN0IFdlYkNvcmU6OkNvbG9y Jik7CisKKyAgICBHZGtSR0JBIG1faW5pdGlhbENvbG9yOworICAgIEd0a1dpZGdldCogbV93ZWJW aWV3OworCitwcml2YXRlOgorICAgIHN0YXRpYyB2b2lkIGNvbG9yQ2hvb3NlckRpYWxvZ1JHQkFD aGFuZ2VkQ2FsbGJhY2soR3RrQ29sb3JDaG9vc2VyKiwgR1BhcmFtU3BlYyosIFdlYkNvbG9yUGlj a2VyR3RrKik7CisgICAgc3RhdGljIHZvaWQgY29sb3JDaG9vc2VyRGlhbG9nUmVzcG9uc2VDYWxs YmFjayhHdGtDb2xvckNob29zZXIqLCBpbnQgLypyZXNwb25zZUlEKi8sIFdlYkNvbG9yUGlja2Vy R3RrKik7CisKKyAgICBHdGtXaWRnZXQqIG1fY29sb3JDaG9vc2VyOworfTsKKworfSAvLyBuYW1l c3BhY2UgV2ViS2l0CisKKyNlbmRpZiAvLyBFTkFCTEUoSU5QVVRfVFlQRV9DT0xPUikKKyNlbmRp ZiAvLyBXZWJDb2xvclBpY2tlckd0a19oCmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvT3B0aW9u c0dUSy5jbWFrZSBiL1NvdXJjZS9jbWFrZS9PcHRpb25zR1RLLmNtYWtlCmluZGV4IGNkZTJmZmUu LmQ0ZTRiZWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9jbWFrZS9PcHRpb25zR1RLLmNtYWtlCisrKyBi L1NvdXJjZS9jbWFrZS9PcHRpb25zR1RLLmNtYWtlCkBAIC0xNDMsNyArMTQzLDcgQEAgV0VCS0lU X09QVElPTl9ERUZBVUxUX1BPUlRfVkFMVUUoRU5BQkxFX0dBTUVQQUQgT0ZGKQogV0VCS0lUX09Q VElPTl9ERUZBVUxUX1BPUlRfVkFMVUUoRU5BQkxFX0dBTUVQQURfREVQUkVDQVRFRCBPRkYpCiBX RUJLSVRfT1BUSU9OX0RFRkFVTFRfUE9SVF9WQUxVRShFTkFCTEVfSU5ERVhFRF9EQVRBQkFTRSBP RkYpCiBXRUJLSVRfT1BUSU9OX0RFRkFVTFRfUE9SVF9WQUxVRShFTkFCTEVfSU5ERVhFRF9EQVRB QkFTRV9JTl9XT1JLRVJTIE9GRikKLVdFQktJVF9PUFRJT05fREVGQVVMVF9QT1JUX1ZBTFVFKEVO QUJMRV9JTlBVVF9UWVBFX0NPTE9SIE9GRikKK1dFQktJVF9PUFRJT05fREVGQVVMVF9QT1JUX1ZB TFVFKEVOQUJMRV9JTlBVVF9UWVBFX0NPTE9SIE9OKQogV0VCS0lUX09QVElPTl9ERUZBVUxUX1BP UlRfVkFMVUUoRU5BQkxFX0xFR0FDWV9XRUJfQVVESU8gT0ZGKQogV0VCS0lUX09QVElPTl9ERUZB VUxUX1BPUlRfVkFMVUUoRU5BQkxFX0xJTktfUFJFRkVUQ0ggT0ZGKQogV0VCS0lUX09QVElPTl9E RUZBVUxUX1BPUlRfVkFMVUUoRU5BQkxFX01FRElBX0NBUFRVUkUgT0ZGKQpkaWZmIC0tZ2l0IGEv VG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDNmMGUwNzQuLjUxNTA2YTAg MTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNCBAQAorMjAxNS0wMi0wOSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGln YWxpYS5jb20+CisKKyAgICAgICAgW0dUS10gQWRkIGRlZmF1bHQgY29sb3IgY2hvb3NlciBpbXBs ZW1lbnRhdGlvbiB1c2luZyBHdGtDb2xvckNob29zZXJEaWFsb2cKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MTM5MgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEVuYWJsZSBJTlBVVF9UWVBFX0NPTE9SIGJ5 IGRlZmF1bHQgZm9yIEdUSysgcG9ydC4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cGVybC9G ZWF0dXJlTGlzdC5wbToKKwogMjAxNS0wMi0wOCAgQ2hyaXMgRmxlaXphY2ggIDxjZmxlaXphY2hA YXBwbGUuY29tPgogCiAgICAgICAgIEFYOiBWb2ljZU92ZXIgYXBwZWFycyB1bnJlc3BvbnNpdmUg d2hlbiBKYXZhU2NyaXB0IGFsZXJ0cyBhcmUgdHJpZ2dlcmVkIHZpYSBmb2N1cyBvciBibHVyIGV2 ZW50cwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRwZXJsL0ZlYXR1cmVMaXN0LnBt IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRwZXJsL0ZlYXR1cmVMaXN0LnBtCmluZGV4IGZkNGJhNzku LjM1NDI1ZjUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cGVybC9GZWF0dXJlTGlz dC5wbQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHBlcmwvRmVhdHVyZUxpc3QucG0KQEAgLTI1 Nyw3ICsyNTcsNyBAQCBteSBAZmVhdHVyZXMgPSAoCiAgICAgICBkZWZpbmUgPT4gIkVOQUJMRV9J TlBVVF9TUEVFQ0giLCBkZWZhdWx0ID0+IDAsIHZhbHVlID0+IFwkaW5wdXRTcGVlY2hTdXBwb3J0 IH0sCiAKICAgICB7IG9wdGlvbiA9PiAiaW5wdXQtdHlwZS1jb2xvciIsIGRlc2MgPT4gIlRvZ2ds ZSBJbnB1dCBUeXBlIENvbG9yIHN1cHBvcnQiLAotICAgICAgZGVmaW5lID0+ICJFTkFCTEVfSU5Q VVRfVFlQRV9DT0xPUiIsIGRlZmF1bHQgPT4gaXNFZmwoKSwgdmFsdWUgPT4gXCRpbnB1dFR5cGVD b2xvclN1cHBvcnQgfSwKKyAgICAgIGRlZmluZSA9PiAiRU5BQkxFX0lOUFVUX1RZUEVfQ09MT1Ii LCBkZWZhdWx0ID0+IChpc0VmbCgpIHx8IGlzR3RrKCkpLCB2YWx1ZSA9PiBcJGlucHV0VHlwZUNv bG9yU3VwcG9ydCB9LAogCiAgICAgeyBvcHRpb24gPT4gImlucHV0LXR5cGUtZGF0ZSIsIGRlc2Mg PT4gIlRvZ2dsZSBJbnB1dCBUeXBlIERhdGUgc3VwcG9ydCIsCiAgICAgICBkZWZpbmUgPT4gIkVO QUJMRV9JTlBVVF9UWVBFX0RBVEUiLCBkZWZhdWx0ID0+IDAsIHZhbHVlID0+IFwkaW5wdXRUeXBl RGF0ZVN1cHBvcnQgfSwK