140284 2015-01-08 21:13:39 -0800 Fix error handling of ContentExtensionsManager when the top level input is unusable 2015-01-09 13:57:04 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 benjamin benjamin kling oldest_to_newest 1060070 0 benjamin 2015-01-08 21:13:39 -0800 Fix error handling of ContentExtensionsManager when the top level input is unusable 1060073 1 244323 benjamin 2015-01-08 21:16:15 -0800 Created attachment 244323 Patch 1060177 2 244323 kling 2015-01-09 10:55:11 -0800 Comment on attachment 244323 Patch r=me 1060262 3 244323 benjamin 2015-01-09 13:57:01 -0800 Comment on attachment 244323 Patch Clearing flags on attachment: 244323 Committed r178194: <http://trac.webkit.org/changeset/178194> 1060263 4 benjamin 2015-01-09 13:57:04 -0800 All reviewed patches have been landed. Closing bug. 244323 2015-01-08 21:16:15 -0800 2015-01-09 13:57:01 -0800 Patch bug-140284-20150108211619.patch text/plain 4805 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTc4MTUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjg2MjkwYmI0ODI0NjI1 NjQ5Y2ZjNjczNGEzMjNhODUyZDNkZjJlNi4uZGE5MjExN2Y3N2NlYmIzMGQ4YjFjYTUxMWU3ZmNl ZmFlYmY3YTE3YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI2IEBACiAyMDE1LTAxLTA4ICBCZW5q YW1pbiBQb3VsYWluICA8YmVuamFtaW5Ad2Via2l0Lm9yZz4KIAorICAgICAgICBGaXggZXJyb3Ig aGFuZGxpbmcgb2YgQ29udGVudEV4dGVuc2lvbnNNYW5hZ2VyIHdoZW4gdGhlIHRvcCBsZXZlbCBp bnB1dCBpcyB1bnVzYWJsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTQwMjg0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgVGhlcmUgYXJlIGEgY291cGxlIG9mIHdheXMgdGhlIFdlYlByb2Nlc3Mgd291bGQg Y3Jhc2ggaWYgdGhlIGlucHV0CisgICAgICAgIGlzIHJlYWxseSByZWFsbHkgYmFkOgorICAgICAg ICAtSWYgdGhlIEpTT04gaXMgdW5yZWFkYWJsZSwgd2UgY2FuIGhhdmUgYW4gZXhjZXB0aW9uIG9y IGRlY29kZWRSdWxlcyBjYW4gYmUgbnVsbC4KKyAgICAgICAgLU9uIGFueSBvZiB0aGUgZXJyb3Is IHdlIGNhbm5vdCByZXR1cm4gaW1tZWRpYXRlbHkgb3Igd2Ugd2lsbCBza2lwIHZtLmNsZWFyKCku CisKKyAgICAgICAgVGhpcyBwYXRjaCBhZGRzIGEgYnJhbmNoIHRvIGZpeCB0aGUgZmlyc3QgaXNz dWUuCisKKyAgICAgICAgRm9yIHRoZSBzZWNvbmQgaXNzdWUsIGEgbmV3IGZ1bmN0aW9uLCBsb2Fk RW5jb2RlZFJ1bGVzKCksIGVuY2Fwc3VsYXRlIGFsbCB0aGUgZWFybHkKKyAgICAgICAgcmV0dXJu cyB0byBtYWtlIHN1cmUgd2UgZXhlY3V0ZSB0aGUgZW5kIG9mIGxvYWRFeHRlbnNpb24oKS4KKwor ICAgICAgICAqIGNvbnRlbnRleHRlbnNpb25zL0NvbnRlbnRFeHRlbnNpb25zTWFuYWdlci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50RXh0ZW5zaW9uczo6RXh0ZW5zaW9uc01hbmFnZXI6 OmxvYWRFbmNvZGVkUnVsZXMpOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudEV4dGVuc2lvbnM6 OkV4dGVuc2lvbnNNYW5hZ2VyOjpsb2FkRXh0ZW5zaW9uKToKKworMjAxNS0wMS0wOCAgQmVuamFt aW4gUG91bGFpbiAgPGJlbmphbWluQHdlYmtpdC5vcmc+CisKICAgICAgICAgQWRkIGJhc2ljIHBh dHRlcm4gbWF0Y2hpbmcgc3VwcG9ydCB0byB0aGUgdXJsIGZpbHRlcnMKICAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MDI4MwogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9jb250ZW50ZXh0ZW5zaW9ucy9Db250ZW50RXh0ZW5zaW9uc01hbmFnZXIu Y3BwIGIvU291cmNlL1dlYkNvcmUvY29udGVudGV4dGVuc2lvbnMvQ29udGVudEV4dGVuc2lvbnNN YW5hZ2VyLmNwcAppbmRleCA0OTBhNDQ0NTQyMTM1ZmQzYTQ0MjlkYWZiZmZkYTc2M2IyYzI4Mzlm Li4xNTUzMWM4MTRkYmQyY2U5ZTcwNTA5M2M2YmM3ZDE5ODI4MTI1NjY0IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9jb250ZW50ZXh0ZW5zaW9ucy9Db250ZW50RXh0ZW5zaW9uc01hbmFnZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2NvbnRlbnRleHRlbnNpb25zL0NvbnRlbnRFeHRlbnNp b25zTWFuYWdlci5jcHAKQEAgLTEwOCw0NyArMTA4LDU5IEBAIHN0YXRpYyB2b2lkIGxvYWRSdWxl KEV4ZWNTdGF0ZSYgZXhlYywgSlNPYmplY3QmIHJ1bGVPYmplY3QsIFZlY3RvcjxDb250ZW50RXh0 ZW5zCiAgICAgcnVsZUxpc3QuYXBwZW5kKENvbnRlbnRFeHRlbnNpb25SdWxlKHRyaWdnZXIsIGFj dGlvbikpOwogfQogCi12b2lkIGxvYWRFeHRlbnNpb24oY29uc3QgU3RyaW5nJiBpZGVudGlmaWVy LCBjb25zdCBTdHJpbmcmIHJ1bGVzKQorc3RhdGljIFZlY3RvcjxDb250ZW50RXh0ZW5zaW9uUnVs ZT4gbG9hZEVuY29kZWRSdWxlcyhFeGVjU3RhdGUmIGV4ZWMsIGNvbnN0IFN0cmluZyYgcnVsZXMp CiB7Ci0gICAgVmVjdG9yPENvbnRlbnRFeHRlbnNpb25SdWxlPiBydWxlTGlzdDsKLQotICAgIFJl ZlB0cjxWTT4gdm0gPSBWTTo6Y3JlYXRlKCk7CisgICAgSlNWYWx1ZSBkZWNvZGVkUnVsZXMgPSBK U09OUGFyc2UoJmV4ZWMsIHJ1bGVzKTsKIAotICAgIEpTTG9ja0hvbGRlciBsb2NrZXIodm0uZ2V0 KCkpOwotICAgIEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QgPSBKU0dsb2JhbE9iamVjdDo6 Y3JlYXRlKCp2bSwgSlNHbG9iYWxPYmplY3Q6OmNyZWF0ZVN0cnVjdHVyZSgqdm0sIGpzTnVsbCgp KSk7CisgICAgaWYgKGV4ZWMuaGFkRXhjZXB0aW9uKCkgfHwgIWRlY29kZWRSdWxlcykgeworICAg ICAgICBXVEZMb2dBbHdheXMoIkZhaWxlZCB0byBwYXJzZSB0aGUgSlNPTiBzdHJpbmcuIik7Cisg ICAgICAgIHJldHVybiBWZWN0b3I8Q29udGVudEV4dGVuc2lvblJ1bGU+KCk7CisgICAgfQogCi0g ICAgRXhlY1N0YXRlKiBleGVjID0gZ2xvYmFsT2JqZWN0LT5nbG9iYWxFeGVjKCk7Ci0gICAgSlNW YWx1ZSBkZWNvZGVkUnVsZXMgPSBKU09OUGFyc2UoZXhlYywgcnVsZXMpOwogICAgIGlmIChkZWNv ZGVkUnVsZXMuaXNPYmplY3QoKSkgewotICAgICAgICBKU09iamVjdCogdG9wTGV2ZWxPYmplY3Qg PSBkZWNvZGVkUnVsZXMudG9PYmplY3QoZXhlYyk7Ci0gICAgICAgIGlmICghdG9wTGV2ZWxPYmpl Y3QgfHwgZXhlYy0+aGFkRXhjZXB0aW9uKCkpIHsKKyAgICAgICAgSlNPYmplY3QqIHRvcExldmVs T2JqZWN0ID0gZGVjb2RlZFJ1bGVzLnRvT2JqZWN0KCZleGVjKTsKKyAgICAgICAgaWYgKCF0b3BM ZXZlbE9iamVjdCB8fCBleGVjLmhhZEV4Y2VwdGlvbigpKSB7CiAgICAgICAgICAgICBXVEZMb2dB bHdheXMoIkludmFsaWQgaW5wdXQsIHRoZSB0b3AgbGV2ZWwgc3RydWN0dXJlIGlzIG5vdCBhbiBv YmplY3QuIik7Ci0gICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICByZXR1cm4gVmVjdG9y PENvbnRlbnRFeHRlbnNpb25SdWxlPigpOwogICAgICAgICB9CiAKICAgICAgICAgaWYgKCFpc0pT QXJyYXkodG9wTGV2ZWxPYmplY3QpKSB7CiAgICAgICAgICAgICBXVEZMb2dBbHdheXMoIkludmFs aWQgaW5wdXQsIHRoZSB0b3AgbGV2ZWwgb2JqZWN0IGlzIG5vdCBhbiBhcnJheS4iKTsKLSAgICAg ICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIHJldHVybiBWZWN0b3I8Q29udGVudEV4dGVuc2lv blJ1bGU+KCk7CiAgICAgICAgIH0KIAorICAgICAgICBWZWN0b3I8Q29udGVudEV4dGVuc2lvblJ1 bGU+IHJ1bGVMaXN0OwogICAgICAgICBKU0FycmF5KiB0b3BMZXZlbEFycmF5ID0ganNDYXN0PEpT QXJyYXkqPih0b3BMZXZlbE9iamVjdCk7CiAKICAgICAgICAgdW5zaWduZWQgbGVuZ3RoID0gdG9w TGV2ZWxBcnJheS0+bGVuZ3RoKCk7CiAgICAgICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBs ZW5ndGg7ICsraSkgewotICAgICAgICAgICAgSlNWYWx1ZSB2YWx1ZSA9IHRvcExldmVsQXJyYXkt PmdldEluZGV4KGV4ZWMsIGkpOwotICAgICAgICAgICAgaWYgKGV4ZWMtPmhhZEV4Y2VwdGlvbigp IHx8ICF2YWx1ZSkgeworICAgICAgICAgICAgSlNWYWx1ZSB2YWx1ZSA9IHRvcExldmVsQXJyYXkt PmdldEluZGV4KCZleGVjLCBpKTsKKyAgICAgICAgICAgIGlmIChleGVjLmhhZEV4Y2VwdGlvbigp IHx8ICF2YWx1ZSkgewogICAgICAgICAgICAgICAgIFdURkxvZ0Fsd2F5cygiSW52YWxpZCBvYmpl Y3QgaW4gdGhlIGFycmF5LiIpOwogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICAg ICAgfQogCi0gICAgICAgICAgICBKU09iamVjdCogcnVsZU9iamVjdCA9IHZhbHVlLnRvT2JqZWN0 KGV4ZWMpOwotICAgICAgICAgICAgaWYgKCFydWxlT2JqZWN0IHx8IGV4ZWMtPmhhZEV4Y2VwdGlv bigpKSB7CisgICAgICAgICAgICBKU09iamVjdCogcnVsZU9iamVjdCA9IHZhbHVlLnRvT2JqZWN0 KCZleGVjKTsKKyAgICAgICAgICAgIGlmICghcnVsZU9iamVjdCB8fCBleGVjLmhhZEV4Y2VwdGlv bigpKSB7CiAgICAgICAgICAgICAgICAgV1RGTG9nQWx3YXlzKCJJbnZhbGlkIHJ1bGUiKTsKICAg ICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIGxvYWRS dWxlKCpleGVjLCAqcnVsZU9iamVjdCwgcnVsZUxpc3QpOworICAgICAgICAgICAgbG9hZFJ1bGUo ZXhlYywgKnJ1bGVPYmplY3QsIHJ1bGVMaXN0KTsKICAgICAgICAgfQorICAgICAgICByZXR1cm4g cnVsZUxpc3Q7CiAgICAgfQorICAgIHJldHVybiBWZWN0b3I8Q29udGVudEV4dGVuc2lvblJ1bGU+ KCk7Cit9CisKK3ZvaWQgbG9hZEV4dGVuc2lvbihjb25zdCBTdHJpbmcmIGlkZW50aWZpZXIsIGNv bnN0IFN0cmluZyYgcnVsZXMpCit7CisgICAgUmVmUHRyPFZNPiB2bSA9IFZNOjpjcmVhdGUoKTsK KworICAgIEpTTG9ja0hvbGRlciBsb2NrZXIodm0uZ2V0KCkpOworICAgIEpTR2xvYmFsT2JqZWN0 KiBnbG9iYWxPYmplY3QgPSBKU0dsb2JhbE9iamVjdDo6Y3JlYXRlKCp2bSwgSlNHbG9iYWxPYmpl Y3Q6OmNyZWF0ZVN0cnVjdHVyZSgqdm0sIGpzTnVsbCgpKSk7CisKKyAgICBFeGVjU3RhdGUqIGV4 ZWMgPSBnbG9iYWxPYmplY3QtPmdsb2JhbEV4ZWMoKTsKKyAgICBWZWN0b3I8Q29udGVudEV4dGVu c2lvblJ1bGU+IHJ1bGVMaXN0ID0gbG9hZEVuY29kZWRSdWxlcygqZXhlYywgcnVsZXMpOwogCiAg ICAgdm0uY2xlYXIoKTsKIAo=