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

andreas.kling at nokia.com andreas.kling at nokia.com
Wed Dec 22 14:14:48 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 973afea49ea20a4cd3b77fd521c9323f26a196f5
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 5 21:41:41 2010 +0000

    2010-10-05  Andreas Kling  <kling at webkit.org>
    
            Reviewed by Tor Arne Vestbø.
    
            [Qt] Re-enable single-NPP_SetWindow quirk for 64-bit
            https://bugs.webkit.org/show_bug.cgi?id=45363
    
            This is still causing trouble for people, so let's put the
            quirk back until we can figure this out properly.
    
            * plugins/PluginPackage.cpp:
            (WebCore::PluginPackage::determineQuirks):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69149 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1130cc3..5bb66ae 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-05  Andreas Kling  <kling at webkit.org>
+
+        Reviewed by Tor Arne Vestbø.
+
+        [Qt] Re-enable single-NPP_SetWindow quirk for 64-bit
+        https://bugs.webkit.org/show_bug.cgi?id=45363
+
+        This is still causing trouble for people, so let's put the
+        quirk back until we can figure this out properly.
+
+        * plugins/PluginPackage.cpp:
+        (WebCore::PluginPackage::determineQuirks):
+
 2010-10-05  Jian Li  <jianli at chromium.org>
 
         Reviewed by Nate Chapin.
diff --git a/WebCore/plugins/PluginPackage.cpp b/WebCore/plugins/PluginPackage.cpp
index bb25312..39c5f2a 100644
--- a/WebCore/plugins/PluginPackage.cpp
+++ b/WebCore/plugins/PluginPackage.cpp
@@ -206,8 +206,8 @@ void PluginPackage::determineQuirks(const String& mimeType)
             m_quirks.add(PluginQuirkWantsMozillaUserAgent);
         }
 
-#if PLATFORM(QT) && CPU(X86)
-        // 32-bit Flash will crash on repeated calls to SetWindow in windowed mode
+#if PLATFORM(QT)
+        // Flash will crash on repeated calls to SetWindow in windowed mode
         m_quirks.add(PluginQuirkDontCallSetWindowMoreThanOnce);
 #endif
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list