Changeset 71951 in webkit


Ignore:
Timestamp:
Nov 12, 2010 2:51:21 PM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2010-11-12 James Simonsen <simonjam@chromium.org>

Reviewed by Darin Fisher.

[Web Timing] Rename interfaces:

  • fast/dom/Window/window-properties-performance-expected.txt: Class names changed.

2010-11-12 James Simonsen <simonjam@chromium.org>

Reviewed by Darin Fisher.

[Web Timing] Rename interfaces:

  • DerivedSources.cpp:
  • DerivedSources.make:
  • GNUmakefile.am:
  • WebCore.gypi:
  • WebCore.vcproj/WebCore.vcproj:
  • WebCore.xcodeproj/project.pbxproj:
  • page/Performance.cpp: (WebCore::Performance::navigation): (WebCore::Performance::timing):
  • page/Performance.h:
  • page/Performance.idl:
  • page/PerformanceNavigation.cpp: Renamed from WebCore/page/Navigation.cpp. (WebCore::PerformanceNavigation::PerformanceNavigation): (WebCore::PerformanceNavigation::frame): (WebCore::PerformanceNavigation::disconnectFrame): (WebCore::PerformanceNavigation::type): (WebCore::PerformanceNavigation::redirectCount):
  • page/PerformanceNavigation.h: Renamed from WebCore/page/Navigation.h. (WebCore::PerformanceNavigation::create):
  • page/PerformanceNavigation.idl: Renamed from WebCore/page/Navigation.idl.
  • page/PerformanceTiming.cpp: Renamed from WebCore/page/Timing.cpp. (WebCore::toIntegerMilliseconds): (WebCore::getPossiblySkewedTimeInKnownRange): (WebCore::PerformanceTiming::PerformanceTiming): (WebCore::PerformanceTiming::frame): (WebCore::PerformanceTiming::disconnectFrame): (WebCore::PerformanceTiming::navigationStart): (WebCore::PerformanceTiming::unloadEventEnd): (WebCore::PerformanceTiming::redirectStart): (WebCore::PerformanceTiming::redirectEnd): (WebCore::PerformanceTiming::fetchStart): (WebCore::PerformanceTiming::domainLookupStart): (WebCore::PerformanceTiming::domainLookupEnd): (WebCore::PerformanceTiming::connectStart): (WebCore::PerformanceTiming::connectEnd): (WebCore::PerformanceTiming::requestStart): (WebCore::PerformanceTiming::requestEnd): (WebCore::PerformanceTiming::responseStart): (WebCore::PerformanceTiming::responseEnd): (WebCore::PerformanceTiming::domLoading): (WebCore::PerformanceTiming::domInteractive): (WebCore::PerformanceTiming::domContentLoaded): (WebCore::PerformanceTiming::domComplete): (WebCore::PerformanceTiming::loadEventStart): (WebCore::PerformanceTiming::loadEventEnd): (WebCore::PerformanceTiming::documentLoader): (WebCore::PerformanceTiming::documentTiming): (WebCore::PerformanceTiming::documentLoadTiming): (WebCore::PerformanceTiming::resourceLoadTiming): (WebCore::PerformanceTiming::resourceLoadTimeRelativeToAbsolute):
  • page/PerformanceTiming.h: Renamed from WebCore/page/Timing.h. (WebCore::PerformanceTiming::create):
  • page/PerformanceTiming.idl: Renamed from WebCore/page/Timing.idl.

2010-11-12 James Simonsen <simonjam@chromium.org>

Reviewed by Darin Fisher.

[Web Timing] Rename interfaces:

  • src/WebPerformance.cpp: (WebKit::WebPerformance::navigationType):
