Changeset 139917 in webkit
- Timestamp:
- Jan 16, 2013 1:33:01 PM (11 years ago)
- Location:
- trunk
- Files:
-
- 1 deleted
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r139915 r139917 1 2013-01-16 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r139853. 4 http://trac.webkit.org/changeset/139853 5 https://bugs.webkit.org/show_bug.cgi?id=107049 6 7 Broke the ChromeOS ppapi_unittests (Requested by leviw on 8 #webkit). 9 10 * inspector-protocol/page/frameScheduledNavigation-expected.txt: Removed. 11 * inspector-protocol/page/frameScheduledNavigation.html: Removed. 12 * inspector-protocol/page/frameStartedLoading-expected.txt: Removed. 13 * inspector-protocol/page/frameStartedLoading.html: Removed. 14 1 15 2013-01-16 Florin Malita <fmalita@chromium.org> 2 16 -
trunk/Source/WebCore/ChangeLog
r139914 r139917 1 2013-01-16 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r139853. 4 http://trac.webkit.org/changeset/139853 5 https://bugs.webkit.org/show_bug.cgi?id=107049 6 7 Broke the ChromeOS ppapi_unittests (Requested by leviw on 8 #webkit). 9 10 * inspector/Inspector.json: 11 * inspector/InspectorInstrumentation.cpp: 12 (WebCore): 13 * inspector/InspectorInstrumentation.h: 14 (InspectorInstrumentation): 15 * inspector/InspectorPageAgent.cpp: 16 * inspector/InspectorPageAgent.h: 17 * inspector/front-end/ResourceTreeModel.js: 18 (WebInspector.PageDispatcher.prototype.frameDetached): 19 * loader/NavigationScheduler.cpp: 20 (WebCore::NavigationScheduler::clear): 21 (WebCore::NavigationScheduler::timerFired): 22 (WebCore::NavigationScheduler::startTimer): 23 (WebCore::NavigationScheduler::cancel): 24 * loader/ProgressTracker.cpp: 25 (WebCore::ProgressTracker::progressStarted): 26 (WebCore::ProgressTracker::finalProgressComplete): 27 1 28 2013-01-16 Kenneth Russell <kbr@google.com> 2 29 -
trunk/Source/WebCore/inspector/Inspector.json
r139853 r139917 493 493 "parameters": [ 494 494 { "name": "frameId", "$ref": "Network.FrameId", "description": "Id of the frame that has been detached." } 495 ],496 "hidden": true497 },498 {499 "name": "frameStartedLoading",500 "description": "Fired when frame has started loading.",501 "parameters": [502 { "name": "frameId", "$ref": "Network.FrameId", "description": "Id of the frame that has started loading." }503 ],504 "hidden": true505 },506 {507 "name": "frameStoppedLoading",508 "description": "Fired when frame has stopped loading.",509 "parameters": [510 { "name": "frameId", "$ref": "Network.FrameId", "description": "Id of the frame that has stopped loading." }511 ],512 "hidden": true513 },514 {515 "name": "frameScheduledNavigation",516 "description": "Fired when frame schedules a potential navigation.",517 "parameters": [518 { "name": "frameId", "$ref": "Network.FrameId", "description": "Id of the frame that has scheduled a navigation." },519 { "name": "delay", "type": "number", "description": "Delay (in seconds) until the navigation is scheduled to begin. The navigation is not guaranteed to start." }520 ],521 "hidden": true522 },523 {524 "name": "frameClearedScheduledNavigation",525 "description": "Fired when frame no longer has a scheduled navigation.",526 "parameters": [527 { "name": "frameId", "$ref": "Network.FrameId", "description": "Id of the frame that has cleared its scheduled navigation." }528 495 ], 529 496 "hidden": true -
trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp
r139853 r139917 928 928 } 929 929 930 void InspectorInstrumentation::frameStartedLoadingImpl(InstrumentingAgents* instrumentingAgents, Frame* frame)931 {932 if (InspectorPageAgent* inspectorPageAgent = instrumentingAgents->inspectorPageAgent())933 inspectorPageAgent->frameStartedLoading(frame);934 }935 936 void InspectorInstrumentation::frameStoppedLoadingImpl(InstrumentingAgents* instrumentingAgents, Frame* frame)937 {938 if (InspectorPageAgent* inspectorPageAgent = instrumentingAgents->inspectorPageAgent())939 inspectorPageAgent->frameStoppedLoading(frame);940 }941 942 void InspectorInstrumentation::frameScheduledNavigationImpl(InstrumentingAgents* instrumentingAgents, Frame* frame, double delay)943 {944 if (InspectorPageAgent* inspectorPageAgent = instrumentingAgents->inspectorPageAgent())945 inspectorPageAgent->frameScheduledNavigation(frame, delay);946 }947 948 void InspectorInstrumentation::frameClearedScheduledNavigationImpl(InstrumentingAgents* instrumentingAgents, Frame* frame)949 {950 if (InspectorPageAgent* inspectorPageAgent = instrumentingAgents->inspectorPageAgent())951 inspectorPageAgent->frameClearedScheduledNavigation(frame);952 }953 954 930 void InspectorInstrumentation::willDestroyCachedResourceImpl(CachedResource* cachedResource) 955 931 { -
trunk/Source/WebCore/inspector/InspectorInstrumentation.h
r139853 r139917 192 192 static void didCommitLoad(Frame*, DocumentLoader*); 193 193 static void loaderDetachedFromFrame(Frame*, DocumentLoader*); 194 static void frameStartedLoading(Frame*);195 static void frameStoppedLoading(Frame*);196 static void frameScheduledNavigation(Frame*, double delay);197 static void frameClearedScheduledNavigation(Frame*);198 194 static void willDestroyCachedResource(CachedResource*); 199 195 … … 395 391 static void didCommitLoadImpl(InstrumentingAgents*, Page*, DocumentLoader*); 396 392 static void loaderDetachedFromFrameImpl(InstrumentingAgents*, DocumentLoader*); 397 static void frameStartedLoadingImpl(InstrumentingAgents*, Frame*);398 static void frameStoppedLoadingImpl(InstrumentingAgents*, Frame*);399 static void frameScheduledNavigationImpl(InstrumentingAgents*, Frame*, double delay);400 static void frameClearedScheduledNavigationImpl(InstrumentingAgents*, Frame*);401 393 static void willDestroyCachedResourceImpl(CachedResource*); 402 394 … … 1660 1652 } 1661 1653 1662 inline void InspectorInstrumentation::frameStartedLoading(Frame* frame)1663 {1664 #if ENABLE(INSPECTOR)1665 if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForFrame(frame))1666 frameStartedLoadingImpl(instrumentingAgents, frame);1667 #endif1668 }1669 1670 inline void InspectorInstrumentation::frameStoppedLoading(Frame* frame)1671 {1672 #if ENABLE(INSPECTOR)1673 if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForFrame(frame))1674 frameStoppedLoadingImpl(instrumentingAgents, frame);1675 #endif1676 }1677 1678 inline void InspectorInstrumentation::frameScheduledNavigation(Frame* frame, double delay)1679 {1680 #if ENABLE(INSPECTOR)1681 if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForFrame(frame))1682 frameScheduledNavigationImpl(instrumentingAgents, frame, delay);1683 #endif1684 }1685 1686 inline void InspectorInstrumentation::frameClearedScheduledNavigation(Frame* frame)1687 {1688 #if ENABLE(INSPECTOR)1689 if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForFrame(frame))1690 frameClearedScheduledNavigationImpl(instrumentingAgents, frame);1691 #endif1692 }1693 1694 1654 inline void InspectorInstrumentation::willDestroyCachedResource(CachedResource* cachedResource) 1695 1655 { -
trunk/Source/WebCore/inspector/InspectorPageAgent.cpp
r139853 r139917 901 901 } 902 902 903 void InspectorPageAgent::frameStartedLoading(Frame* frame)904 {905 m_frontend->frameStartedLoading(frameId(frame));906 }907 908 void InspectorPageAgent::frameStoppedLoading(Frame* frame)909 {910 m_frontend->frameStoppedLoading(frameId(frame));911 }912 913 void InspectorPageAgent::frameScheduledNavigation(Frame* frame, double delay)914 {915 m_frontend->frameScheduledNavigation(frameId(frame), delay);916 }917 918 void InspectorPageAgent::frameClearedScheduledNavigation(Frame* frame)919 {920 m_frontend->frameClearedScheduledNavigation(frameId(frame));921 }922 923 903 void InspectorPageAgent::applyScreenWidthOverride(long* width) 924 904 { -
trunk/Source/WebCore/inspector/InspectorPageAgent.h
r139853 r139917 139 139 void frameDetached(Frame*); 140 140 void loaderDetachedFromFrame(DocumentLoader*); 141 void frameStartedLoading(Frame*);142 void frameStoppedLoading(Frame*);143 void frameScheduledNavigation(Frame*, double delay);144 void frameClearedScheduledNavigation(Frame*);145 141 void applyScreenWidthOverride(long*); 146 142 void applyScreenHeightOverride(long*); -
trunk/Source/WebCore/inspector/front-end/ResourceTreeModel.js
r139885 r139917 602 602 { 603 603 this._resourceTreeModel._frameDetached(frameId); 604 },605 606 frameStartedLoading: function(frameId) {607 },608 609 frameStoppedLoading: function(frameId) {610 },611 612 frameScheduledNavigation: function(frameId, delay) {613 },614 615 frameClearedScheduledNavigation: function(frameId) {616 604 } 617 605 } -
trunk/Source/WebCore/loader/NavigationScheduler.cpp
r139853 r139917 46 46 #include "HTMLFrameOwnerElement.h" 47 47 #include "HistoryItem.h" 48 #include "InspectorInstrumentation.h"49 48 #include "Page.h" 50 49 #include "UserGestureIndicator.h" … … 288 287 void NavigationScheduler::clear() 289 288 { 290 if (m_timer.isActive())291 InspectorInstrumentation::frameClearedScheduledNavigation(m_frame);292 289 m_timer.stop(); 293 290 m_redirect.clear(); … … 415 412 if (!m_frame->page()) 416 413 return; 417 if (m_frame->page()->defersLoading()) { 418 InspectorInstrumentation::frameClearedScheduledNavigation(m_frame); 419 return; 420 } 414 if (m_frame->page()->defersLoading()) 415 return; 421 416 422 417 OwnPtr<ScheduledNavigation> redirect(m_redirect.release()); 423 418 redirect->fire(m_frame); 424 InspectorInstrumentation::frameClearedScheduledNavigation(m_frame);425 419 } 426 420 … … 465 459 m_timer.startOneShot(m_redirect->delay()); 466 460 m_redirect->didStartTimer(m_frame, &m_timer); 467 InspectorInstrumentation::frameScheduledNavigation(m_frame, m_redirect->delay());468 461 } 469 462 470 463 void NavigationScheduler::cancel(bool newLoadInProgress) 471 464 { 472 if (m_timer.isActive())473 InspectorInstrumentation::frameClearedScheduledNavigation(m_frame);474 465 m_timer.stop(); 475 466 -
trunk/Source/WebCore/loader/ProgressTracker.cpp
r139853 r139917 32 32 #include "FrameLoaderStateMachine.h" 33 33 #include "FrameLoaderClient.h" 34 #include "InspectorInstrumentation.h"35 34 #include "Logging.h" 36 35 #include "ResourceResponse.h" … … 122 121 123 122 frame->loader()->client()->didChangeEstimatedProgress(); 124 InspectorInstrumentation::frameStartedLoading(frame);125 123 } 126 124 … … 158 156 frame->loader()->client()->setMainFrameDocumentReady(true); 159 157 frame->loader()->client()->postProgressFinishedNotification(); 160 InspectorInstrumentation::frameStoppedLoading(frame.get());161 158 } 162 159
Note: See TracChangeset
for help on using the changeset viewer.