Changeset 139917 in webkit

Timestamp:

Jan 16, 2013 1:33:01 PM (11 years ago)

Author:

leviw@chromium.org

Message:

Unreviewed, rolling out r139853.
​http://trac.webkit.org/changeset/139853
​https://bugs.webkit.org/show_bug.cgi?id=107049

Broke the ChromeOS ppapi_unittests (Requested by leviw on
#webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2013-01-16

Source/WebCore:

• inspector/Inspector.json:
• inspector/InspectorInstrumentation.cpp:

(WebCore):

• inspector/InspectorInstrumentation.h:

(InspectorInstrumentation):

• inspector/InspectorPageAgent.cpp:
• inspector/InspectorPageAgent.h:
• inspector/front-end/ResourceTreeModel.js:

(WebInspector.PageDispatcher.prototype.frameDetached):

• loader/NavigationScheduler.cpp:

(WebCore::NavigationScheduler::clear):
(WebCore::NavigationScheduler::timerFired):
(WebCore::NavigationScheduler::startTimer):
(WebCore::NavigationScheduler::cancel):

• loader/ProgressTracker.cpp:

(WebCore::ProgressTracker::progressStarted):
(WebCore::ProgressTracker::finalProgressComplete):

LayoutTests:

• inspector-protocol/page/frameScheduledNavigation-expected.txt: Removed.
• inspector-protocol/page/frameScheduledNavigation.html: Removed.
• inspector-protocol/page/frameStartedLoading-expected.txt: Removed.
• inspector-protocol/page/frameStartedLoading.html: Removed.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector-protocol/page (deleted)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/Inspector.json (modified) (1 diff)
• Source/WebCore/inspector/InspectorInstrumentation.cpp (modified) (1 diff)
• Source/WebCore/inspector/InspectorInstrumentation.h (modified) (3 diffs)
• Source/WebCore/inspector/InspectorPageAgent.cpp (modified) (1 diff)
• Source/WebCore/inspector/InspectorPageAgent.h (modified) (1 diff)
• Source/WebCore/inspector/front-end/ResourceTreeModel.js (modified) (1 diff)
• Source/WebCore/loader/NavigationScheduler.cpp (modified) (4 diffs)
• Source/WebCore/loader/ProgressTracker.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-01-16  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r139853.
+        http://trac.webkit.org/changeset/139853
+        https://bugs.webkit.org/show_bug.cgi?id=107049
+
+        Broke the ChromeOS ppapi_unittests (Requested by leviw on
+        #webkit).
+
+        * inspector-protocol/page/frameScheduledNavigation-expected.txt: Removed.
+        * inspector-protocol/page/frameScheduledNavigation.html: Removed.
+        * inspector-protocol/page/frameStartedLoading-expected.txt: Removed.
+        * inspector-protocol/page/frameStartedLoading.html: Removed.
+
 2013-01-16  Florin Malita  <fmalita@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-16  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r139853.
+        http://trac.webkit.org/changeset/139853
+        https://bugs.webkit.org/show_bug.cgi?id=107049
+
+        Broke the ChromeOS ppapi_unittests (Requested by leviw on
+        #webkit).
+
+        * inspector/Inspector.json:
+        * inspector/InspectorInstrumentation.cpp:
+        (WebCore):
+        * inspector/InspectorInstrumentation.h:
+        (InspectorInstrumentation):
+        * inspector/InspectorPageAgent.cpp:
+        * inspector/InspectorPageAgent.h:
+        * inspector/front-end/ResourceTreeModel.js:
+        (WebInspector.PageDispatcher.prototype.frameDetached):
+        * loader/NavigationScheduler.cpp:
+        (WebCore::NavigationScheduler::clear):
+        (WebCore::NavigationScheduler::timerFired):
+        (WebCore::NavigationScheduler::startTimer):
+        (WebCore::NavigationScheduler::cancel):
+        * loader/ProgressTracker.cpp:
+        (WebCore::ProgressTracker::progressStarted):
+        (WebCore::ProgressTracker::finalProgressComplete):
+
 2013-01-16  Kenneth Russell  <kbr@google.com>
 

trunk/Source/WebCore/inspector/Inspector.json

@@ -493 +493 @@
                 "parameters": [
                     { "name": "frameId", "$ref": "Network.FrameId", "description": "Id of the frame that has been detached." }
-                ],
-                "hidden": true
-            },
-            {
-                "name": "frameStartedLoading",
-                "description": "Fired when frame has started loading.",
-                "parameters": [
-                    { "name": "frameId", "$ref": "Network.FrameId", "description": "Id of the frame that has started loading." }
-                ],
-                "hidden": true
-            },
-            {
-                "name": "frameStoppedLoading",
-                "description": "Fired when frame has stopped loading.",
-                "parameters": [
-                    { "name": "frameId", "$ref": "Network.FrameId", "description": "Id of the frame that has stopped loading." }
-                ],
-                "hidden": true
-            },
-            {
-                "name": "frameScheduledNavigation",
-                "description": "Fired when frame schedules a potential navigation.",
-                "parameters": [
-                    { "name": "frameId", "$ref": "Network.FrameId", "description": "Id of the frame that has scheduled a navigation." },
-                    { "name": "delay", "type": "number", "description": "Delay (in seconds) until the navigation is scheduled to begin. The navigation is not guaranteed to start." }
-                ],
-                "hidden": true
-            },
-            {
-                "name": "frameClearedScheduledNavigation",
-                "description": "Fired when frame no longer has a scheduled navigation.",
-                "parameters": [
-                    { "name": "frameId", "$ref": "Network.FrameId", "description": "Id of the frame that has cleared its scheduled navigation." }
                 ],
                 "hidden": true

trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp

@@ -928 +928 @@
 }
 
-void InspectorInstrumentation::frameStartedLoadingImpl(InstrumentingAgents* instrumentingAgents, Frame* frame)
-{
-    if (InspectorPageAgent* inspectorPageAgent = instrumentingAgents->inspectorPageAgent())
-        inspectorPageAgent->frameStartedLoading(frame);
-}
-
-void InspectorInstrumentation::frameStoppedLoadingImpl(InstrumentingAgents* instrumentingAgents, Frame* frame)
-{
-    if (InspectorPageAgent* inspectorPageAgent = instrumentingAgents->inspectorPageAgent())
-        inspectorPageAgent->frameStoppedLoading(frame);
-}
-
-void InspectorInstrumentation::frameScheduledNavigationImpl(InstrumentingAgents* instrumentingAgents, Frame* frame, double delay)
-{
-    if (InspectorPageAgent* inspectorPageAgent = instrumentingAgents->inspectorPageAgent())
-        inspectorPageAgent->frameScheduledNavigation(frame, delay);
-}
-
-void InspectorInstrumentation::frameClearedScheduledNavigationImpl(InstrumentingAgents* instrumentingAgents, Frame* frame)
-{
-    if (InspectorPageAgent* inspectorPageAgent = instrumentingAgents->inspectorPageAgent())
-        inspectorPageAgent->frameClearedScheduledNavigation(frame);
-}
-
 void InspectorInstrumentation::willDestroyCachedResourceImpl(CachedResource* cachedResource)
 {

trunk/Source/WebCore/inspector/InspectorInstrumentation.h

@@ -192 +192 @@
     static void didCommitLoad(Frame*, DocumentLoader*);
     static void loaderDetachedFromFrame(Frame*, DocumentLoader*);
-    static void frameStartedLoading(Frame*);
-    static void frameStoppedLoading(Frame*);
-    static void frameScheduledNavigation(Frame*, double delay);
-    static void frameClearedScheduledNavigation(Frame*);
     static void willDestroyCachedResource(CachedResource*);
 
@@ -395 +391 @@
     static void didCommitLoadImpl(InstrumentingAgents*, Page*, DocumentLoader*);
     static void loaderDetachedFromFrameImpl(InstrumentingAgents*, DocumentLoader*);
-    static void frameStartedLoadingImpl(InstrumentingAgents*, Frame*);
-    static void frameStoppedLoadingImpl(InstrumentingAgents*, Frame*);
-    static void frameScheduledNavigationImpl(InstrumentingAgents*, Frame*, double delay);
-    static void frameClearedScheduledNavigationImpl(InstrumentingAgents*, Frame*);
     static void willDestroyCachedResourceImpl(CachedResource*);
 
@@ -1660 +1652 @@
 }
 
-inline void InspectorInstrumentation::frameStartedLoading(Frame* frame)
-{
-#if ENABLE(INSPECTOR)
-    if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForFrame(frame))
-        frameStartedLoadingImpl(instrumentingAgents, frame);
-#endif
-}
-
-inline void InspectorInstrumentation::frameStoppedLoading(Frame* frame)
-{
-#if ENABLE(INSPECTOR)
-    if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForFrame(frame))
-        frameStoppedLoadingImpl(instrumentingAgents, frame);
-#endif
-}
-
-inline void InspectorInstrumentation::frameScheduledNavigation(Frame* frame, double delay)
-{
-#if ENABLE(INSPECTOR)
-    if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForFrame(frame))
-        frameScheduledNavigationImpl(instrumentingAgents, frame, delay);
-#endif
-}
-
-inline void InspectorInstrumentation::frameClearedScheduledNavigation(Frame* frame)
-{
-#if ENABLE(INSPECTOR)
-    if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForFrame(frame))
-        frameClearedScheduledNavigationImpl(instrumentingAgents, frame);
-#endif
-}
-
 inline void InspectorInstrumentation::willDestroyCachedResource(CachedResource* cachedResource)
 {

trunk/Source/WebCore/inspector/InspectorPageAgent.cpp

@@ -901 +901 @@
 }
 
