193649 2019-01-21 01:45:04 -0800 Move delegatesScrolling() tests to lower level conversion function in ScrollView 2019-03-11 17:51:41 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=182785 InRadar P2 Normal --- 1 koivisto webkit-unassigned bfulgham cdumez commit-queue dbates esprehn+autocc ews-watchlist fred.wang kangil.han simon.fraser webkit-bug-importer zalan oldest_to_newest 1496548 0 koivisto 2019-01-21 01:45:04 -0800 They should be in viewToContents/contentsToView functions. 1496549 1 359678 koivisto 2019-01-21 01:52:51 -0800 Created attachment 359678 patch 1496551 2 359679 koivisto 2019-01-21 02:14:58 -0800 Created attachment 359679 patch 1496560 3 359679 fred.wang 2019-01-21 03:04:28 -0800 Comment on attachment 359679 patch View in context: https://bugs.webkit.org/attachment.cgi?id=359679&action=review This LGTMs, thanks! > Source/WebCore/platform/ScrollView.cpp:-864 > - This is reverting what was added in bug 186956. I guess your patch is the right way to fix it. > Source/WebCore/platform/ScrollView.cpp:-877 > - I'm curious if this will fix bug 184297 as the patch I uploaded there does similar thing. 1496562 4 359679 koivisto 2019-01-21 03:45:45 -0800 Comment on attachment 359679 patch View in context: https://bugs.webkit.org/attachment.cgi?id=359679&action=review >> Source/WebCore/platform/ScrollView.cpp:-864 >> - > > This is reverting what was added in bug 186956. I guess your patch is the right way to fix it. Yeah, the result should be the same. 1496565 5 359679 commit-queue 2019-01-21 04:27:58 -0800 Comment on attachment 359679 patch Clearing flags on attachment: 359679 Committed r240232: <https://trac.webkit.org/changeset/240232> 1496566 6 commit-queue 2019-01-21 04:28:00 -0800 All reviewed patches have been landed. Closing bug. 1496567 7 webkit-bug-importer 2019-01-21 04:28:29 -0800 <rdar://problem/47427108> 359678 2019-01-21 01:52:51 -0800 2019-01-21 02:14:58 -0800 patch scrolling-delegate-coordinates-3.patch text/plain 10177 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI0MDIzMCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMzIEBACisyMDE5LTAxLTIxICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBNb3ZlIGRlbGVnYXRlc1Njcm9s bGluZygpIHRlc3RzIHRvIGxvd2VyIGxldmVsIGNvbnZlcnNpb24gZnVuY3Rpb24gaW4gU2Nyb2xs VmlldworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkz NjQ5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhp cyByZWR1Y2VzIHBsYWNlcyB3aGVyZSB0aGVzZSB0ZXN0cyBhcmUgbmVlZGVkIGFuZCBhdm9pZCBt aXN0YWtlcy4KKworICAgICAgICAqIGRvbS9Eb2N1bWVudC5jcHA6CisgICAgICAgIChXZWJDb3Jl Ojpjb21wdXRlSW50ZXJzZWN0aW9uU3RhdGUpOgorICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6Y29udmVydEZyb21SZW5kZXJlclRvQ29u dGFpbmluZ1ZpZXcgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3Ojpjb252ZXJ0 RnJvbUNvbnRhaW5pbmdWaWV3VG9SZW5kZXJlciBjb25zdCk6CisgICAgICAgICogcGFnZS9pb3Mv RXZlbnRIYW5kbGVySU9TLm1tOgorICAgICAgICAoV2ViQ29yZTo6RXZlbnRIYW5kbGVyOjpzdGFy dFNlbGVjdGlvbkF1dG9zY3JvbGwpOgorICAgICAgICAoV2ViQ29yZTo6RXZlbnRIYW5kbGVyOjp0 YXJnZXRQb3NpdGlvbkluV2luZG93Rm9yU2VsZWN0aW9uQXV0b3Njcm9sbCBjb25zdCk6CisKKyAg ICAgICAgS2VlcCBtX3RhcmdldEF1dG9zY3JvbGxQb3NpdGlvbkluV2luZG93IGluIHdpbmRvdyBj b29yZGluYXRlcyBhcyBpbmRpY2F0ZWQgYnkgdGhlIG5hbWUuCisgICAgICAgIFRoZSB3cm9uZyBj b252ZXJzaW9ucyBjYW5jZWxlZCBlYWNoIG90aGVyIG91dC4KKworICAgICAgICAqIHBsYXRmb3Jt L1Njcm9sbFZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsVmlldzo6dmlld1RvQ29u dGVudHMgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsVmlldzo6Y29udGVudHNUb1Zp ZXcgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsVmlldzo6Y29udGVudHNUb0NvbnRh aW5pbmdWaWV3Q29udGVudHMgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsVmlldzo6 cm9vdFZpZXdUb0NvbnRlbnRzIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbFZpZXc6 OmNvbnRlbnRzVG9Sb290VmlldyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxWaWV3 Ojp3aW5kb3dUb0NvbnRlbnRzIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbFZpZXc6 OmNvbnRlbnRzVG9XaW5kb3cgY29uc3QpOgorCiAyMDE5LTAxLTIwICBNeWxlcyBDLiBNYXhmaWVs ZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CiAKICAgICAgICAgW1dITFNMXSBJbXBsZW1lbnQgTWV0 YWwgY29kZSBnZW5lcmF0aW9uCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAJKHJldmlzaW9u IDI0MDIyNykKKysrIFNvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTc5MTksNyArNzkxOSw3IEBAIHN0YXRpYyBPcHRpb25hbDxJbnRlcnNlY3Rpb25PYnNl cnZhdGlvblMKICAgICAgICAgaWYgKCZ0YXJnZXRSZW5kZXJlci0+ZnJhbWUoKSA9PSAmcm9vdFJl bmRlcmVyLT5mcmFtZSgpKQogICAgICAgICAgICAgaW50ZXJzZWN0aW9uU3RhdGUuYWJzb2x1dGVJ bnRlcnNlY3Rpb25SZWN0ID0gcm9vdEFic29sdXRlSW50ZXJzZWN0aW9uUmVjdDsKICAgICAgICAg ZWxzZSB7Ci0gICAgICAgICAgICBGbG9hdFJlY3Qgcm9vdFZpZXdJbnRlcnNlY3Rpb25SZWN0ID0g ZnJhbWVWaWV3LmRlbGVnYXRlc1Njcm9sbGluZygpID8gcm9vdEFic29sdXRlSW50ZXJzZWN0aW9u UmVjdCA6IGZyYW1lVmlldy5jb250ZW50c1RvVmlldyhyb290QWJzb2x1dGVJbnRlcnNlY3Rpb25S ZWN0KTsKKyAgICAgICAgICAgIEZsb2F0UmVjdCByb290Vmlld0ludGVyc2VjdGlvblJlY3QgPSBm cmFtZVZpZXcuY29udGVudHNUb1ZpZXcocm9vdEFic29sdXRlSW50ZXJzZWN0aW9uUmVjdCk7CiAg ICAgICAgICAgICBpbnRlcnNlY3Rpb25TdGF0ZS5hYnNvbHV0ZUludGVyc2VjdGlvblJlY3QgPSB0 YXJnZXRSZW5kZXJlci0+dmlldygpLmZyYW1lVmlldygpLnJvb3RWaWV3VG9Db250ZW50cyhyb290 Vmlld0ludGVyc2VjdGlvblJlY3QpOwogICAgICAgICB9CiAgICAgfQpJbmRleDogU291cmNlL1dl YkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3Bh Z2UvRnJhbWVWaWV3LmNwcAkocmV2aXNpb24gMjQwMjI3KQorKysgU291cmNlL1dlYkNvcmUvcGFn ZS9GcmFtZVZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00NjU0LDE5ICs0NjU0LDEyIEBAIElu dFJlY3QgRnJhbWVWaWV3Ojpjb252ZXJ0RnJvbVJlbmRlcmVyVG8KIHsKICAgICBJbnRSZWN0IHJl Y3QgPSBzbmFwcGVkSW50UmVjdChlbmNsb3NpbmdMYXlvdXRSZWN0KHJlbmRlcmVyLT5sb2NhbFRv QWJzb2x1dGVRdWFkKEZsb2F0UmVjdChyZW5kZXJlclJlY3QpKS5ib3VuZGluZ0JveCgpKSk7CiAK LSAgICBpZiAoIWRlbGVnYXRlc1Njcm9sbGluZygpKQotICAgICAgICByZWN0ID0gY29udGVudHNU b1ZpZXcocmVjdCk7Ci0KLSAgICByZXR1cm4gcmVjdDsKKyAgICByZXR1cm4gY29udGVudHNUb1Zp ZXcocmVjdCk7CiB9CiAKIEludFJlY3QgRnJhbWVWaWV3Ojpjb252ZXJ0RnJvbUNvbnRhaW5pbmdW aWV3VG9SZW5kZXJlcihjb25zdCBSZW5kZXJFbGVtZW50KiByZW5kZXJlciwgY29uc3QgSW50UmVj dCYgdmlld1JlY3QpIGNvbnN0CiB7Ci0gICAgSW50UmVjdCByZWN0ID0gdmlld1JlY3Q7Ci0gICAg Ci0gICAgLy8gQ29udmVydCBmcm9tIEZyYW1lVmlldyBjb29yZHMgaW50byBwYWdlICgiYWJzb2x1 dGUiKSBjb29yZGluYXRlcy4KLSAgICBpZiAoIWRlbGVnYXRlc1Njcm9sbGluZygpKQotICAgICAg ICByZWN0ID0gdmlld1RvQ29udGVudHMocmVjdCk7CisgICAgSW50UmVjdCByZWN0ID0gdmlld1Rv Q29udGVudHModmlld1JlY3QpOwogCiAgICAgLy8gRklYTUU6IHdlIGRvbid0IGhhdmUgYSB3YXkg dG8gbWFwIGFuIGFic29sdXRlIHJlY3QgZG93biB0byBhIGxvY2FsIHF1YWQsIHNvIGp1c3QKICAg ICAvLyBtb3ZlIHRoZSByZWN0IGZvciBub3cuCkBAIC00Njc2LDExICs0NjY5LDcgQEAgSW50UmVj dCBGcmFtZVZpZXc6OmNvbnZlcnRGcm9tQ29udGFpbmluZwogCiBGbG9hdFJlY3QgRnJhbWVWaWV3 Ojpjb252ZXJ0RnJvbUNvbnRhaW5pbmdWaWV3VG9SZW5kZXJlcihjb25zdCBSZW5kZXJFbGVtZW50 KiByZW5kZXJlciwgY29uc3QgRmxvYXRSZWN0JiB2aWV3UmVjdCkgY29uc3QKIHsKLSAgICBGbG9h dFJlY3QgcmVjdCA9IHZpZXdSZWN0OwotCi0gICAgLy8gQ29udmVydCBmcm9tIEZyYW1lVmlldyBj b29yZHMgaW50byBwYWdlICgiYWJzb2x1dGUiKSBjb29yZGluYXRlcy4KLSAgICBpZiAoIWRlbGVn YXRlc1Njcm9sbGluZygpKQotICAgICAgICByZWN0ID0gdmlld1RvQ29udGVudHMocmVjdCk7Cisg ICAgRmxvYXRSZWN0IHJlY3QgPSB2aWV3VG9Db250ZW50cyh2aWV3UmVjdCk7CiAKICAgICByZXR1 cm4gKHJlbmRlcmVyLT5hYnNvbHV0ZVRvTG9jYWxRdWFkKHJlY3QpKS5ib3VuZGluZ0JveCgpOwog fQpAQCAtNDY4OSwxMSArNDY3OCw3IEBAIEludFBvaW50IEZyYW1lVmlldzo6Y29udmVydEZyb21S ZW5kZXJlclQKIHsKICAgICBJbnRQb2ludCBwb2ludCA9IHJvdW5kZWRJbnRQb2ludChyZW5kZXJl ci0+bG9jYWxUb0Fic29sdXRlKHJlbmRlcmVyUG9pbnQsIFVzZVRyYW5zZm9ybXMpKTsKIAotICAg IC8vIENvbnZlcnQgZnJvbSBwYWdlICgiYWJzb2x1dGUiKSB0byBGcmFtZVZpZXcgY29vcmRpbmF0 ZXMuCi0gICAgaWYgKCFkZWxlZ2F0ZXNTY3JvbGxpbmcoKSkKLSAgICAgICAgcG9pbnQgPSBjb250 ZW50c1RvVmlldyhwb2ludCk7Ci0KLSAgICByZXR1cm4gcG9pbnQ7CisgICAgcmV0dXJuIGNvbnRl bnRzVG9WaWV3KHBvaW50KTsKIH0KIAogSW50UG9pbnQgRnJhbWVWaWV3Ojpjb252ZXJ0RnJvbUNv bnRhaW5pbmdWaWV3VG9SZW5kZXJlcihjb25zdCBSZW5kZXJFbGVtZW50KiByZW5kZXJlciwgY29u c3QgSW50UG9pbnQmIHZpZXdQb2ludCkgY29uc3QKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2Uv aW9zL0V2ZW50SGFuZGxlcklPUy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdl L2lvcy9FdmVudEhhbmRsZXJJT1MubW0JKHJldmlzaW9uIDI0MDIyNykKKysrIFNvdXJjZS9XZWJD b3JlL3BhZ2UvaW9zL0V2ZW50SGFuZGxlcklPUy5tbQkod29ya2luZyBjb3B5KQpAQCAtNTY4LDcg KzU2OCw3IEBAIHZvaWQgRXZlbnRIYW5kbGVyOjpzdGFydFNlbGVjdGlvbkF1dG9zY3IKIHsKICAg ICBSZWY8RnJhbWU+IHByb3RlY3RlZEZyYW1lKG1fZnJhbWUpOwogCi0gICAgbV90YXJnZXRBdXRv c2Nyb2xsUG9zaXRpb25JbldpbmRvdyA9IHByb3RlY3RlZEZyYW1lLT52aWV3KCktPmNvbnRlbnRz VG9WaWV3KHJvdW5kZWRJbnRQb2ludChwb3NpdGlvbkluV2luZG93KSk7CisgICAgbV90YXJnZXRB dXRvc2Nyb2xsUG9zaXRpb25JbldpbmRvdyA9IHJvdW5kZWRJbnRQb2ludChwb3NpdGlvbkluV2lu ZG93KTsKICAgICAKICAgICBtX2lzQXV0b3Njcm9sbGluZyA9IHRydWU7CiAgICAgbV9hdXRvc2Ny b2xsQ29udHJvbGxlci0+c3RhcnRBdXRvc2Nyb2xsRm9yU2VsZWN0aW9uKHJlbmRlcmVyKTsKQEAg LTYzMiw4ICs2MzIsNyBAQCBJbnRQb2ludCBFdmVudEhhbmRsZXI6OnRhcmdldFBvc2l0aW9uSW5X CiAgICAgCiAgICAgRmxvYXRSZWN0IHVub2JzY3VyZWRDb250ZW50UmVjdCA9IHByb3RlY3RlZEZy YW1lLT52aWV3KCktPnVub2JzY3VyZWRDb250ZW50UmVjdCgpOwogICAgIAotICAgIC8vIE1hbnVh bGx5IG5lZWQgdG8gY29udmVydCB2aWV3VG9Db250ZW50cywgYXMgaXQgd2lsbCBiZSBza2lwcGVk IGJlY2F1c2UgZGVsZWdhdGVkU2Nyb2xsaW5nIGlzIG9uIGlPUwotICAgIEludFBvaW50IGNvbnRl bnRQb3NpdGlvbiA9IHByb3RlY3RlZEZyYW1lLT52aWV3KCktPnZpZXdUb0NvbnRlbnRzKHByb3Rl Y3RlZEZyYW1lLT52aWV3KCktPmNvbnZlcnRGcm9tQ29udGFpbmluZ1dpbmRvdyhtX3RhcmdldEF1 dG9zY3JvbGxQb3NpdGlvbkluV2luZG93KSk7CisgICAgSW50UG9pbnQgY29udGVudFBvc2l0aW9u ID0gcHJvdGVjdGVkRnJhbWUtPnZpZXcoKS0+Y29udmVydEZyb21Db250YWluaW5nV2luZG93KG1f dGFyZ2V0QXV0b3Njcm9sbFBvc2l0aW9uSW5XaW5kb3cpOwogICAgIEludFNpemUgYWRqdXN0UG9z aXRpb24gPSBhdXRvc2Nyb2xsQWRqdXN0bWVudEZhY3RvckZvclNjcmVlbkJvdW5kYXJpZXMoY29u dGVudFBvc2l0aW9uLCB1bm9ic2N1cmVkQ29udGVudFJlY3QsIHByb3RlY3RlZEZyYW1lLT5wYWdl KCktPnBhZ2VTY2FsZUZhY3RvcigpKTsKICAgICByZXR1cm4gY29udGVudFBvc2l0aW9uICsgYWRq dXN0UG9zaXRpb247CiB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3 LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmNw cAkocmV2aXNpb24gMjQwMjI3KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmll dy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTgxNSwzNCArODE1LDUyIEBAIHZvaWQgU2Nyb2xsVmll dzo6c2Nyb2xsQ29udGVudHNTbG93UGF0aCgKIAogSW50UG9pbnQgU2Nyb2xsVmlldzo6dmlld1Rv Q29udGVudHMoY29uc3QgSW50UG9pbnQmIHBvaW50KSBjb25zdAogeworICAgIGlmIChkZWxlZ2F0 ZXNTY3JvbGxpbmcoKSkKKyAgICAgICAgcmV0dXJuIHBvaW50OworCiAgICAgcmV0dXJuIHBvaW50 ICsgdG9JbnRTaXplKGRvY3VtZW50U2Nyb2xsUG9zaXRpb25SZWxhdGl2ZVRvVmlld09yaWdpbigp KTsKIH0KIAogSW50UG9pbnQgU2Nyb2xsVmlldzo6Y29udGVudHNUb1ZpZXcoY29uc3QgSW50UG9p bnQmIHBvaW50KSBjb25zdAogeworICAgIGlmIChkZWxlZ2F0ZXNTY3JvbGxpbmcoKSkKKyAgICAg ICAgcmV0dXJuIHBvaW50OworCiAgICAgcmV0dXJuIHBvaW50IC0gdG9JbnRTaXplKGRvY3VtZW50 U2Nyb2xsUG9zaXRpb25SZWxhdGl2ZVRvVmlld09yaWdpbigpKTsKIH0KIAogSW50UmVjdCBTY3Jv bGxWaWV3Ojp2aWV3VG9Db250ZW50cyhJbnRSZWN0IHJlY3QpIGNvbnN0CiB7CisgICAgaWYgKGRl bGVnYXRlc1Njcm9sbGluZygpKQorICAgICAgICByZXR1cm4gcmVjdDsKKwogICAgIHJlY3QubW92 ZUJ5KGRvY3VtZW50U2Nyb2xsUG9zaXRpb25SZWxhdGl2ZVRvVmlld09yaWdpbigpKTsKICAgICBy ZXR1cm4gcmVjdDsKIH0KIAogRmxvYXRSZWN0IFNjcm9sbFZpZXc6OnZpZXdUb0NvbnRlbnRzKEZs b2F0UmVjdCByZWN0KSBjb25zdAogeworICAgIGlmIChkZWxlZ2F0ZXNTY3JvbGxpbmcoKSkKKyAg ICAgICAgcmV0dXJuIHJlY3Q7CisKICAgICByZWN0Lm1vdmVCeShkb2N1bWVudFNjcm9sbFBvc2l0 aW9uUmVsYXRpdmVUb1ZpZXdPcmlnaW4oKSk7CiAgICAgcmV0dXJuIHJlY3Q7CiB9CiAKIEludFJl Y3QgU2Nyb2xsVmlldzo6Y29udGVudHNUb1ZpZXcoSW50UmVjdCByZWN0KSBjb25zdAogeworICAg IGlmIChkZWxlZ2F0ZXNTY3JvbGxpbmcoKSkKKyAgICAgICAgcmV0dXJuIHJlY3Q7CisKICAgICBy ZWN0Lm1vdmVCeSgtZG9jdW1lbnRTY3JvbGxQb3NpdGlvblJlbGF0aXZlVG9WaWV3T3JpZ2luKCkp OwogICAgIHJldHVybiByZWN0OwogfQogCiBGbG9hdFJlY3QgU2Nyb2xsVmlldzo6Y29udGVudHNU b1ZpZXcoRmxvYXRSZWN0IHJlY3QpIGNvbnN0CiB7CisgICAgaWYgKGRlbGVnYXRlc1Njcm9sbGlu ZygpKQorICAgICAgICByZXR1cm4gcmVjdDsKKwogICAgIHJlY3QubW92ZUJ5KC1kb2N1bWVudFNj cm9sbFBvc2l0aW9uUmVsYXRpdmVUb1ZpZXdPcmlnaW4oKSk7CiAgICAgcmV0dXJuIHJlY3Q7CiB9 CkBAIC04NTksOSArODc3LDYgQEAgSW50UG9pbnQgU2Nyb2xsVmlldzo6Y29udGVudHNUb0NvbnRh aW5pbgogCiBJbnRSZWN0IFNjcm9sbFZpZXc6OmNvbnRlbnRzVG9Db250YWluaW5nVmlld0NvbnRl bnRzKEludFJlY3QgcmVjdCkgY29uc3QKIHsKLSAgICBpZiAoZGVsZWdhdGVzU2Nyb2xsaW5nKCkp Ci0gICAgICAgIHJldHVybiBjb252ZXJ0VG9Db250YWluaW5nVmlldyhjb250ZW50c1RvVmlldyhy ZWN0KSk7Ci0gICAgCiAgICAgaWYgKGNvbnN0IFNjcm9sbFZpZXcqIHBhcmVudFNjcm9sbFZpZXcg PSBwYXJlbnQoKSkgewogICAgICAgICBJbnRSZWN0IHJlY3RJbkNvbnRhaW5pbmdWaWV3ID0gY29u dmVydFRvQ29udGFpbmluZ1ZpZXcoY29udGVudHNUb1ZpZXcocmVjdCkpOwogICAgICAgICByZXR1 cm4gcGFyZW50U2Nyb2xsVmlldy0+dmlld1RvQ29udGVudHMocmVjdEluQ29udGFpbmluZ1ZpZXcp OwpAQCAtODcyLDMzICs4ODcsMjEgQEAgSW50UmVjdCBTY3JvbGxWaWV3Ojpjb250ZW50c1RvQ29u dGFpbmluZwogCiBJbnRQb2ludCBTY3JvbGxWaWV3Ojpyb290Vmlld1RvQ29udGVudHMoY29uc3Qg SW50UG9pbnQmIHJvb3RWaWV3UG9pbnQpIGNvbnN0CiB7Ci0gICAgaWYgKGRlbGVnYXRlc1Njcm9s bGluZygpKQotICAgICAgICByZXR1cm4gY29udmVydEZyb21Sb290Vmlldyhyb290Vmlld1BvaW50 KTsKLQogICAgIHJldHVybiB2aWV3VG9Db250ZW50cyhjb252ZXJ0RnJvbVJvb3RWaWV3KHJvb3RW aWV3UG9pbnQpKTsKIH0KIAogSW50UG9pbnQgU2Nyb2xsVmlldzo6Y29udGVudHNUb1Jvb3RWaWV3 KGNvbnN0IEludFBvaW50JiBjb250ZW50c1BvaW50KSBjb25zdAogewotICAgIGlmIChkZWxlZ2F0 ZXNTY3JvbGxpbmcoKSkKLSAgICAgICAgcmV0dXJuIGNvbnZlcnRUb1Jvb3RWaWV3KGNvbnRlbnRz UG9pbnQpOwotCiAgICAgcmV0dXJuIGNvbnZlcnRUb1Jvb3RWaWV3KGNvbnRlbnRzVG9WaWV3KGNv bnRlbnRzUG9pbnQpKTsKIH0KIAogSW50UmVjdCBTY3JvbGxWaWV3Ojpyb290Vmlld1RvQ29udGVu dHMoY29uc3QgSW50UmVjdCYgcm9vdFZpZXdSZWN0KSBjb25zdAogewotICAgIGlmIChkZWxlZ2F0 ZXNTY3JvbGxpbmcoKSkKLSAgICAgICAgcmV0dXJuIGNvbnZlcnRGcm9tUm9vdFZpZXcocm9vdFZp ZXdSZWN0KTsKLQogICAgIHJldHVybiB2aWV3VG9Db250ZW50cyhjb252ZXJ0RnJvbVJvb3RWaWV3 KHJvb3RWaWV3UmVjdCkpOwogfQogCiBGbG9hdFJlY3QgU2Nyb2xsVmlldzo6cm9vdFZpZXdUb0Nv bnRlbnRzKGNvbnN0IEZsb2F0UmVjdCYgcm9vdFZpZXdSZWN0KSBjb25zdAogewotICAgIGlmIChk ZWxlZ2F0ZXNTY3JvbGxpbmcoKSkKLSAgICAgICAgcmV0dXJuIGNvbnZlcnRGcm9tUm9vdFZpZXco cm9vdFZpZXdSZWN0KTsKLQogICAgIHJldHVybiB2aWV3VG9Db250ZW50cyhjb252ZXJ0RnJvbVJv b3RWaWV3KHJvb3RWaWV3UmVjdCkpOwogfQogCkBAIC05MTQsNDEgKzkxNywyNiBAQCBJbnRQb2lu dCBTY3JvbGxWaWV3Ojpyb290Vmlld1RvVG90YWxDb250CiAKIEludFJlY3QgU2Nyb2xsVmlldzo6 Y29udGVudHNUb1Jvb3RWaWV3KGNvbnN0IEludFJlY3QmIGNvbnRlbnRzUmVjdCkgY29uc3QKIHsK LSAgICBpZiAoZGVsZWdhdGVzU2Nyb2xsaW5nKCkpCi0gICAgICAgIHJldHVybiBjb252ZXJ0VG9S b290Vmlldyhjb250ZW50c1JlY3QpOwotCiAgICAgcmV0dXJuIGNvbnZlcnRUb1Jvb3RWaWV3KGNv bnRlbnRzVG9WaWV3KGNvbnRlbnRzUmVjdCkpOwogfQogCiBJbnRQb2ludCBTY3JvbGxWaWV3Ojp3 aW5kb3dUb0NvbnRlbnRzKGNvbnN0IEludFBvaW50JiB3aW5kb3dQb2ludCkgY29uc3QKIHsKLSAg ICBpZiAoZGVsZWdhdGVzU2Nyb2xsaW5nKCkpCi0gICAgICAgIHJldHVybiBjb252ZXJ0RnJvbUNv bnRhaW5pbmdXaW5kb3cod2luZG93UG9pbnQpOwotCiAgICAgcmV0dXJuIHZpZXdUb0NvbnRlbnRz KGNvbnZlcnRGcm9tQ29udGFpbmluZ1dpbmRvdyh3aW5kb3dQb2ludCkpOwogfQogCiBJbnRQb2lu dCBTY3JvbGxWaWV3Ojpjb250ZW50c1RvV2luZG93KGNvbnN0IEludFBvaW50JiBjb250ZW50c1Bv aW50KSBjb25zdAogewotICAgIGlmIChkZWxlZ2F0ZXNTY3JvbGxpbmcoKSkKLSAgICAgICAgcmV0 dXJuIGNvbnZlcnRUb0NvbnRhaW5pbmdXaW5kb3coY29udGVudHNQb2ludCk7Ci0KICAgICByZXR1 cm4gY29udmVydFRvQ29udGFpbmluZ1dpbmRvdyhjb250ZW50c1RvVmlldyhjb250ZW50c1BvaW50 KSk7CiB9CiAKIEludFJlY3QgU2Nyb2xsVmlldzo6d2luZG93VG9Db250ZW50cyhjb25zdCBJbnRS ZWN0JiB3aW5kb3dSZWN0KSBjb25zdAogewotICAgIGlmIChkZWxlZ2F0ZXNTY3JvbGxpbmcoKSkK LSAgICAgICAgcmV0dXJuIGNvbnZlcnRGcm9tQ29udGFpbmluZ1dpbmRvdyh3aW5kb3dSZWN0KTsK LQogICAgIHJldHVybiB2aWV3VG9Db250ZW50cyhjb252ZXJ0RnJvbUNvbnRhaW5pbmdXaW5kb3co d2luZG93UmVjdCkpOwogfQogCiBJbnRSZWN0IFNjcm9sbFZpZXc6OmNvbnRlbnRzVG9XaW5kb3co Y29uc3QgSW50UmVjdCYgY29udGVudHNSZWN0KSBjb25zdAogewotICAgIGlmIChkZWxlZ2F0ZXNT Y3JvbGxpbmcoKSkKLSAgICAgICAgcmV0dXJuIGNvbnZlcnRUb0NvbnRhaW5pbmdXaW5kb3coY29u dGVudHNSZWN0KTsKLQogICAgIHJldHVybiBjb252ZXJ0VG9Db250YWluaW5nV2luZG93KGNvbnRl bnRzVG9WaWV3KGNvbnRlbnRzUmVjdCkpOwogfQogCg== 359679 2019-01-21 02:14:58 -0800 2019-01-21 04:27:58 -0800 patch scrolling-delegate-coordinates-4.patch text/plain 8429 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI0MDIzMCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDE5LTAxLTIxICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBNb3ZlIGRlbGVnYXRlc1Njcm9s bGluZygpIHRlc3RzIHRvIGxvd2VyIGxldmVsIGNvbnZlcnNpb24gZnVuY3Rpb24gaW4gU2Nyb2xs VmlldworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkz NjQ5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhp cyByZWR1Y2VzIHBsYWNlcyB3aGVyZSB0aGVzZSB0ZXN0cyBhcmUgbmVlZGVkIGFuZCBoZWxwcyBh dm9pZCBtaXN0YWtlcy4KKworICAgICAgICAqIGRvbS9Eb2N1bWVudC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpjb21wdXRlSW50ZXJzZWN0aW9uU3RhdGUpOgorICAgICAgICAqIHBhZ2UvRnJhbWVW aWV3LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6Y29udmVydEZyb21SZW5kZXJl clRvQ29udGFpbmluZ1ZpZXcgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3Ojpj b252ZXJ0RnJvbUNvbnRhaW5pbmdWaWV3VG9SZW5kZXJlciBjb25zdCk6CisgICAgICAgICogcGxh dGZvcm0vU2Nyb2xsVmlldy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxWaWV3Ojp2aWV3 VG9Db250ZW50cyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxWaWV3Ojpjb250ZW50 c1RvVmlldyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxWaWV3Ojpjb250ZW50c1Rv Q29udGFpbmluZ1ZpZXdDb250ZW50cyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxW aWV3Ojpyb290Vmlld1RvQ29udGVudHMgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xs Vmlldzo6Y29udGVudHNUb1Jvb3RWaWV3IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9s bFZpZXc6OndpbmRvd1RvQ29udGVudHMgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xs Vmlldzo6Y29udGVudHNUb1dpbmRvdyBjb25zdCk6CisKIDIwMTktMDEtMjAgIE15bGVzIEMuIE1h eGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KIAogICAgICAgICBbV0hMU0xdIEltcGxlbWVu dCBNZXRhbCBjb2RlIGdlbmVyYXRpb24KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVu dC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAkocmV2 aXNpb24gMjQwMjI3KQorKysgU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtNzkxOSw3ICs3OTE5LDcgQEAgc3RhdGljIE9wdGlvbmFsPEludGVyc2VjdGlv bk9ic2VydmF0aW9uUwogICAgICAgICBpZiAoJnRhcmdldFJlbmRlcmVyLT5mcmFtZSgpID09ICZy b290UmVuZGVyZXItPmZyYW1lKCkpCiAgICAgICAgICAgICBpbnRlcnNlY3Rpb25TdGF0ZS5hYnNv bHV0ZUludGVyc2VjdGlvblJlY3QgPSByb290QWJzb2x1dGVJbnRlcnNlY3Rpb25SZWN0OwogICAg ICAgICBlbHNlIHsKLSAgICAgICAgICAgIEZsb2F0UmVjdCByb290Vmlld0ludGVyc2VjdGlvblJl Y3QgPSBmcmFtZVZpZXcuZGVsZWdhdGVzU2Nyb2xsaW5nKCkgPyByb290QWJzb2x1dGVJbnRlcnNl Y3Rpb25SZWN0IDogZnJhbWVWaWV3LmNvbnRlbnRzVG9WaWV3KHJvb3RBYnNvbHV0ZUludGVyc2Vj dGlvblJlY3QpOworICAgICAgICAgICAgRmxvYXRSZWN0IHJvb3RWaWV3SW50ZXJzZWN0aW9uUmVj dCA9IGZyYW1lVmlldy5jb250ZW50c1RvVmlldyhyb290QWJzb2x1dGVJbnRlcnNlY3Rpb25SZWN0 KTsKICAgICAgICAgICAgIGludGVyc2VjdGlvblN0YXRlLmFic29sdXRlSW50ZXJzZWN0aW9uUmVj dCA9IHRhcmdldFJlbmRlcmVyLT52aWV3KCkuZnJhbWVWaWV3KCkucm9vdFZpZXdUb0NvbnRlbnRz KHJvb3RWaWV3SW50ZXJzZWN0aW9uUmVjdCk7CiAgICAgICAgIH0KICAgICB9CkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvcGFnZS9GcmFtZVZpZXcuY3BwCShyZXZpc2lvbiAyNDAyMjcpCisrKyBTb3VyY2UvV2ViQ29y ZS9wYWdlL0ZyYW1lVmlldy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ2NTQsMTkgKzQ2NTQsMTIg QEAgSW50UmVjdCBGcmFtZVZpZXc6OmNvbnZlcnRGcm9tUmVuZGVyZXJUbwogewogICAgIEludFJl Y3QgcmVjdCA9IHNuYXBwZWRJbnRSZWN0KGVuY2xvc2luZ0xheW91dFJlY3QocmVuZGVyZXItPmxv Y2FsVG9BYnNvbHV0ZVF1YWQoRmxvYXRSZWN0KHJlbmRlcmVyUmVjdCkpLmJvdW5kaW5nQm94KCkp KTsKIAotICAgIGlmICghZGVsZWdhdGVzU2Nyb2xsaW5nKCkpCi0gICAgICAgIHJlY3QgPSBjb250 ZW50c1RvVmlldyhyZWN0KTsKLQotICAgIHJldHVybiByZWN0OworICAgIHJldHVybiBjb250ZW50 c1RvVmlldyhyZWN0KTsKIH0KIAogSW50UmVjdCBGcmFtZVZpZXc6OmNvbnZlcnRGcm9tQ29udGFp bmluZ1ZpZXdUb1JlbmRlcmVyKGNvbnN0IFJlbmRlckVsZW1lbnQqIHJlbmRlcmVyLCBjb25zdCBJ bnRSZWN0JiB2aWV3UmVjdCkgY29uc3QKIHsKLSAgICBJbnRSZWN0IHJlY3QgPSB2aWV3UmVjdDsK LSAgICAKLSAgICAvLyBDb252ZXJ0IGZyb20gRnJhbWVWaWV3IGNvb3JkcyBpbnRvIHBhZ2UgKCJh YnNvbHV0ZSIpIGNvb3JkaW5hdGVzLgotICAgIGlmICghZGVsZWdhdGVzU2Nyb2xsaW5nKCkpCi0g ICAgICAgIHJlY3QgPSB2aWV3VG9Db250ZW50cyhyZWN0KTsKKyAgICBJbnRSZWN0IHJlY3QgPSB2 aWV3VG9Db250ZW50cyh2aWV3UmVjdCk7CiAKICAgICAvLyBGSVhNRTogd2UgZG9uJ3QgaGF2ZSBh IHdheSB0byBtYXAgYW4gYWJzb2x1dGUgcmVjdCBkb3duIHRvIGEgbG9jYWwgcXVhZCwgc28ganVz dAogICAgIC8vIG1vdmUgdGhlIHJlY3QgZm9yIG5vdy4KQEAgLTQ2NzYsMTEgKzQ2NjksNyBAQCBJ bnRSZWN0IEZyYW1lVmlldzo6Y29udmVydEZyb21Db250YWluaW5nCiAKIEZsb2F0UmVjdCBGcmFt ZVZpZXc6OmNvbnZlcnRGcm9tQ29udGFpbmluZ1ZpZXdUb1JlbmRlcmVyKGNvbnN0IFJlbmRlckVs ZW1lbnQqIHJlbmRlcmVyLCBjb25zdCBGbG9hdFJlY3QmIHZpZXdSZWN0KSBjb25zdAogewotICAg IEZsb2F0UmVjdCByZWN0ID0gdmlld1JlY3Q7Ci0KLSAgICAvLyBDb252ZXJ0IGZyb20gRnJhbWVW aWV3IGNvb3JkcyBpbnRvIHBhZ2UgKCJhYnNvbHV0ZSIpIGNvb3JkaW5hdGVzLgotICAgIGlmICgh ZGVsZWdhdGVzU2Nyb2xsaW5nKCkpCi0gICAgICAgIHJlY3QgPSB2aWV3VG9Db250ZW50cyhyZWN0 KTsKKyAgICBGbG9hdFJlY3QgcmVjdCA9IHZpZXdUb0NvbnRlbnRzKHZpZXdSZWN0KTsKIAogICAg IHJldHVybiAocmVuZGVyZXItPmFic29sdXRlVG9Mb2NhbFF1YWQocmVjdCkpLmJvdW5kaW5nQm94 KCk7CiB9CkBAIC00Njg5LDExICs0Njc4LDcgQEAgSW50UG9pbnQgRnJhbWVWaWV3Ojpjb252ZXJ0 RnJvbVJlbmRlcmVyVAogewogICAgIEludFBvaW50IHBvaW50ID0gcm91bmRlZEludFBvaW50KHJl bmRlcmVyLT5sb2NhbFRvQWJzb2x1dGUocmVuZGVyZXJQb2ludCwgVXNlVHJhbnNmb3JtcykpOwog Ci0gICAgLy8gQ29udmVydCBmcm9tIHBhZ2UgKCJhYnNvbHV0ZSIpIHRvIEZyYW1lVmlldyBjb29y ZGluYXRlcy4KLSAgICBpZiAoIWRlbGVnYXRlc1Njcm9sbGluZygpKQotICAgICAgICBwb2ludCA9 IGNvbnRlbnRzVG9WaWV3KHBvaW50KTsKLQotICAgIHJldHVybiBwb2ludDsKKyAgICByZXR1cm4g Y29udGVudHNUb1ZpZXcocG9pbnQpOwogfQogCiBJbnRQb2ludCBGcmFtZVZpZXc6OmNvbnZlcnRG cm9tQ29udGFpbmluZ1ZpZXdUb1JlbmRlcmVyKGNvbnN0IFJlbmRlckVsZW1lbnQqIHJlbmRlcmVy LCBjb25zdCBJbnRQb2ludCYgdmlld1BvaW50KSBjb25zdApJbmRleDogU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vU2Nyb2xsVmlldy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vU2Nyb2xsVmlldy5jcHAJKHJldmlzaW9uIDI0MDIyNykKKysrIFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL1Njcm9sbFZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04MTUsMzQgKzgxNSw1 MiBAQCB2b2lkIFNjcm9sbFZpZXc6OnNjcm9sbENvbnRlbnRzU2xvd1BhdGgoCiAKIEludFBvaW50 IFNjcm9sbFZpZXc6OnZpZXdUb0NvbnRlbnRzKGNvbnN0IEludFBvaW50JiBwb2ludCkgY29uc3QK IHsKKyAgICBpZiAoZGVsZWdhdGVzU2Nyb2xsaW5nKCkpCisgICAgICAgIHJldHVybiBwb2ludDsK KwogICAgIHJldHVybiBwb2ludCArIHRvSW50U2l6ZShkb2N1bWVudFNjcm9sbFBvc2l0aW9uUmVs YXRpdmVUb1ZpZXdPcmlnaW4oKSk7CiB9CiAKIEludFBvaW50IFNjcm9sbFZpZXc6OmNvbnRlbnRz VG9WaWV3KGNvbnN0IEludFBvaW50JiBwb2ludCkgY29uc3QKIHsKKyAgICBpZiAoZGVsZWdhdGVz U2Nyb2xsaW5nKCkpCisgICAgICAgIHJldHVybiBwb2ludDsKKwogICAgIHJldHVybiBwb2ludCAt IHRvSW50U2l6ZShkb2N1bWVudFNjcm9sbFBvc2l0aW9uUmVsYXRpdmVUb1ZpZXdPcmlnaW4oKSk7 CiB9CiAKIEludFJlY3QgU2Nyb2xsVmlldzo6dmlld1RvQ29udGVudHMoSW50UmVjdCByZWN0KSBj b25zdAogeworICAgIGlmIChkZWxlZ2F0ZXNTY3JvbGxpbmcoKSkKKyAgICAgICAgcmV0dXJuIHJl Y3Q7CisKICAgICByZWN0Lm1vdmVCeShkb2N1bWVudFNjcm9sbFBvc2l0aW9uUmVsYXRpdmVUb1Zp ZXdPcmlnaW4oKSk7CiAgICAgcmV0dXJuIHJlY3Q7CiB9CiAKIEZsb2F0UmVjdCBTY3JvbGxWaWV3 Ojp2aWV3VG9Db250ZW50cyhGbG9hdFJlY3QgcmVjdCkgY29uc3QKIHsKKyAgICBpZiAoZGVsZWdh dGVzU2Nyb2xsaW5nKCkpCisgICAgICAgIHJldHVybiByZWN0OworCiAgICAgcmVjdC5tb3ZlQnko ZG9jdW1lbnRTY3JvbGxQb3NpdGlvblJlbGF0aXZlVG9WaWV3T3JpZ2luKCkpOwogICAgIHJldHVy biByZWN0OwogfQogCiBJbnRSZWN0IFNjcm9sbFZpZXc6OmNvbnRlbnRzVG9WaWV3KEludFJlY3Qg cmVjdCkgY29uc3QKIHsKKyAgICBpZiAoZGVsZWdhdGVzU2Nyb2xsaW5nKCkpCisgICAgICAgIHJl dHVybiByZWN0OworCiAgICAgcmVjdC5tb3ZlQnkoLWRvY3VtZW50U2Nyb2xsUG9zaXRpb25SZWxh dGl2ZVRvVmlld09yaWdpbigpKTsKICAgICByZXR1cm4gcmVjdDsKIH0KIAogRmxvYXRSZWN0IFNj cm9sbFZpZXc6OmNvbnRlbnRzVG9WaWV3KEZsb2F0UmVjdCByZWN0KSBjb25zdAogeworICAgIGlm IChkZWxlZ2F0ZXNTY3JvbGxpbmcoKSkKKyAgICAgICAgcmV0dXJuIHJlY3Q7CisKICAgICByZWN0 Lm1vdmVCeSgtZG9jdW1lbnRTY3JvbGxQb3NpdGlvblJlbGF0aXZlVG9WaWV3T3JpZ2luKCkpOwog ICAgIHJldHVybiByZWN0OwogfQpAQCAtODU5LDkgKzg3Nyw2IEBAIEludFBvaW50IFNjcm9sbFZp ZXc6OmNvbnRlbnRzVG9Db250YWluaW4KIAogSW50UmVjdCBTY3JvbGxWaWV3Ojpjb250ZW50c1Rv Q29udGFpbmluZ1ZpZXdDb250ZW50cyhJbnRSZWN0IHJlY3QpIGNvbnN0CiB7Ci0gICAgaWYgKGRl bGVnYXRlc1Njcm9sbGluZygpKQotICAgICAgICByZXR1cm4gY29udmVydFRvQ29udGFpbmluZ1Zp ZXcoY29udGVudHNUb1ZpZXcocmVjdCkpOwotICAgIAogICAgIGlmIChjb25zdCBTY3JvbGxWaWV3 KiBwYXJlbnRTY3JvbGxWaWV3ID0gcGFyZW50KCkpIHsKICAgICAgICAgSW50UmVjdCByZWN0SW5D b250YWluaW5nVmlldyA9IGNvbnZlcnRUb0NvbnRhaW5pbmdWaWV3KGNvbnRlbnRzVG9WaWV3KHJl Y3QpKTsKICAgICAgICAgcmV0dXJuIHBhcmVudFNjcm9sbFZpZXctPnZpZXdUb0NvbnRlbnRzKHJl Y3RJbkNvbnRhaW5pbmdWaWV3KTsKQEAgLTg3MiwzMyArODg3LDIxIEBAIEludFJlY3QgU2Nyb2xs Vmlldzo6Y29udGVudHNUb0NvbnRhaW5pbmcKIAogSW50UG9pbnQgU2Nyb2xsVmlldzo6cm9vdFZp ZXdUb0NvbnRlbnRzKGNvbnN0IEludFBvaW50JiByb290Vmlld1BvaW50KSBjb25zdAogewotICAg IGlmIChkZWxlZ2F0ZXNTY3JvbGxpbmcoKSkKLSAgICAgICAgcmV0dXJuIGNvbnZlcnRGcm9tUm9v dFZpZXcocm9vdFZpZXdQb2ludCk7Ci0KICAgICByZXR1cm4gdmlld1RvQ29udGVudHMoY29udmVy dEZyb21Sb290Vmlldyhyb290Vmlld1BvaW50KSk7CiB9CiAKIEludFBvaW50IFNjcm9sbFZpZXc6 OmNvbnRlbnRzVG9Sb290Vmlldyhjb25zdCBJbnRQb2ludCYgY29udGVudHNQb2ludCkgY29uc3QK IHsKLSAgICBpZiAoZGVsZWdhdGVzU2Nyb2xsaW5nKCkpCi0gICAgICAgIHJldHVybiBjb252ZXJ0 VG9Sb290Vmlldyhjb250ZW50c1BvaW50KTsKLQogICAgIHJldHVybiBjb252ZXJ0VG9Sb290Vmll dyhjb250ZW50c1RvVmlldyhjb250ZW50c1BvaW50KSk7CiB9CiAKIEludFJlY3QgU2Nyb2xsVmll dzo6cm9vdFZpZXdUb0NvbnRlbnRzKGNvbnN0IEludFJlY3QmIHJvb3RWaWV3UmVjdCkgY29uc3QK IHsKLSAgICBpZiAoZGVsZWdhdGVzU2Nyb2xsaW5nKCkpCi0gICAgICAgIHJldHVybiBjb252ZXJ0 RnJvbVJvb3RWaWV3KHJvb3RWaWV3UmVjdCk7Ci0KICAgICByZXR1cm4gdmlld1RvQ29udGVudHMo Y29udmVydEZyb21Sb290Vmlldyhyb290Vmlld1JlY3QpKTsKIH0KIAogRmxvYXRSZWN0IFNjcm9s bFZpZXc6OnJvb3RWaWV3VG9Db250ZW50cyhjb25zdCBGbG9hdFJlY3QmIHJvb3RWaWV3UmVjdCkg Y29uc3QKIHsKLSAgICBpZiAoZGVsZWdhdGVzU2Nyb2xsaW5nKCkpCi0gICAgICAgIHJldHVybiBj b252ZXJ0RnJvbVJvb3RWaWV3KHJvb3RWaWV3UmVjdCk7Ci0KICAgICByZXR1cm4gdmlld1RvQ29u dGVudHMoY29udmVydEZyb21Sb290Vmlldyhyb290Vmlld1JlY3QpKTsKIH0KIApAQCAtOTE0LDQx ICs5MTcsMjYgQEAgSW50UG9pbnQgU2Nyb2xsVmlldzo6cm9vdFZpZXdUb1RvdGFsQ29udAogCiBJ bnRSZWN0IFNjcm9sbFZpZXc6OmNvbnRlbnRzVG9Sb290Vmlldyhjb25zdCBJbnRSZWN0JiBjb250 ZW50c1JlY3QpIGNvbnN0CiB7Ci0gICAgaWYgKGRlbGVnYXRlc1Njcm9sbGluZygpKQotICAgICAg ICByZXR1cm4gY29udmVydFRvUm9vdFZpZXcoY29udGVudHNSZWN0KTsKLQogICAgIHJldHVybiBj b252ZXJ0VG9Sb290Vmlldyhjb250ZW50c1RvVmlldyhjb250ZW50c1JlY3QpKTsKIH0KIAogSW50 UG9pbnQgU2Nyb2xsVmlldzo6d2luZG93VG9Db250ZW50cyhjb25zdCBJbnRQb2ludCYgd2luZG93 UG9pbnQpIGNvbnN0CiB7Ci0gICAgaWYgKGRlbGVnYXRlc1Njcm9sbGluZygpKQotICAgICAgICBy ZXR1cm4gY29udmVydEZyb21Db250YWluaW5nV2luZG93KHdpbmRvd1BvaW50KTsKLQogICAgIHJl dHVybiB2aWV3VG9Db250ZW50cyhjb252ZXJ0RnJvbUNvbnRhaW5pbmdXaW5kb3cod2luZG93UG9p bnQpKTsKIH0KIAogSW50UG9pbnQgU2Nyb2xsVmlldzo6Y29udGVudHNUb1dpbmRvdyhjb25zdCBJ bnRQb2ludCYgY29udGVudHNQb2ludCkgY29uc3QKIHsKLSAgICBpZiAoZGVsZWdhdGVzU2Nyb2xs aW5nKCkpCi0gICAgICAgIHJldHVybiBjb252ZXJ0VG9Db250YWluaW5nV2luZG93KGNvbnRlbnRz UG9pbnQpOwotCiAgICAgcmV0dXJuIGNvbnZlcnRUb0NvbnRhaW5pbmdXaW5kb3coY29udGVudHNU b1ZpZXcoY29udGVudHNQb2ludCkpOwogfQogCiBJbnRSZWN0IFNjcm9sbFZpZXc6OndpbmRvd1Rv Q29udGVudHMoY29uc3QgSW50UmVjdCYgd2luZG93UmVjdCkgY29uc3QKIHsKLSAgICBpZiAoZGVs ZWdhdGVzU2Nyb2xsaW5nKCkpCi0gICAgICAgIHJldHVybiBjb252ZXJ0RnJvbUNvbnRhaW5pbmdX aW5kb3cod2luZG93UmVjdCk7Ci0KICAgICByZXR1cm4gdmlld1RvQ29udGVudHMoY29udmVydEZy b21Db250YWluaW5nV2luZG93KHdpbmRvd1JlY3QpKTsKIH0KIAogSW50UmVjdCBTY3JvbGxWaWV3 Ojpjb250ZW50c1RvV2luZG93KGNvbnN0IEludFJlY3QmIGNvbnRlbnRzUmVjdCkgY29uc3QKIHsK LSAgICBpZiAoZGVsZWdhdGVzU2Nyb2xsaW5nKCkpCi0gICAgICAgIHJldHVybiBjb252ZXJ0VG9D b250YWluaW5nV2luZG93KGNvbnRlbnRzUmVjdCk7Ci0KICAgICByZXR1cm4gY29udmVydFRvQ29u dGFpbmluZ1dpbmRvdyhjb250ZW50c1RvVmlldyhjb250ZW50c1JlY3QpKTsKIH0KIAo=