Changeset 86067 in webkit


Ignore:
Timestamp:
May 9, 2011 11:13:49 AM (13 years ago)
Author:
abarth@webkit.org
Message:

2011-05-09 Adam Barth <​abarth@webkit.org>

Reviewed by Tony Gentilcore.

Make Chromium build with strict PassOwnPtr
​https://bugs.webkit.org/show_bug.cgi?id=60461

Fix many, many PassOwnPtr nits.

  • bindings/v8/V8Proxy.cpp: (WebCore::V8Proxy::precompileScript):
  • bindings/v8/custom/V8DOMWindowCustom.cpp: (WebCore::WindowSetTimeoutImpl):
  • bindings/v8/custom/V8MessageEventCustom.cpp: (WebCore::V8MessageEvent::initMessageEventCallback):
  • bindings/v8/custom/V8WorkerContextCustom.cpp: (WebCore::SetTimeoutOrInterval):
  • dom/Document.cpp: (WebCore::Document::removedLastRef): (WebCore::Document::detach):
  • fileapi/DOMFileSystem.h: (WebCore::DOMFileSystem::scheduleCallback):
  • fileapi/FileSystemCallbacks.cpp: (WebCore::FileSystemCallbacks::didOpenFileSystem): (WebCore::ResolveURICallbacks::didOpenFileSystem):
  • platform/graphics/chromium/GraphicsLayerChromium.cpp: (WebCore::GraphicsLayer::create):
  • platform/graphics/chromium/cc/CCLayerImpl.cpp: (WebCore::CCLayerImpl::createRenderSurface):
  • platform/graphics/gpu/BicubicShader.cpp: (WebCore::BicubicShader::create):
  • platform/graphics/gpu/ConvolutionShader.cpp: (WebCore::ConvolutionShader::create):
  • platform/graphics/gpu/LoopBlinnSolidFillShader.cpp: (WebCore::LoopBlinnSolidFillShader::create):
  • platform/graphics/gpu/SolidFillShader.cpp: (WebCore::SolidFillShader::create):
  • platform/graphics/gpu/TexShader.cpp: (WebCore::TexShader::create):
  • platform/graphics/gpu/Texture.cpp: (WebCore::Texture::create):
  • storage/chromium/DatabaseTrackerChromium.cpp: (WebCore::TrackerRemoveOpenDatabaseTask::create):
  • storage/chromium/SQLTransactionClientChromium.cpp: (WebCore::NotifyDatabaseChangedTask::create):

2011-05-09 Adam Barth <​abarth@webkit.org>

Reviewed by Tony Gentilcore.

Make Chromium build with strict PassOwnPtr
​https://bugs.webkit.org/show_bug.cgi?id=60461

Fixed many, many PassOwnPtr nits.

  • src/EditorClientImpl.cpp: (WebKit::EditorClientImpl::autofill):
  • src/IDBDatabaseBackendProxy.cpp: (WebKit::IDBDatabaseBackendProxy::createObjectStore): (WebKit::IDBDatabaseBackendProxy::transaction):
  • src/IDBObjectStoreBackendProxy.cpp: (WebKit::IDBObjectStoreBackendProxy::createIndex): (WebKit::IDBObjectStoreBackendProxy::index):
  • src/IDBTransactionBackendProxy.cpp: (WebKit::IDBTransactionBackendProxy::objectStore):
  • src/PlatformMessagePortChannel.cpp: (WebCore::MessagePortChannel::create): (WebCore::PlatformMessagePortChannel::tryGetMessageFromRemote):
  • src/SharedWorkerRepository.cpp: (WebCore::SharedWorkerRepository::connect):
  • src/SocketStreamHandle.cpp: (WebCore::SocketStreamHandleInternal::create):
  • src/WebDevToolsAgentImpl.cpp: (WebKit::DebuggerTask::DebuggerTask): (WebKit::DebuggerTask::~DebuggerTask): (WebKit::DebuggerTask::run): (WebKit::WebDevToolsAgent::interruptAndDispatch):
  • src/WebDevToolsFrontendImpl.cpp: (WebKit::WebDevToolsFrontendImpl::WebDevToolsFrontendImpl):
  • src/WebIDBCallbacksImpl.cpp: (WebKit::WebIDBCallbacksImpl::onSuccess):
  • src/WebIDBCursorImpl.cpp: (WebKit::WebIDBCursorImpl::update): (WebKit::WebIDBCursorImpl::continueFunction): (WebKit::WebIDBCursorImpl::deleteFunction):
  • src/WebIDBDatabaseImpl.cpp: (WebKit::WebIDBDatabaseImpl::setVersion): (WebKit::WebIDBDatabaseImpl::open):
  • src/WebIDBFactoryImpl.cpp: (WebKit::WebIDBFactoryImpl::open):
  • src/WebIDBIndexImpl.cpp: (WebKit::WebIDBIndexImpl::openObjectCursor): (WebKit::WebIDBIndexImpl::openKeyCursor): (WebKit::WebIDBIndexImpl::getObject): (WebKit::WebIDBIndexImpl::getKey):
  • src/WebIDBObjectStoreImpl.cpp: (WebKit::WebIDBObjectStoreImpl::get): (WebKit::WebIDBObjectStoreImpl::put): (WebKit::WebIDBObjectStoreImpl::deleteFunction): (WebKit::WebIDBObjectStoreImpl::clear): (WebKit::WebIDBObjectStoreImpl::openCursor):
  • src/WebIDBTransactionImpl.cpp: (WebKit::WebIDBTransactionImpl::setCallbacks):
  • src/WebPluginContainerImpl.cpp: (WebKit::WebPluginContainerImpl::loadFrameRequest):
  • src/WebViewImpl.cpp: (WebKit::WebViewImpl::setDevToolsAgentClient):
  • src/WebWorkerClientImpl.cpp: (WebKit::WebWorkerClientImpl::postMessageToWorkerObject):
  • src/WebWorkerImpl.cpp: (WebKit::WebWorkerImpl::postMessageToWorkerContext):
  • src/WorkerFileWriterCallbacksBridge.cpp: (WebKit::WorkerFileWriterCallbacksBridge::initOnMainThread): (WebKit::WorkerFileWriterCallbacksBridge::didWrite): (WebKit::WorkerFileWriterCallbacksBridge::didFail): (WebKit::WorkerFileWriterCallbacksBridge::didTruncate):