-void InspectorPageAgent::frameStartedLoading(Frame* frame)
-{
-    m_frontend->frameStartedLoading(frameId(frame));
-}
-
-void InspectorPageAgent::frameStoppedLoading(Frame* frame)
-{
-    m_frontend->frameStoppedLoading(frameId(frame));
-}
-
-void InspectorPageAgent::frameScheduledNavigation(Frame* frame, double delay)
-{
-    m_frontend->frameScheduledNavigation(frameId(frame), delay);
-}
-
-void InspectorPageAgent::frameClearedScheduledNavigation(Frame* frame)
-{
-    m_frontend->frameClearedScheduledNavigation(frameId(frame));
-}
-
 void InspectorPageAgent::applyScreenWidthOverride(long* width)
 {

trunk/Source/WebCore/inspector/InspectorPageAgent.h

@@ -139 +139 @@
     void frameDetached(Frame*);
     void loaderDetachedFromFrame(DocumentLoader*);
-    void frameStartedLoading(Frame*);
-    void frameStoppedLoading(Frame*);
-    void frameScheduledNavigation(Frame*, double delay);
-    void frameClearedScheduledNavigation(Frame*);
     void applyScreenWidthOverride(long*);
     void applyScreenHeightOverride(long*);

trunk/Source/WebCore/inspector/front-end/ResourceTreeModel.js

@@ -602 +602 @@
     {
         this._resourceTreeModel._frameDetached(frameId);
-    },
-
-    frameStartedLoading: function(frameId) {
-    },
-
-    frameStoppedLoading: function(frameId) {
-    },
-
-    frameScheduledNavigation: function(frameId, delay) {
-    },
-
-    frameClearedScheduledNavigation: function(frameId) {
     }
 }

