Changeset 163862 in webkit


Ignore:
Timestamp:
Feb 10, 2014, 10:21:41 PM (11 years ago)
Author:
mitz@apple.com
Message:

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

Reviewed by Dean Jackson.

  • Platform/IPC/Connection.cpp:

(IPC::Connection::waitForSyncReply): Changed PLATFORM(MAC) to PLATFORM(COCOA) around use of
RunLoop::runForDuration, matching the guard around that function.

  • Platform/Logging.cpp: Deleted unused definition of logLevelString.
  • Platform/Module.cpp:

(WebKit::Module::Module): Changed PLATFORM(MAC) to USE(CF).

  • Platform/Module.h: Changed PLATFORM(MAC) to USE(CF), since the “Mac” implementation is

just a CFBundle-based implementation.

  • Platform/PlatformProcessIdentifier.h: Changed PLATFORM(MAC) to PLATFORM(COCOA). Arguably

this should be OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK).

  • Platform/cf: Added.
  • Platform/cf/ModuleCF.cpp: Renamed from Platform/mac/ModuleMac.mm. This file did not

contain any Objective-C code.

  • Platform/foundation: Added.
  • Platform/foundation/LoggingFoundation.mm: Renamed from Platform/mac/Logging.mac.mm.
  • Platform/mac/Logging.mac.mm: Removed.
  • Platform/mac/ModuleMac.mm: Removed.
  • WebKit2.xcodeproj/project.pbxproj: Updated for renames.
