131099 2014-04-02 04:24:22 -0700 [GTK] Compile all installed resources as GResources 2014-05-15 01:07:10 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 130899 1 cgarcia webkit-unassigned bunhere cdumez commit-queue eric.carlson glenn gustavo gyuyoung.kim jer.noble philipj pnormand rakuco sergio oldest_to_newest 996664 0 cgarcia 2014-04-02 04:24:22 -0700 We currently install a few images and wav file in $prefix/share. These resources are shared between wk1 and wk2. If we compile them as gresources, we don't have to worry anymore about resources not being available because wk was not yet installed, or using hacks to make out tools find the resources. This also avoid conflicts for parallel installable versions of webkit, since the resources dir installed is not versioned. 1009307 1 231460 cgarcia 2014-05-14 11:38:38 -0700 Created attachment 231460 Patch 1009317 2 231460 pnormand 2014-05-14 12:39:06 -0700 Comment on attachment 231460 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=231460&action=review > Source/WebCore/platform/audio/gtk/AudioBusGtk.cpp:-42 > - return createBusFromAudioFile(absoluteFilename.get(), false, sampleRate); Is this function used anywhere else now? I haven't checked :) 1009471 3 cgarcia 2014-05-15 00:14:25 -0700 (In reply to comment #2) > (From update of attachment 231460 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=231460&action=review > > > Source/WebCore/platform/audio/gtk/AudioBusGtk.cpp:-42 > > - return createBusFromAudioFile(absoluteFilename.get(), false, sampleRate); > > Is this function used anywhere else now? I haven't checked :) It seems that mac also implements it (in both mac and IOS), but only EFL uses it. platform/audio/AudioFileReader.h:PassRefPtr<AudioBus> createBusFromAudioFile(const char* filePath, bool mixToMono, float sampleRate); platform/audio/efl/AudioBusEfl.cpp: return createBusFromAudioFile(absoluteFilename.utf8().data(), false, sampleRate); platform/audio/gstreamer/AudioFileReaderGStreamer.cpp:PassRefPtr<AudioBus> createBusFromAudioFile(const char* filePath, bool mixToMono, float sampleRate) platform/audio/ios/AudioFileReaderIOS.cpp:PassRefPtr<AudioBus> createBusFromAudioFile(const char* filePath, bool mixToMono, float sampleRate) platform/audio/mac/AudioFileReaderMac.cpp:PassRefPtr<AudioBus> createBusFromAudioFile(const char* filePath, bool mixToMono, float sampleRate) 1009475 4 231460 pnormand 2014-05-15 00:23:51 -0700 Comment on attachment 231460 Patch Looks good, thanks! 1009483 5 cgarcia 2014-05-15 01:07:10 -0700 Committed r168894: <http://trac.webkit.org/changeset/168894> 231460 2014-05-14 11:38:38 -0700 2014-05-15 00:23:50 -0700 Patch wk-gresources.diff text/plain 14053 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAzMDllMDZiLi43NDQ0YTdmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjgg QEAKKzIwMTQtMDUtMTQgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIENvbXBpbGUgYWxsIGluc3RhbGxlZCByZXNvdXJjZXMgYXMgR1Jl c291cmNlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTMxMDk5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBQbGF0Zm9ybUdUSy5jbWFrZTogRG8gbm90IGluc3RhbGwgdGhlIHJlc291cmNlcy4KKyAgICAg ICAgKiBwbGF0Zm9ybS9hdWRpby9ndGsvQXVkaW9CdXNHdGsuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6QXVkaW9CdXM6OmxvYWRQbGF0Zm9ybVJlc291cmNlKTogTG9hZCB0aGUgYXVkaW8gcmVzb3Vy Y2UKKyAgICAgICAgZnJvbSBHUmVzb3VyY2VzIGFuZCB1c2UgY3JlYXRlQnVzRnJvbUluTWVtb3J5 QXVkaW9GaWxlKCkuCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvSW1hZ2UuaDogUmVtb3Zl IHVuc3VlZCBmdW5jdGlvbiBsb2FkUGxhdGZvcm1UaGVtZUljb24uCisgICAgICAgICogcGxhdGZv cm0vZ3JhcGhpY3MvZ3RrL0ltYWdlR3RrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmxvYWRJbWFn ZUZyb21HUmVzb3VyY2UpOiBMb2FkIHRoZSBnaXZlbiBpY29uIG5hbWUgZnJvbSBHUmVzb3VyY2Vz LgorICAgICAgICAoV2ViQ29yZTo6bG9hZFJlc291cmNlU2hhcmVkQnVmZmVyKTogVXNlIGNoYXIq IGluc3RlYWQgb2YgQ1N0cmluZy4KKyAgICAgICAgKFdlYkNvcmU6OmxvYWRNaXNzaW5nSW1hZ2VJ Y29uRnJvbVRoZW1lKTogVHJ5IHRvIGxvYWQgdGhlIG1pc3NpbmcKKyAgICAgICAgaWNvbiBmcm9t IHRoZSBjdXJyZW50IEdUSyBpY29uIHRoZW1lLgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2U6Omxv YWRQbGF0Zm9ybVJlc291cmNlKTogQ2FsbAorICAgICAgICBsb2FkTWlzc2luZ0ltYWdlSWNvbkZy b21UaGVtZSBmb3IgbWlzc2luZyBpY29uIG9yCisgICAgICAgIGxvYWRJbWFnZUZyb21HUmVzb3Vy Y2UgZm9yIGFueSBvdGhlciBpY29uIG5hbWUuCisgICAgICAgIChXZWJDb3JlOjpnZXRQYXRoVG9J bWFnZVJlc291cmNlKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OmdldFRoZW1lSWNvbkZp bGVOYW1lKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OmxvYWRJbWFnZUZyb21GaWxlKTog RGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkltYWdlOjpsb2FkUGxhdGZvcm1UaGVtZUljb24p OiBEZWxldGVkLgorCiAyMDE0LTA1LTE0ICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNv bT4KIAogICAgICAgICBHSUYgYW5pbWF0aW9ucyBkb24ndCByZXN0YXJ0IGFmdGVyIHNjcm9sbGlu ZyBvbiBpT1MgV2ViS2l0MQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvUGxhdGZvcm1HVEsu Y21ha2UgYi9Tb3VyY2UvV2ViQ29yZS9QbGF0Zm9ybUdUSy5jbWFrZQppbmRleCA4MDU2MWE5Li4y NDEyNWQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9QbGF0Zm9ybUdUSy5jbWFrZQorKysg Yi9Tb3VyY2UvV2ViQ29yZS9QbGF0Zm9ybUdUSy5jbWFrZQpAQCAtMzg1LDIyICszODUsNiBAQCBp ZiAoV1RGX1VTRV9FR0wpCiAgICAgKQogZW5kaWYgKCkKIAotaW5zdGFsbChGSUxFUyAiJHtXRUJD T1JFX0RJUn0vUmVzb3VyY2VzL3RleHRBcmVhUmVzaXplQ29ybmVyLnBuZyIKLSAgICAgICAgICAg ICAgIiR7V0VCQ09SRV9ESVJ9L1Jlc291cmNlcy9udWxsUGx1Z2luLnBuZyIKLSAgICAgICAgICAg ICAgIiR7V0VCQ09SRV9ESVJ9L1Jlc291cmNlcy91cmxJY29uLnBuZyIKLSAgICAgICAgICAgICAg IiR7V0VCQ09SRV9ESVJ9L1Jlc291cmNlcy9taXNzaW5nSW1hZ2UucG5nIgotICAgICAgICAgICAg ICAiJHtXRUJDT1JFX0RJUn0vUmVzb3VyY2VzL3Bhbkljb24ucG5nIgotICAgICAgICAgICAgICAi JHtXRUJDT1JFX0RJUn0vUmVzb3VyY2VzL2RlbGV0ZUJ1dHRvbi5wbmciCi0gICAgICAgICAgICAg ICIke1dFQkNPUkVfRElSfS9SZXNvdXJjZXMvaW5wdXRTcGVlY2gucG5nIgotICAgICAgICBERVNU SU5BVElPTiAiJHtEQVRBX0lOU1RBTExfRElSfS9pbWFnZXMiCi0pCi0KLWlmIChFTkFCTEVfV0VC X0FVRElPKQotICAgIGluc3RhbGwoRklMRVMgIiR7V0VCQ09SRV9ESVJ9L3BsYXRmb3JtL2F1ZGlv L3Jlc291cmNlcy9Db21wb3NpdGUud2F2IgotICAgICAgICAgICAgREVTVElOQVRJT04gIiR7REFU QV9JTlNUQUxMX0RJUn0vcmVzb3VyY2VzL2F1ZGlvIgotICAgICkKLWVuZGlmICgpCi0KIGlmIChF TkFCTEVfV0VCS0lUMikKICAgICAjIFdlYktpdDIgbmVlZHMgYSB2ZXJzaW9uIG9mIFdlYkNvcmUg Y29tcGlsZWQgYWdhaW5zdCBHVEsrMiwgc28gd2UndmUgaXNvbGF0ZWQgYWxsIHRoZSBHVEsrCiAg ICAgIyBkZXBlbmRlbnQgZmlsZXMgaW50byBhIHNlcGFyYXRlIGxpYnJhcnkgd2hpY2ggY2FuIGJl IHVzZWQgdG8gY29uc3RydWN0IGEgR1RLKzIgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vYXVkaW8vZ3RrL0F1ZGlvQnVzR3RrLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2F1ZGlvL2d0ay9BdWRpb0J1c0d0ay5jcHAKaW5kZXggMmFkZWU5Yi4uN2E3ZTc4 ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vZ3RrL0F1ZGlvQnVz R3RrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9ndGsvQXVkaW9CdXNH dGsuY3BwCkBAIC0yMywyMyArMjMsMTggQEAKICNpbmNsdWRlICJBdWRpb0J1cy5oIgogCiAjaW5j bHVkZSAiQXVkaW9GaWxlUmVhZGVyLmgiCi0jaW5jbHVkZSAiRmlsZVN5c3RlbS5oIgotI2luY2x1 ZGUgPGdsaWIuaD4KKyNpbmNsdWRlIDxnaW8vZ2lvLmg+CisjaW5jbHVkZSA8d3RmL2dvYmplY3Qv R1JlZlB0ci5oPgogI2luY2x1ZGUgPHd0Zi9nb2JqZWN0L0dVbmlxdWVQdHIuaD4KLSNpbmNsdWRl IDx3dGYvdGV4dC9DU3RyaW5nLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogUGFzc1JlZlB0 cjxBdWRpb0J1cz4gQXVkaW9CdXM6OmxvYWRQbGF0Zm9ybVJlc291cmNlKGNvbnN0IGNoYXIqIG5h bWUsIGZsb2F0IHNhbXBsZVJhdGUpCiB7Ci0gICAgR1VuaXF1ZVB0cjxnY2hhcj4gZmlsZW5hbWUo Z19zdHJkdXBfcHJpbnRmKCIlcy53YXYiLCBuYW1lKSk7Ci0gICAgY29uc3QgY2hhciogZW52aXJv bm1lbnRQYXRoID0gZ2V0ZW52KCJBVURJT19SRVNPVVJDRVNfUEFUSCIpOwotICAgIEdVbmlxdWVQ dHI8Z2NoYXI+IGFic29sdXRlRmlsZW5hbWU7Ci0gICAgaWYgKGVudmlyb25tZW50UGF0aCkKLSAg ICAgICAgYWJzb2x1dGVGaWxlbmFtZS5yZXNldChnX2J1aWxkX2ZpbGVuYW1lKGVudmlyb25tZW50 UGF0aCwgZmlsZW5hbWUuZ2V0KCksIE5VTEwpKTsKLSAgICBlbHNlCi0gICAgICAgIGFic29sdXRl RmlsZW5hbWUucmVzZXQoZ19idWlsZF9maWxlbmFtZShzaGFyZWRSZXNvdXJjZXNQYXRoKCkuZGF0 YSgpLCAicmVzb3VyY2VzIiwgImF1ZGlvIiwgZmlsZW5hbWUuZ2V0KCksIE5VTEwpKTsKLSAgICBy ZXR1cm4gY3JlYXRlQnVzRnJvbUF1ZGlvRmlsZShhYnNvbHV0ZUZpbGVuYW1lLmdldCgpLCBmYWxz ZSwgc2FtcGxlUmF0ZSk7CisgICAgR1VuaXF1ZVB0cjxjaGFyPiBwYXRoKGdfc3RyZHVwX3ByaW50 ZigiL29yZy93ZWJraXRndGsvcmVzb3VyY2VzL2F1ZGlvLyVzIiwgbmFtZSkpOworICAgIEdSZWZQ dHI8R0J5dGVzPiBkYXRhID0gYWRvcHRHUmVmKGdfcmVzb3VyY2VzX2xvb2t1cF9kYXRhKHBhdGgu Z2V0KCksIEdfUkVTT1VSQ0VfTE9PS1VQX0ZMQUdTX05PTkUsIG51bGxwdHIpKTsKKyAgICBBU1NF UlQoZGF0YSk7CisgICAgcmV0dXJuIGNyZWF0ZUJ1c0Zyb21Jbk1lbW9yeUF1ZGlvRmlsZShnX2J5 dGVzX2dldF9kYXRhKGRhdGEuZ2V0KCksIG51bGxwdHIpLCBnX2J5dGVzX2dldF9zaXplKGRhdGEu Z2V0KCkpLCBmYWxzZSwgc2FtcGxlUmF0ZSk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ltYWdlLmggYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9JbWFnZS5oCmluZGV4IGJlOWZkZTIuLjVl NDU2ZjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ltYWdl LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvSW1hZ2UuaApAQCAtMTUy LDcgKzE1Miw2IEBAIHB1YmxpYzoKIAogI2lmIFBMQVRGT1JNKEdUSykKICAgICB2aXJ0dWFsIEdk a1BpeGJ1ZiogZ2V0R2RrUGl4YnVmKCkgeyByZXR1cm4gMDsgfQotICAgIHN0YXRpYyBQYXNzUmVm UHRyPEltYWdlPiBsb2FkUGxhdGZvcm1UaGVtZUljb24oY29uc3QgY2hhciogbmFtZSwgaW50IHNp emUpOwogI2VuZGlmCiAKICNpZiBQTEFURk9STShFRkwpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ndGsvSW1hZ2VHdGsuY3BwIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvZ3RrL0ltYWdlR3RrLmNwcAppbmRleCBkMjQyYjcyLi4wYTNiNWMz IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ndGsvSW1hZ2VH dGsuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9JbWFnZUd0 ay5jcHAKQEAgLTI2LDQ5ICsyNiwzMSBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogCiAjaW5jbHVk ZSAiQml0bWFwSW1hZ2UuaCIKLSNpbmNsdWRlICJGaWxlU3lzdGVtLmgiCiAjaW5jbHVkZSAiR1Vu aXF1ZVB0ckd0ay5oIgogI2luY2x1ZGUgIkdka0NhaXJvVXRpbGl0aWVzLmgiCiAjaW5jbHVkZSAi U2hhcmVkQnVmZmVyLmgiCi0jaW5jbHVkZSA8d3RmL2dvYmplY3QvR1VuaXF1ZVB0ci5oPgotI2lu Y2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KICNpbmNsdWRlIDxjYWlyby5oPgogI2luY2x1ZGUg PGd0ay9ndGsuaD4KKyNpbmNsdWRlIDx3dGYvZ29iamVjdC9HUmVmUHRyLmg+CisjaW5jbHVkZSA8 d3RmL2dvYmplY3QvR1VuaXF1ZVB0ci5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLXN0YXRp YyBjaGFyKiBnZXRQYXRoVG9JbWFnZVJlc291cmNlKGNoYXIqIHJlc291cmNlKQotewotICAgIGlm IChnX2dldGVudigiV0VCS0lUX1RPUF9MRVZFTCIpKQotICAgICAgICByZXR1cm4gZ19idWlsZF9m aWxlbmFtZShnX2dldGVudigiV0VCS0lUX1RPUF9MRVZFTCIpLCAiU291cmNlIiwgIldlYkNvcmUi LCAiUmVzb3VyY2VzIiwgcmVzb3VyY2UsIE5VTEwpOwotCi0gICAgcmV0dXJuIGdfYnVpbGRfZmls ZW5hbWUoc2hhcmVkUmVzb3VyY2VzUGF0aCgpLmRhdGEoKSwgImltYWdlcyIsIHJlc291cmNlLCBO VUxMKTsKLX0KLQotc3RhdGljIENTdHJpbmcgZ2V0VGhlbWVJY29uRmlsZU5hbWUoY29uc3QgY2hh ciogbmFtZSwgaW50IHNpemUpCitzdGF0aWMgUGFzc1JlZlB0cjxJbWFnZT4gbG9hZEltYWdlRnJv bUdSZXNvdXJjZShjb25zdCBjaGFyKiBpY29uTmFtZSkKIHsKLSAgICBHdGtJY29uSW5mbyogaWNv bkluZm8gPSBndGtfaWNvbl90aGVtZV9sb29rdXBfaWNvbihndGtfaWNvbl90aGVtZV9nZXRfZGVm YXVsdCgpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIG5hbWUsIHNpemUsIEdUS19JQ09OX0xPT0tVUF9OT19TVkcpOwotICAgIC8vIFRyeSB0 byBmYWxsYmFjayBvbiBNSVNTSU5HX0lNQUdFLgotICAgIGlmICghaWNvbkluZm8pCi0gICAgICAg IGljb25JbmZvID0gZ3RrX2ljb25fdGhlbWVfbG9va3VwX2ljb24oZ3RrX2ljb25fdGhlbWVfZ2V0 X2RlZmF1bHQoKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBHVEtfU1RPQ0tfTUlTU0lOR19JTUFHRSwgc2l6ZSwKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBHVEtfSUNPTl9MT09LVVBfTk9fU1ZHKTsKLSAgICBpZiAo aWNvbkluZm8pIHsKLSAgICAgICAgR1VuaXF1ZVB0cjxHdGtJY29uSW5mbz4gaW5mbyhpY29uSW5m byk7Ci0gICAgICAgIHJldHVybiBDU3RyaW5nKGd0a19pY29uX2luZm9fZ2V0X2ZpbGVuYW1lKGlu Zm8uZ2V0KCkpKTsKLSAgICB9Ci0KLSAgICAvLyBObyBpY29uIHdhcyBmb3VuZCwgdGhpcyBjYW4g aGFwcGVuIGlmIG5vdCBHVEsgdGhlbWUgaXMgc2V0LiBJbgotICAgIC8vIHRoYXQgY2FzZSBhbiBl bXB0eSBJbWFnZSB3aWxsIGJlIGNyZWF0ZWQuCi0gICAgcmV0dXJuIENTdHJpbmcoKTsKKyAgICBS ZWZQdHI8Qml0bWFwSW1hZ2U+IGljb24gPSBCaXRtYXBJbWFnZTo6Y3JlYXRlKCk7CisgICAgR1Vu aXF1ZVB0cjxjaGFyPiBwYXRoKGdfc3RyZHVwX3ByaW50ZigiL29yZy93ZWJraXRndGsvcmVzb3Vy Y2VzL2ltYWdlcy8lcyIsIGljb25OYW1lKSk7CisgICAgR1JlZlB0cjxHQnl0ZXM+IGRhdGEgPSBh ZG9wdEdSZWYoZ19yZXNvdXJjZXNfbG9va3VwX2RhdGEocGF0aC5nZXQoKSwgR19SRVNPVVJDRV9M T09LVVBfRkxBR1NfTk9ORSwgbnVsbHB0cikpOworICAgIEFTU0VSVChkYXRhKTsKKyAgICBpY29u LT5zZXREYXRhKFNoYXJlZEJ1ZmZlcjo6Y3JlYXRlKHN0YXRpY19jYXN0PGNvbnN0IHVuc2lnbmVk IGNoYXIqPihnX2J5dGVzX2dldF9kYXRhKGRhdGEuZ2V0KCksIG51bGxwdHIpKSwgZ19ieXRlc19n ZXRfc2l6ZShkYXRhLmdldCgpKSksIHRydWUpOworICAgIHJldHVybiBpY29uLnJlbGVhc2UoKTsK IH0KIAotc3RhdGljIFBhc3NSZWZQdHI8U2hhcmVkQnVmZmVyPiBsb2FkUmVzb3VyY2VTaGFyZWRC dWZmZXIoQ1N0cmluZyBuYW1lKQorc3RhdGljIFBhc3NSZWZQdHI8U2hhcmVkQnVmZmVyPiBsb2Fk UmVzb3VyY2VTaGFyZWRCdWZmZXIoY29uc3QgY2hhciogZmlsZW5hbWUpCiB7CiAgICAgR1VuaXF1 ZU91dFB0cjxnY2hhcj4gY29udGVudDsKICAgICBnc2l6ZSBsZW5ndGg7Ci0gICAgaWYgKCFnX2Zp bGVfZ2V0X2NvbnRlbnRzKG5hbWUuZGF0YSgpLCAmY29udGVudC5vdXRQdHIoKSwgJmxlbmd0aCwg MCkpCisgICAgaWYgKCFnX2ZpbGVfZ2V0X2NvbnRlbnRzKGZpbGVuYW1lLCAmY29udGVudC5vdXRQ dHIoKSwgJmxlbmd0aCwgbnVsbHB0cikpCiAgICAgICAgIHJldHVybiBTaGFyZWRCdWZmZXI6OmNy ZWF0ZSgpOwogCiAgICAgcmV0dXJuIFNoYXJlZEJ1ZmZlcjo6Y3JlYXRlKGNvbnRlbnQuZ2V0KCks IGxlbmd0aCk7CkBAIC03OCwzMyArNjAsMjIgQEAgdm9pZCBCaXRtYXBJbWFnZTo6aW52YWxpZGF0 ZVBsYXRmb3JtRGF0YSgpCiB7CiB9CiAKLVBhc3NSZWZQdHI8SW1hZ2U+IGxvYWRJbWFnZUZyb21G aWxlKENTdHJpbmcgZmlsZU5hbWUpCi17Ci0gICAgUmVmUHRyPEJpdG1hcEltYWdlPiBpbWcgPSBC aXRtYXBJbWFnZTo6Y3JlYXRlKCk7Ci0gICAgaWYgKCFmaWxlTmFtZS5pc051bGwoKSkgewotICAg ICAgICBSZWZQdHI8U2hhcmVkQnVmZmVyPiBidWZmZXIgPSBsb2FkUmVzb3VyY2VTaGFyZWRCdWZm ZXIoZmlsZU5hbWUpOwotICAgICAgICBpbWctPnNldERhdGEoYnVmZmVyLnJlbGVhc2UoKSwgdHJ1 ZSk7Ci0gICAgfQotICAgIHJldHVybiBpbWcucmVsZWFzZSgpOwotfQotCi1QYXNzUmVmUHRyPElt YWdlPiBJbWFnZTo6bG9hZFBsYXRmb3JtUmVzb3VyY2UoY29uc3QgY2hhciogbmFtZSkKK3N0YXRp YyBQYXNzUmVmUHRyPEltYWdlPiBsb2FkTWlzc2luZ0ltYWdlSWNvbkZyb21UaGVtZSgpCiB7Ci0g ICAgQ1N0cmluZyBmaWxlTmFtZTsKLSAgICBpZiAoIXN0cmNtcCgibWlzc2luZ0ltYWdlIiwgbmFt ZSkpCi0gICAgICAgIGZpbGVOYW1lID0gZ2V0VGhlbWVJY29uRmlsZU5hbWUoR1RLX1NUT0NLX01J U1NJTkdfSU1BR0UsIDE2KTsKLSAgICBpZiAoZmlsZU5hbWUuaXNOdWxsKCkpIHsKLSAgICAgICAg R1VuaXF1ZVB0cjxnY2hhcj4gaW1hZ2VOYW1lKGdfc3RyZHVwX3ByaW50ZigiJXMucG5nIiwgbmFt ZSkpOwotICAgICAgICBHVW5pcXVlUHRyPGdjaGFyPiBnbGliRmlsZU5hbWUoZ2V0UGF0aFRvSW1h Z2VSZXNvdXJjZShpbWFnZU5hbWUuZ2V0KCkpKTsKLSAgICAgICAgZmlsZU5hbWUgPSBnbGliRmls ZU5hbWUuZ2V0KCk7CisgICAgUmVmUHRyPEJpdG1hcEltYWdlPiBpY29uID0gQml0bWFwSW1hZ2U6 OmNyZWF0ZSgpOworICAgIEdVbmlxdWVQdHI8R3RrSWNvbkluZm8+IGljb25JbmZvKGd0a19pY29u X3RoZW1lX2xvb2t1cF9pY29uKGd0a19pY29uX3RoZW1lX2dldF9kZWZhdWx0KCksIEdUS19TVE9D S19NSVNTSU5HX0lNQUdFLCAxNiwgR1RLX0lDT05fTE9PS1VQX05PX1NWRykpOworICAgIGlmIChp Y29uSW5mbykgeworICAgICAgICBSZWZQdHI8U2hhcmVkQnVmZmVyPiBidWZmZXIgPSBsb2FkUmVz b3VyY2VTaGFyZWRCdWZmZXIoZ3RrX2ljb25faW5mb19nZXRfZmlsZW5hbWUoaWNvbkluZm8uZ2V0 KCkpKTsKKyAgICAgICAgaWNvbi0+c2V0RGF0YShidWZmZXIucmVsZWFzZSgpLCB0cnVlKTsKKyAg ICAgICAgcmV0dXJuIGljb24ucmVsZWFzZSgpOwogICAgIH0KIAotICAgIHJldHVybiBsb2FkSW1h Z2VGcm9tRmlsZShmaWxlTmFtZSk7CisgICAgcmV0dXJuIGxvYWRJbWFnZUZyb21HUmVzb3VyY2Uo Im1pc3NpbmdJbWFnZSIpOwogfQogCi1QYXNzUmVmUHRyPEltYWdlPiBJbWFnZTo6bG9hZFBsYXRm b3JtVGhlbWVJY29uKGNvbnN0IGNoYXIqIG5hbWUsIGludCBzaXplKQorUGFzc1JlZlB0cjxJbWFn ZT4gSW1hZ2U6OmxvYWRQbGF0Zm9ybVJlc291cmNlKGNvbnN0IGNoYXIqIG5hbWUpCiB7Ci0gICAg cmV0dXJuIGxvYWRJbWFnZUZyb21GaWxlKGdldFRoZW1lSWNvbkZpbGVOYW1lKG5hbWUsIHNpemUp KTsKKyAgICByZXR1cm4gIXN0cmNtcCgibWlzc2luZ0ltYWdlIiwgbmFtZSkgPyBsb2FkTWlzc2lu Z0ltYWdlSWNvbkZyb21UaGVtZSgpIDogbG9hZEltYWdlRnJvbUdSZXNvdXJjZShuYW1lKTsKIH0K IAogR2RrUGl4YnVmKiBCaXRtYXBJbWFnZTo6Z2V0R2RrUGl4YnVmKCkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCAy MTQwNGIyLi4wYTJmYmM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysr IGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTQtMDUtMTQg IENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFtH VEtdIENvbXBpbGUgYWxsIGluc3RhbGxlZCByZXNvdXJjZXMgYXMgR1Jlc291cmNlcworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMxMDk5CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSXQgYXZvaWRzIGNvbmZs aWN0cyB3aXRoIG9sZCBXZWJLaXQgdmVyc2lvbnMsIGFuZCByZXNvdXJjZXMgYXJlCisgICAgICAg IGFsd2F5cyBmb3VuZCBldmVuIHdpdGhvdXQgaW5zdGFsbGluZyBvciB1c2luZyBlbnZpcm9ubWVu dCB2YXJpYWJsZXMuCisKKyAgICAgICAgKiBQbGF0Zm9ybUdUSy5jbWFrZTogQWRkIHJ1bGVzIHRv IHdyaXRlIHRoZSB4bWwgZmlsZSB3aXRoIHRoZQorICAgICAgICByZXNvdXJjZXMgZGVwZW5kaW5n IG9uIHRoZSBjb25maWd1cmUgb3B0aW9ucyBhbmQgdG8gZ2VuZXJhdGUgYW5kCisgICAgICAgIGJ1 aWxkIHRoZSBHUmVzb3VyY2VzIGZpbGUuCisKIDIwMTQtMDUtMTMgIEd5dXlvdW5nIEtpbSAgPGd5 dXlvdW5nLmtpbUBzYW1zdW5nLmNvbT4KIAogICAgICAgICBbRUZMXVtXSzJdIEFkZCBld2tfdmll d19maXhlZF9sYXlvdXRfc2l6ZV9zZXR8Z2V0KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1BsYXRmb3JtR1RLLmNtYWtlIGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm1HVEsuY21ha2UKaW5k ZXggZjA1MDRjOC4uZDE4MTg4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvUGxhdGZvcm1H VEsuY21ha2UKKysrIGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm1HVEsuY21ha2UKQEAgLTE3LDYg KzE3LDcgQEAgc2V0KFdlYktpdDJfVVNFX1BSRUZJWF9IRUFERVIgT04pCiBsaXN0KEFQUEVORCBX ZWJLaXQyX1NPVVJDRVMKICAgICAke0RFUklWRURfU09VUkNFU19XRUJLSVQyR1RLX0RJUn0vSW5z cGVjdG9yR1Jlc291cmNlQnVuZGxlLmMKICAgICAke0RFUklWRURfU09VUkNFU19XRUJLSVQyR1RL X0RJUn0vV2ViS2l0Mkluc3BlY3RvckdSZXNvdXJjZUJ1bmRsZS5jCisgICAgJHtERVJJVkVEX1NP VVJDRVNfV0VCS0lUMkdUS19ESVJ9L1dlYktpdDJSZXNvdXJjZXNHUmVzb3VyY2VCdW5kbGUuYwog CiAgICAgJHtERVJJVkVEX1NPVVJDRVNfV0VCS0lUMkdUS19BUElfRElSfS9XZWJLaXRFbnVtVHlw ZXMuY3BwCiAgICAgJHtERVJJVkVEX1NPVVJDRVNfV0VCS0lUMkdUS19BUElfRElSfS9XZWJLaXRN YXJzaGFsLmNwcApAQCAtNTA0LDYgKzUwNSw0NyBAQCBhZGRfY3VzdG9tX2NvbW1hbmQoCiAgICAg VkVSQkFUSU0KICkKIAorc2V0KFdlYktpdDJSZXNvdXJjZXMKKyAgICAiICAgICAgICA8ZmlsZSBh bGlhcz1cImltYWdlcy9kZWxldGVCdXR0b25cIj5kZWxldGVCdXR0b24ucG5nPC9maWxlPlxuIgor ICAgICIgICAgICAgIDxmaWxlIGFsaWFzPVwiaW1hZ2VzL21pc3NpbmdJbWFnZVwiPm1pc3NpbmdJ bWFnZS5wbmc8L2ZpbGU+XG4iCisgICAgIiAgICAgICAgPGZpbGUgYWxpYXM9XCJpbWFnZXMvcGFu SWNvblwiPnBhbkljb24ucG5nPC9maWxlPlxuIgorICAgICIgICAgICAgIDxmaWxlIGFsaWFzPVwi aW1hZ2VzL3RleHRBcmVhUmVzaXplQ29ybmVyXCI+dGV4dEFyZWFSZXNpemVDb3JuZXIucG5nPC9m aWxlPlxuIgorKQorCitpZiAoRU5BQkxFX0lDT05EQVRBQkFTRSkKKyAgICBsaXN0KEFQUEVORCBX ZWJLaXQyUmVzb3VyY2VzCisgICAgICAgICIgICAgICAgIDxmaWxlIGFsaWFzPVwiaW1hZ2VzL3Vy bEljb25cIj51cmxJY29uLnBuZzwvZmlsZT5cbiIKKyAgICApCitlbmRpZiAoKQorCitpZiAoRU5B QkxFX0lOUFVUX1NQRUVDSCkKKyAgICBsaXN0KEFQUEVORCBXZWJLaXQyUmVzb3VyY2VzCisgICAg ICAgICIgICAgICAgIDxmaWxlIGFsaWFzPVwiaW1hZ2VzL2lucHV0U3BlZWNoXCI+aW5wdXRTcGVl Y2gucG5nPC9maWxlPlxuIgorICAgICkKK2VuZGlmICgpCisKK2lmIChFTkFCTEVfV0VCX0FVRElP KQorICAgIGxpc3QoQVBQRU5EIFdlYktpdDJSZXNvdXJjZXMKKyAgICAgICAgIiAgICAgICAgPGZp bGUgYWxpYXM9XCJhdWRpby9Db21wb3NpdGVcIj5Db21wb3NpdGUud2F2PC9maWxlPlxuIgorICAg ICkKK2VuZGlmICgpCisKK2ZpbGUoV1JJVEUgJHtERVJJVkVEX1NPVVJDRVNfV0VCS0lUMkdUS19E SVJ9L1dlYktpdDJSZXNvdXJjZXNHUmVzb3VyY2VCdW5kbGUueG1sCisgICAgIjw/eG1sIHZlcnNp b249MS4wIGVuY29kaW5nPVVURi04Pz5cbiIKKyAgICAiPGdyZXNvdXJjZXM+XG4iCisgICAgIiAg ICA8Z3Jlc291cmNlIHByZWZpeD1cIi9vcmcvd2Via2l0Z3RrL3Jlc291cmNlc1wiPlxuIgorICAg ICR7V2ViS2l0MlJlc291cmNlc30KKyAgICAiICAgIDwvZ3Jlc291cmNlPlxuIgorICAgICI8L2dy ZXNvdXJjZXM+XG4iCispCisKK2FkZF9jdXN0b21fY29tbWFuZCgKKyAgICBPVVRQVVQgJHtERVJJ VkVEX1NPVVJDRVNfV0VCS0lUMkdUS19ESVJ9L1dlYktpdDJSZXNvdXJjZXNHUmVzb3VyY2VCdW5k bGUuYworICAgIERFUEVORFMgJHtERVJJVkVEX1NPVVJDRVNfV0VCS0lUMkdUS19ESVJ9L1dlYktp dDJSZXNvdXJjZXNHUmVzb3VyY2VCdW5kbGUueG1sCisgICAgQ09NTUFORCBnbGliLWNvbXBpbGUt cmVzb3VyY2VzIC0tZ2VuZXJhdGUgLS1zb3VyY2VkaXI9JHtDTUFLRV9TT1VSQ0VfRElSfS9Tb3Vy Y2UvV2ViQ29yZS9SZXNvdXJjZXMgLS1zb3VyY2VkaXI9JHtDTUFLRV9TT1VSQ0VfRElSfS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9yZXNvdXJjZXMgLS10YXJnZXQ9JHtERVJJVkVEX1NP VVJDRVNfV0VCS0lUMkdUS19ESVJ9L1dlYktpdDJSZXNvdXJjZXNHUmVzb3VyY2VCdW5kbGUuYyAk e0RFUklWRURfU09VUkNFU19XRUJLSVQyR1RLX0RJUn0vV2ViS2l0MlJlc291cmNlc0dSZXNvdXJj ZUJ1bmRsZS54bWwKKyAgICBWRVJCQVRJTQorKQorCiBhZGRfY3VzdG9tX3RhcmdldCh3ZWJraXQy Z3RrLWZvcndhcmRpbmctaGVhZGVycwogICAgIENPTU1BTkQgJHtQRVJMX0VYRUNVVEFCTEV9ICR7 V0VCS0lUMl9ESVJ9L1NjcmlwdHMvZ2VuZXJhdGUtZm9yd2FyZGluZy1oZWFkZXJzLnBsICR7V0VC S0lUMl9ESVJ9ICR7Rk9SV0FSRElOR19IRUFERVJTX0RJUn0gZ3RrCiAgICAgQ09NTUFORCAke1BF UkxfRVhFQ1VUQUJMRX0gJHtXRUJLSVQyX0RJUn0vU2NyaXB0cy9nZW5lcmF0ZS1mb3J3YXJkaW5n LWhlYWRlcnMucGwgJHtXRUJLSVQyX0RJUn0gJHtGT1JXQVJESU5HX0hFQURFUlNfRElSfSBzb3Vw CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMjNk OWJmOS4uNWNkZjFmZCAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0No YW5nZUxvZwpAQCAtMSw1ICsxLDE2IEBACiAyMDE0LTA1LTE0ICBDYXJsb3MgR2FyY2lhIENhbXBv cyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAorICAgICAgICBbR1RLXSBDb21waWxlIGFsbCBpbnN0 YWxsZWQgcmVzb3VyY2VzIGFzIEdSZXNvdXJjZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMTA5OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L2d0ay5weToKKyAg ICAgICAgKEd0a1BvcnQuc2V0dXBfZW52aXJvbl9mb3Jfc2VydmVyKTogUmVtb3ZlZCBub3cgdW5u ZWVkZWQKKyAgICAgICAgQVVESU9fUkVTT1VSQ0VTX1BBVEggZW52IHZhci4KKworMjAxNC0wNS0x NCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisKICAgICAgICAg UkVHUkVTU0lPTihDTUFLRSk6IFtHVEtdIElucHV0TWV0aG9kRmlsdGVyIHVuaXQgdGVzdCBpcyBu b3QgYnVpbHQKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEzMjY4NgogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvZ3RrLnB5 IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2d0ay5weQppbmRleCBhZmEzMTljLi5hZWYz Mzg3IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvZ3RrLnB5CisrKyBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9ndGsucHkKQEAgLTEwMiw3ICsxMDIsNiBAQCBj bGFzcyBHdGtQb3J0KFBvcnQpOgogICAgICAgICBlbnZpcm9ubWVudFsnTElCT1ZFUkxBWV9TQ1JP TExCQVInXSA9ICcwJwogICAgICAgICBlbnZpcm9ubWVudFsnVEVTVF9SVU5ORVJfSU5KRUNURURf QlVORExFX0ZJTEVOQU1FJ10gPSBzZWxmLl9idWlsZF9wYXRoKCdsaWInLCAnbGliVGVzdFJ1bm5l ckluamVjdGVkQnVuZGxlLnNvJykKICAgICAgICAgZW52aXJvbm1lbnRbJ1RFU1RfUlVOTkVSX1RF U1RfUExVR0lOX1BBVEgnXSA9IHNlbGYuX2J1aWxkX3BhdGgoJ2xpYicpCi0gICAgICAgIGVudmly b25tZW50WydBVURJT19SRVNPVVJDRVNfUEFUSCddID0gc2VsZi5wYXRoX2Zyb21fd2Via2l0X2Jh c2UoJ1NvdXJjZScsICdXZWJDb3JlJywgJ3BsYXRmb3JtJywgJ2F1ZGlvJywgJ3Jlc291cmNlcycp CiAgICAgICAgIHNlbGYuX2NvcHlfdmFsdWVfZnJvbV9lbnZpcm9uX2lmX3NldChlbnZpcm9ubWVu dCwgJ1dFQktJVF9PVVRQVVRESVInKQogICAgICAgICBpZiBzZWxmLmdldF9vcHRpb24oImxlYWtz Iik6CiAgICAgICAgICAgICAjICBUdXJuIG9mZiBHTGliIG1lbW9yeSBvcHRpbWlzYXRpb25zIGh0 dHBzOi8vd2lraS5nbm9tZS5vcmcvVmFsZ3JpbmQuCg==