142105 2015-02-27 14:31:32 -0800 Add a "block-cookies" rule to the user content filter 2015-02-27 14:50:45 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 beidson beidson achristensen commit-queue japhet oldest_to_newest 1072831 0 beidson 2015-02-27 14:31:32 -0800 Add a "block-cookies" rule to the user content filter 1072834 1 247553 beidson 2015-02-27 14:33:02 -0800 Created attachment 247553 Patch v1 1072840 2 247553 achristensen 2015-02-27 14:42:53 -0800 Comment on attachment 247553 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=247553&action=review This seems ok, except the ContentFilterAction enum, which could evolve into something completely different. I have a few questions, though: > Source/WebCore/contentextensions/ContentExtensionsManager.cpp:101 > else if (actionType != "block" && actionType != "") { I think this should just be else. > Source/WebCore/page/UserContentController.h:52 > +enum class ContentFilterAction { This will eventually be an index into a data structure I'll make. > Source/WebCore/page/UserContentController.h:53 > + Load, I think Load should just be the absence of Block in the returned vector of actionsForURL > Source/WebCore/page/UserContentController.h:94 > + ContentFilterAction actionForURL(const URL&); Will there only be one? Should we return a vector of actions? 1072842 3 247553 achristensen 2015-02-27 14:48:57 -0800 Comment on attachment 247553 Patch v1 Ok. We'll change these things later. 1072844 4 beidson 2015-02-27 14:50:45 -0800 http://trac.webkit.org/changeset/180783 247553 2015-02-27 14:33:02 -0800 2015-02-27 14:48:57 -0800 Patch v1 patch text/plain 13535 beidson ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBjNmNlZjY0Li45Yzg1NTVhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTUtMDIt MjcgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBhICJi bG9jay1jb29raWVzIiBydWxlIHRvIHRoZSB1c2VyIGNvbnRlbnQgZmlsdGVyLgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQyMTA1CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBodHRwL3Rlc3RzL2Nvb2tp ZXMvcmVzb3VyY2VzL2VjaG8tY29va2llcy5waHA6IEFkZGVkLgorICAgICAgICAqIGh0dHAvdGVz dHMvdXNlcmNvbnRlbnRmaWx0ZXIvYmxvY2stY29va2llcy1iYXNpYy1leHBlY3RlZC50eHQ6IEFk ZGVkLgorICAgICAgICAqIGh0dHAvdGVzdHMvdXNlcmNvbnRlbnRmaWx0ZXIvYmxvY2stY29va2ll cy1iYXNpYy5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBodHRwL3Rlc3RzL3VzZXJjb250ZW50Zmls dGVyL2Jsb2NrLWNvb2tpZXMtYmFzaWMuaHRtbC5qc29uOiBBZGRlZC4KKyAgICAgICAgKiBodHRw L3Rlc3RzL3VzZXJjb250ZW50ZmlsdGVyL2Jsb2NrLWNvb2tpZXMtc2VuZC1leHBlY3RlZC50eHQ6 IEFkZGVkLgorICAgICAgICAqIGh0dHAvdGVzdHMvdXNlcmNvbnRlbnRmaWx0ZXIvYmxvY2stY29v a2llcy1zZW5kLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGh0dHAvdGVzdHMvdXNlcmNvbnRlbnRm aWx0ZXIvYmxvY2stY29va2llcy1zZW5kLmh0bWwuanNvbjogQWRkZWQuCisKIDIwMTUtMDItMjcg IFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgaU9TLCBHVEssIGFu ZCBFRkwgcmViYXNlbGluZXMgYWZ0ZXIgcjE4MDcyNi4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L2h0dHAvdGVzdHMvY29va2llcy9yZXNvdXJjZXMvZWNoby1jb29raWVzLnBocCBiL0xheW91dFRl c3RzL2h0dHAvdGVzdHMvY29va2llcy9yZXNvdXJjZXMvZWNoby1jb29raWVzLnBocApuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi45Nzg3MGYxCi0tLSAvZGV2L251bGwKKysrIGIv TGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9jb29raWVzL3Jlc291cmNlcy9lY2hvLWNvb2tpZXMucGhw CkBAIC0wLDAgKzEsMTEgQEAKKzw/cGhwCisKK2Z1bmN0aW9uIGVjaG9Db29raWUoJHZhbHVlLCAk bmFtZSkKK3sKKyAgICBlY2hvICIkbmFtZSA9ICR2YWx1ZVxuIjsKK30KKworZWNobyAiQ29va2ll cyBhcmU6XG4iOworYXJyYXlfd2FsaygkX0NPT0tJRSwgZWNob0Nvb2tpZSk7ICAgIAorCis/Pgpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy91c2VyY29udGVudGZpbHRlci9ibG9j ay1jb29raWVzLWJhc2ljLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvdXNl cmNvbnRlbnRmaWx0ZXIvYmxvY2stY29va2llcy1iYXNpYy1leHBlY3RlZC50eHQKbmV3IGZpbGUg bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYzIyYzM1MwotLS0gL2Rldi9udWxsCisrKyBiL0xh eW91dFRlc3RzL2h0dHAvdGVzdHMvdXNlcmNvbnRlbnRmaWx0ZXIvYmxvY2stY29va2llcy1iYXNp Yy1leHBlY3RlZC50eHQKQEAgLTAsMCArMSw0IEBACitUaGlzIGltYWdlIHJlc291cmNlIHNldHMg YSBjb29raWUuIEJ1dCBiYXNlZCBvbiB0aGUgY29udGVudCBydWxlcywgc2V0dGluZyBjb29raWUg c2hvdWxkIGJlIGJsb2NrZWQuCitkb2N1bWVudC5jb29raWUgc2hvdWxkIGJlIGVtcHR5LCBhbmQg aXRzIHZhbHVlIGlzICcnCisKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy91 c2VyY29udGVudGZpbHRlci9ibG9jay1jb29raWVzLWJhc2ljLmh0bWwgYi9MYXlvdXRUZXN0cy9o dHRwL3Rlc3RzL3VzZXJjb250ZW50ZmlsdGVyL2Jsb2NrLWNvb2tpZXMtYmFzaWMuaHRtbApuZXcg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi42ZTE3ZmEzCi0tLSAvZGV2L251bGwKKysr IGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy91c2VyY29udGVudGZpbHRlci9ibG9jay1jb29raWVz LWJhc2ljLmh0bWwKQEAgLTAsMCArMSwxOCBAQAorPHNjcmlwdD4KK2lmICh3aW5kb3cudGVzdFJ1 bm5lcikgeworCXRlc3RSdW5uZXIuZHVtcEFzVGV4dCgpOworCXRlc3RSdW5uZXIud2FpdFVudGls RG9uZSgpOworfQorCitmdW5jdGlvbiBsb2FkZWQoKQoreworCWRvY3VtZW50LmdldEVsZW1lbnRC eUlkKCJsb2dnZXIiKS5pbm5lckhUTUwgKz0gImRvY3VtZW50LmNvb2tpZSBzaG91bGQgYmUgZW1w dHksIGFuZCBpdHMgdmFsdWUgaXMgJyIgKyBkb2N1bWVudC5jb29raWUgKyAiJyI7CisJCisJaWYg KHdpbmRvdy50ZXN0UnVubmVyKQorCQl0ZXN0UnVubmVyLm5vdGlmeURvbmUoKTsKK30KKzwvc2Ny aXB0PgorCitUaGlzIGltYWdlIHJlc291cmNlIHNldHMgYSBjb29raWUuIEJ1dCBiYXNlZCBvbiB0 aGUgY29udGVudCBydWxlcywgc2V0dGluZyBjb29raWUgc2hvdWxkIGJlIGJsb2NrZWQuPGJyPgor PGRpdiBpZD0ibG9nZ2VyIj48L2Rpdj48YnI+Cis8aW1nIHNyYz0iaHR0cDovLzEyNy4wLjAuMTo4 MDAwL2Nvb2tpZXMvcmVzb3VyY2VzL2Nvb2tpZS11dGlsaXR5LnBocD9xdWVyeWZ1bmN0aW9uPXNl dEZvb0Nvb2tpZSIgb25lcnJvcj0ibG9hZGVkKCkiPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv aHR0cC90ZXN0cy91c2VyY29udGVudGZpbHRlci9ibG9jay1jb29raWVzLWJhc2ljLmh0bWwuanNv biBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvdXNlcmNvbnRlbnRmaWx0ZXIvYmxvY2stY29va2ll cy1iYXNpYy5odG1sLmpzb24KbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMTRl OTNlOAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvdXNlcmNvbnRl bnRmaWx0ZXIvYmxvY2stY29va2llcy1iYXNpYy5odG1sLmpzb24KQEAgLTAsMCArMSwxMCBAQAor WworICAgIHsKKyAgICAgICAgImFjdGlvbiI6IHsKKyAgICAgICAgICAgICJ0eXBlIjogImJsb2Nr LWNvb2tpZXMiCisgICAgICAgIH0sCisgICAgICAgICJ0cmlnZ2VyIjogeworICAgICAgICAgICAg InVybC1maWx0ZXIiOiAiaHR0cDovLzEyNy4wLjAuMTo4MDAwL2Nvb2tpZXMvcmVzb3VyY2VzL2Nv b2tpZS11dGlsaXR5LnBocCIKKyAgICAgICAgfQorICAgIH0KK10KXCBObyBuZXdsaW5lIGF0IGVu ZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3VzZXJjb250ZW50 ZmlsdGVyL2Jsb2NrLWNvb2tpZXMtc2VuZC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9odHRw L3Rlc3RzL3VzZXJjb250ZW50ZmlsdGVyL2Jsb2NrLWNvb2tpZXMtc2VuZC1leHBlY3RlZC50eHQK bmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNmJmMTI5ZQotLS0gL2Rldi9udWxs CisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvdXNlcmNvbnRlbnRmaWx0ZXIvYmxvY2stY29v a2llcy1zZW5kLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDkgQEAKK1RoaXMgdGVzdCBsb2FkcyBh IHJlc291cmNlIHRoYXQgc2V0cyBhIGNvb2tpZSwgdGhlbiB2ZXJpZmllcyB0aGF0IHRoZSBjb29r aWUgaXMgbm90IHNlbnQgb3V0IHdoZW4gaXQgc2hvdWxkIGJlIGJsb2NrZWQuCitBZnRlciB0aGUg aW1hZ2UsIGRvY3VtZW50LmNvb2tpZSBpcyAnZm9vPWF3ZXNvbWV2YWx1ZScKK0FmdGVyIHRoZSBp ZnJhbWUsIGRvY3VtZW50LmNvb2tpZSBpcyAnZm9vPWF3ZXNvbWV2YWx1ZScKKyAKKworLS0tLS0t LS0KK0ZyYW1lOiAnaWZyYW1lJworLS0tLS0tLS0KK0Nvb2tpZXMgYXJlOgpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvaHR0cC90ZXN0cy91c2VyY29udGVudGZpbHRlci9ibG9jay1jb29raWVzLXNl bmQuaHRtbCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvdXNlcmNvbnRlbnRmaWx0ZXIvYmxvY2st Y29va2llcy1zZW5kLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uODA3 ZTQyMAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvdXNlcmNvbnRl bnRmaWx0ZXIvYmxvY2stY29va2llcy1zZW5kLmh0bWwKQEAgLTAsMCArMSwyOSBAQAorPHNjcmlw dD4KK2lmICh3aW5kb3cudGVzdFJ1bm5lcikgeworCXRlc3RSdW5uZXIuZHVtcEFzVGV4dCgpOwor CXRlc3RSdW5uZXIuZHVtcENoaWxkRnJhbWVzQXNUZXh0KCk7CisJdGVzdFJ1bm5lci53YWl0VW50 aWxEb25lKCk7Cit9CisKK2Z1bmN0aW9uIGlmcmFtZURvbmUoKQoreworCWRvY3VtZW50LmdldEVs ZW1lbnRCeUlkKCJsb2dnZXIiKS5pbm5lckhUTUwgKz0gIkFmdGVyIHRoZSBpZnJhbWUsIGRvY3Vt ZW50LmNvb2tpZSBpcyAnIiArIGRvY3VtZW50LmNvb2tpZSArICInPGJyPiI7CisKKwlpZiAod2lu ZG93LnRlc3RSdW5uZXIpCisJCXRlc3RSdW5uZXIubm90aWZ5RG9uZSgpOworfQorCitmdW5jdGlv biBpbWFnZURvbmUoKQoreworCWRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJsb2dnZXIiKS5pbm5l ckhUTUwgKz0gIkFmdGVyIHRoZSBpbWFnZSwgZG9jdW1lbnQuY29va2llIGlzICciICsgZG9jdW1l bnQuY29va2llICsgIic8YnI+IjsKKwlkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiaWZyYW1lIiku b25sb2FkID0gaWZyYW1lRG9uZTsKKwlkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiaWZyYW1lIiku c3JjID0gImh0dHA6Ly8xMjcuMC4wLjE6ODAwMC9jb29raWVzL3Jlc291cmNlcy9lY2hvLWNvb2tp ZXMucGhwIjsKK30KKworCis8L3NjcmlwdD4KKworVGhpcyB0ZXN0IGxvYWRzIGEgcmVzb3VyY2Ug dGhhdCBzZXRzIGEgY29va2llLCB0aGVuIHZlcmlmaWVzIHRoYXQgdGhlIGNvb2tpZSBpcyBub3Qg c2VudCBvdXQgd2hlbiBpdCBzaG91bGQgYmUgYmxvY2tlZC48YnI+Cis8ZGl2IGlkPSJsb2dnZXIi PjwvZGl2PgorPGltZyBzcmM9Imh0dHA6Ly8xMjcuMC4wLjE6ODAwMC9jb29raWVzL3Jlc291cmNl cy9jb29raWUtdXRpbGl0eS5waHA/cXVlcnlmdW5jdGlvbj1zZXRGb29Db29raWUiIG9uZXJyb3I9 ImltYWdlRG9uZSgpOyI+Cis8aWZyYW1lIGlkPSJpZnJhbWUiPjwvaWZyYW1lPgpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy91c2VyY29udGVudGZpbHRlci9ibG9jay1jb29raWVz LXNlbmQuaHRtbC5qc29uIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy91c2VyY29udGVudGZpbHRl ci9ibG9jay1jb29raWVzLXNlbmQuaHRtbC5qc29uCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IDAwMDAwMDAuLmNkZGU5MGUKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rl c3RzL3VzZXJjb250ZW50ZmlsdGVyL2Jsb2NrLWNvb2tpZXMtc2VuZC5odG1sLmpzb24KQEAgLTAs MCArMSwxMCBAQAorWworICAgIHsKKyAgICAgICAgImFjdGlvbiI6IHsKKyAgICAgICAgICAgICJ0 eXBlIjogImJsb2NrLWNvb2tpZXMiCisgICAgICAgIH0sCisgICAgICAgICJ0cmlnZ2VyIjogewor ICAgICAgICAgICAgInVybC1maWx0ZXIiOiAiaHR0cDovLzEyNy4wLjAuMTo4MDAwL2Nvb2tpZXMv cmVzb3VyY2VzL2VjaG8tY29va2llcyIKKyAgICAgICAgfQorICAgIH0KK10KXCBObyBuZXdsaW5l IGF0IGVuZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9T b3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDA2MzFhYi4uMTk5Y2RjMCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDMxIEBACisyMDE1LTAyLTI3ICBCcmFkeSBFaWRzb24gIDxiZWlkc29uQGFw cGxlLmNvbT4KKworICAgICAgICBBZGQgYSAiYmxvY2stY29va2llcyIgcnVsZSB0byB0aGUgdXNl ciBjb250ZW50IGZpbHRlci4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE0MjEwNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFRlc3RzOiBodHRwL3Rlc3RzL3VzZXJjb250ZW50ZmlsdGVyL2Jsb2NrLWNvb2tp ZXMtYmFzaWMuaHRtbAorICAgICAgICAgICAgICAgaHR0cC90ZXN0cy91c2VyY29udGVudGZpbHRl ci9ibG9jay1jb29raWVzLXNlbmQuaHRtbAorCisgICAgICAgICogY29udGVudGV4dGVuc2lvbnMv Q29udGVudEV4dGVuc2lvblJ1bGUuaDoKKworICAgICAgICAqIGNvbnRlbnRleHRlbnNpb25zL0Nv bnRlbnRFeHRlbnNpb25zQmFja2VuZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50RXh0 ZW5zaW9uczo6Q29udGVudEV4dGVuc2lvbnNCYWNrZW5kOjphY3Rpb25Gb3JVUkwpOgorICAgICAg ICAoV2ViQ29yZTo6Q29udGVudEV4dGVuc2lvbnM6OkNvbnRlbnRFeHRlbnNpb25zQmFja2VuZDo6 c2hvdWxkQmxvY2tVUkwpOiBEZWxldGVkLgorICAgICAgICAqIGNvbnRlbnRleHRlbnNpb25zL0Nv bnRlbnRFeHRlbnNpb25zQmFja2VuZC5oOgorCisgICAgICAgICogY29udGVudGV4dGVuc2lvbnMv Q29udGVudEV4dGVuc2lvbnNNYW5hZ2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRF eHRlbnNpb25zOjpFeHRlbnNpb25zTWFuYWdlcjo6bG9hZEFjdGlvbik6CisKKyAgICAgICAgKiBs b2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 Q2FjaGVkUmVzb3VyY2VMb2FkZXI6OnJlcXVlc3RSZXNvdXJjZSk6CisKKyAgICAgICAgKiBwYWdl L1VzZXJDb250ZW50Q29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpVc2VyQ29udGVu dENvbnRyb2xsZXI6OmFjdGlvbkZvclVSTCk6CisgICAgICAgIChXZWJDb3JlOjpVc2VyQ29udGVu dENvbnRyb2xsZXI6OmNvbnRlbnRGaWx0ZXJCbG9ja3NVUkwpOiBEZWxldGVkLgorICAgICAgICAq IHBhZ2UvVXNlckNvbnRlbnRDb250cm9sbGVyLmg6CisKIDIwMTUtMDItMjcgIEFsZXggQ2hyaXN0 ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBbV2luQ2Fpcm9dIFVu cmV2aWV3ZWQgYnVpbGQgZml4LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY29udGVudGV4 dGVuc2lvbnMvQ29udGVudEV4dGVuc2lvblJ1bGUuaCBiL1NvdXJjZS9XZWJDb3JlL2NvbnRlbnRl eHRlbnNpb25zL0NvbnRlbnRFeHRlbnNpb25SdWxlLmgKaW5kZXggYWE5N2VmMS4uZWYyMTEzYiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY29udGVudGV4dGVuc2lvbnMvQ29udGVudEV4dGVu c2lvblJ1bGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jb250ZW50ZXh0ZW5zaW9ucy9Db250ZW50 RXh0ZW5zaW9uUnVsZS5oCkBAIC0zNiw2ICszNiw3IEBAIG5hbWVzcGFjZSBDb250ZW50RXh0ZW5z aW9ucyB7CiAKIGVudW0gY2xhc3MgRXh0ZW5zaW9uQWN0aW9uVHlwZSB7CiAgICAgQmxvY2tMb2Fk LAorICAgIEJsb2NrQ29va2llcywKICAgICBJZ25vcmVQcmV2aW91c1J1bGVzCiB9OwogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jb250ZW50ZXh0ZW5zaW9ucy9Db250ZW50RXh0ZW5zaW9u c0JhY2tlbmQuY3BwIGIvU291cmNlL1dlYkNvcmUvY29udGVudGV4dGVuc2lvbnMvQ29udGVudEV4 dGVuc2lvbnNCYWNrZW5kLmNwcAppbmRleCA5Yjg3MDY2Li5mZTc4ZmMzIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9jb250ZW50ZXh0ZW5zaW9ucy9Db250ZW50RXh0ZW5zaW9uc0JhY2tlbmQu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2NvbnRlbnRleHRlbnNpb25zL0NvbnRlbnRFeHRlbnNp b25zQmFja2VuZC5jcHAKQEAgLTExNyw3ICsxMTcsNyBAQCB2b2lkIENvbnRlbnRFeHRlbnNpb25z QmFja2VuZDo6cmVtb3ZlQWxsUnVsZUxpc3RzKCkKICAgICBtX3J1bGVMaXN0cy5jbGVhcigpOwog fQogCi1ib29sIENvbnRlbnRFeHRlbnNpb25zQmFja2VuZDo6c2hvdWxkQmxvY2tVUkwoY29uc3Qg VVJMJiB1cmwpCitDb250ZW50RmlsdGVyQWN0aW9uIENvbnRlbnRFeHRlbnNpb25zQmFja2VuZDo6 YWN0aW9uRm9yVVJMKGNvbnN0IFVSTCYgdXJsKQogewogICAgIGNvbnN0IFN0cmluZyYgdXJsU3Ry aW5nID0gdXJsLnN0cmluZygpOwogICAgIEFTU0VSVF9XSVRIX01FU1NBR0UodXJsU3RyaW5nLmNv bnRhaW5zT25seUFTQ0lJKCksICJBIGRlY29kZWQgVVJMIHNob3VsZCBvbmx5IGNvbnRhaW4gQVND SUkgY2hhcmFjdGVycy4gVGhlIG1hdGNoaW5nIGFsZ29yaXRobSBhc3N1bWVzIHRoZSBpbnB1dCBp cyBBU0NJSS4iKTsKQEAgLTEzMywxMiArMTMzLDE2IEBAIGJvb2wgQ29udGVudEV4dGVuc2lvbnNC YWNrZW5kOjpzaG91bGRCbG9ja1VSTChjb25zdCBVUkwmIHVybCkKICAgICAgICAgICAgIGNvcHlU b1ZlY3Rvcih0cmlnZ2VyZWRBY3Rpb25zLCBzb3J0ZWRBY3Rpb25zKTsKICAgICAgICAgICAgIHN0 ZDo6c29ydChzb3J0ZWRBY3Rpb25zLmJlZ2luKCksIHNvcnRlZEFjdGlvbnMuZW5kKCkpOwogICAg ICAgICAgICAgc2l6ZV90IGxhc3RBY3Rpb24gPSBzdGF0aWNfY2FzdDxzaXplX3Q+KHNvcnRlZEFj dGlvbnMubGFzdCgpKTsKLSAgICAgICAgICAgIGlmIChjb21waWxlZENvbnRlbnRFeHRlbnNpb24u cnVsZUxpc3RbbGFzdEFjdGlvbl0uYWN0aW9uKCkudHlwZSA9PSBFeHRlbnNpb25BY3Rpb25UeXBl OjpCbG9ja0xvYWQpCi0gICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgICAgICBF eHRlbnNpb25BY3Rpb25UeXBlIHR5cGUgPSBjb21waWxlZENvbnRlbnRFeHRlbnNpb24ucnVsZUxp c3RbbGFzdEFjdGlvbl0uYWN0aW9uKCkudHlwZTsKKworICAgICAgICAgICAgaWYgKHR5cGUgPT0g RXh0ZW5zaW9uQWN0aW9uVHlwZTo6QmxvY2tMb2FkKQorICAgICAgICAgICAgICAgIHJldHVybiBD b250ZW50RmlsdGVyQWN0aW9uOjpCbG9jazsKKyAgICAgICAgICAgIGlmICh0eXBlID09IEV4dGVu c2lvbkFjdGlvblR5cGU6OkJsb2NrQ29va2llcykKKyAgICAgICAgICAgICAgICByZXR1cm4gQ29u dGVudEZpbHRlckFjdGlvbjo6QmxvY2tDb29raWVzOwogICAgICAgICB9CiAgICAgfQogCi0gICAg cmV0dXJuIGZhbHNlOworICAgIHJldHVybiBDb250ZW50RmlsdGVyQWN0aW9uOjpMb2FkOwogfQog CiB9IC8vIG5hbWVzcGFjZSBDb250ZW50RXh0ZW5zaW9ucwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvY29udGVudGV4dGVuc2lvbnMvQ29udGVudEV4dGVuc2lvbnNCYWNrZW5kLmggYi9Tb3Vy Y2UvV2ViQ29yZS9jb250ZW50ZXh0ZW5zaW9ucy9Db250ZW50RXh0ZW5zaW9uc0JhY2tlbmQuaApp bmRleCA0ZGY0YzRjLi5lOTdkOWE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jb250ZW50 ZXh0ZW5zaW9ucy9Db250ZW50RXh0ZW5zaW9uc0JhY2tlbmQuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9jb250ZW50ZXh0ZW5zaW9ucy9Db250ZW50RXh0ZW5zaW9uc0JhY2tlbmQuaApAQCAtMzEsNiAr MzEsNyBAQAogI2luY2x1ZGUgIkNvbnRlbnRFeHRlbnNpb25SdWxlLmgiCiAjaW5jbHVkZSAiREZB LmgiCiAjaW5jbHVkZSAiREZBQnl0ZWNvZGUuaCIKKyNpbmNsdWRlICJVc2VyQ29udGVudENvbnRy b2xsZXIuaCIKICNpbmNsdWRlIDx3dGYvSGFzaE1hcC5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L1N0 cmluZ0hhc2guaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KQEAgLTU3LDcgKzU4 LDcgQEAgcHVibGljOgogICAgIHZvaWQgcmVtb3ZlQWxsUnVsZUxpc3RzKCk7CiAKICAgICAvLyAt IEludGVybmFsIFdlYkNvcmUgSW50ZXJmYWNlLgotICAgIGJvb2wgc2hvdWxkQmxvY2tVUkwoY29u c3QgVVJMJik7CisgICAgQ29udGVudEZpbHRlckFjdGlvbiBhY3Rpb25Gb3JVUkwoY29uc3QgVVJM Jik7CiAKIHByaXZhdGU6CiAgICAgc3RydWN0IENvbXBpbGVkQ29udGVudEV4dGVuc2lvbiB7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jb250ZW50ZXh0ZW5zaW9ucy9Db250ZW50RXh0ZW5z aW9uc01hbmFnZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvY29udGVudGV4dGVuc2lvbnMvQ29udGVu dEV4dGVuc2lvbnNNYW5hZ2VyLmNwcAppbmRleCA2OGRhOTE5Li5mOTYyMTM4IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9jb250ZW50ZXh0ZW5zaW9ucy9Db250ZW50RXh0ZW5zaW9uc01hbmFn ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2NvbnRlbnRleHRlbnNpb25zL0NvbnRlbnRFeHRl bnNpb25zTWFuYWdlci5jcHAKQEAgLTk2LDYgKzk2LDggQEAgc3RhdGljIGJvb2wgbG9hZEFjdGlv bihFeGVjU3RhdGUmIGV4ZWMsIEpTT2JqZWN0JiBydWxlT2JqZWN0LCBDb250ZW50RXh0ZW5zaW9u UnUKICAgICAgICAgYWN0aW9uLnR5cGUgPSBFeHRlbnNpb25BY3Rpb25UeXBlOjpCbG9ja0xvYWQ7 CiAgICAgZWxzZSBpZiAoYWN0aW9uVHlwZSA9PSAiaWdub3JlLXByZXZpb3VzLXJ1bGVzIikKICAg ICAgICAgYWN0aW9uLnR5cGUgPSBFeHRlbnNpb25BY3Rpb25UeXBlOjpJZ25vcmVQcmV2aW91c1J1 bGVzOworICAgIGVsc2UgaWYgKGFjdGlvblR5cGUgPT0gImJsb2NrLWNvb2tpZXMiKQorICAgICAg ICBhY3Rpb24udHlwZSA9IEV4dGVuc2lvbkFjdGlvblR5cGU6OkJsb2NrQ29va2llczsKICAgICBl bHNlIGlmIChhY3Rpb25UeXBlICE9ICJibG9jayIgJiYgYWN0aW9uVHlwZSAhPSAiIikgewogICAg ICAgICBXVEZMb2dBbHdheXMoIlVucmVjb2duaXplZCBhY3Rpb246IFwiJXNcIiIsIGFjdGlvblR5 cGUudXRmOCgpLmRhdGEoKSk7CiAgICAgICAgIHJldHVybiBmYWxzZTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuY3BwCmluZGV4IDMz ZTU5NzcuLmI2OGY3MDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9D YWNoZWRSZXNvdXJjZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hl L0NhY2hlZFJlc291cmNlTG9hZGVyLmNwcApAQCAtNDY0LDggKzQ2NCwxNiBAQCBDYWNoZWRSZXNv dXJjZUhhbmRsZTxDYWNoZWRSZXNvdXJjZT4gQ2FjaGVkUmVzb3VyY2VMb2FkZXI6OnJlcXVlc3RS ZXNvdXJjZShDYWNoZQogICAgICAgICByZXR1cm4gbnVsbHB0cjsKIAogI2lmIEVOQUJMRShDT05U RU5UX0VYVEVOU0lPTlMpCi0gICAgaWYgKGZyYW1lKCkgJiYgZnJhbWUoKS0+cGFnZSgpICYmIGZy YW1lKCktPnBhZ2UoKS0+dXNlckNvbnRlbnRDb250cm9sbGVyKCkgJiYgZnJhbWUoKS0+cGFnZSgp LT51c2VyQ29udGVudENvbnRyb2xsZXIoKS0+Y29udGVudEZpbHRlckJsb2Nrc1VSTCh1cmwpKQot ICAgICAgICByZXR1cm4gbnVsbHB0cjsKKyAgICBDb250ZW50RmlsdGVyQWN0aW9uIGFjdGlvbiA9 IENvbnRlbnRGaWx0ZXJBY3Rpb246OkxvYWQ7CisKKyAgICBpZiAoZnJhbWUoKSAmJiBmcmFtZSgp LT5wYWdlKCkgJiYgZnJhbWUoKS0+cGFnZSgpLT51c2VyQ29udGVudENvbnRyb2xsZXIoKSkgewor ICAgICAgICBhY3Rpb24gPSBmcmFtZSgpLT5wYWdlKCktPnVzZXJDb250ZW50Q29udHJvbGxlcigp LT5hY3Rpb25Gb3JVUkwodXJsKTsKKyAgICAgICAgaWYgKGFjdGlvbiA9PSBDb250ZW50RmlsdGVy QWN0aW9uOjpCbG9jaykKKyAgICAgICAgICAgIHJldHVybiBudWxscHRyOworICAgIH0KKworICAg IGlmIChhY3Rpb24gPT0gQ29udGVudEZpbHRlckFjdGlvbjo6QmxvY2tDb29raWVzKQorICAgICAg ICByZXF1ZXN0Lm11dGFibGVSZXNvdXJjZVJlcXVlc3QoKS5zZXRBbGxvd0Nvb2tpZXMoZmFsc2Up OwogI2VuZGlmCiAKICAgICBhdXRvJiBtZW1vcnlDYWNoZSA9IE1lbW9yeUNhY2hlOjpzaW5nbGV0 b24oKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvVXNlckNvbnRlbnRDb250cm9s bGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvVXNlckNvbnRlbnRDb250cm9sbGVyLmNwcApp bmRleCBmMWI1YTU1Li4zMmNmZGQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1Vz ZXJDb250ZW50Q29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9Vc2VyQ29u dGVudENvbnRyb2xsZXIuY3BwCkBAIC0yMDMsMTIgKzIwMywxMiBAQCB2b2lkIFVzZXJDb250ZW50 Q29udHJvbGxlcjo6cmVtb3ZlQWxsVXNlckNvbnRlbnRGaWx0ZXJzKCkKICAgICBtX2NvbnRlbnRF eHRlbnNpb25CYWNrZW5kLT5yZW1vdmVBbGxSdWxlTGlzdHMoKTsKIH0KIAotYm9vbCBVc2VyQ29u dGVudENvbnRyb2xsZXI6OmNvbnRlbnRGaWx0ZXJCbG9ja3NVUkwoY29uc3QgVVJMJiB1cmwpCitD b250ZW50RmlsdGVyQWN0aW9uIFVzZXJDb250ZW50Q29udHJvbGxlcjo6YWN0aW9uRm9yVVJMKGNv bnN0IFVSTCYgdXJsKQogewogICAgIGlmICghbV9jb250ZW50RXh0ZW5zaW9uQmFja2VuZCkKLSAg ICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICByZXR1cm4gQ29udGVudEZpbHRlckFjdGlvbjo6 TG9hZDsKIAotICAgIHJldHVybiBtX2NvbnRlbnRFeHRlbnNpb25CYWNrZW5kLT5zaG91bGRCbG9j a1VSTCh1cmwpOworICAgIHJldHVybiBtX2NvbnRlbnRFeHRlbnNpb25CYWNrZW5kLT5hY3Rpb25G b3JVUkwodXJsKTsKIH0KIAogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L1VzZXJDb250ZW50Q29udHJvbGxlci5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9Vc2VyQ29udGVu dENvbnRyb2xsZXIuaAppbmRleCAzZGNhNzE4Li40NTE5MjlmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wYWdlL1VzZXJDb250ZW50Q29udHJvbGxlci5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvVXNlckNvbnRlbnRDb250cm9sbGVyLmgKQEAgLTQ5LDYgKzQ5LDEyIEBAIG5hbWVzcGFj ZSBDb250ZW50RXh0ZW5zaW9ucyB7CiBjbGFzcyBDb250ZW50RXh0ZW5zaW9uc0JhY2tlbmQ7CiB9 CiAKK2VudW0gY2xhc3MgQ29udGVudEZpbHRlckFjdGlvbiB7CisgICAgTG9hZCwKKyAgICBCbG9j aywKKyAgICBCbG9ja0Nvb2tpZXMKK307CisKIGNsYXNzIFVzZXJDb250ZW50Q29udHJvbGxlciA6 IHB1YmxpYyBSZWZDb3VudGVkPFVzZXJDb250ZW50Q29udHJvbGxlcj4gewogcHVibGljOgogICAg IFdFQkNPUkVfRVhQT1JUIHN0YXRpYyBSZWZQdHI8VXNlckNvbnRlbnRDb250cm9sbGVyPiBjcmVh dGUoKTsKQEAgLTg1LDcgKzkxLDcgQEAgcHVibGljOgogICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQg cmVtb3ZlQWxsVXNlckNvbnRlbnRGaWx0ZXJzKCk7CiAgICAgCiAgICAgLy8gRklYTUU6IENvbnNp ZGVyIHB1dHRpbmcgdGhpcyAoYW5kIG90aGVyIGZ1dHVyZSBjb250ZW50IGZpbHRlciBwcmVkaWNh dGVzKSBpbiBpdHMgb3duIGNsYXNzLgotICAgIGJvb2wgY29udGVudEZpbHRlckJsb2Nrc1VSTChj b25zdCBVUkwmKTsKKyAgICBDb250ZW50RmlsdGVyQWN0aW9uIGFjdGlvbkZvclVSTChjb25zdCBV UkwmKTsKICNlbmRpZgogCiBwcml2YXRlOgo=