Changeset 85094 in webkit


Ignore:
Timestamp:
Apr 27, 2011 2:25:22 PM (13 years ago)
Author:
abarth@webkit.org
Message:

2011-04-27 Darin Adler <Darin Adler>

Reviewed by David Levin.

Fix strict OwnPtr issues seen in about 30 more files
​https://bugs.webkit.org/show_bug.cgi?id=59615

  • bindings/js/JSCallbackData.h: (WebCore::DeleteCallbackDataTask::create): Use adoptPtr.
  • bindings/js/JSMessageEventCustom.cpp: (WebCore::JSMessageEvent::initMessageEvent): Use adoptPtr.
  • css/CSSParser.cpp: (WebCore::CSSParser::updateSpecifiersWithElementName): Use OwnPtr, adoptPtr, and release.
  • dom/MessageEvent.cpp: (WebCore::MessageEvent::initMessageEvent): Use OwnPtr, adoptPtr, and release.
  • dom/MessagePortChannel.cpp: (WebCore::MessagePortChannel::EventData::create): Use adoptPtr.
  • dom/ScriptExecutionContext.cpp: (WebCore::ProcessMessagesSoonTask::create): Use adoptPtr.
  • dom/XMLDocumentParserLibxml2.cpp: (WebCore::XMLDocumentParser::doEnd): Use adoptPtr.
  • dom/default/PlatformMessagePortChannel.cpp: (WebCore::MessagePortChannel::create): Use adoptPtr.
  • html/HTMLFormControlElement.cpp: (WebCore::HTMLFormControlElement::detach): Use nullptr.
  • inspector/InspectorAgent.cpp: (WebCore::PostWorkerNotificationToFrontendTask::create): Use adoptPtr.
  • inspector/InspectorConsoleAgent.cpp: (WebCore::InspectorConsoleAgent::addMessageToConsole): Use adoptPtr. (WebCore::InspectorConsoleAgent::didReceiveResponse): Use adoptPtr. (WebCore::InspectorConsoleAgent::didFailLoading): Use adoptPtr.
  • inspector/InspectorController.cpp: (WebCore::InspectorController::connectFrontend): Use adoptPtr.
  • inspector/InspectorDOMAgent.cpp: (WebCore::InspectorDOMAgent::didInvalidateStyleAttr): Use adoptPtr.
  • inspector/InspectorResourceAgent.cpp: (WebCore::InspectorResourceAgent::InspectorResourceAgent): Use adoptPtr.
  • page/FrameActionScheduler.cpp: (WebCore::FrameActionScheduler::scheduleEvent): Use adoptPtr.
  • platform/graphics/ShadowBlur.cpp: (WebCore::ScratchBuffer::clearScratchBuffer): Use nullptr.
  • platform/graphics/ca/GraphicsLayerCA.cpp: (WebCore::GraphicsLayer::create): Use adoptPtr. (WebCore::GraphicsLayerCA::ensureCloneLayers): Use adoptPtr. (WebCore::GraphicsLayerCA::removeCloneLayers): Use nullptr.
  • rendering/RenderBlock.cpp: (WebCore::RenderBlock::setMaxMarginBeforeValues): Use adoptPtr. (WebCore::RenderBlock::setMaxMarginAfterValues): Use adoptPtr. (WebCore::RenderBlock::setPaginationStrut): Use adoptPtr. (WebCore::RenderBlock::setPageLogicalOffset): Use adoptPtr.
  • rendering/RenderLayerBacking.cpp: (WebCore::RenderLayerBacking::destroyGraphicsLayer): Use nullptr. (WebCore::RenderLayerBacking::updateClippingLayers): Use nullptr. (WebCore::RenderLayerBacking::updateForegroundLayer): Use nullptr. (WebCore::RenderLayerBacking::updateMaskLayer): Use nullptr.
  • rendering/RenderLayerCompositor.cpp: (WebCore::RenderLayerCompositor::updateOverflowControlsLayers): Use nullptr. (WebCore::RenderLayerCompositor::ensureRootPlatformLayer): Use nullptr. (WebCore::RenderLayerCompositor::destroyRootPlatformLayer): Use nullptr.
  • rendering/style/StyleRareNonInheritedData.cpp: (WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData): Removed explicit initializations of OwnPtr members to 0. Use adoptPtr.
  • workers/SharedWorkerContext.cpp: (WebCore::createConnectEvent): Use adoptPtr.
  • workers/Worker.cpp: (WebCore::Worker::notifyFinished): Use nullptr.
