102028 2012-11-12 18:05:10 -0800 Use correct unscaled document size when calculating scale limits 2012-11-15 10:42:29 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 trchen webkit-unassigned abarth aelias webkit.review.bot oldest_to_newest 765069 0 trchen 2012-11-12 18:05:10 -0800 Use correct unscaled document size when calculating scale limits 765081 1 173781 trchen 2012-11-12 18:10:43 -0800 Created attachment 173781 Patch 765085 2 trchen 2012-11-12 18:12:04 -0800 Patch uploaded for early feedback. Will add test in next revision. 765115 3 173781 aelias 2012-11-12 18:47:46 -0800 Comment on attachment 173781 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=173781&action=review Good idea, I should've thought of that before. > Source/WebCore/page/FrameView.cpp:3811 > +IntSize FrameView::unscaledContentsSize() const Please move this next to FrameView::setContentsSize(). 765271 4 173781 abarth 2012-11-12 22:50:53 -0800 Comment on attachment 173781 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=173781&action=review > Source/WebCore/page/FrameView.h:98 > virtual void setContentsSize(const IntSize&); > + IntSize unscaledContentsSize() const; I'm not sure I understand the relationship between these functions. Is setContentsSize also unscaled? 767637 5 174324 trchen 2012-11-14 19:48:32 -0800 Created attachment 174324 Patch 767642 6 trchen 2012-11-14 19:51:39 -0800 (In reply to comment #4) > (From update of attachment 173781 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=173781&action=review > > > Source/WebCore/page/FrameView.h:98 > > virtual void setContentsSize(const IntSize&); > > + IntSize unscaledContentsSize() const; > > I'm not sure I understand the relationship between these functions. Is setContentsSize also unscaled? Nope, setContentsSize is scaled. I agree it is super confusing. And it doesn't really fit into current code, where contentsSize() uses push model, that RenderView pushes new contents size to the containing frame, and we use pull model to get latest unscaled contents size from RenderView. My decision is to keep it as a static helper function in WebViewImpl. 767657 7 aelias 2012-11-14 20:08:36 -0800 LGTM, thanks. 768229 8 174324 abarth 2012-11-15 10:12:53 -0800 Comment on attachment 174324 Patch Ok 768282 9 174324 webkit.review.bot 2012-11-15 10:42:26 -0800 Comment on attachment 174324 Patch Clearing flags on attachment: 174324 Committed r134796: <http://trac.webkit.org/changeset/134796> 768283 10 webkit.review.bot 2012-11-15 10:42:29 -0800 All reviewed patches have been landed. Closing bug. 173781 2012-11-12 18:10:43 -0800 2012-11-14 19:48:28 -0800 Patch bug-102028-20121112180845.patch text/plain 4531 trchen U3VidmVyc2lvbiBSZXZpc2lvbjogMTMzNTQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzc4MDg0MjJiNDg5ZTZl OTNmYWNkZjI5ZTg4YTM3ODhkMmVlMTU0Yy4uYTU5N2UwNjEyZTUwMDEwYTkxMjA0OTY3MTViN2Q2 NDEyN2NmZWVmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTExLTEyICBUaWVu LVJlbiBDaGVuICA8dHJjaGVuQGNocm9taXVtLm9yZz4KKworICAgICAgICBVc2UgY29ycmVjdCB1 bnNjYWxlZCBjb250ZW50cyBzaXplIHdoZW4gY2FsY3VsYXRpbmcgc2NhbGUgbGltaXRzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDIwMjgKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaXhlcyBidWcgaHR0 cDovL2NyYnVnLmNvbS8xNjA1ODEKKyAgICAgICAgVXNpbmcgY29udGVudHNTaXplIC8gcGFnZVNj YWxlRmFjdG9yIGFzIHVuc2NhbGVkIGNvbnRlbnRzIHNpemUgcmVzdWx0cworICAgICAgICBpbiBy b3VuZGluZyBlcnJvcnMuIFRoaXMgY2FuIGNhdXNlIHNjYWxlIGZhY3RvciB0byBvc2NpbGxhdGUg aW5kZWZpbml0ZWx5LgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyAoT09QUyEpLgorCisgICAgICAg ICogcGFnZS9GcmFtZVZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3Ojp1bnNj YWxlZENvbnRlbnRzU2l6ZSk6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKiBwYWdlL0Zy YW1lVmlldy5oOgorICAgICAgICAoRnJhbWVWaWV3KToKKwogMjAxMi0xMS0wNSAgQmVuamFtaW4g UG91bGFpbiAgPGJlbmphbWluQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVHJhbnNmb3JtT3BlcmF0 aW9uSW5mbydzIGNvbnN0cnVjdG9yIGlzIHJlYWxseSBzbG93CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdl TG9nCmluZGV4IDJhNjc1OWExOTMwNWQxMjAzYzk0MDQyZmY2OTk5ODcxNjE4ZTI2ZjkuLjc1N2Vk NTJiMjk5ZmRlYzMwNWQ1OTdkYjRjYWQxZDVjMjA4MDdjZTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTItMTEtMTIgIFRpZW4tUmVuIENoZW4gIDx0cmNo ZW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFVzZSBjb3JyZWN0IHVuc2NhbGVkIGRvY3VtZW50 IHNpemUgd2hlbiBjYWxjdWxhdGluZyBzY2FsZSBsaW1pdHMKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMjAyOAorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeGVzIGJ1ZyBodHRwOi8vY3JidWcuY29tLzE2 MDU4MQorICAgICAgICBVc2luZyBjb250ZW50c1NpemUgLyBwYWdlU2NhbGVGYWN0b3IgYXMgdW5z Y2FsZWQgY29udGVudHMgc2l6ZSByZXN1bHRzCisgICAgICAgIGluIHJvdW5kaW5nIGVycm9ycy4g VGhpcyBjYW4gY2F1c2Ugc2NhbGUgZmFjdG9yIHRvIG9zY2lsbGF0ZSBpbmRlZmluaXRlbHkuCisK KyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3 SW1wbDo6Y29tcHV0ZVBhZ2VTY2FsZUZhY3RvckxpbWl0cyk6CisKIDIwMTItMTEtMDUgIEFkYW0g QmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAogICAgICAgICBbVjhdIEludHJ1c2l2ZURPTVdy YXBwZXJNYXAgc2hvdWxkIGJlIHVzYWJsZSBmb3IgbW9yZSB0aGFuIGp1c3QgTm9kZXMKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvRnJhbWVWaWV3LmNwcAppbmRleCAyOWIwNzVjZDM3MWU5ZWJjZDhmMDcwZDVmOTJjZDhi M2Q5MmFlMzlkLi5mN2RjMDhjYzQwZTVlODY5YzY3MDNkZjM5NmVjZjRlYTlkMjQ5NWVjIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCkBAIC0zODA4LDQgKzM4MDgsMTMgQEAgdm9pZCBGcmFt ZVZpZXc6OnNldFNjcm9sbGluZ1BlcmZvcm1hbmNlTG9nZ2luZ0VuYWJsZWQoYm9vbCBmbGFnKQog I2VuZGlmCiB9CiAKK0ludFNpemUgRnJhbWVWaWV3Ojp1bnNjYWxlZENvbnRlbnRzU2l6ZSgpIGNv bnN0Cit7CisgICAgUmVuZGVyVmlldyogcm9vdCA9IHJvb3RSZW5kZXJlcih0aGlzKTsKKyAgICBp ZiAoIXJvb3QpCisgICAgICAgIHJldHVybiBJbnRTaXplKCk7CisKKyAgICByZXR1cm4gcm9vdC0+ dW5zY2FsZWREb2N1bWVudFJlY3QoKS5zaXplKCk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNv cmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmggYi9Tb3VyY2Uv V2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oCmluZGV4IDU4MzQ1M2IyNjU1MjlkMzAzY2IxMmViYmJh YmQ3MjkyYzhhZTZlYWMuLjhiZTE3YTExZGY2MmE5MzYxMGQwYWVhNDVkZjRhMDBjMWJmYjRmZmMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgKKysrIGIvU291cmNl L1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaApAQCAtOTUsNiArOTUsNyBAQCBwdWJsaWM6CiAgICAg dmlydHVhbCBib29sIGF2b2lkU2Nyb2xsYmFyQ3JlYXRpb24oKSBjb25zdDsKIAogICAgIHZpcnR1 YWwgdm9pZCBzZXRDb250ZW50c1NpemUoY29uc3QgSW50U2l6ZSYpOworICAgIEludFNpemUgdW5z Y2FsZWRDb250ZW50c1NpemUoKSBjb25zdDsKIAogICAgIHZvaWQgbGF5b3V0KGJvb2wgYWxsb3dT dWJ0cmVlID0gdHJ1ZSk7CiAgICAgYm9vbCBkaWRGaXJzdExheW91dCgpIGNvbnN0OwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwIGIvU291cmNl L1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCmluZGV4IDNmODNlNGNiY2M5ZGI0 ZDAyM2MxMjUzNmI5N2M0N2I2Yjg0Y2IyYWQuLjQ1NjE0OTQ2MGQ4MGE3NmExNWI4YWM0NDUzNjAy N2EwZDUwMzgzNTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZp ZXdJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5j cHAKQEAgLTI5OTgsMTEgKzI5OTgsMTAgQEAgYm9vbCBXZWJWaWV3SW1wbDo6Y29tcHV0ZVBhZ2VT Y2FsZUZhY3RvckxpbWl0cygpCiAgICAgbV9tYXhpbXVtUGFnZVNjYWxlRmFjdG9yID0gbWF4KG1p bihtX3BhZ2VEZWZpbmVkTWF4aW11bVBhZ2VTY2FsZUZhY3RvciwgbWF4UGFnZVNjYWxlRmFjdG9y KSwgbWluUGFnZVNjYWxlRmFjdG9yKSAqIChkZXZpY2VTY2FsZUZhY3RvcigpIC8gbV9kZXZpY2VT Y2FsZUluQ29tcG9zaXRvcik7CiAKICAgICBpbnQgdmlld1dpZHRoTm90SW5jbHVkaW5nU2Nyb2xs YmFycyA9IHBhZ2UoKS0+bWFpbkZyYW1lKCktPnZpZXcoKS0+dmlzaWJsZUNvbnRlbnRSZWN0KGZh bHNlKS53aWR0aCgpOwotICAgIGludCBjb250ZW50c1dpZHRoID0gbWFpbkZyYW1lKCktPmNvbnRl bnRzU2l6ZSgpLndpZHRoOwotICAgIGlmICh2aWV3V2lkdGhOb3RJbmNsdWRpbmdTY3JvbGxiYXJz ICYmIGNvbnRlbnRzV2lkdGgpIHsKKyAgICBpbnQgdW5zY2FsZWRDb250ZW50c1dpZHRoID0gbWFp bkZyYW1lSW1wbCgpLT5mcmFtZVZpZXcoKS0+dW5zY2FsZWRDb250ZW50c1NpemUoKS53aWR0aCgp OworICAgIGlmICh2aWV3V2lkdGhOb3RJbmNsdWRpbmdTY3JvbGxiYXJzICYmIHVuc2NhbGVkQ29u dGVudHNXaWR0aCkgewogICAgICAgICAvLyBMaW1pdCBwYWdlIHNjYWxpbmcgZG93biB0byB0aGUg ZG9jdW1lbnQgd2lkdGguCi0gICAgICAgIGludCB1bnNjYWxlZENvbnRlbnRXaWR0aCA9IGNvbnRl bnRzV2lkdGggLyBwYWdlU2NhbGVGYWN0b3IoKTsKLSAgICAgICAgbV9taW5pbXVtUGFnZVNjYWxl RmFjdG9yID0gbWF4KG1fbWluaW11bVBhZ2VTY2FsZUZhY3Rvciwgc3RhdGljX2Nhc3Q8ZmxvYXQ+ KHZpZXdXaWR0aE5vdEluY2x1ZGluZ1Njcm9sbGJhcnMpIC8gdW5zY2FsZWRDb250ZW50V2lkdGgp OworICAgICAgICBtX21pbmltdW1QYWdlU2NhbGVGYWN0b3IgPSBtYXgobV9taW5pbXVtUGFnZVNj YWxlRmFjdG9yLCBzdGF0aWNfY2FzdDxmbG9hdD4odmlld1dpZHRoTm90SW5jbHVkaW5nU2Nyb2xs YmFycykgLyB1bnNjYWxlZENvbnRlbnRzV2lkdGgpOwogICAgICAgICBtX21heGltdW1QYWdlU2Nh bGVGYWN0b3IgPSBtYXgobV9taW5pbXVtUGFnZVNjYWxlRmFjdG9yLCBtX21heGltdW1QYWdlU2Nh bGVGYWN0b3IpOwogICAgIH0KICAgICBBU1NFUlQobV9taW5pbXVtUGFnZVNjYWxlRmFjdG9yIDw9 IG1fbWF4aW11bVBhZ2VTY2FsZUZhY3Rvcik7Cg== 174324 2012-11-14 19:48:32 -0800 2012-11-15 10:42:26 -0800 Patch bug-102028-20121114194630.patch text/plain 5343 trchen U3VidmVyc2lvbiBSZXZpc2lvbjogMTMzNTQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDJhNjc1OWExOTMwNWQxMjAzYzk0MDQyZmY2OTk5ODcxNjE4ZTI2ZjkuLjk5YWM1YTBiYjgzMzlj ZjQwZjkyOTFjOGNkMmJjODZiZWMzMzJlNDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjEgQEAKKzIwMTItMTEtMTQgIFRpZW4tUmVuIENoZW4gIDx0cmNoZW5AY2hyb21p dW0ub3JnPgorCisgICAgICAgIFVzZSBjb3JyZWN0IHVuc2NhbGVkIGRvY3VtZW50IHNpemUgd2hl biBjYWxjdWxhdGluZyBzY2FsZSBsaW1pdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEwMjAyOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEZpeGVzIGJ1ZyBodHRwOi8vY3JidWcuY29tLzE2MDU4MQorICAg ICAgICBVc2luZyBjb250ZW50c1NpemUgLyBwYWdlU2NhbGVGYWN0b3IgYXMgdW5zY2FsZWQgY29u dGVudHMgc2l6ZSByZXN1bHRzCisgICAgICAgIGluIHJvdW5kaW5nIGVycm9ycy4gVGhpcyBjYW4g Y2F1c2Ugc2NhbGUgZmFjdG9yIHRvIG9zY2lsbGF0ZSBpbmRlZmluaXRlbHkuCisKKyAgICAgICAg KiBzcmMvV2ViVmlld0ltcGwuY3BwOgorICAgICAgICAoV2ViS2l0Ojp1bnNjYWxlZENvbnRlbnRz U2l6ZSk6CisgICAgICAgIChXZWJLaXQpOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6 Y29tcHV0ZVBhZ2VTY2FsZUZhY3RvckxpbWl0cyk6CisgICAgICAgICogdGVzdHMvV2ViRnJhbWVU ZXN0LmNwcDoKKyAgICAgICAgKiB0ZXN0cy9kYXRhL3NjYWxlX29zY2lsbGF0ZS5odG1sOiBBZGRl ZC4KKwogMjAxMi0xMS0wNSAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgogCiAgICAg ICAgIFtWOF0gSW50cnVzaXZlRE9NV3JhcHBlck1hcCBzaG91bGQgYmUgdXNhYmxlIGZvciBtb3Jl IHRoYW4ganVzdCBOb2RlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMv V2ViVmlld0ltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwu Y3BwCmluZGV4IDNmODNlNGNiY2M5ZGI0ZDAyM2MxMjUzNmI5N2M0N2I2Yjg0Y2IyYWQuLjI4MDI5 NWRjYTFhYjE2OGU3ZDBjZGU3OGVhZGE3ZDI4ZWEwMTZmYmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKQEAgLTI5ODYsNiArMjk4NiwxNCBAQCB2b2lkIFdl YlZpZXdJbXBsOjpzZXRJZ25vcmVWaWV3cG9ydFRhZ01heGltdW1TY2FsZShib29sIGZsYWcpCiAg ICAgbV9wYWdlLT5jaHJvbWUoKS0+Y2xpZW50KCktPmRpc3BhdGNoVmlld3BvcnRQcm9wZXJ0aWVz RGlkQ2hhbmdlKHBhZ2UoKS0+bWFpbkZyYW1lKCktPmRvY3VtZW50KCktPnZpZXdwb3J0QXJndW1l bnRzKCkpOwogfQogCitzdGF0aWMgSW50U2l6ZSB1bnNjYWxlZENvbnRlbnRzU2l6ZShGcmFtZSog ZnJhbWUpCit7CisgICAgUmVuZGVyVmlldyogcm9vdCA9IGZyYW1lLT5jb250ZW50UmVuZGVyZXIo KTsKKyAgICBpZiAoIXJvb3QpCisgICAgICAgIHJldHVybiBJbnRTaXplKCk7CisgICAgcmV0dXJu IHJvb3QtPnVuc2NhbGVkRG9jdW1lbnRSZWN0KCkuc2l6ZSgpOworfQorCiBib29sIFdlYlZpZXdJ bXBsOjpjb21wdXRlUGFnZVNjYWxlRmFjdG9yTGltaXRzKCkKIHsKICAgICBpZiAobV9wYWdlRGVm aW5lZE1pbmltdW1QYWdlU2NhbGVGYWN0b3IgPT0gLTEgfHwgbV9wYWdlRGVmaW5lZE1heGltdW1Q YWdlU2NhbGVGYWN0b3IgPT0gLTEpCkBAIC0yOTk4LDExICszMDA2LDEwIEBAIGJvb2wgV2ViVmll d0ltcGw6OmNvbXB1dGVQYWdlU2NhbGVGYWN0b3JMaW1pdHMoKQogICAgIG1fbWF4aW11bVBhZ2VT Y2FsZUZhY3RvciA9IG1heChtaW4obV9wYWdlRGVmaW5lZE1heGltdW1QYWdlU2NhbGVGYWN0b3Is IG1heFBhZ2VTY2FsZUZhY3RvciksIG1pblBhZ2VTY2FsZUZhY3RvcikgKiAoZGV2aWNlU2NhbGVG YWN0b3IoKSAvIG1fZGV2aWNlU2NhbGVJbkNvbXBvc2l0b3IpOwogCiAgICAgaW50IHZpZXdXaWR0 aE5vdEluY2x1ZGluZ1Njcm9sbGJhcnMgPSBwYWdlKCktPm1haW5GcmFtZSgpLT52aWV3KCktPnZp c2libGVDb250ZW50UmVjdChmYWxzZSkud2lkdGgoKTsKLSAgICBpbnQgY29udGVudHNXaWR0aCA9 IG1haW5GcmFtZSgpLT5jb250ZW50c1NpemUoKS53aWR0aDsKLSAgICBpZiAodmlld1dpZHRoTm90 SW5jbHVkaW5nU2Nyb2xsYmFycyAmJiBjb250ZW50c1dpZHRoKSB7CisgICAgaW50IHVuc2NhbGVk Q29udGVudHNXaWR0aCA9IHVuc2NhbGVkQ29udGVudHNTaXplKHBhZ2UoKS0+bWFpbkZyYW1lKCkp LndpZHRoKCk7CisgICAgaWYgKHZpZXdXaWR0aE5vdEluY2x1ZGluZ1Njcm9sbGJhcnMgJiYgdW5z Y2FsZWRDb250ZW50c1dpZHRoKSB7CiAgICAgICAgIC8vIExpbWl0IHBhZ2Ugc2NhbGluZyBkb3du IHRvIHRoZSBkb2N1bWVudCB3aWR0aC4KLSAgICAgICAgaW50IHVuc2NhbGVkQ29udGVudFdpZHRo ID0gY29udGVudHNXaWR0aCAvIHBhZ2VTY2FsZUZhY3RvcigpOwotICAgICAgICBtX21pbmltdW1Q YWdlU2NhbGVGYWN0b3IgPSBtYXgobV9taW5pbXVtUGFnZVNjYWxlRmFjdG9yLCBzdGF0aWNfY2Fz dDxmbG9hdD4odmlld1dpZHRoTm90SW5jbHVkaW5nU2Nyb2xsYmFycykgLyB1bnNjYWxlZENvbnRl bnRXaWR0aCk7CisgICAgICAgIG1fbWluaW11bVBhZ2VTY2FsZUZhY3RvciA9IG1heChtX21pbmlt dW1QYWdlU2NhbGVGYWN0b3IsIHN0YXRpY19jYXN0PGZsb2F0Pih2aWV3V2lkdGhOb3RJbmNsdWRp bmdTY3JvbGxiYXJzKSAvIHVuc2NhbGVkQ29udGVudHNXaWR0aCk7CiAgICAgICAgIG1fbWF4aW11 bVBhZ2VTY2FsZUZhY3RvciA9IG1heChtX21pbmltdW1QYWdlU2NhbGVGYWN0b3IsIG1fbWF4aW11 bVBhZ2VTY2FsZUZhY3Rvcik7CiAgICAgfQogICAgIEFTU0VSVChtX21pbmltdW1QYWdlU2NhbGVG YWN0b3IgPD0gbV9tYXhpbXVtUGFnZVNjYWxlRmFjdG9yKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vdGVzdHMvV2ViRnJhbWVUZXN0LmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vdGVzdHMvV2ViRnJhbWVUZXN0LmNwcAppbmRleCBmZmVkM2MyMDM4MTQ0ZTExMjc3Mzg4 Y2MyNTVjMjI1MGNlNGQ5ZDUxLi5hZjI0NTY4ZDUxNWY5MDM4NDVkY2ExY2M1YTAwZDY4N2Q0OWI0 Nzc2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL1dlYkZyYW1lVGVz dC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9XZWJGcmFtZVRlc3QuY3Bw CkBAIC0yOTEsNiArMjkxLDI0IEBAIFRFU1RfRihXZWJGcmFtZVRlc3QsIEZpeGVkTGF5b3V0SW5p dGlhbGl6ZUF0TWluaW11bVBhZ2VTY2FsZSkKICAgICB3ZWJWaWV3SW1wbC0+cmVzaXplKFdlYlNp emUodmlld3BvcnRXaWR0aCwgdmlld3BvcnRIZWlnaHQgKyAxMDApKTsKICAgICBFWFBFQ1RfRVEo dXNlclBpbmNoUGFnZVNjYWxlRmFjdG9yLCB3ZWJWaWV3SW1wbC0+cGFnZVNjYWxlRmFjdG9yKCkp OwogfQorCitURVNUX0YoV2ViRnJhbWVUZXN0LCBTY2FsZUZhY3RvclNob3VsZE5vdE9zY2lsbGF0 ZSkKK3sKKyAgICByZWdpc3Rlck1vY2tlZEh0dHBVUkxMb2FkKCJzY2FsZV9vc2NpbGxhdGUuaHRt bCIpOworCisgICAgRml4ZWRMYXlvdXRUZXN0V2ViVmlld0NsaWVudCBjbGllbnQ7CisgICAgY2xp ZW50Lm1fc2NyZWVuSW5mby5ob3Jpem9udGFsRFBJID0gMjEyOworICAgIGludCB2aWV3cG9ydFdp ZHRoID0gODAwOworICAgIGludCB2aWV3cG9ydEhlaWdodCA9IDEwNTc7CisgICAgY2xpZW50Lm1f d2luZG93UmVjdCA9IFdlYlJlY3QoMCwgMCwgdmlld3BvcnRXaWR0aCwgdmlld3BvcnRIZWlnaHQp OworCisgICAgV2ViVmlld0ltcGwqIHdlYlZpZXdJbXBsID0gc3RhdGljX2Nhc3Q8V2ViVmlld0lt cGwqPihGcmFtZVRlc3RIZWxwZXJzOjpjcmVhdGVXZWJWaWV3QW5kTG9hZChtX2Jhc2VVUkwgKyAi c2NhbGVfb3NjaWxsYXRlLmh0bWwiLCB0cnVlLCAwLCAmY2xpZW50KSk7CisgICAgd2ViVmlld0lt cGwtPmVuYWJsZUZpeGVkTGF5b3V0TW9kZSh0cnVlKTsKKyAgICB3ZWJWaWV3SW1wbC0+c2V0dGlu Z3MoKS0+c2V0Vmlld3BvcnRFbmFibGVkKHRydWUpOworICAgIHdlYlZpZXdJbXBsLT5yZXNpemUo V2ViU2l6ZSh2aWV3cG9ydFdpZHRoLCB2aWV3cG9ydEhlaWdodCkpOworICAgIHdlYlZpZXdJbXBs LT5sYXlvdXQoKTsKK30KKwogI2VuZGlmCiAKIFRFU1RfRihXZWJGcmFtZVRlc3QsIENhbk92ZXJy aWRlTWF4aW11bVNjYWxlRmFjdG9yKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1 bS90ZXN0cy9kYXRhL3NjYWxlX29zY2lsbGF0ZS5odG1sIGIvU291cmNlL1dlYktpdC9jaHJvbWl1 bS90ZXN0cy9kYXRhL3NjYWxlX29zY2lsbGF0ZS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0Cmlu ZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjI2Y2E0NjEzYzc3 ZWZjN2M5ZTc1NTg4ZTJiODNiNDk2ZDllNjAxZDkKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3Rlc3RzL2RhdGEvc2NhbGVfb3NjaWxsYXRlLmh0bWwKQEAgLTAsMCAr MSwxNiBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbCBzdHlsZT0id2lkdGg6MTAwJTtoZWlnaHQ6 MTAwJTsiPgorPGhlYWQ+Cis8dGl0bGU+VGVzdDwvdGl0bGU+Cis8c3R5bGU+Cis6Oi13ZWJraXQt c2Nyb2xsYmFyIHsKKyAgICB3aWR0aDogMXB4OworfQorPC9zdHlsZT4KKzxtZXRhIG5hbWU9InZp ZXdwb3J0IiBjb250ZW50PSJ3aWR0aD1kZXZpY2Utd2lkdGgsIGluaXRpYWwtc2NhbGU9MS4wLCBt YXhpbXVtLXNjYWxlPTEuMCwgdXNlci1zY2FsYWJsZT0wIi8+Cis8L2hlYWQ+Cis8Ym9keT4KK1Ro aXMgdGVzdCBwYXNzZXMgaWYgaXQgZG9lc24ndCBjYXVzZSBvc2NpbGxhdGluZyBzY2FsZSBmYWN0 b3IgZHVlIHRvIGNvbnRlbnQgc2l6ZSByb3VuZGluZyBlcnJvcnMgYW5kIGNyZWF0aW5nL2Rlc3Ry b3lpbmcgb2YgY3VzdG9tIHNjcm9sbGJhcnMuCitBbiBleGFtcGxlIG9mIHBhcmFtZXRlciB0aGF0 IHJlcHJvZHVjZSB0aGUgY3Jhc2ggaXMgdmlld3BvcnQgc2l6ZSAoODAwLCAxMDU3KSB3aXRoIGRl dmljZSBzY2FsZSBmYWN0b3IgMS4zMjUKKzwvYm9keT4KKzwvaHRtbD4K