45406 2010-09-08 12:10:24 -0700 Make FocusController::focusedOrMainFrame method const 2010-09-08 15:20:16 -0700 1 1 1 Unclassified WebKit Frames 528+ (Nightly build) PC All RESOLVED FIXED P3 Normal --- 1 tonikitoo tonikitoo dbates eric oldest_to_newest 275978 0 tonikitoo 2010-09-08 12:10:24 -0700 Originally this method could not be const because it was setting class member objects. http://trac.webkit.org/changeset/19197 changed that. Now method just internally call two other already const methods. Making this const makes it possible caller of it to also be const. Patching coming... 275987 1 66926 tonikitoo 2010-09-08 12:22:52 -0700 Created attachment 66926 patch v1. 275989 2 66927 tonikitoo 2010-09-08 12:26:02 -0700 Created attachment 66927 patch v1.1 Fixed a OOPS in the changelog. 276003 3 eric 2010-09-08 12:45:11 -0700 Attachment 66927 did not build on mac: Build output: http://queues.webkit.org/results/3952276 276009 4 tonikitoo 2010-09-08 12:54:05 -0700 (In reply to comment #3) > Attachment 66927 [details] did not build on mac: > Build output: http://queues.webkit.org/results/3952276 /Users/eseidel/Projects/MacEWS/WebKitBuild/Release/WebCore.framework/Versions/A/WebCore Undefined symbols: "__ZN7WebCore15FocusController18focusedOrMainFrameEv", referenced from: -exported_symbols_list command line option ld: symbol(s) not found collect2: ld returned 1 exit status 276053 5 66927 dbates 2010-09-08 14:08:51 -0700 Comment on attachment 66927 patch v1.1 You will need to update WebCore/WebCore.exp.in to reflect the new symbol. In particular, substitute __ZNK7WebCore15FocusController18focusedOrMainFrameEv for __ZN7WebCore15FocusController18focusedOrMainFrameEv. r=me. 276092 6 66945 tonikitoo 2010-09-08 14:54:19 -0700 Created attachment 66945 (committed with r67025, r=dbates)patch v1.2 (do not review - checking with the bots). Thank you, Dan. Double checking with the build bots if all goes fine. I will commit manually if it does. 276108 7 66945 tonikitoo 2010-09-08 15:19:32 -0700 Comment on attachment 66945 (committed with r67025, r=dbates)patch v1.2 (do not review - checking with the bots). Clearing flags on attachment 66945. Committed <http://trac.webkit.org/changeset/67025> 66926 2010-09-08 12:22:52 -0700 2010-09-08 12:26:02 -0700 patch v1. 0001-Make-FocusController-focusedOrMainFrame-method-const.patch text/plain 2326 tonikitoo RnJvbSBmODNiN2Y4ZGQ1MjBkZjYxYTVlMGM4OGNmMTViOGQ0MjEwMWQxM2VkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnRvbmlvIEdvbWVzIDxhZ29tZXNAcmltLmNvbT4KRGF0ZTog V2VkLCA4IFNlcCAyMDEwIDE1OjE5OjU4IC0wNDAwClN1YmplY3Q6IFtQQVRDSF0gTWFrZSBGb2N1 c0NvbnRyb2xsZXI6OmZvY3VzZWRPck1haW5GcmFtZSBtZXRob2QgY29uc3QKIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NTQwNgoKUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuClBhdGNoIGJ5IEFudG9uaW8gR29tZXMgPGFnb21lc0ByaW0uY29tPgoKTm8gbmV3IHRl c3RzIG9uY2UgaXQgaXMgbm90IGEgYmVoYXZpb3IgY2hhbmdlLgoKKiBwYWdlL0ZvY3VzQ29udHJv bGxlci5jcHA6CihXZWJDb3JlOjpGb2N1c0NvbnRyb2xsZXI6OmZvY3VzZWRPck1haW5GcmFtZSk6 CiogcGFnZS9Gb2N1c0NvbnRyb2xsZXIuaDoKLS0tCiBXZWJDb3JlL0NoYW5nZUxvZyAgICAgICAg ICAgICAgICB8ICAgMTMgKysrKysrKysrKysrKwogV2ViQ29yZS9wYWdlL0ZvY3VzQ29udHJvbGxl ci5jcHAgfCAgICAyICstCiBXZWJDb3JlL3BhZ2UvRm9jdXNDb250cm9sbGVyLmggICB8ICAgIDIg Ky0KIDMgZmlsZXMgY2hhbmdlZCwgMTUgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGNi NDEzODcuLjMxMWRiMzUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNv cmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTAtMDktMDggIEFudG9uaW8gR29tZXMg IDxhZ29tZXNAcmltLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBNYWtlIEZvY3VzQ29udHJvbGxlcjo6Zm9jdXNlZE9yTWFpbkZyYW1lIG1ldGhv ZCBjb25zdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NDU0MDYKKworICAgICAgICBObyBuZXcgdGVzdHMuIChPT1BTISkKKworICAgICAgICAqIHBhZ2Uv Rm9jdXNDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZvY3VzQ29udHJvbGxlcjo6 Zm9jdXNlZE9yTWFpbkZyYW1lKToKKyAgICAgICAgKiBwYWdlL0ZvY3VzQ29udHJvbGxlci5oOgor CiAyMDEwLTA5LTA4ICBBbmR5IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBS dWJiZXItc3RhbXBlZCBieSBEYXJpbiBBZGxlci4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGFnZS9G b2N1c0NvbnRyb2xsZXIuY3BwIGIvV2ViQ29yZS9wYWdlL0ZvY3VzQ29udHJvbGxlci5jcHAKaW5k ZXggYTg3ZDZhNi4uYWViNGZhMCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wYWdlL0ZvY3VzQ29udHJv bGxlci5jcHAKKysrIGIvV2ViQ29yZS9wYWdlL0ZvY3VzQ29udHJvbGxlci5jcHAKQEAgLTExMCw3 ICsxMTAsNyBAQCB2b2lkIEZvY3VzQ29udHJvbGxlcjo6c2V0Rm9jdXNlZEZyYW1lKFBhc3NSZWZQ dHI8RnJhbWU+IGZyYW1lKQogICAgIG1faXNDaGFuZ2luZ0ZvY3VzZWRGcmFtZSA9IGZhbHNlOwog fQogCi1GcmFtZSogRm9jdXNDb250cm9sbGVyOjpmb2N1c2VkT3JNYWluRnJhbWUoKQorRnJhbWUq IEZvY3VzQ29udHJvbGxlcjo6Zm9jdXNlZE9yTWFpbkZyYW1lKCkgY29uc3QKIHsKICAgICBpZiAo RnJhbWUqIGZyYW1lID0gZm9jdXNlZEZyYW1lKCkpCiAgICAgICAgIHJldHVybiBmcmFtZTsKZGlm ZiAtLWdpdCBhL1dlYkNvcmUvcGFnZS9Gb2N1c0NvbnRyb2xsZXIuaCBiL1dlYkNvcmUvcGFnZS9G b2N1c0NvbnRyb2xsZXIuaAppbmRleCA0NDEwODMzLi4wNTBhMDhmIDEwMDY0NAotLS0gYS9XZWJD b3JlL3BhZ2UvRm9jdXNDb250cm9sbGVyLmgKKysrIGIvV2ViQ29yZS9wYWdlL0ZvY3VzQ29udHJv bGxlci5oCkBAIC00Niw3ICs0Niw3IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgc2V0Rm9jdXNlZEZy YW1lKFBhc3NSZWZQdHI8RnJhbWU+KTsKICAgICBGcmFtZSogZm9jdXNlZEZyYW1lKCkgY29uc3Qg eyByZXR1cm4gbV9mb2N1c2VkRnJhbWUuZ2V0KCk7IH0KLSAgICBGcmFtZSogZm9jdXNlZE9yTWFp bkZyYW1lKCk7CisgICAgRnJhbWUqIGZvY3VzZWRPck1haW5GcmFtZSgpIGNvbnN0OwogCiAgICAg Ym9vbCBzZXRJbml0aWFsRm9jdXMoRm9jdXNEaXJlY3Rpb24sIEtleWJvYXJkRXZlbnQqKTsKICAg ICBib29sIGFkdmFuY2VGb2N1cyhGb2N1c0RpcmVjdGlvbiwgS2V5Ym9hcmRFdmVudCosIGJvb2wg aW5pdGlhbEZvY3VzID0gZmFsc2UpOwotLSAKMS43LjAuMi5tc3lzZ2l0LjAKCg== 66927 2010-09-08 12:26:02 -0700 2010-09-08 15:19:45 -0700 patch v1.1 0001-Make-FocusController-focusedOrMainFrame-method-const.patch text/plain 2325 tonikitoo RnJvbSAwZjVkMmI0ODQwYjE4MWQ4NTgyZTZjYTZiZDFiOGJkY2JkMmNjYWZjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnRvbmlvIEdvbWVzIDxhZ29tZXNAcmltLmNvbT4KRGF0ZTog V2VkLCA4IFNlcCAyMDEwIDE1OjE5OjU4IC0wNDAwClN1YmplY3Q6IFtQQVRDSF0gTWFrZSBGb2N1 c0NvbnRyb2xsZXI6OmZvY3VzZWRPck1haW5GcmFtZSBtZXRob2QgY29uc3QKIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NTQwNgoKUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuClBhdGNoIGJ5IEFudG9uaW8gR29tZXMgPGFnb21lc0ByaW0uY29tPgoKTm8gbmV3IHRl c3RzIG9uY2UgaXQgaXMgbm90IGEgYmVoYXZpb3IgY2hhbmdlLgoKKiBwYWdlL0ZvY3VzQ29udHJv bGxlci5jcHA6CihXZWJDb3JlOjpGb2N1c0NvbnRyb2xsZXI6OmZvY3VzZWRPck1haW5GcmFtZSk6 CiogcGFnZS9Gb2N1c0NvbnRyb2xsZXIuaDoKLS0tCiBXZWJDb3JlL0NoYW5nZUxvZyAgICAgICAg ICAgICAgICB8ICAgMTMgKysrKysrKysrKysrKwogV2ViQ29yZS9wYWdlL0ZvY3VzQ29udHJvbGxl ci5jcHAgfCAgICAyICstCiBXZWJDb3JlL3BhZ2UvRm9jdXNDb250cm9sbGVyLmggICB8ICAgIDIg Ky0KIDMgZmlsZXMgY2hhbmdlZCwgMTUgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGNi NDEzODcuLmNkNTVkOGQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNv cmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTAtMDktMDggIEFudG9uaW8gR29tZXMg IDxhZ29tZXNAcmltLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBNYWtlIEZvY3VzQ29udHJvbGxlcjo6Zm9jdXNlZE9yTWFpbkZyYW1lIG1ldGhv ZCBjb25zdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NDU0MDYKKworICAgICAgICBObyBuZXcgdGVzdHMgbmVlZGVkLgorCisgICAgICAgICogcGFnZS9G b2N1c0NvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Rm9jdXNDb250cm9sbGVyOjpm b2N1c2VkT3JNYWluRnJhbWUpOgorICAgICAgICAqIHBhZ2UvRm9jdXNDb250cm9sbGVyLmg6CisK IDIwMTAtMDktMDggIEFuZHkgRXN0ZXMgIDxhZXN0ZXNAYXBwbGUuY29tPgogCiAgICAgICAgIFJ1 YmJlci1zdGFtcGVkIGJ5IERhcmluIEFkbGVyLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wYWdlL0Zv Y3VzQ29udHJvbGxlci5jcHAgYi9XZWJDb3JlL3BhZ2UvRm9jdXNDb250cm9sbGVyLmNwcAppbmRl eCBhODdkNmE2Li5hZWI0ZmEwIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BhZ2UvRm9jdXNDb250cm9s bGVyLmNwcAorKysgYi9XZWJDb3JlL3BhZ2UvRm9jdXNDb250cm9sbGVyLmNwcApAQCAtMTEwLDcg KzExMCw3IEBAIHZvaWQgRm9jdXNDb250cm9sbGVyOjpzZXRGb2N1c2VkRnJhbWUoUGFzc1JlZlB0 cjxGcmFtZT4gZnJhbWUpCiAgICAgbV9pc0NoYW5naW5nRm9jdXNlZEZyYW1lID0gZmFsc2U7CiB9 CiAKLUZyYW1lKiBGb2N1c0NvbnRyb2xsZXI6OmZvY3VzZWRPck1haW5GcmFtZSgpCitGcmFtZSog Rm9jdXNDb250cm9sbGVyOjpmb2N1c2VkT3JNYWluRnJhbWUoKSBjb25zdAogewogICAgIGlmIChG cmFtZSogZnJhbWUgPSBmb2N1c2VkRnJhbWUoKSkKICAgICAgICAgcmV0dXJuIGZyYW1lOwpkaWZm IC0tZ2l0IGEvV2ViQ29yZS9wYWdlL0ZvY3VzQ29udHJvbGxlci5oIGIvV2ViQ29yZS9wYWdlL0Zv Y3VzQ29udHJvbGxlci5oCmluZGV4IDQ0MTA4MzMuLjA1MGEwOGYgMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvcGFnZS9Gb2N1c0NvbnRyb2xsZXIuaAorKysgYi9XZWJDb3JlL3BhZ2UvRm9jdXNDb250cm9s bGVyLmgKQEAgLTQ2LDcgKzQ2LDcgQEAgcHVibGljOgogCiAgICAgdm9pZCBzZXRGb2N1c2VkRnJh bWUoUGFzc1JlZlB0cjxGcmFtZT4pOwogICAgIEZyYW1lKiBmb2N1c2VkRnJhbWUoKSBjb25zdCB7 IHJldHVybiBtX2ZvY3VzZWRGcmFtZS5nZXQoKTsgfQotICAgIEZyYW1lKiBmb2N1c2VkT3JNYWlu RnJhbWUoKTsKKyAgICBGcmFtZSogZm9jdXNlZE9yTWFpbkZyYW1lKCkgY29uc3Q7CiAKICAgICBi b29sIHNldEluaXRpYWxGb2N1cyhGb2N1c0RpcmVjdGlvbiwgS2V5Ym9hcmRFdmVudCopOwogICAg IGJvb2wgYWR2YW5jZUZvY3VzKEZvY3VzRGlyZWN0aW9uLCBLZXlib2FyZEV2ZW50KiwgYm9vbCBp bml0aWFsRm9jdXMgPSBmYWxzZSk7Ci0tIAoxLjcuMC4yLm1zeXNnaXQuMAoK 66945 2010-09-08 14:54:19 -0700 2010-09-08 15:19:32 -0700 (committed with r67025, r=dbates)patch v1.2 (do not review - checking with the bots). 0001-Make-FocusController-focusedOrMainFrame-method-const.patch text/plain 3086 tonikitoo RnJvbSBmODQxN2NjNTk1N2IzMDMwZGM2YTA1N2RmOWE0NmM4ZTc4ZjMyNjUwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnRvbmlvIEdvbWVzIDxhZ29tZXNAcmltLmNvbT4KRGF0ZTog V2VkLCA4IFNlcCAyMDEwIDE1OjE5OjU4IC0wNDAwClN1YmplY3Q6IFtQQVRDSF0gTWFrZSBGb2N1 c0NvbnRyb2xsZXI6OmZvY3VzZWRPck1haW5GcmFtZSBtZXRob2QgY29uc3QKIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NTQwNgoKUmV2aWV3ZWQgYnkgRGFuaWVsIEJh dGVzLgpQYXRjaCBieSBBbnRvbmlvIEdvbWVzIDxhZ29tZXNAcmltLmNvbT4KCk5vIG5ldyB0ZXN0 cyBvbmNlIGl0IGlzIG5vdCBhIGJlaGF2aW9yIGNoYW5nZS4KCiogcGFnZS9Gb2N1c0NvbnRyb2xs ZXIuY3BwOgooV2ViQ29yZTo6Rm9jdXNDb250cm9sbGVyOjpmb2N1c2VkT3JNYWluRnJhbWUpOgoq IHBhZ2UvRm9jdXNDb250cm9sbGVyLmg6Ci0tLQogV2ViQ29yZS9DaGFuZ2VMb2cgICAgICAgICAg ICAgICAgfCAgIDEzICsrKysrKysrKysrKysKIFdlYkNvcmUvV2ViQ29yZS5leHAuaW4gICAgICAg ICAgIHwgICAgMiArLQogV2ViQ29yZS9wYWdlL0ZvY3VzQ29udHJvbGxlci5jcHAgfCAgICAyICst CiBXZWJDb3JlL3BhZ2UvRm9jdXNDb250cm9sbGVyLmggICB8ICAgIDIgKy0KIDQgZmlsZXMgY2hh bmdlZCwgMTYgaW5zZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9XZWJD b3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGNiNDEzODcuLjI3MWE4NTMg MTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTYgQEAKKzIwMTAtMDktMDggIEFudG9uaW8gR29tZXMgIDxhZ29tZXNAcmltLmNv bT4KKworICAgICAgICBSZXZpZXdlZCBieSBEYW5pZWwgQmF0ZXMuCisKKyAgICAgICAgTWFrZSBG b2N1c0NvbnRyb2xsZXI6OmZvY3VzZWRPck1haW5GcmFtZSBtZXRob2QgY29uc3QKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ1NDA2CisKKyAgICAgICAg Tm8gbmV3IHRlc3RzLgorCisgICAgICAgICogcGFnZS9Gb2N1c0NvbnRyb2xsZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6Rm9jdXNDb250cm9sbGVyOjpmb2N1c2VkT3JNYWluRnJhbWUpOgorICAg ICAgICAqIHBhZ2UvRm9jdXNDb250cm9sbGVyLmg6CisKIDIwMTAtMDktMDggIEFuZHkgRXN0ZXMg IDxhZXN0ZXNAYXBwbGUuY29tPgogCiAgICAgICAgIFJ1YmJlci1zdGFtcGVkIGJ5IERhcmluIEFk bGVyLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbiBiL1dlYkNvcmUvV2ViQ29y ZS5leHAuaW4KaW5kZXggZDM1YmI0Yi4uZmE1NmNhMiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9XZWJD b3JlLmV4cC5pbgorKysgYi9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCkBAIC0zNDEsNyArMzQxLDcg QEAgX19aTjdXZWJDb3JlMTVEYXRhYmFzZVRyYWNrZXI5c2V0Q2xpZW50RVBOU18yMURhdGFiYXNl VHJhY2tlckNsaWVudEUKIF9fWk43V2ViQ29yZTE1Rm9jdXNDb250cm9sbGVyMTBzZXRGb2N1c2Vk RWIKIF9fWk43V2ViQ29yZTE1Rm9jdXNDb250cm9sbGVyMTVzZXRGb2N1c2VkRnJhbWVFTjNXVEYx MFBhc3NSZWZQdHJJTlNfNUZyYW1lRUVFCiBfX1pON1dlYkNvcmUxNUZvY3VzQ29udHJvbGxlcjE1 c2V0SW5pdGlhbEZvY3VzRU5TXzE0Rm9jdXNEaXJlY3Rpb25FUE5TXzEzS2V5Ym9hcmRFdmVudEUK LV9fWk43V2ViQ29yZTE1Rm9jdXNDb250cm9sbGVyMThmb2N1c2VkT3JNYWluRnJhbWVFdgorX19a Tks3V2ViQ29yZTE1Rm9jdXNDb250cm9sbGVyMThmb2N1c2VkT3JNYWluRnJhbWVFdgogX19aTjdX ZWJDb3JlMTVGb2N1c0NvbnRyb2xsZXI5c2V0QWN0aXZlRWIKIF9fWk43V2ViQ29yZTE1R3JhcGhp Y3NDb250ZXh0MTJzZXRGaWxsQ29sb3JFUktOU181Q29sb3JFTlNfMTBDb2xvclNwYWNlRQogX19a TjdXZWJDb3JlMTVHcmFwaGljc0NvbnRleHQ0Y2xpcEVSS05TXzlGbG9hdFJlY3RFCmRpZmYgLS1n aXQgYS9XZWJDb3JlL3BhZ2UvRm9jdXNDb250cm9sbGVyLmNwcCBiL1dlYkNvcmUvcGFnZS9Gb2N1 c0NvbnRyb2xsZXIuY3BwCmluZGV4IGE4N2Q2YTYuLmFlYjRmYTAgMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvcGFnZS9Gb2N1c0NvbnRyb2xsZXIuY3BwCisrKyBiL1dlYkNvcmUvcGFnZS9Gb2N1c0NvbnRy b2xsZXIuY3BwCkBAIC0xMTAsNyArMTEwLDcgQEAgdm9pZCBGb2N1c0NvbnRyb2xsZXI6OnNldEZv Y3VzZWRGcmFtZShQYXNzUmVmUHRyPEZyYW1lPiBmcmFtZSkKICAgICBtX2lzQ2hhbmdpbmdGb2N1 c2VkRnJhbWUgPSBmYWxzZTsKIH0KIAotRnJhbWUqIEZvY3VzQ29udHJvbGxlcjo6Zm9jdXNlZE9y TWFpbkZyYW1lKCkKK0ZyYW1lKiBGb2N1c0NvbnRyb2xsZXI6OmZvY3VzZWRPck1haW5GcmFtZSgp IGNvbnN0CiB7CiAgICAgaWYgKEZyYW1lKiBmcmFtZSA9IGZvY3VzZWRGcmFtZSgpKQogICAgICAg ICByZXR1cm4gZnJhbWU7CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BhZ2UvRm9jdXNDb250cm9sbGVy LmggYi9XZWJDb3JlL3BhZ2UvRm9jdXNDb250cm9sbGVyLmgKaW5kZXggNDQxMDgzMy4uMDUwYTA4 ZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wYWdlL0ZvY3VzQ29udHJvbGxlci5oCisrKyBiL1dlYkNv cmUvcGFnZS9Gb2N1c0NvbnRyb2xsZXIuaApAQCAtNDYsNyArNDYsNyBAQCBwdWJsaWM6CiAKICAg ICB2b2lkIHNldEZvY3VzZWRGcmFtZShQYXNzUmVmUHRyPEZyYW1lPik7CiAgICAgRnJhbWUqIGZv Y3VzZWRGcmFtZSgpIGNvbnN0IHsgcmV0dXJuIG1fZm9jdXNlZEZyYW1lLmdldCgpOyB9Ci0gICAg RnJhbWUqIGZvY3VzZWRPck1haW5GcmFtZSgpOworICAgIEZyYW1lKiBmb2N1c2VkT3JNYWluRnJh bWUoKSBjb25zdDsKIAogICAgIGJvb2wgc2V0SW5pdGlhbEZvY3VzKEZvY3VzRGlyZWN0aW9uLCBL ZXlib2FyZEV2ZW50Kik7CiAgICAgYm9vbCBhZHZhbmNlRm9jdXMoRm9jdXNEaXJlY3Rpb24sIEtl eWJvYXJkRXZlbnQqLCBib29sIGluaXRpYWxGb2N1cyA9IGZhbHNlKTsKLS0gCjEuNy4wLjIubXN5 c2dpdC4wCgo=