Changeset 74198 in webkit


Ignore:
Timestamp:
Dec 16, 2010 10:01:16 AM (13 years ago)
Author:
pfeldman@chromium.org
Message:

2010-12-16 Pavel Feldman <​pfeldman@chromium.org>

Reviewed by Yury Semikhatsky.

Web Inspector: timeline records should only operate WebCore time.
​https://bugs.webkit.org/show_bug.cgi?id=51127

  • inspector/InspectorTimelineAgent.cpp: (WebCore::InspectorTimelineAgent::didFinishLoadingResource):
  • inspector/TimelineRecordFactory.cpp: (WebCore::TimelineRecordFactory::createResourceFinishData):
  • inspector/TimelineRecordFactory.h:
Location:
trunk/WebCore
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r74197 r74198  
     12010-12-16  Pavel Feldman  <pfeldman@chromium.org>
     2
     3        Reviewed by Yury Semikhatsky.
     4
     5        Web Inspector: timeline records should only operate WebCore time.
     6        https://bugs.webkit.org/show_bug.cgi?id=51127
     7
     8        * inspector/InspectorTimelineAgent.cpp:
     9        (WebCore::InspectorTimelineAgent::didFinishLoadingResource):
     10        * inspector/TimelineRecordFactory.cpp:
     11        (WebCore::TimelineRecordFactory::createResourceFinishData):
     12        * inspector/TimelineRecordFactory.h:
     13
    1142010-12-15  Alexey Proskuryakov  <ap@apple.com>
    215

  • trunk/WebCore/inspector/InspectorTimelineAgent.cpp

    r69283 r74198  
    245245    pushGCEventRecords();
    246246    // Sometimes network stack can provide for us exact finish loading time. In the other case we will use currentTime.
    247     RefPtr<InspectorObject> record = TimelineRecordFactory::createGenericRecord(finishTime ? finishTime * 1000 : WTF::currentTimeMS());
    248     record->setObject("data", TimelineRecordFactory::createResourceFinishData(identifier, didFail));
     247    RefPtr<InspectorObject> record = TimelineRecordFactory::createGenericRecord(WTF::currentTimeMS());
     248    record->setObject("data", TimelineRecordFactory::createResourceFinishData(identifier, didFail, finishTime * 1000));
    249249    record->setNumber("type", ResourceFinishTimelineRecordType);
    250250    setHeapSizeStatistic(record.get());

  • trunk/WebCore/inspector/TimelineRecordFactory.cpp

    r73366 r74198  
    150150}
    151151
    152 PassRefPtr<InspectorObject> TimelineRecordFactory::createResourceFinishData(unsigned long identifier, bool didFail)
     152PassRefPtr<InspectorObject> TimelineRecordFactory::createResourceFinishData(unsigned long identifier, bool didFail, double finishTime)
    153153{
    154154    RefPtr<InspectorObject> data = InspectorObject::create();
    155155    data->setNumber("identifier", identifier);
    156156    data->setBoolean("didFail", didFail);
     157    if (finishTime)
     158        data->setNumber("networkTime", finishTime);
    157159    return data.release();
    158160}

  • trunk/WebCore/inspector/TimelineRecordFactory.h

    r62656 r74198  
    7474        static PassRefPtr<InspectorObject> createReceiveResourceData(unsigned long identifier);
    7575
    76         static PassRefPtr<InspectorObject> createResourceFinishData(unsigned long identifier, bool didFail);
     76        static PassRefPtr<InspectorObject> createResourceFinishData(unsigned long identifier, bool didFail, double finishTime);
    7777
    7878        static PassRefPtr<InspectorObject> createPaintData(const IntRect&);
Note: See TracChangeset for help on using the changeset viewer.