Location:
trunk/Source/WebCore
Files:
22 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r85090 r85094  
     12011-04-27  Darin Adler  <darin@apple.com>
     2
     3        Reviewed by David Levin.
     4
     5        Fix strict OwnPtr issues seen in about 30 more files
     6        https://bugs.webkit.org/show_bug.cgi?id=59615
     7
     8        * bindings/js/JSCallbackData.h:
     9        (WebCore::DeleteCallbackDataTask::create): Use adoptPtr.
     10        * bindings/js/JSMessageEventCustom.cpp:
     11        (WebCore::JSMessageEvent::initMessageEvent): Use adoptPtr.
     12        * css/CSSParser.cpp:
     13        (WebCore::CSSParser::updateSpecifiersWithElementName): Use OwnPtr,
     14        adoptPtr, and release.
     15        * dom/MessageEvent.cpp:
     16        (WebCore::MessageEvent::initMessageEvent): Use OwnPtr, adoptPtr,
     17        and release.
     18        * dom/MessagePortChannel.cpp:
     19        (WebCore::MessagePortChannel::EventData::create): Use adoptPtr.
     20        * dom/ScriptExecutionContext.cpp:
     21        (WebCore::ProcessMessagesSoonTask::create): Use adoptPtr.
     22        * dom/XMLDocumentParserLibxml2.cpp:
     23        (WebCore::XMLDocumentParser::doEnd): Use adoptPtr.
     24        * dom/default/PlatformMessagePortChannel.cpp:
     25        (WebCore::MessagePortChannel::create): Use adoptPtr.
     26        * html/HTMLFormControlElement.cpp:
     27        (WebCore::HTMLFormControlElement::detach): Use nullptr.
     28        * inspector/InspectorAgent.cpp:
     29        (WebCore::PostWorkerNotificationToFrontendTask::create): Use adoptPtr.
     30        * inspector/InspectorConsoleAgent.cpp:
     31        (WebCore::InspectorConsoleAgent::addMessageToConsole): Use adoptPtr.
     32        (WebCore::InspectorConsoleAgent::didReceiveResponse): Use adoptPtr.
     33        (WebCore::InspectorConsoleAgent::didFailLoading): Use adoptPtr.
     34        * inspector/InspectorController.cpp:
     35        (WebCore::InspectorController::connectFrontend): Use adoptPtr.
     36        * inspector/InspectorDOMAgent.cpp:
     37        (WebCore::InspectorDOMAgent::didInvalidateStyleAttr): Use adoptPtr.
     38        * inspector/InspectorResourceAgent.cpp:
     39        (WebCore::InspectorResourceAgent::InspectorResourceAgent): Use adoptPtr.
     40        * page/FrameActionScheduler.cpp:
     41        (WebCore::FrameActionScheduler::scheduleEvent): Use adoptPtr.
     42        * platform/graphics/ShadowBlur.cpp:
     43        (WebCore::ScratchBuffer::clearScratchBuffer): Use nullptr.
     44        * platform/graphics/ca/GraphicsLayerCA.cpp:
     45        (WebCore::GraphicsLayer::create): Use adoptPtr.
     46        (WebCore::GraphicsLayerCA::ensureCloneLayers): Use adoptPtr.
     47        (WebCore::GraphicsLayerCA::removeCloneLayers): Use nullptr.
     48        * rendering/RenderBlock.cpp:
     49        (WebCore::RenderBlock::setMaxMarginBeforeValues): Use adoptPtr.
     50        (WebCore::RenderBlock::setMaxMarginAfterValues): Use adoptPtr.
     51        (WebCore::RenderBlock::setPaginationStrut): Use adoptPtr.
     52        (WebCore::RenderBlock::setPageLogicalOffset): Use adoptPtr.
     53        * rendering/RenderLayerBacking.cpp:
     54        (WebCore::RenderLayerBacking::destroyGraphicsLayer): Use nullptr.
     55        (WebCore::RenderLayerBacking::updateClippingLayers): Use nullptr.
     56        (WebCore::RenderLayerBacking::updateForegroundLayer): Use nullptr.
     57        (WebCore::RenderLayerBacking::updateMaskLayer): Use nullptr.
     58        * rendering/RenderLayerCompositor.cpp:
     59        (WebCore::RenderLayerCompositor::updateOverflowControlsLayers): Use nullptr.
     60        (WebCore::RenderLayerCompositor::ensureRootPlatformLayer): Use nullptr.
     61        (WebCore::RenderLayerCompositor::destroyRootPlatformLayer): Use nullptr.
     62        * rendering/style/StyleRareNonInheritedData.cpp:
     63        (WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData): Removed
     64        explicit initializations of OwnPtr members to 0. Use adoptPtr.
     65        * workers/SharedWorkerContext.cpp:
     66        (WebCore::createConnectEvent): Use adoptPtr.
     67        * workers/Worker.cpp:
     68        (WebCore::Worker::notifyFinished): Use nullptr.
     69
    1702011-04-27  Enrica Casucci  <enrica@apple.com>
    271

  • trunk/Source/WebCore/bindings/js/JSCallbackData.h

    r83385 r85094  
    7878    static PassOwnPtr<DeleteCallbackDataTask> create(JSCallbackData* data)
    7979    {
    80         return new DeleteCallbackDataTask(data);
     80        return adoptPtr(new DeleteCallbackDataTask(data));
    8181    }
    8282

  • trunk/Source/WebCore/bindings/js/JSMessageEventCustom.cpp

    r84670 r85094  
    6868    OwnPtr<MessagePortArray> messagePorts;
    6969    if (!exec->argument(7).isUndefinedOrNull()) {
    70         messagePorts = new MessagePortArray();
     70        messagePorts = adoptPtr(new MessagePortArray);
    7171        fillMessagePortArray(exec, exec->argument(7), *messagePorts);
    7272        if (exec->hadException())

  • trunk/Source/WebCore/css/CSSParser.cpp

    r85077 r85094  
    63886388        return;
    63896389
    6390     CSSParserSelector* elementNameSelector = new CSSParserSelector;
     6390    OwnPtr<CSSParserSelector> elementNameSelector = adoptPtr(new CSSParserSelector);
    63916391    elementNameSelector->setTag(tag);
    6392     lastShadowDescendant->setTagHistory(elementNameSelector);
     6392    lastShadowDescendant->setTagHistory(elementNameSelector.release());
    63936393    lastShadowDescendant->setRelation(CSSSelector::ShadowDescendant);
    63946394}

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

    r49214 r85094  
    7878void MessageEvent::initMessageEvent(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtr<SerializedScriptValue> data, const String& origin, const String& lastEventId, DOMWindow* source, MessagePort* port)
    7979{
    80     MessagePortArray* ports = 0;
     80    OwnPtr<MessagePortArray> ports;
    8181    if (port) {
    82         ports = new MessagePortArray();
     82        ports = adoptPtr(new MessagePortArray);
    8383        ports->append(port);
    8484    }
    85     initMessageEvent(type, canBubble, cancelable, data, origin, lastEventId, source, ports);
     85    initMessageEvent(type, canBubble, cancelable, data, origin, lastEventId, source, ports.release());
    8686}
    8787

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

    r66850 r85094  
    3636PassOwnPtr<MessagePortChannel::EventData> MessagePortChannel::EventData::create(PassRefPtr<SerializedScriptValue> message, PassOwnPtr<MessagePortChannelArray> channels)
    3737{
    38     return new EventData(message, channels);
     38    return adoptPtr(new EventData(message, channels));
    3939}
    4040

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

    r81399 r85094  
    6161    static PassOwnPtr<ProcessMessagesSoonTask> create()
    6262    {
    63         return new ProcessMessagesSoonTask;
     63        return adoptPtr(new ProcessMessagesSoonTask);
    6464    }
    6565

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

    r84881 r85094  
    13521352    if (m_sawXSLTransform) {
    13531353        void* doc = xmlDocPtrForString(document()->cachedResourceLoader(), m_originalSourceForTransform, document()->url().string());
    1354         document()->setTransformSource(new TransformSource(doc));
     1354        document()->setTransformSource(adoptPtr(new TransformSource(doc)));
    13551355
    13561356        document()->setParsing(false); // Make the document think it's done, so it will apply XSL stylesheets.

  • trunk/Source/WebCore/dom/default/PlatformMessagePortChannel.cpp

    r50427 r85094  
    4545PassOwnPtr<MessagePortChannel> MessagePortChannel::create(PassRefPtr<PlatformMessagePortChannel> channel)
    4646{
    47     return new MessagePortChannel(channel);
     47    return adoptPtr(new MessagePortChannel(channel));
    4848}
    4949

  • trunk/Source/WebCore/html/HTMLFormControlElement.cpp

    r84693 r85094  
    8282void HTMLFormControlElement::detach()
    8383{
    84     m_validationMessage = 0;
     84    m_validationMessage = nullptr;
    8585    HTMLElement::detach();
    8686}

  • trunk/Source/WebCore/inspector/InspectorAgent.cpp

    r85035 r85094  
    331331    static PassOwnPtr<PostWorkerNotificationToFrontendTask> create(PassRefPtr<InspectorWorkerResource> worker, InspectorAgent::WorkerAction action)
    332332    {
    333         return new PostWorkerNotificationToFrontendTask(worker, action);
     333        return adoptPtr(new PostWorkerNotificationToFrontendTask(worker, action));
    334334    }
    335335

  • trunk/Source/WebCore/inspector/InspectorConsoleAgent.cpp

    r83175 r85094  
    129129    if (!m_inspectorAgent->enabled())
    130130        return;
    131     addConsoleMessage(new ConsoleMessage(source, type, level, message, arguments, callStack));
     131    addConsoleMessage(adoptPtr(new ConsoleMessage(source, type, level, message, arguments, callStack)));
    132132}
    133133
    … …  
    136136    if (!m_inspectorAgent->enabled())
    137137        return;
    138     addConsoleMessage(new ConsoleMessage(source, type, level, message, lineNumber, sourceID));
     138    addConsoleMessage(adoptPtr(new ConsoleMessage(source, type, level, message, lineNumber, sourceID)));
    139139}
    140140
    … …  
    208208    if (response.httpStatusCode() >= 400) {
    209209        String message = makeString("Failed to load resource: the server responded with a status of ", String::number(response.httpStatusCode()), " (", response.httpStatusText(), ')');
    210         addConsoleMessage(new ConsoleMessage(OtherMessageSource, NetworkErrorMessageType, ErrorMessageLevel, message, response.url().string(), identifier));
     210        addConsoleMessage(adoptPtr(new ConsoleMessage(OtherMessageSource, NetworkErrorMessageType, ErrorMessageLevel, message, response.url().string(), identifier)));
    211211    }
    212212}
    … …  
    221221    if (!error.localizedDescription().isEmpty())
    222222        message += ": " + error.localizedDescription();
    223     addConsoleMessage(new ConsoleMessage(OtherMessageSource, NetworkErrorMessageType, ErrorMessageLevel, message, error.failingURL(), identifier));
     223    addConsoleMessage(adoptPtr(new ConsoleMessage(OtherMessageSource, NetworkErrorMessageType, ErrorMessageLevel, message, error.failingURL(), identifier)));
    224224}
    225225

  • trunk/Source/WebCore/inspector/InspectorController.cpp

    r84833 r85094  
    106106{
    107107    m_openingFrontend = false;
    108     m_inspectorFrontend = new InspectorFrontend(m_inspectorClient);
     108    m_inspectorFrontend = adoptPtr(new InspectorFrontend(m_inspectorClient));
    109109    m_injectedScriptManager->injectedScriptHost()->setFrontend(m_inspectorFrontend.get());
    110110    m_inspectorAgent->setFrontend(m_inspectorFrontend.get());
    … …  
    115115
    116116    ASSERT(m_inspectorClient);
    117     m_inspectorBackendDispatcher = new InspectorBackendDispatcher(
     117    m_inspectorBackendDispatcher = adoptPtr(new InspectorBackendDispatcher(
    118118        m_inspectorClient,
    119119#if ENABLE(OFFLINE_WEB_APPLICATIONS)
    … …  
    145145        , m_inspectorAgent->workerAgent()
    146146#endif
    147     );
     147    ));
    148148
    149149    if (m_startUserInitiatedDebuggingWhenFrontedIsConnected) {

  • trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp

    r85047 r85094  
    12941294
    12951295    if (!m_revalidateStyleAttrTask)
    1296         m_revalidateStyleAttrTask = new RevalidateStyleAttributeTask(this);
     1296        m_revalidateStyleAttrTask = adoptPtr(new RevalidateStyleAttributeTask(this));
    12971297    m_revalidateStyleAttrTask->scheduleFor(static_cast<Element*>(node));
    12981298}

  • trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp

    r84774 r85094  
    375375{
    376376    if (backgroundEventsCollectionEnabled()) {
    377         m_eventsCollector = new EventsCollector();
    378         m_inspectorFrontendProxy = new InspectorFrontendProxy(m_eventsCollector.get());
     377        m_eventsCollector = adoptPtr(new EventsCollector);
     378        m_inspectorFrontendProxy = adoptPtr(new InspectorFrontendProxy(m_eventsCollector.get()));
    379379        // Create mock frontend, so we can collect network events.
    380         m_mockFrontend = new InspectorFrontend::Network(m_inspectorFrontendProxy.get());
     380        m_mockFrontend = adoptPtr(new InspectorFrontend::Network(m_inspectorFrontendProxy.get()));
    381381        m_frontend = m_mockFrontend.get();
    382382        enable();

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

    r80210 r85094  
    105105void FrameActionScheduler::scheduleEvent(PassRefPtr<Event> event, PassRefPtr<Node> eventTarget)
    106106{
    107     scheduleAction(new EventFrameAction(event, eventTarget));
     107    scheduleAction(adoptPtr(new EventFrameAction(event, eventTarget)));
    108108}
    109109

  • trunk/Source/WebCore/platform/graphics/ShadowBlur.cpp

    r84522 r85094  
    141141    void clearScratchBuffer()
    142142    {
    143         m_imageBuffer = 0;
     143        m_imageBuffer = nullptr;
    144144        m_lastRadius = FloatSize();
    145145    }

  • trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp

    r85036 r85094  
    240240PassOwnPtr<GraphicsLayer> GraphicsLayer::create(GraphicsLayerClient* client)
    241241{
    242     return new GraphicsLayerCA(client);
     242    return adoptPtr(new GraphicsLayerCA(client));
    243243}
    244244
    … …  
    21522152
    21532153    if (!m_layerClones)
    2154         m_layerClones = new LayerMap;
     2154        m_layerClones = adoptPtr(new LayerMap);
    21552155
    21562156    if (!m_structuralLayerClones && m_structuralLayer)
    2157         m_structuralLayerClones = new LayerMap;
     2157        m_structuralLayerClones = adoptPtr(new LayerMap);
    21582158
    21592159    if (!m_contentsLayerClones && m_contentsLayer)
    2160         m_contentsLayerClones = new LayerMap;
     2160        m_contentsLayerClones = adoptPtr(new LayerMap);
    21612161
    21622162    primaryLayer = findOrMakeClone(cloneID, m_layer.get(), m_layerClones.get(), cloneLevel);
    … …  
    21672167void GraphicsLayerCA::removeCloneLayers()
    21682168{
    2169     m_layerClones = 0;
    2170     m_structuralLayerClones = 0;
    2171     m_contentsLayerClones = 0;
     2169    m_layerClones = nullptr;
     2170    m_structuralLayerClones = nullptr;
     2171    m_contentsLayerClones = nullptr;
    21722172}
    21732173

  • trunk/Source/WebCore/rendering/RenderBlock.cpp

    r85011 r85094  
    55885588        if (pos == RenderBlockRareData::positiveMarginBeforeDefault(this) && neg == RenderBlockRareData::negativeMarginBeforeDefault(this))
    55895589            return;
    5590         m_rareData = new RenderBlockRareData(this);
     5590        m_rareData = adoptPtr(new RenderBlockRareData(this));
    55915591    }
    55925592    m_rareData->m_margins.setPositiveMarginBefore(pos);
    … …  
    55995599        if (pos == RenderBlockRareData::positiveMarginAfterDefault(this) && neg == RenderBlockRareData::negativeMarginAfterDefault(this))
    56005600            return;
    5601         m_rareData = new RenderBlockRareData(this);
     5601        m_rareData = adoptPtr(new RenderBlockRareData(this));
    56025602    }
    56035603    m_rareData->m_margins.setPositiveMarginAfter(pos);
    … …  
    56105610        if (!strut)
    56115611            return;
    5612         m_rareData = new RenderBlockRareData(this);
     5612        m_rareData = adoptPtr(new RenderBlockRareData(this));
    56135613    }
    56145614    m_rareData->m_paginationStrut = strut;
    … …  
    56205620        if (!logicalOffset)
    56215621            return;
    5622         m_rareData = new RenderBlockRareData(this);
     5622        m_rareData = adoptPtr(new RenderBlockRareData(this));
    56235623    }
    56245624    m_rareData->m_pageLogicalOffset = logicalOffset;

  • trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

    r85036 r85094  
    124124        m_graphicsLayer->removeFromParent();
    125125
    126     m_graphicsLayer = 0;
    127     m_foregroundLayer = 0;
    128     m_clippingLayer = 0;
    129     m_maskLayer = 0;
     126    m_graphicsLayer = nullptr;
     127    m_foregroundLayer = nullptr;
     128    m_clippingLayer = nullptr;
     129    m_maskLayer = nullptr;
    130130}
    131131
    … …  
    542542    } else if (m_ancestorClippingLayer) {
    543543        m_ancestorClippingLayer->removeFromParent();
    544         m_ancestorClippingLayer = 0;
     544        m_ancestorClippingLayer = nullptr;
    545545        layersChanged = true;
    546546    }
    … …  
    557557    } else if (m_clippingLayer) {
    558558        m_clippingLayer->removeFromParent();
    559         m_clippingLayer = 0;
     559        m_clippingLayer = nullptr;
    560560        layersChanged = true;
    561561    }
    … …  
    653653    } else if (m_foregroundLayer) {
    654654        m_foregroundLayer->removeFromParent();
    655         m_foregroundLayer = 0;
     655        m_foregroundLayer = nullptr;
    656656        layerChanged = true;
    657657    }
    … …  
    679679        }
    680680    } else if (m_maskLayer) {
    681         m_maskLayer = 0;
     681        m_maskLayer = nullptr;
    682682        layerChanged = true;
    683683    }

  • trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

    r84805 r85094  
    15091509    } else if (m_layerForHorizontalScrollbar) {
    15101510        m_layerForHorizontalScrollbar->removeFromParent();
    1511         m_layerForHorizontalScrollbar = 0;
     1511        m_layerForHorizontalScrollbar = nullptr;
    15121512        layersChanged = true;
    15131513    }
    … …  
    15221522    } else if (m_layerForVerticalScrollbar) {
    15231523        m_layerForVerticalScrollbar->removeFromParent();
    1524         m_layerForVerticalScrollbar = 0;
     1524        m_layerForVerticalScrollbar = nullptr;
    15251525        layersChanged = true;
    15261526    }
    … …  
    15351535    } else if (m_layerForScrollCorner) {
    15361536        m_layerForScrollCorner->removeFromParent();
    1537         m_layerForScrollCorner = 0;
     1537        m_layerForScrollCorner = nullptr;
    15381538        layersChanged = true;
    15391539    }
    … …  
    15941594    } else {
    15951595        if (m_overflowControlsHostLayer) {
    1596             m_overflowControlsHostLayer = 0;
    1597             m_clipLayer = 0;
    1598             m_scrollLayer = 0;
     1596            m_overflowControlsHostLayer = nullptr;
     1597            m_clipLayer = nullptr;
     1598            m_scrollLayer = nullptr;
    15991599        }
    16001600    }
    … …  
    16161616    if (m_layerForHorizontalScrollbar) {
    16171617        m_layerForHorizontalScrollbar->removeFromParent();
    1618         m_layerForHorizontalScrollbar = 0;
     1618        m_layerForHorizontalScrollbar = nullptr;
    16191619        if (Scrollbar* horizontalScrollbar = m_renderView->frameView()->verticalScrollbar())
    16201620            m_renderView->frameView()->invalidateScrollbar(horizontalScrollbar, IntRect(IntPoint(0, 0), horizontalScrollbar->frameRect().size()));
    … …  
    16231623    if (m_layerForVerticalScrollbar) {
    16241624        m_layerForVerticalScrollbar->removeFromParent();
    1625         m_layerForVerticalScrollbar = 0;
     1625        m_layerForVerticalScrollbar = nullptr;
    16261626        if (Scrollbar* verticalScrollbar = m_renderView->frameView()->verticalScrollbar())
    16271627            m_renderView->frameView()->invalidateScrollbar(verticalScrollbar, IntRect(IntPoint(0, 0), verticalScrollbar->frameRect().size()));
    … …  
    16291629
    16301630    if (m_layerForScrollCorner) {
    1631         m_layerForScrollCorner = 0;
     1631        m_layerForScrollCorner = nullptr;
    16321632        m_renderView->frameView()->invalidateScrollCorner();
    16331633    }
    16341634
    16351635    if (m_overflowControlsHostLayer) {
    1636         m_overflowControlsHostLayer = 0;
    1637         m_clipLayer = 0;
    1638         m_scrollLayer = 0;
     1636        m_overflowControlsHostLayer = nullptr;
     1637        m_clipLayer = nullptr;
     1638        m_scrollLayer = nullptr;
    16391639    }
    16401640    ASSERT(!m_scrollLayer);
    1641     m_rootPlatformLayer = 0;
     1641    m_rootPlatformLayer = nullptr;
    16421642}
    16431643

  • trunk/Source/WebCore/workers/SharedWorkerContext.cpp

    r48701 r85094  
    4545PassRefPtr<MessageEvent> createConnectEvent(PassRefPtr<MessagePort> port)
    4646{
    47     RefPtr<MessageEvent> event = MessageEvent::create(new MessagePortArray(1, port));
     47    RefPtr<MessageEvent> event = MessageEvent::create(adoptPtr(new MessagePortArray(1, port)));
    4848    event->initEvent(eventNames().connectEvent, false, false);
    4949    return event;
Note: See TracChangeset for help on using the changeset viewer.