18992 2008-05-10 21:44:22 -0700 Reset scroll position when loading new page 2008-05-11 22:10:18 -0700 1 1 1 Unclassified WebKit WebKit wx 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 robin webkit-unassigned kevino oldest_to_newest 80098 0 robin 2008-05-10 21:44:22 -0700 In wxWebKit the scrollbar is not reset when loading a new page. This patch fixes that. 80099 1 21060 robin 2008-05-10 21:46:00 -0700 Created attachment 21060 one liner for resetting the scrollbar 80102 2 21060 mrowe 2008-05-10 23:30:44 -0700 Comment on attachment 21060 one liner for resetting the scrollbar windowObjectCleared is definitely not the right place to be doing this. It's likely there is some underlying issue that is leading to the incorrect behaviour you're seeing -- none of the other ports call setContentsPos from within WebKit, which suggests to me that doing so for wx is papering over an issue elsewhere. 80107 3 kevino 2008-05-11 00:30:04 -0700 (In reply to comment #2) > (From update of attachment 21060 [edit]) > windowObjectCleared is definitely not the right place to be doing this. It's > likely there is some underlying issue that is leading to the incorrect > behaviour you're seeing -- none of the other ports call setContentsPos from > within WebKit, which suggests to me that doing so for wx is papering over an > issue elsewhere. > Yeah, poking around some more, I think the real issue is that we don't handle FrameLoaderClientWx::transitionToCommittedForNewPage(), which deletes and re-creates the FrameView, and that's probably how all the other ports end up having their scroll positions reset. 80147 4 21075 robin 2008-05-11 18:02:58 -0700 Created attachment 21075 new patch to fix scrolling This patch does it by implementing transitionToCommittedNewPage() so the scroll positions are reset when a new page is loaded, and also maintained so that back and next restore the scroll positions as well. This also simplifies the logic for initializing and managing wxWebView. 80155 5 21075 kevino 2008-05-11 22:03:59 -0700 Comment on attachment 21075 new patch to fix scrolling This does the trick! :-) 80156 6 kevino 2008-05-11 22:10:18 -0700 landed in r33036, thanks! :) 21060 2008-05-10 21:46:00 -0700 2008-05-11 18:02:58 -0700 one liner for resetting the scrollbar webkit-scrollbarreset.patch text/plain 456 robin SW5kZXg6IFdlYktpdC93eC9XZWJLaXRTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50V3guY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYktpdC93eC9XZWJLaXRTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50V3gu Y3BwCShyZXZpc2lvbiAzMjk0MSkKKysrIFdlYktpdC93eC9XZWJLaXRTdXBwb3J0L0ZyYW1lTG9h ZGVyQ2xpZW50V3guY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04MzIsNiArODM4LDcgQEAKIAogdm9p ZCBGcmFtZUxvYWRlckNsaWVudFd4Ojp3aW5kb3dPYmplY3RDbGVhcmVkKCkKIHsKKyAgICBtX2Zy YW1lLT52aWV3KCktPnNldENvbnRlbnRzUG9zKDAsMCk7CiAgICAgbm90SW1wbGVtZW50ZWQoKTsg Ly8gYW55dGhpbmcgZWxzZSBuZWVkZWQgaGVyZSBvciBjYW4gd2UgcmVtb3ZlIHRoaXM/CiB9CiAK 21075 2008-05-11 18:02:58 -0700 2008-05-11 22:03:59 -0700 new patch to fix scrolling scrolling_fix.patch text/plain 11950 robin SW5kZXg6IFdlYktpdC93eC9XZWJLaXRTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50V3guY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYktpdC93eC9XZWJLaXRTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50V3gu Y3BwCShyZXZpc2lvbiAzMzAyOSkKKysrIFdlYktpdC93eC9XZWJLaXRTdXBwb3J0L0ZyYW1lTG9h ZGVyQ2xpZW50V3guY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNCwxMCArMzQsMTIgQEAKICNpbmNs dWRlICJGcmFtZVZpZXcuaCIKICNpbmNsdWRlICJGcmFtZVRyZWUuaCIKICNpbmNsdWRlICJIVE1M Rm9ybUVsZW1lbnQuaCIKKyNpbmNsdWRlICJIVE1MRnJhbWVPd25lckVsZW1lbnQuaCIKICNpbmNs dWRlICJOb3RJbXBsZW1lbnRlZC5oIgogI2luY2x1ZGUgIlBhZ2UuaCIKICNpbmNsdWRlICJQbGF0 Zm9ybVN0cmluZy5oIgogI2luY2x1ZGUgIlByb2dyZXNzVHJhY2tlci5oIgorI2luY2x1ZGUgIlJl bmRlclBhcnQuaCIKICNpbmNsdWRlICJSZXNvdXJjZUVycm9yLmgiCiAjaW5jbHVkZSAiUmVzb3Vy Y2VSZXNwb25zZS5oIgogCkBAIC04Myw2ICs4NSwxMSBAQAogICAgIG1fZnJhbWUgPSBmcmFtZTsK IH0KIAordm9pZCBGcmFtZUxvYWRlckNsaWVudFd4OjpzZXRXZWJWaWV3KHd4V2ViVmlldyAqd2Vi dmlldykKK3sKKyAgICBtX3dlYlZpZXcgPSB3ZWJ2aWV3OworfQorCiB2b2lkIEZyYW1lTG9hZGVy Q2xpZW50V3g6OmRldGFjaEZyYW1lTG9hZGVyKCkKIHsKICAgICBtX2ZyYW1lID0gMDsKQEAgLTI0 OSwxMiArMjU2LDExIEBACiAKIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRXeDo6ZGlzcGF0Y2hEaWRI YW5kbGVPbmxvYWRFdmVudHMoKQogewotICAgIHd4V2luZG93KiB0YXJnZXQgPSBtX2ZyYW1lLT52 aWV3KCktPm5hdGl2ZVdpbmRvdygpOwotICAgIGlmICh0YXJnZXQpIHsKLSAgICAgICAgd3hXZWJW aWV3TG9hZEV2ZW50IHdrRXZlbnQodGFyZ2V0KTsKKyAgICBpZiAobV93ZWJWaWV3KSB7CisgICAg ICAgIHd4V2ViVmlld0xvYWRFdmVudCB3a0V2ZW50KG1fd2ViVmlldyk7CiAgICAgICAgIHdrRXZl bnQuU2V0U3RhdGUod3hXRUJWSUVXX0xPQURfT05MT0FEX0hBTkRMRUQpOwogICAgICAgICB3a0V2 ZW50LlNldFVSTChtX2ZyYW1lLT5sb2FkZXIoKS0+ZG9jdW1lbnRMb2FkZXIoKS0+cmVxdWVzdCgp LnVybCgpLnN0cmluZygpKTsKLSAgICAgICAgdGFyZ2V0LT5HZXRFdmVudEhhbmRsZXIoKS0+UHJv Y2Vzc0V2ZW50KHdrRXZlbnQpOworICAgICAgICBtX3dlYlZpZXctPkdldEV2ZW50SGFuZGxlcigp LT5Qcm9jZXNzRXZlbnQod2tFdmVudCk7CiAgICAgfQogfQogCkBAIC0yOTMsNDMgKzI5OSwzOSBA QAogCiB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50V3g6OmRpc3BhdGNoRGlkU3RhcnRQcm92aXNpb25h bExvYWQoKQogewotICAgIHd4V2luZG93KiB0YXJnZXQgPSBtX2ZyYW1lLT52aWV3KCktPm5hdGl2 ZVdpbmRvdygpOwotICAgIGlmICh0YXJnZXQpIHsKLSAgICAgICAgd3hXZWJWaWV3TG9hZEV2ZW50 IHdrRXZlbnQodGFyZ2V0KTsKKyAgICBpZiAobV93ZWJWaWV3KSB7CisgICAgICAgIHd4V2ViVmll d0xvYWRFdmVudCB3a0V2ZW50KG1fd2ViVmlldyk7CiAgICAgICAgIHdrRXZlbnQuU2V0U3RhdGUo d3hXRUJWSUVXX0xPQURfTkVHT1RJQVRJTkcpOwogICAgICAgICB3a0V2ZW50LlNldFVSTChtX2Zy YW1lLT5sb2FkZXIoKS0+cHJvdmlzaW9uYWxEb2N1bWVudExvYWRlcigpLT5yZXF1ZXN0KCkudXJs KCkuc3RyaW5nKCkpOwotICAgICAgICB0YXJnZXQtPkdldEV2ZW50SGFuZGxlcigpLT5Qcm9jZXNz RXZlbnQod2tFdmVudCk7CisgICAgICAgIG1fd2ViVmlldy0+R2V0RXZlbnRIYW5kbGVyKCktPlBy b2Nlc3NFdmVudCh3a0V2ZW50KTsKICAgICB9CiB9CiAKIAogdm9pZCBGcmFtZUxvYWRlckNsaWVu dFd4OjpkaXNwYXRjaERpZFJlY2VpdmVUaXRsZShjb25zdCBTdHJpbmcmIHRpdGxlKQogewotICAg IHd4V2ViVmlldyogdGFyZ2V0ID0gc3RhdGljX2Nhc3Q8d3hXZWJWaWV3Kj4obV9mcmFtZS0+dmll dygpLT5uYXRpdmVXaW5kb3coKSk7Ci0gICAgaWYgKHRhcmdldCkKLSAgICAgICAgdGFyZ2V0LT5T ZXRQYWdlVGl0bGUodGl0bGUpOworICAgIGlmIChtX3dlYlZpZXcpCisgICAgICAgIG1fd2ViVmll dy0+U2V0UGFnZVRpdGxlKHRpdGxlKTsKIH0KIAogCiB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50V3g6 OmRpc3BhdGNoRGlkQ29tbWl0TG9hZCgpCiB7Ci0gICAgd3hXaW5kb3cqIHRhcmdldCA9IG1fZnJh bWUtPnZpZXcoKS0+bmF0aXZlV2luZG93KCk7Ci0gICAgaWYgKHRhcmdldCkgewotICAgICAgICB3 eFdlYlZpZXdMb2FkRXZlbnQgd2tFdmVudCh0YXJnZXQpOworICAgIGlmIChtX3dlYlZpZXcpIHsK KyAgICAgICAgd3hXZWJWaWV3TG9hZEV2ZW50IHdrRXZlbnQobV93ZWJWaWV3KTsKICAgICAgICAg d2tFdmVudC5TZXRTdGF0ZSh3eFdFQlZJRVdfTE9BRF9UUkFOU0ZFUlJJTkcpOwogICAgICAgICB3 a0V2ZW50LlNldFVSTChtX2ZyYW1lLT5sb2FkZXIoKS0+ZG9jdW1lbnRMb2FkZXIoKS0+cmVxdWVz dCgpLnVybCgpLnN0cmluZygpKTsKLSAgICAgICAgdGFyZ2V0LT5HZXRFdmVudEhhbmRsZXIoKS0+ UHJvY2Vzc0V2ZW50KHdrRXZlbnQpOworICAgICAgICBtX3dlYlZpZXctPkdldEV2ZW50SGFuZGxl cigpLT5Qcm9jZXNzRXZlbnQod2tFdmVudCk7CiAgICAgfQogfQogCiB2b2lkIEZyYW1lTG9hZGVy Q2xpZW50V3g6OmRpc3BhdGNoRGlkRmluaXNoRG9jdW1lbnRMb2FkKCkKIHsKLSAgICB3eFdpbmRv dyogdGFyZ2V0ID0gbV9mcmFtZS0+dmlldygpLT5uYXRpdmVXaW5kb3coKTsKLSAgICBpZiAodGFy Z2V0KSB7Ci0gICAgICAgIHd4V2ViVmlld0xvYWRFdmVudCB3a0V2ZW50KHRhcmdldCk7CisgICAg aWYgKG1fd2ViVmlldykgeworICAgICAgICB3eFdlYlZpZXdMb2FkRXZlbnQgd2tFdmVudChtX3dl YlZpZXcpOwogICAgICAgICB3a0V2ZW50LlNldFN0YXRlKHd4V0VCVklFV19MT0FEX0RPQ19DT01Q TEVURUQpOwogICAgICAgICB3a0V2ZW50LlNldFVSTChtX2ZyYW1lLT5sb2FkZXIoKS0+dXJsKCku c3RyaW5nKCkpOwotICAgICAgICB0YXJnZXQtPkdldEV2ZW50SGFuZGxlcigpLT5Qcm9jZXNzRXZl bnQod2tFdmVudCk7CisgICAgICAgIG1fd2ViVmlldy0+R2V0RXZlbnRIYW5kbGVyKCktPlByb2Nl c3NFdmVudCh3a0V2ZW50KTsKICAgICB9CiB9CiAKQEAgLTM5MCwxMiArMzkyLDExIEBACiAKIHZv aWQgRnJhbWVMb2FkZXJDbGllbnRXeDo6cG9zdFByb2dyZXNzRmluaXNoZWROb3RpZmljYXRpb24o KQogewotICAgIHd4V2luZG93KiB0YXJnZXQgPSBtX2ZyYW1lLT52aWV3KCktPm5hdGl2ZVdpbmRv dygpOwotICAgIGlmICh0YXJnZXQpIHsKLSAgICAgICAgd3hXZWJWaWV3TG9hZEV2ZW50IHdrRXZl bnQodGFyZ2V0KTsKKyAgICBpZiAobV93ZWJWaWV3KSB7CisgICAgICAgIHd4V2ViVmlld0xvYWRF dmVudCB3a0V2ZW50KG1fd2ViVmlldyk7CiAgICAgICAgIHdrRXZlbnQuU2V0U3RhdGUod3hXRUJW SUVXX0xPQURfRExfQ09NUExFVEVEKTsKICAgICAgICAgd2tFdmVudC5TZXRVUkwobV9mcmFtZS0+ bG9hZGVyKCktPnVybCgpLnN0cmluZygpKTsKLSAgICAgICAgdGFyZ2V0LT5HZXRFdmVudEhhbmRs ZXIoKS0+UHJvY2Vzc0V2ZW50KHdrRXZlbnQpOworICAgICAgICBtX3dlYlZpZXctPkdldEV2ZW50 SGFuZGxlcigpLT5Qcm9jZXNzRXZlbnQod2tFdmVudCk7CiAgICAgfQogfQogCkBAIC03MTksMTMg KzcyMCwxMiBAQAogICAgIGlmICghbV9mcmFtZSkKICAgICAgICAgcmV0dXJuOwogICAgICAgICAK LSAgICB3eFdpbmRvdyogdGFyZ2V0ID0gbV9mcmFtZS0+dmlldygpLT5uYXRpdmVXaW5kb3coKTsK LSAgICBpZiAodGFyZ2V0KSB7Ci0gICAgICAgIHd4V2ViVmlld0JlZm9yZUxvYWRFdmVudCB3a0V2 ZW50KHRhcmdldCk7CisgICAgaWYgKG1fd2ViVmlldykgeworICAgICAgICB3eFdlYlZpZXdCZWZv cmVMb2FkRXZlbnQgd2tFdmVudChtX3dlYlZpZXcpOwogICAgICAgICB3a0V2ZW50LlNldE5hdmln YXRpb25UeXBlKHd4TmF2VHlwZUZyb21XZWJOYXZUeXBlKGFjdGlvbi50eXBlKCkpKTsKICAgICAg ICAgd2tFdmVudC5TZXRVUkwocmVxdWVzdC51cmwoKS5zdHJpbmcoKSk7CiAgICAgICAgIAotICAg ICAgICB0YXJnZXQtPkdldEV2ZW50SGFuZGxlcigpLT5Qcm9jZXNzRXZlbnQod2tFdmVudCk7Cisg ICAgICAgIG1fd2ViVmlldy0+R2V0RXZlbnRIYW5kbGVyKCktPlByb2Nlc3NFdmVudCh3a0V2ZW50 KTsKICAgICAgICAgaWYgKHdrRXZlbnQuSXNDYW5jZWxsZWQoKSkKICAgICAgICAgICAgIChtX2Zy YW1lLT5sb2FkZXIoKS0+KmZ1bmN0aW9uKShQb2xpY3lJZ25vcmUpOwogICAgICAgICBlbHNlCkBA IC03NjIsNyArNzYyLDcgQEAKICovCiAKIC8qCi0gICAgd3hXaW5kb3cqIHBhcmVudCA9IG1fZnJh bWUtPnZpZXcoKS0+bmF0aXZlV2luZG93KCk7CisgICAgd3hXaW5kb3cqIHBhcmVudCA9IG1fd2Vi VmlldzsKIAogICAgIFdlYlZpZXdGcmFtZURhdGEqIGRhdGEgPSBuZXcgV2ViVmlld0ZyYW1lRGF0 YSgpOwogICAgIGRhdGEtPm5hbWUgPSBuYW1lOwpAQCAtODU3LDcgKzg1NywzMyBAQAogCiB2b2lk IEZyYW1lTG9hZGVyQ2xpZW50V3g6OnRyYW5zaXRpb25Ub0NvbW1pdHRlZEZvck5ld1BhZ2UoKQog eyAKLSAgICBub3RJbXBsZW1lbnRlZCgpOworICAgIEFTU0VSVChtX2ZyYW1lKTsKKyAgICBBU1NF UlQobV93ZWJWaWV3KTsKKyAgICAKKyAgICBQYWdlKiBwYWdlID0gbV9mcmFtZS0+cGFnZSgpOwor ICAgIEFTU0VSVChwYWdlKTsKKworICAgIGJvb2wgaXNNYWluRnJhbWUgPSBtX2ZyYW1lID09IHBh Z2UtPm1haW5GcmFtZSgpOworCisgICAgbV9mcmFtZS0+c2V0VmlldygwKTsKKworICAgIEZyYW1l VmlldyogZnJhbWVWaWV3OworICAgIGlmIChpc01haW5GcmFtZSkgeworICAgICAgICBmcmFtZVZp ZXcgPSBuZXcgRnJhbWVWaWV3KG1fZnJhbWUsIEludFJlY3QobV93ZWJWaWV3LT5HZXRSZWN0KCkp LnNpemUoKSk7CisgICAgfSBlbHNlCisgICAgICAgIGZyYW1lVmlldyA9IG5ldyBGcmFtZVZpZXco bV9mcmFtZSk7CisKKyAgICBBU1NFUlQoZnJhbWVWaWV3KTsKKyAgICBtX2ZyYW1lLT5zZXRWaWV3 KGZyYW1lVmlldyk7CisgICAgZnJhbWVWaWV3LT5kZXJlZigpOyAvLyBGcmFtZVZpZXdzIGFyZSBj cmVhdGVkIHdpdGggYSByZWYgY291bnQgb2YgMS4gUmVsZWFzZSB0aGlzIHJlZiBzaW5jZSB3ZSd2 ZSBhc3NpZ25lZCBpdCB0byBmcmFtZS4KKworICAgIGZyYW1lVmlldy0+c2V0TmF0aXZlV2luZG93 KG1fd2ViVmlldyk7CisKKyAgICBpZiAobV9mcmFtZS0+b3duZXJSZW5kZXJlcigpKQorICAgICAg ICBtX2ZyYW1lLT5vd25lclJlbmRlcmVyKCktPnNldFdpZGdldChmcmFtZVZpZXcpOworCisgICAg aWYgKEhUTUxGcmFtZU93bmVyRWxlbWVudCogb3duZXIgPSBtX2ZyYW1lLT5vd25lckVsZW1lbnQo KSkKKyAgICAgICAgbV9mcmFtZS0+dmlldygpLT5zZXRTY3JvbGxiYXJzTW9kZShvd25lci0+c2Ny b2xsaW5nTW9kZSgpKTsKIH0KIAogfQpJbmRleDogV2ViS2l0L3d4L1dlYktpdFN1cHBvcnQvRnJh bWVMb2FkZXJDbGllbnRXeC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC93eC9XZWJLaXRTdXBwb3J0 L0ZyYW1lTG9hZGVyQ2xpZW50V3guaAkocmV2aXNpb24gMzMwMjkpCisrKyBXZWJLaXQvd3gvV2Vi S2l0U3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFd4LmgJKHdvcmtpbmcgY29weSkKQEAgLTM0LDYg KzM0LDcgQEAKICNpbmNsdWRlICJSZWZDb3VudGVkLmgiCiAjaW5jbHVkZSAiUmVzb3VyY2VSZXNw b25zZS5oIgogCitjbGFzcyB3eFdlYlZpZXc7CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIApAQCAt NTIsNiArNTMsNyBAQAogICAgICAgICBGcmFtZUxvYWRlckNsaWVudFd4KCk7CiAgICAgICAgIH5G cmFtZUxvYWRlckNsaWVudFd4KCk7CiAgICAgICAgIHZvaWQgc2V0RnJhbWUoRnJhbWUgKmZyYW1l KTsKKyAgICAgICAgdm9pZCBzZXRXZWJWaWV3KHd4V2ViVmlldyAqd2Vidmlldyk7CiAgICAgICAg IHZpcnR1YWwgdm9pZCBkZXRhY2hGcmFtZUxvYWRlcigpOwogCiAgICAgICAgIHZpcnR1YWwgdm9p ZCByZWYoKTsKQEAgLTIwOSw2ICsyMTEsNyBAQAogCiAgICAgcHJpdmF0ZToKICAgICAgICAgRnJh bWUgKm1fZnJhbWU7CisgICAgICAgIHd4V2ViVmlldyAqbV93ZWJWaWV3OwogICAgICAgICBSZXNv dXJjZVJlc3BvbnNlIG1fcmVzcG9uc2U7CiAgICAgICAgIGJvb2wgbV9maXJzdERhdGE7CiAgICAg fTsKSW5kZXg6IFdlYktpdC93eC9XZWJWaWV3LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvd3gv V2ViVmlldy5jcHAJKHJldmlzaW9uIDMzMDI5KQorKysgV2ViS2l0L3d4L1dlYlZpZXcuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0yMjEsMTQgKzIyMSwxMSBAQAogICAgIAogICAgIG1faW1wbC0+ZnJh bWUgPSBuZXcgV2ViQ29yZTo6RnJhbWUobV9pbXBsLT5wYWdlLCBwYXJlbnRGcmFtZSwgbG9hZGVy Q2xpZW50KTsKICAgICBtX2ltcGwtPmZyYW1lLT5kZXJlZigpOwotICAgIG1faW1wbC0+ZnJhbWVW aWV3ID0gbmV3IFdlYkNvcmU6OkZyYW1lVmlldyhtX2ltcGwtPmZyYW1lLmdldCgpKTsKLSAgICBt X2ltcGwtPmZyYW1lVmlldy0+ZGVyZWYoKTsKKworICAgIGxvYWRlckNsaWVudC0+c2V0RnJhbWUo bV9pbXBsLT5mcmFtZS5nZXQoKSk7CisgICAgbG9hZGVyQ2xpZW50LT5zZXRXZWJWaWV3KHRoaXMp OwogICAgIAotICAgIG1faW1wbC0+ZnJhbWUtPnNldFZpZXcobV9pbXBsLT5mcmFtZVZpZXcuZ2V0 KCkpOwogICAgIG1faW1wbC0+ZnJhbWUtPmluaXQoKTsKLSAgICAKLSAgICBtX2ltcGwtPmZyYW1l Vmlldy0+c2V0TmF0aXZlV2luZG93KHRoaXMpOwotICAgIGxvYWRlckNsaWVudC0+c2V0RnJhbWUo bV9pbXBsLT5mcmFtZS5nZXQoKSk7CiAgICAgICAgIAogICAgIC8vIERlZmF1bHQgc2V0dGluZ3Mg LSB3ZSBzaG91bGQgaGF2ZSB3eFdlYlZpZXdTZXR0aW5ncyBjbGFzcyBmb3IgdGhpcwogICAgIC8v IGV2ZW50dWFsbHkKQEAgLTI1MiwxMCArMjQ5LDcgQEAKICAgICBtX2ltcGwtPmZyYW1lLT5sb2Fk ZXIoKS0+ZGV0YWNoRnJvbVBhcmVudCgpOwogICAgIAogICAgIGRlbGV0ZSBtX2ltcGwtPnBhZ2U7 Ci0gICAgbV9pbXBsLT5wYWdlID0gMDsKLSAgICAvLyBTaW5jZSBmcmFtZVZpZXcgaGFzIHRoZSBs YXN0IHJlZmVyZW5jZSB0byBGcmFtZSwgb25jZSBpdCBpcwotICAgIC8vIGRlc3Ryb3llZCB0aGUg ZGVzdHJ1Y3RvciBmb3IgRnJhbWUgd2lsbCBoYXBwZW4gYXMgd2VsbC4KLSAgICBtX2ltcGwtPmZy YW1lVmlldyA9IDA7ICAgIAorICAgIG1faW1wbC0+cGFnZSA9IDA7ICAgCiB9CiAKIHZvaWQgd3hX ZWJWaWV3OjpTdG9wKCkKQEAgLTI3Myw4ICsyNjcsOCBAQAogd3hTdHJpbmcgd3hXZWJWaWV3OjpH ZXRQYWdlU291cmNlKCkKIHsKICAgICBpZiAobV9pbXBsLT5mcmFtZSkgewotICAgICAgICBpZiAo bV9pbXBsLT5mcmFtZVZpZXcgJiYgbV9pbXBsLT5mcmFtZVZpZXctPmxheW91dFBlbmRpbmcoKSkK LSAgICAgICAgICAgIG1faW1wbC0+ZnJhbWVWaWV3LT5sYXlvdXQoKTsKKyAgICAgICAgaWYgKG1f aW1wbC0+ZnJhbWUtPnZpZXcoKSAmJiBtX2ltcGwtPmZyYW1lLT52aWV3KCktPmxheW91dFBlbmRp bmcoKSkKKyAgICAgICAgICAgIG1faW1wbC0+ZnJhbWUtPnZpZXcoKS0+bGF5b3V0KCk7CiAgICAg CiAgICAgICAgIFdlYkNvcmU6OkRvY3VtZW50KiBkb2MgPSBtX2ltcGwtPmZyYW1lLT5kb2N1bWVu dCgpOwogICAgICAgICAKQEAgLTI5OCw4ICsyOTIsOCBAQAogCiB3eFN0cmluZyB3eFdlYlZpZXc6 OkdldElubmVyVGV4dCgpCiB7Ci0gICAgaWYgKG1faW1wbC0+ZnJhbWVWaWV3ICYmIG1faW1wbC0+ ZnJhbWVWaWV3LT5sYXlvdXRQZW5kaW5nKCkpCi0gICAgICAgIG1faW1wbC0+ZnJhbWVWaWV3LT5s YXlvdXQoKTsKKyAgICBpZiAobV9pbXBsLT5mcmFtZS0+dmlldygpICYmIG1faW1wbC0+ZnJhbWUt PnZpZXcoKS0+bGF5b3V0UGVuZGluZygpKQorICAgICAgICBtX2ltcGwtPmZyYW1lLT52aWV3KCkt PmxheW91dCgpOwogICAgICAgICAKICAgICBXZWJDb3JlOjpFbGVtZW50ICpkb2N1bWVudEVsZW1l bnQgPSBtX2ltcGwtPmZyYW1lLT5kb2N1bWVudCgpLT5kb2N1bWVudEVsZW1lbnQoKTsKICAgICBy ZXR1cm4gZG9jdW1lbnRFbGVtZW50LT5pbm5lclRleHQoKTsKQEAgLTMxNSw4ICszMDksOCBAQAog CiB3eFN0cmluZyB3eFdlYlZpZXc6OkdldEV4dGVybmFsUmVwcmVzZW50YXRpb24oKQogewotICAg IGlmIChtX2ltcGwtPmZyYW1lVmlldyAmJiBtX2ltcGwtPmZyYW1lVmlldy0+bGF5b3V0UGVuZGlu ZygpKQotICAgICAgICBtX2ltcGwtPmZyYW1lVmlldy0+bGF5b3V0KCk7CisgICAgaWYgKG1faW1w bC0+ZnJhbWUtPnZpZXcoKSAmJiBtX2ltcGwtPmZyYW1lLT52aWV3KCktPmxheW91dFBlbmRpbmco KSkKKyAgICAgICAgbV9pbXBsLT5mcmFtZS0+dmlldygpLT5sYXlvdXQoKTsKIAogICAgIHJldHVy biBleHRlcm5hbFJlcHJlc2VudGF0aW9uKG1faW1wbC0+ZnJhbWUtPmNvbnRlbnRSZW5kZXJlcigp KTsKIH0KQEAgLTQzMiw3ICs0MjYsNyBAQAogCiB2b2lkIHd4V2ViVmlldzo6T25QYWludCh3eFBh aW50RXZlbnQmIGV2ZW50KQogewotICAgIGlmIChtX2JlaW5nRGVzdHJveWVkIHx8ICFtX2ltcGwt PmZyYW1lVmlldyB8fCAhbV9pbXBsLT5mcmFtZSkKKyAgICBpZiAobV9iZWluZ0Rlc3Ryb3llZCB8 fCAhbV9pbXBsLT5mcmFtZS0+dmlldygpIHx8ICFtX2ltcGwtPmZyYW1lKQogICAgICAgICByZXR1 cm47CiAgICAgCiAgICAgd3hBdXRvQnVmZmVyZWRQYWludERDIGRjKHRoaXMpOwpAQCAtNDQ1LDcg KzQzOSw3IEBACiAgICAgICAgIGlmIChkYy5Jc09rKCkpIHsKICAgICAgICAgICAgIHd4UmVjdCBw YWludFJlY3QgPSBHZXRVcGRhdGVSZWdpb24oKS5HZXRCb3goKTsKIAotICAgICAgICAgICAgV2Vi Q29yZTo6SW50U2l6ZSBvZmZzZXQgPSBtX2ltcGwtPmZyYW1lVmlldy0+c2Nyb2xsT2Zmc2V0KCk7 CisgICAgICAgICAgICBXZWJDb3JlOjpJbnRTaXplIG9mZnNldCA9IG1faW1wbC0+ZnJhbWUtPnZp ZXcoKS0+c2Nyb2xsT2Zmc2V0KCk7CiAjaWYgVVNFKFdYR0MpCiAgICAgICAgICAgICBnY2RjLlNl dERldmljZU9yaWdpbigtb2Zmc2V0LndpZHRoKCksIC1vZmZzZXQuaGVpZ2h0KCkpOwogI2VuZGlm CkBAIC00NTgsOCArNDUyLDggQEAKICAgICAgICAgICAgIFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4 dCogZ2MgPSBuZXcgV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0KCh3eFdpbmRvd0RDKikmZGMpOwog I2VuZGlmCiAgICAgICAgICAgICBpZiAoZ2MgJiYgbV9pbXBsLT5mcmFtZS0+Y29udGVudFJlbmRl cmVyKCkpIHsKLSAgICAgICAgICAgICAgICBpZiAobV9pbXBsLT5mcmFtZVZpZXctPm5lZWRzTGF5 b3V0KCkpCi0gICAgICAgICAgICAgICAgICAgIG1faW1wbC0+ZnJhbWVWaWV3LT5sYXlvdXQoKTsK KyAgICAgICAgICAgICAgICBpZiAobV9pbXBsLT5mcmFtZS0+dmlldygpLT5uZWVkc0xheW91dCgp KQorICAgICAgICAgICAgICAgICAgICBtX2ltcGwtPmZyYW1lLT52aWV3KCktPmxheW91dCgpOwog CiAgICAgICAgICAgICAgICAgbV9pbXBsLT5mcmFtZS0+cGFpbnQoZ2MsIHBhaW50UmVjdCk7CiAg ICAgICAgICAgICB9CkBAIC00NjksOSArNDYzLDkgQEAKIAogdm9pZCB3eFdlYlZpZXc6Ok9uU2l6 ZSh3eFNpemVFdmVudCYgZXZlbnQpCiB7IAotICAgIGlmIChtX2lzSW5pdGlhbGl6ZWQgJiYgbV9p bXBsLT5mcmFtZSAmJiBtX2ltcGwtPmZyYW1lVmlldykgeworICAgIGlmIChtX2lzSW5pdGlhbGl6 ZWQgJiYgbV9pbXBsLT5mcmFtZSAmJiBtX2ltcGwtPmZyYW1lLT52aWV3KCkpIHsKICAgICAgICAg bV9pbXBsLT5mcmFtZS0+c2VuZFJlc2l6ZUV2ZW50KCk7Ci0gICAgICAgIG1faW1wbC0+ZnJhbWVW aWV3LT5sYXlvdXQoKTsKKyAgICAgICAgbV9pbXBsLT5mcmFtZS0+dmlldygpLT5sYXlvdXQoKTsK ICAgICB9CiAgICAgCiAgICAgZXZlbnQuU2tpcCgpOwpAQCAtNDgyLDcgKzQ3Niw3IEBACiB7CiAg ICAgZXZlbnQuU2tpcCgpOwogICAgIAotICAgIGlmICghbV9pbXBsLT5mcmFtZSAgJiYgbV9pbXBs LT5mcmFtZVZpZXcpCisgICAgaWYgKCFtX2ltcGwtPmZyYW1lICAmJiBtX2ltcGwtPmZyYW1lLT52 aWV3KCkpCiAgICAgICAgIHJldHVybjsgCiAgICAgICAgIAogICAgIHd4UG9pbnQgZ2xvYmFsUG9p bnQgPSBDbGllbnRUb1NjcmVlbihldmVudC5HZXRQb3NpdGlvbigpKTsKQEAgLTUxMCw3ICs1MDQs NyBAQAogCiBib29sIHd4V2ViVmlldzo6Q2FuQ29weSgpCiB7Ci0gICAgaWYgKG1faW1wbC0+ZnJh bWUgJiYgbV9pbXBsLT5mcmFtZVZpZXcpCisgICAgaWYgKG1faW1wbC0+ZnJhbWUgJiYgbV9pbXBs LT5mcmFtZS0+dmlldygpKQogICAgICAgICByZXR1cm4gKG1faW1wbC0+ZnJhbWUtPmVkaXRvcigp LT5jYW5Db3B5KCkgfHwgbV9pbXBsLT5mcmFtZS0+ZWRpdG9yKCktPmNhbkRIVE1MQ29weSgpKTsK IAogICAgIHJldHVybiBmYWxzZTsKQEAgLTUyNCw3ICs1MTgsNyBAQAogCiBib29sIHd4V2ViVmll dzo6Q2FuQ3V0KCkKIHsKLSAgICBpZiAobV9pbXBsLT5mcmFtZSAmJiBtX2ltcGwtPmZyYW1lVmll dykKKyAgICBpZiAobV9pbXBsLT5mcmFtZSAmJiBtX2ltcGwtPmZyYW1lLT52aWV3KCkpCiAgICAg ICAgIHJldHVybiAobV9pbXBsLT5mcmFtZS0+ZWRpdG9yKCktPmNhbkN1dCgpIHx8IG1faW1wbC0+ ZnJhbWUtPmVkaXRvcigpLT5jYW5ESFRNTEN1dCgpKTsKIAogICAgIHJldHVybiBmYWxzZTsKQEAg LTUzOCw3ICs1MzIsNyBAQAogCiBib29sIHd4V2ViVmlldzo6Q2FuUGFzdGUoKQogewotICAgIGlm IChtX2ltcGwtPmZyYW1lICYmIG1faW1wbC0+ZnJhbWVWaWV3KQorICAgIGlmIChtX2ltcGwtPmZy YW1lICYmIG1faW1wbC0+ZnJhbWUtPnZpZXcoKSkKICAgICAgICAgcmV0dXJuIChtX2ltcGwtPmZy YW1lLT5lZGl0b3IoKS0+Y2FuUGFzdGUoKSB8fCBtX2ltcGwtPmZyYW1lLT5lZGl0b3IoKS0+Y2Fu REhUTUxQYXN0ZSgpKTsKIAogICAgIHJldHVybiBmYWxzZTsKQEAgLTU1Myw3ICs1NDcsNyBAQAog CiB2b2lkIHd4V2ViVmlldzo6T25LZXlFdmVudHMod3hLZXlFdmVudCYgZXZlbnQpCiB7Ci0gICAg aWYgKG1faW1wbC0+ZnJhbWUgJiYgbV9pbXBsLT5mcmFtZVZpZXcpIHsKKyAgICBpZiAobV9pbXBs LT5mcmFtZSAmJiBtX2ltcGwtPmZyYW1lLT52aWV3KCkpIHsKICAgICAgICAgLy8gV2ViQ29yZSBk b2Vzbid0IGhhbmRsZSB0aGVzZSBldmVudHMgaXRzZWxmLCBzbyB3ZSBuZWVkIHRvIGRvCiAgICAg ICAgIC8vIGl0IGFuZCBub3Qgc2VuZCB0aGUgZXZlbnQgZG93biBvciBlbHNlIENUUkwrQyB3aWxs IGVyYXNlIHRoZSB0ZXh0CiAgICAgICAgIC8vIGFuZCByZXBsYWNlIGl0IHdpdGggYy4KSW5kZXg6 IFdlYktpdC93eC9XZWJWaWV3UHJpdmF0ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC93eC9XZWJW aWV3UHJpdmF0ZS5oCShyZXZpc2lvbiAzMzAyOSkKKysrIFdlYktpdC93eC9XZWJWaWV3UHJpdmF0 ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC00MSwxMiArNDEsMTAgQEAKIHB1YmxpYzoKICAgICBXZWJW aWV3UHJpdmF0ZSgpIDoKICAgICAgICAgZnJhbWUoMCksCi0gICAgICAgIGZyYW1lVmlldygwKSwK ICAgICAgICAgcGFnZSgwKQogICAgIHt9CiAgICAgCiAgICAgV1RGOjpSZWZQdHI8V2ViQ29yZTo6 RnJhbWU+IGZyYW1lOwotICAgIFdURjo6UmVmUHRyPFdlYkNvcmU6OkZyYW1lVmlldz4gZnJhbWVW aWV3OwogICAgIFdlYkNvcmU6OlBhZ2UqIHBhZ2U7CiB9OwogCg==