Changeset 84843 in webkit


Ignore:
Timestamp:
Apr 25, 2011 4:45:49 PM (13 years ago)
Author:
jamesr@google.com
Message:

2011-04-25 James Robinson <​jamesr@chromium.org>

Unreviewed, rolling out r84835.
​http://trac.webkit.org/changeset/84835
​https://bugs.webkit.org/show_bug.cgi?id=59394

Breaks compile because Deque<OwnPtr> doesn't work

  • dom/XMLDocumentParserLibxml2.cpp: (WebCore::PendingCallbacks::~PendingCallbacks): (WebCore::PendingCallbacks::appendStartElementNSCallback): (WebCore::PendingCallbacks::appendEndElementNSCallback): (WebCore::PendingCallbacks::appendCharactersCallback): (WebCore::PendingCallbacks::appendProcessingInstructionCallback): (WebCore::PendingCallbacks::appendCDATABlockCallback): (WebCore::PendingCallbacks::appendCommentCallback): (WebCore::PendingCallbacks::appendInternalSubsetCallback): (WebCore::PendingCallbacks::appendErrorCallback): (WebCore::XMLDocumentParser::XMLDocumentParser):
  • html/ValidationMessage.cpp: (WebCore::ValidationMessage::setMessage): (WebCore::ValidationMessage::setMessageDOMAndStartTimer): (WebCore::ValidationMessage::requestToHideMessage):
Location:
trunk/Source/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r84842 r84843  
     12011-04-25  James Robinson  <jamesr@chromium.org>
     2
     3        Unreviewed, rolling out r84835.
     4        http://trac.webkit.org/changeset/84835
     5        https://bugs.webkit.org/show_bug.cgi?id=59394
     6
     7        Breaks compile because Deque<OwnPtr> doesn't work
     8
     9        * dom/XMLDocumentParserLibxml2.cpp:
     10        (WebCore::PendingCallbacks::~PendingCallbacks):
     11        (WebCore::PendingCallbacks::appendStartElementNSCallback):
     12        (WebCore::PendingCallbacks::appendEndElementNSCallback):
     13        (WebCore::PendingCallbacks::appendCharactersCallback):
     14        (WebCore::PendingCallbacks::appendProcessingInstructionCallback):
     15        (WebCore::PendingCallbacks::appendCDATABlockCallback):
     16        (WebCore::PendingCallbacks::appendCommentCallback):
     17        (WebCore::PendingCallbacks::appendInternalSubsetCallback):
     18        (WebCore::PendingCallbacks::appendErrorCallback):
     19        (WebCore::XMLDocumentParser::XMLDocumentParser):
     20        * html/ValidationMessage.cpp:
     21        (WebCore::ValidationMessage::setMessage):
     22        (WebCore::ValidationMessage::setMessageDOMAndStartTimer):
     23        (WebCore::ValidationMessage::requestToHideMessage):
     24
    1252011-04-25  James Robinson  <jamesr@chromium.org>
    226

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

    r84835 r84843  
    8181public:
    8282    PendingCallbacks() { }
     83    ~PendingCallbacks()
     84    {
     85        deleteAllValues(m_callbacks);
     86    }
    8387
    8488    void appendStartElementNSCallback(const xmlChar* xmlLocalName, const xmlChar* xmlPrefix, const xmlChar* xmlURI, int nb_namespaces,
    8589                                      const xmlChar** namespaces, int nb_attributes, int nb_defaulted, const xmlChar** attributes)
    8690    {
    87         OwnPtr<PendingStartElementNSCallback> callback = adoptPtr(new PendingStartElementNSCallback);
     91        PendingStartElementNSCallback* callback = new PendingStartElementNSCallback;
    8892
    8993        callback->xmlLocalName = xmlStrdup(xmlLocalName);
    … …  
    110114        }
    111115
    112         m_callbacks.append(callback.release());
     116        m_callbacks.append(callback);
    113117    }
    114118
    115119    void appendEndElementNSCallback()
    116120    {
    117         m_callbacks.append(adoptPtr(new PendingEndElementNSCallback));
     121        PendingEndElementNSCallback* callback = new PendingEndElementNSCallback;
     122
     123        m_callbacks.append(callback);
    118124    }
    119125
    120126    void appendCharactersCallback(const xmlChar* s, int len)
    121127    {
    122         OwnPtr<PendingCharactersCallback> callback = adoptPtr(new PendingCharactersCallback);
     128        PendingCharactersCallback* callback = new PendingCharactersCallback;
    123129
    124130        callback->s = xmlStrndup(s, len);
    125131        callback->len = len;
    126132
    127         m_callbacks.append(callback.release());
     133        m_callbacks.append(callback);
    128134    }
    129135
    130136    void appendProcessingInstructionCallback(const xmlChar* target, const xmlChar* data)
    131137    {
    132         OwnPtr<PendingProcessingInstructionCallback> callback = adoptPtr(new PendingProcessingInstructionCallback);
     138        PendingProcessingInstructionCallback* callback = new PendingProcessingInstructionCallback;
    133139
    134140        callback->target = xmlStrdup(target);
    135141        callback->data = xmlStrdup(data);
    136142
    137         m_callbacks.append(callback.release());
     143        m_callbacks.append(callback);
    138144    }
    139145
    140146    void appendCDATABlockCallback(const xmlChar* s, int len)
    141147    {
    142         OwnPtr<PendingCDATABlockCallback> callback = adoptPtr(new PendingCDATABlockCallback);
     148        PendingCDATABlockCallback* callback = new PendingCDATABlockCallback;
    143149
    144150        callback->s = xmlStrndup(s, len);
    145151        callback->len = len;
    146152
    147         m_callbacks.append(callback.release());
     153        m_callbacks.append(callback);
    148154    }
    149155
    150156    void appendCommentCallback(const xmlChar* s)
    151157    {
    152         OwnPtr<PendingCommentCallback> callback = adoptPtr(new PendingCommentCallback);
     158        PendingCommentCallback* callback = new PendingCommentCallback;
    153159
    154160        callback->s = xmlStrdup(s);
    155161
    156         m_callbacks.append(callback.release());
     162        m_callbacks.append(callback);
    157163    }
    158164
    159165    void appendInternalSubsetCallback(const xmlChar* name, const xmlChar* externalID, const xmlChar* systemID)
    160166    {
    161         OwnPtr<PendingInternalSubsetCallback> callback = adoptPtr(new PendingInternalSubsetCallback);
     167        PendingInternalSubsetCallback* callback = new PendingInternalSubsetCallback;
    162168
    163169        callback->name = xmlStrdup(name);
    … …  
    165171        callback->systemID = xmlStrdup(systemID);
    166172
    167         m_callbacks.append(callback.release());
     173        m_callbacks.append(callback);
    168174    }
    169175
    170176    void appendErrorCallback(XMLDocumentParser::ErrorType type, const xmlChar* message, int lineNumber, int columnNumber)
    171177    {
    172         OwnPtr<PendingErrorCallback> callback = adoptPtr(new PendingErrorCallback);
     178        PendingErrorCallback* callback = new PendingErrorCallback;
    173179
    174180        callback->message = xmlStrdup(message);
    … …  
    177183        callback->columnNumber = columnNumber;
    178184
    179         m_callbacks.append(callback.release());
     185        m_callbacks.append(callback);
    180186    }
    181187
    … …  
    328334    };
    329335
    330     Deque<OwnPtr<PendingCallback> > m_callbacks;
     336    Deque<PendingCallback*> m_callbacks;
    331337};
    332338// --------------------------------
    … …  
    541547    , m_view(frameView)
    542548    , m_context(0)
    543     , m_pendingCallbacks(adoptPtr(new PendingCallbacks))
     549    , m_pendingCallbacks(new PendingCallbacks)
    544550    , m_currentNode(document)
    545551    , m_sawError(false)
    … …  
    568574    , m_view(0)
    569575    , m_context(0)
    570     , m_pendingCallbacks(adoptPtr(new PendingCallbacks))
     576    , m_pendingCallbacks(new PendingCallbacks)
    571577    , m_currentNode(fragment)
    572578    , m_sawError(false)

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

    r84835 r84843  
    7171    m_message = message;
    7272    if (!m_bubble)
    73         m_timer = adoptPtr(new Timer<ValidationMessage>(this, &ValidationMessage::buildBubbleTree));
     73        m_timer.set(new Timer<ValidationMessage>(this, &ValidationMessage::buildBubbleTree));
    7474    else
    75         m_timer = adoptPtr(new Timer<ValidationMessage>(this, &ValidationMessage::setMessageDOMAndStartTimer));
     75        m_timer.set(new Timer<ValidationMessage>(this, &ValidationMessage::setMessageDOMAndStartTimer));
    7676    m_timer->startOneShot(0);
    7777}
    … …  
    100100        m_timer.clear();
    101101    else {
    102         m_timer = adoptPtr(new Timer<ValidationMessage>(this, &ValidationMessage::deleteBubbleTree));
     102        m_timer.set(new Timer<ValidationMessage>(this, &ValidationMessage::deleteBubbleTree));
    103103        m_timer->startOneShot(max(5.0, static_cast<double>(m_message.length()) * magnification / 1000));
    104104    }
    … …  
    149149{
    150150    // We must not modify the DOM tree in this context by the same reason as setMessage().
    151     m_timer = adoptPtr(new Timer<ValidationMessage>(this, &ValidationMessage::deleteBubbleTree));
     151    m_timer.set(new Timer<ValidationMessage>(this, &ValidationMessage::deleteBubbleTree));
    152152    m_timer->startOneShot(0);
    153153}
Note: See TracChangeset for help on using the changeset viewer.