Changeset 164270 in webkit


Ignore:
Timestamp:
Feb 17, 2014 8:59:47 PM (10 years ago)
Author:
mitz@apple.com
Message:

Stop using PLATFORM(MAC) in DumpRenderTree except where it means “OS X but not iOS”
​https://bugs.webkit.org/show_bug.cgi?id=128950

Reviewed by Anders Carlsson.

Changed all PLATFORM(MAC) instances that were not excluding iOS to PLATFORM(COCOA).

  • DumpRenderTree/AccessibilityController.h:
  • DumpRenderTree/AccessibilityTextMarker.h:
  • DumpRenderTree/AccessibilityUIElement.cpp:
  • DumpRenderTree/AccessibilityUIElement.h:
  • DumpRenderTree/DumpRenderTree.h:
  • DumpRenderTree/cg/PixelDumpSupportCG.cpp:

(computeMD5HashStringForBitmapContext):

  • DumpRenderTree/cg/PixelDumpSupportCG.h:

(BitmapContext::~BitmapContext):

  • DumpRenderTree/config.h:
Location:
trunk/Tools
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r164269 r164270  
     12014-02-17  Dan Bernstein  <mitz@apple.com>
     2
     3        Stop using PLATFORM(MAC) in DumpRenderTree except where it means “OS X but not iOS”
     4        https://bugs.webkit.org/show_bug.cgi?id=128950
     5
     6        Reviewed by Anders Carlsson.
     7
     8        Changed all PLATFORM(MAC) instances that were not excluding iOS to PLATFORM(COCOA).
     9
     10        * DumpRenderTree/AccessibilityController.h:
     11        * DumpRenderTree/AccessibilityTextMarker.h:
     12        * DumpRenderTree/AccessibilityUIElement.cpp:
     13        * DumpRenderTree/AccessibilityUIElement.h:
     14        * DumpRenderTree/DumpRenderTree.h:
     15        * DumpRenderTree/cg/PixelDumpSupportCG.cpp:
     16        (computeMD5HashStringForBitmapContext):
     17        * DumpRenderTree/cg/PixelDumpSupportCG.h:
     18        (BitmapContext::~BitmapContext):
     19        * DumpRenderTree/config.h:
     20
    1212014-02-17  Filip Pizlo  <fpizlo@apple.com>
    222

  • trunk/Tools/DumpRenderTree/AccessibilityController.h

    r162222 r164270  
    9090#endif
    9191
    92 #if PLATFORM(MAC)
     92#if PLATFORM(COCOA)
    9393    RetainPtr<NotificationHandler> m_globalNotificationHandler;
    9494#endif

  • trunk/Tools/DumpRenderTree/AccessibilityTextMarker.h

    r162817 r164270  
    3535#endif
    3636
    37 #if PLATFORM(MAC)
     37#if PLATFORM(COCOA)
    3838#include <wtf/RetainPtr.h>
    3939typedef CFTypeRef PlatformTextMarker;

  • trunk/Tools/DumpRenderTree/AccessibilityUIElement.cpp

    r164165 r164270  
    13041304#endif
    13051305
    1306 #if !PLATFORM(MAC)
     1306#if !PLATFORM(COCOA)
    13071307void AccessibilityUIElement::uiElementArrayAttributeValue(JSStringRef, Vector<AccessibilityUIElement>&) const { }
    13081308void AccessibilityUIElement::columnHeaders(Vector<AccessibilityUIElement>&) const { }

  • trunk/Tools/DumpRenderTree/AccessibilityUIElement.h

    r164165 r164270  
    3232#include <wtf/Vector.h>
    3333
    34 #if PLATFORM(MAC)
     34#if PLATFORM(COCOA)
    3535#ifdef __OBJC__
    3636typedef id PlatformUIElement;
    … …  
    5454#endif
    5555
    56 #if PLATFORM(MAC)
     56#if PLATFORM(COCOA)
    5757#ifdef __OBJC__
    5858typedef id NotificationHandler;

  • trunk/Tools/DumpRenderTree/DumpRenderTree.h

    r161699 r164270  
    3535#endif
    3636
    37 #if PLATFORM(MAC)
     37#if PLATFORM(COCOA)
    3838#include "DumpRenderTreeMac.h"
    3939#elif PLATFORM(WIN)

  • trunk/Tools/DumpRenderTree/cg/PixelDumpSupportCG.cpp

    r162817 r164270  
    8686    MD5_Init(&md5Context);
    8787    unsigned char* bitmapData = static_cast<unsigned char*>(CGBitmapContextGetData(bitmapContext));
    88 #if PLATFORM(MAC)
     88#if PLATFORM(COCOA)
    8989    if ((CGBitmapContextGetBitmapInfo(bitmapContext) & kCGBitmapByteOrderMask) == kCGBitmapByteOrder32Big) {
    9090        for (unsigned row = 0; row < pixelsHigh; row++) {

  • trunk/Tools/DumpRenderTree/cg/PixelDumpSupportCG.h

    r149716 r164270  
    4242typedef struct CGContext* CGContextRef;
    4343
    44 #if PLATFORM(MAC)
     44#if PLATFORM(COCOA)
    4545typedef void* PlatformBitmapBuffer;
    4646#elif PLATFORM(WIN)
    … …  
    5858    {
    5959        if (m_buffer)
    60 #if PLATFORM(MAC)
     60#if PLATFORM(COCOA)
    6161            free(m_buffer);
    6262#elif PLATFORM(WIN)

  • trunk/Tools/DumpRenderTree/config.h

    r163776 r164270  
    3939#endif
    4040
    41 #if PLATFORM(MAC)
     41#if PLATFORM(COCOA)
    4242#define WTF_USE_CF 1
    43 #endif // PLATFORM(MAC)
     43#endif
    4444
    4545#if PLATFORM(WIN)
Note: See TracChangeset for help on using the changeset viewer.