Changeset 62357 in webkit
- Timestamp:
- Jul 1, 2010 9:18:47 PM (14 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 14 edited
- 3 copied
- 3 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/Android.mk
r62235 r62357 366 366 page/Location.cpp \ 367 367 page/MouseEventWithHitTestResults.cpp \ 368 page/Navigation Timing.cpp \368 page/Navigation.cpp \ 369 369 page/Navigator.cpp \ 370 370 page/NavigatorBase.cpp \ … … 381 381 page/SpatialNavigation.cpp \ 382 382 page/SuspendableTimer.cpp \ 383 page/Timing.cpp \ 383 384 page/UserContentURLPattern.cpp \ 384 385 page/WindowFeatures.cpp \ -
trunk/WebCore/CMakeLists.txt
r62269 r62357 311 311 page/Location.idl 312 312 page/MemoryInfo.idl 313 page/Navigation Timing.idl313 page/Navigation.idl 314 314 page/Navigator.idl 315 315 page/Performance.idl 316 316 page/PositionError.idl 317 317 page/Screen.idl 318 page/Timing.idl 318 319 page/WebKitPoint.idl 319 320 page/WorkerNavigator.idl … … 1125 1126 page/MemoryInfo.cpp 1126 1127 page/MouseEventWithHitTestResults.cpp 1127 page/Navigation Timing.cpp1128 page/Navigation.cpp 1128 1129 page/Navigator.cpp 1129 1130 page/NavigatorBase.cpp … … 1140 1141 page/SpatialNavigation.cpp 1141 1142 page/SuspendableTimer.cpp 1143 page/Timing.cpp 1142 1144 page/UserContentURLPattern.cpp 1143 1145 page/WindowFeatures.cpp -
trunk/WebCore/ChangeLog
r62354 r62357 1 2010-07-01 Tony Gentilcore <tonyg@chromium.org> 2 3 Reviewed by Dimitri Glazkov. 4 5 Add window.performance.navigation namespace 6 https://bugs.webkit.org/show_bug.cgi?id=41442 7 8 Adds window.performance.navigation namespace consisting of ".type" 9 and ".redirectCount". As part of this change, I renmaed "NavigationTiming" 10 to just "Timing" to avoid confusion. 11 12 No new tests because tests will be added in a subsequent patch when 13 functionality is added. 14 15 * Android.mk: 16 * CMakeLists.txt: 17 * DerivedSources.cpp: 18 * DerivedSources.make: 19 * GNUmakefile.am: 20 * WebCore.gypi: 21 * WebCore.pri: 22 * WebCore.pro: 23 * WebCore.vcproj/WebCore.vcproj: 24 * WebCore.xcodeproj/project.pbxproj: 25 * page/Navigation.cpp: Added. 26 (WebCore::Navigation::Navigation): 27 (WebCore::Navigation::frame): 28 (WebCore::Navigation::disconnectFrame): 29 (WebCore::Navigation::type): 30 (WebCore::Navigation::redirectCount): 31 * page/Navigation.h: Added. 32 (WebCore::Navigation::create): 33 * page/Navigation.idl: Added. 34 * page/NavigationTiming.cpp: Removed. 35 * page/NavigationTiming.h: Removed. 36 * page/NavigationTiming.idl: Removed. 37 * page/Performance.cpp: 38 (WebCore::Performance::navigation): 39 (WebCore::Performance::timing): 40 * page/Performance.h: 41 * page/Performance.idl: 42 * page/Timing.cpp: Added. 43 (WebCore::Timing::Timing): 44 (WebCore::Timing::frame): 45 (WebCore::Timing::disconnectFrame): 46 (WebCore::Timing::navigationStart): 47 * page/Timing.h: Added. 48 (WebCore::Timing::create): 49 * page/Timing.idl: Added. 50 1 51 2010-07-01 Daniel Cheng <dcheng@chromium.org> 2 52 -
trunk/WebCore/DerivedSources.cpp
r62215 r62357 202 202 #include "JSMutationEvent.cpp" 203 203 #include "JSNamedNodeMap.cpp" 204 #include "JSNavigation Timing.cpp"204 #include "JSNavigation.cpp" 205 205 #include "JSNavigator.cpp" 206 206 #include "JSNode.cpp" … … 384 384 #include "JSTextMetrics.cpp" 385 385 #include "JSTimeRanges.cpp" 386 #include "JSTiming.cpp" 386 387 #include "JSTouch.cpp" 387 388 #include "JSTouchEvent.cpp" -
trunk/WebCore/DerivedSources.make
r62283 r62357 244 244 MutationEvent \ 245 245 NamedNodeMap \ 246 Navigation Timing\246 Navigation \ 247 247 Navigator \ 248 248 Node \ … … 438 438 TextMetrics \ 439 439 TimeRanges \ 440 Timing \ 440 441 Touch \ 441 442 TouchEvent \ -
trunk/WebCore/GNUmakefile.am
r62348 r62357 301 301 WebCore/page/Location.idl \ 302 302 WebCore/page/MemoryInfo.idl \ 303 WebCore/page/Navigation Timing.idl \303 WebCore/page/Navigation.idl \ 304 304 WebCore/page/Navigator.idl \ 305 305 WebCore/page/Performance.idl \ 306 306 WebCore/page/PositionError.idl \ 307 307 WebCore/page/Screen.idl \ 308 WebCore/page/Timing.idl \ 308 309 WebCore/page/WebKitPoint.idl \ 309 310 WebCore/page/WorkerNavigator.idl \ … … 1545 1546 WebCore/page/MouseEventWithHitTestResults.cpp \ 1546 1547 WebCore/page/MouseEventWithHitTestResults.h \ 1547 WebCore/page/Navigation Timing.cpp \1548 WebCore/page/Navigation Timing.h \1548 WebCore/page/Navigation.cpp \ 1549 WebCore/page/Navigation.h \ 1549 1550 WebCore/page/Navigator.cpp \ 1550 1551 WebCore/page/Navigator.h \ … … 1581 1582 WebCore/page/SuspendableTimer.cpp \ 1582 1583 WebCore/page/SuspendableTimer.h \ 1584 WebCore/page/Timing.cpp \ 1585 WebCore/page/Timing.h \ 1583 1586 WebCore/page/UserContentURLPattern.cpp \ 1584 1587 WebCore/page/UserContentURLPattern.h \ -
trunk/WebCore/WebCore.gypi
r62348 r62357 217 217 'page/Location.idl', 218 218 'page/MemoryInfo.idl', 219 'page/Navigation Timing.idl',219 'page/Navigation.idl', 220 220 'page/Navigator.idl', 221 221 'page/Performance.idl', 222 222 'page/PositionError.idl', 223 223 'page/Screen.idl', 224 'page/Timing.idl', 224 225 'page/WebKitPoint.idl', 225 226 'page/WorkerNavigator.idl', … … 1986 1987 'page/MouseEventWithHitTestResults.cpp', 1987 1988 'page/MouseEventWithHitTestResults.h', 1988 'page/Navigation Timing.cpp',1989 'page/Navigation Timing.h',1989 'page/Navigation.cpp', 1990 'page/Navigation.h', 1990 1991 'page/Navigator.cpp', 1991 1992 'page/Navigator.h', … … 2022 2023 'page/SuspendableTimer.cpp', 2023 2024 'page/SuspendableTimer.h', 2025 'page/Timing.cpp', 2026 'page/Timing.h', 2024 2027 'page/UserContentURLPattern.cpp', 2025 2028 'page/UserContentURLPattern.h', -
trunk/WebCore/WebCore.pri
r62215 r62357 457 457 page/Location.idl \ 458 458 page/MemoryInfo.idl \ 459 page/Navigation Timing.idl \459 page/Navigation.idl \ 460 460 page/Navigator.idl \ 461 461 page/Performance.idl \ 462 462 page/PositionError.idl \ 463 463 page/Screen.idl \ 464 page/Timing.idl \ 464 465 page/WebKitPoint.idl \ 465 466 page/WorkerNavigator.idl \ -
trunk/WebCore/WebCore.pro
r62348 r62357 807 807 page/DOMTimer.cpp \ 808 808 page/DOMWindow.cpp \ 809 page/Navigation Timing.cpp \809 page/Navigation.cpp \ 810 810 page/Navigator.cpp \ 811 811 page/NavigatorBase.cpp \ … … 836 836 page/SpatialNavigation.cpp \ 837 837 page/SuspendableTimer.cpp \ 838 page/Timing.cpp \ 838 839 page/UserContentURLPattern.cpp \ 839 840 page/WindowFeatures.cpp \ -
trunk/WebCore/WebCore.vcproj/WebCore.vcproj
r62348 r62357 9454 9454 </File> 9455 9455 <File 9456 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSNavigation Timing.cpp"9457 > 9458 <FileConfiguration 9459 Name="Debug|Win32" 9460 ExcludedFromBuild="true" 9461 > 9462 <Tool 9463 Name="VCCLCompilerTool" 9464 /> 9465 </FileConfiguration> 9466 <FileConfiguration 9467 Name="Release|Win32" 9468 ExcludedFromBuild="true" 9469 > 9470 <Tool 9471 Name="VCCLCompilerTool" 9472 /> 9473 </FileConfiguration> 9474 <FileConfiguration 9475 Name="Debug_Internal|Win32" 9476 ExcludedFromBuild="true" 9477 > 9478 <Tool 9479 Name="VCCLCompilerTool" 9480 /> 9481 </FileConfiguration> 9482 <FileConfiguration 9483 Name="Debug_Cairo|Win32" 9484 ExcludedFromBuild="true" 9485 > 9486 <Tool 9487 Name="VCCLCompilerTool" 9488 /> 9489 </FileConfiguration> 9490 <FileConfiguration 9491 Name="Release_Cairo|Win32" 9492 ExcludedFromBuild="true" 9493 > 9494 <Tool 9495 Name="VCCLCompilerTool" 9496 /> 9497 </FileConfiguration> 9498 <FileConfiguration 9499 Name="Debug_All|Win32" 9500 ExcludedFromBuild="true" 9501 > 9502 <Tool 9503 Name="VCCLCompilerTool" 9504 /> 9505 </FileConfiguration> 9506 </File> 9507 <File 9508 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSNavigation Timing.h"9456 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSNavigation.cpp" 9457 > 9458 <FileConfiguration 9459 Name="Debug|Win32" 9460 ExcludedFromBuild="true" 9461 > 9462 <Tool 9463 Name="VCCLCompilerTool" 9464 /> 9465 </FileConfiguration> 9466 <FileConfiguration 9467 Name="Release|Win32" 9468 ExcludedFromBuild="true" 9469 > 9470 <Tool 9471 Name="VCCLCompilerTool" 9472 /> 9473 </FileConfiguration> 9474 <FileConfiguration 9475 Name="Debug_Internal|Win32" 9476 ExcludedFromBuild="true" 9477 > 9478 <Tool 9479 Name="VCCLCompilerTool" 9480 /> 9481 </FileConfiguration> 9482 <FileConfiguration 9483 Name="Debug_Cairo|Win32" 9484 ExcludedFromBuild="true" 9485 > 9486 <Tool 9487 Name="VCCLCompilerTool" 9488 /> 9489 </FileConfiguration> 9490 <FileConfiguration 9491 Name="Release_Cairo|Win32" 9492 ExcludedFromBuild="true" 9493 > 9494 <Tool 9495 Name="VCCLCompilerTool" 9496 /> 9497 </FileConfiguration> 9498 <FileConfiguration 9499 Name="Debug_All|Win32" 9500 ExcludedFromBuild="true" 9501 > 9502 <Tool 9503 Name="VCCLCompilerTool" 9504 /> 9505 </FileConfiguration> 9506 </File> 9507 <File 9508 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSNavigation.h" 9509 9509 > 9510 9510 </File> … … 19147 19147 <File 19148 19148 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSTimeRanges.h" 19149 > 19150 </File> 19151 <File 19152 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSTiming.cpp" 19153 > 19154 <FileConfiguration 19155 Name="Debug|Win32" 19156 ExcludedFromBuild="true" 19157 > 19158 <Tool 19159 Name="VCCLCompilerTool" 19160 /> 19161 </FileConfiguration> 19162 <FileConfiguration 19163 Name="Release|Win32" 19164 ExcludedFromBuild="true" 19165 > 19166 <Tool 19167 Name="VCCLCompilerTool" 19168 /> 19169 </FileConfiguration> 19170 <FileConfiguration 19171 Name="Debug_Internal|Win32" 19172 ExcludedFromBuild="true" 19173 > 19174 <Tool 19175 Name="VCCLCompilerTool" 19176 /> 19177 </FileConfiguration> 19178 <FileConfiguration 19179 Name="Debug_Cairo|Win32" 19180 ExcludedFromBuild="true" 19181 > 19182 <Tool 19183 Name="VCCLCompilerTool" 19184 /> 19185 </FileConfiguration> 19186 <FileConfiguration 19187 Name="Release_Cairo|Win32" 19188 ExcludedFromBuild="true" 19189 > 19190 <Tool 19191 Name="VCCLCompilerTool" 19192 /> 19193 </FileConfiguration> 19194 <FileConfiguration 19195 Name="Debug_All|Win32" 19196 ExcludedFromBuild="true" 19197 > 19198 <Tool 19199 Name="VCCLCompilerTool" 19200 /> 19201 </FileConfiguration> 19202 </File> 19203 <File 19204 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSTiming.h" 19149 19205 > 19150 19206 </File> … … 22274 22330 </File> 22275 22331 <File 22276 RelativePath="..\page\Navigation Timing.cpp"22277 > 22278 </File> 22279 <File 22280 RelativePath="..\page\Navigation Timing.h"22332 RelativePath="..\page\Navigation.cpp" 22333 > 22334 </File> 22335 <File 22336 RelativePath="..\page\Navigation.h" 22281 22337 > 22282 22338 </File> … … 22411 22467 <File 22412 22468 RelativePath="..\page\SuspendableTimer.h" 22469 > 22470 </File> 22471 <File 22472 RelativePath="..\page\Timing.cpp" 22473 > 22474 </File> 22475 <File 22476 RelativePath="..\page\Timing.h" 22413 22477 > 22414 22478 </File> -
trunk/WebCore/WebCore.xcodeproj/project.pbxproj
r62348 r62357 2305 2305 8A844D0411D3C18E0014065C /* Performance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8A844D0111D3C18E0014065C /* Performance.cpp */; }; 2306 2306 8A844D0511D3C18E0014065C /* Performance.h in Headers */ = {isa = PBXBuildFile; fileRef = 8A844D0211D3C18E0014065C /* Performance.h */; }; 2307 8AF4E55511DC5A36000ED3DE /* Navigation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8AF4E55211DC5A36000ED3DE /* Navigation.cpp */; }; 2308 8AF4E55611DC5A36000ED3DE /* Navigation.h in Headers */ = {isa = PBXBuildFile; fileRef = 8AF4E55311DC5A36000ED3DE /* Navigation.h */; }; 2309 8AF4E55B11DC5A63000ED3DE /* Timing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8AF4E55811DC5A63000ED3DE /* Timing.cpp */; }; 2310 8AF4E55C11DC5A63000ED3DE /* Timing.h in Headers */ = {isa = PBXBuildFile; fileRef = 8AF4E55911DC5A63000ED3DE /* Timing.h */; }; 2307 2311 8FAC774D119872CB0015AE94 /* JSMainThreadExecState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8F934D841189F1EE00508D5D /* JSMainThreadExecState.cpp */; }; 2308 2312 9302B0BD0D79F82900C7EE83 /* PageGroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9302B0BC0D79F82900C7EE83 /* PageGroup.cpp */; }; … … 7981 7985 8A844D0211D3C18E0014065C /* Performance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Performance.h; sourceTree = "<group>"; }; 7982 7986 8A844D0311D3C18E0014065C /* Performance.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Performance.idl; sourceTree = "<group>"; }; 7987 8AF4E55211DC5A36000ED3DE /* Navigation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Navigation.cpp; sourceTree = "<group>"; }; 7988 8AF4E55311DC5A36000ED3DE /* Navigation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Navigation.h; sourceTree = "<group>"; }; 7989 8AF4E55411DC5A36000ED3DE /* Navigation.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Navigation.idl; sourceTree = "<group>"; }; 7990 8AF4E55811DC5A63000ED3DE /* Timing.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Timing.cpp; sourceTree = "<group>"; }; 7991 8AF4E55911DC5A63000ED3DE /* Timing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Timing.h; sourceTree = "<group>"; }; 7992 8AF4E55A11DC5A63000ED3DE /* Timing.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Timing.idl; sourceTree = "<group>"; }; 7983 7993 8F934D831189F1EE00508D5D /* JSMainThreadExecState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMainThreadExecState.h; sourceTree = "<group>"; }; 7984 7994 8F934D841189F1EE00508D5D /* JSMainThreadExecState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMainThreadExecState.cpp; sourceTree = "<group>"; }; … … 12232 12242 93EB355E09E37FD600F43799 /* MouseEventWithHitTestResults.cpp */, 12233 12243 935C476209AC4CE600A6AAB4 /* MouseEventWithHitTestResults.h */, 12234 8A 844CFB11D3C17C0014065C /* NavigationTiming.cpp */,12235 8A 844CFC11D3C17C0014065C /* NavigationTiming.h */,12236 8A 844CFD11D3C17C0014065C /* NavigationTiming.idl */,12244 8AF4E55211DC5A36000ED3DE /* Navigation.cpp */, 12245 8AF4E55311DC5A36000ED3DE /* Navigation.h */, 12246 8AF4E55411DC5A36000ED3DE /* Navigation.idl */, 12237 12247 A9C6E5A30D746458006442E9 /* Navigator.cpp */, 12238 12248 A9C6E5A40D746458006442E9 /* Navigator.h */, … … 12273 12283 62C1217A11AB9E76003C462C /* SuspendableTimer.cpp */, 12274 12284 62C1217B11AB9E77003C462C /* SuspendableTimer.h */, 12285 8AF4E55811DC5A63000ED3DE /* Timing.cpp */, 12286 8AF4E55911DC5A63000ED3DE /* Timing.h */, 12287 8AF4E55A11DC5A63000ED3DE /* Timing.idl */, 12275 12288 BCACF3BA1072921A00C0C8A3 /* UserContentURLPattern.cpp */, 12276 12289 BCACF3BB1072921A00C0C8A3 /* UserContentURLPattern.h */, … … 18892 18905 E10B9B6C0B747599003ED890 /* NativeXPathNSResolver.h in Headers */, 18893 18906 93CCF0270AF6C52900018E89 /* NavigationAction.h in Headers */, 18894 8A844CFF11D3C17C0014065C /* NavigationTiming.h in Headers */,18895 18907 A9C6E5A60D746458006442E9 /* Navigator.h in Headers */, 18896 18908 E12719C70EEEC16800F61213 /* NavigatorBase.h in Headers */, … … 19685 19697 A8A564A511DC0E59003AC2F0 /* HTMLFormattingElementList.h in Headers */, 19686 19698 8A81BF8511DCFD9000DA2B98 /* ResourceLoadTiming.h in Headers */, 19699 8AF4E55611DC5A36000ED3DE /* Navigation.h in Headers */, 19700 8AF4E55C11DC5A63000ED3DE /* Timing.h in Headers */, 19687 19701 ); 19688 19702 runOnlyForDeploymentPostprocessing = 0; … … 21331 21345 E10B9B6D0B747599003ED890 /* NativeXPathNSResolver.cpp in Sources */, 21332 21346 93CCF0600AF6CA7600018E89 /* NavigationAction.cpp in Sources */, 21333 8A844CFE11D3C17C0014065C /* NavigationTiming.cpp in Sources */,21334 21347 A9C6E5A50D746458006442E9 /* Navigator.cpp in Sources */, 21335 21348 E12719CA0EEEC21300F61213 /* NavigatorBase.cpp in Sources */, … … 22023 22036 A8A563B511DB3D10003AC2F0 /* HTMLElementStack.cpp in Sources */, 22024 22037 A8A564A611DC0E59003AC2F0 /* HTMLFormattingElementList.cpp in Sources */, 22038 8AF4E55511DC5A36000ED3DE /* Navigation.cpp in Sources */, 22039 8AF4E55B11DC5A63000ED3DE /* Timing.cpp in Sources */, 22025 22040 ); 22026 22041 runOnlyForDeploymentPostprocessing = 0; -
trunk/WebCore/page/Navigation.cpp
r62354 r62357 30 30 31 31 #include "config.h" 32 #include "Navigation Timing.h"32 #include "Navigation.h" 33 33 34 34 #if ENABLE(WEB_TIMING) … … 38 38 namespace WebCore { 39 39 40 Navigation Timing::NavigationTiming(Frame* frame)40 Navigation::Navigation(Frame* frame) 41 41 : m_frame(frame) 42 42 { 43 43 } 44 44 45 Frame* Navigation Timing::frame() const45 Frame* Navigation::frame() const 46 46 { 47 47 return m_frame; 48 48 } 49 49 50 void Navigation Timing::disconnectFrame()50 void Navigation::disconnectFrame() 51 51 { 52 52 m_frame = 0; 53 53 } 54 54 55 unsigned long NavigationTiming::navigationStart() const 55 unsigned short Navigation::type() const 56 { 57 if (!m_frame) 58 return 0; 59 60 return 0; // FIXME 61 } 62 63 unsigned short Navigation::redirectCount() const 56 64 { 57 65 if (!m_frame) -
trunk/WebCore/page/Navigation.h
r62354 r62357 29 29 */ 30 30 31 #ifndef Navigation Timing_h32 #define Navigation Timing_h31 #ifndef Navigation_h 32 #define Navigation_h 33 33 34 34 #if ENABLE(WEB_TIMING) … … 41 41 class Frame; 42 42 43 class Navigation Timing : public RefCounted<NavigationTiming> {43 class Navigation : public RefCounted<Navigation> { 44 44 public: 45 static PassRefPtr<Navigation Timing> create(Frame* frame) { return adoptRef(new NavigationTiming(frame)); }45 static PassRefPtr<Navigation> create(Frame* frame) { return adoptRef(new Navigation(frame)); } 46 46 47 47 Frame* frame() const; 48 48 void disconnectFrame(); 49 49 50 unsigned long navigationStart() const; 50 unsigned short type() const; 51 unsigned short redirectCount() const; 51 52 52 53 private: 53 Navigation Timing(Frame*);54 Navigation(Frame*); 54 55 55 56 Frame* m_frame; … … 59 60 60 61 #endif // !ENABLE(WEB_TIMING) 61 #endif // !defined(Navigation Timing_h)62 #endif // !defined(Navigation_h) -
trunk/WebCore/page/Navigation.idl
r62354 r62357 32 32 33 33 // See: http://dev.w3.org/2006/webapi/WebTiming/ 34 interface [Conditional=WEB_TIMING, OmitConstructor] NavigationTiming { 35 readonly attribute unsigned long navigationStart; 36 // FIXME: Implement remainder of interface. 34 interface [Conditional=WEB_TIMING, OmitConstructor] Navigation { 35 const unsigned short NAVIGATION_OTHER = 0; 36 const unsigned short NAVIGATION_LINK = 1; 37 const unsigned short NAVIGATION_FORWARD_BACK = 2; 38 const unsigned short NAVIGATION_BROWSER = 3; 39 const unsigned short NAVIGATION_NEW_WINDOW = 4; 40 const unsigned short NAVIGATION_RELOAD = 5; 41 const unsigned short NAVIGATION_FRAME = 6; 42 readonly attribute unsigned short type; 43 44 readonly attribute unsigned short redirectCount; 37 45 }; 38 46 -
trunk/WebCore/page/Performance.cpp
r61950 r62357 32 32 #include "Performance.h" 33 33 34 #include "NavigationTiming.h" 34 #include "Navigation.h" 35 #include "Timing.h" 35 36 36 37 #if ENABLE(WEB_TIMING) … … 55 56 } 56 57 57 Navigation Timing* Performance::timing() const58 Navigation* Performance::navigation() const 58 59 { 59 if (!m_navigation Timing)60 m_navigation Timing = NavigationTiming::create(m_frame);60 if (!m_navigation) 61 m_navigation = Navigation::create(m_frame); 61 62 62 return m_navigationTiming.get(); 63 return m_navigation.get(); 64 } 65 66 Timing* Performance::timing() const 67 { 68 if (!m_timing) 69 m_timing = Timing::create(m_frame); 70 71 return m_timing.get(); 63 72 } 64 73 -
trunk/WebCore/page/Performance.h
r61950 r62357 34 34 #if ENABLE(WEB_TIMING) 35 35 36 #include "NavigationTiming.h" 36 #include "Navigation.h" 37 #include "Timing.h" 37 38 #include <wtf/PassRefPtr.h> 38 39 #include <wtf/RefCounted.h> … … 48 49 void disconnectFrame(); 49 50 50 NavigationTiming* timing() const; 51 Navigation* navigation() const; 52 Timing* timing() const; 51 53 52 54 private: 53 55 Performance(Frame*); 54 56 55 mutable RefPtr<NavigationTiming> m_navigationTiming; 57 mutable RefPtr<Navigation> m_navigation; 58 mutable RefPtr<Timing> m_timing; 56 59 Frame* m_frame; 57 60 }; -
trunk/WebCore/page/Performance.idl
r61950 r62357 33 33 // See: http://dev.w3.org/2006/webapi/WebTiming/ 34 34 interface [Conditional=WEB_TIMING, OmitConstructor] Performance { 35 readonly attribute NavigationTiming timing; 35 readonly attribute Navigation navigation; 36 readonly attribute Timing timing; 36 37 }; 37 38 -
trunk/WebCore/page/Timing.cpp
r62354 r62357 30 30 31 31 #include "config.h" 32 #include " NavigationTiming.h"32 #include "Timing.h" 33 33 34 34 #if ENABLE(WEB_TIMING) … … 38 38 namespace WebCore { 39 39 40 NavigationTiming::NavigationTiming(Frame* frame)40 Timing::Timing(Frame* frame) 41 41 : m_frame(frame) 42 42 { 43 43 } 44 44 45 Frame* NavigationTiming::frame() const45 Frame* Timing::frame() const 46 46 { 47 47 return m_frame; 48 48 } 49 49 50 void NavigationTiming::disconnectFrame()50 void Timing::disconnectFrame() 51 51 { 52 52 m_frame = 0; 53 53 } 54 54 55 unsigned long NavigationTiming::navigationStart() const55 unsigned long Timing::navigationStart() const 56 56 { 57 57 if (!m_frame) -
trunk/WebCore/page/Timing.h
r62354 r62357 29 29 */ 30 30 31 #ifndef NavigationTiming_h32 #define NavigationTiming_h31 #ifndef Timing_h 32 #define Timing_h 33 33 34 34 #if ENABLE(WEB_TIMING) … … 41 41 class Frame; 42 42 43 class NavigationTiming : public RefCounted<NavigationTiming> {43 class Timing : public RefCounted<Timing> { 44 44 public: 45 static PassRefPtr< NavigationTiming> create(Frame* frame) { return adoptRef(new NavigationTiming(frame)); }45 static PassRefPtr<Timing> create(Frame* frame) { return adoptRef(new Timing(frame)); } 46 46 47 47 Frame* frame() const; … … 51 51 52 52 private: 53 NavigationTiming(Frame*);53 Timing(Frame*); 54 54 55 55 Frame* m_frame; … … 59 59 60 60 #endif // !ENABLE(WEB_TIMING) 61 #endif // !defined( NavigationTiming_h)61 #endif // !defined(Timing_h) -
trunk/WebCore/page/Timing.idl
r62354 r62357 32 32 33 33 // See: http://dev.w3.org/2006/webapi/WebTiming/ 34 interface [Conditional=WEB_TIMING, OmitConstructor] NavigationTiming {34 interface [Conditional=WEB_TIMING, OmitConstructor] Timing { 35 35 readonly attribute unsigned long navigationStart; 36 36 // FIXME: Implement remainder of interface.
Note: See TracChangeset
for help on using the changeset viewer.