Commit f89921ac authored by ap@apple.com's avatar ap@apple.com

2011-03-14 Alexey Proskuryakov <ap@apple.com>

        Reviewed by Adam Roben.

        https://bugs.webkit.org/show_bug.cgi?id=44138
        Crashes beneath SocketStreamHandle::readStreamCallback when running WebSocket tests.

        * platform/win/Skipped: Unskipped tests that should be fixed now. I couldn't verify that
        locally, becasue most WebSocket tests time out on my machine.
2011-03-14  Alexey Proskuryakov  <ap@apple.com>

        Reviewed by Adam Roben.

        https://bugs.webkit.org/show_bug.cgi?id=44138
        Crash beneath SocketStreamHandle::readStreamCallback when running websocket/tests/workers/worker-handshake-challenge-randomness.html

        https://bugs.webkit.org/show_bug.cgi?id=55375
        http/tests/websocket/tests/reload-crash.html sometimes crashes beneath SocketStreamHandle::readStreamCallback on Windows

        https://bugs.webkit.org/show_bug.cgi?id=56185
        http/tests/websocket/tests/url-with-credential.html sometimes crashes beneath SocketStreamHandle::readStreamCallback on Windows

        * platform/network/cf/SocketStreamHandle.h: Made SocketStreamHandle ThreadSafeShared, so that
        a pointer can be passed across threads when wrapped in a RefPtr.

        * platform/network/cf/SocketStreamHandleCFNet.cpp: Make sure that an object still exists
        when executing a method on main thread by using RefPtr.

