34225 2010-01-27 13:32:41 -0800 Add FrameLoaderClient::allowImages method to allow the client to overrule image loading policy on a per frame basis 2010-01-29 00:44:23 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 fishd fishd abarth pkasting oldest_to_newest 185200 0 fishd 2010-01-27 13:32:41 -0800 Add FrameLoaderClient::allowImages method to allow the client to overrule image loading policy on a per frame basis This should work similarly to allowPlugins and allowJavaScript. 185764 1 fishd 2010-01-29 00:14:51 -0800 For completeness, I'm also adding a Settings::areImagesEnabled. This is different from loadsImagesAutomatically as I explain in the patch comments. 185766 2 47686 fishd 2010-01-29 00:24:22 -0800 Created attachment 47686 v1 patch 185767 3 47686 abarth 2010-01-29 00:27:42 -0800 Comment on attachment 47686 v1 patch LGTM. As we discussed, either you or I owe Sam a test for this patch. We should be able to write the test at the same time as the test for allowPlugins. 185769 4 fishd 2010-01-29 00:44:23 -0800 Landed as http://trac.webkit.org/changeset/54049 47686 2010-01-29 00:24:22 -0800 2010-01-29 00:27:41 -0800 v1 patch images_1.txt text/plain 10517 fishd SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViQ29yZS9DaGFuZ2VM b2cJKHJldmlzaW9uIDU0MDQ4KQorKysgV2ViQ29yZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkK QEAgLTEsMyArMSwyOCBAQAorMjAxMC0wMS0yOSAgRGFyaW4gRmlzaGVyICA8ZGFyaW5AY2hyb21p dW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEFkZCBGcmFtZUxvYWRlckNsaWVudDo6YWxsb3dJbWFnZXMgbWV0aG9kIHRvIGFsbG93IHRoZSBj bGllbnQgdG8KKyAgICAgICAgb3ZlcnJ1bGUgaW1hZ2UgbG9hZGluZyBwb2xpY3kgb24gYSBwZXIg ZnJhbWUgYmFzaXMuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTM0MjI1CisKKyAgICAgICAgRm9yIGNvbXBsZXRlbmVzcywgdGhpcyBwYXRjaCBhbHNv IGFkZHMgU2V0dGluZ3M6OmFyZUltYWdlc0VuYWJsZWQuCisgICAgICAgIFRoaXMgaXMgZGlmZmVy ZW50IGZyb20gbG9hZHNJbWFnZXNBdXRvbWF0aWNhbGx5IGFzIGlzIGV4cGxhaW5lZCBpbgorICAg ICAgICBTZXR0aW5ncy5oLgorCisgICAgICAgICogbG9hZGVyL0RvY0xvYWRlci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpEb2NMb2FkZXI6OnJlcXVlc3RJbWFnZSk6CisgICAgICAgICogbG9hZGVy L0ZyYW1lTG9hZGVyQ2xpZW50Lmg6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVu dDo6YWxsb3dJbWFnZXMpOgorICAgICAgICAqIGxvYWRlci9JbWFnZURvY3VtZW50LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkltYWdlVG9rZW5pemVyOjp3cml0ZVJhd0RhdGEpOgorICAgICAgICAq IHBhZ2UvU2V0dGluZ3MuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2V0dGluZ3M6OlNldHRpbmdz KToKKyAgICAgICAgKFdlYkNvcmU6OlNldHRpbmdzOjpzZXRJbWFnZXNFbmFibGVkKToKKyAgICAg ICAgKiBwYWdlL1NldHRpbmdzLmg6CisgICAgICAgIChXZWJDb3JlOjpTZXR0aW5nczo6YXJlSW1h Z2VzRW5hYmxlZCk6CisKIDIwMTAtMDEtMjggIE5pY2hvbGFzIFlvdW5nICA8bmljaG9sYXMueW91 bmdAbm9raWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgQ2FybHNvbi4KSW5kZXg6 IFdlYkNvcmUvbG9hZGVyL0RvY0xvYWRlci5jcHANCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJDb3JlL2xv YWRlci9Eb2NMb2FkZXIuY3BwCShyZXZpc2lvbiA1NDAyNCkKKysrIFdlYkNvcmUvbG9hZGVyL0Rv Y0xvYWRlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQwLDYgKzQwLDcgQEAKICNpbmNsdWRlICJI VE1MRWxlbWVudC5oIgogI2luY2x1ZGUgIkZyYW1lLmgiCiAjaW5jbHVkZSAiRnJhbWVMb2FkZXIu aCIKKyNpbmNsdWRlICJGcmFtZUxvYWRlckNsaWVudC5oIgogI2luY2x1ZGUgImxvYWRlci5oIgog I2luY2x1ZGUgIlNlY3VyaXR5T3JpZ2luLmgiCiAjaW5jbHVkZSAiU2V0dGluZ3MuaCIKQEAgLTEy MCw2ICsxMjEsMTEgQEAgdm9pZCBEb2NMb2FkZXI6OmNoZWNrRm9yUmVsb2FkKGNvbnN0IEtVUgog CiBDYWNoZWRJbWFnZSogRG9jTG9hZGVyOjpyZXF1ZXN0SW1hZ2UoY29uc3QgU3RyaW5nJiB1cmwp CiB7CisgICAgaWYgKEZyYW1lKiBmID0gZnJhbWUoKSkgeworICAgICAgICBTZXR0aW5ncyogc2V0 dGluZ3MgPSBmLT5zZXR0aW5ncygpOworICAgICAgICBpZiAoIWYtPmxvYWRlcigpLT5jbGllbnQo KS0+YWxsb3dJbWFnZXMoIXNldHRpbmdzIHx8IHNldHRpbmdzLT5hcmVJbWFnZXNFbmFibGVkKCkp KQorICAgICAgICAgICAgcmV0dXJuIDA7CisgICAgfQogICAgIENhY2hlZEltYWdlKiByZXNvdXJj ZSA9IHN0YXRpY19jYXN0PENhY2hlZEltYWdlKj4ocmVxdWVzdFJlc291cmNlKENhY2hlZFJlc291 cmNlOjpJbWFnZVJlc291cmNlLCB1cmwsIFN0cmluZygpKSk7CiAgICAgaWYgKGF1dG9Mb2FkSW1h Z2VzKCkgJiYgcmVzb3VyY2UgJiYgcmVzb3VyY2UtPnN0aWxsTmVlZHNMb2FkKCkpIHsKICAgICAg ICAgcmVzb3VyY2UtPnNldExvYWRpbmcodHJ1ZSk7CkluZGV4OiBXZWJDb3JlL2xvYWRlci9GcmFt ZUxvYWRlckNsaWVudC5oDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2Fk ZXJDbGllbnQuaAkocmV2aXNpb24gNTQwMjQpCisrKyBXZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRl ckNsaWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC0yNTgsNiArMjU4LDcgQEAgbmFtZXNwYWNlIFdl YkNvcmUgewogCiAgICAgICAgIHZpcnR1YWwgYm9vbCBhbGxvd0phdmFTY3JpcHQoYm9vbCBlbmFi bGVkUGVyU2V0dGluZ3MpIHsgcmV0dXJuIGVuYWJsZWRQZXJTZXR0aW5nczsgfQogICAgICAgICB2 aXJ0dWFsIGJvb2wgYWxsb3dQbHVnaW5zKGJvb2wgZW5hYmxlZFBlclNldHRpbmdzKSB7IHJldHVy biBlbmFibGVkUGVyU2V0dGluZ3M7IH0KKyAgICAgICAgdmlydHVhbCBib29sIGFsbG93SW1hZ2Vz KGJvb2wgZW5hYmxlZFBlclNldHRpbmdzKSB7IHJldHVybiBlbmFibGVkUGVyU2V0dGluZ3M7IH0K ICAgICB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCkluZGV4OiBXZWJDb3JlL2xvYWRlci9J bWFnZURvY3VtZW50LmNwcA0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIFdlYkNvcmUvbG9hZGVyL0ltYWdlRG9j dW1lbnQuY3BwCShyZXZpc2lvbiA1NDAyNCkKKysrIFdlYkNvcmUvbG9hZGVyL0ltYWdlRG9jdW1l bnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMyw2ICszMyw3IEBACiAjaW5jbHVkZSAiRXZlbnRO YW1lcy5oIgogI2luY2x1ZGUgIkZyYW1lLmgiCiAjaW5jbHVkZSAiRnJhbWVMb2FkZXIuaCIKKyNp bmNsdWRlICJGcmFtZUxvYWRlckNsaWVudC5oIgogI2luY2x1ZGUgIkZyYW1lVmlldy5oIgogI2lu Y2x1ZGUgIkhUTUxJbWFnZUVsZW1lbnQuaCIKICNpbmNsdWRlICJIVE1MTmFtZXMuaCIKQEAgLTEx NSw4ICsxMTYsMTMgQEAgdm9pZCBJbWFnZVRva2VuaXplcjo6d3JpdGUoY29uc3QgU2VnbWVudAog CiBib29sIEltYWdlVG9rZW5pemVyOjp3cml0ZVJhd0RhdGEoY29uc3QgY2hhciosIGludCkKIHsK KyAgICBGcmFtZSogZnJhbWUgPSBtX2RvYy0+ZnJhbWUoKTsKKyAgICBTZXR0aW5ncyogc2V0dGlu Z3MgPSBmcmFtZS0+c2V0dGluZ3MoKTsKKyAgICBpZiAoIWZyYW1lLT5sb2FkZXIoKS0+Y2xpZW50 KCktPmFsbG93SW1hZ2VzKCFzZXR0aW5ncyB8fCBzZXR0aW5ncy0+YXJlSW1hZ2VzRW5hYmxlZCgp KSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIAogICAgIENhY2hlZEltYWdlKiBjYWNoZWRJ bWFnZSA9IG1fZG9jLT5jYWNoZWRJbWFnZSgpOwotICAgIGNhY2hlZEltYWdlLT5kYXRhKG1fZG9j LT5mcmFtZSgpLT5sb2FkZXIoKS0+ZG9jdW1lbnRMb2FkZXIoKS0+bWFpblJlc291cmNlRGF0YSgp LCBmYWxzZSk7CisgICAgY2FjaGVkSW1hZ2UtPmRhdGEoZnJhbWUtPmxvYWRlcigpLT5kb2N1bWVu dExvYWRlcigpLT5tYWluUmVzb3VyY2VEYXRhKCksIGZhbHNlKTsKIAogICAgIG1fZG9jLT5pbWFn ZUNoYW5nZWQoKTsKICAgICAKSW5kZXg6IFdlYkNvcmUvcGFnZS9TZXR0aW5ncy5jcHANCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0NCi0tLSBXZWJDb3JlL3BhZ2UvU2V0dGluZ3MuY3BwCShyZXZpc2lvbiA1NDAyNCkKKysr IFdlYkNvcmUvcGFnZS9TZXR0aW5ncy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTY4LDYgKzY4LDcg QEAgU2V0dGluZ3M6OlNldHRpbmdzKFBhZ2UqIHBhZ2UpCiAgICAgLCBtX2xvYWRzSW1hZ2VzQXV0 b21hdGljYWxseShmYWxzZSkKICAgICAsIG1fcHJpdmF0ZUJyb3dzaW5nRW5hYmxlZChmYWxzZSkK ICAgICAsIG1fY2FyZXRCcm93c2luZ0VuYWJsZWQoZmFsc2UpCisgICAgLCBtX2FyZUltYWdlc0Vu YWJsZWQodHJ1ZSkKICAgICAsIG1fYXJlUGx1Z2luc0VuYWJsZWQoZmFsc2UpCiAgICAgLCBtX2Rh dGFiYXNlc0VuYWJsZWQoZmFsc2UpCiAgICAgLCBtX2xvY2FsU3RvcmFnZUVuYWJsZWQoZmFsc2Up CkBAIC0yNDIsNiArMjQzLDExIEBAIHZvaWQgU2V0dGluZ3M6OnNldEphdmFFbmFibGVkKGJvb2wg aXNKYXYKICAgICBtX2lzSmF2YUVuYWJsZWQgPSBpc0phdmFFbmFibGVkOwogfQogCit2b2lkIFNl dHRpbmdzOjpzZXRJbWFnZXNFbmFibGVkKGJvb2wgYXJlSW1hZ2VzRW5hYmxlZCkKK3sKKyAgICBt X2FyZUltYWdlc0VuYWJsZWQgPSBhcmVJbWFnZXNFbmFibGVkOworfQorCiB2b2lkIFNldHRpbmdz OjpzZXRQbHVnaW5zRW5hYmxlZChib29sIGFyZVBsdWdpbnNFbmFibGVkKQogewogICAgIG1fYXJl UGx1Z2luc0VuYWJsZWQgPSBhcmVQbHVnaW5zRW5hYmxlZDsKSW5kZXg6IFdlYkNvcmUvcGFnZS9T ZXR0aW5ncy5oDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViQ29yZS9wYWdlL1NldHRpbmdzLmgJKHJldmlz aW9uIDU0MDI0KQorKysgV2ViQ29yZS9wYWdlL1NldHRpbmdzLmgJKHdvcmtpbmcgY29weSkKQEAg LTk4LDYgKzk4LDggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICB2b2lkIHNldERlZmF1 bHRGaXhlZEZvbnRTaXplKGludCk7CiAgICAgICAgIGludCBkZWZhdWx0Rml4ZWRGb250U2l6ZSgp IGNvbnN0IHsgcmV0dXJuIG1fZGVmYXVsdEZpeGVkRm9udFNpemU7IH0KIAorICAgICAgICAvLyBV bmxpa2UgYXJlSW1hZ2VzRW5hYmxlZCwgdGhpcyBvbmx5IHN1cHByZXNzZXMgdGhlIG5ldHdvcmsg bG9hZCBvZgorICAgICAgICAvLyB0aGUgaW1hZ2UgVVJMLiAgQSBjYWNoZWQgaW1hZ2Ugd2lsbCBz dGlsbCBiZSByZW5kZXJlZCBpZiByZXF1ZXN0ZWQuCiAgICAgICAgIHZvaWQgc2V0TG9hZHNJbWFn ZXNBdXRvbWF0aWNhbGx5KGJvb2wpOwogICAgICAgICBib29sIGxvYWRzSW1hZ2VzQXV0b21hdGlj YWxseSgpIGNvbnN0IHsgcmV0dXJuIG1fbG9hZHNJbWFnZXNBdXRvbWF0aWNhbGx5OyB9CiAKQEAg LTExNiw2ICsxMTgsOSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHZvaWQgc2V0SmF2 YUVuYWJsZWQoYm9vbCk7CiAgICAgICAgIGJvb2wgaXNKYXZhRW5hYmxlZCgpIGNvbnN0IHsgcmV0 dXJuIG1faXNKYXZhRW5hYmxlZDsgfQogCisgICAgICAgIHZvaWQgc2V0SW1hZ2VzRW5hYmxlZChi b29sKTsKKyAgICAgICAgYm9vbCBhcmVJbWFnZXNFbmFibGVkKCkgY29uc3QgeyByZXR1cm4gbV9h cmVJbWFnZXNFbmFibGVkOyB9CisKICAgICAgICAgdm9pZCBzZXRQbHVnaW5zRW5hYmxlZChib29s KTsKICAgICAgICAgYm9vbCBhcmVQbHVnaW5zRW5hYmxlZCgpIGNvbnN0IHsgcmV0dXJuIG1fYXJl UGx1Z2luc0VuYWJsZWQ7IH0KIApAQCAtMzAyLDYgKzMwNyw3IEBAIG5hbWVzcGFjZSBXZWJDb3Jl IHsKICAgICAgICAgYm9vbCBtX2xvYWRzSW1hZ2VzQXV0b21hdGljYWxseSA6IDE7CiAgICAgICAg IGJvb2wgbV9wcml2YXRlQnJvd3NpbmdFbmFibGVkIDogMTsKICAgICAgICAgYm9vbCBtX2NhcmV0 QnJvd3NpbmdFbmFibGVkIDogMTsKKyAgICAgICAgYm9vbCBtX2FyZUltYWdlc0VuYWJsZWQgOiAx OwogICAgICAgICBib29sIG1fYXJlUGx1Z2luc0VuYWJsZWQgOiAxOwogICAgICAgICBib29sIG1f ZGF0YWJhc2VzRW5hYmxlZCA6IDE7CiAgICAgICAgIGJvb2wgbV9sb2NhbFN0b3JhZ2VFbmFibGVk IDogMTsKSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cNCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBX ZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiA1NDA0OCkKKysrIFdlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyMiBAQAorMjAxMC0wMS0y OSAgRGFyaW4gRmlzaGVyICA8ZGFyaW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBGcmFtZUxvYWRlckNsaWVudDo6YWxs b3dJbWFnZXMgbWV0aG9kIHRvIGFsbG93IHRoZSBjbGllbnQgdG8KKyAgICAgICAgb3ZlcnJ1bGUg aW1hZ2UgbG9hZGluZyBwb2xpY3kgb24gYSBwZXIgZnJhbWUgYmFzaXMuCisKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM0MjI1CisKKyAgICAgICAgKiBw dWJsaWMvV2ViRnJhbWVDbGllbnQuaDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVDbGllbnQ6 OmFsbG93SW1hZ2VzKToKKyAgICAgICAgKiBwdWJsaWMvV2ViU2V0dGluZ3MuaDoKKyAgICAgICAg KiBzcmMvRnJhbWVMb2FkZXJDbGllbnRJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6RnJhbWVM b2FkZXJDbGllbnRJbXBsOjphbGxvd0ltYWdlcyk6CisgICAgICAgICogc3JjL0ZyYW1lTG9hZGVy Q2xpZW50SW1wbC5oOgorICAgICAgICAqIHNyYy9XZWJTZXR0aW5nc0ltcGwuY3BwOgorICAgICAg ICAoV2ViS2l0OjpXZWJTZXR0aW5nc0ltcGw6OnNldEltYWdlc0VuYWJsZWQpOgorICAgICAgICAq IHNyYy9XZWJTZXR0aW5nc0ltcGwuaDoKKwogMjAxMC0wMS0yOCAgSmVyZW15IE9ybG93ICA8am9y bG93QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBGaXNoZXIuCklu ZGV4OiBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkZyYW1lQ2xpZW50LmgNCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0N Ci0tLSBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkZyYW1lQ2xpZW50LmgJKHJldmlzaW9uIDU0 MDI0KQorKysgV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJGcmFtZUNsaWVudC5oCSh3b3JraW5n IGNvcHkpCkBAIC04Myw2ICs4Myw5IEBAIHB1YmxpYzoKICAgICAvLyBDb250cm9scyB3aGV0aGVy IHBsdWdpbnMgYXJlIGFsbG93ZWQgZm9yIHRoaXMgZnJhbWUuCiAgICAgdmlydHVhbCBib29sIGFs bG93UGx1Z2lucyhXZWJGcmFtZSosIGJvb2wgZW5hYmxlZFBlclNldHRpbmdzKSB7IHJldHVybiBl bmFibGVkUGVyU2V0dGluZ3M7IH0KIAorICAgIC8vIENvbnRyb2xzIHdoZXRoZXIgaW1hZ2VzIGFy ZSBhbGxvd2VkIGZvciB0aGlzIGZyYW1lLgorICAgIHZpcnR1YWwgYm9vbCBhbGxvd0ltYWdlcyhX ZWJGcmFtZSosIGJvb2wgZW5hYmxlZFBlclNldHRpbmdzKSB7IHJldHVybiBlbmFibGVkUGVyU2V0 dGluZ3M7IH0KKwogCiAgICAgLy8gTG9hZCBjb21tYW5kcyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAKSW5kZXg6IFdlYktpdC9jaHJvbWl1 bS9wdWJsaWMvV2ViU2V0dGluZ3MuaA0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIFdlYktpdC9jaHJvbWl1bS9w dWJsaWMvV2ViU2V0dGluZ3MuaAkocmV2aXNpb24gNTQwMjQpCisrKyBXZWJLaXQvY2hyb21pdW0v cHVibGljL1dlYlNldHRpbmdzLmgJKHdvcmtpbmcgY29weSkKQEAgLTU4LDYgKzU4LDcgQEAgcHVi bGljOgogICAgIHZpcnR1YWwgdm9pZCBzZXRXZWJTZWN1cml0eUVuYWJsZWQoYm9vbCkgPSAwOwog ICAgIHZpcnR1YWwgdm9pZCBzZXRKYXZhU2NyaXB0Q2FuT3BlbldpbmRvd3NBdXRvbWF0aWNhbGx5 KGJvb2wpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgc2V0TG9hZHNJbWFnZXNBdXRvbWF0aWNhbGx5 KGJvb2wpID0gMDsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0SW1hZ2VzRW5hYmxlZChib29sKSA9IDA7 CiAgICAgdmlydHVhbCB2b2lkIHNldFBsdWdpbnNFbmFibGVkKGJvb2wpID0gMDsKICAgICB2aXJ0 dWFsIHZvaWQgc2V0RE9NUGFzdGVBbGxvd2VkKGJvb2wpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQg c2V0RGV2ZWxvcGVyRXh0cmFzRW5hYmxlZChib29sKSA9IDA7CkluZGV4OiBXZWJLaXQvY2hyb21p dW0vc3JjL0ZyYW1lTG9hZGVyQ2xpZW50SW1wbC5jcHANCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQv Y2hyb21pdW0vc3JjL0ZyYW1lTG9hZGVyQ2xpZW50SW1wbC5jcHAJKHJldmlzaW9uIDU0MDI0KQor KysgV2ViS2l0L2Nocm9taXVtL3NyYy9GcmFtZUxvYWRlckNsaWVudEltcGwuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0xNzIsNiArMTcyLDE0IEBAIGJvb2wgRnJhbWVMb2FkZXJDbGllbnRJbXBsOjph bGxvd1BsdWdpbnMKICAgICByZXR1cm4gZW5hYmxlZFBlclNldHRpbmdzOwogfQogCitib29sIEZy YW1lTG9hZGVyQ2xpZW50SW1wbDo6YWxsb3dJbWFnZXMoYm9vbCBlbmFibGVkUGVyU2V0dGluZ3Mp Cit7CisgICAgaWYgKG1fd2ViRnJhbWUtPmNsaWVudCgpKQorICAgICAgICByZXR1cm4gbV93ZWJG cmFtZS0+Y2xpZW50KCktPmFsbG93SW1hZ2VzKG1fd2ViRnJhbWUsIGVuYWJsZWRQZXJTZXR0aW5n cyk7CisKKyAgICByZXR1cm4gZW5hYmxlZFBlclNldHRpbmdzOworfQorCiBib29sIEZyYW1lTG9h ZGVyQ2xpZW50SW1wbDo6aGFzV2ViVmlldygpIGNvbnN0CiB7CiAgICAgcmV0dXJuIG1fd2ViRnJh bWUtPnZpZXdJbXBsKCk7CkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3JjL0ZyYW1lTG9hZGVyQ2xp ZW50SW1wbC5oDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9GcmFtZUxvYWRl ckNsaWVudEltcGwuaAkocmV2aXNpb24gNTQwMjQpCisrKyBXZWJLaXQvY2hyb21pdW0vc3JjL0Zy YW1lTG9hZGVyQ2xpZW50SW1wbC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xOTMsNiArMTkzLDcgQEAg cHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBkaWRDaGFuZ2VTY3JvbGxPZmZzZXQoKTsKICAgICB2 aXJ0dWFsIGJvb2wgYWxsb3dKYXZhU2NyaXB0KGJvb2wgZW5hYmxlZFBlclNldHRpbmdzKTsKICAg ICB2aXJ0dWFsIGJvb2wgYWxsb3dQbHVnaW5zKGJvb2wgZW5hYmxlZFBlclNldHRpbmdzKTsKKyAg ICB2aXJ0dWFsIGJvb2wgYWxsb3dJbWFnZXMoYm9vbCBlbmFibGVkUGVyU2V0dGluZ3MpOwogCiBw cml2YXRlOgogICAgIHZvaWQgbWFrZURvY3VtZW50VmlldygpOwpJbmRleDogV2ViS2l0L2Nocm9t aXVtL3NyYy9XZWJTZXR0aW5nc0ltcGwuY3BwDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViS2l0L2Nocm9t aXVtL3NyYy9XZWJTZXR0aW5nc0ltcGwuY3BwCShyZXZpc2lvbiA1NDAyNCkKKysrIFdlYktpdC9j aHJvbWl1bS9zcmMvV2ViU2V0dGluZ3NJbXBsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTMwLDYg KzEzMCwxMSBAQCB2b2lkIFdlYlNldHRpbmdzSW1wbDo6c2V0TG9hZHNJbWFnZXNBdXRvCiAgICAg bV9zZXR0aW5ncy0+c2V0TG9hZHNJbWFnZXNBdXRvbWF0aWNhbGx5KGxvYWRzSW1hZ2VzQXV0b21h dGljYWxseSk7CiB9CiAKK3ZvaWQgV2ViU2V0dGluZ3NJbXBsOjpzZXRJbWFnZXNFbmFibGVkKGJv b2wgZW5hYmxlZCkKK3sKKyAgICBtX3NldHRpbmdzLT5zZXRJbWFnZXNFbmFibGVkKGVuYWJsZWQp OworfQorCiB2b2lkIFdlYlNldHRpbmdzSW1wbDo6c2V0UGx1Z2luc0VuYWJsZWQoYm9vbCBlbmFi bGVkKQogewogICAgIG1fc2V0dGluZ3MtPnNldFBsdWdpbnNFbmFibGVkKGVuYWJsZWQpOwpJbmRl eDogV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJTZXR0aW5nc0ltcGwuaA0KPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0t IFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViU2V0dGluZ3NJbXBsLmgJKHJldmlzaW9uIDU0MDI0KQor KysgV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJTZXR0aW5nc0ltcGwuaAkod29ya2luZyBjb3B5KQpA QCAtNjAsNiArNjAsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHNldFdlYlNlY3VyaXR5 RW5hYmxlZChib29sKTsKICAgICB2aXJ0dWFsIHZvaWQgc2V0SmF2YVNjcmlwdENhbk9wZW5XaW5k b3dzQXV0b21hdGljYWxseShib29sKTsKICAgICB2aXJ0dWFsIHZvaWQgc2V0TG9hZHNJbWFnZXNB dXRvbWF0aWNhbGx5KGJvb2wpOworICAgIHZpcnR1YWwgdm9pZCBzZXRJbWFnZXNFbmFibGVkKGJv b2wpOwogICAgIHZpcnR1YWwgdm9pZCBzZXRQbHVnaW5zRW5hYmxlZChib29sKTsKICAgICB2aXJ0 dWFsIHZvaWQgc2V0RE9NUGFzdGVBbGxvd2VkKGJvb2wpOwogICAgIHZpcnR1YWwgdm9pZCBzZXRE ZXZlbG9wZXJFeHRyYXNFbmFibGVkKGJvb2wpOwo=