Changeset 163886 in webkit


Ignore:
Timestamp:
Feb 11, 2014 10:00:45 AM (10 years ago)
Author:
mitz@apple.com
Message:

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

Reviewed by Darin Adler.

  • Shared/API/c/WKContextMenuItem.cpp: Removed workaround for Mac Safari 6 compatibility.

(WKContextMenuItemGetTag):

  • Shared/API/c/WKDeprecatedFunctions.cpp: Added && !PLATFORM(IOS), because these functions

are not needed on iOS.

  • Shared/API/c/WKSharedAPICast.h: Changed PLATFORM(MAC) to PLATFORM(COCOA).

(WebKit::toAPI):
(WebKit::toImpl):

  • Shared/APIObject.h: Ditto.
  • Shared/ChildProcess.cpp: Ditto.
  • Shared/ChildProcess.h: Changed PLATFORM(MAC) to PLATFORM(COCOA) around

setApplicationIsDaemon and setQOS. Changed it to USE(APPKIT) around stopNSAppRunLoop.

  • Shared/CommandLine.h: Changed PLATFORM(MAC) to OS(UNIX) around parse().
  • Shared/DictionaryPopupInfo.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).

(WebKit::DictionaryPopupInfo::encode):
(WebKit::DictionaryPopupInfo::decode):

  • Shared/DictionaryPopupInfo.h: Changed PLATFORM(MAC) to PLATFORM(COCOA).
  • Shared/Downloads/Download.h: Ditto.
  • Shared/DrawingAreaInfo.h: Changed PLATFORM(MAC) to PLATFORM(COCOA).
  • Shared/FontInfo.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).

(WebKit::FontInfo::encode):
(WebKit::FontInfo::decode):

  • Shared/FontInfo.h: Ditto.
  • Shared/LayerTreeContext.h: Ditto.
  • Shared/NativeWebKeyboardEvent.h: Changed PLATFORM(MAC) to USE(APPKIT) around

forward-declaration of NSView.

  • Shared/NativeWebMouseEvent.h: Ditto.
  • Shared/NativeWebWheelEvent.h: Ditto.
  • Shared/Network/CustomProtocols/Cocoa: Renamed from mac.
  • Shared/Network/CustomProtocols/Cocoa/CustomProtocolManagerCocoa.mm: Renamed from CustomProtocolManagerMac.mm.
  • Shared/Network/CustomProtocols/Cocoa/CustomProtocolManagerMac.mm: Removed.
  • Shared/Network/CustomProtocols/CustomProtocolManager.h: Changed PLATFORM(MAC) to

PLATFORM(COCOA).

  • Shared/Network/CustomProtocols/mac: Removed.
  • Shared/Network/CustomProtocols/mac/CustomProtocolManagerMac.mm: Removed.
  • Shared/PlatformPopupMenuData.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).

(WebKit::PlatformPopupMenuData::encode):
(WebKit::PlatformPopupMenuData::decode):

  • Shared/PlatformPopupMenuData.h: Ditto.
  • Shared/Plugins/Netscape/PluginInformation.cpp: Ditto.
  • Shared/Plugins/PluginModuleInfo.h: Ditto.
  • Shared/Plugins/PluginProcessCreationParameters.cpp: Ditto.

(WebKit::PluginProcessCreationParameters::encode):
(WebKit::PluginProcessCreationParameters::decode):

  • Shared/Plugins/PluginProcessCreationParameters.h: Ditto.
  • Shared/PrintInfo.h: Changed PLATFORM(MAC) to USE(APPKIT) around forward declaration of

NSPrintInfo.

  • Shared/SandboxInitializationParameters.h: Changed PLATFORM(MAC) to PLATFORM(COCOA).
  • Shared/TextCheckerState.h: Changed PLATFORM(MAC) to USE(APPKIT).
  • Shared/WebArchive.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
  • Shared/WebArchive.h: Ditto.
  • Shared/WebArchiveResource.cpp: Ditto.
  • Shared/WebArchiveResource.h: Ditto.
  • Shared/WebCoreArgumentCoders.cpp: Ditto.

(IPC::ArgumentCoder<ResourceResponse>::encode):
(IPC::ArgumentCoder<ResourceResponse>::decode):

  • Shared/WebCoreArgumentCoders.h: Ditto.
  • Shared/WebEvent.h: Ditto.
  • Shared/WebEventConversion.cpp: Ditto.

(WebKit::WebKit2PlatformWheelEvent::WebKit2PlatformWheelEvent):

  • Shared/WebKit2Initialize.cpp: Ditto.

(WebKit::InitializeWebKit2):

  • Shared/WebPageCreationParameters.cpp: Ditto.

(WebKit::WebPageCreationParameters::encode):
(WebKit::WebPageCreationParameters::decode):

  • Shared/WebPageCreationParameters.h: Ditto.
  • Shared/WebPreferencesStore.h: Ditto.
  • Shared/WebProcessCreationParameters.cpp: Ditto.

(WebKit::WebProcessCreationParameters::WebProcessCreationParameters):
(WebKit::WebProcessCreationParameters::encode):
(WebKit::WebProcessCreationParameters::decode):

  • Shared/WebProcessCreationParameters.h: Ditto.
  • Shared/WebWheelEvent.cpp: Ditto.

(WebKit::WebWheelEvent::WebWheelEvent):
(WebKit::WebWheelEvent::encode):
(WebKit::WebWheelEvent::decode):

  • Shared/cf/ArgumentCodersCF.cpp: Changed PLATFORM(MAC) to USE(FOUNDATION).

(IPC::decode):

  • Shared/mac/CommandLineMac.cpp: Removed.
  • Shared/mac/PDFKitImports.h: Removed PLATFORM(MAC)
  • Shared/posix: Added.
  • Shared/posix/CommandLinePOSIX.cpp: Renamed from mac/CommandLineMac.cpp and removed

comment.

  • WebKit2.xcodeproj/project.pbxproj: Updated for moves and renames.
