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

[ossy at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 02fb33d25b774f48bbedc2306f3633328d14a52e
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Aug 30 09:48:02 2010 +0000

    2010-08-30  Csaba Osztrogonác  <ossy at webkit.org>
    
            Reviewed by Kent Tamura.
    
            REGRESSION(r66355): Fix warnings in html/DateComponents.cpp
            https://bugs.webkit.org/show_bug.cgi?id=44855
    
            * html/DateComponents.cpp:
            (WebCore::DateComponents::setMillisecondsSinceEpochForWeek): Suggested parentheses added around && within ||
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66379 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 809b250..eaf4845 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,15 @@
 2010-08-30  Csaba Osztrogonác  <ossy at webkit.org>
 
+        Reviewed by Kent Tamura.
+
+        REGRESSION(r66355): Fix warnings in html/DateComponents.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=44855
+
+        * html/DateComponents.cpp:
+        (WebCore::DateComponents::setMillisecondsSinceEpochForWeek): Suggested parentheses added around && within ||
+
+2010-08-30  Csaba Osztrogonác  <ossy at webkit.org>
+
         Reviewed by Darin Adler.
 
         REGRESSION(r66324): Fix warnings in editing/ApplyStyleCommand.cpp
diff --git a/WebCore/html/DateComponents.cpp b/WebCore/html/DateComponents.cpp
index 88e303e..8dced1d 100644
--- a/WebCore/html/DateComponents.cpp
+++ b/WebCore/html/DateComponents.cpp
@@ -639,7 +639,7 @@ bool DateComponents::setMillisecondsSinceEpochForWeek(double ms)
             m_year++;
             m_week = 1;
         }
-        if (m_year > maximumYear || m_year == maximumYear && m_week > maximumWeekInMaximumYear)
+        if (m_year > maximumYear || (m_year == maximumYear && m_week > maximumWeekInMaximumYear))
             return false;
     }
     m_type = Week;

-- 
WebKit Debian packaging