Changeset 53488 in webkit


Ignore:
Timestamp:
Jan 19, 2010 1:49:30 PM (14 years ago)
Author:
eric@webkit.org
Message:

2010-01-19 Jaime Yap <​jaimeyap@google.com>

Reviewed by Pavel Feldman.

Test changes to accomodate refactor of TimelineRecordFactory and InspectorTimelineAgent to
support reporting data when closing a record.

​https://bugs.webkit.org/show_bug.cgi?id=33853

  • inspector/timeline-layout-expected.txt:
  • inspector/timeline-parse-html-expected.txt:
  • inspector/timeline-recalculate-styles-expected.txt:

2010-01-19 Jaime Yap <​jaimeyap@google.com>

Reviewed by Pavel Feldman.

Refactors the TimelineRecordFactory and InspectorTimelineAgent to support reporting data
when closing a record. Also includes grabbing the start and end line number for parse HTML
records as a reference use case for the above refactor

Tests updated:

inspector/timeline-parse-html-expected.txt
inspector/timeline-layout-expected.txt
inspector/timeline-recalculate-styles-expected.txt

​https://bugs.webkit.org/show_bug.cgi?id=33853

  • html/HTMLTokenizer.cpp: (WebCore::HTMLTokenizer::write):
  • inspector/InspectorTimelineAgent.cpp: (WebCore::InspectorTimelineAgent::willDispatchEvent): (WebCore::InspectorTimelineAgent::willLayout): (WebCore::InspectorTimelineAgent::willRecalculateStyle): (WebCore::InspectorTimelineAgent::willPaint): (WebCore::InspectorTimelineAgent::willWriteHTML): (WebCore::InspectorTimelineAgent::didWriteHTML): (WebCore::InspectorTimelineAgent::didInstallTimer): (WebCore::InspectorTimelineAgent::didRemoveTimer): (WebCore::InspectorTimelineAgent::willFireTimer): (WebCore::InspectorTimelineAgent::willChangeXHRReadyState): (WebCore::InspectorTimelineAgent::willLoadXHR): (WebCore::InspectorTimelineAgent::willEvaluateScript): (WebCore::InspectorTimelineAgent::willSendResourceRequest): (WebCore::InspectorTimelineAgent::didReceiveResourceResponse): (WebCore::InspectorTimelineAgent::didFinishLoadingResource): (WebCore::InspectorTimelineAgent::didMarkTimeline): (WebCore::InspectorTimelineAgent::didCompleteCurrentRecord): (WebCore::InspectorTimelineAgent::pushCurrentRecord):
  • inspector/InspectorTimelineAgent.h: (WebCore::InspectorTimelineAgent::TimelineRecordEntry::TimelineRecordEntry):
  • inspector/TimelineRecordFactory.cpp: (WebCore::TimelineRecordFactory::createEventDispatchData): (WebCore::TimelineRecordFactory::createGenericTimerData): (WebCore::TimelineRecordFactory::createTimerInstallData): (WebCore::TimelineRecordFactory::createXHRReadyStateChangeData): (WebCore::TimelineRecordFactory::createXHRLoadData): (WebCore::TimelineRecordFactory::createEvaluateScriptData): (WebCore::TimelineRecordFactory::createMarkTimelineData): (WebCore::TimelineRecordFactory::createResourceSendRequestData): (WebCore::TimelineRecordFactory::createResourceReceiveResponseData): (WebCore::TimelineRecordFactory::createResourceFinishData): (WebCore::TimelineRecordFactory::createPaintData): (WebCore::TimelineRecordFactory::createParseHTMLData):
  • inspector/TimelineRecordFactory.h:
