146879 2015-07-11 12:05:35 -0700 Fix CONTENT_EXTENSIONS_STATE_MACHINE_DEBUGGING 2015-07-11 13:36:57 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 benjamin benjamin commit-queue oldest_to_newest 1108948 0 benjamin 2015-07-11 12:05:35 -0700 Fix CONTENT_EXTENSIONS_STATE_MACHINE_DEBUGGING 1108949 1 256660 benjamin 2015-07-11 12:06:43 -0700 Created attachment 256660 Patch 1108960 2 256660 commit-queue 2015-07-11 13:36:54 -0700 Comment on attachment 256660 Patch Clearing flags on attachment: 256660 Committed r186715: <http://trac.webkit.org/changeset/186715> 1108961 3 commit-queue 2015-07-11 13:36:57 -0700 All reviewed patches have been landed. Closing bug. 256660 2015-07-11 12:06:43 -0700 2015-07-11 13:36:54 -0700 Patch bug-146879-20150711120540.patch text/plain 4653 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTg2NzExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTU3NDFmZGFkYmIyOWFi YzQ0YTU3MzZiZWExNmY1Yjg4YjYwNDUxZi4uNWNkN2E0YTk4NWVhYmJlMWYwMWVjOGUzYWJhNTBm OTdkMjFkMjNiZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE1LTA3LTExICBCZW5q YW1pbiBQb3VsYWluICA8YmVuamFtaW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBGaXggQ09OVEVO VF9FWFRFTlNJT05TX1NUQVRFX01BQ0hJTkVfREVCVUdHSU5HCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDY4NzkKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTb21lIG9mIG15IHJlY2VudCBjaGFuZ2VzIGJy b2tlIENPTlRFTlRfRVhURU5TSU9OU19TVEFURV9NQUNISU5FX0RFQlVHR0lORyA6KAorCisgICAg ICAgICogY29udGVudGV4dGVuc2lvbnMvQ29tYmluZWRVUkxGaWx0ZXJzLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkNvbnRlbnRFeHRlbnNpb25zOjpwcmVmaXhUcmVlVmVydGV4VG9TdHJpbmcpOgor ICAgICAgICAoV2ViQ29yZTo6Q29udGVudEV4dGVuc2lvbnM6OnJlY3Vyc2l2ZVByaW50KToKKyAg ICAgICAgKFdlYkNvcmU6OkNvbnRlbnRFeHRlbnNpb25zOjpDb21iaW5lZFVSTEZpbHRlcnM6OnBy aW50KToKKyAgICAgICAgKiBjb250ZW50ZXh0ZW5zaW9ucy9Db250ZW50RXh0ZW5zaW9uc0RlYnVn Z2luZy5oOgorICAgICAgICAqIGNvbnRlbnRleHRlbnNpb25zL0RGQS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpDb250ZW50RXh0ZW5zaW9uczo6REZBOjpkZWJ1Z1ByaW50RG90KToKKwogMjAxNS0w Ny0xMCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIFtXSzJdIERp YWdub3N0aWMgbG9nZ2luZyBtZXNzYWdlcyBhcmUgY2F1c2luZyB0b28gbXVjaCBJUEMKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2NvbnRlbnRleHRlbnNpb25zL0NvbWJpbmVkVVJMRmlsdGVy cy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jb250ZW50ZXh0ZW5zaW9ucy9Db21iaW5lZFVSTEZpbHRl cnMuY3BwCmluZGV4IGRiMzk0NzU1MDc5MzljMThiODZlYzRkYTNkOWJiMDE3NmVjMDEyMDQuLjhh OWFlOTk4Yzg0YWVlYTcxN2E5ZGVmNjhhNDI4ZGM1MDViNGE2ODAgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2NvbnRlbnRleHRlbnNpb25zL0NvbWJpbmVkVVJMRmlsdGVycy5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvY29udGVudGV4dGVuc2lvbnMvQ29tYmluZWRVUkxGaWx0ZXJzLmNwcApA QCAtNzgsMTYgKzc4LDE2IEBAIHNpemVfdCBDb21iaW5lZFVSTEZpbHRlcnM6Om1lbW9yeVVzZWQo KSBjb25zdAogI2VuZGlmCiAgICAgCiAjaWYgQ09OVEVOVF9FWFRFTlNJT05TX1NUQVRFX01BQ0hJ TkVfREVCVUdHSU5HCi1zdGF0aWMgU3RyaW5nIHByZWZpeFRyZWVWZXJ0ZXhUb1N0cmluZyhjb25z dCBQcmVmaXhUcmVlVmVydGV4JiB2ZXJ0ZXgsIHVuc2lnbmVkIGRlcHRoKQorc3RhdGljIFN0cmlu ZyBwcmVmaXhUcmVlVmVydGV4VG9TdHJpbmcoY29uc3QgUHJlZml4VHJlZVZlcnRleCYgdmVydGV4 LCBjb25zdCBIYXNoTWFwPGNvbnN0IFByZWZpeFRyZWVWZXJ0ZXgqLCBBY3Rpb25MaXN0PiYgYWN0 aW9ucywgdW5zaWduZWQgZGVwdGgpCiB7CiAgICAgU3RyaW5nQnVpbGRlciBidWlsZGVyOwogICAg IHdoaWxlIChkZXB0aC0tKQogICAgICAgICBidWlsZGVyLmFwcGVuZCgiICAiKTsKICAgICBidWls ZGVyLmFwcGVuZCgidmVydGV4IGFjdGlvbnM6ICIpOwogCi0gICAgYXV0byBhY3Rpb25zU2xvdCA9 IG1fYWN0aW9ucy5maW5kKCZ2ZXJ0ZXgpOwotICAgIGlmIChhY3Rpb25zU2xvdCAhPSBtX2FjdGlv bnMuZW5kKCkpIHsKLSAgICAgICAgZm9yIChhdXRvIGFjdGlvbiA6ICphY3Rpb25zU2xvdC0+dmFs dWUpIHsKKyAgICBhdXRvIGFjdGlvbnNTbG90ID0gYWN0aW9ucy5maW5kKCZ2ZXJ0ZXgpOworICAg IGlmIChhY3Rpb25zU2xvdCAhPSBhY3Rpb25zLmVuZCgpKSB7CisgICAgICAgIGZvciAodWludDY0 X3QgYWN0aW9uIDogYWN0aW9uc1Nsb3QtPnZhbHVlKSB7CiAgICAgICAgICAgICBidWlsZGVyLmFw cGVuZE51bWJlcihhY3Rpb24pOwogICAgICAgICAgICAgYnVpbGRlci5hcHBlbmQoJywnKTsKICAg ICAgICAgfQpAQCAtOTYsOSArOTYsOSBAQCBzdGF0aWMgU3RyaW5nIHByZWZpeFRyZWVWZXJ0ZXhU b1N0cmluZyhjb25zdCBQcmVmaXhUcmVlVmVydGV4JiB2ZXJ0ZXgsIHVuc2lnbmVkCiAgICAgcmV0 dXJuIGJ1aWxkZXIudG9TdHJpbmcoKTsKIH0KIAotc3RhdGljIHZvaWQgcmVjdXJzaXZlUHJpbnQo Y29uc3QgUHJlZml4VHJlZVZlcnRleCYgdmVydGV4LCB1bnNpZ25lZCBkZXB0aCkKK3N0YXRpYyB2 b2lkIHJlY3Vyc2l2ZVByaW50KGNvbnN0IFByZWZpeFRyZWVWZXJ0ZXgmIHZlcnRleCwgY29uc3Qg SGFzaE1hcDxjb25zdCBQcmVmaXhUcmVlVmVydGV4KiwgQWN0aW9uTGlzdD4mIGFjdGlvbnMsIHVu c2lnbmVkIGRlcHRoKQogewotICAgIGRhdGFMb2dGKCIlcyIsIHByZWZpeFRyZWVWZXJ0ZXhUb1N0 cmluZyh2ZXJ0ZXgsIGRlcHRoKS51dGY4KCkuZGF0YSgpKTsKKyAgICBkYXRhTG9nRigiJXMiLCBw cmVmaXhUcmVlVmVydGV4VG9TdHJpbmcodmVydGV4LCBhY3Rpb25zLCBkZXB0aCkudXRmOCgpLmRh dGEoKSk7CiAgICAgZm9yIChjb25zdCBhdXRvJiBlZGdlIDogdmVydGV4LmVkZ2VzKSB7CiAgICAg ICAgIFN0cmluZ0J1aWxkZXIgYnVpbGRlcjsKICAgICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsg aSA8IGRlcHRoICogMjsgKytpKQpAQCAtMTA4LDEzICsxMDgsMTMgQEAgc3RhdGljIHZvaWQgcmVj dXJzaXZlUHJpbnQoY29uc3QgUHJlZml4VHJlZVZlcnRleCYgdmVydGV4LCB1bnNpZ25lZCBkZXB0 aCkKICAgICAgICAgYnVpbGRlci5hcHBlbmQoJ1xuJyk7CiAgICAgICAgIGRhdGFMb2dGKCIlcyIs IGJ1aWxkZXIudG9TdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKICAgICAgICAgQVNTRVJUKGVkZ2Uu Y2hpbGQpOwotICAgICAgICByZWN1cnNpdmVQcmludCgqZWRnZS5jaGlsZC5nZXQoKSwgZGVwdGgg KyAxKTsKKyAgICAgICAgcmVjdXJzaXZlUHJpbnQoKmVkZ2UuY2hpbGQuZ2V0KCksIGFjdGlvbnMs IGRlcHRoICsgMSk7CiAgICAgfQogfQogCiB2b2lkIENvbWJpbmVkVVJMRmlsdGVyczo6cHJpbnQo KSBjb25zdAogewotICAgIHJlY3Vyc2l2ZVByaW50KCptX3ByZWZpeFRyZWVSb290LmdldCgpLCAw KTsKKyAgICByZWN1cnNpdmVQcmludCgqbV9wcmVmaXhUcmVlUm9vdC5nZXQoKSwgbV9hY3Rpb25z LCAwKTsKIH0KICNlbmRpZgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jb250ZW50ZXh0 ZW5zaW9ucy9Db250ZW50RXh0ZW5zaW9uc0RlYnVnZ2luZy5oIGIvU291cmNlL1dlYkNvcmUvY29u dGVudGV4dGVuc2lvbnMvQ29udGVudEV4dGVuc2lvbnNEZWJ1Z2dpbmcuaAppbmRleCA1NmNmNDZj N2FlNWU3MGJkZjhlZWFlZjc3Njk2ZjhlODJjZmU3Nzk3Li44ZTM3NDQ5N2RmOGIyMmNhZjY2NWE2 ZjRhNTg5YmIzYWVkNmRhMDg0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jb250ZW50ZXh0 ZW5zaW9ucy9Db250ZW50RXh0ZW5zaW9uc0RlYnVnZ2luZy5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2NvbnRlbnRleHRlbnNpb25zL0NvbnRlbnRFeHRlbnNpb25zRGVidWdnaW5nLmgKQEAgLTM4LDcg KzM4LDcgQEAKICNkZWZpbmUgQ09OVEVOVF9FWFRFTlNJT05TX1BBR0VfU0laRSAxNjM4NAogCiAj aWYgQ09OVEVOVF9FWFRFTlNJT05TX1NUQVRFX01BQ0hJTkVfREVCVUdHSU5HCi10eXBlZGVmIENy YXNoT25PdmVyZmxvdyBDb250ZW50RXh0ZW5zaW9uc092ZXJmbG93SGFuZGxlcjsKK3R5cGVkZWYg V1RGOjpDcmFzaE9uT3ZlcmZsb3cgQ29udGVudEV4dGVuc2lvbnNPdmVyZmxvd0hhbmRsZXI7CiAj ZWxzZQogdHlwZWRlZiBVbnNhZmVWZWN0b3JPdmVyZmxvdyBDb250ZW50RXh0ZW5zaW9uc092ZXJm bG93SGFuZGxlcjsKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY29udGVudGV4 dGVuc2lvbnMvREZBLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2NvbnRlbnRleHRlbnNpb25zL0RGQS5j cHAKaW5kZXggZTU4YjdjNDRlMzJmNDhiMWQ0MGY5ZGE2MzhmMjE2OWZiNzMzYzljOC4uOTQ1MzVh N2JjMTA4NjIwYzJhZDgxOGNjZTY5MDE3ZDJlNTk5YzczYyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvY29udGVudGV4dGVuc2lvbnMvREZBLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jb250 ZW50ZXh0ZW5zaW9ucy9ERkEuY3BwCkBAIC0xNDcsNiArMTQ3LDcgQEAgdm9pZCBERkE6OmRlYnVn UHJpbnREb3QoKSBjb25zdAogICAgICAgICAgICAgICAgIGRhdGFMb2dGKCIlbGx1IiwgYWN0aW9u c1thY3Rpb25JbmRleF0pOwogICAgICAgICAgICAgfQogICAgICAgICB9CisgICAgICAgIGRhdGFM b2dGKCJdIik7CiAKICAgICAgICAgaWYgKCFhY3Rpb25zLmlzRW1wdHkoKSkKICAgICAgICAgICAg IGRhdGFMb2dGKCIgW3NoYXBlPWRvdWJsZWNpcmNsZV0iKTsK