141563 2015-02-13 07:21:16 -0800 [EFL] Implement WebView::rootViewToScreen. 2017-03-11 10:49:15 -0800 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED WONTFIX P2 Normal --- 1 j.isorce webkit-unassigned andersca benjamin lucas.de.marchi mcatanzaro obzhirov oldest_to_newest 1068911 0 j.isorce 2015-02-13 07:21:16 -0800 Currently Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp::rootViewToScreen(const IntRect& rect) is not implemented. 1068914 1 246523 j.isorce 2015-02-13 07:33:09 -0800 Created attachment 246523 [EFL] Implement WebView::rootViewToScreen. 1069668 2 246523 gyuyoung.kim 2015-02-16 16:42:03 -0800 Comment on attachment 246523 [EFL] Implement WebView::rootViewToScreen. View in context: https://bugs.webkit.org/attachment.cgi?id=246523&action=review I don't object to implement new function. However I think you need to explain why this function is needed for us. > Source/WebKit2/ChangeLog:8 > + All of these are just glue except EwkView::rootViewToScreen. Could you explain what is a role of rootViewToScreen ? > Source/WebKit2/UIProcess/WebPageProxy.h:1104 > void screenToRootView(const WebCore::IntPoint& screenPoint, WebCore::IntPoint& windowPoint); If you need to use rootViewToScreen(), don't we need to support screenToRootView() as well ? > Source/WebKit2/UIProcess/WebPageProxy.h:-1104 > - void rootViewToScreen(const WebCore::IntRect& viewRect, WebCore::IntRect& result); This move should be approved by WK2 owner. 1069819 3 j.isorce 2015-02-17 05:15:28 -0800 (In reply to comment #2) > Comment on attachment 246523 [details] > [EFL] Implement WebView::rootViewToScreen. > > View in context: > https://bugs.webkit.org/attachment.cgi?id=246523&action=review > > I don't object to implement new function. However I think you need to > explain why this function is needed for us. First thx for the initial review. This is not a really new function. This is an existing function that is currently implemented with "NotImplemented" for coordinates graphics: WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp::WebView::rootViewToScreen. I am not sure of the history but I suspect it was supported with WebKit1 but it has not been fully ported to WebKit2. Also in Source/WebCore/platform/HostWindow.h there is virtual IntRect rootViewToScreen(const IntRect&) const = 0; Actually it is implemented for GTK already: WebKit2/UIProcess/API/gtk/PageClientImpl.cpp::PageClientImpl::rootViewToScreen Also the following code already exists in WebKit2/WebProcess/WebPage/WebPage.pp: IntPoint WebPage::screenToRootView(const IntPoint& point) { IntPoint windowPoint; sendSync(Messages::WebPageProxy::ScreenToRootView(point), Messages::WebPageProxy::ScreenToRootView::Reply(windowPoint)); return windowPoint; } IntRect WebPage::rootViewToScreen(const IntRect& rect) { IntRect screenRect; sendSync(Messages::WebPageProxy::RootViewToScreen(rect), Messages::WebPageProxy::RootViewToScreen::Reply(screenRect)); return screenRect; } > > > Source/WebKit2/ChangeLog:8 > > + All of these are just glue except EwkView::rootViewToScreen. > > Could you explain what is a role of rootViewToScreen ? The general idea is to be able to know the webkit view position in the screen within the webprocess. The webprocess needs some informations about the root view that only the UI process knows. > > > Source/WebKit2/UIProcess/WebPageProxy.h:1104 > > void screenToRootView(const WebCore::IntPoint& screenPoint, WebCore::IntPoint& windowPoint); > > If you need to use rootViewToScreen(), don't we need to support > screenToRootView() as well ? Yes indeed I should add screenToRootView as well. > > > Source/WebKit2/UIProcess/WebPageProxy.h:-1104 > > - void rootViewToScreen(const WebCore::IntRect& viewRect, WebCore::IntRect& result); > > This move should be approved by WK2 owner. All right, I'll add some in CC 1283159 4 246523 achristensen 2017-03-03 08:31:50 -0800 Comment on attachment 246523 [EFL] Implement WebView::rootViewToScreen. EFL port was removed. This patch is no longer necessary in trunk. 1286713 5 mcatanzaro 2017-03-11 10:49:15 -0800 Closing this bug because the EFL port has been removed from trunk. If you feel this bug applies to a different upstream WebKit port and was closed in error, please either update the title and reopen the bug, or leave a comment to request this. 246523 2015-02-13 07:33:09 -0800 2017-03-03 08:31:50 -0800 [EFL] Implement WebView::rootViewToScreen. 0001-EFL-Implement-WebView-rootViewToScreen.patch text/plain 10110 j.isorce RnJvbSA1YmZkMWE3ZGI1ZTgyNmFmZTcwZDliYWViZWQ0MDc0NjVkZTA3Y2NjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKdWxpZW4gSXNvcmNlIDxqLmlzb3JjZUBzYW1zdW5nLmNvbT4K RGF0ZTogRnJpLCA5IEphbiAyMDE1IDE0OjEyOjM2ICswMDAwClN1YmplY3Q6IFtQQVRDSF0gW0VG TF0gSW1wbGVtZW50IFdlYlZpZXc6OnJvb3RWaWV3VG9TY3JlZW4uCiBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQxNTYzCgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KCkFsbCBvZiB0aGVzZSBhcmUganVzdCBnbHVlIGV4Y2VwdCBFd2tWaWV3Ojpyb290Vmlld1Rv U2NyZWVuLgoKKiBVSVByb2Nlc3MvQVBJL0MvQ29vcmRpbmF0ZWRHcmFwaGljcy9XS1ZpZXcuaDoK KiBVSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3LmNwcDoKKEV3a1ZpZXc6OnJvb3RWaWV3VG9TY3Jl ZW4pOgoqIFVJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXcuaDoKKiBVSVByb2Nlc3MvQ29vcmRpbmF0 ZWRHcmFwaGljcy9XZWJWaWV3LmNwcDoKKFdlYktpdDo6V2ViVmlldzo6cm9vdFZpZXdUb1NjcmVl bik6CiogVUlQcm9jZXNzL0Nvb3JkaW5hdGVkR3JhcGhpY3MvV2ViVmlld0NsaWVudC5jcHA6CihX ZWJLaXQ6OldlYlZpZXdDbGllbnQ6OnJvb3RWaWV3VG9TY3JlZW4pOgoqIFVJUHJvY2Vzcy9Db29y ZGluYXRlZEdyYXBoaWNzL1dlYlZpZXdDbGllbnQuaDoKKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5 Lmg6CiogVUlQcm9jZXNzL2VmbC9WaWV3Q2xpZW50RWZsLmNwcDoKKFdlYktpdDo6Vmlld0NsaWVu dEVmbDo6cm9vdFZpZXdUb1NjcmVlbik6CihXZWJLaXQ6OlZpZXdDbGllbnRFZmw6OlZpZXdDbGll bnRFZmwpOgoqIFVJUHJvY2Vzcy9lZmwvVmlld0NsaWVudEVmbC5oOgotLS0KIFNvdXJjZS9XZWJL aXQyL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgMjQgKysrKysrKysrKysr KysrKysrKysrKwogLi4uL1VJUHJvY2Vzcy9BUEkvQy9Db29yZGluYXRlZEdyYXBoaWNzL1dLVmll dy5oICAgfCAgMiArKwogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlldy5j cHAgICAgICAgfCAgOCArKysrKysrKwogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwv RXdrVmlldy5oICAgICAgICAgfCAgMiArKwogLi4uL1VJUHJvY2Vzcy9Db29yZGluYXRlZEdyYXBo aWNzL1dlYlZpZXcuY3BwICAgICAgfCAgNSArKy0tLQogLi4uL0Nvb3JkaW5hdGVkR3JhcGhpY3Mv V2ViVmlld0NsaWVudC5jcHAgICAgICAgICAgfCAgNiArKysrKysKIC4uLi9VSVByb2Nlc3MvQ29v cmRpbmF0ZWRHcmFwaGljcy9XZWJWaWV3Q2xpZW50LmggIHwgIDEgKwogU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oICAgICAgICAgICAgfCAgMiArLQogU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL2VmbC9WaWV3Q2xpZW50RWZsLmNwcCAgICAgfCAgNiArKysrKysKIFNvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvVmlld0NsaWVudEVmbC5oICAgICAgIHwgIDEgKwogMTAg ZmlsZXMgY2hhbmdlZCwgNTMgaW5zZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cK aW5kZXggNGEzYWY4OS4uNDE0ZTM4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE1 LTAyLTEzICBKdWxpZW4gSXNvcmNlICA8ai5pc29yY2VAc2Ftc3VuZy5jb20+CisKKyAgICAgICAg W0VGTF0gSW1wbGVtZW50IFdlYlZpZXc6OnJvb3RWaWV3VG9TY3JlZW4uCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDE1NjMKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBbGwgb2YgdGhlc2UgYXJlIGp1c3Qg Z2x1ZSBleGNlcHQgRXdrVmlldzo6cm9vdFZpZXdUb1NjcmVlbi4KKworICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvQy9Db29yZGluYXRlZEdyYXBoaWNzL1dLVmlldy5oOgorICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvZWZsL0V3a1ZpZXcuY3BwOgorICAgICAgICAoRXdrVmlldzo6cm9vdFZpZXdUb1Nj cmVlbik6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlldy5oOgorICAgICAgICAq IFVJUHJvY2Vzcy9Db29yZGluYXRlZEdyYXBoaWNzL1dlYlZpZXcuY3BwOgorICAgICAgICAoV2Vi S2l0OjpXZWJWaWV3Ojpyb290Vmlld1RvU2NyZWVuKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQ29v cmRpbmF0ZWRHcmFwaGljcy9XZWJWaWV3Q2xpZW50LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2Vi Vmlld0NsaWVudDo6cm9vdFZpZXdUb1NjcmVlbik6CisgICAgICAgICogVUlQcm9jZXNzL0Nvb3Jk aW5hdGVkR3JhcGhpY3MvV2ViVmlld0NsaWVudC5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQ YWdlUHJveHkuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvZWZsL1ZpZXdDbGllbnRFZmwuY3BwOgor ICAgICAgICAoV2ViS2l0OjpWaWV3Q2xpZW50RWZsOjpyb290Vmlld1RvU2NyZWVuKToKKyAgICAg ICAgKFdlYktpdDo6Vmlld0NsaWVudEVmbDo6Vmlld0NsaWVudEVmbCk6CisgICAgICAgICogVUlQ cm9jZXNzL2VmbC9WaWV3Q2xpZW50RWZsLmg6CisKIDIwMTUtMDItMTIgIFRpbSBIb3J0b24gIDx0 aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAKICAgICAgICAgQ3Jhc2ggcmVtb3ZpbmcgUmVtb3Rl TGF5ZXJUcmVlRGlzcGxheVJlZnJlc2hNb25pdG9yIGZyb20gdGhlIGRyYXdpbmcgYXJlYSdzIG1h cApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL0Nvb3JkaW5hdGVk R3JhcGhpY3MvV0tWaWV3LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvQ29vcmRp bmF0ZWRHcmFwaGljcy9XS1ZpZXcuaAppbmRleCBmMTQ4OGUzLi5mNDUwMjAxIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvQ29vcmRpbmF0ZWRHcmFwaGljcy9XS1Zp ZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvQ29vcmRpbmF0ZWRHcmFw aGljcy9XS1ZpZXcuaApAQCAtNDIsNiArNDIsNyBAQCB0eXBlZGVmIHZvaWQgKCpXS1ZpZXdQYWdl RGlkQ2hhbmdlVmlld3BvcnRBdHRyaWJ1dGVzQ2FsbGJhY2spKFdLVmlld1JlZiB2aWV3LCBXSwog dHlwZWRlZiB2b2lkICgqV0tWaWV3UGFnZURpZENoYW5nZVRvb2x0aXBDYWxsYmFjaykoV0tWaWV3 UmVmIHZpZXcsIFdLU3RyaW5nUmVmIG5ld1Rvb2x0aXAsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8p OwogdHlwZWRlZiB2b2lkICgqV0tWaWV3RGlkRmluZFpvb21hYmxlQXJlYUNhbGxiYWNrKShXS1Zp ZXdSZWYgdmlldywgV0tQb2ludCBwb2ludCwgV0tSZWN0IGFyZWEsIGNvbnN0IHZvaWQqIGNsaWVu dEluZm8pOwogdHlwZWRlZiB2b2lkICgqV0tWaWV3RG9uZVdpdGhUb3VjaEV2ZW50Q2FsbGJhY2sp KFdLVmlld1JlZiB2aWV3LCBXS1RvdWNoRXZlbnRSZWYgdG91Y2hFdmVudCwgYm9vbCB3YXNFdmVu dEhhbmRsZWQsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pOwordHlwZWRlZiBXS1JlY3QgKCpXS1Zp ZXdyb290Vmlld1RvU2NyZWVuQ2FsbGJhY2spKFdLVmlld1JlZiB2aWV3LCBXS1JlY3QgcmVjdCwg Y29uc3Qgdm9pZCogY2xpZW50SW5mbyk7CiAKIHR5cGVkZWYgc3RydWN0IFdLVmlld0NsaWVudEJh c2UgewogICAgIGludCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICB2ZXJzaW9uOwpAQCAtNjIsNiArNjMsNyBAQCB0eXBlZGVmIHN0cnVjdCBXS1ZpZXdDbGllbnRW MCB7CiAgICAgV0tWaWV3UGFnZURpZENoYW5nZVRvb2x0aXBDYWxsYmFjayAgICAgICAgICAgICAg IGRpZENoYW5nZVRvb2x0aXA7CiAgICAgV0tWaWV3RGlkRmluZFpvb21hYmxlQXJlYUNhbGxiYWNr ICAgICAgICAgICAgICAgIGRpZEZpbmRab29tYWJsZUFyZWE7CiAgICAgV0tWaWV3RG9uZVdpdGhU b3VjaEV2ZW50Q2FsbGJhY2sgICAgICAgICAgICAgICAgIGRvbmVXaXRoVG91Y2hFdmVudDsKKyAg ICBXS1ZpZXdyb290Vmlld1RvU2NyZWVuQ2FsbGJhY2sgICAgICAgICAgICAgICAgICAgcm9vdFZp ZXdUb1NjcmVlbjsKIH0gV0tWaWV3Q2xpZW50VjA7CiAKIFdLX0VYUE9SVCBXS1ZpZXdSZWYgV0tW aWV3Q3JlYXRlKFdLQ29udGV4dFJlZiBjb250ZXh0LCBXS1BhZ2VHcm91cFJlZiBwYWdlR3JvdXAp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlldy5j cHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3LmNwcAppbmRleCBl ZTUwM2E3Li5kNzczMzc4IDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2VmbC9Fd2tWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9F d2tWaWV3LmNwcApAQCAtMTQ1NCw1ICsxNDU0LDEzIEBAIHZvaWQgRXdrVmlldzo6c2V0QmFja2dy b3VuZENvbG9yKGludCByZWQsIGludCBncmVlbiwgaW50IGJsdWUsIGludCBhbHBoYSkKICAgICBX S1ZpZXdTZXRCYWNrZ3JvdW5kQ29sb3Iod2tWaWV3KCksIHJlZCwgZ3JlZW4sIGJsdWUsIGFscGhh KTsKIH0KIAorV0tSZWN0IEV3a1ZpZXc6OnJvb3RWaWV3VG9TY3JlZW4oY29uc3QgV0tSZWN0JiBy ZWN0KQoreworICAgIFdlYkNvcmU6OkFmZmluZVRyYW5zZm9ybSB0cmFuc2Zvcm0gPSB0cmFuc2Zv cm1Ub1NjcmVlbigpOworICAgIHRyYW5zZm9ybS50cmFuc2xhdGUoc21hcnREYXRhKCktPnZpZXcu eCwgc21hcnREYXRhKCktPnZpZXcueSk7CisgICAgRmxvYXRQb2ludCBwID0gdHJhbnNmb3JtLm1h cFBvaW50KEZsb2F0UG9pbnQocmVjdC5vcmlnaW4ueCwgIHJlY3Qub3JpZ2luLnkpKTsKKyAgICBy ZXR1cm4gV0tSZWN0TWFrZShwLngoKSwgcC55KCksIHJlY3Quc2l6ZS53aWR0aCwgcmVjdC5zaXpl LmhlaWdodCk7Cit9CisKIEV2YXNfU21hcnRfQ2xhc3MgRXdrVmlldzo6cGFyZW50U21hcnRDbGFz cyA9IEVWQVNfU01BUlRfQ0xBU1NfSU5JVF9OVUxMOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL2VmbC9Fd2tWaWV3LmgKaW5kZXggNDE0ZWFiZi4uMmFhM2I1YiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlldy5oCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXcuaApAQCAtMjAyLDYgKzIwMiw4IEBAIHB1 YmxpYzoKIAogICAgIHZvaWQgZGlkRmluZFpvb21hYmxlQXJlYShjb25zdCBXS1BvaW50JiwgY29u c3QgV0tSZWN0Jik7CiAKKyAgICBXS1JlY3Qgcm9vdFZpZXdUb1NjcmVlbihjb25zdCBXS1JlY3Qm KTsKKwogICAgIHN0YXRpYyBjb25zdCBjaGFyIHNtYXJ0Q2xhc3NOYW1lW107CiAKICNpZiBIQVZF KEFDQ0VTU0lCSUxJVFkpICYmIGRlZmluZWQoSEFWRV9FQ09SRV9YKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0Nvb3JkaW5hdGVkR3JhcGhpY3MvV2ViVmlldy5jcHAgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29vcmRpbmF0ZWRHcmFwaGljcy9XZWJWaWV3LmNwcApp bmRleCBmOTdkNWNhLi40YTAwZmQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQ29vcmRpbmF0ZWRHcmFwaGljcy9XZWJWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQ29vcmRpbmF0ZWRHcmFwaGljcy9XZWJWaWV3LmNwcApAQCAtNDEyLDEwICs0MTIs OSBAQCBJbnRQb2ludCBXZWJWaWV3OjpzY3JlZW5Ub1Jvb3RWaWV3KGNvbnN0IEludFBvaW50JiBw b2ludCkKICAgICByZXR1cm4gcG9pbnQ7CiB9CiAKLUludFJlY3QgV2ViVmlldzo6cm9vdFZpZXdU b1NjcmVlbihjb25zdCBJbnRSZWN0JikKK0ludFJlY3QgV2ViVmlldzo6cm9vdFZpZXdUb1NjcmVl bihjb25zdCBJbnRSZWN0JiByZWN0KQogewotICAgIG5vdEltcGxlbWVudGVkKCk7Ci0gICAgcmV0 dXJuIEludFJlY3QoKTsKKyAgICByZXR1cm4gbV9jbGllbnQucm9vdFZpZXdUb1NjcmVlbih0aGlz LCByZWN0KTsKIH0KIAogdm9pZCBXZWJWaWV3Ojpkb25lV2l0aEtleUV2ZW50KGNvbnN0IE5hdGl2 ZVdlYktleWJvYXJkRXZlbnQmLCBib29sKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0Nvb3JkaW5hdGVkR3JhcGhpY3MvV2ViVmlld0NsaWVudC5jcHAgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQ29vcmRpbmF0ZWRHcmFwaGljcy9XZWJWaWV3Q2xpZW50LmNwcAppbmRl eCAwMzE2ZGMyLi5mMzZkNWY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv Q29vcmRpbmF0ZWRHcmFwaGljcy9XZWJWaWV3Q2xpZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQ29vcmRpbmF0ZWRHcmFwaGljcy9XZWJWaWV3Q2xpZW50LmNwcApAQCAtMTQx LDYgKzE0MSwxMiBAQCB2b2lkIFdlYlZpZXdDbGllbnQ6OmRvbmVXaXRoVG91Y2hFdmVudChXZWJW aWV3KiB2aWV3LCBjb25zdCBOYXRpdmVXZWJUb3VjaEV2ZW50JgogfQogI2VuZGlmCiAKK1dlYkNv cmU6OkludFJlY3QgV2ViVmlld0NsaWVudDo6cm9vdFZpZXdUb1NjcmVlbihXZWJWaWV3KiB2aWV3 LCBjb25zdCBJbnRSZWN0JiByZWN0KQoreworICAgIFdLUmVjdCByID0gbV9jbGllbnQucm9vdFZp ZXdUb1NjcmVlbih0b0FQSSh2aWV3KSwgdG9BUEkocmVjdCksIG1fY2xpZW50LmJhc2UuY2xpZW50 SW5mbyk7CisgICAgcmV0dXJuIFdlYkNvcmU6OkludFJlY3Qoci5vcmlnaW4ueCwgci5vcmlnaW4u eSwgci5zaXplLndpZHRoLCByLnNpemUuaGVpZ2h0KTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2Vi S2l0CiAKICNlbmRpZiAvLyBVU0UoQ09PUkRJTkFURURfR1JBUEhJQ1MpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29vcmRpbmF0ZWRHcmFwaGljcy9XZWJWaWV3Q2xpZW50 LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29vcmRpbmF0ZWRHcmFwaGljcy9XZWJWaWV3 Q2xpZW50LmgKaW5kZXggZDY0ODZlYi4uYzBjNmI4OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0Nvb3JkaW5hdGVkR3JhcGhpY3MvV2ViVmlld0NsaWVudC5oCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db29yZGluYXRlZEdyYXBoaWNzL1dlYlZpZXdDbGllbnQu aApAQCAtNjgsNiArNjgsNyBAQCBwdWJsaWM6CiAjaWYgRU5BQkxFKFRPVUNIX0VWRU5UUykKICAg ICB2b2lkIGRvbmVXaXRoVG91Y2hFdmVudChXZWJWaWV3KiwgY29uc3QgTmF0aXZlV2ViVG91Y2hF dmVudCYsIGJvb2wpOwogI2VuZGlmCisgICAgV2ViQ29yZTo6SW50UmVjdCByb290Vmlld1RvU2Ny ZWVuKFdlYlZpZXcqLCBjb25zdCBXZWJDb3JlOjpJbnRSZWN0Jik7CiB9OwogCiB9IC8vIG5hbWVz cGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAppbmRleCBj OTJjYTg5Li40YzkwMDcwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi UGFnZVByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5o CkBAIC05ODcsNiArOTg3LDcgQEAgcHVibGljOgogICAgIHZvaWQgZ2V0R3Vlc3Nlc0ZvcldvcmQo Y29uc3QgU3RyaW5nJiB3b3JkLCBjb25zdCBTdHJpbmcmIGNvbnRleHQsIFZlY3RvcjxTdHJpbmc+ JiBndWVzc2VzKTsKIAogICAgIHZvaWQgc2V0U2hvdWxkRGlzcGF0Y2hGYWtlTW91c2VNb3ZlRXZl bnRzKGJvb2wpOworICAgIHZvaWQgcm9vdFZpZXdUb1NjcmVlbihjb25zdCBXZWJDb3JlOjpJbnRS ZWN0JiB2aWV3UmVjdCwgV2ViQ29yZTo6SW50UmVjdCYgcmVzdWx0KTsKIAogICAgIC8vIERpYWdu b3N0aWMgbWVzc2FnZXMgbG9nZ2luZy4KICAgICB2b2lkIGxvZ0RpYWdub3N0aWNNZXNzYWdlKGNv bnN0IFN0cmluZyYgbWVzc2FnZSwgY29uc3QgU3RyaW5nJiBkZXNjcmlwdGlvbik7CkBAIC0xMTAx LDcgKzExMDIsNiBAQCBwcml2YXRlOgogICAgIHZvaWQgc2V0V2luZG93RnJhbWUoY29uc3QgV2Vi Q29yZTo6RmxvYXRSZWN0Jik7CiAgICAgdm9pZCBnZXRXaW5kb3dGcmFtZShXZWJDb3JlOjpGbG9h dFJlY3QmKTsKICAgICB2b2lkIHNjcmVlblRvUm9vdFZpZXcoY29uc3QgV2ViQ29yZTo6SW50UG9p bnQmIHNjcmVlblBvaW50LCBXZWJDb3JlOjpJbnRQb2ludCYgd2luZG93UG9pbnQpOwotICAgIHZv aWQgcm9vdFZpZXdUb1NjcmVlbihjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiB2aWV3UmVjdCwgV2Vi Q29yZTo6SW50UmVjdCYgcmVzdWx0KTsKICNpZiBQTEFURk9STShJT1MpCiAgICAgdm9pZCBhY2Nl c3NpYmlsaXR5U2NyZWVuVG9Sb290Vmlldyhjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYgc2NyZWVu UG9pbnQsIFdlYkNvcmU6OkludFBvaW50JiB3aW5kb3dQb2ludCk7CiAgICAgdm9pZCByb290Vmll d1RvQWNjZXNzaWJpbGl0eVNjcmVlbihjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiB2aWV3UmVjdCwg V2ViQ29yZTo6SW50UmVjdCYgcmVzdWx0KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9lZmwvVmlld0NsaWVudEVmbC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv ZWZsL1ZpZXdDbGllbnRFZmwuY3BwCmluZGV4IDFjYjlkMjcuLjU3N2E0YWQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvVmlld0NsaWVudEVmbC5jcHAKKysrIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9WaWV3Q2xpZW50RWZsLmNwcApAQCAtMTY3LDYgKzE2 NywxMSBAQCB2b2lkIFZpZXdDbGllbnRFZmw6OmVuZENvbG9yUGlja2VyKFdLVmlld1JlZiwgY29u c3Qgdm9pZCogY2xpZW50SW5mbykKIH0KICNlbmRpZgogCitXS1JlY3QgVmlld0NsaWVudEVmbDo6 cm9vdFZpZXdUb1NjcmVlbihXS1ZpZXdSZWYsIFdLUmVjdCByZWN0LCBjb25zdCB2b2lkKiBjbGll bnRJbmZvKQoreworICAgIHJldHVybiB0b0V3a1ZpZXcoY2xpZW50SW5mbyktPnJvb3RWaWV3VG9T Y3JlZW4ocmVjdCk7Cit9CisKIFZpZXdDbGllbnRFZmw6OlZpZXdDbGllbnRFZmwoRXdrVmlldyog dmlldykKICAgICA6IG1fdmlldyh2aWV3KQogewpAQCAtMTg5LDYgKzE5NCw3IEBAIFZpZXdDbGll bnRFZmw6OlZpZXdDbGllbnRFZmwoRXdrVmlldyogdmlldykKICNpZiBFTkFCTEUoVE9VQ0hfRVZF TlRTKQogICAgIHZpZXdDbGllbnQuZG9uZVdpdGhUb3VjaEV2ZW50ID0gZG9uZVdpdGhUb3VjaEV2 ZW50OwogI2VuZGlmCisgICAgdmlld0NsaWVudC5yb290Vmlld1RvU2NyZWVuID0gcm9vdFZpZXdU b1NjcmVlbjsKIAogICAgIFdLVmlld1NldFZpZXdDbGllbnQobV92aWV3LT53a1ZpZXcoKSwgJnZp ZXdDbGllbnQuYmFzZSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9l ZmwvVmlld0NsaWVudEVmbC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9WaWV3Q2xp ZW50RWZsLmgKaW5kZXggM2RlNjI5OC4uZjJmNDEyMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL2VmbC9WaWV3Q2xpZW50RWZsLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL2VmbC9WaWV3Q2xpZW50RWZsLmgKQEAgLTU3LDYgKzU3LDcgQEAgcHJpdmF0ZToKICAg ICBzdGF0aWMgdm9pZCBzaG93Q29sb3JQaWNrZXIoV0tWaWV3UmVmLCBXS1N0cmluZ1JlZiwgV0tD b2xvclBpY2tlclJlc3VsdExpc3RlbmVyUmVmLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKTsKICAg ICBzdGF0aWMgdm9pZCBlbmRDb2xvclBpY2tlcihXS1ZpZXdSZWYsIGNvbnN0IHZvaWQqIGNsaWVu dEluZm8pOwogI2VuZGlmCisgICAgc3RhdGljIFdLUmVjdCByb290Vmlld1RvU2NyZWVuKFdLVmll d1JlZiwgV0tSZWN0LCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKTsKIAogICAgIEV3a1ZpZXcqIG1f dmlldzsKIH07Ci0tIAoxLjkuMQoK