113066 2013-03-22 08:40:19 -0700 [Qt][WK2] WebView's interactive property is not fully respected 2013-04-08 04:12:33 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 110211 1 abecsi abecsi benjamin cmarcelo jturcotte menard webkit.review.bot oldest_to_newest 861504 0 abecsi 2013-03-22 08:40:19 -0700 [Qt][WK2] WebView's interactive property is not fully respected 861505 1 194557 abecsi 2013-03-22 08:40:55 -0700 Created attachment 194557 Patch 861509 2 abecsi 2013-03-22 08:44:43 -0700 Flickable also disables wheel scrolling if set to non-interactive, but disabling scrolling would mean that we would also ignore scroll requests coming from the web content which would not be a preferable behaviour. 861523 3 194557 jturcotte 2013-03-22 08:57:50 -0700 Comment on attachment 194557 Patch Do we disable pinching somehow already? 861684 4 194601 abecsi 2013-03-22 11:05:14 -0700 Created attachment 194601 Patch 861687 5 abecsi 2013-03-22 11:06:53 -0700 (In reply to comment #3) > (From update of attachment 194557 [details]) > Do we disable pinching somehow already? Indeed, that's also circumventing the Flickable, so we need to ignore requests. 862785 6 194601 jturcotte 2013-03-25 08:15:41 -0700 Comment on attachment 194601 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=194601&action=review > Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp:433 > + if (!m_controller->allowsUserScaling() || !m_viewportItem->isInteractive()) An edge case would be if the user code sets interactive = false as a response of a certain pinch, or just randomly while a pinch is ongoing. In that case we should avoid inconsistent states, which I think could happen if we just stop listening in every callback from the recognizer. Handling this in the gesture recognizer itself would allow us to force a pinchGestureCancelled(), but this wouldn't allow us to easily send pinch gestures to the web page in the future if interactive == false. So that might not be better. Any idea? 862824 7 abecsi 2013-03-25 09:14:07 -0700 (In reply to comment #6) > (From update of attachment 194601 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=194601&action=review > > > Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp:433 > > + if (!m_controller->allowsUserScaling() || !m_viewportItem->isInteractive()) > > An edge case would be if the user code sets interactive = false as a response of a certain pinch, or just randomly while a pinch is ongoing. > In that case we should avoid inconsistent states, which I think could happen if we just stop listening in every callback from the recognizer. This corner case does not seem possible since we do not expose any gesture state in QML, thus there is no direct way to switch interactivity upon a pinch gesture. Indirectly it is possible to change interactivity in response to page size changes, but this does not only happen during pinch zoom. > > Handling this in the gesture recognizer itself would allow us to force a pinchGestureCancelled(), but this wouldn't allow us to easily send pinch gestures to the web page in the future if interactive == false. So that might not be better. > Any idea? I don't think changes in interactivity should force panGestureCancelled() since the gesture would not actually be cancelled it would only be ignored. Although the condition in pinchGestureEnded() has to be improved so that no such case can result in an inconsistent state. 862895 8 194884 abecsi 2013-03-25 10:35:42 -0700 Created attachment 194884 Patch 863534 9 jturcotte 2013-03-26 03:57:24 -0700 LGTM Benjamin, could you have a look? 868581 10 abecsi 2013-04-03 03:19:54 -0700 Ping for review? 869950 11 194884 benjamin 2013-04-05 12:25:50 -0700 Comment on attachment 194884 Patch Good to go for WebKit2. 870704 12 abecsi 2013-04-08 04:11:55 -0700 Committed r147909: <http://trac.webkit.org/changeset/147909> 870705 13 194884 abecsi 2013-04-08 04:12:33 -0700 Comment on attachment 194884 Patch Clearing flags from attachment. 194557 2013-03-22 08:40:55 -0700 2013-03-22 11:05:09 -0700 Patch bug-113066-20130322163353.patch text/plain 2002 abecsi U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2NTg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYWFjYjIyMjI1YzhlZDA0 Y2ZjZWY2OTYxZTEyMzBkODUzNTQ2MDdkZC4uNzcyZjQ3NzNjN2YwMDg3YTkwMWU1MjdkZWE3YWM4 YTcwYzEzYWIwZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEzLTAzLTIyICBBbmRy YXMgQmVjc2kgIDxhbmRyYXMuYmVjc2lAZGlnaWEuY29tPgorCisgICAgICAgIFtRdF1bV0syXSBX ZWJWaWV3J3MgaW50ZXJhY3RpdmUgcHJvcGVydHkgaXMgbm90IGZ1bGx5IHJlc3BlY3RlZAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEzMDY2CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIFFNTCBXZWJW aWV3IGluaGVyaXRzIHRoZSAiaW50ZXJhY3RpdmUiIHByb3BlcnR5IGZyb20gRmxpY2thYmxlCisg ICAgICAgIHdoaWNoIGlzIHRydWUgYnkgZGVmYXVsdCwgYW5kIGRpc2FibGVzIHRoZSBpbnRlcmFj dGlvbiB3aXRoIHRoZQorICAgICAgICBGbGlja2FibGUgaWYgc2V0IHRvIGZhbHNlLgorICAgICAg ICBSZXN1bHRpbmcgZnJvbSB0aGUgZGVzaWduIG9mIHRoZSBXZWJWaWV3IHBhbm5pbmcgYW5kIGZs aWNraW5nIGlzCisgICAgICAgIGRpc2FibGVkIGJ5IEZsaWNrYWJsZSBidXQgdG8gYmUgY29uc2lz dGVudCB3ZSBhbHNvIG5lZWQgdG8gZGlzYWJsZQorICAgICAgICBkb3VibGUtdGFwIGdlc3R1cmVz IHNpbmNlIHRoZXkgd291bGQgdHJpZ2dlciBzY2FsZSBhbmQgcG9zaXRpb24KKyAgICAgICAgY2hh bmdlcy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VFdmVudEhhbmRsZXIuY3Bw OgorICAgICAgICAoV2ViS2l0OjpRdFdlYlBhZ2VFdmVudEhhbmRsZXI6OmhhbmRsZURvdWJsZVRh cEV2ZW50KToKKwogMjAxMy0wMy0yMSAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxl LmNvbT4KIAogICAgICAgICBbd2syXSBQYWdlIE92ZXJsYXlzOiBEb24ndCBjcmVhdGUgYmFja2lu ZyBzdG9yZSB1bnRpbCB0aGUgY2xpZW50IGFza3MgdXMgdG8gcGFpbnQKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VFdmVudEhhbmRsZXIuY3BwIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFnZUV2ZW50SGFuZGxlci5jcHAKaW5kZXgg ZDdmZDJhNDhhYzM0NWEzMTE1YzFkNGE0NTcyZWRjNzUzYzkwYzhiMy4uMWMwZGNlMTBlZmM3NTlh MTNlYjU2ZmI4NWY3YTEzZTc4NDc3MDdmMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL3F0L1F0V2ViUGFnZUV2ZW50SGFuZGxlci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL3F0L1F0V2ViUGFnZUV2ZW50SGFuZGxlci5jcHAKQEAgLTI3MSw2ICsyNzEsOSBA QCB2b2lkIFF0V2ViUGFnZUV2ZW50SGFuZGxlcjo6aGFuZGxlU2luZ2xlVGFwRXZlbnQoY29uc3Qg UVRvdWNoRXZlbnQ6OlRvdWNoUG9pbnQmCiAKIHZvaWQgUXRXZWJQYWdlRXZlbnRIYW5kbGVyOjpo YW5kbGVEb3VibGVUYXBFdmVudChjb25zdCBRVG91Y2hFdmVudDo6VG91Y2hQb2ludCYgcG9pbnQp CiB7CisgICAgaWYgKCFtX3dlYlZpZXctPmlzSW50ZXJhY3RpdmUoKSkKKyAgICAgICAgcmV0dXJu OworCiAgICAgZGVhY3RpdmF0ZVRhcEhpZ2hsaWdodCgpOwogICAgIFFUcmFuc2Zvcm0gZnJvbUl0 ZW1UcmFuc2Zvcm0gPSBtX3dlYlBhZ2UtPnRyYW5zZm9ybUZyb21JdGVtKCk7CiAgICAgbV93ZWJQ YWdlUHJveHktPmZpbmRab29tYWJsZUFyZWFGb3JQb2ludChmcm9tSXRlbVRyYW5zZm9ybS5tYXAo cG9pbnQucG9zKCkpLnRvUG9pbnQoKSwgSW50U2l6ZShwb2ludC5yZWN0KCkuc2l6ZSgpLnRvU2l6 ZSgpKSk7Cg== 194601 2013-03-22 11:05:14 -0700 2013-03-25 10:35:37 -0700 Patch bug-113066-20130322185758.patch text/plain 4248 abecsi U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2NjE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOTE5NGJlZmM0MTQ4YTcy MTBmNzcxMjM3YmRjYzQ0ZGRlYjkwZWM2NS4uMjhkMDFiYmJlMjNkZTc5ZTViMTllMjM5OTQ0NjQ3 MzJmNDBhNjQ5OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEzLTAzLTIyICBBbmRy YXMgQmVjc2kgIDxhbmRyYXMuYmVjc2lAZGlnaWEuY29tPgorCisgICAgICAgIFtRdF1bV0syXSBX ZWJWaWV3J3MgaW50ZXJhY3RpdmUgcHJvcGVydHkgaXMgbm90IGZ1bGx5IHJlc3BlY3RlZAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEzMDY2CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIFFNTCBXZWJW aWV3IGluaGVyaXRzIHRoZSAiaW50ZXJhY3RpdmUiIHByb3BlcnR5IGZyb20gRmxpY2thYmxlCisg ICAgICAgIHdoaWNoIGlzIHRydWUgYnkgZGVmYXVsdCwgYW5kIGRpc2FibGVzIHRoZSBpbnRlcmFj dGlvbiB3aXRoIHRoZQorICAgICAgICBGbGlja2FibGUgaWYgc2V0IHRvIGZhbHNlLgorICAgICAg ICBSZXN1bHRpbmcgZnJvbSB0aGUgZGVzaWduIG9mIHRoZSBXZWJWaWV3IHBhbm5pbmcgYW5kIGZs aWNraW5nIGlzCisgICAgICAgIGRpc2FibGVkIGJ5IEZsaWNrYWJsZSBidXQgdG8gYmUgY29uc2lz dGVudCB3ZSBhbHNvIG5lZWQgdG8gZGlzYWJsZQorICAgICAgICBkb3VibGUtdGFwIGdlc3R1cmVz IGFuZCBwaW5jaCBnZXN0dXJlcyBzaW5jZSB0aGV5IHdvdWxkIHRyaWdnZXIKKyAgICAgICAgc2Nh bGUgYW5kIHBvc2l0aW9uIGNoYW5nZXMuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvcXQvUGFnZVZp ZXdwb3J0Q29udHJvbGxlckNsaWVudFF0LmNwcDoKKyAgICAgICAgKFdlYktpdDo6UGFnZVZpZXdw b3J0Q29udHJvbGxlckNsaWVudFF0OjpwaW5jaEdlc3R1cmVTdGFydGVkKToKKyAgICAgICAgKFdl YktpdDo6UGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudFF0OjpwaW5jaEdlc3R1cmVSZXF1ZXN0 VXBkYXRlKToKKyAgICAgICAgKFdlYktpdDo6UGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudFF0 OjpwaW5jaEdlc3R1cmVFbmRlZCk6CisgICAgICAgICogVUlQcm9jZXNzL3F0L1F0V2ViUGFnZUV2 ZW50SGFuZGxlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OlF0V2ViUGFnZUV2ZW50SGFuZGxlcjo6 aGFuZGxlRG91YmxlVGFwRXZlbnQpOgorCiAyMDEzLTAzLTIyICBUaW1vdGh5IEhhdGNoZXIgIDx0 aW1vdGh5QGFwcGxlLmNvbT4KIAogICAgICAgICBGaXggYW4gYXNzZXJ0IHdoZW4gb3BlbmluZyB0 aGUgV2ViIEluc3BlY3RvciB3aW5kb3cgZm9yIHRoZSBmaXJzdCB0aW1lLgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1BhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRR dC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUGFnZVZpZXdwb3J0Q29udHJvbGxl ckNsaWVudFF0LmNwcAppbmRleCA1MjAwZDUyZWU0NmYwODJiMTY0Y2UyMGZhMGI3YTJmNTJkNzZh ZmVhLi43NWE5NjM2MjIxMTMyOTEzOWNmMDIwNDYyMmMxYTYwOWFlZDhkNDlmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVu dFF0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUGFnZVZpZXdwb3J0Q29u dHJvbGxlckNsaWVudFF0LmNwcApAQCAtNDMwLDcgKzQzMCw3IEBAIHZvaWQgUGFnZVZpZXdwb3J0 Q29udHJvbGxlckNsaWVudFF0OjpwaW5jaEdlc3R1cmVTdGFydGVkKGNvbnN0IFFQb2ludEYmIHBp bmNoQ2VuCiAgICAgLy8gVGhpcyBjYW4gb25seSBoYXBwZW4gYXMgYSByZXN1bHQgb2YgYSB1c2Vy IGludGVyYWN0aW9uLgogICAgIEFTU0VSVChtX3RvdWNoSW50ZXJhY3Rpb24uaW5Qcm9ncmVzcygp KTsKIAotICAgIGlmICghbV9jb250cm9sbGVyLT5hbGxvd3NVc2VyU2NhbGluZygpKQorICAgIGlm ICghbV9jb250cm9sbGVyLT5hbGxvd3NVc2VyU2NhbGluZygpIHx8ICFtX3ZpZXdwb3J0SXRlbS0+ aXNJbnRlcmFjdGl2ZSgpKQogICAgICAgICByZXR1cm47CiAKICAgICBjbGVhclJlbGF0aXZlWm9v bVN0YXRlKCk7CkBAIC00NDIsMTEgKzQ0MiwxMCBAQCB2b2lkIFBhZ2VWaWV3cG9ydENvbnRyb2xs ZXJDbGllbnRRdDo6cGluY2hHZXN0dXJlU3RhcnRlZChjb25zdCBRUG9pbnRGJiBwaW5jaENlbgog CiB2b2lkIFBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRRdDo6cGluY2hHZXN0dXJlUmVxdWVz dFVwZGF0ZShjb25zdCBRUG9pbnRGJiBwaW5jaENlbnRlckluVmlld3BvcnRDb29yZGluYXRlcywg cXJlYWwgdG90YWxTY2FsZUZhY3RvcikKIHsKLSAgICBBU1NFUlQobV9zY2FsZUNoYW5nZS5pblBy b2dyZXNzKCkpOwotCi0gICAgaWYgKCFtX2NvbnRyb2xsZXItPmFsbG93c1VzZXJTY2FsaW5nKCkp CisgICAgaWYgKCFtX2NvbnRyb2xsZXItPmFsbG93c1VzZXJTY2FsaW5nKCkgfHwgIW1fdmlld3Bv cnRJdGVtLT5pc0ludGVyYWN0aXZlKCkpCiAgICAgICAgIHJldHVybjsKIAorICAgIEFTU0VSVCht X3NjYWxlQ2hhbmdlLmluUHJvZ3Jlc3MoKSk7CiAgICAgQVNTRVJUKG1fcGluY2hTdGFydFNjYWxl ID4gMCk7CiAgICAgLy8gIENoYW5nZXMgb2YgdGhlIGNlbnRlciBwb3NpdGlvbiBzaG91bGQgbW92 ZSB0aGUgcGFnZSBldmVuIGlmIHRoZSB6b29tIGZhY3RvciBkb2VzIG5vdCBjaGFuZ2UuCiAgICAg Y29uc3QgcXJlYWwgcGluY2hTY2FsZSA9IG1fcGluY2hTdGFydFNjYWxlICogdG90YWxTY2FsZUZh Y3RvcjsKQEAgLTQ2NCwxMSArNDYzLDEwIEBAIHZvaWQgUGFnZVZpZXdwb3J0Q29udHJvbGxlckNs aWVudFF0OjpwaW5jaEdlc3R1cmVSZXF1ZXN0VXBkYXRlKGNvbnN0IFFQb2ludEYmIHBpCiAKIHZv aWQgUGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudFF0OjpwaW5jaEdlc3R1cmVFbmRlZCgpCiB7 Ci0gICAgQVNTRVJUKG1fc2NhbGVDaGFuZ2UuaW5Qcm9ncmVzcygpKTsKLQotICAgIGlmICghbV9j b250cm9sbGVyLT5hbGxvd3NVc2VyU2NhbGluZygpKQorICAgIGlmICghbV9jb250cm9sbGVyLT5h bGxvd3NVc2VyU2NhbGluZygpIHx8ICFtX3ZpZXdwb3J0SXRlbS0+aXNJbnRlcmFjdGl2ZSgpKQog ICAgICAgICByZXR1cm47CiAKKyAgICBBU1NFUlQobV9zY2FsZUNoYW5nZS5pblByb2dyZXNzKCkp OwogICAgIG1fcGluY2hTdGFydFNjYWxlID0gLTE7CiAKICAgICAvLyBUaGlzIHdpbGwgdGFrZSBj YXJlIG9mIHJlc3VtaW5nIHRoZSBjb250ZW50LCBldmVuIGlmIG5vIGFuaW1hdGlvbiB3YXMgcGVy Zm9ybWVkLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFn ZUV2ZW50SGFuZGxlci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdl RXZlbnRIYW5kbGVyLmNwcAppbmRleCBkN2ZkMmE0OGFjMzQ1YTMxMTVjMWQ0YTQ1NzJlZGM3NTNj OTBjOGIzLi4xYzBkY2UxMGVmYzc1OWExM2ViNTZmYjg1ZjdhMTNlNzg0NzcwN2YyIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlRXZlbnRIYW5kbGVyLmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlRXZlbnRIYW5kbGVy LmNwcApAQCAtMjcxLDYgKzI3MSw5IEBAIHZvaWQgUXRXZWJQYWdlRXZlbnRIYW5kbGVyOjpoYW5k bGVTaW5nbGVUYXBFdmVudChjb25zdCBRVG91Y2hFdmVudDo6VG91Y2hQb2ludCYKIAogdm9pZCBR dFdlYlBhZ2VFdmVudEhhbmRsZXI6OmhhbmRsZURvdWJsZVRhcEV2ZW50KGNvbnN0IFFUb3VjaEV2 ZW50OjpUb3VjaFBvaW50JiBwb2ludCkKIHsKKyAgICBpZiAoIW1fd2ViVmlldy0+aXNJbnRlcmFj dGl2ZSgpKQorICAgICAgICByZXR1cm47CisKICAgICBkZWFjdGl2YXRlVGFwSGlnaGxpZ2h0KCk7 CiAgICAgUVRyYW5zZm9ybSBmcm9tSXRlbVRyYW5zZm9ybSA9IG1fd2ViUGFnZS0+dHJhbnNmb3Jt RnJvbUl0ZW0oKTsKICAgICBtX3dlYlBhZ2VQcm94eS0+ZmluZFpvb21hYmxlQXJlYUZvclBvaW50 KGZyb21JdGVtVHJhbnNmb3JtLm1hcChwb2ludC5wb3MoKSkudG9Qb2ludCgpLCBJbnRTaXplKHBv aW50LnJlY3QoKS5zaXplKCkudG9TaXplKCkpKTsK 194884 2013-03-25 10:35:42 -0700 2013-04-08 04:12:33 -0700 Patch bug-113066-20130325182831.patch text/plain 4182 abecsi U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2NzU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZTQ2ZmU2MjllNGIxYjli OWVjZjhlNzVlZWZiYTlmZmE0NzI2MDQxYS4uMmE1Y2Q3MTU4MjVkZjhiMDNkMWE0MTk3NmJhN2U4 YjllNjk0MzY3MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEzLTAzLTI1ICBBbmRy YXMgQmVjc2kgIDxhbmRyYXMuYmVjc2lAZGlnaWEuY29tPgorCisgICAgICAgIFtRdF1bV0syXSBX ZWJWaWV3J3MgaW50ZXJhY3RpdmUgcHJvcGVydHkgaXMgbm90IGZ1bGx5IHJlc3BlY3RlZAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEzMDY2CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIFFNTCBXZWJW aWV3IGluaGVyaXRzIHRoZSAiaW50ZXJhY3RpdmUiIHByb3BlcnR5IGZyb20gRmxpY2thYmxlCisg ICAgICAgIHdoaWNoIGlzIHRydWUgYnkgZGVmYXVsdCwgYW5kIGRpc2FibGVzIHRoZSBpbnRlcmFj dGlvbiB3aXRoIHRoZQorICAgICAgICBGbGlja2FibGUgaWYgc2V0IHRvIGZhbHNlLgorICAgICAg ICBSZXN1bHRpbmcgZnJvbSB0aGUgZGVzaWduIG9mIHRoZSBXZWJWaWV3IHBhbm5pbmcgYW5kIGZs aWNraW5nIGlzCisgICAgICAgIGRpc2FibGVkIGJ5IEZsaWNrYWJsZSBidXQgdG8gYmUgY29uc2lz dGVudCB3ZSBhbHNvIG5lZWQgdG8gZGlzYWJsZQorICAgICAgICBkb3VibGUtdGFwIGdlc3R1cmVz IGFuZCBwaW5jaCBnZXN0dXJlcyBzaW5jZSB0aGV5IHdvdWxkIHRyaWdnZXIKKyAgICAgICAgc2Nh bGUgYW5kIHBvc2l0aW9uIGNoYW5nZXMuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvcXQvUGFnZVZp ZXdwb3J0Q29udHJvbGxlckNsaWVudFF0LmNwcDoKKyAgICAgICAgKFdlYktpdDo6UGFnZVZpZXdw b3J0Q29udHJvbGxlckNsaWVudFF0OjpwaW5jaEdlc3R1cmVTdGFydGVkKToKKyAgICAgICAgKFdl YktpdDo6UGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudFF0OjpwaW5jaEdlc3R1cmVSZXF1ZXN0 VXBkYXRlKToKKyAgICAgICAgKFdlYktpdDo6UGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudFF0 OjpwaW5jaEdlc3R1cmVFbmRlZCk6CisgICAgICAgICogVUlQcm9jZXNzL3F0L1F0V2ViUGFnZUV2 ZW50SGFuZGxlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OlF0V2ViUGFnZUV2ZW50SGFuZGxlcjo6 aGFuZGxlRG91YmxlVGFwRXZlbnQpOgorCiAyMDEzLTAzLTIzICBHZW9mZnJleSBHYXJlbiAgPGdn YXJlbkBhcHBsZS5jb20+CiAKICAgICAgICAgQWRkZWQgYSBzZXR0aW5nIGZvciB3aGV0aGVyIEph dmFTY3JpcHQgbWFya3VwIGlzIGVuYWJsZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9xdC9QYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50UXQuY3BwIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL3F0L1BhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRRdC5jcHAKaW5k ZXggNTIwMGQ1MmVlNDZmMDgyYjE2NGNlMjBmYTBiN2EyZjUyZDc2YWZlYS4uZjcyOTQ2NTI5N2Ey MmQyNTA0YTZjOWJlMjA0MzYzOTA3YWIxMDAxZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL3F0L1BhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRRdC5jcHAKKysrIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1BhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRRdC5j cHAKQEAgLTQzMCw3ICs0MzAsNyBAQCB2b2lkIFBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRR dDo6cGluY2hHZXN0dXJlU3RhcnRlZChjb25zdCBRUG9pbnRGJiBwaW5jaENlbgogICAgIC8vIFRo aXMgY2FuIG9ubHkgaGFwcGVuIGFzIGEgcmVzdWx0IG9mIGEgdXNlciBpbnRlcmFjdGlvbi4KICAg ICBBU1NFUlQobV90b3VjaEludGVyYWN0aW9uLmluUHJvZ3Jlc3MoKSk7CiAKLSAgICBpZiAoIW1f Y29udHJvbGxlci0+YWxsb3dzVXNlclNjYWxpbmcoKSkKKyAgICBpZiAoIW1fY29udHJvbGxlci0+ YWxsb3dzVXNlclNjYWxpbmcoKSB8fCAhbV92aWV3cG9ydEl0ZW0tPmlzSW50ZXJhY3RpdmUoKSkK ICAgICAgICAgcmV0dXJuOwogCiAgICAgY2xlYXJSZWxhdGl2ZVpvb21TdGF0ZSgpOwpAQCAtNDQy LDExICs0NDIsMTAgQEAgdm9pZCBQYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50UXQ6OnBpbmNo R2VzdHVyZVN0YXJ0ZWQoY29uc3QgUVBvaW50RiYgcGluY2hDZW4KIAogdm9pZCBQYWdlVmlld3Bv cnRDb250cm9sbGVyQ2xpZW50UXQ6OnBpbmNoR2VzdHVyZVJlcXVlc3RVcGRhdGUoY29uc3QgUVBv aW50RiYgcGluY2hDZW50ZXJJblZpZXdwb3J0Q29vcmRpbmF0ZXMsIHFyZWFsIHRvdGFsU2NhbGVG YWN0b3IpCiB7Ci0gICAgQVNTRVJUKG1fc2NhbGVDaGFuZ2UuaW5Qcm9ncmVzcygpKTsKLQotICAg IGlmICghbV9jb250cm9sbGVyLT5hbGxvd3NVc2VyU2NhbGluZygpKQorICAgIGlmICghbV9jb250 cm9sbGVyLT5hbGxvd3NVc2VyU2NhbGluZygpIHx8ICFtX3ZpZXdwb3J0SXRlbS0+aXNJbnRlcmFj dGl2ZSgpKQogICAgICAgICByZXR1cm47CiAKKyAgICBBU1NFUlQobV9zY2FsZUNoYW5nZS5pblBy b2dyZXNzKCkpOwogICAgIEFTU0VSVChtX3BpbmNoU3RhcnRTY2FsZSA+IDApOwogICAgIC8vICBD aGFuZ2VzIG9mIHRoZSBjZW50ZXIgcG9zaXRpb24gc2hvdWxkIG1vdmUgdGhlIHBhZ2UgZXZlbiBp ZiB0aGUgem9vbSBmYWN0b3IgZG9lcyBub3QgY2hhbmdlLgogICAgIGNvbnN0IHFyZWFsIHBpbmNo U2NhbGUgPSBtX3BpbmNoU3RhcnRTY2FsZSAqIHRvdGFsU2NhbGVGYWN0b3I7CkBAIC00NjQsMTEg KzQ2MywxMCBAQCB2b2lkIFBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRRdDo6cGluY2hHZXN0 dXJlUmVxdWVzdFVwZGF0ZShjb25zdCBRUG9pbnRGJiBwaQogCiB2b2lkIFBhZ2VWaWV3cG9ydENv bnRyb2xsZXJDbGllbnRRdDo6cGluY2hHZXN0dXJlRW5kZWQoKQogewotICAgIEFTU0VSVChtX3Nj YWxlQ2hhbmdlLmluUHJvZ3Jlc3MoKSk7Ci0KLSAgICBpZiAoIW1fY29udHJvbGxlci0+YWxsb3dz VXNlclNjYWxpbmcoKSkKKyAgICBpZiAobV9waW5jaFN0YXJ0U2NhbGUgPCAwKQogICAgICAgICBy ZXR1cm47CiAKKyAgICBBU1NFUlQobV9zY2FsZUNoYW5nZS5pblByb2dyZXNzKCkpOwogICAgIG1f cGluY2hTdGFydFNjYWxlID0gLTE7CiAKICAgICAvLyBUaGlzIHdpbGwgdGFrZSBjYXJlIG9mIHJl c3VtaW5nIHRoZSBjb250ZW50LCBldmVuIGlmIG5vIGFuaW1hdGlvbiB3YXMgcGVyZm9ybWVkLgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFnZUV2ZW50SGFu ZGxlci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlRXZlbnRIYW5k bGVyLmNwcAppbmRleCBkN2ZkMmE0OGFjMzQ1YTMxMTVjMWQ0YTQ1NzJlZGM3NTNjOTBjOGIzLi4x YzBkY2UxMGVmYzc1OWExM2ViNTZmYjg1ZjdhMTNlNzg0NzcwN2YyIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlRXZlbnRIYW5kbGVyLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlRXZlbnRIYW5kbGVyLmNwcApAQCAt MjcxLDYgKzI3MSw5IEBAIHZvaWQgUXRXZWJQYWdlRXZlbnRIYW5kbGVyOjpoYW5kbGVTaW5nbGVU YXBFdmVudChjb25zdCBRVG91Y2hFdmVudDo6VG91Y2hQb2ludCYKIAogdm9pZCBRdFdlYlBhZ2VF dmVudEhhbmRsZXI6OmhhbmRsZURvdWJsZVRhcEV2ZW50KGNvbnN0IFFUb3VjaEV2ZW50OjpUb3Vj aFBvaW50JiBwb2ludCkKIHsKKyAgICBpZiAoIW1fd2ViVmlldy0+aXNJbnRlcmFjdGl2ZSgpKQor ICAgICAgICByZXR1cm47CisKICAgICBkZWFjdGl2YXRlVGFwSGlnaGxpZ2h0KCk7CiAgICAgUVRy YW5zZm9ybSBmcm9tSXRlbVRyYW5zZm9ybSA9IG1fd2ViUGFnZS0+dHJhbnNmb3JtRnJvbUl0ZW0o KTsKICAgICBtX3dlYlBhZ2VQcm94eS0+ZmluZFpvb21hYmxlQXJlYUZvclBvaW50KGZyb21JdGVt VHJhbnNmb3JtLm1hcChwb2ludC5wb3MoKSkudG9Qb2ludCgpLCBJbnRTaXplKHBvaW50LnJlY3Qo KS5zaXplKCkudG9TaXplKCkpKTsK