Changeset 194201 in webkit


Ignore:
Timestamp:
Dec 16, 2015 6:13:00 PM (8 years ago)
Author:
Gyuyoung Kim
Message:

Reduce PassRefPtr uses in dom - 2
​https://bugs.webkit.org/show_bug.cgi?id=151936

Reviewed by Darin Adler.

Change PassRefPtr with RefPtr<Foo>&&, WTF::move(), Foo*, and Foo&.

  • dom/ScopedEventQueue.h:
  • dom/ScriptedAnimationController.cpp:

(WebCore::ScriptedAnimationController::registerCallback):

  • dom/ScriptedAnimationController.h:
  • dom/StaticNodeList.h:
  • dom/Traversal.cpp:

(WebCore::NodeIteratorBase::NodeIteratorBase):

  • dom/Traversal.h:
  • dom/TreeWalker.cpp:

(WebCore::TreeWalker::TreeWalker):
(WebCore::TreeWalker::setCurrentNode):

  • dom/TreeWalker.h:

(WebCore::TreeWalker::create):

  • dom/UserActionElementSet.h:
  • dom/WebKitNamedFlow.cpp:

(WebCore::WebKitNamedFlow::WebKitNamedFlow):
(WebCore::WebKitNamedFlow::create):
(WebCore::WebKitNamedFlow::getRegionsByContent):
(WebCore::WebKitNamedFlow::getRegions):
(WebCore::WebKitNamedFlow::getContent):

  • dom/WebKitNamedFlow.h:
  • dom/WheelEvent.cpp:

(WebCore::WheelEvent::WheelEvent):
(WebCore::WheelEvent::initWheelEvent):
(WebCore::WheelEvent::initWebKitWheelEvent):

  • dom/WheelEvent.h:
