[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[bweinstein at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 7026b81bd6aa9fab401d3050fd05a8439fadd85d
Author: bweinstein at apple.com <bweinstein at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 2 21:49:56 2009 +0000

    2009-10-02  Brian Weinstein  <bweinstein at apple.com>
    
            Reviewed by Jon Honeycutt.
    
            Fix test breakages by adding null checks, and putting inspector code in
            ENABLE(INSPECTOR).
    
            * dom/Document.cpp:
            (WebCore::Document::finishedParsing):
            * page/DOMWindow.cpp:
            (WebCore::DOMWindow::dispatchLoadEvent):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49043 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index dc310f3..0cedb6b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2009-10-02  Brian Weinstein  <bweinstein at apple.com>
+
+        Reviewed by Jon Honeycutt.
+
+        Fix test breakages by adding null checks, and putting inspector code in
+        ENABLE(INSPECTOR).
+
+        * dom/Document.cpp:
+        (WebCore::Document::finishedParsing):
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::dispatchLoadEvent):
+
 2009-10-02  Kenneth Rohde Christiansen  <kenneth at webkit.org>
 
         Reviewed by Simon Hausmann.
diff --git a/WebCore/dom/Document.cpp b/WebCore/dom/Document.cpp
index 2a30893..9f8a893 100644
--- a/WebCore/dom/Document.cpp
+++ b/WebCore/dom/Document.cpp
@@ -4019,9 +4019,14 @@ void Document::finishedParsing()
     if (Frame* f = frame()) {
         f->loader()->finishedParsing();
 
+#if ENABLE(INSPECTOR)
+        if (!page())
+            return;
+
         if (InspectorController* controller = page()->inspectorController())
             controller->mainResourceFiredDOMContentEvent(f->loader()->documentLoader(), url());
     }
+#endif
 }
 
 Vector<String> Document::formElementsState() const
diff --git a/WebCore/page/DOMWindow.cpp b/WebCore/page/DOMWindow.cpp
index d1821fd..0ff8811 100644
--- a/WebCore/page/DOMWindow.cpp
+++ b/WebCore/page/DOMWindow.cpp
@@ -1297,8 +1297,13 @@ void DOMWindow::dispatchLoadEvent()
         ownerElement->dispatchGenericEvent(ownerEvent.release());
     }
 
+#if ENABLE(INSPECTOR)
+    if (!frame() || !frame()->page())
+        return;
+
     if (InspectorController* controller = frame()->page()->inspectorController())
         controller->mainResourceFiredLoadEvent(frame()->loader()->documentLoader(), url());
+#endif
 }
 
 bool DOMWindow::dispatchEvent(PassRefPtr<Event> prpEvent, PassRefPtr<EventTarget> prpTarget)

-- 
WebKit Debian packaging