Fix unsigned/enum problem on Win32. r=darin.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@28869 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/page/AnimationController.cpp b/WebCore/page/AnimationController.cpp
index 255feac7db7e9c3aadb64a2b8d50b061a63feac0..61c8cd2902e3621fbec66f0987eb7e9dc94c0242 100644 (file)
--- a/WebCore/page/AnimationController.cpp
+++ b/WebCore/page/AnimationController.cpp
@@ -301,13 +301,12 @@ static inline TransformOperations blendFunc(const TransformOperations& from, con
 
 static inline EVisibility blendFunc(EVisibility from, EVisibility to, double progress)
 {
-    if (from == to || from != VISIBLE && to != VISIBLE)
-        return to;
-    
     // Any non-zero result means we consider the object to be visible.  Only at 0 do we consider the object to be
     // invisible.   The invisible value we use (HIDDEN vs. COLLAPSE) depends on the specified from/to values.
     double fromVal = from == VISIBLE ? 1. : 0.;
     double toVal = to == VISIBLE ? 1. : 0.;
+    if (fromVal == toVal)
+        return to;
     double result = blendFunc(fromVal, toVal, progress);
     return result > 0. ? VISIBLE : (to != VISIBLE ? to : from);
 }

diff --git a/WebCore/page/Settings.cpp b/WebCore/page/Settings.cpp
index f1097e679a936ff5df10ec5ec740a7b20acc0bee..da10ff82782069221e1f567fa1bfdefa34d72914 100644 (file)
--- a/WebCore/page/Settings.cpp
+++ b/WebCore/page/Settings.cpp
@@ -324,7 +324,7 @@ void Settings::setFontRenderingMode(FontRenderingMode mode)
 
 FontRenderingMode Settings::fontRenderingMode() const
 {
-    return m_fontRenderingMode;
+    return static_cast<FontRenderinMode>(m_fontRenderingMode);
 }
 
 } // namespace WebCore

diff --git a/WebCore/page/Settings.h b/WebCore/page/Settings.h
index 58fffbf340251598b4827dab2d9d06624658eeb5..bbe6aaf25bd16b28ad986f8dd35f22ad30ad6ce4 100644 (file)
--- a/WebCore/page/Settings.h
+++ b/WebCore/page/Settings.h
@@ -185,7 +185,7 @@ namespace WebCore {
         bool m_forceFTPDirectoryListings : 1;
         bool m_developerExtrasEnabled : 1;
         bool m_authorAndUserStylesEnabled : 1;
-        FontRenderingMode m_fontRenderingMode : 1;
+        unsigned m_fontRenderingMode : 1;
     };
 
 } // namespace WebCore