Changeset 35598 in webkit for trunk/JavaScriptCore/wtf/ThreadingQt.cpp

Timestamp:

Aug 6, 2008, 5:11:29 AM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Cameron Zwarich.

Fix warnings and errors seen on Qt bot.
Including one correctness fix for ThreadingQt.
According to the Qt 4.4 docs, we were always passing
seconds to "wait()" when we should have been passing
milliseconds.

Lots of float <-> int conversion warnings.

• css/CSSCursorImageValue.cpp: (WebCore::CSSCursorImageValue::updateIfSVGCursorIsUsed):
• dom/Element.cpp: (WebCore::adjustForLocalZoom): (WebCore::adjustForAbsoluteZoom): (WebCore::Element::setScrollLeft): (WebCore::Element::setScrollTop):
• dom/EventTargetNode.cpp: (WebCore::EventTargetNode::dispatchMouseEvent):
• loader/CachedImage.cpp: (WebCore::CachedImage::imageRect):
• page/DOMWindow.cpp: (WebCore::DOMWindow::innerHeight): (WebCore::DOMWindow::innerWidth): (WebCore::DOMWindow::scrollX): (WebCore::DOMWindow::scrollY): (WebCore::DOMWindow::scrollTo):
• page/EventHandler.cpp: (WebCore::scrollAndAcceptEvent):
• plugins/npapi.cpp:
• plugins/qt/PluginViewQt.cpp: (WebCore::PluginView::getValue): (WebCore::PluginView::~PluginView):
• rendering/RenderReplaced.cpp: (WebCore::RenderReplaced::intrinsicSizeChanged):

File:

• trunk/JavaScriptCore/wtf/ThreadingQt.cpp (modified) (1 diff)

trunk/JavaScriptCore/wtf/ThreadingQt.cpp

@@ -214 +214 @@
 }
 
-bool ThreadCondition::timedWait(Mutex& mutex, double interval)
-{
-    return m_condition->wait(mutex.impl(), interval);
+bool ThreadCondition::timedWait(Mutex& mutex, double secondsToWait)
+{
+    if (secondsToWait < 0.0) {
+        wait(mutex);
+        return true;
+    }
+
+    unsigned long millisecondsToWait = static_cast<unsigned long>(secondsToWait * 1000.0);
+    return m_condition->wait(mutex.impl(), millisecondsToWait);
 }