Changeset 216473 in webkit


Ignore:
Timestamp:
May 8, 2017, 7:22:45 PM (8 years ago)
Author:
achristensen@apple.com
Message:

Reduce PassRefPtr use in WebKit2
​https://bugs.webkit.org/show_bug.cgi?id=171831

Reviewed by Chris Dumez.

  • UIProcess/API/C/WKPageGroup.cpp:

(WKPageGroupCreateWithIdentifier):

  • UIProcess/GenericCallback.h:

(WebKit::GenericCallback::create):
(WebKit::CallbackMap::put):

  • UIProcess/StatisticsRequest.cpp:

(WebKit::StatisticsRequest::StatisticsRequest):

  • UIProcess/StatisticsRequest.h:

(WebKit::StatisticsRequest::create):

  • UIProcess/TextChecker.h:
  • UIProcess/TextCheckerCompletion.cpp:

(WebKit::TextCheckerCompletion::create):

  • UIProcess/TextCheckerCompletion.h:
  • UIProcess/WebColorPicker.h:

(WebKit::WebColorPicker::create):

  • UIProcess/WebConnectionToWebProcess.cpp:

(WebKit::WebConnectionToWebProcess::create):

  • UIProcess/WebConnectionToWebProcess.h:
  • UIProcess/WebContextInjectedBundleClient.cpp:

(WebKit::WebContextInjectedBundleClient::getInjectedBundleInitializationUserData):

  • UIProcess/WebContextInjectedBundleClient.h:
  • UIProcess/WebContextMenuListenerProxy.h:

(WebKit::WebContextMenuListenerProxy::create):

  • UIProcess/WebCookieManagerProxy.cpp:

(WebKit::WebCookieManagerProxy::create):

  • UIProcess/WebCookieManagerProxy.h:
  • UIProcess/WebEditCommandProxy.h:

(WebKit::WebEditCommandProxy::create):

  • UIProcess/WebFormSubmissionListenerProxy.h:

(WebKit::WebFormSubmissionListenerProxy::create):

  • UIProcess/WebFrameListenerProxy.h:
  • UIProcess/WebFrameProxy.h:

(WebKit::WebFrameProxy::create):

  • UIProcess/WebFullScreenManagerProxy.cpp:

(WebKit::WebFullScreenManagerProxy::create):

  • UIProcess/WebFullScreenManagerProxy.h:
  • UIProcess/WebGeolocationManagerProxy.cpp:

(WebKit::WebGeolocationManagerProxy::create):

  • UIProcess/WebGeolocationManagerProxy.h:
  • UIProcess/WebIconDatabase.cpp:

(WebKit::WebIconDatabase::create):
(WebKit::WebIconDatabase::iconDataForPageURL):

  • UIProcess/WebIconDatabase.h:
  • UIProcess/WebMediaSessionFocusManager.cpp:

(WebKit::WebMediaSessionFocusManager::create):

  • UIProcess/WebMediaSessionFocusManager.h:
  • UIProcess/WebOpenPanelResultListenerProxy.h:

(WebKit::WebOpenPanelResultListenerProxy::create):

  • UIProcess/WebPageGroup.cpp:

(WebKit::WebPageGroup::create):

  • UIProcess/WebPageGroup.h:
  • UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::forceRepaint):
(WebKit::WebPageProxy::computePagesForPrinting):
(WebKit::WebPageProxy::drawRectToImage):
(WebKit::WebPageProxy::drawPagesToPDF):
(WebKit::WebPageProxy::drawPagesForPrinting):
(WebKit::WebPageProxy::callAfterNextPresentationUpdate):

  • UIProcess/WebPageProxy.h:
  • UIProcess/ios/TextCheckerIOS.mm:

(WebKit::TextChecker::requestCheckingOfString):

  • UIProcess/mac/TextCheckerMac.mm:

(WebKit::TextChecker::requestCheckingOfString):

  • UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h:
  • UIProcess/mac/WKFullScreenWindowController.mm:

(-[WKFullScreenWindowController finishedExitFullScreenAnimation:]):

  • UIProcess/mac/WKPrintingView.mm:

(-[WKPrintingView _preparePDFDataForPrintingOnSecondaryThread]):
(-[WKPrintingView _drawPreview:]):

  • WebProcess/Plugins/Netscape/NetscapePlugin.cpp:

(WebKit::NetscapePlugin::loadURL):
(WebKit::NetscapePlugin::manualStreamDidReceiveResponse):

  • WebProcess/Plugins/Netscape/NetscapePluginStream.cpp:

(WebKit::NetscapePluginStream::NetscapePluginStream):

  • WebProcess/Plugins/Netscape/NetscapePluginStream.h:

(WebKit::NetscapePluginStream::create):

  • WebProcess/WebCoreSupport/SessionStateConversion.cpp:

(WebKit::toFormData):

