Changeset 95790 in webkit

Timestamp:

Sep 23, 2011 3:46:54 AM (13 years ago)

Author:

vsevik@chromium.org

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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (1 diff)
• inspector/InspectorInstrumentation.cpp (modified) (2 diffs)
• inspector/InspectorInstrumentation.h (modified) (3 diffs)
• page/DOMWindow.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-23  Vsevolod Vlasov  <vsevik@chromium.org>
+
+        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  <tony@chromium.org>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -4285 +4285 @@
         f->loader()->finishedParsing();
 
-        InspectorInstrumentation::domContentLoadedEventFired(f.get(), url());
+        InspectorInstrumentation::domContentLoadedEventFired(f.get());
     }
 }

trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp

@@ -571 +571 @@
 }
 
-void InspectorInstrumentation::domContentLoadedEventFiredImpl(InstrumentingAgents* instrumentingAgents, Frame* frame, const KURL& url)
-{
-    DocumentLoader* documentLoader = frame->loader()->documentLoader();
-    ASSERT(documentLoader);
-
-    if (frame->page()->mainFrame() != frame || url != documentLoader->requestURL())
+void InspectorInstrumentation::domContentLoadedEventFiredImpl(InstrumentingAgents* instrumentingAgents, Frame* frame)
+{
+    if (frame->page()->mainFrame() != frame)
         return;
 
@@ -592 +589 @@
 }
 
-void InspectorInstrumentation::loadEventFiredImpl(InstrumentingAgents* instrumentingAgents, Frame* frame, const KURL& url)
-{
-    DocumentLoader* documentLoader = frame->loader()->documentLoader();
-    ASSERT(documentLoader);
-
+void InspectorInstrumentation::loadEventFiredImpl(InstrumentingAgents* instrumentingAgents, Frame* frame)
+{
     if (InspectorDOMAgent* domAgent = instrumentingAgents->inspectorDOMAgent())
-        domAgent->loadEventFired(documentLoader->frame()->document());
-
-    if (frame->page()->mainFrame() != frame || url != documentLoader->requestURL())
+        domAgent->loadEventFired(frame->document());
+
+    if (frame->page()->mainFrame() != frame)
         return;
 

trunk/Source/WebCore/inspector/InspectorInstrumentation.h

@@ -139 +139 @@
     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*);
@@ -273 +273 @@
     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*);
@@ -868 +868 @@
 }
 
-inline void InspectorInstrumentation::domContentLoadedEventFired(Frame* frame, const KURL& url)
-{
-#if ENABLE(INSPECTOR)
-    if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForFrame(frame))
-        domContentLoadedEventFiredImpl(instrumentingAgents, frame, url);
-#endif
-}
-
-inline void InspectorInstrumentation::loadEventFired(Frame* frame, const KURL& url)
-{
-#if ENABLE(INSPECTOR)
-    if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForFrame(frame))
-        loadEventFiredImpl(instrumentingAgents, frame, url);
+inline void InspectorInstrumentation::domContentLoadedEventFired(Frame* frame)
+{
+#if ENABLE(INSPECTOR)
+    if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForFrame(frame))
+        domContentLoadedEventFiredImpl(instrumentingAgents, frame);
+#endif
+}
+
+inline void InspectorInstrumentation::loadEventFired(Frame* frame)
+{
+#if ENABLE(INSPECTOR)
+    if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForFrame(frame))
+        loadEventFiredImpl(instrumentingAgents, frame);
 #endif
 }

trunk/Source/WebCore/page/DOMWindow.cpp

@@ -1581 +1581 @@
         ownerElement->dispatchEvent(Event::create(eventNames().loadEvent, false, false));
 
-    InspectorInstrumentation::loadEventFired(frame(), url());
+    InspectorInstrumentation::loadEventFired(frame());
 }