174668 2017-07-19 23:58:12 -0700 WebDriver: correctly handle main frame handles 2017-07-21 02:43:24 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 174670 1 cgarcia webkit-unassigned bburg oldest_to_newest 1330569 0 cgarcia 2017-07-19 23:58:12 -0700 When I switched to use std::optional instead of empty strings for the browsing contexts in WebDriver, I forgot that automation uses empty string for frames to refer to the main frame. We should handle that case, because we are currently considering empty strings as valid browsing context. It's not a big deal because Automation converts back the empty string received to the main frame, though. We should also ensure we close the current browsing context when switching to a new top level browsing context. 1330570 1 315973 cgarcia 2017-07-20 00:01:16 -0700 Created attachment 315973 Patch 1330668 2 315973 bburg 2017-07-20 10:26:23 -0700 Comment on attachment 315973 Patch r=me 1330947 3 cgarcia 2017-07-21 02:43:24 -0700 Committed r219721: <http://trac.webkit.org/changeset/219721> 315973 2017-07-20 00:01:16 -0700 2017-07-20 10:26:23 -0700 Patch wd-switch-browsing-context.diff text/plain 7133 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJEcml2ZXIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkRyaXZl ci9DaGFuZ2VMb2cKaW5kZXggMTlhM2QxZDUxZjAuLmZmZGFjMWE1MTAwIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViRHJpdmVyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViRHJpdmVyL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDMxIEBACisyMDE3LTA3LTE5ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNn YXJjaWFAaWdhbGlhLmNvbT4KKworICAgICAgICBXZWJEcml2ZXI6IGNvcnJlY3RseSBoYW5kbGUg bWFpbiBmcmFtZSBoYW5kbGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNzQ2NjgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBXaGVuIEkgc3dpdGNoZWQgdG8gdXNlIHN0ZDo6b3B0aW9uYWwgaW5zdGVhZCBv ZiBlbXB0eSBzdHJpbmdzIGZvciB0aGUgYnJvd3NpbmcgY29udGV4dHMgaW4gV2ViRHJpdmVyLCBJ IGZvcmdvdAorICAgICAgICB0aGF0IGF1dG9tYXRpb24gdXNlcyBlbXB0eSBzdHJpbmcgZm9yIGZy YW1lcyB0byByZWZlciB0byB0aGUgbWFpbiBmcmFtZS4gV2Ugc2hvdWxkIGhhbmRsZSB0aGF0IGNh c2UsIGJlY2F1c2Ugd2UKKyAgICAgICAgYXJlIGN1cnJlbnRseSBjb25zaWRlcmluZyBlbXB0eSBz dHJpbmdzIGFzIHZhbGlkIGJyb3dzaW5nIGNvbnRleHQuIEl0J3Mgbm90IGEgYmlnIGRlYWwgYmVj YXVzZSBBdXRvbWF0aW9uCisgICAgICAgIGNvbnZlcnRzIGJhY2sgdGhlIGVtcHR5IHN0cmluZyBy ZWNlaXZlZCB0byB0aGUgbWFpbiBmcmFtZSwgdGhvdWdoLiBXZSBzaG91bGQgYWxzbyBlbnN1cmUg d2UgY2xvc2UgdGhlIGN1cnJlbnQKKyAgICAgICAgYnJvd3NpbmcgY29udGV4dCB3aGVuIHN3aXRj aGluZyB0byBhIG5ldyB0b3AgbGV2ZWwgYnJvd3NpbmcgY29udGV4dC4gVGhpcyBwYXRjaCBhZGRz IHRvIGhlbHBlciBwcml2YXRlIG1ldGhvZHMKKyAgICAgICAgdG8gc3dpdGNoIGJyb3dzaW5nIGNv bnRleHRzIHRoYXQgZGVhbCB3aXRoIHRoZSBzcGVjaWFsIGNhc2VzLgorCisgICAgICAgICogU2Vz c2lvbi5jcHA6CisgICAgICAgIChXZWJEcml2ZXI6OlNlc3Npb246OmNsb3NlKToKKyAgICAgICAg KFdlYkRyaXZlcjo6U2Vzc2lvbjo6c3dpdGNoVG9Ub3BMZXZlbEJyb3dzaW5nQ29udGV4dCk6Cisg ICAgICAgIChXZWJEcml2ZXI6OlNlc3Npb246OnN3aXRjaFRvQnJvd3NpbmdDb250ZXh0KToKKyAg ICAgICAgKFdlYkRyaXZlcjo6U2Vzc2lvbjo6Y3JlYXRlVG9wTGV2ZWxCcm93c2luZ0NvbnRleHQp OgorICAgICAgICAoV2ViRHJpdmVyOjpTZXNzaW9uOjpnbyk6CisgICAgICAgIChXZWJEcml2ZXI6 OlNlc3Npb246OmJhY2spOgorICAgICAgICAoV2ViRHJpdmVyOjpTZXNzaW9uOjpmb3J3YXJkKToK KyAgICAgICAgKFdlYkRyaXZlcjo6U2Vzc2lvbjo6cmVmcmVzaCk6CisgICAgICAgIChXZWJEcml2 ZXI6OlNlc3Npb246OnN3aXRjaFRvV2luZG93KToKKyAgICAgICAgKFdlYkRyaXZlcjo6U2Vzc2lv bjo6c3dpdGNoVG9GcmFtZSk6CisgICAgICAgIChXZWJEcml2ZXI6OlNlc3Npb246OnN3aXRjaFRv UGFyZW50RnJhbWUpOgorICAgICAgICAqIFNlc3Npb24uaDoKKwogMjAxNy0wNy0xOCAgQ2FybG9z IEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgV2ViRHJpdmVy OiBoYW5kbGUgaW52YWxpZCBzZWxlY3RvciBlcnJvcnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJE cml2ZXIvU2Vzc2lvbi5jcHAgYi9Tb3VyY2UvV2ViRHJpdmVyL1Nlc3Npb24uY3BwCmluZGV4IDM1 Y2VkMGU2Mzc3Li5mZGQyNGRmYmJlZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkRyaXZlci9TZXNz aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViRHJpdmVyL1Nlc3Npb24uY3BwCkBAIC03MSw3ICs3MSw3 IEBAIHZvaWQgU2Vzc2lvbjo6Y2xvc2UoRnVuY3Rpb248dm9pZCAoQ29tbWFuZFJlc3VsdCYmKT4m JiBjb21wbGV0aW9uSGFuZGxlcikKICAgICAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKENvbW1h bmRSZXN1bHQ6OmZhaWwoV1RGTW92ZShyZXNwb25zZS5yZXNwb25zZU9iamVjdCkpKTsKICAgICAg ICAgICAgIHJldHVybjsKICAgICAgICAgfQotICAgICAgICBtX3RvcGxldmVsQnJvd3NpbmdDb250 ZXh0ID0gc3RkOjpudWxsb3B0OworICAgICAgICBzd2l0Y2hUb1RvcExldmVsQnJvd3NpbmdDb250 ZXh0KHN0ZDo6bnVsbG9wdCk7CiAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKENvbW1hbmRSZXN1 bHQ6OnN1Y2Nlc3MoKSk7CiAgICAgfSk7CiB9CkBAIC04Nyw2ICs4NywyMSBAQCB2b2lkIFNlc3Np b246OnNldFRpbWVvdXRzKGNvbnN0IFRpbWVvdXRzJiB0aW1lb3V0cywgRnVuY3Rpb248dm9pZCAo Q29tbWFuZFJlc3VsdAogICAgIGNvbXBsZXRpb25IYW5kbGVyKENvbW1hbmRSZXN1bHQ6OnN1Y2Nl c3MoKSk7CiB9CiAKK3ZvaWQgU2Vzc2lvbjo6c3dpdGNoVG9Ub3BMZXZlbEJyb3dzaW5nQ29udGV4 dChzdGQ6Om9wdGlvbmFsPFN0cmluZz4gdG9wbGV2ZWxCcm93c2luZ0NvbnRleHQpCit7CisgICAg bV90b3BsZXZlbEJyb3dzaW5nQ29udGV4dCA9IHRvcGxldmVsQnJvd3NpbmdDb250ZXh0OworICAg IG1fYnJvd3NpbmdDb250ZXh0ID0gc3RkOjpudWxsb3B0OworfQorCit2b2lkIFNlc3Npb246OnN3 aXRjaFRvQnJvd3NpbmdDb250ZXh0KHN0ZDo6b3B0aW9uYWw8U3RyaW5nPiBicm93c2luZ0NvbnRl eHQpCit7CisgICAgLy8gQXV0b21hdGlvbiBzZW5kcyBlbXB0eSBzdHJpbmdzIGZvciBtYWluIGZy YW1lLgorICAgIGlmICghYnJvd3NpbmdDb250ZXh0IHx8IGJyb3dzaW5nQ29udGV4dC52YWx1ZSgp LmlzRW1wdHkoKSkKKyAgICAgICAgbV9icm93c2luZ0NvbnRleHQgPSBzdGQ6Om51bGxvcHQ7Cisg ICAgZWxzZQorICAgICAgICBtX2Jyb3dzaW5nQ29udGV4dCA9IGJyb3dzaW5nQ29udGV4dDsKK30K Kwogdm9pZCBTZXNzaW9uOjpjcmVhdGVUb3BMZXZlbEJyb3dzaW5nQ29udGV4dChGdW5jdGlvbjx2 b2lkIChDb21tYW5kUmVzdWx0JiYpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQogewogICAgIEFTU0VS VCghbV90b3BsZXZlbEJyb3dzaW5nQ29udGV4dC52YWx1ZSgpKTsKQEAgLTEwMSw3ICsxMTYsNyBA QCB2b2lkIFNlc3Npb246OmNyZWF0ZVRvcExldmVsQnJvd3NpbmdDb250ZXh0KEZ1bmN0aW9uPHZv aWQgKENvbW1hbmRSZXN1bHQmJik+JiYgYwogICAgICAgICAgICAgICAgIGNvbXBsZXRpb25IYW5k bGVyKENvbW1hbmRSZXN1bHQ6OmZhaWwoQ29tbWFuZFJlc3VsdDo6RXJyb3JDb2RlOjpVbmtub3du RXJyb3IpKTsKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB9Ci0gICAgICAg ICAgICBtX3RvcGxldmVsQnJvd3NpbmdDb250ZXh0ID0gaGFuZGxlOworICAgICAgICAgICAgc3dp dGNoVG9Ub3BMZXZlbEJyb3dzaW5nQ29udGV4dChoYW5kbGUpOwogICAgICAgICAgICAgY29tcGxl dGlvbkhhbmRsZXIoQ29tbWFuZFJlc3VsdDo6c3VjY2VzcygpKTsKICAgICAgICAgfSk7CiAgICAg fSk7CkBAIC0xMjIsNyArMTM3LDcgQEAgdm9pZCBTZXNzaW9uOjpnbyhjb25zdCBTdHJpbmcmIHVy bCwgRnVuY3Rpb248dm9pZCAoQ29tbWFuZFJlc3VsdCYmKT4mJiBjb21wbGV0aW8KICAgICAgICAg ICAgIGNvbXBsZXRpb25IYW5kbGVyKENvbW1hbmRSZXN1bHQ6OmZhaWwoV1RGTW92ZShyZXNwb25z ZS5yZXNwb25zZU9iamVjdCkpKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQotICAg ICAgICBtX2Jyb3dzaW5nQ29udGV4dCA9IHN0ZDo6bnVsbG9wdDsKKyAgICAgICAgc3dpdGNoVG9C cm93c2luZ0NvbnRleHQoc3RkOjpudWxsb3B0KTsKICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIo Q29tbWFuZFJlc3VsdDo6c3VjY2VzcygpKTsKICAgICB9KTsKIH0KQEAgLTE2OSw3ICsxODQsNyBA QCB2b2lkIFNlc3Npb246OmJhY2soRnVuY3Rpb248dm9pZCAoQ29tbWFuZFJlc3VsdCYmKT4mJiBj b21wbGV0aW9uSGFuZGxlcikKICAgICAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKENvbW1hbmRS ZXN1bHQ6OmZhaWwoV1RGTW92ZShyZXNwb25zZS5yZXNwb25zZU9iamVjdCkpKTsKICAgICAgICAg ICAgIHJldHVybjsKICAgICAgICAgfQotICAgICAgICBtX2Jyb3dzaW5nQ29udGV4dCA9IHN0ZDo6 bnVsbG9wdDsKKyAgICAgICAgc3dpdGNoVG9Ccm93c2luZ0NvbnRleHQoc3RkOjpudWxsb3B0KTsK ICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoQ29tbWFuZFJlc3VsdDo6c3VjY2VzcygpKTsKICAg ICB9KTsKIH0KQEAgLTE4OCw3ICsyMDMsNyBAQCB2b2lkIFNlc3Npb246OmZvcndhcmQoRnVuY3Rp b248dm9pZCAoQ29tbWFuZFJlc3VsdCYmKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKICAgICAgICAg ICAgIGNvbXBsZXRpb25IYW5kbGVyKENvbW1hbmRSZXN1bHQ6OmZhaWwoV1RGTW92ZShyZXNwb25z ZS5yZXNwb25zZU9iamVjdCkpKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQotICAg ICAgICBtX2Jyb3dzaW5nQ29udGV4dCA9IHN0ZDo6bnVsbG9wdDsKKyAgICAgICAgc3dpdGNoVG9C cm93c2luZ0NvbnRleHQoc3RkOjpudWxsb3B0KTsKICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIo Q29tbWFuZFJlc3VsdDo6c3VjY2VzcygpKTsKICAgICB9KTsKIH0KQEAgLTIwNyw3ICsyMjIsNyBA QCB2b2lkIFNlc3Npb246OnJlZnJlc2goRnVuY3Rpb248dm9pZCAoQ29tbWFuZFJlc3VsdCYmKT4m JiBjb21wbGV0aW9uSGFuZGxlcikKICAgICAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKENvbW1h bmRSZXN1bHQ6OmZhaWwoV1RGTW92ZShyZXNwb25zZS5yZXNwb25zZU9iamVjdCkpKTsKICAgICAg ICAgICAgIHJldHVybjsKICAgICAgICAgfQotICAgICAgICBtX2Jyb3dzaW5nQ29udGV4dCA9IHN0 ZDo6bnVsbG9wdDsKKyAgICAgICAgc3dpdGNoVG9Ccm93c2luZ0NvbnRleHQoc3RkOjpudWxsb3B0 KTsKICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoQ29tbWFuZFJlc3VsdDo6c3VjY2VzcygpKTsK ICAgICB9KTsKIH0KQEAgLTI4OSw3ICszMDQsNyBAQCB2b2lkIFNlc3Npb246OnN3aXRjaFRvV2lu ZG93KGNvbnN0IFN0cmluZyYgd2luZG93SGFuZGxlLCBGdW5jdGlvbjx2b2lkIChDb21tYW5kUgog ICAgICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoQ29tbWFuZFJlc3VsdDo6ZmFpbChXVEZNb3Zl KHJlc3BvbnNlLnJlc3BvbnNlT2JqZWN0KSkpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAg ICB9Ci0gICAgICAgIG1fdG9wbGV2ZWxCcm93c2luZ0NvbnRleHQgPSB3aW5kb3dIYW5kbGU7Cisg ICAgICAgIHN3aXRjaFRvVG9wTGV2ZWxCcm93c2luZ0NvbnRleHQod2luZG93SGFuZGxlKTsKICAg ICAgICAgY29tcGxldGlvbkhhbmRsZXIoQ29tbWFuZFJlc3VsdDo6c3VjY2VzcygpKTsKICAgICB9 KTsKIH0KQEAgLTM0MCw3ICszNTUsNyBAQCB2b2lkIFNlc3Npb246OnN3aXRjaFRvRnJhbWUoUmVm UHRyPEluc3BlY3RvclZhbHVlPiYmIGZyYW1lSUQsIEZ1bmN0aW9uPHZvaWQgKENvbQogICAgIH0K IAogICAgIGlmIChmcmFtZUlELT5pc051bGwoKSkgewotICAgICAgICBtX2Jyb3dzaW5nQ29udGV4 dCA9IHN0ZDo6bnVsbG9wdDsKKyAgICAgICAgc3dpdGNoVG9Ccm93c2luZ0NvbnRleHQoc3RkOjpu dWxsb3B0KTsKICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoQ29tbWFuZFJlc3VsdDo6c3VjY2Vz cygpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KQEAgLTM4MSw3ICszOTYsNyBAQCB2b2lkIFNl c3Npb246OnN3aXRjaFRvRnJhbWUoUmVmUHRyPEluc3BlY3RvclZhbHVlPiYmIGZyYW1lSUQsIEZ1 bmN0aW9uPHZvaWQgKENvbQogICAgICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoQ29tbWFuZFJl c3VsdDo6ZmFpbChDb21tYW5kUmVzdWx0OjpFcnJvckNvZGU6OlVua25vd25FcnJvcikpOwogICAg ICAgICAgICAgcmV0dXJuOwogICAgICAgICB9Ci0gICAgICAgIG1fYnJvd3NpbmdDb250ZXh0ID0g ZnJhbWVIYW5kbGU7CisgICAgICAgIHN3aXRjaFRvQnJvd3NpbmdDb250ZXh0KGZyYW1lSGFuZGxl KTsKICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoQ29tbWFuZFJlc3VsdDo6c3VjY2VzcygpKTsK ICAgICB9KTsKIH0KQEAgLTQxMSw3ICs0MjYsNyBAQCB2b2lkIFNlc3Npb246OnN3aXRjaFRvUGFy ZW50RnJhbWUoRnVuY3Rpb248dm9pZCAoQ29tbWFuZFJlc3VsdCYmKT4mJiBjb21wbGV0aW9uSAog ICAgICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoQ29tbWFuZFJlc3VsdDo6ZmFpbChDb21tYW5k UmVzdWx0OjpFcnJvckNvZGU6OlVua25vd25FcnJvcikpOwogICAgICAgICAgICAgcmV0dXJuOwog ICAgICAgICB9Ci0gICAgICAgIG1fYnJvd3NpbmdDb250ZXh0ID0gZnJhbWVIYW5kbGU7CisgICAg ICAgIHN3aXRjaFRvQnJvd3NpbmdDb250ZXh0KGZyYW1lSGFuZGxlKTsKICAgICAgICAgY29tcGxl dGlvbkhhbmRsZXIoQ29tbWFuZFJlc3VsdDo6c3VjY2VzcygpKTsKICAgICB9KTsKIH0KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJEcml2ZXIvU2Vzc2lvbi5oIGIvU291cmNlL1dlYkRyaXZlci9TZXNz aW9uLmgKaW5kZXggMWIzYzI5YjUyNWYuLjE5ZDU4NWVmZjA0IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViRHJpdmVyL1Nlc3Npb24uaAorKysgYi9Tb3VyY2UvV2ViRHJpdmVyL1Nlc3Npb24uaApAQCAt MTA0LDYgKzEwNCw5IEBAIHB1YmxpYzoKIHByaXZhdGU6CiAgICAgU2Vzc2lvbihzdGQ6OnVuaXF1 ZV9wdHI8U2Vzc2lvbkhvc3Q+JiYpOwogCisgICAgdm9pZCBzd2l0Y2hUb1RvcExldmVsQnJvd3Np bmdDb250ZXh0KHN0ZDo6b3B0aW9uYWw8U3RyaW5nPik7CisgICAgdm9pZCBzd2l0Y2hUb0Jyb3dz aW5nQ29udGV4dChzdGQ6Om9wdGlvbmFsPFN0cmluZz4pOworCiAgICAgUmVmUHRyPEluc3BlY3Rv cjo6SW5zcGVjdG9yT2JqZWN0PiBjcmVhdGVFbGVtZW50KFJlZlB0cjxJbnNwZWN0b3I6Okluc3Bl Y3RvclZhbHVlPiYmKTsKICAgICBSZWZQdHI8SW5zcGVjdG9yOjpJbnNwZWN0b3JPYmplY3Q+IGNy ZWF0ZUVsZW1lbnQoY29uc3QgU3RyaW5nJiBlbGVtZW50SUQpOwogICAgIFJlZlB0cjxJbnNwZWN0 b3I6Okluc3BlY3Rvck9iamVjdD4gZXh0cmFjdEVsZW1lbnQoSW5zcGVjdG9yOjpJbnNwZWN0b3JW YWx1ZSYpOwo=