Changeset 89402 in webkit


Ignore:
Timestamp:
Jun 21, 2011 7:36:45 PM (13 years ago)
Author:
Darin Adler
Message:

2011-06-21 Darin Adler <Darin Adler>

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.
Location:
trunk/Source/WebCore
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r89401 r89402  
     12011-06-21  Darin Adler  <darin@apple.com>
     2
     3        Reviewed by Ryosuke Niwa.
     4
     5        RefPtr misused as argument type in a few classes
     6        https://bugs.webkit.org/show_bug.cgi?id=62955
     7
     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        * page/WebKitAnimationList.cpp:
     18        (WebCore::WebKitAnimationList::append):
     19        (WebCore::WebKitAnimationList::insertAnimation):
     20        * page/WebKitAnimationList.h:
     21        * svg/graphics/filters/SVGFEImage.cpp:
     22        (WebCore::FEImage::FEImage):
     23        (WebCore::FEImage::create):
     24        * svg/graphics/filters/SVGFEImage.h:
     25        * svg/graphics/filters/SVGFilterBuilder.cpp:
     26        (WebCore::SVGFilterBuilder::SVGFilterBuilder):
     27        (WebCore::SVGFilterBuilder::add):
     28        (WebCore::SVGFilterBuilder::appendEffectToEffectReferences):
     29        * svg/graphics/filters/SVGFilterBuilder.h:
     30        * websockets/ThreadableWebSocketChannelClientWrapper.cpp:
     31        (WebCore::ThreadableWebSocketChannelClientWrapper::didConnectCallback):
     32        (WebCore::ThreadableWebSocketChannelClientWrapper::didReceiveMessageCallback):
     33        (WebCore::ThreadableWebSocketChannelClientWrapper::didStartClosingHandshakeCallback):
     34        (WebCore::ThreadableWebSocketChannelClientWrapper::didCloseCallback):
     35        * websockets/ThreadableWebSocketChannelClientWrapper.h:
     36        * websockets/WorkerThreadableWebSocketChannel.cpp:
     37        (WebCore::WorkerThreadableWebSocketChannel::Peer::Peer):
     38        (WebCore::WorkerThreadableWebSocketChannel::Bridge::setWebSocketChannel):
     39        (WebCore::WorkerThreadableWebSocketChannel::Bridge::mainThreadCreateWebSocketChannel):
     40        * websockets/WorkerThreadableWebSocketChannel.h:
     41        Use PassRefPtr or raw pointer as appropriate for RefPtr arguments.
     42
    1432011-06-20  MORITA Hajime  <morrita@google.com>
    244

  • trunk/Source/WebCore/dom/DataTransferItem.cpp

    r89224 r89402  
    4141const char DataTransferItem::kindFile[] = "file";
    4242
    43 DataTransferItem::DataTransferItem(RefPtr<Clipboard> owner, const String& kind, const String& type)
     43DataTransferItem::DataTransferItem(PassRefPtr<Clipboard> owner, const String& kind, const String& type)
    4444    : m_owner(owner)
    4545    , m_kind(kind)

  • trunk/Source/WebCore/dom/DataTransferItem.h

    r89224 r89402  
    6161
    6262protected:
    63     DataTransferItem(RefPtr<Clipboard> owner, const String& kind, const String& type);
     63    DataTransferItem(PassRefPtr<Clipboard> owner, const String& kind, const String& type);
    6464    Clipboard* owner();
    6565

  • trunk/Source/WebCore/dom/DataTransferItems.cpp

    r89224 r89402  
    4040namespace WebCore {
    4141
    42 DataTransferItems::DataTransferItems(RefPtr<Clipboard> clipboard, ScriptExecutionContext* context)
     42DataTransferItems::DataTransferItems(PassRefPtr<Clipboard> clipboard, ScriptExecutionContext* context)
    4343    : m_owner(clipboard)
    4444    , m_context(context)

  • trunk/Source/WebCore/dom/DataTransferItems.h

    r89224 r89402  
    5555
    5656protected:
    57     DataTransferItems(RefPtr<Clipboard>, ScriptExecutionContext*);
     57    DataTransferItems(PassRefPtr<Clipboard>, ScriptExecutionContext*);
    5858
    5959protected:

  • trunk/Source/WebCore/editing/CompositeEditCommand.cpp

    r89283 r89402  
    462462}
    463463
    464 void CompositeEditCommand::rebalanceWhitespaceOnTextSubstring(RefPtr<Text> textNode, int startOffset, int endOffset)
    465 {
     464void CompositeEditCommand::rebalanceWhitespaceOnTextSubstring(PassRefPtr<Text> prpTextNode, int startOffset, int endOffset)
     465{
     466    RefPtr<Text> textNode = prpTextNode;
     467
    466468    String text = textNode->data();
    467469    ASSERT(!text.isEmpty());
    … …  
    491493   
    492494    if (string != rebalancedString)
    493         replaceTextInNodePreservingMarkers(textNode, upstream, length, rebalancedString);
     495        replaceTextInNodePreservingMarkers(textNode.release(), upstream, length, rebalancedString);
    494496}
    495497

  • trunk/Source/WebCore/editing/CompositeEditCommand.h

    r89224 r89402  
    7070    void rebalanceWhitespace();
    7171    void rebalanceWhitespaceAt(const Position&);
    72     void rebalanceWhitespaceOnTextSubstring(RefPtr<Text>, int startOffset, int endOffset);
     72    void rebalanceWhitespaceOnTextSubstring(PassRefPtr<Text>, int startOffset, int endOffset);
    7373    void prepareWhitespaceAtPositionForSplit(Position&);
    7474    bool canRebalance(const Position&) const;

  • trunk/Source/WebCore/page/WebKitAnimationList.cpp

    r89224 r89402  
    2727#include "WebKitAnimationList.h"
    2828
    29 #include "Animation.h"
    30 #include "AnimationBase.h"
    31 #include "RenderStyle.h"
    3229#include "WebKitAnimation.h"
    3330
    … …  
    6259}
    6360
    64 void WebKitAnimationList::append(RefPtr<WebKitAnimation> animation)
     61void WebKitAnimationList::append(PassRefPtr<WebKitAnimation> animation)
    6562{
    6663    m_animations.append(animation);
    6764}
    6865
    69 unsigned WebKitAnimationList::insertAnimation(RefPtr<WebKitAnimation> animation, unsigned index)
     66unsigned WebKitAnimationList::insertAnimation(PassRefPtr<WebKitAnimation> animation, unsigned index)
    7067{
    7168    if (!animation)
    … …  
    8077
    8178} // namespace WebCore
    82 

  • trunk/Source/WebCore/page/WebKitAnimationList.h

    r89224 r89402  
    4040    static PassRefPtr<WebKitAnimationList> create()
    4141    {
    42         return adoptRef(new WebKitAnimationList());
     42        return adoptRef(new WebKitAnimationList);
    4343    }
    4444    ~WebKitAnimationList();
    … …  
    4747    WebKitAnimation* item(unsigned index);
    4848
    49     unsigned insertAnimation(RefPtr<WebKitAnimation>, unsigned index);
     49    unsigned insertAnimation(PassRefPtr<WebKitAnimation>, unsigned index);
    5050    void deleteAnimation(unsigned index);
    51     void append(RefPtr<WebKitAnimation>);
     51    void append(PassRefPtr<WebKitAnimation>);
    5252
    5353private:

  • trunk/Source/WebCore/svg/graphics/filters/SVGFEImage.cpp

    r89224 r89402  
    3535namespace WebCore {
    3636
    37 FEImage::FEImage(Filter* filter, RefPtr<Image> image, const SVGPreserveAspectRatio& preserveAspectRatio)
     37FEImage::FEImage(Filter* filter, PassRefPtr<Image> image, const SVGPreserveAspectRatio& preserveAspectRatio)
    3838    : FilterEffect(filter)
    3939    , m_image(image)
    … …  
    4242}
    4343
    44 PassRefPtr<FEImage> FEImage::create(Filter* filter, RefPtr<Image> image, const SVGPreserveAspectRatio& preserveAspectRatio)
     44PassRefPtr<FEImage> FEImage::create(Filter* filter, PassRefPtr<Image> image, const SVGPreserveAspectRatio& preserveAspectRatio)
    4545{
    4646    return adoptRef(new FEImage(filter, image, preserveAspectRatio));

  • trunk/Source/WebCore/svg/graphics/filters/SVGFEImage.h

    r89224 r89402  
    3434class FEImage : public FilterEffect {
    3535public:
    36     static PassRefPtr<FEImage> create(Filter*, RefPtr<Image>, const SVGPreserveAspectRatio&);
     36    static PassRefPtr<FEImage> create(Filter*, PassRefPtr<Image>, const SVGPreserveAspectRatio&);
    3737
    3838    void setAbsoluteSubregion(const FloatRect& absoluteSubregion) { m_absoluteSubregion = absoluteSubregion; }
    … …  
    4848   
    4949private:
    50     FEImage(Filter*, RefPtr<Image>, const SVGPreserveAspectRatio&);
     50    FEImage(Filter*, PassRefPtr<Image>, const SVGPreserveAspectRatio&);
    5151
    5252    RefPtr<Image> m_image;

  • trunk/Source/WebCore/svg/graphics/filters/SVGFilterBuilder.cpp

    r89224 r89402  
    3333
    3434SVGFilterBuilder::SVGFilterBuilder(Filter* filter)
    35     : m_lastEffect(0)
    3635{
    3736    m_builtinEffects.add(SourceGraphic::effectName(), SourceGraphic::create(filter));
    … …  
    4039}
    4140
    42 void SVGFilterBuilder::add(const AtomicString& id, RefPtr<FilterEffect> effect)
     41void SVGFilterBuilder::add(const AtomicString& id, PassRefPtr<FilterEffect> effect)
    4342{
    4443    if (id.isEmpty()) {
    … …  
    6968}
    7069
    71 void SVGFilterBuilder::appendEffectToEffectReferences(RefPtr<FilterEffect> effectReference, RenderObject* object)
     70void SVGFilterBuilder::appendEffectToEffectReferences(PassRefPtr<FilterEffect> prpEffect, RenderObject* object)
    7271{
     72    RefPtr<FilterEffect> effect = prpEffect;
     73
    7374    // The effect must be a newly created filter effect.
    74     ASSERT(!m_effectReferences.contains(effectReference));
     75    ASSERT(!m_effectReferences.contains(effect));
    7576    ASSERT(object && !m_effectRenderer.contains(object));
    76     m_effectReferences.add(effectReference, FilterEffectSet());
     77    m_effectReferences.add(effect, FilterEffectSet());
    7778
    78     FilterEffect* effect = effectReference.get();
    7979    unsigned numberOfInputEffects = effect->inputEffects().size();
    8080
    8181    // It is not possible to add the same value to a set twice.
    8282    for (unsigned i = 0; i < numberOfInputEffects; ++i)
    83         effectReferences(effect->inputEffect(i)).add(effect);
    84     m_effectRenderer.add(object, effectReference.get());
     83        effectReferences(effect->inputEffect(i)).add(effect.get());
     84    m_effectRenderer.add(object, effect.get());
    8585}
    8686

  • trunk/Source/WebCore/svg/graphics/filters/SVGFilterBuilder.h

    r89224 r89402  
    4040    static PassRefPtr<SVGFilterBuilder> create(Filter* filter) { return adoptRef(new SVGFilterBuilder(filter)); }
    4141
    42     void add(const AtomicString& id, RefPtr<FilterEffect> effect);
     42    void add(const AtomicString& id, PassRefPtr<FilterEffect>);
    4343
    4444    FilterEffect* getEffectById(const AtomicString& id) const;
    4545    FilterEffect* lastEffect() const { return m_lastEffect.get(); }
    4646
    47     void appendEffectToEffectReferences(RefPtr<FilterEffect>, RenderObject*);
     47    void appendEffectToEffectReferences(PassRefPtr<FilterEffect>, RenderObject*);
    4848
    4949    inline FilterEffectSet& effectReferences(FilterEffect* effect)

  • trunk/Source/WebCore/websockets/ThreadableWebSocketChannelClientWrapper.cpp

    r89224 r89402  
    145145}
    146146
    147 void ThreadableWebSocketChannelClientWrapper::didConnectCallback(ScriptExecutionContext* context, RefPtr<ThreadableWebSocketChannelClientWrapper> wrapper)
     147void ThreadableWebSocketChannelClientWrapper::didConnectCallback(ScriptExecutionContext* context, ThreadableWebSocketChannelClientWrapper* wrapper)
    148148{
    149149    ASSERT_UNUSED(context, !context);
    … …  
    152152}
    153153
    154 void ThreadableWebSocketChannelClientWrapper::didReceiveMessageCallback(ScriptExecutionContext* context, RefPtr<ThreadableWebSocketChannelClientWrapper> wrapper, String message)
     154void ThreadableWebSocketChannelClientWrapper::didReceiveMessageCallback(ScriptExecutionContext* context, ThreadableWebSocketChannelClientWrapper* wrapper, String message)
    155155{
    156156    ASSERT_UNUSED(context, !context);
    … …  
    159159}
    160160
    161 void ThreadableWebSocketChannelClientWrapper::didStartClosingHandshakeCallback(ScriptExecutionContext* context, RefPtr<ThreadableWebSocketChannelClientWrapper> wrapper)
     161void ThreadableWebSocketChannelClientWrapper::didStartClosingHandshakeCallback(ScriptExecutionContext* context, ThreadableWebSocketChannelClientWrapper* wrapper)
    162162{
    163163    ASSERT_UNUSED(context, !context);
    … …  
    166166}
    167167
    168 void ThreadableWebSocketChannelClientWrapper::didCloseCallback(ScriptExecutionContext* context, RefPtr<ThreadableWebSocketChannelClientWrapper> wrapper, unsigned long unhandledBufferedAmount, WebSocketChannelClient::ClosingHandshakeCompletionStatus closingHandshakeCompletion)
     168void ThreadableWebSocketChannelClientWrapper::didCloseCallback(ScriptExecutionContext* context, ThreadableWebSocketChannelClientWrapper* wrapper, unsigned long unhandledBufferedAmount, WebSocketChannelClient::ClosingHandshakeCompletionStatus closingHandshakeCompletion)
    169169{
    170170    ASSERT_UNUSED(context, !context);

  • trunk/Source/WebCore/websockets/ThreadableWebSocketChannelClientWrapper.h

    r89224 r89402  
    7474
    7575    void processPendingTasks();
    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);
     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);
    8080
    8181    WebSocketChannelClient* m_client;

  • trunk/Source/WebCore/websockets/WorkerThreadableWebSocketChannel.cpp

    r89224 r89402  
    115115}
    116116
    117 WorkerThreadableWebSocketChannel::Peer::Peer(RefPtr<ThreadableWebSocketChannelClientWrapper> clientWrapper, WorkerLoaderProxy& loaderProxy, ScriptExecutionContext* context, const String& taskMode, const KURL& url, const String& protocol)
     117WorkerThreadableWebSocketChannel::Peer::Peer(PassRefPtr<ThreadableWebSocketChannelClientWrapper> clientWrapper, WorkerLoaderProxy& loaderProxy, ScriptExecutionContext* context, const String& taskMode, const KURL& url, const String& protocol)
    118118    : m_workerClientWrapper(clientWrapper)
    119119    , m_loaderProxy(loaderProxy)
    … …  
    259259}
    260260
    261 void WorkerThreadableWebSocketChannel::Bridge::setWebSocketChannel(ScriptExecutionContext* context, Bridge* thisPtr, Peer* peer, RefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper)
     261void WorkerThreadableWebSocketChannel::Bridge::setWebSocketChannel(ScriptExecutionContext* context, Bridge* thisPtr, Peer* peer, PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper)
    262262{
    263263    ASSERT_UNUSED(context, context->isWorkerContext());
    … …  
    266266}
    267267
    268 void WorkerThreadableWebSocketChannel::Bridge::mainThreadCreateWebSocketChannel(ScriptExecutionContext* context, Bridge* thisPtr, RefPtr<ThreadableWebSocketChannelClientWrapper> clientWrapper, const String& taskMode, const KURL& url, const String& protocol)
     268void WorkerThreadableWebSocketChannel::Bridge::mainThreadCreateWebSocketChannel(ScriptExecutionContext* context, Bridge* thisPtr, PassRefPtr<ThreadableWebSocketChannelClientWrapper> clientWrapper, const String& taskMode, const KURL& url, const String& protocol)
    269269{
    270270    ASSERT(isMainThread());

  • trunk/Source/WebCore/websockets/WorkerThreadableWebSocketChannel.h

    r89224 r89402  
    8383        WTF_MAKE_NONCOPYABLE(Peer); WTF_MAKE_FAST_ALLOCATED;
    8484    public:
    85         static Peer* create(RefPtr<ThreadableWebSocketChannelClientWrapper> clientWrapper, WorkerLoaderProxy& loaderProxy, ScriptExecutionContext* context, const String& taskMode, const KURL& url, const String& protocol)
     85        static Peer* create(PassRefPtr<ThreadableWebSocketChannelClientWrapper> clientWrapper, WorkerLoaderProxy& loaderProxy, ScriptExecutionContext* context, const String& taskMode, const KURL& url, const String& protocol)
    8686        {
    8787            return new Peer(clientWrapper, loaderProxy, context, taskMode, url, protocol);
    … …  
    104104
    105105    private:
    106         Peer(RefPtr<ThreadableWebSocketChannelClientWrapper>, WorkerLoaderProxy&, ScriptExecutionContext*, const String& taskMode, const KURL&, const String& protocol);
     106        Peer(PassRefPtr<ThreadableWebSocketChannelClientWrapper>, WorkerLoaderProxy&, ScriptExecutionContext*, const String& taskMode, const KURL&, const String& protocol);
    107107
    108108        RefPtr<ThreadableWebSocketChannelClientWrapper> m_workerClientWrapper;
    … …  
    135135        Bridge(PassRefPtr<ThreadableWebSocketChannelClientWrapper>, PassRefPtr<WorkerContext>, const String& taskMode, const KURL&, const String& protocol);
    136136
    137         static void setWebSocketChannel(ScriptExecutionContext*, Bridge* thisPtr, Peer*, RefPtr<ThreadableWebSocketChannelClientWrapper>);
     137        static void setWebSocketChannel(ScriptExecutionContext*, Bridge* thisPtr, Peer*, PassRefPtr<ThreadableWebSocketChannelClientWrapper>);
    138138
    139139        // Executed on the main thread to create a Peer for this bridge.
    140         static void mainThreadCreateWebSocketChannel(ScriptExecutionContext*, Bridge* thisPtr, RefPtr<ThreadableWebSocketChannelClientWrapper>, const String& taskMode, const KURL&, const String& protocol);
     140        static void mainThreadCreateWebSocketChannel(ScriptExecutionContext*, Bridge* thisPtr, PassRefPtr<ThreadableWebSocketChannelClientWrapper>, const String& taskMode, const KURL&, const String& protocol);
    141141
    142142        // Executed on the worker context's thread.
Note: See TracChangeset for help on using the changeset viewer.