38827 2010-05-09 18:00:34 -0700 FrameLoader: refactor changeLocation() and urlSelected() to share more code 2010-05-17 05:52:29 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 cjerdonek cjerdonek abarth cjerdonek eric webkit.review.bot oldest_to_newest 223120 0 cjerdonek 2010-05-09 18:00:34 -0700 The following call appears twice: m_frame->script()->executeIfJavaScriptURL() Also, when changeLocation() is called, the function unnecessarily gets called twice. 225194 1 55954 cjerdonek 2010-05-13 01:01:35 -0700 Created attachment 55954 Proposed patch 226476 2 55954 abarth 2010-05-16 06:53:06 -0700 Comment on attachment 55954 Proposed patch For parameters like shouldReplaceDocumentIfJavascriptURL, we like to use enums with two values so you can read at the call site what the parameter does (instead of just "true" or "false"). For example, we'd add ReplaceDocumentIfJavaScritptURL or DoNotReplaceDocumentIfJavaScritptURL as the argument. 226537 3 56193 cjerdonek 2010-05-16 14:09:46 -0700 Created attachment 56193 Proposed patch 2 226571 4 56193 abarth 2010-05-16 17:41:55 -0700 Comment on attachment 56193 Proposed patch 2 LGTM. Please consider these small tweaks below before landing. WebCore/loader/FrameLoader.cpp:340 + bool lockHistory, bool lockBackForwardList, bool userGesture, ReferrerPolicy referrerPolicy) We usually don't add line breaks for function declarations, even when they're ridiculously long like this one. WebCore/loader/FrameLoader.cpp:352 + if (m_frame->script()->executeIfJavaScriptURL(request.url(), userGesture, shouldReplaceDocumentIfJavaScriptURL == ReplaceDocumentIfJavaScriptURL)) You might consider propagating the enum down into executeIfJavaScriptURL so we don't have to convert here and other callers (if there are any) will look prettier. 226644 5 cjerdonek 2010-05-17 00:35:56 -0700 Committed r59596: <http://trac.webkit.org/changeset/59596> 226674 6 cjerdonek 2010-05-17 01:17:24 -0700 (In reply to comment #4) > (From update of attachment 56193 [details]) > LGTM. Please consider these small tweaks below before landing. > > WebCore/loader/FrameLoader.cpp:340 > + bool lockHistory, bool lockBackForwardList, bool userGesture, ReferrerPolicy referrerPolicy) > We usually don't add line breaks for function declarations, even when they're ridiculously long like this one. > > WebCore/loader/FrameLoader.cpp:352 > + if (m_frame->script()->executeIfJavaScriptURL(request.url(), userGesture, shouldReplaceDocumentIfJavaScriptURL == ReplaceDocumentIfJavaScriptURL)) > You might consider propagating the enum down into executeIfJavaScriptURL so we don't have to convert here and other callers (if there are any) will look prettier. FYI, I incorporated both of these suggestions in the final commit. Thanks for your review and helpful comments. 226715 7 webkit.review.bot 2010-05-17 03:26:49 -0700 http://trac.webkit.org/changeset/59596 might have broken GTK Linux 32-bit Debug 226737 8 cjerdonek 2010-05-17 05:52:29 -0700 (In reply to comment #7) > http://trac.webkit.org/changeset/59596 might have broken GTK Linux 32-bit Debug The three test cases that failed here also failed in a previous revision (r59591), so it doesn't look like the revision for this report caused the breakage. 55954 2010-05-13 01:01:35 -0700 2010-05-16 14:09:46 -0700 Proposed patch _patch-38827-1.diff text/plain 3724 cjerdonek ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YjA1MzRmYS4uYjU0NjQ1MSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAxMC0wNS0xMCAgQ2hyaXMgSmVyZG9u ZWsgIDxjamVyZG9uZWtAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBNb2RpZmllZCBGcmFtZUxvYWRlcjo6Y2hhbmdlTG9jYXRpb24o KSBhbmQgdXJsU2VsZWN0ZWQoKSB0byBzaGFyZSBtb3JlIGNvZGUuCisKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM4ODI3CisKKyAgICAgICAgTm8gY2hh bmdlIGluIGJlaGF2aW9yLCBzbyBubyBuZXcgdGVzdHMuCisKKyAgICAgICAgKiBsb2FkZXIvRnJh bWVMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OmNoYW5nZUxvY2F0 aW9uKToKKyAgICAgICAgICAtIENoYW5nZWQgdG8gY2FsbCB0aGUgbmV3IHByaXZhdGUgb3Zlcmxv YWQgb2YgdXJsU2VsZWN0ZWQoKS4KKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjp1cmxT ZWxlY3RlZCk6CisgICAgICAgICAgLSBBZGRlZCBhIHByaXZhdGUgb3ZlcmxvYWQgb2YgdXJsU2Vs ZWN0ZWQoKS4KKyAgICAgICAgICAtIENoYW5nZWQgdGhlIHB1YmxpYyB1cmxTZWxlY3RlZCgpIHRv IGNhbGwgdGhlIHByaXZhdGUgb3ZlcmxvYWQuCisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVy Lmg6CisgICAgICAgICAgLSBBZGRlZCBhIHByaXZhdGUgb3ZlcmxvYWQgb2YgdXJsU2VsZWN0ZWQo KS4KKwogMjAxMC0wNS0xMiAgU2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5j b20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjU5MjcwLgpkaWZmIC0tZ2l0 IGEvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwIGIvV2ViQ29yZS9sb2FkZXIvRnJhbWVM b2FkZXIuY3BwCmluZGV4IDZjZjkwODcuLjdiNjc2OWIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvbG9h ZGVyL0ZyYW1lTG9hZGVyLmNwcAorKysgYi9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAK QEAgLTMzMywxNyArMzMzLDIzIEBAIHZvaWQgRnJhbWVMb2FkZXI6OmNoYW5nZUxvY2F0aW9uKGNv bnN0IEtVUkwmIHVybCwgY29uc3QgU3RyaW5nJiByZWZlcnJlciwgYm9vbCBsCiAKICAgICBSZXNv dXJjZVJlcXVlc3QgcmVxdWVzdCh1cmwsIHJlZmVycmVyLCByZWZyZXNoID8gUmVsb2FkSWdub3Jp bmdDYWNoZURhdGEgOiBVc2VQcm90b2NvbENhY2hlUG9saWN5KTsKICAgICAKLSAgICBpZiAobV9m cmFtZS0+c2NyaXB0KCktPmV4ZWN1dGVJZkphdmFTY3JpcHRVUkwocmVxdWVzdC51cmwoKSwgdXNl ckdlc3R1cmUpKQotICAgICAgICByZXR1cm47CisgICAgdXJsU2VsZWN0ZWQocmVxdWVzdCwgIl9z ZWxmIiwgMCwgbG9ja0hpc3RvcnksIGxvY2tCYWNrRm9yd2FyZExpc3QsIHVzZXJHZXN0dXJlLCBT ZW5kUmVmZXJyZXIsIHRydWUpOworfQogCi0gICAgdXJsU2VsZWN0ZWQocmVxdWVzdCwgIl9zZWxm IiwgMCwgbG9ja0hpc3RvcnksIGxvY2tCYWNrRm9yd2FyZExpc3QsIHVzZXJHZXN0dXJlLCBTZW5k UmVmZXJyZXIpOwordm9pZCBGcmFtZUxvYWRlcjo6dXJsU2VsZWN0ZWQoY29uc3QgUmVzb3VyY2VS ZXF1ZXN0JiByZXF1ZXN0LCBjb25zdCBTdHJpbmcmIHBhc3NlZFRhcmdldCwgUGFzc1JlZlB0cjxF dmVudD4gdHJpZ2dlcmluZ0V2ZW50LAorICAgIGJvb2wgbG9ja0hpc3RvcnksIGJvb2wgbG9ja0Jh Y2tGb3J3YXJkTGlzdCwgYm9vbCB1c2VyR2VzdHVyZSwgUmVmZXJyZXJQb2xpY3kgcmVmZXJyZXJQ b2xpY3kpCit7CisgICAgdXJsU2VsZWN0ZWQocmVxdWVzdCwgcGFzc2VkVGFyZ2V0LCB0cmlnZ2Vy aW5nRXZlbnQsIGxvY2tIaXN0b3J5LCBsb2NrQmFja0ZvcndhcmRMaXN0LCB1c2VyR2VzdHVyZSwg cmVmZXJyZXJQb2xpY3ksIGZhbHNlKTsKIH0KIAotdm9pZCBGcmFtZUxvYWRlcjo6dXJsU2VsZWN0 ZWQoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBjb25zdCBTdHJpbmcmIHBhc3NlZFRh cmdldCwgUGFzc1JlZlB0cjxFdmVudD4gdHJpZ2dlcmluZ0V2ZW50LCBib29sIGxvY2tIaXN0b3J5 LCBib29sIGxvY2tCYWNrRm9yd2FyZExpc3QsIGJvb2wgdXNlckdlc3R1cmUsIFJlZmVycmVyUG9s aWN5IHJlZmVycmVyUG9saWN5KQorLy8gVGhpcyBvdmVybG9hZCB3aWxsIGdvIGF3YXkgd2hlbiB0 aGUgRklYTUUgdG8gZWxpbWluYXRlIHRoZSBzaG91bGRSZXBsYWNlRG9jdW1lbnRJZkphdmFzY3Jp cHRVUkwKKy8vIHBhcmFtZXRlciBmcm9tIFNjcmlwdENvbnRyb2xsZXI6OmV4ZWN1dGVJZkphdmFT Y3JpcHRVUkwoKSBpcyBhZGRyZXNzZWQuCit2b2lkIEZyYW1lTG9hZGVyOjp1cmxTZWxlY3RlZChj b25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIGNvbnN0IFN0cmluZyYgcGFzc2VkVGFyZ2V0 LCBQYXNzUmVmUHRyPEV2ZW50PiB0cmlnZ2VyaW5nRXZlbnQsCisgICAgYm9vbCBsb2NrSGlzdG9y eSwgYm9vbCBsb2NrQmFja0ZvcndhcmRMaXN0LCBib29sIHVzZXJHZXN0dXJlLCBSZWZlcnJlclBv bGljeSByZWZlcnJlclBvbGljeSwgYm9vbCBzaG91bGRSZXBsYWNlRG9jdW1lbnRJZkphdmFzY3Jp cHRVUkwpCiB7CiAgICAgQVNTRVJUKCFtX3N1cHByZXNzT3BlbmVySW5OZXdGcmFtZSk7CiAKLSAg ICBpZiAobV9mcmFtZS0+c2NyaXB0KCktPmV4ZWN1dGVJZkphdmFTY3JpcHRVUkwocmVxdWVzdC51 cmwoKSwgdXNlckdlc3R1cmUsIGZhbHNlKSkKKyAgICBpZiAobV9mcmFtZS0+c2NyaXB0KCktPmV4 ZWN1dGVJZkphdmFTY3JpcHRVUkwocmVxdWVzdC51cmwoKSwgdXNlckdlc3R1cmUsIHNob3VsZFJl cGxhY2VEb2N1bWVudElmSmF2YXNjcmlwdFVSTCkpCiAgICAgICAgIHJldHVybjsKIAogICAgIFN0 cmluZyB0YXJnZXQgPSBwYXNzZWRUYXJnZXQ7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2xvYWRlci9G cmFtZUxvYWRlci5oIGIvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuaAppbmRleCAxOTIyMzRi Li5lNzc5ZWM1IDEwMDY0NAotLS0gYS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5oCisrKyBi L1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmgKQEAgLTQxOSw2ICs0MTksOSBAQCBwcml2YXRl OgogCiAgICAgdm9pZCBkaXNwYXRjaERpZENvbW1pdExvYWQoKTsKIAorICAgIHZvaWQgdXJsU2Vs ZWN0ZWQoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiwgY29uc3QgU3RyaW5nJiB0YXJnZXQsIFBhc3NS ZWZQdHI8RXZlbnQ+LCBib29sIGxvY2tIaXN0b3J5LAorICAgICAgICAgICAgICAgICAgICAgYm9v bCBsb2NrQmFja0ZvcndhcmRMaXN0LCBib29sIHVzZXJHZXN0dXJlLCBSZWZlcnJlclBvbGljeSwg Ym9vbCBzaG91bGRSZXBsYWNlRG9jdW1lbnRJZkphdmFzY3JpcHRVUkwpOworCiAgICAgdm9pZCBs b2FkV2l0aERvY3VtZW50TG9hZGVyKERvY3VtZW50TG9hZGVyKiwgRnJhbWVMb2FkVHlwZSwgUGFz c1JlZlB0cjxGb3JtU3RhdGU+KTsgLy8gQ2FsbHMgY29udGludWVMb2FkQWZ0ZXJOYXZpZ2F0aW9u UG9saWN5CiAgICAgdm9pZCBsb2FkKERvY3VtZW50TG9hZGVyKik7ICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8gQ2FsbHMgbG9hZFdpdGhE b2N1bWVudExvYWRlciAgIAogCg== 56193 2010-05-16 14:09:46 -0700 2010-05-16 17:41:54 -0700 Proposed patch 2 _patch-38827-2.diff text/plain 4763 cjerdonek ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg OWE0YmJkYy4uMzY0NGQ3MCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNCBAQAorMjAxMC0wNS0xMCAgQ2hyaXMgSmVyZG9u ZWsgIDxjamVyZG9uZWtAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBSZWZhY3RvcmVkIEZyYW1lTG9hZGVyOjpjaGFuZ2VMb2NhdGlv bigpIGFuZCB1cmxTZWxlY3RlZCgpIHRvIHNoYXJlIG1vcmUgY29kZS4KKworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mzg4MjcKKworICAgICAgICBObyBj aGFuZ2UgaW4gYmVoYXZpb3IsIHNvIG5vIG5ldyB0ZXN0cy4KKworICAgICAgICAqIGxvYWRlci9G cmFtZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6Y2hhbmdlTG9j YXRpb24pOgorICAgICAgICAgIC0gQ2hhbmdlZCB0byBjYWxsIHRoZSBuZXcgcHJpdmF0ZSBvdmVy bG9hZCBvZiB1cmxTZWxlY3RlZCgpLgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OnVy bFNlbGVjdGVkKToKKyAgICAgICAgICAtIEFkZGVkIGEgcHJpdmF0ZSBvdmVybG9hZCBvZiB1cmxT ZWxlY3RlZCgpLgorICAgICAgICAgIC0gQ2hhbmdlZCB0aGUgcHVibGljIHVybFNlbGVjdGVkKCkg dG8gY2FsbCB0aGUgcHJpdmF0ZSBvdmVybG9hZC4KKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2Fk ZXIuaDoKKyAgICAgICAgICAtIEFkZGVkIGEgcHJpdmF0ZSBvdmVybG9hZCBvZiB1cmxTZWxlY3Rl ZCgpLgorICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlclR5cGVzLmg6CisgICAgICAgICAgLSBB ZGRlZCBhIFNob3VsZFJlcGxhY2VEb2N1bWVudElmSmF2YVNjcmlwdFVSTCBlbnVtLgorCiAyMDEw LTA1LTEyICBZdXpvIEZ1amlzaGltYSAgPHl1em9AZ29vZ2xlLmNvbT4KIAogICAgICAgICBSZXZp ZXdlZCBieSBEYXJpbiBBZGxlci4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9h ZGVyLmNwcCBiL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAppbmRleCA2Y2Y5MDg3Li4y YThlZGUwIDEwMDY0NAotLS0gYS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKKysrIGIv V2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCkBAIC0zMzMsMTcgKzMzMywyMyBAQCB2b2lk IEZyYW1lTG9hZGVyOjpjaGFuZ2VMb2NhdGlvbihjb25zdCBLVVJMJiB1cmwsIGNvbnN0IFN0cmlu ZyYgcmVmZXJyZXIsIGJvb2wgbAogCiAgICAgUmVzb3VyY2VSZXF1ZXN0IHJlcXVlc3QodXJsLCBy ZWZlcnJlciwgcmVmcmVzaCA/IFJlbG9hZElnbm9yaW5nQ2FjaGVEYXRhIDogVXNlUHJvdG9jb2xD YWNoZVBvbGljeSk7CiAgICAgCi0gICAgaWYgKG1fZnJhbWUtPnNjcmlwdCgpLT5leGVjdXRlSWZK YXZhU2NyaXB0VVJMKHJlcXVlc3QudXJsKCksIHVzZXJHZXN0dXJlKSkKLSAgICAgICAgcmV0dXJu OworICAgIHVybFNlbGVjdGVkKHJlcXVlc3QsICJfc2VsZiIsIDAsIGxvY2tIaXN0b3J5LCBsb2Nr QmFja0ZvcndhcmRMaXN0LCB1c2VyR2VzdHVyZSwgU2VuZFJlZmVycmVyLCBSZXBsYWNlRG9jdW1l bnRJZkphdmFTY3JpcHRVUkwpOworfQogCi0gICAgdXJsU2VsZWN0ZWQocmVxdWVzdCwgIl9zZWxm IiwgMCwgbG9ja0hpc3RvcnksIGxvY2tCYWNrRm9yd2FyZExpc3QsIHVzZXJHZXN0dXJlLCBTZW5k UmVmZXJyZXIpOwordm9pZCBGcmFtZUxvYWRlcjo6dXJsU2VsZWN0ZWQoY29uc3QgUmVzb3VyY2VS ZXF1ZXN0JiByZXF1ZXN0LCBjb25zdCBTdHJpbmcmIHBhc3NlZFRhcmdldCwgUGFzc1JlZlB0cjxF dmVudD4gdHJpZ2dlcmluZ0V2ZW50LAorICAgIGJvb2wgbG9ja0hpc3RvcnksIGJvb2wgbG9ja0Jh Y2tGb3J3YXJkTGlzdCwgYm9vbCB1c2VyR2VzdHVyZSwgUmVmZXJyZXJQb2xpY3kgcmVmZXJyZXJQ b2xpY3kpCit7CisgICAgdXJsU2VsZWN0ZWQocmVxdWVzdCwgcGFzc2VkVGFyZ2V0LCB0cmlnZ2Vy aW5nRXZlbnQsIGxvY2tIaXN0b3J5LCBsb2NrQmFja0ZvcndhcmRMaXN0LCB1c2VyR2VzdHVyZSwg cmVmZXJyZXJQb2xpY3ksIERvTm90UmVwbGFjZURvY3VtZW50SWZKYXZhU2NyaXB0VVJMKTsKIH0K IAotdm9pZCBGcmFtZUxvYWRlcjo6dXJsU2VsZWN0ZWQoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiBy ZXF1ZXN0LCBjb25zdCBTdHJpbmcmIHBhc3NlZFRhcmdldCwgUGFzc1JlZlB0cjxFdmVudD4gdHJp Z2dlcmluZ0V2ZW50LCBib29sIGxvY2tIaXN0b3J5LCBib29sIGxvY2tCYWNrRm9yd2FyZExpc3Qs IGJvb2wgdXNlckdlc3R1cmUsIFJlZmVycmVyUG9saWN5IHJlZmVycmVyUG9saWN5KQorLy8gVGhp cyBvdmVybG9hZCB3aWxsIGdvIGF3YXkgd2hlbiB0aGUgRklYTUUgdG8gZWxpbWluYXRlIHRoZSBz aG91bGRSZXBsYWNlRG9jdW1lbnRJZkphdmFTY3JpcHRVUkwKKy8vIHBhcmFtZXRlciBmcm9tIFNj cmlwdENvbnRyb2xsZXI6OmV4ZWN1dGVJZkphdmFTY3JpcHRVUkwoKSBpcyBhZGRyZXNzZWQuCit2 b2lkIEZyYW1lTG9hZGVyOjp1cmxTZWxlY3RlZChjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVl c3QsIGNvbnN0IFN0cmluZyYgcGFzc2VkVGFyZ2V0LCBQYXNzUmVmUHRyPEV2ZW50PiB0cmlnZ2Vy aW5nRXZlbnQsCisgICAgYm9vbCBsb2NrSGlzdG9yeSwgYm9vbCBsb2NrQmFja0ZvcndhcmRMaXN0 LCBib29sIHVzZXJHZXN0dXJlLCBSZWZlcnJlclBvbGljeSByZWZlcnJlclBvbGljeSwgU2hvdWxk UmVwbGFjZURvY3VtZW50SWZKYXZhU2NyaXB0VVJMIHNob3VsZFJlcGxhY2VEb2N1bWVudElmSmF2 YVNjcmlwdFVSTCkKIHsKICAgICBBU1NFUlQoIW1fc3VwcHJlc3NPcGVuZXJJbk5ld0ZyYW1lKTsK IAotICAgIGlmIChtX2ZyYW1lLT5zY3JpcHQoKS0+ZXhlY3V0ZUlmSmF2YVNjcmlwdFVSTChyZXF1 ZXN0LnVybCgpLCB1c2VyR2VzdHVyZSwgZmFsc2UpKQorICAgIGlmIChtX2ZyYW1lLT5zY3JpcHQo KS0+ZXhlY3V0ZUlmSmF2YVNjcmlwdFVSTChyZXF1ZXN0LnVybCgpLCB1c2VyR2VzdHVyZSwgc2hv dWxkUmVwbGFjZURvY3VtZW50SWZKYXZhU2NyaXB0VVJMID09IFJlcGxhY2VEb2N1bWVudElmSmF2 YVNjcmlwdFVSTCkpCiAgICAgICAgIHJldHVybjsKIAogICAgIFN0cmluZyB0YXJnZXQgPSBwYXNz ZWRUYXJnZXQ7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5oIGIvV2Vi Q29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuaAppbmRleCAxOTIyMzRiLi4zNjUwMjkzIDEwMDY0NAot LS0gYS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5oCisrKyBiL1dlYkNvcmUvbG9hZGVyL0Zy YW1lTG9hZGVyLmgKQEAgLTQxOSw2ICs0MTksOSBAQCBwcml2YXRlOgogCiAgICAgdm9pZCBkaXNw YXRjaERpZENvbW1pdExvYWQoKTsKIAorICAgIHZvaWQgdXJsU2VsZWN0ZWQoY29uc3QgUmVzb3Vy Y2VSZXF1ZXN0JiwgY29uc3QgU3RyaW5nJiB0YXJnZXQsIFBhc3NSZWZQdHI8RXZlbnQ+LCBib29s IGxvY2tIaXN0b3J5LAorICAgICAgICBib29sIGxvY2tCYWNrRm9yd2FyZExpc3QsIGJvb2wgdXNl ckdlc3R1cmUsIFJlZmVycmVyUG9saWN5LCBTaG91bGRSZXBsYWNlRG9jdW1lbnRJZkphdmFTY3Jp cHRVUkwpOworCiAgICAgdm9pZCBsb2FkV2l0aERvY3VtZW50TG9hZGVyKERvY3VtZW50TG9hZGVy KiwgRnJhbWVMb2FkVHlwZSwgUGFzc1JlZlB0cjxGb3JtU3RhdGU+KTsgLy8gQ2FsbHMgY29udGlu dWVMb2FkQWZ0ZXJOYXZpZ2F0aW9uUG9saWN5CiAgICAgdm9pZCBsb2FkKERvY3VtZW50TG9hZGVy Kik7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgLy8gQ2FsbHMgbG9hZFdpdGhEb2N1bWVudExvYWRlciAgIAogCmRpZmYgLS1naXQgYS9XZWJD b3JlL2xvYWRlci9GcmFtZUxvYWRlclR5cGVzLmggYi9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRl clR5cGVzLmgKaW5kZXggMzQ4NzJhZC4uZDZlMGFkMiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9sb2Fk ZXIvRnJhbWVMb2FkZXJUeXBlcy5oCisrKyBiL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyVHlw ZXMuaApAQCAtMTA5LDYgKzEwOSwxNSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIERv U2VjdXJpdHlDaGVjawogICAgIH07CiAKKyAgICAvLyBQYXNzZWQgdG8gRnJhbWVMb2FkZXI6OnVy bFNlbGVjdGVkKCkgdG8gY29udHJvbCB3aGV0aGVyLCBpbiB0aGUgY2FzZSBvZiBhIEphdmFTY3Jp cHQgVVJMLAorICAgIC8vIFNjcmlwdENvbnRyb2xsZXI6OmV4ZWN1dGVJZkphdmFTY3JpcHRVUkwo KSBzaG91bGQgYmUgYXNrZWQgdG8gcmVwbGFjZSB0aGUgZG9jdW1lbnQuCisgICAgLy8gSXQgaXMg YSBGSVhNRSB0byBlbGltaW5hdGUgdGhhdCBleHRyYSBwYXJhbWV0ZXIgdG8gZXhlY3V0ZUlmSmF2 YVNjcmlwdFVSTCgpLCBpbiB3aGljaAorICAgIC8vIGNhc2UgdGhpcyBlbnVtIGNhbiBnbyBhd2F5 LgorICAgIGVudW0gU2hvdWxkUmVwbGFjZURvY3VtZW50SWZKYXZhU2NyaXB0VVJMIHsKKyAgICAg ICAgUmVwbGFjZURvY3VtZW50SWZKYXZhU2NyaXB0VVJMLAorICAgICAgICBEb05vdFJlcGxhY2VE b2N1bWVudElmSmF2YVNjcmlwdFVSTAorICAgIH07CisKICAgICBlbnVtIFJlYXNvbkZvckNhbGxp bmdBbGxvd1BsdWdpbnMgewogICAgICAgICBBYm91dFRvSW5zdGFudGlhdGVQbHVnaW4sCiAgICAg ICAgIE5vdEFib3V0VG9JbnN0YW50aWF0ZVBsdWdpbgo=