Location:
trunk/Source/WebKit2
Files:
43 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r216463 r216473  
     12017-05-08  Alex Christensen  <achristensen@webkit.org>
     2
     3        Reduce PassRefPtr use in WebKit2
     4        https://bugs.webkit.org/show_bug.cgi?id=171831
     5
     6        Reviewed by Chris Dumez.
     7
     8        * UIProcess/API/C/WKPageGroup.cpp:
     9        (WKPageGroupCreateWithIdentifier):
     10        * UIProcess/GenericCallback.h:
     11        (WebKit::GenericCallback::create):
     12        (WebKit::CallbackMap::put):
     13        * UIProcess/StatisticsRequest.cpp:
     14        (WebKit::StatisticsRequest::StatisticsRequest):
     15        * UIProcess/StatisticsRequest.h:
     16        (WebKit::StatisticsRequest::create):
     17        * UIProcess/TextChecker.h:
     18        * UIProcess/TextCheckerCompletion.cpp:
     19        (WebKit::TextCheckerCompletion::create):
     20        * UIProcess/TextCheckerCompletion.h:
     21        * UIProcess/WebColorPicker.h:
     22        (WebKit::WebColorPicker::create):
     23        * UIProcess/WebConnectionToWebProcess.cpp:
     24        (WebKit::WebConnectionToWebProcess::create):
     25        * UIProcess/WebConnectionToWebProcess.h:
     26        * UIProcess/WebContextInjectedBundleClient.cpp:
     27        (WebKit::WebContextInjectedBundleClient::getInjectedBundleInitializationUserData):
     28        * UIProcess/WebContextInjectedBundleClient.h:
     29        * UIProcess/WebContextMenuListenerProxy.h:
     30        (WebKit::WebContextMenuListenerProxy::create):
     31        * UIProcess/WebCookieManagerProxy.cpp:
     32        (WebKit::WebCookieManagerProxy::create):
     33        * UIProcess/WebCookieManagerProxy.h:
     34        * UIProcess/WebEditCommandProxy.h:
     35        (WebKit::WebEditCommandProxy::create):
     36        * UIProcess/WebFormSubmissionListenerProxy.h:
     37        (WebKit::WebFormSubmissionListenerProxy::create):
     38        * UIProcess/WebFrameListenerProxy.h:
     39        * UIProcess/WebFrameProxy.h:
     40        (WebKit::WebFrameProxy::create):
     41        * UIProcess/WebFullScreenManagerProxy.cpp:
     42        (WebKit::WebFullScreenManagerProxy::create):
     43        * UIProcess/WebFullScreenManagerProxy.h:
     44        * UIProcess/WebGeolocationManagerProxy.cpp:
     45        (WebKit::WebGeolocationManagerProxy::create):
     46        * UIProcess/WebGeolocationManagerProxy.h:
     47        * UIProcess/WebIconDatabase.cpp:
     48        (WebKit::WebIconDatabase::create):
     49        (WebKit::WebIconDatabase::iconDataForPageURL):
     50        * UIProcess/WebIconDatabase.h:
     51        * UIProcess/WebMediaSessionFocusManager.cpp:
     52        (WebKit::WebMediaSessionFocusManager::create):
     53        * UIProcess/WebMediaSessionFocusManager.h:
     54        * UIProcess/WebOpenPanelResultListenerProxy.h:
     55        (WebKit::WebOpenPanelResultListenerProxy::create):
     56        * UIProcess/WebPageGroup.cpp:
     57        (WebKit::WebPageGroup::create):
     58        * UIProcess/WebPageGroup.h:
     59        * UIProcess/WebPageProxy.cpp:
     60        (WebKit::WebPageProxy::forceRepaint):
     61        (WebKit::WebPageProxy::computePagesForPrinting):
     62        (WebKit::WebPageProxy::drawRectToImage):
     63        (WebKit::WebPageProxy::drawPagesToPDF):
     64        (WebKit::WebPageProxy::drawPagesForPrinting):
     65        (WebKit::WebPageProxy::callAfterNextPresentationUpdate):
     66        * UIProcess/WebPageProxy.h:
     67        * UIProcess/ios/TextCheckerIOS.mm:
     68        (WebKit::TextChecker::requestCheckingOfString):
     69        * UIProcess/mac/TextCheckerMac.mm:
     70        (WebKit::TextChecker::requestCheckingOfString):
     71        * UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h:
     72        * UIProcess/mac/WKFullScreenWindowController.mm:
     73        (-[WKFullScreenWindowController finishedExitFullScreenAnimation:]):
     74        * UIProcess/mac/WKPrintingView.mm:
     75        (-[WKPrintingView _preparePDFDataForPrintingOnSecondaryThread]):
     76        (-[WKPrintingView _drawPreview:]):
     77        * WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
     78        (WebKit::NetscapePlugin::loadURL):
     79        (WebKit::NetscapePlugin::manualStreamDidReceiveResponse):
     80        * WebProcess/Plugins/Netscape/NetscapePluginStream.cpp:
     81        (WebKit::NetscapePluginStream::NetscapePluginStream):
     82        * WebProcess/Plugins/Netscape/NetscapePluginStream.h:
     83        (WebKit::NetscapePluginStream::create):
     84        * WebProcess/WebCoreSupport/SessionStateConversion.cpp:
     85        (WebKit::toFormData):
     86
    1872017-05-08  Youenn Fablet  <youenn@apple.com>
    288

  • trunk/Source/WebKit2/UIProcess/API/C/WKPageGroup.cpp

    r213696 r216473  
    4646{
    4747    auto pageGroup = WebPageGroup::create(toWTFString(identifier));
    48     return toAPI(pageGroup.leakRef());
     48    return toAPI(&pageGroup.leakRef());
    4949}
    5050

  • trunk/Source/WebKit2/UIProcess/GenericCallback.h

    r213777 r216473  
    2424 */
    2525
    26 #ifndef GenericCallback_h
    27 #define GenericCallback_h
     26#pragma once
    2827
    2928#include "APIError.h"
    … …  
    3534#include <wtf/Function.h>
    3635#include <wtf/HashMap.h>
    37 #include <wtf/PassRefPtr.h>
    3836#include <wtf/RefCounted.h>
    3937#include <wtf/RunLoop.h>
    … …  
    9694    typedef Function<void (T..., Error)> CallbackFunction;
    9795
    98     static PassRefPtr<GenericCallback> create(CallbackFunction&& callback, const ProcessThrottler::BackgroundActivityToken& activityToken = nullptr)
    99     {
    100         return adoptRef(new GenericCallback(WTFMove(callback), activityToken));
     96    static Ref<GenericCallback> create(CallbackFunction&& callback, const ProcessThrottler::BackgroundActivityToken& activityToken = nullptr)
     97    {
     98        return adoptRef(*new GenericCallback(WTFMove(callback), activityToken));
    10199    }
    102100
    … …  
    173171class CallbackMap {
    174172public:
    175     uint64_t put(PassRefPtr<CallbackBase> callback)
     173    uint64_t put(Ref<CallbackBase>&& callback)
    176174    {
    177175        ASSERT(!m_map.contains(callback->callbackID()));
    178176
    179177        uint64_t callbackID = callback->callbackID();
    180         m_map.set(callbackID, callback);
     178        m_map.set(callbackID, WTFMove(callback));
    181179        return callbackID;
    182180    }
    … …  
    193191
    194192    template<typename... T>
    195     uint64_t put(std::function<void (T...)> function, const ProcessThrottler::BackgroundActivityToken& activityToken)
     193    uint64_t put(std::function<void(T...)>&& function, const ProcessThrottler::BackgroundActivityToken& activityToken)
    196194    {
    197195        auto callback = GenericCallbackType<sizeof...(T), T...>::type::create(WTFMove(function), activityToken);
    198         return put(callback);
     196        return put(WTFMove(callback));
    199197    }
    200198
    201199    template<typename... T>
    202     uint64_t put(Function<void (T...)>&& function, const ProcessThrottler::BackgroundActivityToken& activityToken)
     200    uint64_t put(Function<void(T...)>&& function, const ProcessThrottler::BackgroundActivityToken& activityToken)
    203201    {
    204202        auto callback = GenericCallbackType<sizeof...(T), T...>::type::create(WTFMove(function), activityToken);
    205         return put(callback);
     203        return put(WTFMove(callback));
    206204    }
    207205
    … …  
    226224
    227225} // namespace WebKit
    228 
    229 #endif // GenericCallback_h

  • trunk/Source/WebKit2/UIProcess/StatisticsRequest.cpp

    r194496 r216473  
    3232namespace WebKit {
    3333
    34 StatisticsRequest::StatisticsRequest(PassRefPtr<DictionaryCallback> callback)
    35     : m_callback(callback)
     34StatisticsRequest::StatisticsRequest(Ref<DictionaryCallback>&& callback)
     35    : m_callback(WTFMove(callback))
    3636{
    3737}

  • trunk/Source/WebKit2/UIProcess/StatisticsRequest.h

    r177699 r216473  
    2424 */
    2525
    26 #ifndef StatisticsRequest_h
    27 #define StatisticsRequest_h
     26#pragma once
    2827
    2928#include "GenericCallback.h"
    … …  
    4544class StatisticsRequest : public RefCounted<StatisticsRequest> {
    4645public:
    47     static PassRefPtr<StatisticsRequest> create(PassRefPtr<DictionaryCallback> callback)
     46    static Ref<StatisticsRequest> create(Ref<DictionaryCallback>&& callback)
    4847    {
    49         return adoptRef(new StatisticsRequest(callback));
     48        return adoptRef(*new StatisticsRequest(WTFMove(callback)));
    5049    }
    5150
    … …  
    5756
    5857private:
    59     StatisticsRequest(PassRefPtr<DictionaryCallback>);
     58    StatisticsRequest(Ref<DictionaryCallback>&&);
    6059
    6160    HashSet<uint64_t> m_outstandingRequests;
    … …  
    6665
    6766} // namespace WebKit
    68 
    69 #endif // StatisticsRequest_h

  • trunk/Source/WebKit2/UIProcess/TextChecker.h

    r206261 r216473  
    2424 */
    2525
    26 #ifndef TextChecker_h
    27 #define TextChecker_h
     26#pragma once
    2827
    2928#include "TextCheckerCompletion.h"
    … …  
    8786    static void learnWord(int64_t spellDocumentTag, const String& word);
    8887    static void ignoreWord(int64_t spellDocumentTag, const String& word);
    89     static void requestCheckingOfString(PassRefPtr<TextCheckerCompletion>, int32_t insertionPoint);
     88    static void requestCheckingOfString(Ref<TextCheckerCompletion>&&, int32_t insertionPoint);
    9089};
    9190
    9291} // namespace WebKit
    93 
    94 #endif // TextChecker_h

  • trunk/Source/WebKit2/UIProcess/TextCheckerCompletion.cpp

    r144436 r216473  
    3131namespace WebKit {
    3232
    33 PassRefPtr<TextCheckerCompletion> TextCheckerCompletion::create(uint64_t requestID, const TextCheckingRequestData& requestData, WebPageProxy* page)
     33Ref<TextCheckerCompletion> TextCheckerCompletion::create(uint64_t requestID, const TextCheckingRequestData& requestData, WebPageProxy* page)
    3434{
    35     return adoptRef(new TextCheckerCompletion(requestID, requestData, page));
     35    return adoptRef(*new TextCheckerCompletion(requestID, requestData, page));
    3636}
    3737

  • trunk/Source/WebKit2/UIProcess/TextCheckerCompletion.h

    r144436 r216473  
    2424 */
    2525
    26 #ifndef TextCheckerCompletion_h
    27 #define TextCheckerCompletion_h
     26#pragma once
    2827
    2928#include "WebPageProxy.h"
    … …  
    3534class TextCheckerCompletion : public RefCounted<TextCheckerCompletion> {
    3635public:
    37     static PassRefPtr<TextCheckerCompletion> create(uint64_t requestID, const WebCore::TextCheckingRequestData&, WebPageProxy*);
     36    static Ref<TextCheckerCompletion> create(uint64_t requestID, const WebCore::TextCheckingRequestData&, WebPageProxy*);
    3837
    3938    const WebCore::TextCheckingRequestData& textCheckingRequestData() const;
    … …  
    5150
    5251} // namespace WebKit
    53 
    54 #endif // TextCheckerCompletion_h

  • trunk/Source/WebKit2/UIProcess/WebColorPicker.h

    r153541 r216473  
    2424 */
    2525
    26 #ifndef WebColorPicker_h
    27 #define WebColorPicker_h
     26#pragma once
    2827
    2928#if ENABLE(INPUT_TYPE_COLOR)
    … …  
    5150    };
    5251
    53     static PassRefPtr<WebColorPicker> create(Client* client)
     52    static Ref<WebColorPicker> create(Client* client)
    5453    {
    55         return adoptRef(new WebColorPicker(client));
     54        return adoptRef(*new WebColorPicker(client));
    5655    }
    5756
    … …  
    7372
    7473#endif // ENABLE(INPUT_TYPE_COLOR)
    75 
    76 #endif // WebColorPicker_h

  • trunk/Source/WebKit2/UIProcess/WebConnectionToWebProcess.cpp

    r186464 r216473  
    3232namespace WebKit {
    3333
    34 PassRefPtr<WebConnectionToWebProcess> WebConnectionToWebProcess::create(WebProcessProxy* process)
     34Ref<WebConnectionToWebProcess> WebConnectionToWebProcess::create(WebProcessProxy* process)
    3535{
    36     return adoptRef(new WebConnectionToWebProcess(process));
     36    return adoptRef(*new WebConnectionToWebProcess(process));
    3737}
    3838

  • trunk/Source/WebKit2/UIProcess/WebConnectionToWebProcess.h

    r197563 r216473  
    2424 */
    2525
    26 #ifndef WebConnectionToWebProcess_h
    27 #define WebConnectionToWebProcess_h
     26#pragma once
    2827
    2928#include "WebConnection.h"
    … …  
    3534class WebConnectionToWebProcess : public WebConnection {
    3635public:
    37     static PassRefPtr<WebConnectionToWebProcess> create(WebProcessProxy*);
     36    static Ref<WebConnectionToWebProcess> create(WebProcessProxy*);
    3837
    3938    WebProcessProxy* webProcessProxy() const { return m_process; }
    … …  
    5756
    5857} // namespace WebKit
    59 
    60 #endif // WebConnectionToWebProcess_h

  • trunk/Source/WebKit2/UIProcess/WebContextInjectedBundleClient.cpp

    r189442 r216473  
    5353}
    5454
    55 PassRefPtr<API::Object> WebContextInjectedBundleClient::getInjectedBundleInitializationUserData(WebProcessPool* processPool)
     55RefPtr<API::Object> WebContextInjectedBundleClient::getInjectedBundleInitializationUserData(WebProcessPool* processPool)
    5656{
    5757    if (!m_client.getInjectedBundleInitializationUserData)
    58         return 0;
     58        return nullptr;
    5959
    6060    return adoptRef(toImpl(m_client.getInjectedBundleInitializationUserData(toAPI(processPool), m_client.base.clientInfo)));

  • trunk/Source/WebKit2/UIProcess/WebContextInjectedBundleClient.h

    r177692 r216473  
    2424 */
    2525
    26 #ifndef WebContextInjectedBundleClient_h
    27 #define WebContextInjectedBundleClient_h
     26#pragma once
    2827
    2928#include "APIClient.h"
    … …  
    4746    void didReceiveMessageFromInjectedBundle(WebProcessPool*, const String&, API::Object*);
    4847    void didReceiveSynchronousMessageFromInjectedBundle(WebProcessPool*, const String&, API::Object*, RefPtr<API::Object>& returnData);
    49     PassRefPtr<API::Object> getInjectedBundleInitializationUserData(WebProcessPool*);
     48    RefPtr<API::Object> getInjectedBundleInitializationUserData(WebProcessPool*);
    5049};
    5150
    5251} // namespace WebKit
    53 
    54 #endif // WebContextInjectedBundleClient_h

  • trunk/Source/WebKit2/UIProcess/WebContextMenuListenerProxy.h

    r207558 r216473  
    3939class WebContextMenuListenerProxy : public API::ObjectImpl<API::Object::Type::ContextMenuListener> {
    4040public:
    41     static PassRefPtr<WebContextMenuListenerProxy> create(WebContextMenuProxy* contextMenuMac)
     41    static Ref<WebContextMenuListenerProxy> create(WebContextMenuProxy* contextMenuMac)
    4242    {
    43         return adoptRef(new WebContextMenuListenerProxy(contextMenuMac));
     43        return adoptRef(*new WebContextMenuListenerProxy(contextMenuMac));
    4444    }
    4545

  • trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp

    r214078 r216473  
    4545}
    4646
    47 PassRefPtr<WebCookieManagerProxy> WebCookieManagerProxy::create(WebProcessPool* processPool)
    48 {
    49     return adoptRef(new WebCookieManagerProxy(processPool));
     47Ref<WebCookieManagerProxy> WebCookieManagerProxy::create(WebProcessPool* processPool)
     48{
     49    return adoptRef(*new WebCookieManagerProxy(processPool));
    5050}
    5151

  • trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.h

    r214078 r216473  
    2424 */
    2525
    26 #ifndef WebCookieManagerProxy_h
    27 #define WebCookieManagerProxy_h
     26#pragma once
    2827
    2928#include "APIObject.h"
    … …  
    6261    static const char* supplementName();
    6362
    64     static PassRefPtr<WebCookieManagerProxy> create(WebProcessPool*);
     63    static Ref<WebCookieManagerProxy> create(WebProcessPool*);
    6564    virtual ~WebCookieManagerProxy();
    6665
    … …  
    151150
    152151} // namespace WebKit
    153 
    154 #endif // WebCookieManagerProxy_h

  • trunk/Source/WebKit2/UIProcess/WebEditCommandProxy.h

    r160384 r216473  
    2424 */
    2525
    26 #ifndef WebEditCommandProxy_h
    27 #define WebEditCommandProxy_h
     26#pragma once
    2827
    2928#include "APIObject.h"
    … …  
    3938class WebEditCommandProxy : public API::ObjectImpl<API::Object::Type::EditCommandProxy> {
    4039public:
    41     static PassRefPtr<WebEditCommandProxy> create(uint64_t commandID, WebCore::EditAction editAction, WebPageProxy* page)
     40    static Ref<WebEditCommandProxy> create(uint64_t commandID, WebCore::EditAction editAction, WebPageProxy* page)
    4241    {
    43         return adoptRef(new WebEditCommandProxy(commandID, editAction, page));
     42        return adoptRef(*new WebEditCommandProxy(commandID, editAction, page));
    4443    }
    4544    ~WebEditCommandProxy();
    … …  
    6463
    6564} // namespace WebKit
    66 
    67 #endif // WebEditCommandProxy_h

  • trunk/Source/WebKit2/UIProcess/WebFormSubmissionListenerProxy.h

    r209871 r216473  
    4343    static const Type APIType = Type::FormSubmissionListener;
    4444
    45     static PassRefPtr<WebFormSubmissionListenerProxy> create(WebFrameProxy* frame, uint64_t listenerID)
     45    static Ref<WebFormSubmissionListenerProxy> create(WebFrameProxy* frame, uint64_t listenerID)
    4646    {
    47         return adoptRef(new WebFormSubmissionListenerProxy(frame, listenerID));
     47        return adoptRef(*new WebFormSubmissionListenerProxy(frame, listenerID));
    4848    }
    4949

  • trunk/Source/WebKit2/UIProcess/WebFrameListenerProxy.h

    r209558 r216473  
    2929#include "APIObject.h"
    3030#include <WebCore/FrameLoaderTypes.h>
    31 #include <wtf/PassRefPtr.h>
    3231#include <wtf/Ref.h>
    3332#include <wtf/RefPtr.h>

  • trunk/Source/WebKit2/UIProcess/WebFrameProxy.h

    r213877 r216473  
    3333#include <wtf/Forward.h>
    3434#include <wtf/Function.h>
    35 #include <wtf/PassRefPtr.h>
    3635#include <wtf/text/WTFString.h>
    3736
    … …  
    6059class WebFrameProxy : public API::ObjectImpl<API::Object::Type::Frame> {
    6160public:
    62     static PassRefPtr<WebFrameProxy> create(WebPageProxy* page, uint64_t frameID)
     61    static Ref<WebFrameProxy> create(WebPageProxy* page, uint64_t frameID)
    6362    {
    64         return adoptRef(new WebFrameProxy(page, frameID));
     63        return adoptRef(*new WebFrameProxy(page, frameID));
    6564    }
    6665

  • trunk/Source/WebKit2/UIProcess/WebFullScreenManagerProxy.cpp

    r207820 r216473  
    4040namespace WebKit {
    4141
    42 PassRefPtr<WebFullScreenManagerProxy> WebFullScreenManagerProxy::create(WebPageProxy& page, WebFullScreenManagerProxyClient& client)
     42Ref<WebFullScreenManagerProxy> WebFullScreenManagerProxy::create(WebPageProxy& page, WebFullScreenManagerProxyClient& client)
    4343{
    44     return adoptRef(new WebFullScreenManagerProxy(page, client));
     44    return adoptRef(*new WebFullScreenManagerProxy(page, client));
    4545}
    4646

  • trunk/Source/WebKit2/UIProcess/WebFullScreenManagerProxy.h

    r204668 r216473  
    2424 */
    2525
    26 #ifndef WebFullScreenManagerProxy_h
    27 #define WebFullScreenManagerProxy_h
     26#pragma once
    2827
    2928#if ENABLE(FULLSCREEN_API)
    3029
    3130#include "MessageReceiver.h"
    32 #include <wtf/PassRefPtr.h>
    3331#include <wtf/RefCounted.h>
    3432#include <wtf/RefPtr.h>
    … …  
    5654class WebFullScreenManagerProxy : public RefCounted<WebFullScreenManagerProxy>, public IPC::MessageReceiver {
    5755public:
    58     static PassRefPtr<WebFullScreenManagerProxy> create(WebPageProxy&, WebFullScreenManagerProxyClient&);
     56    static Ref<WebFullScreenManagerProxy> create(WebPageProxy&, WebFullScreenManagerProxyClient&);
    5957    virtual ~WebFullScreenManagerProxy();
    6058
    … …  
    9290
    9391#endif // ENABLE(FULLSCREEN_API)
    94 
    95 #endif // WebFullScreenManagerProxy_h

  • trunk/Source/WebKit2/UIProcess/WebGeolocationManagerProxy.cpp

    r205183 r216473  
    3838}
    3939
    40 PassRefPtr<WebGeolocationManagerProxy> WebGeolocationManagerProxy::create(WebProcessPool* processPool)
     40Ref<WebGeolocationManagerProxy> WebGeolocationManagerProxy::create(WebProcessPool* processPool)
    4141{
    42     return adoptRef(new WebGeolocationManagerProxy(processPool));
     42    return adoptRef(*new WebGeolocationManagerProxy(processPool));
    4343}
    4444

  • trunk/Source/WebKit2/UIProcess/WebGeolocationManagerProxy.h

    r204668 r216473  
    2424 */
    2525
    26 #ifndef WebGeolocationManagerProxy_h
    27 #define WebGeolocationManagerProxy_h
     26#pragma once
    2827
    2928#include "APIObject.h"
    … …  
    4443    static const char* supplementName();
    4544
    46     static PassRefPtr<WebGeolocationManagerProxy> create(WebProcessPool*);
     45    static Ref<WebGeolocationManagerProxy> create(WebProcessPool*);
    4746
    4847    void initializeProvider(const WKGeolocationProviderBase*);
    … …  
    8483
    8584} // namespace WebKit
    86 
    87 #endif // WebGeolocationManagerProxy_h

  • trunk/Source/WebKit2/UIProcess/WebIconDatabase.cpp

    r210845 r216473  
    4040namespace WebKit {
    4141
    42 PassRefPtr<WebIconDatabase> WebIconDatabase::create(WebProcessPool* processPool)
    43 {
    44     return adoptRef(new WebIconDatabase(*processPool));
     42Ref<WebIconDatabase> WebIconDatabase::create(WebProcessPool* processPool)
     43{
     44    return adoptRef(*new WebIconDatabase(*processPool));
    4545}
    4646
    … …  
    316316}
    317317
    318 PassRefPtr<API::Data> WebIconDatabase::iconDataForPageURL(const String& pageURL)
     318RefPtr<API::Data> WebIconDatabase::iconDataForPageURL(const String& pageURL)
    319319{
    320320    auto* image = imageForPageURL(pageURL);

  • trunk/Source/WebKit2/UIProcess/WebIconDatabase.h

    r205682 r216473  
    4949class WebIconDatabase : public API::ObjectImpl<API::Object::Type::IconDatabase>, private WebCore::IconDatabaseClient, private IPC::MessageReceiver {
    5050public:
    51     static PassRefPtr<WebIconDatabase> create(WebProcessPool*);
     51    static Ref<WebIconDatabase> create(WebProcessPool*);
    5252    virtual ~WebIconDatabase();
    5353
    … …  
    7272    WebCore::Image* imageForPageURL(const String&, const WebCore::IntSize& iconSize = WebCore::IntSize(32, 32));
    7373    WebCore::NativeImagePtr nativeImageForPageURL(const String&, const WebCore::IntSize& iconSize = WebCore::IntSize(32, 32));
    74     PassRefPtr<API::Data> iconDataForPageURL(const String& pageURL);
     74    RefPtr<API::Data> iconDataForPageURL(const String& pageURL);
    7575
    7676    bool isOpen();

  • trunk/Source/WebKit2/UIProcess/WebMediaSessionFocusManager.cpp

    r188775 r216473  
    3838}
    3939
    40 PassRefPtr<WebMediaSessionFocusManager> WebMediaSessionFocusManager::create(WebProcessPool* processPool)
     40Ref<WebMediaSessionFocusManager> WebMediaSessionFocusManager::create(WebProcessPool* processPool)
    4141{
    42     return adoptRef(new WebMediaSessionFocusManager(processPool));
     42    return adoptRef(*new WebMediaSessionFocusManager(processPool));
    4343}
    4444

  • trunk/Source/WebKit2/UIProcess/WebMediaSessionFocusManager.h

    r197563 r216473  
    2424 */
    2525
    26 #ifndef WebMediaSessionFocusManager_h
    27 #define WebMediaSessionFocusManager_h
     26#pragma once
    2827
    2928#if ENABLE(MEDIA_SESSION)
    … …  
    4241    static const char* supplementName();
    4342
    44     static PassRefPtr<WebMediaSessionFocusManager> create(WebProcessPool*);
     43    static Ref<WebMediaSessionFocusManager> create(WebProcessPool*);
    4544
    4645    void initializeClient(const WKMediaSessionFocusManagerClientBase*);
    … …  
    7372
    7473#endif // ENABLE(MEDIA_SESSION)
    75 
    76 #endif /* WebMediaSessionFocusManager_h */

  • trunk/Source/WebKit2/UIProcess/WebOpenPanelResultListenerProxy.h

    r199558 r216473  
    2424 */
    2525
    26 #ifndef WebOpenPanelResultListenerProxy_h
    27 #define WebOpenPanelResultListenerProxy_h
     26#pragma once
    2827
    2928#include "APIObject.h"
    3029#include <wtf/Forward.h>
    31 #include <wtf/PassRefPtr.h>
    3230#include <wtf/RefPtr.h>
    3331#include <wtf/Vector.h>
    … …  
    4543class WebOpenPanelResultListenerProxy : public API::ObjectImpl<API::Object::Type::FramePolicyListener> {
    4644public:
    47     static PassRefPtr<WebOpenPanelResultListenerProxy> create(WebPageProxy* page)
     45    static Ref<WebOpenPanelResultListenerProxy> create(WebPageProxy* page)
    4846    {
    49         return adoptRef(new WebOpenPanelResultListenerProxy(page));
     47        return adoptRef(*new WebOpenPanelResultListenerProxy(page));
    5048    }
    5149
    … …  
    6765
    6866} // namespace WebKit
    69 
    70 #endif // WebOpenPanelResultListenerProxy_h

  • trunk/Source/WebKit2/UIProcess/WebPageGroup.cpp

    r213696 r216473  
    5555}
    5656
    57 PassRefPtr<WebPageGroup> WebPageGroup::create(const String& identifier, bool visibleToInjectedBundle, bool visibleToHistoryClient)
     57Ref<WebPageGroup> WebPageGroup::create(const String& identifier, bool visibleToInjectedBundle, bool visibleToHistoryClient)
    5858{
    59     return adoptRef(new WebPageGroup(identifier, visibleToInjectedBundle, visibleToHistoryClient));
     59    return adoptRef(*new WebPageGroup(identifier, visibleToInjectedBundle, visibleToHistoryClient));
    6060}
    6161

  • trunk/Source/WebKit2/UIProcess/WebPageGroup.h

    r216348 r216473  
    4444public:
    4545    WebPageGroup(const String& identifier = String(), bool visibleToInjectedBundle = true, bool visibleToHistoryClient = true);
    46     static PassRefPtr<WebPageGroup> create(const String& identifier = String(), bool visibleToInjectedBundle = true, bool visibleToHistoryClient = true);
     46    static Ref<WebPageGroup> create(const String& identifier = String(), bool visibleToInjectedBundle = true, bool visibleToHistoryClient = true);
    4747    static Ref<WebPageGroup> createNonNull(const String& identifier = String(), bool visibleToInjectedBundle = true, bool visibleToHistoryClient = true);
    4848    static WebPageGroup* get(uint64_t pageGroupID);

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

    r216249 r216473  
    30353035}
    30363036
    3037 void WebPageProxy::forceRepaint(PassRefPtr<VoidCallback> prpCallback)
    3038 {
    3039     RefPtr<VoidCallback> callback = prpCallback;
     3037void WebPageProxy::forceRepaint(RefPtr<VoidCallback>&& callback)
     3038{
    30403039    if (!isValid()) {
    30413040        // FIXME: If the page is invalid we should not call the callback. It'd be better to just return false from forceRepaint.
    … …  
    30443043    }
    30453044
    3046     std::function<void (CallbackBase::Error)> didForceRepaintCallback = [this, callback](CallbackBase::Error error) {
     3045    Function<void(CallbackBase::Error)> didForceRepaintCallback = [this, callback = WTFMove(callback)](CallbackBase::Error error) mutable {
    30473046        if (error != CallbackBase::Error::None) {
    30483047            callback->invalidate(error);
    … …  
    30553054        }
    30563055   
    3057         callAfterNextPresentationUpdate([callback](CallbackBase::Error error) {
     3056        callAfterNextPresentationUpdate([callback = WTFMove(callback)](CallbackBase::Error error) {
    30583057            if (error != CallbackBase::Error::None) {
    30593058                callback->invalidate(error);
    … …  
    30653064    };
    30663065
    3067     uint64_t callbackID = m_callbacks.put(didForceRepaintCallback, m_process->throttler().backgroundActivityToken());
     3066    uint64_t callbackID = m_callbacks.put(WTFMove(didForceRepaintCallback), m_process->throttler().backgroundActivityToken());
    30683067    m_drawingArea->waitForBackingStoreUpdateOnNextPaint();
    30693068    m_process->send(Messages::WebPage::ForceRepaint(callbackID), m_pageID);
    … …  
    59935992}
    59945993
    5995 void WebPageProxy::computePagesForPrinting(WebFrameProxy* frame, const PrintInfo& printInfo, PassRefPtr<ComputedPagesCallback> prpCallback)
    5996 {
    5997     RefPtr<ComputedPagesCallback> callback = prpCallback;
     5994void WebPageProxy::computePagesForPrinting(WebFrameProxy* frame, const PrintInfo& printInfo, Ref<ComputedPagesCallback>&& callback)
     5995{
    59985996    if (!isValid()) {
    59995997        callback->invalidate();
    … …  
    60026000
    60036001    uint64_t callbackID = callback->callbackID();
    6004     m_callbacks.put(callback);
     6002    m_callbacks.put(WTFMove(callback));
    60056003    m_isInPrintingMode = true;
    60066004    m_process->send(Messages::WebPage::ComputePagesForPrinting(frame->frameID(), printInfo, callbackID), m_pageID, printingSendOptions(m_isPerformingDOMPrintOperation));
    … …  
    60086006
    60096007#if PLATFORM(COCOA)
    6010 void WebPageProxy::drawRectToImage(WebFrameProxy* frame, const PrintInfo& printInfo, const IntRect& rect, const WebCore::IntSize& imageSize, PassRefPtr<ImageCallback> prpCallback)
    6011 {
    6012     RefPtr<ImageCallback> callback = prpCallback;
     6008void WebPageProxy::drawRectToImage(WebFrameProxy* frame, const PrintInfo& printInfo, const IntRect& rect, const WebCore::IntSize& imageSize, Ref<ImageCallback>&& callback)
     6009{
    60136010    if (!isValid()) {
    60146011        callback->invalidate();
    … …  
    60176014   
    60186015    uint64_t callbackID = callback->callbackID();
    6019     m_callbacks.put(callback);
     6016    m_callbacks.put(WTFMove(callback));
    60206017    m_process->send(Messages::WebPage::DrawRectToImage(frame->frameID(), printInfo, rect, imageSize, callbackID), m_pageID, printingSendOptions(m_isPerformingDOMPrintOperation));
    60216018}
    60226019
    6023 void WebPageProxy::drawPagesToPDF(WebFrameProxy* frame, const PrintInfo& printInfo, uint32_t first, uint32_t count, PassRefPtr<DataCallback> prpCallback)
    6024 {
    6025     RefPtr<DataCallback> callback = prpCallback;
     6020void WebPageProxy::drawPagesToPDF(WebFrameProxy* frame, const PrintInfo& printInfo, uint32_t first, uint32_t count, Ref<DataCallback>&& callback)
     6021{
    60266022    if (!isValid()) {
    60276023        callback->invalidate();
    … …  
    60306026   
    60316027    uint64_t callbackID = callback->callbackID();
    6032     m_callbacks.put(callback);
     6028    m_callbacks.put(WTFMove(callback));
    60336029    m_process->send(Messages::WebPage::DrawPagesToPDF(frame->frameID(), printInfo, first, count, callbackID), m_pageID, printingSendOptions(m_isPerformingDOMPrintOperation));
    60346030}
    60356031#elif PLATFORM(GTK)
    6036 void WebPageProxy::drawPagesForPrinting(WebFrameProxy* frame, const PrintInfo& printInfo, PassRefPtr<PrintFinishedCallback> didPrintCallback)
    6037 {
    6038     RefPtr<PrintFinishedCallback> callback = didPrintCallback;
     6032void WebPageProxy::drawPagesForPrinting(WebFrameProxy* frame, const PrintInfo& printInfo, Ref<PrintFinishedCallback>&& callback)
     6033{
    60396034    if (!isValid()) {
    60406035        callback->invalidate();
    … …  
    60436038
    60446039    uint64_t callbackID = callback->callbackID();
    6045     m_callbacks.put(callback);
     6040    m_callbacks.put(WTFMove(callback));
    60466041    m_isInPrintingMode = true;
    60476042    m_process->send(Messages::WebPage::DrawPagesForPrinting(frame->frameID(), printInfo, callbackID), m_pageID, printingSendOptions(m_isPerformingDOMPrintOperation));
    … …  
    67456740    }
    67466741
    6747     m_drawingArea->dispatchAfterEnsuringDrawing(callback);
     6742    m_drawingArea->dispatchAfterEnsuringDrawing(WTFMove(callback));
    67486743}
    67496744

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.h

    r216352 r216473  
    808808    void getWebArchiveOfFrame(WebFrameProxy*, Function<void (API::Data*, CallbackBase::Error)>&&);
    809809    void runJavaScriptInMainFrame(const String&, std::function<void (API::SerializedScriptValue*, bool hadException, const WebCore::ExceptionDetails&, CallbackBase::Error)> callbackFunction);
    810     void forceRepaint(PassRefPtr<VoidCallback>);
     810    void forceRepaint(RefPtr<VoidCallback>&&);
    811811
    812812    float headerHeight(WebFrameProxy*);
    … …  
    937937    void beginPrinting(WebFrameProxy*, const PrintInfo&);
    938938    void endPrinting();
    939     void computePagesForPrinting(WebFrameProxy*, const PrintInfo&, PassRefPtr<ComputedPagesCallback>);
    940 #if PLATFORM(COCOA)
    941     void drawRectToImage(WebFrameProxy*, const PrintInfo&, const WebCore::IntRect&, const WebCore::IntSize&, PassRefPtr<ImageCallback>);
    942     void drawPagesToPDF(WebFrameProxy*, const PrintInfo&, uint32_t first, uint32_t count, PassRefPtr<DataCallback>);
     939    void computePagesForPrinting(WebFrameProxy*, const PrintInfo&, Ref<ComputedPagesCallback>&&);
     940#if PLATFORM(COCOA)
     941    void drawRectToImage(WebFrameProxy*, const PrintInfo&, const WebCore::IntRect&, const WebCore::IntSize&, Ref<ImageCallback>&&);
     942    void drawPagesToPDF(WebFrameProxy*, const PrintInfo&, uint32_t first, uint32_t count, Ref<DataCallback>&&);
    943943#if PLATFORM(IOS)
    944944    uint32_t computePagesForPrintingAndDrawToPDF(uint64_t frameID, const PrintInfo&, DrawToPDFCallback::CallbackFunction&&);
    … …  
    946946#endif
    947947#elif PLATFORM(GTK)
    948     void drawPagesForPrinting(WebFrameProxy*, const PrintInfo&, PassRefPtr<PrintFinishedCallback>);
     948    void drawPagesForPrinting(WebFrameProxy*, const PrintInfo&, Ref<PrintFinishedCallback>&&);
    949949#endif
    950950

  • trunk/Source/WebKit2/UIProcess/gtk/TextCheckerGtk.cpp

    r209907 r216473  
    208208}
    209209
    210 void TextChecker::requestCheckingOfString(PassRefPtr<TextCheckerCompletion> completion, int32_t insertionPoint)
    211 {
    212 #if ENABLE(SPELLCHECK)
    213     if (!completion)
    214         return;
    215 
     210void TextChecker::requestCheckingOfString(Ref<TextCheckerCompletion>&& completion, int32_t insertionPoint)
     211{
     212#if ENABLE(SPELLCHECK)
    216213    TextCheckingRequestData request = completion->textCheckingRequestData();
    217214    ASSERT(request.sequence() != unrequestedTextCheckingSequence);

  • trunk/Source/WebKit2/UIProcess/ios/TextCheckerIOS.mm

    r206261 r216473  
    200200}
    201201
    202 void TextChecker::requestCheckingOfString(PassRefPtr<TextCheckerCompletion>, int32_t)
     202void TextChecker::requestCheckingOfString(Ref<TextCheckerCompletion>&&, int32_t)
    203203{
    204204    notImplemented();

  • trunk/Source/WebKit2/UIProcess/mac/TextCheckerMac.mm

    r206261 r216473  
    501501}
    502502
    503 void TextChecker::requestCheckingOfString(PassRefPtr<TextCheckerCompletion>, int32_t)
     503void TextChecker::requestCheckingOfString(Ref<TextCheckerCompletion>&&, int32_t)
    504504{
    505505    notImplemented();

  • trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h

    r208415 r216473  
    2424 */
    2525
    26 #ifndef TiledCoreAnimationDrawingAreaProxy_h
    27 #define TiledCoreAnimationDrawingAreaProxy_h
     26#pragma once
    2827
    2928#if !PLATFORM(IOS)
    … …  
    8180
    8281#endif // !PLATFORM(IOS)
    83 
    84 #endif // TiledCoreAnimationDrawingAreaProxy_h

  • trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm

    r212398 r216473  
    427427        [self completeFinishExitFullScreenAnimationAfterRepaint];
    428428    });
    429     _page->forceRepaint(_repaintCallback);
     429    _page->forceRepaint(_repaintCallback.copyRef());
    430430}
    431431

  • trunk/Source/WebKit2/UIProcess/mac/WKPrintingView.mm

    r208347 r216473  
    266266
    267267    IPCCallbackContext* context = new IPCCallbackContext;
    268     RefPtr<DataCallback> callback = DataCallback::create([context](API::Data* data, WebKit::CallbackBase::Error) {
     268    auto callback = DataCallback::create([context](API::Data* data, WebKit::CallbackBase::Error) {
    269269        ASSERT(RunLoop::isMain());
    270270
    … …  
    287287    context->callbackID = callback->callbackID();
    288288
    289     _webFrame->page()->drawPagesToPDF(_webFrame.get(), printInfo, firstPage - 1, lastPage - firstPage + 1, callback.get());
     289    _webFrame->page()->drawPagesToPDF(_webFrame.get(), printInfo, firstPage - 1, lastPage - firstPage + 1, WTFMove(callback));
    290290}
    291291
    … …  
    518518
    519519                IPCCallbackContext* context = new IPCCallbackContext;
    520                 RefPtr<ImageCallback> callback = ImageCallback::create([context](const ShareableBitmap::Handle& imageHandle, WebKit::CallbackBase::Error) {
     520                auto callback = ImageCallback::create([context](const ShareableBitmap::Handle& imageHandle, WebKit::CallbackBase::Error) {
    521521                    std::unique_ptr<IPCCallbackContext> contextDeleter(context);
    522522                    pageDidDrawToImage(imageHandle, context);
    … …  
    528528                context->callbackID = callback->callbackID();
    529529
    530                 _webFrame->page()->drawRectToImage(_webFrame.get(), PrintInfo([_printOperation printInfo]), scaledPrintingRect, imageSize, callback.get());
     530                _webFrame->page()->drawRectToImage(_webFrame.get(), PrintInfo([_printOperation printInfo]), scaledPrintingRect, imageSize, WTFMove(callback));
    531531                return;
    532532            }

  • trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp

    r215167 r216473  
    170170    if (target.isNull()) {
    171171        // The browser is going to send the data in a stream, create a plug-in stream.
    172         auto pluginStream = NetscapePluginStream::create(this, requestID, urlString, sendNotification, notificationData);
     172        auto pluginStream = NetscapePluginStream::create(*this, requestID, urlString, sendNotification, notificationData);
    173173        ASSERT(!m_streams.contains(requestID));
    174174
    … …  
    898898    ASSERT(!m_manualStream);
    899899   
    900     m_manualStream = NetscapePluginStream::create(this, 0, responseURL.string(), false, 0);
     900    m_manualStream = NetscapePluginStream::create(*this, 0, responseURL.string(), false, 0);
    901901    m_manualStream->didReceiveResponse(responseURL, streamLength, lastModifiedTime, mimeType, headers);
    902902}

  • trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.cpp

    r215160 r216473  
    3737namespace WebKit {
    3838
    39 NetscapePluginStream::NetscapePluginStream(PassRefPtr<NetscapePlugin> plugin, uint64_t streamID, const String& requestURLString, bool sendNotification, void* notificationData)
    40     : m_plugin(plugin)
     39NetscapePluginStream::NetscapePluginStream(Ref<NetscapePlugin>&& plugin, uint64_t streamID, const String& requestURLString, bool sendNotification, void* notificationData)
     40    : m_plugin(WTFMove(plugin))
    4141    , m_streamID(streamID)
    4242    , m_requestURLString(requestURLString)

  • trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.h

    r202611 r216473  
    2424 */
    2525
    26 #ifndef NetscapePluginStream_h
    27 #define NetscapePluginStream_h
     26#pragma once
    2827
    2928#if ENABLE(NETSCAPE_PLUGIN_API)
    … …  
    3332#include <memory>
    3433#include <wtf/Forward.h>
    35 #include <wtf/PassRefPtr.h>
    3634#include <wtf/RefCounted.h>
    3735#include <wtf/RefPtr.h>
    … …  
    4947class NetscapePluginStream : public RefCounted<NetscapePluginStream> {
    5048public:
    51     static Ref<NetscapePluginStream> create(PassRefPtr<NetscapePlugin> plugin, uint64_t streamID, const String& requestURLString, bool sendNotification, void* notificationData)
     49    static Ref<NetscapePluginStream> create(Ref<NetscapePlugin>&& plugin, uint64_t streamID, const String& requestURLString, bool sendNotification, void* notificationData)
    5250    {
    53         return adoptRef(*new NetscapePluginStream(plugin, streamID, requestURLString, sendNotification, notificationData));
     51        return adoptRef(*new NetscapePluginStream(WTFMove(plugin), streamID, requestURLString, sendNotification, notificationData));
    5452    }
    5553    ~NetscapePluginStream();
    … …  
    7270
    7371private:
    74     NetscapePluginStream(PassRefPtr<NetscapePlugin>, uint64_t streamID, const String& requestURLString, bool sendNotification, void* notificationData);
     72    NetscapePluginStream(Ref<NetscapePlugin>&&, uint64_t streamID, const String& requestURLString, bool sendNotification, void* notificationData);
    7573
    7674    bool start(const String& responseURLString, uint32_t streamLength,
    … …  
    8482    void deliverDataToFile(const char* bytes, int length);
    8583
    86     RefPtr<NetscapePlugin> m_plugin;
     84    Ref<NetscapePlugin> m_plugin;
    8785    uint64_t m_streamID;
    8886
    … …  
    117115
    118116#endif // ENABLE(NETSCAPE_PLUGIN_API)
    119 
    120 #endif // NetscapePluginStream_h

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/SessionStateConversion.cpp

    r213590 r216473  
    123123}
    124124
    125 static PassRefPtr<FormData> toFormData(const HTTPBody& httpBody)
     125static Ref<FormData> toFormData(const HTTPBody& httpBody)
    126126{
    127127    auto formData = FormData::create();
    … …  
    143143    }
    144144
    145     return WTFMove(formData);
     145    return formData;
    146146}
    147147
Note: See TracChangeset for help on using the changeset viewer.