52113 2011-01-08 13:31:52 -0800 In WebKit2, page zooming does not work with PDF 2011-01-11 14:26:48 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 mitz mitz ademar buildbot webkit-ews oldest_to_newest 331262 0 mitz 2011-01-08 13:31:52 -0800 In WebKit2, page zooming does not work with PDF 331263 1 78329 mitz 2011-01-08 13:44:20 -0800 Created attachment 78329 Make the page client manage zoom for custom representations 331270 2 buildbot 2011-01-08 14:04:05 -0800 Attachment 78329 did not build on win: Build output: http://queues.webkit.org/results/7388071 331271 3 webkit-ews 2011-01-08 14:04:11 -0800 Attachment 78329 did not build on qt: Build output: http://queues.webkit.org/results/7446042 331280 4 78330 mitz 2011-01-08 14:08:31 -0800 Created attachment 78330 Make the page client manage zoom for custom representations 331299 5 78330 mitz 2011-01-08 15:14:41 -0800 Comment on attachment 78330 Make the page client manage zoom for custom representations Working on changes proposed by Maciej 331304 6 78333 mitz 2011-01-08 15:34:26 -0800 Created attachment 78333 Make the page client manage zoom for custom representations 331306 7 78333 mjs 2011-01-08 15:46:45 -0800 Comment on attachment 78333 Make the page client manage zoom for custom representations r=me 331307 8 mitz 2011-01-08 15:48:34 -0800 <http://trac.webkit.org/changeset/75331> 332657 9 ademar 2011-01-11 14:26:48 -0800 WebKit2 is not supported by qtwebkit-2.2, so removing bug 50925 from the blockers. 78329 2011-01-08 13:44:20 -0800 2011-01-08 14:08:31 -0800 Make the page client manage zoom for custom representations bug-52113-20110108134419.patch text/plain 12679 mitz SW5kZXg6IFdlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvQ2hhbmdlTG9n CShyZXZpc2lvbiA3NTMyNSkKKysrIFdlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsNDkgQEAKKzIwMTEtMDEtMDggIERhbiBCZXJuc3RlaW4gIDxtaXR6QGFwcGxlLmNv bT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiBX ZWJLaXQyLCBwYWdlIHpvb21pbmcgZG9lcyBub3Qgd29yayB3aXRoIFBERgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTIxMTMKKworICAgICAgICAqIFVJ UHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwOgorICAgICAgICAoV0tQYWdlU3VwcG9ydHNUZXh0Wm9v bSk6IEFkZGVkLiBSZXR1cm5zIHdoZXRoZXIgdGhlIHBhZ2UgY3VycmVudGx5IHN1cHBvcnRzIHRl eHQtb25seSB6b29tLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuaDoKKyAgICAg ICAgKiBVSVByb2Nlc3MvQVBJL21hYy9QREZWaWV3Q29udHJvbGxlci5oOiBNYWRlIHBkZkRvY3Vt ZW50Q2xhc3MoKSBwcml2YXRlIGFuZCBkZWNsYXJlZCBuZXcKKyAgICAgICAgbWVtYmVyIGZ1bmN0 aW9ucy4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL21hYy9QREZWaWV3Q29udHJvbGxlci5tbToK KyAgICAgICAgKFdlYktpdDo6UERGVmlld0NvbnRyb2xsZXI6Onpvb21GYWN0b3IpOiBBZGRlZC4K KyAgICAgICAgKFdlYktpdDo6UERGVmlld0NvbnRyb2xsZXI6OnNldFpvb21GYWN0b3IpOiBBZGRl ZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL21hYy9QYWdlQ2xpZW50SW1wbC5oOgorICAgICAg ICAqIFVJUHJvY2Vzcy9BUEkvbWFjL1BhZ2VDbGllbnRJbXBsLm1tOgorICAgICAgICAoV2ViS2l0 OjpQYWdlQ2xpZW50SW1wbDo6em9vbUZhY3Rvcik6IEFkZGVkLiBDYWxscyB0aHJvdWdoIHRvIHRo ZSBXS1ZpZXcuCisgICAgICAgIChXZWJLaXQ6OlBhZ2VDbGllbnRJbXBsOjpzZXRab29tRmFjdG9y KTogRGl0dG8uCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tOgorICAgICAg ICAoLVtXS1ZpZXcgX3pvb21GYWN0b3JdKTogQWRkZWQuIENhbGxzIHRocm91Z2ggdG8gdGhlIFBE RlZpZXdDb250cm9sbGVyLgorICAgICAgICAoLVtXS1ZpZXcgX3NldFpvb21GYWN0b3I6XSk6IERp dHRvLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvbWFjL1dLVmlld0ludGVybmFsLmg6CisgICAg ICAgICogVUlQcm9jZXNzL0FQSS9xdC9xd2twYWdlX3AuaDoKKyAgICAgICAgKFFXS1BhZ2VQcml2 YXRlOjp6b29tRmFjdG9yKTogQWRkZWQuCisgICAgICAgIChRV0tQYWdlUHJpdmF0ZTo6c2V0Wm9v bUZhY3Rvcik6IEFkZGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9QYWdlQ2xpZW50Lmg6CisgICAg ICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBh Z2VQcm94eTo6V2ViUGFnZVByb3h5KTogQ29kaW5nIHN0eWxlIGZpeC4KKyAgICAgICAgKFdlYktp dDo6V2ViUGFnZVByb3h5OjpzZXRUZXh0Wm9vbUZhY3Rvcik6IEJhaWwgb3V0IGlmIHRoZSBtYWlu IGZyYW1lIGhhcyBhIGN1c3RvbSByZXByZXNlbnRhdGlvbiwKKyAgICAgICAgc2luY2UgdGhvc2Ug ZG8gbm90IHN1cHBvcnQgdGV4dC1vbmx5IHpvb20uCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQ cm94eTo6cGFnZVpvb21GYWN0b3IpOiBJZiB0aGUgbWFpbiBmcmFtZSBoYXMgYSBjdXN0b20gcmVw cmVzZW50YXRpb24sIGdldCB0aGUKKyAgICAgICAgem9vbSBmYWN0b3IgZnJvbSB0aGUgcGFnZSBj bGllbnQuCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6c2V0UGFnZVpvb21GYWN0b3Ip OiBJZiB0aGUgbWFpbiBmcmFtZSBoYXMgYSBjdXN0b20gcmVwcmVzZW50YXRpb24sIGhhdmUKKyAg ICAgICAgdGhlIGNsaWVudCBzZXQgdGhlIHpvb20gZmFjdG9yLgorICAgICAgICAoV2ViS2l0OjpX ZWJQYWdlUHJveHk6OnNldFBhZ2VBbmRUZXh0Wm9vbUZhY3RvcnMpOiBEaXR0by4KKyAgICAgICAg KiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94 eTo6c3VwcG9ydHNUZXh0Wm9vbSk6IEFkZGVkLiBSZXR1cm5zIGZhbHNlIGlmIHRoZSBtYWluIGZy YW1lIGhhcyBhIGN1c3RvbQorICAgICAgICByZXByZXNlbnRhdGlvbiwgdHJ1ZSBvdGhlcndpc2Uu CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6dGV4dFpvb21GYWN0b3IpOiBDaGFuZ2Vk IHRvIHJldHVybiAxIGlmIHRoZSBtYWluIGZyYW1lIGRvZXMgbm90IHN1cHBvcnQKKyAgICAgICAg dGV4dC1vbmx5IHpvb20uCisgICAgICAgICogVUlQcm9jZXNzL3dpbi9XZWJWaWV3LmNwcDoKKyAg ICAgICAgKFdlYktpdDo6V2ViVmlldzo6em9vbUZhY3Rvcik6IEFkZGVkLgorICAgICAgICAoV2Vi S2l0OjpXZWJWaWV3OjpzZXRab29tRmFjdG9yKTogQWRkZWQuCisgICAgICAgICogVUlQcm9jZXNz L3dpbi9XZWJWaWV3Lmg6CisKIDIwMTEtMDEtMDggIEJhbGF6cyBLZWxlbWVuICA8a2JhbGF6c0B3 ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFu c2VuLgpJbmRleDogV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZUNsaWVudC5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYktpdDIvVUlQcm9jZXNzL1BhZ2VDbGllbnQuaAkocmV2aXNpb24gNzUzMTUpCisrKyBXZWJL aXQyL1VJUHJvY2Vzcy9QYWdlQ2xpZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTEwMSw2ICsxMDEs OCBAQCBwdWJsaWM6CiAgICAgLy8gQ3VzdG9tIHJlcHJlc2VudGF0aW9ucy4KICAgICB2aXJ0dWFs IHZvaWQgZGlkQ29tbWl0TG9hZEZvck1haW5GcmFtZShib29sIHVzZUN1c3RvbVJlcHJlc2VudGF0 aW9uKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIGRpZEZpbmlzaExvYWRpbmdEYXRhRm9yQ3VzdG9t UmVwcmVzZW50YXRpb24oY29uc3QgQ29yZUlQQzo6RGF0YVJlZmVyZW5jZSYpID0gMDsKKyAgICB2 aXJ0dWFsIGRvdWJsZSB6b29tRmFjdG9yKCkgPSAwOworICAgIHZpcnR1YWwgdm9pZCBzZXRab29t RmFjdG9yKGRvdWJsZSkgPSAwOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CkluZGV4OiBX ZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHJldmlzaW9uIDc1MzE1KQorKysgV2ViS2l0Mi9V SVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTYsNyArOTYsNyBA QCBXZWJQYWdlUHJveHk6OldlYlBhZ2VQcm94eShXZWJDb250ZXh0KiBjCiAgICAgLCBtX3BhZ2VH cm91cChwYWdlR3JvdXApCiAgICAgLCBtX21haW5GcmFtZSgwKQogICAgICwgbV91c2VyQWdlbnQo c3RhbmRhcmRVc2VyQWdlbnQoKSkKLSAgICAsIG1fZXN0aW1hdGVkUHJvZ3Jlc3MoMC4wKQorICAg ICwgbV9lc3RpbWF0ZWRQcm9ncmVzcygwKQogICAgICwgbV9pc0luV2luZG93KGZhbHNlKQogICAg ICwgbV9iYWNrRm9yd2FyZExpc3QoV2ViQmFja0ZvcndhcmRMaXN0OjpjcmVhdGUodGhpcykpCiAg ICAgLCBtX3RleHRab29tRmFjdG9yKDEpCkBAIC03NDcsNiArNzQ3LDkgQEAgdm9pZCBXZWJQYWdl UHJveHk6OnNldFRleHRab29tRmFjdG9yKGRvdQogICAgIGlmICghaXNWYWxpZCgpKQogICAgICAg ICByZXR1cm47CiAKKyAgICBpZiAobV9tYWluRnJhbWVIYXNDdXN0b21SZXByZXNlbnRhdGlvbikK KyAgICAgICAgcmV0dXJuOworCiAgICAgaWYgKG1fdGV4dFpvb21GYWN0b3IgPT0gem9vbUZhY3Rv cikKICAgICAgICAgcmV0dXJuOwogCkBAIC03NTQsMTEgKzc1NywyMSBAQCB2b2lkIFdlYlBhZ2VQ cm94eTo6c2V0VGV4dFpvb21GYWN0b3IoZG91CiAgICAgcHJvY2VzcygpLT5zZW5kKE1lc3NhZ2Vz OjpXZWJQYWdlOjpTZXRUZXh0Wm9vbUZhY3RvcihtX3RleHRab29tRmFjdG9yKSwgbV9wYWdlSUQp OyAKIH0KIAorZG91YmxlIFdlYlBhZ2VQcm94eTo6cGFnZVpvb21GYWN0b3IoKSBjb25zdAorewor ICAgIHJldHVybiBtX21haW5GcmFtZUhhc0N1c3RvbVJlcHJlc2VudGF0aW9uID8gbV9wYWdlQ2xp ZW50LT56b29tRmFjdG9yKCkgOiBtX3BhZ2Vab29tRmFjdG9yOworfQorCiB2b2lkIFdlYlBhZ2VQ cm94eTo6c2V0UGFnZVpvb21GYWN0b3IoZG91YmxlIHpvb21GYWN0b3IpCiB7CiAgICAgaWYgKCFp c1ZhbGlkKCkpCiAgICAgICAgIHJldHVybjsKIAorICAgIGlmIChtX21haW5GcmFtZUhhc0N1c3Rv bVJlcHJlc2VudGF0aW9uKSB7CisgICAgICAgIG1fcGFnZUNsaWVudC0+c2V0Wm9vbUZhY3Rvcih6 b29tRmFjdG9yKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKwogICAgIGlmIChtX3BhZ2Vab29t RmFjdG9yID09IHpvb21GYWN0b3IpCiAgICAgICAgIHJldHVybjsKIApAQCAtNzcxLDYgKzc4NCwx MSBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6c2V0UGFnZUFuZFRleHRab29tRmFjCiAgICAgaWYgKCFp c1ZhbGlkKCkpCiAgICAgICAgIHJldHVybjsKIAorICAgIGlmIChtX21haW5GcmFtZUhhc0N1c3Rv bVJlcHJlc2VudGF0aW9uKSB7CisgICAgICAgIG1fcGFnZUNsaWVudC0+c2V0Wm9vbUZhY3Rvcihw YWdlWm9vbUZhY3Rvcik7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKICAgICBpZiAobV9wYWdl Wm9vbUZhY3RvciA9PSBwYWdlWm9vbUZhY3RvciAmJiBtX3RleHRab29tRmFjdG9yID09IHRleHRa b29tRmFjdG9yKQogICAgICAgICByZXR1cm47CiAKSW5kZXg6IFdlYktpdDIvVUlQcm9jZXNzL1dl YlBhZ2VQcm94eS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5oCShyZXZpc2lvbiA3NTMxNSkKKysrIFdlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5o CSh3b3JraW5nIGNvcHkpCkBAIC0yMjYsOSArMjI2LDEwIEBAIHB1YmxpYzoKICAgICBQYXNzUmVm UHRyPFdlYkRhdGE+IHNlc3Npb25TdGF0ZURhdGEoV2ViUGFnZVByb3h5U2Vzc2lvblN0YXRlRmls dGVyQ2FsbGJhY2ssIHZvaWQqIGNvbnRleHQpIGNvbnN0OwogICAgIHZvaWQgcmVzdG9yZUZyb21T ZXNzaW9uU3RhdGVEYXRhKFdlYkRhdGEqKTsKIAotICAgIGRvdWJsZSB0ZXh0Wm9vbUZhY3Rvcigp IGNvbnN0IHsgcmV0dXJuIG1fdGV4dFpvb21GYWN0b3I7IH0KKyAgICBib29sIHN1cHBvcnRzVGV4 dFpvb20oKSBjb25zdCB7IHJldHVybiAhbV9tYWluRnJhbWVIYXNDdXN0b21SZXByZXNlbnRhdGlv bjsgfQorICAgIGRvdWJsZSB0ZXh0Wm9vbUZhY3RvcigpIGNvbnN0IHsgcmV0dXJuIG1fbWFpbkZy YW1lSGFzQ3VzdG9tUmVwcmVzZW50YXRpb24gPyAxIDogbV90ZXh0Wm9vbUZhY3RvcjsgfQogICAg IHZvaWQgc2V0VGV4dFpvb21GYWN0b3IoZG91YmxlKTsKLSAgICBkb3VibGUgcGFnZVpvb21GYWN0 b3IoKSBjb25zdCB7IHJldHVybiBtX3BhZ2Vab29tRmFjdG9yOyB9CisgICAgZG91YmxlIHBhZ2Va b29tRmFjdG9yKCkgY29uc3Q7CiAgICAgdm9pZCBzZXRQYWdlWm9vbUZhY3Rvcihkb3VibGUpOwog ICAgIHZvaWQgc2V0UGFnZUFuZFRleHRab29tRmFjdG9ycyhkb3VibGUgcGFnZVpvb21GYWN0b3Is IGRvdWJsZSB0ZXh0Wm9vbUZhY3Rvcik7CiAKSW5kZXg6IFdlYktpdDIvVUlQcm9jZXNzL0FQSS9D L1dLUGFnZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQYWdl LmNwcAkocmV2aXNpb24gNzUzMTUpCisrKyBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2Uu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMzUsNiArMjM1LDExIEBAIGRvdWJsZSBXS1BhZ2VHZXRU ZXh0Wm9vbUZhY3RvcihXS1BhZ2VSZWYKICAgICByZXR1cm4gdG9JbXBsKHBhZ2VSZWYpLT50ZXh0 Wm9vbUZhY3RvcigpOwogfQogCitib29sIFdLUGFnZVN1cHBvcnRzVGV4dFpvb20oV0tQYWdlUmVm IHBhZ2VSZWYpCit7CisgICAgcmV0dXJuIHRvSW1wbChwYWdlUmVmKS0+c3VwcG9ydHNUZXh0Wm9v bSgpOworfQorCiB2b2lkIFdLUGFnZVNldFRleHRab29tRmFjdG9yKFdLUGFnZVJlZiBwYWdlUmVm LCBkb3VibGUgem9vbUZhY3RvcikKIHsKICAgICB0b0ltcGwocGFnZVJlZiktPnNldFRleHRab29t RmFjdG9yKHpvb21GYWN0b3IpOwpJbmRleDogV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQYWdl LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmgJKHJldmlz aW9uIDc1MzE1KQorKysgV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmgJKHdvcmtpbmcg Y29weSkKQEAgLTI5NSw2ICsyOTUsNyBAQCB0eXBlZGVmIGJvb2wgKCpXS1BhZ2VTZXNzaW9uU3Rh dGVGaWx0ZXJDCiBXS19FWFBPUlQgV0tEYXRhUmVmIFdLUGFnZUNvcHlTZXNzaW9uU3RhdGUoV0tQ YWdlUmVmIHBhZ2UsIHZvaWQqIGNvbnRleHQsIFdLUGFnZVNlc3Npb25TdGF0ZUZpbHRlckNhbGxi YWNrIHVybEFsbG93ZWRDYWxsYmFjayk7CiBXS19FWFBPUlQgdm9pZCBXS1BhZ2VSZXN0b3JlRnJv bVNlc3Npb25TdGF0ZShXS1BhZ2VSZWYgcGFnZSwgV0tEYXRhUmVmIHNlc3Npb25TdGF0ZURhdGEp OwogCitXS19FWFBPUlQgYm9vbCBXS1BhZ2VTdXBwb3J0c1RleHRab29tKFdLUGFnZVJlZiBwYWdl KTsKIFdLX0VYUE9SVCBkb3VibGUgV0tQYWdlR2V0VGV4dFpvb21GYWN0b3IoV0tQYWdlUmVmIHBh Z2UpOwogV0tfRVhQT1JUIHZvaWQgV0tQYWdlU2V0VGV4dFpvb21GYWN0b3IoV0tQYWdlUmVmIHBh Z2UsIGRvdWJsZSB6b29tRmFjdG9yKTsKIFdLX0VYUE9SVCBkb3VibGUgV0tQYWdlR2V0UGFnZVpv b21GYWN0b3IoV0tQYWdlUmVmIHBhZ2UpOwpJbmRleDogV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21h Yy9QREZWaWV3Q29udHJvbGxlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvVUlQcm9jZXNzL0FQ SS9tYWMvUERGVmlld0NvbnRyb2xsZXIuaAkocmV2aXNpb24gNzUzMTUpCisrKyBXZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvbWFjL1BERlZpZXdDb250cm9sbGVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTUx LDcgKzUxLDkgQEAgcHVibGljOgogICAgIFdLVmlldyogd2tWaWV3KCkgY29uc3QgeyByZXR1cm4g bV93a1ZpZXc7IH0KICAgICB2b2lkIHNldFBERkRvY3VtZW50RGF0YShjb25zdCBTdHJpbmcmIG1p bWVUeXBlLCBjb25zdCBDb3JlSVBDOjpEYXRhUmVmZXJlbmNlJik7CiAKLSAgICBzdGF0aWMgQ2xh c3MgcGRmRG9jdW1lbnRDbGFzcygpOworICAgIGRvdWJsZSB6b29tRmFjdG9yKCkgY29uc3Q7Cisg ICAgdm9pZCBzZXRab29tRmFjdG9yKGRvdWJsZSk7CisKICAgICBzdGF0aWMgQ2xhc3MgcGRmUHJl dmlld1ZpZXdDbGFzcygpOwogCiAgICAgTlNQcmludE9wZXJhdGlvbiAqbWFrZVByaW50T3BlcmF0 aW9uKE5TUHJpbnRJbmZvICopOwpAQCAtNTksNiArNjEsNyBAQCBwdWJsaWM6CiBwcml2YXRlOgog ICAgIGV4cGxpY2l0IFBERlZpZXdDb250cm9sbGVyKFdLVmlldyAqd2tWaWV3KTsKIAorICAgIHN0 YXRpYyBDbGFzcyBwZGZEb2N1bWVudENsYXNzKCk7CiAgICAgc3RhdGljIE5TQnVuZGxlKiBwZGZL aXRCdW5kbGUoKTsKIAogICAgIFdLVmlldyogbV93a1ZpZXc7CkluZGV4OiBXZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvbWFjL1BERlZpZXdDb250cm9sbGVyLm1tCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIv VUlQcm9jZXNzL0FQSS9tYWMvUERGVmlld0NvbnRyb2xsZXIubW0JKHJldmlzaW9uIDc1MzE1KQor KysgV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9QREZWaWV3Q29udHJvbGxlci5tbQkod29ya2lu ZyBjb3B5KQpAQCAtMTUxLDYgKzE1MSwxNiBAQCB2b2lkIFBERlZpZXdDb250cm9sbGVyOjpzZXRQ REZEb2N1bWVudERhCiAgICAgW21fcGRmVmlldyBzZXREb2N1bWVudDpwZGZEb2N1bWVudC5nZXQo KV07CiB9CiAKK2RvdWJsZSBQREZWaWV3Q29udHJvbGxlcjo6em9vbUZhY3RvcigpIGNvbnN0Cit7 CisgICAgcmV0dXJuIFttX3BkZlZpZXcgc2NhbGVGYWN0b3JdOworfQorCit2b2lkIFBERlZpZXdD b250cm9sbGVyOjpzZXRab29tRmFjdG9yKGRvdWJsZSB6b29tRmFjdG9yKQoreworICAgIFttX3Bk ZlZpZXcgc2V0U2NhbGVGYWN0b3I6em9vbUZhY3Rvcl07Cit9CisKIENsYXNzIFBERlZpZXdDb250 cm9sbGVyOjpwZGZEb2N1bWVudENsYXNzKCkKIHsKICAgICBzdGF0aWMgQ2xhc3MgcGRmRG9jdW1l bnRDbGFzcyA9IFtwZGZLaXRCdW5kbGUoKSBjbGFzc05hbWVkOkAiUERGRG9jdW1lbnQiXTsKSW5k ZXg6IFdlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvUGFnZUNsaWVudEltcGwuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1BhZ2VDbGllbnRJbXBsLmgJKHJldmlzaW9u IDc1MzE1KQorKysgV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9QYWdlQ2xpZW50SW1wbC5oCSh3 b3JraW5nIGNvcHkpCkBAIC04MSw2ICs4MSw5IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCB2b2lk IGRpZENvbW1pdExvYWRGb3JNYWluRnJhbWUoYm9vbCB1c2VDdXN0b21SZXByZXNlbnRhdGlvbik7 CiAgICAgdmlydHVhbCB2b2lkIGRpZEZpbmlzaExvYWRpbmdEYXRhRm9yQ3VzdG9tUmVwcmVzZW50 YXRpb24oY29uc3QgQ29yZUlQQzo6RGF0YVJlZmVyZW5jZSYpOwogCisgICAgdmlydHVhbCBkb3Vi bGUgem9vbUZhY3RvcigpOworICAgIHZpcnR1YWwgdm9pZCBzZXRab29tRmFjdG9yKGRvdWJsZSk7 CisKICAgICBXS1ZpZXcqIG1fd2tWaWV3OwogICAgIFJldGFpblB0cjxXZWJFZGl0b3JVbmRvVGFy Z2V0T2JqQz4gbV91bmRvVGFyZ2V0OwogfTsKSW5kZXg6IFdlYktpdDIvVUlQcm9jZXNzL0FQSS9t YWMvUGFnZUNsaWVudEltcGwubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L21hYy9QYWdlQ2xpZW50SW1wbC5tbQkocmV2aXNpb24gNzUzMTUpCisrKyBXZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvbWFjL1BhZ2VDbGllbnRJbXBsLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0yOTEsNCAr MjkxLDE0IEBAIHZvaWQgUGFnZUNsaWVudEltcGw6OmRpZEZpbmlzaExvYWRpbmdEYXQKICAgICBb bV93a1ZpZXcgX2RpZEZpbmlzaExvYWRpbmdEYXRhRm9yQ3VzdG9tUmVwcmVzZW50YXRpb246ZGF0 YVJlZmVyZW5jZV07CiB9CiAKK2RvdWJsZSBQYWdlQ2xpZW50SW1wbDo6em9vbUZhY3RvcigpCit7 CisgICAgcmV0dXJuIFttX3drVmlldyBfem9vbUZhY3Rvcl07Cit9CisKK3ZvaWQgUGFnZUNsaWVu dEltcGw6OnNldFpvb21GYWN0b3IoZG91YmxlIHpvb21GYWN0b3IpCit7CisgICAgW21fd2tWaWV3 IF9zZXRab29tRmFjdG9yOnpvb21GYWN0b3JdOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQK SW5kZXg6IFdlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCShyZXZpc2lvbiA3NTMxNSkKKysr IFdlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC0x NTM2LDQgKzE1MzYsMjAgQEAgLSAodm9pZClfZGlkRmluaXNoTG9hZGluZ0RhdGFGb3JDdXN0b21S ZQogICAgIF9kYXRhLT5fcGRmVmlld0NvbnRyb2xsZXItPnNldFBERkRvY3VtZW50RGF0YShfZGF0 YS0+X3BhZ2UtPm1haW5GcmFtZSgpLT5taW1lVHlwZSgpLCBkYXRhUmVmZXJlbmNlKTsKIH0KIAor LSAoZG91YmxlKV96b29tRmFjdG9yCit7CisgICAgaWYgKCFfZGF0YS0+X3BkZlZpZXdDb250cm9s bGVyKQorICAgICAgICByZXR1cm4gMTsKKworICAgIHJldHVybiBfZGF0YS0+X3BkZlZpZXdDb250 cm9sbGVyLT56b29tRmFjdG9yKCk7Cit9CisKKy0gKHZvaWQpX3NldFpvb21GYWN0b3I6KGRvdWJs ZSl6b29tRmFjdG9yCit7CisgICAgaWYgKCFfZGF0YS0+X3BkZlZpZXdDb250cm9sbGVyKQorICAg ICAgICByZXR1cm47CisKKyAgICBfZGF0YS0+X3BkZlZpZXdDb250cm9sbGVyLT5zZXRab29tRmFj dG9yKHpvb21GYWN0b3IpOworfQorCiBAZW5kCkluZGV4OiBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkv bWFjL1dLVmlld0ludGVybmFsLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L21hYy9XS1ZpZXdJbnRlcm5hbC5oCShyZXZpc2lvbiA3NTMxNSkKKysrIFdlYktpdDIvVUlQcm9j ZXNzL0FQSS9tYWMvV0tWaWV3SW50ZXJuYWwuaAkod29ya2luZyBjb3B5KQpAQCAtNTcsNSArNTcs NyBAQCBAaW50ZXJmYWNlIFdLVmlldyAoSW50ZXJuYWwpCiAKIC0gKHZvaWQpX3NldFBhZ2VIYXND dXN0b21SZXByZXNlbnRhdGlvbjooQk9PTClwYWdlSGFzQ3VzdG9tUmVwcmVzZW50YXRpb247CiAt ICh2b2lkKV9kaWRGaW5pc2hMb2FkaW5nRGF0YUZvckN1c3RvbVJlcHJlc2VudGF0aW9uOihjb25z dCBDb3JlSVBDOjpEYXRhUmVmZXJlbmNlJilkYXRhUmVmZXJlbmNlOworLSAoZG91YmxlKV96b29t RmFjdG9yOworLSAodm9pZClfc2V0Wm9vbUZhY3RvcjooZG91YmxlKXpvb21GYWN0b3I7CiAKIEBl bmQKSW5kZXg6IFdlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2twYWdlX3AuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdrcGFnZV9wLmgJKHJldmlzaW9uIDc1MzE1 KQorKysgV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3a3BhZ2VfcC5oCSh3b3JraW5nIGNvcHkp CkBAIC02OSw2ICs2OSw4IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgdm9pZCBkaWRDb21taXRM b2FkRm9yTWFpbkZyYW1lKGJvb2wgdXNlQ3VzdG9tUmVwcmVzZW50YXRpb24pOwogICAgIHZpcnR1 YWwgdm9pZCBkaWRGaW5pc2hMb2FkaW5nRGF0YUZvckN1c3RvbVJlcHJlc2VudGF0aW9uKGNvbnN0 IENvcmVJUEM6OkRhdGFSZWZlcmVuY2UmKTsKKyAgICB2aXJ0dWFsIGRvdWJsZSB6b29tRmFjdG9y KCkgY29uc3QgeyByZXR1cm4gMTsgfQorICAgIHZpcnR1YWwgdm9pZCBzZXRab29tRmFjdG9yKGRv dWJsZSkgeyB9CiAKICAgICB2b2lkIHBhaW50KFFQYWludGVyKiBwYWludGVyLCBRUmVjdCk7CiAK SW5kZXg6IFdlYktpdDIvVUlQcm9jZXNzL3dpbi9XZWJWaWV3LmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJLaXQyL1VJUHJvY2Vzcy93aW4vV2ViVmlldy5jcHAJKHJldmlzaW9uIDc1MzE1KQorKysgV2Vi S2l0Mi9VSVByb2Nlc3Mvd2luL1dlYlZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05ODEsNiAr OTgxLDE1IEBAIHZvaWQgV2ViVmlldzo6ZGlkRmluaXNoTG9hZGluZ0RhdGFGb3JDdXMKIHsKIH0K IAorZG91YmxlIFdlYlZpZXc6Onpvb21GYWN0b3IoKSBjb25zdAoreworICAgIHJldHVybiAxOwor fQorCit2b2lkIFdlYlZpZXc6OnNldFpvb21GYWN0b3IoZG91YmxlKQoreworfQorCiB2b2lkIFdl YlZpZXc6OnNldElzSW5XaW5kb3coYm9vbCBpc0luV2luZG93KQogewogICAgIG1fcGFnZS0+c2V0 SXNJbldpbmRvdyhpc0luV2luZG93KTsKSW5kZXg6IFdlYktpdDIvVUlQcm9jZXNzL3dpbi9XZWJW aWV3LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9VSVByb2Nlc3Mvd2luL1dlYlZpZXcuaAkocmV2 aXNpb24gNzUzMTUpCisrKyBXZWJLaXQyL1VJUHJvY2Vzcy93aW4vV2ViVmlldy5oCSh3b3JraW5n IGNvcHkpCkBAIC0xMzAsNiArMTMwLDggQEAgcHJpdmF0ZToKIAogICAgIHZvaWQgZGlkQ29tbWl0 TG9hZEZvck1haW5GcmFtZShib29sIHVzZUN1c3RvbVJlcHJlc2VudGF0aW9uKTsKICAgICB2b2lk IGRpZEZpbmlzaExvYWRpbmdEYXRhRm9yQ3VzdG9tUmVwcmVzZW50YXRpb24oY29uc3QgQ29yZUlQ Qzo6RGF0YVJlZmVyZW5jZSYpOworICAgIHZpcnR1YWwgZG91YmxlIHpvb21GYWN0b3IoKSBjb25z dDsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0Wm9vbUZhY3Rvcihkb3VibGUpOwogCiAgICAgdmlydHVh bCBIV05EIG5hdGl2ZVdpbmRvdygpOwogCg== 78330 2011-01-08 14:08:31 -0800 2011-01-08 15:14:40 -0800 Make the page client manage zoom for custom representations 52113_r2.diff text/plain 12661 mitz SW5kZXg6IFdlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvQ2hhbmdlTG9n CShyZXZpc2lvbiA3NTMyNSkKKysrIFdlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsNDkgQEAKKzIwMTEtMDEtMDggIERhbiBCZXJuc3RlaW4gIDxtaXR6QGFwcGxlLmNv bT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiBX ZWJLaXQyLCBwYWdlIHpvb21pbmcgZG9lcyBub3Qgd29yayB3aXRoIFBERgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTIxMTMKKworICAgICAgICAqIFVJ UHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwOgorICAgICAgICAoV0tQYWdlU3VwcG9ydHNUZXh0Wm9v bSk6IEFkZGVkLiBSZXR1cm5zIHdoZXRoZXIgdGhlIHBhZ2UgY3VycmVudGx5IHN1cHBvcnRzIHRl eHQtb25seSB6b29tLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuaDoKKyAgICAg ICAgKiBVSVByb2Nlc3MvQVBJL21hYy9QREZWaWV3Q29udHJvbGxlci5oOiBNYWRlIHBkZkRvY3Vt ZW50Q2xhc3MoKSBwcml2YXRlIGFuZCBkZWNsYXJlZCBuZXcKKyAgICAgICAgbWVtYmVyIGZ1bmN0 aW9ucy4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL21hYy9QREZWaWV3Q29udHJvbGxlci5tbToK KyAgICAgICAgKFdlYktpdDo6UERGVmlld0NvbnRyb2xsZXI6Onpvb21GYWN0b3IpOiBBZGRlZC4K KyAgICAgICAgKFdlYktpdDo6UERGVmlld0NvbnRyb2xsZXI6OnNldFpvb21GYWN0b3IpOiBBZGRl ZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL21hYy9QYWdlQ2xpZW50SW1wbC5oOgorICAgICAg ICAqIFVJUHJvY2Vzcy9BUEkvbWFjL1BhZ2VDbGllbnRJbXBsLm1tOgorICAgICAgICAoV2ViS2l0 OjpQYWdlQ2xpZW50SW1wbDo6em9vbUZhY3Rvcik6IEFkZGVkLiBDYWxscyB0aHJvdWdoIHRvIHRo ZSBXS1ZpZXcuCisgICAgICAgIChXZWJLaXQ6OlBhZ2VDbGllbnRJbXBsOjpzZXRab29tRmFjdG9y KTogRGl0dG8uCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tOgorICAgICAg ICAoLVtXS1ZpZXcgX3pvb21GYWN0b3JdKTogQWRkZWQuIENhbGxzIHRocm91Z2ggdG8gdGhlIFBE RlZpZXdDb250cm9sbGVyLgorICAgICAgICAoLVtXS1ZpZXcgX3NldFpvb21GYWN0b3I6XSk6IERp dHRvLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvbWFjL1dLVmlld0ludGVybmFsLmg6CisgICAg ICAgICogVUlQcm9jZXNzL0FQSS9xdC9xd2twYWdlX3AuaDoKKyAgICAgICAgKFFXS1BhZ2VQcml2 YXRlOjp6b29tRmFjdG9yKTogQWRkZWQuCisgICAgICAgIChRV0tQYWdlUHJpdmF0ZTo6c2V0Wm9v bUZhY3Rvcik6IEFkZGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9QYWdlQ2xpZW50Lmg6CisgICAg ICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBh Z2VQcm94eTo6V2ViUGFnZVByb3h5KTogQ29kaW5nIHN0eWxlIGZpeC4KKyAgICAgICAgKFdlYktp dDo6V2ViUGFnZVByb3h5OjpzZXRUZXh0Wm9vbUZhY3Rvcik6IEJhaWwgb3V0IGlmIHRoZSBtYWlu IGZyYW1lIGhhcyBhIGN1c3RvbSByZXByZXNlbnRhdGlvbiwKKyAgICAgICAgc2luY2UgdGhvc2Ug ZG8gbm90IHN1cHBvcnQgdGV4dC1vbmx5IHpvb20uCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQ cm94eTo6cGFnZVpvb21GYWN0b3IpOiBJZiB0aGUgbWFpbiBmcmFtZSBoYXMgYSBjdXN0b20gcmVw cmVzZW50YXRpb24sIGdldCB0aGUKKyAgICAgICAgem9vbSBmYWN0b3IgZnJvbSB0aGUgcGFnZSBj bGllbnQuCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6c2V0UGFnZVpvb21GYWN0b3Ip OiBJZiB0aGUgbWFpbiBmcmFtZSBoYXMgYSBjdXN0b20gcmVwcmVzZW50YXRpb24sIGhhdmUKKyAg ICAgICAgdGhlIGNsaWVudCBzZXQgdGhlIHpvb20gZmFjdG9yLgorICAgICAgICAoV2ViS2l0OjpX ZWJQYWdlUHJveHk6OnNldFBhZ2VBbmRUZXh0Wm9vbUZhY3RvcnMpOiBEaXR0by4KKyAgICAgICAg KiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94 eTo6c3VwcG9ydHNUZXh0Wm9vbSk6IEFkZGVkLiBSZXR1cm5zIGZhbHNlIGlmIHRoZSBtYWluIGZy YW1lIGhhcyBhIGN1c3RvbQorICAgICAgICByZXByZXNlbnRhdGlvbiwgdHJ1ZSBvdGhlcndpc2Uu CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6dGV4dFpvb21GYWN0b3IpOiBDaGFuZ2Vk IHRvIHJldHVybiAxIGlmIHRoZSBtYWluIGZyYW1lIGRvZXMgbm90IHN1cHBvcnQKKyAgICAgICAg dGV4dC1vbmx5IHpvb20uCisgICAgICAgICogVUlQcm9jZXNzL3dpbi9XZWJWaWV3LmNwcDoKKyAg ICAgICAgKFdlYktpdDo6V2ViVmlldzo6em9vbUZhY3Rvcik6IEFkZGVkLgorICAgICAgICAoV2Vi S2l0OjpXZWJWaWV3OjpzZXRab29tRmFjdG9yKTogQWRkZWQuCisgICAgICAgICogVUlQcm9jZXNz L3dpbi9XZWJWaWV3Lmg6CisKIDIwMTEtMDEtMDggIEJhbGF6cyBLZWxlbWVuICA8a2JhbGF6c0B3 ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFu c2VuLgpJbmRleDogV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZUNsaWVudC5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYktpdDIvVUlQcm9jZXNzL1BhZ2VDbGllbnQuaAkocmV2aXNpb24gNzUzMTUpCisrKyBXZWJL aXQyL1VJUHJvY2Vzcy9QYWdlQ2xpZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTEwMSw2ICsxMDEs OCBAQCBwdWJsaWM6CiAgICAgLy8gQ3VzdG9tIHJlcHJlc2VudGF0aW9ucy4KICAgICB2aXJ0dWFs IHZvaWQgZGlkQ29tbWl0TG9hZEZvck1haW5GcmFtZShib29sIHVzZUN1c3RvbVJlcHJlc2VudGF0 aW9uKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIGRpZEZpbmlzaExvYWRpbmdEYXRhRm9yQ3VzdG9t UmVwcmVzZW50YXRpb24oY29uc3QgQ29yZUlQQzo6RGF0YVJlZmVyZW5jZSYpID0gMDsKKyAgICB2 aXJ0dWFsIGRvdWJsZSB6b29tRmFjdG9yKCkgPSAwOworICAgIHZpcnR1YWwgdm9pZCBzZXRab29t RmFjdG9yKGRvdWJsZSkgPSAwOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CkluZGV4OiBX ZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHJldmlzaW9uIDc1MzE1KQorKysgV2ViS2l0Mi9V SVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTYsNyArOTYsNyBA QCBXZWJQYWdlUHJveHk6OldlYlBhZ2VQcm94eShXZWJDb250ZXh0KiBjCiAgICAgLCBtX3BhZ2VH cm91cChwYWdlR3JvdXApCiAgICAgLCBtX21haW5GcmFtZSgwKQogICAgICwgbV91c2VyQWdlbnQo c3RhbmRhcmRVc2VyQWdlbnQoKSkKLSAgICAsIG1fZXN0aW1hdGVkUHJvZ3Jlc3MoMC4wKQorICAg ICwgbV9lc3RpbWF0ZWRQcm9ncmVzcygwKQogICAgICwgbV9pc0luV2luZG93KGZhbHNlKQogICAg ICwgbV9iYWNrRm9yd2FyZExpc3QoV2ViQmFja0ZvcndhcmRMaXN0OjpjcmVhdGUodGhpcykpCiAg ICAgLCBtX3RleHRab29tRmFjdG9yKDEpCkBAIC03NDcsNiArNzQ3LDkgQEAgdm9pZCBXZWJQYWdl UHJveHk6OnNldFRleHRab29tRmFjdG9yKGRvdQogICAgIGlmICghaXNWYWxpZCgpKQogICAgICAg ICByZXR1cm47CiAKKyAgICBpZiAobV9tYWluRnJhbWVIYXNDdXN0b21SZXByZXNlbnRhdGlvbikK KyAgICAgICAgcmV0dXJuOworCiAgICAgaWYgKG1fdGV4dFpvb21GYWN0b3IgPT0gem9vbUZhY3Rv cikKICAgICAgICAgcmV0dXJuOwogCkBAIC03NTQsMTEgKzc1NywyMSBAQCB2b2lkIFdlYlBhZ2VQ cm94eTo6c2V0VGV4dFpvb21GYWN0b3IoZG91CiAgICAgcHJvY2VzcygpLT5zZW5kKE1lc3NhZ2Vz OjpXZWJQYWdlOjpTZXRUZXh0Wm9vbUZhY3RvcihtX3RleHRab29tRmFjdG9yKSwgbV9wYWdlSUQp OyAKIH0KIAorZG91YmxlIFdlYlBhZ2VQcm94eTo6cGFnZVpvb21GYWN0b3IoKSBjb25zdAorewor ICAgIHJldHVybiBtX21haW5GcmFtZUhhc0N1c3RvbVJlcHJlc2VudGF0aW9uID8gbV9wYWdlQ2xp ZW50LT56b29tRmFjdG9yKCkgOiBtX3BhZ2Vab29tRmFjdG9yOworfQorCiB2b2lkIFdlYlBhZ2VQ cm94eTo6c2V0UGFnZVpvb21GYWN0b3IoZG91YmxlIHpvb21GYWN0b3IpCiB7CiAgICAgaWYgKCFp c1ZhbGlkKCkpCiAgICAgICAgIHJldHVybjsKIAorICAgIGlmIChtX21haW5GcmFtZUhhc0N1c3Rv bVJlcHJlc2VudGF0aW9uKSB7CisgICAgICAgIG1fcGFnZUNsaWVudC0+c2V0Wm9vbUZhY3Rvcih6 b29tRmFjdG9yKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKwogICAgIGlmIChtX3BhZ2Vab29t RmFjdG9yID09IHpvb21GYWN0b3IpCiAgICAgICAgIHJldHVybjsKIApAQCAtNzcxLDYgKzc4NCwx MSBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6c2V0UGFnZUFuZFRleHRab29tRmFjCiAgICAgaWYgKCFp c1ZhbGlkKCkpCiAgICAgICAgIHJldHVybjsKIAorICAgIGlmIChtX21haW5GcmFtZUhhc0N1c3Rv bVJlcHJlc2VudGF0aW9uKSB7CisgICAgICAgIG1fcGFnZUNsaWVudC0+c2V0Wm9vbUZhY3Rvcihw YWdlWm9vbUZhY3Rvcik7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKICAgICBpZiAobV9wYWdl Wm9vbUZhY3RvciA9PSBwYWdlWm9vbUZhY3RvciAmJiBtX3RleHRab29tRmFjdG9yID09IHRleHRa b29tRmFjdG9yKQogICAgICAgICByZXR1cm47CiAKSW5kZXg6IFdlYktpdDIvVUlQcm9jZXNzL1dl YlBhZ2VQcm94eS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5oCShyZXZpc2lvbiA3NTMxNSkKKysrIFdlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5o CSh3b3JraW5nIGNvcHkpCkBAIC0yMjYsOSArMjI2LDEwIEBAIHB1YmxpYzoKICAgICBQYXNzUmVm UHRyPFdlYkRhdGE+IHNlc3Npb25TdGF0ZURhdGEoV2ViUGFnZVByb3h5U2Vzc2lvblN0YXRlRmls dGVyQ2FsbGJhY2ssIHZvaWQqIGNvbnRleHQpIGNvbnN0OwogICAgIHZvaWQgcmVzdG9yZUZyb21T ZXNzaW9uU3RhdGVEYXRhKFdlYkRhdGEqKTsKIAotICAgIGRvdWJsZSB0ZXh0Wm9vbUZhY3Rvcigp IGNvbnN0IHsgcmV0dXJuIG1fdGV4dFpvb21GYWN0b3I7IH0KKyAgICBib29sIHN1cHBvcnRzVGV4 dFpvb20oKSBjb25zdCB7IHJldHVybiAhbV9tYWluRnJhbWVIYXNDdXN0b21SZXByZXNlbnRhdGlv bjsgfQorICAgIGRvdWJsZSB0ZXh0Wm9vbUZhY3RvcigpIGNvbnN0IHsgcmV0dXJuIG1fbWFpbkZy YW1lSGFzQ3VzdG9tUmVwcmVzZW50YXRpb24gPyAxIDogbV90ZXh0Wm9vbUZhY3RvcjsgfQogICAg IHZvaWQgc2V0VGV4dFpvb21GYWN0b3IoZG91YmxlKTsKLSAgICBkb3VibGUgcGFnZVpvb21GYWN0 b3IoKSBjb25zdCB7IHJldHVybiBtX3BhZ2Vab29tRmFjdG9yOyB9CisgICAgZG91YmxlIHBhZ2Va b29tRmFjdG9yKCkgY29uc3Q7CiAgICAgdm9pZCBzZXRQYWdlWm9vbUZhY3Rvcihkb3VibGUpOwog ICAgIHZvaWQgc2V0UGFnZUFuZFRleHRab29tRmFjdG9ycyhkb3VibGUgcGFnZVpvb21GYWN0b3Is IGRvdWJsZSB0ZXh0Wm9vbUZhY3Rvcik7CiAKSW5kZXg6IFdlYktpdDIvVUlQcm9jZXNzL0FQSS9D L1dLUGFnZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQYWdl LmNwcAkocmV2aXNpb24gNzUzMTUpCisrKyBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2Uu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMzUsNiArMjM1LDExIEBAIGRvdWJsZSBXS1BhZ2VHZXRU ZXh0Wm9vbUZhY3RvcihXS1BhZ2VSZWYKICAgICByZXR1cm4gdG9JbXBsKHBhZ2VSZWYpLT50ZXh0 Wm9vbUZhY3RvcigpOwogfQogCitib29sIFdLUGFnZVN1cHBvcnRzVGV4dFpvb20oV0tQYWdlUmVm IHBhZ2VSZWYpCit7CisgICAgcmV0dXJuIHRvSW1wbChwYWdlUmVmKS0+c3VwcG9ydHNUZXh0Wm9v bSgpOworfQorCiB2b2lkIFdLUGFnZVNldFRleHRab29tRmFjdG9yKFdLUGFnZVJlZiBwYWdlUmVm LCBkb3VibGUgem9vbUZhY3RvcikKIHsKICAgICB0b0ltcGwocGFnZVJlZiktPnNldFRleHRab29t RmFjdG9yKHpvb21GYWN0b3IpOwpJbmRleDogV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQYWdl LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmgJKHJldmlz aW9uIDc1MzE1KQorKysgV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmgJKHdvcmtpbmcg Y29weSkKQEAgLTI5NSw2ICsyOTUsNyBAQCB0eXBlZGVmIGJvb2wgKCpXS1BhZ2VTZXNzaW9uU3Rh dGVGaWx0ZXJDCiBXS19FWFBPUlQgV0tEYXRhUmVmIFdLUGFnZUNvcHlTZXNzaW9uU3RhdGUoV0tQ YWdlUmVmIHBhZ2UsIHZvaWQqIGNvbnRleHQsIFdLUGFnZVNlc3Npb25TdGF0ZUZpbHRlckNhbGxi YWNrIHVybEFsbG93ZWRDYWxsYmFjayk7CiBXS19FWFBPUlQgdm9pZCBXS1BhZ2VSZXN0b3JlRnJv bVNlc3Npb25TdGF0ZShXS1BhZ2VSZWYgcGFnZSwgV0tEYXRhUmVmIHNlc3Npb25TdGF0ZURhdGEp OwogCitXS19FWFBPUlQgYm9vbCBXS1BhZ2VTdXBwb3J0c1RleHRab29tKFdLUGFnZVJlZiBwYWdl KTsKIFdLX0VYUE9SVCBkb3VibGUgV0tQYWdlR2V0VGV4dFpvb21GYWN0b3IoV0tQYWdlUmVmIHBh Z2UpOwogV0tfRVhQT1JUIHZvaWQgV0tQYWdlU2V0VGV4dFpvb21GYWN0b3IoV0tQYWdlUmVmIHBh Z2UsIGRvdWJsZSB6b29tRmFjdG9yKTsKIFdLX0VYUE9SVCBkb3VibGUgV0tQYWdlR2V0UGFnZVpv b21GYWN0b3IoV0tQYWdlUmVmIHBhZ2UpOwpJbmRleDogV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21h Yy9QREZWaWV3Q29udHJvbGxlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvVUlQcm9jZXNzL0FQ SS9tYWMvUERGVmlld0NvbnRyb2xsZXIuaAkocmV2aXNpb24gNzUzMTUpCisrKyBXZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvbWFjL1BERlZpZXdDb250cm9sbGVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTUx LDcgKzUxLDkgQEAgcHVibGljOgogICAgIFdLVmlldyogd2tWaWV3KCkgY29uc3QgeyByZXR1cm4g bV93a1ZpZXc7IH0KICAgICB2b2lkIHNldFBERkRvY3VtZW50RGF0YShjb25zdCBTdHJpbmcmIG1p bWVUeXBlLCBjb25zdCBDb3JlSVBDOjpEYXRhUmVmZXJlbmNlJik7CiAKLSAgICBzdGF0aWMgQ2xh c3MgcGRmRG9jdW1lbnRDbGFzcygpOworICAgIGRvdWJsZSB6b29tRmFjdG9yKCkgY29uc3Q7Cisg ICAgdm9pZCBzZXRab29tRmFjdG9yKGRvdWJsZSk7CisKICAgICBzdGF0aWMgQ2xhc3MgcGRmUHJl dmlld1ZpZXdDbGFzcygpOwogCiAgICAgTlNQcmludE9wZXJhdGlvbiAqbWFrZVByaW50T3BlcmF0 aW9uKE5TUHJpbnRJbmZvICopOwpAQCAtNTksNiArNjEsNyBAQCBwdWJsaWM6CiBwcml2YXRlOgog ICAgIGV4cGxpY2l0IFBERlZpZXdDb250cm9sbGVyKFdLVmlldyAqd2tWaWV3KTsKIAorICAgIHN0 YXRpYyBDbGFzcyBwZGZEb2N1bWVudENsYXNzKCk7CiAgICAgc3RhdGljIE5TQnVuZGxlKiBwZGZL aXRCdW5kbGUoKTsKIAogICAgIFdLVmlldyogbV93a1ZpZXc7CkluZGV4OiBXZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvbWFjL1BERlZpZXdDb250cm9sbGVyLm1tCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIv VUlQcm9jZXNzL0FQSS9tYWMvUERGVmlld0NvbnRyb2xsZXIubW0JKHJldmlzaW9uIDc1MzE1KQor KysgV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9QREZWaWV3Q29udHJvbGxlci5tbQkod29ya2lu ZyBjb3B5KQpAQCAtMTUxLDYgKzE1MSwxNiBAQCB2b2lkIFBERlZpZXdDb250cm9sbGVyOjpzZXRQ REZEb2N1bWVudERhCiAgICAgW21fcGRmVmlldyBzZXREb2N1bWVudDpwZGZEb2N1bWVudC5nZXQo KV07CiB9CiAKK2RvdWJsZSBQREZWaWV3Q29udHJvbGxlcjo6em9vbUZhY3RvcigpIGNvbnN0Cit7 CisgICAgcmV0dXJuIFttX3BkZlZpZXcgc2NhbGVGYWN0b3JdOworfQorCit2b2lkIFBERlZpZXdD b250cm9sbGVyOjpzZXRab29tRmFjdG9yKGRvdWJsZSB6b29tRmFjdG9yKQoreworICAgIFttX3Bk ZlZpZXcgc2V0U2NhbGVGYWN0b3I6em9vbUZhY3Rvcl07Cit9CisKIENsYXNzIFBERlZpZXdDb250 cm9sbGVyOjpwZGZEb2N1bWVudENsYXNzKCkKIHsKICAgICBzdGF0aWMgQ2xhc3MgcGRmRG9jdW1l bnRDbGFzcyA9IFtwZGZLaXRCdW5kbGUoKSBjbGFzc05hbWVkOkAiUERGRG9jdW1lbnQiXTsKSW5k ZXg6IFdlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvUGFnZUNsaWVudEltcGwuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1BhZ2VDbGllbnRJbXBsLmgJKHJldmlzaW9u IDc1MzE1KQorKysgV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9QYWdlQ2xpZW50SW1wbC5oCSh3 b3JraW5nIGNvcHkpCkBAIC04MSw2ICs4MSw5IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCB2b2lk IGRpZENvbW1pdExvYWRGb3JNYWluRnJhbWUoYm9vbCB1c2VDdXN0b21SZXByZXNlbnRhdGlvbik7 CiAgICAgdmlydHVhbCB2b2lkIGRpZEZpbmlzaExvYWRpbmdEYXRhRm9yQ3VzdG9tUmVwcmVzZW50 YXRpb24oY29uc3QgQ29yZUlQQzo6RGF0YVJlZmVyZW5jZSYpOwogCisgICAgdmlydHVhbCBkb3Vi bGUgem9vbUZhY3RvcigpOworICAgIHZpcnR1YWwgdm9pZCBzZXRab29tRmFjdG9yKGRvdWJsZSk7 CisKICAgICBXS1ZpZXcqIG1fd2tWaWV3OwogICAgIFJldGFpblB0cjxXZWJFZGl0b3JVbmRvVGFy Z2V0T2JqQz4gbV91bmRvVGFyZ2V0OwogfTsKSW5kZXg6IFdlYktpdDIvVUlQcm9jZXNzL0FQSS9t YWMvUGFnZUNsaWVudEltcGwubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L21hYy9QYWdlQ2xpZW50SW1wbC5tbQkocmV2aXNpb24gNzUzMTUpCisrKyBXZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvbWFjL1BhZ2VDbGllbnRJbXBsLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0yOTEsNCAr MjkxLDE0IEBAIHZvaWQgUGFnZUNsaWVudEltcGw6OmRpZEZpbmlzaExvYWRpbmdEYXQKICAgICBb bV93a1ZpZXcgX2RpZEZpbmlzaExvYWRpbmdEYXRhRm9yQ3VzdG9tUmVwcmVzZW50YXRpb246ZGF0 YVJlZmVyZW5jZV07CiB9CiAKK2RvdWJsZSBQYWdlQ2xpZW50SW1wbDo6em9vbUZhY3RvcigpCit7 CisgICAgcmV0dXJuIFttX3drVmlldyBfem9vbUZhY3Rvcl07Cit9CisKK3ZvaWQgUGFnZUNsaWVu dEltcGw6OnNldFpvb21GYWN0b3IoZG91YmxlIHpvb21GYWN0b3IpCit7CisgICAgW21fd2tWaWV3 IF9zZXRab29tRmFjdG9yOnpvb21GYWN0b3JdOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQK SW5kZXg6IFdlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCShyZXZpc2lvbiA3NTMxNSkKKysr IFdlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC0x NTM2LDQgKzE1MzYsMjAgQEAgLSAodm9pZClfZGlkRmluaXNoTG9hZGluZ0RhdGFGb3JDdXN0b21S ZQogICAgIF9kYXRhLT5fcGRmVmlld0NvbnRyb2xsZXItPnNldFBERkRvY3VtZW50RGF0YShfZGF0 YS0+X3BhZ2UtPm1haW5GcmFtZSgpLT5taW1lVHlwZSgpLCBkYXRhUmVmZXJlbmNlKTsKIH0KIAor LSAoZG91YmxlKV96b29tRmFjdG9yCit7CisgICAgaWYgKCFfZGF0YS0+X3BkZlZpZXdDb250cm9s bGVyKQorICAgICAgICByZXR1cm4gMTsKKworICAgIHJldHVybiBfZGF0YS0+X3BkZlZpZXdDb250 cm9sbGVyLT56b29tRmFjdG9yKCk7Cit9CisKKy0gKHZvaWQpX3NldFpvb21GYWN0b3I6KGRvdWJs ZSl6b29tRmFjdG9yCit7CisgICAgaWYgKCFfZGF0YS0+X3BkZlZpZXdDb250cm9sbGVyKQorICAg ICAgICByZXR1cm47CisKKyAgICBfZGF0YS0+X3BkZlZpZXdDb250cm9sbGVyLT5zZXRab29tRmFj dG9yKHpvb21GYWN0b3IpOworfQorCiBAZW5kCkluZGV4OiBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkv bWFjL1dLVmlld0ludGVybmFsLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L21hYy9XS1ZpZXdJbnRlcm5hbC5oCShyZXZpc2lvbiA3NTMxNSkKKysrIFdlYktpdDIvVUlQcm9j ZXNzL0FQSS9tYWMvV0tWaWV3SW50ZXJuYWwuaAkod29ya2luZyBjb3B5KQpAQCAtNTcsNSArNTcs NyBAQCBAaW50ZXJmYWNlIFdLVmlldyAoSW50ZXJuYWwpCiAKIC0gKHZvaWQpX3NldFBhZ2VIYXND dXN0b21SZXByZXNlbnRhdGlvbjooQk9PTClwYWdlSGFzQ3VzdG9tUmVwcmVzZW50YXRpb247CiAt ICh2b2lkKV9kaWRGaW5pc2hMb2FkaW5nRGF0YUZvckN1c3RvbVJlcHJlc2VudGF0aW9uOihjb25z dCBDb3JlSVBDOjpEYXRhUmVmZXJlbmNlJilkYXRhUmVmZXJlbmNlOworLSAoZG91YmxlKV96b29t RmFjdG9yOworLSAodm9pZClfc2V0Wm9vbUZhY3RvcjooZG91YmxlKXpvb21GYWN0b3I7CiAKIEBl bmQKSW5kZXg6IFdlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2twYWdlX3AuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdrcGFnZV9wLmgJKHJldmlzaW9uIDc1MzE1 KQorKysgV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3a3BhZ2VfcC5oCSh3b3JraW5nIGNvcHkp CkBAIC02OSw2ICs2OSw4IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgdm9pZCBkaWRDb21taXRM b2FkRm9yTWFpbkZyYW1lKGJvb2wgdXNlQ3VzdG9tUmVwcmVzZW50YXRpb24pOwogICAgIHZpcnR1 YWwgdm9pZCBkaWRGaW5pc2hMb2FkaW5nRGF0YUZvckN1c3RvbVJlcHJlc2VudGF0aW9uKGNvbnN0 IENvcmVJUEM6OkRhdGFSZWZlcmVuY2UmKTsKKyAgICB2aXJ0dWFsIGRvdWJsZSB6b29tRmFjdG9y KCkgeyByZXR1cm4gMTsgfQorICAgIHZpcnR1YWwgdm9pZCBzZXRab29tRmFjdG9yKGRvdWJsZSkg eyB9CiAKICAgICB2b2lkIHBhaW50KFFQYWludGVyKiBwYWludGVyLCBRUmVjdCk7CiAKSW5kZXg6 IFdlYktpdDIvVUlQcm9jZXNzL3dpbi9XZWJWaWV3LmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQy L1VJUHJvY2Vzcy93aW4vV2ViVmlldy5jcHAJKHJldmlzaW9uIDc1MzE1KQorKysgV2ViS2l0Mi9V SVByb2Nlc3Mvd2luL1dlYlZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05ODEsNiArOTgxLDE1 IEBAIHZvaWQgV2ViVmlldzo6ZGlkRmluaXNoTG9hZGluZ0RhdGFGb3JDdXMKIHsKIH0KIAorZG91 YmxlIFdlYlZpZXc6Onpvb21GYWN0b3IoKQoreworICAgIHJldHVybiAxOworfQorCit2b2lkIFdl YlZpZXc6OnNldFpvb21GYWN0b3IoZG91YmxlKQoreworfQorCiB2b2lkIFdlYlZpZXc6OnNldElz SW5XaW5kb3coYm9vbCBpc0luV2luZG93KQogewogICAgIG1fcGFnZS0+c2V0SXNJbldpbmRvdyhp c0luV2luZG93KTsKSW5kZXg6IFdlYktpdDIvVUlQcm9jZXNzL3dpbi9XZWJWaWV3LmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViS2l0Mi9VSVByb2Nlc3Mvd2luL1dlYlZpZXcuaAkocmV2aXNpb24gNzUzMTUp CisrKyBXZWJLaXQyL1VJUHJvY2Vzcy93aW4vV2ViVmlldy5oCSh3b3JraW5nIGNvcHkpCkBAIC0x MzAsNiArMTMwLDggQEAgcHJpdmF0ZToKIAogICAgIHZvaWQgZGlkQ29tbWl0TG9hZEZvck1haW5G cmFtZShib29sIHVzZUN1c3RvbVJlcHJlc2VudGF0aW9uKTsKICAgICB2b2lkIGRpZEZpbmlzaExv YWRpbmdEYXRhRm9yQ3VzdG9tUmVwcmVzZW50YXRpb24oY29uc3QgQ29yZUlQQzo6RGF0YVJlZmVy ZW5jZSYpOworICAgIHZpcnR1YWwgZG91YmxlIHpvb21GYWN0b3IoKTsKKyAgICB2aXJ0dWFsIHZv aWQgc2V0Wm9vbUZhY3Rvcihkb3VibGUpOwogCiAgICAgdmlydHVhbCBIV05EIG5hdGl2ZVdpbmRv dygpOwogCg== 78333 2011-01-08 15:34:26 -0800 2011-01-08 15:46:45 -0800 Make the page client manage zoom for custom representations 52113_r3.diff text/plain 13552 mitz SW5kZXg6IFdlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvQ2hhbmdlTG9n CShyZXZpc2lvbiA3NTMyNykKKysrIFdlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsNDggQEAKKzIwMTEtMDEtMDggIERhbiBCZXJuc3RlaW4gIDxtaXR6QGFwcGxlLmNv bT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiBX ZWJLaXQyLCBwYWdlIHpvb21pbmcgZG9lcyBub3Qgd29yayB3aXRoIFBERgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTIxMTMKKworICAgICAgICAqIFVJ UHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwOgorICAgICAgICAoV0tQYWdlU3VwcG9ydHNUZXh0Wm9v bSk6IEFkZGVkLiBSZXR1cm5zIHdoZXRoZXIgdGhlIHBhZ2UgY3VycmVudGx5IHN1cHBvcnRzIHRl eHQtb25seSB6b29tLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuaDoKKyAgICAg ICAgKiBVSVByb2Nlc3MvQVBJL21hYy9QREZWaWV3Q29udHJvbGxlci5oOiBNYWRlIHBkZkRvY3Vt ZW50Q2xhc3MoKSBwcml2YXRlIGFuZCBkZWNsYXJlZCBuZXcKKyAgICAgICAgbWVtYmVyIGZ1bmN0 aW9ucy4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL21hYy9QREZWaWV3Q29udHJvbGxlci5tbToK KyAgICAgICAgKFdlYktpdDo6UERGVmlld0NvbnRyb2xsZXI6Onpvb21GYWN0b3IpOiBBZGRlZC4K KyAgICAgICAgKFdlYktpdDo6UERGVmlld0NvbnRyb2xsZXI6OnNldFpvb21GYWN0b3IpOiBBZGRl ZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL21hYy9QYWdlQ2xpZW50SW1wbC5oOgorICAgICAg ICAqIFVJUHJvY2Vzcy9BUEkvbWFjL1BhZ2VDbGllbnRJbXBsLm1tOgorICAgICAgICAoV2ViS2l0 OjpQYWdlQ2xpZW50SW1wbDo6Y3VzdG9tUmVwcmVzZW50YXRpb25ab29tRmFjdG9yKTogQWRkZWQu IENhbGxzIHRocm91Z2ggdG8gdGhlIFdLVmlldy4KKyAgICAgICAgKFdlYktpdDo6UGFnZUNsaWVu dEltcGw6OnNldEN1c3RvbVJlcHJlc2VudGF0aW9uWm9vbUZhY3Rvcik6IERpdHRvLgorICAgICAg ICAqIFVJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbToKKyAgICAgICAgKC1bV0tWaWV3IF9jdXN0 b21SZXByZXNlbnRhdGlvblpvb21GYWN0b3JdKTogQWRkZWQuIENhbGxzIHRocm91Z2ggdG8gdGhl IFBERlZpZXdDb250cm9sbGVyLgorICAgICAgICAoLVtXS1ZpZXcgX3NldEN1c3RvbVJlcHJlc2Vu dGF0aW9uWm9vbUZhY3RvcjpdKTogRGl0dG8uCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9tYWMv V0tWaWV3SW50ZXJuYWwuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3F3a3BhZ2VfcC5o OgorICAgICAgICAoUVdLUGFnZVByaXZhdGU6OmN1c3RvbVJlcHJlc2VudGF0aW9uWm9vbUZhY3Rv cik6IEFkZGVkLgorICAgICAgICAoUVdLUGFnZVByaXZhdGU6OnNldEN1c3RvbVJlcHJlc2VudGF0 aW9uWm9vbUZhY3Rvcik6IEFkZGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9QYWdlQ2xpZW50Lmg6 CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6 OldlYlBhZ2VQcm94eTo6V2ViUGFnZVByb3h5KTogQ29kaW5nIHN0eWxlIGZpeC4KKyAgICAgICAg KFdlYktpdDo6V2ViUGFnZVByb3h5OjpzdXBwb3J0c1RleHRab29tKTogQWRkZWQuIFJldHVybnMg ZmFsc2UgaWYgdGhlIG1haW4gZnJhbWUgaGFzIGEgY3VzdG9tCisgICAgICAgIHJlcHJlc2VudGF0 aW9uIG9yIGlzIGEgc3RhbmRhbG9uZSBpbWFnZSwgdHJ1ZSBvdGhlcndpc2UuCisgICAgICAgIChX ZWJLaXQ6OldlYlBhZ2VQcm94eTo6c2V0VGV4dFpvb21GYWN0b3IpOiBCYWlsIG91dCBpZiB0aGUg bWFpbiBmcmFtZSBoYXMgYSBjdXN0b20gcmVwcmVzZW50YXRpb24uCisgICAgICAgIChXZWJLaXQ6 OldlYlBhZ2VQcm94eTo6cGFnZVpvb21GYWN0b3IpOiBJZiB0aGUgbWFpbiBmcmFtZSBoYXMgYSBj dXN0b20gcmVwcmVzZW50YXRpb24sIGdldCB0aGUKKyAgICAgICAgem9vbSBmYWN0b3IgZnJvbSB0 aGUgcGFnZSBjbGllbnQuCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6c2V0UGFnZVpv b21GYWN0b3IpOiBJZiB0aGUgbWFpbiBmcmFtZSBoYXMgYSBjdXN0b20gcmVwcmVzZW50YXRpb24s IGhhdmUKKyAgICAgICAgdGhlIGNsaWVudCBzZXQgdGhlIHpvb20gZmFjdG9yLgorICAgICAgICAo V2ViS2l0OjpXZWJQYWdlUHJveHk6OnNldFBhZ2VBbmRUZXh0Wm9vbUZhY3RvcnMpOiBEaXR0by4K KyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6CisgICAgICAgIChXZWJLaXQ6Oldl YlBhZ2VQcm94eTo6dGV4dFpvb21GYWN0b3IpOiBDaGFuZ2VkIHRvIHJldHVybiAxIGlmIHRoZSBt YWluIGZyYW1lIGhhcyBhIGN1c3RvbQorICAgICAgICByZXByZXNlbnRhdGlvbi4KKyAgICAgICAg KiBVSVByb2Nlc3Mvd2luL1dlYlZpZXcuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3Ojpj dXN0b21SZXByZXNlbnRhdGlvblpvb21GYWN0b3IpOiBBZGRlZC4KKyAgICAgICAgKFdlYktpdDo6 V2ViVmlldzo6c2V0Q3VzdG9tUmVwcmVzZW50YXRpb25ab29tRmFjdG9yKTogQWRkZWQuCisgICAg ICAgICogVUlQcm9jZXNzL3dpbi9XZWJWaWV3Lmg6CisKIDIwMTEtMDEtMDggIEplZmYgTWlsbGVy ICA8amVmZm1AYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEpvbiBIb25leWN1dHQu CkluZGV4OiBXZWJLaXQyL1VJUHJvY2Vzcy9QYWdlQ2xpZW50LmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi S2l0Mi9VSVByb2Nlc3MvUGFnZUNsaWVudC5oCShyZXZpc2lvbiA3NTMyNSkKKysrIFdlYktpdDIv VUlQcm9jZXNzL1BhZ2VDbGllbnQuaAkod29ya2luZyBjb3B5KQpAQCAtMTAxLDYgKzEwMSw4IEBA IHB1YmxpYzoKICAgICAvLyBDdXN0b20gcmVwcmVzZW50YXRpb25zLgogICAgIHZpcnR1YWwgdm9p ZCBkaWRDb21taXRMb2FkRm9yTWFpbkZyYW1lKGJvb2wgdXNlQ3VzdG9tUmVwcmVzZW50YXRpb24p ID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgZGlkRmluaXNoTG9hZGluZ0RhdGFGb3JDdXN0b21SZXBy ZXNlbnRhdGlvbihjb25zdCBDb3JlSVBDOjpEYXRhUmVmZXJlbmNlJikgPSAwOworICAgIHZpcnR1 YWwgZG91YmxlIGN1c3RvbVJlcHJlc2VudGF0aW9uWm9vbUZhY3RvcigpID0gMDsKKyAgICB2aXJ0 dWFsIHZvaWQgc2V0Q3VzdG9tUmVwcmVzZW50YXRpb25ab29tRmFjdG9yKGRvdWJsZSkgPSAwOwog fTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CkluZGV4OiBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJQ YWdlUHJveHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5jcHAJKHJldmlzaW9uIDc1MzI1KQorKysgV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5 LmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTYsNyArOTYsNyBAQCBXZWJQYWdlUHJveHk6OldlYlBh Z2VQcm94eShXZWJDb250ZXh0KiBjCiAgICAgLCBtX3BhZ2VHcm91cChwYWdlR3JvdXApCiAgICAg LCBtX21haW5GcmFtZSgwKQogICAgICwgbV91c2VyQWdlbnQoc3RhbmRhcmRVc2VyQWdlbnQoKSkK LSAgICAsIG1fZXN0aW1hdGVkUHJvZ3Jlc3MoMC4wKQorICAgICwgbV9lc3RpbWF0ZWRQcm9ncmVz cygwKQogICAgICwgbV9pc0luV2luZG93KGZhbHNlKQogICAgICwgbV9iYWNrRm9yd2FyZExpc3Qo V2ViQmFja0ZvcndhcmRMaXN0OjpjcmVhdGUodGhpcykpCiAgICAgLCBtX3RleHRab29tRmFjdG9y KDEpCkBAIC03NDIsMTEgKzc0MiwyNiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6cmVzdG9yZUZyb21T ZXNzaW9uU3RhCiB9CiAjZW5kaWYKIAorYm9vbCBXZWJQYWdlUHJveHk6OnN1cHBvcnRzVGV4dFpv b20oKSBjb25zdAoreworICAgIGlmIChtX21haW5GcmFtZUhhc0N1c3RvbVJlcHJlc2VudGF0aW9u KQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICAvLyBGSVhNRTogVGhpcyBzaG91bGQgYWxz byByZXR1cm4gZmFsc2UgZm9yIHN0YW5kYWxvbmUgbWVkaWEgYW5kIHBsdWctaW4gZG9jdW1lbnRz LgorICAgIGlmICghbV9tYWluRnJhbWUgfHwgbV9tYWluRnJhbWUtPmlzRGlzcGxheWluZ1N0YW5k YWxvbmVJbWFnZURvY3VtZW50KCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIHJldHVy biB0cnVlOworfQorIAogdm9pZCBXZWJQYWdlUHJveHk6OnNldFRleHRab29tRmFjdG9yKGRvdWJs ZSB6b29tRmFjdG9yKQogewogICAgIGlmICghaXNWYWxpZCgpKQogICAgICAgICByZXR1cm47CiAK KyAgICBpZiAobV9tYWluRnJhbWVIYXNDdXN0b21SZXByZXNlbnRhdGlvbikKKyAgICAgICAgcmV0 dXJuOworCiAgICAgaWYgKG1fdGV4dFpvb21GYWN0b3IgPT0gem9vbUZhY3RvcikKICAgICAgICAg cmV0dXJuOwogCkBAIC03NTQsMTEgKzc2OSwyMSBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6c2V0VGV4 dFpvb21GYWN0b3IoZG91CiAgICAgcHJvY2VzcygpLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpT ZXRUZXh0Wm9vbUZhY3RvcihtX3RleHRab29tRmFjdG9yKSwgbV9wYWdlSUQpOyAKIH0KIAorZG91 YmxlIFdlYlBhZ2VQcm94eTo6cGFnZVpvb21GYWN0b3IoKSBjb25zdAoreworICAgIHJldHVybiBt X21haW5GcmFtZUhhc0N1c3RvbVJlcHJlc2VudGF0aW9uID8gbV9wYWdlQ2xpZW50LT5jdXN0b21S ZXByZXNlbnRhdGlvblpvb21GYWN0b3IoKSA6IG1fcGFnZVpvb21GYWN0b3I7Cit9CisKIHZvaWQg V2ViUGFnZVByb3h5OjpzZXRQYWdlWm9vbUZhY3Rvcihkb3VibGUgem9vbUZhY3RvcikKIHsKICAg ICBpZiAoIWlzVmFsaWQoKSkKICAgICAgICAgcmV0dXJuOwogCisgICAgaWYgKG1fbWFpbkZyYW1l SGFzQ3VzdG9tUmVwcmVzZW50YXRpb24pIHsKKyAgICAgICAgbV9wYWdlQ2xpZW50LT5zZXRDdXN0 b21SZXByZXNlbnRhdGlvblpvb21GYWN0b3Ioem9vbUZhY3Rvcik7CisgICAgICAgIHJldHVybjsK KyAgICB9CisKICAgICBpZiAobV9wYWdlWm9vbUZhY3RvciA9PSB6b29tRmFjdG9yKQogICAgICAg ICByZXR1cm47CiAKQEAgLTc3MSw2ICs3OTYsMTEgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnNldFBh Z2VBbmRUZXh0Wm9vbUZhYwogICAgIGlmICghaXNWYWxpZCgpKQogICAgICAgICByZXR1cm47CiAK KyAgICBpZiAobV9tYWluRnJhbWVIYXNDdXN0b21SZXByZXNlbnRhdGlvbikgeworICAgICAgICBt X3BhZ2VDbGllbnQtPnNldEN1c3RvbVJlcHJlc2VudGF0aW9uWm9vbUZhY3RvcihwYWdlWm9vbUZh Y3Rvcik7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKICAgICBpZiAobV9wYWdlWm9vbUZhY3Rv ciA9PSBwYWdlWm9vbUZhY3RvciAmJiBtX3RleHRab29tRmFjdG9yID09IHRleHRab29tRmFjdG9y KQogICAgICAgICByZXR1cm47CiAKSW5kZXg6IFdlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCShyZXZp c2lvbiA3NTMyNSkKKysrIFdlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCSh3b3JraW5n IGNvcHkpCkBAIC0yMjYsOSArMjI2LDEwIEBAIHB1YmxpYzoKICAgICBQYXNzUmVmUHRyPFdlYkRh dGE+IHNlc3Npb25TdGF0ZURhdGEoV2ViUGFnZVByb3h5U2Vzc2lvblN0YXRlRmlsdGVyQ2FsbGJh Y2ssIHZvaWQqIGNvbnRleHQpIGNvbnN0OwogICAgIHZvaWQgcmVzdG9yZUZyb21TZXNzaW9uU3Rh dGVEYXRhKFdlYkRhdGEqKTsKIAotICAgIGRvdWJsZSB0ZXh0Wm9vbUZhY3RvcigpIGNvbnN0IHsg cmV0dXJuIG1fdGV4dFpvb21GYWN0b3I7IH0KKyAgICBib29sIHN1cHBvcnRzVGV4dFpvb20oKSBj b25zdDsKKyAgICBkb3VibGUgdGV4dFpvb21GYWN0b3IoKSBjb25zdCB7IHJldHVybiBtX21haW5G cmFtZUhhc0N1c3RvbVJlcHJlc2VudGF0aW9uID8gMSA6IG1fdGV4dFpvb21GYWN0b3I7IH0KICAg ICB2b2lkIHNldFRleHRab29tRmFjdG9yKGRvdWJsZSk7Ci0gICAgZG91YmxlIHBhZ2Vab29tRmFj dG9yKCkgY29uc3QgeyByZXR1cm4gbV9wYWdlWm9vbUZhY3RvcjsgfQorICAgIGRvdWJsZSBwYWdl Wm9vbUZhY3RvcigpIGNvbnN0OwogICAgIHZvaWQgc2V0UGFnZVpvb21GYWN0b3IoZG91YmxlKTsK ICAgICB2b2lkIHNldFBhZ2VBbmRUZXh0Wm9vbUZhY3RvcnMoZG91YmxlIHBhZ2Vab29tRmFjdG9y LCBkb3VibGUgdGV4dFpvb21GYWN0b3IpOwogCkluZGV4OiBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Qy9XS1BhZ2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFn ZS5jcHAJKHJldmlzaW9uIDc1MzI1KQorKysgV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQYWdl LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjM1LDYgKzIzNSwxMSBAQCBkb3VibGUgV0tQYWdlR2V0 VGV4dFpvb21GYWN0b3IoV0tQYWdlUmVmCiAgICAgcmV0dXJuIHRvSW1wbChwYWdlUmVmKS0+dGV4 dFpvb21GYWN0b3IoKTsKIH0KIAorYm9vbCBXS1BhZ2VTdXBwb3J0c1RleHRab29tKFdLUGFnZVJl ZiBwYWdlUmVmKQoreworICAgIHJldHVybiB0b0ltcGwocGFnZVJlZiktPnN1cHBvcnRzVGV4dFpv b20oKTsKK30KKwogdm9pZCBXS1BhZ2VTZXRUZXh0Wm9vbUZhY3RvcihXS1BhZ2VSZWYgcGFnZVJl ZiwgZG91YmxlIHpvb21GYWN0b3IpCiB7CiAgICAgdG9JbXBsKHBhZ2VSZWYpLT5zZXRUZXh0Wm9v bUZhY3Rvcih6b29tRmFjdG9yKTsKSW5kZXg6IFdlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFn ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5oCShyZXZp c2lvbiA3NTMyNSkKKysrIFdlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5oCSh3b3JraW5n IGNvcHkpCkBAIC0yOTUsNiArMjk1LDcgQEAgdHlwZWRlZiBib29sICgqV0tQYWdlU2Vzc2lvblN0 YXRlRmlsdGVyQwogV0tfRVhQT1JUIFdLRGF0YVJlZiBXS1BhZ2VDb3B5U2Vzc2lvblN0YXRlKFdL UGFnZVJlZiBwYWdlLCB2b2lkKiBjb250ZXh0LCBXS1BhZ2VTZXNzaW9uU3RhdGVGaWx0ZXJDYWxs YmFjayB1cmxBbGxvd2VkQ2FsbGJhY2spOwogV0tfRVhQT1JUIHZvaWQgV0tQYWdlUmVzdG9yZUZy b21TZXNzaW9uU3RhdGUoV0tQYWdlUmVmIHBhZ2UsIFdLRGF0YVJlZiBzZXNzaW9uU3RhdGVEYXRh KTsKIAorV0tfRVhQT1JUIGJvb2wgV0tQYWdlU3VwcG9ydHNUZXh0Wm9vbShXS1BhZ2VSZWYgcGFn ZSk7CiBXS19FWFBPUlQgZG91YmxlIFdLUGFnZUdldFRleHRab29tRmFjdG9yKFdLUGFnZVJlZiBw YWdlKTsKIFdLX0VYUE9SVCB2b2lkIFdLUGFnZVNldFRleHRab29tRmFjdG9yKFdLUGFnZVJlZiBw YWdlLCBkb3VibGUgem9vbUZhY3Rvcik7CiBXS19FWFBPUlQgZG91YmxlIFdLUGFnZUdldFBhZ2Va b29tRmFjdG9yKFdLUGFnZVJlZiBwYWdlKTsKSW5kZXg6IFdlYktpdDIvVUlQcm9jZXNzL0FQSS9t YWMvUERGVmlld0NvbnRyb2xsZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1VJUHJvY2Vzcy9B UEkvbWFjL1BERlZpZXdDb250cm9sbGVyLmgJKHJldmlzaW9uIDc1MzI1KQorKysgV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL21hYy9QREZWaWV3Q29udHJvbGxlci5oCSh3b3JraW5nIGNvcHkpCkBAIC01 MSw3ICs1MSw5IEBAIHB1YmxpYzoKICAgICBXS1ZpZXcqIHdrVmlldygpIGNvbnN0IHsgcmV0dXJu IG1fd2tWaWV3OyB9CiAgICAgdm9pZCBzZXRQREZEb2N1bWVudERhdGEoY29uc3QgU3RyaW5nJiBt aW1lVHlwZSwgY29uc3QgQ29yZUlQQzo6RGF0YVJlZmVyZW5jZSYpOwogCi0gICAgc3RhdGljIENs YXNzIHBkZkRvY3VtZW50Q2xhc3MoKTsKKyAgICBkb3VibGUgem9vbUZhY3RvcigpIGNvbnN0Owor ICAgIHZvaWQgc2V0Wm9vbUZhY3Rvcihkb3VibGUpOworCiAgICAgc3RhdGljIENsYXNzIHBkZlBy ZXZpZXdWaWV3Q2xhc3MoKTsKIAogICAgIE5TUHJpbnRPcGVyYXRpb24gKm1ha2VQcmludE9wZXJh dGlvbihOU1ByaW50SW5mbyAqKTsKQEAgLTU5LDYgKzYxLDcgQEAgcHVibGljOgogcHJpdmF0ZToK ICAgICBleHBsaWNpdCBQREZWaWV3Q29udHJvbGxlcihXS1ZpZXcgKndrVmlldyk7CiAKKyAgICBz dGF0aWMgQ2xhc3MgcGRmRG9jdW1lbnRDbGFzcygpOwogICAgIHN0YXRpYyBOU0J1bmRsZSogcGRm S2l0QnVuZGxlKCk7CiAKICAgICBXS1ZpZXcqIG1fd2tWaWV3OwpJbmRleDogV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL21hYy9QREZWaWV3Q29udHJvbGxlci5tbQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQy L1VJUHJvY2Vzcy9BUEkvbWFjL1BERlZpZXdDb250cm9sbGVyLm1tCShyZXZpc2lvbiA3NTMyNSkK KysrIFdlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvUERGVmlld0NvbnRyb2xsZXIubW0JKHdvcmtp bmcgY29weSkKQEAgLTE1MSw2ICsxNTEsMTYgQEAgdm9pZCBQREZWaWV3Q29udHJvbGxlcjo6c2V0 UERGRG9jdW1lbnREYQogICAgIFttX3BkZlZpZXcgc2V0RG9jdW1lbnQ6cGRmRG9jdW1lbnQuZ2V0 KCldOwogfQogCitkb3VibGUgUERGVmlld0NvbnRyb2xsZXI6Onpvb21GYWN0b3IoKSBjb25zdAor eworICAgIHJldHVybiBbbV9wZGZWaWV3IHNjYWxlRmFjdG9yXTsKK30KKwordm9pZCBQREZWaWV3 Q29udHJvbGxlcjo6c2V0Wm9vbUZhY3Rvcihkb3VibGUgem9vbUZhY3RvcikKK3sKKyAgICBbbV9w ZGZWaWV3IHNldFNjYWxlRmFjdG9yOnpvb21GYWN0b3JdOworfQorCiBDbGFzcyBQREZWaWV3Q29u dHJvbGxlcjo6cGRmRG9jdW1lbnRDbGFzcygpCiB7CiAgICAgc3RhdGljIENsYXNzIHBkZkRvY3Vt ZW50Q2xhc3MgPSBbcGRmS2l0QnVuZGxlKCkgY2xhc3NOYW1lZDpAIlBERkRvY3VtZW50Il07Cklu ZGV4OiBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1BhZ2VDbGllbnRJbXBsLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9QYWdlQ2xpZW50SW1wbC5oCShyZXZpc2lv biA3NTMyNSkKKysrIFdlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvUGFnZUNsaWVudEltcGwuaAko d29ya2luZyBjb3B5KQpAQCAtODEsNiArODEsOSBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgdm9p ZCBkaWRDb21taXRMb2FkRm9yTWFpbkZyYW1lKGJvb2wgdXNlQ3VzdG9tUmVwcmVzZW50YXRpb24p OwogICAgIHZpcnR1YWwgdm9pZCBkaWRGaW5pc2hMb2FkaW5nRGF0YUZvckN1c3RvbVJlcHJlc2Vu dGF0aW9uKGNvbnN0IENvcmVJUEM6OkRhdGFSZWZlcmVuY2UmKTsKIAorICAgIHZpcnR1YWwgZG91 YmxlIGN1c3RvbVJlcHJlc2VudGF0aW9uWm9vbUZhY3RvcigpOworICAgIHZpcnR1YWwgdm9pZCBz ZXRDdXN0b21SZXByZXNlbnRhdGlvblpvb21GYWN0b3IoZG91YmxlKTsKKwogICAgIFdLVmlldyog bV93a1ZpZXc7CiAgICAgUmV0YWluUHRyPFdlYkVkaXRvclVuZG9UYXJnZXRPYmpDPiBtX3VuZG9U YXJnZXQ7CiB9OwpJbmRleDogV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9QYWdlQ2xpZW50SW1w bC5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1BhZ2VDbGllbnRJ bXBsLm1tCShyZXZpc2lvbiA3NTMyNSkKKysrIFdlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvUGFn ZUNsaWVudEltcGwubW0JKHdvcmtpbmcgY29weSkKQEAgLTI5MSw0ICsyOTEsMTQgQEAgdm9pZCBQ YWdlQ2xpZW50SW1wbDo6ZGlkRmluaXNoTG9hZGluZ0RhdAogICAgIFttX3drVmlldyBfZGlkRmlu aXNoTG9hZGluZ0RhdGFGb3JDdXN0b21SZXByZXNlbnRhdGlvbjpkYXRhUmVmZXJlbmNlXTsKIH0K IAorZG91YmxlIFBhZ2VDbGllbnRJbXBsOjpjdXN0b21SZXByZXNlbnRhdGlvblpvb21GYWN0b3Io KQoreworICAgIHJldHVybiBbbV93a1ZpZXcgX2N1c3RvbVJlcHJlc2VudGF0aW9uWm9vbUZhY3Rv cl07Cit9CisKK3ZvaWQgUGFnZUNsaWVudEltcGw6OnNldEN1c3RvbVJlcHJlc2VudGF0aW9uWm9v bUZhY3Rvcihkb3VibGUgem9vbUZhY3RvcikKK3sKKyAgICBbbV93a1ZpZXcgX3NldEN1c3RvbVJl cHJlc2VudGF0aW9uWm9vbUZhY3Rvcjp6b29tRmFjdG9yXTsKK30KKwogfSAvLyBuYW1lc3BhY2Ug V2ViS2l0CkluZGV4OiBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQkocmV2aXNpb24gNzUz MjUpCisrKyBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQkod29ya2luZyBjb3B5 KQpAQCAtMTUzNiw0ICsxNTM2LDIwIEBAIC0gKHZvaWQpX2RpZEZpbmlzaExvYWRpbmdEYXRhRm9y Q3VzdG9tUmUKICAgICBfZGF0YS0+X3BkZlZpZXdDb250cm9sbGVyLT5zZXRQREZEb2N1bWVudERh dGEoX2RhdGEtPl9wYWdlLT5tYWluRnJhbWUoKS0+bWltZVR5cGUoKSwgZGF0YVJlZmVyZW5jZSk7 CiB9CiAKKy0gKGRvdWJsZSlfY3VzdG9tUmVwcmVzZW50YXRpb25ab29tRmFjdG9yCit7CisgICAg aWYgKCFfZGF0YS0+X3BkZlZpZXdDb250cm9sbGVyKQorICAgICAgICByZXR1cm4gMTsKKworICAg IHJldHVybiBfZGF0YS0+X3BkZlZpZXdDb250cm9sbGVyLT56b29tRmFjdG9yKCk7Cit9CisKKy0g KHZvaWQpX3NldEN1c3RvbVJlcHJlc2VudGF0aW9uWm9vbUZhY3RvcjooZG91YmxlKXpvb21GYWN0 b3IKK3sKKyAgICBpZiAoIV9kYXRhLT5fcGRmVmlld0NvbnRyb2xsZXIpCisgICAgICAgIHJldHVy bjsKKworICAgIF9kYXRhLT5fcGRmVmlld0NvbnRyb2xsZXItPnNldFpvb21GYWN0b3Ioem9vbUZh Y3Rvcik7Cit9CisKIEBlbmQKSW5kZXg6IFdlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3 SW50ZXJuYWwuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmll d0ludGVybmFsLmgJKHJldmlzaW9uIDc1MzI1KQorKysgV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21h Yy9XS1ZpZXdJbnRlcm5hbC5oCSh3b3JraW5nIGNvcHkpCkBAIC01Nyw1ICs1Nyw3IEBAIEBpbnRl cmZhY2UgV0tWaWV3IChJbnRlcm5hbCkKIAogLSAodm9pZClfc2V0UGFnZUhhc0N1c3RvbVJlcHJl c2VudGF0aW9uOihCT09MKXBhZ2VIYXNDdXN0b21SZXByZXNlbnRhdGlvbjsKIC0gKHZvaWQpX2Rp ZEZpbmlzaExvYWRpbmdEYXRhRm9yQ3VzdG9tUmVwcmVzZW50YXRpb246KGNvbnN0IENvcmVJUEM6 OkRhdGFSZWZlcmVuY2UmKWRhdGFSZWZlcmVuY2U7CistIChkb3VibGUpX2N1c3RvbVJlcHJlc2Vu dGF0aW9uWm9vbUZhY3RvcjsKKy0gKHZvaWQpX3NldEN1c3RvbVJlcHJlc2VudGF0aW9uWm9vbUZh Y3RvcjooZG91YmxlKXpvb21GYWN0b3I7CiAKIEBlbmQKSW5kZXg6IFdlYktpdDIvVUlQcm9jZXNz L0FQSS9xdC9xd2twYWdlX3AuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkv cXQvcXdrcGFnZV9wLmgJKHJldmlzaW9uIDc1MzI1KQorKysgV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L3F0L3F3a3BhZ2VfcC5oCSh3b3JraW5nIGNvcHkpCkBAIC02OSw2ICs2OSw4IEBAIHB1YmxpYzoK IAogICAgIHZpcnR1YWwgdm9pZCBkaWRDb21taXRMb2FkRm9yTWFpbkZyYW1lKGJvb2wgdXNlQ3Vz dG9tUmVwcmVzZW50YXRpb24pOwogICAgIHZpcnR1YWwgdm9pZCBkaWRGaW5pc2hMb2FkaW5nRGF0 YUZvckN1c3RvbVJlcHJlc2VudGF0aW9uKGNvbnN0IENvcmVJUEM6OkRhdGFSZWZlcmVuY2UmKTsK KyAgICB2aXJ0dWFsIGRvdWJsZSBjdXN0b21SZXByZXNlbnRhdGlvblpvb21GYWN0b3IoKSB7IHJl dHVybiAxOyB9CisgICAgdmlydHVhbCB2b2lkIHNldEN1c3RvbVJlcHJlc2VudGF0aW9uWm9vbUZh Y3Rvcihkb3VibGUpIHsgfQogCiAgICAgdm9pZCBwYWludChRUGFpbnRlciogcGFpbnRlciwgUVJl Y3QpOwogCkluZGV4OiBXZWJLaXQyL1VJUHJvY2Vzcy93aW4vV2ViVmlldy5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViS2l0Mi9VSVByb2Nlc3Mvd2luL1dlYlZpZXcuY3BwCShyZXZpc2lvbiA3NTMyNSkK KysrIFdlYktpdDIvVUlQcm9jZXNzL3dpbi9XZWJWaWV3LmNwcAkod29ya2luZyBjb3B5KQpAQCAt OTgxLDYgKzk4MSwxNSBAQCB2b2lkIFdlYlZpZXc6OmRpZEZpbmlzaExvYWRpbmdEYXRhRm9yQ3Vz CiB7CiB9CiAKK2RvdWJsZSBXZWJWaWV3OjpjdXN0b21SZXByZXNlbnRhdGlvblpvb21GYWN0b3Io KQoreworICAgIHJldHVybiAxOworfQorCit2b2lkIFdlYlZpZXc6OnNldEN1c3RvbVJlcHJlc2Vu dGF0aW9uWm9vbUZhY3Rvcihkb3VibGUpCit7Cit9CisKIHZvaWQgV2ViVmlldzo6c2V0SXNJbldp bmRvdyhib29sIGlzSW5XaW5kb3cpCiB7CiAgICAgbV9wYWdlLT5zZXRJc0luV2luZG93KGlzSW5X aW5kb3cpOwpJbmRleDogV2ViS2l0Mi9VSVByb2Nlc3Mvd2luL1dlYlZpZXcuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJLaXQyL1VJUHJvY2Vzcy93aW4vV2ViVmlldy5oCShyZXZpc2lvbiA3NTMyNSkKKysr IFdlYktpdDIvVUlQcm9jZXNzL3dpbi9XZWJWaWV3LmgJKHdvcmtpbmcgY29weSkKQEAgLTEzMCw2 ICsxMzAsOCBAQCBwcml2YXRlOgogCiAgICAgdm9pZCBkaWRDb21taXRMb2FkRm9yTWFpbkZyYW1l KGJvb2wgdXNlQ3VzdG9tUmVwcmVzZW50YXRpb24pOwogICAgIHZvaWQgZGlkRmluaXNoTG9hZGlu Z0RhdGFGb3JDdXN0b21SZXByZXNlbnRhdGlvbihjb25zdCBDb3JlSVBDOjpEYXRhUmVmZXJlbmNl Jik7CisgICAgdmlydHVhbCBkb3VibGUgY3VzdG9tUmVwcmVzZW50YXRpb25ab29tRmFjdG9yKCk7 CisgICAgdmlydHVhbCB2b2lkIHNldEN1c3RvbVJlcHJlc2VudGF0aW9uWm9vbUZhY3Rvcihkb3Vi bGUpOwogCiAgICAgdmlydHVhbCBIV05EIG5hdGl2ZVdpbmRvdygpOwogCg==