[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit f5b7fe0f1982ca72a4bcd526b67f44acd180296f
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 10 22:47:22 2011 +0000

    2011-01-10  Leonid Ebril  <leonid.ebril at nokia.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            https://bugs.webkit.org/show_bug.cgi?id=51879
    
            Set the PluginQuirkDontSetNullWindowHandleOnDestroy for Adobe Lite
            plugin if Flash 10 or newer (for Symbian platform), setting a nulled
            window handler on destroy crashes WebKit.
    
            * plugins/symbian/PluginPackageSymbian.cpp:
            (WebCore::PluginPackage::fetchInfo):
            (WebCore::PluginPackage::determineQuirks):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75439 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index d5cb9dc..1489ce7 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2011-01-10  Leonid Ebril  <leonid.ebril at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        https://bugs.webkit.org/show_bug.cgi?id=51879
+
+        Set the PluginQuirkDontSetNullWindowHandleOnDestroy for Adobe Lite  
+        plugin if Flash 10 or newer (for Symbian platform), setting a nulled 
+        window handler on destroy crashes WebKit.
+
+        * plugins/symbian/PluginPackageSymbian.cpp:
+        (WebCore::PluginPackage::fetchInfo):
+        (WebCore::PluginPackage::determineQuirks):
+
 2011-01-10  Martin Robinson  <mrobinson at igalia.com>
 
         Reviewed by Xan Lopez.
diff --git a/Source/WebCore/plugins/symbian/PluginPackageSymbian.cpp b/Source/WebCore/plugins/symbian/PluginPackageSymbian.cpp
index 7fca625..a14ac20 100644
--- a/Source/WebCore/plugins/symbian/PluginPackageSymbian.cpp
+++ b/Source/WebCore/plugins/symbian/PluginPackageSymbian.cpp
@@ -55,6 +55,7 @@ bool PluginPackage::fetchInfo()
                 mime[1].split(UChar(','), false, exts); // <ext1,ext2,ext3,...>
             
             m_mimeToExtensions.add(mime[0], exts); // <MIME>,<ext1,ext2,ext3>
+            determineQuirks(mime[0]);
             if (mime.size() > 2)
                 m_mimeToDescriptions.add(mime[0], mime[2]); // <MIME>,<Description>
         }
@@ -63,6 +64,17 @@ bool PluginPackage::fetchInfo()
     return true;
 }
 
+void PluginPackage::determineQuirks(const String& mimeType)
+{
+    if (mimeType == "application/x-shockwave-flash") {
+        PlatformModuleVersion flashTenVersion(0x000a0000);
+        if (compareFileVersion(flashTenVersion) >= 0) {
+            // Flash 10 doesn't like having a 0 window handle.
+            m_quirks.add(PluginQuirkDontSetNullWindowHandleOnDestroy);
+        }
+    }
+}
+
 bool PluginPackage::load()
 {
     if (m_isLoaded) {

-- 
WebKit Debian packaging