106908 2013-01-15 08:08:18 -0800 [GTK] Click on an anchor link makes page title dissappear 2013-01-23 11:15:24 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 rego webkit-unassigned cgarcia mrobinson pnormand webkit.review.bot xan.lopez oldest_to_newest 807316 0 182776 rego 2013-01-15 08:08:18 -0800 Created attachment 182776 Example HTML file to reproduce the issue Overview: In GtkLauncher if you go to a page with anchors and you click in one of them, the page title is set to NULL and you only see the text " - WebKit Launcher" Steps to Reproduce: 1) Open the attached HTML page in GtkLauncher. Page title is "My page title - WebKit Launcher" 2) Click on the link with the text "this anchor link" Actual Results: Page title is set to " - WebKit Launcher" Expected Results: Page title is still "My page title - WebKit Launcher" 807321 1 182779 rego 2013-01-15 08:18:22 -0800 Created attachment 182779 Patch 813028 2 182779 mrobinson 2013-01-22 07:38:22 -0800 Comment on attachment 182779 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=182779&action=review > Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp:856 > - priv->title = NULL; > + priv->title = g_strdup(core(m_frame)->loader()->activeDocumentLoader()->title().string().utf8().data()); I'm not sure this is valid. The new title isn't necessarily available when a new load is committed. There's another FrameLoader messages that deals with titles. Perhaps what this is doing is resetting the title to the original value? it also makes sense to check the WebKit2 behavior. 813376 3 rego 2013-01-22 13:36:53 -0800 (In reply to comment #2) > (From update of attachment 182779 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=182779&action=review > > > Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp:856 > > - priv->title = NULL; > > + priv->title = g_strdup(core(m_frame)->loader()->activeDocumentLoader()->title().string().utf8().data()); > > I'm not sure this is valid. The new title isn't necessarily available when a new load is committed. There's another FrameLoader messages that deals with titles. Perhaps what this is doing is resetting the title to the original value? it also makes sense to check the WebKit2 behavior. I agree that the title could not be available at this point yet, but in these cases FrameLoaderClient::dispatchDidReceiveTitle will be called when it is available and the title will be updated accordingly. The problem is in this particular case. When you click on an anchor, FrameLoaderClient::dispatchDidCommitLoad is called from FrameLoaderClient::dispatchDidNavigateWithinPage. Then FrameLoaderClient::dispatchDidCommitLoad resets title to NULL, however FrameLoaderClient::dispatchDidReceiveTitle is not called (as title is not received again). About how it works in WK2, it's quite different as when you click on an anchor the method WebPageProxy::didSameDocumentNavigationForFrame is called. And it requests to update the URL but not the page title, moreover it doesn't reset the title property either. Not sure about the best approach to fix the issue, any idea is welcomed :-) 813402 4 mrobinson 2013-01-22 14:15:30 -0800 The right thing to do here seems to be to to not set the title to NULL for navigation within the page. 814034 5 184184 rego 2013-01-23 02:25:17 -0800 Created attachment 184184 Patch 814145 6 184184 mrobinson 2013-01-23 06:09:54 -0800 Comment on attachment 184184 Patch Instead of adding new state to the FrameLoaderClient, wouldn't it be simpler to abstract the shared logic of dispatchDidCommitLoad into a helper method and simply keep clearing the title in dispatchDidCommitLoad? 814221 7 184239 rego 2013-01-23 08:06:11 -0800 Created attachment 184239 Patch 814231 8 184239 mrobinson 2013-01-23 08:30:57 -0800 Comment on attachment 184239 Patch Okay. Looks good. Did you run the unit tests? In the future you probably want to avoid the usage of booleans [1], but for this change it's probably okay. 1. See the WebKit style guide where it says: "Prefer enums to bools on function parameters if callers are likely to be passing constants, since named constants are easier to read at the call site. An exception to this rule is a setter function, where the name of the function already makes clear what the boolean is." 814250 9 rego 2013-01-23 09:03:38 -0800 (In reply to comment #8) > (From update of attachment 184239 [details]) > Okay. Looks good. Did you run the unit tests? Yes, they gave me the same results than without my patch. >In the future you probably want to avoid the usage of booleans [1], but for this change it's probably okay. I agree that it's better to use enums, I've read the coding style guidelines but I didn't remember all of them yet :-) Anyway in this case, for a private method I think it's not so important as when you have a public method that could be called from somewhere else. I can include a new enum if you prefer. Let me know. 814391 10 184239 webkit.review.bot 2013-01-23 11:15:21 -0800 Comment on attachment 184239 Patch Clearing flags on attachment: 184239 Committed r140557: <http://trac.webkit.org/changeset/140557> 814392 11 webkit.review.bot 2013-01-23 11:15:24 -0800 All reviewed patches have been landed. Closing bug. 182776 2013-01-15 08:08:18 -0800 2013-01-15 08:08:18 -0800 Example HTML file to reproduce the issue test.html text/html 139 rego PGh0bWw+Cjx0aXRsZT5NeSBwYWdlIHRpdGxlPC90aXRsZT4KPGJvZHk+CjxwPklmIHlvdSBjbGlj ayA8YSBocmVmPSIjIj50aGlzIGFuY2hvciBsaW5rPC9hPiB0aGUgcGFnZSB0aXRsZSBkaXNhcHBl YXJzLjwvcD4KPC9ib2R5Pgo8L2h0bWw+Cg== 182779 2013-01-15 08:18:22 -0800 2013-01-23 02:25:11 -0800 Patch bug-106908-20130115171521.patch text/plain 1590 rego U3VidmVyc2lvbiBSZXZpc2lvbjogMTM5NzE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0 ay9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKaW5kZXggZjM1NTA0MTY1 OGQ3Y2Y5MDU2MTkzZjMyZjQzZDcyNmY5M2UxMzcxZC4uMDAyYzkzMGUxMjc0MGY1ODdjZTU3YmM5 NjI4M2EwNTZjNmM0NjY4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDEz LTAxLTE1ICBNYW51ZWwgUmVnbyBDYXNhc25vdmFzICA8cmVnb0BpZ2FsaWEuY29tPgorCisgICAg ICAgIEtlZXAgcGFnZSB0aXRsZSB3aGVuIHVzZXIgY2xpY2tzIG9uIGFuIGFuY2hvci4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNjkwOAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViQ29yZVN1cHBv cnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwOgorICAgICAgICAoV2ViS2l0OjpGcmFtZUxvYWRl ckNsaWVudDo6ZGlzcGF0Y2hEaWRDb21taXRMb2FkKToKKyAgICAgICAgU2V0IHRpdGxlIHRvIHZh bHVlIGdldCBmcm9tIGZyYW1lLgorCiAyMDEzLTAxLTExICBDYXJsb3MgR2FyY2lhIENhbXBvcyAg PGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLiBVcGRhdGUgTkVXUyBh bmQgY29uZmlndXJlLmFjIGZvciAxLjExLjQgcmVsZWFzZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwIGIvU291cmNl L1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwCmluZGV4 IDAzODU1ZTEzZGFhN2Q0ZjdiNjRiNzk5MTY5ZDBkMWRlMDhhYjg4MmUuLjlhNTgyY2JjZDE3NTk3 OGU3MzhmYWNlNzJkN2MyOTczNjgxODA3NzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZ3Rr L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEd0ay5jcHAKQEAgLTg1Myw3 ICs4NTMsNyBAQCB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZENvbW1pdExvYWQo KQogICAgIGdfZnJlZShwcml2LT51cmkpOwogICAgIHByaXYtPnVyaSA9IGdfc3RyZHVwKGNvcmUo bV9mcmFtZSktPmxvYWRlcigpLT5hY3RpdmVEb2N1bWVudExvYWRlcigpLT51cmwoKS5zdHJpbmco KS51dGY4KCkuZGF0YSgpKTsKICAgICBnX2ZyZWUocHJpdi0+dGl0bGUpOwotICAgIHByaXYtPnRp dGxlID0gTlVMTDsKKyAgICBwcml2LT50aXRsZSA9IGdfc3RyZHVwKGNvcmUobV9mcmFtZSktPmxv YWRlcigpLT5hY3RpdmVEb2N1bWVudExvYWRlcigpLT50aXRsZSgpLnN0cmluZygpLnV0ZjgoKS5k YXRhKCkpOwogICAgIGdfb2JqZWN0X25vdGlmeShHX09CSkVDVChtX2ZyYW1lKSwgInVyaSIpOwog ICAgIGdfb2JqZWN0X25vdGlmeShHX09CSkVDVChtX2ZyYW1lKSwgInRpdGxlIik7CiAK 184184 2013-01-23 02:25:17 -0800 2013-01-23 08:06:04 -0800 Patch bug-106908-20130123112210.patch text/plain 4283 rego U3VidmVyc2lvbiBSZXZpc2lvbjogMTQwNDQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0 ay9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKaW5kZXggYTU5NDFhZGNl MzY5NmUxZmI4NDNhOGQ4NGIyYWExZjk3ZDE2NWY0OS4uZDZhNjQzMDJmODQyNjA2YTgwNGQ3YjYz NzZlMDk1OWVhY2ViYWE4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEz LTAxLTIzICBNYW51ZWwgUmVnbyBDYXNhc25vdmFzICA8cmVnb0BpZ2FsaWEuY29tPgorCisgICAg ICAgIFtHVEtdIEF2b2lkIHJlc2V0IHRpdGxlIGZvciBuYXZpZ2F0aW9uIHdpdGhpbiB0aGUgcGFn ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA2OTA4 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJD b3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEd0ay5jcHA6CisgICAgICAgIChXZWJLaXQ6OkZy YW1lTG9hZGVyQ2xpZW50OjpGcmFtZUxvYWRlckNsaWVudCk6IEluaXRpYWxpemUKKyAgICAgICAg bV9pc05hdmlnYXRpbmdXaXRoaW5QYWdlIHRvIGZhbHNlLgorICAgICAgICAoV2ViS2l0OjpGcmFt ZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEaWROYXZpZ2F0ZVdpdGhpblBhZ2UpOiBTZXQKKyAgICAg ICAgbV9pc05hdmlnYXRpbmdXaXRoaW5QYWdlIHRvIHRydWUgYW5kIHJlc2V0IGl0IHdoZW4gbGVh dmluZyB0aGUgbWV0aG9kLgorICAgICAgICAoV2ViS2l0OjpGcmFtZUxvYWRlckNsaWVudDo6ZGlz cGF0Y2hEaWRDb21taXRMb2FkKTogQXZvaWQgcmVzZXQgdGl0bGUKKyAgICAgICAgZm9yIG5hdmln YXRpb24gd2l0aGluIHRoZSBwYWdlLgorICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0ZyYW1lTG9h ZGVyQ2xpZW50R3RrLmg6CisgICAgICAgIChGcmFtZUxvYWRlckNsaWVudCk6IEFkZCBuZXcgcHJp dmF0ZSBkYXRhIG1lbWJlciBjYWxsZWQKKyAgICAgICAgbV9pc05hdmlnYXRpbmdXaXRoaW5QYWdl IHRvIG1vbml0b3IgaWYgaXQgaXMgbmF2aWdhdGluZyB3aXRoaW4gdGhlIHNhbWUKKyAgICAgICAg cGFnZSBvciBub3QuCisKIDIwMTMtMDEtMjIgIE1hbnVlbCBSZWdvIENhc2Fzbm92YXMgIDxyZWdv QGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gQWRkIGxpc3RlbmVyIGZvciBkaXJlY3Rpb24t Y2hhbmdlZCBzaWduYWwgaW4gV2ViS2l0V2ViVmlldwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwIGIvU291cmNlL1dl YktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwCmluZGV4IDAz ODU1ZTEzZGFhN2Q0ZjdiNjRiNzk5MTY5ZDBkMWRlMDhhYjg4MmUuLmU3NzhlZjE0MTM0MmQ2Y2E4 YWYwM2I4MTk0YTM4MGYxZjBiZDZjODUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZ3RrL1dl YkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 L2d0ay9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEd0ay5jcHAKQEAgLTExMCw2ICsx MTAsNyBAQCBGcmFtZUxvYWRlckNsaWVudDo6RnJhbWVMb2FkZXJDbGllbnQoV2ViS2l0V2ViRnJh bWUqIGZyYW1lKQogICAgICwgbV9sb2FkaW5nRXJyb3JQYWdlKGZhbHNlKQogICAgICwgbV9wbHVn aW5WaWV3KDApCiAgICAgLCBtX2hhc1NlbnRSZXNwb25zZVRvUGx1Z2luKGZhbHNlKQorICAgICwg bV9pc05hdmlnYXRpbmdXaXRoaW5QYWdlKGZhbHNlKQogewogICAgIEFTU0VSVChtX2ZyYW1lKTsK IH0KQEAgLTc1OSw2ICs3NjAsOCBAQCB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERp ZE5hdmlnYXRlV2l0aGluUGFnZSgpCiAgICAgaWYgKCFsb2FkZXJDb21wbGV0ZWQpCiAgICAgICAg IHJldHVybjsKIAorICAgIG1faXNOYXZpZ2F0aW5nV2l0aGluUGFnZSA9IHRydWU7CisKICAgICAv LyBObyBwcm92aXNpb25hbCBsb2FkIHN0YXJ0ZWQsIGJlY2F1c2U6CiAgICAgLy8gLSBJdCB3aWxs IGJyZWFrIChubyBwcm92aXNpb25hbCBkYXRhIHNvdXJjZSBhdCB0aGlzIHBvaW50KS4KICAgICAv LyAtIFRoZXJlJ3Mgbm8gcHJvdmlzaW9uYWwgbG9hZCBnb2luZyBvbiBhbnl3YXksIHRoZSBVUkkg aXMgYmVpbmcKQEAgLTc2OCw2ICs3NzEsOCBAQCB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50OjpkaXNw YXRjaERpZE5hdmlnYXRlV2l0aGluUGFnZSgpCiAgICAgLy8gc291cmNlcyBub3QgYmVpbmcgJzAn IGR1cmluZyB0aGUgcHJvdmlzaW9uYWwgbG9hZCBzdGFnZS4KICAgICBkaXNwYXRjaERpZENvbW1p dExvYWQoKTsKICAgICBkaXNwYXRjaERpZEZpbmlzaExvYWQoKTsKKworICAgIG1faXNOYXZpZ2F0 aW5nV2l0aGluUGFnZSA9IGZhbHNlOwogfQogCiB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50OjpkaXNw YXRjaERpZFB1c2hTdGF0ZVdpdGhpblBhZ2UoKQpAQCAtODUyLDEwICs4NTcsMTMgQEAgdm9pZCBG cmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEaWRDb21taXRMb2FkKCkKICAgICBXZWJLaXRXZWJG cmFtZVByaXZhdGUqIHByaXYgPSBtX2ZyYW1lLT5wcml2OwogICAgIGdfZnJlZShwcml2LT51cmkp OwogICAgIHByaXYtPnVyaSA9IGdfc3RyZHVwKGNvcmUobV9mcmFtZSktPmxvYWRlcigpLT5hY3Rp dmVEb2N1bWVudExvYWRlcigpLT51cmwoKS5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKLSAgICBn X2ZyZWUocHJpdi0+dGl0bGUpOwotICAgIHByaXYtPnRpdGxlID0gTlVMTDsKICAgICBnX29iamVj dF9ub3RpZnkoR19PQkpFQ1QobV9mcmFtZSksICJ1cmkiKTsKLSAgICBnX29iamVjdF9ub3RpZnko R19PQkpFQ1QobV9mcmFtZSksICJ0aXRsZSIpOworCisgICAgaWYgKCFtX2lzTmF2aWdhdGluZ1dp dGhpblBhZ2UpIHsKKyAgICAgICAgZ19mcmVlKHByaXYtPnRpdGxlKTsKKyAgICAgICAgcHJpdi0+ dGl0bGUgPSAwOworICAgICAgICBnX29iamVjdF9ub3RpZnkoR19PQkpFQ1QobV9mcmFtZSksICJ0 aXRsZSIpOworICAgIH0KIAogICAgIGdfc2lnbmFsX2VtaXRfYnlfbmFtZShtX2ZyYW1lLCAibG9h ZC1jb21taXR0ZWQiKTsKICAgICBub3RpZnlTdGF0dXMobV9mcmFtZSwgV0VCS0lUX0xPQURfQ09N TUlUVEVEKTsKQEAgLTg2NCw3ICs4NzIsOCBAQCB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50OjpkaXNw YXRjaERpZENvbW1pdExvYWQoKQogICAgIGlmIChtX2ZyYW1lID09IHdlYmtpdF93ZWJfdmlld19n ZXRfbWFpbl9mcmFtZSh3ZWJWaWV3KSkgewogICAgICAgICBnX29iamVjdF9mcmVlemVfbm90aWZ5 KEdfT0JKRUNUKHdlYlZpZXcpKTsKICAgICAgICAgZ19vYmplY3Rfbm90aWZ5KEdfT0JKRUNUKHdl YlZpZXcpLCAidXJpIik7Ci0gICAgICAgIGdfb2JqZWN0X25vdGlmeShHX09CSkVDVCh3ZWJWaWV3 KSwgInRpdGxlIik7CisgICAgICAgIGlmICghbV9pc05hdmlnYXRpbmdXaXRoaW5QYWdlKQorICAg ICAgICAgICAgZ19vYmplY3Rfbm90aWZ5KEdfT0JKRUNUKHdlYlZpZXcpLCAidGl0bGUiKTsKICAg ICAgICAgZ19vYmplY3RfdGhhd19ub3RpZnkoR19PQkpFQ1Qod2ViVmlldykpOwogICAgICAgICBn X3NpZ25hbF9lbWl0X2J5X25hbWUod2ViVmlldywgImxvYWQtY29tbWl0dGVkIiwgbV9mcmFtZSk7 CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJh bWVMb2FkZXJDbGllbnRHdGsuaCBiL1NvdXJjZS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0Zy YW1lTG9hZGVyQ2xpZW50R3RrLmgKaW5kZXggYWI2ZjY1Nzg5ODdhNWUyNjI0OTBiMTY1YWU3YWRh YjM5ZTk5ODM4ZS4uYTEzNDY2OTk1Y2FkOWM0ODE4N2JlMmI2NGVjZmU5NDNlNWRiY2UwMiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGll bnRHdGsuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRl ckNsaWVudEd0ay5oCkBAIC0xOTgsNiArMTk4LDggQEAgbmFtZXNwYWNlIFdlYktpdCB7CiAgICAg ICAgIC8vIFBsdWdpbiB2aWV3IHRvIHJlZGlyZWN0IGRhdGEgdG8KICAgICAgICAgV2ViQ29yZTo6 UGx1Z2luVmlldyogbV9wbHVnaW5WaWV3OwogICAgICAgICBib29sIG1faGFzU2VudFJlc3BvbnNl VG9QbHVnaW47CisKKyAgICAgICAgYm9vbCBtX2lzTmF2aWdhdGluZ1dpdGhpblBhZ2U7CiAgICAg fTsKIAogfQo= 184239 2013-01-23 08:06:11 -0800 2013-01-23 11:15:20 -0800 Patch bug-106908-20130123170303.patch text/plain 4210 rego U3VidmVyc2lvbiBSZXZpc2lvbjogMTQwNDQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0 ay9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKaW5kZXggYTU5NDFhZGNl MzY5NmUxZmI4NDNhOGQ4NGIyYWExZjk3ZDE2NWY0OS4uNThmMDIyZGU2YTljNTNkNDhhZTA4MDQ1 NDk4OGY3ZmQzNGU1MjRiNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEz LTAxLTIzICBNYW51ZWwgUmVnbyBDYXNhc25vdmFzICA8cmVnb0BpZ2FsaWEuY29tPgorCisgICAg ICAgIFtHVEtdIEF2b2lkIHJlc2V0IHRpdGxlIGZvciBuYXZpZ2F0aW9uIHdpdGhpbiB0aGUgcGFn ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA2OTA4 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJD b3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEd0ay5jcHA6CisgICAgICAgIChXZWJLaXQ6OkZy YW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZE5hdmlnYXRlV2l0aGluUGFnZSk6IENhbGwKKyAg ICAgICAgZGlzcGF0Y2hEaWRDb21taXRMb2FkIHdpdGggdHJ1ZSBhcyBwYXJhbS4KKyAgICAgICAg KFdlYktpdDo6RnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkQ29tbWl0TG9hZCk6IFRoZSBt ZXRob2QgaGFzIGJlZW4KKyAgICAgICAgb3ZlcmxvYWRlZC4gVGhlIGRlZmF1bHQgaW1wbGVtZW50 YXRpb24gKHdpdGhvdXQgcGFyYW1zKSBzaW1wbHkgY2FsbHMKKyAgICAgICAgZGlzcGF0Y2hEaWRD b21taXRMb2FkIHdpdGggZmFsc2UuIFRoZSBuZXcgcHJpdmF0ZSBtZXRob2Qgd2l0aAorICAgICAg ICBpc05hdmlnYXRpbmdXaXRoaW5QYWdlIGFzIHBhcmFtIHdpbGwgYXZvaWQgdG8gcmVzZXQgdGhl IHRpdGxlIGZvcgorICAgICAgICBuYXZpZ2F0aW9uIHdpdGhpbiB0aGUgcGFnZS4KKyAgICAgICAg KiBXZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudEd0ay5oOgorICAgICAgICAoRnJhbWVM b2FkZXJDbGllbnQpOiBBZGQgbmV3IHByaXZhdGUgbWV0aG9kIGRpc3BhdGNoRGlkQ29tbWl0TG9h ZCB3aXRoIGEKKyAgICAgICAgYm9vbGVhbiBwYXJhbWV0ZXIgdG8ga25vdyBpZiBpdCBpcyBuYXZp Z2F0aW5nIHdpdGhpbmcgdGhlIHNhbWUgcGFnZSBvcgorICAgICAgICBub3QuCisKIDIwMTMtMDEt MjIgIE1hbnVlbCBSZWdvIENhc2Fzbm92YXMgIDxyZWdvQGlnYWxpYS5jb20+CiAKICAgICAgICAg W0dUS10gQWRkIGxpc3RlbmVyIGZvciBkaXJlY3Rpb24tY2hhbmdlZCBzaWduYWwgaW4gV2ViS2l0 V2ViVmlldwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJh bWVMb2FkZXJDbGllbnRHdGsuY3BwIGIvU291cmNlL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQv RnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwCmluZGV4IDAzODU1ZTEzZGFhN2Q0ZjdiNjRiNzk5MTY5 ZDBkMWRlMDhhYjg4MmUuLjI0NjUyOTU0Mjg3Nzg5YTI2ZmQ4YTZkZjYxNTU3YmEyODIwYjNlZWYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVy Q2xpZW50R3RrLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9GcmFt ZUxvYWRlckNsaWVudEd0ay5jcHAKQEAgLTc2Niw3ICs3NjYsNyBAQCB2b2lkIEZyYW1lTG9hZGVy Q2xpZW50OjpkaXNwYXRjaERpZE5hdmlnYXRlV2l0aGluUGFnZSgpCiAgICAgLy8gRklYTUU6IHRo aXMgaXMgbm90IGlkZWFsLCBidXQgaXQgc2VlbXMgc2FmZXIgdGhhbiBjaGFuZ2luZyBvdXIKICAg ICAvLyBjdXJyZW50IGNvbnRyYWN0IHdpdGggdGhlIGNsaWVudHMgYWJvdXQgcHJvdmlzaW9uYWwg ZGF0YQogICAgIC8vIHNvdXJjZXMgbm90IGJlaW5nICcwJyBkdXJpbmcgdGhlIHByb3Zpc2lvbmFs IGxvYWQgc3RhZ2UuCi0gICAgZGlzcGF0Y2hEaWRDb21taXRMb2FkKCk7CisgICAgZGlzcGF0Y2hE aWRDb21taXRMb2FkKHRydWUpOwogICAgIGRpc3BhdGNoRGlkRmluaXNoTG9hZCgpOwogfQogCkBA IC04NDEsNiArODQxLDExIEBAIHZvaWQgRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkQ2hh bmdlSWNvbnMoV2ViQ29yZTo6SWNvblR5cGUpCiAKIHZvaWQgRnJhbWVMb2FkZXJDbGllbnQ6OmRp c3BhdGNoRGlkQ29tbWl0TG9hZCgpCiB7CisgICAgRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNo RGlkQ29tbWl0TG9hZChmYWxzZSk7Cit9CisKK3ZvaWQgRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3Bh dGNoRGlkQ29tbWl0TG9hZChib29sIGlzTmF2aWdhdGluZ1dpdGhpblBhZ2UpCit7CiAgICAgaWYg KG1fbG9hZGluZ0Vycm9yUGFnZSkKICAgICAgICAgcmV0dXJuOwogCkBAIC04NTIsMTAgKzg1Nywx MiBAQCB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERpZENvbW1pdExvYWQoKQogICAg IFdlYktpdFdlYkZyYW1lUHJpdmF0ZSogcHJpdiA9IG1fZnJhbWUtPnByaXY7CiAgICAgZ19mcmVl KHByaXYtPnVyaSk7CiAgICAgcHJpdi0+dXJpID0gZ19zdHJkdXAoY29yZShtX2ZyYW1lKS0+bG9h ZGVyKCktPmFjdGl2ZURvY3VtZW50TG9hZGVyKCktPnVybCgpLnN0cmluZygpLnV0ZjgoKS5kYXRh KCkpOwotICAgIGdfZnJlZShwcml2LT50aXRsZSk7Ci0gICAgcHJpdi0+dGl0bGUgPSBOVUxMOwog ICAgIGdfb2JqZWN0X25vdGlmeShHX09CSkVDVChtX2ZyYW1lKSwgInVyaSIpOwotICAgIGdfb2Jq ZWN0X25vdGlmeShHX09CSkVDVChtX2ZyYW1lKSwgInRpdGxlIik7CisgICAgaWYgKCFpc05hdmln YXRpbmdXaXRoaW5QYWdlKSB7CisgICAgICAgIGdfZnJlZShwcml2LT50aXRsZSk7CisgICAgICAg IHByaXYtPnRpdGxlID0gMDsKKyAgICAgICAgZ19vYmplY3Rfbm90aWZ5KEdfT0JKRUNUKG1fZnJh bWUpLCAidGl0bGUiKTsKKyAgICB9CiAKICAgICBnX3NpZ25hbF9lbWl0X2J5X25hbWUobV9mcmFt ZSwgImxvYWQtY29tbWl0dGVkIik7CiAgICAgbm90aWZ5U3RhdHVzKG1fZnJhbWUsIFdFQktJVF9M T0FEX0NPTU1JVFRFRCk7CkBAIC04NjQsOCArODcxLDkgQEAgdm9pZCBGcmFtZUxvYWRlckNsaWVu dDo6ZGlzcGF0Y2hEaWRDb21taXRMb2FkKCkKICAgICBpZiAobV9mcmFtZSA9PSB3ZWJraXRfd2Vi X3ZpZXdfZ2V0X21haW5fZnJhbWUod2ViVmlldykpIHsKICAgICAgICAgZ19vYmplY3RfZnJlZXpl X25vdGlmeShHX09CSkVDVCh3ZWJWaWV3KSk7CiAgICAgICAgIGdfb2JqZWN0X25vdGlmeShHX09C SkVDVCh3ZWJWaWV3KSwgInVyaSIpOwotICAgICAgICBnX29iamVjdF9ub3RpZnkoR19PQkpFQ1Qo d2ViVmlldyksICJ0aXRsZSIpOwogICAgICAgICBnX29iamVjdF90aGF3X25vdGlmeShHX09CSkVD VCh3ZWJWaWV3KSk7CisgICAgICAgIGlmICghaXNOYXZpZ2F0aW5nV2l0aGluUGFnZSkKKyAgICAg ICAgICAgIGdfb2JqZWN0X25vdGlmeShHX09CSkVDVCh3ZWJWaWV3KSwgInRpdGxlIik7CiAgICAg ICAgIGdfc2lnbmFsX2VtaXRfYnlfbmFtZSh3ZWJWaWV3LCAibG9hZC1jb21taXR0ZWQiLCBtX2Zy YW1lKTsKICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBw b3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmggYi9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3JlU3Vw cG9ydC9GcmFtZUxvYWRlckNsaWVudEd0ay5oCmluZGV4IGFiNmY2NTc4OTg3YTVlMjYyNDkwYjE2 NWFlN2FkYWIzOWU5OTgzOGUuLmQzZjlkMjZmNjRjZGEyMWM3YjhlYzg2MGYwNTMzMTZkNTgxMmVk Y2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9h ZGVyQ2xpZW50R3RrLmgKKysrIGIvU291cmNlL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJh bWVMb2FkZXJDbGllbnRHdGsuaApAQCAtMTk4LDYgKzE5OCw4IEBAIG5hbWVzcGFjZSBXZWJLaXQg ewogICAgICAgICAvLyBQbHVnaW4gdmlldyB0byByZWRpcmVjdCBkYXRhIHRvCiAgICAgICAgIFdl YkNvcmU6OlBsdWdpblZpZXcqIG1fcGx1Z2luVmlldzsKICAgICAgICAgYm9vbCBtX2hhc1NlbnRS ZXNwb25zZVRvUGx1Z2luOworCisgICAgICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRjaERpZENvbW1p dExvYWQoYm9vbCBpc05hdmlnYXRpbmdXaXRoaW5QYWdlKTsKICAgICB9OwogCiB9Cg==