Changeset 173321 in webkit


Ignore:
Timestamp:
Sep 5, 2014, 11:57:06 AM (11 years ago)
Author:
Simon Fraser
Message:

Remove some PLATFORM(IOS) code in Color.h/cpp
​https://bugs.webkit.org/show_bug.cgi?id=136582

Reviewed by Dan Bates.
Source/WebCore:

Remove Color::tap which is unused, and remove createCGColorWithDeviceWhite()
which was only called in one file in WebKit.

  • WebCore.exp.in:
  • platform/graphics/Color.h:
  • platform/graphics/cg/ColorCG.cpp:

(WebCore::createCGColorWithDeviceWhite): Deleted.

Source/WebKit/ios:

createCGColorWithDeviceWhite() is only used here so make it a local static function.

  • WebView/WebPDFViewIOS.mm:

(createCGColorWithDeviceWhite):

Location:
trunk/Source
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r173320 r173321  
     12014-09-05  Simon Fraser  <simon.fraser@apple.com>
     2
     3        Remove some PLATFORM(IOS) code in Color.h/cpp
     4        https://bugs.webkit.org/show_bug.cgi?id=136582
     5
     6        Reviewed by Dan Bates.
     7
     8        Remove Color::tap which is unused, and remove createCGColorWithDeviceWhite()
     9        which was only called in one file in WebKit.
     10
     11        * WebCore.exp.in:
     12        * platform/graphics/Color.h:
     13        * platform/graphics/cg/ColorCG.cpp:
     14        (WebCore::createCGColorWithDeviceWhite): Deleted.
     15
    1162014-09-05  Beth Dakin  <bdakin@apple.com>
    217

  • trunk/Source/WebCore/WebCore.exp.in

    r173276 r173321  
    28122812#endif
    28132813
    2814 #if PLATFORM(IOS) && defined(__LP64__) && __LP64__
    2815 __ZN7WebCore28createCGColorWithDeviceWhiteEdd
    2816 #endif
    2817 
    2818 #if PLATFORM(IOS) && !(defined(__LP64__) && __LP64__)
    2819 __ZN7WebCore28createCGColorWithDeviceWhiteEff
    2820 #endif
    2821 
    28222814#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
    28232815__ZN7WebCore15ProtectionSpace28encodingRequiresPlatformDataEP20NSURLProtectionSpace

  • trunk/Source/WebCore/platform/graphics/Color.h

    r172849 r173321  
    154154
    155155#if PLATFORM(IOS)
    156     static const RGBA32 tap = 0x4D1A1A1A;
    157 
    158156    // FIXME: This color shouldn't be iOS-specific. Once we fix up its usage in InlineTextBox::paintCompositionBackground()
    159157    // we should move it outside the PLATFORM(IOS)-guard. See <https://bugs.webkit.org/show_bug.cgi?id=126296>.
    … …  
    190188#if USE(CG)
    191189WEBCORE_EXPORT CGColorRef cachedCGColor(const Color&, ColorSpace);
    192 #if PLATFORM(IOS)
    193 WEBCORE_EXPORT CGColorRef createCGColorWithDeviceWhite(CGFloat white, CGFloat alpha);
    194 #endif // PLATFORM(IOS)
    195190#endif
    196191

  • trunk/Source/WebCore/platform/graphics/cg/ColorCG.cpp

    r166005 r173321  
    4343
    4444#if PLATFORM(IOS)
    45 CGColorRef createCGColorWithDeviceWhite(CGFloat white, CGFloat alpha)
    46 {
    47     static CGColorSpaceRef graySpace = CGColorSpaceCreateDeviceGray();
    48     const CGFloat components[] = { white, alpha };
    49     return CGColorCreate(graySpace, components);
    50 }
    51 
    5245static CGColorRef createCGColorWithDeviceRGBA(CGColorRef sourceColor)
    5346{

  • trunk/Source/WebKit/ios/ChangeLog

    r173265 r173321  
     12014-09-05  Simon Fraser  <simon.fraser@apple.com>
     2
     3        Remove some PLATFORM(IOS) code in Color.h/cpp
     4        https://bugs.webkit.org/show_bug.cgi?id=136582
     5
     6        Reviewed by Dan Bates.
     7       
     8        createCGColorWithDeviceWhite() is only used here so make it a local static function.
     9
     10        * WebView/WebPDFViewIOS.mm:
     11        (createCGColorWithDeviceWhite):
     12
    1132014-09-04  Pratik Solanki  <psolanki@apple.com>
    214

  • trunk/Source/WebKit/ios/WebView/WebPDFViewIOS.mm

    r173150 r173321  
    6161static const float PAGE_WIDTH_INSET     = 4.0 * 2.0;
    6262static const float PAGE_HEIGHT_INSET    = 4.0 * 2.0;
     63
     64static CGColorRef createCGColorWithDeviceWhite(CGFloat white, CGFloat alpha)
     65{
     66    static CGColorSpaceRef graySpace = CGColorSpaceCreateDeviceGray();
     67    const CGFloat components[] = { white, alpha };
     68    return CGColorCreate(graySpace, components);
     69}
    6370
    6471@implementation WebPDFView
Note: See TracChangeset for help on using the changeset viewer.