Changeset 62656 in webkit
- Timestamp:
- Jul 7, 2010 6:01:31 AM (14 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r62654 r62656 1 2010-07-07 Ilya Tikhonovsky <loislo@chromium.org> 2 3 Reviewed by Pavel Feldman. 4 5 Web Inspector: All RefPtr arguments and return values should be 6 changed to PassRefPtr whenever it is possible according to common practice. 7 https://bugs.webkit.org/show_bug.cgi?id=41759 8 9 * inspector/CodeGeneratorInspector.pm: 10 * inspector/InspectorTimelineAgent.cpp: 11 (WebCore::InspectorTimelineAgent::pushGCEventRecords): 12 (WebCore::InspectorTimelineAgent::didInstallTimer): 13 (WebCore::InspectorTimelineAgent::didRemoveTimer): 14 (WebCore::InspectorTimelineAgent::didScheduleResourceRequest): 15 (WebCore::InspectorTimelineAgent::willSendResourceRequest): 16 (WebCore::InspectorTimelineAgent::didFinishLoadingResource): 17 (WebCore::InspectorTimelineAgent::didMarkTimeline): 18 (WebCore::InspectorTimelineAgent::didMarkDOMContentEvent): 19 (WebCore::InspectorTimelineAgent::didMarkLoadEvent): 20 (WebCore::InspectorTimelineAgent::addRecordToTimeline): 21 (WebCore::InspectorTimelineAgent::setHeapSizeStatistic): 22 (WebCore::InspectorTimelineAgent::pushCurrentRecord): 23 * inspector/InspectorTimelineAgent.h: 24 (WebCore::InspectorTimelineAgent::TimelineRecordEntry::TimelineRecordEntry): 25 * inspector/TimelineRecordFactory.cpp: 26 (WebCore::TimelineRecordFactory::createGenericRecord): 27 (WebCore::TimelineRecordFactory::createGCEventData): 28 (WebCore::TimelineRecordFactory::createFunctionCallData): 29 (WebCore::TimelineRecordFactory::createEventDispatchData): 30 (WebCore::TimelineRecordFactory::createGenericTimerData): 31 (WebCore::TimelineRecordFactory::createTimerInstallData): 32 (WebCore::TimelineRecordFactory::createXHRReadyStateChangeData): 33 (WebCore::TimelineRecordFactory::createXHRLoadData): 34 (WebCore::TimelineRecordFactory::createEvaluateScriptData): 35 (WebCore::TimelineRecordFactory::createMarkTimelineData): 36 (WebCore::TimelineRecordFactory::createScheduleResourceRequestData): 37 (WebCore::TimelineRecordFactory::createResourceSendRequestData): 38 (WebCore::TimelineRecordFactory::createResourceReceiveResponseData): 39 (WebCore::TimelineRecordFactory::createResourceFinishData): 40 (WebCore::TimelineRecordFactory::createReceiveResourceData): 41 (WebCore::TimelineRecordFactory::createPaintData): 42 (WebCore::TimelineRecordFactory::createParseHTMLData): 43 * inspector/TimelineRecordFactory.h: 44 1 45 2010-07-07 Antti Koivisto <koivisto@iki.fi> 2 46 -
trunk/WebCore/inspector/CodeGeneratorInspector.pm
r62549 r62656 14 14 "header" => "InspectorClient.h", 15 15 }; 16 $typeTransform{" RefPtr"} = {17 "forwardHeader" => "wtf/ RefPtr.h",16 $typeTransform{"PassRefPtr"} = { 17 "forwardHeader" => "wtf/PassRefPtr.h", 18 18 }; 19 19 $typeTransform{"Object"} = { 20 "param" => " const RefPtr<InspectorObject>&",20 "param" => "PassRefPtr<InspectorObject>", 21 21 "retVal" => "PassRefPtr<InspectorObject>", 22 22 "forward" => "InspectorObject", … … 25 25 }; 26 26 $typeTransform{"Array"} = { 27 "param" => " const RefPtr<InspectorArray>&",27 "param" => "PassRefPtr<InspectorArray>", 28 28 "retVal" => "PassRefPtr<InspectorArray>", 29 29 "forward" => "InspectorArray", … … 141 141 $discoveredTypes{"String"} = 1; 142 142 $discoveredTypes{"InspectorClient"} = 1; 143 $discoveredTypes{" RefPtr"} = 1;143 $discoveredTypes{"PassRefPtr"} = 1; 144 144 145 145 push(@classDefinition, "class $className {"); -
trunk/WebCore/inspector/InspectorTimelineAgent.cpp
r62549 r62656 66 66 record->set("data", TimelineRecordFactory::createGCEventData(i->collectedBytes)); 67 67 record->setNumber("endTime", i->endTime); 68 addRecordToTimeline(record , GCEventTimelineRecordType);68 addRecordToTimeline(record.release(), GCEventTimelineRecordType); 69 69 } 70 70 } … … 152 152 RefPtr<InspectorObject> record = TimelineRecordFactory::createGenericRecord(WTF::currentTimeMS()); 153 153 record->set("data", TimelineRecordFactory::createTimerInstallData(timerId, timeout, singleShot)); 154 addRecordToTimeline(record , TimerInstallTimelineRecordType);154 addRecordToTimeline(record.release(), TimerInstallTimelineRecordType); 155 155 } 156 156 … … 160 160 RefPtr<InspectorObject> record = TimelineRecordFactory::createGenericRecord(WTF::currentTimeMS()); 161 161 record->set("data", TimelineRecordFactory::createGenericTimerData(timerId)); 162 addRecordToTimeline(record , TimerRemoveTimelineRecordType);162 addRecordToTimeline(record.release(), TimerRemoveTimelineRecordType); 163 163 } 164 164 … … 209 209 record->set("data", TimelineRecordFactory::createScheduleResourceRequestData(url)); 210 210 record->setNumber("type", ScheduleResourceRequestTimelineRecordType); 211 addRecordToTimeline(record , ScheduleResourceRequestTimelineRecordType);211 addRecordToTimeline(record.release(), ScheduleResourceRequestTimelineRecordType); 212 212 } 213 213 … … 219 219 record->set("data", TimelineRecordFactory::createResourceSendRequestData(identifier, isMainResource, request)); 220 220 record->setNumber("type", ResourceSendRequestTimelineRecordType); 221 setHeapSizeStatistic(record );222 m_frontend->addRecordToTimeline(record );221 setHeapSizeStatistic(record.get()); 222 m_frontend->addRecordToTimeline(record.release()); 223 223 } 224 224 … … 249 249 record->set("data", TimelineRecordFactory::createResourceFinishData(identifier, didFail)); 250 250 record->setNumber("type", ResourceFinishTimelineRecordType); 251 setHeapSizeStatistic(record );252 m_frontend->addRecordToTimeline(record );251 setHeapSizeStatistic(record.get()); 252 m_frontend->addRecordToTimeline(record.release()); 253 253 } 254 254 … … 258 258 RefPtr<InspectorObject> record = TimelineRecordFactory::createGenericRecord(WTF::currentTimeMS()); 259 259 record->set("data", TimelineRecordFactory::createMarkTimelineData(message)); 260 addRecordToTimeline(record , MarkTimelineRecordType);260 addRecordToTimeline(record.release(), MarkTimelineRecordType); 261 261 } 262 262 … … 265 265 pushGCEventRecords(); 266 266 RefPtr<InspectorObject> record = TimelineRecordFactory::createGenericRecord(WTF::currentTimeMS()); 267 addRecordToTimeline(record , MarkDOMContentEventType);267 addRecordToTimeline(record.release(), MarkDOMContentEventType); 268 268 } 269 269 … … 272 272 pushGCEventRecords(); 273 273 RefPtr<InspectorObject> record = TimelineRecordFactory::createGenericRecord(WTF::currentTimeMS()); 274 addRecordToTimeline(record , MarkLoadEventType);274 addRecordToTimeline(record.release(), MarkLoadEventType); 275 275 } 276 276 … … 287 287 } 288 288 289 void InspectorTimelineAgent::addRecordToTimeline(const RefPtr<InspectorObject>& record, TimelineRecordType type) 290 { 289 void InspectorTimelineAgent::addRecordToTimeline(PassRefPtr<InspectorObject> prpRecord, TimelineRecordType type) 290 { 291 RefPtr<InspectorObject> record(prpRecord); 291 292 record->setNumber("type", type); 292 setHeapSizeStatistic(record );293 setHeapSizeStatistic(record.get()); 293 294 if (m_recordStack.isEmpty()) 294 m_frontend->addRecordToTimeline(record );295 m_frontend->addRecordToTimeline(record.release()); 295 296 else { 296 297 TimelineRecordEntry parent = m_recordStack.last(); 297 parent.children->push(record );298 parent.children->push(record.release()); 298 299 } 299 300 } 300 301 301 void InspectorTimelineAgent::setHeapSizeStatistic( const RefPtr<InspectorObject>&record)302 void InspectorTimelineAgent::setHeapSizeStatistic(InspectorObject* record) 302 303 { 303 304 size_t usedHeapSize = 0; … … 324 325 } 325 326 326 void InspectorTimelineAgent::pushCurrentRecord( const RefPtr<InspectorObject>&data, TimelineRecordType type)327 { 328 pushGCEventRecords(); 329 RefPtr<InspectorObject> record = TimelineRecordFactory::createGenericRecord(WTF::currentTimeMS()); 330 m_recordStack.append(TimelineRecordEntry(record , data, InspectorArray::create(), type));327 void InspectorTimelineAgent::pushCurrentRecord(PassRefPtr<InspectorObject> data, TimelineRecordType type) 328 { 329 pushGCEventRecords(); 330 RefPtr<InspectorObject> record = TimelineRecordFactory::createGenericRecord(WTF::currentTimeMS()); 331 m_recordStack.append(TimelineRecordEntry(record.release(), data, InspectorArray::create(), type)); 331 332 } 332 333 } // namespace WebCore -
trunk/WebCore/inspector/InspectorTimelineAgent.h
r62549 r62656 134 134 private: 135 135 struct TimelineRecordEntry { 136 TimelineRecordEntry( const RefPtr<InspectorObject>& record, const RefPtr<InspectorObject>& data, const RefPtr<InspectorArray>&children, TimelineRecordType type)136 TimelineRecordEntry(PassRefPtr<InspectorObject> record, PassRefPtr<InspectorObject> data, PassRefPtr<InspectorArray> children, TimelineRecordType type) 137 137 : record(record), data(data), children(children), type(type) 138 138 { … … 144 144 }; 145 145 146 void pushCurrentRecord( const RefPtr<InspectorObject>&, TimelineRecordType);147 void setHeapSizeStatistic( const RefPtr<InspectorObject>&record);146 void pushCurrentRecord(PassRefPtr<InspectorObject>, TimelineRecordType); 147 void setHeapSizeStatistic(InspectorObject* record); 148 148 149 149 void didCompleteCurrentRecord(TimelineRecordType); 150 150 151 void addRecordToTimeline( const RefPtr<InspectorObject>&, TimelineRecordType);151 void addRecordToTimeline(PassRefPtr<InspectorObject>, TimelineRecordType); 152 152 153 153 void pushGCEventRecords(); -
trunk/WebCore/inspector/TimelineRecordFactory.cpp
r62542 r62656 45 45 namespace WebCore { 46 46 47 RefPtr<InspectorObject> TimelineRecordFactory::createGenericRecord(double startTime)47 PassRefPtr<InspectorObject> TimelineRecordFactory::createGenericRecord(double startTime) 48 48 { 49 49 RefPtr<InspectorObject> record = InspectorObject::create(); … … 53 53 if (ScriptCallStack::stackTrace(5, stackTrace)) 54 54 record->set("stackTrace", stackTrace); 55 return record ;55 return record.release(); 56 56 } 57 57 58 RefPtr<InspectorObject> TimelineRecordFactory::createGCEventData(const size_t usedHeapSizeDelta)58 PassRefPtr<InspectorObject> TimelineRecordFactory::createGCEventData(const size_t usedHeapSizeDelta) 59 59 { 60 60 RefPtr<InspectorObject> data = InspectorObject::create(); 61 61 data->setNumber("usedHeapSizeDelta", usedHeapSizeDelta); 62 return data ;62 return data.release(); 63 63 } 64 64 65 RefPtr<InspectorObject> TimelineRecordFactory::createFunctionCallData(const String& scriptName, int scriptLine)65 PassRefPtr<InspectorObject> TimelineRecordFactory::createFunctionCallData(const String& scriptName, int scriptLine) 66 66 { 67 67 RefPtr<InspectorObject> data = InspectorObject::create(); 68 68 data->setString("scriptName", scriptName); 69 69 data->setNumber("scriptLine", scriptLine); 70 return data ;70 return data.release(); 71 71 } 72 72 73 RefPtr<InspectorObject> TimelineRecordFactory::createEventDispatchData(const Event& event)73 PassRefPtr<InspectorObject> TimelineRecordFactory::createEventDispatchData(const Event& event) 74 74 { 75 75 RefPtr<InspectorObject> data = InspectorObject::create(); 76 76 data->setString("type", event.type().string()); 77 return data ;77 return data.release(); 78 78 } 79 79 80 RefPtr<InspectorObject> TimelineRecordFactory::createGenericTimerData(int timerId)80 PassRefPtr<InspectorObject> TimelineRecordFactory::createGenericTimerData(int timerId) 81 81 { 82 82 RefPtr<InspectorObject> data = InspectorObject::create(); 83 83 data->setNumber("timerId", timerId); 84 return data ;84 return data.release(); 85 85 } 86 86 87 RefPtr<InspectorObject> TimelineRecordFactory::createTimerInstallData(int timerId, int timeout, bool singleShot)87 PassRefPtr<InspectorObject> TimelineRecordFactory::createTimerInstallData(int timerId, int timeout, bool singleShot) 88 88 { 89 89 RefPtr<InspectorObject> data = InspectorObject::create(); … … 91 91 data->setNumber("timeout", timeout); 92 92 data->setBool("singleShot", singleShot); 93 return data ;93 return data.release(); 94 94 } 95 95 96 RefPtr<InspectorObject> TimelineRecordFactory::createXHRReadyStateChangeData(const String& url, int readyState)96 PassRefPtr<InspectorObject> TimelineRecordFactory::createXHRReadyStateChangeData(const String& url, int readyState) 97 97 { 98 98 RefPtr<InspectorObject> data = InspectorObject::create(); 99 99 data->setString("url", url); 100 100 data->setNumber("readyState", readyState); 101 return data ;101 return data.release(); 102 102 } 103 103 104 RefPtr<InspectorObject> TimelineRecordFactory::createXHRLoadData(const String& url)104 PassRefPtr<InspectorObject> TimelineRecordFactory::createXHRLoadData(const String& url) 105 105 { 106 106 RefPtr<InspectorObject> data = InspectorObject::create(); 107 107 data->setString("url", url); 108 return data ;108 return data.release(); 109 109 } 110 110 111 RefPtr<InspectorObject> TimelineRecordFactory::createEvaluateScriptData(const String& url, double lineNumber)111 PassRefPtr<InspectorObject> TimelineRecordFactory::createEvaluateScriptData(const String& url, double lineNumber) 112 112 { 113 113 RefPtr<InspectorObject> data = InspectorObject::create(); 114 114 data->setString("url", url); 115 115 data->setNumber("lineNumber", lineNumber); 116 return data ;116 return data.release(); 117 117 } 118 118 119 RefPtr<InspectorObject> TimelineRecordFactory::createMarkTimelineData(const String& message)119 PassRefPtr<InspectorObject> TimelineRecordFactory::createMarkTimelineData(const String& message) 120 120 { 121 121 RefPtr<InspectorObject> data = InspectorObject::create(); 122 122 data->setString("message", message); 123 return data ;123 return data.release(); 124 124 } 125 125 126 RefPtr<InspectorObject> TimelineRecordFactory::createScheduleResourceRequestData(const String& url)126 PassRefPtr<InspectorObject> TimelineRecordFactory::createScheduleResourceRequestData(const String& url) 127 127 { 128 128 RefPtr<InspectorObject> data = InspectorObject::create(); 129 129 data->setString("url", url); 130 return data ;130 return data.release(); 131 131 } 132 132 133 RefPtr<InspectorObject> TimelineRecordFactory::createResourceSendRequestData(unsigned long identifier, bool isMainResource, const ResourceRequest& request)133 PassRefPtr<InspectorObject> TimelineRecordFactory::createResourceSendRequestData(unsigned long identifier, bool isMainResource, const ResourceRequest& request) 134 134 { 135 135 RefPtr<InspectorObject> data = InspectorObject::create(); … … 138 138 data->setString("requestMethod", request.httpMethod()); 139 139 data->setBool("isMainResource", isMainResource); 140 return data ;140 return data.release(); 141 141 } 142 142 143 RefPtr<InspectorObject> TimelineRecordFactory::createResourceReceiveResponseData(unsigned long identifier, const ResourceResponse& response)143 PassRefPtr<InspectorObject> TimelineRecordFactory::createResourceReceiveResponseData(unsigned long identifier, const ResourceResponse& response) 144 144 { 145 145 RefPtr<InspectorObject> data = InspectorObject::create(); … … 148 148 data->setString("mimeType", response.mimeType()); 149 149 data->setNumber("expectedContentLength", response.expectedContentLength()); 150 return data ;150 return data.release(); 151 151 } 152 152 153 RefPtr<InspectorObject> TimelineRecordFactory::createResourceFinishData(unsigned long identifier, bool didFail)153 PassRefPtr<InspectorObject> TimelineRecordFactory::createResourceFinishData(unsigned long identifier, bool didFail) 154 154 { 155 155 RefPtr<InspectorObject> data = InspectorObject::create(); 156 156 data->setNumber("identifier", identifier); 157 157 data->setBool("didFail", didFail); 158 return data ;158 return data.release(); 159 159 } 160 160 161 RefPtr<InspectorObject> TimelineRecordFactory::createReceiveResourceData(unsigned long identifier)161 PassRefPtr<InspectorObject> TimelineRecordFactory::createReceiveResourceData(unsigned long identifier) 162 162 { 163 163 RefPtr<InspectorObject> data = InspectorObject::create(); 164 164 data->setNumber("identifier", identifier); 165 return data ;165 return data.release(); 166 166 } 167 167 168 RefPtr<InspectorObject> TimelineRecordFactory::createPaintData(const IntRect& rect)168 PassRefPtr<InspectorObject> TimelineRecordFactory::createPaintData(const IntRect& rect) 169 169 { 170 170 RefPtr<InspectorObject> data = InspectorObject::create(); … … 173 173 data->setNumber("width", rect.width()); 174 174 data->setNumber("height", rect.height()); 175 return data ;175 return data.release(); 176 176 } 177 177 178 RefPtr<InspectorObject> TimelineRecordFactory::createParseHTMLData(unsigned int length, unsigned int startLine)178 PassRefPtr<InspectorObject> TimelineRecordFactory::createParseHTMLData(unsigned int length, unsigned int startLine) 179 179 { 180 180 RefPtr<InspectorObject> data = InspectorObject::create(); 181 181 data->setNumber("length", length); 182 182 data->setNumber("startLine", startLine); 183 return data ;183 return data.release(); 184 184 } 185 185 -
trunk/WebCore/inspector/TimelineRecordFactory.h
r62542 r62656 45 45 class TimelineRecordFactory { 46 46 public: 47 static RefPtr<InspectorObject> createGenericRecord(double startTime);47 static PassRefPtr<InspectorObject> createGenericRecord(double startTime); 48 48 49 static RefPtr<InspectorObject> createGCEventData(const size_t usedHeapSizeDelta);49 static PassRefPtr<InspectorObject> createGCEventData(const size_t usedHeapSizeDelta); 50 50 51 static RefPtr<InspectorObject> createFunctionCallData(const String& scriptName, int scriptLine);51 static PassRefPtr<InspectorObject> createFunctionCallData(const String& scriptName, int scriptLine); 52 52 53 static RefPtr<InspectorObject> createEventDispatchData(const Event&);53 static PassRefPtr<InspectorObject> createEventDispatchData(const Event&); 54 54 55 static RefPtr<InspectorObject> createGenericTimerData(int timerId);55 static PassRefPtr<InspectorObject> createGenericTimerData(int timerId); 56 56 57 static RefPtr<InspectorObject> createTimerInstallData(int timerId, int timeout, bool singleShot);57 static PassRefPtr<InspectorObject> createTimerInstallData(int timerId, int timeout, bool singleShot); 58 58 59 static RefPtr<InspectorObject> createXHRReadyStateChangeData(const String& url, int readyState);59 static PassRefPtr<InspectorObject> createXHRReadyStateChangeData(const String& url, int readyState); 60 60 61 static RefPtr<InspectorObject> createXHRLoadData(const String& url);61 static PassRefPtr<InspectorObject> createXHRLoadData(const String& url); 62 62 63 static RefPtr<InspectorObject> createEvaluateScriptData(const String&, double lineNumber);63 static PassRefPtr<InspectorObject> createEvaluateScriptData(const String&, double lineNumber); 64 64 65 static RefPtr<InspectorObject> createMarkTimelineData(const String&);65 static PassRefPtr<InspectorObject> createMarkTimelineData(const String&); 66 66 67 static RefPtr<InspectorObject> createResourceSendRequestData(unsigned long identifier,67 static PassRefPtr<InspectorObject> createResourceSendRequestData(unsigned long identifier, 68 68 bool isMainResource, const ResourceRequest&); 69 69 70 static RefPtr<InspectorObject> createScheduleResourceRequestData(const String&);70 static PassRefPtr<InspectorObject> createScheduleResourceRequestData(const String&); 71 71 72 static RefPtr<InspectorObject> createResourceReceiveResponseData(unsigned long identifier, const ResourceResponse&);72 static PassRefPtr<InspectorObject> createResourceReceiveResponseData(unsigned long identifier, const ResourceResponse&); 73 73 74 static RefPtr<InspectorObject> createReceiveResourceData(unsigned long identifier);74 static PassRefPtr<InspectorObject> createReceiveResourceData(unsigned long identifier); 75 75 76 static RefPtr<InspectorObject> createResourceFinishData(unsigned long identifier, bool didFail);76 static PassRefPtr<InspectorObject> createResourceFinishData(unsigned long identifier, bool didFail); 77 77 78 static RefPtr<InspectorObject> createPaintData(const IntRect&);78 static PassRefPtr<InspectorObject> createPaintData(const IntRect&); 79 79 80 static RefPtr<InspectorObject> createParseHTMLData(unsigned int length, unsigned int startLine);80 static PassRefPtr<InspectorObject> createParseHTMLData(unsigned int length, unsigned int startLine); 81 81 82 82 private:
Note: See TracChangeset
for help on using the changeset viewer.