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

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit bf14f6e7560da144f171b836ab29b34e879a83a8
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 12 00:09:55 2010 +0000

    2010-01-11  Andreas Kling  <andreas.kling at nokia.com>
    
            Reviewed by Darin Adler.
    
            Fixed an uninitialized PluginView member (m_mode) which wasn't
            set when constructed with a null PluginPackage*
    
            https://bugs.webkit.org/show_bug.cgi?id=33468
    
            * plugins/PluginView.cpp:
            (WebCore::PluginView::PluginView):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53109 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b2a8d40..f01a53a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-01-11  Andreas Kling  <andreas.kling at nokia.com>
+
+        Reviewed by Darin Adler.
+
+        Fixed an uninitialized PluginView member (m_mode) which wasn't
+        set when constructed with a null PluginPackage*
+
+        https://bugs.webkit.org/show_bug.cgi?id=33468
+
+        * plugins/PluginView.cpp:
+        (WebCore::PluginView::PluginView):
+
 2010-01-11  Dirk Schulze  <krit at webkit.org>
 
         Reviewed by Nikolas Zimmermann.
diff --git a/WebCore/plugins/PluginView.cpp b/WebCore/plugins/PluginView.cpp
index e79eb88..3be1b05 100644
--- a/WebCore/plugins/PluginView.cpp
+++ b/WebCore/plugins/PluginView.cpp
@@ -789,6 +789,7 @@ PluginView::PluginView(Frame* parentFrame, const IntSize& size, PluginPackage* p
     , m_requestTimer(this, &PluginView::requestTimerFired)
     , m_invalidateTimer(this, &PluginView::invalidateTimerFired)
     , m_popPopupsStateTimer(this, &PluginView::popPopupsStateTimerFired)
+    , m_mode(loadManually ? NP_FULL : NP_EMBED)
     , m_paramNames(0)
     , m_paramValues(0)
     , m_mimeType(mimeType)
@@ -848,8 +849,6 @@ PluginView::PluginView(Frame* parentFrame, const IntSize& size, PluginPackage* p
     memset(&m_npCgContext, 0, sizeof(m_npCgContext));
 #endif
 
-    m_mode = m_loadManually ? NP_FULL : NP_EMBED;
-
     resize(size);
 }
 

-- 
WebKit Debian packaging