[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit ba2713c136457d05b87872d8f4b34c499b811c76
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Feb 21 05:22:43 2010 +0000

    2010-02-20  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
    
            Reviewed by Darin Adler.
    
            Fix compiler warning "suggest parentheses around"
            https://bugs.webkit.org/show_bug.cgi?id=35197
    
            No new tests as there is no new functionality.
    
            * html/DateComponents.cpp:
            (WebCore::beforeGregorianStartDate):
            * plugins/PluginDatabase.cpp:
            (WebCore::PluginDatabase::findPlugin):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55058 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 583a0d8..3cc0f68 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-02-20  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
+
+        Reviewed by Darin Adler.
+
+        Fix compiler warning "suggest parentheses around"
+        https://bugs.webkit.org/show_bug.cgi?id=35197
+
+        No new tests as there is no new functionality.
+
+        * html/DateComponents.cpp:
+        (WebCore::beforeGregorianStartDate):
+        * plugins/PluginDatabase.cpp:
+        (WebCore::PluginDatabase::findPlugin):
+
 2010-02-20  Noam Rosenthal  <noam.rosenthal at nokia.com>
 
         Reviewed by Laszlo Gombos.
diff --git a/WebCore/html/DateComponents.cpp b/WebCore/html/DateComponents.cpp
index 9c62d30..39dd733 100644
--- a/WebCore/html/DateComponents.cpp
+++ b/WebCore/html/DateComponents.cpp
@@ -145,8 +145,8 @@ bool DateComponents::parseYear(const UChar* src, unsigned length, unsigned start
 static bool beforeGregorianStartDate(int year, int month, int monthDay)
 {
     return year < gregorianStartYear
-        || year == gregorianStartYear && month < gregorianStartMonth
-        || year == gregorianStartYear && month == gregorianStartMonth && monthDay < gregorianStartDay;
+        || (year == gregorianStartYear && month < gregorianStartMonth)
+        || (year == gregorianStartYear && month == gregorianStartMonth && monthDay < gregorianStartDay);
 }
 
 bool DateComponents::addDay(int dayDiff)
diff --git a/WebCore/plugins/PluginDatabase.cpp b/WebCore/plugins/PluginDatabase.cpp
index 62d847f..b09658f 100644
--- a/WebCore/plugins/PluginDatabase.cpp
+++ b/WebCore/plugins/PluginDatabase.cpp
@@ -258,7 +258,7 @@ PluginPackage* PluginDatabase::findPlugin(const KURL& url, String& mimeType)
                 String extension = filename.substring(extensionPos + 1);
 
                 String mimeTypeForExtension = MIMETypeForExtension(extension);
-                if (plugin = pluginForMIMEType(mimeTypeForExtension))
+                if ((plugin = pluginForMIMEType(mimeTypeForExtension)))
                     mimeType = mimeTypeForExtension;
             }
         }

-- 
WebKit Debian packaging