55960 2011-03-08 12:28:39 -0800 [GTK] [WebKit2] WebView::windowToScreen needs an implementation 2011-05-06 16:29:57 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P3 Normal --- 1 mrobinson mrobinson oldest_to_newest 364103 0 mrobinson 2011-03-08 12:28:39 -0800 WebView::windowToScreen was added to PageClientImpl in r80569. 364106 1 85080 mrobinson 2011-03-08 12:32:53 -0800 Created attachment 85080 Patch 364733 2 85222 mrobinson 2011-03-09 13:16:50 -0800 Created attachment 85222 Patch using duplicating calculating from WebKit1 377788 3 85222 cgarcia 2011-04-01 07:59:32 -0700 Comment on attachment 85222 Patch using duplicating calculating from WebKit1 View in context: https://bugs.webkit.org/attachment.cgi?id=85222&action=review > Source/WebKit2/UIProcess/gtk/WebView.cpp:243 > + GtkWidget* toplevel = gtk_widget_get_toplevel(m_viewWidget); > + if (!toplevel || !gtk_widget_is_toplevel(toplevel) || !GTK_IS_WINDOW(toplevel)) > + return rect; > + > + int xInWindow, yInWindow; > + gtk_widget_translate_coordinates(m_viewWidget, toplevel, rect.x(), rect.y(), &xInWindow, &yInWindow); > + int windowOriginX, windowOriginY; > + gdk_window_get_origin(gtk_widget_get_window(toplevel), &windowOriginX, &windowOriginY); > + > + IntRect rectInScreenCoordinates(rect); > + rectInScreenCoordinates.move(windowOriginX + xInWindow, windowOriginY + yInWindow); > + return rectInScreenCoordinates; hmm, isn't all this the same than simply calling gdk_window_get_origin(gtk_widget_get_window(m_viewWidget), &x, &y); ? 379113 4 mrobinson 2011-04-04 15:07:27 -0700 (In reply to comment #3) > hmm, isn't all this the same than simply calling gdk_window_get_origin(gtk_widget_get_window(m_viewWidget), &x, &y); ? Carlos and I talked about this before and I explained how a more complex implementation is likely necessary because widgets can share GdkWindows. 392904 5 85222 xan.lopez 2011-04-26 15:59:28 -0700 Comment on attachment 85222 Patch using duplicating calculating from WebKit1 IIRC this is very similar to the code in WebKit1? Wasn't the plan to move it into WebCore somehow and share it? r- for now! 396804 6 92009 mrobinson 2011-05-02 17:06:07 -0700 Created attachment 92009 Patch 399197 7 92009 xan.lopez 2011-05-05 17:01:54 -0700 Comment on attachment 92009 Patch Alright. 399896 8 92009 mrobinson 2011-05-06 16:29:54 -0700 Comment on attachment 92009 Patch Clearing flags on attachment: 92009 Committed r85987: <http://trac.webkit.org/changeset/85987> 399897 9 mrobinson 2011-05-06 16:29:57 -0700 All reviewed patches have been landed. Closing bug. 85080 2011-03-08 12:32:53 -0800 2011-03-09 09:30:39 -0800 Patch bug-55960-20110308123254.patch text/plain 1628 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogODA1ODEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCBiMGMxN2JjNTY4ZDZhMmNh Yzg4YzQ0YmViYThhZmJmNzViZjk2M2UzLi5iY2I1OTRiYWVhOWM1YmRjNjRlZjllODU4MGYwNTc0 Y2I2YTdjY2MzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMDMtMDggIE1hcnRp biBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHVEtdIFtXZWJLaXQyXSBXZWJWaWV3Ojp3aW5k b3dUb1NjcmVlbiBuZWVkcyBhbiBpbXBsZW1lbnRhdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTU5NjAKKworICAgICAgICBBZGQgYW4gaW1wbGVt ZW50YXRpb24gb2YgUGFnZUNsaWVudDo6d2luZG93VG9TY3JlZW4gZm9yIEdUSysuCisKKyAgICAg ICAgKiBVSVByb2Nlc3MvZ3RrL1dlYlZpZXcuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3 Ojp3aW5kb3dUb1NjcmVlbik6IEFkZGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9ndGsvV2ViVmll dy5oOgorCiAyMDExLTAzLTA4ICBBbGVqYW5kcm8gRy4gQ2FzdHJvICA8YWxleEBpZ2FsaWEuY29t PgogCiAgICAgICAgIFVucmV2aWV3ZWQsIGZpeGVkIEdUSysgY29tcGlsYXRpb24gYWZ0ZXIgcjgw NTY5LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9XZWJWaWV3LmNw cCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9ndGsvV2ViVmlldy5jcHAKaW5kZXggNGI0OTcy N2Y2NGNhODlkMWQ4MjJiMjZmMWU3MDJhZWI0NDY4Y2I5Yy4uOGIxNDUwMTg5YTVkMDlkNjA2Mzlh NWMzZDNlM2YzYTFjZjU0YmRmOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L2d0ay9XZWJWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL1dlYlZp ZXcuY3BwCkBAIC0yMjMsOCArMjIzLDE2IEBAIEZsb2F0UmVjdCBXZWJWaWV3Ojpjb252ZXJ0VG9V c2VyU3BhY2UoY29uc3QgRmxvYXRSZWN0JiB2aWV3UmVjdCkKIAogSW50UmVjdCBXZWJWaWV3Ojp3 aW5kb3dUb1NjcmVlbihjb25zdCBJbnRSZWN0JiByZWN0KQogewotICAgIG5vdEltcGxlbWVudGVk KCk7Ci0gICAgcmV0dXJuIEludFJlY3QoKTsKKyAgICBHZGtXaW5kb3cqIHdpZGdldFdpbmRvdyA9 IGd0a193aWRnZXRfZ2V0X3dpbmRvdyhtX3ZpZXdXaWRnZXQpOworICAgIGlmICghd2lkZ2V0V2lu ZG93KQorICAgICAgICByZXR1cm4gcmVjdDsKKworICAgIGludCB4LCB5OworICAgIGdka193aW5k b3dfZ2V0X29yaWdpbih3aWRnZXRXaW5kb3csICZ4LCAmeSk7CisKKyAgICBJbnRSZWN0IG5ld1Jl Y3QocmVjdCk7CisgICAgbmV3UmVjdC5tb3ZlKHgsIHkpOworICAgIHJldHVybiBuZXdSZWN0Owog fQogCiB2b2lkIFdlYlZpZXc6OmRvbmVXaXRoS2V5RXZlbnQoY29uc3QgTmF0aXZlV2ViS2V5Ym9h cmRFdmVudCYsIGJvb2wgd2FzRXZlbnRIYW5kbGVkKQo= 85222 2011-03-09 13:16:50 -0800 2011-05-02 17:06:02 -0700 Patch using duplicating calculating from WebKit1 bug-55960-20110309131648.patch text/plain 1956 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogODA1OTUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCBhN2FkZmFkNzQyYmQ1ZjY4 MjM2OTgwN2ViM2FhNDJhZWRjODY5NTNlLi44NzE5YjE5NjViNTZjZjMzOTU0MGI4NTA2ZWI1MjFk NGM5ZjZhNDJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMDMtMDggIE1hcnRp biBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHVEtdIFtXZWJLaXQyXSBXZWJWaWV3Ojp3aW5k b3dUb1NjcmVlbiBuZWVkcyBhbiBpbXBsZW1lbnRhdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTU5NjAKKworICAgICAgICBBZGQgYW4gaW1wbGVt ZW50YXRpb24gb2YgUGFnZUNsaWVudDo6d2luZG93VG9TY3JlZW4gZm9yIEdUSysuCisKKyAgICAg ICAgKiBVSVByb2Nlc3MvZ3RrL1dlYlZpZXcuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3 Ojp3aW5kb3dUb1NjcmVlbik6IEFkZGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9ndGsvV2ViVmll dy5oOgorCiAyMDExLTAzLTA4ICBJdmFuIEtyc3RpxIcgIDxpa2VAYXBwbGUuY29tPgogCiAgICAg ICAgIFJldmlld2VkIGJ5IFNhbSBXZWluaWcuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvZ3RrL1dlYlZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9X ZWJWaWV3LmNwcAppbmRleCAxMzhmMTZlZDM5ODQ5NDBlZDc5Yzg4ZjBjYTYyYmVjOTk2MTExM2Yx Li5jMDdhYzcxNTljZGRlMjY2Mjk0ODAyMTUxYzJkNzIxNTAxN2YyNzRkIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL1dlYlZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9ndGsvV2ViVmlldy5jcHAKQEAgLTIyOCw4ICsyMjgsMTkgQEAgRmxvYXRS ZWN0IFdlYlZpZXc6OmNvbnZlcnRUb1VzZXJTcGFjZShjb25zdCBGbG9hdFJlY3QmIHZpZXdSZWN0 KQogCiBJbnRSZWN0IFdlYlZpZXc6OndpbmRvd1RvU2NyZWVuKGNvbnN0IEludFJlY3QmIHJlY3Qp CiB7Ci0gICAgbm90SW1wbGVtZW50ZWQoKTsKLSAgICByZXR1cm4gSW50UmVjdCgpOworCisgICAg R3RrV2lkZ2V0KiB0b3BsZXZlbCA9IGd0a193aWRnZXRfZ2V0X3RvcGxldmVsKG1fdmlld1dpZGdl dCk7CisgICAgaWYgKCF0b3BsZXZlbCB8fCAhZ3RrX3dpZGdldF9pc190b3BsZXZlbCh0b3BsZXZl bCkgfHwgIUdUS19JU19XSU5ET1codG9wbGV2ZWwpKQorICAgICAgICByZXR1cm4gcmVjdDsKKwor ICAgIGludCB4SW5XaW5kb3csIHlJbldpbmRvdzsKKyAgICBndGtfd2lkZ2V0X3RyYW5zbGF0ZV9j b29yZGluYXRlcyhtX3ZpZXdXaWRnZXQsIHRvcGxldmVsLCByZWN0LngoKSwgcmVjdC55KCksICZ4 SW5XaW5kb3csICZ5SW5XaW5kb3cpOworICAgIGludCB3aW5kb3dPcmlnaW5YLCB3aW5kb3dPcmln aW5ZOworICAgIGdka193aW5kb3dfZ2V0X29yaWdpbihndGtfd2lkZ2V0X2dldF93aW5kb3codG9w bGV2ZWwpLCAmd2luZG93T3JpZ2luWCwgJndpbmRvd09yaWdpblkpOworCisgICAgSW50UmVjdCBy ZWN0SW5TY3JlZW5Db29yZGluYXRlcyhyZWN0KTsKKyAgICByZWN0SW5TY3JlZW5Db29yZGluYXRl cy5tb3ZlKHdpbmRvd09yaWdpblggKyB4SW5XaW5kb3csIHdpbmRvd09yaWdpblkgKyB5SW5XaW5k b3cpOworICAgIHJldHVybiByZWN0SW5TY3JlZW5Db29yZGluYXRlczsKIH0KIAogdm9pZCBXZWJW aWV3Ojpkb25lV2l0aEtleUV2ZW50KGNvbnN0IE5hdGl2ZVdlYktleWJvYXJkRXZlbnQmLCBib29s IHdhc0V2ZW50SGFuZGxlZCkK 92009 2011-05-02 17:06:07 -0700 2011-05-06 16:29:54 -0700 Patch bug-55960-20110502170606.patch text/plain 9946 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogODU1MTYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA4NTA3ODcxOWFjOWY5OTk4 MjhmMzBjMjQ3MTcwZDU0ZmMxYjZiYzFlLi4wMjdmOWQ1ZDkzOWY4YmJjYzA3NWU5OWNhMGE0Y2Jh ZmZkZTI5NDhjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDUtMDIgIE1hcnRp biBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHVEtdIFtXZWJLaXQyXSBXZWJWaWV3Ojp3aW5k b3dUb1NjcmVlbiBuZWVkcyBhbiBpbXBsZW1lbnRhdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTU5NjAKKworICAgICAgICBBYnN0cmFjdCBjb29y ZGluYXRlIHN5c3RlbSB0cmFuc2xhdGlvbiBjb2RlIGZyb20gV2ViS2l0IGludG8gV2ViQ29yZS4K KyAgICAgICAgVGhpcyB3aWxsIGFsbG93IHRoZSBjb2RlIHRvIGJlIHNoYXJlZCBiZXR3ZWVuIFdl YktpdCBhbmQgV2ViS2l0Mi4gVGhlIGNvZGUKKyAgICAgICAgbm93IGxpdmVzIGluIGEgbmV3IEd0 a1V0aWxpdGllcy5jcHAgaGVscGVyIGZpbGUuCisKKyAgICAgICAgKiBHTlVtYWtlZmlsZS5saXN0 LmFtOiBBZGRlZCBHdGtVdGlsaXRpZXMgdG8gdGhlIHNvdXJjZSBsaXN0LgorICAgICAgICAqIHBs YXRmb3JtL2d0ay9HdGtVdGlsaXRpZXMuY3BwOiBBZGRlZC4KKyAgICAgICAgKFdlYkNvcmU6OmNv bnZlcnRXaWRnZXRSZWN0VG9TY3JlZW5SZWN0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvR3Rr VXRpbGl0aWVzLmg6IEFkZGVkLgorCiAyMDExLTA1LTAyICBBZGFtIEJhcnRoICA8YWJhcnRoQHdl YmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGF2aWQgTGV2aW4uCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9HTlVtYWtlZmlsZS5saXN0LmFtIGIvU291cmNlL1dlYkNvcmUvR05V bWFrZWZpbGUubGlzdC5hbQppbmRleCAxN2YyYTVmOGEzODk4ODBjN2RmNWYxZDI5ZTk2MmJjODAy MmFhNDA0Li4xZjJhNmZlMGYzOTljMjZmN2FjZWIzYTg4MzMzZmIxNTc4NjFjNjRjIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9HTlVtYWtlZmlsZS5saXN0LmFtCisrKyBiL1NvdXJjZS9XZWJD b3JlL0dOVW1ha2VmaWxlLmxpc3QuYW0KQEAgLTM3MjMsNiArMzcyMyw4IEBAIHdlYmNvcmVndGtf c291cmNlcyArPSBcCiAJU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0ZpbGVTeXN0ZW1HdGsu Y3BwIFwKIAlTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrQ2xpY2tDb3VudGVyLmNwcCBc CiAJU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a0NsaWNrQ291bnRlci5oIFwKKwlTb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrVXRpbGl0aWVzLmNwcCBcCisJU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3RrL0d0a1V0aWxpdGllcy5oIFwKIAlTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ndGsvR2VvbG9jYXRpb25TZXJ2aWNlR3RrLmNwcCBcCiAJU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3RrL0dlb2xvY2F0aW9uU2VydmljZUd0ay5oIFwKIAlTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ndGsvR093blB0ckd0ay5jcHAgXApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3RrL0d0a1V0aWxpdGllcy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3Rr VXRpbGl0aWVzLmNwcApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5iNTI1ZDgzNzhjMzU2YzA2MjI3ODQxNzc0OTVlNjkz MTk5ZmUzMWJhCi0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Rr L0d0a1V0aWxpdGllcy5jcHAKQEAgLTAsMCArMSw0NyBAQAorLyoKKyAqIENvcHlyaWdodCAoQykg MjAxMSwgSWdhbGlhIFMuTC4KKyAqCisgKiAgVGhpcyBsaWJyYXJ5IGlzIGZyZWUgc29mdHdhcmU7 IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vcgorICogIG1vZGlmeSBpdCB1bmRlciB0aGUg dGVybXMgb2YgdGhlIEdOVSBMZXNzZXIgR2VuZXJhbCBQdWJsaWMKKyAqICBMaWNlbnNlIGFzIHB1 Ymxpc2hlZCBieSB0aGUgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uOyBlaXRoZXIKKyAqICB2ZXJz aW9uIDIgb2YgdGhlIExpY2Vuc2UsIG9yIChhdCB5b3VyIG9wdGlvbikgYW55IGxhdGVyIHZlcnNp b24uCisgKgorICogIFRoaXMgbGlicmFyeSBpcyBkaXN0cmlidXRlZCBpbiB0aGUgaG9wZSB0aGF0 IGl0IHdpbGwgYmUgdXNlZnVsLAorICogIGJ1dCBXSVRIT1VUIEFOWSBXQVJSQU5UWTsgd2l0aG91 dCBldmVuIHRoZSBpbXBsaWVkIHdhcnJhbnR5IG9mCisgKiAgTUVSQ0hBTlRBQklMSVRZIG9yIEZJ VE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFLiAgU2VlIHRoZSBHTlUKKyAqICBMZXNzZXIg R2VuZXJhbCBQdWJsaWMgTGljZW5zZSBmb3IgbW9yZSBkZXRhaWxzLgorICoKKyAqICBZb3Ugc2hv dWxkIGhhdmUgcmVjZWl2ZWQgYSBjb3B5IG9mIHRoZSBHTlUgTGVzc2VyIEdlbmVyYWwgUHVibGlj CisgKiAgTGljZW5zZSBhbG9uZyB3aXRoIHRoaXMgbGlicmFyeTsgaWYgbm90LCB3cml0ZSB0byB0 aGUgRnJlZSBTb2Z0d2FyZQorICogIEZvdW5kYXRpb24sIEluYy4sIDUxIEZyYW5rbGluIFN0cmVl dCwgRmlmdGggRmxvb3IsIEJvc3RvbiwgTUEgIDAyMTEwLTEzMDEgIFVTQQorICovCisKKyNpbmNs dWRlICJjb25maWcuaCIKKyNpbmNsdWRlICJHdGtVdGlsaXRpZXMuaCIKKworI2luY2x1ZGUgIklu dFJlY3QuaCIKKyNpbmNsdWRlIDxndGsvZ3RrLmg+CisKK25hbWVzcGFjZSBXZWJDb3JlIHsKKwor SW50UmVjdCBjb252ZXJ0V2lkZ2V0UmVjdFRvU2NyZWVuUmVjdChHdGtXaWRnZXQqIHdpZGdldCwg Y29uc3QgSW50UmVjdCYgcmVjdCkKK3sKKyAgICAvLyBGSVhNRTogVGhpcyBpcyBhY3R1YWxseSBh IHZlcnkgdHJpY2t5IG9wZXJhdGlvbiBhbmQgdGhlIHJlc3VsdHMgb2YgdGhpcyBmdW5jdGlvbiBz aG91bGQKKyAgICAvLyBvbmx5IGJlIHRob3VnaHQgb2YgYXMgYSBndWVzcy4gRm9yIGluc3RhbmNl LCBzb21ldGltZXMgaXQgbWF5IG5vdCBjb3JyZWN0bHkgdGFrZSBpbnRvCisgICAgLy8gYWNjb3Vu dCB3aW5kb3cgZGVjb3JhdGlvbnMuCisKKyAgICBHdGtXaWRnZXQqIHRvcGxldmVsV2lkZ2V0ID0g Z3RrX3dpZGdldF9nZXRfdG9wbGV2ZWwod2lkZ2V0KTsKKyAgICBpZiAoIXRvcGxldmVsV2lkZ2V0 IHx8ICFndGtfd2lkZ2V0X2lzX3RvcGxldmVsKHRvcGxldmVsV2lkZ2V0KSB8fCAhR1RLX0lTX1dJ TkRPVyh0b3BsZXZlbFdpZGdldCkpCisgICAgICAgIHJldHVybiByZWN0OworCisgICAgaW50IHhJ bldpbmRvdywgeUluV2luZG93OworICAgIGd0a193aWRnZXRfdHJhbnNsYXRlX2Nvb3JkaW5hdGVz KHdpZGdldCwgdG9wbGV2ZWxXaWRnZXQsIHJlY3QueCgpLCByZWN0LnkoKSwgJnhJbldpbmRvdywg JnlJbldpbmRvdyk7CisgICAgaW50IHdpbmRvd09yaWdpblgsIHdpbmRvd09yaWdpblk7CisgICAg Z2RrX3dpbmRvd19nZXRfb3JpZ2luKGd0a193aWRnZXRfZ2V0X3dpbmRvdyh0b3BsZXZlbFdpZGdl dCksICZ3aW5kb3dPcmlnaW5YLCAmd2luZG93T3JpZ2luWSk7CisKKyAgICBJbnRSZWN0IHJlY3RJ blNjcmVlbkNvb3JkaW5hdGVzKHJlY3QpOworICAgIHJlY3RJblNjcmVlbkNvb3JkaW5hdGVzLm1v dmUod2luZG93T3JpZ2luWCArIHhJbldpbmRvdywgd2luZG93T3JpZ2luWSArIHlJbldpbmRvdyk7 CisgICAgcmV0dXJuIHJlY3RJblNjcmVlbkNvb3JkaW5hdGVzOworfQorCit9IC8vIG5hbWVzcGFj ZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrVXRp bGl0aWVzLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrVXRpbGl0aWVzLmgKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMC4uMTI4ZGQ4MTE3NDVlYTFjNTlmYzNlZDRhYzM3OWZiNmFjNTNmZWVmYQotLS0gL2Rl di9udWxsCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtVdGlsaXRpZXMuaApA QCAtMCwwICsxLDMwIEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDExLCBJZ2FsaWEgUy5MLgor ICoKKyAqICBUaGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1 dGUgaXQgYW5kL29yCisgKiAgbW9kaWZ5IGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExl c3NlciBHZW5lcmFsIFB1YmxpYworICogIExpY2Vuc2UgYXMgcHVibGlzaGVkIGJ5IHRoZSBGcmVl IFNvZnR3YXJlIEZvdW5kYXRpb247IGVpdGhlcgorICogIHZlcnNpb24gMiBvZiB0aGUgTGljZW5z ZSwgb3IgKGF0IHlvdXIgb3B0aW9uKSBhbnkgbGF0ZXIgdmVyc2lvbi4KKyAqCisgKiAgVGhpcyBs aWJyYXJ5IGlzIGRpc3RyaWJ1dGVkIGluIHRoZSBob3BlIHRoYXQgaXQgd2lsbCBiZSB1c2VmdWws CisgKiAgYnV0IFdJVEhPVVQgQU5ZIFdBUlJBTlRZOyB3aXRob3V0IGV2ZW4gdGhlIGltcGxpZWQg d2FycmFudHkgb2YKKyAqICBNRVJDSEFOVEFCSUxJVFkgb3IgRklUTkVTUyBGT1IgQSBQQVJUSUNV TEFSIFBVUlBPU0UuICBTZWUgdGhlIEdOVQorICogIExlc3NlciBHZW5lcmFsIFB1YmxpYyBMaWNl bnNlIGZvciBtb3JlIGRldGFpbHMuCisgKgorICogIFlvdSBzaG91bGQgaGF2ZSByZWNlaXZlZCBh IGNvcHkgb2YgdGhlIEdOVSBMZXNzZXIgR2VuZXJhbCBQdWJsaWMKKyAqICBMaWNlbnNlIGFsb25n IHdpdGggdGhpcyBsaWJyYXJ5OyBpZiBub3QsIHdyaXRlIHRvIHRoZSBGcmVlIFNvZnR3YXJlCisg KiAgRm91bmRhdGlvbiwgSW5jLiwgNTEgRnJhbmtsaW4gU3RyZWV0LCBGaWZ0aCBGbG9vciwgQm9z dG9uLCBNQSAgMDIxMTAtMTMwMSAgVVNBCisgKi8KKworI2lmbmRlZiBHdGtVdGlsaXRpZXNfaCAK KyNkZWZpbmUgR3RrVXRpbGl0aWVzX2ggCisKK25hbWVzcGFjZSBXZWJDb3JlIHsKKworY2xhc3Mg SW50UmVjdDsKKworSW50UmVjdCBjb252ZXJ0V2lkZ2V0UmVjdFRvU2NyZWVuUmVjdChHdGtXaWRn ZXQqLCBjb25zdCBJbnRSZWN0Jik7CisKK30gLy8gbmFtZXNwYWNlIFdlYkNvcmUKKworI2VuZGlm IC8vIEd0a1V0aWxpdGllc19oCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VM b2cgYi9Tb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKaW5kZXggMmQyNTc2ODg4NTI3MzA0YThh MjRiZjIzODA4OWMwNGU0OTgxMDM4Yy4uMjZkMDkxYjlhZTRkZDYwZDU1ODMwOTdiYzg3ZGJiYjY2 ZGMyZmJjMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDExLTA1LTAyICBN YXJ0aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbR1RLXSBbV2ViS2l0Ml0gV2ViVmlldzo6 d2luZG93VG9TY3JlZW4gbmVlZHMgYW4gaW1wbGVtZW50YXRpb24KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU1OTYwCisKKyAgICAgICAgQWJzdHJhY3Qg dGhlIGNvZGUgdG8gdHJhbnNsYXRlIGZyb20gd2lkZ2V0IHNwYWNlIHRvIHNjcmVlbiBzcGFjZSBp bnRvCisgICAgICAgIGEgaGVscGVyIG1ldGhvZCBpbiBXZWJDb3JlLgorCisgICAgICAgICogV2Vi Q29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50R3RrLmNwcDogVXNlIHRoZSBuZXcgaGVscGVyIG1ldGhv ZCBmcm9tIEd0a1V0aWxpdGllcy4KKyAgICAgICAgKFdlYktpdDo6Q2hyb21lQ2xpZW50Ojp3aW5k b3dUb1NjcmVlbik6CisgICAgICAgIChXZWJLaXQ6OkNocm9tZUNsaWVudDo6c2NyZWVuVG9XaW5k b3cpOgorCiAyMDExLTA0LTI5ICBYYW4gTG9wZXogIDx4bG9wZXpAaWdhbGlhLmNvbT4KIAogICAg ICAgICBSZXZpZXdlZCBieSBNYXJ0aW4gUm9iaW5zb24uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRHdGsuY3BwIGIvU291cmNlL1dlYktp dC9ndGsvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50R3RrLmNwcAppbmRleCBhOWQ4MDMyOGE2 ZDA5YjQ4NWNhYzM0YmY0NjI3YWY1ODY5ZmZiOGQ5Li5jOWYxZTU1ZGQ4NDUyNmRhZGRhNjNjNmIx N2NhYWRiOWExYWJmNTQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3JlU3Vw cG9ydC9DaHJvbWVDbGllbnRHdGsuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvZ3RrL1dlYkNvcmVT dXBwb3J0L0Nocm9tZUNsaWVudEd0ay5jcHAKQEAgLTMzLDYgKzMzLDcgQEAKICNpbmNsdWRlICJG bG9hdFJlY3QuaCIKICNpbmNsdWRlICJGcmFtZUxvYWRSZXF1ZXN0LmgiCiAjaW5jbHVkZSAiRnJh bWVWaWV3LmgiCisjaW5jbHVkZSAiR3RrVXRpbGl0aWVzLmgiCiAjaW5jbHVkZSAiR3RrVmVyc2lv bmluZy5oIgogI2luY2x1ZGUgIkhUTUxOYW1lcy5oIgogI2luY2x1ZGUgIkhpdFRlc3RSZXN1bHQu aCIKQEAgLTQ1MCwzNyArNDUxLDE3IEBAIHZvaWQgQ2hyb21lQ2xpZW50OjpzY3JvbGwoY29uc3Qg SW50U2l6ZSYgZGVsdGEsIGNvbnN0IEludFJlY3QmIHJlY3RUb1Njcm9sbCwgY29uCiAjZW5kaWYK IH0KIAotLy8gRklYTUU6IHRoaXMgZG9lcyBub3QgdGFrZSBpbnRvIGFjY291bnQgdGhlIFdNIGRl Y29yYXRpb25zCi1zdGF0aWMgSW50UG9pbnQgd2lkZ2V0U2NyZWVuUG9zaXRpb24oR3RrV2lkZ2V0 KiB3aWRnZXQpCi17Ci0gICAgR3RrV2lkZ2V0KiB3aW5kb3cgPSBndGtfd2lkZ2V0X2dldF90b3Bs ZXZlbCh3aWRnZXQpOwotICAgIGludCB3aWRnZXRYID0gMCwgd2lkZ2V0WSA9IDA7Ci0KLSAgICBn dGtfd2lkZ2V0X3RyYW5zbGF0ZV9jb29yZGluYXRlcyh3aWRnZXQsIHdpbmRvdywgMCwgMCwgJndp ZGdldFgsICZ3aWRnZXRZKTsKLQotICAgIEludFBvaW50IHJlc3VsdCh3aWRnZXRYLCB3aWRnZXRZ KTsKLSAgICBpbnQgb3JpZ2luWCwgb3JpZ2luWTsKLSAgICBnZGtfd2luZG93X2dldF9vcmlnaW4o Z3RrX3dpZGdldF9nZXRfd2luZG93KHdpbmRvdyksICZvcmlnaW5YLCAmb3JpZ2luWSk7Ci0gICAg cmVzdWx0Lm1vdmUob3JpZ2luWCwgb3JpZ2luWSk7Ci0KLSAgICByZXR1cm4gcmVzdWx0OwotfQot CiBJbnRSZWN0IENocm9tZUNsaWVudDo6d2luZG93VG9TY3JlZW4oY29uc3QgSW50UmVjdCYgcmVj dCkgY29uc3QKIHsKLSAgICBJbnRSZWN0IHJlc3VsdChyZWN0KTsKLSAgICBJbnRQb2ludCBzY3Jl ZW5Qb3NpdGlvbiA9IHdpZGdldFNjcmVlblBvc2l0aW9uKEdUS19XSURHRVQobV93ZWJWaWV3KSk7 Ci0gICAgcmVzdWx0Lm1vdmUoc2NyZWVuUG9zaXRpb24ueCgpLCBzY3JlZW5Qb3NpdGlvbi55KCkp OwotCi0gICAgcmV0dXJuIHJlc3VsdDsKKyAgICByZXR1cm4gY29udmVydFdpZGdldFJlY3RUb1Nj cmVlblJlY3QoR1RLX1dJREdFVChtX3dlYlZpZXcpLCByZWN0KTsKIH0KIAogSW50UG9pbnQgQ2hy b21lQ2xpZW50OjpzY3JlZW5Ub1dpbmRvdyhjb25zdCBJbnRQb2ludCYgcG9pbnQpIGNvbnN0CiB7 CisgICAgSW50UG9pbnQgd2lkZ2V0UG9zaXRpb25PblNjcmVlbiA9IGNvbnZlcnRXaWRnZXRSZWN0 VG9TY3JlZW5SZWN0KEdUS19XSURHRVQobV93ZWJWaWV3KSwKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgSW50UmVjdChJ bnRQb2ludCgpLCBJbnRTaXplKCkpKS5sb2NhdGlvbigpOwogICAgIEludFBvaW50IHJlc3VsdChw b2ludCk7Ci0gICAgSW50UG9pbnQgc2NyZWVuUG9zaXRpb24gPSB3aWRnZXRTY3JlZW5Qb3NpdGlv bihHVEtfV0lER0VUKG1fd2ViVmlldykpOwotICAgIHJlc3VsdC5tb3ZlKC1zY3JlZW5Qb3NpdGlv bi54KCksIC1zY3JlZW5Qb3NpdGlvbi55KCkpOwotCisgICAgcmVzdWx0Lm1vdmUoLXdpZGdldFBv c2l0aW9uT25TY3JlZW4ueCgpLCAtd2lkZ2V0UG9zaXRpb25PblNjcmVlbi55KCkpOwogICAgIHJl dHVybiByZXN1bHQ7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBi L1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCAzNmVhMmE2OTMwNTRlZTllMTYzNGVlZGUy YjQ3OWIwMzA5ZjI5MzZhLi5kM2NjYzJhNTRlNTA3NGRkN2U0MWYyOWJlMzNhMTFjYTVhNGFmNzY2 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktp dDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMDUtMDIgIE1hcnRpbiBSb2JpbnNv biAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFtHVEtdIFtXZWJLaXQyXSBXZWJWaWV3Ojp3aW5kb3dUb1NjcmVl biBuZWVkcyBhbiBpbXBsZW1lbnRhdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NTU5NjAKKworICAgICAgICBBZGQgYW4gaW1wbGVtZW50YXRpb24g b2YgUGFnZUNsaWVudDo6d2luZG93VG9TY3JlZW4gZm9yIEdUSysgV2ViS2l0MiB1c2luZworICAg ICAgICB0aGUgbmV3bHkgYWJzdHJhY3RlZCB3aWRnZXQgdG8gc2NyZWVuIGNvb3JkaW5hdGUgdHJh bnNsYXRpb24gY29kZSBpbiBXZWJDb3JlLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsv UGFnZUNsaWVudEltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpQYWdlQ2xpZW50SW1wbDo6d2lu ZG93VG9TY3JlZW4pOiBBZGRlZCBpbXBsZW1lbnRhdGlvbi4KKwogMjAxMS0wNS0wMiAgQWRhbSBC YXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhdmlkIExl dmluLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNs aWVudEltcGwuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNsaWVu dEltcGwuY3BwCmluZGV4IDdmZWZiNDQ4ZTk2MDY4N2YzYmE0YjNiNmQ3OGI4NTczMDgwNmRkMTgu LjU0YmZhNGYwM2Y5ZGVmNjJlNDMyOTQ2ZjUxYTZlOGEyNjgzMmM1NzEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1BhZ2VDbGllbnRJbXBsLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9QYWdlQ2xpZW50SW1wbC5jcHAKQEAgLTM3 LDYgKzM3LDcgQEAKICNpbmNsdWRlICJXZWJFdmVudEZhY3RvcnkuaCIKICNpbmNsdWRlICJXZWJL aXRXZWJWaWV3QmFzZVByaXZhdGUuaCIKICNpbmNsdWRlICJXZWJQYWdlUHJveHkuaCIKKyNpbmNs dWRlIDxXZWJDb3JlL0d0a1V0aWxpdGllcy5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L1dURlN0cmlu Zy5oPgogCiB0eXBlZGVmIEhhc2hNYXA8aW50LCBjb25zdCBjaGFyKj4gSW50Q29uc3RDaGFySGFz aE1hcDsKQEAgLTQxMiw4ICs0MTMsNyBAQCBGbG9hdFJlY3QgUGFnZUNsaWVudEltcGw6OmNvbnZl cnRUb1VzZXJTcGFjZShjb25zdCBGbG9hdFJlY3QmIHZpZXdSZWN0KQogCiBJbnRSZWN0IFBhZ2VD bGllbnRJbXBsOjp3aW5kb3dUb1NjcmVlbihjb25zdCBJbnRSZWN0JiByZWN0KQogewotICAgIG5v dEltcGxlbWVudGVkKCk7Ci0gICAgcmV0dXJuIEludFJlY3QoKTsKKyAgICByZXR1cm4gY29udmVy dFdpZGdldFJlY3RUb1NjcmVlblJlY3QobV92aWV3V2lkZ2V0LCByZWN0KTsKIH0KIAogdm9pZCBQ YWdlQ2xpZW50SW1wbDo6ZG9uZVdpdGhLZXlFdmVudChjb25zdCBOYXRpdmVXZWJLZXlib2FyZEV2 ZW50JiwgYm9vbCB3YXNFdmVudEhhbmRsZWQpCg==