git-svn-id: svn://svn.chromium.org/blink/trunk@81111 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent ff6489d1
2011-03-14 Alexey Proskuryakov <ap@apple.com>
Reviewed by Adam Roben.
https://bugs.webkit.org/show_bug.cgi?id=44138
Crashes beneath SocketStreamHandle::readStreamCallback when running WebSocket tests.
* platform/win/Skipped: Unskipped tests that should be fixed now. I couldn't verify that
locally, becasue most WebSocket tests time out on my machine.
2011-03-14 Ryosuke Niwa <rniwa@webkit.org> 2011-03-14 Ryosuke Niwa <rniwa@webkit.org>
Chromium rebaselines for r81095. Chromium rebaselines for r81095.
...@@ -316,9 +316,6 @@ editing/pasteboard/drop-text-events.html ...@@ -316,9 +316,6 @@ editing/pasteboard/drop-text-events.html
editing/selection/drag-in-iframe.html editing/selection/drag-in-iframe.html
fast/events/dragging-mouse-moves.html fast/events/dragging-mouse-moves.html
# Crash beneath SocketStream::readStreamCallback http://webkit.org/b/44138
http/tests/websocket/tests/workers/worker-handshake-challenge-randomness.html
# Causes next test to time out http://webkit.org/b/46975 # Causes next test to time out http://webkit.org/b/46975
http/tests/xmlhttprequest/xmlhttprequest-sync-vs-async-assertion-failure.html http/tests/xmlhttprequest/xmlhttprequest-sync-vs-async-assertion-failure.html
...@@ -376,10 +373,6 @@ http/tests/media/video-cancel-load.html ...@@ -376,10 +373,6 @@ http/tests/media/video-cancel-load.html
# Sometimes crashes http://webkit.org/b/48996 # Sometimes crashes http://webkit.org/b/48996
http/tests/websocket/tests/workers/close-in-onmessage-crash.html http/tests/websocket/tests/workers/close-in-onmessage-crash.html
# Sometimes crashes http://webkit.org/b/55375
http/tests/websocket/tests/reload-crash.html
# Sometimes causes crashes in following tests http://webkit.org/b/56185
http/tests/websocket/tests/url-parsing.html
# Sometimes times out http://webkit.org/b/48997 # Sometimes times out http://webkit.org/b/48997
animations/animation-iteration-event-destroy-renderer.html animations/animation-iteration-event-destroy-renderer.html
......
2011-03-14 Alexey Proskuryakov <ap@apple.com>
Reviewed by Adam Roben.
https://bugs.webkit.org/show_bug.cgi?id=44138
Crash beneath SocketStreamHandle::readStreamCallback when running websocket/tests/workers/worker-handshake-challenge-randomness.html
https://bugs.webkit.org/show_bug.cgi?id=55375
http/tests/websocket/tests/reload-crash.html sometimes crashes beneath SocketStreamHandle::readStreamCallback on Windows
https://bugs.webkit.org/show_bug.cgi?id=56185
http/tests/websocket/tests/url-with-credential.html sometimes crashes beneath SocketStreamHandle::readStreamCallback on Windows
* platform/network/cf/SocketStreamHandle.h: Made SocketStreamHandle ThreadSafeShared, so that
a pointer can be passed across threads when wrapped in a RefPtr.
* platform/network/cf/SocketStreamHandleCFNet.cpp: Make sure that an object still exists
when executing a method on main thread by using RefPtr.
2011-03-14 Sam Weinig <sam@webkit.org> 2011-03-14 Sam Weinig <sam@webkit.org>
Mac build fix. Part 1 of N. Mac build fix. Part 1 of N.
......
...@@ -44,14 +44,14 @@ class AuthenticationChallenge; ...@@ -44,14 +44,14 @@ class AuthenticationChallenge;
class Credential; class Credential;
class SocketStreamHandleClient; class SocketStreamHandleClient;
class SocketStreamHandle : public RefCounted<SocketStreamHandle>, public SocketStreamHandleBase, public AuthenticationClient { class SocketStreamHandle : public ThreadSafeShared<SocketStreamHandle>, public SocketStreamHandleBase, public AuthenticationClient {
public: public:
static PassRefPtr<SocketStreamHandle> create(const KURL& url, SocketStreamHandleClient* client) { return adoptRef(new SocketStreamHandle(url, client)); } static PassRefPtr<SocketStreamHandle> create(const KURL& url, SocketStreamHandleClient* client) { return adoptRef(new SocketStreamHandle(url, client)); }
virtual ~SocketStreamHandle(); virtual ~SocketStreamHandle();
using RefCounted<SocketStreamHandle>::ref; using ThreadSafeShared<SocketStreamHandle>::ref;
using RefCounted<SocketStreamHandle>::deref; using ThreadSafeShared<SocketStreamHandle>::deref;
private: private:
virtual int platformSend(const char* data, int length); virtual int platformSend(const char* data, int length);
......
...@@ -117,7 +117,7 @@ CFStringRef SocketStreamHandle::copyPACExecutionDescription(void*) ...@@ -117,7 +117,7 @@ CFStringRef SocketStreamHandle::copyPACExecutionDescription(void*)
struct MainThreadPACCallbackInfo { struct MainThreadPACCallbackInfo {
MainThreadPACCallbackInfo(SocketStreamHandle* handle, CFArrayRef proxyList) : handle(handle), proxyList(proxyList) { } MainThreadPACCallbackInfo(SocketStreamHandle* handle, CFArrayRef proxyList) : handle(handle), proxyList(proxyList) { }
SocketStreamHandle* handle; RefPtr<SocketStreamHandle> handle;
CFArrayRef proxyList; CFArrayRef proxyList;
}; };
...@@ -436,7 +436,7 @@ CFStringRef SocketStreamHandle::copyCFStreamDescription(void* info) ...@@ -436,7 +436,7 @@ CFStringRef SocketStreamHandle::copyCFStreamDescription(void* info)
struct MainThreadEventCallbackInfo { struct MainThreadEventCallbackInfo {
MainThreadEventCallbackInfo(CFStreamEventType type, SocketStreamHandle* handle) : type(type), handle(handle) { } MainThreadEventCallbackInfo(CFStreamEventType type, SocketStreamHandle* handle) : type(type), handle(handle) { }
CFStreamEventType type; CFStreamEventType type;
SocketStreamHandle* handle; RefPtr<SocketStreamHandle> handle;
}; };
void SocketStreamHandle::readStreamCallback(CFReadStreamRef stream, CFStreamEventType type, void* clientCallBackInfo) void SocketStreamHandle::readStreamCallback(CFReadStreamRef stream, CFStreamEventType type, void* clientCallBackInfo)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment