Changeset 84835 in webkit
- Timestamp:
- Apr 25, 2011 4:35:45 PM (13 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r84833 r84835 1 2011-04-25 Adam Barth <abarth@webkit.org> 2 3 Reviewed by James Robinson. 4 5 ValidationMessage and XMLDocumentParserLibxml2 should play nice with strict OwnPtrs 6 https://bugs.webkit.org/show_bug.cgi?id=59394 7 8 * dom/XMLDocumentParserLibxml2.cpp: 9 (WebCore::PendingCallbacks::PendingCallbacks): 10 (WebCore::PendingCallbacks::appendStartElementNSCallback): 11 (WebCore::PendingCallbacks::appendEndElementNSCallback): 12 (WebCore::PendingCallbacks::appendCharactersCallback): 13 (WebCore::PendingCallbacks::appendProcessingInstructionCallback): 14 (WebCore::PendingCallbacks::appendCDATABlockCallback): 15 (WebCore::PendingCallbacks::appendCommentCallback): 16 (WebCore::PendingCallbacks::appendInternalSubsetCallback): 17 (WebCore::PendingCallbacks::appendErrorCallback): 18 (WebCore::XMLDocumentParser::XMLDocumentParser): 19 * html/ValidationMessage.cpp: 20 (WebCore::ValidationMessage::setMessage): 21 (WebCore::ValidationMessage::setMessageDOMAndStartTimer): 22 (WebCore::ValidationMessage::requestToHideMessage): 23 1 24 2011-04-25 James Robinson <jamesr@chromium.org> 2 25 -
trunk/Source/WebCore/dom/XMLDocumentParserLibxml2.cpp
r83406 r84835 81 81 public: 82 82 PendingCallbacks() { } 83 ~PendingCallbacks()84 {85 deleteAllValues(m_callbacks);86 }87 83 88 84 void appendStartElementNSCallback(const xmlChar* xmlLocalName, const xmlChar* xmlPrefix, const xmlChar* xmlURI, int nb_namespaces, 89 85 const xmlChar** namespaces, int nb_attributes, int nb_defaulted, const xmlChar** attributes) 90 86 { 91 PendingStartElementNSCallback* callback = new PendingStartElementNSCallback;87 OwnPtr<PendingStartElementNSCallback> callback = adoptPtr(new PendingStartElementNSCallback); 92 88 93 89 callback->xmlLocalName = xmlStrdup(xmlLocalName); … … 114 110 } 115 111 116 m_callbacks.append(callback );112 m_callbacks.append(callback.release()); 117 113 } 118 114 119 115 void appendEndElementNSCallback() 120 116 { 121 PendingEndElementNSCallback* callback = new PendingEndElementNSCallback; 122 123 m_callbacks.append(callback); 117 m_callbacks.append(adoptPtr(new PendingEndElementNSCallback)); 124 118 } 125 119 126 120 void appendCharactersCallback(const xmlChar* s, int len) 127 121 { 128 PendingCharactersCallback* callback = new PendingCharactersCallback;122 OwnPtr<PendingCharactersCallback> callback = adoptPtr(new PendingCharactersCallback); 129 123 130 124 callback->s = xmlStrndup(s, len); 131 125 callback->len = len; 132 126 133 m_callbacks.append(callback );127 m_callbacks.append(callback.release()); 134 128 } 135 129 136 130 void appendProcessingInstructionCallback(const xmlChar* target, const xmlChar* data) 137 131 { 138 PendingProcessingInstructionCallback* callback = new PendingProcessingInstructionCallback;132 OwnPtr<PendingProcessingInstructionCallback> callback = adoptPtr(new PendingProcessingInstructionCallback); 139 133 140 134 callback->target = xmlStrdup(target); 141 135 callback->data = xmlStrdup(data); 142 136 143 m_callbacks.append(callback );137 m_callbacks.append(callback.release()); 144 138 } 145 139 146 140 void appendCDATABlockCallback(const xmlChar* s, int len) 147 141 { 148 PendingCDATABlockCallback* callback = new PendingCDATABlockCallback;142 OwnPtr<PendingCDATABlockCallback> callback = adoptPtr(new PendingCDATABlockCallback); 149 143 150 144 callback->s = xmlStrndup(s, len); 151 145 callback->len = len; 152 146 153 m_callbacks.append(callback );147 m_callbacks.append(callback.release()); 154 148 } 155 149 156 150 void appendCommentCallback(const xmlChar* s) 157 151 { 158 PendingCommentCallback* callback = new PendingCommentCallback;152 OwnPtr<PendingCommentCallback> callback = adoptPtr(new PendingCommentCallback); 159 153 160 154 callback->s = xmlStrdup(s); 161 155 162 m_callbacks.append(callback );156 m_callbacks.append(callback.release()); 163 157 } 164 158 165 159 void appendInternalSubsetCallback(const xmlChar* name, const xmlChar* externalID, const xmlChar* systemID) 166 160 { 167 PendingInternalSubsetCallback* callback = new PendingInternalSubsetCallback;161 OwnPtr<PendingInternalSubsetCallback> callback = adoptPtr(new PendingInternalSubsetCallback); 168 162 169 163 callback->name = xmlStrdup(name); … … 171 165 callback->systemID = xmlStrdup(systemID); 172 166 173 m_callbacks.append(callback );167 m_callbacks.append(callback.release()); 174 168 } 175 169 176 170 void appendErrorCallback(XMLDocumentParser::ErrorType type, const xmlChar* message, int lineNumber, int columnNumber) 177 171 { 178 PendingErrorCallback* callback = new PendingErrorCallback;172 OwnPtr<PendingErrorCallback> callback = adoptPtr(new PendingErrorCallback); 179 173 180 174 callback->message = xmlStrdup(message); … … 183 177 callback->columnNumber = columnNumber; 184 178 185 m_callbacks.append(callback );179 m_callbacks.append(callback.release()); 186 180 } 187 181 … … 334 328 }; 335 329 336 Deque< PendingCallback*> m_callbacks;330 Deque<OwnPtr<PendingCallback> > m_callbacks; 337 331 }; 338 332 // -------------------------------- … … 547 541 , m_view(frameView) 548 542 , m_context(0) 549 , m_pendingCallbacks( new PendingCallbacks)543 , m_pendingCallbacks(adoptPtr(new PendingCallbacks)) 550 544 , m_currentNode(document) 551 545 , m_sawError(false) … … 574 568 , m_view(0) 575 569 , m_context(0) 576 , m_pendingCallbacks( new PendingCallbacks)570 , m_pendingCallbacks(adoptPtr(new PendingCallbacks)) 577 571 , m_currentNode(fragment) 578 572 , m_sawError(false) -
trunk/Source/WebCore/html/ValidationMessage.cpp
r83256 r84835 71 71 m_message = message; 72 72 if (!m_bubble) 73 m_timer .set(new Timer<ValidationMessage>(this, &ValidationMessage::buildBubbleTree));73 m_timer = adoptPtr(new Timer<ValidationMessage>(this, &ValidationMessage::buildBubbleTree)); 74 74 else 75 m_timer .set(new Timer<ValidationMessage>(this, &ValidationMessage::setMessageDOMAndStartTimer));75 m_timer = adoptPtr(new Timer<ValidationMessage>(this, &ValidationMessage::setMessageDOMAndStartTimer)); 76 76 m_timer->startOneShot(0); 77 77 } … … 100 100 m_timer.clear(); 101 101 else { 102 m_timer .set(new Timer<ValidationMessage>(this, &ValidationMessage::deleteBubbleTree));102 m_timer = adoptPtr(new Timer<ValidationMessage>(this, &ValidationMessage::deleteBubbleTree)); 103 103 m_timer->startOneShot(max(5.0, static_cast<double>(m_message.length()) * magnification / 1000)); 104 104 } … … 149 149 { 150 150 // We must not modify the DOM tree in this context by the same reason as setMessage(). 151 m_timer .set(new Timer<ValidationMessage>(this, &ValidationMessage::deleteBubbleTree));151 m_timer = adoptPtr(new Timer<ValidationMessage>(this, &ValidationMessage::deleteBubbleTree)); 152 152 m_timer->startOneShot(0); 153 153 }
Note: See TracChangeset
for help on using the changeset viewer.