[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[mrowe at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 67018916705a2c6fd9f87588de436edf9e28eba9
Author: mrowe at apple.com <mrowe at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 26 07:40:05 2010 +0000

    <rdar://problem/7688455> REGRESSION(r55205): Crash inside dispatchEventsOnWindowAndFocusedNode when clicking link from bookmarks view
    
    Reviewed by Brady Eidson.
    
    Null-check the document's page to avoid dereferencing a null page.
    
    No regression test is added as this appears to be dependent on an interaction with Safari's bookmarks view that is
    not testable from within DumpRenderTree.
    
    * page/FocusController.cpp:
    (WebCore::dispatchEventsOnWindowAndFocusedNode):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55270 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 467877b..537736c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-02-25  Mark Rowe  <mrowe at apple.com>
+
+        Reviewed by Brady Eidson.
+
+        <rdar://problem/7688455> REGRESSION(r55205): Crash inside dispatchEventsOnWindowAndFocusedNode when clicking link from bookmarks view
+
+        Null-check the document's page to avoid dereferencing a null page.
+
+        No regression test is added as this appears to be dependent on an interaction with Safari's bookmarks view that is
+        not testable from within DumpRenderTree.
+
+        * page/FocusController.cpp:
+        (WebCore::dispatchEventsOnWindowAndFocusedNode):
+
 2010-02-25  Oliver Hunt  <oliver at apple.com>
 
         Reviewed by Simon Fraser.
diff --git a/WebCore/page/FocusController.cpp b/WebCore/page/FocusController.cpp
index 21779f9..f94eaf9 100644
--- a/WebCore/page/FocusController.cpp
+++ b/WebCore/page/FocusController.cpp
@@ -61,10 +61,13 @@ static inline void dispatchEventsOnWindowAndFocusedNode(Document* document, bool
     // If we have a focused node we should dispatch blur on it before we blur the window.
     // If we have a focused node we should dispatch focus on it after we focus the window.
     // https://bugs.webkit.org/show_bug.cgi?id=27105
-  
+
     // Do not fire events while modal dialogs are up.  See https://bugs.webkit.org/show_bug.cgi?id=33962
-    if (document->page()->defersLoading())
-        return;
+    if (Page* page = document->page()) {
+        if (page->defersLoading())
+            return;
+    }
+
     if (!focused && document->focusedNode())
         document->focusedNode()->dispatchBlurEvent();
     document->dispatchWindowEvent(Event::create(focused ? eventNames().focusEvent : eventNames().blurEvent, false, false));

-- 
WebKit Debian packaging