Location:
trunk/Source/WebKit2
Files:
2 added
7 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r163860 r163862  
     12014-02-10  Dan Bernstein  <mitz@apple.com>
     2
     3        Stop using PLATFORM(MAC) in WebKit2/platform except where it means “OS X but not iOS”
     4        https://bugs.webkit.org/show_bug.cgi?id=128513
     5
     6        Reviewed by Dean Jackson.
     7
     8        * Platform/IPC/Connection.cpp:
     9        (IPC::Connection::waitForSyncReply): Changed PLATFORM(MAC) to PLATFORM(COCOA) around use of
     10        RunLoop::runForDuration, matching the guard around that function.
     11        * Platform/Logging.cpp: Deleted unused definition of logLevelString.
     12        * Platform/Module.cpp:
     13        (WebKit::Module::Module): Changed PLATFORM(MAC) to USE(CF).
     14        * Platform/Module.h: Changed PLATFORM(MAC) to USE(CF), since the “Mac” implementation is
     15        just a CFBundle-based implementation.
     16        * Platform/PlatformProcessIdentifier.h: Changed PLATFORM(MAC) to PLATFORM(COCOA). Arguably
     17        this should be OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK).
     18        * Platform/cf: Added.
     19        * Platform/cf/ModuleCF.cpp: Renamed from Platform/mac/ModuleMac.mm. This file did not
     20        contain any Objective-C code.
     21        * Platform/foundation: Added.
     22        * Platform/foundation/LoggingFoundation.mm: Renamed from Platform/mac/Logging.mac.mm.
     23        * Platform/mac/Logging.mac.mm: Removed.
     24        * Platform/mac/ModuleMac.mm: Removed.
     25        * WebKit2.xcodeproj/project.pbxproj: Updated for renames.
     26
    1272014-02-10  Commit Queue  <commit-queue@webkit.org>
    228

  • trunk/Source/WebKit2/Platform/IPC/Connection.cpp

    r162777 r163862  
    546546        // Notably, it can continue to process accessibility requests, which are on the main thread.
    547547        if (syncSendFlags & SpinRunLoopWhileWaitingForReply) {
    548 #if PLATFORM(MAC)
     548#if PLATFORM(COCOA)
    549549            // FIXME: Although we run forever, any events incoming will cause us to drop out and exit out. This however doesn't
    550550            // account for a timeout value passed in. Timeout is always NoTimeout in these cases, but that could change.

  • trunk/Source/WebKit2/Platform/Logging.cpp

    r156799 r163862  
    6767#endif
    6868
    69 #if !PLATFORM(MAC) && !PLATFORM(GTK) && !PLATFORM(EFL)
    70 String logLevelString()
    71 {
    72     // FIXME: Each platform will need to define their own logLevelString();
    73     return emptyString();
    74 }
    75 #endif
    76 
    7769} // namespace WebKit
    7870

  • trunk/Source/WebKit2/Platform/Module.cpp

    r139023 r163862  
    3131Module::Module(const String& path)
    3232    : m_path(path)
    33 #if PLATFORM(MAC) && !defined(__LP64__)
     33#if USE(CF) && !defined(__LP64__)
    3434    , m_bundleResourceMap(-1)
    3535#endif

  • trunk/Source/WebKit2/Platform/Module.h

    r156799 r163862  
    3030#include <wtf/text/WTFString.h>
    3131
    32 #if PLATFORM(MAC)
     32#if USE(CF)
    3333#include <wtf/RetainPtr.h>
    3434#endif
    … …  
    5555    void unload();
    5656
    57 #if PLATFORM(MAC)
     57#if USE(CF)
    5858    String bundleIdentifier() const;
    5959#endif
    … …  
    6161    template<typename FunctionType> FunctionType functionPointer(const char* functionName) const;
    6262
    63 #if PLATFORM(MAC) && !defined(__LP64__)
     63#if USE(CF) && !defined(__LP64__)
    6464    CFBundleRefNum bundleResourceMap();
    6565#endif
    … …  
    6969
    7070    String m_path;
    71 #if PLATFORM(MAC)
     71#if USE(CF)
    7272    RetainPtr<CFBundleRef> m_bundle;
    7373#if !defined(__LP64__)

  • trunk/Source/WebKit2/Platform/PlatformProcessIdentifier.h

    r157643 r163862  
    3434namespace WebKit {
    3535
    36 #if PLATFORM(MAC)
     36#if PLATFORM(COCOA)
    3737typedef pid_t PlatformProcessIdentifier;
    3838#elif PLATFORM(GTK)

  • trunk/Source/WebKit2/Platform/cf/ModuleCF.cpp

    r163859 r163862  
    2424 */
    2525
    26 #import "config.h"
    27 #import "Module.h"
     26#include "config.h"
     27#include "Module.h"
    2828
    2929namespace WebKit {

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

    r163666 r163862  
    710710                515E773318402D510007203F /* UniqueIDBDatabaseIdentifier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 515E773118402D510007203F /* UniqueIDBDatabaseIdentifier.cpp */; };
    711711                515E773418402D510007203F /* UniqueIDBDatabaseIdentifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 515E773218402D510007203F /* UniqueIDBDatabaseIdentifier.h */; };
    712                 5160BFE113381DF900918999 /* Logging.mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5160BFE013381DF900918999 /* Logging.mac.mm */; };
     712                5160BFE113381DF900918999 /* LoggingFoundation.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5160BFE013381DF900918999 /* LoggingFoundation.mm */; };
    713713                516311871858446600534647 /* WebCrossThreadCopier.h in Headers */ = {isa = PBXBuildFile; fileRef = 516311861858446600534647 /* WebCrossThreadCopier.h */; };
    714714                516319921628980A00E22F00 /* NetworkProcessProxyMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 516319911628980A00E22F00 /* NetworkProcessProxyMac.mm */; };
    … …  
    13451345                C0CE72A11247E71D00BC0EC4 /* WebPageMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = C0CE729F1247E71D00BC0EC4 /* WebPageMessages.h */; };
    13461346                C0CE72AD1247E78D00BC0EC4 /* HandleMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = C0CE72AC1247E78D00BC0EC4 /* HandleMessage.h */; };
    1347                 C0E3AA7A1209E83000A49D01 /* ModuleMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = C0E3AA481209E45000A49D01 /* ModuleMac.mm */; };
     1347                C0E3AA7A1209E83000A49D01 /* ModuleCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C0E3AA481209E45000A49D01 /* ModuleCF.cpp */; };
    13481348                C0E3AA7B1209E83500A49D01 /* Module.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C0E3AA451209E2BA00A49D01 /* Module.cpp */; };
    13491349                C0E3AA7C1209E83C00A49D01 /* Module.h in Headers */ = {isa = PBXBuildFile; fileRef = C0E3AA441209E2BA00A49D01 /* Module.h */; };
    … …  
    24342434                515E773118402D510007203F /* UniqueIDBDatabaseIdentifier.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UniqueIDBDatabaseIdentifier.cpp; sourceTree = "<group>"; };
    24352435                515E773218402D510007203F /* UniqueIDBDatabaseIdentifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UniqueIDBDatabaseIdentifier.h; sourceTree = "<group>"; };
    2436                 5160BFE013381DF900918999 /* Logging.mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = Logging.mac.mm; sourceTree = "<group>"; };
     2436                5160BFE013381DF900918999 /* LoggingFoundation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LoggingFoundation.mm; sourceTree = "<group>"; };
    24372437                516311861858446600534647 /* WebCrossThreadCopier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebCrossThreadCopier.h; sourceTree = "<group>"; };
    24382438                516319911628980A00E22F00 /* NetworkProcessProxyMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = NetworkProcessProxyMac.mm; path = mac/NetworkProcessProxyMac.mm; sourceTree = "<group>"; };
    … …  
    31343134                C0E3AA441209E2BA00A49D01 /* Module.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Module.h; sourceTree = "<group>"; };
    31353135                C0E3AA451209E2BA00A49D01 /* Module.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Module.cpp; sourceTree = "<group>"; };
    3136                 C0E3AA481209E45000A49D01 /* ModuleMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ModuleMac.mm; sourceTree = "<group>"; };
     3136                C0E3AA481209E45000A49D01 /* ModuleCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ModuleCF.cpp; sourceTree = "<group>"; };
    31373137                C517388012DF8F4F00EE3F47 /* DragControllerAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DragControllerAction.h; sourceTree = "<group>"; };
    31383138                C5237F5F12441CA300780472 /* WebEditorClientMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebEditorClientMac.mm; sourceTree = "<group>"; };
    … …  
    37573757                                BCE0937614FB128B001138D9 /* LayerHostingContext.h */,
    37583758                                BCE0937514FB128B001138D9 /* LayerHostingContext.mm */,
    3759                                 5160BFE013381DF900918999 /* Logging.mac.mm */,
    37603759                                1A24B5F011F531E800C38269 /* MachUtilities.cpp */,
    37613760                                1A24B5F111F531E800C38269 /* MachUtilities.h */,
    3762                                 C0E3AA481209E45000A49D01 /* ModuleMac.mm */,
    37633761                                1A24BF39120896A600FBB059 /* SharedMemoryMac.cpp */,
    37643762                                296BD85B15019BC30071F424 /* StringUtilities.h */,
    … …  
    43354333                        sourceTree = "<group>";
    43364334                };
     4335                3709504118A88BA40087AE5D /* cf */ = {
     4336                        isa = PBXGroup;
     4337                        children = (
     4338                                C0E3AA481209E45000A49D01 /* ModuleCF.cpp */,
     4339                        );
     4340                        path = cf;
     4341                        sourceTree = "<group>";
     4342                };
     4343                3709504218A88CDE0087AE5D /* foundation */ = {
     4344                        isa = PBXGroup;
     4345                        children = (
     4346                                5160BFE013381DF900918999 /* LoggingFoundation.mm */,
     4347                        );
     4348                        path = foundation;
     4349                        sourceTree = "<group>";
     4350                };
    43374351                37C4C08318149C2A003688B9 /* Cocoa */ = {
    43384352                        isa = PBXGroup;
    … …  
    55025516                        children = (
    55035517                                1AE00D6818327C1200087DD7 /* IPC */,
     5518                                3709504118A88BA40087AE5D /* cf */,
    55045519                                1AA2E51A12E4C05600BC4966 /* cg */,
     5520                                3709504218A88CDE0087AE5D /* foundation */,
    55055521                                1A7E814E1152D2240003695B /* mac */,
    55065522                                51B15A7D138439B200321AD8 /* unix */,
    … …  
    77457761                                1A8C728C1738477C000A6554 /* LocalStorageDatabaseTracker.cpp in Sources */,
    77467762                                51A7F2F5125BF8D4008AEB1D /* Logging.cpp in Sources */,
    7747                                 5160BFE113381DF900918999 /* Logging.mac.mm in Sources */,
     7763                                5160BFE113381DF900918999 /* LoggingFoundation.mm in Sources */,
    77487764                                1A24B5F211F531E800C38269 /* MachUtilities.cpp in Sources */,
    77497765                                1A232902162C867300D82F7A /* MessageDecoder.cpp in Sources */,
    … …  
    77527768                                1A9E328E182165A900F5D04C /* WKRemoteObjectInterface.mm in Sources */,
    77537769                                C0E3AA7B1209E83500A49D01 /* Module.cpp in Sources */,
    7754                                 C0E3AA7A1209E83000A49D01 /* ModuleMac.mm in Sources */,
     7770                                C0E3AA7A1209E83000A49D01 /* ModuleCF.cpp in Sources */,
    77557771                                370F34A21829BE1E009027C8 /* WKNavigationData.mm in Sources */,
    77567772                                BCB0AEEA122F53E300B1341E /* MutableDictionary.cpp in Sources */,
Note: See TracChangeset for help on using the changeset viewer.