97212 2012-09-20 07:44:59 -0700 [Qt] Don't render at scale 1.0 when doing a pinch unzoom 2012-09-25 06:33:08 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jturcotte jturcotte abecsi cmarcelo hausmann kenneth menard webkit.review.bot zoltan oldest_to_newest 724509 0 jturcotte 2012-09-20 07:44:59 -0700 [Qt] Don't render at scale 1.0 when doing a pinch unzoom 724512 1 kenneth 2012-09-20 07:45:35 -0700 What is an unzoom? 724516 2 164917 jturcotte 2012-09-20 07:49:11 -0700 Created attachment 164917 Patch 724519 3 164917 kenneth 2012-09-20 07:52:31 -0700 Comment on attachment 164917 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=164917&action=review > Source/WebKit2/ChangeLog:13 > + This creates a couple of issues: > + - Create extra rendering when the user starts pinching that is bound to the > + page size and can be considerably big, reducing performance and peaking tile > + memory usage. > + - Request a new visible rect for each pinch update which in turn update all fixed layers. > + So why update at all states? Wont that make pinch zoom slow? 724521 4 164917 abecsi 2012-09-20 08:00:36 -0700 Comment on attachment 164917 Patch LGTM. Although other approaches to fix the mentioned tiling artifacts might increase the needed complexity considerably, this needs to be explored further but I think it is not high priority for Qt5. 724552 5 jturcotte 2012-09-20 08:54:39 -0700 (In reply to comment #3) > (From update of attachment 164917 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=164917&action=review > > > Source/WebKit2/ChangeLog:13 > > + This creates a couple of issues: > > + - Create extra rendering when the user starts pinching that is bound to the > > + page size and can be considerably big, reducing performance and peaking tile > > + memory usage. > > + - Request a new visible rect for each pinch update which in turn update all fixed layers. > > + > > So why update at all states? Wont that make pinch zoom slow? Humm I'll remove that comment, it's misleading. The problem is that we request a new visible rect but always with a 1.0 scale. For some reason that would relayout fixed layers, that might be the intended behavior for some other port. This could be fixed easily but this patch rather reverts it for the first reason. 724573 6 164932 jturcotte 2012-09-20 09:34:39 -0700 Created attachment 164932 Patch Update the ChangeLog 725192 7 164932 kenneth 2012-09-20 23:30:39 -0700 Comment on attachment 164932 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=164932&action=review > Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp:110 > + // are rendered at the final destination while we perform the animation. during the animation? 727567 8 165596 jturcotte 2012-09-25 06:12:33 -0700 Created attachment 165596 Patch Patch to commit 727576 9 165596 webkit.review.bot 2012-09-25 06:33:04 -0700 Comment on attachment 165596 Patch Clearing flags on attachment: 165596 Committed r129497: <http://trac.webkit.org/changeset/129497> 727577 10 webkit.review.bot 2012-09-25 06:33:08 -0700 All reviewed patches have been landed. Closing bug. 164917 2012-09-20 07:49:11 -0700 2012-09-20 09:34:35 -0700 Patch bug-97212-20120920164835.patch text/plain 3430 jturcotte U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4OTg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNWM0YTQxMDhkNjg0ODY0 ZTQ2YjViNGQ4NjcyMmIxOTNjYTIxNzg2My4uNjc4NGU2MDAzMzM1MWMzNTcwZjkxYWNmNmQ2NzQx ZTE4N2U0MTgwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI0IEBACiAyMDEyLTA5LTIwICBKb2Nl bHluIFR1cmNvdHRlICA8am9jZWx5bi50dXJjb3R0ZUBkaWdpYS5jb20+CiAKKyAgICAgICAgW1F0 XSBEb24ndCByZW5kZXIgYXQgc2NhbGUgMS4wIHdoZW4gZG9pbmcgYSBwaW5jaCB1bnpvb20KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk3MjEyCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBjcmVhdGVz IGEgY291cGxlIG9mIGlzc3VlczoKKyAgICAgICAgLSBDcmVhdGUgZXh0cmEgcmVuZGVyaW5nIHdo ZW4gdGhlIHVzZXIgc3RhcnRzIHBpbmNoaW5nIHRoYXQgaXMgYm91bmQgdG8gdGhlCisgICAgICAg ICAgcGFnZSBzaXplIGFuZCBjYW4gYmUgY29uc2lkZXJhYmx5IGJpZywgcmVkdWNpbmcgcGVyZm9y bWFuY2UgYW5kIHBlYWtpbmcgdGlsZQorICAgICAgICAgIG1lbW9yeSB1c2FnZS4KKyAgICAgICAg LSBSZXF1ZXN0IGEgbmV3IHZpc2libGUgcmVjdCBmb3IgZWFjaCBwaW5jaCB1cGRhdGUgd2hpY2gg aW4gdHVybiB1cGRhdGUgYWxsIGZpeGVkIGxheWVycy4KKworICAgICAgICBGaXhpbmcgdGhpcyBt aWdodCByZXF1aXJlIGEgZGlmZmVyZW50IGFwcHJvYWNoIHRoYXQgd2UgY291bGQgZXhwZXJpbWVu dCB3aXRoLgorCisgICAgICAgICogVUlQcm9jZXNzL3F0L1BhZ2VWaWV3cG9ydENvbnRyb2xsZXJD bGllbnRRdC5jcHA6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGll bnRRdDo6YW5pbWF0ZUNvbnRlbnRSZWN0VmlzaWJsZSk6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VW aWV3cG9ydENvbnRyb2xsZXJDbGllbnRRdDo6cGluY2hHZXN0dXJlUmVxdWVzdFVwZGF0ZSk6CisK KzIwMTItMDktMjAgIEpvY2VseW4gVHVyY290dGUgIDxqb2NlbHluLnR1cmNvdHRlQGRpZ2lhLmNv bT4KKwogICAgICAgICBbUXRdIEFwcGx5IHRoZSBkZXZpY2VQaXhlbFJhdGlvIGFzIHNvb24gYXMg cG9zc2libGUKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTk3MjExCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9QYWdlVmll d3BvcnRDb250cm9sbGVyQ2xpZW50UXQuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0 L1BhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRRdC5jcHAKaW5kZXggYzUxNzAyM2UyMzFlMjRj NDZlNmFmNmQyYWQ4MmYwMzAzMmFlMGEwZi4uYzkzNTA4YjU1OGZlZWNiNzdjZDA0OWUxNjEyYmZm N2NhMWI1MjMzMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1BhZ2VW aWV3cG9ydENvbnRyb2xsZXJDbGllbnRRdC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL3F0L1BhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRRdC5jcHAKQEAgLTEwNiwxNiArMTA2 LDE1IEBAIHZvaWQgUGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudFF0OjphbmltYXRlQ29udGVu dFJlY3RWaXNpYmxlKGNvbnN0IFFSZWN0RiYgY29uCiAgICAgICAgIHJldHVybjsKICAgICB9CiAK KyAgICAvLyBJbmZvcm0gdGhlIHdlYiBwcm9jZXNzIGFib3V0IHRoZSByZXF1ZXN0ZWQgdmlzaWJs ZSBjb250ZW50IHJlY3QgaW1tZWRpYXRlbHkgc28gdGhhdCBuZXcgdGlsZXMKKyAgICAvLyBhcmUg cmVuZGVyZWQgYXQgdGhlIGZpbmFsIGRlc3RpbmF0aW9uIHdoaWxlIHdlIHBlcmZvcm0gdGhlIGFu aW1hdGlvbi4KKyAgICBtX2NvbnRyb2xsZXItPnNldFZpc2libGVDb250ZW50c1JlY3QoY29udGVu dFJlY3QsIHZpZXdwb3J0U2NhbGVGb3JSZWN0KGNvbnRlbnRSZWN0KSk7CisKICAgICAvLyBTaW5j ZSB3ZSBoYXZlIHRvIGFuaW1hdGUgc2NhbGUgYW5kIHBvc2l0aW9uIGF0IHRoZSBzYW1lIHRpbWUg dGhlIHNjYWxlIGFuaW1hdGlvbiBpbnRlcnBvbGF0ZXMKICAgICAvLyBmcm9tIHRoZSBjdXJyZW50 IHZpZXdwb3J0IHJlY3QgaW4gY29udGVudCBjb29yZGluYXRlcyB0byBhIHZpc2libGUgcmVjdCBv ZiB0aGUgY29udGVudC4KICAgICBtX3NjYWxlQW5pbWF0aW9uLT5zZXRTdGFydFZhbHVlKHZpZXdw b3J0UmVjdEluQ29udGVudENvb3Jkcyk7CiAgICAgbV9zY2FsZUFuaW1hdGlvbi0+c2V0RW5kVmFs dWUoY29udGVudFJlY3QpOwogCi0gICAgLy8gSW5mb3JtIHRoZSB3ZWIgcHJvY2VzcyBhYm91dCB0 aGUgcmVxdWVzdGVkIHZpc2libGUgY29udGVudCByZWN0Ci0gICAgLy8gaWYgem9vbWluZy1vdXQg c28gdGhhdCBubyB3aGl0ZSB0aWxlcyBhcmUgZXhwb3NlZCBkdXJpbmcgYW5pbWF0aW9uLgotICAg IGlmICh2aWV3cG9ydFJlY3RJbkNvbnRlbnRDb29yZHMud2lkdGgoKSAvIGNvbnRlbnRSZWN0Lndp ZHRoKCkgPCBtX3BhZ2VJdGVtLT5jb250ZW50c1NjYWxlKCkpCi0gICAgICAgIG1fY29udHJvbGxl ci0+c2V0VmlzaWJsZUNvbnRlbnRzUmVjdChjb250ZW50UmVjdCwgdmlld3BvcnRTY2FsZUZvclJl Y3QoY29udGVudFJlY3QpKTsKLQogICAgIG1fc2NhbGVBbmltYXRpb24tPnN0YXJ0KCk7CiB9CiAK QEAgLTQ2MSwxMSArNDYwLDYgQEAgdm9pZCBQYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50UXQ6 OnBpbmNoR2VzdHVyZVJlcXVlc3RVcGRhdGUoY29uc3QgUVBvaW50RiYgcGkKICAgICBtX2xhc3RQ aW5jaENlbnRlckluVmlld3BvcnRDb29yZGluYXRlcyA9IHBpbmNoQ2VudGVySW5WaWV3cG9ydENv b3JkaW5hdGVzOwogCiAgICAgbV92aWV3cG9ydEl0ZW0tPnNldENvbnRlbnRQb3MobV92aWV3cG9y dEl0ZW0tPmNvbnRlbnRQb3MoKSAtIHBvc2l0aW9uRGlmZik7Ci0KLSAgICAvLyBJbmZvcm0gdGhl IHdlYiBwcm9jZXNzIHRvIHJlbmRlciB0aGUgY3VycmVudGx5IHZpc2libGUgYXJlYSB3aXRoIGxv dy1yZXNvbHV0aW9uIHRpbGVzIG5vdAotICAgIC8vIHRvIGV4cG9zZSB3aGl0ZSB0aWxlcyBkdXJp bmcgcGluY2ggZ2VzdHVyZXMgYW5kIHRvIHNob3cgZml4ZWQgcG9zaXRpb24gbGF5ZXJzIGNvcnJl Y3RseS4KLSAgICAvLyBUaGUgYWN0dWFsIHNjYWxlIGlzIHJlc3RvcmVkIGFmdGVyIHRoZSBwaW5j aCBnZXN0dXJlIGVuZHMuCi0gICAgdXBkYXRlVmlld3BvcnRDb250cm9sbGVyKFFQb2ludEYoKSwg MSk7CiB9CiAKIHZvaWQgUGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudFF0OjpwaW5jaEdlc3R1 cmVFbmRlZCgpCg== 164932 2012-09-20 09:34:39 -0700 2012-09-25 06:12:29 -0700 Patch bug-97212-20120920183403.patch text/plain 3295 jturcotte U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4OTg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNWM0YTQxMDhkNjg0ODY0 ZTQ2YjViNGQ4NjcyMmIxOTNjYTIxNzg2My4uZGQwYjYwY2IwOWIzOGYzZDA4MzNhNzdmZGIzOGVi YTJjZWM0ZDBlZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIyIEBACiAyMDEyLTA5LTIwICBKb2Nl bHluIFR1cmNvdHRlICA8am9jZWx5bi50dXJjb3R0ZUBkaWdpYS5jb20+CiAKKyAgICAgICAgW1F0 XSBEb24ndCByZW5kZXIgYXQgc2NhbGUgMS4wIHdoZW4gZG9pbmcgYSBwaW5jaC16b29tIG91dAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTcyMTIKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIHRoZSB1 c2VyIHN0YXJ0cyBwaW5jaGluZyB0aGlzIGNyZWF0ZXMgZXh0cmEgcmVuZGVyaW5nIHRoYXQgaXMg Ym91bmQgdG8gdGhlCisgICAgICAgIHBhZ2Ugc2l6ZSBhbmQgY2FuIGJlIGNvbnNpZGVyYWJseSBi aWcsIHJlZHVjaW5nIHBlcmZvcm1hbmNlIGFuZCBwZWFraW5nIHRoZSB0aWxlCisgICAgICAgIG1l bW9yeSB1c2FnZS4KKworICAgICAgICBGaXhpbmcgdGhpcyBtaWdodCByZXF1aXJlIGEgZGlmZmVy ZW50IGFwcHJvYWNoIHRoYXQgd2UgY291bGQgZXhwZXJpbWVudCB3aXRoLgorCisgICAgICAgICog VUlQcm9jZXNzL3F0L1BhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRRdC5jcHA6CisgICAgICAg IChXZWJLaXQ6OlBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRRdDo6YW5pbWF0ZUNvbnRlbnRS ZWN0VmlzaWJsZSk6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGll bnRRdDo6cGluY2hHZXN0dXJlUmVxdWVzdFVwZGF0ZSk6CisKKzIwMTItMDktMjAgIEpvY2VseW4g VHVyY290dGUgIDxqb2NlbHluLnR1cmNvdHRlQGRpZ2lhLmNvbT4KKwogICAgICAgICBbUXRdIEFw cGx5IHRoZSBkZXZpY2VQaXhlbFJhdGlvIGFzIHNvb24gYXMgcG9zc2libGUKICAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk3MjExCiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9QYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50 UXQuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1BhZ2VWaWV3cG9ydENvbnRyb2xs ZXJDbGllbnRRdC5jcHAKaW5kZXggYzUxNzAyM2UyMzFlMjRjNDZlNmFmNmQyYWQ4MmYwMzAzMmFl MGEwZi4uYzkzNTA4YjU1OGZlZWNiNzdjZDA0OWUxNjEyYmZmN2NhMWI1MjMzMCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1BhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGll bnRRdC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1BhZ2VWaWV3cG9ydENv bnRyb2xsZXJDbGllbnRRdC5jcHAKQEAgLTEwNiwxNiArMTA2LDE1IEBAIHZvaWQgUGFnZVZpZXdw b3J0Q29udHJvbGxlckNsaWVudFF0OjphbmltYXRlQ29udGVudFJlY3RWaXNpYmxlKGNvbnN0IFFS ZWN0RiYgY29uCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKKyAgICAvLyBJbmZvcm0gdGhlIHdl YiBwcm9jZXNzIGFib3V0IHRoZSByZXF1ZXN0ZWQgdmlzaWJsZSBjb250ZW50IHJlY3QgaW1tZWRp YXRlbHkgc28gdGhhdCBuZXcgdGlsZXMKKyAgICAvLyBhcmUgcmVuZGVyZWQgYXQgdGhlIGZpbmFs IGRlc3RpbmF0aW9uIHdoaWxlIHdlIHBlcmZvcm0gdGhlIGFuaW1hdGlvbi4KKyAgICBtX2NvbnRy b2xsZXItPnNldFZpc2libGVDb250ZW50c1JlY3QoY29udGVudFJlY3QsIHZpZXdwb3J0U2NhbGVG b3JSZWN0KGNvbnRlbnRSZWN0KSk7CisKICAgICAvLyBTaW5jZSB3ZSBoYXZlIHRvIGFuaW1hdGUg c2NhbGUgYW5kIHBvc2l0aW9uIGF0IHRoZSBzYW1lIHRpbWUgdGhlIHNjYWxlIGFuaW1hdGlvbiBp bnRlcnBvbGF0ZXMKICAgICAvLyBmcm9tIHRoZSBjdXJyZW50IHZpZXdwb3J0IHJlY3QgaW4gY29u dGVudCBjb29yZGluYXRlcyB0byBhIHZpc2libGUgcmVjdCBvZiB0aGUgY29udGVudC4KICAgICBt X3NjYWxlQW5pbWF0aW9uLT5zZXRTdGFydFZhbHVlKHZpZXdwb3J0UmVjdEluQ29udGVudENvb3Jk cyk7CiAgICAgbV9zY2FsZUFuaW1hdGlvbi0+c2V0RW5kVmFsdWUoY29udGVudFJlY3QpOwogCi0g ICAgLy8gSW5mb3JtIHRoZSB3ZWIgcHJvY2VzcyBhYm91dCB0aGUgcmVxdWVzdGVkIHZpc2libGUg Y29udGVudCByZWN0Ci0gICAgLy8gaWYgem9vbWluZy1vdXQgc28gdGhhdCBubyB3aGl0ZSB0aWxl cyBhcmUgZXhwb3NlZCBkdXJpbmcgYW5pbWF0aW9uLgotICAgIGlmICh2aWV3cG9ydFJlY3RJbkNv bnRlbnRDb29yZHMud2lkdGgoKSAvIGNvbnRlbnRSZWN0LndpZHRoKCkgPCBtX3BhZ2VJdGVtLT5j b250ZW50c1NjYWxlKCkpCi0gICAgICAgIG1fY29udHJvbGxlci0+c2V0VmlzaWJsZUNvbnRlbnRz UmVjdChjb250ZW50UmVjdCwgdmlld3BvcnRTY2FsZUZvclJlY3QoY29udGVudFJlY3QpKTsKLQog ICAgIG1fc2NhbGVBbmltYXRpb24tPnN0YXJ0KCk7CiB9CiAKQEAgLTQ2MSwxMSArNDYwLDYgQEAg dm9pZCBQYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50UXQ6OnBpbmNoR2VzdHVyZVJlcXVlc3RV cGRhdGUoY29uc3QgUVBvaW50RiYgcGkKICAgICBtX2xhc3RQaW5jaENlbnRlckluVmlld3BvcnRD b29yZGluYXRlcyA9IHBpbmNoQ2VudGVySW5WaWV3cG9ydENvb3JkaW5hdGVzOwogCiAgICAgbV92 aWV3cG9ydEl0ZW0tPnNldENvbnRlbnRQb3MobV92aWV3cG9ydEl0ZW0tPmNvbnRlbnRQb3MoKSAt IHBvc2l0aW9uRGlmZik7Ci0KLSAgICAvLyBJbmZvcm0gdGhlIHdlYiBwcm9jZXNzIHRvIHJlbmRl ciB0aGUgY3VycmVudGx5IHZpc2libGUgYXJlYSB3aXRoIGxvdy1yZXNvbHV0aW9uIHRpbGVzIG5v dAotICAgIC8vIHRvIGV4cG9zZSB3aGl0ZSB0aWxlcyBkdXJpbmcgcGluY2ggZ2VzdHVyZXMgYW5k IHRvIHNob3cgZml4ZWQgcG9zaXRpb24gbGF5ZXJzIGNvcnJlY3RseS4KLSAgICAvLyBUaGUgYWN0 dWFsIHNjYWxlIGlzIHJlc3RvcmVkIGFmdGVyIHRoZSBwaW5jaCBnZXN0dXJlIGVuZHMuCi0gICAg dXBkYXRlVmlld3BvcnRDb250cm9sbGVyKFFQb2ludEYoKSwgMSk7CiB9CiAKIHZvaWQgUGFnZVZp ZXdwb3J0Q29udHJvbGxlckNsaWVudFF0OjpwaW5jaEdlc3R1cmVFbmRlZCgpCg== 165596 2012-09-25 06:12:33 -0700 2012-09-25 06:33:04 -0700 Patch bug-97212-20120925151153.patch text/plain 3297 jturcotte U3VidmVyc2lvbiBSZXZpc2lvbjogMTI5MzQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNWIwNjJjNzFmMTc4Nzdl YWJmODkyNjgwMDc5ZWQ2ZTgwNDQzYzI2Zi4uY2M4MzA5ZTg5N2JhMDI1OWUxOTVlZGFhMjVjNGFh M2Y5NjUxMzUzMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIyIEBACiAyMDEyLTA5LTIwICBKb2Nl bHluIFR1cmNvdHRlICA8am9jZWx5bi50dXJjb3R0ZUBkaWdpYS5jb20+CiAKKyAgICAgICAgW1F0 XSBEb24ndCByZW5kZXIgYXQgc2NhbGUgMS4wIHdoZW4gZG9pbmcgYSBwaW5jaC16b29tIG91dAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTcyMTIKKwor ICAgICAgICBSZXZpZXdlZCBieSBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbi4KKworICAgICAg ICBXaGVuIHRoZSB1c2VyIHN0YXJ0cyBwaW5jaGluZyB0aGlzIGNyZWF0ZXMgZXh0cmEgcmVuZGVy aW5nIHRoYXQgaXMgYm91bmQgdG8gdGhlCisgICAgICAgIHBhZ2Ugc2l6ZSBhbmQgY2FuIGJlIGNv bnNpZGVyYWJseSBiaWcsIHJlZHVjaW5nIHBlcmZvcm1hbmNlIGFuZCBwZWFraW5nIHRoZSB0aWxl CisgICAgICAgIG1lbW9yeSB1c2FnZS4KKworICAgICAgICBGaXhpbmcgdGhpcyBtaWdodCByZXF1 aXJlIGEgZGlmZmVyZW50IGFwcHJvYWNoIHRoYXQgd2UgY291bGQgZXhwZXJpbWVudCB3aXRoLgor CisgICAgICAgICogVUlQcm9jZXNzL3F0L1BhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRRdC5j cHA6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRRdDo6YW5p bWF0ZUNvbnRlbnRSZWN0VmlzaWJsZSk6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VWaWV3cG9ydENv bnRyb2xsZXJDbGllbnRRdDo6cGluY2hHZXN0dXJlUmVxdWVzdFVwZGF0ZSk6CisKKzIwMTItMDkt MjAgIEpvY2VseW4gVHVyY290dGUgIDxqb2NlbHluLnR1cmNvdHRlQGRpZ2lhLmNvbT4KKwogICAg ICAgICBbUXRdIEFwcGx5IHRoZSBkZXZpY2VQaXhlbFJhdGlvIGFzIHNvb24gYXMgcG9zc2libGUK ICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk3MjExCiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9QYWdlVmlld3BvcnRDb250 cm9sbGVyQ2xpZW50UXQuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1BhZ2VWaWV3 cG9ydENvbnRyb2xsZXJDbGllbnRRdC5jcHAKaW5kZXggYzUxNzAyM2UyMzFlMjRjNDZlNmFmNmQy YWQ4MmYwMzAzMmFlMGEwZi4uMTBmY2YwMjFjMzI4YzdmOTFmNGM0OGQxMjU5ZGY4N2ViMTZkMjg3 YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1BhZ2VWaWV3cG9ydENv bnRyb2xsZXJDbGllbnRRdC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1Bh Z2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRRdC5jcHAKQEAgLTEwNiwxNiArMTA2LDE1IEBAIHZv aWQgUGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudFF0OjphbmltYXRlQ29udGVudFJlY3RWaXNp YmxlKGNvbnN0IFFSZWN0RiYgY29uCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKKyAgICAvLyBJ bmZvcm0gdGhlIHdlYiBwcm9jZXNzIGFib3V0IHRoZSByZXF1ZXN0ZWQgdmlzaWJsZSBjb250ZW50 IHJlY3QgaW1tZWRpYXRlbHkgc28gdGhhdCBuZXcgdGlsZXMKKyAgICAvLyBhcmUgcmVuZGVyZWQg YXQgdGhlIGZpbmFsIGRlc3RpbmF0aW9uIGR1cmluZyB0aGUgYW5pbWF0aW9uLgorICAgIG1fY29u dHJvbGxlci0+c2V0VmlzaWJsZUNvbnRlbnRzUmVjdChjb250ZW50UmVjdCwgdmlld3BvcnRTY2Fs ZUZvclJlY3QoY29udGVudFJlY3QpKTsKKwogICAgIC8vIFNpbmNlIHdlIGhhdmUgdG8gYW5pbWF0 ZSBzY2FsZSBhbmQgcG9zaXRpb24gYXQgdGhlIHNhbWUgdGltZSB0aGUgc2NhbGUgYW5pbWF0aW9u IGludGVycG9sYXRlcwogICAgIC8vIGZyb20gdGhlIGN1cnJlbnQgdmlld3BvcnQgcmVjdCBpbiBj b250ZW50IGNvb3JkaW5hdGVzIHRvIGEgdmlzaWJsZSByZWN0IG9mIHRoZSBjb250ZW50LgogICAg IG1fc2NhbGVBbmltYXRpb24tPnNldFN0YXJ0VmFsdWUodmlld3BvcnRSZWN0SW5Db250ZW50Q29v cmRzKTsKICAgICBtX3NjYWxlQW5pbWF0aW9uLT5zZXRFbmRWYWx1ZShjb250ZW50UmVjdCk7CiAK LSAgICAvLyBJbmZvcm0gdGhlIHdlYiBwcm9jZXNzIGFib3V0IHRoZSByZXF1ZXN0ZWQgdmlzaWJs ZSBjb250ZW50IHJlY3QKLSAgICAvLyBpZiB6b29taW5nLW91dCBzbyB0aGF0IG5vIHdoaXRlIHRp bGVzIGFyZSBleHBvc2VkIGR1cmluZyBhbmltYXRpb24uCi0gICAgaWYgKHZpZXdwb3J0UmVjdElu Q29udGVudENvb3Jkcy53aWR0aCgpIC8gY29udGVudFJlY3Qud2lkdGgoKSA8IG1fcGFnZUl0ZW0t PmNvbnRlbnRzU2NhbGUoKSkKLSAgICAgICAgbV9jb250cm9sbGVyLT5zZXRWaXNpYmxlQ29udGVu dHNSZWN0KGNvbnRlbnRSZWN0LCB2aWV3cG9ydFNjYWxlRm9yUmVjdChjb250ZW50UmVjdCkpOwot CiAgICAgbV9zY2FsZUFuaW1hdGlvbi0+c3RhcnQoKTsKIH0KIApAQCAtNDYxLDExICs0NjAsNiBA QCB2b2lkIFBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRRdDo6cGluY2hHZXN0dXJlUmVxdWVz dFVwZGF0ZShjb25zdCBRUG9pbnRGJiBwaQogICAgIG1fbGFzdFBpbmNoQ2VudGVySW5WaWV3cG9y dENvb3JkaW5hdGVzID0gcGluY2hDZW50ZXJJblZpZXdwb3J0Q29vcmRpbmF0ZXM7CiAKICAgICBt X3ZpZXdwb3J0SXRlbS0+c2V0Q29udGVudFBvcyhtX3ZpZXdwb3J0SXRlbS0+Y29udGVudFBvcygp IC0gcG9zaXRpb25EaWZmKTsKLQotICAgIC8vIEluZm9ybSB0aGUgd2ViIHByb2Nlc3MgdG8gcmVu ZGVyIHRoZSBjdXJyZW50bHkgdmlzaWJsZSBhcmVhIHdpdGggbG93LXJlc29sdXRpb24gdGlsZXMg bm90Ci0gICAgLy8gdG8gZXhwb3NlIHdoaXRlIHRpbGVzIGR1cmluZyBwaW5jaCBnZXN0dXJlcyBh bmQgdG8gc2hvdyBmaXhlZCBwb3NpdGlvbiBsYXllcnMgY29ycmVjdGx5LgotICAgIC8vIFRoZSBh Y3R1YWwgc2NhbGUgaXMgcmVzdG9yZWQgYWZ0ZXIgdGhlIHBpbmNoIGdlc3R1cmUgZW5kcy4KLSAg ICB1cGRhdGVWaWV3cG9ydENvbnRyb2xsZXIoUVBvaW50RigpLCAxKTsKIH0KIAogdm9pZCBQYWdl Vmlld3BvcnRDb250cm9sbGVyQ2xpZW50UXQ6OnBpbmNoR2VzdHVyZUVuZGVkKCkK