Skip to content
  • ddkilzer@apple.com's avatar
    <http://webkit.org/b/28355> Replace MAX()/MIN() macros with type-safe... · edb53c3f
    ddkilzer@apple.com authored
            <http://webkit.org/b/28355> Replace MAX()/MIN() macros with type-safe std::max()/min() templates
    
            Reviewed by Dan Bernstein.
    
    WebCore:
    
            * accessibility/mac/AccessibilityObjectWrapper.mm:
            (AXAttributeStringSetSpelling): Changed MIN() to min().
            * platform/graphics/mac/FontMacATSUI.mm:
            (WebCore::Font::selectionRectForComplexText): Changed MAX() to
            max() and MIN() to min().
            (WebCore::Font::floatWidthForComplexText): Ditto.
            * platform/graphics/mac/SimpleFontDataMac.mm: Added using
            std::max statement.
            (WebCore::SimpleFontData::platformInit): Changed MAX() to max().
            * platform/text/mac/TextCodecMac.cpp:
            (WebCore::TextCodecMac::decode): Changed MIN() to min().
    
    WebKit/mac:
    
            * Plugins/WebBaseNetscapePluginStream.mm: Added using std::min
            statement.
            (WebNetscapePluginStream::deliverData): Changed MIN() to min().
            Changed C-style cast to a static_cast.
            * Plugins/WebNetscapePluginView.mm: Added using std::min
            statement.
            (-[WebNetscapePluginView _postURL:target:len:buf:file:notifyData:sendNotification:allowHeaders:]):
            Changed MIN() to min().  Changed C-style cast to a static_cast.
            * WebView/WebHTMLView.mm: Added using std::max statement.
            (-[WebHTMLView _dragImageForURL:withLabel:]): Changed MAX() to
            max().
            (-[WebHTMLView _scaleFactorForPrintOperation:]): Ditto.
            * WebView/WebTextCompletionController.mm: Added using std::max
            and using std::min statements.
            (-[WebTextCompletionController _placePopupWindow:]): Changed
            type of maxWidth variable from float to CGFloat to prevent a
            type mismatch on x86_64.  Changed MAX() to max() and MIN() to
            min().  Added static_cast for a constant value since CGFloat is
            defined as a float on i386 and as a double on x86_64.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@47341 268f45cc-cd09-0410-ab3c-d52691b4dbfc
    edb53c3f