Changeset 77242 in webkit


Ignore:
Timestamp:
Feb 1, 2011 4:42:16 AM (13 years ago)
Author:
darin@chromium.org
Message:

2011-02-01 Darin Fisher <darin@chromium.org>

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 <darin@chromium.org>

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
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/JavaScriptCore/ChangeLog

    r77165 r77242  
     12011-02-01  Darin Fisher  <darin@chromium.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Fix some Visual Studio compiler warnings.
     6        https://bugs.webkit.org/show_bug.cgi?id=53476
     7
     8        * wtf/MathExtras.h:
     9        (clampToInteger):
     10        (clampToPositiveInteger):
     11        * wtf/ThreadingWin.cpp:
     12        (WTF::absoluteTimeToWaitTimeoutInterval):
     13
    1142011-01-31  Oliver Hunt  <oliver@apple.com>
    215
  • trunk/Source/JavaScriptCore/wtf/MathExtras.h

    r77045 r77242  
    223223inline int clampToInteger(float d)
    224224{
    225     const float minIntAsFloat = std::numeric_limits<int>::min();
    226     const float maxIntAsFloat = std::numeric_limits<int>::max();
     225    const float minIntAsFloat = static_cast<float>(std::numeric_limits<int>::min());
     226    const float maxIntAsFloat = static_cast<float>(std::numeric_limits<int>::max());
    227227    return static_cast<int>(std::max(std::min(d, maxIntAsFloat), minIntAsFloat));
    228228}
     
    230230inline int clampToPositiveInteger(float d)
    231231{
    232     const float maxIntAsFloat = std::numeric_limits<int>::max();
     232    const float maxIntAsFloat = static_cast<float>(std::numeric_limits<int>::max());
    233233    return static_cast<int>(std::max<float>(std::min(d, maxIntAsFloat), 0));
    234234}
  • trunk/Source/JavaScriptCore/wtf/ThreadingWin.cpp

    r76967 r77242  
    492492        return INFINITE;
    493493
    494     return (absoluteTime - currentTime) * 1000;
     494    return static_cast<DWORD>((absoluteTime - currentTime) * 1000.0);
    495495}
    496496
  • trunk/Source/WebKit/chromium/ChangeLog

    r77236 r77242  
     12011-02-01  Darin Fisher  <darin@chromium.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Fix some Visual Studio compiler warnings.
     6        https://bugs.webkit.org/show_bug.cgi?id=53476
     7
     8        * src/GraphicsContext3DChromium.cpp:
     9        (WebCore::GraphicsContext3DInternal::paintRenderingResultsToCanvas):
     10        * src/WebFrameImpl.cpp:
     11        (WebKit::WebFrameImpl::forms):
     12        * src/WebMediaPlayerClientImpl.cpp:
     13        (WebKit::WebMediaPlayerClientImpl::repaint):
     14        * src/WebScrollbarImpl.cpp:
     15        (WebKit::WebScrollbarImpl::setValue):
     16        * src/WebViewImpl.cpp:
     17        (WebKit::WebViewImpl::doPixelReadbackToCanvas):
     18        (WebKit::WebViewImpl::setZoomLevel):
     19        (WebKit::WebViewImplScrollbarPaintInterface::paint):
     20
    1212011-02-01  Hans Wennborg  <hans@chromium.org>
    222
  • trunk/Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp

    r76717 r77242  
    206206        SkCanvas canvas(*canvasBitmap);
    207207        SkRect dst;
    208         dst.set(SkIntToScalar(0), SkIntToScalar(0), canvasBitmap->width(), canvasBitmap->height());
     208        dst.set(SkIntToScalar(0), SkIntToScalar(0), SkIntToScalar(canvasBitmap->width()), SkIntToScalar(canvasBitmap->height()));
    209209        canvas.drawBitmapRect(m_resizingBitmap, 0, dst);
    210210    }
  • trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp

    r76889 r77242  
    686686
    687687    WebVector<WebFormElement> temp(formCount);
    688     unsigned i = 0;
    689     for (size_t sourceIndex = 0; i < forms->length(); ++sourceIndex) {
     688    size_t j = 0;
     689    for (size_t sourceIndex = 0; j < forms->length(); ++sourceIndex) {
    690690        Node* node = forms->item(sourceIndex);
    691691        // Strange but true, sometimes item can be 0.
    692692        if (node && node->isHTMLElement())
    693             temp[i++] = static_cast<HTMLFormElement*>(node);
    694     }
    695     ASSERT(i == formCount);
     693            temp[j++] = static_cast<HTMLFormElement*>(node);
     694    }
     695    ASSERT(j == formCount);
    696696    results.swap(temp);
    697697}
  • trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp

    r70919 r77242  
    145145#if USE(ACCELERATED_COMPOSITING)
    146146    if (m_videoLayer.get() && supportsAcceleratedRendering())
    147         m_videoLayer->setNeedsDisplay(FloatRect(0, 0, m_videoLayer->bounds().width(), m_videoLayer->bounds().height()));
     147        m_videoLayer->setNeedsDisplay(IntRect(0, 0, m_videoLayer->bounds().width(), m_videoLayer->bounds().height()));
    148148#endif
    149149    m_mediaPlayer->repaint();
  • trunk/Source/WebKit/chromium/src/WebScrollbarImpl.cpp

    r76455 r77242  
    9696void WebScrollbarImpl::setValue(int position)
    9797{
    98     WebCore::ScrollableArea::scrollToOffsetWithoutAnimation(m_scrollbar->orientation(), position);
     98    WebCore::ScrollableArea::scrollToOffsetWithoutAnimation(m_scrollbar->orientation(), static_cast<float>(position));
    9999}
    100100
  • trunk/Source/WebKit/chromium/src/WebViewImpl.cpp

    r76677 r77242  
    10341034        imageBuffer->putPremultipliedImageData(pixelArray.get(), rect.size(), IntRect(IntPoint(), rect.size()), IntPoint());
    10351035        gc.save();
    1036         gc.translate(FloatSize(0.0f, bitmapHeight));
     1036        gc.translate(IntSize(0, bitmapHeight));
    10371037        gc.scale(FloatSize(1.0f, -1.0f));
    10381038        // Use invertRect in next line, so that transform above inverts it back to
     
    16171617        pluginContainer->plugin()->setZoomLevel(m_zoomLevel, textOnly);
    16181618    else {
    1619         double zoomFactor = zoomLevelToZoomFactor(m_zoomLevel);
     1619        float zoomFactor = static_cast<float>(zoomLevelToZoomFactor(m_zoomLevel));
    16201620        if (textOnly)
    16211621            frame->setPageAndTextZoomFactors(1, zoomFactor);
     
    23742374        FrameView* view = page->mainFrame()->view();
    23752375
    2376         context.translate(view->scrollX(), view->scrollY());
     2376        context.translate(static_cast<float>(view->scrollX()), static_cast<float>(view->scrollY()));
    23772377        IntRect windowRect = view->contentsToWindow(contentRect);
    23782378        view->paintScrollbars(&context, windowRect);
Note: See TracChangeset for help on using the changeset viewer.