110751 2013-02-25 05:27:43 -0800 [Qt][WK2] Remove unneeded method didResumeContent from PageViewportController clients 2013-02-28 09:55:34 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 abecsi abecsi cmarcelo gyuyoung.kim jturcotte menard michael.bruning rakuco webkit.review.bot zarvai oldest_to_newest 840900 0 abecsi 2013-02-25 05:27:43 -0800 [Qt][WK2] Remove unneeded method didResumeContent from PageViewportController clients 840901 1 190041 abecsi 2013-02-25 05:28:30 -0800 Created attachment 190041 Patch 840915 2 190041 jturcotte 2013-02-25 05:54:09 -0800 Comment on attachment 190041 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=190041&action=review > Source/WebKit2/UIProcess/PageViewportController.cpp:320 > if (!m_hasSuspendedContent) > return; Cool, the only purpose I then see left of suspend/resumeContent in PageViewportController is headed by the following comment in pageDidRequestScroll: // Ignore the request if suspended. Can only happen due to delay in event delivery. So do you think we could go even further and remove all knowledge of page suspension in PVC? 840923 3 190041 abecsi 2013-02-25 06:16:37 -0800 Comment on attachment 190041 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=190041&action=review >> Source/WebKit2/UIProcess/PageViewportController.cpp:320 >> return; > > Cool, the only purpose I then see left of suspend/resumeContent in PageViewportController is headed by the following comment in pageDidRequestScroll: > // Ignore the request if suspended. Can only happen due to delay in event delivery. > > So do you think we could go even further and remove all knowledge of page suspension in PVC? I'll check. I think we can, since the WebPageProxy already has early returns to not send unnecessary events. 840925 4 abecsi 2013-02-25 06:21:01 -0800 (In reply to comment #3) > (From update of attachment 190041 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=190041&action=review > > >> Source/WebKit2/UIProcess/PageViewportController.cpp:320 > >> return; > > > > Cool, the only purpose I then see left of suspend/resumeContent in PageViewportController is headed by the following comment in pageDidRequestScroll: > > // Ignore the request if suspended. Can only happen due to delay in event delivery. > > > > So do you think we could go even further and remove all knowledge of page suspension in PVC? > > I'll check. I think we can, since the WebPageProxy already has early returns to not send unnecessary events. Actually there are references to m_controller->hasSuspendedContent() from the client (at least for Qt). 840927 5 abecsi 2013-02-25 06:34:43 -0800 (In reply to comment #4) > (In reply to comment #3) > > (From update of attachment 190041 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=190041&action=review > > > > >> Source/WebKit2/UIProcess/PageViewportController.cpp:320 > > >> return; > > > > > > Cool, the only purpose I then see left of suspend/resumeContent in PageViewportController is headed by the following comment in pageDidRequestScroll: > > > // Ignore the request if suspended. Can only happen due to delay in event delivery. > > > > > > So do you think we could go even further and remove all knowledge of page suspension in PVC? > > > > I'll check. I think we can, since the WebPageProxy already has early returns to not send unnecessary events. > > Actually there are references to m_controller->hasSuspendedContent() from the client (at least for Qt). On second thought, it looks like only PageViewportControllerClientQt::didChangeContentsSize really depend on knowing about the suspend state, all the other references could be substituted with checking if the scale animation is active. Let's see. 840969 6 abecsi 2013-02-25 07:49:30 -0800 (In reply to comment #2) > (From update of attachment 190041 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=190041&action=review > > > Source/WebKit2/UIProcess/PageViewportController.cpp:320 > > if (!m_hasSuspendedContent) > > return; > > Cool, the only purpose I then see left of suspend/resumeContent in PageViewportController is headed by the following comment in pageDidRequestScroll: > // Ignore the request if suspended. Can only happen due to delay in event delivery. I is also happening when there are mouse wheel events during a double tap to zoom animation, so the comment is not completely accurate. > > So do you think we could go even further and remove all knowledge of page suspension in PVC? As discussed on IRC, we can try to make the PVC slimmer, or event merge the shareable functionality somewhere reasonable later, once we know where things are heading with the shared WebView and and specific API. 840989 7 190041 jturcotte 2013-02-25 08:12:46 -0800 Comment on attachment 190041 Patch Looks good then, r=me 841019 8 190041 abecsi 2013-02-25 09:15:50 -0800 Comment on attachment 190041 Patch Clearing flags on attachment: 190041 Committed r143935: <http://trac.webkit.org/changeset/143935> 841020 9 abecsi 2013-02-25 09:15:56 -0800 All reviewed patches have been landed. Closing bug. 841874 10 zarvai 2013-02-26 04:22:30 -0800 Please check API tests: Before the patch: 189 passed, 3 failed, 0 skipped, 0 crashed http://build.webkit.sed.hu/builders/x86-64%20Linux%20Qt%20Release%20WebKit2%20%28Amazon%20EC2%29/builds/14249 After the patch: 182 passed, 10 failed, 0 skipped, 0 crashed http://build.webkit.sed.hu/builders/x86-64%20Linux%20Qt%20Release%20WebKit2%20%28Amazon%20EC2%29/builds/14250 841906 11 abecsi 2013-02-26 05:17:53 -0800 (In reply to comment #10) > Please check API tests: > > Before the patch: > 189 passed, 3 failed, 0 skipped, 0 crashed > http://build.webkit.sed.hu/builders/x86-64%20Linux%20Qt%20Release%20WebKit2%20%28Amazon%20EC2%29/builds/14249 > > After the patch: > 182 passed, 10 failed, 0 skipped, 0 crashed > http://build.webkit.sed.hu/builders/x86-64%20Linux%20Qt%20Release%20WebKit2%20%28Amazon%20EC2%29/builds/14250 Thanks. Investigating. 844163 12 abecsi 2013-02-28 09:55:34 -0800 (In reply to comment #11) > (In reply to comment #10) > > Please check API tests: > > > > Before the patch: > > 189 passed, 3 failed, 0 skipped, 0 crashed > > http://build.webkit.sed.hu/builders/x86-64%20Linux%20Qt%20Release%20WebKit2%20%28Amazon%20EC2%29/builds/14249 > > > > After the patch: > > 182 passed, 10 failed, 0 skipped, 0 crashed > > http://build.webkit.sed.hu/builders/x86-64%20Linux%20Qt%20Release%20WebKit2%20%28Amazon%20EC2%29/builds/14250 > > Thanks. Investigating. Fixed in https://bugs.webkit.org/show_bug.cgi?id=111086 190041 2013-02-25 05:28:30 -0800 2013-02-25 09:15:50 -0800 Patch bug-110751-20130225142243.patch text/plain 7401 abecsi U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzODk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMjljMDQ3YTM3ZWMzMjMz YzlhOWJlZDdkZTc5YzU2YWE5YTg5ZTZmMi4uOWZlY2Y5ODJhNWIwODU1MjEwOWQwZGQ4ZDdjNGE4 YmVlMGZiNTI4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEzLTAyLTI1ICBBbmRy YXMgQmVjc2kgIDxhbmRyYXMuYmVjc2lAZGlnaWEuY29tPgorCisgICAgICAgIFtRdF1bV0syXSBS ZW1vdmUgdW5uZWVkZWQgbWV0aG9kIGRpZFJlc3VtZUNvbnRlbnQgZnJvbSBQYWdlVmlld3BvcnRD b250cm9sbGVyIGNsaWVudHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTExMDc1MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFRoaXMgaXMgYSBjbGVhbi11cCBpbiB0aGUgUGFnZVZpZXdwb3J0Q29udHJvbGxl ciBjbGllbnRzIHRoYXQgcmVtb3ZlcyBsZWZ0b3ZlcgorICAgICAgICBjb2RlIGZyb20gcHJldmlv dXMgZGVzaWduIHRoYXQgaXMgcGFydGlhbGx5IHVudXNlZCBhbmQgdW5uZWNlc3NhcnksIHRvIHNp bXBsaWZ5CisgICAgICAgIHRoZSBpbnRlcmFjdGlvbiBiZXR3ZWVuIFBhZ2VWaWV3cG9ydENvbnRy b2xsZXIgYW5kIGNsaWVudHMuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvUGFnZVZpZXdwb3J0Q29u dHJvbGxlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VWaWV3cG9ydENvbnRyb2xsZXI6OnJl c3VtZUNvbnRlbnQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9QYWdlVmlld3BvcnRDb250cm9sbGVy Q2xpZW50Lmg6CisgICAgICAgIChQYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50KToKKyAgICAg ICAgKiBVSVByb2Nlc3MvZWZsL1BhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRFZmwuY3BwOgor ICAgICAgICAqIFVJUHJvY2Vzcy9lZmwvUGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudEVmbC5o OgorICAgICAgICAoUGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudEVmbCk6CisgICAgICAgICog VUlQcm9jZXNzL3F0L1BhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRRdC5jcHA6CisgICAgICAg IChXZWJLaXQ6OlBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRRdDo6YW5pbWF0ZUNvbnRlbnRS ZWN0VmlzaWJsZSk6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGll bnRRdDo6ZmxpY2tNb3ZlRW5kZWQpOgorICAgICAgICAoV2ViS2l0OjpQYWdlVmlld3BvcnRDb250 cm9sbGVyQ2xpZW50UXQ6OnJlc3VtZUFuZFVwZGF0ZUNvbnRlbnQpOgorICAgICAgICAoV2ViS2l0 OjpQYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50UXQ6OnBpbmNoR2VzdHVyZUNhbmNlbGxlZCk6 CisgICAgICAgICogVUlQcm9jZXNzL3F0L1BhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRRdC5o OgorICAgICAgICAoUGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudFF0KToKKwogMjAxMy0wMi0y NCAgQW5kcmVhcyBLbGluZyAgPGFrbGluZ0BhcHBsZS5jb20+CiAKICAgICAgICAgUmVkdWNlIGlu Y2x1ZGUgZ3JhcGggb2YgSlNET01CaW5kaW5nLmgKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9QYWdlVmlld3BvcnRDb250cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9QYWdlVmlld3BvcnRDb250cm9sbGVyLmNwcAppbmRleCAwZjZiZDIyMzBlZWZlNDRl NTNiZmNkMzYwMmQ2OTFiMTM1NDI3NzI3Li4zMWQwYzdjMWYwMzdmNjhlMzY4ODFlNzNiZDg3ZGEz NzY4ZjY4ZDNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZVZpZXdw b3J0Q29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BhZ2VWaWV3 cG9ydENvbnRyb2xsZXIuY3BwCkBAIC0zMTYsOCArMzE2LDYgQEAgdm9pZCBQYWdlVmlld3BvcnRD b250cm9sbGVyOjpzdXNwZW5kQ29udGVudCgpCiAKIHZvaWQgUGFnZVZpZXdwb3J0Q29udHJvbGxl cjo6cmVzdW1lQ29udGVudCgpCiB7Ci0gICAgbV9jbGllbnQtPmRpZFJlc3VtZUNvbnRlbnQoKTsK LQogICAgIGlmICghbV9oYXNTdXNwZW5kZWRDb250ZW50KQogICAgICAgICByZXR1cm47CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QYWdlVmlld3BvcnRDb250cm9sbGVy Q2xpZW50LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZVZpZXdwb3J0Q29udHJvbGxl ckNsaWVudC5oCmluZGV4IGU1NWRiZGI0NmQ0ZWNiODg5ODc5ZGQ5Nzg4NzBkZmMyNjc2MGJmOTcu LjE1ZDlhNWU1ZGNlMGRhMmE3YjNkZTEwNGUyNTMxYzNiZTkyOTA0ZjQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50LmgKKysr IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnQu aApAQCAtNDEsNyArNDEsNiBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHNldFZpZXdwb3J0 UG9zaXRpb24oY29uc3QgV2ViQ29yZTo6RmxvYXRQb2ludCYgY29udGVudHNQb2ludCkgPSAwOwog ICAgIHZpcnR1YWwgdm9pZCBzZXRQYWdlU2NhbGVGYWN0b3IoZmxvYXQpID0gMDsKIAotICAgIHZp cnR1YWwgdm9pZCBkaWRSZXN1bWVDb250ZW50KCkgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBkaWRD aGFuZ2VDb250ZW50c1NpemUoY29uc3QgV2ViQ29yZTo6SW50U2l6ZSYpID0gMDsKICAgICB2aXJ0 dWFsIHZvaWQgZGlkQ2hhbmdlVmlzaWJsZUNvbnRlbnRzKCkgPSAwOwogICAgIHZpcnR1YWwgdm9p ZCBkaWRDaGFuZ2VWaWV3cG9ydEF0dHJpYnV0ZXMoKSA9IDA7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1BhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRFZmwuY3Bw IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9QYWdlVmlld3BvcnRDb250cm9sbGVyQ2xp ZW50RWZsLmNwcAppbmRleCBmNGRmYmU1YjZlZjM4NTJiZDRlOWZjYjFiYTQ5MGNjZTVlOTEwNDlm Li42OWNkZTAzY2YwYzdiMDcyZTA4MTk2N2MyZDJjODNlODBkMjI5ZjBkIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1BhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRF ZmwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvUGFnZVZpZXdwb3J0Q29u dHJvbGxlckNsaWVudEVmbC5jcHAKQEAgLTYzLDEyICs2Myw2IEBAIHZvaWQgUGFnZVZpZXdwb3J0 Q29udHJvbGxlckNsaWVudEVmbDo6c2V0UGFnZVNjYWxlRmFjdG9yKGZsb2F0IG5ld1NjYWxlKQog ICAgIG1fdmlldy0+c2V0UGFnZVNjYWxlRmFjdG9yKG5ld1NjYWxlKTsKIH0KIAotdm9pZCBQYWdl Vmlld3BvcnRDb250cm9sbGVyQ2xpZW50RWZsOjpkaWRSZXN1bWVDb250ZW50KCkKLXsKLSAgICBB U1NFUlQobV9jb250cm9sbGVyKTsKLSAgICBtX2NvbnRyb2xsZXItPmRpZENoYW5nZUNvbnRlbnRz VmlzaWJpbGl0eShtX2NvbnRlbnRQb3NpdGlvbiwgbV92aWV3LT5wYWdlU2NhbGVGYWN0b3IoKSk7 Ci19Ci0KIHZvaWQgUGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudEVmbDo6ZGlkQ2hhbmdlVmlz aWJsZUNvbnRlbnRzKCkKIHsKICAgICBtX3ZpZXctPnNjaGVkdWxlVXBkYXRlRGlzcGxheSgpOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9QYWdlVmlld3BvcnRDb250 cm9sbGVyQ2xpZW50RWZsLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1BhZ2VWaWV3 cG9ydENvbnRyb2xsZXJDbGllbnRFZmwuaAppbmRleCA0NTI0OGY1MDJmOWNkZmFhYzYyMzNmYjU3 NDRlNjI4NWE3NTkxZTliLi5lNDA0NWI2ZTFhMjA2ZGNiODIwYTU2NjAwM2JmYzEzMmI4Nzc0MDE4 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1BhZ2VWaWV3cG9ydENv bnRyb2xsZXJDbGllbnRFZmwuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1Bh Z2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRFZmwuaApAQCAtNDYsNyArNDYsNiBAQCBwdWJsaWM6 CiAgICAgdmlydHVhbCB2b2lkIHNldFZpZXdwb3J0UG9zaXRpb24oY29uc3QgV2ViQ29yZTo6Rmxv YXRQb2ludCYpIE9WRVJSSURFOwogICAgIHZpcnR1YWwgdm9pZCBzZXRQYWdlU2NhbGVGYWN0b3Io ZmxvYXQpIE9WRVJSSURFOwogCi0gICAgdmlydHVhbCB2b2lkIGRpZFJlc3VtZUNvbnRlbnQoKSBP VkVSUklERTsKICAgICB2aXJ0dWFsIHZvaWQgZGlkQ2hhbmdlQ29udGVudHNTaXplKGNvbnN0IFdl YkNvcmU6OkludFNpemUmKSBPVkVSUklERTsKICAgICB2aXJ0dWFsIHZvaWQgZGlkQ2hhbmdlVmlz aWJsZUNvbnRlbnRzKCkgT1ZFUlJJREU7CiAgICAgdmlydHVhbCB2b2lkIGRpZENoYW5nZVZpZXdw b3J0QXR0cmlidXRlcygpIE9WRVJSSURFOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL3F0L1BhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRRdC5jcHAgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvcXQvUGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudFF0LmNwcAppbmRl eCAxNDFkYTVkY2U1MTk4MjgxNzk1MGIzMmUyZmRhMzg4ZGRiNDBiZjk3Li42ZWUzOTk3ZjVhY2Ri YzcyMWRmOGZhMGNmMTM1YjVhYTM3ZDg4MzNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvcXQvUGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudFF0LmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudFF0LmNw cApAQCAtMTAzLDcgKzEwMyw3IEBAIHZvaWQgUGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudFF0 OjphbmltYXRlQ29udGVudFJlY3RWaXNpYmxlKGNvbnN0IFFSZWN0RiYgY29uCiAKICAgICBRUmVj dEYgdmlld3BvcnRSZWN0SW5Db250ZW50Q29vcmRzID0gbV92aWV3cG9ydEl0ZW0tPm1hcFJlY3RU b1dlYkNvbnRlbnQobV92aWV3cG9ydEl0ZW0tPmJvdW5kaW5nUmVjdCgpKTsKICAgICBpZiAoY29u dGVudFJlY3QgPT0gdmlld3BvcnRSZWN0SW5Db250ZW50Q29vcmRzKSB7Ci0gICAgICAgIG1fY29u dHJvbGxlci0+cmVzdW1lQ29udGVudCgpOworICAgICAgICByZXN1bWVBbmRVcGRhdGVDb250ZW50 KCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKQEAgLTEzMSw3ICsxMzEsNyBAQCB2b2lkIFBh Z2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRRdDo6ZmxpY2tNb3ZlRW5kZWQoKQogICAgIC8vIFRo aXMgbWV0aG9kIGlzIGNhbGxlZCBvbiB0aGUgZW5kIG9mIHRoZSBwYW4gb3IgcGFuIGtpbmV0aWMg YW5pbWF0aW9uLgogCiAgICAgaWYgKCFtX2lzVXNlckludGVyYWN0aW5nKQotICAgICAgICBtX2Nv bnRyb2xsZXItPnJlc3VtZUNvbnRlbnQoKTsKKyAgICAgICAgcmVzdW1lQW5kVXBkYXRlQ29udGVu dCgpOwogfQogCiB2b2lkIFBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRRdDo6cGFnZUl0ZW1Q b3NpdGlvbkNoYW5nZWQoKQpAQCAtMzMzLDggKzMzMyw5IEBAIHZvaWQgUGFnZVZpZXdwb3J0Q29u dHJvbGxlckNsaWVudFF0OjpzZXRDb250ZW50c1JlY3RUb05lYXJlc3RWYWxpZEJvdW5kcygpCiAg ICAgdXBkYXRlVmlld3BvcnRDb250cm9sbGVyKCk7CiB9CiAKLXZvaWQgUGFnZVZpZXdwb3J0Q29u dHJvbGxlckNsaWVudFF0OjpkaWRSZXN1bWVDb250ZW50KCkKK3ZvaWQgUGFnZVZpZXdwb3J0Q29u dHJvbGxlckNsaWVudFF0OjpyZXN1bWVBbmRVcGRhdGVDb250ZW50KCkKIHsKKyAgICBtX2NvbnRy b2xsZXItPnJlc3VtZUNvbnRlbnQoKTsKICAgICAvLyBNYWtlIHN1cmUgdGhhdCB0aWxlcyBhbGwg YXJvdW5kIHRoZSB2aWV3cG9ydCB3aWxsIGJlIHJlcXVlc3RlZC4KICAgICB1cGRhdGVWaWV3cG9y dENvbnRyb2xsZXIoKTsKIH0KQEAgLTQ2Nyw3ICs0NjgsNyBAQCB2b2lkIFBhZ2VWaWV3cG9ydENv bnRyb2xsZXJDbGllbnRRdDo6cGluY2hHZXN0dXJlRW5kZWQoKQogdm9pZCBQYWdlVmlld3BvcnRD b250cm9sbGVyQ2xpZW50UXQ6OnBpbmNoR2VzdHVyZUNhbmNlbGxlZCgpCiB7CiAgICAgbV9waW5j aFN0YXJ0U2NhbGUgPSAtMTsKLSAgICBtX2NvbnRyb2xsZXItPnJlc3VtZUNvbnRlbnQoKTsKKyAg ICByZXN1bWVBbmRVcGRhdGVDb250ZW50KCk7CiB9CiAKIHZvaWQgUGFnZVZpZXdwb3J0Q29udHJv bGxlckNsaWVudFF0OjpkaWRDaGFuZ2VDb250ZW50c1NpemUoY29uc3QgSW50U2l6ZSYgbmV3U2l6 ZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9QYWdlVmlld3BvcnRD b250cm9sbGVyQ2xpZW50UXQuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9QYWdlVmll d3BvcnRDb250cm9sbGVyQ2xpZW50UXQuaAppbmRleCBlNWNmZWVlNjEzOGYyZDVmOGZhYzVlMmJk ZTM1ZmFlNTU3YTQ5MDA5Li5mODVlOWJkMDAzMGJlMzkwOTY0YzAxMTk5YWIzMjYzMjgzYzk1NzU2 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUGFnZVZpZXdwb3J0Q29u dHJvbGxlckNsaWVudFF0LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1BhZ2VW aWV3cG9ydENvbnRyb2xsZXJDbGllbnRRdC5oCkBAIC01MCw3ICs1MCw2IEBAIHB1YmxpYzoKICAg ICB2aXJ0dWFsIHZvaWQgc2V0Vmlld3BvcnRQb3NpdGlvbihjb25zdCBXZWJDb3JlOjpGbG9hdFBv aW50JiBjb250ZW50c1BvaW50KTsKICAgICB2aXJ0dWFsIHZvaWQgc2V0UGFnZVNjYWxlRmFjdG9y KGZsb2F0KTsKIAotICAgIHZpcnR1YWwgdm9pZCBkaWRSZXN1bWVDb250ZW50KCk7CiAgICAgdmly dHVhbCB2b2lkIGRpZENoYW5nZUNvbnRlbnRzU2l6ZShjb25zdCBXZWJDb3JlOjpJbnRTaXplJik7 CiAgICAgdmlydHVhbCB2b2lkIGRpZENoYW5nZVZpc2libGVDb250ZW50cygpOwogICAgIHZpcnR1 YWwgdm9pZCBkaWRDaGFuZ2VWaWV3cG9ydEF0dHJpYnV0ZXMoKTsKQEAgLTEyOSw2ICsxMjgsNyBA QCBwcml2YXRlOgogICAgIHZvaWQgYW5pbWF0ZUNvbnRlbnRSZWN0VmlzaWJsZShjb25zdCBRUmVj dEYmIGNvbnRlbnRSZWN0KTsKICAgICB2b2lkIHNjYWxlQ29udGVudChxcmVhbCBpdGVtU2NhbGUs IGNvbnN0IFFQb2ludEYmIGNlbnRlckluQ1NTQ29vcmRpbmF0ZXMgPSBRUG9pbnRGKCkpOwogICAg IHZvaWQgY2xlYXJSZWxhdGl2ZVpvb21TdGF0ZSgpOworICAgIHZvaWQgcmVzdW1lQW5kVXBkYXRl Q29udGVudCgpOwogCiAgICAgU2NhbGVBbmltYXRpb24qIG1fc2NhbGVBbmltYXRpb247CiAgICAg UVBvaW50RiBtX2xhc3RQaW5jaENlbnRlckluVmlld3BvcnRDb29yZGluYXRlczsK