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

[andreas.kling at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit c16990fb8fb8ace9cd735f957bad3c2c9631fdf8
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 27 11:45:31 2010 +0000

    2010-09-27  Andreas Kling  <andreas.kling at nokia.com>
    
            Rubber-stamped by Kenneth Rohde Christiansen.
    
            [Qt] 32-bit Flash crashes on repeated SetWindow calls
            https://bugs.webkit.org/show_bug.cgi?id=46616
    
            Re-enable PluginQuirkDontCallSetWindowMoreThanOnce for Qt on x86 Unix.
    
            We incorrectly thought this was fixed in Flash 10, but it turns out it
            was just never broken on 64-bit.
    
            * plugins/PluginPackage.cpp:
            (WebCore::PluginPackage::determineQuirks):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68381 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0a417b2..848724b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-09-27  Andreas Kling  <andreas.kling at nokia.com>
+
+        Rubber-stamped by Kenneth Rohde Christiansen.
+
+        [Qt] 32-bit Flash crashes on repeated SetWindow calls
+        https://bugs.webkit.org/show_bug.cgi?id=46616
+
+        Re-enable PluginQuirkDontCallSetWindowMoreThanOnce for Qt on x86 Unix.
+
+        We incorrectly thought this was fixed in Flash 10, but it turns out it
+        was just never broken on 64-bit.
+
+        * plugins/PluginPackage.cpp:
+        (WebCore::PluginPackage::determineQuirks):
+
 2010-09-27  İsmail Dönmez  <ismail at namtrac.org>
 
         Reviewed by Andreas Kling.
diff --git a/WebCore/plugins/PluginPackage.cpp b/WebCore/plugins/PluginPackage.cpp
index 99445e7..bb25312 100644
--- a/WebCore/plugins/PluginPackage.cpp
+++ b/WebCore/plugins/PluginPackage.cpp
@@ -204,12 +204,13 @@ void PluginPackage::determineQuirks(const String& mimeType)
         } else {
             // Flash 9 and older requests windowless plugins if we return a mozilla user agent
             m_quirks.add(PluginQuirkWantsMozillaUserAgent);
-#if PLATFORM(QT)
-            // Flash 9 and older would crash on repeated calls to SetWindow in windowed mode
-            m_quirks.add(PluginQuirkDontCallSetWindowMoreThanOnce);
-#endif
         }
 
+#if PLATFORM(QT) && CPU(X86)
+        // 32-bit Flash will crash on repeated calls to SetWindow in windowed mode
+        m_quirks.add(PluginQuirkDontCallSetWindowMoreThanOnce);
+#endif
+
         m_quirks.add(PluginQuirkRequiresDefaultScreenDepth);
         m_quirks.add(PluginQuirkThrottleInvalidate);
         m_quirks.add(PluginQuirkThrottleWMUserPlusOneMessages);

-- 
WebKit Debian packaging