trunk/Source/WebCore/loader/NavigationScheduler.cpp

@@ -46 +46 @@
 #include "HTMLFrameOwnerElement.h"
 #include "HistoryItem.h"
-#include "InspectorInstrumentation.h"
 #include "Page.h"
 #include "UserGestureIndicator.h"
@@ -288 +287 @@
 void NavigationScheduler::clear()
 {
-    if (m_timer.isActive())
-        InspectorInstrumentation::frameClearedScheduledNavigation(m_frame);
     m_timer.stop();
     m_redirect.clear();
@@ -415 +412 @@
     if (!m_frame->page())
         return;
-    if (m_frame->page()->defersLoading()) {
-        InspectorInstrumentation::frameClearedScheduledNavigation(m_frame);
-        return;
-    }
+    if (m_frame->page()->defersLoading())
+        return;
 
     OwnPtr<ScheduledNavigation> redirect(m_redirect.release());
     redirect->fire(m_frame);
-    InspectorInstrumentation::frameClearedScheduledNavigation(m_frame);
 }
 
@@ -465 +459 @@
     m_timer.startOneShot(m_redirect->delay());
     m_redirect->didStartTimer(m_frame, &m_timer);
-    InspectorInstrumentation::frameScheduledNavigation(m_frame, m_redirect->delay());
 }
 
 void NavigationScheduler::cancel(bool newLoadInProgress)
 {
-    if (m_timer.isActive())
-        InspectorInstrumentation::frameClearedScheduledNavigation(m_frame);
     m_timer.stop();
 

trunk/Source/WebCore/loader/ProgressTracker.cpp

@@ -32 +32 @@
 #include "FrameLoaderStateMachine.h"
 #include "FrameLoaderClient.h"
-#include "InspectorInstrumentation.h"
 #include "Logging.h"
 #include "ResourceResponse.h"
@@ -122 +121 @@
 
     frame->loader()->client()->didChangeEstimatedProgress();
-    InspectorInstrumentation::frameStartedLoading(frame);
 }
 
@@ -158 +156 @@
     frame->loader()->client()->setMainFrameDocumentReady(true);
     frame->loader()->client()->postProgressFinishedNotification();
-    InspectorInstrumentation::frameStoppedLoading(frame.get());
 }