Location:
trunk/Source
Files:
40 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r86064 r86067  
     12011-05-09  Adam Barth  <abarth@webkit.org>
     2
     3        Reviewed by Tony Gentilcore.
     4
     5        Make Chromium build with strict PassOwnPtr
     6        https://bugs.webkit.org/show_bug.cgi?id=60461
     7
     8        Fix many, many PassOwnPtr nits.
     9
     10        * bindings/v8/V8Proxy.cpp:
     11        (WebCore::V8Proxy::precompileScript):
     12        * bindings/v8/custom/V8DOMWindowCustom.cpp:
     13        (WebCore::WindowSetTimeoutImpl):
     14        * bindings/v8/custom/V8MessageEventCustom.cpp:
     15        (WebCore::V8MessageEvent::initMessageEventCallback):
     16        * bindings/v8/custom/V8WorkerContextCustom.cpp:
     17        (WebCore::SetTimeoutOrInterval):
     18        * dom/Document.cpp:
     19        (WebCore::Document::removedLastRef):
     20        (WebCore::Document::detach):
     21        * fileapi/DOMFileSystem.h:
     22        (WebCore::DOMFileSystem::scheduleCallback):
     23        * fileapi/FileSystemCallbacks.cpp:
     24        (WebCore::FileSystemCallbacks::didOpenFileSystem):
     25        (WebCore::ResolveURICallbacks::didOpenFileSystem):
     26        * platform/graphics/chromium/GraphicsLayerChromium.cpp:
     27        (WebCore::GraphicsLayer::create):
     28        * platform/graphics/chromium/cc/CCLayerImpl.cpp:
     29        (WebCore::CCLayerImpl::createRenderSurface):
     30        * platform/graphics/gpu/BicubicShader.cpp:
     31        (WebCore::BicubicShader::create):
     32        * platform/graphics/gpu/ConvolutionShader.cpp:
     33        (WebCore::ConvolutionShader::create):
     34        * platform/graphics/gpu/LoopBlinnSolidFillShader.cpp:
     35        (WebCore::LoopBlinnSolidFillShader::create):
     36        * platform/graphics/gpu/SolidFillShader.cpp:
     37        (WebCore::SolidFillShader::create):
     38        * platform/graphics/gpu/TexShader.cpp:
     39        (WebCore::TexShader::create):
     40        * platform/graphics/gpu/Texture.cpp:
     41        (WebCore::Texture::create):
     42        * storage/chromium/DatabaseTrackerChromium.cpp:
     43        (WebCore::TrackerRemoveOpenDatabaseTask::create):
     44        * storage/chromium/SQLTransactionClientChromium.cpp:
     45        (WebCore::NotifyDatabaseChangedTask::create):
     46
    1472011-05-07  Martin Robinson  <mrobinson@igalia.com>
    248

  • trunk/Source/WebCore/bindings/v8/V8Proxy.cpp

    r85716 r86067  
    322322    CachedMetadata* cachedMetadata = cachedScript->cachedMetadata(dataTypeID);
    323323    if (cachedMetadata)
    324         return v8::ScriptData::New(cachedMetadata->data(), cachedMetadata->size());
     324        return adoptPtr(v8::ScriptData::New(cachedMetadata->data(), cachedMetadata->size()));
    325325
    326326    OwnPtr<v8::ScriptData> scriptData = adoptPtr(v8::ScriptData::PreCompile(code));

  • trunk/Source/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp

    r84073 r86067  
    127127
    128128        // params is passed to action, and released in action's destructor
    129         ScheduledAction* action = new ScheduledAction(V8Proxy::context(imp->frame()), v8::Handle<v8::Function>::Cast(function), paramCount, params);
    130 
     129        OwnPtr<ScheduledAction> action = adoptPtr(new ScheduledAction(V8Proxy::context(imp->frame()), v8::Handle<v8::Function>::Cast(function), paramCount, params));
     130
     131        // FIXME: We should use OwnArrayPtr for params.
    131132        delete[] params;
    132133
    133         id = DOMTimer::install(scriptContext, action, timeout, singleShot);
     134        id = DOMTimer::install(scriptContext, action.release(), timeout, singleShot);
    134135    } else {
    135136        if (imp->document() && !imp->document()->contentSecurityPolicy()->allowEval())
    136137            return v8::Integer::New(0);
    137         id = DOMTimer::install(scriptContext, new ScheduledAction(V8Proxy::context(imp->frame()), functionString), timeout, singleShot);
     138        id = DOMTimer::install(scriptContext, adoptPtr(new ScheduledAction(V8Proxy::context(imp->frame()), functionString)), timeout, singleShot);
    138139    }
    139140

  • trunk/Source/WebCore/bindings/v8/custom/V8MessageEventCustom.cpp

    r56877 r86067  
    8080
    8181    if (!isUndefinedOrNull(args[7])) {
    82         portArray = new MessagePortArray();
     82        portArray = adoptPtr(new MessagePortArray);
    8383        if (!getMessagePortArray(args[7], *portArray))
    8484            return v8::Undefined();

  • trunk/Source/WebCore/bindings/v8/custom/V8WorkerContextCustom.cpp

    r65021 r86067  
    6767    if (function->IsString()) {
    6868        WTF::String stringFunction = toWebCoreString(function);
    69         timerId = DOMTimer::install(workerContext, new ScheduledAction(v8Context, stringFunction, workerContext->url()), timeout, singleShot);
     69        timerId = DOMTimer::install(workerContext, adoptPtr(new ScheduledAction(v8Context, stringFunction, workerContext->url())), timeout, singleShot);
    7070    } else if (function->IsFunction()) {
    7171        size_t paramCount = argumentCount >= 2 ? argumentCount - 2 : 0;
    … …  
    7777        }
    7878        // ScheduledAction takes ownership of actual params and releases them in its destructor.
    79         ScheduledAction* action = new ScheduledAction(v8Context, v8::Handle<v8::Function>::Cast(function), paramCount, params);
     79        OwnPtr<ScheduledAction> action = adoptPtr(new ScheduledAction(v8Context, v8::Handle<v8::Function>::Cast(function), paramCount, params));
     80        // FIXME: We should use a OwnArrayPtr for params.
    8081        delete [] params;
    81         timerId = DOMTimer::install(workerContext, action, timeout, singleShot);
     82        timerId = DOMTimer::install(workerContext, action.release(), timeout, singleShot);
    8283    } else
    8384        return v8::Undefined();

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

    r86047 r86067  
    590590#if ENABLE(REQUEST_ANIMATION_FRAME)
    591591        // FIXME: consider using ActiveDOMObject.
    592         m_scriptedAnimationController = 0;
     592        m_scriptedAnimationController = nullptr;
    593593#endif
    594594
    … …  
    17651765#if ENABLE(REQUEST_ANIMATION_FRAME)
    17661766    // FIXME: consider using ActiveDOMObject.
    1767     m_scriptedAnimationController = 0;
     1767    m_scriptedAnimationController = nullptr;
    17681768#endif
    17691769

  • trunk/Source/WebCore/fileapi/DOMFileSystem.h

    r69907 r86067  
    103103    ASSERT(scriptExecutionContext->isContextThread());
    104104    ASSERT(callback);
    105     scriptExecutionContext->postTask(new DispatchCallbackTask<CB, CBArg>(callback, arg));
     105    scriptExecutionContext->postTask(adoptPtr(new DispatchCallbackTask<CB, CBArg>(callback, arg)));
    106106}
    107107

  • trunk/Source/WebCore/fileapi/FileSystemCallbacks.cpp

    r80313 r86067  
    187187    if (m_successCallback) {
    188188        ASSERT(asyncFileSystem);
    189         m_successCallback->handleEvent(DOMFileSystem::create(m_scriptExecutionContext.get(), name, asyncFileSystem.leakPtr()).get());
     189        RefPtr<DOMFileSystem> fileSystem = DOMFileSystem::create(m_scriptExecutionContext.get(), name, asyncFileSystem);
     190        m_successCallback->handleEvent(fileSystem.get());
    190191        m_scriptExecutionContext.clear();
    191192    }
    … …  
    248249{
    249250    ASSERT(asyncFileSystem);
    250     RefPtr<DirectoryEntry> root = DOMFileSystem::create(m_scriptExecutionContext.get(), name, asyncFileSystem.leakPtr())->root();
     251    RefPtr<DirectoryEntry> root = DOMFileSystem::create(m_scriptExecutionContext.get(), name, asyncFileSystem)->root();
    251252    root->getDirectory(m_filePath, 0, m_successCallback, ErrorCallbackWrapper::create(m_successCallback, m_errorCallback, root, m_filePath));
    252253}

  • trunk/Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp

    r85825 r86067  
    8787PassOwnPtr<GraphicsLayer> GraphicsLayer::create(GraphicsLayerClient* client)
    8888{
    89     return new GraphicsLayerChromium(client);
     89    return adoptPtr(new GraphicsLayerChromium(client));
    9090}
    9191

  • trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerImpl.cpp

    r84890 r86067  
    108108RenderSurfaceChromium* CCLayerImpl::createRenderSurface()
    109109{
    110     m_renderSurface = new RenderSurfaceChromium(this);
     110    m_renderSurface = adoptPtr(new RenderSurfaceChromium(this));
    111111    return m_renderSurface.get();
    112112}

  • trunk/Source/WebCore/platform/graphics/gpu/BicubicShader.cpp

    r85716 r86067  
    107107        return nullptr;
    108108
    109     return new BicubicShader(context, program);
     109    return adoptPtr(new BicubicShader(context, program));
    110110}
    111111

  • trunk/Source/WebCore/platform/graphics/gpu/ConvolutionShader.cpp

    r85716 r86067  
    9494    if (!program)
    9595        return nullptr;
    96     return new ConvolutionShader(context, program, kernelWidth);
     96    return adoptPtr(new ConvolutionShader(context, program, kernelWidth));
    9797}
    9898

  • trunk/Source/WebCore/platform/graphics/gpu/LoopBlinnSolidFillShader.cpp

    r85716 r86067  
    4343    if (!program)
    4444        return nullptr;
    45     return new LoopBlinnSolidFillShader(context, program);
     45    return adoptPtr(new LoopBlinnSolidFillShader(context, program));
    4646}
    4747

  • trunk/Source/WebCore/platform/graphics/gpu/SolidFillShader.cpp

    r85716 r86067  
    5555    if (!program)
    5656        return nullptr;
    57     return new SolidFillShader(context, program);
     57    return adoptPtr(new SolidFillShader(context, program));
    5858}
    5959

  • trunk/Source/WebCore/platform/graphics/gpu/TexShader.cpp

    r85716 r86067  
    5656    if (!program)
    5757        return nullptr;
    58     return new TexShader(context, program);
     58    return adoptPtr(new TexShader(context, program));
    5959}
    6060

  • trunk/Source/WebCore/platform/graphics/gpu/Texture.cpp

    r84890 r86067  
    117117                                        0, glFormat, glType);
    118118    }
    119     return adoptRef(new Texture(context, textureIds.leakPtr(), format, width, height, maxTextureSize));
     119    return adoptRef(new Texture(context, textureIds.release(), format, width, height, maxTextureSize));
    120120}
    121121

  • trunk/Source/WebCore/storage/chromium/DatabaseTrackerChromium.cpp

    r84890 r86067  
    101101    static PassOwnPtr<TrackerRemoveOpenDatabaseTask> create(PassRefPtr<AbstractDatabase> database)
    102102    {
    103         return new TrackerRemoveOpenDatabaseTask(database);
     103        return adoptPtr(new TrackerRemoveOpenDatabaseTask(database));
    104104    }
    105105

  • trunk/Source/WebCore/storage/chromium/SQLTransactionClientChromium.cpp

    r64151 r86067  
    4444    static PassOwnPtr<NotifyDatabaseChangedTask> create(AbstractDatabase *database)
    4545    {
    46         return new NotifyDatabaseChangedTask(database);
     46        return adoptPtr(new NotifyDatabaseChangedTask(database));
    4747    }
    4848

  • trunk/Source/WebKit/chromium/ChangeLog

    r86047 r86067  
     12011-05-09  Adam Barth  <abarth@webkit.org>
     2
     3        Reviewed by Tony Gentilcore.
     4
     5        Make Chromium build with strict PassOwnPtr
     6        https://bugs.webkit.org/show_bug.cgi?id=60461
     7
     8        Fixed many, many PassOwnPtr nits.
     9
     10        * src/EditorClientImpl.cpp:
     11        (WebKit::EditorClientImpl::autofill):
     12        * src/IDBDatabaseBackendProxy.cpp:
     13        (WebKit::IDBDatabaseBackendProxy::createObjectStore):
     14        (WebKit::IDBDatabaseBackendProxy::transaction):
     15        * src/IDBObjectStoreBackendProxy.cpp:
     16        (WebKit::IDBObjectStoreBackendProxy::createIndex):
     17        (WebKit::IDBObjectStoreBackendProxy::index):
     18        * src/IDBTransactionBackendProxy.cpp:
     19        (WebKit::IDBTransactionBackendProxy::objectStore):
     20        * src/PlatformMessagePortChannel.cpp:
     21        (WebCore::MessagePortChannel::create):
     22        (WebCore::PlatformMessagePortChannel::tryGetMessageFromRemote):
     23        * src/SharedWorkerRepository.cpp:
     24        (WebCore::SharedWorkerRepository::connect):
     25        * src/SocketStreamHandle.cpp:
     26        (WebCore::SocketStreamHandleInternal::create):
     27        * src/WebDevToolsAgentImpl.cpp:
     28        (WebKit::DebuggerTask::DebuggerTask):
     29        (WebKit::DebuggerTask::~DebuggerTask):
     30        (WebKit::DebuggerTask::run):
     31        (WebKit::WebDevToolsAgent::interruptAndDispatch):
     32        * src/WebDevToolsFrontendImpl.cpp:
     33        (WebKit::WebDevToolsFrontendImpl::WebDevToolsFrontendImpl):
     34        * src/WebIDBCallbacksImpl.cpp:
     35        (WebKit::WebIDBCallbacksImpl::onSuccess):
     36        * src/WebIDBCursorImpl.cpp:
     37        (WebKit::WebIDBCursorImpl::update):
     38        (WebKit::WebIDBCursorImpl::continueFunction):
     39        (WebKit::WebIDBCursorImpl::deleteFunction):
     40        * src/WebIDBDatabaseImpl.cpp:
     41        (WebKit::WebIDBDatabaseImpl::setVersion):
     42        (WebKit::WebIDBDatabaseImpl::open):
     43        * src/WebIDBFactoryImpl.cpp:
     44        (WebKit::WebIDBFactoryImpl::open):
     45        * src/WebIDBIndexImpl.cpp:
     46        (WebKit::WebIDBIndexImpl::openObjectCursor):
     47        (WebKit::WebIDBIndexImpl::openKeyCursor):
     48        (WebKit::WebIDBIndexImpl::getObject):
     49        (WebKit::WebIDBIndexImpl::getKey):
     50        * src/WebIDBObjectStoreImpl.cpp:
     51        (WebKit::WebIDBObjectStoreImpl::get):
     52        (WebKit::WebIDBObjectStoreImpl::put):
     53        (WebKit::WebIDBObjectStoreImpl::deleteFunction):
     54        (WebKit::WebIDBObjectStoreImpl::clear):
     55        (WebKit::WebIDBObjectStoreImpl::openCursor):
     56        * src/WebIDBTransactionImpl.cpp:
     57        (WebKit::WebIDBTransactionImpl::setCallbacks):
     58        * src/WebPluginContainerImpl.cpp:
     59        (WebKit::WebPluginContainerImpl::loadFrameRequest):
     60        * src/WebViewImpl.cpp:
     61        (WebKit::WebViewImpl::setDevToolsAgentClient):
     62        * src/WebWorkerClientImpl.cpp:
     63        (WebKit::WebWorkerClientImpl::postMessageToWorkerObject):
     64        * src/WebWorkerImpl.cpp:
     65        (WebKit::WebWorkerImpl::postMessageToWorkerContext):
     66        * src/WorkerFileWriterCallbacksBridge.cpp:
     67        (WebKit::WorkerFileWriterCallbacksBridge::initOnMainThread):
     68        (WebKit::WorkerFileWriterCallbacksBridge::didWrite):
     69        (WebKit::WorkerFileWriterCallbacksBridge::didFail):
     70        (WebKit::WorkerFileWriterCallbacksBridge::didTruncate):
     71
    1722011-05-09  Shishir Agrawal  <shishir@chromium.org>
    273

  • trunk/Source/WebKit/chromium/src/EditorClientImpl.cpp

    r85241 r86067  
    748748        return false;
    749749
    750     m_autofillArgs = new AutofillArgs();
     750    m_autofillArgs = adoptPtr(new AutofillArgs);
    751751    m_autofillArgs->inputElement = inputElement;
    752752    m_autofillArgs->autofillFormOnly = autofillFormOnly;

  • trunk/Source/WebKit/chromium/src/IDBDatabaseBackendProxy.cpp

    r82917 r86067  
    8181    // all implementations of IDB interfaces are proxy objects.
    8282    IDBTransactionBackendProxy* transactionProxy = static_cast<IDBTransactionBackendProxy*>(transaction);
    83     WebIDBObjectStore* objectStore = m_webIDBDatabase->createObjectStore(name, keyPath, autoIncrement, *transactionProxy->getWebIDBTransaction(), ec);
     83    OwnPtr<WebIDBObjectStore> objectStore = adoptPtr(m_webIDBDatabase->createObjectStore(name, keyPath, autoIncrement, *transactionProxy->getWebIDBTransaction(), ec));
    8484    if (!objectStore)
    8585        return 0;
    86     return IDBObjectStoreBackendProxy::create(objectStore);
     86    return IDBObjectStoreBackendProxy::create(objectStore.release());
    8787}
    8888
    … …  
    103103{
    104104    WebDOMStringList names(storeNames);
    105     WebIDBTransaction* transaction = m_webIDBDatabase->transaction(names, mode, ec);
     105    OwnPtr<WebIDBTransaction> transaction = adoptPtr(m_webIDBDatabase->transaction(names, mode, ec));
    106106    if (!transaction) {
    107107        ASSERT(ec);
    108108        return 0;
    109109    }
    110     return IDBTransactionBackendProxy::create(transaction);
     110    return IDBTransactionBackendProxy::create(transaction.release());
    111111}
    112112

  • trunk/Source/WebKit/chromium/src/IDBObjectStoreBackendProxy.cpp

    r82917 r86067  
    112112    // all implementations of IDB interfaces are proxy objects.
    113113    IDBTransactionBackendProxy* transactionProxy = static_cast<IDBTransactionBackendProxy*>(transaction);
    114     WebIDBIndex* index = m_webIDBObjectStore->createIndex(name, keyPath, unique, *transactionProxy->getWebIDBTransaction(), ec);
     114    OwnPtr<WebIDBIndex> index = adoptPtr(m_webIDBObjectStore->createIndex(name, keyPath, unique, *transactionProxy->getWebIDBTransaction(), ec));
    115115    if (!index)
    116116        return 0;
    117     return IDBIndexBackendProxy::create(index);
     117    return IDBIndexBackendProxy::create(index.release());
    118118}
    119119
    120120PassRefPtr<IDBIndexBackendInterface> IDBObjectStoreBackendProxy::index(const String& name, ExceptionCode& ec)
    121121{
    122     WebIDBIndex* index = m_webIDBObjectStore->index(name, ec);
     122    OwnPtr<WebIDBIndex> index = adoptPtr(m_webIDBObjectStore->index(name, ec));
    123123    if (!index)
    124124        return 0;
    125     return IDBIndexBackendProxy::create(index);
     125    return IDBIndexBackendProxy::create(index.release());
    126126}
    127127

  • trunk/Source/WebKit/chromium/src/IDBTransactionBackendProxy.cpp

    r82917 r86067  
    5757PassRefPtr<IDBObjectStoreBackendInterface> IDBTransactionBackendProxy::objectStore(const String& name, ExceptionCode& ec)
    5858{
    59     WebIDBObjectStore* objectStore = m_webIDBTransaction->objectStore(name, ec);
     59    OwnPtr<WebIDBObjectStore> objectStore = adoptPtr(m_webIDBTransaction->objectStore(name, ec));
    6060    if (!objectStore)
    6161        return 0;
    62     return IDBObjectStoreBackendProxy::create(objectStore);
     62    return IDBObjectStoreBackendProxy::create(objectStore.release());
    6363}
    6464

  • trunk/Source/WebKit/chromium/src/PlatformMessagePortChannel.cpp

    r53586 r86067  
    4747PassOwnPtr<MessagePortChannel> MessagePortChannel::create(PassRefPtr<PlatformMessagePortChannel> channel)
    4848{
    49     return new MessagePortChannel(channel);
     49    return adoptPtr(new MessagePortChannel(channel));
    5050}
    5151
    … …  
    205205        OwnPtr<MessagePortChannelArray> channels;
    206206        if (webChannels.size()) {
    207             channels = new MessagePortChannelArray(webChannels.size());
     207            channels = adoptPtr(new MessagePortChannelArray(webChannels.size()));
    208208            for (size_t i = 0; i < webChannels.size(); ++i) {
    209209                RefPtr<PlatformMessagePortChannel> platformChannel = create(webChannels[i]);

  • trunk/Source/WebKit/chromium/src/SharedWorkerRepository.cpp

    r75604 r86067  
    205205    WebFrameImpl* webFrame = WebFrameImpl::fromFrame(document->frame());
    206206    OwnPtr<WebSharedWorker> webWorker;
    207     webWorker = webFrame->client()->createSharedWorker(webFrame, url, name, getId(document));
     207    webWorker = adoptPtr(webFrame->client()->createSharedWorker(webFrame, url, name, getId(document)));
    208208
    209209    if (!webWorker) {

  • trunk/Source/WebKit/chromium/src/SocketStreamHandle.cpp

    r84893 r86067  
    5353    static PassOwnPtr<SocketStreamHandleInternal> create(SocketStreamHandle* handle)
    5454    {
    55         return new SocketStreamHandleInternal(handle);
     55        return adoptPtr(new SocketStreamHandleInternal(handle));
    5656    }
    5757    virtual ~SocketStreamHandleInternal();

  • trunk/Source/WebKit/chromium/src/WebDevToolsAgentImpl.cpp

    r84933 r86067  
    7979        if (s_instance)
    8080            return;
    81         s_instance = new ClientMessageLoopAdapter(client->createClientMessageLoop());
    82         PageScriptDebugServer::shared().setClientMessageLoop(s_instance);
     81        OwnPtr<ClientMessageLoopAdapter> instance = adoptPtr(new ClientMessageLoopAdapter(adoptPtr(client->createClientMessageLoop())));
     82        s_instance = instance.get();
     83        PageScriptDebugServer::shared().setClientMessageLoop(instance.release());
    8384    }
    8485
    … …  
    151152    typedef HashSet<WebViewImpl*> FrozenViewsSet;
    152153    FrozenViewsSet m_frozenViews;
     154    // FIXME: The ownership model for s_instance is somewhat complicated. Can we make this simpler?
    153155    static ClientMessageLoopAdapter* s_instance;
    154 
    155156};
    156157
    … …  
    158159
    159160} //  namespace
     161
     162class DebuggerTask : public PageScriptDebugServer::Task {
     163public:
     164    DebuggerTask(PassOwnPtr<WebDevToolsAgent::MessageDescriptor> descriptor)
     165        : m_descriptor(descriptor)
     166    {
     167    }
     168
     169    virtual ~DebuggerTask() { }
     170    virtual void run()
     171    {
     172        if (WebDevToolsAgent* webagent = m_descriptor->agent())
     173            webagent->dispatchOnInspectorBackend(m_descriptor->message());
     174    }
     175
     176private:
     177    OwnPtr<WebDevToolsAgent::MessageDescriptor> m_descriptor;
     178};
    160179
    161180WebDevToolsAgentImpl::WebDevToolsAgentImpl(
    … …  
    321340    // rawDescriptor can't be a PassOwnPtr because interruptAndDispatch is a WebKit API function.
    322341    OwnPtr<MessageDescriptor> descriptor = adoptPtr(rawDescriptor);
    323 
    324     class DebuggerTask : public PageScriptDebugServer::Task {
    325     public:
    326         DebuggerTask(PassOwnPtr<WebDevToolsAgent::MessageDescriptor> descriptor)
    327             : m_descriptor(descriptor)
    328         {
    329         }
    330 
    331         virtual ~DebuggerTask() { }
    332         virtual void run()
    333         {
    334             if (WebDevToolsAgent* webagent = m_descriptor->agent())
    335                 webagent->dispatchOnInspectorBackend(m_descriptor->message());
    336         }
    337 
    338     private:
    339         OwnPtr<WebDevToolsAgent::MessageDescriptor> m_descriptor;
    340     };
    341 
    342     PageScriptDebugServer::interruptAndRun(new DebuggerTask(descriptor.release()));
     342    OwnPtr<DebuggerTask> task = adoptPtr(new DebuggerTask(descriptor.release()));
     343    PageScriptDebugServer::interruptAndRun(task.release());
    343344}
    344345

  • trunk/Source/WebKit/chromium/src/WebDevToolsFrontendImpl.cpp

    r74785 r86067  
    9494{
    9595    InspectorController* ic = m_webViewImpl->page()->inspectorController();
    96     ic->setInspectorFrontendClient(new InspectorFrontendClientImpl(m_webViewImpl->page(), m_client, this));
     96    ic->setInspectorFrontendClient(adoptPtr(new InspectorFrontendClientImpl(m_webViewImpl->page(), m_client, this)));
    9797
    9898    // Put each DevTools frontend Page into its own (single page) group so that it's not

  • trunk/Source/WebKit/chromium/src/WebIDBCallbacksImpl.cpp

    r82917 r86067  
    6262void WebIDBCallbacksImpl::onSuccess(WebIDBCursor* cursor)
    6363{
    64     m_callbacks->onSuccess(IDBCursorBackendProxy::create(cursor));
     64    m_callbacks->onSuccess(IDBCursorBackendProxy::create(adoptPtr(cursor)));
    6565}
    6666
    6767void WebIDBCallbacksImpl::onSuccess(WebIDBDatabase* webKitInstance)
    6868{
    69     m_callbacks->onSuccess(IDBDatabaseBackendProxy::create(webKitInstance));
     69    m_callbacks->onSuccess(IDBDatabaseBackendProxy::create(adoptPtr(webKitInstance)));
    7070}
    7171
    … …  
    7777void WebIDBCallbacksImpl::onSuccess(WebIDBTransaction* webKitInstance)
    7878{
    79     m_callbacks->onSuccess(IDBTransactionBackendProxy::create(webKitInstance));
     79    m_callbacks->onSuccess(IDBTransactionBackendProxy::create(adoptPtr(webKitInstance)));
    8080}
    8181

  • trunk/Source/WebKit/chromium/src/WebIDBCursorImpl.cpp

    r82917 r86067  
    7070void WebIDBCursorImpl::update(const WebSerializedScriptValue& value, WebIDBCallbacks* callbacks, WebExceptionCode& ec)
    7171{
    72     m_idbCursorBackend->update(value, IDBCallbacksProxy::create(callbacks), ec);
     72    m_idbCursorBackend->update(value, IDBCallbacksProxy::create(adoptPtr(callbacks)), ec);
    7373}
    7474
    7575void WebIDBCursorImpl::continueFunction(const WebIDBKey& key, WebIDBCallbacks* callbacks, WebExceptionCode& ec)
    7676{
    77     m_idbCursorBackend->continueFunction(key, IDBCallbacksProxy::create(callbacks), ec);
     77    m_idbCursorBackend->continueFunction(key, IDBCallbacksProxy::create(adoptPtr(callbacks)), ec);
    7878}
    7979
    8080void WebIDBCursorImpl::deleteFunction(WebIDBCallbacks* callbacks, WebExceptionCode& ec)
    8181{
    82     m_idbCursorBackend->deleteFunction(IDBCallbacksProxy::create(callbacks), ec);
     82    m_idbCursorBackend->deleteFunction(IDBCallbacksProxy::create(adoptPtr(callbacks)), ec);
    8383}
    8484

  • trunk/Source/WebKit/chromium/src/WebIDBDatabaseImpl.cpp

    r82917 r86067  
    8484void WebIDBDatabaseImpl::setVersion(const WebString& version, WebIDBCallbacks* callbacks, WebExceptionCode& ec)
    8585{
    86     m_databaseBackend->setVersion(version, IDBCallbacksProxy::create(callbacks), m_databaseCallbacks, ec);
     86    m_databaseBackend->setVersion(version, IDBCallbacksProxy::create(adoptPtr(callbacks)), m_databaseCallbacks, ec);
    8787}
    8888
    … …  
    109109{
    110110    ASSERT(!m_databaseCallbacks);
    111     m_databaseCallbacks = IDBDatabaseCallbacksProxy::create(callbacks);
     111    m_databaseCallbacks = IDBDatabaseCallbacksProxy::create(adoptPtr(callbacks));
    112112    m_databaseBackend->open(m_databaseCallbacks);
    113113}

  • trunk/Source/WebKit/chromium/src/WebIDBFactoryImpl.cpp

    r82917 r86067  
    6161void WebIDBFactoryImpl::open(const WebString& name, WebIDBCallbacks* callbacks, const WebSecurityOrigin& origin, WebFrame*, const WebString& dataDir, unsigned long long maximumSize, BackingStoreType backingStoreType)
    6262{
    63     m_idbFactoryBackend->open(name, IDBCallbacksProxy::create(callbacks), origin, 0, dataDir, maximumSize, static_cast<IDBFactoryBackendInterface::BackingStoreType>(backingStoreType));
     63    m_idbFactoryBackend->open(name, IDBCallbacksProxy::create(adoptPtr(callbacks)), origin, 0, dataDir, maximumSize, static_cast<IDBFactoryBackendInterface::BackingStoreType>(backingStoreType));
    6464}
    6565

  • trunk/Source/WebKit/chromium/src/WebIDBIndexImpl.cpp

    r82917 r86067  
    7171void WebIDBIndexImpl::openObjectCursor(const WebIDBKeyRange& keyRange, unsigned short direction, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction, WebExceptionCode& ec)
    7272{
    73     m_backend->openCursor(keyRange, direction, IDBCallbacksProxy::create(callbacks), transaction.getIDBTransactionBackendInterface(), ec);
     73    m_backend->openCursor(keyRange, direction, IDBCallbacksProxy::create(adoptPtr(callbacks)), transaction.getIDBTransactionBackendInterface(), ec);
    7474}
    7575
    7676void WebIDBIndexImpl::openKeyCursor(const WebIDBKeyRange& keyRange, unsigned short direction, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction, WebExceptionCode& ec)
    7777{
    78     m_backend->openKeyCursor(keyRange, direction, IDBCallbacksProxy::create(callbacks), transaction.getIDBTransactionBackendInterface(), ec);
     78    m_backend->openKeyCursor(keyRange, direction, IDBCallbacksProxy::create(adoptPtr(callbacks)), transaction.getIDBTransactionBackendInterface(), ec);
    7979}
    8080
    8181void WebIDBIndexImpl::getObject(const WebIDBKey& keyRange, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction, WebExceptionCode& ec)
    8282{
    83     m_backend->get(keyRange, IDBCallbacksProxy::create(callbacks), transaction.getIDBTransactionBackendInterface(), ec);
     83    m_backend->get(keyRange, IDBCallbacksProxy::create(adoptPtr(callbacks)), transaction.getIDBTransactionBackendInterface(), ec);
    8484}
    8585
    8686void WebIDBIndexImpl::getKey(const WebIDBKey& keyRange, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction, WebExceptionCode& ec)
    8787{
    88     m_backend->getKey(keyRange, IDBCallbacksProxy::create(callbacks), transaction.getIDBTransactionBackendInterface(), ec);
     88    m_backend->getKey(keyRange, IDBCallbacksProxy::create(adoptPtr(callbacks)), transaction.getIDBTransactionBackendInterface(), ec);
    8989}
    9090

  • trunk/Source/WebKit/chromium/src/WebIDBObjectStoreImpl.cpp

    r82917 r86067  
    7070void WebIDBObjectStoreImpl::get(const WebIDBKey& key, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction, WebExceptionCode& ec)
    7171{
    72     m_objectStore->get(key, IDBCallbacksProxy::create(callbacks), transaction.getIDBTransactionBackendInterface(), ec);
     72    m_objectStore->get(key, IDBCallbacksProxy::create(adoptPtr(callbacks)), transaction.getIDBTransactionBackendInterface(), ec);
    7373}
    7474
    7575void WebIDBObjectStoreImpl::put(const WebSerializedScriptValue& value, const WebIDBKey& key, PutMode putMode, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction, WebExceptionCode& ec)
    7676{
    77     m_objectStore->put(value, key, static_cast<IDBObjectStoreBackendInterface::PutMode>(putMode), IDBCallbacksProxy::create(callbacks), transaction.getIDBTransactionBackendInterface(), ec);
     77    m_objectStore->put(value, key, static_cast<IDBObjectStoreBackendInterface::PutMode>(putMode), IDBCallbacksProxy::create(adoptPtr(callbacks)), transaction.getIDBTransactionBackendInterface(), ec);
    7878}
    7979
    8080void WebIDBObjectStoreImpl::deleteFunction(const WebIDBKey& key, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction, WebExceptionCode& ec)
    8181{
    82     m_objectStore->deleteFunction(key, IDBCallbacksProxy::create(callbacks), transaction.getIDBTransactionBackendInterface(), ec);
     82    m_objectStore->deleteFunction(key, IDBCallbacksProxy::create(adoptPtr(callbacks)), transaction.getIDBTransactionBackendInterface(), ec);
    8383}
    8484
    8585void WebIDBObjectStoreImpl::clear(WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction, WebExceptionCode& ec)
    8686{
    87     m_objectStore->clear(IDBCallbacksProxy::create(callbacks), transaction.getIDBTransactionBackendInterface(), ec);
     87    m_objectStore->clear(IDBCallbacksProxy::create(adoptPtr(callbacks)), transaction.getIDBTransactionBackendInterface(), ec);
    8888}
    8989
    … …  
    111111void WebIDBObjectStoreImpl::openCursor(const WebIDBKeyRange& keyRange, unsigned short direction, WebIDBCallbacks* callbacks, const WebIDBTransaction& transaction, WebExceptionCode& ec)
    112112{
    113     m_objectStore->openCursor(keyRange, direction, IDBCallbacksProxy::create(callbacks), transaction.getIDBTransactionBackendInterface(), ec);
     113    m_objectStore->openCursor(keyRange, direction, IDBCallbacksProxy::create(adoptPtr(callbacks)), transaction.getIDBTransactionBackendInterface(), ec);
    114114}
    115115

  • trunk/Source/WebKit/chromium/src/WebIDBTransactionImpl.cpp

    r82748 r86067  
    7272void WebIDBTransactionImpl::setCallbacks(WebIDBTransactionCallbacks* callbacks)
    7373{
    74     RefPtr<IDBTransactionCallbacks> idbCallbacks = IDBTransactionCallbacksProxy::create(callbacks);
     74    RefPtr<IDBTransactionCallbacks> idbCallbacks = IDBTransactionCallbacksProxy::create(adoptPtr(callbacks));
    7575    m_backend->setCallbacks(idbCallbacks.get());
    7676}

  • trunk/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp

    r84270 r86067  
    377377        // our frame request.  It would be better to evolve FrameLoader to
    378378        // support a completion callback instead.
    379         WebPluginLoadObserver* observer =
    380             new WebPluginLoadObserver(this, request.url(), notifyData);
    381         m_pluginLoadObservers.append(observer);
    382         WebDataSourceImpl::setNextPluginLoadObserver(observer);
     379        OwnPtr<WebPluginLoadObserver> observer = adoptPtr(new WebPluginLoadObserver(this, request.url(), notifyData));
     380        // FIXME: Calling get here is dangerous! What if observer is freed?
     381        m_pluginLoadObservers.append(observer.get());
     382        WebDataSourceImpl::setNextPluginLoadObserver(observer.release());
    383383    }
    384384

  • trunk/Source/WebKit/chromium/src/WebViewImpl.cpp

    r86047 r86067  
    282282{
    283283    if (devToolsClient)
    284         m_devToolsAgent = new WebDevToolsAgentImpl(this, devToolsClient);
     284        m_devToolsAgent = adoptPtr(new WebDevToolsAgentImpl(this, devToolsClient));
    285285    else
    286286        m_devToolsAgent.clear();

  • trunk/Source/WebKit/chromium/src/WebWorkerClientImpl.cpp

    r85165 r86067  
    212212    OwnPtr<MessagePortChannelArray> channels2;
    213213    if (channels.size()) {
    214         channels2 = new MessagePortChannelArray(channels.size());
     214        channels2 = adoptPtr(new MessagePortChannelArray(channels.size()));
    215215        for (size_t i = 0; i < channels.size(); ++i) {
    216216            RefPtr<PlatformMessagePortChannel> platform_channel =

  • trunk/Source/WebKit/chromium/src/WebWorkerImpl.cpp

    r85165 r86067  
    119119    OwnPtr<MessagePortChannelArray> channels;
    120120    if (webChannels.size()) {
    121         channels = new MessagePortChannelArray(webChannels.size());
     121        channels = adoptPtr(new MessagePortChannelArray(webChannels.size()));
    122122        for (size_t i = 0; i < webChannels.size(); ++i) {
    123123            RefPtr<PlatformMessagePortChannel> platform_channel =

  • trunk/Source/WebKit/chromium/src/WorkerFileWriterCallbacksBridge.cpp

    r85165 r86067  
    105105{
    106106    ASSERT(!bridge->m_writer);
    107     bridge->m_writer = webKitClient()->fileSystem()->createFileWriter(path, bridge.get());
     107    bridge->m_writer = adoptPtr(webKitClient()->fileSystem()->createFileWriter(path, bridge.get()));
    108108}
    109109
    … …  
    116116void WorkerFileWriterCallbacksBridge::didWrite(long long bytes, bool complete)
    117117{
    118     dispatchTaskToWorkerThread(
    119         createCallbackTask(&didWriteOnWorkerThread, AllowCrossThreadAccess(this), bytes, complete));
     118    dispatchTaskToWorkerThread(createCallbackTask(&didWriteOnWorkerThread, AllowCrossThreadAccess(this), bytes, complete));
    120119}
    121120
    122121void WorkerFileWriterCallbacksBridge::didFail(WebFileError error)
    123122{
    124     dispatchTaskToWorkerThread(
    125         createCallbackTask(&didFailOnWorkerThread, AllowCrossThreadAccess(this), error));
     123    dispatchTaskToWorkerThread(createCallbackTask(&didFailOnWorkerThread, AllowCrossThreadAccess(this), error));
    126124}
    127125
    128126void WorkerFileWriterCallbacksBridge::didTruncate()
    129127{
    130     dispatchTaskToWorkerThread(
    131         createCallbackTask(&didTruncateOnWorkerThread, AllowCrossThreadAccess(this)));
     128    dispatchTaskToWorkerThread(createCallbackTask(&didTruncateOnWorkerThread, AllowCrossThreadAccess(this)));
    132129}
    133130
Note: See TracChangeset for help on using the changeset viewer.