Changeset 71951 in webkit
- Timestamp:
- Nov 12, 2010 2:51:21 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 18 edited
- 6 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r71948 r71951 1 2010-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 1 12 2010-11-12 Mihai Parparita <mihaip@chromium.org> 2 13 -
trunk/LayoutTests/fast/dom/Window/window-properties-performance-expected.txt
r71633 r71951 5 5 window.webkitPerformance.memory.totalJSHeapSize [number] 6 6 window.webkitPerformance.memory.usedJSHeapSize [number] 7 window.webkitPerformance.navigation [object Navigation]7 window.webkitPerformance.navigation [object PerformanceNavigation] 8 8 window.webkitPerformance.navigation.BACK_FORWARD [number] 9 9 window.webkitPerformance.navigation.NAVIGATE [number] … … 11 11 window.webkitPerformance.navigation.redirectCount [number] 12 12 window.webkitPerformance.navigation.type [number] 13 window.webkitPerformance.timing [object Timing]13 window.webkitPerformance.timing [object PerformanceTiming] 14 14 window.webkitPerformance.timing.connectEnd [number] 15 15 window.webkitPerformance.timing.connectStart [number] -
trunk/WebCore/Android.mk
r71934 r71951 419 419 page/Location.cpp \ 420 420 page/MouseEventWithHitTestResults.cpp \ 421 page/Navigation.cpp \422 421 page/Navigator.cpp \ 423 422 page/NavigatorBase.cpp \ … … 427 426 page/PageGroupLoadDeferrer.cpp \ 428 427 page/Performance.cpp \ 428 page/PerformanceNavigation.cpp \ 429 page/PerformanceTiming.cpp \ 429 430 page/PluginHalter.cpp \ 430 431 page/PrintContext.cpp \ … … 436 437 page/SpeechInputResult.cpp \ 437 438 page/SuspendableTimer.cpp \ 438 page/Timing.cpp \439 439 page/UserContentURLPattern.cpp \ 440 440 page/WindowFeatures.cpp \ -
trunk/WebCore/CMakeLists.txt
r71934 r71951 330 330 page/Location.idl 331 331 page/MemoryInfo.idl 332 page/Navigation.idl333 332 page/Navigator.idl 334 333 page/Performance.idl 334 page/PerformanceNavigation.idl 335 page/PerformanceTiming.idl 335 336 page/PositionError.idl 336 337 page/Screen.idl 337 page/Timing.idl338 338 page/WebKitPoint.idl 339 339 page/WorkerNavigator.idl … … 1226 1226 page/MemoryInfo.cpp 1227 1227 page/MouseEventWithHitTestResults.cpp 1228 page/Navigation.cpp1229 1228 page/Navigator.cpp 1230 1229 page/NavigatorBase.cpp … … 1234 1233 page/PageGroupLoadDeferrer.cpp 1235 1234 page/Performance.cpp 1235 page/PerformanceNavigation.cpp 1236 page/PerformanceTiming.cpp 1236 1237 page/PluginHalter.cpp 1237 1238 page/PrintContext.cpp … … 1241 1242 page/SpatialNavigation.cpp 1242 1243 page/SuspendableTimer.cpp 1243 page/Timing.cpp1244 1244 page/UserContentURLPattern.cpp 1245 1245 page/WindowFeatures.cpp -
trunk/WebCore/ChangeLog
r71950 r71951 1 2010-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 1 64 2010-11-12 Eric Carlson <eric.carlson@apple.com> 2 65 -
trunk/WebCore/DerivedSources.cpp
r71711 r71951 236 236 #include "JSMutationEvent.cpp" 237 237 #include "JSNamedNodeMap.cpp" 238 #include "JSNavigation.cpp"239 238 #include "JSNavigator.cpp" 240 239 #include "JSNode.cpp" … … 248 247 #include "JSPageTransitionEvent.cpp" 249 248 #include "JSPerformance.cpp" 249 #include "JSPerformanceNavigation.cpp" 250 #include "JSPerformanceTiming.cpp" 250 251 #include "JSPopStateEvent.cpp" 251 252 #include "JSPositionError.cpp" … … 416 417 #include "JSTextMetrics.cpp" 417 418 #include "JSTimeRanges.cpp" 418 #include "JSTiming.cpp"419 419 #include "JSTouch.cpp" 420 420 #include "JSTouchEvent.cpp" -
trunk/WebCore/DerivedSources.make
r71754 r71951 280 280 MutationEvent \ 281 281 NamedNodeMap \ 282 Navigation \283 282 Navigator \ 284 283 Node \ … … 292 291 PageTransitionEvent \ 293 292 Performance \ 293 PerformanceNavigation \ 294 PerformanceTiming \ 294 295 PopStateEvent \ 295 296 PositionError \ … … 471 472 TextMetrics \ 472 473 TimeRanges \ 473 Timing \474 474 Touch \ 475 475 TouchEvent \ -
trunk/WebCore/GNUmakefile.am
r71934 r71951 448 448 DerivedSources/WebCore/JSNamedNodeMap.cpp \ 449 449 DerivedSources/WebCore/JSNamedNodeMap.h \ 450 DerivedSources/WebCore/JSNavigation.cpp \451 DerivedSources/WebCore/JSNavigation.h \452 450 DerivedSources/WebCore/JSNavigator.cpp \ 453 451 DerivedSources/WebCore/JSNavigator.h \ … … 472 470 DerivedSources/WebCore/JSPerformance.cpp \ 473 471 DerivedSources/WebCore/JSPerformance.h \ 472 DerivedSources/WebCore/JSPerformanceNavigation.cpp \ 473 DerivedSources/WebCore/JSPerformanceNavigation.h \ 474 DerivedSources/WebCore/JSPerformanceTiming.cpp \ 475 DerivedSources/WebCore/JSPerformanceTiming.h \ 474 476 DerivedSources/WebCore/JSPopStateEvent.cpp \ 475 477 DerivedSources/WebCore/JSPopStateEvent.h \ … … 513 515 DerivedSources/WebCore/JSTimeRanges.cpp \ 514 516 DerivedSources/WebCore/JSTimeRanges.h \ 515 DerivedSources/WebCore/JSTiming.cpp \516 DerivedSources/WebCore/JSTiming.h \517 517 DerivedSources/WebCore/JSTouch.cpp \ 518 518 DerivedSources/WebCore/JSTouchEvent.cpp \ … … 2129 2129 WebCore/page/MouseEventWithHitTestResults.cpp \ 2130 2130 WebCore/page/MouseEventWithHitTestResults.h \ 2131 WebCore/page/Navigation.cpp \2132 WebCore/page/Navigation.h \2133 2131 WebCore/page/NavigatorBase.cpp \ 2134 2132 WebCore/page/NavigatorBase.h \ … … 2145 2143 WebCore/page/Performance.cpp \ 2146 2144 WebCore/page/Performance.h \ 2145 WebCore/page/PerformanceNavigation.cpp \ 2146 WebCore/page/PerformanceNavigation.h \ 2147 WebCore/page/PerformanceTiming.cpp \ 2148 WebCore/page/PerformanceTiming.h \ 2147 2149 WebCore/page/PluginHalterClient.h \ 2148 2150 WebCore/page/PluginHalter.cpp \ … … 2171 2173 WebCore/page/SuspendableTimer.cpp \ 2172 2174 WebCore/page/SuspendableTimer.h \ 2173 WebCore/page/Timing.cpp \2174 WebCore/page/Timing.h \2175 2175 WebCore/page/UserContentTypes.h \ 2176 2176 WebCore/page/UserContentURLPattern.cpp \ -
trunk/WebCore/WebCore.gypi
r71934 r71951 247 247 'page/Location.idl', 248 248 'page/MemoryInfo.idl', 249 'page/Navigation.idl',250 249 'page/Navigator.idl', 251 250 'page/Performance.idl', 251 'page/PerformanceNavigation.idl', 252 'page/PerformanceTiming.idl', 252 253 'page/PositionError.idl', 253 254 'page/Screen.idl', 254 'page/Timing.idl',255 255 'page/WebKitPoint.idl', 256 256 'page/WorkerNavigator.idl', … … 2262 2262 'page/MouseEventWithHitTestResults.cpp', 2263 2263 'page/MouseEventWithHitTestResults.h', 2264 'page/Navigation.cpp',2265 'page/Navigation.h',2266 2264 'page/Navigator.cpp', 2267 2265 'page/Navigator.h', … … 2278 2276 'page/Performance.cpp', 2279 2277 'page/Performance.h', 2278 'page/PerformanceNavigation.cpp', 2279 'page/PerformanceNavigation.h', 2280 'page/PerformanceTiming.cpp', 2281 'page/PerformanceTiming.h', 2280 2282 'page/PluginHalter.cpp', 2281 2283 'page/PluginHalter.h', … … 2304 2306 'page/SuspendableTimer.cpp', 2305 2307 'page/SuspendableTimer.h', 2306 'page/Timing.cpp',2307 'page/Timing.h',2308 2308 'page/UserContentURLPattern.cpp', 2309 2309 'page/UserContentURLPattern.h', -
trunk/WebCore/WebCore.pri
r71373 r71951 308 308 page/Location.idl \ 309 309 page/MemoryInfo.idl \ 310 page/Navigation.idl \311 310 page/Navigator.idl \ 312 311 page/Performance.idl \ 312 page/PerformanceNavigation.idl \ 313 page/PerformanceTiming.idl \ 313 314 page/PositionError.idl \ 314 315 page/Screen.idl \ 315 page/Timing.idl \316 316 page/WebKitPoint.idl \ 317 317 page/WorkerNavigator.idl \ -
trunk/WebCore/WebCore.pro
r71934 r71951 1091 1091 page/DOMTimer.cpp \ 1092 1092 page/DOMWindow.cpp \ 1093 page/Navigation.cpp \1094 1093 page/Navigator.cpp \ 1095 1094 page/NavigatorBase.cpp \ … … 1114 1113 page/PageGroupLoadDeferrer.cpp \ 1115 1114 page/Performance.cpp \ 1115 page/PerformanceNavigation.cpp \ 1116 page/PerformanceTiming.cpp \ 1116 1117 page/PluginHalter.cpp \ 1117 1118 page/PrintContext.cpp \ … … 1121 1122 page/SpatialNavigation.cpp \ 1122 1123 page/SuspendableTimer.cpp \ 1123 page/Timing.cpp \1124 1124 page/UserContentURLPattern.cpp \ 1125 1125 page/WindowFeatures.cpp \ -
trunk/WebCore/WebCore.vcproj/WebCore.vcproj
r71934 r71951 10693 10693 </File> 10694 10694 <File 10695 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSNavigation.cpp"10696 >10697 <FileConfiguration10698 Name="Debug|Win32"10699 ExcludedFromBuild="true"10700 >10701 <Tool10702 Name="VCCLCompilerTool"10703 />10704 </FileConfiguration>10705 <FileConfiguration10706 Name="Release|Win32"10707 ExcludedFromBuild="true"10708 >10709 <Tool10710 Name="VCCLCompilerTool"10711 />10712 </FileConfiguration>10713 <FileConfiguration10714 Name="Debug_Internal|Win32"10715 ExcludedFromBuild="true"10716 >10717 <Tool10718 Name="VCCLCompilerTool"10719 />10720 </FileConfiguration>10721 <FileConfiguration10722 Name="Debug_Cairo|Win32"10723 ExcludedFromBuild="true"10724 >10725 <Tool10726 Name="VCCLCompilerTool"10727 />10728 </FileConfiguration>10729 <FileConfiguration10730 Name="Release_Cairo|Win32"10731 ExcludedFromBuild="true"10732 >10733 <Tool10734 Name="VCCLCompilerTool"10735 />10736 </FileConfiguration>10737 <FileConfiguration10738 Name="Debug_All|Win32"10739 ExcludedFromBuild="true"10740 >10741 <Tool10742 Name="VCCLCompilerTool"10743 />10744 </FileConfiguration>10745 </File>10746 <File10747 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSNavigation.h"10748 >10749 </File>10750 <File10751 10695 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSNavigator.cpp" 10752 10696 > … … 11365 11309 </File> 11366 11310 <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 11367 11423 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSPopStateEvent.cpp" 11368 11424 > … … 20274 20330 <File 20275 20331 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSTimeRanges.h" 20276 >20277 </File>20278 <File20279 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSTiming.cpp"20280 >20281 <FileConfiguration20282 Name="Debug|Win32"20283 ExcludedFromBuild="true"20284 >20285 <Tool20286 Name="VCCLCompilerTool"20287 />20288 </FileConfiguration>20289 <FileConfiguration20290 Name="Release|Win32"20291 ExcludedFromBuild="true"20292 >20293 <Tool20294 Name="VCCLCompilerTool"20295 />20296 </FileConfiguration>20297 <FileConfiguration20298 Name="Debug_Internal|Win32"20299 ExcludedFromBuild="true"20300 >20301 <Tool20302 Name="VCCLCompilerTool"20303 />20304 </FileConfiguration>20305 <FileConfiguration20306 Name="Debug_Cairo|Win32"20307 ExcludedFromBuild="true"20308 >20309 <Tool20310 Name="VCCLCompilerTool"20311 />20312 </FileConfiguration>20313 <FileConfiguration20314 Name="Release_Cairo|Win32"20315 ExcludedFromBuild="true"20316 >20317 <Tool20318 Name="VCCLCompilerTool"20319 />20320 </FileConfiguration>20321 <FileConfiguration20322 Name="Debug_All|Win32"20323 ExcludedFromBuild="true"20324 >20325 <Tool20326 Name="VCCLCompilerTool"20327 />20328 </FileConfiguration>20329 </File>20330 <File20331 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSTiming.h"20332 20332 > 20333 20333 </File> … … 23481 23481 </File> 23482 23482 <File 23483 RelativePath="..\page\Navigation.cpp"23484 >23485 </File>23486 <File23487 RelativePath="..\page\Navigation.h"23488 >23489 </File>23490 <File23491 23483 RelativePath="..\page\Navigator.cpp" 23492 23484 > … … 23541 23533 </File> 23542 23534 <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 23543 23551 RelativePath="..\page\PluginHalter.cpp" 23544 23552 > … … 23630 23638 <File 23631 23639 RelativePath="..\page\SuspendableTimer.h" 23632 >23633 </File>23634 <File23635 RelativePath="..\page\Timing.cpp"23636 >23637 </File>23638 <File23639 RelativePath="..\page\Timing.h"23640 23640 > 23641 23641 </File> -
trunk/WebCore/WebCore.xcodeproj/project.pbxproj
r71949 r71951 2642 2642 8A844D0411D3C18E0014065C /* Performance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A844D0111D3C18E0014065C /* Performance.cpp */; }; 2643 2643 8A844D0511D3C18E0014065C /* Performance.h in Headers */ = {isa = PBXBuildFile; fileRef = 8A844D0211D3C18E0014065C /* Performance.h */; }; 2644 8A9A587011E84C36008ACFD1 /* JS Navigation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A9A586E11E84C35008ACFD1 /* JSNavigation.cpp */; };2645 8A9A587111E84C36008ACFD1 /* JS Navigation.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 */; }; 2646 2646 8A9A587411E84C81008ACFD1 /* JSPerformance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A9A587211E84C81008ACFD1 /* JSPerformance.cpp */; }; 2647 2647 8A9A587511E84C81008ACFD1 /* JSPerformance.h in Headers */ = {isa = PBXBuildFile; fileRef = 8A9A587311E84C81008ACFD1 /* JSPerformance.h */; }; 2648 8A9A588711E84F37008ACFD1 /* JS Timing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A9A587611E84C98008ACFD1 /* JSTiming.cpp */; };2649 8A9A588811E84F37008ACFD1 /* JS Timing.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 */; }; 2650 2650 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 */; }; 2655 2655 8C6EA61911EF7E0400FD8EE3 /* RuntimeEnabledFeatures.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8C6EA61711EF7E0400FD8EE3 /* RuntimeEnabledFeatures.cpp */; }; 2656 2656 8C6EA61A11EF7E0400FD8EE3 /* RuntimeEnabledFeatures.h in Headers */ = {isa = PBXBuildFile; fileRef = 8C6EA61811EF7E0400FD8EE3 /* RuntimeEnabledFeatures.h */; }; … … 8769 8769 8A844D0211D3C18E0014065C /* Performance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Performance.h; sourceTree = "<group>"; }; 8770 8770 8A844D0311D3C18E0014065C /* Performance.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Performance.idl; sourceTree = "<group>"; }; 8771 8A9A586E11E84C35008ACFD1 /* JS Navigation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSNavigation.cpp; sourceTree = "<group>"; };8772 8A9A586F11E84C36008ACFD1 /* JS Navigation.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>"; }; 8773 8773 8A9A587211E84C81008ACFD1 /* JSPerformance.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSPerformance.cpp; sourceTree = "<group>"; }; 8774 8774 8A9A587311E84C81008ACFD1 /* JSPerformance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSPerformance.h; sourceTree = "<group>"; }; 8775 8A9A587611E84C98008ACFD1 /* JS Timing.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSTiming.cpp; sourceTree = "<group>"; };8776 8A9A587711E84C98008ACFD1 /* JS Timing.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>"; }; 8777 8777 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>"; }; 8784 8784 8C6EA61711EF7E0400FD8EE3 /* RuntimeEnabledFeatures.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RuntimeEnabledFeatures.cpp; path = generic/RuntimeEnabledFeatures.cpp; sourceTree = "<group>"; }; 8785 8785 8C6EA61811EF7E0400FD8EE3 /* RuntimeEnabledFeatures.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RuntimeEnabledFeatures.h; path = generic/RuntimeEnabledFeatures.h; sourceTree = "<group>"; }; … … 13308 13308 93EB355E09E37FD600F43799 /* MouseEventWithHitTestResults.cpp */, 13309 13309 935C476209AC4CE600A6AAB4 /* MouseEventWithHitTestResults.h */, 13310 8AF4E55211DC5A36000ED3DE /* Navigation.cpp */,13311 8AF4E55311DC5A36000ED3DE /* Navigation.h */,13312 8AF4E55411DC5A36000ED3DE /* Navigation.idl */,13313 13310 A9C6E5A30D746458006442E9 /* Navigator.cpp */, 13314 13311 A9C6E5A40D746458006442E9 /* Navigator.h */, … … 13327 13324 8A844D0211D3C18E0014065C /* Performance.h */, 13328 13325 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 */, 13329 13332 7693BACF106C2DCA007B0823 /* PluginHalter.cpp */, 13330 13333 7693BAD0106C2DCA007B0823 /* PluginHalter.h */, … … 13355 13358 62C1217A11AB9E76003C462C /* SuspendableTimer.cpp */, 13356 13359 62C1217B11AB9E77003C462C /* SuspendableTimer.h */, 13357 8AF4E55811DC5A63000ED3DE /* Timing.cpp */,13358 8AF4E55911DC5A63000ED3DE /* Timing.h */,13359 8AF4E55A11DC5A63000ED3DE /* Timing.idl */,13360 13360 003F1FE911E6AB43008258D9 /* UserContentTypes.h */, 13361 13361 BCACF3BA1072921A00C0C8A3 /* UserContentURLPattern.cpp */, … … 17269 17269 9FFE3EA311B5A4390037874E /* JSMemoryInfo.cpp */, 17270 17270 9FFE3EA411B5A4390037874E /* JSMemoryInfo.h */, 17271 8A9A586E11E84C35008ACFD1 /* JSNavigation.cpp */,17272 8A9A586F11E84C36008ACFD1 /* JSNavigation.h */,17273 17271 A9D247F50D757E3300FDF959 /* JSNavigator.cpp */, 17274 17272 A9D247F60D757E3300FDF959 /* JSNavigator.h */, 17275 17273 8A9A587211E84C81008ACFD1 /* JSPerformance.cpp */, 17276 17274 8A9A587311E84C81008ACFD1 /* JSPerformance.h */, 17275 8A9A586E11E84C35008ACFD1 /* JSPerformanceNavigation.cpp */, 17276 8A9A586F11E84C36008ACFD1 /* JSPerformanceNavigation.h */, 17277 8A9A587611E84C98008ACFD1 /* JSPerformanceTiming.cpp */, 17278 8A9A587711E84C98008ACFD1 /* JSPerformanceTiming.h */, 17277 17279 BCEC01C00C274DDD009F4EC9 /* JSScreen.cpp */, 17278 17280 BCEC01C10C274DDD009F4EC9 /* JSScreen.h */, 17279 8A9A587611E84C98008ACFD1 /* JSTiming.cpp */,17280 8A9A587711E84C98008ACFD1 /* JSTiming.h */,17281 17281 494BD79B0F55C94C00747828 /* JSWebKitPoint.cpp */, 17282 17282 494BD79C0F55C94C00747828 /* JSWebKitPoint.h */, … … 20201 20201 65DF31FC09D1CC60000BE325 /* JSMutationEvent.h in Headers */, 20202 20202 BCD9C2C10C17B69E005C90A2 /* JSNamedNodeMap.h in Headers */, 20203 8A9A587111E84C36008ACFD1 /* JSNavigation.h in Headers */,20204 20203 A9D247F80D757E3400FDF959 /* JSNavigator.h in Headers */, 20205 20204 BC9439C3116CF4940048C750 /* JSNodeCustom.h in Headers */, … … 20215 20214 E1284BB110449FFA00EAEB52 /* JSPageTransitionEvent.h in Headers */, 20216 20215 8A9A587511E84C81008ACFD1 /* JSPerformance.h in Headers */, 20216 8A9A587111E84C36008ACFD1 /* JSPerformanceNavigation.h in Headers */, 20217 8A9A588811E84F37008ACFD1 /* JSPerformanceTiming.h in Headers */, 20217 20218 93B70D6C09EB0C7C009D8468 /* JSPluginElementFunctions.h in Headers */, 20218 20219 5189F01E10B37BD900F3C739 /* JSPopStateEvent.h in Headers */, … … 20387 20388 BCEF45F60E687B5C001C1287 /* JSTextMetrics.h in Headers */, 20388 20389 E446141B0CD6826900FADA75 /* JSTimeRanges.h in Headers */, 20389 8A9A588811E84F37008ACFD1 /* JSTiming.h in Headers */,20390 20390 1A750D5D0A90DEE1000FF215 /* JSTreeWalker.h in Headers */, 20391 20391 A86629CF09DA2B47009633A5 /* JSUIEvent.h in Headers */, … … 20507 20507 A818721E0977D3C0005826D9 /* NameNodeList.h in Headers */, 20508 20508 E10B9B6C0B747599003ED890 /* NativeXPathNSResolver.h in Headers */, 20509 8AF4E55611DC5A36000ED3DE /* Navigation.h in Headers */,20510 20509 93CCF0270AF6C52900018E89 /* NavigationAction.h in Headers */, 20511 20510 979F43D41075E44A0000F83B /* NavigationScheduler.h in Headers */, … … 20576 20575 8A7CC96B12076D73001D4588 /* PendingScript.h in Headers */, 20577 20576 8A844D0511D3C18E0014065C /* Performance.h in Headers */, 20577 8AF4E55611DC5A36000ED3DE /* PerformanceNavigation.h in Headers */, 20578 8AF4E55C11DC5A63000ED3DE /* PerformanceTiming.h in Headers */, 20578 20579 49D5DC2E0F423A73008F20FD /* PerspectiveTransformOperation.h in Headers */, 20579 20580 D0FF2A5E11F8C45A007E74E0 /* PingLoader.h in Headers */, … … 21198 21199 9305B24D098F1B6B00C28855 /* Timer.h in Headers */, 21199 21200 E44613B00CD6331000FADA75 /* TimeRanges.h in Headers */, 21200 8AF4E55C11DC5A63000ED3DE /* Timing.h in Headers */,21201 21201 49E912AE0EFAC906009D0CAF /* TimingFunction.h in Headers */, 21202 21202 49E911C40EF86D47009D0CAF /* TransformationMatrix.h in Headers */, … … 22885 22885 BCD9C2C00C17B69E005C90A2 /* JSNamedNodeMap.cpp in Sources */, 22886 22886 BCD9C2630C17AA67005C90A2 /* JSNamedNodeMapCustom.cpp in Sources */, 22887 8A9A587011E84C36008ACFD1 /* JSNavigation.cpp in Sources */,22888 22887 A9D247F70D757E3400FDF959 /* JSNavigator.cpp in Sources */, 22889 22888 A9C6E6490D7465D8006442E9 /* JSNavigatorCustom.cpp in Sources */, … … 22904 22903 E1284BB210449FFA00EAEB52 /* JSPageTransitionEvent.cpp in Sources */, 22905 22904 8A9A587411E84C81008ACFD1 /* JSPerformance.cpp in Sources */, 22905 8A9A587011E84C36008ACFD1 /* JSPerformanceNavigation.cpp in Sources */, 22906 8A9A588711E84F37008ACFD1 /* JSPerformanceTiming.cpp in Sources */, 22906 22907 93B70D6B09EB0C7C009D8468 /* JSPluginElementFunctions.cpp in Sources */, 22907 22908 5189F01D10B37BD900F3C739 /* JSPopStateEvent.cpp in Sources */, … … 23088 23089 BCEF45F50E687B5C001C1287 /* JSTextMetrics.cpp in Sources */, 23089 23090 E446141A0CD6826900FADA75 /* JSTimeRanges.cpp in Sources */, 23090 8A9A588711E84F37008ACFD1 /* JSTiming.cpp in Sources */,23091 23091 1A750D5C0A90DEE1000FF215 /* JSTreeWalker.cpp in Sources */, 23092 23092 516BB7940CE91E6800512F79 /* JSTreeWalkerCustom.cpp in Sources */, … … 23217 23217 A81872240977D3C0005826D9 /* NameNodeList.cpp in Sources */, 23218 23218 E10B9B6D0B747599003ED890 /* NativeXPathNSResolver.cpp in Sources */, 23219 8AF4E55511DC5A36000ED3DE /* Navigation.cpp in Sources */,23220 23219 93CCF0600AF6CA7600018E89 /* NavigationAction.cpp in Sources */, 23221 23220 979F43D31075E44A0000F83B /* NavigationScheduler.cpp in Sources */, … … 23268 23267 8A7CC97012076F8A001D4588 /* PendingScript.cpp in Sources */, 23269 23268 8A844D0411D3C18E0014065C /* Performance.cpp in Sources */, 23269 8AF4E55511DC5A36000ED3DE /* PerformanceNavigation.cpp in Sources */, 23270 8AF4E55B11DC5A63000ED3DE /* PerformanceTiming.cpp in Sources */, 23270 23271 49D5DC2D0F423A73008F20FD /* PerspectiveTransformOperation.cpp in Sources */, 23271 23272 D0FF2A5D11F8C45A007E74E0 /* PingLoader.cpp in Sources */, … … 23799 23800 93309EA4099EB78C0056E581 /* Timer.cpp in Sources */, 23800 23801 E44613AF0CD6331000FADA75 /* TimeRanges.cpp in Sources */, 23801 8AF4E55B11DC5A63000ED3DE /* Timing.cpp in Sources */,23802 23802 49E911C30EF86D47009D0CAF /* TransformationMatrix.cpp in Sources */, 23803 23803 B27535580B053814002CE64F /* TransformationMatrixCG.cpp in Sources */, -
trunk/WebCore/page/Performance.cpp
r63537 r71951 33 33 34 34 #include "MemoryInfo.h" 35 #include " Navigation.h"36 #include " Timing.h"35 #include "PerformanceNavigation.h" 36 #include "PerformanceTiming.h" 37 37 38 38 #if ENABLE(WEB_TIMING) … … 73 73 } 74 74 75 Navigation* Performance::navigation() const75 PerformanceNavigation* Performance::navigation() const 76 76 { 77 77 if (!m_navigation) 78 m_navigation = Navigation::create(m_frame);78 m_navigation = PerformanceNavigation::create(m_frame); 79 79 80 80 return m_navigation.get(); 81 81 } 82 82 83 Timing* Performance::timing() const83 PerformanceTiming* Performance::timing() const 84 84 { 85 85 if (!m_timing) 86 m_timing = Timing::create(m_frame);86 m_timing = PerformanceTiming::create(m_frame); 87 87 88 88 return m_timing.get(); -
trunk/WebCore/page/Performance.h
r63537 r71951 35 35 36 36 #include "MemoryInfo.h" 37 #include " Navigation.h"38 #include " Timing.h"37 #include "PerformanceNavigation.h" 38 #include "PerformanceTiming.h" 39 39 #include <wtf/PassRefPtr.h> 40 40 #include <wtf/RefCounted.h> … … 51 51 52 52 MemoryInfo* memory() const; 53 Navigation* navigation() const;54 Timing* timing() const;53 PerformanceNavigation* navigation() const; 54 PerformanceTiming* timing() const; 55 55 56 56 private: … … 58 58 59 59 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; 62 62 Frame* m_frame; 63 63 }; -
trunk/WebCore/page/Performance.idl
r63537 r71951 33 33 // See: http://dev.w3.org/2006/webapi/WebTiming/ 34 34 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; 37 37 readonly attribute MemoryInfo memory; 38 38 }; -
trunk/WebCore/page/PerformanceNavigation.cpp
r71950 r71951 30 30 31 31 #include "config.h" 32 #include " Navigation.h"32 #include "PerformanceNavigation.h" 33 33 34 34 #if ENABLE(WEB_TIMING) … … 40 40 namespace WebCore { 41 41 42 Navigation::Navigation(Frame* frame)42 PerformanceNavigation::PerformanceNavigation(Frame* frame) 43 43 : m_frame(frame) 44 44 { 45 45 } 46 46 47 Frame* Navigation::frame() const47 Frame* PerformanceNavigation::frame() const 48 48 { 49 49 return m_frame; 50 50 } 51 51 52 void Navigation::disconnectFrame()52 void PerformanceNavigation::disconnectFrame() 53 53 { 54 54 m_frame = 0; 55 55 } 56 56 57 unsigned short Navigation::type() const57 unsigned short PerformanceNavigation::type() const 58 58 { 59 59 if (!m_frame) … … 75 75 } 76 76 77 unsigned short Navigation::redirectCount() const77 unsigned short PerformanceNavigation::redirectCount() const 78 78 { 79 79 if (!m_frame) -
trunk/WebCore/page/PerformanceNavigation.h
r71950 r71951 29 29 */ 30 30 31 #ifndef Navigation_h32 #define Navigation_h31 #ifndef PerformanceNavigation_h 32 #define PerformanceNavigation_h 33 33 34 34 #if ENABLE(WEB_TIMING) … … 41 41 class Frame; 42 42 43 class Navigation : public RefCounted<Navigation> {43 class PerformanceNavigation : public RefCounted<PerformanceNavigation> { 44 44 public: 45 static PassRefPtr< Navigation> create(Frame* frame) { return adoptRef(newNavigation(frame)); }45 static PassRefPtr<PerformanceNavigation> create(Frame* frame) { return adoptRef(new PerformanceNavigation(frame)); } 46 46 47 47 Frame* frame() const; 48 48 void disconnectFrame(); 49 49 50 enum NavigationType {50 enum PerformanceNavigationType { 51 51 NAVIGATE, 52 52 RELOAD, … … 58 58 59 59 private: 60 Navigation(Frame*);60 PerformanceNavigation(Frame*); 61 61 62 62 Frame* m_frame; … … 66 66 67 67 #endif // !ENABLE(WEB_TIMING) 68 #endif // !defined( Navigation_h)68 #endif // !defined(PerformanceNavigation_h) -
trunk/WebCore/page/PerformanceNavigation.idl
r71950 r71951 32 32 33 33 // See: http://dev.w3.org/2006/webapi/WebTiming/ 34 interface [Conditional=WEB_TIMING, OmitConstructor] Navigation {34 interface [Conditional=WEB_TIMING, OmitConstructor] PerformanceNavigation { 35 35 const unsigned short NAVIGATE = 0; 36 36 const unsigned short RELOAD = 1; -
trunk/WebCore/page/PerformanceTiming.cpp
r71950 r71951 30 30 31 31 #include "config.h" 32 #include " Timing.h"32 #include "PerformanceTiming.h" 33 33 34 34 #if ENABLE(WEB_TIMING) … … 70 70 } 71 71 72 Timing::Timing(Frame* frame)72 PerformanceTiming::PerformanceTiming(Frame* frame) 73 73 : m_frame(frame) 74 74 { 75 75 } 76 76 77 Frame* Timing::frame() const77 Frame* PerformanceTiming::frame() const 78 78 { 79 79 return m_frame; 80 80 } 81 81 82 void Timing::disconnectFrame()82 void PerformanceTiming::disconnectFrame() 83 83 { 84 84 m_frame = 0; 85 85 } 86 86 87 unsigned long long Timing::navigationStart() const87 unsigned long long PerformanceTiming::navigationStart() const 88 88 { 89 89 DocumentLoadTiming* timing = documentLoadTiming(); … … 94 94 } 95 95 96 unsigned long long Timing::unloadEventEnd() const96 unsigned long long PerformanceTiming::unloadEventEnd() const 97 97 { 98 98 DocumentLoadTiming* timing = documentLoadTiming(); … … 103 103 } 104 104 105 unsigned long long Timing::redirectStart() const105 unsigned long long PerformanceTiming::redirectStart() const 106 106 { 107 107 DocumentLoadTiming* timing = documentLoadTiming(); … … 112 112 } 113 113 114 unsigned long long Timing::redirectEnd() const114 unsigned long long PerformanceTiming::redirectEnd() const 115 115 { 116 116 DocumentLoadTiming* timing = documentLoadTiming(); … … 121 121 } 122 122 123 unsigned long long Timing::fetchStart() const123 unsigned long long PerformanceTiming::fetchStart() const 124 124 { 125 125 DocumentLoadTiming* timing = documentLoadTiming(); … … 130 130 } 131 131 132 unsigned long long Timing::domainLookupStart() const132 unsigned long long PerformanceTiming::domainLookupStart() const 133 133 { 134 134 ResourceLoadTiming* timing = resourceLoadTiming(); … … 145 145 } 146 146 147 unsigned long long Timing::domainLookupEnd() const147 unsigned long long PerformanceTiming::domainLookupEnd() const 148 148 { 149 149 ResourceLoadTiming* timing = resourceLoadTiming(); … … 160 160 } 161 161 162 unsigned long long Timing::connectStart() const162 unsigned long long PerformanceTiming::connectStart() const 163 163 { 164 164 DocumentLoader* loader = documentLoader(); … … 184 184 } 185 185 186 unsigned long long Timing::connectEnd() const186 unsigned long long PerformanceTiming::connectEnd() const 187 187 { 188 188 DocumentLoader* loader = documentLoader(); … … 208 208 } 209 209 210 unsigned long long Timing::requestStart() const210 unsigned long long PerformanceTiming::requestStart() const 211 211 { 212 212 ResourceLoadTiming* timing = resourceLoadTiming(); … … 218 218 } 219 219 220 unsigned long long Timing::responseStart() const220 unsigned long long PerformanceTiming::responseStart() const 221 221 { 222 222 ResourceLoadTiming* timing = resourceLoadTiming(); … … 234 234 } 235 235 236 unsigned long long Timing::responseEnd() const236 unsigned long long PerformanceTiming::responseEnd() const 237 237 { 238 238 DocumentLoadTiming* timing = documentLoadTiming(); … … 243 243 } 244 244 245 unsigned long long Timing::domLoading() const245 unsigned long long PerformanceTiming::domLoading() const 246 246 { 247 247 const DocumentTiming* timing = documentTiming(); … … 252 252 } 253 253 254 unsigned long long Timing::domInteractive() const254 unsigned long long PerformanceTiming::domInteractive() const 255 255 { 256 256 const DocumentTiming* timing = documentTiming(); … … 261 261 } 262 262 263 unsigned long long Timing::domContentLoadedStart() const263 unsigned long long PerformanceTiming::domContentLoadedStart() const 264 264 { 265 265 const DocumentTiming* timing = documentTiming(); … … 270 270 } 271 271 272 unsigned long long Timing::domContentLoadedEnd() const272 unsigned long long PerformanceTiming::domContentLoadedEnd() const 273 273 { 274 274 const DocumentTiming* timing = documentTiming(); … … 279 279 } 280 280 281 unsigned long long Timing::domComplete() const281 unsigned long long PerformanceTiming::domComplete() const 282 282 { 283 283 const DocumentTiming* timing = documentTiming(); … … 288 288 } 289 289 290 unsigned long long Timing::loadEventStart() const290 unsigned long long PerformanceTiming::loadEventStart() const 291 291 { 292 292 DocumentLoadTiming* timing = documentLoadTiming(); … … 297 297 } 298 298 299 unsigned long long Timing::loadEventEnd() const299 unsigned long long PerformanceTiming::loadEventEnd() const 300 300 { 301 301 DocumentLoadTiming* timing = documentLoadTiming(); … … 306 306 } 307 307 308 DocumentLoader* Timing::documentLoader() const308 DocumentLoader* PerformanceTiming::documentLoader() const 309 309 { 310 310 if (!m_frame) … … 314 314 } 315 315 316 const DocumentTiming* Timing::documentTiming() const316 const DocumentTiming* PerformanceTiming::documentTiming() const 317 317 { 318 318 if (!m_frame) … … 326 326 } 327 327 328 DocumentLoadTiming* Timing::documentLoadTiming() const328 DocumentLoadTiming* PerformanceTiming::documentLoadTiming() const 329 329 { 330 330 DocumentLoader* loader = documentLoader(); … … 335 335 } 336 336 337 ResourceLoadTiming* Timing::resourceLoadTiming() const337 ResourceLoadTiming* PerformanceTiming::resourceLoadTiming() const 338 338 { 339 339 DocumentLoader* loader = documentLoader(); … … 344 344 } 345 345 346 unsigned long long Timing::resourceLoadTimeRelativeToAbsolute(int relativeSeconds) const346 unsigned long long PerformanceTiming::resourceLoadTimeRelativeToAbsolute(int relativeSeconds) const 347 347 { 348 348 ASSERT(relativeSeconds >= 0); -
trunk/WebCore/page/PerformanceTiming.h
r71950 r71951 29 29 */ 30 30 31 #ifndef Timing_h32 #define Timing_h31 #ifndef PerformanceTiming_h 32 #define PerformanceTiming_h 33 33 34 34 #if ENABLE(WEB_TIMING) … … 45 45 class ResourceLoadTiming; 46 46 47 class Timing : public RefCounted<Timing> {47 class PerformanceTiming : public RefCounted<PerformanceTiming> { 48 48 public: 49 static PassRefPtr< Timing> create(Frame* frame) { return adoptRef(newTiming(frame)); }49 static PassRefPtr<PerformanceTiming> create(Frame* frame) { return adoptRef(new PerformanceTiming(frame)); } 50 50 51 51 Frame* frame() const; … … 73 73 74 74 private: 75 Timing(Frame*);75 PerformanceTiming(Frame*); 76 76 77 77 const DocumentTiming* documentTiming() const; … … 87 87 88 88 #endif // !ENABLE(WEB_TIMING) 89 #endif // !defined( Timing_h)89 #endif // !defined(PerformanceTiming_h) -
trunk/WebCore/page/PerformanceTiming.idl
r71950 r71951 32 32 33 33 // See: http://dev.w3.org/2006/webapi/WebTiming/ 34 interface [Conditional=WEB_TIMING, OmitConstructor] Timing {34 interface [Conditional=WEB_TIMING, OmitConstructor] PerformanceTiming { 35 35 readonly attribute unsigned long long navigationStart; 36 36 readonly attribute unsigned long long unloadEventEnd; -
trunk/WebKit/chromium/ChangeLog
r71942 r71951 1 2010-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 1 13 2010-11-12 Zhenyao Mo <zmo@google.com> 2 14 -
trunk/WebKit/chromium/src/WebPerformance.cpp
r71883 r71951 56 56 { 57 57 switch (m_private->navigation()->type()) { 58 case Navigation::NAVIGATE:58 case PerformanceNavigation::NAVIGATE: 59 59 return WebNavigationTypeOther; 60 case Navigation::RELOAD:60 case PerformanceNavigation::RELOAD: 61 61 return WebNavigationTypeReload; 62 case Navigation::BACK_FORWARD:62 case PerformanceNavigation::BACK_FORWARD: 63 63 return WebNavigationTypeBackForward; 64 64 }
Note: See TracChangeset
for help on using the changeset viewer.