34530 2010-02-03 08:13:56 -0800 [v8] Remove clear method from DOM object maps 2013-09-12 22:29:19 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Other All RESOLVED WONTFIX P2 Normal --- 1 antonm webkit-unassigned abarth andersca commit-queue dglazkov eric senorblanco oldest_to_newest 187369 0 antonm 2010-02-03 08:13:56 -0800 [v8] Remove clear method from DOM object maps 187371 1 48034 antonm 2010-02-03 08:17:11 -0800 Created attachment 48034 Patch 187376 2 antonm 2010-02-03 08:21:14 -0800 Currently the only client of clear method is WorkerScriptController (this method is called in dtor.) I believe that as worker most probably would own a separate V8 instance, VM destroy should take care of clearing (if it's not the case, I'd be glad to fix it on V8-side.) If this cleanup is crucial, I'd provide a separate method to iterate through created wrappers. This patch is just one in (planned) series of patches which could lead to elimination of indirect reference from the Node to its wrapper. The next move would be to get rid of visit which is somewhat more involved. 187588 3 48034 abarth 2010-02-03 18:33:40 -0800 Comment on attachment 48034 Patch Amazing! I take it this functionality had no clients. :) 187737 4 antonm 2010-02-04 04:40:23 -0800 Thanks a lot for review, Adam. just in case, if I manage to get rid of indirection, ChunkedTable would go away as well---I remember about my promise :) 187746 5 48034 commit-queue 2010-02-04 04:57:21 -0800 Comment on attachment 48034 Patch Clearing flags on attachment: 48034 Committed r54341: <http://trac.webkit.org/changeset/54341> 187747 6 commit-queue 2010-02-04 04:57:30 -0800 All reviewed patches have been landed. Closing bug. 187890 7 senorblanco 2010-02-04 12:08:49 -0800 Sorry, I had to revert this, since it broke the ui_tests fpr Workers. See http://build.chromium.org/buildbot/waterfall/builders/XP%20Tests%20(dbg)(2)/builds/13955/steps/ui_tests/logs/stdio --- [ RUN ] WorkerTest.MultipleWorkers C:\b\slave\chromium-dbg-builder\build\src\chrome\test\ui\ui_test.cc(167): error: Value of: actual_crashes Actual: 1 Expected: expected_crashes_ Which is: 0 Encountered an unexpected crash in the program during this test. [ FAILED ] WorkerTest.MultipleWorkers (3609 ms) [ RUN ] WorkerTest.IncognitoSharedWorkers C:\b\slave\chromium-dbg-builder\build\src\chrome\test\ui\ui_test.cc(167): error: Value of: actual_crashes Actual: 1 Expected: expected_crashes_ Which is: 0 Encountered an unexpected crash in the program during this test. [ FAILED ] WorkerTest.IncognitoSharedWorkers (3985 ms) [ RUN ] WorkerTest.WorkerFastLayoutTests2 Test: worker-call.html Test: worker-constructor.html Test: worker-event-listener.html Test: worker-messageport.html Test: worker-replace-global-constructor.html Test: worker-terminate.html C:\b\slave\chromium-dbg-builder\build\src\chrome\test\ui\ui_test.cc(167): error: Value of: actual_crashes Actual: 6 Expected: expected_crashes_ Which is: 0 Encountered an unexpected crash in the program during this test. [ FAILED ] WorkerTest.WorkerFastLayoutTests2 (10297 ms) 187899 8 antonm 2010-02-04 12:18:31 -0800 Sorry about that---I ran ui_tests on my box and they were fine. Will have a closer look. (In reply to comment #7) > Sorry, I had to revert this, since it broke the ui_tests fpr Workers. See > > http://build.chromium.org/buildbot/waterfall/builders/XP%20Tests%20(dbg)(2)/builds/13955/steps/ui_tests/logs/stdio > > --- > > [ RUN ] WorkerTest.MultipleWorkers > C:\b\slave\chromium-dbg-builder\build\src\chrome\test\ui\ui_test.cc(167): > error: Value of: actual_crashes > Actual: 1 > Expected: expected_crashes_ > Which is: 0 > Encountered an unexpected crash in the program during this test. > [ FAILED ] WorkerTest.MultipleWorkers (3609 ms) > [ RUN ] WorkerTest.IncognitoSharedWorkers > C:\b\slave\chromium-dbg-builder\build\src\chrome\test\ui\ui_test.cc(167): > error: Value of: actual_crashes > Actual: 1 > Expected: expected_crashes_ > Which is: 0 > Encountered an unexpected crash in the program during this test. > [ FAILED ] WorkerTest.IncognitoSharedWorkers (3985 ms) > [ RUN ] WorkerTest.WorkerFastLayoutTests2 > Test: worker-call.html > Test: worker-constructor.html > Test: worker-event-listener.html > Test: worker-messageport.html > Test: worker-replace-global-constructor.html > Test: worker-terminate.html > C:\b\slave\chromium-dbg-builder\build\src\chrome\test\ui\ui_test.cc(167): > error: Value of: actual_crashes > Actual: 6 > Expected: expected_crashes_ > Which is: 0 > Encountered an unexpected crash in the program during this test. > [ FAILED ] WorkerTest.WorkerFastLayoutTests2 (10297 ms) 188602 9 antonm 2010-02-08 03:43:12 -0800 That's strange. I ran ui_tests couple of times on both Ubuntu and Windows 7 and didn't see anything like that. Could it have been some flakiness? Do we have any trybots for ui_tests? (In reply to comment #8) > Sorry about that---I ran ui_tests on my box and they were fine. Will have a > closer look. > > (In reply to comment #7) > > Sorry, I had to revert this, since it broke the ui_tests fpr Workers. See > > > > http://build.chromium.org/buildbot/waterfall/builders/XP%20Tests%20(dbg)(2)/builds/13955/steps/ui_tests/logs/stdio > > > > --- > > > > [ RUN ] WorkerTest.MultipleWorkers > > C:\b\slave\chromium-dbg-builder\build\src\chrome\test\ui\ui_test.cc(167): > > error: Value of: actual_crashes > > Actual: 1 > > Expected: expected_crashes_ > > Which is: 0 > > Encountered an unexpected crash in the program during this test. > > [ FAILED ] WorkerTest.MultipleWorkers (3609 ms) > > [ RUN ] WorkerTest.IncognitoSharedWorkers > > C:\b\slave\chromium-dbg-builder\build\src\chrome\test\ui\ui_test.cc(167): > > error: Value of: actual_crashes > > Actual: 1 > > Expected: expected_crashes_ > > Which is: 0 > > Encountered an unexpected crash in the program during this test. > > [ FAILED ] WorkerTest.IncognitoSharedWorkers (3985 ms) > > [ RUN ] WorkerTest.WorkerFastLayoutTests2 > > Test: worker-call.html > > Test: worker-constructor.html > > Test: worker-event-listener.html > > Test: worker-messageport.html > > Test: worker-replace-global-constructor.html > > Test: worker-terminate.html > > C:\b\slave\chromium-dbg-builder\build\src\chrome\test\ui\ui_test.cc(167): > > error: Value of: actual_crashes > > Actual: 6 > > Expected: expected_crashes_ > > Which is: 0 > > Encountered an unexpected crash in the program during this test. > > [ FAILED ] WorkerTest.WorkerFastLayoutTests2 (10297 ms) 188773 10 senorblanco 2010-02-08 14:57:36 -0800 (In reply to comment #9) > That's strange. I ran ui_tests couple of times on both Ubuntu and Windows 7 > and didn't see anything like that. Could it have been some flakiness? It's possible it was flake, although the problems all went away with the revert. I don't know enough about these tests to say. > Do we have any trybots for ui_tests? The regular trybots (win/mac/linux) run ui_tests, I believe. It's possible that i > > (In reply to comment #8) > > Sorry about that---I ran ui_tests on my box and they were fine. Will have a > > closer look. > > > > (In reply to comment #7) > > > Sorry, I had to revert this, since it broke the ui_tests fpr Workers. See > > > > > > http://build.chromium.org/buildbot/waterfall/builders/XP%20Tests%20(dbg)(2)/builds/13955/steps/ui_tests/logs/stdio > > > > > > --- > > > > > > [ RUN ] WorkerTest.MultipleWorkers > > > C:\b\slave\chromium-dbg-builder\build\src\chrome\test\ui\ui_test.cc(167): > > > error: Value of: actual_crashes > > > Actual: 1 > > > Expected: expected_crashes_ > > > Which is: 0 > > > Encountered an unexpected crash in the program during this test. > > > [ FAILED ] WorkerTest.MultipleWorkers (3609 ms) > > > [ RUN ] WorkerTest.IncognitoSharedWorkers > > > C:\b\slave\chromium-dbg-builder\build\src\chrome\test\ui\ui_test.cc(167): > > > error: Value of: actual_crashes > > > Actual: 1 > > > Expected: expected_crashes_ > > > Which is: 0 > > > Encountered an unexpected crash in the program during this test. > > > [ FAILED ] WorkerTest.IncognitoSharedWorkers (3985 ms) > > > [ RUN ] WorkerTest.WorkerFastLayoutTests2 > > > Test: worker-call.html > > > Test: worker-constructor.html > > > Test: worker-event-listener.html > > > Test: worker-messageport.html > > > Test: worker-replace-global-constructor.html > > > Test: worker-terminate.html > > > C:\b\slave\chromium-dbg-builder\build\src\chrome\test\ui\ui_test.cc(167): > > > error: Value of: actual_crashes > > > Actual: 6 > > > Expected: expected_crashes_ > > > Which is: 0 > > > Encountered an unexpected crash in the program during this test. > > > [ FAILED ] WorkerTest.WorkerFastLayoutTests2 (10297 ms) 928636 11 andersca 2013-09-12 22:29:19 -0700 V8 is gone. 48034 2010-02-03 08:17:11 -0800 2010-06-10 20:53:14 -0700 Patch bug-34530-20100203191709.patch text/plain 7279 antonm ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MDFhZTU5MS4uMjM2ZWQxYiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMC0wMi0wMyAgQW50b24gTXVoaW4g IDxhbnRvbm1AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFt2OF0gUmVtb3ZlIGNsZWFyIG1ldGhvZCBmcm9tIERPTSBvYmplY3Qg bWFwcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzQ1 MzAKKworICAgICAgICBObyBuZXcgdGVzdHMuIFNob3VsZCBiZSBjb3ZlcmVkIGJ5IGV4aXN0ZW50 IHRlc3RpbmcgaW5mcmFzdHJ1Y3R1cmUuCisKKyAgICAgICAgKiBiaW5kaW5ncy92OC9ET01EYXRh Lmg6CisgICAgICAgICogYmluZGluZ3MvdjgvRE9NRGF0YVN0b3JlLmg6CisgICAgICAgICogYmlu ZGluZ3MvdjgvVjhET01NYXAuY3BwOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L1Y4RE9NTWFwLmg6 CisgICAgICAgICogYmluZGluZ3MvdjgvV29ya2VyU2NyaXB0Q29udHJvbGxlci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpXb3JrZXJTY3JpcHRDb250cm9sbGVyOjp+V29ya2VyU2NyaXB0Q29udHJv bGxlcik6CisKIDIwMTAtMDItMDIgIEtlbnQgVGFtdXJhICA8dGtlbnRAY2hyb21pdW0ub3JnPgog CiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9i aW5kaW5ncy92OC9ET01EYXRhLmggYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L0RPTURhdGEuaAppbmRl eCA3ZmE5ZTdkLi42YWVlNTE5IDEwMDY0NAotLS0gYS9XZWJDb3JlL2JpbmRpbmdzL3Y4L0RPTURh dGEuaAorKysgYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L0RPTURhdGEuaApAQCAtMTEyLDE0ICsxMTIs NiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIH0KICAgICB9CiAKLSAgICB0ZW1wbGF0 ZTx0eXBlbmFtZSBUPgotICAgIHZvaWQgRE9NRGF0YTo6cmVtb3ZlT2JqZWN0c0Zyb21XcmFwcGVy TWFwKEFic3RyYWN0V2Vha1JlZmVyZW5jZU1hcDxULCB2ODo6T2JqZWN0PiYgZG9tTWFwKQotICAg IHsKLSAgICAgICAgV3JhcHBlck1hcE9iamVjdFJlbW92ZXI8VD4gcmVtb3ZlcjsKLSAgICAgICAg ZG9tTWFwLnZpc2l0KCZyZW1vdmVyKTsKLSAgICAgICAgZG9tTWFwLmNsZWFyKCk7Ci0gICAgfQot CiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKICNlbmRpZiAvLyBET01EYXRhX2gKZGlmZiAtLWdp dCBhL1dlYkNvcmUvYmluZGluZ3MvdjgvRE9NRGF0YVN0b3JlLmggYi9XZWJDb3JlL2JpbmRpbmdz L3Y4L0RPTURhdGFTdG9yZS5oCmluZGV4IDU0YTQ5ZTcuLmYxNzVmYmYgMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvYmluZGluZ3MvdjgvRE9NRGF0YVN0b3JlLmgKKysrIGIvV2ViQ29yZS9iaW5kaW5ncy92 OC9ET01EYXRhU3RvcmUuaApAQCAtODQsMjcgKzg0LDYgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewog ICAgICAgICAgICAgQVNTRVJUKCFtX2NodW5rcyB8fCAoKG1fY2h1bmtzLT5tX2VudHJpZXMgPCBt X2N1cnJlbnQpICYmIChtX2N1cnJlbnQgPD0gbV9sYXN0KSkpOwogICAgICAgICB9CiAKLSAgICAg ICAgdm9pZCBjbGVhcigpCi0gICAgICAgIHsKLSAgICAgICAgICAgIGlmICghbV9jaHVua3MpCi0g ICAgICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAgICAgICBjbGVhckVudHJpZXMobV9jaHVu a3MtPm1fZW50cmllcywgbV9jdXJyZW50KTsKLSAgICAgICAgICAgIENodW5rKiBsYXN0ID0gbV9j aHVua3M7Ci0gICAgICAgICAgICB3aGlsZSAodHJ1ZSkgewotICAgICAgICAgICAgICAgIENodW5r KiBwcmV2aW91cyA9IGxhc3QtPm1fcHJldmlvdXM7Ci0gICAgICAgICAgICAgICAgaWYgKCFwcmV2 aW91cykKLSAgICAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICAgICAgZGVsZXRl IGxhc3Q7Ci0gICAgICAgICAgICAgICAgY2xlYXJFbnRyaWVzKHByZXZpb3VzLT5tX2VudHJpZXMs IHByZXZpb3VzLT5tX2VudHJpZXMgKyBDSFVOS19TSVpFKTsKLSAgICAgICAgICAgICAgICBsYXN0 ID0gcHJldmlvdXM7Ci0gICAgICAgICAgICB9Ci0KLSAgICAgICAgICAgIG1fY2h1bmtzID0gbGFz dDsKLSAgICAgICAgICAgIG1fY3VycmVudCA9IG1fY2h1bmtzLT5tX2VudHJpZXM7Ci0gICAgICAg ICAgICBtX2xhc3QgPSBtX2N1cnJlbnQgKyBDSFVOS19TSVpFOwotICAgICAgICB9Ci0KICAgICAg ICAgdm9pZCB2aXNpdCh0eXBlbmFtZSBUcmFpdHM6OlZpc2l0b3IqIHZpc2l0b3IpCiAgICAgICAg IHsKICAgICAgICAgICAgIGlmICghbV9jaHVua3MpCkBAIC0xMjIsMTIgKzEwMSw2IEBAIG5hbWVz cGFjZSBXZWJDb3JlIHsKICAgICAgICAgICAgIFQgbV9lbnRyaWVzW0NIVU5LX1NJWkVdOwogICAg ICAgICB9OwogCi0gICAgICAgIHN0YXRpYyB2b2lkIGNsZWFyRW50cmllcyhUKiBmaXJzdCwgVCog bGFzdCkKLSAgICAgICAgewotICAgICAgICAgICAgZm9yIChUKiBlbnRyeSA9IGZpcnN0OyBlbnRy eSA8IGxhc3Q7IGVudHJ5KyspCi0gICAgICAgICAgICAgICAgVHJhaXRzOjpjbGVhcihlbnRyeSk7 Ci0gICAgICAgIH0KLQogICAgICAgICBzdGF0aWMgdm9pZCB2aXNpdEVudHJpZXMoVCogZmlyc3Qs IFQqIGxhc3QsIHR5cGVuYW1lIFRyYWl0czo6VmlzaXRvciogdmlzaXRvcikKICAgICAgICAgewog ICAgICAgICAgICAgZm9yIChUKiBlbnRyeSA9IGZpcnN0OyBlbnRyeSA8IGxhc3Q7IGVudHJ5Kysp CkBAIC0yMDgsMTEgKzE4MSw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAgICAgICAgICAg dmlydHVhbCBib29sIHJlbW92ZUlmUHJlc2VudChOb2RlKiBrZXksIHY4OjpQZXJzaXN0ZW50PHY4 OjpEYXRhPiB2YWx1ZSk7CiAKLSAgICAgICAgICAgIHZpcnR1YWwgdm9pZCBjbGVhcigpCi0gICAg ICAgICAgICB7Ci0gICAgICAgICAgICAgICAgbV90YWJsZS5jbGVhcigpOwotICAgICAgICAgICAg fQotCiAgICAgICAgIHByaXZhdGU6CiAgICAgICAgICAgICBzdGF0aWMgaW50IGNvbnN0IG51bWJl ck9mRW50cmllcyA9ICgxIDw8IDEwKSAtIDE7CiAKQEAgLTIyNywxNSArMTk1LDYgQEAgbmFtZXNw YWNlIFdlYkNvcmUgewogICAgICAgICAgICAgICAgICAgICBub2RlLT5zZXRXcmFwcGVyKHRhcmdl dCk7CiAgICAgICAgICAgICAgICAgfQogCi0gICAgICAgICAgICAgICAgc3RhdGljIHZvaWQgY2xl YXIodjg6OlBlcnNpc3RlbnQ8djg6Ok9iamVjdD4qIGVudHJ5KQotICAgICAgICAgICAgICAgIHsK LSAgICAgICAgICAgICAgICAgICAgTm9kZSogbm9kZSA9IFY4Tm9kZTo6dG9OYXRpdmUoKmVudHJ5 KTsKLSAgICAgICAgICAgICAgICAgICAgQVNTRVJUKG5vZGUtPndyYXBwZXIoKSA9PSBlbnRyeSk7 Ci0KLSAgICAgICAgICAgICAgICAgICAgbm9kZS0+Y2xlYXJXcmFwcGVyKCk7Ci0gICAgICAgICAg ICAgICAgICAgIGVudHJ5LT5EaXNwb3NlKCk7Ci0gICAgICAgICAgICAgICAgfQotCiAgICAgICAg ICAgICAgICAgc3RhdGljIHZvaWQgdmlzaXQodjg6OlBlcnNpc3RlbnQ8djg6Ok9iamVjdD4qIGVu dHJ5LCBWaXNpdG9yKiB2aXNpdG9yKQogICAgICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAg ICAgICAgTm9kZSogbm9kZSA9IFY4Tm9kZTo6dG9OYXRpdmUoKmVudHJ5KTsKZGlmZiAtLWdpdCBh L1dlYkNvcmUvYmluZGluZ3MvdjgvVjhET01NYXAuY3BwIGIvV2ViQ29yZS9iaW5kaW5ncy92OC9W OERPTU1hcC5jcHAKaW5kZXggZmEyZmJhMy4uODEzNzJmYiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9i aW5kaW5ncy92OC9WOERPTU1hcC5jcHAKKysrIGIvV2ViQ29yZS9iaW5kaW5ncy92OC9WOERPTU1h cC5jcHAKQEAgLTk1LDQ1ICs5NSw2IEBAIERPTVdyYXBwZXJNYXA8dm9pZD4mIGdldERPTVNWR09i amVjdFdpdGhDb250ZXh0TWFwKCkKIAogI2VuZGlmIC8vIEVOQUJMRShTVkcpCiAKLXN0YXRpYyB2 b2lkIHJlbW92ZUFsbERPTU9iamVjdHNJbkN1cnJlbnRUaHJlYWRIZWxwZXIoKQotewotICAgIHY4 OjpIYW5kbGVTY29wZSBzY29wZTsKLQotICAgIC8vIERlcmVmIGFsbCBvYmplY3RzIGluIHRoZSBk ZWxheWVkIHF1ZXVlLgotICAgIERPTURhdGE6OmdldEN1cnJlbnQoKS0+ZGVyZWZEZWxheWVkT2Jq ZWN0cygpOwotCi0gICAgLy8gVGhlIERPTSBvYmplY3RzIHdpdGggdGhlIGZvbGxvd2luZyB0eXBl cyBvbmx5IGV4aXN0IG9uIHRoZSBtYWluIHRocmVhZC4KLSAgICBpZiAoV1RGOjppc01haW5UaHJl YWQoKSkgewotICAgICAgICAvLyBSZW1vdmUgYWxsIERPTSBub2Rlcy4KLSAgICAgICAgRE9NRGF0 YTo6cmVtb3ZlT2JqZWN0c0Zyb21XcmFwcGVyTWFwPE5vZGU+KGdldERPTU5vZGVNYXAoKSk7Ci0K LSNpZiBFTkFCTEUoU1ZHKQotICAgICAgICAvLyBSZW1vdmUgYWxsIFNWRyBlbGVtZW50IGluc3Rh bmNlcyBpbiB0aGUgd3JhcHBlciBtYXAuCi0gICAgICAgIERPTURhdGE6OnJlbW92ZU9iamVjdHNG cm9tV3JhcHBlck1hcDxTVkdFbGVtZW50SW5zdGFuY2U+KGdldERPTVNWR0VsZW1lbnRJbnN0YW5j ZU1hcCgpKTsKLQotICAgICAgICAvLyBSZW1vdmUgYWxsIFNWRyBvYmplY3RzIHdpdGggY29udGV4 dCBpbiB0aGUgd3JhcHBlciBtYXAuCi0gICAgICAgIERPTURhdGE6OnJlbW92ZU9iamVjdHNGcm9t V3JhcHBlck1hcDx2b2lkPihnZXRET01TVkdPYmplY3RXaXRoQ29udGV4dE1hcCgpKTsKLSNlbmRp ZgotICAgIH0KLQotICAgIC8vIFJlbW92ZSBhbGwgRE9NIG9iamVjdHMgaW4gdGhlIHdyYXBwZXIg bWFwLgotICAgIERPTURhdGE6OnJlbW92ZU9iamVjdHNGcm9tV3JhcHBlck1hcDx2b2lkPihnZXRE T01PYmplY3RNYXAoKSk7Ci0KLSAgICAvLyBSZW1vdmUgYWxsIGFjdGl2ZSBET00gb2JqZWN0cyBp biB0aGUgd3JhcHBlciBtYXAuCi0gICAgRE9NRGF0YTo6cmVtb3ZlT2JqZWN0c0Zyb21XcmFwcGVy TWFwPHZvaWQ+KGdldEFjdGl2ZURPTU9iamVjdE1hcCgpKTsKLX0KLQotdm9pZCByZW1vdmVBbGxE T01PYmplY3RzSW5DdXJyZW50VGhyZWFkKCkKLXsKLSAgICAvLyBVc2UgdGhlIGxvY2tlciBvbmx5 IGlmIGl0IGhhcyBhbHJlYWR5IGJlZW4gaW52b2tlZCBiZWZvcmUsIGFzIGJ5IHdvcmtlciB0aHJl YWQuCi0gICAgaWYgKHY4OjpMb2NrZXI6OklzQWN0aXZlKCkpIHsKLSAgICAgICAgdjg6OkxvY2tl ciBsb2NrZXI7Ci0gICAgICAgIHJlbW92ZUFsbERPTU9iamVjdHNJbkN1cnJlbnRUaHJlYWRIZWxw ZXIoKTsKLSAgICB9IGVsc2UKLSAgICAgICAgcmVtb3ZlQWxsRE9NT2JqZWN0c0luQ3VycmVudFRo cmVhZEhlbHBlcigpOwotfQotCi0KIHZvaWQgdmlzaXRET01Ob2Rlc0luQ3VycmVudFRocmVhZChE T01XcmFwcGVyTWFwPE5vZGU+OjpWaXNpdG9yKiB2aXNpdG9yKQogewogICAgIHY4OjpIYW5kbGVT Y29wZSBzY29wZTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhET01NYXAuaCBi L1dlYkNvcmUvYmluZGluZ3MvdjgvVjhET01NYXAuaAppbmRleCBhN2UwM2EwLi42ZWNiNDg4IDEw MDY0NAotLS0gYS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4RE9NTWFwLmgKKysrIGIvV2ViQ29yZS9i aW5kaW5ncy92OC9WOERPTU1hcC5oCkBAIC01OCw3ICs1OCw2IEBAIG5hbWVzcGFjZSBXZWJDb3Jl IHsKICAgICAgICAgdmlydHVhbCBib29sIGNvbnRhaW5zKEtleVR5cGUqIG9iaikgPSAwOwogICAg ICAgICB2aXJ0dWFsIHZvaWQgdmlzaXQoVmlzaXRvciogdmlzaXRvcikgPSAwOwogICAgICAgICB2 aXJ0dWFsIGJvb2wgcmVtb3ZlSWZQcmVzZW50KEtleVR5cGUqIGtleSwgdjg6OlBlcnNpc3RlbnQ8 djg6OkRhdGE+IHZhbHVlKSA9IDA7Ci0gICAgICAgIHZpcnR1YWwgdm9pZCBjbGVhcigpID0gMDsK IAogICAgICAgICB2ODo6V2Vha1JlZmVyZW5jZUNhbGxiYWNrIHdlYWtSZWZlcmVuY2VDYWxsYmFj aygpIHsgcmV0dXJuIG1fd2Vha1JlZmVyZW5jZUNhbGxiYWNrOyB9CiAgICAgcHJpdmF0ZToKQEAg LTExOSwxMSArMTE4LDYgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICAgICAgcmV0dXJu IHRydWU7CiAgICAgICAgIH0KIAotICAgICAgICB2b2lkIGNsZWFyKCkKLSAgICAgICAgewotICAg ICAgICAgICAgbV9tYXAuY2xlYXIoKTsKLSAgICAgICAgfQotCiAgICAgICAgIGJvb2wgY29udGFp bnMoS2V5VHlwZSogb2JqKSB7IHJldHVybiBtX21hcC5jb250YWlucyhvYmopOyB9CiAKICAgICAg ICAgdmlydHVhbCB2b2lkIHZpc2l0KHR5cGVuYW1lIFBhcmVudDo6VmlzaXRvciogdmlzaXRvcikK QEAgLTE3MCw5ICsxNjQsNiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgRE9NV3JhcHBlck1h cDx2b2lkPiYgZ2V0QWN0aXZlRE9NT2JqZWN0TWFwKCk7CiAgICAgdm9pZCB2aXNpdEFjdGl2ZURP TU9iamVjdHNJbkN1cnJlbnRUaHJlYWQoRE9NV3JhcHBlck1hcDx2b2lkPjo6VmlzaXRvciopOwog Ci0gICAgLy8gVGhpcyBzaG91bGQgYmUgY2FsbGVkIHRvIHJlbW92ZSBhbGwgRE9NIG9iamVjdHMg YXNzb2NpYXRlZCB3aXRoIHRoZSBjdXJyZW50IHRocmVhZCB3aGVuIGl0IGlzIHRlYXJpbmcgZG93 bi4KLSAgICB2b2lkIHJlbW92ZUFsbERPTU9iamVjdHNJbkN1cnJlbnRUaHJlYWQoKTsKLQogI2lm IEVOQUJMRShTVkcpCiAgICAgLy8gQSBtYXAgZm9yIFNWR0VsZW1lbnRJbnN0YW5jZXMgdG8gaXRz IEpTIHdyYXBwZXIuCiAgICAgRE9NV3JhcHBlck1hcDxTVkdFbGVtZW50SW5zdGFuY2U+JiBnZXRE T01TVkdFbGVtZW50SW5zdGFuY2VNYXAoKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvYmluZGluZ3Mv djgvV29ya2VyU2NyaXB0Q29udHJvbGxlci5jcHAgYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L1dvcmtl clNjcmlwdENvbnRyb2xsZXIuY3BwCmluZGV4IGYyMzExYmYuLmQxMDcwNWEgMTAwNjQ0Ci0tLSBh L1dlYkNvcmUvYmluZGluZ3MvdjgvV29ya2VyU2NyaXB0Q29udHJvbGxlci5jcHAKKysrIGIvV2Vi Q29yZS9iaW5kaW5ncy92OC9Xb3JrZXJTY3JpcHRDb250cm9sbGVyLmNwcApAQCAtNTcsNyArNTcs NiBAQCBXb3JrZXJTY3JpcHRDb250cm9sbGVyOjpXb3JrZXJTY3JpcHRDb250cm9sbGVyKFdvcmtl ckNvbnRleHQqIHdvcmtlckNvbnRleHQpCiAKIFdvcmtlclNjcmlwdENvbnRyb2xsZXI6On5Xb3Jr ZXJTY3JpcHRDb250cm9sbGVyKCkKIHsKLSAgICByZW1vdmVBbGxET01PYmplY3RzSW5DdXJyZW50 VGhyZWFkKCk7CiB9CiAKIFNjcmlwdFZhbHVlIFdvcmtlclNjcmlwdENvbnRyb2xsZXI6OmV2YWx1 YXRlKGNvbnN0IFNjcmlwdFNvdXJjZUNvZGUmIHNvdXJjZUNvZGUpCg==