49356 2010-11-10 17:38:00 -0800 -[WebView _scaleWebView:] should take an origin and scroll the document 2010-11-11 12:41:01 -0800 1 1 1 Unclassified WebKit WebKit API 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED InRadar P2 Normal --- 1 bdakin bdakin aroben bdakin eric lforschler oldest_to_newest 307658 0 bdakin 2010-11-10 17:38:00 -0800 https://bugs.webkit.org/show_bug.cgi?id=48385 added new WebKit SPI to scale a WebView. The SPI should take an origin for the scale. <rdar://problem/8643921> 307659 1 73562 bdakin 2010-11-10 17:46:04 -0800 Created attachment 73562 Patch 307665 2 bdakin 2010-11-10 18:02:15 -0800 Fixed with r71790. 308063 3 eric 2010-11-11 12:40:07 -0800 I think this broke the windows builders: 4>..\WebProcess\WebPage\WebPage.cpp(466) : error C2660: 'WebCore::Frame::scalePage' : function does not take 1 arguments 308064 4 eric 2010-11-11 12:41:01 -0800 Hmm... maybe it's only Lucas's EWS: http://queues.webkit.org/results/5659003 73562 2010-11-10 17:46:04 -0800 2010-11-10 17:54:44 -0800 Patch for-review.txt text/plain 11323 bdakin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3MTc4OSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTkgQEAKKzIwMTAtMTEtMTAgIEJldGggRGFraW4gIDxiZGFraW5AYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeCBm b3IgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ5MzU2IAorICAgICAg ICAtW1dlYlZpZXcgX3NjYWxlV2ViVmlldzpdIHNob3VsZCB0YWtlIGFuZCBvcmlnaW4gYW5kIHNj cm9sbCB0aGUgCisgICAgICAgIGRvY3VtZW50CisgICAgICAgIC1hbmQgY29ycmVzcG9uZGluZy0K KyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzg2NDM5MjE+CisKKyAgICAgICAgQXBwbHkgdGhlIHNj YWxlIHRvIHRoZSBvcmlnaW4sIGFuZCBzZXQgYSBuZXcgc2Nyb2xsIHBvc2l0aW9uLgorICAgICAg ICAqIHBhZ2UvRnJhbWUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWU6OnNjYWxlUGFnZSk6 CisgICAgICAgICogcGFnZS9GcmFtZS5oOgorICAgICAgICAqIFdlYkNvcmUuZXhwLmluOgorCiAy MDEwLTExLTEwICBEYW4gQmVybnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCkluZGV4OiBXZWJDb3JlL1dlYkNvcmUuZXhwLmluCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYkNvcmUvV2ViQ29yZS5leHAuaW4JKHJldmlzaW9uIDcxNzQ5KQorKysgV2Vi Q29yZS9XZWJDb3JlLmV4cC5pbgkod29ya2luZyBjb3B5KQpAQCAtNjQ1LDcgKzY0NSw3IEBAIF9f Wk43V2ViQ29yZTVGcmFtZTI4c2VhcmNoRm9yTGFiZWxzQmVmb3IKIF9fWk43V2ViQ29yZTVGcmFt ZTZjcmVhdGVFUE5TXzRQYWdlRVBOU18yMUhUTUxGcmFtZU93bmVyRWxlbWVudEVQTlNfMTdGcmFt ZUxvYWRlckNsaWVudEUKIF9fWk43V2ViQ29yZTVGcmFtZTdzZXRWaWV3RU4zV1RGMTBQYXNzUmVm UHRySU5TXzlGcmFtZVZpZXdFRUUKIF9fWk43V2ViQ29yZTVGcmFtZTlub2RlSW1hZ2VFUE5TXzRO b2RlRQotX19aTjdXZWJDb3JlNUZyYW1lOXNjYWxlUGFnZUVmCitfX1pON1dlYkNvcmU1RnJhbWU5 c2NhbGVQYWdlRWZSS05TXzhJbnRQb2ludEUKIF9fWk43V2ViQ29yZTVGcmFtZUQxRXYKIF9fWk43 V2ViQ29yZTVJbWFnZTEyc3VwcG9ydHNUeXBlRVJLTjNXVEY2U3RyaW5nRQogX19aTjdXZWJDb3Jl NUltYWdlMjBsb2FkUGxhdGZvcm1SZXNvdXJjZUVQS2MKSW5kZXg6IFdlYkNvcmUvcGFnZS9GcmFt ZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wYWdlL0ZyYW1lLmNwcAkocmV2aXNpb24gNzE3 NDkpCisrKyBXZWJDb3JlL3BhZ2UvRnJhbWUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05NjksNyAr OTY5LDcgQEAgdm9pZCBGcmFtZTo6c2V0UGFnZUFuZFRleHRab29tRmFjdG9ycyhmbAogICAgIH0K IH0KIAotdm9pZCBGcmFtZTo6c2NhbGVQYWdlKGZsb2F0IHNjYWxlKQordm9pZCBGcmFtZTo6c2Nh bGVQYWdlKGZsb2F0IHNjYWxlLCBjb25zdCBJbnRQb2ludCYgb3JpZ2luKQogewogICAgIGlmICht X3BhZ2VTY2FsZUZhY3RvciA9PSBzY2FsZSkKICAgICAgICAgcmV0dXJuOwpAQCAtOTg4LDYgKzk4 OCw5IEBAIHZvaWQgRnJhbWU6OnNjYWxlUGFnZShmbG9hdCBzY2FsZSkKICAgICBpZiAoRnJhbWVW aWV3KiB2aWV3ID0gdGhpcy0+dmlldygpKSB7CiAgICAgICAgIGlmIChkb2N1bWVudC0+cmVuZGVy ZXIoKSAmJiBkb2N1bWVudC0+cmVuZGVyZXIoKS0+bmVlZHNMYXlvdXQoKSAmJiB2aWV3LT5kaWRG aXJzdExheW91dCgpKQogICAgICAgICAgICAgdmlldy0+bGF5b3V0KCk7CisgICAgICAgIEludFBv aW50IHNjcm9sbFBvc2l0aW9uID0gdmlldy0+c2Nyb2xsUG9zaXRpb24oKTsKKyAgICAgICAgdmll dy0+c2V0U2Nyb2xsUG9zaXRpb24oSW50UG9pbnQoc2Nyb2xsUG9zaXRpb24ueCgpICsgb3JpZ2lu LngoKSAqIHNjYWxlLCAKKyAgICAgICAgICAgIHNjcm9sbFBvc2l0aW9uLnkoKSArIG9yaWdpbi55 KCkgKiBzY2FsZSkpOwogICAgIH0KIH0KIApJbmRleDogV2ViQ29yZS9wYWdlL0ZyYW1lLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViQ29yZS9wYWdlL0ZyYW1lLmgJKHJldmlzaW9uIDcxNzQ5KQorKysgV2Vi Q29yZS9wYWdlL0ZyYW1lLmgJKHdvcmtpbmcgY29weSkKQEAgLTE0NCw3ICsxNDQsNyBAQCBuYW1l c3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIGZsb2F0IHRleHRab29tRmFjdG9yKCkgY29uc3QgeyBy ZXR1cm4gbV90ZXh0Wm9vbUZhY3RvcjsgfQogICAgICAgICB2b2lkIHNldFBhZ2VBbmRUZXh0Wm9v bUZhY3RvcnMoZmxvYXQgcGFnZVpvb21GYWN0b3IsIGZsb2F0IHRleHRab29tRmFjdG9yKTsKIAot ICAgICAgICB2b2lkIHNjYWxlUGFnZShmbG9hdCBzY2FsZSk7CisgICAgICAgIHZvaWQgc2NhbGVQ YWdlKGZsb2F0IHNjYWxlLCBjb25zdCBJbnRQb2ludCYgb3JpZ2luKTsKICAgICAgICAgZmxvYXQg cGFnZVNjYWxlRmFjdG9yKCkgY29uc3QgeyByZXR1cm4gbV9wYWdlU2NhbGVGYWN0b3I7IH0KIAog I2lmIEVOQUJMRShPUklFTlRBVElPTl9FVkVOVFMpCkluZGV4OiBXZWJLaXQyL0NoYW5nZUxvZwo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJLaXQyL0NoYW5nZUxvZwkocmV2aXNpb24gNzE3ODkpCisrKyBXZWJL aXQyL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDEwLTExLTEw ICBCZXRoIERha2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaXggZm9yIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD00OTM1NiAKKyAgICAgICAgLVtXZWJWaWV3IF9zY2FsZVdlYlZpZXc6 XSBzaG91bGQgdGFrZSBhbmQgb3JpZ2luIGFuZCBzY3JvbGwgdGhlIAorICAgICAgICBkb2N1bWVu dAorICAgICAgICAtYW5kIGNvcnJlc3BvbmRpbmctCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84 NjQzOTIxPgorCisgICAgICAgICogU2hhcmVkL0FQSS9jL1dLU2hhcmVkQVBJQ2FzdC5oOgorICAg ICAgICAoV2ViS2l0Ojp0b0ltcGwpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9XS1BhZ2Uu Y3BwOgorICAgICAgICAoV0tQYWdlU2NhbGVXZWJWaWV3KToKKyAgICAgICAgKiBVSVByb2Nlc3Mv QVBJL0MvV0tQYWdlLmg6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6c2NhbGVXZWJWaWV3KToKKyAgICAgICAgKiBV SVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpzY2FsZVdlYlZpZXcpOgorICAg ICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmg6CisgICAgICAgICogV2ViUHJvY2Vz cy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW46CisKIDIwMTAtMTEtMTAgIEFkYSBDaGFuICA8 YWRhY2hhbkBhcHBsZS5jb20+CiAgICAgICAgIAogICAgICAgICBGaXggV2luZG93cyBidWlsZC4K SW5kZXg6IFdlYktpdDIvU2hhcmVkL0FQSS9jL1dLU2hhcmVkQVBJQ2FzdC5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYktpdDIvU2hhcmVkL0FQSS9jL1dLU2hhcmVkQVBJQ2FzdC5oCShyZXZpc2lvbiA3MTc0 OSkKKysrIFdlYktpdDIvU2hhcmVkL0FQSS9jL1dLU2hhcmVkQVBJQ2FzdC5oCSh3b3JraW5nIGNv cHkpCkBAIC0zNiw2ICszNiw3IEBACiAjaW5jbHVkZSAiV2ViVVJMLmgiCiAjaW5jbHVkZSA8V2Vi Q29yZS9JbnRSZWN0Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9GbG9hdFJlY3QuaD4KKyNpbmNsdWRl IDxXZWJDb3JlL0ludFBvaW50Lmg+CiAjaW5jbHVkZSA8d3RmL1R5cGVUcmFpdHMuaD4KIAogbmFt ZXNwYWNlIFdlYktpdCB7CkBAIC0xNjcsNiArMTY4LDExIEBAIGlubGluZSBXZWJDb3JlOjpGbG9h dFJlY3QgdG9JbXBsKGNvbnN0IFcKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0YXRp Y19jYXN0PGZsb2F0Pih3a1JlY3Quc2l6ZS53aWR0aCksIHN0YXRpY19jYXN0PGZsb2F0Pih3a1Jl Y3Quc2l6ZS5oZWlnaHQpKTsKIH0KIAoraW5saW5lIFdlYkNvcmU6OkludFBvaW50IHRvSW1wbChj b25zdCBXS1BvaW50JiB3a1BvaW50KQoreworICAgIHJldHVybiBXZWJDb3JlOjpJbnRQb2ludChz dGF0aWNfY2FzdDxpbnQ+KHdrUG9pbnQueCksIHN0YXRpY19jYXN0PGludD4od2tQb2ludC55KSk7 Cit9CisKIGlubGluZSBXS1JlY3QgdG9BUEkoY29uc3QgV2ViQ29yZTo6RmxvYXRSZWN0JiByZWN0 KQogewogICAgIFdLUmVjdCB3a1JlY3Q7CkluZGV4OiBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5j cHAJKHJldmlzaW9uIDcxNzQ5KQorKysgV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNw cAkod29ya2luZyBjb3B5KQpAQCAtNTM0LDcgKzUzNCw3IEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpz ZXRQYWdlQW5kVGV4dFpvb21GYWMKICAgICBwcm9jZXNzKCktPnNlbmQoTWVzc2FnZXM6OldlYlBh Z2U6OlNldFBhZ2VBbmRUZXh0Wm9vbUZhY3RvcnMobV9wYWdlWm9vbUZhY3RvciwgbV90ZXh0Wm9v bUZhY3RvciksIG1fcGFnZUlEKTsgCiB9CiAKLXZvaWQgV2ViUGFnZVByb3h5OjpzY2FsZVdlYlZp ZXcoZG91YmxlIHNjYWxlKQordm9pZCBXZWJQYWdlUHJveHk6OnNjYWxlV2ViVmlldyhkb3VibGUg c2NhbGUsIGNvbnN0IEludFBvaW50JiBvcmlnaW4pCiB7CiAgICAgaWYgKCFpc1ZhbGlkKCkpCiAg ICAgICAgIHJldHVybjsKQEAgLTU0Myw3ICs1NDMsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6c2Nh bGVXZWJWaWV3KGRvdWJsZSBzCiAgICAgICAgIHJldHVybjsKIAogICAgIG1fdmlld1NjYWxlRmFj dG9yID0gc2NhbGU7Ci0gICAgcHJvY2VzcygpLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpTY2Fs ZVdlYlZpZXcoc2NhbGUpLCBtX3BhZ2VJRCk7CisgICAgcHJvY2VzcygpLT5zZW5kKE1lc3NhZ2Vz OjpXZWJQYWdlOjpTY2FsZVdlYlZpZXcoc2NhbGUsIG9yaWdpbiksIG1fcGFnZUlEKTsKIH0KIAog dm9pZCBXZWJQYWdlUHJveHk6OmZpbmRTdHJpbmcoY29uc3QgU3RyaW5nJiBzdHJpbmcsIEZpbmRE aXJlY3Rpb24gZmluZERpcmVjdGlvbiwgRmluZE9wdGlvbnMgZmluZE9wdGlvbnMsIHVuc2lnbmVk IG1heE1hdGNoQ291bnQpCkluZGV4OiBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAkocmV2aXNpb24g NzE3NDkpCisrKyBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAkod29ya2luZyBjb3B5 KQpAQCAtMTkxLDcgKzE5MSw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldFBhZ2Vab29tRmFjdG9y KGRvdWJsZSk7CiAgICAgdm9pZCBzZXRQYWdlQW5kVGV4dFpvb21GYWN0b3JzKGRvdWJsZSBwYWdl Wm9vbUZhY3RvciwgZG91YmxlIHRleHRab29tRmFjdG9yKTsKIAotICAgIHZvaWQgc2NhbGVXZWJW aWV3KGRvdWJsZSBzY2FsZSk7CisgICAgdm9pZCBzY2FsZVdlYlZpZXcoZG91YmxlIHNjYWxlLCBj b25zdCBXZWJDb3JlOjpJbnRQb2ludCYgb3JpZ2luKTsKICAgICBkb3VibGUgdmlld1NjYWxlRmFj dG9yKCkgY29uc3QgeyByZXR1cm4gbV92aWV3U2NhbGVGYWN0b3I7IH0KIAogICAgIC8vIEZpbmQu CkluZGV4OiBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5jcHAJKHJldmlzaW9uIDcxNzQ5KQorKysg V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjEz LDkgKzIxMyw5IEBAIHZvaWQgV0tQYWdlU2V0UGFnZUFuZFRleHRab29tRmFjdG9ycyhXS1AKICAg ICB0b0ltcGwocGFnZVJlZiktPnNldFBhZ2VBbmRUZXh0Wm9vbUZhY3RvcnMocGFnZVpvb21GYWN0 b3IsIHRleHRab29tRmFjdG9yKTsKIH0KIAotdm9pZCBXS1BhZ2VTY2FsZVdlYlZpZXcoV0tQYWdl UmVmIHBhZ2VSZWYsIGRvdWJsZSBzY2FsZSkKK3ZvaWQgV0tQYWdlU2NhbGVXZWJWaWV3KFdLUGFn ZVJlZiBwYWdlUmVmLCBkb3VibGUgc2NhbGUsIFdLUG9pbnQgb3JpZ2luKQogewotICAgIHRvSW1w bChwYWdlUmVmKS0+c2NhbGVXZWJWaWV3KHNjYWxlKTsKKyAgICB0b0ltcGwocGFnZVJlZiktPnNj YWxlV2ViVmlldyhzY2FsZSwgdG9JbXBsKG9yaWdpbikpOwogfQogCiBkb3VibGUgV0tQYWdlR2V0 Vmlld1NjYWxlRmFjdG9yKFdLUGFnZVJlZiBwYWdlUmVmKQpJbmRleDogV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL0MvV0tQYWdlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0Mv V0tQYWdlLmgJKHJldmlzaW9uIDcxNzQ5KQorKysgV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQ YWdlLmgJKHdvcmtpbmcgY29weSkKQEAgLTI1Myw3ICsyNTMsNyBAQCBXS19FWFBPUlQgZG91Ymxl IFdLUGFnZUdldFBhZ2Vab29tRmFjdG9yCiBXS19FWFBPUlQgdm9pZCBXS1BhZ2VTZXRQYWdlWm9v bUZhY3RvcihXS1BhZ2VSZWYgcGFnZSwgZG91YmxlIHpvb21GYWN0b3IpOwogV0tfRVhQT1JUIHZv aWQgV0tQYWdlU2V0UGFnZUFuZFRleHRab29tRmFjdG9ycyhXS1BhZ2VSZWYgcGFnZSwgZG91Ymxl IHBhZ2Vab29tRmFjdG9yLCBkb3VibGUgdGV4dFpvb21GYWN0b3IpOwogCi1XS19FWFBPUlQgdm9p ZCBXS1BhZ2VTY2FsZVdlYlZpZXcoV0tQYWdlUmVmIHBhZ2UsIGRvdWJsZSBzY2FsZSk7CitXS19F WFBPUlQgdm9pZCBXS1BhZ2VTY2FsZVdlYlZpZXcoV0tQYWdlUmVmIHBhZ2UsIGRvdWJsZSBzY2Fs ZSwgV0tQb2ludCBvcmlnaW4pOwogV0tfRVhQT1JUIGRvdWJsZSBXS1BhZ2VHZXRWaWV3U2NhbGVG YWN0b3IoV0tQYWdlUmVmIHBhZ2UpOwogCiAvLyBGaW5kLgpJbmRleDogV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYlBhZ2UvV2ViUGFnZS5jcHAJKHJldmlzaW9uIDcxNzQ5KQorKysgV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ1NiwxMiArNDU2LDEy IEBAIHZvaWQgV2ViUGFnZTo6c2V0UGFnZUFuZFRleHRab29tRmFjdG9ycygKICAgICByZXR1cm4g ZnJhbWUtPnNldFBhZ2VBbmRUZXh0Wm9vbUZhY3RvcnMoc3RhdGljX2Nhc3Q8ZmxvYXQ+KHBhZ2Va b29tRmFjdG9yKSwgc3RhdGljX2Nhc3Q8ZmxvYXQ+KHRleHRab29tRmFjdG9yKSk7CiB9CiAKLXZv aWQgV2ViUGFnZTo6c2NhbGVXZWJWaWV3KGRvdWJsZSBzY2FsZSkKK3ZvaWQgV2ViUGFnZTo6c2Nh bGVXZWJWaWV3KGRvdWJsZSBzY2FsZSwgY29uc3QgSW50UG9pbnQmIG9yaWdpbikKIHsKICAgICBG cmFtZSogZnJhbWUgPSBtX21haW5GcmFtZS0+Y29yZUZyYW1lKCk7CiAgICAgaWYgKCFmcmFtZSkK ICAgICAgICAgcmV0dXJuOwotICAgIGZyYW1lLT5zY2FsZVBhZ2Uoc2NhbGUpOworICAgIGZyYW1l LT5zY2FsZVBhZ2Uoc2NhbGUsIG9yaWdpbik7CiB9CiAKIGRvdWJsZSBXZWJQYWdlOjp2aWV3U2Nh bGVGYWN0b3IoKSBjb25zdApJbmRleDogV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFn ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAko cmV2aXNpb24gNzE3NDkpCisrKyBXZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgJ KHdvcmtpbmcgY29weSkKQEAgLTE2MCw3ICsxNjAsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRQ YWdlWm9vbUZhY3Rvcihkb3VibGUpOwogICAgIHZvaWQgc2V0UGFnZUFuZFRleHRab29tRmFjdG9y cyhkb3VibGUgcGFnZVpvb21GYWN0b3IsIGRvdWJsZSB0ZXh0Wm9vbUZhY3Rvcik7CiAKLSAgICB2 b2lkIHNjYWxlV2ViVmlldyhkb3VibGUgc2NhbGUpOworICAgIHZvaWQgc2NhbGVXZWJWaWV3KGRv dWJsZSBzY2FsZSwgY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmIG9yaWdpbik7CiAgICAgZG91Ymxl IHZpZXdTY2FsZUZhY3RvcigpIGNvbnN0OwogCiAgICAgdm9pZCBzdG9wTG9hZGluZygpOwpJbmRl eDogV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbgo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluCShy ZXZpc2lvbiA3MTc0OSkKKysrIFdlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVz c2FnZXMuaW4JKHdvcmtpbmcgY29weSkKQEAgLTcwLDcgKzcwLDcgQEAgbWVzc2FnZXMgLT4gV2Vi UGFnZSB7CiAgICAgU2V0UGFnZVpvb21GYWN0b3IoZG91YmxlIHpvb21GYWN0b3IpCiAgICAgU2V0 VGV4dFpvb21GYWN0b3IoZG91YmxlIHpvb21GYWN0b3IpCiAKLSAgICBTY2FsZVdlYlZpZXcoZG91 YmxlIHNjYWxlKQorICAgIFNjYWxlV2ViVmlldyhkb3VibGUgc2NhbGUsIFdlYkNvcmU6OkludFBv aW50IG9yaWdpbikKIAogICAgICMgRmluZC4KICAgICBGaW5kU3RyaW5nKFdURjo6U3RyaW5nIHN0 cmluZywgdWludDMyX3QgZmluZERpcmVjdGlvbiwgdWludDMyX3QgZmluZE9wdGlvbnMsIHVuc2ln bmVkIG1heE1hdGNoQ291bnQpCkluZGV4OiBXZWJLaXQvbWFjL0NoYW5nZUxvZwo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJLaXQvbWFjL0NoYW5nZUxvZwkocmV2aXNpb24gNzE3ODkpCisrKyBXZWJLaXQvbWFj L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDEwLTExLTEwICBC ZXRoIERha2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBGaXggZm9yIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD00OTM1NiAKKyAgICAgICAgLVtXZWJWaWV3IF9zY2FsZVdlYlZpZXc6XSBz aG91bGQgdGFrZSBhbmQgb3JpZ2luIGFuZCBzY3JvbGwgdGhlIAorICAgICAgICBkb2N1bWVudAor ICAgICAgICAtYW5kIGNvcnJlc3BvbmRpbmctCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84NjQz OTIxPgorCisgICAgICAgICogV2ViVmlldy9XZWJWaWV3Lm1tOgorICAgICAgICAoLVtXZWJWaWV3 IF9zY2FsZVdlYlZpZXc6YXRPcmlnaW46XSk6CisgICAgICAgICogV2ViVmlldy9XZWJWaWV3UHJp dmF0ZS5oOgorCiAyMDEwLTExLTEwICBDc2FiYSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5v cmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGF2aWQgSHlhdHQuCkluZGV4OiBXZWJLaXQvbWFj L1dlYlZpZXcvV2ViVmlldy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvbWFjL1dlYlZpZXcvV2Vi Vmlldy5tbQkocmV2aXNpb24gNzE3NDkpCisrKyBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5t bQkod29ya2luZyBjb3B5KQpAQCAtMjYyNywxMyArMjYyNywxMyBAQCArICh2b2lkKV9yZWdpc3Rl clVSTFNjaGVtZUFzU2VjdXJlOihOU1N0CiAgICAgU2NoZW1lUmVnaXN0cnk6OnJlZ2lzdGVyVVJM U2NoZW1lQXNTZWN1cmUoc2NoZW1lKTsKIH0KIAotLSAodm9pZClfc2NhbGVXZWJWaWV3OihmbG9h dClzY2FsZQorLSAodm9pZClfc2NhbGVXZWJWaWV3OihmbG9hdClzY2FsZSBhdE9yaWdpbjooTlNQ b2ludClvcmlnaW4KIHsKICAgICBGcmFtZSogY29yZUZyYW1lID0gW3NlbGYgX21haW5Db3JlRnJh bWVdOwogICAgIGlmICghY29yZUZyYW1lKQogICAgICAgICByZXR1cm47CiAKLSAgICBjb3JlRnJh bWUtPnNjYWxlUGFnZShzY2FsZSk7CisgICAgY29yZUZyYW1lLT5zY2FsZVBhZ2Uoc2NhbGUsIElu dFBvaW50KG9yaWdpbikpOwogfQogCiAtIChmbG9hdClfdmlld1NjYWxlRmFjdG9yCkluZGV4OiBX ZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlld1ByaXZhdGUuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQv bWFjL1dlYlZpZXcvV2ViVmlld1ByaXZhdGUuaAkocmV2aXNpb24gNzE3NDkpCisrKyBXZWJLaXQv bWFjL1dlYlZpZXcvV2ViVmlld1ByaXZhdGUuaAkod29ya2luZyBjb3B5KQpAQCAtNTQyLDcgKzU0 Miw3IEBAIENvdWxkIGJlIHdvcnRoIGFkZGluZyB0byB0aGUgQVBJLgogKyAodm9pZClfc2V0RG9t YWluUmVsYXhhdGlvbkZvcmJpZGRlbjooQk9PTClmb3JiaWRkZW4gZm9yVVJMU2NoZW1lOihOU1N0 cmluZyAqKXNjaGVtZTsKICsgKHZvaWQpX3JlZ2lzdGVyVVJMU2NoZW1lQXNTZWN1cmU6KE5TU3Ry aW5nICopc2NoZW1lOwogCi0tICh2b2lkKV9zY2FsZVdlYlZpZXc6KGZsb2F0KXNjYWxlOworLSAo dm9pZClfc2NhbGVXZWJWaWV3OihmbG9hdClzY2FsZSBhdE9yaWdpbjooTlNQb2ludClvcmlnaW47 CiAtIChmbG9hdClfdmlld1NjYWxlRmFjdG9yOwogCiBAZW5kCg==