Diff
Modified: trunk/LayoutTests/ChangeLog (139916 => 139917)
--- trunk/LayoutTests/ChangeLog 2013-01-16 21:23:34 UTC (rev 139916)
+++ trunk/LayoutTests/ChangeLog 2013-01-16 21:33:01 UTC (rev 139917)
@@ -1,3 +1,17 @@
+2013-01-16 Sheriff Bot <[email protected]>
+
+ 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 <[email protected]>
[Chromium] Unreviewed gardening.
Modified: trunk/Source/WebCore/ChangeLog (139916 => 139917)
--- trunk/Source/WebCore/ChangeLog 2013-01-16 21:23:34 UTC (rev 139916)
+++ trunk/Source/WebCore/ChangeLog 2013-01-16 21:33:01 UTC (rev 139917)
@@ -1,3 +1,30 @@
+2013-01-16 Sheriff Bot <[email protected]>
+
+ 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 <[email protected]>
Simplify validation and data copying in WebGLBuffer
Modified: trunk/Source/WebCore/inspector/Inspector.json (139916 => 139917)
--- trunk/Source/WebCore/inspector/Inspector.json 2013-01-16 21:23:34 UTC (rev 139916)
+++ trunk/Source/WebCore/inspector/Inspector.json 2013-01-16 21:33:01 UTC (rev 139917)
@@ -494,39 +494,6 @@
{ "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
}
]
},
Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp (139916 => 139917)
--- trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2013-01-16 21:23:34 UTC (rev 139916)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2013-01-16 21:33:01 UTC (rev 139917)
@@ -927,30 +927,6 @@
inspectorPageAgent->loaderDetachedFromFrame(loader);
}
-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)
{
if (!instrumentingAgentsSet)
Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.h (139916 => 139917)
--- trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2013-01-16 21:23:34 UTC (rev 139916)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2013-01-16 21:33:01 UTC (rev 139917)
@@ -191,10 +191,6 @@
static void frameDetachedFromParent(Frame*);
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*);
static InspectorInstrumentationCookie willWriteHTML(Document*, unsigned int length, unsigned int startLine);
@@ -394,10 +390,6 @@
static void frameDetachedFromParentImpl(InstrumentingAgents*, Frame*);
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*);
static InspectorInstrumentationCookie willWriteHTMLImpl(InstrumentingAgents*, unsigned int length, unsigned int startLine, Frame*);
@@ -1659,38 +1651,6 @@
#endif
}
-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)
{
#if ENABLE(INSPECTOR)
Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.cpp (139916 => 139917)
--- trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2013-01-16 21:23:34 UTC (rev 139916)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2013-01-16 21:33:01 UTC (rev 139917)
@@ -900,26 +900,6 @@
m_loaderToIdentifier.remove(iterator);
}
-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)
{
long widthOverride = m_state->getLong(PageAgentState::pageAgentScreenWidthOverride);
Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.h (139916 => 139917)
--- trunk/Source/WebCore/inspector/InspectorPageAgent.h 2013-01-16 21:23:34 UTC (rev 139916)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.h 2013-01-16 21:33:01 UTC (rev 139917)
@@ -138,10 +138,6 @@
void frameNavigated(DocumentLoader*);
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*);
void applyEmulatedMedia(String*);
Modified: trunk/Source/WebCore/inspector/front-end/ResourceTreeModel.js (139916 => 139917)
--- trunk/Source/WebCore/inspector/front-end/ResourceTreeModel.js 2013-01-16 21:23:34 UTC (rev 139916)
+++ trunk/Source/WebCore/inspector/front-end/ResourceTreeModel.js 2013-01-16 21:33:01 UTC (rev 139917)
@@ -601,18 +601,6 @@
frameDetached: function(frameId)
{
this._resourceTreeModel._frameDetached(frameId);
- },
-
- frameStartedLoading: function(frameId) {
- },
-
- frameStoppedLoading: function(frameId) {
- },
-
- frameScheduledNavigation: function(frameId, delay) {
- },
-
- frameClearedScheduledNavigation: function(frameId) {
}
}
Modified: trunk/Source/WebCore/loader/NavigationScheduler.cpp (139916 => 139917)
--- trunk/Source/WebCore/loader/NavigationScheduler.cpp 2013-01-16 21:23:34 UTC (rev 139916)
+++ trunk/Source/WebCore/loader/NavigationScheduler.cpp 2013-01-16 21:33:01 UTC (rev 139917)
@@ -45,7 +45,6 @@
#include "HTMLFormElement.h"
#include "HTMLFrameOwnerElement.h"
#include "HistoryItem.h"
-#include "InspectorInstrumentation.h"
#include "Page.h"
#include "UserGestureIndicator.h"
#include <wtf/CurrentTime.h>
@@ -287,8 +286,6 @@
void NavigationScheduler::clear()
{
- if (m_timer.isActive())
- InspectorInstrumentation::frameClearedScheduledNavigation(m_frame);
m_timer.stop();
m_redirect.clear();
}
@@ -414,14 +411,11 @@
{
if (!m_frame->page())
return;
- if (m_frame->page()->defersLoading()) {
- InspectorInstrumentation::frameClearedScheduledNavigation(m_frame);
+ if (m_frame->page()->defersLoading())
return;
- }
OwnPtr<ScheduledNavigation> redirect(m_redirect.release());
redirect->fire(m_frame);
- InspectorInstrumentation::frameClearedScheduledNavigation(m_frame);
}
void NavigationScheduler::schedule(PassOwnPtr<ScheduledNavigation> redirect)
@@ -464,13 +458,10 @@
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();
OwnPtr<ScheduledNavigation> redirect(m_redirect.release());
Modified: trunk/Source/WebCore/loader/ProgressTracker.cpp (139916 => 139917)
--- trunk/Source/WebCore/loader/ProgressTracker.cpp 2013-01-16 21:23:34 UTC (rev 139916)
+++ trunk/Source/WebCore/loader/ProgressTracker.cpp 2013-01-16 21:33:01 UTC (rev 139917)
@@ -31,7 +31,6 @@
#include "FrameLoader.h"
#include "FrameLoaderStateMachine.h"
#include "FrameLoaderClient.h"
-#include "InspectorInstrumentation.h"
#include "Logging.h"
#include "ResourceResponse.h"
#include <wtf/text/CString.h>
@@ -121,7 +120,6 @@
m_numProgressTrackedFrames++;
frame->loader()->client()->didChangeEstimatedProgress();
- InspectorInstrumentation::frameStartedLoading(frame);
}
void ProgressTracker::progressCompleted(Frame* frame)
@@ -157,7 +155,6 @@
frame->loader()->client()->setMainFrameDocumentReady(true);
frame->loader()->client()->postProgressFinishedNotification();
- InspectorInstrumentation::frameStoppedLoading(frame.get());
}
void ProgressTracker::incrementProgress(unsigned long identifier, const ResourceResponse& response)
