Attachment 123423 Details for Bug 40899 – Patch

[patch] Patch

bug-40899-20120120182238.patch (text/plain), 8.24 KB, created by Pablo Flouret on 2012-01-20 18:22:39 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Pablo Flouret

Created: 2012-01-20 18:22:39 PST

Size: 8.24 KB

patch

obsolete

>Subversion Revision: 105310
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 1c3eaba2f4cbd9af21c0f33f9feeb88eb116fdfb..c2aef1f356cfeb90cfb1b63e9a39d7f9097519a2 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,17 @@
>+2012-01-20  Pablo Flouret  <pablof@motorola.com>
>+
>+        Add .url attribute alongside .URL in EventSource and WebSocket to comply with the specs but not break existing usage.
>+        https://bugs.webkit.org/show_bug.cgi?id=40899
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Tests: fast/eventsource/eventsource-url-attribute.html
>+               http/tests/websocket/tests/hixie76/url-attribute.html
>+               http/tests/websocket/tests/hybi/url-attribute.html
>+
>+        * page/EventSource.idl:
>+        * websockets/WebSocket.idl:
>+
> 2012-01-18  Pablo Flouret  <pablof@motorola.com>
> 
>         Reset an event object's internal-propagation and default-action-prevention states after the event is dispatched.
>diff --git a/Source/WebCore/page/EventSource.idl b/Source/WebCore/page/EventSource.idl
>index c06076cd6e044274f30ae4af33f82719a9524c2a..4c4433f7abae79d2db85fb52d5964f4b59cb4a4a 100644
>--- a/Source/WebCore/page/EventSource.idl
>+++ b/Source/WebCore/page/EventSource.idl
>@@ -41,7 +41,8 @@ module window {
>         NoStaticTables
>     ] EventSource {
> 
>-        readonly attribute DOMString URL;
>+        readonly attribute DOMString URL; // Lowercased .url is the one in the spec, but leaving .URL for compatibility reasons.
>+        readonly attribute DOMString url;
> 
>         // ready state
>         const unsigned short CONNECTING = 0;
>diff --git a/Source/WebCore/websockets/WebSocket.idl b/Source/WebCore/websockets/WebSocket.idl
>index 4c09ec1c05e947f1f5b0f6d28ded830cd3eea4fa..b2b6779b42083a96a0d587d7cafbe0a4a653007b 100644
>--- a/Source/WebCore/websockets/WebSocket.idl
>+++ b/Source/WebCore/websockets/WebSocket.idl
>@@ -39,7 +39,8 @@ module websockets {
>         EventTarget,
>         NoStaticTables
>     ] WebSocket {
>-        readonly attribute DOMString URL;
>+        readonly attribute DOMString URL; // Lowercased .url is the one in the spec, but leaving .URL for compatibility reasons.
>+        readonly attribute DOMString url;
> 
>         // ready state
>         const unsigned short CONNECTING = 0;
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 847836be25c53c03f8dd9d7b16fe4ddaac418313..cf9c508e32bed467a7f7a5cc1b6ae48077de23c5 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,17 @@
>+2012-01-20  Pablo Flouret  <pablof@motorola.com>
>+
>+        Add .url attribute alongside .URL in EventSource and WebSocket to comply with the specs but not break existing usage.
>+        https://bugs.webkit.org/show_bug.cgi?id=40899
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * fast/eventsource/eventsource-url-attribute-expected.txt: Added.
>+        * fast/eventsource/eventsource-url-attribute.html: Added.
>+        * http/tests/websocket/tests/hixie76/url-attribute-expected.txt: Added.
>+        * http/tests/websocket/tests/hixie76/url-attribute.html: Added.
>+        * http/tests/websocket/tests/hybi/url-attribute-expected.txt: Added.
>+        * http/tests/websocket/tests/hybi/url-attribute.html: Added.
>+
> 2012-01-18  Pablo Flouret  <pablof@motorola.com>
> 
>         Reset an event object's internal-propagation and default-action-prevention states after the event is dispatched.
>diff --git a/LayoutTests/fast/eventsource/eventsource-url-attribute-expected.txt b/LayoutTests/fast/eventsource/eventsource-url-attribute-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..05fc655b97b5a90589377326b846846e2a636dd3
>--- /dev/null
>+++ b/LayoutTests/fast/eventsource/eventsource-url-attribute-expected.txt
>@@ -0,0 +1,12 @@
>+Both .URL and .url should work (for compatibility reasons).
>+
>+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>+
>+
>+PASS source.URL is "http://localhost/"
>+PASS source.url is "http://localhost/"
>+PASS source.URL === source.url is true
>+PASS successfullyParsed is true
>+
>+TEST COMPLETE
>+
>diff --git a/LayoutTests/fast/eventsource/eventsource-url-attribute.html b/LayoutTests/fast/eventsource/eventsource-url-attribute.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..a4d08ed158b9c8a7c70f70c6af32a3f32ffd529d
>--- /dev/null
>+++ b/LayoutTests/fast/eventsource/eventsource-url-attribute.html
>@@ -0,0 +1,22 @@
>+<!DOCTYPE html>
>+<html>
>+<head>
>+<meta charset="utf-8">
>+<script src="../js/resources/js-test-pre.js"></script>
>+</head>
>+<body>
>+<script>
>+
>+description("Both .URL and .url should work (for compatibility reasons).");
>+
>+var url = "http://localhost/";
>+var source = new EventSource(url);
>+
>+shouldBeEqualToString("source.URL", url);
>+shouldBeEqualToString("source.url", url);
>+shouldBeTrue("source.URL === source.url");
>+
>+</script>
>+<script src="../js/resources/js-test-post.js"></script>
>+</body>
>+</html>
>diff --git a/LayoutTests/http/tests/websocket/tests/hixie76/url-attribute-expected.txt b/LayoutTests/http/tests/websocket/tests/hixie76/url-attribute-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..ee2ced44076aa73cb0ea88e8ad7cf7bea5986c67
>--- /dev/null
>+++ b/LayoutTests/http/tests/websocket/tests/hixie76/url-attribute-expected.txt
>@@ -0,0 +1,11 @@
>+Both .URL and .url attributes should work (for compatibility reasons).
>+
>+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>+
>+PASS ws.url is "ws://127.0.0.1:8880"
>+PASS ws.URL is "ws://127.0.0.1:8880"
>+PASS ws.URL === ws.url is true
>+PASS successfullyParsed is true
>+
>+TEST COMPLETE
>+
>diff --git a/LayoutTests/http/tests/websocket/tests/hixie76/url-attribute.html b/LayoutTests/http/tests/websocket/tests/hixie76/url-attribute.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..21825024b9a19733d95220a1fcea957fb969ca96
>--- /dev/null
>+++ b/LayoutTests/http/tests/websocket/tests/hixie76/url-attribute.html
>@@ -0,0 +1,24 @@
>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
>+<html>
>+<head>
>+<script src="../../../../js-test-resources/js-test-pre.js"></script>
>+</head>
>+<body>
>+<div id="description"></div>
>+<div id="console"></div>
>+<script type="text/javascript">
>+
>+description("Both .URL and .url attributes should work (for compatibility reasons).");
>+
>+var url = "ws://127.0.0.1:8880";
>+var ws = new WebSocket(url);
>+
>+shouldBeEqualToString("ws.url", url);
>+shouldBeEqualToString("ws.URL", url);
>+shouldBeTrue("ws.URL === ws.url");
>+
>+</script>
>+<script src="../../../../js-test-resources/js-test-post.js"></script>
>+</body>
>+</html>
>+
>diff --git a/LayoutTests/http/tests/websocket/tests/hybi/url-attribute-expected.txt b/LayoutTests/http/tests/websocket/tests/hybi/url-attribute-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..ee2ced44076aa73cb0ea88e8ad7cf7bea5986c67
>--- /dev/null
>+++ b/LayoutTests/http/tests/websocket/tests/hybi/url-attribute-expected.txt
>@@ -0,0 +1,11 @@
>+Both .URL and .url attributes should work (for compatibility reasons).
>+
>+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>+
>+PASS ws.url is "ws://127.0.0.1:8880"
>+PASS ws.URL is "ws://127.0.0.1:8880"
>+PASS ws.URL === ws.url is true
>+PASS successfullyParsed is true
>+
>+TEST COMPLETE
>+
>diff --git a/LayoutTests/http/tests/websocket/tests/hybi/url-attribute.html b/LayoutTests/http/tests/websocket/tests/hybi/url-attribute.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..231eb4be25eeb1b38faa35788fd5edecbf364112
>--- /dev/null
>+++ b/LayoutTests/http/tests/websocket/tests/hybi/url-attribute.html
>@@ -0,0 +1,27 @@
>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
>+<html>
>+<head>
>+<script src="../../../../js-test-resources/js-test-pre.js"></script>
>+</head>
>+<body>
>+<div id="description"></div>
>+<div id="console"></div>
>+<script type="text/javascript">
>+
>+description("Both .URL and .url attributes should work (for compatibility reasons).");
>+
>+if (window.layoutTestController)
>+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
>+
>+var url = "ws://127.0.0.1:8880";
>+var ws = new WebSocket(url);
>+
>+shouldBeEqualToString("ws.url", url);
>+shouldBeEqualToString("ws.URL", url);
>+shouldBeTrue("ws.URL === ws.url");
>+
>+</script>
>+<script src="../../../../js-test-resources/js-test-post.js"></script>
>+</body>
>+</html>
>+

Actions: View | Formatted Diff | Diff

Attachments on bug 40899: 123423 | 123460