106646 2013-01-11 02:16:44 -0800 [GTK] Remove support for global extensions in WebKit2 GTK+ 2013-01-11 04:28:05 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned xan.lopez oldest_to_newest 805090 0 cgarcia 2013-01-11 02:16:44 -0800 Now that we have API to set the extensions dir, it doesn't make sense to have a global dir to load extensions from. 805093 1 182301 cgarcia 2013-01-11 02:21:29 -0800 Created attachment 182301 Patch 805163 2 182301 xan.lopez 2013-01-11 04:22:28 -0800 Comment on attachment 182301 Patch I think it makes more sense to have this info as an initialization property of some class given that it would become a mandatory thing in order for the extension system to work, but after talking with carlos he tells me this is a) planned b) cumbersome to do at this point. So I think this is fine for the time being. 805169 3 cgarcia 2013-01-11 04:28:05 -0800 Committed r139428: <http://trac.webkit.org/changeset/139428> 182301 2013-01-11 02:21:29 -0800 2013-01-11 04:22:28 -0800 Patch wk2-remove-global-extensions.diff text/plain 4810 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBhMjlmNmIzLi42NDYyMTBmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTMtMDEtMTEgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIFJlbW92ZSBzdXBwb3J0IGZvciBnbG9iYWwgZXh0ZW5zaW9ucyBp biBXZWJLaXQyIEdUSysKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTEwNjY0NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFdlIGhhdmUgbm93IEFQSSB0byBzZXQgdGhlIHdlYiBleHRlbnNpb25zIGRpcmVjdG9y eS4gQSBnbG9iYWwgd2ViCisgICAgICAgIGVzdGVuc2lvbnMgZGlyZWN0b3J5IGRvZXNuJ3QgbWFr ZSBzZW5zZSBhbnltb3JlLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9ndGsvV2ViR3RrRXh0ZW5z aW9uTWFuYWdlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkd0a0V4dGVuc2lvbk1hbmFnZXI6 OnNjYW5Nb2R1bGVzKTogT25seSBzY2FuIHRoZSBnaXZlbgorICAgICAgICBkaXJlY3RvcnkgZm9y IG1vZHVsZXMuCisgICAgICAgIChXZWJLaXQ6OldlYkd0a0V4dGVuc2lvbk1hbmFnZXI6OmluaXRp YWxpemUpOiBMb2FkIG1vZHVsZXMgZm91bmQKKyAgICAgICAgaW4gdGhlIGdpdmVuIGRpcmVjdG9y eSBvbmx5LgorICAgICAgICAqIFdlYlByb2Nlc3MvZ3RrL1dlYkd0a0V4dGVuc2lvbk1hbmFnZXIu aDoKKyAgICAgICAgKFdlYkd0a0V4dGVuc2lvbk1hbmFnZXIpOiBSZW1vdmUgYXBwZW5kTW9kdWxl RGlyZWN0b3JpZXMoKS4KKwogMjAxMy0wMS0xMCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2Fy Y2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gQWRkIEFQSSB0byBzZXQgdGhlIHdlYiBl eHRlbnNpb25zIGRpcmVjdG9yeSB0byBXZWJLaXQyIEdUSysKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvZ3RrL1dlYkd0a0V4dGVuc2lvbk1hbmFnZXIuY3BwIGIvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9ndGsvV2ViR3RrRXh0ZW5zaW9uTWFuYWdlci5jcHAKaW5kZXgg MzQyZTAzNC4uODhjYTBmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9n dGsvV2ViR3RrRXh0ZW5zaW9uTWFuYWdlci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9ndGsvV2ViR3RrRXh0ZW5zaW9uTWFuYWdlci5jcHAKQEAgLTM4LDMyICszOCwxMiBAQCBX ZWJHdGtFeHRlbnNpb25NYW5hZ2VyOjpXZWJHdGtFeHRlbnNpb25NYW5hZ2VyKCkKIHsKIH0KIAot dm9pZCBXZWJHdGtFeHRlbnNpb25NYW5hZ2VyOjphcHBlbmRNb2R1bGVEaXJlY3RvcmllcyhWZWN0 b3I8U3RyaW5nPiYgZGlyZWN0b3JpZXMpCit2b2lkIFdlYkd0a0V4dGVuc2lvbk1hbmFnZXI6OnNj YW5Nb2R1bGVzKGNvbnN0IFN0cmluZyYgd2ViRXh0ZW5zaW9uc0RpcmVjdG9yeSwgVmVjdG9yPFN0 cmluZz4mIG1vZHVsZXMpCiB7Ci0gICAgU3RyaW5nIGV4dGVuc2lvblBhdGhzKGdldGVudigiV0VC S0lUX1dFQl9FWFRFTlNJT05TX1BBVEgiKSk7Ci0gICAgaWYgKCFleHRlbnNpb25QYXRocy5pc0Vt cHR5KCkpIHsKLSAgICAgICAgVmVjdG9yPFN0cmluZz4gcGF0aHM7Ci0gICAgICAgIGV4dGVuc2lv blBhdGhzLnNwbGl0KFVDaGFyKCc6JyksIC8qIGFsbG93RW1wdHlFbnRyaWVzICovIGZhbHNlLCBw YXRocyk7Ci0gICAgICAgIGRpcmVjdG9yaWVzLmFwcGVuZChwYXRocyk7Ci0gICAgfQotCi0gICAg c3RhdGljIGNvbnN0IGNoYXIqIGV4dGVuc2lvbkRlZmF1bHREaXJlY3RvcnkgPSBMSUJESVIiIkdf RElSX1NFUEFSQVRPUl9TIndlYmtpdGd0ay0iV0VCS0lUR1RLX0FQSV9WRVJTSU9OX1NUUklORyIi R19ESVJfU0VQQVJBVE9SX1Mid2ViLWV4dGVuc2lvbnMiR19ESVJfU0VQQVJBVE9SX1M7Ci0gICAg ZGlyZWN0b3JpZXMuYXBwZW5kKFdlYkNvcmU6OmZpbGVuYW1lVG9TdHJpbmcoZXh0ZW5zaW9uRGVm YXVsdERpcmVjdG9yeSkpOwotfQotCi12b2lkIFdlYkd0a0V4dGVuc2lvbk1hbmFnZXI6OnNjYW5N b2R1bGVzKGNvbnN0IFN0cmluZyYgYWRkaXRpb25hbFdlYkV4dGVuc2lvbnNEaXJlY3RvcnksIFZl Y3RvcjxTdHJpbmc+JiBtb2R1bGVzKQotewotICAgIFZlY3RvcjxTdHJpbmc+IG1vZHVsZURpcmVj dG9yaWVzOwotICAgIGlmICghYWRkaXRpb25hbFdlYkV4dGVuc2lvbnNEaXJlY3RvcnkuaXNOdWxs KCkpCi0gICAgICAgIG1vZHVsZURpcmVjdG9yaWVzLmFwcGVuZChhZGRpdGlvbmFsV2ViRXh0ZW5z aW9uc0RpcmVjdG9yeSk7Ci0gICAgYXBwZW5kTW9kdWxlRGlyZWN0b3JpZXMobW9kdWxlRGlyZWN0 b3JpZXMpOwotCi0gICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBtb2R1bGVEaXJlY3Rvcmllcy5z aXplKCk7ICsraSkgewotICAgICAgICBWZWN0b3I8U3RyaW5nPiBtb2R1bGVQYXRocyA9IFdlYkNv cmU6Omxpc3REaXJlY3RvcnkobW9kdWxlRGlyZWN0b3JpZXNbaV0sIFN0cmluZygiKi5zbyIpKTsK LSAgICAgICAgZm9yIChzaXplX3QgaiA9IDA7IGogPCBtb2R1bGVQYXRocy5zaXplKCk7ICsraikg ewotICAgICAgICAgICAgaWYgKFdlYkNvcmU6OmZpbGVFeGlzdHMobW9kdWxlUGF0aHNbal0pKQot ICAgICAgICAgICAgICAgIG1vZHVsZXMuYXBwZW5kKG1vZHVsZVBhdGhzW2pdKTsKLSAgICAgICAg fQorICAgIFZlY3RvcjxTdHJpbmc+IG1vZHVsZVBhdGhzID0gV2ViQ29yZTo6bGlzdERpcmVjdG9y eSh3ZWJFeHRlbnNpb25zRGlyZWN0b3J5LCBTdHJpbmcoIiouc28iKSk7CisgICAgZm9yIChzaXpl X3QgaSA9IDA7IGkgPCBtb2R1bGVQYXRocy5zaXplKCk7ICsraSkgeworICAgICAgICBpZiAoV2Vi Q29yZTo6ZmlsZUV4aXN0cyhtb2R1bGVQYXRoc1tpXSkpCisgICAgICAgICAgICBtb2R1bGVzLmFw cGVuZChtb2R1bGVQYXRoc1tpXSk7CiAgICAgfQogfQogCkBAIC03MSwxNCArNTEsMTggQEAgdm9p ZCBXZWJHdGtFeHRlbnNpb25NYW5hZ2VyOjppbml0aWFsaXplKFdLQnVuZGxlUmVmIGJ1bmRsZSwg V0tUeXBlUmVmIHVzZXJEYXRhKQogewogICAgIG1fZXh0ZW5zaW9uID0gYWRvcHRHUmVmKHdlYmtp dFdlYkV4dGVuc2lvbkNyZWF0ZSh0b0ltcGwoYnVuZGxlKSkpOwogCi0gICAgU3RyaW5nIGFkZGl0 aW9uYWxXZWJFeHRlbnNpb25zRGlyZWN0b3J5OworICAgIFN0cmluZyB3ZWJFeHRlbnNpb25zRGly ZWN0b3J5OwogICAgIGlmICh1c2VyRGF0YSkgewogICAgICAgICBBU1NFUlQoV0tHZXRUeXBlSUQo dXNlckRhdGEpID09IFdLU3RyaW5nR2V0VHlwZUlEKCkpOwotICAgICAgICBhZGRpdGlvbmFsV2Vi RXh0ZW5zaW9uc0RpcmVjdG9yeSA9IHRvSW1wbChzdGF0aWNfY2FzdDxXS1N0cmluZ1JlZj4odXNl ckRhdGEpKS0+c3RyaW5nKCk7CisgICAgICAgIHdlYkV4dGVuc2lvbnNEaXJlY3RvcnkgPSB0b0lt cGwoc3RhdGljX2Nhc3Q8V0tTdHJpbmdSZWY+KHVzZXJEYXRhKSktPnN0cmluZygpOwogICAgIH0K IAorICAgIGlmICh3ZWJFeHRlbnNpb25zRGlyZWN0b3J5LmlzTnVsbCgpKQorICAgICAgICByZXR1 cm47CisKICAgICBWZWN0b3I8U3RyaW5nPiBtb2R1bGVQYXRoczsKLSAgICBzY2FuTW9kdWxlcyhh ZGRpdGlvbmFsV2ViRXh0ZW5zaW9uc0RpcmVjdG9yeSwgbW9kdWxlUGF0aHMpOworICAgIHNjYW5N b2R1bGVzKHdlYkV4dGVuc2lvbnNEaXJlY3RvcnksIG1vZHVsZVBhdGhzKTsKKwogICAgIGZvciAo c2l6ZV90IGkgPSAwOyBpIDwgbW9kdWxlUGF0aHMuc2l6ZSgpOyArK2kpIHsKICAgICAgICAgT3du UHRyPE1vZHVsZT4gbW9kdWxlID0gYWRvcHRQdHIobmV3IE1vZHVsZShtb2R1bGVQYXRoc1tpXSkp OwogICAgICAgICBpZiAoIW1vZHVsZS0+bG9hZCgpKQpAQCAtODksNyArNzMsNiBAQCB2b2lkIFdl Ykd0a0V4dGVuc2lvbk1hbmFnZXI6OmluaXRpYWxpemUoV0tCdW5kbGVSZWYgYnVuZGxlLCBXS1R5 cGVSZWYgdXNlckRhdGEpCiAgICAgICAgIGlmICghaW5pdGlhbGl6ZUZ1bmN0aW9uKQogICAgICAg ICAgICAgY29udGludWU7CiAKLSAgICAgICAgLy8gRklYTUU6IGNoZWNrIHdlIGRvbid0IGxvYWQg dGhlIHNhbWUgbW9kdWxlIHR3aWNlIGZyb20gZGlmZmVyZW50IHBhdGhzLgogICAgICAgICBtX2V4 dGVuc2lvbk1vZHVsZXMuYXBwZW5kKG1vZHVsZS5sZWFrUHRyKCkpOwogICAgICAgICBpbml0aWFs aXplRnVuY3Rpb24obV9leHRlbnNpb24uZ2V0KCkpOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvZ3RrL1dlYkd0a0V4dGVuc2lvbk1hbmFnZXIuaCBiL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvZ3RrL1dlYkd0a0V4dGVuc2lvbk1hbmFnZXIuaAppbmRleCA4 YTNiZWNkLi4zMGY2ZGUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL2d0 ay9XZWJHdGtFeHRlbnNpb25NYW5hZ2VyLmgKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9ndGsvV2ViR3RrRXh0ZW5zaW9uTWFuYWdlci5oCkBAIC00NSw3ICs0NSw2IEBAIHB1YmxpYzoK IHByaXZhdGU6CiAgICAgV2ViR3RrRXh0ZW5zaW9uTWFuYWdlcigpOwogCi0gICAgdm9pZCBhcHBl bmRNb2R1bGVEaXJlY3RvcmllcyhWZWN0b3I8U3RyaW5nPiYpOwogICAgIHZvaWQgc2Nhbk1vZHVs ZXMoY29uc3QgU3RyaW5nJiwgVmVjdG9yPFN0cmluZz4mKTsKIAogICAgIFZlY3RvcjxNb2R1bGUq PiBtX2V4dGVuc2lvbk1vZHVsZXM7Cg==