67322 2011-08-31 14:34:50 -0700 Re-name overrideBackingScaleFactor 2011-08-31 16:31:50 -0700 1 1 1 Unclassified WebKit WebKit API 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bdakin bdakin bdakin oldest_to_newest 459930 0 bdakin 2011-08-31 14:34:50 -0700 https://bugs.webkit.org/show_bug.cgi?id=67150 introduced API to WebKit and WebKit 2 to set a custom device scale factor. I called with overrideBackingScaleFactor, but we have since decided that we could re-name that to something more clear. Posting a patch shortly. 459949 1 105835 bdakin 2011-08-31 14:49:58 -0700 Created attachment 105835 Patch 460055 2 bdakin 2011-08-31 16:31:50 -0700 Committed change with revision 94247. 105835 2011-08-31 14:49:58 -0700 2011-08-31 15:54:58 -0700 Patch for-review.txt text/plain 12297 bdakin SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDk0MjM0KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzYgQEAKKzIwMTEtMDgtMzEgIEJldGggRGFr aW4gIDxiZGFraW5AYXBwbGUuY29tPgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD02NzMyMgorICAgICAgICBSZS1uYW1lIG92ZXJyaWRlQmFja2luZ1Nj YWxlRmFjdG9yCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgQVBJIGlzIG5vdyBXS1BhZ2VTZXRDdXN0b21CYWNraW5nU2NhbGVGYWN0b3IoKSBhbmQgV0tQ YWdlR2V0QmFja2luZ1NjYWxlRmFjdG9yKCkgCisgICAgICAgIHdoaWNoIHJldHVybnMgdGhlIGN1 c3RvbSBzY2FsZSBmYWN0b3IgaWYgb25lIHdhcyBzZXQsIGFuZCB0aGUgaW50cmluc2ljIHNjYWxl IAorICAgICAgICBmYWN0b3Igb3RoZXJ3aXNlLiAKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0Mv V0tQYWdlLmNwcDoKKyAgICAgICAgKFdLUGFnZUdldEJhY2tpbmdTY2FsZUZhY3Rvcik6CisgICAg ICAgIChXS1BhZ2VTZXRDdXN0b21CYWNraW5nU2NhbGVGYWN0b3IpOgorICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvQy9XS1BhZ2UuaDoKKworICAgICAgICBSZS1uYW1lZCBfZGV2aWNlU2NhbGVGYWN0 b3IgdG8gX2ludHJpbnNpY0RldmljZVNjYWxlRmFjdG9yIHNpbmNlIGl0IG9ubHkgZXZlciAKKyAg ICAgICAgcmVmZXJzIHRvIHRoZSBpbnRyaW5zaWMgdmFsdWUuCisgICAgICAgICogVUlQcm9jZXNz L0FQSS9tYWMvV0tWaWV3Lm1tOgorICAgICAgICAoLVtXS1ZpZXcgdmlld0RpZE1vdmVUb1dpbmRv d10pOgorICAgICAgICAoLVtXS1ZpZXcgX3dpbmRvd0RpZENoYW5nZVJlc29sdXRpb246XSk6Cisg ICAgICAgICgtW1dLVmlldyBfaW50cmluc2ljRGV2aWNlU2NhbGVGYWN0b3JdKToKKworICAgICAg ICBXZWJQYWdlUHJveHkgc3RvcmVzIGJvdGggdGhlIGN1c3RvbURldmljZVNjYWxlRmFjdG9yIGFu ZCB0aGUgCisgICAgICAgIGludHJpbnNpY0RldmljZVNjYWxlRmFjdG9yLiBkZXZpY2VTY2FsZUZh Y3RvcigpIHJldHVybnMgdGhlIGFwcHJvcHJpYXRlIHZhbHVlIHRoYXQgCisgICAgICAgIHNob3Vs ZCBiZSB0aGUgb25lIHVzZWQuIAorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3Bw OgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OldlYlBhZ2VQcm94eSk6CisgICAgICAg IChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6c2V0SW50cmluc2ljRGV2aWNlU2NhbGVGYWN0b3IpOgor ICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRldmljZVNjYWxlRmFjdG9yKToKKyAgICAg ICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpzZXRDdXN0b21EZXZpY2VTY2FsZUZhY3Rvcik6Cisg ICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6Y3JlYXRpb25QYXJhbWV0ZXJzKToKKyAgICAg ICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6CisKIDIwMTEtMDgtMzAgIEJldGggRGFraW4g IDxiZGFraW5AYXBwbGUuY29tPgogCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD02NzE1MApJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5jcHAJKHJldmlzaW9uIDk0MTIyKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE0NCw4ICsxNDQsOCBAQCBXZWJQ YWdlUHJveHk6OldlYlBhZ2VQcm94eShQYWdlQ2xpZW50KiBwCiAgICAgLCBtX3RleHRab29tRmFj dG9yKDEpCiAgICAgLCBtX3BhZ2Vab29tRmFjdG9yKDEpCiAgICAgLCBtX3BhZ2VTY2FsZUZhY3Rv cigxKQotICAgICwgbV9kZXZpY2VTY2FsZUZhY3RvcigxKQotICAgICwgbV9vdmVycmlkZUJhY2tp bmdTY2FsZUZhY3RvcigwKQorICAgICwgbV9pbnRyaW5zaWNEZXZpY2VTY2FsZUZhY3RvcigxKQor ICAgICwgbV9jdXN0b21EZXZpY2VTY2FsZUZhY3RvcigwKQogICAgICwgbV9kcmF3c0JhY2tncm91 bmQodHJ1ZSkKICAgICAsIG1fZHJhd3NUcmFuc3BhcmVudEJhY2tncm91bmQoZmFsc2UpCiAgICAg LCBtX2FyZU1lbW9yeUNhY2hlQ2xpZW50Q2FsbHNFbmFibGVkKHRydWUpCkBAIC0xMTA3LDM2ICsx MTA3LDM2IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpzY2FsZVBhZ2UoZG91YmxlIHNjYWwKICAgICBw cm9jZXNzKCktPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlNjYWxlUGFnZShzY2FsZSwgb3JpZ2lu KSwgbV9wYWdlSUQpOwogfQogCi12b2lkIFdlYlBhZ2VQcm94eTo6c2V0RGV2aWNlU2NhbGVGYWN0 b3IoZmxvYXQgc2NhbGVGYWN0b3IpCit2b2lkIFdlYlBhZ2VQcm94eTo6c2V0SW50cmluc2ljRGV2 aWNlU2NhbGVGYWN0b3IoZmxvYXQgc2NhbGVGYWN0b3IpCiB7CiAgICAgaWYgKCFpc1ZhbGlkKCkp CiAgICAgICAgIHJldHVybjsKIAotICAgIGlmIChtX2RldmljZVNjYWxlRmFjdG9yID09IHNjYWxl RmFjdG9yKQorICAgIGlmIChtX2ludHJpbnNpY0RldmljZVNjYWxlRmFjdG9yID09IHNjYWxlRmFj dG9yKQogICAgICAgICByZXR1cm47CiAKLSAgICBtX2RldmljZVNjYWxlRmFjdG9yID0gc2NhbGVG YWN0b3I7CisgICAgbV9pbnRyaW5zaWNEZXZpY2VTY2FsZUZhY3RvciA9IHNjYWxlRmFjdG9yOwog ICAgIG1fZHJhd2luZ0FyZWEtPmRldmljZVNjYWxlRmFjdG9yRGlkQ2hhbmdlKCk7CiB9CiAKIGZs b2F0IFdlYlBhZ2VQcm94eTo6ZGV2aWNlU2NhbGVGYWN0b3IoKSBjb25zdAogewotICAgIGlmICht X292ZXJyaWRlQmFja2luZ1NjYWxlRmFjdG9yKQotICAgICAgICByZXR1cm4gbV9vdmVycmlkZUJh Y2tpbmdTY2FsZUZhY3RvcjsKLSAgICByZXR1cm4gbV9kZXZpY2VTY2FsZUZhY3RvcjsKKyAgICBp ZiAobV9jdXN0b21EZXZpY2VTY2FsZUZhY3RvcikKKyAgICAgICAgcmV0dXJuIG1fY3VzdG9tRGV2 aWNlU2NhbGVGYWN0b3I7CisgICAgcmV0dXJuIG1faW50cmluc2ljRGV2aWNlU2NhbGVGYWN0b3I7 CiB9CiAKLXZvaWQgV2ViUGFnZVByb3h5OjpzZXRPdmVycmlkZUJhY2tpbmdTY2FsZUZhY3Rvcihm bG9hdCBvdmVycmlkZVNjYWxlRmFjdG9yKQordm9pZCBXZWJQYWdlUHJveHk6OnNldEN1c3RvbURl dmljZVNjYWxlRmFjdG9yKGZsb2F0IGN1c3RvbVNjYWxlRmFjdG9yKQogewogICAgIGlmICghaXNW YWxpZCgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBpZiAobV9vdmVycmlkZUJhY2tpbmdTY2Fs ZUZhY3RvciA9PSBvdmVycmlkZVNjYWxlRmFjdG9yKQorICAgIGlmIChtX2N1c3RvbURldmljZVNj YWxlRmFjdG9yID09IGN1c3RvbVNjYWxlRmFjdG9yKQogICAgICAgICByZXR1cm47CiAKICAgICBm bG9hdCBvbGRTY2FsZUZhY3RvciA9IGRldmljZVNjYWxlRmFjdG9yKCk7CiAKLSAgICBtX292ZXJy aWRlQmFja2luZ1NjYWxlRmFjdG9yID0gb3ZlcnJpZGVTY2FsZUZhY3RvcjsKKyAgICBtX2N1c3Rv bURldmljZVNjYWxlRmFjdG9yID0gY3VzdG9tU2NhbGVGYWN0b3I7CiAKICAgICBpZiAoZGV2aWNl U2NhbGVGYWN0b3IoKSAhPSBvbGRTY2FsZUZhY3RvcikKICAgICAgICAgbV9kcmF3aW5nQXJlYS0+ ZGV2aWNlU2NhbGVGYWN0b3JEaWRDaGFuZ2UoKTsKQEAgLTI5OTIsNyArMjk5Miw3IEBAIFdlYlBh Z2VDcmVhdGlvblBhcmFtZXRlcnMgV2ViUGFnZVByb3h5OjoKICAgICBwYXJhbWV0ZXJzLmhpZ2hl c3RVc2VkQmFja0ZvcndhcmRJdGVtSUQgPSBXZWJCYWNrRm9yd2FyZExpc3RJdGVtOjpoaWdoZWRV c2VkSXRlbUlEKCk7CiAgICAgcGFyYW1ldGVycy5jYW5SdW5CZWZvcmVVbmxvYWRDb25maXJtUGFu ZWwgPSBtX3VpQ2xpZW50LmNhblJ1bkJlZm9yZVVubG9hZENvbmZpcm1QYW5lbCgpOwogICAgIHBh cmFtZXRlcnMuY2FuUnVuTW9kYWwgPSBtX3VpQ2xpZW50LmNhblJ1bk1vZGFsKCk7Ci0gICAgcGFy YW1ldGVycy5kZXZpY2VTY2FsZUZhY3RvciA9IG1fZGV2aWNlU2NhbGVGYWN0b3I7CisgICAgcGFy YW1ldGVycy5kZXZpY2VTY2FsZUZhY3RvciA9IG1faW50cmluc2ljRGV2aWNlU2NhbGVGYWN0b3I7 CiAKICNpZiBQTEFURk9STShNQUMpCiAgICAgcGFyYW1ldGVycy5pc1NtYXJ0SW5zZXJ0RGVsZXRl RW5hYmxlZCA9IG1faXNTbWFydEluc2VydERlbGV0ZUVuYWJsZWQ7CkluZGV4OiBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCShyZXZpc2lvbiA5NDEyMikKKysrIFNvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAkod29ya2luZyBjb3B5KQpAQCAtMzg2LDEx ICszODYsOSBAQCBwdWJsaWM6CiAgICAgdm9pZCBzY2FsZVBhZ2UoZG91YmxlIHNjYWxlLCBjb25z dCBXZWJDb3JlOjpJbnRQb2ludCYgb3JpZ2luKTsKICAgICBkb3VibGUgcGFnZVNjYWxlRmFjdG9y KCkgY29uc3QgeyByZXR1cm4gbV9wYWdlU2NhbGVGYWN0b3I7IH0KIAotICAgIHZvaWQgc2V0RGV2 aWNlU2NhbGVGYWN0b3IoZmxvYXQpOwogICAgIGZsb2F0IGRldmljZVNjYWxlRmFjdG9yKCkgY29u c3Q7Ci0KLSAgICB2b2lkIHNldE92ZXJyaWRlQmFja2luZ1NjYWxlRmFjdG9yKGZsb2F0KTsKLSAg ICBmbG9hdCBvdmVycmlkZUJhY2tpbmdTY2FsZUZhY3RvcigpIGNvbnN0IHsgcmV0dXJuIG1fb3Zl cnJpZGVCYWNraW5nU2NhbGVGYWN0b3I7IH0KKyAgICB2b2lkIHNldEludHJpbnNpY0RldmljZVNj YWxlRmFjdG9yKGZsb2F0KTsKKyAgICB2b2lkIHNldEN1c3RvbURldmljZVNjYWxlRmFjdG9yKGZs b2F0KTsKIAogICAgIHZvaWQgc2V0VXNlRml4ZWRMYXlvdXQoYm9vbCk7CiAgICAgdm9pZCBzZXRG aXhlZExheW91dFNpemUoY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYpOwpAQCAtODYyLDggKzg2MCw4 IEBAIHByaXZhdGU6CiAgICAgZG91YmxlIG1fdGV4dFpvb21GYWN0b3I7CiAgICAgZG91YmxlIG1f cGFnZVpvb21GYWN0b3I7CiAgICAgZG91YmxlIG1fcGFnZVNjYWxlRmFjdG9yOwotICAgIGZsb2F0 IG1fZGV2aWNlU2NhbGVGYWN0b3I7Ci0gICAgZmxvYXQgbV9vdmVycmlkZUJhY2tpbmdTY2FsZUZh Y3RvcjsKKyAgICBmbG9hdCBtX2ludHJpbnNpY0RldmljZVNjYWxlRmFjdG9yOworICAgIGZsb2F0 IG1fY3VzdG9tRGV2aWNlU2NhbGVGYWN0b3I7CiAKICAgICBib29sIG1fZHJhd3NCYWNrZ3JvdW5k OwogICAgIGJvb2wgbV9kcmF3c1RyYW5zcGFyZW50QmFja2dyb3VuZDsKSW5kZXg6IFNvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwCShyZXZpc2lvbiA5NDEyMikKKysrIFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0yNTgsMTQgKzI1OCwxNCBAQCBkb3VibGUgV0tQYWdlR2V0VGV4dFpvb21GYWN0b3IoV0tQYWdl UmVmCiAgICAgcmV0dXJuIHRvSW1wbChwYWdlUmVmKS0+dGV4dFpvb21GYWN0b3IoKTsKIH0KIAot ZG91YmxlIFdLUGFnZUdldE92ZXJyaWRlQmFja2luZ1NjYWxlRmFjdG9yKFdLUGFnZVJlZiBwYWdl UmVmKQorZG91YmxlIFdLUGFnZUdldEJhY2tpbmdTY2FsZUZhY3RvcihXS1BhZ2VSZWYgcGFnZVJl ZikKIHsKLSAgICByZXR1cm4gdG9JbXBsKHBhZ2VSZWYpLT5vdmVycmlkZUJhY2tpbmdTY2FsZUZh Y3RvcigpOworICAgIHJldHVybiB0b0ltcGwocGFnZVJlZiktPmRldmljZVNjYWxlRmFjdG9yKCk7 CiB9CiAKLXZvaWQgV0tQYWdlU2V0T3ZlcnJpZGVCYWNraW5nU2NhbGVGYWN0b3IoV0tQYWdlUmVm IHBhZ2VSZWYsIGRvdWJsZSBvdmVycmlkZVNjYWxlRmFjdG9yKQordm9pZCBXS1BhZ2VTZXRDdXN0 b21CYWNraW5nU2NhbGVGYWN0b3IoV0tQYWdlUmVmIHBhZ2VSZWYsIGRvdWJsZSBjdXN0b21TY2Fs ZUZhY3RvcikKIHsKLSAgICB0b0ltcGwocGFnZVJlZiktPnNldE92ZXJyaWRlQmFja2luZ1NjYWxl RmFjdG9yKG92ZXJyaWRlU2NhbGVGYWN0b3IpOworICAgIHRvSW1wbChwYWdlUmVmKS0+c2V0Q3Vz dG9tRGV2aWNlU2NhbGVGYWN0b3IoY3VzdG9tU2NhbGVGYWN0b3IpOwogfQogCiBib29sIFdLUGFn ZVN1cHBvcnRzVGV4dFpvb20oV0tQYWdlUmVmIHBhZ2VSZWYpCkluZGV4OiBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5oCShyZXZpc2lvbiA5NDEyMikKKysrIFNvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuaAkod29ya2luZyBjb3B5KQpAQCAtMzQ5LDggKzM0 OSw4IEBAIHR5cGVkZWYgYm9vbCAoKldLUGFnZVNlc3Npb25TdGF0ZUZpbHRlckMKIFdLX0VYUE9S VCBXS0RhdGFSZWYgV0tQYWdlQ29weVNlc3Npb25TdGF0ZShXS1BhZ2VSZWYgcGFnZSwgdm9pZCog Y29udGV4dCwgV0tQYWdlU2Vzc2lvblN0YXRlRmlsdGVyQ2FsbGJhY2sgdXJsQWxsb3dlZENhbGxi YWNrKTsKIFdLX0VYUE9SVCB2b2lkIFdLUGFnZVJlc3RvcmVGcm9tU2Vzc2lvblN0YXRlKFdLUGFn ZVJlZiBwYWdlLCBXS0RhdGFSZWYgc2Vzc2lvblN0YXRlRGF0YSk7CiAKLVdLX0VYUE9SVCBkb3Vi bGUgV0tQYWdlR2V0T3ZlcnJpZGVCYWNraW5nU2NhbGVGYWN0b3IoV0tQYWdlUmVmIHBhZ2UpOwot V0tfRVhQT1JUIHZvaWQgV0tQYWdlU2V0T3ZlcnJpZGVCYWNraW5nU2NhbGVGYWN0b3IoV0tQYWdl UmVmIHBhZ2UsIGRvdWJsZSBvdmVycmlkZVNjYWxlRmFjdG9yKTsKK1dLX0VYUE9SVCBkb3VibGUg V0tQYWdlR2V0QmFja2luZ1NjYWxlRmFjdG9yKFdLUGFnZVJlZiBwYWdlKTsKK1dLX0VYUE9SVCB2 b2lkIFdLUGFnZVNldEN1c3RvbUJhY2tpbmdTY2FsZUZhY3RvcihXS1BhZ2VSZWYgcGFnZSwgZG91 YmxlIGN1c3RvbVNjYWxlRmFjdG9yKTsKIAogV0tfRVhQT1JUIGJvb2wgV0tQYWdlU3VwcG9ydHNU ZXh0Wm9vbShXS1BhZ2VSZWYgcGFnZSk7CiBXS19FWFBPUlQgZG91YmxlIFdLUGFnZUdldFRleHRa b29tRmFjdG9yKFdLUGFnZVJlZiBwYWdlKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvbWFjL1dLVmlldy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL21hYy9XS1ZpZXcubW0JKHJldmlzaW9uIDk0MTIxKQorKysgU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xMTAsNyArMTEw LDcgQEAgc3RydWN0IFdLVmlld0ludGVycHJldEtleUV2ZW50c1BhcmFtZXRlcgogfTsKIAogQGlu dGVyZmFjZSBXS1ZpZXcgKCkKLS0gKGZsb2F0KV9kZXZpY2VTY2FsZUZhY3RvcjsKKy0gKGZsb2F0 KV9pbnRyaW5zaWNEZXZpY2VTY2FsZUZhY3RvcjsKIC0gKHZvaWQpX3NldERyYXdpbmdBcmVhU2l6 ZTooTlNTaXplKXNpemU7CiAtICh2b2lkKV9zZXRQbHVnaW5Db21wbGV4VGV4dElucHV0U3RhdGU6 KFBsdWdpbkNvbXBsZXhUZXh0SW5wdXRTdGF0ZSlwbHVnaW5Db21wbGV4VGV4dElucHV0U3RhdGU7 CiAtICh2b2lkKV9kaXNhYmxlQ29tcGxleFRleHRJbnB1dElmTmVjZXNzYXJ5OwpAQCAtMTg1OCw3 ICsxODU4LDcgQEAgLSAodm9pZCl2aWV3RGlkTW92ZVRvV2luZG93CiAjZW5kaWYKICAgICB9CiAK LSAgICBfZGF0YS0+X3BhZ2UtPnNldERldmljZVNjYWxlRmFjdG9yKFtzZWxmIF9kZXZpY2VTY2Fs ZUZhY3Rvcl0pOworICAgIF9kYXRhLT5fcGFnZS0+c2V0SW50cmluc2ljRGV2aWNlU2NhbGVGYWN0 b3IoW3NlbGYgX2ludHJpbnNpY0RldmljZVNjYWxlRmFjdG9yXSk7CiB9CiAKIC0gKHZvaWQpX3dp bmRvd0RpZEJlY29tZUtleTooTlNOb3RpZmljYXRpb24gKilub3RpZmljYXRpb24KQEAgLTE5MDYs NyArMTkwNiw3IEBAIC0gKHZvaWQpX3dpbmRvd0RpZE9yZGVyT25TY3JlZW46KE5TTm90aWYKIAog LSAodm9pZClfd2luZG93RGlkQ2hhbmdlUmVzb2x1dGlvbjooTlNOb3RpZmljYXRpb24gKilub3Rp ZmljYXRpb24KIHsKLSAgICBfZGF0YS0+X3BhZ2UtPnNldERldmljZVNjYWxlRmFjdG9yKFtzZWxm IF9kZXZpY2VTY2FsZUZhY3Rvcl0pOworICAgIF9kYXRhLT5fcGFnZS0+c2V0SW50cmluc2ljRGV2 aWNlU2NhbGVGYWN0b3IoW3NlbGYgX2ludHJpbnNpY0RldmljZVNjYWxlRmFjdG9yXSk7CiB9CiAK IHN0YXRpYyB2b2lkIGRyYXdQYWdlQmFja2dyb3VuZChDR0NvbnRleHRSZWYgY29udGV4dCwgV2Vi UGFnZVByb3h5KiBwYWdlLCBjb25zdCBJbnRSZWN0JiByZWN0KQpAQCAtMjA2NCw3ICsyMDY0LDcg QEAgLSAoTlNQcmludE9wZXJhdGlvbiAqKXByaW50T3BlcmF0aW9uV2l0aAogICAgIH0KIH0KIAot LSAoZmxvYXQpX2RldmljZVNjYWxlRmFjdG9yCistIChmbG9hdClfaW50cmluc2ljRGV2aWNlU2Nh bGVGYWN0b3IKIHsKICAgICBOU1dpbmRvdyAqd2luZG93ID0gW3NlbGYgd2luZG93XTsKICNpZiAh ZGVmaW5lZChCVUlMRElOR19PTl9TTk9XX0xFT1BBUkQpCkluZGV4OiBTb3VyY2UvV2ViS2l0L21h Yy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCShy ZXZpc2lvbiA5NDIzNCkKKysrIFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwkod29ya2luZyBj b3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDExLTA4LTMxICBCZXRoIERha2luICA8YmRha2luQGFw cGxlLmNvbT4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NjczMjIKKyAgICAgICAgUmUtbmFtZSBvdmVycmlkZUJhY2tpbmdTY2FsZUZhY3RvcgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIF9zZXRPdmVycmlk ZUJhY2tpbmdTY2FsZUZhY3RvciBpcyBub3cgX3NldEN1c3RvbUJhY2tpbmdTY2FsZUZhY3Rvcgor ICAgICAgICAqIFdlYlZpZXcvV2ViVmlldy5tbToKKyAgICAgICAgKC1bV2ViVmlldyBfc2V0Q3Vz dG9tQmFja2luZ1NjYWxlRmFjdG9yOl0pOgorICAgICAgICAoLVtXZWJWaWV3IF9kZXZpY2VTY2Fs ZUZhY3Rvcl0pOgorICAgICAgICAqIFdlYlZpZXcvV2ViVmlld0RhdGEuaDoKKyAgICAgICAgKiBX ZWJWaWV3L1dlYlZpZXdQcml2YXRlLmg6CisKIDIwMTEtMDgtMzAgIERhbiBCZXJuc3RlaW4gIDxt aXR6QGFwcGxlLmNvbT4KIAogICAgICAgICA8cmRhcjovL3Byb2JsZW0vOTI4MTY5NT4gQWRkIHRl eHQgc2VhcmNoIEFQSSBmb3IgZ2V0dGluZyB0aGUgRE9NIHJhbmdlIG9mIGEgdGV4dCBtYXRjaApJ bmRleDogU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQkocmV2aXNpb24gOTQxMjIpCisr KyBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0JKHdvcmtpbmcgY29weSkKQEAg LTI3OTMsMTQgKzI3OTMsMTQgQEAgLSAoTlNTaXplKV9maXhlZExheW91dFNpemUKICAgICByZXR1 cm4gdmlldy0+Zml4ZWRMYXlvdXRTaXplKCk7CiB9CiAKLS0gKHZvaWQpX3NldE92ZXJyaWRlQmFj a2luZ1NjYWxlRmFjdG9yOihDR0Zsb2F0KW92ZXJyaWRlU2NhbGVGYWN0b3IKKy0gKHZvaWQpX3Nl dEN1c3RvbUJhY2tpbmdTY2FsZUZhY3RvcjooQ0dGbG9hdCljdXN0b21TY2FsZUZhY3Rvcgogewog ICAgIGZsb2F0IG9sZFNjYWxlRmFjdG9yID0gW3NlbGYgX2RldmljZVNjYWxlRmFjdG9yXTsKIAot ICAgIF9wcml2YXRlLT5vdmVycmlkZUJhY2tpbmdTY2FsZUZhY3RvciA9IG92ZXJyaWRlU2NhbGVG YWN0b3I7CisgICAgX3ByaXZhdGUtPmN1c3RvbURldmljZVNjYWxlRmFjdG9yID0gY3VzdG9tU2Nh bGVGYWN0b3I7CiAKICAgICBpZiAob2xkU2NhbGVGYWN0b3IgIT0gW3NlbGYgX2RldmljZVNjYWxl RmFjdG9yXSkKLSAgICAgICAgX3ByaXZhdGUtPnBhZ2UtPnNldERldmljZVNjYWxlRmFjdG9yKG92 ZXJyaWRlU2NhbGVGYWN0b3IpOworICAgICAgICBfcHJpdmF0ZS0+cGFnZS0+c2V0RGV2aWNlU2Nh bGVGYWN0b3IoY3VzdG9tU2NhbGVGYWN0b3IpOwogfQogCiAtIChOU1VJbnRlZ2VyKW1hcmtBbGxN YXRjaGVzRm9yVGV4dDooTlNTdHJpbmcgKilzdHJpbmcgY2FzZVNlbnNpdGl2ZTooQk9PTCljYXNl RmxhZyBoaWdobGlnaHQ6KEJPT0wpaGlnaGxpZ2h0IGxpbWl0OihOU1VJbnRlZ2VyKWxpbWl0CkBA IC01NTMwLDggKzU1MzAsOCBAQCBzdGF0aWMgV2ViRnJhbWVWaWV3ICpjb250YWluaW5nRnJhbWVW aWV3CiAKIC0gKGZsb2F0KV9kZXZpY2VTY2FsZUZhY3RvcgogewotICAgIGlmIChfcHJpdmF0ZS0+ b3ZlcnJpZGVCYWNraW5nU2NhbGVGYWN0b3IgIT0gMCkKLSAgICAgICAgcmV0dXJuIF9wcml2YXRl LT5vdmVycmlkZUJhY2tpbmdTY2FsZUZhY3RvcjsKKyAgICBpZiAoX3ByaXZhdGUtPmN1c3RvbURl dmljZVNjYWxlRmFjdG9yICE9IDApCisgICAgICAgIHJldHVybiBfcHJpdmF0ZS0+Y3VzdG9tRGV2 aWNlU2NhbGVGYWN0b3I7CiAKICAgICBOU1dpbmRvdyAqd2luZG93ID0gW3NlbGYgd2luZG93XTsK ICNpZiAhZGVmaW5lZChCVUlMRElOR19PTl9MRU9QQVJEKSAmJiAhZGVmaW5lZChCVUlMRElOR19P Tl9TTk9XX0xFT1BBUkQpCkluZGV4OiBTb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXdE YXRhLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3RGF0 YS5oCShyZXZpc2lvbiA5NDEyMikKKysrIFNvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmll d0RhdGEuaAkod29ya2luZyBjb3B5KQpAQCAtMTk0LDYgKzE5NCw2IEBAIEBpbnRlcmZhY2UgV2Vi Vmlld1ByaXZhdGUgOiBOU09iamVjdCB7CiAgICAgQk9PTCBpbnRlcmFjdGl2ZUZvcm1WYWxpZGF0 aW9uRW5hYmxlZDsKICAgICBpbnQgdmFsaWRhdGlvbk1lc3NhZ2VUaW1lck1hZ25pZmljYXRpb247 CiAKLSAgICBmbG9hdCBvdmVycmlkZUJhY2tpbmdTY2FsZUZhY3RvcjsKKyAgICBmbG9hdCBjdXN0 b21EZXZpY2VTY2FsZUZhY3RvcjsKIH0KIEBlbmQKSW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL1dl YlZpZXcvV2ViVmlld1ByaXZhdGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L21hYy9X ZWJWaWV3L1dlYlZpZXdQcml2YXRlLmgJKHJldmlzaW9uIDk0MTIyKQorKysgU291cmNlL1dlYktp dC9tYWMvV2ViVmlldy9XZWJWaWV3UHJpdmF0ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC01NDksNyAr NTQ5LDcgQEAgQ291bGQgYmUgd29ydGggYWRkaW5nIHRvIHRoZSBBUEkuCiAtIChCT09MKV91c2VG aXhlZExheW91dDsKIC0gKE5TU2l6ZSlfZml4ZWRMYXlvdXRTaXplOwogCi0tICh2b2lkKV9zZXRP dmVycmlkZUJhY2tpbmdTY2FsZUZhY3RvcjooQ0dGbG9hdClvdmVycmlkZVNjYWxlRmFjdG9yOwor LSAodm9pZClfc2V0Q3VzdG9tQmFja2luZ1NjYWxlRmFjdG9yOihDR0Zsb2F0KW92ZXJyaWRlU2Nh bGVGYWN0b3I7CiAKIC8vIERlcHJlY2F0ZWQuIFVzZSB0aGUgbWV0aG9kcyBpbiBwZW5kaW5nIHB1 YmxpYyBhYm92ZSBpbnN0ZWFkLgogLSAoTlNVSW50ZWdlciltYXJrQWxsTWF0Y2hlc0ZvclRleHQ6 KE5TU3RyaW5nICopc3RyaW5nIGNhc2VTZW5zaXRpdmU6KEJPT0wpY2FzZUZsYWcgaGlnaGxpZ2h0 OihCT09MKWhpZ2hsaWdodCBsaW1pdDooTlNVSW50ZWdlcilsaW1pdDsK