Title: [131324] trunk/Source/WebCore
- Revision
- 131324
- Author
- commit-qu...@webkit.org
- Date
- 2012-10-15 11:14:26 -0700 (Mon, 15 Oct 2012)
Log Message
[BlackBerry] Fix WebSockets which was disabled by recent string changes
https://bugs.webkit.org/show_bug.cgi?id=99248
Patch by Joe Mason <jma...@rim.com> on 2012-10-15
Reviewed by George Staikos.
PR 223681: The signature of FilterStream::notifyStatusReceived changed to take a
BlackBerry::Platform::String instead of a char *. But SocketStreamHandleBlackBerry was not
updated to the new signature, so the status message is not getting passed on because it is
not calling the correct override.
No new tests because this is fixing a regression.
* platform/network/blackberry/SocketStreamHandle.h:
(SocketStreamHandle):
* platform/network/blackberry/SocketStreamHandleBlackBerry.cpp:
(WebCore::SocketStreamHandle::notifyStatusReceived):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (131323 => 131324)
--- trunk/Source/WebCore/ChangeLog 2012-10-15 18:09:52 UTC (rev 131323)
+++ trunk/Source/WebCore/ChangeLog 2012-10-15 18:14:26 UTC (rev 131324)
@@ -1,3 +1,22 @@
+2012-10-15 Joe Mason <jma...@rim.com>
+
+ [BlackBerry] Fix WebSockets which was disabled by recent string changes
+ https://bugs.webkit.org/show_bug.cgi?id=99248
+
+ Reviewed by George Staikos.
+
+ PR 223681: The signature of FilterStream::notifyStatusReceived changed to take a
+ BlackBerry::Platform::String instead of a char *. But SocketStreamHandleBlackBerry was not
+ updated to the new signature, so the status message is not getting passed on because it is
+ not calling the correct override.
+
+ No new tests because this is fixing a regression.
+
+ * platform/network/blackberry/SocketStreamHandle.h:
+ (SocketStreamHandle):
+ * platform/network/blackberry/SocketStreamHandleBlackBerry.cpp:
+ (WebCore::SocketStreamHandle::notifyStatusReceived):
+
2012-10-15 Rob Buis <rb...@rim.com>
Remove RenderTextControl::isSelectableElement
Modified: trunk/Source/WebCore/platform/network/blackberry/SocketStreamHandle.h (131323 => 131324)
--- trunk/Source/WebCore/platform/network/blackberry/SocketStreamHandle.h 2012-10-15 18:09:52 UTC (rev 131323)
+++ trunk/Source/WebCore/platform/network/blackberry/SocketStreamHandle.h 2012-10-15 18:14:26 UTC (rev 131324)
@@ -53,7 +53,7 @@
virtual ~SocketStreamHandle();
// FilterStream interface
- virtual void notifyStatusReceived(int status, const char* message);
+ virtual void notifyStatusReceived(int status, const BlackBerry::Platform::String& message);
virtual void notifyDataReceived(BlackBerry::Platform::NetworkBuffer*);
virtual void notifyReadyToSendData();
virtual void notifyClose(int status);
Modified: trunk/Source/WebCore/platform/network/blackberry/SocketStreamHandleBlackBerry.cpp (131323 => 131324)
--- trunk/Source/WebCore/platform/network/blackberry/SocketStreamHandleBlackBerry.cpp 2012-10-15 18:09:52 UTC (rev 131323)
+++ trunk/Source/WebCore/platform/network/blackberry/SocketStreamHandleBlackBerry.cpp 2012-10-15 18:14:26 UTC (rev 131324)
@@ -97,7 +97,7 @@
// FilterStream interface
-void SocketStreamHandle::notifyStatusReceived(int status, const char* message)
+void SocketStreamHandle::notifyStatusReceived(int status, const BlackBerry::Platform::String& message)
{
ASSERT(m_client);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
