109829 2013-02-14 07:15:53 -0800 [Qt][WK2] Allow QtWebContext to call directly to QQuickWebView with a WKPageRef 2013-03-12 04:15:57 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 109827 108475 1 jturcotte jturcotte abecsi allan.jensen benjamin buildbot cmarcelo hausmann jturcotte menard rniwa webkit.review.bot oldest_to_newest 833051 0 jturcotte 2013-02-14 07:15:53 -0800 [Qt][WK2] Allow QtWebContext to call directly to QQuickWebView with a WKPageRef 833055 1 188345 jturcotte 2013-02-14 07:18:18 -0800 Created attachment 188345 Patch 833093 2 188345 allan.jensen 2013-02-14 08:17:20 -0800 Comment on attachment 188345 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=188345&action=review > Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp:92 > +typedef QMap<WKPageRef, QQuickWebViewPrivate*> PageToViewMap; > +Q_GLOBAL_STATIC(PageToViewMap, pageToView) Wouldn't an extra pointer in qquickwebviewprivate be more efficient. This doesn't seem like a rare property where we can save memory from using a map over using normal pointers. 833102 3 jturcotte 2013-02-14 08:31:35 -0800 (In reply to comment #2) > (From update of attachment 188345 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=188345&action=review > > > Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp:92 > > +typedef QMap<WKPageRef, QQuickWebViewPrivate*> PageToViewMap; > > +Q_GLOBAL_STATIC(PageToViewMap, pageToView) > > Wouldn't an extra pointer in qquickwebviewprivate be more efficient. This doesn't seem like a rare property where we can save memory from using a map over using normal pointers. We already have a WKPageRef in qquickwebviewprivate. The matter is more the lookup, I need to find a qquickwebviewprivate using a WKPageRef. The only other solution I see is to keep a vector of all views and iterate them to find my page, that doesn't sound much better. 833110 4 allan.jensen 2013-02-14 08:45:10 -0800 (In reply to comment #3) > (In reply to comment #2) > > (From update of attachment 188345 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=188345&action=review > > > > > Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp:92 > > > +typedef QMap<WKPageRef, QQuickWebViewPrivate*> PageToViewMap; > > > +Q_GLOBAL_STATIC(PageToViewMap, pageToView) > > > > Wouldn't an extra pointer in qquickwebviewprivate be more efficient. This doesn't seem like a rare property where we can save memory from using a map over using normal pointers. > > We already have a WKPageRef in qquickwebviewprivate. > The matter is more the lookup, I need to find a qquickwebviewprivate using a WKPageRef. The only other solution I see is to keep a vector of all views and iterate them to find my page, that doesn't sound much better. Ah, right. I read the map the wrong way. 833111 5 188345 allan.jensen 2013-02-14 08:45:38 -0800 Comment on attachment 188345 Patch LGTM. 833905 6 188345 buildbot 2013-02-15 05:05:01 -0800 Comment on attachment 188345 Patch Attachment 188345 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/16595050 New failing tests: media/video-controls-captions-trackmenu.html 833918 7 188345 allan.jensen 2013-02-15 05:12:31 -0800 Comment on attachment 188345 Patch LGTM, but needs approval of owners. I am assuming the failure by the mac build-bot is an unmarked flaky test. 837441 8 hausmann 2013-02-20 06:59:26 -0800 Benjamin, can you help us sign off on this one, too? :) 842810 9 hausmann 2013-02-27 01:00:18 -0800 WK2-sign-off-ping :) 842819 10 188345 benjamin 2013-02-27 01:06:29 -0800 Comment on attachment 188345 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=188345&action=review That is great, sorry I did not see it earlier. I sign of on the change. > Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp:91 > +typedef QMap<WKPageRef, QQuickWebViewPrivate*> PageToViewMap; No love for HashTable? :( 842959 11 jturcotte 2013-02-27 05:27:16 -0800 (In reply to comment #10) > (From update of attachment 188345 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=188345&action=review > > That is great, sorry I did not see it earlier. > I sign of on the change. > > > Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp:91 > > +typedef QMap<WKPageRef, QQuickWebViewPrivate*> PageToViewMap; > > No love for HashTable? :( Thanks! :) I'm trying to use Qt containers to avoid dependencies to WTF. There will generally be less than 5 pages open and rarely more than 50, so QMap should fit better than QHash, theoretically. 843398 12 benjamin 2013-02-27 12:47:00 -0800 > I'm trying to use Qt containers to avoid dependencies to WTF. > There will generally be less than 5 pages open and rarely more than 50, so QMap should fit better than QHash, theoretically. In Qt4, QMap was a fairly bad linked list. 843449 13 hausmann 2013-02-27 13:36:01 -0800 (In reply to comment #12) > > I'm trying to use Qt containers to avoid dependencies to WTF. > > There will generally be less than 5 pages open and rarely more than 50, so QMap should fit better than QHash, theoretically. > > In Qt4, QMap was a fairly bad linked list. In QT 5 it's a red black tree again :) 853314 14 jturcotte 2013-03-12 04:15:57 -0700 Committed r145515: <http://trac.webkit.org/changeset/145515> 188345 2013-02-14 07:18:18 -0800 2013-02-27 01:06:29 -0800 Patch bug-109829-20130214161445.patch text/plain 12277 jturcotte U3VidmVyc2lvbiBSZXZpc2lvbjogMTQyMjUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOGNjOTFiY2UzYjExNDhl M2VjNTBhZTU4NGI0OWExYTE2NGRiYWMxMC4uZWVmM2NiYThmNmYwYWU4ZGEwMWEzZWVhNThiYWU3 OWQ4Njc3MTUxMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM2IEBACiAyMDEzLTAyLTE0ICBKb2Nl bHluIFR1cmNvdHRlICA8am9jZWx5bi50dXJjb3R0ZUBkaWdpYS5jb20+CiAKKyAgICAgICAgW1F0 XVtXSzJdIEFsbG93IFF0V2ViQ29udGV4dCB0byBjYWxsIGRpcmVjdGx5IHRvIFFRdWlja1dlYlZp ZXcgd2l0aCBhIFdLUGFnZVJlZgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTA5ODI5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgSW5zdGVhZCBvZiBnb2luZyB0aHJvdWdoIFdlYlBhZ2VQcm94eSBhbmQgUGFn ZUNsaWVudCB0byBmb3J3YXJkCisgICAgICAgIGluamVjdGVkIGJ1bmRsZSBtZXNzYWdlcyByZWNl aXZlZCBieSB0aGUgY29udGV4dCwgbWFpbnRhaW4gYSBzdGF0aWMgbWFwCisgICAgICAgIG9mIFdL UGFnZVJlZiB0byBRUXVpY2tXZWJWaWV3UHJpdmF0ZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9B UEkvcXQvcXF1aWNrd2Vidmlldy5jcHA6CisgICAgICAgIChRUXVpY2tXZWJWaWV3UHJpdmF0ZTo6 Z2V0KToKKyAgICAgICAgKFFRdWlja1dlYlZpZXdQcml2YXRlOjp+UVF1aWNrV2ViVmlld1ByaXZh dGUpOgorICAgICAgICAoUVF1aWNrV2ViVmlld1ByaXZhdGU6OmluaXRpYWxpemUpOgorICAgICAg ICAoUVF1aWNrV2ViVmlld1ByaXZhdGU6OmRpZFJlY2VpdmVNZXNzYWdlRnJvbU5hdmlnYXRvclF0 T2JqZWN0KToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXdfcF9wLmg6 CisgICAgICAgIChRUXVpY2tXZWJWaWV3UHJpdmF0ZSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQ SS9xdC9yYXcvcXJhd3dlYnZpZXcuY3BwOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcmF3 L3FyYXd3ZWJ2aWV3X3BfcC5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9QYWdlQ2xpZW50Lmg6Cisg ICAgICAgIChQYWdlQ2xpZW50KToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6 CisgICAgICAgIChXZWJQYWdlUHJveHkpOgorICAgICAgICAqIFVJUHJvY2Vzcy9xdC9RdFBhZ2VD bGllbnQuY3BwOgorICAgICAgICAqIFVJUHJvY2Vzcy9xdC9RdFBhZ2VDbGllbnQuaDoKKyAgICAg ICAgKFF0UGFnZUNsaWVudCk6CisgICAgICAgICogVUlQcm9jZXNzL3F0L1F0V2ViQ29udGV4dC5j cHA6CisgICAgICAgIChXZWJLaXQ6OmRpZFJlY2VpdmVNZXNzYWdlRnJvbUluamVjdGVkQnVuZGxl KToKKyAgICAgICAgKiBVSVByb2Nlc3MvcXQvV2ViUGFnZVByb3h5UXQuY3BwOgorCisyMDEzLTAy LTE0ICBKb2NlbHluIFR1cmNvdHRlICA8am9jZWx5bi50dXJjb3R0ZUBkaWdpYS5jb20+CisKICAg ICAgICAgW1F0XVtXSzJdIEtlZXAgdGhlIFdlYkNvbnRleHQgYWxpdmUgZHVyaW5nIHRoZSB3aG9s ZSBhcHBsaWNhdGlvbidzIGxpZmV0aW1lCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMDk4MjcKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHAKaW5kZXggMDZiMzU4MmM1Yjk0YTMzZmYzYzNmYTA2 MGU3NGViNGVhMTFmZjY3ZS4uNzA5NTVkNTYzMTZhNDIxZTY3YzQ0NmE5MGNkNmQ1NmZiNTUwYWNi ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2 aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZp ZXcuY3BwCkBAIC00NSw2ICs0NSw3IEBACiAjZW5kaWYKICNpbmNsdWRlICJXZWJQYWdlR3JvdXAu aCIKICNpbmNsdWRlICJXZWJQcmVmZXJlbmNlcy5oIgorI2luY2x1ZGUgInFnbG9iYWwuaCIKICNp bmNsdWRlICJxcXVpY2tuZXR3b3JrcmVwbHlfcC5oIgogI2luY2x1ZGUgInFxdWlja25ldHdvcmty ZXF1ZXN0X3AuaCIKICNpbmNsdWRlICJxcXVpY2t3ZWJwYWdlX3BfcC5oIgpAQCAtNjEsNiArNjIs NyBAQAogI2luY2x1ZGUgPEphdmFTY3JpcHRDb3JlL0pTQmFzZS5oPgogI2luY2x1ZGUgPEphdmFT Y3JpcHRDb3JlL0pTUmV0YWluUHRyLmg+CiAjaW5jbHVkZSA8UURhdGVUaW1lPgorI2luY2x1ZGUg PFFNYXA+CiAjaW5jbHVkZSA8UXRDb3JlL1FGaWxlPgogI2luY2x1ZGUgPFF0UW1sL1FKU1ZhbHVl PgogI2luY2x1ZGUgPFF0UXVpY2svUVF1aWNrVmlldz4KQEAgLTg2LDYgKzg4LDkgQEAgc3RhdGlj IGNvbnN0IGludCBrQXhpc0xvY2tTYW1wbGVDb3VudCA9IDU7CiBzdGF0aWMgY29uc3QgcXJlYWwg a0F4aXNMb2NrVmVsb2NpdHlUaHJlc2hvbGQgPSAzMDA7CiBzdGF0aWMgY29uc3QgcXJlYWwga0F4 aXNMb2NrVmVsb2NpdHlEaXJlY3Rpb25UaHJlc2hvbGQgPSA1MDsKIAordHlwZWRlZiBRTWFwPFdL UGFnZVJlZiwgUVF1aWNrV2ViVmlld1ByaXZhdGUqPiBQYWdlVG9WaWV3TWFwOworUV9HTE9CQUxf U1RBVElDKFBhZ2VUb1ZpZXdNYXAsIHBhZ2VUb1ZpZXcpCisKIHN0YXRpYyBpbmxpbmUgUVF1aWNr V2ViVmlld1ByaXZhdGUqIHRvUVF1aWNrV2ViVmlld1ByaXZhdGUoY29uc3Qgdm9pZCogY2xpZW50 SW5mbykKIHsKICAgICBBU1NFUlQoY2xpZW50SW5mbyk7CkBAIC0xOTgsNiArMjAzLDExIEBAIHN0 YXRpYyBRUXVpY2tXZWJWaWV3UHJpdmF0ZSogY3JlYXRlUHJpdmF0ZU9iamVjdChRUXVpY2tXZWJW aWV3KiBwdWJsaWNPYmplY3QpCiAgICAgcmV0dXJuIG5ldyBRUXVpY2tXZWJWaWV3TGVnYWN5UHJp dmF0ZShwdWJsaWNPYmplY3QpOwogfQogCitRUXVpY2tXZWJWaWV3UHJpdmF0ZSogUVF1aWNrV2Vi Vmlld1ByaXZhdGU6OmdldChXS1BhZ2VSZWYgcGFnZSkKK3sKKyAgICByZXR1cm4gcGFnZVRvVmll dygpLT52YWx1ZShwYWdlKTsKK30KKwogUVF1aWNrV2ViVmlld1ByaXZhdGU6OkZsaWNrYWJsZUF4 aXNMb2NrZXI6OkZsaWNrYWJsZUF4aXNMb2NrZXIoKQogICAgIDogbV9hbGxvd2VkRGlyZWN0aW9u KFFRdWlja0ZsaWNrYWJsZTo6QXV0b0ZsaWNrRGlyZWN0aW9uKQogICAgICwgbV90aW1lKDApLCBt X3NhbXBsZUNvdW50KDApCkBAIC0zMDEsNiArMzExLDcgQEAgUVF1aWNrV2ViVmlld1ByaXZhdGU6 OlFRdWlja1dlYlZpZXdQcml2YXRlKFFRdWlja1dlYlZpZXcqIHZpZXdwb3J0KQogUVF1aWNrV2Vi Vmlld1ByaXZhdGU6On5RUXVpY2tXZWJWaWV3UHJpdmF0ZSgpCiB7CiAgICAgd2ViUGFnZVByb3h5 LT5jbG9zZSgpOworICAgIHBhZ2VUb1ZpZXcoKS0+cmVtb3ZlKHdlYlBhZ2UuZ2V0KCkpOwogfQog CiAvLyBOb3RlOiB3ZSBkZWxheSB0aGlzIGluaXRpYWxpemF0aW9uIHRvIG1ha2Ugc3VyZSB0aGF0 IFFRdWlja1dlYlZpZXcgaGFzIGl0cyBkLXB0ciBpbi1wbGFjZS4KQEAgLTMxMyw2ICszMjQsOCBA QCB2b2lkIFFRdWlja1dlYlZpZXdQcml2YXRlOjppbml0aWFsaXplKFdLQ29udGV4dFJlZiBjb250 ZXh0UmVmLCBXS1BhZ2VHcm91cFJlZiBwYQogICAgIGNvbnRleHQgPSBjb250ZXh0UmVmID8gUXRX ZWJDb250ZXh0OjpjcmVhdGUodG9JbXBsKGNvbnRleHRSZWYpKSA6IFF0V2ViQ29udGV4dDo6ZGVm YXVsdENvbnRleHQoKTsKICAgICB3ZWJQYWdlUHJveHkgPSBjb250ZXh0LT5jcmVhdGVXZWJQYWdl KCZwYWdlQ2xpZW50LCB0b0ltcGwocGFnZUdyb3VwLmdldCgpKSk7CiAgICAgd2ViUGFnZSA9IHRv QVBJKHdlYlBhZ2VQcm94eS5nZXQoKSk7CisgICAgcGFnZVRvVmlldygpLT5pbnNlcnQod2ViUGFn ZS5nZXQoKSwgdGhpcyk7CisKICAgICB3ZWJQYWdlUHJveHktPnNldFVzZUZpeGVkTGF5b3V0KHNf ZmxpY2thYmxlVmlld3BvcnRFbmFibGVkKTsKICNpZiBFTkFCTEUoRlVMTFNDUkVFTl9BUEkpCiAg ICAgd2ViUGFnZVByb3h5LT5mdWxsU2NyZWVuTWFuYWdlcigpLT5zZXRXZWJWaWV3KHFfcHRyKTsK QEAgLTg5OCwxMCArOTExLDEwIEBAIFdlYkNvcmU6OkludFNpemUgUVF1aWNrV2ViVmlld1ByaXZh dGU6OnZpZXdTaXplKCkgY29uc3QKIAogICAgIFxzYSBwb3N0TWVzc2FnZQogKi8KLXZvaWQgUVF1 aWNrV2ViVmlld1ByaXZhdGU6OmRpZFJlY2VpdmVNZXNzYWdlRnJvbU5hdmlnYXRvclF0T2JqZWN0 KGNvbnN0IFN0cmluZyYgbWVzc2FnZSkKK3ZvaWQgUVF1aWNrV2ViVmlld1ByaXZhdGU6OmRpZFJl Y2VpdmVNZXNzYWdlRnJvbU5hdmlnYXRvclF0T2JqZWN0KFdLU3RyaW5nUmVmIG1lc3NhZ2UpCiB7 CiAgICAgUVZhcmlhbnRNYXAgdmFyaWFudE1hcDsKLSAgICB2YXJpYW50TWFwLmluc2VydChRTGF0 aW4xU3RyaW5nKCJkYXRhIiksIFFTdHJpbmcobWVzc2FnZSkpOworICAgIHZhcmlhbnRNYXAuaW5z ZXJ0KFFMYXRpbjFTdHJpbmcoImRhdGEiKSwgV0tTdHJpbmdDb3B5UVN0cmluZyhtZXNzYWdlKSk7 CiAgICAgdmFyaWFudE1hcC5pbnNlcnQoUUxhdGluMVN0cmluZygib3JpZ2luIiksIHFfcHRyLT51 cmwoKSk7CiAgICAgZW1pdCBxX3B0ci0+ZXhwZXJpbWVudGFsKCktPm1lc3NhZ2VSZWNlaXZlZCh2 YXJpYW50TWFwKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv cXQvcXF1aWNrd2Vidmlld19wX3AuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQv cXF1aWNrd2Vidmlld19wX3AuaAppbmRleCAxMDYxOGY4OWE0MDAyOWNkNWEwNmQxYjUwMWQzZDkx Mjc1OTFkNDRjLi5lYzVmNTc0MTBjNjU5MjVkNzRmOTExNTdhMmM0NzA5NTc4MjUxZTgwIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXdfcF9w LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3X3Bf cC5oCkBAIC02NSw2ICs2NSw3IEBAIGNsYXNzIFFRdWlja1dlYlZpZXdQcml2YXRlIHsKIAogcHVi bGljOgogICAgIHN0YXRpYyBRUXVpY2tXZWJWaWV3UHJpdmF0ZSogZ2V0KFFRdWlja1dlYlZpZXcq IHEpIHsgcmV0dXJuIHEtPmRfcHRyLmRhdGEoKTsgfQorICAgIHN0YXRpYyBRUXVpY2tXZWJWaWV3 UHJpdmF0ZSogZ2V0KFdLUGFnZVJlZik7CiAKICAgICB2aXJ0dWFsIH5RUXVpY2tXZWJWaWV3UHJp dmF0ZSgpOwogCkBAIC0xMjMsMTMgKzEyNCwxNCBAQCBwdWJsaWM6CiAKICAgICAvLyBQYWdlQ2xp ZW50LgogICAgIFdlYkNvcmU6OkludFNpemUgdmlld1NpemUoKSBjb25zdDsKLSAgICB2b2lkIGRp ZFJlY2VpdmVNZXNzYWdlRnJvbU5hdmlnYXRvclF0T2JqZWN0KGNvbnN0IFN0cmluZyYgbWVzc2Fn ZSk7CiAgICAgdmlydHVhbCB2b2lkIHBhZ2VEaWRSZXF1ZXN0U2Nyb2xsKGNvbnN0IFFQb2ludCYg cG9zKSB7IH0KICAgICB2b2lkIHByb2Nlc3NEaWRDcmFzaCgpOwogICAgIHZvaWQgZGlkUmVsYXVu Y2hQcm9jZXNzKCk7CiAgICAgUGFzc093blB0cjxXZWJLaXQ6OkRyYXdpbmdBcmVhUHJveHk+IGNy ZWF0ZURyYXdpbmdBcmVhUHJveHkoKTsKICAgICB2b2lkIGhhbmRsZURvd25sb2FkUmVxdWVzdChX ZWJLaXQ6OkRvd25sb2FkUHJveHkqKTsKIAorICAgIHZvaWQgZGlkUmVjZWl2ZU1lc3NhZ2VGcm9t TmF2aWdhdG9yUXRPYmplY3QoV0tTdHJpbmdSZWYgbWVzc2FnZSk7CisKIHByb3RlY3RlZDoKICAg ICBjbGFzcyBGbGlja2FibGVBeGlzTG9ja2VyIHsKICAgICAgICAgUVF1aWNrRmxpY2thYmxlOjpG bGlja2FibGVEaXJlY3Rpb24gbV9hbGxvd2VkRGlyZWN0aW9uOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9yYXcvcXJhd3dlYnZpZXcuY3BwIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9xdC9yYXcvcXJhd3dlYnZpZXcuY3BwCmluZGV4IGQzNDgxZWEw MTYyYTUzZDNkMDg4M2U3ZDYzMGMzMmYzNDcwM2ExZWYuLjg5ODEzZmYzOWEyMGQ5MjViNzJiOWY3 MDk2MGIyMzgwMjhmZDcwMjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvcXQvcmF3L3FyYXd3ZWJ2aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL3F0L3Jhdy9xcmF3d2Vidmlldy5jcHAKQEAgLTM3LDExICszNyw2IEBACiAjaW5jbHVkZSA8 V2ViQ29yZS9Db29yZGluYXRlZEdyYXBoaWNzU2NlbmUuaD4KICNpbmNsdWRlIDxXZWJLaXQyL3Fy YXd3ZWJ2aWV3X3AuaD4KIAotdm9pZCBRUmF3V2ViVmlld1ByaXZhdGU6OmRpZFJlY2VpdmVNZXNz YWdlRnJvbU5hdmlnYXRvclF0T2JqZWN0KGNvbnN0IFN0cmluZyYgbWVzc2FnZSkKLXsKLSAgICBu b3RJbXBsZW1lbnRlZCgpOwotfQotCiB2b2lkIFFSYXdXZWJWaWV3UHJpdmF0ZTo6ZGlkQ2hhbmdl Vmlld3BvcnRQcm9wZXJ0aWVzKGNvbnN0IFdlYkNvcmU6OlZpZXdwb3J0QXR0cmlidXRlcyYgYXR0 cikKIHsKICAgICBub3RJbXBsZW1lbnRlZCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9xdC9yYXcvcXJhd3dlYnZpZXdfcF9wLmggYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL3F0L3Jhdy9xcmF3d2Vidmlld19wX3AuaAppbmRleCAwMjk5NTZlNzdmMjYw MGUyMjExNmRjZDcwMTY2NjY5NjA3ODhhOTAzLi41YThmYzM0Nzk5NTQ3NDg5ZjE1ZjA4OTQ5M2M1 YWMyYTU4MzBlOGE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0 L3Jhdy9xcmF3d2Vidmlld19wX3AuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L3F0L3Jhdy9xcmF3d2Vidmlld19wX3AuaApAQCAtNDYsNyArNDYsNiBAQCBwdWJsaWM6CiAgICAg dmlydHVhbCB2b2lkIGNvdW50U3RyaW5nTWF0Y2hlc0luQ3VzdG9tUmVwcmVzZW50YXRpb24oY29u c3QgU3RyaW5nJiwgV2ViS2l0OjpGaW5kT3B0aW9ucywgdW5zaWduZWQgbWF4TWF0Y2hDb3VudCkg eyB9CiAgICAgdmlydHVhbCB2b2lkIGNsZWFyQWxsRWRpdENvbW1hbmRzKCkgeyB9CiAKLSAgICB2 aXJ0dWFsIHZvaWQgZGlkUmVjZWl2ZU1lc3NhZ2VGcm9tTmF2aWdhdG9yUXRPYmplY3QoY29uc3Qg U3RyaW5nJiBtZXNzYWdlKTsKICAgICB2aXJ0dWFsIHZvaWQgZGlkQ2hhbmdlVmlld3BvcnRQcm9w ZXJ0aWVzKGNvbnN0IFdlYkNvcmU6OlZpZXdwb3J0QXR0cmlidXRlcyYgYXR0cik7CiAgICAgdmly dHVhbCB2b2lkIGhhbmRsZURvd25sb2FkUmVxdWVzdChXZWJLaXQ6OkRvd25sb2FkUHJveHkqIGRv d25sb2FkKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BhZ2VDbGll bnQuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QYWdlQ2xpZW50LmgKaW5kZXggZDA4Y2M5 MWY2NDRkOWE5ZjhiYjg3M2ViNGZlODMxYjk5ODNmOGM2Mi4uMmVjMjBhYmZmMDgzOGE4M2M1MTQw N2Q2ODgxMGVmYTBjODdlYzExYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1BhZ2VDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZUNsaWVudC5o CkBAIC0xMjEsNyArMTIxLDYgQEAgcHVibGljOgogI2VuZGlmCiAjaWYgUExBVEZPUk0oUVQpCiAg ICAgdmlydHVhbCB2b2lkIGRpZEZpbmRab29tYWJsZUFyZWEoY29uc3QgV2ViQ29yZTo6SW50UG9p bnQmLCBjb25zdCBXZWJDb3JlOjpJbnRSZWN0JikgPSAwOwotICAgIHZpcnR1YWwgdm9pZCBkaWRS ZWNlaXZlTWVzc2FnZUZyb21OYXZpZ2F0b3JRdE9iamVjdChjb25zdCBTdHJpbmcmKSA9IDA7CiAg ICAgdmlydHVhbCB2b2lkIGhhbmRsZUF1dGhlbnRpY2F0aW9uUmVxdWlyZWRSZXF1ZXN0KGNvbnN0 IFN0cmluZyYgaG9zdG5hbWUsIGNvbnN0IFN0cmluZyYgcmVhbG0sIGNvbnN0IFN0cmluZyYgcHJl ZmlsbGVkVXNlcm5hbWUsIFN0cmluZyYgdXNlcm5hbWUsIFN0cmluZyYgcGFzc3dvcmQpID0gMDsK ICAgICB2aXJ0dWFsIHZvaWQgaGFuZGxlQ2VydGlmaWNhdGVWZXJpZmljYXRpb25SZXF1ZXN0KGNv bnN0IFN0cmluZyYgaG9zdG5hbWUsIGJvb2wmIGlnbm9yZUVycm9ycykgPSAwOwogICAgIHZpcnR1 YWwgdm9pZCBoYW5kbGVQcm94eUF1dGhlbnRpY2F0aW9uUmVxdWlyZWRSZXF1ZXN0KGNvbnN0IFN0 cmluZyYgaG9zdG5hbWUsIHVpbnQxNl90IHBvcnQsIGNvbnN0IFN0cmluZyYgcHJlZmlsbGVkVXNl cm5hbWUsIFN0cmluZyYgdXNlcm5hbWUsIFN0cmluZyYgcGFzc3dvcmQpID0gMDsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaCBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAppbmRleCAwZjYwZTdkZTZlOGFhMGJiOGI3ZGYw NDk0OWQ2ZGQwMDc2YmRhNWZiLi5mZWQ5N2I4YjgyMzg2OTg4YjAzMDU1NzRmODZhNmZmMzQ4OTFj ZjM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgK KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCkBAIC02NDIsNyAr NjQyLDYgQEAgcHVibGljOgogCiAjaWYgUExBVEZPUk0oUVQpCiAgICAgdm9pZCBmaW5kWm9vbWFi bGVBcmVhRm9yUG9pbnQoY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmLCBjb25zdCBXZWJDb3JlOjpJ bnRTaXplJik7Ci0gICAgdm9pZCBkaWRSZWNlaXZlTWVzc2FnZUZyb21OYXZpZ2F0b3JRdE9iamVj dChjb25zdCBTdHJpbmcmKTsKICNlbmRpZgogCiAjaWYgUExBVEZPUk0oUVQpIHx8IFBMQVRGT1JN KEVGTCkgfHwgUExBVEZPUk0oR1RLKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL3F0L1F0UGFnZUNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRQ YWdlQ2xpZW50LmNwcAppbmRleCA4OWE0MGM5MjMxYTE4MWI3MDE5YzFlMmZhMTJiNmI2OGIxMTZi MjYxLi44NmNhMzg3M2U4NDg3NjRjZDZlYWJmNTg2MjdmMjkwMDZiNmI4YTg0IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRQYWdlQ2xpZW50LmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRQYWdlQ2xpZW50LmNwcApAQCAtMjQ1LDExICsyNDUs NiBAQCB2b2lkIFF0UGFnZUNsaWVudDo6ZGlkRmluZFpvb21hYmxlQXJlYShjb25zdCBJbnRQb2lu dCYgdGFyZ2V0LCBjb25zdCBJbnRSZWN0JiBhcgogICAgIG1fZXZlbnRIYW5kbGVyLT5kaWRGaW5k Wm9vbWFibGVBcmVhKHRhcmdldCwgYXJlYSk7CiB9CiAKLXZvaWQgUXRQYWdlQ2xpZW50OjpkaWRS ZWNlaXZlTWVzc2FnZUZyb21OYXZpZ2F0b3JRdE9iamVjdChjb25zdCBTdHJpbmcmIG1lc3NhZ2Up Ci17Ci0gICAgUVF1aWNrV2ViVmlld1ByaXZhdGU6OmdldChtX3dlYlZpZXcpLT5kaWRSZWNlaXZl TWVzc2FnZUZyb21OYXZpZ2F0b3JRdE9iamVjdChtZXNzYWdlKTsKLX0KLQogdm9pZCBRdFBhZ2VD bGllbnQ6OnVwZGF0ZVRleHRJbnB1dFN0YXRlKCkKIHsKICAgICBBU1NFUlQobV9ldmVudEhhbmRs ZXIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0UGFnZUNsaWVu dC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0UGFnZUNsaWVudC5oCmluZGV4IGJj M2UzZjEyYzMwZWNmMDdmNzk4NWNmYmY3YjA0MjJhN2ExZjU1MjEuLmNiOTdjZTRmZjQ4MWZhZDJk ZGE4OTIwZDBjY2I0YTE4NjMxNWFiZjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9xdC9RdFBhZ2VDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQv UXRQYWdlQ2xpZW50LmgKQEAgLTQ3LDcgKzQ3LDYgQEAgcHVibGljOgogICAgIHZpcnR1YWwgV2Vi Q29yZTo6SW50U2l6ZSB2aWV3U2l6ZSgpOwogICAgIHZpcnR1YWwgYm9vbCBpc1ZpZXdGb2N1c2Vk KCk7CiAgICAgdmlydHVhbCBib29sIGlzVmlld1Zpc2libGUoKTsKLSAgICB2aXJ0dWFsIHZvaWQg ZGlkUmVjZWl2ZU1lc3NhZ2VGcm9tTmF2aWdhdG9yUXRPYmplY3QoY29uc3QgU3RyaW5nJik7CiAg ICAgdmlydHVhbCB2b2lkIHBhZ2VEaWRSZXF1ZXN0U2Nyb2xsKGNvbnN0IFdlYkNvcmU6OkludFBv aW50Jik7CiAgICAgdmlydHVhbCB2b2lkIGRpZENoYW5nZUNvbnRlbnRzU2l6ZShjb25zdCBXZWJD b3JlOjpJbnRTaXplJik7CiAgICAgdmlydHVhbCB2b2lkIGRpZENoYW5nZVZpZXdwb3J0UHJvcGVy dGllcyhjb25zdCBXZWJDb3JlOjpWaWV3cG9ydEF0dHJpYnV0ZXMmKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYkNvbnRleHQuY3BwIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL3F0L1F0V2ViQ29udGV4dC5jcHAKaW5kZXggMjY3NWY1MTFmNjQzYjAxYjNi YzFkODk2MTM3NTZlYWM2Yzc1Njc3Zi4uNzE4MmQ1MGY5NDc1MWQ0M2UyZjQyMTExMTI5YjExNTU3 YzcwOWJmMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViQ29u dGV4dC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViQ29udGV4dC5j cHAKQEAgLTI2LDcgKzI2LDcgQEAKICNpbmNsdWRlICJXS0FQSUNhc3QuaCIKICNpbmNsdWRlICJX ZWJDb250ZXh0LmgiCiAjaW5jbHVkZSAiV2ViSW5zcGVjdG9yU2VydmVyLmgiCi0jaW5jbHVkZSAi V2ViUGFnZVByb3h5LmgiCisjaW5jbHVkZSAicXF1aWNrd2Vidmlld19wX3AuaCIKICNpbmNsdWRl IDxXS0FycmF5Lmg+CiAjaW5jbHVkZSA8V0tQYWdlLmg+CiAjaW5jbHVkZSA8V0tTdHJpbmcuaD4K QEAgLTk5LDcgKzk5LDcgQEAgc3RhdGljIHZvaWQgZGlkUmVjZWl2ZU1lc3NhZ2VGcm9tSW5qZWN0 ZWRCdW5kbGUoV0tDb250ZXh0UmVmLCBXS1N0cmluZ1JlZiBtZXNzYWcKICAgICBXS1BhZ2VSZWYg cGFnZSA9IHN0YXRpY19jYXN0PFdLUGFnZVJlZj4oV0tBcnJheUdldEl0ZW1BdEluZGV4KGJvZHks IDApKTsKICAgICBXS1N0cmluZ1JlZiBzdHIgPSBzdGF0aWNfY2FzdDxXS1N0cmluZ1JlZj4oV0tB cnJheUdldEl0ZW1BdEluZGV4KGJvZHksIDEpKTsKIAotICAgIHRvSW1wbChwYWdlKS0+ZGlkUmVj ZWl2ZU1lc3NhZ2VGcm9tTmF2aWdhdG9yUXRPYmplY3QodG9JbXBsKHN0ciktPnN0cmluZygpKTsK KyAgICBRUXVpY2tXZWJWaWV3UHJpdmF0ZTo6Z2V0KHBhZ2UpLT5kaWRSZWNlaXZlTWVzc2FnZUZy b21OYXZpZ2F0b3JRdE9iamVjdChzdHIpOwogfQogCiBzdGF0aWMgdm9pZCBpbml0aWFsaXplQ29u dGV4dEluamVjdGVkQnVuZGxlQ2xpZW50KFdlYkNvbnRleHQqIGNvbnRleHQpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvV2ViUGFnZVByb3h5UXQuY3BwIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL3F0L1dlYlBhZ2VQcm94eVF0LmNwcAppbmRleCBlNmQ5YjkwODQ1 MGRmYmE2Y2Y0Y2NjYzkxYWQxZWEyOTUwMTI4YzhiLi40ZjI2ZDY1ZTA5MGIwMTNmN2UzYjRmZTY5 OGQyYmRkNTlhYTkyMjhiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQv V2ViUGFnZVByb3h5UXQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9XZWJQ YWdlUHJveHlRdC5jcHAKQEAgLTk5LDExICs5OSw2IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpmaW5k Wm9vbWFibGVBcmVhRm9yUG9pbnQoY29uc3QgSW50UG9pbnQmIHBvaW50LCBjb25zdCBJbnRTaXpl CiAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpGaW5kWm9vbWFibGVBcmVh Rm9yUG9pbnQocG9pbnQsIGFyZWEpLCBtX3BhZ2VJRCk7CiB9CiAKLXZvaWQgV2ViUGFnZVByb3h5 OjpkaWRSZWNlaXZlTWVzc2FnZUZyb21OYXZpZ2F0b3JRdE9iamVjdChjb25zdCBTdHJpbmcmIGNv bnRlbnRzKQotewotICAgIG1fcGFnZUNsaWVudC0+ZGlkUmVjZWl2ZU1lc3NhZ2VGcm9tTmF2aWdh dG9yUXRPYmplY3QoY29udGVudHMpOwotfQotCiB2b2lkIFdlYlBhZ2VQcm94eTo6YXV0aGVudGlj YXRpb25SZXF1aXJlZFJlcXVlc3QoY29uc3QgU3RyaW5nJiBob3N0bmFtZSwgY29uc3QgU3RyaW5n JiByZWFsbSwgY29uc3QgU3RyaW5nJiBwcmVmaWxsZWRVc2VybmFtZSwgU3RyaW5nJiB1c2VybmFt ZSwgU3RyaW5nJiBwYXNzd29yZCkKIHsKICAgICBtX3BhZ2VDbGllbnQtPmhhbmRsZUF1dGhlbnRp Y2F0aW9uUmVxdWlyZWRSZXF1ZXN0KGhvc3RuYW1lLCByZWFsbSwgcHJlZmlsbGVkVXNlcm5hbWUs IHVzZXJuYW1lLCBwYXNzd29yZCk7Cg==