Title: [161633] trunk/Source/WebCore
- Revision
- 161633
- Author
- ander...@apple.com
- Date
- 2014-01-10 07:40:52 -0800 (Fri, 10 Jan 2014)
Log Message
Tighten up two functions in the inspector code
https://bugs.webkit.org/show_bug.cgi?id=126751
Reviewed by Antti Koivisto.
* inspector/InspectorInstrumentation.cpp:
(WebCore::InspectorInstrumentation::frameStartedLoadingImpl):
(WebCore::InspectorInstrumentation::frameStoppedLoadingImpl):
* inspector/InspectorInstrumentation.h:
(WebCore::InspectorInstrumentation::frameStartedLoading):
(WebCore::InspectorInstrumentation::frameStoppedLoading):
* inspector/InspectorPageAgent.cpp:
(WebCore::InspectorPageAgent::frameStartedLoading):
(WebCore::InspectorPageAgent::frameStoppedLoading):
* inspector/InspectorPageAgent.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (161632 => 161633)
--- trunk/Source/WebCore/ChangeLog 2014-01-10 14:30:16 UTC (rev 161632)
+++ trunk/Source/WebCore/ChangeLog 2014-01-10 15:40:52 UTC (rev 161633)
@@ -1,3 +1,21 @@
+2014-01-10 Anders Carlsson <ander...@apple.com>
+
+ Tighten up two functions in the inspector code
+ https://bugs.webkit.org/show_bug.cgi?id=126751
+
+ Reviewed by Antti Koivisto.
+
+ * inspector/InspectorInstrumentation.cpp:
+ (WebCore::InspectorInstrumentation::frameStartedLoadingImpl):
+ (WebCore::InspectorInstrumentation::frameStoppedLoadingImpl):
+ * inspector/InspectorInstrumentation.h:
+ (WebCore::InspectorInstrumentation::frameStartedLoading):
+ (WebCore::InspectorInstrumentation::frameStoppedLoading):
+ * inspector/InspectorPageAgent.cpp:
+ (WebCore::InspectorPageAgent::frameStartedLoading):
+ (WebCore::InspectorPageAgent::frameStoppedLoading):
+ * inspector/InspectorPageAgent.h:
+
2014-01-10 Antti Koivisto <an...@apple.com>
Crash when mutating SVG text with transform
Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp (161632 => 161633)
--- trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2014-01-10 14:30:16 UTC (rev 161632)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2014-01-10 15:40:52 UTC (rev 161633)
@@ -866,15 +866,15 @@
inspectorPageAgent->loaderDetachedFromFrame(loader);
}
-void InspectorInstrumentation::frameStartedLoadingImpl(InstrumentingAgents* instrumentingAgents, Frame* frame)
+void InspectorInstrumentation::frameStartedLoadingImpl(InstrumentingAgents& instrumentingAgents, Frame& frame)
{
- if (InspectorPageAgent* inspectorPageAgent = instrumentingAgents->inspectorPageAgent())
+ if (InspectorPageAgent* inspectorPageAgent = instrumentingAgents.inspectorPageAgent())
inspectorPageAgent->frameStartedLoading(frame);
}
-void InspectorInstrumentation::frameStoppedLoadingImpl(InstrumentingAgents* instrumentingAgents, Frame* frame)
+void InspectorInstrumentation::frameStoppedLoadingImpl(InstrumentingAgents& instrumentingAgents, Frame& frame)
{
- if (InspectorPageAgent* inspectorPageAgent = instrumentingAgents->inspectorPageAgent())
+ if (InspectorPageAgent* inspectorPageAgent = instrumentingAgents.inspectorPageAgent())
inspectorPageAgent->frameStoppedLoading(frame);
}
Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.h (161632 => 161633)
--- trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2014-01-10 14:30:16 UTC (rev 161632)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2014-01-10 15:40:52 UTC (rev 161633)
@@ -386,8 +386,8 @@
static void didCommitLoadImpl(InstrumentingAgents*, Page*, DocumentLoader*);
static void frameDocumentUpdatedImpl(InstrumentingAgents*, Frame*);
static void loaderDetachedFromFrameImpl(InstrumentingAgents*, DocumentLoader*);
- static void frameStartedLoadingImpl(InstrumentingAgents*, Frame*);
- static void frameStoppedLoadingImpl(InstrumentingAgents*, Frame*);
+ static void frameStartedLoadingImpl(InstrumentingAgents&, Frame&);
+ static void frameStoppedLoadingImpl(InstrumentingAgents&, Frame&);
static void frameScheduledNavigationImpl(InstrumentingAgents*, Frame*, double delay);
static void frameClearedScheduledNavigationImpl(InstrumentingAgents*, Frame*);
static InspectorInstrumentationCookie willRunJavaScriptDialogImpl(InstrumentingAgents*, const String& message);
@@ -1610,7 +1610,7 @@
{
#if ENABLE(INSPECTOR)
if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForFrame(&frame))
- frameStartedLoadingImpl(instrumentingAgents, &frame);
+ frameStartedLoadingImpl(*instrumentingAgents, frame);
#else
UNUSED_PARAM(frame);
#endif
@@ -1620,7 +1620,7 @@
{
#if ENABLE(INSPECTOR)
if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForFrame(&frame))
- frameStoppedLoadingImpl(instrumentingAgents, &frame);
+ frameStoppedLoadingImpl(*instrumentingAgents, frame);
#else
UNUSED_PARAM(frame);
#endif
Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.cpp (161632 => 161633)
--- trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2014-01-10 14:30:16 UTC (rev 161632)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2014-01-10 15:40:52 UTC (rev 161633)
@@ -877,14 +877,14 @@
m_loaderToIdentifier.remove(iterator);
}
-void InspectorPageAgent::frameStartedLoading(Frame* frame)
+void InspectorPageAgent::frameStartedLoading(Frame& frame)
{
- m_frontendDispatcher->frameStartedLoading(frameId(frame));
+ m_frontendDispatcher->frameStartedLoading(frameId(&frame));
}
-void InspectorPageAgent::frameStoppedLoading(Frame* frame)
+void InspectorPageAgent::frameStoppedLoading(Frame& frame)
{
- m_frontendDispatcher->frameStoppedLoading(frameId(frame));
+ m_frontendDispatcher->frameStoppedLoading(frameId(&frame));
}
void InspectorPageAgent::frameScheduledNavigation(Frame* frame, double delay)
Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.h (161632 => 161633)
--- trunk/Source/WebCore/inspector/InspectorPageAgent.h 2014-01-10 14:30:16 UTC (rev 161632)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.h 2014-01-10 15:40:52 UTC (rev 161633)
@@ -133,8 +133,8 @@
void frameNavigated(DocumentLoader*);
void frameDetached(Frame*);
void loaderDetachedFromFrame(DocumentLoader*);
- void frameStartedLoading(Frame*);
- void frameStoppedLoading(Frame*);
+ void frameStartedLoading(Frame&);
+ void frameStoppedLoading(Frame&);
void frameScheduledNavigation(Frame*, double delay);
void frameClearedScheduledNavigation(Frame*);
void willRunJavaScriptDialog(const String& message);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
