138768 2014-11-15 17:14:28 -0800 App.Manifest shouldn't use App.__container__.lookup 2014-11-17 09:07:12 -0800 1 1 1 Unclassified WebKit WebKit Website 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rniwa rniwa barraclough benjamin commit-queue kling koivisto oldest_to_newest 1049015 0 rniwa 2014-11-15 17:14:28 -0800 Pass around the store object instead. 1049016 1 241668 rniwa 2014-11-15 17:26:52 -0800 Created attachment 241668 Removes the hack 1049213 2 241668 commit-queue 2014-11-17 09:07:06 -0800 Comment on attachment 241668 Removes the hack Clearing flags on attachment: 241668 Committed r176203: <http://trac.webkit.org/changeset/176203> 1049214 3 commit-queue 2014-11-17 09:07:12 -0800 All reviewed patches have been landed. Closing bug. 241668 2014-11-15 17:26:52 -0800 2014-11-17 09:07:06 -0800 Removes the hack bug-138768-20141115172701.patch text/plain 7680 rniwa U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2MTU3CmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvQ2hhbmdlTG9nIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwpp bmRleCAyZTZjNjBlNjQ3MDE0NDY5YzEzZWY2MTcwN2UxZjM4NmNhMzc3ODE1Li4xNjQ5Nzk0NzEw MTU2NTIyNGRiNGZiMjczYjgyOTQ5MTI4NTEzNjYwIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvQ2hhbmdlTG9nCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwzMCBAQAorMjAxNC0xMS0xNSAgUnlvc3VrZSBOaXdhICA8cm5pd2FA d2Via2l0Lm9yZz4KKworICAgICAgICBBcHAuTWFuaWZlc3Qgc2hvdWxkbid0IHVzZSBBcHAuX19j b250YWluZXJfXy5sb29rdXAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEzODc2OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFJlbW92ZWQgdGhlIGhhY2sgdG8gZmluZCB0aGUgc3RvcmUgb2JqZWN0IHZpYSBB cHAuX19jb250YWluZXJfXy5sb29rdXAuCisgICAgICAgIFBhc3MgYXJvdW5kIHRoZSBzdG9yZSBv YmplY3QgaW5zdGVhZC4KKworICAgICAgICAqIHB1YmxpYy92Mi9hcHAuanM6CisgICAgICAgIChB cHAuRGFzaGJvYXJkUm93Ll9jcmVhdGVQYW5lKTogQWRkICJzdG9yZSIgcHJvcGVydHkgdG8gdGhl IHBhbmUuCisgICAgICAgIChBcHAuRGFzaGJvYXJkUGFuZVByb3h5Rm9yUGlja2VyLl9wbGF0Zm9y bU9yTWV0cmljSWRDaGFuZ2VkKTogRGl0dG8uCisgICAgICAgIChBcHAuSW5kZXhDb250cm9sbGVy LmdyaWRDaGFuZ2VkKTogRGl0dG8uCisgICAgICAgIChBcHAuSW5kZXhDb250cm9sbGVyLmFjdGlv bnMuYWRkUm93KTogRGl0dG8uCisgICAgICAgIChBcHAuSW5kZXhDb250cm9sbGVyLmluaXQpOiBE aXR0by4KKyAgICAgICAgKEFwcC5QYW5lLl9mZXRjaCk6IERpdHRvLgorICAgICAgICAoQXBwLkNo YXJ0c0NvbnRyb2xsZXIuX3BhcnNlUGFuZUxpc3QpOiBEaXR0by4KKyAgICAgICAgKEFwcC5DaGFy dHNDb250cm9sbGVyLl91cGRhdGVRdWVyeVN0cmluZyk6IERpdHRvLgorICAgICAgICAoQXBwLkNo YXJ0c0NvbnRyb2xsZXIuYWN0aW9ucy5hZGRQYW5lQnlNZXRyaWNBbmRQbGF0Zm9ybSk6IERpdHRv LgorICAgICAgICAoQXBwLkJ1aWxkUG9wdXApOiBEaXR0by4KKyAgICAgICAgKEFwcC5BbmFseXNp c1Rhc2tSb3V0ZS5tb2RlbCk6IERpdHRvLgorICAgICAgICAoQXBwLkFuYWx5c2lzVGFza1ZpZXdN b2RlbC5fdGFza1VwZGF0ZWQpOiBEaXR0by4KKworICAgICAgICAqIHB1YmxpYy92Mi9tYW5pZmVz dC5qczoKKyAgICAgICAgKEFwcC5NYW5pZmVzdC5mZXRjaCk6IFJlbW92ZWQgdGhlIGNvZGUgdG8g ZmluZCB0aGUgc3RvcmUgb2JqZWN0LgorCiAyMDE0LTExLTA4ICBSeW9zdWtlIE5pd2EgIDxybml3 YUB3ZWJraXQub3JnPgogCiAgICAgICAgIEZpeCBFbWJlci5qcyB3YXJuaW5ncyB0aGUgbmV3IHBl cmYgZGFzaGJvYXJkCmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGlj L3YyL2FwcC5qcyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvdjIvYXBwLmpzCmlu ZGV4IGI4ZDIyMjQxMzUzYWYxZGIwMTZmOTFlMzk3MjQ3ZmNmZDI1ZjRmNzguLmZlYmM0MzQzNmZm Mjk0N2NhZTM3Y2U3MjQ5MjQ0MTM2NGVjZTA1MGYgMTAwNzU1Ci0tLSBhL1dlYnNpdGVzL3BlcmYu d2Via2l0Lm9yZy9wdWJsaWMvdjIvYXBwLmpzCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9y Zy9wdWJsaWMvdjIvYXBwLmpzCkBAIC0zMyw2ICszMyw3IEBAIEFwcC5EYXNoYm9hcmRSb3cgPSBF bWJlci5PYmplY3QuZXh0ZW5kKHsKICAgICAgICAgICAgIHBhbmVJbmZvID0gbnVsbDsKIAogICAg ICAgICB2YXIgcGFuZSA9IEFwcC5QYW5lLmNyZWF0ZSh7CisgICAgICAgICAgICBzdG9yZTogdGhp cy5nZXQoJ3N0b3JlJyksCiAgICAgICAgICAgICBwbGF0Zm9ybUlkOiBwYW5lSW5mbyA/IHBhbmVJ bmZvWzBdIDogbnVsbCwKICAgICAgICAgICAgIG1ldHJpY0lkOiBwYW5lSW5mbyA/IHBhbmVJbmZv WzFdIDogbnVsbCwKICAgICAgICAgfSk7CkBAIC00NSw3ICs0Niw3IEBAIEFwcC5EYXNoYm9hcmRQ YW5lUHJveHlGb3JQaWNrZXIgPSBFbWJlci5PYmplY3RQcm94eS5leHRlbmQoewogICAgIF9wbGF0 Zm9ybU9yTWV0cmljSWRDaGFuZ2VkOiBmdW5jdGlvbiAoKQogICAgIHsKICAgICAgICAgdmFyIHNl bGYgPSB0aGlzOwotICAgICAgICBBcHAuQnVpbGRQb3B1cCgnY2hvb3NlUGFuZScsIHRoaXMpCisg ICAgICAgIEFwcC5CdWlsZFBvcHVwKHRoaXMuZ2V0KCdzdG9yZScpLCAnY2hvb3NlUGFuZScsIHRo aXMpCiAgICAgICAgICAgICAudGhlbihmdW5jdGlvbiAocGxhdGZvcm1zKSB7IHNlbGYuc2V0KCdw aWNrZXJEYXRhJywgcGxhdGZvcm1zKTsgfSk7CiAgICAgfS5vYnNlcnZlcygncGxhdGZvcm1JZCcs ICdtZXRyaWNJZCcpLm9uKCdpbml0JyksCiAgICAgcGFuZUxpc3Q6IGZ1bmN0aW9uICgpIHsKQEAg LTg3LDggKzg4LDEwIEBAIEFwcC5JbmRleENvbnRyb2xsZXIgPSBFbWJlci5Db250cm9sbGVyLmV4 dGVuZCh7CiAgICAgICAgICAgICByZXR1cm4ge2xhYmVsOm5hbWUsIGluZGV4OiBpbmRleH07CiAg ICAgICAgIH0pKTsKIAorICAgICAgICB2YXIgc3RvcmUgPSB0aGlzLnN0b3JlOwogICAgICAgICB0 aGlzLnNldCgncm93cycsIHRhYmxlLnNsaWNlKDEpLm1hcChmdW5jdGlvbiAocm93UGFyYW0pIHsK ICAgICAgICAgICAgIHJldHVybiBBcHAuRGFzaGJvYXJkUm93LmNyZWF0ZSh7CisgICAgICAgICAg ICAgICAgc3RvcmU6IHN0b3JlLAogICAgICAgICAgICAgICAgIGhlYWRlcjogcm93UGFyYW1bMF0s CiAgICAgICAgICAgICAgICAgY2VsbHNJbmZvOiByb3dQYXJhbS5zbGljZSgxKSwKICAgICAgICAg ICAgICAgICBjb2x1bW5Db3VudDogY29sdW1uQ291bnQsCkBAIC0xNzAsNiArMTczLDcgQEAgQXBw LkluZGV4Q29udHJvbGxlciA9IEVtYmVyLkNvbnRyb2xsZXIuZXh0ZW5kKHsKICAgICAgICAgYWRk Um93OiBmdW5jdGlvbiAoKQogICAgICAgICB7CiAgICAgICAgICAgICB0aGlzLmdldCgncm93cycp LnB1c2hPYmplY3QoQXBwLkRhc2hib2FyZFJvdy5jcmVhdGUoeworICAgICAgICAgICAgICAgIHN0 b3JlOiB0aGlzLnN0b3JlLAogICAgICAgICAgICAgICAgIGhlYWRlcjogdGhpcy5nZXQoJ25ld1Jv d0hlYWRlcicpLAogICAgICAgICAgICAgICAgIGNvbHVtbkNvdW50OiB0aGlzLmdldCgnY29sdW1u Q291bnQnKSwKICAgICAgICAgICAgIH0pKTsKQEAgLTE5NSw3ICsxOTksNyBAQCBBcHAuSW5kZXhD b250cm9sbGVyID0gRW1iZXIuQ29udHJvbGxlci5leHRlbmQoewogICAgIGluaXQ6IGZ1bmN0aW9u ICgpCiAgICAgewogICAgICAgICB0aGlzLl9zdXBlcigpOwotICAgICAgICBBcHAuTWFuaWZlc3Qu ZmV0Y2goKTsKKyAgICAgICAgQXBwLk1hbmlmZXN0LmZldGNoKHRoaXMuZ2V0KCdzdG9yZScpKTsK ICAgICB9CiB9KTsKIApAQCAtMzQwLDcgKzM0NCw3IEBAIEFwcC5QYW5lID0gRW1iZXIuT2JqZWN0 LmV4dGVuZCh7CiAgICAgICAgIGVsc2UgewogICAgICAgICAgICAgdmFyIHNlbGYgPSB0aGlzOwog Ci0gICAgICAgICAgICBBcHAuTWFuaWZlc3QuZmV0Y2hSdW5zV2l0aFBsYXRmb3JtQW5kTWV0cmlj KHRoaXMuc3RvcmUsIHBsYXRmb3JtSWQsIG1ldHJpY0lkKS50aGVuKGZ1bmN0aW9uIChyZXN1bHQp IHsKKyAgICAgICAgICAgIEFwcC5NYW5pZmVzdC5mZXRjaFJ1bnNXaXRoUGxhdGZvcm1BbmRNZXRy aWModGhpcy5nZXQoJ3N0b3JlJyksIHBsYXRmb3JtSWQsIG1ldHJpY0lkKS50aGVuKGZ1bmN0aW9u IChyZXN1bHQpIHsKICAgICAgICAgICAgICAgICBzZWxmLnNldCgncGxhdGZvcm0nLCByZXN1bHQu cGxhdGZvcm0pOwogICAgICAgICAgICAgICAgIHNlbGYuc2V0KCdtZXRyaWMnLCByZXN1bHQubWV0 cmljKTsKICAgICAgICAgICAgICAgICBzZWxmLnNldCgnY2hhcnREYXRhJywgcmVzdWx0LnJ1bnMp OwpAQCAtNTEwLDYgKzUxNCw3IEBAIEFwcC5DaGFydHNDb250cm9sbGVyID0gRW1iZXIuQ29udHJv bGxlci5leHRlbmQoewogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KICAgICAgICAg ICAgIHJldHVybiBBcHAuUGFuZS5jcmVhdGUoeworICAgICAgICAgICAgICAgIHN0b3JlOiBzZWxm LnN0b3JlLAogICAgICAgICAgICAgICAgIGluZm86IHBhbmVJbmZvLAogICAgICAgICAgICAgICAg IHBsYXRmb3JtSWQ6IHBhbmVJbmZvWzBdLAogICAgICAgICAgICAgICAgIG1ldHJpY0lkOiBwYW5l SW5mb1sxXSwKQEAgLTU2MSw2ICs1NjYsNyBAQCBBcHAuQ2hhcnRzQ29udHJvbGxlciA9IEVtYmVy LkNvbnRyb2xsZXIuZXh0ZW5kKHsKICAgICAgICAgYWRkUGFuZUJ5TWV0cmljQW5kUGxhdGZvcm06 IGZ1bmN0aW9uIChwYXJhbSkKICAgICAgICAgewogICAgICAgICAgICAgdGhpcy5hZGRQYW5lKEFw cC5QYW5lLmNyZWF0ZSh7CisgICAgICAgICAgICAgICAgc3RvcmUsIHRoaXMuc3RvcmUsCiAgICAg ICAgICAgICAgICAgcGxhdGZvcm1JZDogcGFyYW0ucGxhdGZvcm0uZ2V0KCdpZCcpLAogICAgICAg ICAgICAgICAgIG1ldHJpY0lkOiBwYXJhbS5tZXRyaWMuZ2V0KCdpZCcpLAogICAgICAgICAgICAg ICAgIHNob3dpbmdEZXRhaWxzOiBmYWxzZQpAQCAtNTcyLDE1ICs1NzgsMTUgQEAgQXBwLkNoYXJ0 c0NvbnRyb2xsZXIgPSBFbWJlci5Db250cm9sbGVyLmV4dGVuZCh7CiAgICAgewogICAgICAgICB0 aGlzLl9zdXBlcigpOwogICAgICAgICB2YXIgc2VsZiA9IHRoaXM7Ci0gICAgICAgIEFwcC5CdWls ZFBvcHVwKCdhZGRQYW5lQnlNZXRyaWNBbmRQbGF0Zm9ybScpLnRoZW4oZnVuY3Rpb24gKHBsYXRm b3JtcykgeworICAgICAgICBBcHAuQnVpbGRQb3B1cCh0aGlzLnN0b3JlLCAnYWRkUGFuZUJ5TWV0 cmljQW5kUGxhdGZvcm0nKS50aGVuKGZ1bmN0aW9uIChwbGF0Zm9ybXMpIHsKICAgICAgICAgICAg IHNlbGYuc2V0KCdwbGF0Zm9ybXMnLCBwbGF0Zm9ybXMpOwogICAgICAgICB9KTsKICAgICB9LAog fSk7CiAKLUFwcC5CdWlsZFBvcHVwID0gZnVuY3Rpb24oYWN0aW9uLCBwb3NpdGlvbikKK0FwcC5C dWlsZFBvcHVwID0gZnVuY3Rpb24oc3RvcmUsIGFjdGlvbiwgcG9zaXRpb24pCiB7Ci0gICAgcmV0 dXJuIEFwcC5NYW5pZmVzdC5mZXRjaCgpLnRoZW4oZnVuY3Rpb24gKCkgeworICAgIHJldHVybiBB cHAuTWFuaWZlc3QuZmV0Y2goc3RvcmUpLnRoZW4oZnVuY3Rpb24gKCkgewogICAgICAgICByZXR1 cm4gQXBwLk1hbmlmZXN0LmdldCgncGxhdGZvcm1zJykubWFwKGZ1bmN0aW9uIChwbGF0Zm9ybSkg ewogICAgICAgICAgICAgcmV0dXJuIEFwcC5QbGF0Zm9ybVByb3h5Rm9yUG9wdXAuY3JlYXRlKHtj b250ZW50OiBwbGF0Zm9ybSwKICAgICAgICAgICAgICAgICBhY3Rpb246IGFjdGlvbiwgcG9zaXRp b246IHBvc2l0aW9ufSk7CkBAIC0xNTkyLDkgKzE1OTgsOCBAQCBBcHAuQW5hbHlzaXNSb3V0ZSA9 IEVtYmVyLlJvdXRlLmV4dGVuZCh7CiAKIEFwcC5BbmFseXNpc1Rhc2tSb3V0ZSA9IEVtYmVyLlJv dXRlLmV4dGVuZCh7CiAgICAgbW9kZWw6IGZ1bmN0aW9uIChwYXJhbSkgewotICAgICAgICB2YXIg c3RvcmUgPSB0aGlzLnN0b3JlOwotICAgICAgICByZXR1cm4gdGhpcy5zdG9yZS5maW5kKCdhbmFs eXNpc1Rhc2snLCBwYXJhbS50YXNrSWQpLnRoZW4oZnVuY3Rpb24gKHRhc2spIHsKLSAgICAgICAg ICAgIHJldHVybiBBcHAuQW5hbHlzaXNUYXNrVmlld01vZGVsLmNyZWF0ZSh7Y29udGVudDogdGFz a30pOworICAgICAgICByZXR1cm4gc3RvcmUuZmluZCgnYW5hbHlzaXNUYXNrJywgcGFyYW0udGFz a0lkKS50aGVuKGZ1bmN0aW9uICh0YXNrKSB7CisgICAgICAgICAgICByZXR1cm4gQXBwLkFuYWx5 c2lzVGFza1ZpZXdNb2RlbC5jcmVhdGUoe2NvbnRlbnQ6IHRhc2ssIHN0b3JlOiBzdG9yZX0pOwog ICAgICAgICB9KTsKICAgICB9LAogfSk7CkBAIC0xNjA2LDcgKzE2MTEsNyBAQCBBcHAuQW5hbHlz aXNUYXNrVmlld01vZGVsID0gRW1iZXIuT2JqZWN0UHJveHkuZXh0ZW5kKHsKICAgICB7CiAgICAg ICAgIHZhciBwbGF0Zm9ybUlkID0gdGhpcy5nZXQoJ3BsYXRmb3JtJykuZ2V0KCdpZCcpOwogICAg ICAgICB2YXIgbWV0cmljSWQgPSB0aGlzLmdldCgnbWV0cmljJykuZ2V0KCdpZCcpOwotICAgICAg ICBBcHAuTWFuaWZlc3QuZmV0Y2hSdW5zV2l0aFBsYXRmb3JtQW5kTWV0cmljKHRoaXMuc3RvcmUs IHBsYXRmb3JtSWQsIG1ldHJpY0lkKS50aGVuKHRoaXMuX2ZldGNoZWRSdW5zLmJpbmQodGhpcykp OworICAgICAgICBBcHAuTWFuaWZlc3QuZmV0Y2hSdW5zV2l0aFBsYXRmb3JtQW5kTWV0cmljKHRo aXMuZ2V0KCdzdG9yZScpLCBwbGF0Zm9ybUlkLCBtZXRyaWNJZCkudGhlbih0aGlzLl9mZXRjaGVk UnVucy5iaW5kKHRoaXMpKTsKICAgICB9Lm9ic2VydmVzKCdwbGF0Zm9ybScsICdtZXRyaWMnKS5v bignaW5pdCcpLAogICAgIF9mZXRjaGVkUnVuczogZnVuY3Rpb24gKGRhdGEpIHsKICAgICAgICAg dmFyIHJ1bnMgPSBkYXRhLnJ1bnM7CmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndlYmtpdC5v cmcvcHVibGljL3YyL21hbmlmZXN0LmpzIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1Ymxp Yy92Mi9tYW5pZmVzdC5qcwppbmRleCA2NGUzNzg3ODM0YzU5ZjlkMDkzNDZlNGFkZDlhODVjMDI3 NGMwMmMzLi43Y2NhMDA5ZmVmOTBhODUyZTc4MTM4ODFhNTRlYjZhYjNjYzk0YWFmIDEwMDc1NQot LS0gYS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3YyL21hbmlmZXN0LmpzCisrKyBi L1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvdjIvbWFuaWZlc3QuanMKQEAgLTE2MCwx NCArMTYwLDEwIEBAIEFwcC5NYW5pZmVzdCA9IEVtYmVyLkNvbnRyb2xsZXIuZXh0ZW5kKHsKICAg ICBfYnVpbGRlckJ5SWQ6IHt9LAogICAgIF9yZXBvc2l0b3J5QnlJZDoge30sCiAgICAgX2ZldGNo UHJvbWlzZTogbnVsbCwKLSAgICBmZXRjaDogZnVuY3Rpb24gKCkKKyAgICBmZXRjaDogZnVuY3Rp b24gKHN0b3JlKQogICAgIHsKLSAgICAgICAgaWYgKHRoaXMuX2ZldGNoUHJvbWlzZSkKLSAgICAg ICAgICAgIHJldHVybiB0aGlzLl9mZXRjaFByb21pc2U7Ci0gICAgICAgIC8vIEZJWE1FOiBXZSBz aG91bGRuJ3QgdXNlIERTLlN0b3JlIGF0IGFsbC4KLSAgICAgICAgdmFyIHN0b3JlID0gQXBwLl9f Y29udGFpbmVyX18ubG9va3VwKCdzdG9yZTptYWluJyk7Ci0gICAgICAgIHZhciBwcm9taXNlID0g c3RvcmUuZmluZEFsbCgncGxhdGZvcm0nKTsKLSAgICAgICAgdGhpcy5fZmV0Y2hQcm9taXNlID0g cHJvbWlzZS50aGVuKHRoaXMuX2ZldGNoZWRNYW5pZmVzdC5iaW5kKHRoaXMsIHN0b3JlKSk7Cisg ICAgICAgIGlmICghdGhpcy5fZmV0Y2hQcm9taXNlKQorICAgICAgICAgICAgdGhpcy5fZmV0Y2hQ cm9taXNlID0gc3RvcmUuZmluZEFsbCgncGxhdGZvcm0nKS50aGVuKHRoaXMuX2ZldGNoZWRNYW5p ZmVzdC5iaW5kKHRoaXMsIHN0b3JlKSk7CiAgICAgICAgIHJldHVybiB0aGlzLl9mZXRjaFByb21p c2U7CiAgICAgfSwKICAgICBpc0ZldGNoZWQ6IGZ1bmN0aW9uICgpIHsgcmV0dXJuICEhdGhpcy5n ZXQoJ3BsYXRmb3JtcycpOyB9LnByb3BlcnR5KCdwbGF0Zm9ybXMnKSwK