Changeset 181044 in webkit
- Timestamp:
- Mar 4, 2015 3:52:31 PM (9 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 3 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r181038 r181044 1 2015-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 1 14 2015-03-04 Dean Jackson <dino@apple.com> 2 15 -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r181037 r181044 1050 1050 2917B566147349950052C9D0 /* LayerFlushSchedulerMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2917B565147349950052C9D0 /* LayerFlushSchedulerMac.cpp */; }; 1051 1051 2919A1E916B3376600787213 /* ContentFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 2919A1E816B3376600787213 /* ContentFilter.h */; }; 1052 2919A1EB16B3378900787213 /* ContentFilterMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2919A1EA16B3378900787213 /* ContentFilterMac.mm */; };1053 1052 2934940A16C02C0700901318 /* PlatformSpeechSynthesisVoice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2527CC9316BF92EC009DDAC0 /* PlatformSpeechSynthesisVoice.cpp */; }; 1054 1053 2934940B16C02C0A00901318 /* PlatformSpeechSynthesisUtterance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2527CC9516BF95DD009DDAC0 /* PlatformSpeechSynthesisUtterance.cpp */; }; … … 3803 3802 A14832CE187F683400DA63A6 /* WebCoreThreadSystemInterface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A14832A0187F508700DA63A6 /* WebCoreThreadSystemInterface.cpp */; }; 3804 3803 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 */; }; 3805 3805 A17C81220F2A5CF7005DAAEB /* HTMLElementFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A17C81200F2A5CF7005DAAEB /* HTMLElementFactory.cpp */; }; 3806 3806 A17C81230F2A5CF7005DAAEB /* HTMLElementFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = A17C81210F2A5CF7005DAAEB /* HTMLElementFactory.h */; }; … … 8105 8105 2917B565147349950052C9D0 /* LayerFlushSchedulerMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LayerFlushSchedulerMac.cpp; path = ca/mac/LayerFlushSchedulerMac.cpp; sourceTree = "<group>"; }; 8106 8106 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>"; };8108 8107 293EAE1E1356B2FE0067ACF9 /* RuntimeApplicationChecks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RuntimeApplicationChecks.h; sourceTree = "<group>"; }; 8109 8108 293EAE201356B32E0067ACF9 /* RuntimeApplicationChecks.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RuntimeApplicationChecks.cpp; sourceTree = "<group>"; }; … … 11036 11035 A14832AA187F508700DA63A6 /* WKView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKView.mm; path = ios/wak/WKView.mm; sourceTree = "<group>"; }; 11037 11036 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>"; }; 11038 11038 A17C81200F2A5CF7005DAAEB /* HTMLElementFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLElementFactory.cpp; sourceTree = "<group>"; }; 11039 11039 A17C81210F2A5CF7005DAAEB /* HTMLElementFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLElementFactory.h; sourceTree = "<group>"; }; … … 16586 16586 65A640F00533BB1F0085E777 /* BlockExceptions.h */, 16587 16587 65F80697054D9F86008BF776 /* BlockExceptions.mm */, 16588 2919A1EA16B3378900787213 /* ContentFilterMac.mm */,16589 16588 06027CB20B1CC03D00884B2D /* ContextMenuItemMac.mm */, 16590 16589 93B6A0E90B0BCA8400F5027A /* ContextMenuMac.mm */, … … 21512 21511 C37CDEBC149EF2030042090D /* ColorChooserClient.h */, 21513 21512 BCC8CFCA0986CD2400140BF2 /* ColorData.gperf */, 21513 A15D329C1AA7CF3B009A234A /* ContentFilter.cpp */, 21514 21514 2919A1E816B3376600787213 /* ContentFilter.h */, 21515 21515 A14090FC1AA51E480091191A /* ContentFilterUnblockHandler.h */, … … 27495 27495 BC5EB9800E82072500B25965 /* ContentData.cpp in Sources */, 27496 27496 57B791A314C6A62900F202D1 /* ContentDistributor.cpp in Sources */, 27497 2919A1EB16B3378900787213 /* ContentFilterMac.mm in Sources */,27498 27497 97C471DB12F925BD0086354B /* ContentSecurityPolicy.cpp in Sources */, 27499 27498 41D015CB0F4B5C71004A662F /* ContentType.cpp in Sources */, … … 29104 29103 CDA98DD816025BEF00FEA3B1 /* MediaKeyMessageEvent.cpp in Sources */, 29105 29104 CD1B4A65160786AE00282DF9 /* MediaKeyNeededEvent.cpp in Sources */, 29105 A15D329D1AA7CF3B009A234A /* ContentFilter.cpp in Sources */, 29106 29106 6C568CB019DAFEA000430CA2 /* MaskImageOperation.cpp in Sources */, 29107 29107 CDA98E0D1603FE4A00FEA3B1 /* MediaKeys.cpp in Sources */, -
trunk/Source/WebCore/platform/ContentFilter.cpp
r181043 r181044 24 24 */ 25 25 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" 30 28 31 29 #if ENABLE(CONTENT_FILTERING) 32 30 33 #i mport"NetworkExtensionContentFilter.h"34 #i mport"ParentalControlsContentFilter.h"35 #i mport<wtf/NeverDestroyed.h>36 #i mport<wtf/Vector.h>31 #include "NetworkExtensionContentFilter.h" 32 #include "ParentalControlsContentFilter.h" 33 #include <wtf/NeverDestroyed.h> 34 #include <wtf/Vector.h> 37 35 38 36 namespace WebCore { -
trunk/Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.h
r181037 r181044 52 52 53 53 private: 54 NSIntegerm_neFilterSourceStatus;54 long m_neFilterSourceStatus; 55 55 RetainPtr<NEFilterSource> m_neFilterSource; 56 56 dispatch_queue_t m_neFilterSourceQueue;
Note: See TracChangeset
for help on using the changeset viewer.