Changeset 181044 in webkit


Ignore:
Timestamp:
Mar 4, 2015 3:52:31 PM (9 years ago)
Author:
aestes@apple.com
Message:

[Content Filtering] Rename ContentFilterMac.mm to ContentFilter.cpp
https://bugs.webkit.org/show_bug.cgi?id=142313

Reviewed by Anders Carlsson.

ContentFilterMac.mm no longer contains any Objective-C code, so rename it to ContentFilter.cpp. It is also no longer Mac-specific, so move it up to platform/.

  • WebCore.xcodeproj/project.pbxproj:
  • platform/ContentFilter.cpp: Renamed from Source/WebCore/platform/mac/ContentFilterMac.mm.
  • platform/cocoa/NetworkExtensionContentFilter.h: Replaced NSInteger with long.
Location:
trunk/Source/WebCore
Files:
3 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r181038 r181044  
     12015-03-04  Andy Estes  <aestes@apple.com>
     2
     3        [Content Filtering] Rename ContentFilterMac.mm to ContentFilter.cpp
     4        https://bugs.webkit.org/show_bug.cgi?id=142313
     5
     6        Reviewed by Anders Carlsson.
     7
     8        ContentFilterMac.mm no longer contains any Objective-C code, so rename it to ContentFilter.cpp. It is also no longer Mac-specific, so move it up to platform/.
     9
     10        * WebCore.xcodeproj/project.pbxproj:
     11        * platform/ContentFilter.cpp: Renamed from Source/WebCore/platform/mac/ContentFilterMac.mm.
     12        * platform/cocoa/NetworkExtensionContentFilter.h: Replaced NSInteger with long.
     13
    1142015-03-04  Dean Jackson  <dino@apple.com>
    215
  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r181037 r181044  
    10501050                2917B566147349950052C9D0 /* LayerFlushSchedulerMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2917B565147349950052C9D0 /* LayerFlushSchedulerMac.cpp */; };
    10511051                2919A1E916B3376600787213 /* ContentFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 2919A1E816B3376600787213 /* ContentFilter.h */; };
    1052                 2919A1EB16B3378900787213 /* ContentFilterMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2919A1EA16B3378900787213 /* ContentFilterMac.mm */; };
    10531052                2934940A16C02C0700901318 /* PlatformSpeechSynthesisVoice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2527CC9316BF92EC009DDAC0 /* PlatformSpeechSynthesisVoice.cpp */; };
    10541053                2934940B16C02C0A00901318 /* PlatformSpeechSynthesisUtterance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2527CC9516BF95DD009DDAC0 /* PlatformSpeechSynthesisUtterance.cpp */; };
     
    38033802                A14832CE187F683400DA63A6 /* WebCoreThreadSystemInterface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A14832A0187F508700DA63A6 /* WebCoreThreadSystemInterface.cpp */; };
    38043803                A14832CF187F684700DA63A6 /* WebCoreThreadSystemInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = A14832A1187F508700DA63A6 /* WebCoreThreadSystemInterface.h */; settings = {ATTRIBUTES = (Private, ); }; };
     3804                A15D329D1AA7CF3B009A234A /* ContentFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A15D329C1AA7CF3B009A234A /* ContentFilter.cpp */; };
    38053805                A17C81220F2A5CF7005DAAEB /* HTMLElementFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A17C81200F2A5CF7005DAAEB /* HTMLElementFactory.cpp */; };
    38063806                A17C81230F2A5CF7005DAAEB /* HTMLElementFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = A17C81210F2A5CF7005DAAEB /* HTMLElementFactory.h */; };
     
    81058105                2917B565147349950052C9D0 /* LayerFlushSchedulerMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LayerFlushSchedulerMac.cpp; path = ca/mac/LayerFlushSchedulerMac.cpp; sourceTree = "<group>"; };
    81068106                2919A1E816B3376600787213 /* ContentFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContentFilter.h; sourceTree = "<group>"; };
    8107                 2919A1EA16B3378900787213 /* ContentFilterMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ContentFilterMac.mm; sourceTree = "<group>"; };
    81088107                293EAE1E1356B2FE0067ACF9 /* RuntimeApplicationChecks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RuntimeApplicationChecks.h; sourceTree = "<group>"; };
    81098108                293EAE201356B32E0067ACF9 /* RuntimeApplicationChecks.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RuntimeApplicationChecks.cpp; sourceTree = "<group>"; };
     
    1103611035                A14832AA187F508700DA63A6 /* WKView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKView.mm; path = ios/wak/WKView.mm; sourceTree = "<group>"; };
    1103711036                A14832AB187F508700DA63A6 /* WKViewPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKViewPrivate.h; path = ios/wak/WKViewPrivate.h; sourceTree = "<group>"; };
     11037                A15D329C1AA7CF3B009A234A /* ContentFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ContentFilter.cpp; sourceTree = "<group>"; };
    1103811038                A17C81200F2A5CF7005DAAEB /* HTMLElementFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLElementFactory.cpp; sourceTree = "<group>"; };
    1103911039                A17C81210F2A5CF7005DAAEB /* HTMLElementFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLElementFactory.h; sourceTree = "<group>"; };
     
    1658616586                                65A640F00533BB1F0085E777 /* BlockExceptions.h */,
    1658716587                                65F80697054D9F86008BF776 /* BlockExceptions.mm */,
    16588                                 2919A1EA16B3378900787213 /* ContentFilterMac.mm */,
    1658916588                                06027CB20B1CC03D00884B2D /* ContextMenuItemMac.mm */,
    1659016589                                93B6A0E90B0BCA8400F5027A /* ContextMenuMac.mm */,
     
    2151221511                                C37CDEBC149EF2030042090D /* ColorChooserClient.h */,
    2151321512                                BCC8CFCA0986CD2400140BF2 /* ColorData.gperf */,
     21513                                A15D329C1AA7CF3B009A234A /* ContentFilter.cpp */,
    2151421514                                2919A1E816B3376600787213 /* ContentFilter.h */,
    2151521515                                A14090FC1AA51E480091191A /* ContentFilterUnblockHandler.h */,
     
    2749527495                                BC5EB9800E82072500B25965 /* ContentData.cpp in Sources */,
    2749627496                                57B791A314C6A62900F202D1 /* ContentDistributor.cpp in Sources */,
    27497                                 2919A1EB16B3378900787213 /* ContentFilterMac.mm in Sources */,
    2749827497                                97C471DB12F925BD0086354B /* ContentSecurityPolicy.cpp in Sources */,
    2749927498                                41D015CB0F4B5C71004A662F /* ContentType.cpp in Sources */,
     
    2910429103                                CDA98DD816025BEF00FEA3B1 /* MediaKeyMessageEvent.cpp in Sources */,
    2910529104                                CD1B4A65160786AE00282DF9 /* MediaKeyNeededEvent.cpp in Sources */,
     29105                                A15D329D1AA7CF3B009A234A /* ContentFilter.cpp in Sources */,
    2910629106                                6C568CB019DAFEA000430CA2 /* MaskImageOperation.cpp in Sources */,
    2910729107                                CDA98E0D1603FE4A00FEA3B1 /* MediaKeys.cpp in Sources */,
  • trunk/Source/WebCore/platform/ContentFilter.cpp

    r181043 r181044  
    2424 */
    2525
    26 // FIXME: Rename to ContentFilter.cpp and move to platform/.
    27 
    28 #import "config.h"
    29 #import "ContentFilter.h"
     26#include "config.h"
     27#include "ContentFilter.h"
    3028
    3129#if ENABLE(CONTENT_FILTERING)
    3230
    33 #import "NetworkExtensionContentFilter.h"
    34 #import "ParentalControlsContentFilter.h"
    35 #import <wtf/NeverDestroyed.h>
    36 #import <wtf/Vector.h>
     31#include "NetworkExtensionContentFilter.h"
     32#include "ParentalControlsContentFilter.h"
     33#include <wtf/NeverDestroyed.h>
     34#include <wtf/Vector.h>
    3735
    3836namespace WebCore {
  • trunk/Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.h

    r181037 r181044  
    5252
    5353private:
    54     NSInteger m_neFilterSourceStatus;
     54    long m_neFilterSourceStatus;
    5555    RetainPtr<NEFilterSource> m_neFilterSource;
    5656    dispatch_queue_t m_neFilterSourceQueue;
Note: See TracChangeset for help on using the changeset viewer.