63536 2011-06-28 07:23:20 -0700 [Chromium] DRT: Add setHixie76WebSocketProtocolEnabled to LayoutTestController 2011-06-29 01:04:24 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED DUPLICATE 63532 P2 Normal --- 50099 1 yutak yutak abarth tkent oldest_to_newest 428867 0 yutak 2011-06-28 07:23:20 -0700 Add setHixie76WebSocketProtocolEnabled() method to LayoutTestController in order to switch WebSocket protocols in layout tests. Win/Mac implementation: bug 63532 428868 1 98916 yutak 2011-06-28 07:28:09 -0700 Created attachment 98916 Patch 428873 2 98916 tkent 2011-06-28 07:42:55 -0700 Comment on attachment 98916 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=98916&action=review > Tools/ChangeLog:8 > + Add a method to LayoutTestController so we can switch WebSocket protocols in layout tests. Why don't you use window.internals? See WebCore/testing/Internals.* 429452 3 98916 yutak 2011-06-28 23:49:32 -0700 Comment on attachment 98916 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=98916&action=review Taking Adam's advice, I would like to use LayoutTestController::overridePreference(), rather than adding a new method to LayoutTestController. I'm preparing a new patch. >> Tools/ChangeLog:8 >> + Add a method to LayoutTestController so we can switch WebSocket protocols in layout tests. > > Why don't you use window.internals? > See WebCore/testing/Internals.* I don't think I can use window.internals for this purpose, because we need to reset preference values for each test run to prevent preference values from previous runs from leaking to the following tests. 429468 4 yutak 2011-06-29 01:04:24 -0700 I will do Chromium part in bug 63532. *** This bug has been marked as a duplicate of bug 63532 *** 98916 2011-06-28 07:28:09 -0700 2011-06-28 23:49:32 -0700 Patch bug-63536-20110628232807.patch text/plain 5035 yutak U3VidmVyc2lvbiBSZXZpc2lvbjogODk4OTEKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCAyMzZkNmRhNjIwMjVkNjljOGY1NDIyODE4MTU3YzA3ZmI4 ZmVkNTg3Li42NGQ5NDVkMzYzYjFmMTRhMGUwYjczNzdmMmRmZmIzYWU1NzFlNDhkIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTEtMDYtMjggIFl1dGEgS2l0YW11cmEgIDx5dXRha0BjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0Nocm9taXVtXSBE UlQ6IEFkZCBzZXRIaXhpZTc2V2ViU29ja2V0UHJvdG9jb2xFbmFibGVkIHRvIExheW91dFRlc3RD b250cm9sbGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD02MzUzNgorCisgICAgICAgIEFkZCBhIG1ldGhvZCB0byBMYXlvdXRUZXN0Q29udHJvbGxlciBz byB3ZSBjYW4gc3dpdGNoIFdlYlNvY2tldCBwcm90b2NvbHMgaW4gbGF5b3V0IHRlc3RzLgorCisg ICAgICAgICogRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vTGF5b3V0VGVzdENvbnRyb2xsZXIuY3Bw OgorICAgICAgICAoTGF5b3V0VGVzdENvbnRyb2xsZXI6OkxheW91dFRlc3RDb250cm9sbGVyKToK KyAgICAgICAgKExheW91dFRlc3RDb250cm9sbGVyOjpzZXRIaXhpZTc2V2ViU29ja2V0UHJvdG9j b2xFbmFibGVkKToKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9MYXlvdXRUZXN0 Q29udHJvbGxlci5oOgorICAgICAgICAqIER1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlByZWZl cmVuY2VzLmNwcDoKKyAgICAgICAgKFdlYlByZWZlcmVuY2VzOjpyZXNldCk6CisgICAgICAgIChX ZWJQcmVmZXJlbmNlczo6YXBwbHlUbyk6CisgICAgICAgICogRHVtcFJlbmRlclRyZWUvY2hyb21p dW0vV2ViUHJlZmVyZW5jZXMuaDoKKwogMjAxMS0wNi0yNyAgQWxpY2UgQm94aGFsbCAgPGFib3ho YWxsQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBPamFuIFZhZmFpLgpkaWZm IC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vTGF5b3V0VGVzdENvbnRyb2xs ZXIuY3BwIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vTGF5b3V0VGVzdENvbnRyb2xs ZXIuY3BwCmluZGV4IGI1OGE5NDQ0ODY4NWE4ZDI4NDMzNTU2MGNmZmYwYjRhZTNiMWI2N2MuLjY5 YmM1ZTI5MWNlNTUyYWRkOThlMDI1ZDY4NTk3MjdlZDAwZmIyNjcgMTAwNjQ0Ci0tLSBhL1Rvb2xz L0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL0xheW91dFRlc3RDb250cm9sbGVyLmNwcAorKysgYi9U b29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9MYXlvdXRUZXN0Q29udHJvbGxlci5jcHAKQEAg LTE5Miw2ICsxOTIsNyBAQCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6TGF5b3V0VGVzdENvbnRyb2xs ZXIoVGVzdFNoZWxsKiBzaGVsbCkKICAgICBiaW5kTWV0aG9kKCJzZXRUZXh0RGlyZWN0aW9uIiwg JkxheW91dFRlc3RDb250cm9sbGVyOjpzZXRUZXh0RGlyZWN0aW9uKTsKICAgICBiaW5kTWV0aG9k KCJzZXRJbWFnZXNBbGxvd2VkIiwgJkxheW91dFRlc3RDb250cm9sbGVyOjpzZXRJbWFnZXNBbGxv d2VkKTsKICAgICBiaW5kTWV0aG9kKCJzZXRTdG9yYWdlQWxsb3dlZCIsICZMYXlvdXRUZXN0Q29u dHJvbGxlcjo6c2V0U3RvcmFnZUFsbG93ZWQpOworICAgIGJpbmRNZXRob2QoInNldEhpeGllNzZX ZWJTb2NrZXRQcm90b2NvbEVuYWJsZWQiLCAmTGF5b3V0VGVzdENvbnRyb2xsZXI6OnNldEhpeGll NzZXZWJTb2NrZXRQcm90b2NvbEVuYWJsZWQpOwogCiAgICAgLy8gVGhlIGZvbGxvd2luZyBhcmUg c3R1YnMuCiAgICAgYmluZE1ldGhvZCgiYWJvcnRNb2RhbCIsICZMYXlvdXRUZXN0Q29udHJvbGxl cjo6YWJvcnRNb2RhbCk7CkBAIC0xODU0LDMgKzE4NTUsMTIgQEAgdm9pZCBMYXlvdXRUZXN0Q29u dHJvbGxlcjo6c2V0RW5jb2RlZEF1ZGlvRGF0YShjb25zdCBDcHBBcmd1bWVudExpc3QmIGFyZ3Vt ZW50cywKICAgICBtX2VuY29kZWRBdWRpb0RhdGEgPSBhcmd1bWVudHNbMF0udG9TdHJpbmcoKTsK ICAgICBzZXRTaG91bGREdW1wQXNBdWRpbyh0cnVlKTsKIH0KKwordm9pZCBMYXlvdXRUZXN0Q29u dHJvbGxlcjo6c2V0SGl4aWU3NldlYlNvY2tldFByb3RvY29sRW5hYmxlZChjb25zdCBDcHBBcmd1 bWVudExpc3QmIGFyZ3VtZW50cywgQ3BwVmFyaWFudCogcmVzdWx0KQoreworICAgIGlmIChhcmd1 bWVudHMuc2l6ZSgpID4gMCAmJiBhcmd1bWVudHNbMF0uaXNCb29sKCkpIHsKKyAgICAgICAgbV9z aGVsbC0+cHJlZmVyZW5jZXMoKS0+aGl4aWU3NldlYlNvY2tldFByb3RvY29sRW5hYmxlZCA9IGFy Z3VtZW50c1swXS50b0Jvb2xlYW4oKTsKKyAgICAgICAgbV9zaGVsbC0+YXBwbHlQcmVmZXJlbmNl cygpOworICAgIH0KKyAgICByZXN1bHQtPnNldE51bGwoKTsKK30KZGlmZiAtLWdpdCBhL1Rvb2xz L0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL0xheW91dFRlc3RDb250cm9sbGVyLmggYi9Ub29scy9E dW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9MYXlvdXRUZXN0Q29udHJvbGxlci5oCmluZGV4IGIwOWE2 ZTU2MjM3MmNlM2VkNjAwMjNiODJkN2U0OGJlNjUwNDhlMzguLmM1ZDQ1NTViYzIyMjJlYzI1NjMy N2I4OGI5ZWU4YjkyNDAyZmRhYjMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2No cm9taXVtL0xheW91dFRlc3RDb250cm9sbGVyLmgKKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUv Y2hyb21pdW0vTGF5b3V0VGVzdENvbnRyb2xsZXIuaApAQCAtMzg5LDYgKzM4OSw5IEBAIHB1Ymxp YzoKICAgICAvLyBDaGFuZ2VzIHRoZSBkaXJlY3Rpb24gb2YgdGhlIGZvY3VzZWQgZWxlbWVudC4K ICAgICB2b2lkIHNldFRleHREaXJlY3Rpb24oY29uc3QgQ3BwQXJndW1lbnRMaXN0JiwgQ3BwVmFy aWFudCopOwogCisgICAgLy8gU3dpdGNoIFdlYlNvY2tldCBwcm90b2NvbHMuCisgICAgdm9pZCBz ZXRIaXhpZTc2V2ViU29ja2V0UHJvdG9jb2xFbmFibGVkKGNvbnN0IENwcEFyZ3VtZW50TGlzdCYs IENwcFZhcmlhbnQqKTsKKwogcHVibGljOgogICAgIC8vIFRoZSBmb2xsb3dpbmcgbWV0aG9kcyBh cmUgbm90IGV4cG9zZWQgdG8gSmF2YVNjcmlwdC4KICAgICB2b2lkIHNldFdvcmtRdWV1ZUZyb3pl bihib29sIGZyb3plbikgeyBtX3dvcmtRdWV1ZS5zZXRGcm96ZW4oZnJvemVuKTsgfQpkaWZmIC0t Z2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViUHJlZmVyZW5jZXMuY3BwIGIv VG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViUHJlZmVyZW5jZXMuY3BwCmluZGV4IDA2 ODA5NjY4Njk4YWRlMzYxOGRhZmEyNzBlYzg2MmNjZDQxMGYwOTEuLmMyOTMzNTRjMDdlYzNhMzJk MjBhNGY4NjYwMDhmNmRmYWRiM2JjMDggMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVl L2Nocm9taXVtL1dlYlByZWZlcmVuY2VzLmNwcAorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9j aHJvbWl1bS9XZWJQcmVmZXJlbmNlcy5jcHAKQEAgLTExMCw2ICsxMTAsNyBAQCB2b2lkIFdlYlBy ZWZlcmVuY2VzOjpyZXNldCgpCiAgICAgbGVnYWN5QWNjZWxlcmF0ZWQyZENhbnZhc0VuYWJsZWQg PSBmYWxzZTsKICAgICBhY2NlbGVyYXRlZERyYXdpbmdFbmFibGVkID0gZmFsc2U7CiAgICAgZm9y Y2VDb21wb3NpdGluZ01vZGUgPSBmYWxzZTsKKyAgICBoaXhpZTc2V2ViU29ja2V0UHJvdG9jb2xF bmFibGVkID0gdHJ1ZTsKIH0KIAogdm9pZCBXZWJQcmVmZXJlbmNlczo6YXBwbHlUbyhXZWJWaWV3 KiB3ZWJWaWV3KQpAQCAtMTYyLDYgKzE2Myw3IEBAIHZvaWQgV2ViUHJlZmVyZW5jZXM6OmFwcGx5 VG8oV2ViVmlldyogd2ViVmlldykKICAgICBzZXR0aW5ncy0+c2V0QWNjZWxlcmF0ZWQyZENhbnZh c0VuYWJsZWQoYWNjZWxlcmF0ZWQyZENhbnZhc0VuYWJsZWQpOwogICAgIHNldHRpbmdzLT5zZXRM ZWdhY3lBY2NlbGVyYXRlZDJkQ2FudmFzRW5hYmxlZChsZWdhY3lBY2NlbGVyYXRlZDJkQ2FudmFz RW5hYmxlZCk7CiAgICAgc2V0dGluZ3MtPnNldEFjY2VsZXJhdGVkRHJhd2luZ0VuYWJsZWQoYWNj ZWxlcmF0ZWREcmF3aW5nRW5hYmxlZCk7CisgICAgc2V0dGluZ3MtPnNldEhpeGllNzZXZWJTb2Nr ZXRQcm90b2NvbEVuYWJsZWQoaGl4aWU3NldlYlNvY2tldFByb3RvY29sRW5hYmxlZCk7CiAKICAg ICAvLyBGaXhlZCB2YWx1ZXMuCiAgICAgc2V0dGluZ3MtPnNldFNob3VsZFBhaW50Q3VzdG9tU2Ny b2xsYmFycyh0cnVlKTsKQEAgLTE3OSw0ICsxODEsMyBAQCB2b2lkIFdlYlByZWZlcmVuY2VzOjph cHBseVRvKFdlYlZpZXcqIHdlYlZpZXcpCiAgICAgc2V0dGluZ3MtPnNldEZ1bGxTY3JlZW5FbmFi bGVkKHRydWUpOwogICAgIHNldHRpbmdzLT5zZXRWYWxpZGF0aW9uTWVzc2FnZVRpbWVyTWFnbmlm aWNhdGlvbigtMSk7CiB9Ci0KZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9t aXVtL1dlYlByZWZlcmVuY2VzLmggYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9XZWJQ cmVmZXJlbmNlcy5oCmluZGV4IDM4ZmI1NTc3MzM1ZDE4ZDUwNzRhNzEwYzY2MTg1ZTgxODdhNjc4 N2EuLjU4M2VlMjE2YzU3YzRkZjRjYmFjYWRjNzM4NDY2N2NlMjVkNWVkYWIgMTAwNjQ0Ci0tLSBh L1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1dlYlByZWZlcmVuY2VzLmgKKysrIGIvVG9v bHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vV2ViUHJlZmVyZW5jZXMuaApAQCAtODUsNiArODUs NyBAQCBzdHJ1Y3QgV2ViUHJlZmVyZW5jZXMgewogICAgIGJvb2wgYWNjZWxlcmF0ZWQyZENhbnZh c0VuYWJsZWQ7CiAgICAgYm9vbCBsZWdhY3lBY2NlbGVyYXRlZDJkQ2FudmFzRW5hYmxlZDsKICAg ICBib29sIGFjY2VsZXJhdGVkRHJhd2luZ0VuYWJsZWQ7CisgICAgYm9vbCBoaXhpZTc2V2ViU29j a2V0UHJvdG9jb2xFbmFibGVkOwogCiAgICAgV2ViUHJlZmVyZW5jZXMoKSB7IHJlc2V0KCk7IH0K ICAgICB2b2lkIHJlc2V0KCk7Cg==