Location:
trunk/Source/WebKit2
Files:
2 added
1 deleted
46 edited
1 copied
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r163877 r163886  
     12014-02-11  Dan Bernstein  <mitz@apple.com>
     2
     3        Stop using PLATFORM(MAC) in WebKit2/Shared except where it means “OS X but not iOS”
     4        https://bugs.webkit.org/show_bug.cgi?id=128582
     5
     6        Reviewed by Darin Adler.
     7
     8        * Shared/API/c/WKContextMenuItem.cpp: Removed workaround for Mac Safari 6 compatibility.
     9        (WKContextMenuItemGetTag):
     10        * Shared/API/c/WKDeprecatedFunctions.cpp: Added && !PLATFORM(IOS), because these functions
     11        are not needed on iOS.
     12        * Shared/API/c/WKSharedAPICast.h: Changed PLATFORM(MAC) to PLATFORM(COCOA).
     13        (WebKit::toAPI):
     14        (WebKit::toImpl):
     15        * Shared/APIObject.h: Ditto.
     16        * Shared/ChildProcess.cpp: Ditto.
     17        * Shared/ChildProcess.h: Changed PLATFORM(MAC) to PLATFORM(COCOA) around
     18        setApplicationIsDaemon and setQOS. Changed it to USE(APPKIT) around stopNSAppRunLoop.
     19        * Shared/CommandLine.h: Changed PLATFORM(MAC) to OS(UNIX) around parse().
     20        * Shared/DictionaryPopupInfo.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
     21        (WebKit::DictionaryPopupInfo::encode):
     22        (WebKit::DictionaryPopupInfo::decode):
     23        * Shared/DictionaryPopupInfo.h: Changed PLATFORM(MAC) to PLATFORM(COCOA).
     24        * Shared/Downloads/Download.h: Ditto.
     25        * Shared/DrawingAreaInfo.h: Changed PLATFORM(MAC) to PLATFORM(COCOA).
     26        * Shared/FontInfo.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
     27        (WebKit::FontInfo::encode):
     28        (WebKit::FontInfo::decode):
     29        * Shared/FontInfo.h: Ditto.
     30        * Shared/LayerTreeContext.h: Ditto.
     31        * Shared/NativeWebKeyboardEvent.h: Changed PLATFORM(MAC) to USE(APPKIT) around
     32        forward-declaration of NSView.
     33        * Shared/NativeWebMouseEvent.h: Ditto.
     34        * Shared/NativeWebWheelEvent.h: Ditto.
     35        * Shared/Network/CustomProtocols/Cocoa: Renamed from mac.
     36        * Shared/Network/CustomProtocols/Cocoa/CustomProtocolManagerCocoa.mm: Renamed from CustomProtocolManagerMac.mm.
     37        * Shared/Network/CustomProtocols/Cocoa/CustomProtocolManagerMac.mm: Removed.
     38        * Shared/Network/CustomProtocols/CustomProtocolManager.h: Changed PLATFORM(MAC) to
     39        PLATFORM(COCOA).
     40        * Shared/Network/CustomProtocols/mac: Removed.
     41        * Shared/Network/CustomProtocols/mac/CustomProtocolManagerMac.mm: Removed.
     42        * Shared/PlatformPopupMenuData.cpp:  Changed PLATFORM(MAC) to PLATFORM(COCOA).
     43        (WebKit::PlatformPopupMenuData::encode):
     44        (WebKit::PlatformPopupMenuData::decode):
     45        * Shared/PlatformPopupMenuData.h: Ditto.
     46        * Shared/Plugins/Netscape/PluginInformation.cpp: Ditto.
     47        * Shared/Plugins/PluginModuleInfo.h: Ditto.
     48        * Shared/Plugins/PluginProcessCreationParameters.cpp: Ditto.
     49        (WebKit::PluginProcessCreationParameters::encode):
     50        (WebKit::PluginProcessCreationParameters::decode):
     51        * Shared/Plugins/PluginProcessCreationParameters.h: Ditto.
     52        * Shared/PrintInfo.h: Changed PLATFORM(MAC) to USE(APPKIT) around forward declaration of
     53        NSPrintInfo.
     54        * Shared/SandboxInitializationParameters.h: Changed PLATFORM(MAC) to PLATFORM(COCOA).
     55        * Shared/TextCheckerState.h: Changed PLATFORM(MAC) to USE(APPKIT).
     56        * Shared/WebArchive.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA).
     57        * Shared/WebArchive.h: Ditto.
     58        * Shared/WebArchiveResource.cpp: Ditto.
     59        * Shared/WebArchiveResource.h: Ditto.
     60        * Shared/WebCoreArgumentCoders.cpp: Ditto.
     61        (IPC::ArgumentCoder<ResourceResponse>::encode):
     62        (IPC::ArgumentCoder<ResourceResponse>::decode):
     63        * Shared/WebCoreArgumentCoders.h: Ditto.
     64        * Shared/WebEvent.h: Ditto.
     65        * Shared/WebEventConversion.cpp: Ditto.
     66        (WebKit::WebKit2PlatformWheelEvent::WebKit2PlatformWheelEvent):
     67        * Shared/WebKit2Initialize.cpp: Ditto.
     68        (WebKit::InitializeWebKit2):
     69        * Shared/WebPageCreationParameters.cpp: Ditto.
     70        (WebKit::WebPageCreationParameters::encode):
     71        (WebKit::WebPageCreationParameters::decode):
     72        * Shared/WebPageCreationParameters.h: Ditto.
     73        * Shared/WebPreferencesStore.h: Ditto.
     74        * Shared/WebProcessCreationParameters.cpp: Ditto.
     75        (WebKit::WebProcessCreationParameters::WebProcessCreationParameters):
     76        (WebKit::WebProcessCreationParameters::encode):
     77        (WebKit::WebProcessCreationParameters::decode):
     78        * Shared/WebProcessCreationParameters.h: Ditto.
     79        * Shared/WebWheelEvent.cpp: Ditto.
     80        (WebKit::WebWheelEvent::WebWheelEvent):
     81        (WebKit::WebWheelEvent::encode):
     82        (WebKit::WebWheelEvent::decode):
     83        * Shared/cf/ArgumentCodersCF.cpp: Changed PLATFORM(MAC) to USE(FOUNDATION).
     84        (IPC::decode):
     85        * Shared/mac/CommandLineMac.cpp: Removed.
     86        * Shared/mac/PDFKitImports.h: Removed PLATFORM(MAC)
     87        * Shared/posix: Added.
     88        * Shared/posix/CommandLinePOSIX.cpp: Renamed from mac/CommandLineMac.cpp and removed
     89        comment.
     90        * WebKit2.xcodeproj/project.pbxproj: Updated for moves and renames.
     91
    1922014-02-11  Brady Eidson  <beidson@apple.com>
    293

  • trunk/Source/WebKit2/Shared/API/c/WKContextMenuItem.cpp

    r160432 r163886  
    3232#include "WKAPICast.h"
    3333#include "WKContextMenuItemTypes.h"
    34 
    35 #if PLATFORM(MAC)
    36 #import <mach-o/dyld.h>
    37 #endif
    3834
    3935using namespace WebCore;
    … …  
    9591}
    9692
    97 #if ENABLE(CONTEXT_MENUS)
    98 #if PLATFORM(MAC)
    99 static WKContextMenuItemTag compatibleContextMenuItemTag(WKContextMenuItemTag tag)
    100 {
    101     static bool needsWorkaround = ^bool {
    102         const int32_t safariFrameworkVersionWithIncompatibleContextMenuItemTags = 0x02181900; // 536.25.0 (Safari 6.0)
    103         return NSVersionOfRunTimeLibrary("Safari") == safariFrameworkVersionWithIncompatibleContextMenuItemTags;
    104     }();
    105 
    106     if (!needsWorkaround)
    107         return tag;
    108 
    109     // kWKContextMenuItemTagDictationAlternative was inserted before kWKContextMenuItemTagInspectElement.
    110     // DictationAlternative is now at the end like it should have been. To be compatible we need to return
    111     // InspectElement for DictationAlternative and shift InspectElement and after by one.
    112     if (tag == kWKContextMenuItemTagDictationAlternative)
    113         return kWKContextMenuItemTagInspectElement;
    114     if (tag >= kWKContextMenuItemTagInspectElement && tag < kWKContextMenuItemBaseApplicationTag)
    115         return tag + 1;
    116     return tag;
    117 }
    118 #endif
    119 #endif // ENABLE(CONTEXT_MENUS)
    120 
    12193WKContextMenuItemTag WKContextMenuItemGetTag(WKContextMenuItemRef itemRef)
    12294{
    12395#if ENABLE(CONTEXT_MENUS)
    124 #if PLATFORM(MAC)
    125     return compatibleContextMenuItemTag(toAPI(toImpl(itemRef)->data()->action()));
    126 #else
    12796    return toAPI(toImpl(itemRef)->data()->action());
    128 #endif
    12997#else
    13098    UNUSED_PARAM(itemRef);

  • trunk/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp

    r163821 r163886  
    3131#include "WKSharedAPICast.h"
    3232
    33 #if PLATFORM(MAC)
     33#if PLATFORM(MAC) && !PLATFORM(IOS)
    3434#include "WKContextPrivateMac.h"
    3535#endif
    … …  
    4848WK_EXPORT void WKDictionaryRemoveItem(WKMutableDictionaryRef dictionary, WKStringRef key);
    4949
    50 #if PLATFORM(MAC)
     50#if PLATFORM(MAC) && !PLATFORM(IOS)
    5151WK_EXPORT CGContextRef WKGraphicsContextGetCGContext(WKGraphicsContextRef graphicsContext);
    5252#endif
    … …  
    7777}
    7878
    79 #if PLATFORM(MAC)
     79#if PLATFORM(MAC) && !PLATFORM(IOS)
    8080CGContextRef WKGraphicsContextGetCGContext(WKGraphicsContextRef graphicsContext)
    8181{

  • trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h

    r161542 r163886  
    119119template<> struct APITypeInfo<WKMutableArrayRef> { typedef API::Array* ImplType; };
    120120
    121 #if PLATFORM(MAC)
     121#if PLATFORM(COCOA)
    122122WK_ADD_API_MAPPING(WKWebArchiveRef, WebArchive)
    123123WK_ADD_API_MAPPING(WKWebArchiveResourceRef, WebArchiveResource)
    … …  
    483483    case WebCore::ContextMenuItemTagMediaMute:
    484484        return kWKContextMenuItemTagMediaMute;
    485 #if PLATFORM(MAC)
     485#if PLATFORM(COCOA)
    486486    case WebCore::ContextMenuItemTagCorrectSpellingAutomatically:
    487487        return kWKContextMenuItemTagCorrectSpellingAutomatically;
    … …  
    677677    case kWKContextMenuItemTagMediaMute:
    678678        return WebCore::ContextMenuItemTagMediaMute;
    679 #if PLATFORM(MAC)
     679#if PLATFORM(COCOA)
    680680    case kWKContextMenuItemTagCorrectSpellingAutomatically:
    681681        return WebCore::ContextMenuItemTagCorrectSpellingAutomatically;

  • trunk/Source/WebKit2/Shared/APIObject.h

    r162449 r163886  
    3232#include <wtf/ThreadSafeRefCounted.h>
    3333
    34 #if PLATFORM(MAC)
     34#if PLATFORM(COCOA)
    3535#include "WKFoundation.h"
    3636#ifdef __OBJC__
    … …  
    3939#endif
    4040
    41 #define DELEGATE_REF_COUNTING_TO_COCOA (PLATFORM(MAC) && WK_API_ENABLED)
     41#define DELEGATE_REF_COUNTING_TO_COCOA (PLATFORM(COCOA) && WK_API_ENABLED)
    4242
    4343#if DELEGATE_REF_COUNTING_TO_COCOA

  • trunk/Source/WebKit2/Shared/ChildProcess.cpp

    r163591 r163886  
    164164}
    165165
    166 #if !PLATFORM(MAC)
     166#if !PLATFORM(COCOA)
    167167void ChildProcess::platformInitialize()
    168168{

  • trunk/Source/WebKit2/Shared/ChildProcess.h

    r163591 r163886  
    6666    bool processSuppressionEnabled() const { return !m_processSuppressionDisabled.isActive(); }
    6767
    68 #if PLATFORM(MAC)
     68#if PLATFORM(COCOA)
    6969    void setApplicationIsDaemon();
    7070    void setQOS(int latencyQOS, int throughputQOS);
    … …  
    9191    virtual void stopRunLoop();
    9292
    93 #if PLATFORM(MAC)
     93#if USE(APPKIT)
    9494    static void stopNSAppRunLoop();
    9595#endif

  • trunk/Source/WebKit2/Shared/CommandLine.h

    r139023 r163886  
    3838class CommandLine {
    3939public:
    40 #if PLATFORM(MAC)
     40#if OS(UNIX)
    4141    bool parse(int argc, char** argv);
    4242#endif

  • trunk/Source/WebKit2/Shared/DictionaryPopupInfo.cpp

    r161148 r163886  
    2929#include "WebCoreArgumentCoders.h"
    3030
    31 #if PLATFORM(MAC)
     31#if PLATFORM(COCOA)
    3232#include "ArgumentCodersCF.h"
    3333#endif
    … …  
    3939    encoder << origin;
    4040
    41 #if PLATFORM(MAC)
     41#if PLATFORM(COCOA)
    4242    bool hadOptions = options;
    4343    encoder << hadOptions;
    … …  
    5151    if (!decoder.decode(result.origin))
    5252        return false;
    53 #if PLATFORM(MAC)
     53#if PLATFORM(COCOA)
    5454    bool hadOptions;
    5555    if (!decoder.decode(hadOptions))

  • trunk/Source/WebKit2/Shared/DictionaryPopupInfo.h

    r161148 r163886  
    2929#include <WebCore/FloatPoint.h>
    3030
    31 #if PLATFORM(MAC)
     31#if PLATFORM(COCOA)
    3232#include <wtf/RetainPtr.h>
    3333#endif
    … …  
    4545
    4646    WebCore::FloatPoint origin;
    47 #if PLATFORM(MAC)
     47#if PLATFORM(COCOA)
    4848    RetainPtr<CFDictionaryRef> options;
    4949#endif

  • trunk/Source/WebKit2/Shared/Downloads/Download.h

    r162139 r163886  
    3131#include <wtf/Noncopyable.h>
    3232
    33 #if PLATFORM(MAC)
     33#if PLATFORM(COCOA)
    3434#include <wtf/RetainPtr.h>
    3535
    … …  
    120120    RefPtr<SandboxExtension> m_sandboxExtension;
    121121
    122 #if PLATFORM(MAC)
     122#if PLATFORM(COCOA)
    123123    RetainPtr<NSURLDownload> m_nsURLDownload;
    124124    RetainPtr<WKDownloadAsDelegate> m_delegate;

  • trunk/Source/WebKit2/Shared/DrawingAreaInfo.h

    r160031 r163886  
    3030
    3131enum DrawingAreaType {
    32 #if PLATFORM(MAC)
     32#if PLATFORM(COCOA)
    3333#if !PLATFORM(IOS)
    3434    DrawingAreaTypeTiledCoreAnimation,

  • trunk/Source/WebKit2/Shared/FontInfo.cpp

    r161148 r163886  
    2929#include "WebCoreArgumentCoders.h"
    3030
    31 #if PLATFORM(MAC)
     31#if PLATFORM(COCOA)
    3232#include "ArgumentCodersCF.h"
    3333#endif
    … …  
    3737void FontInfo::encode(IPC::ArgumentEncoder& encoder) const
    3838{
    39 #if PLATFORM(MAC)
     39#if PLATFORM(COCOA)
    4040    encoder << static_cast<bool>(fontAttributeDictionary);
    4141    if (fontAttributeDictionary)
    … …  
    4848bool FontInfo::decode(IPC::ArgumentDecoder& decoder, FontInfo& fontInfo)
    4949{   
    50 #if PLATFORM(MAC)
     50#if PLATFORM(COCOA)
    5151    bool hasFontAttributeDictionary;
    5252    if (!decoder.decode(hasFontAttributeDictionary))

  • trunk/Source/WebKit2/Shared/FontInfo.h

    r161148 r163886  
    2727#define FontInfo_h
    2828
    29 #if PLATFORM(MAC)
     29#if PLATFORM(COCOA)
    3030#include <wtf/RetainPtr.h>
    3131#endif
    … …  
    4242    static bool decode(IPC::ArgumentDecoder&, FontInfo&);
    4343   
    44 #if PLATFORM(MAC)
     44#if PLATFORM(COCOA)
    4545    RetainPtr<CFDictionaryRef> fontAttributeDictionary;
    4646#endif

  • trunk/Source/WebKit2/Shared/LayerTreeContext.h

    r163218 r163886  
    5353    bool isEmpty() const;
    5454
    55 #if PLATFORM(MAC)
     55#if PLATFORM(COCOA)
    5656    uint32_t contextID;
    5757#elif PLATFORM(GTK)

  • trunk/Source/WebKit2/Shared/NativeWebKeyboardEvent.h

    r162599 r163886  
    3131#include "WebEvent.h"
    3232
    33 #if PLATFORM(MAC)
     33#if USE(APPKIT)
    3434#include <wtf/RetainPtr.h>
    3535OBJC_CLASS NSView;
    36 #elif PLATFORM(GTK)
     36#endif
     37
     38#if PLATFORM(EFL)
     39#include <Evas.h>
     40#endif
     41
     42#if PLATFORM(GTK)
    3743#include <WebCore/CompositionResults.h>
    3844#include <WebCore/GUniquePtrGtk.h>
    3945#include <WebCore/GtkInputMethodFilter.h>
    4046typedef union _GdkEvent GdkEvent;
    41 #elif PLATFORM(EFL)
    42 #include <Evas.h>
    4347#endif
    4448
    4549#if PLATFORM(IOS)
     50#include <wtf/RetainPtr.h>
    4651OBJC_CLASS WebIOSEvent;
    4752#endif

  • trunk/Source/WebKit2/Shared/NativeWebMouseEvent.h

    r162599 r163886  
    2929#include "WebEvent.h"
    3030
    31 #if PLATFORM(MAC)
     31#if USE(APPKIT)
    3232#include <wtf/RetainPtr.h>
    3333OBJC_CLASS NSView;
    34 #elif PLATFORM(GTK)
     34#endif
     35
     36#if PLATFORM(EFL)
     37#include <Evas.h>
     38#include <WebCore/AffineTransform.h>
     39#endif
     40
     41#if PLATFORM(GTK)
    3542#include <WebCore/GUniquePtrGtk.h>
    3643typedef union _GdkEvent GdkEvent;
    37 #elif PLATFORM(EFL)
    38 #include <Evas.h>
    39 #include <WebCore/AffineTransform.h>
    4044#endif
    4145

  • trunk/Source/WebKit2/Shared/NativeWebWheelEvent.h

    r162599 r163886  
    2929#include "WebEvent.h"
    3030
    31 #if PLATFORM(MAC)
     31#if USE(APPKIT)
    3232#include <wtf/RetainPtr.h>
    3333OBJC_CLASS NSView;
    34 #elif PLATFORM(GTK)
     34#endif
     35
     36#if PLATFORM(EFL)
     37#include <Evas.h>
     38#include <WebCore/AffineTransform.h>
     39#endif
     40
     41#if PLATFORM(GTK)
    3542#include <WebCore/GUniquePtrGtk.h>
    3643typedef union _GdkEvent GdkEvent;
    37 #elif PLATFORM(EFL)
    38 #include <Evas.h>
    39 #include <WebCore/AffineTransform.h>
    4044#endif
    4145

  • trunk/Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.h

    r162449 r163886  
    3535#include <wtf/text/WTFString.h>
    3636
    37 #if PLATFORM(MAC)
     37#if PLATFORM(COCOA)
    3838#include <wtf/HashMap.h>
    3939#include <wtf/HashSet.h>
    … …  
    7272    bool supportsScheme(const String&);
    7373   
    74 #if PLATFORM(MAC)
     74#if PLATFORM(COCOA)
    7575    void addCustomProtocol(WKCustomProtocol *);
    7676    void removeCustomProtocol(WKCustomProtocol *);
    … …  
    100100    RefPtr<WorkQueue> m_messageQueue;
    101101
    102 #if PLATFORM(MAC)
     102#if PLATFORM(COCOA)
    103103    HashSet<String> m_registeredSchemes;
    104104    Mutex m_registeredSchemesMutex;

  • trunk/Source/WebKit2/Shared/PlatformPopupMenuData.cpp

    r161148 r163886  
    3737void PlatformPopupMenuData::encode(IPC::ArgumentEncoder& encoder) const
    3838{
    39 #if PLATFORM(MAC)
     39#if PLATFORM(COCOA)
    4040    encoder << fontInfo;
    4141    encoder << shouldPopOver;
    … …  
    4747bool PlatformPopupMenuData::decode(IPC::ArgumentDecoder& decoder, PlatformPopupMenuData& data)
    4848{
    49 #if PLATFORM(MAC)
     49#if PLATFORM(COCOA)
    5050    if (!decoder.decode(data.fontInfo))
    5151        return false;

  • trunk/Source/WebKit2/Shared/PlatformPopupMenuData.h

    r161148 r163886  
    4444    static bool decode(IPC::ArgumentDecoder&, PlatformPopupMenuData&);
    4545
    46 #if PLATFORM(MAC)
     46#if PLATFORM(COCOA)
    4747    FontInfo fontInfo;
    4848    bool shouldPopOver;

  • trunk/Source/WebKit2/Shared/Plugins/Netscape/PluginInformation.cpp

    r160969 r163886  
    165165}
    166166
    167 #if !PLATFORM(MAC)
     167#if !PLATFORM(COCOA)
    168168void getPlatformPluginModuleInformation(const PluginModuleInfo&, ImmutableDictionary::MapType&)
    169169{

  • trunk/Source/WebKit2/Shared/Plugins/PluginModuleInfo.h

    r151767 r163886  
    2929#include <WebCore/PluginData.h>
    3030
    31 #if PLATFORM(MAC)
     31#if PLATFORM(COCOA)
    3232#include <mach/machine.h>
    3333#endif
    … …  
    5151    WebCore::PluginInfo info;
    5252
    53 #if PLATFORM(MAC)
     53#if PLATFORM(COCOA)
    5454    cpu_type_t pluginArchitecture;
    5555    String bundleIdentifier;

  • trunk/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp

    r161148 r163886  
    4444    encoder << minimumLifetime;
    4545    encoder << terminationTimeout;
    46 #if PLATFORM(MAC)
     46#if PLATFORM(COCOA)
    4747    encoder << acceleratedCompositingPort;
    4848#endif
    … …  
    5959    if (!decoder.decode(result.terminationTimeout))
    6060        return false;
    61 #if PLATFORM(MAC)
     61#if PLATFORM(COCOA)
    6262    if (!decoder.decode(result.acceleratedCompositingPort))
    6363        return false;

  • trunk/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.h

    r161148 r163886  
    3131#include "PluginProcessAttributes.h"
    3232
    33 #if PLATFORM(MAC)
     33#if PLATFORM(COCOA)
    3434#include "MachPort.h"
    3535#endif
    … …  
    5454    double terminationTimeout;
    5555
    56 #if PLATFORM(MAC)
     56#if PLATFORM(COCOA)
    5757    IPC::MachPort acceleratedCompositingPort;
    5858#endif

  • trunk/Source/WebKit2/Shared/PrintInfo.h

    r161148 r163886  
    2727#define PrintInfo_h
    2828
    29 #if PLATFORM(MAC)
     29#if USE(APPKIT)
    3030OBJC_CLASS NSPrintInfo;
    3131#elif PLATFORM(GTK)

  • trunk/Source/WebKit2/Shared/SandboxInitializationParameters.h

    r153070 r163886  
    3030#include <wtf/text/WTFString.h>
    3131
    32 #if PLATFORM(MAC)
     32#if PLATFORM(COCOA)
    3333OBJC_CLASS NSString;
    3434#endif
    … …  
    4242    ~SandboxInitializationParameters();
    4343
    44 #if PLATFORM(MAC)
     44#if PLATFORM(COCOA)
    4545    // Name must be a literal.
    4646    void addConfDirectoryParameter(const char* name, int confID);
    … …  
    9292
    9393private:
    94 #if PLATFORM(MAC)
     94#if PLATFORM(COCOA)
    9595    void appendPathInternal(const char* name, const char* path);
    9696
    … …  
    103103};
    104104
    105 #if !PLATFORM(MAC)
     105#if !PLATFORM(COCOA)
    106106SandboxInitializationParameters::SandboxInitializationParameters()
    107107{

  • trunk/Source/WebKit2/Shared/TextCheckerState.h

    r161148 r163886  
    3535    bool isGrammarCheckingEnabled;
    3636
    37 #if PLATFORM(MAC)
     37#if USE(APPKIT)
    3838    bool isAutomaticSpellingCorrectionEnabled;
    3939    bool isAutomaticQuoteSubstitutionEnabled;

  • trunk/Source/WebKit2/Shared/WebArchive.cpp

    r160653 r163886  
    2727#include "WebArchive.h"
    2828
    29 #if PLATFORM(MAC)
     29#if PLATFORM(COCOA)
    3030
    3131#include "APIArray.h"
    … …  
    158158} // namespace WebKit
    159159
    160 #endif // PLATFORM(MAC)
     160#endif // PLATFORM(COCOA)

  • trunk/Source/WebKit2/Shared/WebArchive.h

    r160653 r163886  
    2727#define WebArchive_h
    2828
    29 #if PLATFORM(MAC)
     29#if PLATFORM(COCOA)
    3030
    3131#include "APIObject.h"
    … …  
    7777} // namespace WebKit
    7878
    79 #endif // PLATFORM(MAC)
     79#endif // PLATFORM(COCOA)
    8080
    8181#endif // WebArchive_h

  • trunk/Source/WebKit2/Shared/WebArchiveResource.cpp

    r160653 r163886  
    2727#include "WebArchiveResource.h"
    2828
    29 #if PLATFORM(MAC)
     29#if PLATFORM(COCOA)
    3030
    3131#include "APIData.h"
    … …  
    100100} // namespace WebKit
    101101
    102 #endif // PLATFORM(MAC)
     102#endif // PLATFORM(COCOA)

  • trunk/Source/WebKit2/Shared/WebArchiveResource.h

    r160969 r163886  
    2727#define WebArchiveResource_h
    2828
    29 #if PLATFORM(MAC)
     29#if PLATFORM(COCOA)
    3030
    3131#include "APIObject.h"
    … …  
    6868} // namespace WebKit
    6969
    70 #endif // PLATFORM(MAC)
     70#endif // PLATFORM(COCOA)
    7171
    7272#endif // WebArchiveResource_h

  • trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp

    r163662 r163886  
    575575void ArgumentCoder<ResourceResponse>::encode(ArgumentEncoder& encoder, const ResourceResponse& resourceResponse)
    576576{
    577 #if PLATFORM(MAC)
     577#if PLATFORM(COCOA)
    578578    bool shouldSerializeWebCoreData = !resourceResponse.platformResponseIsUpToDate();
    579579    encoder << shouldSerializeWebCoreData;
    … …  
    604604bool ArgumentCoder<ResourceResponse>::decode(ArgumentDecoder& decoder, ResourceResponse& resourceResponse)
    605605{
    606 #if PLATFORM(MAC)
     606#if PLATFORM(COCOA)
    607607    bool hasSerializedWebCoreData;
    608608    if (!decoder.decode(hasSerializedWebCoreData))

  • trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h

    r163509 r163886  
    8484}
    8585
    86 #if PLATFORM(MAC)
     86#if PLATFORM(COCOA)
    8787namespace WebCore {
    8888struct KeypressCommand;
    … …  
    215215
    216216template<> struct ArgumentCoder<WebCore::ResourceRequest> {
    217 #if PLATFORM(MAC)
     217#if PLATFORM(COCOA)
    218218    static const bool kShouldSerializeWebCoreData = false;
    219219#else
    … …  
    235235
    236236template<> struct ArgumentCoder<WebCore::ResourceError> {
    237 #if PLATFORM(MAC)
     237#if PLATFORM(COCOA)
    238238    static const bool kShouldSerializeWebCoreData = false;
    239239#else
    … …  
    257257};
    258258
    259 #if PLATFORM(MAC)
     259#if PLATFORM(COCOA)
    260260template<> struct ArgumentCoder<WebCore::KeypressCommand> {
    261261    static void encode(ArgumentEncoder&, const WebCore::KeypressCommand&);

  • trunk/Source/WebKit2/Shared/WebEvent.h

    r161148 r163886  
    151151    };
    152152
    153 #if PLATFORM(MAC)
     153#if PLATFORM(COCOA)
    154154    enum Phase {
    155155        PhaseNone        = 0,
    … …  
    166166
    167167    WebWheelEvent(Type, const WebCore::IntPoint& position, const WebCore::IntPoint& globalPosition, const WebCore::FloatSize& delta, const WebCore::FloatSize& wheelTicks, Granularity, Modifiers, double timestamp);
    168 #if PLATFORM(MAC)
     168#if PLATFORM(COCOA)
    169169    WebWheelEvent(Type, const WebCore::IntPoint& position, const WebCore::IntPoint& globalPosition, const WebCore::FloatSize& delta, const WebCore::FloatSize& wheelTicks, Granularity, bool directionInvertedFromDevice, Phase, Phase momentumPhase, bool hasPreciseScrollingDeltas, uint32_t scrollCount, const WebCore::FloatSize& unacceleratedScrollingDelta, Modifiers, double timestamp);
    170170#endif
    … …  
    176176    Granularity granularity() const { return static_cast<Granularity>(m_granularity); }
    177177    bool directionInvertedFromDevice() const { return m_directionInvertedFromDevice; }
    178 #if PLATFORM(MAC)
     178#if PLATFORM(COCOA)
    179179    Phase phase() const { return static_cast<Phase>(m_phase); }
    180180    Phase momentumPhase() const { return static_cast<Phase>(m_momentumPhase); }
    … …  
    196196    uint32_t m_granularity; // Granularity
    197197    bool m_directionInvertedFromDevice;
    198 #if PLATFORM(MAC)
     198#if PLATFORM(COCOA)
    199199    uint32_t m_phase; // Phase
    200200    uint32_t m_momentumPhase; // Phase

  • trunk/Source/WebKit2/Shared/WebEventConversion.cpp

    r159724 r163886  
    129129        m_granularity = (webEvent.granularity() == WebWheelEvent::ScrollByPageWheelEvent) ? WebCore::ScrollByPageWheelEvent : WebCore::ScrollByPixelWheelEvent;
    130130        m_directionInvertedFromDevice = webEvent.directionInvertedFromDevice();
    131 #if PLATFORM(MAC)
     131#if PLATFORM(COCOA)
    132132        m_phase = static_cast<WebCore::PlatformWheelEventPhase>(webEvent.phase());
    133133        m_momentumPhase = static_cast<WebCore::PlatformWheelEventPhase>(webEvent.momentumPhase());

  • trunk/Source/WebKit2/Shared/WebKit2Initialize.cpp

    r160069 r163886  
    3333#include <wtf/RunLoop.h>
    3434
    35 #if PLATFORM(MAC)
     35#if PLATFORM(COCOA)
    3636#include "WebSystemInterface.h"
    3737#endif
    … …  
    4444void InitializeWebKit2()
    4545{
    46 #if PLATFORM(MAC)
     46#if PLATFORM(COCOA)
    4747    InitWebCoreSystemInterface();
    4848#endif

  • trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp

    r161357 r163886  
    6363    encoder.encodeEnum(layerHostingMode);
    6464
    65 #if PLATFORM(MAC)
     65#if PLATFORM(COCOA)
    6666    encoder << colorSpace;
    6767#endif
    … …  
    127127        return false;
    128128   
    129 #if PLATFORM(MAC)
     129#if PLATFORM(COCOA)
    130130    if (!decoder.decode(parameters.colorSpace))
    131131        return false;

  • trunk/Source/WebKit2/Shared/WebPageCreationParameters.h

    r161357 r163886  
    4040#include <wtf/text/WTFString.h>
    4141
    42 #if PLATFORM(MAC)
     42#if PLATFORM(COCOA)
    4343#include "ColorSpaceData.h"
    4444#endif
    … …  
    102102    LayerHostingMode layerHostingMode;
    103103
    104 #if PLATFORM(MAC)
     104#if PLATFORM(COCOA)
    105105    ColorSpaceData colorSpace;
    106106#endif

  • trunk/Source/WebKit2/Shared/WebPreferencesStore.h

    r163702 r163886  
    5555#endif
    5656
    57 #if PLATFORM(MAC)
     57#if PLATFORM(COCOA)
    5858#define DEFAULT_HIDDEN_PAGE_DOM_TIMER_THROTTLING_ENABLED true
    5959#define DEFAULT_HIDDEN_PAGE_CSS_ANIMATION_SUSPENSION_ENABLED true
    … …  
    217217    \
    218218
    219 #if PLATFORM(MAC)
     219#if PLATFORM(COCOA)
    220220
    221221#define FOR_EACH_WEBKIT_FONT_FAMILY_PREFERENCE(macro) \

  • trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp

    r163504 r163886  
    3636    , shouldUseFontSmoothing(true)
    3737    , defaultRequestTimeoutInterval(INT_MAX)
    38 #if PLATFORM(MAC)
     38#if PLATFORM(COCOA)
    3939    , nsURLCacheMemoryCapacity(0)
    4040    , nsURLCacheDiskCapacity(0)
    … …  
    9797    encoder << fullKeyboardAccessEnabled;
    9898    encoder << defaultRequestTimeoutInterval;
    99 #if PLATFORM(MAC) || USE(CFNETWORK)
     99#if PLATFORM(COCOA) || USE(CFNETWORK)
    100100    encoder << uiProcessBundleIdentifier;
    101101#endif
    102 #if PLATFORM(MAC)
     102#if PLATFORM(COCOA)
    103103    encoder << presenterApplicationPid;
    104104    encoder << accessibilityEnhancedUserInterfaceEnabled;
    … …  
    210210    if (!decoder.decode(parameters.defaultRequestTimeoutInterval))
    211211        return false;
    212 #if PLATFORM(MAC) || USE(CFNETWORK)
     212#if PLATFORM(COCOA) || USE(CFNETWORK)
    213213    if (!decoder.decode(parameters.uiProcessBundleIdentifier))
    214214        return false;
    215215#endif
    216216
    217 #if PLATFORM(MAC)
     217#if PLATFORM(COCOA)
    218218    if (!decoder.decode(parameters.presenterApplicationPid))
    219219        return false;

  • trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h

    r163504 r163886  
    3535#include <wtf/text/WTFString.h>
    3636
    37 #if PLATFORM(MAC)
     37#if PLATFORM(COCOA)
    3838#include "MachPort.h"
    3939#endif
    … …  
    113113    double defaultRequestTimeoutInterval;
    114114
    115 #if PLATFORM(MAC) || USE(CFNETWORK)
     115#if PLATFORM(COCOA) || USE(CFNETWORK)
    116116    String uiProcessBundleIdentifier;
    117117#endif
    118118
    119 #if PLATFORM(MAC)
     119#if PLATFORM(COCOA)
    120120    pid_t presenterApplicationPid;
    121121
    … …  
    133133    bool shouldEnableKerningAndLigaturesByDefault;
    134134    bool shouldEnableFTL;
    135 #endif // PLATFORM(MAC)
     135#endif // PLATFORM(COCOA)
    136136
    137137#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)

  • trunk/Source/WebKit2/Shared/WebWheelEvent.cpp

    r161148 r163886  
    4242    , m_granularity(granularity)
    4343    , m_directionInvertedFromDevice(false)
    44 #if PLATFORM(MAC)
     44#if PLATFORM(COCOA)
    4545    , m_phase(PhaseNone)
    4646    , m_hasPreciseScrollingDeltas(false)
    … …  
    5151}
    5252
    53 #if PLATFORM(MAC)
     53#if PLATFORM(COCOA)
    5454WebWheelEvent::WebWheelEvent(Type type, const IntPoint& position, const IntPoint& globalPosition, const FloatSize& delta, const FloatSize& wheelTicks, Granularity granularity, bool directionInvertedFromDevice, Phase phase, Phase momentumPhase, bool hasPreciseScrollingDeltas, uint32_t scrollCount, const WebCore::FloatSize& unacceleratedScrollingDelta, Modifiers modifiers, double timestamp)
    5555    : WebEvent(type, modifiers, timestamp)
    … …  
    8080    encoder << m_granularity;
    8181    encoder << m_directionInvertedFromDevice;
    82 #if PLATFORM(MAC)
     82#if PLATFORM(COCOA)
    8383    encoder << m_phase;
    8484    encoder << m_momentumPhase;
    … …  
    105105    if (!decoder.decode(t.m_directionInvertedFromDevice))
    106106        return false;
    107 #if PLATFORM(MAC)
     107#if PLATFORM(COCOA)
    108108    if (!decoder.decode(t.m_phase))
    109109        return false;

  • trunk/Source/WebKit2/Shared/cf/ArgumentCodersCF.cpp

    r161148 r163886  
    3333#include <wtf/Vector.h>
    3434
    35 #if PLATFORM(MAC)
     35#if USE(FOUNDATION)
    3636#import <Foundation/Foundation.h>
    3737#endif
    … …  
    525525        return false;
    526526
    527 #if PLATFORM(MAC)
     527#if USE(FOUNDATION)
    528528    // FIXME: Move this to ArgumentCodersCFMac.mm and change this file back to be C++
    529529    // instead of Objective-C++.

  • trunk/Source/WebKit2/Shared/mac/PDFKitImports.h

    r147067 r163886  
    2727#define PDFKitImports_h
    2828
    29 #if PLATFORM(MAC)
    30 
    3129namespace WebKit {
    3230
    … …  
    4442}
    4543
    46 #endif // PLATFORM(MAC)
    47 
    4844#endif // PDFKitImports_h

  • trunk/Source/WebKit2/Shared/posix/CommandLinePOSIX.cpp

    r163885 r163886  
    2929namespace WebKit {
    3030
    31 // FIXME: There's nothing Mac specific about this command line parser.
    32 // Maybe we should move it to CommandLinePosix.cpp instead.
    33 
    3431bool CommandLine::parse(int argc, char** argv)
    3532{

  • trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

    r163862 r163886  
    202202                1A66BF8F18A052ED002071B4 /* WKWebViewInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A66BF8E18A052ED002071B4 /* WKWebViewInternal.h */; };
    203203                1A6F9F9011E13EFC00DB1371 /* CommandLine.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6F9F8E11E13EFC00DB1371 /* CommandLine.h */; };
    204                 1A6F9FB711E1408500DB1371 /* CommandLineMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6F9FB611E1408500DB1371 /* CommandLineMac.cpp */; };
     204                1A6F9FB711E1408500DB1371 /* CommandLinePOSIX.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6F9FB611E1408500DB1371 /* CommandLinePOSIX.cpp */; };
    205205                1A6FB7AE11E64B6800DB1371 /* PluginView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6FB7AC11E64B6800DB1371 /* PluginView.cpp */; };
    206206                1A6FB7AF11E64B6800DB1371 /* PluginView.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6FB7AD11E64B6800DB1371 /* PluginView.h */; };
    … …  
    416416                2984F588164BA095004BC0C6 /* CustomProtocolManagerMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2984F586164BA095004BC0C6 /* CustomProtocolManagerMessageReceiver.cpp */; };
    417417                2984F589164BA095004BC0C6 /* CustomProtocolManagerMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 2984F587164BA095004BC0C6 /* CustomProtocolManagerMessages.h */; };
    418                 2989A411167D1834004F96D2 /* CustomProtocolManagerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2989A410167D1834004F96D2 /* CustomProtocolManagerMac.mm */; };
     418                2989A411167D1834004F96D2 /* CustomProtocolManagerCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2989A410167D1834004F96D2 /* CustomProtocolManagerCocoa.mm */; };
    419419                2989A414167D184B004F96D2 /* CustomProtocolManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 2989A412167D184B004F96D2 /* CustomProtocolManager.h */; };
    420420                29AD3093164B4C5D0072DEA9 /* CustomProtocolManagerProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 29AD3092164B4C5D0072DEA9 /* CustomProtocolManagerProxy.h */; };
    … …  
    18711871                1A66BF8E18A052ED002071B4 /* WKWebViewInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebViewInternal.h; sourceTree = "<group>"; };
    18721872                1A6F9F8E11E13EFC00DB1371 /* CommandLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommandLine.h; sourceTree = "<group>"; };
    1873                 1A6F9FB611E1408500DB1371 /* CommandLineMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CommandLineMac.cpp; sourceTree = "<group>"; };
     1873                1A6F9FB611E1408500DB1371 /* CommandLinePOSIX.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CommandLinePOSIX.cpp; sourceTree = "<group>"; };
    18741874                1A6FB7AC11E64B6800DB1371 /* PluginView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PluginView.cpp; sourceTree = "<group>"; };
    18751875                1A6FB7AD11E64B6800DB1371 /* PluginView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginView.h; sourceTree = "<group>"; };
    … …  
    21042104                2984F586164BA095004BC0C6 /* CustomProtocolManagerMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CustomProtocolManagerMessageReceiver.cpp; sourceTree = "<group>"; };
    21052105                2984F587164BA095004BC0C6 /* CustomProtocolManagerMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomProtocolManagerMessages.h; sourceTree = "<group>"; };
    2106                 2989A410167D1834004F96D2 /* CustomProtocolManagerMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = CustomProtocolManagerMac.mm; path = Network/CustomProtocols/mac/CustomProtocolManagerMac.mm; sourceTree = "<group>"; };
     2106                2989A410167D1834004F96D2 /* CustomProtocolManagerCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CustomProtocolManagerCocoa.mm; sourceTree = "<group>"; };
    21072107                2989A412167D184B004F96D2 /* CustomProtocolManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CustomProtocolManager.h; path = Network/CustomProtocols/CustomProtocolManager.h; sourceTree = "<group>"; };
    21082108                2989A413167D184B004F96D2 /* CustomProtocolManager.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CustomProtocolManager.messages.in; path = Network/CustomProtocols/CustomProtocolManager.messages.in; sourceTree = "<group>"; };
    … …  
    38173817                                51A8A60D1627F2AC000D90E9 /* Network */,
    38183818                                1AAE058C1279DCD400852418 /* Plugins */,
     3819                                3709504918A9FAD20087AE5D /* posix */,
    38193820                                0F5947A0187B3B7100437857 /* Scrolling */,
    38203821                                BC64696D11DBE603006455B0 /* APIArray.cpp */,
    … …  
    41284129                        isa = PBXGroup;
    41294130                        children = (
    4130                                 2989A40F167D181B004F96D2 /* mac */,
     4131                                2989A40F167D181B004F96D2 /* Cocoa */,
    41314132                                2989A412167D184B004F96D2 /* CustomProtocolManager.h */,
    41324133                                2989A413167D184B004F96D2 /* CustomProtocolManager.messages.in */,
    … …  
    41354136                        sourceTree = "<group>";
    41364137                };
    4137                 2989A40F167D181B004F96D2 /* mac */ = {
    4138                         isa = PBXGroup;
    4139                         children = (
    4140                                 2989A410167D1834004F96D2 /* CustomProtocolManagerMac.mm */,
    4141                         );
    4142                         name = mac;
     4138                2989A40F167D181B004F96D2 /* Cocoa */ = {
     4139                        isa = PBXGroup;
     4140                        children = (
     4141                                2989A410167D1834004F96D2 /* CustomProtocolManagerCocoa.mm */,
     4142                        );
     4143                        name = Cocoa;
     4144                        path = Network/CustomProtocols/Cocoa;
    41434145                        sourceTree = "<group>";
    41444146                };
    … …  
    43474349                        );
    43484350                        path = foundation;
     4351                        sourceTree = "<group>";
     4352                };
     4353                3709504918A9FAD20087AE5D /* posix */ = {
     4354                        isa = PBXGroup;
     4355                        children = (
     4356                                1A6F9FB611E1408500DB1371 /* CommandLinePOSIX.cpp */,
     4357                        );
     4358                        path = posix;
    43494359                        sourceTree = "<group>";
    43504360                };
    … …  
    53425352                                1A2A4AFE158693920090C9E9 /* ColorSpaceData.h */,
    53435353                                1A2A4AFD158693920090C9E9 /* ColorSpaceData.mm */,
    5344                                 1A6F9FB611E1408500DB1371 /* CommandLineMac.cpp */,
    53455354                                CDC3830D1721242D008A2FC3 /* CookieStorageShim.mm */,
    53465355                                CDC3830E1721242D008A2FC3 /* CookieStorageShim.h */,
    … …  
    76637672                                E1513C66166EABB200149FCB /* ChildProcessProxy.cpp in Sources */,
    76647673                                1A2A4B0E1586A2240090C9E9 /* ColorSpaceData.mm in Sources */,
    7665                                 1A6F9FB711E1408500DB1371 /* CommandLineMac.cpp in Sources */,
     7674                                1A6F9FB711E1408500DB1371 /* CommandLinePOSIX.cpp in Sources */,
    76667675                                BC032DAA10F437D10058C15A /* Connection.cpp in Sources */,
    76677676                                2DA944A31884E4F000ED86DB /* WebTouchEventIOS.cpp in Sources */,
    … …  
    76767685                                CDC3831017212440008A2FC3 /* CookieStorageShim.mm in Sources */,
    76777686                                B878B616133428DC006888E9 /* CorrectionPanel.mm in Sources */,
    7678                                 2989A411167D1834004F96D2 /* CustomProtocolManagerMac.mm in Sources */,
     7687                                2989A411167D1834004F96D2 /* CustomProtocolManagerCocoa.mm in Sources */,
    76797688                                2984F588164BA095004BC0C6 /* CustomProtocolManagerMessageReceiver.cpp in Sources */,
    76807689                                29AD3096164B4C930072DEA9 /* CustomProtocolManagerProxyMac.mm in Sources */,
Note: See TracChangeset for help on using the changeset viewer.