[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[vestbo at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 262dbed5e30a95de059e6b86fc3afd30b3c35f65
Author: vestbo at webkit.org <vestbo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 1 15:34:25 2010 +0000

    [Qt] Fix segfault when drawing NPAPI plugins on Mac
    
    Reviewed by Simon Hausmann.
    
    Don't try to get a contexctRef for a null-pixmap. If the pixmap
    size is 0,0 the private pixmap data has not yet been initialized.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55368 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 769acc8..82d1d9f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,17 @@
 
         Reviewed by Simon Hausmann.
 
+        [Qt] Fix segfault when drawing NPAPI plugins on Mac
+
+        Don't try to get a contexctRef for a null-pixmap. If the pixmap
+        size is 0,0 the private pixmap data has not yet been initialized.
+
+        * plugins/mac/PluginViewMac.cpp:
+
+2010-03-01  Tor Arne Vestbø  <tor.arne.vestbo at nokia.com>
+
+        Reviewed by Simon Hausmann.
+
         Fix the Qt build on Mac OS X/Cocoa 64-bit
 
         Use the proper event/drawing-model guards instead of global 64-bit
diff --git a/WebCore/plugins/mac/PluginViewMac.cpp b/WebCore/plugins/mac/PluginViewMac.cpp
index 3f54195..762709d 100644
--- a/WebCore/plugins/mac/PluginViewMac.cpp
+++ b/WebCore/plugins/mac/PluginViewMac.cpp
@@ -486,7 +486,7 @@ void PluginView::updatePluginWidget()
 #if PLATFORM(QT)
             m_pixmap = QPixmap(m_windowRect.size());
             m_pixmap.fill(Qt::transparent);
-            m_contextRef = qt_mac_cg_context(&m_pixmap);
+            m_contextRef = m_pixmap.isNull() ? 0 : qt_mac_cg_context(&m_pixmap);
 #endif
         }
     }

-- 
WebKit Debian packaging