Changeset 145743 in webkit


Ignore:
Timestamp:
Mar 13, 2013 1:23:27 PM (11 years ago)
Author:
commit-queue@webkit.org
Message:

SchedulePair.cpp is CF-specific
​https://bugs.webkit.org/show_bug.cgi?id=112204

Patch by James Robinson <​jamesr@chromium.org> on 2013-03-13
Reviewed by Oliver Hunt.

This renames SchedulePair.cpp SchedulePairCF.cpp, since it depends on CF, and excludes it from chromium's gyp
files.

  • WTF.gyp/WTF.gyp: Add CF to the exclusion filter for the Chromium port.
  • WTF.gypi: Add SchedulePairCF.cpp
  • WTF.xcodeproj/project.pbxproj: Update project file to point to new .cpp location
  • wtf/SchedulePairCF.cpp: Renamed from Source/WTF/wtf/SchedulePair.cpp.
Location:
trunk/Source/WTF
Files:
4 edited
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/WTF/ChangeLog

    r145701 r145743  
     12013-03-13  James Robinson  <jamesr@chromium.org>
     2
     3        SchedulePair.cpp is CF-specific
     4        https://bugs.webkit.org/show_bug.cgi?id=112204
     5
     6        Reviewed by Oliver Hunt.
     7
     8        This renames SchedulePair.cpp SchedulePairCF.cpp, since it depends on CF, and excludes it from chromium's gyp
     9        files.
     10
     11        * WTF.gyp/WTF.gyp:
     12          Add CF to the exclusion filter for the Chromium port.
     13        * WTF.gypi:
     14          Add SchedulePairCF.cpp
     15        * WTF.xcodeproj/project.pbxproj:
     16          Update project file to point to new .cpp location
     17        * wtf/SchedulePairCF.cpp: Renamed from Source/WTF/wtf/SchedulePair.cpp.
     18
    1192013-03-13  Allan Sandfeld Jensen  <allan.jensen@digia.com>
    220

  • trunk/Source/WTF/WTF.gyp/WTF.gyp

    r142731 r145743  
    117117        ['exclude', '../wtf/unicode/wchar'],
    118118        ['exclude', '/(gtk|gobject)/.*\\.(cpp|h)$'],
    119         ['exclude', '(Default|Gtk|Mac|None|Qt|Win|Wx|Efl)\\.(cpp|mm)$'],
     119        ['exclude', '(Default|CF|Gtk|Mac|None|Qt|Win|Wx|Efl)\\.(cpp|mm)$'],
    120120        ['exclude', 'wtf/OSRandomSource\\.cpp$'],
    121121        ['exclude', 'wtf/MainThread.cpp$'],

  • trunk/Source/WTF/WTF.gypi

    r145603 r145743  
    205205            'wtf/SHA1.cpp',
    206206            'wtf/SHA1.h',
     207            'wtf/SchedulePairCF.cpp',
    207208            'wtf/SchedulePairMac.mm',
    208209            'wtf/SegmentedVector.h',

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

    r145592 r145743  
    3636                1469419316EAAF6D0024E146 /* RunLoopTimerCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1469419116EAAF6D0024E146 /* RunLoopTimerCF.cpp */; };
    3737                1469419616EAAFF80024E146 /* SchedulePair.h in Headers */ = {isa = PBXBuildFile; fileRef = 1469419416EAAFF80024E146 /* SchedulePair.h */; settings = {ATTRIBUTES = (Private, ); }; };
     38                1469419916EAB0410024E146 /* SchedulePairCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1469419816EAB0410024E146 /* SchedulePairCF.cpp */; };
    3839                1469419716EAAFF80024E146 /* SchedulePairMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1469419516EAAFF80024E146 /* SchedulePairMac.mm */; };
    39                 1469419916EAB0410024E146 /* SchedulePair.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1469419816EAB0410024E146 /* SchedulePair.cpp */; };
    4040                1469419C16EAB10A0024E146 /* AutodrainedPool.h in Headers */ = {isa = PBXBuildFile; fileRef = 1469419A16EAB10A0024E146 /* AutodrainedPool.h */; settings = {ATTRIBUTES = (Private, ); }; };
    4141                1469419D16EAB10A0024E146 /* AutodrainedPoolMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1469419B16EAB10A0024E146 /* AutodrainedPoolMac.mm */; };
    … …  
    346346                1469419116EAAF6D0024E146 /* RunLoopTimerCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RunLoopTimerCF.cpp; sourceTree = "<group>"; };
    347347                1469419416EAAFF80024E146 /* SchedulePair.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SchedulePair.h; sourceTree = "<group>"; };
     348                1469419816EAB0410024E146 /* SchedulePairCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SchedulePairCF.cpp; sourceTree = "<group>"; };
    348349                1469419516EAAFF80024E146 /* SchedulePairMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SchedulePairMac.mm; sourceTree = "<group>"; };
    349                 1469419816EAB0410024E146 /* SchedulePair.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SchedulePair.cpp; sourceTree = "<group>"; };
    350350                1469419A16EAB10A0024E146 /* AutodrainedPool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AutodrainedPool.h; sourceTree = "<group>"; };
    351351                1469419B16EAB10A0024E146 /* AutodrainedPoolMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AutodrainedPoolMac.mm; sourceTree = "<group>"; };
    … …  
    852852                                14F3B0F615E45E4600210069 /* SaturatedArithmetic.h */,
    853853                                1469419416EAAFF80024E146 /* SchedulePair.h */,
    854                                 1469419816EAB0410024E146 /* SchedulePair.cpp */,
     854                                1469419816EAB0410024E146 /* SchedulePairCF.cpp */,
    855855                                1469419516EAAFF80024E146 /* SchedulePairMac.mm */,
    856856                                A8A47306151A825B004123FF /* SegmentedVector.h */,
    … …  
    14131413                                A8A47440151A825B004123FF /* StringImpl.cpp in Sources */,
    14141414                                0FDDBFA71666DFA300C55FEF /* StringPrintStream.cpp in Sources */,
    1415                                 1469419916EAB0410024E146 /* SchedulePair.cpp in Sources */,
     1415                                1469419916EAB0410024E146 /* SchedulePairCF.cpp in Sources */,
    14161416                                A8A47443151A825B004123FF /* StringStatics.cpp in Sources */,
    14171417                                A8A473B7151A825B004123FF /* strtod.cc in Sources */,
Note: See TracChangeset for help on using the changeset viewer.