108920 2013-02-05 00:47:40 -0800 [Qt][WK2] Fold QtWebPageFindClient into QQuickWebViewPrivate 2013-02-07 00:39:57 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 108471 1 hausmann hausmann abecsi benjamin cmarcelo jturcotte menard webkit.review.bot oldest_to_newest 825233 0 hausmann 2013-02-05 00:47:40 -0800 [Qt][WK2] Fold QtWebPageFindClient into QQuickWebViewPrivate 825234 1 186567 hausmann 2013-02-05 00:50:11 -0800 Created attachment 186567 Patch 825433 2 186567 jturcotte 2013-02-05 06:15:23 -0800 Comment on attachment 186567 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=186567&action=review > Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp:327 > + { > + WKPageFindClient findClient; > + memset(&findClient, 0, sizeof(WKPageFindClient)); > + findClient.version = kWKPageFindClientCurrentVersion; > + findClient.clientInfo = this; > + findClient.didFindString = didFindString; > + findClient.didFailToFindString = didFailToFindString; > + WKPageSetPageFindClient(toAPI(webPageProxy.get()), &findClient); > + } If the intent is to do so with most C API clients, it would be cleaner move all their initialization in a separate method. We can also do this once we have more of them here. r=me either way. 825464 3 hausmann 2013-02-05 07:24:52 -0800 This still needs a sign-off from a WK2 owner. Benjamin, can you help us with this? :) 825958 4 186567 benjamin 2013-02-05 17:29:24 -0800 Comment on attachment 186567 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=186567&action=review Okay with me, feel free to land. Isn't that exposing a bit too much in case you want to make QQuickWebView publicly available from C++? > Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp:2082 > + didFindString(page, string, 0, clientInfo); Maybe prefix by QQuickWebViewPrivate:: for clarity? 827105 5 hausmann 2013-02-07 00:25:18 -0800 (In reply to comment #4) > (From update of attachment 186567 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=186567&action=review > > Okay with me, feel free to land. Thank you! > Isn't that exposing a bit too much in case you want to make QQuickWebView publicly available from C++? It is becoming less and less likely that we're going to make the QML implementation a public C++ API :) > > Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp:2082 > > + didFindString(page, string, 0, clientInfo); > > Maybe prefix by QQuickWebViewPrivate:: for clarity? Good idea. 827119 6 hausmann 2013-02-07 00:39:57 -0800 Committed r142073: <http://trac.webkit.org/changeset/142073> 186567 2013-02-05 00:50:11 -0800 2013-02-05 17:29:24 -0800 Patch bug-108920-20130205094735.patch text/plain 10299 hausmann U3VidmVyc2lvbiBSZXZpc2lvbjogMTQxNzYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNmIyYTY2MWRlMzU0YTc2 ZDdlY2ViNDYwM2U5M2Y5ZmNkNGY3NDdiZC4uNjk5OTU3NzliMTYxNzNkNGY3ZjQyMmQ1Mjk3N2I5 Yzg1ZGE0MWI4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEzLTAyLTA1ICBTaW1v biBIYXVzbWFubiAgPHNpbW9uLmhhdXNtYW5uQGRpZ2lhLmNvbT4KKworICAgICAgICBbUXRdW1dL Ml0gRm9sZCBRdFdlYlBhZ2VGaW5kQ2xpZW50IGludG8gUVF1aWNrV2ViVmlld1ByaXZhdGUKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwODkyMAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEVtcGxveSB0aGUg cGF0dGVybiBzdWdnZXN0ZWQgYnkgSm9jZWx5biB0byBzaW1wbHkgaW1wbGVtZW50IHRoZSBDCisg ICAgICAgIGNhbGxiYWNrcyBkaXJlY3RseSB1c2luZyBzdGF0aWMgZnVuY3Rpb25zLgorCisgICAg ICAgICogVGFyZ2V0LnByaToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZp ZXcuY3BwOgorICAgICAgICAodG9RUXVpY2tXZWJWaWV3UHJpdmF0ZSk6CisgICAgICAgIChRUXVp Y2tXZWJWaWV3UHJpdmF0ZTo6aW5pdGlhbGl6ZSk6CisgICAgICAgIChRUXVpY2tXZWJWaWV3UHJp dmF0ZTo6ZGlkRmluZFN0cmluZyk6CisgICAgICAgIChRUXVpY2tXZWJWaWV3UHJpdmF0ZTo6ZGlk RmFpbFRvRmluZFN0cmluZyk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2 aWV3X3BfcC5oOgorICAgICAgICAoUVF1aWNrV2ViVmlld1ByaXZhdGUpOgorICAgICAgICAqIFVJ UHJvY2Vzcy9xdC9RdFdlYlBhZ2VGaW5kQ2xpZW50LmNwcDogUmVtb3ZlZC4KKyAgICAgICAgKiBV SVByb2Nlc3MvcXQvUXRXZWJQYWdlRmluZENsaWVudC5oOiBSZW1vdmVkLgorCiAyMDEzLTAyLTA0 ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CiAKICAgICAgICAgU29ydCBXZWJL aXQyIFhjb2RlIHByb2plY3QgZmlsZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVGFyZ2V0 LnByaSBiL1NvdXJjZS9XZWJLaXQyL1RhcmdldC5wcmkKaW5kZXggYzZlMzE2MmZmOTg0ZWUxNThi MzQ2M2RlYTM4NjNlNTU5ZDI1M2JjNi4uNmE1NWY0ZjJlNzA1OWM0Yzg0M2ZjZTBlYTM2ZWY1OGI2 NjhiMjBhOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVGFyZ2V0LnByaQorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9UYXJnZXQucHJpCkBAIC03ODUsNyArNzg1LDYgQEAgaGF2ZT8oUVRRVUlDSykg ewogICAgICAgICBVSVByb2Nlc3MvcXQvUXREaWFsb2dSdW5uZXIuaCBcCiAgICAgICAgIFVJUHJv Y2Vzcy9xdC9RdERvd25sb2FkTWFuYWdlci5oIFwKICAgICAgICAgVUlQcm9jZXNzL3F0L1F0UGFn ZUNsaWVudC5oIFwKLSAgICAgICAgVUlQcm9jZXNzL3F0L1F0V2ViUGFnZUZpbmRDbGllbnQuaCBc CiAgICAgICAgIFVJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VMb2FkQ2xpZW50LmggXAogICAgICAgICBV SVByb2Nlc3MvcXQvUXRXZWJQYWdlUG9saWN5Q2xpZW50LmggXAogICAgICAgICBVSVByb2Nlc3Mv cXQvUXRXZWJQYWdlU0dOb2RlLmggXApAQCAtODEzLDcgKzgxMiw2IEBAIGhhdmU/KFFUUVVJQ0sp IHsKICAgICAgICAgVUlQcm9jZXNzL3F0L1F0RGlhbG9nUnVubmVyLmNwcCBcCiAgICAgICAgIFVJ UHJvY2Vzcy9xdC9RdERvd25sb2FkTWFuYWdlci5jcHAgXAogICAgICAgICBVSVByb2Nlc3MvcXQv UXRQYWdlQ2xpZW50LmNwcCBcCi0gICAgICAgIFVJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VGaW5kQ2xp ZW50LmNwcCBcCiAgICAgICAgIFVJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VMb2FkQ2xpZW50LmNwcCBc CiAgICAgICAgIFVJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VQb2xpY3lDbGllbnQuY3BwIFwKICAgICAg ICAgVUlQcm9jZXNzL3F0L1F0V2ViUGFnZVNHTm9kZS5jcHAgXApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcCBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHAKaW5kZXggYTZhOWQ2NDU5MmE4 NmZkNTIyNmExZDJiZmUzYTZiZTE1MWVmZjM1Yy4uN2I1Mjc0NDUzZjNhYzIwNDkyYTk1MDBmMGQz MmFhNDY1YWZhMjg0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9x dC9xcXVpY2t3ZWJ2aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0 L3FxdWlja3dlYnZpZXcuY3BwCkBAIC0zMSw3ICszMSw2IEBACiAjaW5jbHVkZSAiUXRXZWJFcnJv ci5oIgogI2luY2x1ZGUgIlF0V2ViSWNvbkRhdGFiYXNlQ2xpZW50LmgiCiAjaW5jbHVkZSAiUXRX ZWJQYWdlRXZlbnRIYW5kbGVyLmgiCi0jaW5jbHVkZSAiUXRXZWJQYWdlRmluZENsaWVudC5oIgog I2luY2x1ZGUgIlF0V2ViUGFnZUxvYWRDbGllbnQuaCIKICNpbmNsdWRlICJRdFdlYlBhZ2VQb2xp Y3lDbGllbnQuaCIKICNpbmNsdWRlICJXZWJCYWNrRm9yd2FyZExpc3QuaCIKQEAgLTg0LDYgKzgz LDEyIEBAIHN0YXRpYyBjb25zdCBpbnQga0F4aXNMb2NrU2FtcGxlQ291bnQgPSA1Owogc3RhdGlj IGNvbnN0IHFyZWFsIGtBeGlzTG9ja1ZlbG9jaXR5VGhyZXNob2xkID0gMzAwOwogc3RhdGljIGNv bnN0IHFyZWFsIGtBeGlzTG9ja1ZlbG9jaXR5RGlyZWN0aW9uVGhyZXNob2xkID0gNTA7CiAKK3N0 YXRpYyBRUXVpY2tXZWJWaWV3UHJpdmF0ZSogdG9RUXVpY2tXZWJWaWV3UHJpdmF0ZShjb25zdCB2 b2lkKiBjbGllbnRJbmZvKQoreworICAgIEFTU0VSVChjbGllbnRJbmZvKTsKKyAgICByZXR1cm4g cmVpbnRlcnByZXRfY2FzdDxRUXVpY2tXZWJWaWV3UHJpdmF0ZSo+KGNvbnN0X2Nhc3Q8dm9pZCo+ KGNsaWVudEluZm8pKTsKK30KKwogc3RydWN0IEpTQ2FsbGJhY2tDbG9zdXJlIHsKICAgICBRUG9p bnRlcjxRT2JqZWN0PiByZWNlaXZlcjsKICAgICBRQnl0ZUFycmF5IG1ldGhvZDsKQEAgLTMxMSw3 ICszMTYsMTYgQEAgdm9pZCBRUXVpY2tXZWJWaWV3UHJpdmF0ZTo6aW5pdGlhbGl6ZShXS0NvbnRl eHRSZWYgY29udGV4dFJlZiwgV0tQYWdlR3JvdXBSZWYgcGEKICAgICBRUXVpY2tXZWJQYWdlUHJp dmF0ZSogY29uc3QgcGFnZVZpZXdQcml2YXRlID0gcGFnZVZpZXcuZGF0YSgpLT5kOwogICAgIHBh Z2VWaWV3UHJpdmF0ZS0+aW5pdGlhbGl6ZSh3ZWJQYWdlUHJveHkuZ2V0KCkpOwogCi0gICAgcGFn ZUZpbmRDbGllbnQucmVzZXQobmV3IFF0V2ViUGFnZUZpbmRDbGllbnQodG9BUEkod2ViUGFnZVBy b3h5LmdldCgpKSwgcV9wdHIpKTsKKyAgICB7CisgICAgICAgIFdLUGFnZUZpbmRDbGllbnQgZmlu ZENsaWVudDsKKyAgICAgICAgbWVtc2V0KCZmaW5kQ2xpZW50LCAwLCBzaXplb2YoV0tQYWdlRmlu ZENsaWVudCkpOworICAgICAgICBmaW5kQ2xpZW50LnZlcnNpb24gPSBrV0tQYWdlRmluZENsaWVu dEN1cnJlbnRWZXJzaW9uOworICAgICAgICBmaW5kQ2xpZW50LmNsaWVudEluZm8gPSB0aGlzOwor ICAgICAgICBmaW5kQ2xpZW50LmRpZEZpbmRTdHJpbmcgPSBkaWRGaW5kU3RyaW5nOworICAgICAg ICBmaW5kQ2xpZW50LmRpZEZhaWxUb0ZpbmRTdHJpbmcgPSBkaWRGYWlsVG9GaW5kU3RyaW5nOwor ICAgICAgICBXS1BhZ2VTZXRQYWdlRmluZENsaWVudCh0b0FQSSh3ZWJQYWdlUHJveHkuZ2V0KCkp LCAmZmluZENsaWVudCk7CisgICAgfQorCiAgICAgcGFnZUxvYWRDbGllbnQucmVzZXQobmV3IFF0 V2ViUGFnZUxvYWRDbGllbnQodG9BUEkod2ViUGFnZVByb3h5LmdldCgpKSwgcV9wdHIpKTsKICAg ICBwYWdlUG9saWN5Q2xpZW50LnJlc2V0KG5ldyBRdFdlYlBhZ2VQb2xpY3lDbGllbnQodG9BUEko d2ViUGFnZVByb3h5LmdldCgpKSwgcV9wdHIpKTsKICAgICBwYWdlVUlDbGllbnQucmVzZXQobmV3 IFF0V2ViUGFnZVVJQ2xpZW50KHRvQVBJKHdlYlBhZ2VQcm94eS5nZXQoKSksIHFfcHRyKSk7CkBA IC0yMDU3LDEyICsyMDcxLDE3IEBAIHZvaWQgUVF1aWNrV2ViVmlldzo6c2V0QWxsb3dBbnlIVFRQ U0NlcnRpZmljYXRlRm9yTG9jYWxIb3N0KGJvb2wgYWxsb3cpCiAgICAgZC0+bV9hbGxvd0FueUhU VFBTQ2VydGlmaWNhdGVGb3JMb2NhbEhvc3QgPSBhbGxvdzsKIH0KIAotdm9pZCBRUXVpY2tXZWJW aWV3UHJpdmF0ZTo6ZGlkRmluZFN0cmluZyh1bnNpZ25lZCBtYXRjaENvdW50KQordm9pZCBRUXVp Y2tXZWJWaWV3UHJpdmF0ZTo6ZGlkRmluZFN0cmluZyhXS1BhZ2VSZWYsIFdLU3RyaW5nUmVmLCB1 bnNpZ25lZCBtYXRjaENvdW50LCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKQogewotICAgIFFfUShR UXVpY2tXZWJWaWV3KTsKKyAgICBRUXVpY2tXZWJWaWV3KiBxID0gdG9RUXVpY2tXZWJWaWV3UHJp dmF0ZShjbGllbnRJbmZvKS0+cV9wdHI7CiAgICAgZW1pdCBxLT5leHBlcmltZW50YWwoKS0+dGV4 dEZvdW5kKG1hdGNoQ291bnQpOwogfQogCit2b2lkIFFRdWlja1dlYlZpZXdQcml2YXRlOjpkaWRG YWlsVG9GaW5kU3RyaW5nKFdLUGFnZVJlZiBwYWdlLCBXS1N0cmluZ1JlZiBzdHJpbmcsIGNvbnN0 IHZvaWQqIGNsaWVudEluZm8pCit7CisgICAgZGlkRmluZFN0cmluZyhwYWdlLCBzdHJpbmcsIDAs IGNsaWVudEluZm8pOworfQorCiAvKiEKICAgICBccW1sc2lnbmFsIFdlYlZpZXc6Om9uTG9hZGlu Z0NoYW5nZWQobG9hZFJlcXVlc3QpCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlld19wX3AuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvcXQvcXF1aWNrd2Vidmlld19wX3AuaAppbmRleCA4OGIyOGM0NzNkM2YxMjU2YWZmYzk1 N2VlZDBmOGNhNjYyMDNmMmNkLi5lZGJmNjMyODE4NTNmMWRhYjMxY2NkODI0OWY0MzJlZmZhZDhj Y2ZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dl YnZpZXdfcF9wLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3 ZWJ2aWV3X3BfcC5oCkBAIC04NSw3ICs4NSw4IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQg bG9hZERpZEZhaWwoY29uc3QgV2ViS2l0OjpRdFdlYkVycm9yJiBlcnJvcik7CiAgICAgdmlydHVh bCB2b2lkIGhhbmRsZU1vdXNlRXZlbnQoUU1vdXNlRXZlbnQqKTsKIAotICAgIHZvaWQgZGlkRmlu ZFN0cmluZyh1bnNpZ25lZCBtYXRjaENvdW50KTsKKyAgICBzdGF0aWMgdm9pZCBkaWRGaW5kU3Ry aW5nKFdLUGFnZVJlZiBwYWdlLCBXS1N0cmluZ1JlZiBzdHJpbmcsIHVuc2lnbmVkIG1hdGNoQ291 bnQsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pOworICAgIHN0YXRpYyB2b2lkIGRpZEZhaWxUb0Zp bmRTdHJpbmcoV0tQYWdlUmVmIHBhZ2UsIFdLU3RyaW5nUmVmIHN0cmluZywgY29uc3Qgdm9pZCog Y2xpZW50SW5mbyk7CiAKICAgICB2aXJ0dWFsIHZvaWQgZGlkQ2hhbmdlVmlld3BvcnRQcm9wZXJ0 aWVzKGNvbnN0IFdlYkNvcmU6OlZpZXdwb3J0QXR0cmlidXRlcyYgYXR0cikgeyB9CiAKQEAgLTE3 MCw3ICsxNzEsNiBAQCBwcm90ZWN0ZWQ6CiAgICAgT3duUHRyPFFXZWJQcmVmZXJlbmNlcz4gcHJl ZmVyZW5jZXM7CiAKICAgICBRU2NvcGVkUG9pbnRlcjxXZWJLaXQ6OlF0V2ViUGFnZUxvYWRDbGll bnQ+IHBhZ2VMb2FkQ2xpZW50OwotICAgIFFTY29wZWRQb2ludGVyPFdlYktpdDo6UXRXZWJQYWdl RmluZENsaWVudD4gcGFnZUZpbmRDbGllbnQ7CiAgICAgUVNjb3BlZFBvaW50ZXI8V2ViS2l0OjpR dFdlYlBhZ2VQb2xpY3lDbGllbnQ+IHBhZ2VQb2xpY3lDbGllbnQ7CiAgICAgUVNjb3BlZFBvaW50 ZXI8V2ViS2l0OjpRdFdlYlBhZ2VVSUNsaWVudD4gcGFnZVVJQ2xpZW50OwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlRmluZENsaWVudC5jcHAgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlRmluZENsaWVudC5jcHAKZGVsZXRl ZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDg1ZTFlNjgwNDQ2MjQwYWYwMmRiMDQ2NDNhZjZmNmI2 NjE0MjFjMjcuLjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAKLS0tIGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFnZUZpbmRDbGllbnQuY3BwCisrKyAv ZGV2L251bGwKQEAgLTEsNjMgKzAsMCBAQAotLyoKLSAqIENvcHlyaWdodCAoYykgMjAxMiBIZXds ZXR0LVBhY2thcmQgRGV2ZWxvcG1lbnQgQ29tcGFueSwgTC5QLgotICoKLSAqIFRoaXMgbGlicmFy eSBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IKLSAqIG1v ZGlmeSBpdCB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEdOVSBMaWJyYXJ5IEdlbmVyYWwgUHVibGlj Ci0gKiBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBieSB0aGUgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9u OyBlaXRoZXIKLSAqIHZlcnNpb24gMiBvZiB0aGUgTGljZW5zZSwgb3IgKGF0IHlvdXIgb3B0aW9u KSBhbnkgbGF0ZXIgdmVyc2lvbi4KLSAqCi0gKiBUaGlzIHByb2dyYW0gaXMgZGlzdHJpYnV0ZWQg aW4gdGhlIGhvcGUgdGhhdCBpdCB3aWxsIGJlIHVzZWZ1bCwKLSAqIGJ1dCBXSVRIT1VUIEFOWSBX QVJSQU5UWTsgd2l0aG91dCBldmVuIHRoZSBpbXBsaWVkIHdhcnJhbnR5IG9mCi0gKiBNRVJDSEFO VEFCSUxJVFkgb3IgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBVUlBPU0UuICBTZWUgdGhlIEdO VQotICogTGlicmFyeSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGZvciBtb3JlIGRldGFpbHMuCi0g KgotICogWW91IHNob3VsZCBoYXZlIHJlY2VpdmVkIGEgY29weSBvZiB0aGUgR05VIExpYnJhcnkg R2VuZXJhbCBQdWJsaWMgTGljZW5zZQotICogYWxvbmcgd2l0aCB0aGlzIHByb2dyYW07IHNlZSB0 aGUgZmlsZSBDT1BZSU5HLkxJQi4gIElmIG5vdCwgd3JpdGUgdG8KLSAqIHRoZSBGcmVlIFNvZnR3 YXJlIEZvdW5kYXRpb24sIEluYy4sIDUxIEZyYW5rbGluIFN0cmVldCwgRmlmdGggRmxvb3IsCi0g KiBCb3N0b24sIE1BIDAyMTEwLTEzMDEsIFVTQS4KLSAqCi0gKi8KLQotI2luY2x1ZGUgImNvbmZp Zy5oIgotI2luY2x1ZGUgIlF0V2ViUGFnZUZpbmRDbGllbnQuaCIKLQotI2luY2x1ZGUgInFxdWlj a3dlYnZpZXdfcF9wLmgiCi0KLXVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwotCi1uYW1lc3BhY2Ug V2ViS2l0IHsKLQotUXRXZWJQYWdlRmluZENsaWVudDo6UXRXZWJQYWdlRmluZENsaWVudChXS1Bh Z2VSZWYgcGFnZVJlZiwgUVF1aWNrV2ViVmlldyogd2ViVmlldykKLSAgICA6IG1fd2ViVmlldyh3 ZWJWaWV3KQotewotICAgIFdLUGFnZUZpbmRDbGllbnQgZmluZENsaWVudDsKLSAgICBtZW1zZXQo JmZpbmRDbGllbnQsIDAsIHNpemVvZihXS1BhZ2VGaW5kQ2xpZW50KSk7Ci0gICAgZmluZENsaWVu dC52ZXJzaW9uID0ga1dLUGFnZUZpbmRDbGllbnRDdXJyZW50VmVyc2lvbjsKLSAgICBmaW5kQ2xp ZW50LmNsaWVudEluZm8gPSB0aGlzOwotICAgIGZpbmRDbGllbnQuZGlkRmluZFN0cmluZyA9IGRp ZEZpbmRTdHJpbmc7Ci0gICAgZmluZENsaWVudC5kaWRGYWlsVG9GaW5kU3RyaW5nID0gZGlkRmFp bFRvRmluZFN0cmluZzsKLSAgICBXS1BhZ2VTZXRQYWdlRmluZENsaWVudChwYWdlUmVmLCAmZmlu ZENsaWVudCk7Ci19Ci0KLXZvaWQgUXRXZWJQYWdlRmluZENsaWVudDo6ZGlkRmluZFN0cmluZyh1 bnNpZ25lZCBtYXRjaENvdW50KQotewotICAgIG1fd2ViVmlldy0+ZF9mdW5jKCktPmRpZEZpbmRT dHJpbmcobWF0Y2hDb3VudCk7Ci19Ci0KLXN0YXRpYyBRdFdlYlBhZ2VGaW5kQ2xpZW50KiB0b1F0 V2ViUGFnZUZpbmRDbGllbnQoY29uc3Qgdm9pZCogY2xpZW50SW5mbykKLXsKLSAgICBBU1NFUlQo Y2xpZW50SW5mbyk7Ci0gICAgcmV0dXJuIHJlaW50ZXJwcmV0X2Nhc3Q8UXRXZWJQYWdlRmluZENs aWVudCo+KGNvbnN0X2Nhc3Q8dm9pZCo+KGNsaWVudEluZm8pKTsKLX0KLQotdm9pZCBRdFdlYlBh Z2VGaW5kQ2xpZW50OjpkaWRGaW5kU3RyaW5nKFdLUGFnZVJlZiBwYWdlLCBXS1N0cmluZ1JlZiBz dHJpbmcsIHVuc2lnbmVkIG1hdGNoQ291bnQsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCi17Ci0g ICAgdG9RdFdlYlBhZ2VGaW5kQ2xpZW50KGNsaWVudEluZm8pLT5kaWRGaW5kU3RyaW5nKG1hdGNo Q291bnQpOwotfQotCi12b2lkIFF0V2ViUGFnZUZpbmRDbGllbnQ6OmRpZEZhaWxUb0ZpbmRTdHJp bmcoV0tQYWdlUmVmIHBhZ2UsIFdLU3RyaW5nUmVmIHN0cmluZywgY29uc3Qgdm9pZCogY2xpZW50 SW5mbykKLXsKLSAgICB0b1F0V2ViUGFnZUZpbmRDbGllbnQoY2xpZW50SW5mbyktPmRpZEZpbmRT dHJpbmcoMCk7Ci19Ci0KLX0gLy8gbmFtZXNwYWNlIFdlYmtpdApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFnZUZpbmRDbGllbnQuaCBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VGaW5kQ2xpZW50LmgKZGVsZXRlZCBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDU1YzAyNzI0OGYwZDBiOWEzYWEzZjAwNGU4NWI4NGVkMzMyMGMzOGIuLjAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFnZUZpbmRDbGllbnQuaAorKysgL2Rldi9udWxsCkBAIC0x LDQ4ICswLDAgQEAKLS8qCi0gKiBDb3B5cmlnaHQgKGMpIDIwMTIgSGV3bGV0dC1QYWNrYXJkIERl dmVsb3BtZW50IENvbXBhbnksIEwuUC4KLSAqCi0gKiBUaGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0 d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yCi0gKiBtb2RpZnkgaXQgdW5kZXIg dGhlIHRlcm1zIG9mIHRoZSBHTlUgTGlicmFyeSBHZW5lcmFsIFB1YmxpYwotICogTGljZW5zZSBh cyBwdWJsaXNoZWQgYnkgdGhlIEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbjsgZWl0aGVyCi0gKiB2 ZXJzaW9uIDIgb2YgdGhlIExpY2Vuc2UsIG9yIChhdCB5b3VyIG9wdGlvbikgYW55IGxhdGVyIHZl cnNpb24uCi0gKgotICogVGhpcyBwcm9ncmFtIGlzIGRpc3RyaWJ1dGVkIGluIHRoZSBob3BlIHRo YXQgaXQgd2lsbCBiZSB1c2VmdWwsCi0gKiBidXQgV0lUSE9VVCBBTlkgV0FSUkFOVFk7IHdpdGhv dXQgZXZlbiB0aGUgaW1wbGllZCB3YXJyYW50eSBvZgotICogTUVSQ0hBTlRBQklMSVRZIG9yIEZJ VE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFLiAgU2VlIHRoZSBHTlUKLSAqIExpYnJhcnkg R2VuZXJhbCBQdWJsaWMgTGljZW5zZSBmb3IgbW9yZSBkZXRhaWxzLgotICoKLSAqIFlvdSBzaG91 bGQgaGF2ZSByZWNlaXZlZCBhIGNvcHkgb2YgdGhlIEdOVSBMaWJyYXJ5IEdlbmVyYWwgUHVibGlj IExpY2Vuc2UKLSAqIGFsb25nIHdpdGggdGhpcyBwcm9ncmFtOyBzZWUgdGhlIGZpbGUgQ09QWUlO Ry5MSUIuICBJZiBub3QsIHdyaXRlIHRvCi0gKiB0aGUgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9u LCBJbmMuLCA1MSBGcmFua2xpbiBTdHJlZXQsIEZpZnRoIEZsb29yLAotICogQm9zdG9uLCBNQSAw MjExMC0xMzAxLCBVU0EuCi0gKgotICovCi0KLSNpZm5kZWYgUXRXZWJQYWdlRmluZENsaWVudF9o Ci0jZGVmaW5lIFF0V2ViUGFnZUZpbmRDbGllbnRfaAotCi0jaW5jbHVkZSA8V0tQYWdlLmg+Ci0j aW5jbHVkZSA8d3RmL3RleHQvV1RGU3RyaW5nLmg+Ci0KLWNsYXNzIFFRdWlja1dlYlZpZXc7Ci0K LW5hbWVzcGFjZSBXZWJLaXQgewotCi1jbGFzcyBRdFdlYlBhZ2VGaW5kQ2xpZW50IHsKLXB1Ymxp YzoKLSAgICBRdFdlYlBhZ2VGaW5kQ2xpZW50KFdLUGFnZVJlZiwgUVF1aWNrV2ViVmlldyopOwot Ci1wcml2YXRlOgotCi0gICAgdm9pZCBkaWRGaW5kU3RyaW5nKHVuc2lnbmVkIG1hdGNoQ291bnQp OwotCi0gICAgLy8gV0tQYWdlRmluZENsaWVudCBjYWxsYmFja3MuCi0gICAgc3RhdGljIHZvaWQg ZGlkRmluZFN0cmluZyhXS1BhZ2VSZWYsIFdLU3RyaW5nUmVmLCB1bnNpZ25lZCBtYXRjaENvdW50 LCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKTsKLSAgICBzdGF0aWMgdm9pZCBkaWRGYWlsVG9GaW5k U3RyaW5nKFdLUGFnZVJlZiwgV0tTdHJpbmdSZWYsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pOwot Ci0gICAgUVF1aWNrV2ViVmlldyogbV93ZWJWaWV3OwotfTsKLQotfSAvLyBuYW1lc3BhY2UgV2Vi a2l0Ci0KLSNlbmRpZiAvLyBRdFdlYlBhZ2VGaW5kQ2xpZW50X2gK