Diff
Modified: trunk/Source/WebCore/ChangeLog (89401 => 89402)
--- trunk/Source/WebCore/ChangeLog 2011-06-22 02:27:31 UTC (rev 89401)
+++ trunk/Source/WebCore/ChangeLog 2011-06-22 02:36:45 UTC (rev 89402)
@@ -1,3 +1,45 @@
+2011-06-21 Darin Adler <[email protected]>
+
+ Reviewed by Ryosuke Niwa.
+
+ RefPtr misused as argument type in a few classes
+ https://bugs.webkit.org/show_bug.cgi?id=62955
+
+ * dom/DataTransferItem.cpp:
+ (WebCore::DataTransferItem::DataTransferItem):
+ * dom/DataTransferItem.h:
+ * dom/DataTransferItems.cpp:
+ (WebCore::DataTransferItems::DataTransferItems):
+ * dom/DataTransferItems.h:
+ * editing/CompositeEditCommand.cpp:
+ (WebCore::CompositeEditCommand::rebalanceWhitespaceOnTextSubstring):
+ * editing/CompositeEditCommand.h:
+ * page/WebKitAnimationList.cpp:
+ (WebCore::WebKitAnimationList::append):
+ (WebCore::WebKitAnimationList::insertAnimation):
+ * page/WebKitAnimationList.h:
+ * svg/graphics/filters/SVGFEImage.cpp:
+ (WebCore::FEImage::FEImage):
+ (WebCore::FEImage::create):
+ * svg/graphics/filters/SVGFEImage.h:
+ * svg/graphics/filters/SVGFilterBuilder.cpp:
+ (WebCore::SVGFilterBuilder::SVGFilterBuilder):
+ (WebCore::SVGFilterBuilder::add):
+ (WebCore::SVGFilterBuilder::appendEffectToEffectReferences):
+ * svg/graphics/filters/SVGFilterBuilder.h:
+ * websockets/ThreadableWebSocketChannelClientWrapper.cpp:
+ (WebCore::ThreadableWebSocketChannelClientWrapper::didConnectCallback):
+ (WebCore::ThreadableWebSocketChannelClientWrapper::didReceiveMessageCallback):
+ (WebCore::ThreadableWebSocketChannelClientWrapper::didStartClosingHandshakeCallback):
+ (WebCore::ThreadableWebSocketChannelClientWrapper::didCloseCallback):
+ * websockets/ThreadableWebSocketChannelClientWrapper.h:
+ * websockets/WorkerThreadableWebSocketChannel.cpp:
+ (WebCore::WorkerThreadableWebSocketChannel::Peer::Peer):
+ (WebCore::WorkerThreadableWebSocketChannel::Bridge::setWebSocketChannel):
+ (WebCore::WorkerThreadableWebSocketChannel::Bridge::mainThreadCreateWebSocketChannel):
+ * websockets/WorkerThreadableWebSocketChannel.h:
+ Use PassRefPtr or raw pointer as appropriate for RefPtr arguments.
+
2011-06-20 MORITA Hajime <[email protected]>
Reviewed by Kent Tamura.
Modified: trunk/Source/WebCore/dom/DataTransferItem.cpp (89401 => 89402)
--- trunk/Source/WebCore/dom/DataTransferItem.cpp 2011-06-22 02:27:31 UTC (rev 89401)
+++ trunk/Source/WebCore/dom/DataTransferItem.cpp 2011-06-22 02:36:45 UTC (rev 89402)
@@ -40,7 +40,7 @@
const char DataTransferItem::kindString[] = "string";
const char DataTransferItem::kindFile[] = "file";
-DataTransferItem::DataTransferItem(RefPtr<Clipboard> owner, const String& kind, const String& type)
+DataTransferItem::DataTransferItem(PassRefPtr<Clipboard> owner, const String& kind, const String& type)
: m_owner(owner)
, m_kind(kind)
, m_type(type)
Modified: trunk/Source/WebCore/dom/DataTransferItem.h (89401 => 89402)
--- trunk/Source/WebCore/dom/DataTransferItem.h 2011-06-22 02:27:31 UTC (rev 89401)
+++ trunk/Source/WebCore/dom/DataTransferItem.h 2011-06-22 02:36:45 UTC (rev 89402)
@@ -60,7 +60,7 @@
virtual PassRefPtr<Blob> getAsFile() = 0;
protected:
- DataTransferItem(RefPtr<Clipboard> owner, const String& kind, const String& type);
+ DataTransferItem(PassRefPtr<Clipboard> owner, const String& kind, const String& type);
Clipboard* owner();
private:
Modified: trunk/Source/WebCore/dom/DataTransferItems.cpp (89401 => 89402)
--- trunk/Source/WebCore/dom/DataTransferItems.cpp 2011-06-22 02:27:31 UTC (rev 89401)
+++ trunk/Source/WebCore/dom/DataTransferItems.cpp 2011-06-22 02:36:45 UTC (rev 89402)
@@ -39,7 +39,7 @@
namespace WebCore {
-DataTransferItems::DataTransferItems(RefPtr<Clipboard> clipboard, ScriptExecutionContext* context)
+DataTransferItems::DataTransferItems(PassRefPtr<Clipboard> clipboard, ScriptExecutionContext* context)
: m_owner(clipboard)
, m_context(context)
{
Modified: trunk/Source/WebCore/dom/DataTransferItems.h (89401 => 89402)
--- trunk/Source/WebCore/dom/DataTransferItems.h 2011-06-22 02:27:31 UTC (rev 89401)
+++ trunk/Source/WebCore/dom/DataTransferItems.h 2011-06-22 02:36:45 UTC (rev 89402)
@@ -54,7 +54,7 @@
virtual void add(const String& data, const String& type, ExceptionCode&);
protected:
- DataTransferItems(RefPtr<Clipboard>, ScriptExecutionContext*);
+ DataTransferItems(PassRefPtr<Clipboard>, ScriptExecutionContext*);
protected:
RefPtr<Clipboard> m_owner;
Modified: trunk/Source/WebCore/editing/CompositeEditCommand.cpp (89401 => 89402)
--- trunk/Source/WebCore/editing/CompositeEditCommand.cpp 2011-06-22 02:27:31 UTC (rev 89401)
+++ trunk/Source/WebCore/editing/CompositeEditCommand.cpp 2011-06-22 02:36:45 UTC (rev 89402)
@@ -461,8 +461,10 @@
rebalanceWhitespaceOnTextSubstring(static_cast<Text*>(node), position.offsetInContainerNode(), position.offsetInContainerNode());
}
-void CompositeEditCommand::rebalanceWhitespaceOnTextSubstring(RefPtr<Text> textNode, int startOffset, int endOffset)
+void CompositeEditCommand::rebalanceWhitespaceOnTextSubstring(PassRefPtr<Text> prpTextNode, int startOffset, int endOffset)
{
+ RefPtr<Text> textNode = prpTextNode;
+
String text = textNode->data();
ASSERT(!text.isEmpty());
@@ -490,7 +492,7 @@
isEndOfParagraph(visibleDownstreamPos) || (unsigned)downstream == text.length());
if (string != rebalancedString)
- replaceTextInNodePreservingMarkers(textNode, upstream, length, rebalancedString);
+ replaceTextInNodePreservingMarkers(textNode.release(), upstream, length, rebalancedString);
}
void CompositeEditCommand::prepareWhitespaceAtPositionForSplit(Position& position)
Modified: trunk/Source/WebCore/editing/CompositeEditCommand.h (89401 => 89402)
--- trunk/Source/WebCore/editing/CompositeEditCommand.h 2011-06-22 02:27:31 UTC (rev 89401)
+++ trunk/Source/WebCore/editing/CompositeEditCommand.h 2011-06-22 02:36:45 UTC (rev 89402)
@@ -69,7 +69,7 @@
void mergeIdenticalElements(PassRefPtr<Element>, PassRefPtr<Element>);
void rebalanceWhitespace();
void rebalanceWhitespaceAt(const Position&);
- void rebalanceWhitespaceOnTextSubstring(RefPtr<Text>, int startOffset, int endOffset);
+ void rebalanceWhitespaceOnTextSubstring(PassRefPtr<Text>, int startOffset, int endOffset);
void prepareWhitespaceAtPositionForSplit(Position&);
bool canRebalance(const Position&) const;
bool shouldRebalanceLeadingWhitespaceFor(const String&) const;
Modified: trunk/Source/WebCore/page/WebKitAnimationList.cpp (89401 => 89402)
--- trunk/Source/WebCore/page/WebKitAnimationList.cpp 2011-06-22 02:27:31 UTC (rev 89401)
+++ trunk/Source/WebCore/page/WebKitAnimationList.cpp 2011-06-22 02:36:45 UTC (rev 89402)
@@ -26,9 +26,6 @@
#include "config.h"
#include "WebKitAnimationList.h"
-#include "Animation.h"
-#include "AnimationBase.h"
-#include "RenderStyle.h"
#include "WebKitAnimation.h"
namespace WebCore {
@@ -61,12 +58,12 @@
m_animations.remove(index);
}
-void WebKitAnimationList::append(RefPtr<WebKitAnimation> animation)
+void WebKitAnimationList::append(PassRefPtr<WebKitAnimation> animation)
{
m_animations.append(animation);
}
-unsigned WebKitAnimationList::insertAnimation(RefPtr<WebKitAnimation> animation, unsigned index)
+unsigned WebKitAnimationList::insertAnimation(PassRefPtr<WebKitAnimation> animation, unsigned index)
{
if (!animation)
return 0;
@@ -79,4 +76,3 @@
}
} // namespace WebCore
-
Modified: trunk/Source/WebCore/page/WebKitAnimationList.h (89401 => 89402)
--- trunk/Source/WebCore/page/WebKitAnimationList.h 2011-06-22 02:27:31 UTC (rev 89401)
+++ trunk/Source/WebCore/page/WebKitAnimationList.h 2011-06-22 02:36:45 UTC (rev 89402)
@@ -39,16 +39,16 @@
public:
static PassRefPtr<WebKitAnimationList> create()
{
- return adoptRef(new WebKitAnimationList());
+ return adoptRef(new WebKitAnimationList);
}
~WebKitAnimationList();
unsigned length() const;
WebKitAnimation* item(unsigned index);
- unsigned insertAnimation(RefPtr<WebKitAnimation>, unsigned index);
+ unsigned insertAnimation(PassRefPtr<WebKitAnimation>, unsigned index);
void deleteAnimation(unsigned index);
- void append(RefPtr<WebKitAnimation>);
+ void append(PassRefPtr<WebKitAnimation>);
private:
WebKitAnimationList();
Modified: trunk/Source/WebCore/svg/graphics/filters/SVGFEImage.cpp (89401 => 89402)
--- trunk/Source/WebCore/svg/graphics/filters/SVGFEImage.cpp 2011-06-22 02:27:31 UTC (rev 89401)
+++ trunk/Source/WebCore/svg/graphics/filters/SVGFEImage.cpp 2011-06-22 02:36:45 UTC (rev 89402)
@@ -34,14 +34,14 @@
namespace WebCore {
-FEImage::FEImage(Filter* filter, RefPtr<Image> image, const SVGPreserveAspectRatio& preserveAspectRatio)
+FEImage::FEImage(Filter* filter, PassRefPtr<Image> image, const SVGPreserveAspectRatio& preserveAspectRatio)
: FilterEffect(filter)
, m_image(image)
, m_preserveAspectRatio(preserveAspectRatio)
{
}
-PassRefPtr<FEImage> FEImage::create(Filter* filter, RefPtr<Image> image, const SVGPreserveAspectRatio& preserveAspectRatio)
+PassRefPtr<FEImage> FEImage::create(Filter* filter, PassRefPtr<Image> image, const SVGPreserveAspectRatio& preserveAspectRatio)
{
return adoptRef(new FEImage(filter, image, preserveAspectRatio));
}
Modified: trunk/Source/WebCore/svg/graphics/filters/SVGFEImage.h (89401 => 89402)
--- trunk/Source/WebCore/svg/graphics/filters/SVGFEImage.h 2011-06-22 02:27:31 UTC (rev 89401)
+++ trunk/Source/WebCore/svg/graphics/filters/SVGFEImage.h 2011-06-22 02:36:45 UTC (rev 89402)
@@ -33,7 +33,7 @@
class FEImage : public FilterEffect {
public:
- static PassRefPtr<FEImage> create(Filter*, RefPtr<Image>, const SVGPreserveAspectRatio&);
+ static PassRefPtr<FEImage> create(Filter*, PassRefPtr<Image>, const SVGPreserveAspectRatio&);
void setAbsoluteSubregion(const FloatRect& absoluteSubregion) { m_absoluteSubregion = absoluteSubregion; }
@@ -47,7 +47,7 @@
virtual TextStream& externalRepresentation(TextStream&, int indention) const;
private:
- FEImage(Filter*, RefPtr<Image>, const SVGPreserveAspectRatio&);
+ FEImage(Filter*, PassRefPtr<Image>, const SVGPreserveAspectRatio&);
RefPtr<Image> m_image;
SVGPreserveAspectRatio m_preserveAspectRatio;
Modified: trunk/Source/WebCore/svg/graphics/filters/SVGFilterBuilder.cpp (89401 => 89402)
--- trunk/Source/WebCore/svg/graphics/filters/SVGFilterBuilder.cpp 2011-06-22 02:27:31 UTC (rev 89401)
+++ trunk/Source/WebCore/svg/graphics/filters/SVGFilterBuilder.cpp 2011-06-22 02:36:45 UTC (rev 89402)
@@ -32,14 +32,13 @@
namespace WebCore {
SVGFilterBuilder::SVGFilterBuilder(Filter* filter)
- : m_lastEffect(0)
{
m_builtinEffects.add(SourceGraphic::effectName(), SourceGraphic::create(filter));
m_builtinEffects.add(SourceAlpha::effectName(), SourceAlpha::create(filter));
addBuiltinEffects();
}
-void SVGFilterBuilder::add(const AtomicString& id, RefPtr<FilterEffect> effect)
+void SVGFilterBuilder::add(const AtomicString& id, PassRefPtr<FilterEffect> effect)
{
if (id.isEmpty()) {
m_lastEffect = effect;
@@ -68,20 +67,21 @@
return m_namedEffects.get(id).get();
}
-void SVGFilterBuilder::appendEffectToEffectReferences(RefPtr<FilterEffect> effectReference, RenderObject* object)
+void SVGFilterBuilder::appendEffectToEffectReferences(PassRefPtr<FilterEffect> prpEffect, RenderObject* object)
{
+ RefPtr<FilterEffect> effect = prpEffect;
+
// The effect must be a newly created filter effect.
- ASSERT(!m_effectReferences.contains(effectReference));
+ ASSERT(!m_effectReferences.contains(effect));
ASSERT(object && !m_effectRenderer.contains(object));
- m_effectReferences.add(effectReference, FilterEffectSet());
+ m_effectReferences.add(effect, FilterEffectSet());
- FilterEffect* effect = effectReference.get();
unsigned numberOfInputEffects = effect->inputEffects().size();
// It is not possible to add the same value to a set twice.
for (unsigned i = 0; i < numberOfInputEffects; ++i)
- effectReferences(effect->inputEffect(i)).add(effect);
- m_effectRenderer.add(object, effectReference.get());
+ effectReferences(effect->inputEffect(i)).add(effect.get());
+ m_effectRenderer.add(object, effect.get());
}
void SVGFilterBuilder::clearEffects()
Modified: trunk/Source/WebCore/svg/graphics/filters/SVGFilterBuilder.h (89401 => 89402)
--- trunk/Source/WebCore/svg/graphics/filters/SVGFilterBuilder.h 2011-06-22 02:27:31 UTC (rev 89401)
+++ trunk/Source/WebCore/svg/graphics/filters/SVGFilterBuilder.h 2011-06-22 02:36:45 UTC (rev 89402)
@@ -39,12 +39,12 @@
static PassRefPtr<SVGFilterBuilder> create(Filter* filter) { return adoptRef(new SVGFilterBuilder(filter)); }
- void add(const AtomicString& id, RefPtr<FilterEffect> effect);
+ void add(const AtomicString& id, PassRefPtr<FilterEffect>);
FilterEffect* getEffectById(const AtomicString& id) const;
FilterEffect* lastEffect() const { return m_lastEffect.get(); }
- void appendEffectToEffectReferences(RefPtr<FilterEffect>, RenderObject*);
+ void appendEffectToEffectReferences(PassRefPtr<FilterEffect>, RenderObject*);
inline FilterEffectSet& effectReferences(FilterEffect* effect)
{
Modified: trunk/Source/WebCore/websockets/ThreadableWebSocketChannelClientWrapper.cpp (89401 => 89402)
--- trunk/Source/WebCore/websockets/ThreadableWebSocketChannelClientWrapper.cpp 2011-06-22 02:27:31 UTC (rev 89401)
+++ trunk/Source/WebCore/websockets/ThreadableWebSocketChannelClientWrapper.cpp 2011-06-22 02:36:45 UTC (rev 89402)
@@ -144,28 +144,28 @@
(*iter)->performTask(0);
}
-void ThreadableWebSocketChannelClientWrapper::didConnectCallback(ScriptExecutionContext* context, RefPtr<ThreadableWebSocketChannelClientWrapper> wrapper)
+void ThreadableWebSocketChannelClientWrapper::didConnectCallback(ScriptExecutionContext* context, ThreadableWebSocketChannelClientWrapper* wrapper)
{
ASSERT_UNUSED(context, !context);
if (wrapper->m_client)
wrapper->m_client->didConnect();
}
-void ThreadableWebSocketChannelClientWrapper::didReceiveMessageCallback(ScriptExecutionContext* context, RefPtr<ThreadableWebSocketChannelClientWrapper> wrapper, String message)
+void ThreadableWebSocketChannelClientWrapper::didReceiveMessageCallback(ScriptExecutionContext* context, ThreadableWebSocketChannelClientWrapper* wrapper, String message)
{
ASSERT_UNUSED(context, !context);
if (wrapper->m_client)
wrapper->m_client->didReceiveMessage(message);
}
-void ThreadableWebSocketChannelClientWrapper::didStartClosingHandshakeCallback(ScriptExecutionContext* context, RefPtr<ThreadableWebSocketChannelClientWrapper> wrapper)
+void ThreadableWebSocketChannelClientWrapper::didStartClosingHandshakeCallback(ScriptExecutionContext* context, ThreadableWebSocketChannelClientWrapper* wrapper)
{
ASSERT_UNUSED(context, !context);
if (wrapper->m_client)
wrapper->m_client->didStartClosingHandshake();
}
-void ThreadableWebSocketChannelClientWrapper::didCloseCallback(ScriptExecutionContext* context, RefPtr<ThreadableWebSocketChannelClientWrapper> wrapper, unsigned long unhandledBufferedAmount, WebSocketChannelClient::ClosingHandshakeCompletionStatus closingHandshakeCompletion)
+void ThreadableWebSocketChannelClientWrapper::didCloseCallback(ScriptExecutionContext* context, ThreadableWebSocketChannelClientWrapper* wrapper, unsigned long unhandledBufferedAmount, WebSocketChannelClient::ClosingHandshakeCompletionStatus closingHandshakeCompletion)
{
ASSERT_UNUSED(context, !context);
if (wrapper->m_client)
Modified: trunk/Source/WebCore/websockets/ThreadableWebSocketChannelClientWrapper.h (89401 => 89402)
--- trunk/Source/WebCore/websockets/ThreadableWebSocketChannelClientWrapper.h 2011-06-22 02:27:31 UTC (rev 89401)
+++ trunk/Source/WebCore/websockets/ThreadableWebSocketChannelClientWrapper.h 2011-06-22 02:36:45 UTC (rev 89402)
@@ -73,10 +73,10 @@
ThreadableWebSocketChannelClientWrapper(WebSocketChannelClient*);
void processPendingTasks();
- static void didConnectCallback(ScriptExecutionContext*, RefPtr<ThreadableWebSocketChannelClientWrapper>);
- static void didReceiveMessageCallback(ScriptExecutionContext*, RefPtr<ThreadableWebSocketChannelClientWrapper>, String message);
- static void didStartClosingHandshakeCallback(ScriptExecutionContext*, RefPtr<ThreadableWebSocketChannelClientWrapper>);
- static void didCloseCallback(ScriptExecutionContext*, RefPtr<ThreadableWebSocketChannelClientWrapper>, unsigned long unhandledBufferedAmount, WebSocketChannelClient::ClosingHandshakeCompletionStatus);
+ static void didConnectCallback(ScriptExecutionContext*, ThreadableWebSocketChannelClientWrapper*);
+ static void didReceiveMessageCallback(ScriptExecutionContext*, ThreadableWebSocketChannelClientWrapper*, String message);
+ static void didStartClosingHandshakeCallback(ScriptExecutionContext*, ThreadableWebSocketChannelClientWrapper*);
+ static void didCloseCallback(ScriptExecutionContext*, ThreadableWebSocketChannelClientWrapper*, unsigned long unhandledBufferedAmount, WebSocketChannelClient::ClosingHandshakeCompletionStatus);
WebSocketChannelClient* m_client;
bool m_syncMethodDone;
Modified: trunk/Source/WebCore/websockets/WorkerThreadableWebSocketChannel.cpp (89401 => 89402)
--- trunk/Source/WebCore/websockets/WorkerThreadableWebSocketChannel.cpp 2011-06-22 02:27:31 UTC (rev 89401)
+++ trunk/Source/WebCore/websockets/WorkerThreadableWebSocketChannel.cpp 2011-06-22 02:36:45 UTC (rev 89402)
@@ -114,7 +114,7 @@
m_bridge->resume();
}
-WorkerThreadableWebSocketChannel::Peer::Peer(RefPtr<ThreadableWebSocketChannelClientWrapper> clientWrapper, WorkerLoaderProxy& loaderProxy, ScriptExecutionContext* context, const String& taskMode, const KURL& url, const String& protocol)
+WorkerThreadableWebSocketChannel::Peer::Peer(PassRefPtr<ThreadableWebSocketChannelClientWrapper> clientWrapper, WorkerLoaderProxy& loaderProxy, ScriptExecutionContext* context, const String& taskMode, const KURL& url, const String& protocol)
: m_workerClientWrapper(clientWrapper)
, m_loaderProxy(loaderProxy)
, m_mainWebSocketChannel(WebSocketChannel::create(context, this, url, protocol))
@@ -258,14 +258,14 @@
m_loaderProxy.postTaskForModeToWorkerContext(createCallbackTask(&workerContextDidClose, m_workerClientWrapper, unhandledBufferedAmount, closingHandshakeCompletion), m_taskMode);
}
-void WorkerThreadableWebSocketChannel::Bridge::setWebSocketChannel(ScriptExecutionContext* context, Bridge* thisPtr, Peer* peer, RefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper)
+void WorkerThreadableWebSocketChannel::Bridge::setWebSocketChannel(ScriptExecutionContext* context, Bridge* thisPtr, Peer* peer, PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper)
{
ASSERT_UNUSED(context, context->isWorkerContext());
thisPtr->m_peer = peer;
workerClientWrapper->setSyncMethodDone();
}
-void WorkerThreadableWebSocketChannel::Bridge::mainThreadCreateWebSocketChannel(ScriptExecutionContext* context, Bridge* thisPtr, RefPtr<ThreadableWebSocketChannelClientWrapper> clientWrapper, const String& taskMode, const KURL& url, const String& protocol)
+void WorkerThreadableWebSocketChannel::Bridge::mainThreadCreateWebSocketChannel(ScriptExecutionContext* context, Bridge* thisPtr, PassRefPtr<ThreadableWebSocketChannelClientWrapper> clientWrapper, const String& taskMode, const KURL& url, const String& protocol)
{
ASSERT(isMainThread());
ASSERT_UNUSED(context, context->isDocument());
Modified: trunk/Source/WebCore/websockets/WorkerThreadableWebSocketChannel.h (89401 => 89402)
--- trunk/Source/WebCore/websockets/WorkerThreadableWebSocketChannel.h 2011-06-22 02:27:31 UTC (rev 89401)
+++ trunk/Source/WebCore/websockets/WorkerThreadableWebSocketChannel.h 2011-06-22 02:36:45 UTC (rev 89402)
@@ -82,7 +82,7 @@
class Peer : public WebSocketChannelClient {
WTF_MAKE_NONCOPYABLE(Peer); WTF_MAKE_FAST_ALLOCATED;
public:
- static Peer* create(RefPtr<ThreadableWebSocketChannelClientWrapper> clientWrapper, WorkerLoaderProxy& loaderProxy, ScriptExecutionContext* context, const String& taskMode, const KURL& url, const String& protocol)
+ static Peer* create(PassRefPtr<ThreadableWebSocketChannelClientWrapper> clientWrapper, WorkerLoaderProxy& loaderProxy, ScriptExecutionContext* context, const String& taskMode, const KURL& url, const String& protocol)
{
return new Peer(clientWrapper, loaderProxy, context, taskMode, url, protocol);
}
@@ -103,7 +103,7 @@
virtual void didClose(unsigned long unhandledBufferedAmount, ClosingHandshakeCompletionStatus);
private:
- Peer(RefPtr<ThreadableWebSocketChannelClientWrapper>, WorkerLoaderProxy&, ScriptExecutionContext*, const String& taskMode, const KURL&, const String& protocol);
+ Peer(PassRefPtr<ThreadableWebSocketChannelClientWrapper>, WorkerLoaderProxy&, ScriptExecutionContext*, const String& taskMode, const KURL&, const String& protocol);
RefPtr<ThreadableWebSocketChannelClientWrapper> m_workerClientWrapper;
WorkerLoaderProxy& m_loaderProxy;
@@ -134,10 +134,10 @@
private:
Bridge(PassRefPtr<ThreadableWebSocketChannelClientWrapper>, PassRefPtr<WorkerContext>, const String& taskMode, const KURL&, const String& protocol);
- static void setWebSocketChannel(ScriptExecutionContext*, Bridge* thisPtr, Peer*, RefPtr<ThreadableWebSocketChannelClientWrapper>);
+ static void setWebSocketChannel(ScriptExecutionContext*, Bridge* thisPtr, Peer*, PassRefPtr<ThreadableWebSocketChannelClientWrapper>);
// Executed on the main thread to create a Peer for this bridge.
- static void mainThreadCreateWebSocketChannel(ScriptExecutionContext*, Bridge* thisPtr, RefPtr<ThreadableWebSocketChannelClientWrapper>, const String& taskMode, const KURL&, const String& protocol);
+ static void mainThreadCreateWebSocketChannel(ScriptExecutionContext*, Bridge* thisPtr, PassRefPtr<ThreadableWebSocketChannelClientWrapper>, const String& taskMode, const KURL&, const String& protocol);
// Executed on the worker context's thread.
void clearClientWrapper();