Location:
trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r53486 r53488  
     12010-01-19  Jaime Yap  <jaimeyap@google.com>
     2
     3        Reviewed by Pavel Feldman.
     4
     5        Test changes to accomodate refactor of TimelineRecordFactory and InspectorTimelineAgent to
     6        support reporting data when closing a record.
     7
     8        https://bugs.webkit.org/show_bug.cgi?id=33853
     9
     10        * inspector/timeline-layout-expected.txt:
     11        * inspector/timeline-parse-html-expected.txt:
     12        * inspector/timeline-recalculate-styles-expected.txt:
     13
    1142010-01-19  Eric Carlson  <eric.carlson@apple.com>
    215

  • trunk/LayoutTests/inspector/timeline-layout-expected.txt

    r51072 r53488  
    33Layout Properties:
    44+ startTime : * DEFINED *
     5+ data : {
     6+ }
    57+ children : * DEFINED *
    68+ endTime : * DEFINED *

  • trunk/LayoutTests/inspector/timeline-parse-html-expected.txt

    r53160 r53488  
    55+ data : {
    66+- length : 9
     7+- startLine : 0
     8+- endLine : 0
    79+ }
    810+ children : * DEFINED *

  • trunk/LayoutTests/inspector/timeline-recalculate-styles-expected.txt

    r51072 r53488  
    33RecalculateStyles Properties:
    44+ startTime : * DEFINED *
     5+ data : {
     6+ }
    57+ children : * DEFINED *
    68+ endTime : * DEFINED *

  • trunk/WebCore/ChangeLog

    r53487 r53488  
     12010-01-19  Jaime Yap  <jaimeyap@google.com>
     2
     3        Reviewed by Pavel Feldman.
     4       
     5        Refactors the TimelineRecordFactory and InspectorTimelineAgent to support reporting data
     6        when closing a record. Also includes grabbing the start and end line number for parse HTML
     7        records as a reference use case for the above refactor
     8
     9        Tests updated:
     10            inspector/timeline-parse-html-expected.txt
     11            inspector/timeline-layout-expected.txt
     12            inspector/timeline-recalculate-styles-expected.txt
     13
     14        https://bugs.webkit.org/show_bug.cgi?id=33853
     15
     16        * html/HTMLTokenizer.cpp:
     17        (WebCore::HTMLTokenizer::write):
     18        * inspector/InspectorTimelineAgent.cpp:
     19        (WebCore::InspectorTimelineAgent::willDispatchEvent):
     20        (WebCore::InspectorTimelineAgent::willLayout):
     21        (WebCore::InspectorTimelineAgent::willRecalculateStyle):
     22        (WebCore::InspectorTimelineAgent::willPaint):
     23        (WebCore::InspectorTimelineAgent::willWriteHTML):
     24        (WebCore::InspectorTimelineAgent::didWriteHTML):
     25        (WebCore::InspectorTimelineAgent::didInstallTimer):
     26        (WebCore::InspectorTimelineAgent::didRemoveTimer):
     27        (WebCore::InspectorTimelineAgent::willFireTimer):
     28        (WebCore::InspectorTimelineAgent::willChangeXHRReadyState):
     29        (WebCore::InspectorTimelineAgent::willLoadXHR):
     30        (WebCore::InspectorTimelineAgent::willEvaluateScript):
     31        (WebCore::InspectorTimelineAgent::willSendResourceRequest):
     32        (WebCore::InspectorTimelineAgent::didReceiveResourceResponse):
     33        (WebCore::InspectorTimelineAgent::didFinishLoadingResource):
     34        (WebCore::InspectorTimelineAgent::didMarkTimeline):
     35        (WebCore::InspectorTimelineAgent::didCompleteCurrentRecord):
     36        (WebCore::InspectorTimelineAgent::pushCurrentRecord):
     37        * inspector/InspectorTimelineAgent.h:
     38        (WebCore::InspectorTimelineAgent::TimelineRecordEntry::TimelineRecordEntry):
     39        * inspector/TimelineRecordFactory.cpp:
     40        (WebCore::TimelineRecordFactory::createEventDispatchData):
     41        (WebCore::TimelineRecordFactory::createGenericTimerData):
     42        (WebCore::TimelineRecordFactory::createTimerInstallData):
     43        (WebCore::TimelineRecordFactory::createXHRReadyStateChangeData):
     44        (WebCore::TimelineRecordFactory::createXHRLoadData):
     45        (WebCore::TimelineRecordFactory::createEvaluateScriptData):
     46        (WebCore::TimelineRecordFactory::createMarkTimelineData):
     47        (WebCore::TimelineRecordFactory::createResourceSendRequestData):
     48        (WebCore::TimelineRecordFactory::createResourceReceiveResponseData):
     49        (WebCore::TimelineRecordFactory::createResourceFinishData):
     50        (WebCore::TimelineRecordFactory::createPaintData):
     51        (WebCore::TimelineRecordFactory::createParseHTMLData):
     52        * inspector/TimelineRecordFactory.h:
     53
    1542010-01-19 Joanmarie Diggs  <joanmarie.diggs@gmail.com>
    255

  • trunk/WebCore/html/HTMLTokenizer.cpp

    r53442 r53488  
    16731673#if ENABLE(INSPECTOR)
    16741674    if (InspectorTimelineAgent* timelineAgent = m_doc->inspectorTimelineAgent())
    1675         timelineAgent->willWriteHTML(source.length());
     1675        timelineAgent->willWriteHTML(source.length(), m_lineNumber);
    16761676#endif
    16771677 
    … …  
    17991799#if ENABLE(INSPECTOR)
    18001800    if (InspectorTimelineAgent* timelineAgent = m_doc->inspectorTimelineAgent())
    1801         timelineAgent->didWriteHTML();
     1801        timelineAgent->didWriteHTML(m_lineNumber);
    18021802#endif
    18031803

  • trunk/WebCore/inspector/InspectorTimelineAgent.cpp

    r53160 r53488  
    5757void InspectorTimelineAgent::willDispatchEvent(const Event& event)
    5858{
    59     pushCurrentRecord(TimelineRecordFactory::createEventDispatchRecord(m_frontend, currentTimeInMilliseconds(), event),
     59    pushCurrentRecord(TimelineRecordFactory::createEventDispatchData(m_frontend, event),
    6060        EventDispatchTimelineRecordType);
    6161}
    … …  
    6868void InspectorTimelineAgent::willLayout()
    6969{
    70     pushCurrentRecord(TimelineRecordFactory::createGenericRecord(m_frontend, currentTimeInMilliseconds()), LayoutTimelineRecordType);
     70    pushCurrentRecord(m_frontend->newScriptObject(), LayoutTimelineRecordType);
    7171}
    7272
    … …  
    7878void InspectorTimelineAgent::willRecalculateStyle()
    7979{
    80     pushCurrentRecord(TimelineRecordFactory::createGenericRecord(m_frontend, currentTimeInMilliseconds()), RecalculateStylesTimelineRecordType);
     80    pushCurrentRecord(m_frontend->newScriptObject(), RecalculateStylesTimelineRecordType);
    8181}
    8282
    … …  
    8888void InspectorTimelineAgent::willPaint(const IntRect& rect)
    8989{
    90     pushCurrentRecord(TimelineRecordFactory::createPaintRecord(m_frontend, currentTimeInMilliseconds(), rect),
    91         PaintTimelineRecordType);
     90    pushCurrentRecord(TimelineRecordFactory::createPaintData(m_frontend, rect), PaintTimelineRecordType);
    9291}
    9392
    … …  
    9796}
    9897
    99 void InspectorTimelineAgent::willWriteHTML(unsigned length)
    100 {
    101     pushCurrentRecord(TimelineRecordFactory::createParseHTMLRecord(m_frontend, currentTimeInMilliseconds(), length), ParseHTMLTimelineRecordType);
    102 }
    103 
    104 void InspectorTimelineAgent::didWriteHTML()
    105 {
    106     didCompleteCurrentRecord(ParseHTMLTimelineRecordType);
     98void InspectorTimelineAgent::willWriteHTML(unsigned int length, unsigned int startLine)
     99{
     100    pushCurrentRecord(TimelineRecordFactory::createParseHTMLData(m_frontend, length, startLine), ParseHTMLTimelineRecordType);
     101}
     102
     103void InspectorTimelineAgent::didWriteHTML(unsigned int endLine)
     104{
     105    if (!m_recordStack.isEmpty()) {
     106        TimelineRecordEntry entry = m_recordStack.last();
     107        entry.data.set("endLine", endLine);
     108        didCompleteCurrentRecord(ParseHTMLTimelineRecordType);
     109    }
    107110}
    108111   
    109112void InspectorTimelineAgent::didInstallTimer(int timerId, int timeout, bool singleShot)
    110113{
    111     addRecordToTimeline(TimelineRecordFactory::createTimerInstallRecord(m_frontend, currentTimeInMilliseconds(), timerId,
    112         timeout, singleShot), TimerInstallTimelineRecordType);
     114    ScriptObject record = TimelineRecordFactory::createGenericRecord(m_frontend, currentTimeInMilliseconds());
     115    record.set("data", TimelineRecordFactory::createTimerInstallData(m_frontend, timerId, timeout, singleShot));
     116    addRecordToTimeline(record, TimerInstallTimelineRecordType);
    113117}
    114118
    115119void InspectorTimelineAgent::didRemoveTimer(int timerId)
    116120{
    117     addRecordToTimeline(TimelineRecordFactory::createGenericTimerRecord(m_frontend, currentTimeInMilliseconds(), timerId),
    118         TimerRemoveTimelineRecordType);
     121    ScriptObject record = TimelineRecordFactory::createGenericRecord(m_frontend, currentTimeInMilliseconds());
     122    record.set("data", TimelineRecordFactory::createGenericTimerData(m_frontend, timerId));
     123    addRecordToTimeline(record, TimerRemoveTimelineRecordType);
    119124}
    120125
    121126void InspectorTimelineAgent::willFireTimer(int timerId)
    122127{
    123     pushCurrentRecord(TimelineRecordFactory::createGenericTimerRecord(m_frontend, currentTimeInMilliseconds(), timerId),
    124         TimerFireTimelineRecordType);
     128    pushCurrentRecord(TimelineRecordFactory::createGenericTimerData(m_frontend, timerId), TimerFireTimelineRecordType);
    125129}
    126130
    … …  
    132136void InspectorTimelineAgent::willChangeXHRReadyState(const String& url, int readyState)
    133137{
    134     pushCurrentRecord(TimelineRecordFactory::createXHRReadyStateChangeRecord(m_frontend, currentTimeInMilliseconds(), url, readyState),
    135         XHRReadyStateChangeRecordType);
     138    pushCurrentRecord(TimelineRecordFactory::createXHRReadyStateChangeData(m_frontend, url, readyState), XHRReadyStateChangeRecordType);
    136139}
    137140
    … …  
    143146void InspectorTimelineAgent::willLoadXHR(const String& url)
    144147{
    145     pushCurrentRecord(TimelineRecordFactory::createXHRLoadRecord(m_frontend, currentTimeInMilliseconds(), url), XHRLoadRecordType);
     148    pushCurrentRecord(TimelineRecordFactory::createXHRLoadData(m_frontend, url), XHRLoadRecordType);
    146149}
    147150
    … …  
    153156void InspectorTimelineAgent::willEvaluateScript(const String& url, int lineNumber)
    154157{
    155     pushCurrentRecord(TimelineRecordFactory::createEvaluateScriptRecord(m_frontend, currentTimeInMilliseconds(), url, lineNumber), EvaluateScriptTimelineRecordType);
     158    pushCurrentRecord(TimelineRecordFactory::createEvaluateScriptData(m_frontend, url, lineNumber), EvaluateScriptTimelineRecordType);
    156159}
    157160   
    … …  
    164167    const ResourceRequest& request)
    165168{
    166     ScriptObject record = TimelineRecordFactory::createResourceSendRequestRecord(m_frontend, currentTimeInMilliseconds(),
    167         identifier, isMainResource, request);
     169    ScriptObject record = TimelineRecordFactory::createGenericRecord(m_frontend, currentTimeInMilliseconds());
     170    record.set("data", TimelineRecordFactory::createResourceSendRequestData(m_frontend, identifier, isMainResource, request));
    168171    record.set("type", ResourceSendRequestTimelineRecordType);
    169172    m_frontend->addRecordToTimeline(record);
    … …  
    172175void InspectorTimelineAgent::didReceiveResourceResponse(unsigned long identifier, const ResourceResponse& response)
    173176{
    174     ScriptObject record = TimelineRecordFactory::createResourceReceiveResponseRecord(m_frontend, currentTimeInMilliseconds(),
    175         identifier, response);
     177    ScriptObject record = TimelineRecordFactory::createGenericRecord(m_frontend, currentTimeInMilliseconds());
     178    record.set("data", TimelineRecordFactory::createResourceReceiveResponseData(m_frontend, identifier, response));
    176179    record.set("type", ResourceReceiveResponseTimelineRecordType);
    177180    m_frontend->addRecordToTimeline(record);
    … …  
    180183void InspectorTimelineAgent::didFinishLoadingResource(unsigned long identifier, bool didFail)
    181184{
    182     ScriptObject record = TimelineRecordFactory::createResourceFinishRecord(m_frontend, currentTimeInMilliseconds(),
    183         identifier, didFail);
     185    ScriptObject record = TimelineRecordFactory::createGenericRecord(m_frontend, currentTimeInMilliseconds());
     186    record.set("data", TimelineRecordFactory::createResourceFinishData(m_frontend, identifier, didFail));
    184187    record.set("type", ResourceFinishTimelineRecordType);
    185188    m_frontend->addRecordToTimeline(record);
    … …  
    188191void InspectorTimelineAgent::didMarkTimeline(const String& message)
    189192{
    190     addRecordToTimeline(TimelineRecordFactory::createMarkTimelineRecord(m_frontend, currentTimeInMilliseconds(), message), MarkTimelineRecordType);
     193    ScriptObject record = TimelineRecordFactory::createGenericRecord(m_frontend, currentTimeInMilliseconds());
     194    record.set("data", TimelineRecordFactory::createMarkTimelineData(m_frontend, message));
     195    addRecordToTimeline(record, MarkTimelineRecordType);
    191196}
    192197
    … …  
    222227        m_recordStack.removeLast();
    223228        ASSERT(entry.type == type);
     229        entry.record.set("data", entry.data);
    224230        entry.record.set("children", entry.children);
    225231        entry.record.set("endTime", currentTimeInMilliseconds());
    … …  
    233239}
    234240
    235 void InspectorTimelineAgent::pushCurrentRecord(ScriptObject record, TimelineRecordType type)
    236 {
    237     m_recordStack.append(TimelineRecordEntry(record, m_frontend->newScriptArray(), type));
     241void InspectorTimelineAgent::pushCurrentRecord(ScriptObject data, TimelineRecordType type)
     242{
     243    m_recordStack.append(TimelineRecordEntry(TimelineRecordFactory::createGenericRecord(m_frontend, currentTimeInMilliseconds()), data, m_frontend->newScriptArray(), type));
    238244}
    239245

  • trunk/WebCore/inspector/InspectorTimelineAgent.h

    r53160 r53488  
    8787        void didPaint();
    8888
    89         void willWriteHTML(unsigned length);
    90         void didWriteHTML();
     89        void willWriteHTML(unsigned int length, unsigned int startLine);
     90        void didWriteHTML(unsigned int endLine);
    9191       
    9292        void didInstallTimer(int timerId, int timeout, bool singleShot);
    … …  
    112112    private:
    113113        struct TimelineRecordEntry {
    114             TimelineRecordEntry(ScriptObject record, ScriptArray children, TimelineRecordType type) : record(record), children(children), type(type) { }
     114            TimelineRecordEntry(ScriptObject record, ScriptObject data, ScriptArray children, TimelineRecordType type) : record(record), data(data), children(children), type(type) { }
    115115            ScriptObject record;
     116            ScriptObject data;
    116117            ScriptArray children;
    117118            TimelineRecordType type;
    … …  
    123124
    124125        void didCompleteCurrentRecord(TimelineRecordType);
    125        
     126
    126127        void addRecordToTimeline(ScriptObject, TimelineRecordType);
    127128

  • trunk/WebCore/inspector/TimelineRecordFactory.cpp

    r53160 r53488  
    5151}
    5252
    53 ScriptObject TimelineRecordFactory::createEventDispatchRecord(InspectorFrontend* frontend, double startTime, const Event& event)
     53ScriptObject TimelineRecordFactory::createEventDispatchData(InspectorFrontend* frontend, const Event& event)
    5454{
    55     ScriptObject record = createGenericRecord(frontend, startTime);
    5655    ScriptObject data = frontend->newScriptObject();
    5756    data.set("type", event.type().string());
    58     record.set("data", data);
    59     return record;
     57    return data;
    6058}
    6159
    62 ScriptObject TimelineRecordFactory::createGenericTimerRecord(InspectorFrontend* frontend, double startTime, int timerId)
     60ScriptObject TimelineRecordFactory::createGenericTimerData(InspectorFrontend* frontend, int timerId)
    6361{
    64     ScriptObject record = createGenericRecord(frontend, startTime);
    6562    ScriptObject data = frontend->newScriptObject();
    6663    data.set("timerId", timerId);
    67     record.set("data", data);
    68     return record;
     64    return data;
    6965}
    7066
    71 ScriptObject TimelineRecordFactory::createTimerInstallRecord(InspectorFrontend* frontend, double startTime, int timerId, int timeout, bool singleShot)
     67ScriptObject TimelineRecordFactory::createTimerInstallData(InspectorFrontend* frontend, int timerId, int timeout, bool singleShot)
    7268{
    73     ScriptObject record = createGenericRecord(frontend, startTime);
    7469    ScriptObject data = frontend->newScriptObject();
    7570    data.set("timerId", timerId);
    7671    data.set("timeout", timeout);
    7772    data.set("singleShot", singleShot);
    78     record.set("data", data);
    79     return record;
     73    return data;
    8074}
    8175
    82 ScriptObject TimelineRecordFactory::createXHRReadyStateChangeRecord(InspectorFrontend* frontend, double startTime, const String& url, int readyState)
     76ScriptObject TimelineRecordFactory::createXHRReadyStateChangeData(InspectorFrontend* frontend, const String& url, int readyState)
    8377{
    84     ScriptObject record = createGenericRecord(frontend, startTime);
    8578    ScriptObject data = frontend->newScriptObject();
    8679    data.set("url", url);
    8780    data.set("readyState", readyState);
    88     record.set("data", data);
    89     return record;
     81    return data;
    9082}
    9183
    92 ScriptObject TimelineRecordFactory::createXHRLoadRecord(InspectorFrontend* frontend, double startTime, const String& url)
     84ScriptObject TimelineRecordFactory::createXHRLoadData(InspectorFrontend* frontend, const String& url)
    9385{
    94     ScriptObject record = createGenericRecord(frontend, startTime);
    9586    ScriptObject data = frontend->newScriptObject();
    9687    data.set("url", url);
    97     record.set("data", data);
    98     return record;
     88    return data;
    9989}
    10090
    101 ScriptObject TimelineRecordFactory::createEvaluateScriptRecord(InspectorFrontend* frontend, double startTime, const String& url, double lineNumber)
     91ScriptObject TimelineRecordFactory::createEvaluateScriptData(InspectorFrontend* frontend, const String& url, double lineNumber)
    10292{
    103     ScriptObject record = createGenericRecord(frontend, startTime);
    10493    ScriptObject data = frontend->newScriptObject();
    10594    data.set("url", url);
    10695    data.set("lineNumber", lineNumber);
    107     record.set("data", data);
    108     return record;
     96    return data;
    10997}
    11098
    111 ScriptObject TimelineRecordFactory::createMarkTimelineRecord(InspectorFrontend* frontend, double startTime, const String& message)
     99ScriptObject TimelineRecordFactory::createMarkTimelineData(InspectorFrontend* frontend, const String& message)
    112100{
    113     ScriptObject record = createGenericRecord(frontend, startTime);
    114101    ScriptObject data = frontend->newScriptObject();
    115102    data.set("message", message);
    116     record.set("data", data);
    117     return record;
     103    return data;
    118104}
    119105
    120106
    121 ScriptObject TimelineRecordFactory::createResourceSendRequestRecord(InspectorFrontend* frontend, double startTime,
    122     unsigned long identifier, bool isMainResource, const ResourceRequest& request)
     107ScriptObject TimelineRecordFactory::createResourceSendRequestData(InspectorFrontend* frontend, unsigned long identifier, bool isMainResource, const ResourceRequest& request)
    123108{
    124     ScriptObject record = createGenericRecord(frontend, startTime);
    125109    ScriptObject data = frontend->newScriptObject();
    126110    data.set("identifier", identifier);
    … …  
    128112    data.set("requestMethod", request.httpMethod());
    129113    data.set("isMainResource", isMainResource);
    130     record.set("data", data);
    131     return record;
     114    return data;
    132115}
    133116
    134 ScriptObject TimelineRecordFactory::createResourceReceiveResponseRecord(InspectorFrontend* frontend, double startTime,
    135     unsigned long identifier, const ResourceResponse& response)
     117ScriptObject TimelineRecordFactory::createResourceReceiveResponseData(InspectorFrontend* frontend, unsigned long identifier, const ResourceResponse& response)
    136118{
    137     ScriptObject record = createGenericRecord(frontend, startTime);
    138119    ScriptObject data = frontend->newScriptObject();
    139120    data.set("identifier", identifier);
    … …  
    141122    data.set("mimeType", response.mimeType());
    142123    data.set("expectedContentLength", response.expectedContentLength());
    143     record.set("data", data);
    144     return record;
     124    return data;
    145125}
    146126
    147 ScriptObject TimelineRecordFactory::createResourceFinishRecord(InspectorFrontend* frontend, double startTime,
    148     unsigned long identifier, bool didFail)
     127ScriptObject TimelineRecordFactory::createResourceFinishData(InspectorFrontend* frontend, unsigned long identifier, bool didFail)
    149128{
    150     ScriptObject record = createGenericRecord(frontend, startTime);
    151129    ScriptObject data = frontend->newScriptObject();
    152130    data.set("identifier", identifier);
    153131    data.set("didFail", didFail);
    154     record.set("data", data);
    155     return record;
     132    return data;
    156133}
    157134
    158 ScriptObject TimelineRecordFactory::createPaintRecord(InspectorFrontend* frontend, double startTime, const IntRect& rect)
     135ScriptObject TimelineRecordFactory::createPaintData(InspectorFrontend* frontend, const IntRect& rect)
    159136{
    160     ScriptObject record = createGenericRecord(frontend, startTime);
    161137    ScriptObject data = frontend->newScriptObject();
    162138    data.set("x", rect.x());
    … …  
    164140    data.set("width", rect.width());
    165141    data.set("height", rect.height());
    166     record.set("data", data);
    167     return record;
     142    return data;
    168143}
    169144
    170 ScriptObject TimelineRecordFactory::createParseHTMLRecord(InspectorFrontend* frontend, double startTime, unsigned length)
     145ScriptObject TimelineRecordFactory::createParseHTMLData(InspectorFrontend* frontend, unsigned int length, unsigned int startLine)
    171146{
    172     ScriptObject record = createGenericRecord(frontend, startTime);
    173147    ScriptObject data = frontend->newScriptObject();
    174148    data.set("length", length);
    175     record.set("data", data);
    176     return record;
     149    data.set("startLine", startLine);
     150    return data;
    177151}
    178152

  • trunk/WebCore/inspector/TimelineRecordFactory.h

    r53160 r53488  
    4747        static ScriptObject createGenericRecord(InspectorFrontend*, double startTime);
    4848
    49         static ScriptObject createEventDispatchRecord(InspectorFrontend*, double startTime, const Event&);
     49        static ScriptObject createEventDispatchData(InspectorFrontend*, const Event&);
    5050
    51         static ScriptObject createGenericTimerRecord(InspectorFrontend*, double startTime, int timerId);
     51        static ScriptObject createGenericTimerData(InspectorFrontend*, int timerId);
    5252
    53         static ScriptObject createTimerInstallRecord(InspectorFrontend*, double startTime, int timerId, int timeout, bool singleShot);
     53        static ScriptObject createTimerInstallData(InspectorFrontend*, int timerId, int timeout, bool singleShot);
    5454
    55         static ScriptObject createXHRReadyStateChangeRecord(InspectorFrontend*, double startTime, const String& url, int readyState);
    56         static ScriptObject createXHRLoadRecord(InspectorFrontend*, double startTime, const String& url);
     55        static ScriptObject createXHRReadyStateChangeData(InspectorFrontend*, const String& url, int readyState);
     56
     57        static ScriptObject createXHRLoadData(InspectorFrontend*, const String& url);
    5758       
    58         static ScriptObject createEvaluateScriptRecord(InspectorFrontend*, double startTime, const String&, double lineNumber);
     59        static ScriptObject createEvaluateScriptData(InspectorFrontend*, const String&, double lineNumber);
    5960       
    60         static ScriptObject createMarkTimelineRecord(InspectorFrontend*, double startTime, const String&);
     61        static ScriptObject createMarkTimelineData(InspectorFrontend*, const String&);
    6162
    62         static ScriptObject createResourceSendRequestRecord(InspectorFrontend*, double startTime,
    63             unsigned long identifier, bool isMainResource, const ResourceRequest&);
    64         static ScriptObject createResourceReceiveResponseRecord(InspectorFrontend*, double startTime,
    65             unsigned long identifier, const ResourceResponse&);
    66         static ScriptObject createResourceFinishRecord(InspectorFrontend*, double startTime,
    67             unsigned long identifier, bool didFail);
     63        static ScriptObject createResourceSendRequestData(InspectorFrontend*, unsigned long identifier,
     64            bool isMainResource, const ResourceRequest&);
    6865
    69         static ScriptObject createPaintRecord(InspectorFrontend*, double startTime, const IntRect&);
     66        static ScriptObject createResourceReceiveResponseData(InspectorFrontend*, unsigned long identifier, const ResourceResponse&);
    7067
    71         static ScriptObject createParseHTMLRecord(InspectorFrontend*, double startTime, unsigned length);
     68        static ScriptObject createResourceFinishData(InspectorFrontend*, unsigned long identifier, bool didFail);
     69
     70        static ScriptObject createPaintData(InspectorFrontend*, const IntRect&);
     71
     72        static ScriptObject createParseHTMLData(InspectorFrontend*, unsigned int length, unsigned int startLine);
    7273
    7374    private:
Note: See TracChangeset for help on using the changeset viewer.