3953 2005-07-11 12:03:36 -0700 back-forward items have wrong titles after sub-frame navigations 2005-07-24 16:15:29 -0700 1 1 1 Unclassified WebKit Frames 412 Mac OS X 10.4 RESOLVED FIXED http://java.sun.com/j2se/1.5.0/docs/api/index.html P2 Normal --- 1 trey trey oldest_to_newest 14393 0 trey 2005-07-11 12:03:36 -0700 Goto http://java.sun.com/j2se/1.5.0/docs/api/index.html. Note the title is "Overview...". Now click some class names in the lower left pane. Press and hold the back button. The oldest item that should still be "Overview..." is now titled the same as the last class page that was loaded. At the HTML level, what's happening is that whenever a frame loads it sets the parent.document.title to be specific to that newly loaded frame. The same is also true for the history item for the overview page - its title also changes as the page changes its title dynamically. I don't think this is very desirable behavior from the user perspective, but given the page keeps changing it's title, it's not as clear to me that this is technically incorrect. 14395 1 trey 2005-07-11 12:46:51 -0700 I checked WinIE, and they do not allow the title of the history item to change due to subsequent loads, **while the window is open **. When you open a new window and look at history, then the item has the newly requested title. So perhaps they let the items title change, but just don't have any way to track that change dynamically in their history UI. 14416 2 2912 trey 2005-07-11 16:52:02 -0700 Created attachment 2912 patch for bug 3953 14417 3 2912 sullivan 2005-07-11 17:25:53 -0700 Comment on attachment 2912 patch for bug 3953 Looks very good to me (bug fix plus code simplfication, yay!). Whoever commits this should verify that it fixes the specific bug reported here (the oldest title in the Back button's menu should be Overview after the fix). 15143 4 justin.garcia 2005-07-24 16:15:29 -0700 Landed this patch, and verified fix. 2912 2005-07-11 16:52:02 -0700 2005-07-11 17:25:53 -0700 patch for bug 3953 3953.patch text/plain 9691 trey SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvY3ZzL3Jvb3QvV2ViS2l0L0No YW5nZUxvZyx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS4zMjE5CmRpZmYgLXAgLXUgLXIxLjMyMTkg Q2hhbmdlTG9nCi0tLSBDaGFuZ2VMb2cJMjAwNS8wNy8xMSAxNjo1NzozNwkxLjMyMTkKKysrIENo YW5nZUxvZwkyMDA1LzA3LzExIDIzOjQyOjA1CkBAIC0xLDMgKzEsMzMgQEAKKzIwMDUtMDctMTEg IFRyZXkgTWF0dGVzb24gIDx0cmV5QGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaXhlZCBodHRwOi8vYnVnemlsbGEub3BlbmRhcndp bi5vcmcvc2hvd19idWcuY2dpP2lkPTM5NTMgLSBiYWNrLWZvcndhcmQgaXRlbXMgaGF2ZSB3cm9u ZyB0aXRsZXMgYWZ0ZXIgc3ViLWZyYW1lIG5hdmlnYXRpb25zCisKKyAgICAgICAgVGhpcyB3YXMg Y2F1c2VkIGJ5IGEgbWlzdGFrZW4gZGF0YSBzdHJ1Y3R1cmUsIHdoZXJlIFdlYkRhdGFTb3VyY2Ug dHJpZWQgdG8ga2VlcCBhIGxpc3Qgb2YKKyAgICAgICAgYi9mIGl0ZW1zIGl0IHdhcyByZXNwb25z aWJsZSBmb3IuICBUaGUgcHJvYmxlbSBhcm9zZSBpbiB0aGUgY2FzZSBvZiBmcmFtZXMsIHdoZXJl IGEgc3ViZnJhbWUKKyAgICAgICAgd2FzIGxvYWRlZCB3aXRoIG5ldyBjb250ZW50LiAgV2hlbiB0 aGlzIGhhcHBlbnMgYSBmcmVzaCB0cmVlIG9mIGIvZiBpdGVtcyBpcyBjcmVhdGVkLAorICAgICAg ICBidXQgdGhlIHJlZmVyZW5jZSBpbiB0aGUgRGF0YVNvdXJjZSBzdGlsbCBwb2ludGVkIHRvIHRo ZSBvbGQgaXRlbS4KKworICAgICAgICBTaW5jZSB0aGUgV2ViRnJhbWUgZG9lcyBhIGxvdCBvZiB3 b3JrIHRvIHRyYWNrIHRoZSBjdXJyZW50IGIvZiBpdGVtLCB0aGUgZWFzaWVzdCB0aGluZyBpcyB0 bworICAgICAgICBnZXQgcmlkIG9mIHRoZSBEYXRhU291cmNlJ3MgcmVmZXJlbmNlLCBhbmQgaGF2 ZSBpdCBhc2sgdGhlIFdlYkZyYW1lIHRvIHNldCB0aGUgdGl0bGUgb24gdGhlCisgICAgICAgIHJp Z2h0IGIvZiBpdGVtLgorCisgICAgICAgICogV2ViVmlldy5zdWJwcm9qL1dlYkRhdGFTb3VyY2Uu bToKKyAgICAgICAgKC1bV2ViRGF0YVNvdXJjZVByaXZhdGUgZGVhbGxvY10pOiAgTnVrZSBvdXJC YWNrRm9yd2FyZEl0ZW1zIGl2YXIuCisgICAgICAgICgtW1dlYkRhdGFTb3VyY2UgX3NldFRpdGxl Ol0pOiAgQ2FsbCBXZWJGcmFtZSB0byB1cGRhdGUgYi9mIGl0ZW0uCisgICAgICAgICgtW1dlYkRh dGFTb3VyY2UgX2FkZEJhY2tGb3J3YXJkSXRlbTpdKTogIE51a2Ugb3VyQmFja0ZvcndhcmRJdGVt cyBpdmFyLgorICAgICAgICAoLVtXZWJEYXRhU291cmNlIF9hZGRCYWNrRm9yd2FyZEl0ZW1zOl0p OiAgZGl0dG8KKyAgICAgICAgKC1bV2ViRGF0YVNvdXJjZSBfYmFja0ZvcndhcmRJdGVtc10pOiAg ZGl0dG8KKyAgICAgICAgKiBXZWJWaWV3LnN1YnByb2ovV2ViRGF0YVNvdXJjZVByaXZhdGUuaDog IGRpdHRvCisgICAgICAgICogV2ViVmlldy5zdWJwcm9qL1dlYkZyYW1lLm06CisgICAgICAgICgt W1dlYkZyYW1lIF9jcmVhdGVJdGVtOl0pOiAgTm8gbW9yZSBuZWVkIHRvIG1haW50YWluIGIvZiBp dGVtIGluIERhdGFTb3VyY2UKKyAgICAgICAgKC1bV2ViRnJhbWUgX3RyYW5zaXRpb25Ub0NvbW1p dHRlZDpdKTogIE51a2UgcmVkdW5kYW50IG9yIE5PUCBjb2RlLgorICAgICAgICAoLVtXZWJGcmFt ZSBfbG9hZFVSTDpyZWZlcnJlcjpsb2FkVHlwZTp0YXJnZXQ6dHJpZ2dlcmluZ0V2ZW50OmZvcm06 Zm9ybVZhbHVlczpdKToKKyAgICAgICAgICBObyBtb3JlIG5lZWQgdG8gbWFpbnRhaW4gYi9mIGl0 ZW0gaW4gRGF0YVNvdXJjZQorICAgICAgICAoLVtXZWJGcmFtZSBfc2V0VGl0bGU6XSk6ICBuZXcg bWV0aG9kIHRvIHNldCB0aXRsZSBvZiBjdXJyZW50IGIvZiBpdGVtCisgICAgICAgICogV2ViVmll dy5zdWJwcm9qL1dlYkZyYW1lUHJpdmF0ZS5oOgorCiAyMDA1LTA3LTExICBLZXZpbiBEZWNrZXIg IDxrZGVja2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBjYmx1IGFuZCBtanMu CkluZGV4OiAuL1dlYlZpZXcuc3VicHJvai9XZWJEYXRhU291cmNlLm0KPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1Mg ZmlsZTogL2N2cy9yb290L1dlYktpdC9XZWJWaWV3LnN1YnByb2ovV2ViRGF0YVNvdXJjZS5tLHYK cmV0cmlldmluZyByZXZpc2lvbiAxLjIwNgpkaWZmIC1wIC11IC1yMS4yMDYgLi9XZWJWaWV3LnN1 YnByb2ovV2ViRGF0YVNvdXJjZS5tCi0tLSAuL1dlYlZpZXcuc3VicHJvai9XZWJEYXRhU291cmNl Lm0JMjAwNS8wNy8wMSAwNToyMDo0OAkxLjIwNgorKysgLi9XZWJWaWV3LnN1YnByb2ovV2ViRGF0 YVNvdXJjZS5tCTIwMDUvMDcvMTEgMjM6NDI6MTYKQEAgLTg4LDcgKzg4LDYgQEAKICAgICBbbWFp bkRvY3VtZW50RXJyb3IgcmVsZWFzZV07CiAgICAgW2ljb25Mb2FkZXIgcmVsZWFzZV07CiAgICAg W2ljb25VUkwgcmVsZWFzZV07Ci0gICAgW291ckJhY2tGb3J3YXJkSXRlbXMgcmVsZWFzZV07CiAg ICAgW3RyaWdnZXJpbmdBY3Rpb24gcmVsZWFzZV07CiAgICAgW2xhc3RDaGVja2VkUmVxdWVzdCBy ZWxlYXNlXTsKICAgICBbcmVzcG9uc2VzIHJlbGVhc2VdOwpAQCAtNTQyLDggKzU0MSw5IEBACiAg ICAgICAgICAgICBXZWJIaXN0b3J5SXRlbSAqZW50cnkgPSBbW1dlYkhpc3Rvcnkgb3B0aW9uYWxT aGFyZWRIaXN0b3J5XSBpdGVtRm9yVVJMOlVSTEZvckhpc3RvcnldOwogICAgICAgICAgICAgW2Vu dHJ5IHNldFRpdGxlOiBfcHJpdmF0ZS0+cGFnZVRpdGxlXTsKICAgICAgICAgICAgIAotICAgICAg ICAgICAgLy8gTXVzdCB1cGRhdGUgdGhlIGVudHJpZXMgaW4gdGhlIGJhY2stZm9yd2FyZCBsaXN0 IHRvby4KLSAgICAgICAgICAgIFtfcHJpdmF0ZS0+b3VyQmFja0ZvcndhcmRJdGVtcyBtYWtlT2Jq ZWN0c1BlcmZvcm1TZWxlY3RvcjpAc2VsZWN0b3Ioc2V0VGl0bGU6KSB3aXRoT2JqZWN0Ol9wcml2 YXRlLT5wYWdlVGl0bGVdOworICAgICAgICAgICAgLy8gTXVzdCB1cGRhdGUgdGhlIGVudHJpZXMg aW4gdGhlIGJhY2stZm9yd2FyZCBsaXN0IHRvby4gIFRoaXMgbXVzdCBnbyB0aHJvdWdoIHRoZSBX ZWJGcmFtZSBiZWNhdXNlCisgICAgICAgICAgICAvLyBpdCBoYXMgdGhlIHJpZ2h0IG5vdGlvbiBv ZiB0aGUgY3VycmVudCBiL2YgaXRlbS4KKyAgICAgICAgICAgIFtbc2VsZiB3ZWJGcmFtZV0gX3Nl dFRpdGxlOl9wcml2YXRlLT5wYWdlVGl0bGVdOwogICAgICAgICAgICAgCiAgICAgICAgICAgICBb W19wcml2YXRlLT53ZWJWaWV3IF9mcmFtZUxvYWREZWxlZ2F0ZUZvcndhcmRlcl0gd2ViVmlldzpf cHJpdmF0ZS0+d2ViVmlldwogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBkaWRSZWNlaXZlVGl0bGU6X3ByaXZhdGUtPnBhZ2VUaXRsZQpAQCAtNjM1 LDM2ICs2MzUsNiBAQAogLSAoQk9PTClfaXNDbGllbnRSZWRpcmVjdAogewogICAgIHJldHVybiBf cHJpdmF0ZS0+aXNDbGllbnRSZWRpcmVjdDsKLX0KLQotLSAodm9pZClfYWRkQmFja0ZvcndhcmRJ dGVtOihXZWJIaXN0b3J5SXRlbSAqKWl0ZW0KLXsKLSAgICBpZiAoIWl0ZW0pIHsKLSAgICAgICAg cmV0dXJuOwotICAgIH0KLSAgICBpZiAoIV9wcml2YXRlLT5vdXJCYWNrRm9yd2FyZEl0ZW1zKSB7 Ci0gICAgICAgIF9wcml2YXRlLT5vdXJCYWNrRm9yd2FyZEl0ZW1zID0gW1tOU011dGFibGVBcnJh eSBhbGxvY10gaW5pdFdpdGhDYXBhY2l0eToxXTsKLSAgICB9Ci0gICAgaWYgKFtfcHJpdmF0ZS0+ b3VyQmFja0ZvcndhcmRJdGVtcyBpbmRleE9mT2JqZWN0SWRlbnRpY2FsVG86aXRlbV0gPT0gTlNO b3RGb3VuZCkgewotICAgICAgICBbX3ByaXZhdGUtPm91ckJhY2tGb3J3YXJkSXRlbXMgYWRkT2Jq ZWN0Oml0ZW1dOwotICAgIH0KLX0KLQotLSAodm9pZClfYWRkQmFja0ZvcndhcmRJdGVtczooTlNB cnJheSAqKWl0ZW1zCi17Ci0gICAgaWYgKCFpdGVtcyB8fCBbaXRlbXMgY291bnRdID09IDApIHsK LSAgICAgICAgcmV0dXJuOwotICAgIH0KLSAgICBpZiAoIV9wcml2YXRlLT5vdXJCYWNrRm9yd2Fy ZEl0ZW1zKSB7Ci0gICAgICAgIF9wcml2YXRlLT5vdXJCYWNrRm9yd2FyZEl0ZW1zID0gW2l0ZW1z IG11dGFibGVDb3B5XTsKLSAgICB9IGVsc2UgewotICAgICAgICBbX3ByaXZhdGUtPm91ckJhY2tG b3J3YXJkSXRlbXMgYWRkT2JqZWN0c0Zyb21BcnJheTppdGVtc107Ci0gICAgfQotfQotCi0tIChO U0FycmF5ICopX2JhY2tGb3J3YXJkSXRlbXMKLXsKLSAgICByZXR1cm4gX3ByaXZhdGUtPm91ckJh Y2tGb3J3YXJkSXRlbXM7CiB9CiAKIC0gKHZvaWQpX3NldE1haW5Eb2N1bWVudEVycm9yOiAoTlNF cnJvciAqKWVycm9yCkluZGV4OiAuL1dlYlZpZXcuc3VicHJvai9XZWJEYXRhU291cmNlUHJpdmF0 ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9jdnMvcm9vdC9XZWJLaXQvV2ViVmlldy5zdWJwcm9q L1dlYkRhdGFTb3VyY2VQcml2YXRlLmgsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMTQzCmRpZmYg LXAgLXUgLXIxLjE0MyAuL1dlYlZpZXcuc3VicHJvai9XZWJEYXRhU291cmNlUHJpdmF0ZS5oCi0t LSAuL1dlYlZpZXcuc3VicHJvai9XZWJEYXRhU291cmNlUHJpdmF0ZS5oCTIwMDUvMDcvMDEgMDU6 MjA6NDgJMS4xNDMKKysrIC4vV2ViVmlldy5zdWJwcm9qL1dlYkRhdGFTb3VyY2VQcml2YXRlLmgJ MjAwNS8wNy8xMSAyMzo0MjoxNgpAQCAtMTA4LDkgKzEwOCw2IEBACiAgICAgTlNVUkwgKmljb25V Ukw7CiAgICAgV2ViSWNvbkxvYWRlciAqaWNvbkxvYWRlcjsKIAotICAgIC8vIEJGIGl0ZW1zIHRo YXQgcmVmZXJlbmNlIHdoYXQgd2UgbG9hZGVkIC0gd2UgbXVzdCBrZWVwIHRoZWlyIHRpdGxlcyB1 cCB0byBkYXRlCi0gICAgTlNNdXRhYmxlQXJyYXkgKm91ckJhY2tGb3J3YXJkSXRlbXM7Ci0KICAg ICAvLyBUaGUgYWN0aW9uIHRoYXQgdHJpZ2dlcmVkIGxvYWRpbmcgb2YgdGhpcyBkYXRhIHNvdXJj ZSAtCiAgICAgLy8gd2Uga2VlcCB0aGlzIGFyb3VuZCBmb3IgdGhlIGJlbmVmaXQgb2YgdGhlIHZh cmlvdXMgcG9saWN5CiAgICAgLy8gaGFuZGxlcnMuCkBAIC0xODgsOSArMTg1LDYgQEAKIC0gKHZv aWQpX3NldEljb25VUkw6KE5TVVJMICopVVJMIHdpdGhUeXBlOihOU1N0cmluZyAqKWljb25UeXBl OwogLSAodm9pZClfc2V0T3ZlcnJpZGVFbmNvZGluZzooTlNTdHJpbmcgKilvdmVycmlkZUVuY29k aW5nOwogLSAoTlNTdHJpbmcgKilfb3ZlcnJpZGVFbmNvZGluZzsKLS0gKHZvaWQpX2FkZEJhY2tG b3J3YXJkSXRlbTooV2ViSGlzdG9yeUl0ZW0gKilpdGVtOwotLSAodm9pZClfYWRkQmFja0Zvcndh cmRJdGVtczooTlNBcnJheSAqKWl0ZW1zOwotLSAoTlNBcnJheSAqKV9iYWNrRm9yd2FyZEl0ZW1z OwogLSAodm9pZClfc2V0SXNDbGllbnRSZWRpcmVjdDooQk9PTClmbGFnOwogLSAoQk9PTClfaXND bGllbnRSZWRpcmVjdDsKIApJbmRleDogLi9XZWJWaWV3LnN1YnByb2ovV2ViRnJhbWUubQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09ClJDUyBmaWxlOiAvY3ZzL3Jvb3QvV2ViS2l0L1dlYlZpZXcuc3VicHJvai9XZWJGcmFt ZS5tLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjIzOApkaWZmIC1wIC11IC1yMS4yMzggLi9XZWJW aWV3LnN1YnByb2ovV2ViRnJhbWUubQotLS0gLi9XZWJWaWV3LnN1YnByb2ovV2ViRnJhbWUubQky MDA1LzA3LzEwIDAwOjQ1OjUzCTEuMjM4CisrKyAuL1dlYlZpZXcuc3VicHJvai9XZWJGcmFtZS5t CTIwMDUvMDcvMTEgMjM6NDI6MTkKQEAgLTQyMiw3ICs0MjIsNiBAQCBOU1N0cmluZyAqV2ViUGFn ZUNhY2hlRG9jdW1lbnRWaWV3S2V5ID0gCiAgICAgfQogICAgIAogICAgIGJmSXRlbSA9IFtbW1dl Ykhpc3RvcnlJdGVtIGFsbG9jXSBpbml0V2l0aFVSTDpVUkwgdGFyZ2V0OltzZWxmIG5hbWVdIHBh cmVudDpbW3NlbGYgcGFyZW50RnJhbWVdIG5hbWVdIHRpdGxlOltkYXRhU3JjIHBhZ2VUaXRsZV1d IGF1dG9yZWxlYXNlXTsKLSAgICBbZGF0YVNyYyBfYWRkQmFja0ZvcndhcmRJdGVtOmJmSXRlbV07 CiAgICAgW2JmSXRlbSBzZXRPcmlnaW5hbFVSTFN0cmluZzpbb3JpZ2luYWxVUkwgX3dlYl9vcmln aW5hbERhdGFBc1N0cmluZ11dOwogCiAgICAgLy8gc2F2ZSBmb3JtIHN0YXRlIGlmIHRoaXMgaXMg YSBQT1NUCkBAIC03NzUsNyArNzc0LDYgQEAgTlNTdHJpbmcgKldlYlBhZ2VDYWNoZURvY3VtZW50 Vmlld0tleSA9IAogICAgICAgICAKICAgICAgICAgICAgIC8vIEhhbmRsZSBhZGRpbmcgdGhlIFVS TCB0byB0aGUgYmFjay9mb3J3YXJkIGxpc3QuCiAgICAgICAgICAgICBXZWJEYXRhU291cmNlICpk cyA9IFtzZWxmIGRhdGFTb3VyY2VdOwotICAgICAgICAgICAgV2ViSGlzdG9yeUl0ZW0gKmVudHJ5 ID0gbmlsOwogICAgICAgICAgICAgTlNTdHJpbmcgKnB0aXRsZSA9IFtkcyBwYWdlVGl0bGVdOwog CiAgICAgICAgICAgICBzd2l0Y2ggKGxvYWRUeXBlKSB7CkBAIC04MzQsNyArODMyLDcgQEAgTlNT dHJpbmcgKldlYlBhZ2VDYWNoZURvY3VtZW50Vmlld0tleSA9IAogICAgICAgICAgICAgICAgICAg ICBpZiAoVVJMICYmICFbVVJMIF93ZWJfaXNFbXB0eV0pewogICAgICAgICAgICAgICAgICAgICAg ICAgQVNTRVJUKFtzZWxmIHdlYlZpZXddKTsKICAgICAgICAgICAgICAgICAgICAgICAgIGlmICgh W1tbc2VsZiB3ZWJWaWV3XSBwcmVmZXJlbmNlc10gcHJpdmF0ZUJyb3dzaW5nRW5hYmxlZF0pIHsK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICBlbnRyeSA9IFtbV2ViSGlzdG9yeSBvcHRpb25h bFNoYXJlZEhpc3RvcnldIGFkZEl0ZW1Gb3JVUkw6VVJMXTsKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICBXZWJIaXN0b3J5SXRlbSAqZW50cnkgPSBbW1dlYkhpc3Rvcnkgb3B0aW9uYWxTaGFy ZWRIaXN0b3J5XSBhZGRJdGVtRm9yVVJMOlVSTF07CiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgaWYgKHB0aXRsZSkKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgW2VudHJ5IHNl dFRpdGxlOiBwdGl0bGVdOyAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAg ICAgICAgICAgICAgIH0KQEAgLTg5Niw3ICs4OTQsNiBAQCBOU1N0cmluZyAqV2ViUGFnZUNhY2hl RG9jdW1lbnRWaWV3S2V5ID0gCiAgICAgICAgICAgICAKICAgICAgICAgICAgIC8vIElmIHdlIGhh dmUgYSB0aXRsZSBsZXQgdGhlIFdlYlZpZXcga25vdyBhYm91dCBpdC4KICAgICAgICAgICAgIGlm IChwdGl0bGUpIHsKLSAgICAgICAgICAgICAgICBbZW50cnkgc2V0VGl0bGU6cHRpdGxlXTsKICAg ICAgICAgICAgICAgICBbW1tzZWxmIHdlYlZpZXddIF9mcmFtZUxvYWREZWxlZ2F0ZUZvcndhcmRl cl0gd2ViVmlldzpfcHJpdmF0ZS0+d2ViVmlldwogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkaWRSZWNlaXZlVGl0bGU6cHRpdGxlCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBmb3JGcmFtZTpzZWxmXTsKQEAgLTE5NDIsMTEgKzE5MzksNyBAQCBzdGF0aWMgQ0ZB YnNvbHV0ZVRpbWUgX3RpbWVPZkxhc3RDb21wbGV0CiAgICAgICAgIGlmIChfcHJpdmF0ZS0+cXVp Y2tSZWRpcmVjdENvbWluZykgewogICAgICAgICAgICAgTE9HKFJlZGlyZWN0LCAiJUAoJXApIF9w cml2YXRlLT5xdWlja1JlZGlyZWN0Q29taW5nID0gJWQiLCBbc2VsZiBuYW1lXSwgc2VsZiwgKGlu dClfcHJpdmF0ZS0+cXVpY2tSZWRpcmVjdENvbWluZyk7CiAgICAgICAgICAgICBfcHJpdmF0ZS0+ cXVpY2tSZWRpcmVjdENvbWluZyA9IE5POwotICAgICAgICAgICAgCi0gICAgICAgICAgICAvLyBu ZWVkIHRvIHRyYW5zZmVyIEJGIGl0ZW1zIGZyb20gdGhlIGRhdGFTb3VyY2UgdGhhdCB3ZSdyZSBy ZXBsYWNpbmcKLSAgICAgICAgICAgIFdlYkRhdGFTb3VyY2UgKm5ld0RhdGFTb3VyY2UgPSBbc2Vs ZiBwcm92aXNpb25hbERhdGFTb3VyY2VdOwotICAgICAgICAgICAgW25ld0RhdGFTb3VyY2UgX3Nl dElzQ2xpZW50UmVkaXJlY3Q6WUVTXTsKLSAgICAgICAgICAgIFtuZXdEYXRhU291cmNlIF9hZGRC YWNrRm9yd2FyZEl0ZW1zOltvbGREYXRhU291cmNlIF9iYWNrRm9yd2FyZEl0ZW1zXV07CisgICAg ICAgICAgICBbW3NlbGYgcHJvdmlzaW9uYWxEYXRhU291cmNlXSBfc2V0SXNDbGllbnRSZWRpcmVj dDpZRVNdOwogICAgICAgICB9IGVsc2UgaWYgKHNhbWVVUkwpIHsKICAgICAgICAgICAgIC8vIEV4 YW1wbGUgb2YgdGhpcyBjYXNlIGFyZSBzaXRlcyB0aGF0IHJlbG9hZCB0aGUgc2FtZSBVUkwgd2l0 aCBhIGRpZmZlcmVudCBjb29raWUKICAgICAgICAgICAgIC8vIGRyaXZpbmcgdGhlIGdlbmVyYXRl ZCBjb250ZW50LCBvciBhIG1hc3RlciBmcmFtZSB3aXRoIGxpbmtzIHRoYXQgZHJpdmUgYSB0YXJn ZXQKQEAgLTIwNzgsNiArMjA3MSwxMSBAQCBzdGF0aWMgQ0ZBYnNvbHV0ZVRpbWUgX3RpbWVPZkxh c3RDb21wbGV0CiAgICAgaWYgKCFjYW5jZWxXaXRoTG9hZEluUHJvZ3Jlc3MpCiAgICAgICAgIF9w cml2YXRlLT5xdWlja1JlZGlyZWN0Q29taW5nID0gTk87CiAgICAgTE9HKFJlZGlyZWN0LCAiJUAo JXApIF9wcml2YXRlLT5xdWlja1JlZGlyZWN0Q29taW5nID0gJWQiLCBbc2VsZiBuYW1lXSwgc2Vs ZiwgKGludClfcHJpdmF0ZS0+cXVpY2tSZWRpcmVjdENvbWluZyk7Cit9CisKKy0gKHZvaWQpX3Nl dFRpdGxlOihOU1N0cmluZyAqKXRpdGxlCit7CisgICAgW1tfcHJpdmF0ZSBjdXJyZW50SXRlbV0g c2V0VGl0bGU6dGl0bGVdOwogfQogCiAtICh2b2lkKV9zYXZlU2Nyb2xsUG9zaXRpb25Ub0l0ZW06 KFdlYkhpc3RvcnlJdGVtICopaXRlbQpJbmRleDogLi9XZWJWaWV3LnN1YnByb2ovV2ViRnJhbWVQ cml2YXRlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2N2cy9yb290L1dlYktpdC9XZWJWaWV3LnN1 YnByb2ovV2ViRnJhbWVQcml2YXRlLmgsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMTU1CmRpZmYg LXAgLXUgLXIxLjE1NSAuL1dlYlZpZXcuc3VicHJvai9XZWJGcmFtZVByaXZhdGUuaAotLS0gLi9X ZWJWaWV3LnN1YnByb2ovV2ViRnJhbWVQcml2YXRlLmgJMjAwNS8wNi8wNSAxNzo1NDo0NwkxLjE1 NQorKysgLi9XZWJWaWV3LnN1YnByb2ovV2ViRnJhbWVQcml2YXRlLmgJMjAwNS8wNy8xMSAyMzo0 MjoyMApAQCAtMjAwLDYgKzIwMCw4IEBAIGV4dGVybiBOU1N0cmluZyAqV2ViUGFnZUNhY2hlRG9j dW1lbnRWaWUKIAogLSAodm9pZClfc2F2ZURvY3VtZW50QW5kU2Nyb2xsU3RhdGU7CiAKKy0gKHZv aWQpX3NldFRpdGxlOihOU1N0cmluZyAqKXRpdGxlOworCiAtICh2b2lkKV9oYW5kbGVVbmltcGxl bWVudGFibGVQb2xpY3lXaXRoRXJyb3JDb2RlOihpbnQpY29kZSBmb3JVUkw6KE5TVVJMICopVVJM OwogLSAodm9pZClfcmVjZWl2ZWRNYWluUmVzb3VyY2VFcnJvcjooTlNFcnJvciAqKWVycm9yOwog Cg==