[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[loislo at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 3ba13c97ffc22f1cf41464e946a420375e033635
Author: loislo at chromium.org <loislo at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 24 12:08:38 2010 +0000

    2010-09-24  Ilya Tikhonovsky  <loislo at chromium.org>
    
            Reviewed by Yury Semikhatsky.
    
            Web Inspector: CRASH at node highlight on MAC Safari.
            1) run-safari --debug
            2) open inspector
            3) open elements panel
            4) hover mouse over elements panel items multiple times
            5) CRASH
            Looks like it is a race condition. WebNodeHighlightView doesn't check
            the pointer to WebNodeHighligh object and it can be nil.
    
            https://bugs.webkit.org/show_bug.cgi?id=46261
    
            * WebInspector/WebNodeHighlightView.mm:
            (-[WebNodeHighlightView drawRect:]):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68247 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 42197fd..25d7b25 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,21 @@
+2010-09-24  Ilya Tikhonovsky  <loislo at chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: CRASH at node highlight on MAC Safari.
+        1) run-safari --debug
+        2) open inspector
+        3) open elements panel
+        4) hover mouse over elements panel items multiple times
+        5) CRASH
+        Looks like it is a race condition. WebNodeHighlightView doesn't check
+        the pointer to WebNodeHighligh object and it can be nil.
+
+        https://bugs.webkit.org/show_bug.cgi?id=46261
+
+        * WebInspector/WebNodeHighlightView.mm:
+        (-[WebNodeHighlightView drawRect:]):
+
 2010-09-23  Andy Estes  <aestes at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebKit/mac/WebInspector/WebNodeHighlightView.mm b/WebKit/mac/WebInspector/WebNodeHighlightView.mm
index b3cd69e..7fc3cf4 100644
--- a/WebKit/mac/WebInspector/WebNodeHighlightView.mm
+++ b/WebKit/mac/WebInspector/WebNodeHighlightView.mm
@@ -67,14 +67,15 @@ using namespace WebCore;
 
 - (void)drawRect:(NSRect)rect 
 {
-    [NSGraphicsContext saveGraphicsState];
+    if (_webNodeHighlight) {
+        [NSGraphicsContext saveGraphicsState];
 
-    ASSERT([[NSGraphicsContext currentContext] isFlipped]);
+        ASSERT([[NSGraphicsContext currentContext] isFlipped]);
 
-    GraphicsContext context((PlatformGraphicsContext*)[[NSGraphicsContext currentContext] graphicsPort]);
-    [_webNodeHighlight inspectorController]->drawNodeHighlight(context);
-
-    [NSGraphicsContext restoreGraphicsState];
+        GraphicsContext context((PlatformGraphicsContext*)[[NSGraphicsContext currentContext] graphicsPort]);
+        [_webNodeHighlight inspectorController]->drawNodeHighlight(context);
+        [NSGraphicsContext restoreGraphicsState];
+    }
 }
 
 - (WebNodeHighlight *)webNodeHighlight

-- 
WebKit Debian packaging