Changeset 77242 in webkit for trunk/Source/JavaScriptCore

Timestamp:

Feb 1, 2011, 4:42:16 AM (14 years ago)

Author:

[email protected]

Message:

2011-02-01 Darin Fisher <​[email protected]>

Reviewed by Eric Seidel.

Fix some Visual Studio compiler warnings.
​https://bugs.webkit.org/show_bug.cgi?id=53476

• wtf/MathExtras.h: (clampToInteger): (clampToPositiveInteger):
• wtf/ThreadingWin.cpp: (WTF::absoluteTimeToWaitTimeoutInterval):

2011-02-01 Darin Fisher <​[email protected]>

Reviewed by Eric Seidel.

Fix some Visual Studio compiler warnings.
​https://bugs.webkit.org/show_bug.cgi?id=53476

• src/GraphicsContext3DChromium.cpp: (WebCore::GraphicsContext3DInternal::paintRenderingResultsToCanvas):
• src/WebFrameImpl.cpp: (WebKit::WebFrameImpl::forms):
• src/WebMediaPlayerClientImpl.cpp: (WebKit::WebMediaPlayerClientImpl::repaint):
• src/WebScrollbarImpl.cpp: (WebKit::WebScrollbarImpl::setValue):
• src/WebViewImpl.cpp: (WebKit::WebViewImpl::doPixelReadbackToCanvas): (WebKit::WebViewImpl::setZoomLevel): (WebKit::WebViewImplScrollbarPaintInterface::paint):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• wtf/MathExtras.h (modified) (2 diffs)
• wtf/ThreadingWin.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-02-01  Darin Fisher  <[email protected]>
+
+        Reviewed by Eric Seidel.
+
+        Fix some Visual Studio compiler warnings.
+        https://bugs.webkit.org/show_bug.cgi?id=53476
+
+        * wtf/MathExtras.h:
+        (clampToInteger):
+        (clampToPositiveInteger):
+        * wtf/ThreadingWin.cpp:
+        (WTF::absoluteTimeToWaitTimeoutInterval):
+
 2011-01-31  Oliver Hunt  <[email protected]>
 

trunk/Source/JavaScriptCore/wtf/MathExtras.h

@@ -223 +223 @@
 inline int clampToInteger(float d)
 {
-    const float minIntAsFloat = std::numeric_limits<int>::min();
-    const float maxIntAsFloat = std::numeric_limits<int>::max();
+    const float minIntAsFloat = static_cast<float>(std::numeric_limits<int>::min());
+    const float maxIntAsFloat = static_cast<float>(std::numeric_limits<int>::max());
     return static_cast<int>(std::max(std::min(d, maxIntAsFloat), minIntAsFloat));
 }
@@ -230 +230 @@
 inline int clampToPositiveInteger(float d)
 {
-    const float maxIntAsFloat = std::numeric_limits<int>::max();
+    const float maxIntAsFloat = static_cast<float>(std::numeric_limits<int>::max());
     return static_cast<int>(std::max<float>(std::min(d, maxIntAsFloat), 0));
 }

trunk/Source/JavaScriptCore/wtf/ThreadingWin.cpp

@@ -492 +492 @@
         return INFINITE;
 
-    return (absoluteTime - currentTime) * 1000;
+    return static_cast<DWORD>((absoluteTime - currentTime) * 1000.0);
 }