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

[hausmann at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit c2fc3bc36c08d11b188be4b80475e4045bc921b1
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 6 15:06:28 2009 +0000

    Fix the Qt/Windows build by stubbing out the still image
    support for halted plugins for the Qt build.
    
    Patch by Simon Hausmann <simon.hausmann at nokia.com> on 2009-10-06
    Reviewed by Tor Arne Vestbø.
    
    Bugzilla entry https://bugs.webkit.org/show_bug.cgi?id=30130
    tracks removing this by implementing Frame::nodeImage().
    
    * plugins/win/PluginViewWin.cpp:
    (WebCore::PluginView::halt):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49187 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a4552db..3cc6faf 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2009-10-06  Simon Hausmann  <simon.hausmann at nokia.com>
+
+        Reviewed by Tor Arne Vestbø.
+
+        Fix the Qt/Windows build by stubbing out the still image
+        support for halted plugins for the Qt build.
+
+        Bugzilla entry https://bugs.webkit.org/show_bug.cgi?id=30130
+        tracks removing this by implementing Frame::nodeImage().
+
+        * plugins/win/PluginViewWin.cpp:
+        (WebCore::PluginView::halt):
+
 2009-10-05  Holger Hans Peter Freyther  <zecke at selfish.org>
 
         Reviewed by Simon Hausmann.
diff --git a/WebCore/plugins/win/PluginViewWin.cpp b/WebCore/plugins/win/PluginViewWin.cpp
index bc18b61..ccbf6f8 100644
--- a/WebCore/plugins/win/PluginViewWin.cpp
+++ b/WebCore/plugins/win/PluginViewWin.cpp
@@ -1019,9 +1019,11 @@ void PluginView::platformDestroy()
 
 void PluginView::halt()
 {
+#if !PLATFORM(QT)
     // Show a screenshot of the plug-in.
     OwnPtr<HBITMAP> nodeImage(m_parentFrame->nodeImage(m_element));
     toRenderWidget(m_element->renderer())->showSubstituteImage(BitmapImage::create(nodeImage.get()));
+#endif
 
     stop();
     platformDestroy();

-- 
WebKit Debian packaging