<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[160877] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/160877">160877</a></dd>
<dt>Author</dt> <dd>aestes@apple.com</dd>
<dt>Date</dt> <dd>2013-12-19 16:48:27 -0800 (Thu, 19 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove WebFilterEvaluator wrappers from WebKitSystemInterface
https://bugs.webkit.org/show_bug.cgi?id=126028
Reviewed by Anders Carlsson.
Source/WebCore:
It's overkill to pipe access to WebFilterEvaluator through
WebKitSystemInterface. Instead, include WebFilterEvaluator.h when it
exists and re-declare WebFilterEvaluator when it doesn't.
WebKitSystemInterface used to soft-link WebContentAnalysis.framework
since OS X 10.7 didn't contain this framework. Since we no longer
support 10.7, we can now directly link against the framework.
* Configurations/WebCore.xcconfig: Add /System/Library/PrivateHeaders
to the system framework search path at both compile and link time so
that we can find WebContentAnalysis.framework.
* WebCore.exp.in: Don't export removed symbols.
* WebCore.xcodeproj/project.pbxproj: Added WebContentAnalysis.framework
to the 'Link Binary With Libraries' build phase.
* platform/mac/ContentFilterMac.mm: Included WebFilterEvaluator.h when
it exists and re-declared WebFilterEvaluator when it doesn't.
(WebCore::ContentFilter::ContentFilter): Directly called a method on
m_platformContentFilter rather than going through WKSI.
(WebCore::ContentFilter::isEnabled): Ditto.
(WebCore::ContentFilter::addData): Ditto.
(WebCore::ContentFilter::finishedAddingData): Ditto.
(WebCore::ContentFilter::needsMoreData): Ditto.
(WebCore::ContentFilter::didBlockData): Ditto.
* platform/mac/WebCoreSystemInterface.h: Removed function pointers for
calling into WKSI.
* platform/mac/WebCoreSystemInterface.mm: Ditto.
Source/WebKit/mac:
* WebCoreSupport/WebSystemInterface.mm:
(InitWebCoreSystemInterface): Don't INIT() removed function pointers.
Source/WebKit2:
* WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
(InitWebCoreSystemInterface): Don't INIT() removed function pointers.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreConfigurationsWebCorexcconfig">trunk/Source/WebCore/Configurations/WebCore.xcconfig</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoreplatformmacContentFilterMacmm">trunk/Source/WebCore/platform/mac/ContentFilterMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacWebCoreSystemInterfaceh">trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacWebCoreSystemInterfacemm">trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebSystemInterfacemm">trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportmacWebSystemInterfacemm">trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160876 => 160877)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-20 00:42:47 UTC (rev 160876)
+++ trunk/Source/WebCore/ChangeLog 2013-12-20 00:48:27 UTC (rev 160877)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2013-12-19 Andy Estes <aestes@apple.com>
+
+ Remove WebFilterEvaluator wrappers from WebKitSystemInterface
+ https://bugs.webkit.org/show_bug.cgi?id=126028
+
+ Reviewed by Anders Carlsson.
+
+ It's overkill to pipe access to WebFilterEvaluator through
+ WebKitSystemInterface. Instead, include WebFilterEvaluator.h when it
+ exists and re-declare WebFilterEvaluator when it doesn't.
+
+ WebKitSystemInterface used to soft-link WebContentAnalysis.framework
+ since OS X 10.7 didn't contain this framework. Since we no longer
+ support 10.7, we can now directly link against the framework.
+
+ * Configurations/WebCore.xcconfig: Add /System/Library/PrivateHeaders
+ to the system framework search path at both compile and link time so
+ that we can find WebContentAnalysis.framework.
+ * WebCore.exp.in: Don't export removed symbols.
+ * WebCore.xcodeproj/project.pbxproj: Added WebContentAnalysis.framework
+ to the 'Link Binary With Libraries' build phase.
+ * platform/mac/ContentFilterMac.mm: Included WebFilterEvaluator.h when
+ it exists and re-declared WebFilterEvaluator when it doesn't.
+ (WebCore::ContentFilter::ContentFilter): Directly called a method on
+ m_platformContentFilter rather than going through WKSI.
+ (WebCore::ContentFilter::isEnabled): Ditto.
+ (WebCore::ContentFilter::addData): Ditto.
+ (WebCore::ContentFilter::finishedAddingData): Ditto.
+ (WebCore::ContentFilter::needsMoreData): Ditto.
+ (WebCore::ContentFilter::didBlockData): Ditto.
+ * platform/mac/WebCoreSystemInterface.h: Removed function pointers for
+ calling into WKSI.
+ * platform/mac/WebCoreSystemInterface.mm: Ditto.
+
</ins><span class="cx"> 2013-12-19 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Use CascadedProperties for page and keyframe style resolution as well.
</span></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsWebCorexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (160876 => 160877)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Configurations/WebCore.xcconfig 2013-12-20 00:42:47 UTC (rev 160876)
+++ trunk/Source/WebCore/Configurations/WebCore.xcconfig 2013-12-20 00:48:27 UTC (rev 160877)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> FRAMEWORK_SEARCH_PATHS_iphonesimulator = $(FRAMEWORK_SEARCH_PATHS_iphoneos_$(CONFIGURATION));
</span><span class="cx"> FRAMEWORK_SEARCH_PATHS_macosx = $(STAGED_FRAMEWORKS_SEARCH_PATH) $(FRAMEWORK_SEARCH_PATHS);
</span><span class="cx">
</span><del>-OTHER_CFLAGS = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks;
</del><ins>+OTHER_CFLAGS = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
</ins><span class="cx"> OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
</span><span class="cx">
</span><span class="cx"> STAGED_FRAMEWORKS_SEARCH_PATH = $(STAGED_FRAMEWORKS_SEARCH_PATH_$(USE_STAGING_INSTALL_PATH));
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> INSTALLHDRS_COPY_PHASE = YES;
</span><span class="cx"> INSTALLHDRS_SCRIPT_PHASE = YES;
</span><span class="cx"> PRODUCT_NAME = WebCore;
</span><del>-OTHER_LDFLAGS_BASE = -lsqlite3 -lobjc -lANGLE -allowable_client WebCoreTestSupport;
</del><ins>+OTHER_LDFLAGS_BASE = -lsqlite3 -lobjc -lANGLE -allowable_client WebCoreTestSupport -F$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
</ins><span class="cx"> OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
</span><span class="cx"> OTHER_LDFLAGS_iphoneos = $(OTHER_LDFLAGS_BASE) -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework CoreText -framework Foundation -framework GraphicsServices -framework ImageIO -framework QuartzCore;
</span><span class="cx"> OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (160876 => 160877)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2013-12-20 00:42:47 UTC (rev 160876)
+++ trunk/Source/WebCore/WebCore.exp.in 2013-12-20 00:48:27 UTC (rev 160877)
</span><span class="lines">@@ -2529,15 +2529,6 @@
</span><span class="cx"> _wkSetRequestStorageSession
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(CONTENT_FILTERING)
-_wkFilterAddData
-_wkFilterCreateInstance
-_wkFilterDataComplete
-_wkFilterIsBuffering
-_wkFilterIsManagedSession
-_wkFilterWasBlocked
-#endif
-
</del><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><span class="cx"> __ZN7WebCore11ContextMenu22setPlatformDescriptionEP14NSMutableArray
</span><span class="cx"> __ZN7WebCore12EventHandler20sendContextMenuEventERKNS_18PlatformMouseEventE
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (160876 => 160877)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-12-20 00:42:47 UTC (rev 160876)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-12-20 00:48:27 UTC (rev 160877)
</span><span class="lines">@@ -3474,6 +3474,7 @@
</span><span class="cx"> A12538D413F9B60A00024754 /* LayoutRepainter.h in Headers */ = {isa = PBXBuildFile; fileRef = A120ACA013F9983700FE4AC7 /* LayoutRepainter.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> A12705C31656BD6500C2E27C /* GridPosition.h in Headers */ = {isa = PBXBuildFile; fileRef = A12705C21656BD6500C2E27C /* GridPosition.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> A12A1050166444FD008FA311 /* GridTrackSize.h in Headers */ = {isa = PBXBuildFile; fileRef = A12A104E166444DC008FA311 /* GridTrackSize.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><ins>+ A13330C01863C0BB00F9152B /* WebContentAnalysis.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A13330BE1863B92600F9152B /* WebContentAnalysis.framework */; };
</ins><span class="cx"> A136A00C1134DBD200CC8D50 /* XMLHttpRequestProgressEventThrottle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A136A00A1134DBD200CC8D50 /* XMLHttpRequestProgressEventThrottle.cpp */; };
</span><span class="cx"> A136A00D1134DBD200CC8D50 /* XMLHttpRequestProgressEventThrottle.h in Headers */ = {isa = PBXBuildFile; fileRef = A136A00B1134DBD200CC8D50 /* XMLHttpRequestProgressEventThrottle.h */; };
</span><span class="cx"> A17C81220F2A5CF7005DAAEB /* HTMLElementFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A17C81200F2A5CF7005DAAEB /* HTMLElementFactory.cpp */; };
</span><span class="lines">@@ -10304,6 +10305,7 @@
</span><span class="cx"> A120ACA113F9984600FE4AC7 /* LayoutRepainter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LayoutRepainter.cpp; sourceTree = "<group>"; };
</span><span class="cx"> A12705C21656BD6500C2E27C /* GridPosition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GridPosition.h; path = style/GridPosition.h; sourceTree = "<group>"; };
</span><span class="cx"> A12A104E166444DC008FA311 /* GridTrackSize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GridTrackSize.h; path = style/GridTrackSize.h; sourceTree = "<group>"; };
</span><ins>+ A13330BE1863B92600F9152B /* WebContentAnalysis.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebContentAnalysis.framework; path = System/Library/PrivateFrameworks/WebContentAnalysis.framework; sourceTree = SDKROOT; };
</ins><span class="cx"> A136A00A1134DBD200CC8D50 /* XMLHttpRequestProgressEventThrottle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XMLHttpRequestProgressEventThrottle.cpp; sourceTree = "<group>"; };
</span><span class="cx"> A136A00B1134DBD200CC8D50 /* XMLHttpRequestProgressEventThrottle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XMLHttpRequestProgressEventThrottle.h; sourceTree = "<group>"; };
</span><span class="cx"> A17C81200F2A5CF7005DAAEB /* HTMLElementFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLElementFactory.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -13627,6 +13629,7 @@
</span><span class="cx"> 49C7BA791042EFAE0009D447 /* OpenGL.framework in Frameworks */,
</span><span class="cx"> A88AD52F09524B92001DD196 /* QuartzCore.framework in Frameworks */,
</span><span class="cx"> 1A7FA7CC0DDA4B770028F8A5 /* SystemConfiguration.framework in Frameworks */,
</span><ins>+ A13330C01863C0BB00F9152B /* WebContentAnalysis.framework in Frameworks */,
</ins><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> };
</span><span class="lines">@@ -14034,6 +14037,7 @@
</span><span class="cx"> A85D7A2F0879EBA9006A9172 /* QuartzCore.framework */,
</span><span class="cx"> 5FE1D291178FD1F3001AA3C3 /* Security.framework */,
</span><span class="cx"> 1A7FA7CB0DDA4B770028F8A5 /* SystemConfiguration.framework */,
</span><ins>+ A13330BE1863B92600F9152B /* WebContentAnalysis.framework */,
</ins><span class="cx"> );
</span><span class="cx"> name = Frameworks;
</span><span class="cx"> sourceTree = "<group>";
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacContentFilterMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ContentFilterMac.mm (160876 => 160877)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ContentFilterMac.mm 2013-12-20 00:42:47 UTC (rev 160876)
+++ trunk/Source/WebCore/platform/mac/ContentFilterMac.mm 2013-12-20 00:48:27 UTC (rev 160877)
</span><span class="lines">@@ -31,6 +31,20 @@
</span><span class="cx"> #import "ResourceResponse.h"
</span><span class="cx"> #import "WebCoreSystemInterface.h"
</span><span class="cx">
</span><ins>+#if defined(__has_include) && __has_include(<WebContentAnalysis/WebFilterEvaluator.h>)
+#import <WebContentAnalysis/WebFilterEvaluator.h>
+#else
+static const OSStatus kWFEStateBuffering = 2;
+@interface WebFilterEvaluator : NSObject
++ (BOOL)isManagedSession;
+- (BOOL)wasBlocked;
+- (NSData *)addData:(NSData *)receivedData;
+- (NSData *)dataComplete;
+- (OSStatus)filterState;
+- (id)initWithResponse:(NSURLResponse *)response;
+@end
+#endif
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> PassRefPtr<ContentFilter> ContentFilter::create(const ResourceResponse& response)
</span><span class="lines">@@ -39,21 +53,21 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ContentFilter::ContentFilter(const ResourceResponse& response)
</span><del>- : m_platformContentFilter(adoptNS(wkFilterCreateInstance(response.nsURLResponse())))
</del><ins>+ : m_platformContentFilter(adoptNS([[WebFilterEvaluator alloc] initWithResponse:response.nsURLResponse()]))
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_platformContentFilter);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool ContentFilter::isEnabled()
</span><span class="cx"> {
</span><del>- return wkFilterIsManagedSession();
</del><ins>+ return [WebFilterEvaluator isManagedSession];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ContentFilter::addData(const char* data, int length)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(needsMoreData());
</span><span class="cx"> ASSERT(![m_replacementData.get() length]);
</span><del>- m_replacementData = wkFilterAddData(m_platformContentFilter.get(), [NSData dataWithBytesNoCopy:(void*)data length:length freeWhenDone:NO]);
</del><ins>+ m_replacementData = [m_platformContentFilter addData:[NSData dataWithBytesNoCopy:(void*)data length:length freeWhenDone:NO]];
</ins><span class="cx"> ASSERT(needsMoreData() || [m_replacementData.get() length]);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -61,18 +75,18 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(needsMoreData());
</span><span class="cx"> ASSERT(![m_replacementData.get() length]);
</span><del>- m_replacementData = wkFilterDataComplete(m_platformContentFilter.get());
</del><ins>+ m_replacementData = [m_platformContentFilter dataComplete];
</ins><span class="cx"> ASSERT(!needsMoreData());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool ContentFilter::needsMoreData() const
</span><span class="cx"> {
</span><del>- return wkFilterIsBuffering(m_platformContentFilter.get());
</del><ins>+ return [m_platformContentFilter filterState] == kWFEStateBuffering;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool ContentFilter::didBlockData() const
</span><span class="cx"> {
</span><del>- return wkFilterWasBlocked(m_platformContentFilter.get());
</del><ins>+ return [m_platformContentFilter wasBlocked];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const char* ContentFilter::getReplacementData(int& length) const
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacWebCoreSystemInterfaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h (160876 => 160877)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2013-12-20 00:42:47 UTC (rev 160876)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2013-12-20 00:48:27 UTC (rev 160877)
</span><span class="lines">@@ -104,7 +104,6 @@
</span><span class="cx"> OBJC_CLASS NSWindow;
</span><span class="cx"> OBJC_CLASS QTMovie;
</span><span class="cx"> OBJC_CLASS QTMovieView;
</span><del>-OBJC_CLASS WebFilterEvaluator;
</del><span class="cx">
</span><span class="cx"> extern "C" {
</span><span class="cx">
</span><span class="lines">@@ -316,15 +315,6 @@
</span><span class="cx">
</span><span class="cx"> extern void (*wkCFURLRequestAllowAllPostCaching)(CFURLRequestRef);
</span><span class="cx">
</span><del>-#if USE(CONTENT_FILTERING)
-extern BOOL (*wkFilterIsManagedSession)(void);
-extern WebFilterEvaluator *(*wkFilterCreateInstance)(NSURLResponse *);
-extern BOOL (*wkFilterWasBlocked)(WebFilterEvaluator *);
-extern BOOL (*wkFilterIsBuffering)(WebFilterEvaluator *);
-extern NSData *(*wkFilterAddData)(WebFilterEvaluator *, NSData *);
-extern NSData *(*wkFilterDataComplete)(WebFilterEvaluator *);
-#endif
-
</del><span class="cx"> #if !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
</span><span class="cx"> extern CGFloat (*wkNSElasticDeltaForTimeDelta)(CGFloat initialPosition, CGFloat initialVelocity, CGFloat elapsedTime);
</span><span class="cx"> extern CGFloat (*wkNSElasticDeltaForReboundDelta)(CGFloat delta);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacWebCoreSystemInterfacemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm (160876 => 160877)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2013-12-20 00:42:47 UTC (rev 160876)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2013-12-20 00:48:27 UTC (rev 160877)
</span><span class="lines">@@ -200,15 +200,6 @@
</span><span class="cx">
</span><span class="cx"> void (*wkCFURLRequestAllowAllPostCaching)(CFURLRequestRef);
</span><span class="cx">
</span><del>-#if USE(CONTENT_FILTERING)
-BOOL (*wkFilterIsManagedSession)(void);
-WebFilterEvaluator *(*wkFilterCreateInstance)(NSURLResponse *);
-BOOL (*wkFilterWasBlocked)(WebFilterEvaluator *);
-BOOL (*wkFilterIsBuffering)(WebFilterEvaluator *);
-NSData *(*wkFilterAddData)(WebFilterEvaluator *, NSData *);
-NSData *(*wkFilterDataComplete)(WebFilterEvaluator *);
-#endif
-
</del><span class="cx"> #if !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
</span><span class="cx"> CGFloat (*wkNSElasticDeltaForTimeDelta)(CGFloat initialPosition, CGFloat initialVelocity, CGFloat elapsedTime);
</span><span class="cx"> CGFloat (*wkNSElasticDeltaForReboundDelta)(CGFloat delta);
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (160876 => 160877)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2013-12-20 00:42:47 UTC (rev 160876)
+++ trunk/Source/WebKit/mac/ChangeLog 2013-12-20 00:48:27 UTC (rev 160877)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2013-12-19 Andy Estes <aestes@apple.com>
+
+ Remove WebFilterEvaluator wrappers from WebKitSystemInterface
+ https://bugs.webkit.org/show_bug.cgi?id=126028
+
+ Reviewed by Anders Carlsson.
+
+ * WebCoreSupport/WebSystemInterface.mm:
+ (InitWebCoreSystemInterface): Don't INIT() removed function pointers.
+
</ins><span class="cx"> 2013-12-17 Gavin Barraclough <barraclough@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove PageVisibilityStateUnloaded
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebSystemInterfacemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm (160876 => 160877)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm 2013-12-20 00:42:47 UTC (rev 160876)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm 2013-12-20 00:48:27 UTC (rev 160877)
</span><span class="lines">@@ -201,15 +201,6 @@
</span><span class="cx">
</span><span class="cx"> INIT(CFURLRequestAllowAllPostCaching);
</span><span class="cx">
</span><del>-#if USE(CONTENT_FILTERING)
- INIT(FilterIsManagedSession);
- INIT(FilterCreateInstance);
- INIT(FilterWasBlocked);
- INIT(FilterIsBuffering);
- INIT(FilterAddData);
- INIT(FilterDataComplete);
-#endif
-
</del><span class="cx"> #if !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
</span><span class="cx"> INIT(NSElasticDeltaForTimeDelta);
</span><span class="cx"> INIT(NSElasticDeltaForReboundDelta);
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (160876 => 160877)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-20 00:42:47 UTC (rev 160876)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-20 00:48:27 UTC (rev 160877)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2013-12-19 Andy Estes <aestes@apple.com>
+
+ Remove WebFilterEvaluator wrappers from WebKitSystemInterface
+ https://bugs.webkit.org/show_bug.cgi?id=126028
+
+ Reviewed by Anders Carlsson.
+
+ * WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
+ (InitWebCoreSystemInterface): Don't INIT() removed function pointers.
+
</ins><span class="cx"> 2013-12-19 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove WKContentViewPrivate.h, WKContentView.h is private now
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportmacWebSystemInterfacemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm (160876 => 160877)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2013-12-20 00:42:47 UTC (rev 160876)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2013-12-20 00:48:27 UTC (rev 160877)
</span><span class="lines">@@ -202,18 +202,6 @@
</span><span class="cx"> INIT(CGPathAddRoundedRect);
</span><span class="cx"> INIT(CFURLRequestAllowAllPostCaching);
</span><span class="cx">
</span><del>-#if USE(CONTENT_FILTERING)
- INIT(FilterIsManagedSession);
- INIT(FilterCreateInstance);
- INIT(FilterWasBlocked);
- INIT(FilterIsBuffering);
- INIT(FilterAddData);
- INIT(FilterDataComplete);
-#if PLATFORM(IOS)
- INIT(FilterUnblockWithCompletion);
-#endif
-#endif
-
</del><span class="cx"> #if !PLATFORM(IOS) && PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
</span><span class="cx"> INIT(NSElasticDeltaForTimeDelta);
</span><span class="cx"> INIT(NSElasticDeltaForReboundDelta);
</span></span></pre>
</div>
</div>
</body>
</html>