30967 2009-10-30 15:22:33 -0700 Give the FrameLoaderClient the ability to override Settings::isJavaScriptEnabled. 2009-11-02 21:47:58 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 fishd fishd abarth oldest_to_newest 159475 0 fishd 2009-10-30 15:22:33 -0700 Give the FrameLoaderClient the ability to override Settings::isJavaScriptEnabled. I plan to use this to remove ChromiumBridge::uiResourceProtocol() as well as some other application-specific cruft in V8Proxy.cpp. 159477 1 42239 fishd 2009-10-30 15:23:55 -0700 Created attachment 42239 v1 patch 159481 2 abarth 2009-10-30 15:29:06 -0700 This looks great, but can't we just delete V8Proxy::isEnabled? V8Proxy and ScriptContoller are the same thing. 159483 3 fishd 2009-10-30 15:31:43 -0700 Yes, I can do that. I can also remove uiResourceProtocol from ChromiumBridge! 159484 4 42239 darin 2009-10-30 15:32:41 -0700 Comment on attachment 42239 v1 patch Looks OK. r=me 159486 5 42240 fishd 2009-10-30 15:35:24 -0700 Created attachment 42240 v2 patch 159520 6 42240 abarth 2009-10-30 16:49:25 -0700 Comment on attachment 42240 v2 patch Great! I like how this patch makes the old code look silly. 159986 7 fishd 2009-11-02 21:47:58 -0800 Landed as: http://trac.webkit.org/changeset/50441 42239 2009-10-30 15:23:55 -0700 2009-10-30 15:35:24 -0700 v1 patch script_1.txt text/plain 4105 fishd SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViQ29yZS9DaGFuZ2VM b2cJKHJldmlzaW9uIDUwMzU4KQorKysgV2ViQ29yZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkK QEAgLTEsMyArMSwxNyBAQAorMjAwOS0xMC0zMCAgRGFyaW4gRmlzaGVyICA8ZGFyaW5AY2hyb21p dW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEdpdmUgdGhlIEZyYW1lTG9hZGVyQ2xpZW50IHRoZSBhYmlsaXR5IHRvIG92ZXJyaWRlIFNldHRp bmdzOjppc0phdmFTY3JpcHRFbmFibGVkLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MzA5NjcKKworICAgICAgICAqIGJpbmRpbmdzL2pzL1NjcmlwdENv bnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2NyaXB0Q29udHJvbGxlcjo6aXNFbmFi bGVkKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9WOFByb3h5LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlY4UHJveHk6OmlzRW5hYmxlZCk6CisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyQ2xp ZW50Lmg6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudDo6YWxsb3dKYXZhU2Ny aXB0KToKKwogMjAwOS0xMC0zMCAgRW5yaWNhIENhc3VjY2kgIDxlbnJpY2FAYXBwbGUuY29tPgog CiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgpJbmRleDogV2ViQ29yZS9iaW5kaW5n cy9qcy9TY3JpcHRDb250cm9sbGVyLmNwcA0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIFdlYkNvcmUvYmluZGlu Z3MvanMvU2NyaXB0Q29udHJvbGxlci5jcHAJKHJldmlzaW9uIDUwMzU4KQorKysgV2ViQ29yZS9i aW5kaW5ncy9qcy9TY3JpcHRDb250cm9sbGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzExLDcg KzMxMSw3IEBAIGJvb2wgU2NyaXB0Q29udHJvbGxlcjo6YW55UGFnZUlzUHJvY2Vzc2kKIGJvb2wg U2NyaXB0Q29udHJvbGxlcjo6aXNFbmFibGVkKCkKIHsKICAgICBTZXR0aW5ncyogc2V0dGluZ3Mg PSBtX2ZyYW1lLT5zZXR0aW5ncygpOwotICAgIHJldHVybiAoc2V0dGluZ3MgJiYgc2V0dGluZ3Mt PmlzSmF2YVNjcmlwdEVuYWJsZWQoKSk7CisgICAgcmV0dXJuIG1fZnJhbWUtPmxvYWRlcigpLT5j bGllbnQoKS0+YWxsb3dKYXZhU2NyaXB0KHNldHRpbmdzICYmIHNldHRpbmdzLT5pc0phdmFTY3Jp cHRFbmFibGVkKCkpOwogfQogCiB2b2lkIFNjcmlwdENvbnRyb2xsZXI6OmF0dGFjaERlYnVnZ2Vy KEpTQzo6RGVidWdnZXIqIGRlYnVnZ2VyKQpJbmRleDogV2ViQ29yZS9iaW5kaW5ncy92OC9WOFBy b3h5LmNwcA0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQ0KLS0tIFdlYkNvcmUvYmluZGluZ3MvdjgvVjhQcm94eS5jcHAJ KHJldmlzaW9uIDUwMzU4KQorKysgV2ViQ29yZS9iaW5kaW5ncy92OC9WOFByb3h5LmNwcAkod29y a2luZyBjb3B5KQpAQCAtNjEzLDQ2ICs2MTMsNyBAQCB2b2lkIFY4UHJveHk6OmRpc2Nvbm5lY3RG cmFtZSgpCiBib29sIFY4UHJveHk6OmlzRW5hYmxlZCgpCiB7CiAgICAgU2V0dGluZ3MqIHNldHRp bmdzID0gbV9mcmFtZS0+c2V0dGluZ3MoKTsKLSAgICBpZiAoIXNldHRpbmdzKQotICAgICAgICBy ZXR1cm4gZmFsc2U7Ci0KLSAgICAvLyBJbiB0aGUgY29tbW9uIGNhc2UsIEphdmFTY3JpcHQgaXMg ZW5hYmxlZCBhbmQgd2UncmUgZG9uZS4KLSAgICBpZiAoc2V0dGluZ3MtPmlzSmF2YVNjcmlwdEVu YWJsZWQoKSkKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0KLSAgICAvLyBJZiBKYXZhU2NyaXB0IGhh cyBiZWVuIGRpc2FibGVkLCB3ZSBuZWVkIHRvIGxvb2sgYXQgdGhlIGZyYW1lIHRvIHRlbGwKLSAg ICAvLyB3aGV0aGVyIHRoaXMgc2NyaXB0IGNhbWUgZnJvbSB0aGUgd2ViIG9yIHRoZSBlbWJlZGRl ci4gU2NyaXB0cyBmcm9tIHRoZQotICAgIC8vIGVtYmVkZGVyIGFyZSBzYWZlIHRvIHJ1biwgYnV0 IHNjcmlwdHMgZnJvbSB0aGUgb3RoZXIgc291cmNlcyBhcmUKLSAgICAvLyBkaXNhbGxvd2VkLgot ICAgIERvY3VtZW50KiBkb2N1bWVudCA9IG1fZnJhbWUtPmRvY3VtZW50KCk7Ci0gICAgaWYgKCFk b2N1bWVudCkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgU2VjdXJpdHlPcmlnaW4qIG9y aWdpbiA9IGRvY3VtZW50LT5zZWN1cml0eU9yaWdpbigpOwotICAgIGlmIChvcmlnaW4tPnByb3Rv Y29sKCkuaXNFbXB0eSgpKQotICAgICAgICByZXR1cm4gZmFsc2U7IC8vIFVuaW5pdGlhbGl6ZWQg ZG9jdW1lbnQKLQotICAgIGlmIChvcmlnaW4tPnByb3RvY29sKCkgPT0gImh0dHAiIHx8IG9yaWdp bi0+cHJvdG9jb2woKSA9PSAiaHR0cHMiKQotICAgICAgICByZXR1cm4gZmFsc2U7IC8vIFdlYiBz aXRlCi0KLSAgICAvLyBGSVhNRTogdGhlIGZvbGxvd2luZyBhcmUgYXBwbGljYXRpb24gZGVjaXNp b25zLCBhbmQgdGhleSBzaG91bGQKLSAgICAvLyBub3QgYmUgbWFkZSBhdCB0aGlzIGxheWVyLiBp bnN0ZWFkLCB3ZSBzaG91bGQgYnJpZGdlIG91dCB0byB0aGUKLSAgICAvLyBlbWJlZGRlciB0byBh bGxvdyB0aGVtIHRvIG92ZXJyaWRlIHBvbGljeSBoZXJlLgotCi0gICAgaWYgKG9yaWdpbi0+cHJv dG9jb2woKSA9PSBDaHJvbWl1bUJyaWRnZTo6dWlSZXNvdXJjZVByb3RvY29sKCkpCi0gICAgICAg IHJldHVybiB0cnVlOyAgIC8vIEVtYmVkZGVyJ3Mgc2NyaXB0cyBhcmUgb2sgdG8gcnVuCi0KLSAg ICAvLyBJZiB0aGUgc2NoZW1lIGlzIGZ0cDogb3IgZmlsZTosIGFuIGVtcHR5IGZpbGUgbmFtZSBp bmRpY2F0ZXMgYSBkaXJlY3RvcnkKLSAgICAvLyBsaXN0aW5nLCB3aGljaCByZXF1aXJlcyBKYXZh U2NyaXB0IHRvIGZ1bmN0aW9uIHByb3Blcmx5LgotICAgIGNvbnN0IGNoYXIqIGtEaXJQcm90b2Nv bHNbXSA9IHsgImZ0cCIsICJmaWxlIiB9OwotICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgYXJy YXlzaXplKGtEaXJQcm90b2NvbHMpOyArK2kpIHsKLSAgICAgICAgaWYgKG9yaWdpbi0+cHJvdG9j b2woKSA9PSBrRGlyUHJvdG9jb2xzW2ldKSB7Ci0gICAgICAgICAgICBjb25zdCBLVVJMJiB1cmwg PSBkb2N1bWVudC0+dXJsKCk7Ci0gICAgICAgICAgICByZXR1cm4gdXJsLnBhdGhBZnRlckxhc3RT bGFzaCgpID09IHVybC5wYXRoRW5kKCk7Ci0gICAgICAgIH0KLSAgICB9Ci0KLSAgICByZXR1cm4g ZmFsc2U7IC8vIE90aGVyIHByb3RvY29scyBmYWxsIHRocm91Z2ggdG8gaGVyZQorICAgIHJldHVy biBtX2ZyYW1lLT5sb2FkZXIoKS0+Y2xpZW50KCktPmFsbG93SmF2YVNjcmlwdChzZXR0aW5ncyAm JiBzZXR0aW5ncy0+aXNKYXZhU2NyaXB0RW5hYmxlZCgpKTsKIH0KIAogdm9pZCBWOFByb3h5Ojp1 cGRhdGVEb2N1bWVudFdyYXBwZXIodjg6OkhhbmRsZTx2ODo6VmFsdWU+IHdyYXBwZXIpCkluZGV4 OiBXZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlckNsaWVudC5oDQo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2Vi Q29yZS9sb2FkZXIvRnJhbWVMb2FkZXJDbGllbnQuaAkocmV2aXNpb24gNTAzNTgpCisrKyBXZWJD b3JlL2xvYWRlci9GcmFtZUxvYWRlckNsaWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC0yNDYsNiAr MjQ2LDggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiAgICAgICAgIHZpcnR1YWwgYm9vbCBzaG91 bGRVc2VQbHVnaW5Eb2N1bWVudChjb25zdCBTdHJpbmcmIC8qbWltZVR5cGUqLykgY29uc3QgeyBy ZXR1cm4gZmFsc2U7IH0KICAgICAgICAgdmlydHVhbCBib29sIHNob3VsZExvYWRNZWRpYUVsZW1l bnRVUkwoY29uc3QgS1VSTCYpIGNvbnN0IHsgcmV0dXJuIHRydWU7IH0KKworICAgICAgICB2aXJ0 dWFsIGJvb2wgYWxsb3dKYXZhU2NyaXB0KGJvb2wgZW5hYmxlZFBlclNldHRpbmdzKSB7IHJldHVy biBlbmFibGVkUGVyU2V0dGluZ3M7IH0KICAgICB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3Jl Cg== 42240 2009-10-30 15:35:24 -0700 2009-10-30 16:49:25 -0700 v2 patch script_2.txt text/plain 6090 fishd SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViQ29yZS9DaGFuZ2VM b2cJKHJldmlzaW9uIDUwMzYwKQorKysgV2ViQ29yZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkK QEAgLTEsMyArMSwyMCBAQAorMjAwOS0xMC0zMCAgRGFyaW4gRmlzaGVyICA8ZGFyaW5AY2hyb21p dW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEdpdmUgdGhlIEZyYW1lTG9hZGVyQ2xpZW50IHRoZSBhYmlsaXR5IHRvIG92ZXJyaWRlIFNldHRp bmdzOjppc0phdmFTY3JpcHRFbmFibGVkLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MzA5NjcKKworICAgICAgICAqIGJpbmRpbmdzL2pzL1NjcmlwdENv bnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2NyaXB0Q29udHJvbGxlcjo6aXNFbmFi bGVkKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9TY3JpcHRDb250cm9sbGVyLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlNjcmlwdENvbnRyb2xsZXI6OmlzRW5hYmxlZCk6CisgICAgICAgICogYmlu ZGluZ3MvdjgvVjhQcm94eS5jcHA6IE1vdmUgaW1wbGVtZW50YXRpb24gb2YgaXNFbmFibGVkIHRv IFNjcmlwdENvbnRyb2xsZXIKKyAgICAgICAgKiBiaW5kaW5ncy92OC9WOFByb3h5Lmg6IERpdHRv CisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyQ2xpZW50Lmg6CisgICAgICAgIChXZWJDb3Jl OjpGcmFtZUxvYWRlckNsaWVudDo6YWxsb3dKYXZhU2NyaXB0KToKKyAgICAgICAgKiBwbGF0Zm9y bS9jaHJvbWl1bS9DaHJvbWl1bUJyaWRnZS5oOiBEZWxldGUgdWlSZXNvdXJjZVByb3RvY29sIGZ1 bmN0aW9uCisKIDIwMDktMTAtMzAgIERtaXRyeSBUaXRvdiAgPGRpbWljaEBjaHJvbWl1bS5vcmc+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGF2aWQgTGV2aW4uCkluZGV4OiBXZWJDb3JlL2JpbmRp bmdzL2pzL1NjcmlwdENvbnRyb2xsZXIuY3BwDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViQ29yZS9iaW5k aW5ncy9qcy9TY3JpcHRDb250cm9sbGVyLmNwcAkocmV2aXNpb24gNTAzNTgpCisrKyBXZWJDb3Jl L2JpbmRpbmdzL2pzL1NjcmlwdENvbnRyb2xsZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMTEs NyArMzExLDcgQEAgYm9vbCBTY3JpcHRDb250cm9sbGVyOjphbnlQYWdlSXNQcm9jZXNzaQogYm9v bCBTY3JpcHRDb250cm9sbGVyOjppc0VuYWJsZWQoKQogewogICAgIFNldHRpbmdzKiBzZXR0aW5n cyA9IG1fZnJhbWUtPnNldHRpbmdzKCk7Ci0gICAgcmV0dXJuIChzZXR0aW5ncyAmJiBzZXR0aW5n cy0+aXNKYXZhU2NyaXB0RW5hYmxlZCgpKTsKKyAgICByZXR1cm4gbV9mcmFtZS0+bG9hZGVyKCkt PmNsaWVudCgpLT5hbGxvd0phdmFTY3JpcHQoc2V0dGluZ3MgJiYgc2V0dGluZ3MtPmlzSmF2YVNj cmlwdEVuYWJsZWQoKSk7CiB9CiAKIHZvaWQgU2NyaXB0Q29udHJvbGxlcjo6YXR0YWNoRGVidWdn ZXIoSlNDOjpEZWJ1Z2dlciogZGVidWdnZXIpCkluZGV4OiBXZWJDb3JlL2JpbmRpbmdzL3Y4L1Nj cmlwdENvbnRyb2xsZXIuY3BwDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViQ29yZS9iaW5kaW5ncy92OC9T Y3JpcHRDb250cm9sbGVyLmNwcAkocmV2aXNpb24gNTAzNTgpCisrKyBXZWJDb3JlL2JpbmRpbmdz L3Y4L1NjcmlwdENvbnRyb2xsZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yOTAsNyArMjkwLDgg QEAgYm9vbCBTY3JpcHRDb250cm9sbGVyOjpoYXZlSW50ZXJwcmV0ZXIoKQogCiBib29sIFNjcmlw dENvbnRyb2xsZXI6OmlzRW5hYmxlZCgpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIG1fcHJveHktPmlz RW5hYmxlZCgpOworICAgIFNldHRpbmdzKiBzZXR0aW5ncyA9IG1fcHJveHktPmZyYW1lKCktPnNl dHRpbmdzKCk7CisgICAgcmV0dXJuIG1fcHJveHktPmZyYW1lKCktPmxvYWRlcigpLT5jbGllbnQo KS0+YWxsb3dKYXZhU2NyaXB0KHNldHRpbmdzICYmIHNldHRpbmdzLT5pc0phdmFTY3JpcHRFbmFi bGVkKCkpOwogfQogCiBQYXNzU2NyaXB0SW5zdGFuY2UgU2NyaXB0Q29udHJvbGxlcjo6Y3JlYXRl U2NyaXB0SW5zdGFuY2VGb3JXaWRnZXQoV2lkZ2V0KiB3aWRnZXQpCkluZGV4OiBXZWJDb3JlL2Jp bmRpbmdzL3Y4L1Y4UHJveHkuY3BwDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViQ29yZS9iaW5kaW5ncy92 OC9WOFByb3h5LmNwcAkocmV2aXNpb24gNTAzNTgpCisrKyBXZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4 UHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02MTAsNTEgKzYxMCw2IEBAIHZvaWQgVjhQcm94 eTo6ZGlzY29ubmVjdEZyYW1lKCkKIHsKIH0KIAotYm9vbCBWOFByb3h5Ojppc0VuYWJsZWQoKQot ewotICAgIFNldHRpbmdzKiBzZXR0aW5ncyA9IG1fZnJhbWUtPnNldHRpbmdzKCk7Ci0gICAgaWYg KCFzZXR0aW5ncykKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgLy8gSW4gdGhlIGNvbW1v biBjYXNlLCBKYXZhU2NyaXB0IGlzIGVuYWJsZWQgYW5kIHdlJ3JlIGRvbmUuCi0gICAgaWYgKHNl dHRpbmdzLT5pc0phdmFTY3JpcHRFbmFibGVkKCkpCi0gICAgICAgIHJldHVybiB0cnVlOwotCi0g ICAgLy8gSWYgSmF2YVNjcmlwdCBoYXMgYmVlbiBkaXNhYmxlZCwgd2UgbmVlZCB0byBsb29rIGF0 IHRoZSBmcmFtZSB0byB0ZWxsCi0gICAgLy8gd2hldGhlciB0aGlzIHNjcmlwdCBjYW1lIGZyb20g dGhlIHdlYiBvciB0aGUgZW1iZWRkZXIuIFNjcmlwdHMgZnJvbSB0aGUKLSAgICAvLyBlbWJlZGRl ciBhcmUgc2FmZSB0byBydW4sIGJ1dCBzY3JpcHRzIGZyb20gdGhlIG90aGVyIHNvdXJjZXMgYXJl Ci0gICAgLy8gZGlzYWxsb3dlZC4KLSAgICBEb2N1bWVudCogZG9jdW1lbnQgPSBtX2ZyYW1lLT5k b2N1bWVudCgpOwotICAgIGlmICghZG9jdW1lbnQpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQot ICAgIFNlY3VyaXR5T3JpZ2luKiBvcmlnaW4gPSBkb2N1bWVudC0+c2VjdXJpdHlPcmlnaW4oKTsK LSAgICBpZiAob3JpZ2luLT5wcm90b2NvbCgpLmlzRW1wdHkoKSkKLSAgICAgICAgcmV0dXJuIGZh bHNlOyAvLyBVbmluaXRpYWxpemVkIGRvY3VtZW50Ci0KLSAgICBpZiAob3JpZ2luLT5wcm90b2Nv bCgpID09ICJodHRwIiB8fCBvcmlnaW4tPnByb3RvY29sKCkgPT0gImh0dHBzIikKLSAgICAgICAg cmV0dXJuIGZhbHNlOyAvLyBXZWIgc2l0ZQotCi0gICAgLy8gRklYTUU6IHRoZSBmb2xsb3dpbmcg YXJlIGFwcGxpY2F0aW9uIGRlY2lzaW9ucywgYW5kIHRoZXkgc2hvdWxkCi0gICAgLy8gbm90IGJl IG1hZGUgYXQgdGhpcyBsYXllci4gaW5zdGVhZCwgd2Ugc2hvdWxkIGJyaWRnZSBvdXQgdG8gdGhl Ci0gICAgLy8gZW1iZWRkZXIgdG8gYWxsb3cgdGhlbSB0byBvdmVycmlkZSBwb2xpY3kgaGVyZS4K LQotICAgIGlmIChvcmlnaW4tPnByb3RvY29sKCkgPT0gQ2hyb21pdW1CcmlkZ2U6OnVpUmVzb3Vy Y2VQcm90b2NvbCgpKQotICAgICAgICByZXR1cm4gdHJ1ZTsgICAvLyBFbWJlZGRlcidzIHNjcmlw dHMgYXJlIG9rIHRvIHJ1bgotCi0gICAgLy8gSWYgdGhlIHNjaGVtZSBpcyBmdHA6IG9yIGZpbGU6 LCBhbiBlbXB0eSBmaWxlIG5hbWUgaW5kaWNhdGVzIGEgZGlyZWN0b3J5Ci0gICAgLy8gbGlzdGlu Zywgd2hpY2ggcmVxdWlyZXMgSmF2YVNjcmlwdCB0byBmdW5jdGlvbiBwcm9wZXJseS4KLSAgICBj b25zdCBjaGFyKiBrRGlyUHJvdG9jb2xzW10gPSB7ICJmdHAiLCAiZmlsZSIgfTsKLSAgICBmb3Ig KHNpemVfdCBpID0gMDsgaSA8IGFycmF5c2l6ZShrRGlyUHJvdG9jb2xzKTsgKytpKSB7Ci0gICAg ICAgIGlmIChvcmlnaW4tPnByb3RvY29sKCkgPT0ga0RpclByb3RvY29sc1tpXSkgewotICAgICAg ICAgICAgY29uc3QgS1VSTCYgdXJsID0gZG9jdW1lbnQtPnVybCgpOwotICAgICAgICAgICAgcmV0 dXJuIHVybC5wYXRoQWZ0ZXJMYXN0U2xhc2goKSA9PSB1cmwucGF0aEVuZCgpOwotICAgICAgICB9 Ci0gICAgfQotCi0gICAgcmV0dXJuIGZhbHNlOyAvLyBPdGhlciBwcm90b2NvbHMgZmFsbCB0aHJv dWdoIHRvIGhlcmUKLX0KLQogdm9pZCBWOFByb3h5Ojp1cGRhdGVEb2N1bWVudFdyYXBwZXIodjg6 OkhhbmRsZTx2ODo6VmFsdWU+IHdyYXBwZXIpCiB7CiAgICAgY2xlYXJEb2N1bWVudFdyYXBwZXIo KTsKSW5kZXg6IFdlYkNvcmUvYmluZGluZ3MvdjgvVjhQcm94eS5oDQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0g V2ViQ29yZS9iaW5kaW5ncy92OC9WOFByb3h5LmgJKHJldmlzaW9uIDUwMzU4KQorKysgV2ViQ29y ZS9iaW5kaW5ncy92OC9WOFByb3h5LmgJKHdvcmtpbmcgY29weSkKQEAgLTE2Myw4ICsxNjMsNiBA QCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIC8vIGFuZCBjbGVhcnMgYWxsIHRpbWVvdXRz IG9uIHRoZSBET00gd2luZG93LgogICAgICAgICB2b2lkIGRpc2Nvbm5lY3RGcmFtZSgpOwogCi0g ICAgICAgIGJvb2wgaXNFbmFibGVkKCk7Ci0KICNpZiBFTkFCTEUoU1ZHKQogICAgICAgICBzdGF0 aWMgdm9pZCBzZXRTVkdDb250ZXh0KHZvaWQqLCBTVkdFbGVtZW50Kik7CiAgICAgICAgIHN0YXRp YyBTVkdFbGVtZW50KiBzdmdDb250ZXh0KHZvaWQqKTsKSW5kZXg6IFdlYkNvcmUvbG9hZGVyL0Zy YW1lTG9hZGVyQ2xpZW50LmgNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJDb3JlL2xvYWRlci9GcmFtZUxv YWRlckNsaWVudC5oCShyZXZpc2lvbiA1MDM1OCkKKysrIFdlYkNvcmUvbG9hZGVyL0ZyYW1lTG9h ZGVyQ2xpZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTI0Niw2ICsyNDYsOCBAQCBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAKICAgICAgICAgdmlydHVhbCBib29sIHNob3VsZFVzZVBsdWdpbkRvY3VtZW50 KGNvbnN0IFN0cmluZyYgLyptaW1lVHlwZSovKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQogICAg ICAgICB2aXJ0dWFsIGJvb2wgc2hvdWxkTG9hZE1lZGlhRWxlbWVudFVSTChjb25zdCBLVVJMJikg Y29uc3QgeyByZXR1cm4gdHJ1ZTsgfQorCisgICAgICAgIHZpcnR1YWwgYm9vbCBhbGxvd0phdmFT Y3JpcHQoYm9vbCBlbmFibGVkUGVyU2V0dGluZ3MpIHsgcmV0dXJuIGVuYWJsZWRQZXJTZXR0aW5n czsgfQogICAgIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKSW5kZXg6IFdlYkNvcmUvcGxh dGZvcm0vY2hyb21pdW0vQ2hyb21pdW1CcmlkZ2UuaA0KPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIFdlYkNvcmUv cGxhdGZvcm0vY2hyb21pdW0vQ2hyb21pdW1CcmlkZ2UuaAkocmV2aXNpb24gNTAzNTgpCisrKyBX ZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL0Nocm9taXVtQnJpZGdlLmgJKHdvcmtpbmcgY29weSkK QEAgLTE1OCw5ICsxNTgsNiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHN0YXRpYyBO UE9iamVjdCogcGx1Z2luU2NyaXB0YWJsZU9iamVjdChXaWRnZXQqKTsKICAgICAgICAgc3RhdGlj IGJvb2wgcG9wdXBzQWxsb3dlZChOUFApOwogCi0gICAgICAgIC8vIFByb3RvY29sIC0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCi0gICAg ICAgIHN0YXRpYyBTdHJpbmcgdWlSZXNvdXJjZVByb3RvY29sKCk7ICAvLyBkZXByZWNhdGVkCi0K ICAgICAgICAgLy8gUmVzb3VyY2VzIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KICAgICAgICAgc3RhdGljIFBhc3NSZWZQdHI8SW1hZ2U+ IGxvYWRQbGF0Zm9ybUltYWdlUmVzb3VyY2UoY29uc3QgY2hhciogbmFtZSk7CiAK