Changeset 89224 in webkit
- Timestamp:
- Jun 19, 2011 7:26:37 PM (13 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 25 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r89223 r89224 1 2011-06-19 Darin Adler <darin@apple.com>2 3 Reviewed by Sam Weinig.4 5 RefPtr misused as argument type in a few classes6 https://bugs.webkit.org/show_bug.cgi?id=629557 8 * dom/DataTransferItem.cpp:9 (WebCore::DataTransferItem::DataTransferItem):10 * dom/DataTransferItem.h:11 * dom/DataTransferItems.cpp:12 (WebCore::DataTransferItems::DataTransferItems):13 * dom/DataTransferItems.h:14 * editing/CompositeEditCommand.cpp:15 (WebCore::CompositeEditCommand::rebalanceWhitespaceOnTextSubstring):16 * editing/CompositeEditCommand.h:17 * inspector/InspectorConsoleInstrumentation.h:18 * inspector/InspectorInstrumentation.cpp:19 (WebCore::InspectorInstrumentation::addProfileImpl):20 * inspector/InspectorInstrumentation.h:21 * inspector/InspectorProfilerAgent.h:22 * inspector/InspectorStyleSheet.cpp:23 (WebCore::InspectorStyleSheet::inspectorStyleForId):24 (WebCore::InspectorStyleSheet::rememberInspectorStyle):25 * inspector/InspectorStyleSheet.h:26 * page/WebKitAnimationList.cpp:27 (WebCore::WebKitAnimationList::append):28 (WebCore::WebKitAnimationList::insertAnimation):29 * page/WebKitAnimationList.h:30 * svg/graphics/filters/SVGFEImage.cpp:31 (WebCore::FEImage::FEImage):32 (WebCore::FEImage::create):33 * svg/graphics/filters/SVGFEImage.h:34 * svg/graphics/filters/SVGFilterBuilder.cpp:35 (WebCore::SVGFilterBuilder::SVGFilterBuilder):36 (WebCore::SVGFilterBuilder::add):37 (WebCore::SVGFilterBuilder::appendEffectToEffectReferences):38 * svg/graphics/filters/SVGFilterBuilder.h:39 * websockets/ThreadableWebSocketChannelClientWrapper.cpp:40 (WebCore::ThreadableWebSocketChannelClientWrapper::didConnectCallback):41 (WebCore::ThreadableWebSocketChannelClientWrapper::didReceiveMessageCallback):42 (WebCore::ThreadableWebSocketChannelClientWrapper::didStartClosingHandshakeCallback):43 (WebCore::ThreadableWebSocketChannelClientWrapper::didCloseCallback):44 * websockets/ThreadableWebSocketChannelClientWrapper.h:45 * websockets/WorkerThreadableWebSocketChannel.cpp:46 (WebCore::WorkerThreadableWebSocketChannel::Peer::Peer):47 (WebCore::WorkerThreadableWebSocketChannel::Bridge::setWebSocketChannel):48 (WebCore::WorkerThreadableWebSocketChannel::Bridge::mainThreadCreateWebSocketChannel):49 * websockets/WorkerThreadableWebSocketChannel.h:50 Use PassRefPtr or raw pointer as appropriate for RefPtr arguments.51 52 1 2011-06-19 Una Sabovic <una.sabovic@palm.com> 53 2 -
trunk/Source/WebCore/dom/DataTransferItem.cpp
r89223 r89224 41 41 const char DataTransferItem::kindFile[] = "file"; 42 42 43 DataTransferItem::DataTransferItem( PassRefPtr<Clipboard> owner, const String& kind, const String& type)43 DataTransferItem::DataTransferItem(RefPtr<Clipboard> owner, const String& kind, const String& type) 44 44 : m_owner(owner) 45 45 , m_kind(kind) -
trunk/Source/WebCore/dom/DataTransferItem.h
r89223 r89224 61 61 62 62 protected: 63 DataTransferItem( PassRefPtr<Clipboard> owner, const String& kind, const String& type);63 DataTransferItem(RefPtr<Clipboard> owner, const String& kind, const String& type); 64 64 Clipboard* owner(); 65 65 -
trunk/Source/WebCore/dom/DataTransferItems.cpp
r89223 r89224 40 40 namespace WebCore { 41 41 42 DataTransferItems::DataTransferItems( PassRefPtr<Clipboard> clipboard, ScriptExecutionContext* context)42 DataTransferItems::DataTransferItems(RefPtr<Clipboard> clipboard, ScriptExecutionContext* context) 43 43 : m_owner(clipboard) 44 44 , m_context(context) -
trunk/Source/WebCore/dom/DataTransferItems.h
r89223 r89224 55 55 56 56 protected: 57 DataTransferItems( PassRefPtr<Clipboard>, ScriptExecutionContext*);57 DataTransferItems(RefPtr<Clipboard>, ScriptExecutionContext*); 58 58 59 59 protected: -
trunk/Source/WebCore/editing/CompositeEditCommand.cpp
r89223 r89224 460 460 } 461 461 462 void CompositeEditCommand::rebalanceWhitespaceOnTextSubstring(PassRefPtr<Text> prpTextNode, int startOffset, int endOffset) 463 { 464 RefPtr<Text> textNode = prpTextNode; 465 462 void CompositeEditCommand::rebalanceWhitespaceOnTextSubstring(RefPtr<Text> textNode, int startOffset, int endOffset) 463 { 466 464 String text = textNode->data(); 467 465 ASSERT(!text.isEmpty()); … … 491 489 492 490 if (string != rebalancedString) 493 replaceTextInNodePreservingMarkers(textNode .release(), upstream, length, rebalancedString);491 replaceTextInNodePreservingMarkers(textNode, upstream, length, rebalancedString); 494 492 } 495 493 -
trunk/Source/WebCore/editing/CompositeEditCommand.h
r89223 r89224 70 70 void rebalanceWhitespace(); 71 71 void rebalanceWhitespaceAt(const Position&); 72 void rebalanceWhitespaceOnTextSubstring( PassRefPtr<Text>, int startOffset, int endOffset);72 void rebalanceWhitespaceOnTextSubstring(RefPtr<Text>, int startOffset, int endOffset); 73 73 void prepareWhitespaceAtPositionForSplit(Position&); 74 74 bool canRebalance(const Position&) const; -
trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp
r89223 r89224 305 305 } 306 306 307 void InspectorCSSAgent::setPropertyText(ErrorString* errorString, InspectorObject*fullStyleId, int propertyIndex, const String& text, bool overwrite, RefPtr<InspectorObject>* result)307 void InspectorCSSAgent::setPropertyText(ErrorString* errorString, const RefPtr<InspectorObject>& fullStyleId, int propertyIndex, const String& text, bool overwrite, RefPtr<InspectorObject>* result) 308 308 { 309 309 InspectorCSSId compoundId(fullStyleId); … … 319 319 } 320 320 321 void InspectorCSSAgent::toggleProperty(ErrorString* errorString, InspectorObject*fullStyleId, int propertyIndex, bool disable, RefPtr<InspectorObject>* result)321 void InspectorCSSAgent::toggleProperty(ErrorString* errorString, const RefPtr<InspectorObject>& fullStyleId, int propertyIndex, bool disable, RefPtr<InspectorObject>* result) 322 322 { 323 323 InspectorCSSId compoundId(fullStyleId); … … 333 333 } 334 334 335 void InspectorCSSAgent::setRuleSelector(ErrorString* errorString, InspectorObject*fullRuleId, const String& selector, RefPtr<InspectorObject>* result)335 void InspectorCSSAgent::setRuleSelector(ErrorString* errorString, const RefPtr<InspectorObject>& fullRuleId, const String& selector, RefPtr<InspectorObject>* result) 336 336 { 337 337 InspectorCSSId compoundId(fullRuleId); -
trunk/Source/WebCore/inspector/InspectorCSSAgent.h
r89223 r89224 69 69 void getStyleSheetText(ErrorString*, const String& styleSheetId, String* result); 70 70 void setStyleSheetText(ErrorString*, const String& styleSheetId, const String& text); 71 void setPropertyText(ErrorString*, InspectorObject*styleId, int propertyIndex, const String& text, bool overwrite, RefPtr<InspectorObject>* result);72 void toggleProperty(ErrorString*, InspectorObject*styleId, int propertyIndex, bool disable, RefPtr<InspectorObject>* result);73 void setRuleSelector(ErrorString*, InspectorObject*ruleId, const String& selector, RefPtr<InspectorObject>* result);71 void setPropertyText(ErrorString*, const RefPtr<InspectorObject>& styleId, int propertyIndex, const String& text, bool overwrite, RefPtr<InspectorObject>* result); 72 void toggleProperty(ErrorString*, const RefPtr<InspectorObject>& styleId, int propertyIndex, bool disable, RefPtr<InspectorObject>* result); 73 void setRuleSelector(ErrorString*, const RefPtr<InspectorObject>& ruleId, const String& selector, RefPtr<InspectorObject>* result); 74 74 void addRule(ErrorString*, const int contextNodeId, const String& selector, RefPtr<InspectorObject>* result); 75 75 void getSupportedCSSProperties(ErrorString*, RefPtr<InspectorArray>* result); -
trunk/Source/WebCore/inspector/InspectorConsoleInstrumentation.h
r89223 r89224 97 97 } 98 98 99 inline void InspectorInstrumentation::addProfile(Page* page, PassRefPtr<ScriptProfile> profile, PassRefPtr<ScriptCallStack> callStack)99 inline void InspectorInstrumentation::addProfile(Page* page, RefPtr<ScriptProfile> profile, PassRefPtr<ScriptCallStack> callStack) 100 100 { 101 101 #if ENABLE(INSPECTOR) -
trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp
r89223 r89224 699 699 } 700 700 701 void InspectorInstrumentation::addProfileImpl(InstrumentingAgents* instrumentingAgents, PassRefPtr<ScriptProfile> profile, PassRefPtr<ScriptCallStack> callStack)701 void InspectorInstrumentation::addProfileImpl(InstrumentingAgents* instrumentingAgents, RefPtr<ScriptProfile> profile, PassRefPtr<ScriptCallStack> callStack) 702 702 { 703 703 if (InspectorProfilerAgent* profilerAgent = instrumentingAgents->inspectorProfilerAgent()) { -
trunk/Source/WebCore/inspector/InspectorInstrumentation.h
r89223 r89224 151 151 #if ENABLE(JAVASCRIPT_DEBUGGER) 152 152 static void addStartProfilingMessageToConsole(Page*, const String& title, unsigned lineNumber, const String& sourceURL); 153 static void addProfile(Page*, PassRefPtr<ScriptProfile>, PassRefPtr<ScriptCallStack>);153 static void addProfile(Page*, RefPtr<ScriptProfile>, PassRefPtr<ScriptCallStack>); 154 154 static String getCurrentUserInitiatedProfileName(Page*, bool incrementProfileNumber); 155 155 static bool profilerEnabled(Page*); … … 279 279 #if ENABLE(JAVASCRIPT_DEBUGGER) 280 280 static void addStartProfilingMessageToConsoleImpl(InstrumentingAgents*, const String& title, unsigned lineNumber, const String& sourceURL); 281 static void addProfileImpl(InstrumentingAgents*, PassRefPtr<ScriptProfile>, PassRefPtr<ScriptCallStack>);281 static void addProfileImpl(InstrumentingAgents*, RefPtr<ScriptProfile>, PassRefPtr<ScriptCallStack>); 282 282 static String getCurrentUserInitiatedProfileNameImpl(InstrumentingAgents*, bool incrementProfileNumber); 283 283 static bool profilerEnabledImpl(InstrumentingAgents*); -
trunk/Source/WebCore/inspector/InspectorProfilerAgent.h
r89223 r89224 60 60 virtual ~InspectorProfilerAgent(); 61 61 62 void addProfile(PassRefPtr<ScriptProfile> , unsigned lineNumber, const String& sourceURL);62 void addProfile(PassRefPtr<ScriptProfile> prpProfile, unsigned lineNumber, const String& sourceURL); 63 63 void addProfileFinishedMessageToConsole(PassRefPtr<ScriptProfile>, unsigned lineNumber, const String& sourceURL); 64 64 void addStartProfilingMessageToConsole(const String& title, unsigned lineNumber, const String& sourceURL); -
trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp
r89223 r89224 876 876 return 0; 877 877 878 if (RefPtr<InspectorStyle> inspectorStyle = m_inspectorStyles.get(style)) 878 InspectorStyleMap::iterator it = m_inspectorStyles.find(style); 879 if (it == m_inspectorStyles.end()) { 880 RefPtr<InspectorStyle> inspectorStyle = InspectorStyle::create(id, style, this); 879 881 return inspectorStyle.release(); 880 881 return InspectorStyle::create(id, style, this); 882 } 883 884 void InspectorStyleSheet::rememberInspectorStyle(PassRefPtr<InspectorStyle> prpInspectorStyle) 885 { 886 RefPtr<InspectorStyle> inspectorStyle = prpInspectorStyle; 887 CSSStyleDeclaration* cssStyle = inspectorStyle->cssStyle(); 888 m_inspectorStyles.set(cssStyle, inspectorStyle.release()); 882 } 883 return it->second; 884 } 885 886 void InspectorStyleSheet::rememberInspectorStyle(RefPtr<InspectorStyle> inspectorStyle) 887 { 888 m_inspectorStyles.set(inspectorStyle->cssStyle(), inspectorStyle); 889 889 } 890 890 -
trunk/Source/WebCore/inspector/InspectorStyleSheet.h
r89223 r89224 56 56 InspectorCSSId() { } 57 57 58 explicit InspectorCSSId( InspectorObject*value)58 explicit InspectorCSSId(RefPtr<InspectorObject> value) 59 59 { 60 60 if (!value->getString("styleSheetId", &m_styleSheetId)) … … 190 190 virtual bool ensureParsedDataReady(); 191 191 virtual PassRefPtr<InspectorStyle> inspectorStyleForId(const InspectorCSSId&); 192 virtual void rememberInspectorStyle( PassRefPtr<InspectorStyle>);192 virtual void rememberInspectorStyle(RefPtr<InspectorStyle> inspectorStyle); 193 193 virtual void forgetInspectorStyle(CSSStyleDeclaration* style); 194 194 … … 239 239 virtual bool ensureParsedDataReady(); 240 240 virtual PassRefPtr<InspectorStyle> inspectorStyleForId(const InspectorCSSId&); 241 virtual void rememberInspectorStyle( PassRefPtr<InspectorStyle>) { }241 virtual void rememberInspectorStyle(RefPtr<InspectorStyle>) { } 242 242 virtual void forgetInspectorStyle(CSSStyleDeclaration*) { } 243 243 -
trunk/Source/WebCore/page/WebKitAnimationList.cpp
r89223 r89224 27 27 #include "WebKitAnimationList.h" 28 28 29 #include "Animation.h" 30 #include "AnimationBase.h" 31 #include "RenderStyle.h" 29 32 #include "WebKitAnimation.h" 30 33 … … 59 62 } 60 63 61 void WebKitAnimationList::append( PassRefPtr<WebKitAnimation> animation)64 void WebKitAnimationList::append(RefPtr<WebKitAnimation> animation) 62 65 { 63 66 m_animations.append(animation); 64 67 } 65 68 66 unsigned WebKitAnimationList::insertAnimation( PassRefPtr<WebKitAnimation> animation, unsigned index)69 unsigned WebKitAnimationList::insertAnimation(RefPtr<WebKitAnimation> animation, unsigned index) 67 70 { 68 71 if (!animation) … … 77 80 78 81 } // namespace WebCore 82 -
trunk/Source/WebCore/page/WebKitAnimationList.h
r89223 r89224 40 40 static PassRefPtr<WebKitAnimationList> create() 41 41 { 42 return adoptRef(new WebKitAnimationList );42 return adoptRef(new WebKitAnimationList()); 43 43 } 44 44 ~WebKitAnimationList(); … … 47 47 WebKitAnimation* item(unsigned index); 48 48 49 unsigned insertAnimation( PassRefPtr<WebKitAnimation>, unsigned index);49 unsigned insertAnimation(RefPtr<WebKitAnimation>, unsigned index); 50 50 void deleteAnimation(unsigned index); 51 void append( PassRefPtr<WebKitAnimation>);51 void append(RefPtr<WebKitAnimation>); 52 52 53 53 private: -
trunk/Source/WebCore/svg/graphics/filters/SVGFEImage.cpp
r89223 r89224 35 35 namespace WebCore { 36 36 37 FEImage::FEImage(Filter* filter, PassRefPtr<Image> image, const SVGPreserveAspectRatio& preserveAspectRatio)37 FEImage::FEImage(Filter* filter, RefPtr<Image> image, const SVGPreserveAspectRatio& preserveAspectRatio) 38 38 : FilterEffect(filter) 39 39 , m_image(image) … … 42 42 } 43 43 44 PassRefPtr<FEImage> FEImage::create(Filter* filter, PassRefPtr<Image> image, const SVGPreserveAspectRatio& preserveAspectRatio)44 PassRefPtr<FEImage> FEImage::create(Filter* filter, RefPtr<Image> image, const SVGPreserveAspectRatio& preserveAspectRatio) 45 45 { 46 46 return adoptRef(new FEImage(filter, image, preserveAspectRatio)); -
trunk/Source/WebCore/svg/graphics/filters/SVGFEImage.h
r89223 r89224 34 34 class FEImage : public FilterEffect { 35 35 public: 36 static PassRefPtr<FEImage> create(Filter*, PassRefPtr<Image>, const SVGPreserveAspectRatio&);36 static PassRefPtr<FEImage> create(Filter*, RefPtr<Image>, const SVGPreserveAspectRatio&); 37 37 38 38 void setAbsoluteSubregion(const FloatRect& absoluteSubregion) { m_absoluteSubregion = absoluteSubregion; } … … 48 48 49 49 private: 50 FEImage(Filter*, PassRefPtr<Image>, const SVGPreserveAspectRatio&);50 FEImage(Filter*, RefPtr<Image>, const SVGPreserveAspectRatio&); 51 51 52 52 RefPtr<Image> m_image; -
trunk/Source/WebCore/svg/graphics/filters/SVGFilterBuilder.cpp
r89223 r89224 33 33 34 34 SVGFilterBuilder::SVGFilterBuilder(Filter* filter) 35 : m_lastEffect(0) 35 36 { 36 37 m_builtinEffects.add(SourceGraphic::effectName(), SourceGraphic::create(filter)); … … 39 40 } 40 41 41 void SVGFilterBuilder::add(const AtomicString& id, PassRefPtr<FilterEffect> effect)42 void SVGFilterBuilder::add(const AtomicString& id, RefPtr<FilterEffect> effect) 42 43 { 43 44 if (id.isEmpty()) { … … 68 69 } 69 70 70 void SVGFilterBuilder::appendEffectToEffectReferences( PassRefPtr<FilterEffect> prpEffect, RenderObject* object)71 void SVGFilterBuilder::appendEffectToEffectReferences(RefPtr<FilterEffect> effectReference, RenderObject* object) 71 72 { 72 RefPtr<FilterEffect> effect = prpEffect; 73 // The effect must be a newly created filter effect. 74 ASSERT(!m_effectReferences.contains(effectReference)); 75 ASSERT(object && !m_effectRenderer.contains(object)); 76 m_effectReferences.add(effectReference, FilterEffectSet()); 73 77 74 // The effect must be a newly created filter effect. 75 ASSERT(!m_effectReferences.contains(effect)); 76 ASSERT(object && !m_effectRenderer.contains(object)); 77 m_effectReferences.add(effect, FilterEffectSet()); 78 78 FilterEffect* effect = effectReference.get(); 79 79 unsigned numberOfInputEffects = effect->inputEffects().size(); 80 80 81 81 // It is not possible to add the same value to a set twice. 82 82 for (unsigned i = 0; i < numberOfInputEffects; ++i) 83 effectReferences(effect->inputEffect(i)).add(effect .get());84 m_effectRenderer.add(object, effect .get());83 effectReferences(effect->inputEffect(i)).add(effect); 84 m_effectRenderer.add(object, effectReference.get()); 85 85 } 86 86 -
trunk/Source/WebCore/svg/graphics/filters/SVGFilterBuilder.h
r89223 r89224 40 40 static PassRefPtr<SVGFilterBuilder> create(Filter* filter) { return adoptRef(new SVGFilterBuilder(filter)); } 41 41 42 void add(const AtomicString& id, PassRefPtr<FilterEffect>);42 void add(const AtomicString& id, RefPtr<FilterEffect> effect); 43 43 44 44 FilterEffect* getEffectById(const AtomicString& id) const; 45 45 FilterEffect* lastEffect() const { return m_lastEffect.get(); } 46 46 47 void appendEffectToEffectReferences( PassRefPtr<FilterEffect>, RenderObject*);47 void appendEffectToEffectReferences(RefPtr<FilterEffect>, RenderObject*); 48 48 49 49 inline FilterEffectSet& effectReferences(FilterEffect* effect) -
trunk/Source/WebCore/websockets/ThreadableWebSocketChannelClientWrapper.cpp
r89223 r89224 145 145 } 146 146 147 void ThreadableWebSocketChannelClientWrapper::didConnectCallback(ScriptExecutionContext* context, ThreadableWebSocketChannelClientWrapper*wrapper)147 void ThreadableWebSocketChannelClientWrapper::didConnectCallback(ScriptExecutionContext* context, RefPtr<ThreadableWebSocketChannelClientWrapper> wrapper) 148 148 { 149 149 ASSERT_UNUSED(context, !context); … … 152 152 } 153 153 154 void ThreadableWebSocketChannelClientWrapper::didReceiveMessageCallback(ScriptExecutionContext* context, ThreadableWebSocketChannelClientWrapper*wrapper, String message)154 void ThreadableWebSocketChannelClientWrapper::didReceiveMessageCallback(ScriptExecutionContext* context, RefPtr<ThreadableWebSocketChannelClientWrapper> wrapper, String message) 155 155 { 156 156 ASSERT_UNUSED(context, !context); … … 159 159 } 160 160 161 void ThreadableWebSocketChannelClientWrapper::didStartClosingHandshakeCallback(ScriptExecutionContext* context, ThreadableWebSocketChannelClientWrapper*wrapper)161 void ThreadableWebSocketChannelClientWrapper::didStartClosingHandshakeCallback(ScriptExecutionContext* context, RefPtr<ThreadableWebSocketChannelClientWrapper> wrapper) 162 162 { 163 163 ASSERT_UNUSED(context, !context); … … 166 166 } 167 167 168 void ThreadableWebSocketChannelClientWrapper::didCloseCallback(ScriptExecutionContext* context, ThreadableWebSocketChannelClientWrapper*wrapper, unsigned long unhandledBufferedAmount, WebSocketChannelClient::ClosingHandshakeCompletionStatus closingHandshakeCompletion)168 void ThreadableWebSocketChannelClientWrapper::didCloseCallback(ScriptExecutionContext* context, RefPtr<ThreadableWebSocketChannelClientWrapper> wrapper, unsigned long unhandledBufferedAmount, WebSocketChannelClient::ClosingHandshakeCompletionStatus closingHandshakeCompletion) 169 169 { 170 170 ASSERT_UNUSED(context, !context); -
trunk/Source/WebCore/websockets/ThreadableWebSocketChannelClientWrapper.h
r89223 r89224 74 74 75 75 void processPendingTasks(); 76 static void didConnectCallback(ScriptExecutionContext*, ThreadableWebSocketChannelClientWrapper*);77 static void didReceiveMessageCallback(ScriptExecutionContext*, ThreadableWebSocketChannelClientWrapper*, String message);78 static void didStartClosingHandshakeCallback(ScriptExecutionContext*, ThreadableWebSocketChannelClientWrapper*);79 static void didCloseCallback(ScriptExecutionContext*, ThreadableWebSocketChannelClientWrapper*, unsigned long unhandledBufferedAmount, WebSocketChannelClient::ClosingHandshakeCompletionStatus);76 static void didConnectCallback(ScriptExecutionContext*, RefPtr<ThreadableWebSocketChannelClientWrapper>); 77 static void didReceiveMessageCallback(ScriptExecutionContext*, RefPtr<ThreadableWebSocketChannelClientWrapper>, String message); 78 static void didStartClosingHandshakeCallback(ScriptExecutionContext*, RefPtr<ThreadableWebSocketChannelClientWrapper>); 79 static void didCloseCallback(ScriptExecutionContext*, RefPtr<ThreadableWebSocketChannelClientWrapper>, unsigned long unhandledBufferedAmount, WebSocketChannelClient::ClosingHandshakeCompletionStatus); 80 80 81 81 WebSocketChannelClient* m_client; -
trunk/Source/WebCore/websockets/WorkerThreadableWebSocketChannel.cpp
r89223 r89224 115 115 } 116 116 117 WorkerThreadableWebSocketChannel::Peer::Peer( PassRefPtr<ThreadableWebSocketChannelClientWrapper> clientWrapper, WorkerLoaderProxy& loaderProxy, ScriptExecutionContext* context, const String& taskMode, const KURL& url, const String& protocol)117 WorkerThreadableWebSocketChannel::Peer::Peer(RefPtr<ThreadableWebSocketChannelClientWrapper> clientWrapper, WorkerLoaderProxy& loaderProxy, ScriptExecutionContext* context, const String& taskMode, const KURL& url, const String& protocol) 118 118 : m_workerClientWrapper(clientWrapper) 119 119 , m_loaderProxy(loaderProxy) … … 259 259 } 260 260 261 void WorkerThreadableWebSocketChannel::Bridge::setWebSocketChannel(ScriptExecutionContext* context, Bridge* thisPtr, Peer* peer, PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper)261 void WorkerThreadableWebSocketChannel::Bridge::setWebSocketChannel(ScriptExecutionContext* context, Bridge* thisPtr, Peer* peer, RefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper) 262 262 { 263 263 ASSERT_UNUSED(context, context->isWorkerContext()); … … 266 266 } 267 267 268 void WorkerThreadableWebSocketChannel::Bridge::mainThreadCreateWebSocketChannel(ScriptExecutionContext* context, Bridge* thisPtr, PassRefPtr<ThreadableWebSocketChannelClientWrapper> clientWrapper, const String& taskMode, const KURL& url, const String& protocol)268 void WorkerThreadableWebSocketChannel::Bridge::mainThreadCreateWebSocketChannel(ScriptExecutionContext* context, Bridge* thisPtr, RefPtr<ThreadableWebSocketChannelClientWrapper> clientWrapper, const String& taskMode, const KURL& url, const String& protocol) 269 269 { 270 270 ASSERT(isMainThread()); -
trunk/Source/WebCore/websockets/WorkerThreadableWebSocketChannel.h
r89223 r89224 83 83 WTF_MAKE_NONCOPYABLE(Peer); WTF_MAKE_FAST_ALLOCATED; 84 84 public: 85 static Peer* create( PassRefPtr<ThreadableWebSocketChannelClientWrapper> clientWrapper, WorkerLoaderProxy& loaderProxy, ScriptExecutionContext* context, const String& taskMode, const KURL& url, const String& protocol)85 static Peer* create(RefPtr<ThreadableWebSocketChannelClientWrapper> clientWrapper, WorkerLoaderProxy& loaderProxy, ScriptExecutionContext* context, const String& taskMode, const KURL& url, const String& protocol) 86 86 { 87 87 return new Peer(clientWrapper, loaderProxy, context, taskMode, url, protocol); … … 104 104 105 105 private: 106 Peer( PassRefPtr<ThreadableWebSocketChannelClientWrapper>, WorkerLoaderProxy&, ScriptExecutionContext*, const String& taskMode, const KURL&, const String& protocol);106 Peer(RefPtr<ThreadableWebSocketChannelClientWrapper>, WorkerLoaderProxy&, ScriptExecutionContext*, const String& taskMode, const KURL&, const String& protocol); 107 107 108 108 RefPtr<ThreadableWebSocketChannelClientWrapper> m_workerClientWrapper; … … 135 135 Bridge(PassRefPtr<ThreadableWebSocketChannelClientWrapper>, PassRefPtr<WorkerContext>, const String& taskMode, const KURL&, const String& protocol); 136 136 137 static void setWebSocketChannel(ScriptExecutionContext*, Bridge* thisPtr, Peer*, PassRefPtr<ThreadableWebSocketChannelClientWrapper>);137 static void setWebSocketChannel(ScriptExecutionContext*, Bridge* thisPtr, Peer*, RefPtr<ThreadableWebSocketChannelClientWrapper>); 138 138 139 139 // Executed on the main thread to create a Peer for this bridge. 140 static void mainThreadCreateWebSocketChannel(ScriptExecutionContext*, Bridge* thisPtr, PassRefPtr<ThreadableWebSocketChannelClientWrapper>, const String& taskMode, const KURL&, const String& protocol);140 static void mainThreadCreateWebSocketChannel(ScriptExecutionContext*, Bridge* thisPtr, RefPtr<ThreadableWebSocketChannelClientWrapper>, const String& taskMode, const KURL&, const String& protocol); 141 141 142 142 // Executed on the worker context's thread.
Note: See TracChangeset
for help on using the changeset viewer.