- Revision
- 95790
- Author
- [email protected]
- Date
- 2011-09-23 03:46:54 -0700 (Fri, 23 Sep 2011)
Log Message
ASSERTION FAILED: documentLoader in WebKit/Source/WebCore/inspector/InspectorInstrumentation.cpp(597)
https://bugs.webkit.org/show_bug.cgi?id=68291
Reviewed by Tony Chang.
* dom/Document.cpp:
(WebCore::Document::finishedParsing):
* inspector/InspectorInstrumentation.cpp:
(WebCore::InspectorInstrumentation::domContentLoadedEventFiredImpl):
(WebCore::InspectorInstrumentation::loadEventFiredImpl):
* inspector/InspectorInstrumentation.h:
(WebCore::InspectorInstrumentation::domContentLoadedEventFired):
(WebCore::InspectorInstrumentation::loadEventFired):
* page/DOMWindow.cpp:
(WebCore::DOMWindow::dispatchLoadEvent):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (95789 => 95790)
--- trunk/Source/WebCore/ChangeLog 2011-09-23 10:35:28 UTC (rev 95789)
+++ trunk/Source/WebCore/ChangeLog 2011-09-23 10:46:54 UTC (rev 95790)
@@ -1,3 +1,21 @@
+2011-09-23 Vsevolod Vlasov <[email protected]>
+
+ ASSERTION FAILED: documentLoader in WebKit/Source/WebCore/inspector/InspectorInstrumentation.cpp(597)
+ https://bugs.webkit.org/show_bug.cgi?id=68291
+
+ Reviewed by Tony Chang.
+
+ * dom/Document.cpp:
+ (WebCore::Document::finishedParsing):
+ * inspector/InspectorInstrumentation.cpp:
+ (WebCore::InspectorInstrumentation::domContentLoadedEventFiredImpl):
+ (WebCore::InspectorInstrumentation::loadEventFiredImpl):
+ * inspector/InspectorInstrumentation.h:
+ (WebCore::InspectorInstrumentation::domContentLoadedEventFired):
+ (WebCore::InspectorInstrumentation::loadEventFired):
+ * page/DOMWindow.cpp:
+ (WebCore::DOMWindow::dispatchLoadEvent):
+
2011-09-22 Tony Chang <[email protected]>
implement -webkit-flex-order
Modified: trunk/Source/WebCore/dom/Document.cpp (95789 => 95790)
--- trunk/Source/WebCore/dom/Document.cpp 2011-09-23 10:35:28 UTC (rev 95789)
+++ trunk/Source/WebCore/dom/Document.cpp 2011-09-23 10:46:54 UTC (rev 95790)
@@ -4284,7 +4284,7 @@
f->loader()->finishedParsing();
- InspectorInstrumentation::domContentLoadedEventFired(f.get(), url());
+ InspectorInstrumentation::domContentLoadedEventFired(f.get());
}
}
Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp (95789 => 95790)
--- trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2011-09-23 10:35:28 UTC (rev 95789)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2011-09-23 10:46:54 UTC (rev 95790)
@@ -570,12 +570,9 @@
resourceAgent->didReceiveScriptResponse(identifier);
}
-void InspectorInstrumentation::domContentLoadedEventFiredImpl(InstrumentingAgents* instrumentingAgents, Frame* frame, const KURL& url)
+void InspectorInstrumentation::domContentLoadedEventFiredImpl(InstrumentingAgents* instrumentingAgents, Frame* frame)
{
- DocumentLoader* documentLoader = frame->loader()->documentLoader();
- ASSERT(documentLoader);
-
- if (frame->page()->mainFrame() != frame || url != documentLoader->requestURL())
+ if (frame->page()->mainFrame() != frame)
return;
if (InspectorAgent* inspectorAgent = instrumentingAgents->inspectorAgent())
@@ -591,15 +588,12 @@
pageAgent->domContentEventFired();
}
-void InspectorInstrumentation::loadEventFiredImpl(InstrumentingAgents* instrumentingAgents, Frame* frame, const KURL& url)
+void InspectorInstrumentation::loadEventFiredImpl(InstrumentingAgents* instrumentingAgents, Frame* frame)
{
- DocumentLoader* documentLoader = frame->loader()->documentLoader();
- ASSERT(documentLoader);
-
if (InspectorDOMAgent* domAgent = instrumentingAgents->inspectorDOMAgent())
- domAgent->loadEventFired(documentLoader->frame()->document());
+ domAgent->loadEventFired(frame->document());
- if (frame->page()->mainFrame() != frame || url != documentLoader->requestURL())
+ if (frame->page()->mainFrame() != frame)
return;
if (InspectorTimelineAgent* timelineAgent = instrumentingAgents->inspectorTimelineAgent())
Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.h (95789 => 95790)
--- trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2011-09-23 10:35:28 UTC (rev 95789)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2011-09-23 10:46:54 UTC (rev 95790)
@@ -138,8 +138,8 @@
static void didLoadXHRSynchronously(ScriptExecutionContext*);
static void scriptImported(ScriptExecutionContext*, unsigned long identifier, const String& sourceString);
static void didReceiveScriptResponse(ScriptExecutionContext*, unsigned long identifier);
- static void domContentLoadedEventFired(Frame*, const KURL&);
- static void loadEventFired(Frame*, const KURL&);
+ static void domContentLoadedEventFired(Frame*);
+ static void loadEventFired(Frame*);
static void frameDetachedFromParent(Frame*);
static void didCommitLoad(Frame*, DocumentLoader*);
static void loaderDetachedFromFrame(Frame*, DocumentLoader*);
@@ -272,8 +272,8 @@
static void didLoadXHRSynchronouslyImpl(InstrumentingAgents*);
static void scriptImportedImpl(InstrumentingAgents*, unsigned long identifier, const String& sourceString);
static void didReceiveScriptResponseImpl(InstrumentingAgents*, unsigned long identifier);
- static void domContentLoadedEventFiredImpl(InstrumentingAgents*, Frame*, const KURL&);
- static void loadEventFiredImpl(InstrumentingAgents*, Frame*, const KURL&);
+ static void domContentLoadedEventFiredImpl(InstrumentingAgents*, Frame*);
+ static void loadEventFiredImpl(InstrumentingAgents*, Frame*);
static void frameDetachedFromParentImpl(InstrumentingAgents*, Frame*);
static void didCommitLoadImpl(InstrumentingAgents*, Page*, DocumentLoader*);
static void loaderDetachedFromFrameImpl(InstrumentingAgents*, DocumentLoader*);
@@ -867,19 +867,19 @@
#endif
}
-inline void InspectorInstrumentation::domContentLoadedEventFired(Frame* frame, const KURL& url)
+inline void InspectorInstrumentation::domContentLoadedEventFired(Frame* frame)
{
#if ENABLE(INSPECTOR)
if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForFrame(frame))
- domContentLoadedEventFiredImpl(instrumentingAgents, frame, url);
+ domContentLoadedEventFiredImpl(instrumentingAgents, frame);
#endif
}
-inline void InspectorInstrumentation::loadEventFired(Frame* frame, const KURL& url)
+inline void InspectorInstrumentation::loadEventFired(Frame* frame)
{
#if ENABLE(INSPECTOR)
if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForFrame(frame))
- loadEventFiredImpl(instrumentingAgents, frame, url);
+ loadEventFiredImpl(instrumentingAgents, frame);
#endif
}
Modified: trunk/Source/WebCore/page/DOMWindow.cpp (95789 => 95790)
--- trunk/Source/WebCore/page/DOMWindow.cpp 2011-09-23 10:35:28 UTC (rev 95789)
+++ trunk/Source/WebCore/page/DOMWindow.cpp 2011-09-23 10:46:54 UTC (rev 95790)
@@ -1580,7 +1580,7 @@
if (ownerElement)
ownerElement->dispatchEvent(Event::create(eventNames().loadEvent, false, false));
- InspectorInstrumentation::loadEventFired(frame(), url());
+ InspectorInstrumentation::loadEventFired(frame());
}
bool DOMWindow::dispatchEvent(PassRefPtr<Event> prpEvent, PassRefPtr<EventTarget> prpTarget)