Location:
trunk/Source/WebCore
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r194184 r194201  
     12015-12-16  Gyuyoung Kim  <gyuyoung.kim@webkit.org>
     2
     3        Reduce PassRefPtr uses in dom - 2
     4        https://bugs.webkit.org/show_bug.cgi?id=151936
     5
     6        Reviewed by Darin Adler.
     7
     8        Change PassRefPtr with RefPtr<Foo>&&, WTF::move(), Foo*, and Foo&.
     9
     10        * dom/ScopedEventQueue.h:
     11        * dom/ScriptedAnimationController.cpp:
     12        (WebCore::ScriptedAnimationController::registerCallback):
     13        * dom/ScriptedAnimationController.h:
     14        * dom/StaticNodeList.h:
     15        * dom/Traversal.cpp:
     16        (WebCore::NodeIteratorBase::NodeIteratorBase):
     17        * dom/Traversal.h:
     18        * dom/TreeWalker.cpp:
     19        (WebCore::TreeWalker::TreeWalker):
     20        (WebCore::TreeWalker::setCurrentNode):
     21        * dom/TreeWalker.h:
     22        (WebCore::TreeWalker::create):
     23        * dom/UserActionElementSet.h:
     24        * dom/WebKitNamedFlow.cpp:
     25        (WebCore::WebKitNamedFlow::WebKitNamedFlow):
     26        (WebCore::WebKitNamedFlow::create):
     27        (WebCore::WebKitNamedFlow::getRegionsByContent):
     28        (WebCore::WebKitNamedFlow::getRegions):
     29        (WebCore::WebKitNamedFlow::getContent):
     30        * dom/WebKitNamedFlow.h:
     31        * dom/WheelEvent.cpp:
     32        (WebCore::WheelEvent::WheelEvent):
     33        (WebCore::WheelEvent::initWheelEvent):
     34        (WebCore::WheelEvent::initWebKitWheelEvent):
     35        * dom/WheelEvent.h:
     36
    1372015-12-16  Simon Fraser  <simon.fraser@apple.com>
    238

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

    r194006 r194201  
    17491749        return nullptr;
    17501750    }
    1751     return TreeWalker::create(root, whatToShow, WTF::move(filter));
     1751    return TreeWalker::create(*root, whatToShow, WTF::move(filter));
    17521752}
    17531753

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

    r191792 r194201  
    7777    }
    7878
    79     RefPtr<WebKitNamedFlow> newFlow = WebKitNamedFlow::create(this, flowName);
     79    RefPtr<WebKitNamedFlow> newFlow = WebKitNamedFlow::create(*this, flowName);
    8080    m_namedFlows.add(newFlow.get());
    8181

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

    r190120 r194201  
    7878
    7979NodeIterator::NodeIterator(PassRefPtr<Node> rootNode, unsigned long whatToShow, RefPtr<NodeFilter>&& filter)
    80     : NodeIteratorBase(rootNode, whatToShow, WTF::move(filter))
     80    : NodeIteratorBase(*rootNode, whatToShow, WTF::move(filter))
    8181    , m_referenceNode(root(), true)
    8282{

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

    r192354 r194201  
    3434#include <wtf/NeverDestroyed.h>
    3535#include <wtf/Noncopyable.h>
    36 #include <wtf/PassRefPtr.h>
    3736#include <wtf/RefPtr.h>
    3837#include <wtf/Vector.h>

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

    r191351 r194201  
    6363class StaticElementList final : public NodeList {
    6464public:
    65     static PassRefPtr<StaticElementList> adopt(Vector<Ref<Element>>& elements)
     65    static Ref<StaticElementList> adopt(Vector<Ref<Element>>& elements)
    6666    {
    67         RefPtr<StaticElementList> nodeList = adoptRef(new StaticElementList);
     67        Ref<StaticElementList> nodeList = adoptRef(*new StaticElementList);
    6868        nodeList->m_elements.swap(elements);
    69         return nodeList.release();
     69        return nodeList;
    7070    }
    7171

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

    r190120 r194201  
    3131namespace WebCore {
    3232
    33 NodeIteratorBase::NodeIteratorBase(PassRefPtr<Node> rootNode, unsigned long whatToShow, RefPtr<NodeFilter>&& nodeFilter)
     33NodeIteratorBase::NodeIteratorBase(Node& rootNode, unsigned long whatToShow, RefPtr<NodeFilter>&& nodeFilter)
    3434    : m_root(rootNode)
    3535    , m_whatToShow(whatToShow)

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

    r190120 r194201  
    3636    class NodeIteratorBase {
    3737    public:
    38         Node* root() const { return m_root.get(); }
     38        Node* root() const { return &m_root; }
    3939        unsigned long whatToShow() const { return m_whatToShow; }
    4040        NodeFilter* filter() const { return m_filter.get(); }
    … …  
    4242
    4343    protected:
    44         NodeIteratorBase(PassRefPtr<Node>, unsigned long whatToShow, RefPtr<NodeFilter>&&);
     44        NodeIteratorBase(Node&, unsigned long whatToShow, RefPtr<NodeFilter>&&);
    4545        short acceptNode(Node*) const;
    4646
    4747    private:
    48         RefPtr<Node> m_root;
     48        Node& m_root;
    4949        unsigned long m_whatToShow;
    5050        RefPtr<NodeFilter> m_filter;

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

    r190187 r194201  
    3434namespace WebCore {
    3535
    36 TreeWalker::TreeWalker(PassRefPtr<Node> rootNode, unsigned long whatToShow, RefPtr<NodeFilter>&& filter)
     36TreeWalker::TreeWalker(Node& rootNode, unsigned long whatToShow, RefPtr<NodeFilter>&& filter)
    3737    : NodeIteratorBase(rootNode, whatToShow, WTF::move(filter))
    3838    , m_current(root())
    … …  
    4040}
    4141
    42 void TreeWalker::setCurrentNode(PassRefPtr<Node> node, ExceptionCode& ec)
     42void TreeWalker::setCurrentNode(Node* node, ExceptionCode& ec)
    4343{
    4444    if (!node) {

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

    r190187 r194201  
    3838    class TreeWalker : public ScriptWrappable, public RefCounted<TreeWalker>, public NodeIteratorBase {
    3939    public:
    40         static Ref<TreeWalker> create(PassRefPtr<Node> rootNode, unsigned long whatToShow, RefPtr<NodeFilter>&& filter)
     40        static Ref<TreeWalker> create(Node& rootNode, unsigned long whatToShow, RefPtr<NodeFilter>&& filter)
    4141        {
    4242            return adoptRef(*new TreeWalker(rootNode, whatToShow, WTF::move(filter)));
    … …  
    4444
    4545        Node* currentNode() const { return m_current.get(); }
    46         void setCurrentNode(PassRefPtr<Node>, ExceptionCode&);
     46        void setCurrentNode(Node*, ExceptionCode&);
    4747
    4848        Node* parentNode();
    … …  
    5555
    5656    private:
    57         TreeWalker(PassRefPtr<Node>, unsigned long whatToShow, RefPtr<NodeFilter>&&);
     57        TreeWalker(Node&, unsigned long whatToShow, RefPtr<NodeFilter>&&);
    5858        enum class SiblingTraversalType { Previous, Next };
    5959        template<SiblingTraversalType> Node* traverseSiblings();

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

    r164309 r194201  
    3030
    3131#include <wtf/HashMap.h>
    32 #include <wtf/PassRefPtr.h>
    3332#include <wtf/RefPtr.h>
    3433

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

    r184225 r194201  
    4040namespace WebCore {
    4141
    42 WebKitNamedFlow::WebKitNamedFlow(PassRefPtr<NamedFlowCollection> manager, const AtomicString& flowThreadName)
     42WebKitNamedFlow::WebKitNamedFlow(NamedFlowCollection& manager, const AtomicString& flowThreadName)
    4343    : m_flowThreadName(flowThreadName)
    4444    , m_flowManager(manager)
    … …  
    5050{
    5151    // The named flow is not "strong" referenced from anywhere at this time so it shouldn't be reused if the named flow is recreated.
    52     m_flowManager->discardNamedFlow(this);
    53 }
    54 
    55 Ref<WebKitNamedFlow> WebKitNamedFlow::create(PassRefPtr<NamedFlowCollection> manager, const AtomicString& flowThreadName)
     52    m_flowManager.discardNamedFlow(this);
     53}
     54
     55Ref<WebKitNamedFlow> WebKitNamedFlow::create(NamedFlowCollection& manager, const AtomicString& flowThreadName)
    5656{
    5757    return adoptRef(*new WebKitNamedFlow(manager, flowThreadName));
    … …  
    6565bool WebKitNamedFlow::overset() const
    6666{
    67     if (m_flowManager->document())
    68         m_flowManager->document()->updateLayoutIgnorePendingStylesheets();
     67    if (m_flowManager.document())
     68        m_flowManager.document()->updateLayoutIgnorePendingStylesheets();
    6969
    7070    // The renderer may be destroyed or created after the style update.
    … …  
    9393int WebKitNamedFlow::firstEmptyRegionIndex() const
    9494{
    95     if (m_flowManager->document())
    96         m_flowManager->document()->updateLayoutIgnorePendingStylesheets();
     95    if (m_flowManager.document())
     96        m_flowManager.document()->updateLayoutIgnorePendingStylesheets();
    9797
    9898    if (!m_parentFlowThread)
    … …  
    118118}
    119119
    120 PassRefPtr<NodeList> WebKitNamedFlow::getRegionsByContent(Node* contentNode)
     120Ref<NodeList> WebKitNamedFlow::getRegionsByContent(Node* contentNode)
    121121{
    122122    if (!contentNode)
    123123        return StaticElementList::createEmpty();
    124124
    125     if (m_flowManager->document())
    126         m_flowManager->document()->updateLayoutIgnorePendingStylesheets();
     125    if (m_flowManager.document())
     126        m_flowManager.document()->updateLayoutIgnorePendingStylesheets();
    127127
    128128    // The renderer may be destroyed or created after the style update.
    … …  
    152152}
    153153
    154 PassRefPtr<NodeList> WebKitNamedFlow::getRegions()
    155 {
    156     if (m_flowManager->document())
    157         m_flowManager->document()->updateLayoutIgnorePendingStylesheets();
     154Ref<NodeList> WebKitNamedFlow::getRegions()
     155{
     156    if (m_flowManager.document())
     157        m_flowManager.document()->updateLayoutIgnorePendingStylesheets();
    158158
    159159    // The renderer may be destroyed or created after the style update.
    … …  
    179179}
    180180
    181 PassRefPtr<NodeList> WebKitNamedFlow::getContent()
    182 {
    183     if (m_flowManager->document())
    184         m_flowManager->document()->updateLayoutIgnorePendingStylesheets();
     181Ref<NodeList> WebKitNamedFlow::getContent()
     182{
     183    if (m_flowManager.document())
     184        m_flowManager.document()->updateLayoutIgnorePendingStylesheets();
    185185
    186186    // The renderer may be destroyed or created after the style update.
    … …  
    217217        return;
    218218
    219     dispatchEvent(UIEvent::create(eventNames().webkitregionoversetchangeEvent, false, false, m_flowManager->document()->defaultView(), 0));
     219    dispatchEvent(UIEvent::create(eventNames().webkitregionoversetchangeEvent, false, false, m_flowManager.document()->defaultView(), 0));
    220220}
    221221
    222222ScriptExecutionContext* WebKitNamedFlow::scriptExecutionContext() const
    223223{
    224     return m_flowManager->document();
     224    return m_flowManager.document();
    225225}
    226226
    227227Node* WebKitNamedFlow::ownerNode() const
    228228{
    229     return m_flowManager->document();
     229    return m_flowManager.document();
    230230}
    231231

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

    r184225 r194201  
    4949class WebKitNamedFlow final : public RefCounted<WebKitNamedFlow>, public EventTargetWithInlineData {
    5050public:
    51     static Ref<WebKitNamedFlow> create(PassRefPtr<NamedFlowCollection> manager, const AtomicString& flowThreadName);
     51    static Ref<WebKitNamedFlow> create(NamedFlowCollection& manager, const AtomicString& flowThreadName);
    5252
    5353    ~WebKitNamedFlow();
    … …  
    5656    bool overset() const;
    5757    int firstEmptyRegionIndex() const;
    58     PassRefPtr<NodeList> getRegionsByContent(Node*);
    59     PassRefPtr<NodeList> getRegions();
    60     PassRefPtr<NodeList> getContent();
     58    Ref<NodeList> getRegionsByContent(Node*);
     59    Ref<NodeList> getRegions();
     60    Ref<NodeList> getContent();
    6161
    6262    using RefCounted<WebKitNamedFlow>::ref;
    … …  
    8282
    8383private:
    84     WebKitNamedFlow(PassRefPtr<NamedFlowCollection>, const AtomicString&);
     84    WebKitNamedFlow(NamedFlowCollection&, const AtomicString&);
    8585
    8686    // EventTarget implementation.
    … …  
    9191    AtomicString m_flowThreadName;
    9292
    93     RefPtr<NamedFlowCollection> m_flowManager;
     93    NamedFlowCollection& m_flowManager;
    9494    RenderNamedFlowThread* m_parentFlowThread;
    9595};

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

    r192903 r194201  
    6666}
    6767
    68 WheelEvent::WheelEvent(const PlatformWheelEvent& event, PassRefPtr<AbstractView> view)
     68WheelEvent::WheelEvent(const PlatformWheelEvent& event, AbstractView* view)
    6969    : MouseEvent(eventNames().wheelEvent, true, true, event.timestamp(), view, 0, event.globalPosition().x(), event.globalPosition().y(), event.position().x(), event.position().y()
    7070#if ENABLE(POINTER_LOCK)
    … …  
    8282}
    8383
    84 void WheelEvent::initWheelEvent(int rawDeltaX, int rawDeltaY, PassRefPtr<AbstractView> view, int screenX, int screenY, int pageX, int pageY, bool ctrlKey, bool altKey, bool shiftKey, bool metaKey)
     84void WheelEvent::initWheelEvent(int rawDeltaX, int rawDeltaY, AbstractView* view, int screenX, int screenY, int pageX, int pageY, bool ctrlKey, bool altKey, bool shiftKey, bool metaKey)
    8585{
    8686    if (dispatched())
    … …  
    105105}
    106106
    107 void WheelEvent::initWebKitWheelEvent(int rawDeltaX, int rawDeltaY, PassRefPtr<AbstractView> view, int screenX, int screenY, int pageX, int pageY, bool ctrlKey, bool altKey, bool shiftKey, bool metaKey)
     107void WheelEvent::initWebKitWheelEvent(int rawDeltaX, int rawDeltaY, AbstractView* view, int screenX, int screenY, int pageX, int pageY, bool ctrlKey, bool altKey, bool shiftKey, bool metaKey)
    108108{
    109109    initWheelEvent(rawDeltaX, rawDeltaY, view, screenX, screenY, pageX, pageY, ctrlKey, altKey, shiftKey, metaKey);

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

    r192903 r194201  
    6565    }
    6666
    67     static Ref<WheelEvent> create(const PlatformWheelEvent& event, PassRefPtr<AbstractView> view)
     67    static Ref<WheelEvent> create(const PlatformWheelEvent& event, AbstractView* view)
    6868    {
    6969        return adoptRef(*new WheelEvent(event, view));
    7070    }
    7171
    72     void initWheelEvent(int rawDeltaX, int rawDeltaY, PassRefPtr<AbstractView>,
     72    void initWheelEvent(int rawDeltaX, int rawDeltaY, AbstractView*,
    7373        int screenX, int screenY, int pageX, int pageY,
    7474        bool ctrlKey, bool altKey, bool shiftKey, bool metaKey);
    7575
    76     void initWebKitWheelEvent(int rawDeltaX, int rawDeltaY, PassRefPtr<AbstractView>,
     76    void initWebKitWheelEvent(int rawDeltaX, int rawDeltaY, AbstractView*,
    7777        int screenX, int screenY, int pageX, int pageY,
    7878        bool ctrlKey, bool altKey, bool shiftKey, bool metaKey);
    … …  
    101101    WheelEvent();
    102102    WheelEvent(const AtomicString&, const WheelEventInit&);
    103     WheelEvent(const PlatformWheelEvent&, PassRefPtr<AbstractView>);
     103    WheelEvent(const PlatformWheelEvent&, AbstractView*);
    104104
    105105    virtual bool isWheelEvent() const override;
Note: See TracChangeset for help on using the changeset viewer.