Location:
trunk
Files:
18 edited
6 moved

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r71948 r71951  
     12010-11-12  James Simonsen  <simonjam@chromium.org>
     2
     3        Reviewed by Darin Fisher.
     4
     5        [Web Timing] Rename interfaces:
     6        - Navigation -> PerformanceNavigation
     7        - Timing -> PerformanceTiming
     8        https://bugs.webkit.org/show_bug.cgi?id=48919
     9
     10        * fast/dom/Window/window-properties-performance-expected.txt: Class names changed.
     11
    1122010-11-12  Mihai Parparita  <mihaip@chromium.org>
    213
  • trunk/LayoutTests/fast/dom/Window/window-properties-performance-expected.txt

    r71633 r71951  
    55window.webkitPerformance.memory.totalJSHeapSize [number]
    66window.webkitPerformance.memory.usedJSHeapSize [number]
    7 window.webkitPerformance.navigation [object Navigation]
     7window.webkitPerformance.navigation [object PerformanceNavigation]
    88window.webkitPerformance.navigation.BACK_FORWARD [number]
    99window.webkitPerformance.navigation.NAVIGATE [number]
     
    1111window.webkitPerformance.navigation.redirectCount [number]
    1212window.webkitPerformance.navigation.type [number]
    13 window.webkitPerformance.timing [object Timing]
     13window.webkitPerformance.timing [object PerformanceTiming]
    1414window.webkitPerformance.timing.connectEnd [number]
    1515window.webkitPerformance.timing.connectStart [number]
  • trunk/WebCore/Android.mk

    r71934 r71951  
    419419        page/Location.cpp \
    420420        page/MouseEventWithHitTestResults.cpp \
    421         page/Navigation.cpp \
    422421        page/Navigator.cpp \
    423422        page/NavigatorBase.cpp \
     
    427426        page/PageGroupLoadDeferrer.cpp \
    428427        page/Performance.cpp \
     428        page/PerformanceNavigation.cpp \
     429        page/PerformanceTiming.cpp \
    429430        page/PluginHalter.cpp \
    430431        page/PrintContext.cpp \
     
    436437        page/SpeechInputResult.cpp \
    437438        page/SuspendableTimer.cpp \
    438         page/Timing.cpp \
    439439        page/UserContentURLPattern.cpp \
    440440        page/WindowFeatures.cpp \
  • trunk/WebCore/CMakeLists.txt

    r71934 r71951  
    330330    page/Location.idl
    331331    page/MemoryInfo.idl
    332     page/Navigation.idl
    333332    page/Navigator.idl
    334333    page/Performance.idl
     334    page/PerformanceNavigation.idl
     335    page/PerformanceTiming.idl
    335336    page/PositionError.idl
    336337    page/Screen.idl
    337     page/Timing.idl
    338338    page/WebKitPoint.idl
    339339    page/WorkerNavigator.idl
     
    12261226    page/MemoryInfo.cpp
    12271227    page/MouseEventWithHitTestResults.cpp
    1228     page/Navigation.cpp
    12291228    page/Navigator.cpp
    12301229    page/NavigatorBase.cpp
     
    12341233    page/PageGroupLoadDeferrer.cpp
    12351234    page/Performance.cpp
     1235    page/PerformanceNavigation.cpp
     1236    page/PerformanceTiming.cpp
    12361237    page/PluginHalter.cpp
    12371238    page/PrintContext.cpp
     
    12411242    page/SpatialNavigation.cpp
    12421243    page/SuspendableTimer.cpp
    1243     page/Timing.cpp
    12441244    page/UserContentURLPattern.cpp
    12451245    page/WindowFeatures.cpp
  • trunk/WebCore/ChangeLog

    r71950 r71951  
     12010-11-12  James Simonsen  <simonjam@chromium.org>
     2
     3        Reviewed by Darin Fisher.
     4
     5        [Web Timing] Rename interfaces:
     6        - Navigation -> PerformanceNavigation
     7        - Timing -> PerformanceTiming
     8        https://bugs.webkit.org/show_bug.cgi?id=48919
     9
     10        * DerivedSources.cpp:
     11        * DerivedSources.make:
     12        * GNUmakefile.am:
     13        * WebCore.gypi:
     14        * WebCore.vcproj/WebCore.vcproj:
     15        * WebCore.xcodeproj/project.pbxproj:
     16        * page/Performance.cpp:
     17        (WebCore::Performance::navigation):
     18        (WebCore::Performance::timing):
     19        * page/Performance.h:
     20        * page/Performance.idl:
     21        * page/PerformanceNavigation.cpp: Renamed from WebCore/page/Navigation.cpp.
     22        (WebCore::PerformanceNavigation::PerformanceNavigation):
     23        (WebCore::PerformanceNavigation::frame):
     24        (WebCore::PerformanceNavigation::disconnectFrame):
     25        (WebCore::PerformanceNavigation::type):
     26        (WebCore::PerformanceNavigation::redirectCount):
     27        * page/PerformanceNavigation.h: Renamed from WebCore/page/Navigation.h.
     28        (WebCore::PerformanceNavigation::create):
     29        * page/PerformanceNavigation.idl: Renamed from WebCore/page/Navigation.idl.
     30        * page/PerformanceTiming.cpp: Renamed from WebCore/page/Timing.cpp.
     31        (WebCore::toIntegerMilliseconds):
     32        (WebCore::getPossiblySkewedTimeInKnownRange):
     33        (WebCore::PerformanceTiming::PerformanceTiming):
     34        (WebCore::PerformanceTiming::frame):
     35        (WebCore::PerformanceTiming::disconnectFrame):
     36        (WebCore::PerformanceTiming::navigationStart):
     37        (WebCore::PerformanceTiming::unloadEventEnd):
     38        (WebCore::PerformanceTiming::redirectStart):
     39        (WebCore::PerformanceTiming::redirectEnd):
     40        (WebCore::PerformanceTiming::fetchStart):
     41        (WebCore::PerformanceTiming::domainLookupStart):
     42        (WebCore::PerformanceTiming::domainLookupEnd):
     43        (WebCore::PerformanceTiming::connectStart):
     44        (WebCore::PerformanceTiming::connectEnd):
     45        (WebCore::PerformanceTiming::requestStart):
     46        (WebCore::PerformanceTiming::requestEnd):
     47        (WebCore::PerformanceTiming::responseStart):
     48        (WebCore::PerformanceTiming::responseEnd):
     49        (WebCore::PerformanceTiming::domLoading):
     50        (WebCore::PerformanceTiming::domInteractive):
     51        (WebCore::PerformanceTiming::domContentLoaded):
     52        (WebCore::PerformanceTiming::domComplete):
     53        (WebCore::PerformanceTiming::loadEventStart):
     54        (WebCore::PerformanceTiming::loadEventEnd):
     55        (WebCore::PerformanceTiming::documentLoader):
     56        (WebCore::PerformanceTiming::documentTiming):
     57        (WebCore::PerformanceTiming::documentLoadTiming):
     58        (WebCore::PerformanceTiming::resourceLoadTiming):
     59        (WebCore::PerformanceTiming::resourceLoadTimeRelativeToAbsolute):
     60        * page/PerformanceTiming.h: Renamed from WebCore/page/Timing.h.
     61        (WebCore::PerformanceTiming::create):
     62        * page/PerformanceTiming.idl: Renamed from WebCore/page/Timing.idl.
     63
    1642010-11-12  Eric Carlson  <eric.carlson@apple.com>
    265
  • trunk/WebCore/DerivedSources.cpp

    r71711 r71951  
    236236#include "JSMutationEvent.cpp"
    237237#include "JSNamedNodeMap.cpp"
    238 #include "JSNavigation.cpp"
    239238#include "JSNavigator.cpp"
    240239#include "JSNode.cpp"
     
    248247#include "JSPageTransitionEvent.cpp"
    249248#include "JSPerformance.cpp"
     249#include "JSPerformanceNavigation.cpp"
     250#include "JSPerformanceTiming.cpp"
    250251#include "JSPopStateEvent.cpp"
    251252#include "JSPositionError.cpp"
     
    416417#include "JSTextMetrics.cpp"
    417418#include "JSTimeRanges.cpp"
    418 #include "JSTiming.cpp"
    419419#include "JSTouch.cpp"
    420420#include "JSTouchEvent.cpp"
  • trunk/WebCore/DerivedSources.make

    r71754 r71951  
    280280    MutationEvent \
    281281    NamedNodeMap \
    282     Navigation \
    283282    Navigator \
    284283    Node \
     
    292291    PageTransitionEvent \
    293292    Performance \
     293    PerformanceNavigation \
     294    PerformanceTiming \
    294295    PopStateEvent \
    295296    PositionError \
     
    471472    TextMetrics \
    472473    TimeRanges \
    473     Timing \
    474474    Touch \
    475475    TouchEvent \
  • trunk/WebCore/GNUmakefile.am

    r71934 r71951  
    448448        DerivedSources/WebCore/JSNamedNodeMap.cpp \
    449449        DerivedSources/WebCore/JSNamedNodeMap.h \
    450         DerivedSources/WebCore/JSNavigation.cpp \
    451         DerivedSources/WebCore/JSNavigation.h \
    452450        DerivedSources/WebCore/JSNavigator.cpp \
    453451        DerivedSources/WebCore/JSNavigator.h \
     
    472470        DerivedSources/WebCore/JSPerformance.cpp \
    473471        DerivedSources/WebCore/JSPerformance.h \
     472        DerivedSources/WebCore/JSPerformanceNavigation.cpp \
     473        DerivedSources/WebCore/JSPerformanceNavigation.h \
     474        DerivedSources/WebCore/JSPerformanceTiming.cpp \
     475        DerivedSources/WebCore/JSPerformanceTiming.h \
    474476        DerivedSources/WebCore/JSPopStateEvent.cpp \
    475477        DerivedSources/WebCore/JSPopStateEvent.h \
     
    513515        DerivedSources/WebCore/JSTimeRanges.cpp \
    514516        DerivedSources/WebCore/JSTimeRanges.h \
    515         DerivedSources/WebCore/JSTiming.cpp \
    516         DerivedSources/WebCore/JSTiming.h \
    517517        DerivedSources/WebCore/JSTouch.cpp \
    518518        DerivedSources/WebCore/JSTouchEvent.cpp \
     
    21292129        WebCore/page/MouseEventWithHitTestResults.cpp \
    21302130        WebCore/page/MouseEventWithHitTestResults.h \
    2131         WebCore/page/Navigation.cpp \
    2132         WebCore/page/Navigation.h \
    21332131        WebCore/page/NavigatorBase.cpp \
    21342132        WebCore/page/NavigatorBase.h \
     
    21452143        WebCore/page/Performance.cpp \
    21462144        WebCore/page/Performance.h \
     2145        WebCore/page/PerformanceNavigation.cpp \
     2146        WebCore/page/PerformanceNavigation.h \
     2147        WebCore/page/PerformanceTiming.cpp \
     2148        WebCore/page/PerformanceTiming.h \
    21472149        WebCore/page/PluginHalterClient.h \
    21482150        WebCore/page/PluginHalter.cpp \
     
    21712173        WebCore/page/SuspendableTimer.cpp \
    21722174        WebCore/page/SuspendableTimer.h \
    2173         WebCore/page/Timing.cpp \
    2174         WebCore/page/Timing.h \
    21752175        WebCore/page/UserContentTypes.h \
    21762176        WebCore/page/UserContentURLPattern.cpp \
  • trunk/WebCore/WebCore.gypi

    r71934 r71951  
    247247            'page/Location.idl',
    248248            'page/MemoryInfo.idl',
    249             'page/Navigation.idl',
    250249            'page/Navigator.idl',
    251250            'page/Performance.idl',
     251            'page/PerformanceNavigation.idl',
     252            'page/PerformanceTiming.idl',
    252253            'page/PositionError.idl',
    253254            'page/Screen.idl',
    254             'page/Timing.idl',
    255255            'page/WebKitPoint.idl',
    256256            'page/WorkerNavigator.idl',
     
    22622262            'page/MouseEventWithHitTestResults.cpp',
    22632263            'page/MouseEventWithHitTestResults.h',
    2264             'page/Navigation.cpp',
    2265             'page/Navigation.h',
    22662264            'page/Navigator.cpp',
    22672265            'page/Navigator.h',
     
    22782276            'page/Performance.cpp',
    22792277            'page/Performance.h',
     2278            'page/PerformanceNavigation.cpp',
     2279            'page/PerformanceNavigation.h',
     2280            'page/PerformanceTiming.cpp',
     2281            'page/PerformanceTiming.h',
    22802282            'page/PluginHalter.cpp',
    22812283            'page/PluginHalter.h',
     
    23042306            'page/SuspendableTimer.cpp',
    23052307            'page/SuspendableTimer.h',
    2306             'page/Timing.cpp',
    2307             'page/Timing.h',
    23082308            'page/UserContentURLPattern.cpp',
    23092309            'page/UserContentURLPattern.h',
  • trunk/WebCore/WebCore.pri

    r71373 r71951  
    308308    page/Location.idl \
    309309    page/MemoryInfo.idl \
    310     page/Navigation.idl \
    311310    page/Navigator.idl \
    312311    page/Performance.idl \
     312    page/PerformanceNavigation.idl \
     313    page/PerformanceTiming.idl \
    313314    page/PositionError.idl \
    314315    page/Screen.idl \
    315     page/Timing.idl \
    316316    page/WebKitPoint.idl \
    317317    page/WorkerNavigator.idl \
  • trunk/WebCore/WebCore.pro

    r71934 r71951  
    10911091    page/DOMTimer.cpp \
    10921092    page/DOMWindow.cpp \
    1093     page/Navigation.cpp \
    10941093    page/Navigator.cpp \
    10951094    page/NavigatorBase.cpp \
     
    11141113    page/PageGroupLoadDeferrer.cpp \
    11151114    page/Performance.cpp \
     1115    page/PerformanceNavigation.cpp \
     1116    page/PerformanceTiming.cpp \
    11161117    page/PluginHalter.cpp \
    11171118    page/PrintContext.cpp \
     
    11211122    page/SpatialNavigation.cpp \
    11221123    page/SuspendableTimer.cpp \
    1123     page/Timing.cpp \
    11241124    page/UserContentURLPattern.cpp \
    11251125    page/WindowFeatures.cpp \
  • trunk/WebCore/WebCore.vcproj/WebCore.vcproj

    r71934 r71951  
    1069310693                        </File>
    1069410694                        <File
    10695                                 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSNavigation.cpp"
    10696                                 >
    10697                                 <FileConfiguration
    10698                                         Name="Debug|Win32"
    10699                                         ExcludedFromBuild="true"
    10700                                         >
    10701                                         <Tool
    10702                                                 Name="VCCLCompilerTool"
    10703                                         />
    10704                                 </FileConfiguration>
    10705                                 <FileConfiguration
    10706                                         Name="Release|Win32"
    10707                                         ExcludedFromBuild="true"
    10708                                         >
    10709                                         <Tool
    10710                                                 Name="VCCLCompilerTool"
    10711                                         />
    10712                                 </FileConfiguration>
    10713                                 <FileConfiguration
    10714                                         Name="Debug_Internal|Win32"
    10715                                         ExcludedFromBuild="true"
    10716                                         >
    10717                                         <Tool
    10718                                                 Name="VCCLCompilerTool"
    10719                                         />
    10720                                 </FileConfiguration>
    10721                                 <FileConfiguration
    10722                                         Name="Debug_Cairo|Win32"
    10723                                         ExcludedFromBuild="true"
    10724                                         >
    10725                                         <Tool
    10726                                                 Name="VCCLCompilerTool"
    10727                                         />
    10728                                 </FileConfiguration>
    10729                                 <FileConfiguration
    10730                                         Name="Release_Cairo|Win32"
    10731                                         ExcludedFromBuild="true"
    10732                                         >
    10733                                         <Tool
    10734                                                 Name="VCCLCompilerTool"
    10735                                         />
    10736                                 </FileConfiguration>
    10737                                 <FileConfiguration
    10738                                         Name="Debug_All|Win32"
    10739                                         ExcludedFromBuild="true"
    10740                                         >
    10741                                         <Tool
    10742                                                 Name="VCCLCompilerTool"
    10743                                         />
    10744                                 </FileConfiguration>
    10745                         </File>
    10746                         <File
    10747                                 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSNavigation.h"
    10748                                 >
    10749                         </File>
    10750                         <File
    1075110695                                RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSNavigator.cpp"
    1075210696                                >
     
    1136511309                        </File>
    1136611310                        <File
     11311                                RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSPerformanceNavigation.cpp"
     11312                                >
     11313                                <FileConfiguration
     11314                                        Name="Debug|Win32"
     11315                                        ExcludedFromBuild="true"
     11316                                        >
     11317                                        <Tool
     11318                                                Name="VCCLCompilerTool"
     11319                                        />
     11320                                </FileConfiguration>
     11321                                <FileConfiguration
     11322                                        Name="Release|Win32"
     11323                                        ExcludedFromBuild="true"
     11324                                        >
     11325                                        <Tool
     11326                                                Name="VCCLCompilerTool"
     11327                                        />
     11328                                </FileConfiguration>
     11329                                <FileConfiguration
     11330                                        Name="Debug_Internal|Win32"
     11331                                        ExcludedFromBuild="true"
     11332                                        >
     11333                                        <Tool
     11334                                                Name="VCCLCompilerTool"
     11335                                        />
     11336                                </FileConfiguration>
     11337                                <FileConfiguration
     11338                                        Name="Debug_Cairo|Win32"
     11339                                        ExcludedFromBuild="true"
     11340                                        >
     11341                                        <Tool
     11342                                                Name="VCCLCompilerTool"
     11343                                        />
     11344                                </FileConfiguration>
     11345                                <FileConfiguration
     11346                                        Name="Release_Cairo|Win32"
     11347                                        ExcludedFromBuild="true"
     11348                                        >
     11349                                        <Tool
     11350                                                Name="VCCLCompilerTool"
     11351                                        />
     11352                                </FileConfiguration>
     11353                                <FileConfiguration
     11354                                        Name="Debug_All|Win32"
     11355                                        ExcludedFromBuild="true"
     11356                                        >
     11357                                        <Tool
     11358                                                Name="VCCLCompilerTool"
     11359                                        />
     11360                                </FileConfiguration>
     11361                        </File>
     11362                        <File
     11363                                RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSPerformanceNavigation.h"
     11364                                >
     11365                        </File>
     11366                        <File
     11367                                RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSPerformanceTiming.cpp"
     11368                                >
     11369                                <FileConfiguration
     11370                                        Name="Debug|Win32"
     11371                                        ExcludedFromBuild="true"
     11372                                        >
     11373                                        <Tool
     11374                                                Name="VCCLCompilerTool"
     11375                                        />
     11376                                </FileConfiguration>
     11377                                <FileConfiguration
     11378                                        Name="Release|Win32"
     11379                                        ExcludedFromBuild="true"
     11380                                        >
     11381                                        <Tool
     11382                                                Name="VCCLCompilerTool"
     11383                                        />
     11384                                </FileConfiguration>
     11385                                <FileConfiguration
     11386                                        Name="Debug_Internal|Win32"
     11387                                        ExcludedFromBuild="true"
     11388                                        >
     11389                                        <Tool
     11390                                                Name="VCCLCompilerTool"
     11391                                        />
     11392                                </FileConfiguration>
     11393                                <FileConfiguration
     11394                                        Name="Debug_Cairo|Win32"
     11395                                        ExcludedFromBuild="true"
     11396                                        >
     11397                                        <Tool
     11398                                                Name="VCCLCompilerTool"
     11399                                        />
     11400                                </FileConfiguration>
     11401                                <FileConfiguration
     11402                                        Name="Release_Cairo|Win32"
     11403                                        ExcludedFromBuild="true"
     11404                                        >
     11405                                        <Tool
     11406                                                Name="VCCLCompilerTool"
     11407                                        />
     11408                                </FileConfiguration>
     11409                                <FileConfiguration
     11410                                        Name="Debug_All|Win32"
     11411                                        ExcludedFromBuild="true"
     11412                                        >
     11413                                        <Tool
     11414                                                Name="VCCLCompilerTool"
     11415                                        />
     11416                                </FileConfiguration>
     11417                        </File>
     11418                        <File
     11419                                RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSPerformanceTiming.h"
     11420                                >
     11421                        </File>
     11422                        <File
    1136711423                                RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSPopStateEvent.cpp"
    1136811424                                >
     
    2027420330                        <File
    2027520331                                RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSTimeRanges.h"
    20276                                 >
    20277                         </File>
    20278                         <File
    20279                                 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSTiming.cpp"
    20280                                 >
    20281                                 <FileConfiguration
    20282                                         Name="Debug|Win32"
    20283                                         ExcludedFromBuild="true"
    20284                                         >
    20285                                         <Tool
    20286                                                 Name="VCCLCompilerTool"
    20287                                         />
    20288                                 </FileConfiguration>
    20289                                 <FileConfiguration
    20290                                         Name="Release|Win32"
    20291                                         ExcludedFromBuild="true"
    20292                                         >
    20293                                         <Tool
    20294                                                 Name="VCCLCompilerTool"
    20295                                         />
    20296                                 </FileConfiguration>
    20297                                 <FileConfiguration
    20298                                         Name="Debug_Internal|Win32"
    20299                                         ExcludedFromBuild="true"
    20300                                         >
    20301                                         <Tool
    20302                                                 Name="VCCLCompilerTool"
    20303                                         />
    20304                                 </FileConfiguration>
    20305                                 <FileConfiguration
    20306                                         Name="Debug_Cairo|Win32"
    20307                                         ExcludedFromBuild="true"
    20308                                         >
    20309                                         <Tool
    20310                                                 Name="VCCLCompilerTool"
    20311                                         />
    20312                                 </FileConfiguration>
    20313                                 <FileConfiguration
    20314                                         Name="Release_Cairo|Win32"
    20315                                         ExcludedFromBuild="true"
    20316                                         >
    20317                                         <Tool
    20318                                                 Name="VCCLCompilerTool"
    20319                                         />
    20320                                 </FileConfiguration>
    20321                                 <FileConfiguration
    20322                                         Name="Debug_All|Win32"
    20323                                         ExcludedFromBuild="true"
    20324                                         >
    20325                                         <Tool
    20326                                                 Name="VCCLCompilerTool"
    20327                                         />
    20328                                 </FileConfiguration>
    20329                         </File>
    20330                         <File
    20331                                 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSTiming.h"
    2033220332                                >
    2033320333                        </File>
     
    2348123481                        </File>
    2348223482                        <File
    23483                                 RelativePath="..\page\Navigation.cpp"
    23484                                 >
    23485                         </File>
    23486                         <File
    23487                                 RelativePath="..\page\Navigation.h"
    23488                                 >
    23489                         </File>
    23490                         <File
    2349123483                                RelativePath="..\page\Navigator.cpp"
    2349223484                                >
     
    2354123533                        </File>
    2354223534                        <File
     23535                                RelativePath="..\page\PerformanceNavigation.cpp"
     23536                                >
     23537                        </File>
     23538                        <File
     23539                                RelativePath="..\page\PerformanceNavigation.h"
     23540                                >
     23541                        </File>
     23542                        <File
     23543                                RelativePath="..\page\PerformanceTiming.cpp"
     23544                                >
     23545                        </File>
     23546                        <File
     23547                                RelativePath="..\page\PerformanceTiming.h"
     23548                                >
     23549                        </File>
     23550                        <File
    2354323551                                RelativePath="..\page\PluginHalter.cpp"
    2354423552                                >
     
    2363023638                        <File
    2363123639                                RelativePath="..\page\SuspendableTimer.h"
    23632                                 >
    23633                         </File>
    23634                         <File
    23635                                 RelativePath="..\page\Timing.cpp"
    23636                                 >
    23637                         </File>
    23638                         <File
    23639                                 RelativePath="..\page\Timing.h"
    2364023640                                >
    2364123641                        </File>
  • trunk/WebCore/WebCore.xcodeproj/project.pbxproj

    r71949 r71951  
    26422642                8A844D0411D3C18E0014065C /* Performance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A844D0111D3C18E0014065C /* Performance.cpp */; };
    26432643                8A844D0511D3C18E0014065C /* Performance.h in Headers */ = {isa = PBXBuildFile; fileRef = 8A844D0211D3C18E0014065C /* Performance.h */; };
    2644                 8A9A587011E84C36008ACFD1 /* JSNavigation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A9A586E11E84C35008ACFD1 /* JSNavigation.cpp */; };
    2645                 8A9A587111E84C36008ACFD1 /* JSNavigation.h in Headers */ = {isa = PBXBuildFile; fileRef = 8A9A586F11E84C36008ACFD1 /* JSNavigation.h */; };
     2644                8A9A587011E84C36008ACFD1 /* JSPerformanceNavigation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A9A586E11E84C35008ACFD1 /* JSPerformanceNavigation.cpp */; };
     2645                8A9A587111E84C36008ACFD1 /* JSPerformanceNavigation.h in Headers */ = {isa = PBXBuildFile; fileRef = 8A9A586F11E84C36008ACFD1 /* JSPerformanceNavigation.h */; };
    26462646                8A9A587411E84C81008ACFD1 /* JSPerformance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A9A587211E84C81008ACFD1 /* JSPerformance.cpp */; };
    26472647                8A9A587511E84C81008ACFD1 /* JSPerformance.h in Headers */ = {isa = PBXBuildFile; fileRef = 8A9A587311E84C81008ACFD1 /* JSPerformance.h */; };
    2648                 8A9A588711E84F37008ACFD1 /* JSTiming.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A9A587611E84C98008ACFD1 /* JSTiming.cpp */; };
    2649                 8A9A588811E84F37008ACFD1 /* JSTiming.h in Headers */ = {isa = PBXBuildFile; fileRef = 8A9A587711E84C98008ACFD1 /* JSTiming.h */; };
     2648                8A9A588711E84F37008ACFD1 /* JSPerformanceTiming.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A9A587611E84C98008ACFD1 /* JSPerformanceTiming.cpp */; };
     2649                8A9A588811E84F37008ACFD1 /* JSPerformanceTiming.h in Headers */ = {isa = PBXBuildFile; fileRef = 8A9A587711E84C98008ACFD1 /* JSPerformanceTiming.h */; };
    26502650                8AB4BC77126FDB7100DEB727 /* IgnoreDestructiveWriteCountIncrementer.h in Headers */ = {isa = PBXBuildFile; fileRef = 8AB4BC76126FDB7100DEB727 /* IgnoreDestructiveWriteCountIncrementer.h */; };
    2651                 8AF4E55511DC5A36000ED3DE /* Navigation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8AF4E55211DC5A36000ED3DE /* Navigation.cpp */; };
    2652                 8AF4E55611DC5A36000ED3DE /* Navigation.h in Headers */ = {isa = PBXBuildFile; fileRef = 8AF4E55311DC5A36000ED3DE /* Navigation.h */; };
    2653                 8AF4E55B11DC5A63000ED3DE /* Timing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8AF4E55811DC5A63000ED3DE /* Timing.cpp */; };
    2654                 8AF4E55C11DC5A63000ED3DE /* Timing.h in Headers */ = {isa = PBXBuildFile; fileRef = 8AF4E55911DC5A63000ED3DE /* Timing.h */; };
     2651                8AF4E55511DC5A36000ED3DE /* PerformanceNavigation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8AF4E55211DC5A36000ED3DE /* PerformanceNavigation.cpp */; };
     2652                8AF4E55611DC5A36000ED3DE /* PerformanceNavigation.h in Headers */ = {isa = PBXBuildFile; fileRef = 8AF4E55311DC5A36000ED3DE /* PerformanceNavigation.h */; };
     2653                8AF4E55B11DC5A63000ED3DE /* PerformanceTiming.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8AF4E55811DC5A63000ED3DE /* PerformanceTiming.cpp */; };
     2654                8AF4E55C11DC5A63000ED3DE /* PerformanceTiming.h in Headers */ = {isa = PBXBuildFile; fileRef = 8AF4E55911DC5A63000ED3DE /* PerformanceTiming.h */; };
    26552655                8C6EA61911EF7E0400FD8EE3 /* RuntimeEnabledFeatures.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8C6EA61711EF7E0400FD8EE3 /* RuntimeEnabledFeatures.cpp */; };
    26562656                8C6EA61A11EF7E0400FD8EE3 /* RuntimeEnabledFeatures.h in Headers */ = {isa = PBXBuildFile; fileRef = 8C6EA61811EF7E0400FD8EE3 /* RuntimeEnabledFeatures.h */; };
     
    87698769                8A844D0211D3C18E0014065C /* Performance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Performance.h; sourceTree = "<group>"; };
    87708770                8A844D0311D3C18E0014065C /* Performance.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Performance.idl; sourceTree = "<group>"; };
    8771                 8A9A586E11E84C35008ACFD1 /* JSNavigation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSNavigation.cpp; sourceTree = "<group>"; };
    8772                 8A9A586F11E84C36008ACFD1 /* JSNavigation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSNavigation.h; sourceTree = "<group>"; };
     8771                8A9A586E11E84C35008ACFD1 /* JSPerformanceNavigation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSPerformanceNavigation.cpp; sourceTree = "<group>"; };
     8772                8A9A586F11E84C36008ACFD1 /* JSPerformanceNavigation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSPerformanceNavigation.h; sourceTree = "<group>"; };
    87738773                8A9A587211E84C81008ACFD1 /* JSPerformance.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSPerformance.cpp; sourceTree = "<group>"; };
    87748774                8A9A587311E84C81008ACFD1 /* JSPerformance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSPerformance.h; sourceTree = "<group>"; };
    8775                 8A9A587611E84C98008ACFD1 /* JSTiming.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSTiming.cpp; sourceTree = "<group>"; };
    8776                 8A9A587711E84C98008ACFD1 /* JSTiming.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSTiming.h; sourceTree = "<group>"; };
     8775                8A9A587611E84C98008ACFD1 /* JSPerformanceTiming.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSPerformanceTiming.cpp; sourceTree = "<group>"; };
     8776                8A9A587711E84C98008ACFD1 /* JSPerformanceTiming.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSPerformanceTiming.h; sourceTree = "<group>"; };
    87778777                8AB4BC76126FDB7100DEB727 /* IgnoreDestructiveWriteCountIncrementer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IgnoreDestructiveWriteCountIncrementer.h; sourceTree = "<group>"; };
    8778                 8AF4E55211DC5A36000ED3DE /* Navigation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Navigation.cpp; sourceTree = "<group>"; };
    8779                 8AF4E55311DC5A36000ED3DE /* Navigation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Navigation.h; sourceTree = "<group>"; };
    8780                 8AF4E55411DC5A36000ED3DE /* Navigation.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Navigation.idl; sourceTree = "<group>"; };
    8781                 8AF4E55811DC5A63000ED3DE /* Timing.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Timing.cpp; sourceTree = "<group>"; };
    8782                 8AF4E55911DC5A63000ED3DE /* Timing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Timing.h; sourceTree = "<group>"; };
    8783                 8AF4E55A11DC5A63000ED3DE /* Timing.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Timing.idl; sourceTree = "<group>"; };
     8778                8AF4E55211DC5A36000ED3DE /* PerformanceNavigation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PerformanceNavigation.cpp; sourceTree = "<group>"; };
     8779                8AF4E55311DC5A36000ED3DE /* PerformanceNavigation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PerformanceNavigation.h; sourceTree = "<group>"; };
     8780                8AF4E55411DC5A36000ED3DE /* PerformanceNavigation.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = PerformanceNavigation.idl; sourceTree = "<group>"; };
     8781                8AF4E55811DC5A63000ED3DE /* PerformanceTiming.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PerformanceTiming.cpp; sourceTree = "<group>"; };
     8782                8AF4E55911DC5A63000ED3DE /* PerformanceTiming.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PerformanceTiming.h; sourceTree = "<group>"; };
     8783                8AF4E55A11DC5A63000ED3DE /* PerformanceTiming.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = PerformanceTiming.idl; sourceTree = "<group>"; };
    87848784                8C6EA61711EF7E0400FD8EE3 /* RuntimeEnabledFeatures.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RuntimeEnabledFeatures.cpp; path = generic/RuntimeEnabledFeatures.cpp; sourceTree = "<group>"; };
    87858785                8C6EA61811EF7E0400FD8EE3 /* RuntimeEnabledFeatures.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RuntimeEnabledFeatures.h; path = generic/RuntimeEnabledFeatures.h; sourceTree = "<group>"; };
     
    1330813308                                93EB355E09E37FD600F43799 /* MouseEventWithHitTestResults.cpp */,
    1330913309                                935C476209AC4CE600A6AAB4 /* MouseEventWithHitTestResults.h */,
    13310                                 8AF4E55211DC5A36000ED3DE /* Navigation.cpp */,
    13311                                 8AF4E55311DC5A36000ED3DE /* Navigation.h */,
    13312                                 8AF4E55411DC5A36000ED3DE /* Navigation.idl */,
    1331313310                                A9C6E5A30D746458006442E9 /* Navigator.cpp */,
    1331413311                                A9C6E5A40D746458006442E9 /* Navigator.h */,
     
    1332713324                                8A844D0211D3C18E0014065C /* Performance.h */,
    1332813325                                8A844D0311D3C18E0014065C /* Performance.idl */,
     13326                                8AF4E55211DC5A36000ED3DE /* PerformanceNavigation.cpp */,
     13327                                8AF4E55311DC5A36000ED3DE /* PerformanceNavigation.h */,
     13328                                8AF4E55411DC5A36000ED3DE /* PerformanceNavigation.idl */,
     13329                                8AF4E55811DC5A63000ED3DE /* PerformanceTiming.cpp */,
     13330                                8AF4E55911DC5A63000ED3DE /* PerformanceTiming.h */,
     13331                                8AF4E55A11DC5A63000ED3DE /* PerformanceTiming.idl */,
    1332913332                                7693BACF106C2DCA007B0823 /* PluginHalter.cpp */,
    1333013333                                7693BAD0106C2DCA007B0823 /* PluginHalter.h */,
     
    1335513358                                62C1217A11AB9E76003C462C /* SuspendableTimer.cpp */,
    1335613359                                62C1217B11AB9E77003C462C /* SuspendableTimer.h */,
    13357                                 8AF4E55811DC5A63000ED3DE /* Timing.cpp */,
    13358                                 8AF4E55911DC5A63000ED3DE /* Timing.h */,
    13359                                 8AF4E55A11DC5A63000ED3DE /* Timing.idl */,
    1336013360                                003F1FE911E6AB43008258D9 /* UserContentTypes.h */,
    1336113361                                BCACF3BA1072921A00C0C8A3 /* UserContentURLPattern.cpp */,
     
    1726917269                                9FFE3EA311B5A4390037874E /* JSMemoryInfo.cpp */,
    1727017270                                9FFE3EA411B5A4390037874E /* JSMemoryInfo.h */,
    17271                                 8A9A586E11E84C35008ACFD1 /* JSNavigation.cpp */,
    17272                                 8A9A586F11E84C36008ACFD1 /* JSNavigation.h */,
    1727317271                                A9D247F50D757E3300FDF959 /* JSNavigator.cpp */,
    1727417272                                A9D247F60D757E3300FDF959 /* JSNavigator.h */,
    1727517273                                8A9A587211E84C81008ACFD1 /* JSPerformance.cpp */,
    1727617274                                8A9A587311E84C81008ACFD1 /* JSPerformance.h */,
     17275                                8A9A586E11E84C35008ACFD1 /* JSPerformanceNavigation.cpp */,
     17276                                8A9A586F11E84C36008ACFD1 /* JSPerformanceNavigation.h */,
     17277                                8A9A587611E84C98008ACFD1 /* JSPerformanceTiming.cpp */,
     17278                                8A9A587711E84C98008ACFD1 /* JSPerformanceTiming.h */,
    1727717279                                BCEC01C00C274DDD009F4EC9 /* JSScreen.cpp */,
    1727817280                                BCEC01C10C274DDD009F4EC9 /* JSScreen.h */,
    17279                                 8A9A587611E84C98008ACFD1 /* JSTiming.cpp */,
    17280                                 8A9A587711E84C98008ACFD1 /* JSTiming.h */,
    1728117281                                494BD79B0F55C94C00747828 /* JSWebKitPoint.cpp */,
    1728217282                                494BD79C0F55C94C00747828 /* JSWebKitPoint.h */,
     
    2020120201                                65DF31FC09D1CC60000BE325 /* JSMutationEvent.h in Headers */,
    2020220202                                BCD9C2C10C17B69E005C90A2 /* JSNamedNodeMap.h in Headers */,
    20203                                 8A9A587111E84C36008ACFD1 /* JSNavigation.h in Headers */,
    2020420203                                A9D247F80D757E3400FDF959 /* JSNavigator.h in Headers */,
    2020520204                                BC9439C3116CF4940048C750 /* JSNodeCustom.h in Headers */,
     
    2021520214                                E1284BB110449FFA00EAEB52 /* JSPageTransitionEvent.h in Headers */,
    2021620215                                8A9A587511E84C81008ACFD1 /* JSPerformance.h in Headers */,
     20216                                8A9A587111E84C36008ACFD1 /* JSPerformanceNavigation.h in Headers */,
     20217                                8A9A588811E84F37008ACFD1 /* JSPerformanceTiming.h in Headers */,
    2021720218                                93B70D6C09EB0C7C009D8468 /* JSPluginElementFunctions.h in Headers */,
    2021820219                                5189F01E10B37BD900F3C739 /* JSPopStateEvent.h in Headers */,
     
    2038720388                                BCEF45F60E687B5C001C1287 /* JSTextMetrics.h in Headers */,
    2038820389                                E446141B0CD6826900FADA75 /* JSTimeRanges.h in Headers */,
    20389                                 8A9A588811E84F37008ACFD1 /* JSTiming.h in Headers */,
    2039020390                                1A750D5D0A90DEE1000FF215 /* JSTreeWalker.h in Headers */,
    2039120391                                A86629CF09DA2B47009633A5 /* JSUIEvent.h in Headers */,
     
    2050720507                                A818721E0977D3C0005826D9 /* NameNodeList.h in Headers */,
    2050820508                                E10B9B6C0B747599003ED890 /* NativeXPathNSResolver.h in Headers */,
    20509                                 8AF4E55611DC5A36000ED3DE /* Navigation.h in Headers */,
    2051020509                                93CCF0270AF6C52900018E89 /* NavigationAction.h in Headers */,
    2051120510                                979F43D41075E44A0000F83B /* NavigationScheduler.h in Headers */,
     
    2057620575                                8A7CC96B12076D73001D4588 /* PendingScript.h in Headers */,
    2057720576                                8A844D0511D3C18E0014065C /* Performance.h in Headers */,
     20577                                8AF4E55611DC5A36000ED3DE /* PerformanceNavigation.h in Headers */,
     20578                                8AF4E55C11DC5A63000ED3DE /* PerformanceTiming.h in Headers */,
    2057820579                                49D5DC2E0F423A73008F20FD /* PerspectiveTransformOperation.h in Headers */,
    2057920580                                D0FF2A5E11F8C45A007E74E0 /* PingLoader.h in Headers */,
     
    2119821199                                9305B24D098F1B6B00C28855 /* Timer.h in Headers */,
    2119921200                                E44613B00CD6331000FADA75 /* TimeRanges.h in Headers */,
    21200                                 8AF4E55C11DC5A63000ED3DE /* Timing.h in Headers */,
    2120121201                                49E912AE0EFAC906009D0CAF /* TimingFunction.h in Headers */,
    2120221202                                49E911C40EF86D47009D0CAF /* TransformationMatrix.h in Headers */,
     
    2288522885                                BCD9C2C00C17B69E005C90A2 /* JSNamedNodeMap.cpp in Sources */,
    2288622886                                BCD9C2630C17AA67005C90A2 /* JSNamedNodeMapCustom.cpp in Sources */,
    22887                                 8A9A587011E84C36008ACFD1 /* JSNavigation.cpp in Sources */,
    2288822887                                A9D247F70D757E3400FDF959 /* JSNavigator.cpp in Sources */,
    2288922888                                A9C6E6490D7465D8006442E9 /* JSNavigatorCustom.cpp in Sources */,
     
    2290422903                                E1284BB210449FFA00EAEB52 /* JSPageTransitionEvent.cpp in Sources */,
    2290522904                                8A9A587411E84C81008ACFD1 /* JSPerformance.cpp in Sources */,
     22905                                8A9A587011E84C36008ACFD1 /* JSPerformanceNavigation.cpp in Sources */,
     22906                                8A9A588711E84F37008ACFD1 /* JSPerformanceTiming.cpp in Sources */,
    2290622907                                93B70D6B09EB0C7C009D8468 /* JSPluginElementFunctions.cpp in Sources */,
    2290722908                                5189F01D10B37BD900F3C739 /* JSPopStateEvent.cpp in Sources */,
     
    2308823089                                BCEF45F50E687B5C001C1287 /* JSTextMetrics.cpp in Sources */,
    2308923090                                E446141A0CD6826900FADA75 /* JSTimeRanges.cpp in Sources */,
    23090                                 8A9A588711E84F37008ACFD1 /* JSTiming.cpp in Sources */,
    2309123091                                1A750D5C0A90DEE1000FF215 /* JSTreeWalker.cpp in Sources */,
    2309223092                                516BB7940CE91E6800512F79 /* JSTreeWalkerCustom.cpp in Sources */,
     
    2321723217                                A81872240977D3C0005826D9 /* NameNodeList.cpp in Sources */,
    2321823218                                E10B9B6D0B747599003ED890 /* NativeXPathNSResolver.cpp in Sources */,
    23219                                 8AF4E55511DC5A36000ED3DE /* Navigation.cpp in Sources */,
    2322023219                                93CCF0600AF6CA7600018E89 /* NavigationAction.cpp in Sources */,
    2322123220                                979F43D31075E44A0000F83B /* NavigationScheduler.cpp in Sources */,
     
    2326823267                                8A7CC97012076F8A001D4588 /* PendingScript.cpp in Sources */,
    2326923268                                8A844D0411D3C18E0014065C /* Performance.cpp in Sources */,
     23269                                8AF4E55511DC5A36000ED3DE /* PerformanceNavigation.cpp in Sources */,
     23270                                8AF4E55B11DC5A63000ED3DE /* PerformanceTiming.cpp in Sources */,
    2327023271                                49D5DC2D0F423A73008F20FD /* PerspectiveTransformOperation.cpp in Sources */,
    2327123272                                D0FF2A5D11F8C45A007E74E0 /* PingLoader.cpp in Sources */,
     
    2379923800                                93309EA4099EB78C0056E581 /* Timer.cpp in Sources */,
    2380023801                                E44613AF0CD6331000FADA75 /* TimeRanges.cpp in Sources */,
    23801                                 8AF4E55B11DC5A63000ED3DE /* Timing.cpp in Sources */,
    2380223802                                49E911C30EF86D47009D0CAF /* TransformationMatrix.cpp in Sources */,
    2380323803                                B27535580B053814002CE64F /* TransformationMatrixCG.cpp in Sources */,
  • trunk/WebCore/page/Performance.cpp

    r63537 r71951  
    3333
    3434#include "MemoryInfo.h"
    35 #include "Navigation.h"
    36 #include "Timing.h"
     35#include "PerformanceNavigation.h"
     36#include "PerformanceTiming.h"
    3737
    3838#if ENABLE(WEB_TIMING)
     
    7373}
    7474
    75 Navigation* Performance::navigation() const
     75PerformanceNavigation* Performance::navigation() const
    7676{
    7777    if (!m_navigation)
    78         m_navigation = Navigation::create(m_frame);
     78        m_navigation = PerformanceNavigation::create(m_frame);
    7979
    8080    return m_navigation.get();
    8181}
    8282
    83 Timing* Performance::timing() const
     83PerformanceTiming* Performance::timing() const
    8484{
    8585    if (!m_timing)
    86         m_timing = Timing::create(m_frame);
     86        m_timing = PerformanceTiming::create(m_frame);
    8787
    8888    return m_timing.get();
  • trunk/WebCore/page/Performance.h

    r63537 r71951  
    3535
    3636#include "MemoryInfo.h"
    37 #include "Navigation.h"
    38 #include "Timing.h"
     37#include "PerformanceNavigation.h"
     38#include "PerformanceTiming.h"
    3939#include <wtf/PassRefPtr.h>
    4040#include <wtf/RefCounted.h>
     
    5151
    5252    MemoryInfo* memory() const;
    53     Navigation* navigation() const;
    54     Timing* timing() const;
     53    PerformanceNavigation* navigation() const;
     54    PerformanceTiming* timing() const;
    5555
    5656private:
     
    5858
    5959    mutable RefPtr<MemoryInfo> m_memory;
    60     mutable RefPtr<Navigation> m_navigation;
    61     mutable RefPtr<Timing> m_timing;
     60    mutable RefPtr<PerformanceNavigation> m_navigation;
     61    mutable RefPtr<PerformanceTiming> m_timing;
    6262    Frame* m_frame;
    6363};
  • trunk/WebCore/page/Performance.idl

    r63537 r71951  
    3333    // See: http://dev.w3.org/2006/webapi/WebTiming/
    3434    interface [Conditional=WEB_TIMING, OmitConstructor] Performance {
    35         readonly attribute Navigation navigation;
    36         readonly attribute Timing timing;
     35        readonly attribute PerformanceNavigation navigation;
     36        readonly attribute PerformanceTiming timing;
    3737        readonly attribute MemoryInfo memory;
    3838    };
  • trunk/WebCore/page/PerformanceNavigation.cpp

    r71950 r71951  
    3030
    3131#include "config.h"
    32 #include "Navigation.h"
     32#include "PerformanceNavigation.h"
    3333
    3434#if ENABLE(WEB_TIMING)
     
    4040namespace WebCore {
    4141
    42 Navigation::Navigation(Frame* frame)
     42PerformanceNavigation::PerformanceNavigation(Frame* frame)
    4343    : m_frame(frame)
    4444{
    4545}
    4646
    47 Frame* Navigation::frame() const
     47Frame* PerformanceNavigation::frame() const
    4848{
    4949    return m_frame;
    5050}
    5151
    52 void Navigation::disconnectFrame()
     52void PerformanceNavigation::disconnectFrame()
    5353{
    5454    m_frame = 0;
    5555}
    5656
    57 unsigned short Navigation::type() const
     57unsigned short PerformanceNavigation::type() const
    5858{
    5959    if (!m_frame)
     
    7575}
    7676
    77 unsigned short Navigation::redirectCount() const
     77unsigned short PerformanceNavigation::redirectCount() const
    7878{
    7979    if (!m_frame)
  • trunk/WebCore/page/PerformanceNavigation.h

    r71950 r71951  
    2929 */
    3030
    31 #ifndef Navigation_h
    32 #define Navigation_h
     31#ifndef PerformanceNavigation_h
     32#define PerformanceNavigation_h
    3333
    3434#if ENABLE(WEB_TIMING)
     
    4141class Frame;
    4242
    43 class Navigation : public RefCounted<Navigation> {
     43class PerformanceNavigation : public RefCounted<PerformanceNavigation> {
    4444public:
    45     static PassRefPtr<Navigation> create(Frame* frame) { return adoptRef(new Navigation(frame)); }
     45    static PassRefPtr<PerformanceNavigation> create(Frame* frame) { return adoptRef(new PerformanceNavigation(frame)); }
    4646
    4747    Frame* frame() const;
    4848    void disconnectFrame();
    4949
    50     enum NavigationType {
     50    enum PerformanceNavigationType {
    5151        NAVIGATE,
    5252        RELOAD,
     
    5858
    5959private:
    60     Navigation(Frame*);
     60    PerformanceNavigation(Frame*);
    6161
    6262    Frame* m_frame;
     
    6666
    6767#endif // !ENABLE(WEB_TIMING)
    68 #endif // !defined(Navigation_h)
     68#endif // !defined(PerformanceNavigation_h)
  • trunk/WebCore/page/PerformanceNavigation.idl

    r71950 r71951  
    3232
    3333    // See: http://dev.w3.org/2006/webapi/WebTiming/
    34     interface [Conditional=WEB_TIMING, OmitConstructor] Navigation {
     34    interface [Conditional=WEB_TIMING, OmitConstructor] PerformanceNavigation {
    3535        const unsigned short NAVIGATE = 0;
    3636        const unsigned short RELOAD = 1;
  • trunk/WebCore/page/PerformanceTiming.cpp

    r71950 r71951  
    3030
    3131#include "config.h"
    32 #include "Timing.h"
     32#include "PerformanceTiming.h"
    3333
    3434#if ENABLE(WEB_TIMING)
     
    7070}
    7171
    72 Timing::Timing(Frame* frame)
     72PerformanceTiming::PerformanceTiming(Frame* frame)
    7373    : m_frame(frame)
    7474{
    7575}
    7676
    77 Frame* Timing::frame() const
     77Frame* PerformanceTiming::frame() const
    7878{
    7979    return m_frame;
    8080}
    8181
    82 void Timing::disconnectFrame()
     82void PerformanceTiming::disconnectFrame()
    8383{
    8484    m_frame = 0;
    8585}
    8686
    87 unsigned long long Timing::navigationStart() const
     87unsigned long long PerformanceTiming::navigationStart() const
    8888{
    8989    DocumentLoadTiming* timing = documentLoadTiming();
     
    9494}
    9595
    96 unsigned long long Timing::unloadEventEnd() const
     96unsigned long long PerformanceTiming::unloadEventEnd() const
    9797{
    9898    DocumentLoadTiming* timing = documentLoadTiming();
     
    103103}
    104104
    105 unsigned long long Timing::redirectStart() const
     105unsigned long long PerformanceTiming::redirectStart() const
    106106{
    107107    DocumentLoadTiming* timing = documentLoadTiming();
     
    112112}
    113113
    114 unsigned long long Timing::redirectEnd() const
     114unsigned long long PerformanceTiming::redirectEnd() const
    115115{
    116116    DocumentLoadTiming* timing = documentLoadTiming();
     
    121121}
    122122
    123 unsigned long long Timing::fetchStart() const
     123unsigned long long PerformanceTiming::fetchStart() const
    124124{
    125125    DocumentLoadTiming* timing = documentLoadTiming();
     
    130130}
    131131
    132 unsigned long long Timing::domainLookupStart() const
     132unsigned long long PerformanceTiming::domainLookupStart() const
    133133{
    134134    ResourceLoadTiming* timing = resourceLoadTiming();
     
    145145}
    146146
    147 unsigned long long Timing::domainLookupEnd() const
     147unsigned long long PerformanceTiming::domainLookupEnd() const
    148148{
    149149    ResourceLoadTiming* timing = resourceLoadTiming();
     
    160160}
    161161
    162 unsigned long long Timing::connectStart() const
     162unsigned long long PerformanceTiming::connectStart() const
    163163{
    164164    DocumentLoader* loader = documentLoader();
     
    184184}
    185185
    186 unsigned long long Timing::connectEnd() const
     186unsigned long long PerformanceTiming::connectEnd() const
    187187{
    188188    DocumentLoader* loader = documentLoader();
     
    208208}
    209209
    210 unsigned long long Timing::requestStart() const
     210unsigned long long PerformanceTiming::requestStart() const
    211211{
    212212    ResourceLoadTiming* timing = resourceLoadTiming();
     
    218218}
    219219
    220 unsigned long long Timing::responseStart() const
     220unsigned long long PerformanceTiming::responseStart() const
    221221{
    222222    ResourceLoadTiming* timing = resourceLoadTiming();
     
    234234}
    235235
    236 unsigned long long Timing::responseEnd() const
     236unsigned long long PerformanceTiming::responseEnd() const
    237237{
    238238    DocumentLoadTiming* timing = documentLoadTiming();
     
    243243}
    244244
    245 unsigned long long Timing::domLoading() const
     245unsigned long long PerformanceTiming::domLoading() const
    246246{
    247247    const DocumentTiming* timing = documentTiming();
     
    252252}
    253253
    254 unsigned long long Timing::domInteractive() const
     254unsigned long long PerformanceTiming::domInteractive() const
    255255{
    256256    const DocumentTiming* timing = documentTiming();
     
    261261}
    262262
    263 unsigned long long Timing::domContentLoadedStart() const
     263unsigned long long PerformanceTiming::domContentLoadedStart() const
    264264{
    265265    const DocumentTiming* timing = documentTiming();
     
    270270}
    271271
    272 unsigned long long Timing::domContentLoadedEnd() const
     272unsigned long long PerformanceTiming::domContentLoadedEnd() const
    273273{
    274274    const DocumentTiming* timing = documentTiming();
     
    279279}
    280280
    281 unsigned long long Timing::domComplete() const
     281unsigned long long PerformanceTiming::domComplete() const
    282282{
    283283    const DocumentTiming* timing = documentTiming();
     
    288288}
    289289
    290 unsigned long long Timing::loadEventStart() const
     290unsigned long long PerformanceTiming::loadEventStart() const
    291291{
    292292    DocumentLoadTiming* timing = documentLoadTiming();
     
    297297}
    298298
    299 unsigned long long Timing::loadEventEnd() const
     299unsigned long long PerformanceTiming::loadEventEnd() const
    300300{
    301301    DocumentLoadTiming* timing = documentLoadTiming();
     
    306306}
    307307
    308 DocumentLoader* Timing::documentLoader() const
     308DocumentLoader* PerformanceTiming::documentLoader() const
    309309{
    310310    if (!m_frame)
     
    314314}
    315315
    316 const DocumentTiming* Timing::documentTiming() const
     316const DocumentTiming* PerformanceTiming::documentTiming() const
    317317{
    318318    if (!m_frame)
     
    326326}
    327327
    328 DocumentLoadTiming* Timing::documentLoadTiming() const
     328DocumentLoadTiming* PerformanceTiming::documentLoadTiming() const
    329329{
    330330    DocumentLoader* loader = documentLoader();
     
    335335}
    336336
    337 ResourceLoadTiming* Timing::resourceLoadTiming() const
     337ResourceLoadTiming* PerformanceTiming::resourceLoadTiming() const
    338338{
    339339    DocumentLoader* loader = documentLoader();
     
    344344}
    345345
    346 unsigned long long Timing::resourceLoadTimeRelativeToAbsolute(int relativeSeconds) const
     346unsigned long long PerformanceTiming::resourceLoadTimeRelativeToAbsolute(int relativeSeconds) const
    347347{
    348348    ASSERT(relativeSeconds >= 0);
  • trunk/WebCore/page/PerformanceTiming.h

    r71950 r71951  
    2929 */
    3030
    31 #ifndef Timing_h
    32 #define Timing_h
     31#ifndef PerformanceTiming_h
     32#define PerformanceTiming_h
    3333
    3434#if ENABLE(WEB_TIMING)
     
    4545class ResourceLoadTiming;
    4646
    47 class Timing : public RefCounted<Timing> {
     47class PerformanceTiming : public RefCounted<PerformanceTiming> {
    4848public:
    49     static PassRefPtr<Timing> create(Frame* frame) { return adoptRef(new Timing(frame)); }
     49    static PassRefPtr<PerformanceTiming> create(Frame* frame) { return adoptRef(new PerformanceTiming(frame)); }
    5050
    5151    Frame* frame() const;
     
    7373
    7474private:
    75     Timing(Frame*);
     75    PerformanceTiming(Frame*);
    7676
    7777    const DocumentTiming* documentTiming() const;
     
    8787
    8888#endif // !ENABLE(WEB_TIMING)
    89 #endif // !defined(Timing_h)
     89#endif // !defined(PerformanceTiming_h)
  • trunk/WebCore/page/PerformanceTiming.idl

    r71950 r71951  
    3232
    3333    // See: http://dev.w3.org/2006/webapi/WebTiming/
    34     interface [Conditional=WEB_TIMING, OmitConstructor] Timing {
     34    interface [Conditional=WEB_TIMING, OmitConstructor] PerformanceTiming {
    3535        readonly attribute unsigned long long navigationStart;
    3636        readonly attribute unsigned long long unloadEventEnd;
  • trunk/WebKit/chromium/ChangeLog

    r71942 r71951  
     12010-11-12  James Simonsen  <simonjam@chromium.org>
     2
     3        Reviewed by Darin Fisher.
     4
     5        [Web Timing] Rename interfaces:
     6        - Navigation -> PerformanceNavigation
     7        - Timing -> PerformanceTiming
     8        https://bugs.webkit.org/show_bug.cgi?id=48919
     9
     10        * src/WebPerformance.cpp:
     11        (WebKit::WebPerformance::navigationType):
     12
    1132010-11-12  Zhenyao Mo  <zmo@google.com>
    214
  • trunk/WebKit/chromium/src/WebPerformance.cpp

    r71883 r71951  
    5656{
    5757    switch (m_private->navigation()->type()) {
    58     case Navigation::NAVIGATE:
     58    case PerformanceNavigation::NAVIGATE:
    5959        return WebNavigationTypeOther;
    60     case Navigation::RELOAD:
     60    case PerformanceNavigation::RELOAD:
    6161        return WebNavigationTypeReload;
    62     case Navigation::BACK_FORWARD:
     62    case PerformanceNavigation::BACK_FORWARD:
    6363        return WebNavigationTypeBackForward;
    6464    }
Note: See TracChangeset for help on using the changeset viewer.