108826 2013-02-04 08:08:12 -0800 [Qt][WK2] Replace more uses of WebPageProxy with WKPage in QQuickWebView 2013-02-05 03:00:35 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 108471 1 hausmann hausmann abecsi benjamin cmarcelo kling menard webkit.review.bot oldest_to_newest 824362 0 hausmann 2013-02-04 08:08:12 -0800 [Qt][WK2] Replace more uses of WebPageProxy with WKPage in QQuickWebView 824364 1 186377 hausmann 2013-02-04 08:10:04 -0800 Created attachment 186377 Patch 824367 2 186377 kenneth 2013-02-04 08:15:13 -0800 Comment on attachment 186377 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=186377&action=review LGTM > Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp:1016 > + static WKStringRef messageName = WKStringCreateWithUTF8CString("MessageToNavigatorQtObject"); hmm ok, so static and no adoption here... guess that is fine > Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp:1514 > + WKPageGoBack(d->webPage.get()); why not add an inline wkPage() const accessor? 825222 3 186377 hausmann 2013-02-05 00:37:25 -0800 Comment on attachment 186377 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=186377&action=review >> Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp:1514 >> + WKPageGoBack(d->webPage.get()); > > why not add an inline wkPage() const accessor? Not sure that it's worth it :) 825247 4 186377 benjamin 2013-02-05 01:07:29 -0800 Comment on attachment 186377 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=186377&action=review This looks like a step in the right direction. I sign off on this for WebKit2. > Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h:165 > RefPtr<WebKit::WebPageProxy> webPageProxy; > + WKRetainPtr<WKPageRef> webPage; Why keep a reference to webPageProxy? This defeats the purpose. :( 825255 5 186377 hausmann 2013-02-05 01:17:03 -0800 Comment on attachment 186377 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=186377&action=review Thanks for the sign-off, Benjamin! >> Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h:165 >> + WKRetainPtr<WKPageRef> webPage; > > Why keep a reference to webPageProxy? This defeats the purpose. :( There are still a few references left, our plan is to definitely get rid of this member as the last step of the increments. 825294 6 186377 kenneth 2013-02-05 02:14:38 -0800 Comment on attachment 186377 Patch r=me as signed off by Benjamin 825332 7 hausmann 2013-02-05 03:00:35 -0800 Committed r141882: <http://trac.webkit.org/changeset/141882> 186377 2013-02-04 08:10:04 -0800 2013-02-05 02:14:38 -0800 Patch bug-108826-20130204170727.patch text/plain 13024 hausmann U3VidmVyc2lvbiBSZXZpc2lvbjogMTQxNzYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNmIyYTY2MWRlMzU0YTc2 ZDdlY2ViNDYwM2U5M2Y5ZmNkNGY3NDdiZC4uOTZiNTI3NTU3ODg3Zjc5ZWI1YjBkZjFmMWU1NmM0 ZGQyZTAwMGU3OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDEzLTAyLTA0ICBTaW1v biBIYXVzbWFubiAgPHNpbW9uLmhhdXNtYW5uQGRpZ2lhLmNvbT4KKworICAgICAgICBbUXRdW1dL Ml0gUmVwbGFjZSBtb3JlIHVzZXMgb2YgV2ViUGFnZVByb3h5IHdpdGggV0tQYWdlIGluIFFRdWlj a1dlYlZpZXcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEwODgyNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFRoaXMgcGF0Y2ggY29udmVydHMgYSBmZXcgbW9yZSB1c2FnZXMgb2YgV2ViUGFnZVByb3h5IHRv IGZ1bmN0aW9ucyBpbgorICAgICAgICB0aGUgV0tQYWdlIEFQSS4KKworICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHA6CisgICAgICAgIChRUXVpY2tXZWJWaWV3UHJp dmF0ZTo6aW5pdGlhbGl6ZSk6CisgICAgICAgIChRUXVpY2tXZWJWaWV3TGVnYWN5UHJpdmF0ZTo6 em9vbUZhY3Rvcik6CisgICAgICAgIChRUXVpY2tXZWJWaWV3TGVnYWN5UHJpdmF0ZTo6c2V0Wm9v bUZhY3Rvcik6CisgICAgICAgIChRUXVpY2tXZWJWaWV3RXhwZXJpbWVudGFsOjpwb3N0TWVzc2Fn ZSk6CisgICAgICAgIChRUXVpY2tXZWJWaWV3RXhwZXJpbWVudGFsOjp1c2VyQWdlbnQpOgorICAg ICAgICAoUVF1aWNrV2ViVmlld0V4cGVyaW1lbnRhbDo6c2V0VXNlckFnZW50KToKKyAgICAgICAg KFFRdWlja1dlYlZpZXdFeHBlcmltZW50YWw6OmV2YWx1YXRlSmF2YVNjcmlwdCk6CisgICAgICAg IChRUXVpY2tXZWJWaWV3RXhwZXJpbWVudGFsOjpmaW5kVGV4dCk6CisgICAgICAgIChRUXVpY2tX ZWJWaWV3Ojpnb0JhY2spOgorICAgICAgICAoUVF1aWNrV2ViVmlldzo6Z29Gb3J3YXJkKToKKyAg ICAgICAgKFFRdWlja1dlYlZpZXc6OnN0b3ApOgorICAgICAgICAoUVF1aWNrV2ViVmlldzo6cmVs b2FkKToKKyAgICAgICAgKFFRdWlja1dlYlZpZXc6OnNldFVybCk6CisgICAgICAgIChRUXVpY2tX ZWJWaWV3OjpjYW5Hb0JhY2spOgorICAgICAgICAoUVF1aWNrV2ViVmlldzo6Y2FuR29Gb3J3YXJk KToKKyAgICAgICAgKFFRdWlja1dlYlZpZXc6OmxvYWRpbmcpOgorICAgICAgICAoUVF1aWNrV2Vi Vmlldzo6dGl0bGUpOgorICAgICAgICAoUVF1aWNrV2ViVmlldzo6cGFnZVJlZik6CisgICAgICAg IChRUXVpY2tXZWJWaWV3Ojpsb2FkSHRtbCk6CisgICAgICAgIChRUXVpY2tXZWJWaWV3OjpydW5K YXZhU2NyaXB0SW5NYWluRnJhbWUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXF1aWNr d2Vidmlld19wX3AuaDoKKyAgICAgICAgKFFRdWlja1dlYlZpZXdQcml2YXRlKToKKwogMjAxMy0w Mi0wNCAgRGF2aWQgS2lsemVyICA8ZGRraWx6ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFNvcnQg V2ViS2l0MiBYY29kZSBwcm9qZWN0IGZpbGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL3F0L3FxdWlja3dlYnZpZXcuY3BwCmluZGV4IGE2YTlkNjQ1OTJhODZmZDUyMjZhMWQy YmZlM2E2YmUxNTFlZmYzNWMuLmYxZjEzY2IyNzZlMjJjMDUwNzI0NGNjNzQwZDNiNWJjYjFhODQ0 ZmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vi dmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2 aWV3LmNwcApAQCAtNjgsNiArNjgsOCBAQAogI2luY2x1ZGUgPFdLUGFnZUdyb3VwLmg+CiAjaW5j bHVkZSA8V0tTZXJpYWxpemVkU2NyaXB0VmFsdWUuaD4KICNpbmNsdWRlIDxXS1N0cmluZy5oPgor I2luY2x1ZGUgPFdLU3RyaW5nUXQuaD4KKyNpbmNsdWRlIDxXS1VSTFF0Lmg+CiAjaW5jbHVkZSA8 V2ViQ29yZS9JbnRQb2ludC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvSW50UmVjdC5oPgogI2luY2x1 ZGUgPGxpbWl0cz4KQEAgLTMwMyw2ICszMDUsNyBAQCB2b2lkIFFRdWlja1dlYlZpZXdQcml2YXRl Ojppbml0aWFsaXplKFdLQ29udGV4dFJlZiBjb250ZXh0UmVmLCBXS1BhZ2VHcm91cFJlZiBwYQog CiAgICAgY29udGV4dCA9IGNvbnRleHRSZWYgPyBRdFdlYkNvbnRleHQ6OmNyZWF0ZSh0b0ltcGwo Y29udGV4dFJlZikpIDogUXRXZWJDb250ZXh0OjpkZWZhdWx0Q29udGV4dCgpOwogICAgIHdlYlBh Z2VQcm94eSA9IGNvbnRleHQtPmNyZWF0ZVdlYlBhZ2UoJnBhZ2VDbGllbnQsIHRvSW1wbChwYWdl R3JvdXAuZ2V0KCkpKTsKKyAgICB3ZWJQYWdlID0gdG9BUEkod2ViUGFnZVByb3h5LmdldCgpKTsK ICAgICB3ZWJQYWdlUHJveHktPnNldFVzZUZpeGVkTGF5b3V0KHNfZmxpY2thYmxlVmlld3BvcnRF bmFibGVkKTsKICNpZiBFTkFCTEUoRlVMTFNDUkVFTl9BUEkpCiAgICAgd2ViUGFnZVByb3h5LT5m dWxsU2NyZWVuTWFuYWdlcigpLT5zZXRXZWJWaWV3KHFfcHRyKTsKQEAgLTMxMSwxMSArMzE0LDEx IEBAIHZvaWQgUVF1aWNrV2ViVmlld1ByaXZhdGU6OmluaXRpYWxpemUoV0tDb250ZXh0UmVmIGNv bnRleHRSZWYsIFdLUGFnZUdyb3VwUmVmIHBhCiAgICAgUVF1aWNrV2ViUGFnZVByaXZhdGUqIGNv bnN0IHBhZ2VWaWV3UHJpdmF0ZSA9IHBhZ2VWaWV3LmRhdGEoKS0+ZDsKICAgICBwYWdlVmlld1By aXZhdGUtPmluaXRpYWxpemUod2ViUGFnZVByb3h5LmdldCgpKTsKIAotICAgIHBhZ2VGaW5kQ2xp ZW50LnJlc2V0KG5ldyBRdFdlYlBhZ2VGaW5kQ2xpZW50KHRvQVBJKHdlYlBhZ2VQcm94eS5nZXQo KSksIHFfcHRyKSk7Ci0gICAgcGFnZUxvYWRDbGllbnQucmVzZXQobmV3IFF0V2ViUGFnZUxvYWRD bGllbnQodG9BUEkod2ViUGFnZVByb3h5LmdldCgpKSwgcV9wdHIpKTsKLSAgICBwYWdlUG9saWN5 Q2xpZW50LnJlc2V0KG5ldyBRdFdlYlBhZ2VQb2xpY3lDbGllbnQodG9BUEkod2ViUGFnZVByb3h5 LmdldCgpKSwgcV9wdHIpKTsKLSAgICBwYWdlVUlDbGllbnQucmVzZXQobmV3IFF0V2ViUGFnZVVJ Q2xpZW50KHRvQVBJKHdlYlBhZ2VQcm94eS5nZXQoKSksIHFfcHRyKSk7Ci0gICAgbmF2aWdhdGlv bkhpc3RvcnkgPSBhZG9wdFB0cihRV2ViTmF2aWdhdGlvbkhpc3RvcnlQcml2YXRlOjpjcmVhdGVI aXN0b3J5KHRvQVBJKHdlYlBhZ2VQcm94eS5nZXQoKSkpKTsKKyAgICBwYWdlRmluZENsaWVudC5y ZXNldChuZXcgUXRXZWJQYWdlRmluZENsaWVudCh3ZWJQYWdlLmdldCgpLCBxX3B0cikpOworICAg IHBhZ2VMb2FkQ2xpZW50LnJlc2V0KG5ldyBRdFdlYlBhZ2VMb2FkQ2xpZW50KHdlYlBhZ2UuZ2V0 KCksIHFfcHRyKSk7CisgICAgcGFnZVBvbGljeUNsaWVudC5yZXNldChuZXcgUXRXZWJQYWdlUG9s aWN5Q2xpZW50KHdlYlBhZ2UuZ2V0KCksIHFfcHRyKSk7CisgICAgcGFnZVVJQ2xpZW50LnJlc2V0 KG5ldyBRdFdlYlBhZ2VVSUNsaWVudCh3ZWJQYWdlLmdldCgpLCBxX3B0cikpOworICAgIG5hdmln YXRpb25IaXN0b3J5ID0gYWRvcHRQdHIoUVdlYk5hdmlnYXRpb25IaXN0b3J5UHJpdmF0ZTo6Y3Jl YXRlSGlzdG9yeSh3ZWJQYWdlLmdldCgpKSk7CiAKICAgICBRdFdlYkljb25EYXRhYmFzZUNsaWVu dCogaWNvbkRhdGFiYXNlID0gY29udGV4dC0+aWNvbkRhdGFiYXNlKCk7CiAgICAgUU9iamVjdDo6 Y29ubmVjdChpY29uRGF0YWJhc2UsIFNJR05BTChpY29uQ2hhbmdlZEZvclBhZ2VVUkwoUVN0cmlu ZykpLCBxX3B0ciwgU0xPVChfcV9vbkljb25DaGFuZ2VkRm9yUGFnZVVSTChRU3RyaW5nKSkpOwpA QCAtODUwLDEyICs4NTMsMTIgQEAgdm9pZCBRUXVpY2tXZWJWaWV3TGVnYWN5UHJpdmF0ZTo6dXBk YXRlVmlld3BvcnRTaXplKCkKIAogcXJlYWwgUVF1aWNrV2ViVmlld0xlZ2FjeVByaXZhdGU6Onpv b21GYWN0b3IoKSBjb25zdAogewotICAgIHJldHVybiB3ZWJQYWdlUHJveHktPnBhZ2Vab29tRmFj dG9yKCk7CisgICAgcmV0dXJuIFdLUGFnZUdldFBhZ2Vab29tRmFjdG9yKHdlYlBhZ2UuZ2V0KCkp OwogfQogCiB2b2lkIFFRdWlja1dlYlZpZXdMZWdhY3lQcml2YXRlOjpzZXRab29tRmFjdG9yKHFy ZWFsIGZhY3RvcikKIHsKLSAgICB3ZWJQYWdlUHJveHktPnNldFBhZ2Vab29tRmFjdG9yKGZhY3Rv cik7CisgICAgV0tQYWdlU2V0UGFnZVpvb21GYWN0b3Iod2ViUGFnZS5nZXQoKSwgZmFjdG9yKTsK IH0KIAogUVF1aWNrV2ViVmlld0ZsaWNrYWJsZVByaXZhdGU6OlFRdWlja1dlYlZpZXdGbGlja2Fi bGVQcml2YXRlKFFRdWlja1dlYlZpZXcqIHZpZXdwb3J0KQpAQCAtMTAxMCw5ICsxMDEzLDkgQEAg Ym9vbCBRUXVpY2tXZWJWaWV3RXhwZXJpbWVudGFsOjpmbGlja2FibGVWaWV3cG9ydEVuYWJsZWQo KQogdm9pZCBRUXVpY2tXZWJWaWV3RXhwZXJpbWVudGFsOjpwb3N0TWVzc2FnZShjb25zdCBRU3Ry aW5nJiBtZXNzYWdlKQogewogICAgIFFfRChRUXVpY2tXZWJWaWV3KTsKLSAgICBzdGF0aWMgU3Ry aW5nIG1lc3NhZ2VOYW1lKCJNZXNzYWdlVG9OYXZpZ2F0b3JRdE9iamVjdCIpOwotICAgIFJlZlB0 cjxXZWJTdHJpbmc+IGNvbnRlbnRzID0gV2ViU3RyaW5nOjpjcmVhdGUoU3RyaW5nKG1lc3NhZ2Up KTsKLSAgICBkLT53ZWJQYWdlUHJveHktPnBvc3RNZXNzYWdlVG9JbmplY3RlZEJ1bmRsZShtZXNz YWdlTmFtZSwgY29udGVudHMuZ2V0KCkpOworICAgIHN0YXRpYyBXS1N0cmluZ1JlZiBtZXNzYWdl TmFtZSA9IFdLU3RyaW5nQ3JlYXRlV2l0aFVURjhDU3RyaW5nKCJNZXNzYWdlVG9OYXZpZ2F0b3JR dE9iamVjdCIpOworICAgIFdLUmV0YWluUHRyPFdLU3RyaW5nUmVmPiBjb250ZW50cyA9IGFkb3B0 V0soV0tTdHJpbmdDcmVhdGVXaXRoUVN0cmluZyhtZXNzYWdlKSk7CisgICAgV0tQYWdlUG9zdE1l c3NhZ2VUb0luamVjdGVkQnVuZGxlKGQtPndlYlBhZ2UuZ2V0KCksIG1lc3NhZ2VOYW1lLCBjb250 ZW50cy5nZXQoKSk7CiB9CiAKIFFRbWxDb21wb25lbnQqIFFRdWlja1dlYlZpZXdFeHBlcmltZW50 YWw6OmFsZXJ0RGlhbG9nKCkgY29uc3QKQEAgLTExODEsMTYgKzExODQsMTkgQEAgdm9pZCBRUXVp Y2tXZWJWaWV3RXhwZXJpbWVudGFsOjpzZXRDb2xvckNob29zZXIoUVFtbENvbXBvbmVudCogY29s b3JDaG9vc2VyKQogUVN0cmluZyBRUXVpY2tXZWJWaWV3RXhwZXJpbWVudGFsOjp1c2VyQWdlbnQo KSBjb25zdAogewogICAgIFFfRChjb25zdCBRUXVpY2tXZWJWaWV3KTsKLSAgICByZXR1cm4gZC0+ d2ViUGFnZVByb3h5LT51c2VyQWdlbnQoKTsKKyAgICBXS1JldGFpblB0cjxXS1N0cmluZ1JlZj4g dWEgPSBhZG9wdFdLKFdLUGFnZUNvcHlDdXN0b21Vc2VyQWdlbnQoZC0+d2ViUGFnZS5nZXQoKSkp OworICAgIHJldHVybiBXS1N0cmluZ0NvcHlRU3RyaW5nKHVhLmdldCgpKTsKIH0KIAogdm9pZCBR UXVpY2tXZWJWaWV3RXhwZXJpbWVudGFsOjpzZXRVc2VyQWdlbnQoY29uc3QgUVN0cmluZyYgdXNl ckFnZW50KQogewogICAgIFFfRChRUXVpY2tXZWJWaWV3KTsKLSAgICBpZiAodXNlckFnZW50ID09 IFFTdHJpbmcoZC0+d2ViUGFnZVByb3h5LT51c2VyQWdlbnQoKSkpCisgICAgV0tSZXRhaW5QdHI8 V0tTdHJpbmdSZWY+IG5ld1VzZXJBZ2VudCA9IGFkb3B0V0soV0tTdHJpbmdDcmVhdGVXaXRoUVN0 cmluZyh1c2VyQWdlbnQpKTsKKyAgICBXS1JldGFpblB0cjxXS1N0cmluZ1JlZj4gY3VycmVudFVz ZXJBZ2VudCA9IGFkb3B0V0soV0tQYWdlQ29weUN1c3RvbVVzZXJBZ2VudChkLT53ZWJQYWdlLmdl dCgpKSk7CisgICAgaWYgKFdLU3RyaW5nSXNFcXVhbChuZXdVc2VyQWdlbnQuZ2V0KCksIGN1cnJl bnRVc2VyQWdlbnQuZ2V0KCkpKQogICAgICAgICByZXR1cm47CiAKLSAgICBkLT53ZWJQYWdlUHJv eHktPnNldFVzZXJBZ2VudCh1c2VyQWdlbnQpOworICAgIFdLUGFnZVNldEN1c3RvbVVzZXJBZ2Vu dChkLT53ZWJQYWdlLmdldCgpLCBuZXdVc2VyQWdlbnQuZ2V0KCkpOwogICAgIGVtaXQgdXNlckFn ZW50Q2hhbmdlZCgpOwogfQogCkBAIC0xMjU3LDI3ICsxMjYzLDMxIEBAIHZvaWQgUVF1aWNrV2Vi Vmlld0V4cGVyaW1lbnRhbDo6ZXZhbHVhdGVKYXZhU2NyaXB0KGNvbnN0IFFTdHJpbmcmIHNjcmlw dCwgY29uc3QKICAgICBjbG9zdXJlLT5yZWNlaXZlciA9IHRoaXM7CiAgICAgY2xvc3VyZS0+dmFs dWUgPSB2YWx1ZTsKIAotICAgIGRfcHRyLT53ZWJQYWdlUHJveHkuZ2V0KCktPnJ1bkphdmFTY3Jp cHRJbk1haW5GcmFtZShzY3JpcHQsIFNjcmlwdFZhbHVlQ2FsbGJhY2s6OmNyZWF0ZShjbG9zdXJl LCBqYXZhU2NyaXB0Q2FsbGJhY2spKTsKKyAgICBXS1JldGFpblB0cjxXS1N0cmluZ1JlZj4gc2Ny aXB0U3RyaW5nID0gYWRvcHRXSyhXS1N0cmluZ0NyZWF0ZVdpdGhRU3RyaW5nKHNjcmlwdCkpOwor ICAgIFdLUGFnZVJ1bkphdmFTY3JpcHRJbk1haW5GcmFtZShkX3B0ci0+d2ViUGFnZS5nZXQoKSwg c2NyaXB0U3RyaW5nLmdldCgpLCBjbG9zdXJlLCBqYXZhU2NyaXB0Q2FsbGJhY2spOwogfQogCiB2 b2lkIFFRdWlja1dlYlZpZXdFeHBlcmltZW50YWw6OmZpbmRUZXh0KGNvbnN0IFFTdHJpbmcmIHN0 cmluZywgRmluZEZsYWdzIG9wdGlvbnMpCiB7CiAgICAgUV9EKFFRdWlja1dlYlZpZXcpOwogICAg IGlmIChzdHJpbmcuaXNFbXB0eSgpKSB7Ci0gICAgICAgIGQtPndlYlBhZ2VQcm94eS0+aGlkZUZp bmRVSSgpOworICAgICAgICBXS1BhZ2VIaWRlRmluZFVJKGQtPndlYlBhZ2UuZ2V0KCkpOwogICAg ICAgICByZXR1cm47CiAgICAgfQotICAgIFdlYktpdDo6RmluZE9wdGlvbnMgd2tPcHRpb25zID0g V2ViS2l0OjpGaW5kT3B0aW9uc0Nhc2VJbnNlbnNpdGl2ZTsKKworICAgIFdLRmluZE9wdGlvbnMg d2tPcHRpb25zID0ga1dLRmluZE9wdGlvbnNDYXNlSW5zZW5zaXRpdmU7CiAgICAgaWYgKG9wdGlv bnMgJiBGaW5kQ2FzZVNlbnNpdGl2ZWx5KQotICAgICAgICB3a09wdGlvbnMgPSBzdGF0aWNfY2Fz dDxXZWJLaXQ6OkZpbmRPcHRpb25zPih3a09wdGlvbnMgJiB+V2ViS2l0OjpGaW5kT3B0aW9uc0Nh c2VJbnNlbnNpdGl2ZSk7CisgICAgICAgIHdrT3B0aW9ucyA9IHdrT3B0aW9ucyAmIH5rV0tGaW5k T3B0aW9uc0Nhc2VJbnNlbnNpdGl2ZTsKICAgICBpZiAob3B0aW9ucyAmIEZpbmRCYWNrd2FyZCkK LSAgICAgICAgd2tPcHRpb25zID0gc3RhdGljX2Nhc3Q8V2ViS2l0OjpGaW5kT3B0aW9ucz4od2tP cHRpb25zIHwgRmluZE9wdGlvbnNCYWNrd2FyZHMpOworICAgICAgICB3a09wdGlvbnMgfD0ga1dL RmluZE9wdGlvbnNCYWNrd2FyZHM7CiAgICAgaWYgKG9wdGlvbnMgJiBGaW5kV3JhcHNBcm91bmRE b2N1bWVudCkKLSAgICAgICAgd2tPcHRpb25zID0gc3RhdGljX2Nhc3Q8V2ViS2l0OjpGaW5kT3B0 aW9ucz4od2tPcHRpb25zIHwgRmluZE9wdGlvbnNXcmFwQXJvdW5kKTsKKyAgICAgICAgd2tPcHRp b25zIHw9IGtXS0ZpbmRPcHRpb25zV3JhcEFyb3VuZDsKICAgICBpZiAob3B0aW9ucyAmIEZpbmRI aWdobGlnaHRBbGxPY2N1cnJlbmNlcykKLSAgICAgICAgd2tPcHRpb25zID0gc3RhdGljX2Nhc3Q8 V2ViS2l0OjpGaW5kT3B0aW9ucz4od2tPcHRpb25zIHwgRmluZE9wdGlvbnNTaG93SGlnaGxpZ2h0 KTsKKyAgICAgICAgd2tPcHRpb25zIHw9IGtXS0ZpbmRPcHRpb25zU2hvd0hpZ2hsaWdodDsKKwor ICAgIFdLUmV0YWluUHRyPFdLU3RyaW5nUmVmPiBzdHIgPSBhZG9wdFdLKFdLU3RyaW5nQ3JlYXRl V2l0aFFTdHJpbmcoc3RyaW5nKSk7CiAKLSAgICBkLT53ZWJQYWdlUHJveHktPmZpbmRTdHJpbmco c3RyaW5nLCB3a09wdGlvbnMsIHN0ZDo6bnVtZXJpY19saW1pdHM8dW5zaWduZWQ+OjptYXgoKSAt IDEpOworICAgIFdLUGFnZUZpbmRTdHJpbmcoZC0+d2ViUGFnZS5nZXQoKSwgc3RyLmdldCgpLCB3 a09wdGlvbnMsIHN0ZDo6bnVtZXJpY19saW1pdHM8dW5zaWduZWQ+OjptYXgoKSAtIDEpOwogfQog CiBRTGlzdDxRVXJsPiBRUXVpY2tXZWJWaWV3RXhwZXJpbWVudGFsOjp1c2VyU2NyaXB0cygpIGNv bnN0CkBAIC0xNTAxLDcgKzE1MTEsNyBAQCBRUXVpY2tXZWJQYWdlKiBRUXVpY2tXZWJWaWV3Ojpw YWdlKCkKIHZvaWQgUVF1aWNrV2ViVmlldzo6Z29CYWNrKCkKIHsKICAgICBRX0QoUVF1aWNrV2Vi Vmlldyk7Ci0gICAgZC0+d2ViUGFnZVByb3h5LT5nb0JhY2soKTsKKyAgICBXS1BhZ2VHb0JhY2so ZC0+d2ViUGFnZS5nZXQoKSk7CiB9CiAKIC8qIQpAQCAtMTUxMyw3ICsxNTIzLDcgQEAgdm9pZCBR UXVpY2tXZWJWaWV3Ojpnb0JhY2soKQogdm9pZCBRUXVpY2tXZWJWaWV3Ojpnb0ZvcndhcmQoKQog ewogICAgIFFfRChRUXVpY2tXZWJWaWV3KTsKLSAgICBkLT53ZWJQYWdlUHJveHktPmdvRm9yd2Fy ZCgpOworICAgIFdLUGFnZUdvRm9yd2FyZChkLT53ZWJQYWdlLmdldCgpKTsKIH0KIAogLyohCkBA IC0xNTI0LDcgKzE1MzQsNyBAQCB2b2lkIFFRdWlja1dlYlZpZXc6OmdvRm9yd2FyZCgpCiB2b2lk IFFRdWlja1dlYlZpZXc6OnN0b3AoKQogewogICAgIFFfRChRUXVpY2tXZWJWaWV3KTsKLSAgICBk LT53ZWJQYWdlUHJveHktPnN0b3BMb2FkaW5nKCk7CisgICAgV0tQYWdlU3RvcExvYWRpbmcoZC0+ d2ViUGFnZS5nZXQoKSk7CiB9CiAKIC8qIQpAQCAtMTU0OSw4ICsxNTU5LDcgQEAgdm9pZCBRUXVp Y2tXZWJWaWV3OjpyZWxvYWQoKQogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgY29uc3Qg Ym9vbCByZWxvYWRGcm9tT3JpZ2luID0gdHJ1ZTsKLSAgICBkLT53ZWJQYWdlUHJveHktPnJlbG9h ZChyZWxvYWRGcm9tT3JpZ2luKTsKKyAgICBXS1BhZ2VSZWxvYWRGcm9tT3JpZ2luKGQtPndlYlBh Z2UuZ2V0KCkpOwogfQogCiAvKiEKQEAgLTE1NzksNyArMTU4OCw4IEBAIHZvaWQgUVF1aWNrV2Vi Vmlldzo6c2V0VXJsKGNvbnN0IFFVcmwmIHVybCkKICAgICBpZiAodXJsLmlzRW1wdHkoKSkKICAg ICAgICAgcmV0dXJuOwogCi0gICAgZC0+d2ViUGFnZVByb3h5LT5sb2FkVVJMKHVybC50b1N0cmlu ZygpKTsKKyAgICBXS1JldGFpblB0cjxXS1VSTFJlZj4gdSA9IGFkb3B0V0soV0tVUkxDcmVhdGVX aXRoUVVybCh1cmwpKTsKKyAgICBXS1BhZ2VMb2FkVVJMKGQtPndlYlBhZ2UuZ2V0KCksIHUuZ2V0 KCkpOwogICAgIGVtaXRVcmxDaGFuZ2VJZk5lZWRlZCgpOwogfQogCkBAIC0xNjQwLDcgKzE2NTAs NyBAQCBpbnQgUVF1aWNrV2ViVmlldzo6bG9hZFByb2dyZXNzKCkgY29uc3QKIGJvb2wgUVF1aWNr V2ViVmlldzo6Y2FuR29CYWNrKCkgY29uc3QKIHsKICAgICBRX0QoY29uc3QgUVF1aWNrV2ViVmll dyk7Ci0gICAgcmV0dXJuIGQtPndlYlBhZ2VQcm94eS0+Y2FuR29CYWNrKCk7CisgICAgcmV0dXJu IFdLUGFnZUNhbkdvQmFjayhkLT53ZWJQYWdlLmdldCgpKTsKIH0KIAogLyohCkBAIC0xNjUyLDcg KzE2NjIsNyBAQCBib29sIFFRdWlja1dlYlZpZXc6OmNhbkdvQmFjaygpIGNvbnN0CiBib29sIFFR dWlja1dlYlZpZXc6OmNhbkdvRm9yd2FyZCgpIGNvbnN0CiB7CiAgICAgUV9EKGNvbnN0IFFRdWlj a1dlYlZpZXcpOwotICAgIHJldHVybiBkLT53ZWJQYWdlUHJveHktPmNhbkdvRm9yd2FyZCgpOwor ICAgIHJldHVybiBXS1BhZ2VDYW5Hb0ZvcndhcmQoZC0+d2ViUGFnZS5nZXQoKSk7CiB9CiAKIC8q IQpAQCAtMTY2Myw4ICsxNjczLDggQEAgYm9vbCBRUXVpY2tXZWJWaWV3OjpjYW5Hb0ZvcndhcmQo KSBjb25zdAogYm9vbCBRUXVpY2tXZWJWaWV3Ojpsb2FkaW5nKCkgY29uc3QKIHsKICAgICBRX0Qo Y29uc3QgUVF1aWNrV2ViVmlldyk7Ci0gICAgUmVmUHRyPFdlYktpdDo6V2ViRnJhbWVQcm94eT4g bWFpbkZyYW1lID0gZC0+d2ViUGFnZVByb3h5LT5tYWluRnJhbWUoKTsKLSAgICByZXR1cm4gbWFp bkZyYW1lICYmICEoV2ViRnJhbWVQcm94eTo6TG9hZFN0YXRlRmluaXNoZWQgPT0gbWFpbkZyYW1l LT5sb2FkU3RhdGUoKSk7CisgICAgV0tGcmFtZVJlZiBtYWluRnJhbWUgPSBXS1BhZ2VHZXRNYWlu RnJhbWUoZC0+d2ViUGFnZS5nZXQoKSk7CisgICAgcmV0dXJuIG1haW5GcmFtZSAmJiAhKGtXS0Zy YW1lTG9hZFN0YXRlRmluaXNoZWQgPT0gV0tGcmFtZUdldEZyYW1lTG9hZFN0YXRlKG1haW5GcmFt ZSkpOwogfQogCiAvKiEKQEAgLTE3MTUsNyArMTcyNSw4IEBAIFFSZWN0RiBRUXVpY2tXZWJWaWV3 OjptYXBSZWN0RnJvbVdlYkNvbnRlbnQoY29uc3QgUVJlY3RGJiByZWN0SW5DU1NDb29yZGluYXRl cykKIFFTdHJpbmcgUVF1aWNrV2ViVmlldzo6dGl0bGUoKSBjb25zdAogewogICAgIFFfRChjb25z dCBRUXVpY2tXZWJWaWV3KTsKLSAgICByZXR1cm4gZC0+d2ViUGFnZVByb3h5LT5wYWdlVGl0bGUo KTsKKyAgICBXS1JldGFpblB0cjxXS1N0cmluZ1JlZj4gdCA9IGFkb3B0V0soV0tQYWdlQ29weVRp dGxlKGQtPndlYlBhZ2UuZ2V0KCkpKTsKKyAgICByZXR1cm4gV0tTdHJpbmdDb3B5UVN0cmluZyh0 LmdldCgpKTsKIH0KIAogUVZhcmlhbnQgUVF1aWNrV2ViVmlldzo6aW5wdXRNZXRob2RRdWVyeShR dDo6SW5wdXRNZXRob2RRdWVyeSBwcm9wZXJ0eSkgY29uc3QKQEAgLTE5NDgsNyArMTk1OSw3IEBA IGJvb2wgUVF1aWNrV2ViVmlldzo6ZXZlbnQoUUV2ZW50KiBldikKIFdLUGFnZVJlZiBRUXVpY2tX ZWJWaWV3OjpwYWdlUmVmKCkgY29uc3QKIHsKICAgICBRX0QoY29uc3QgUVF1aWNrV2ViVmlldyk7 Ci0gICAgcmV0dXJuIHRvQVBJKGQtPndlYlBhZ2VQcm94eS5nZXQoKSk7CisgICAgcmV0dXJuIGQt PndlYlBhZ2UuZ2V0KCk7CiB9CiAKIFFQb2ludEYgUVF1aWNrV2ViVmlldzo6Y29udGVudFBvcygp IGNvbnN0CkBAIC0yMDE1LDEwICsyMDI2LDE0IEBAIHZvaWQgUVF1aWNrV2ViVmlldzo6aGFuZGxl RmxpY2thYmxlTW91c2VSZWxlYXNlKGNvbnN0IFFQb2ludEYmIHBvc2l0aW9uLCBxaW50NjQKIHZv aWQgUVF1aWNrV2ViVmlldzo6bG9hZEh0bWwoY29uc3QgUVN0cmluZyYgaHRtbCwgY29uc3QgUVVy bCYgYmFzZVVybCwgY29uc3QgUVVybCYgdW5yZWFjaGFibGVVcmwpCiB7CiAgICAgUV9EKFFRdWlj a1dlYlZpZXcpOworICAgIFdLUmV0YWluUHRyPFdLU3RyaW5nUmVmPiBodG1sUmVmID0gYWRvcHRX SyhXS1N0cmluZ0NyZWF0ZVdpdGhRU3RyaW5nKGh0bWwpKTsKKyAgICBXS1JldGFpblB0cjxXS1VS TFJlZj4gYmFzZVVybFJlZiA9IGFkb3B0V0soV0tVUkxDcmVhdGVXaXRoUVVybChiYXNlVXJsKSk7 CisgICAgV0tSZXRhaW5QdHI8V0tVUkxSZWY+IHVucmVhY2hhYmxlVXJsUmVmID0gYWRvcHRXSyhX S1VSTENyZWF0ZVdpdGhRVXJsKHVucmVhY2hhYmxlVXJsKSk7CisKICAgICBpZiAodW5yZWFjaGFi bGVVcmwuaXNWYWxpZCgpKQotICAgICAgICBkLT53ZWJQYWdlUHJveHktPmxvYWRBbHRlcm5hdGVI VE1MU3RyaW5nKGh0bWwsIGJhc2VVcmwudG9TdHJpbmcoKSwgdW5yZWFjaGFibGVVcmwudG9TdHJp bmcoKSk7CisgICAgICAgIFdLUGFnZUxvYWRBbHRlcm5hdGVIVE1MU3RyaW5nKGQtPndlYlBhZ2Uu Z2V0KCksIGh0bWxSZWYuZ2V0KCksIGJhc2VVcmxSZWYuZ2V0KCksIHVucmVhY2hhYmxlVXJsUmVm LmdldCgpKTsKICAgICBlbHNlCi0gICAgICAgIGQtPndlYlBhZ2VQcm94eS0+bG9hZEhUTUxTdHJp bmcoaHRtbCwgYmFzZVVybC50b1N0cmluZygpKTsKKyAgICAgICAgV0tQYWdlTG9hZEhUTUxTdHJp bmcoZC0+d2ViUGFnZS5nZXQoKSwgaHRtbFJlZi5nZXQoKSwgYmFzZVVybFJlZi5nZXQoKSk7CiB9 CiAKIHFyZWFsIFFRdWlja1dlYlZpZXc6Onpvb21GYWN0b3IoKSBjb25zdApAQCAtMjA0Miw3ICsy MDU3LDggQEAgdm9pZCBRUXVpY2tXZWJWaWV3OjpydW5KYXZhU2NyaXB0SW5NYWluRnJhbWUoY29u c3QgUVN0cmluZyAmc2NyaXB0LCBRT2JqZWN0ICpyZWMKICAgICBjbG9zdXJlLT5yZWNlaXZlciA9 IHJlY2VpdmVyOwogICAgIGNsb3N1cmUtPm1ldGhvZCA9IG1ldGhvZDsKIAotICAgIGQtPndlYlBh Z2VQcm94eS5nZXQoKS0+cnVuSmF2YVNjcmlwdEluTWFpbkZyYW1lKHNjcmlwdCwgU2NyaXB0VmFs dWVDYWxsYmFjazo6Y3JlYXRlKGNsb3N1cmUsIGphdmFTY3JpcHRDYWxsYmFjaykpOworICAgIFdL UmV0YWluUHRyPFdLU3RyaW5nUmVmPiBzY3JpcHRTdHJpbmcgPSBhZG9wdFdLKFdLU3RyaW5nQ3Jl YXRlV2l0aFFTdHJpbmcoc2NyaXB0KSk7CisgICAgV0tQYWdlUnVuSmF2YVNjcmlwdEluTWFpbkZy YW1lKGQtPndlYlBhZ2UuZ2V0KCksIHNjcmlwdFN0cmluZy5nZXQoKSwgY2xvc3VyZSwgamF2YVNj cmlwdENhbGxiYWNrKTsKIH0KIAogYm9vbCBRUXVpY2tXZWJWaWV3OjphbGxvd0FueUhUVFBTQ2Vy dGlmaWNhdGVGb3JMb2NhbEhvc3QoKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3X3BfcC5oIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3X3BfcC5oCmluZGV4IDg4YjI4YzQ3M2QzZjEyNTZh ZmZjOTU3ZWVkMGY4Y2E2NjIwM2YyY2QuLjIxZWZkYWU0MDBlOGVjOTFkN2IzMWE4NTA0MjkwNWNi ZGI5MzJkYjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1 aWNrd2Vidmlld19wX3AuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3Fx dWlja3dlYnZpZXdfcF9wLmgKQEAgLTE2Miw2ICsxNjIsNyBAQCBwcm90ZWN0ZWQ6CiAgICAgUVF1 aWNrV2ViVmlld1ByaXZhdGUoUVF1aWNrV2ViVmlldyogdmlld3BvcnQpOwogICAgIFJlZlB0cjxX ZWJLaXQ6OlF0V2ViQ29udGV4dD4gY29udGV4dDsKICAgICBSZWZQdHI8V2ViS2l0OjpXZWJQYWdl UHJveHk+IHdlYlBhZ2VQcm94eTsKKyAgICBXS1JldGFpblB0cjxXS1BhZ2VSZWY+IHdlYlBhZ2U7 CiAgICAgV0tSZXRhaW5QdHI8V0tQYWdlR3JvdXBSZWY+IHBhZ2VHcm91cDsKIAogICAgIFdlYktp dDo6UXRQYWdlQ2xpZW50IHBhZ2VDbGllbnQ7Cg==