<!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>[180985] 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/180985">180985</a></dd>
<dt>Author</dt> <dd>aestes@apple.com</dd>
<dt>Date</dt> <dd>2015-03-03 19:36:10 -0800 (Tue, 03 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Content Filtering] Separate unblock handling into its own class
https://bugs.webkit.org/show_bug.cgi?id=142251
Reviewed by Andreas Kling.
Source/WebCore:
Unblock handling is currently supported only for one type of content filter (WebFilterEvaluator) on one
platform (iOS). Having its implementation in ContentFilter is making it difficult to support other filters and
platforms, so let's separate unblock handling into its own class called ContentFilterUnblockHandler.
* WebCore.xcodeproj/project.pbxproj:
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::finishedLoading): Passed a ContentFilterUnblockHandler to FrameLoaderClient::contentFilterDidBlockLoad.
(WebCore::DocumentLoader::dataReceived): Ditto.
* loader/FrameLoaderClient.h:
* platform/ContentFilter.h:
* platform/ContentFilterUnblockHandler.h: Copied from Source/WebCore/platform/ios/ContentFilterIOS.mm.
(WebCore::ContentFilterUnblockHandler::clear):
* platform/cocoa/ContentFilterUnblockHandlerCocoa.mm: Renamed from Source/WebCore/platform/ios/ContentFilterIOS.mm.
(WebCore::ContentFilterUnblockHandler::ContentFilterUnblockHandler):
(WebCore::ContentFilterUnblockHandler::encode):
(WebCore::ContentFilterUnblockHandler::decode):
(WebCore::scheme):
(WebCore::ContentFilterUnblockHandler::handleUnblockRequestAndDispatchIfSuccessful):
* platform/mac/ContentFilterMac.mm:
(WebCore::ContentFilter::unblockHandler):
(WebCore::ContentFilter::ContentFilter): Deleted.
(WebCore::ContentFilter::encode): Deleted.
(WebCore::ContentFilter::decode): Deleted.
Source/WebKit/mac:
Adopted ContentFilterUnblockHandler.
* WebCoreSupport/WebFrameLoaderClient.h:
* WebCoreSupport/WebFrameLoaderClient.mm:
(WebFrameLoaderClient::dispatchDidStartProvisionalLoad):
* WebView/WebFrame.mm:
(-[WebFrame _contentFilterDidHandleNavigationAction:]):
* WebView/WebFrameInternal.h:
Source/WebKit2:
Adopted ContentFilterUnblockHandler.
* Shared/WebCoreArgumentCoders.h:
* Shared/mac/WebCoreArgumentCodersMac.mm:
(IPC::ArgumentCoder<ContentFilterUnblockHandler>::encode):
(IPC::ArgumentCoder<ContentFilterUnblockHandler>::decode):
(IPC::ArgumentCoder<ContentFilter>::encode): Deleted.
(IPC::ArgumentCoder<ContentFilter>::decode): Deleted.
* UIProcess/Cocoa/WebPageProxyCocoa.mm:
(WebKit::WebPageProxy::contentFilterDidBlockLoadForFrame):
* UIProcess/WebFrameProxy.cpp:
(WebKit::WebFrameProxy::didStartProvisionalLoad):
(WebKit::WebFrameProxy::contentFilterDidHandleNavigationAction):
* UIProcess/WebFrameProxy.h:
(WebKit::WebFrameProxy::setContentFilterUnblockHandler):
(WebKit::WebFrameProxy::setContentFilterForBlockedLoad): Deleted.
* UIProcess/WebPageProxy.h:
* UIProcess/WebPageProxy.messages.in:
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::contentFilterDidBlockLoad):
* WebProcess/WebCoreSupport/WebFrameLoaderClient.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentLoadercpp">trunk/Source/WebCore/loader/DocumentLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoaderClienth">trunk/Source/WebCore/loader/FrameLoaderClient.h</a></li>
<li><a href="#trunkSourceWebCoreplatformContentFilterh">trunk/Source/WebCore/platform/ContentFilter.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacContentFilterMacmm">trunk/Source/WebCore/platform/mac/ContentFilterMac.mm</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClienth">trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebFramemm">trunk/Source/WebKit/mac/WebView/WebFrame.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebFrameInternalh">trunk/Source/WebKit/mac/WebView/WebFrameInternal.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebCoreArgumentCodersh">trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h</a></li>
<li><a href="#trunkSourceWebKit2SharedmacWebCoreArgumentCodersMacmm">trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebPageProxyCocoamm">trunk/Source/WebKit2/UIProcess/Cocoa/WebPageProxyCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebFrameProxycpp">trunk/Source/WebKit2/UIProcess/WebFrameProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebFrameProxyh">trunk/Source/WebKit2/UIProcess/WebFrameProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxymessagesin">trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClienth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformContentFilterUnblockHandlerh">trunk/Source/WebCore/platform/ContentFilterUnblockHandler.h</a></li>
<li><a href="#trunkSourceWebCoreplatformcocoaContentFilterUnblockHandlerCocoamm">trunk/Source/WebCore/platform/cocoa/ContentFilterUnblockHandlerCocoa.mm</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformiosContentFilterIOSmm">trunk/Source/WebCore/platform/ios/ContentFilterIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (180984 => 180985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-04 03:33:42 UTC (rev 180984)
+++ trunk/Source/WebCore/ChangeLog 2015-03-04 03:36:10 UTC (rev 180985)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2015-03-03 Andy Estes <aestes@apple.com>
+
+ [Content Filtering] Separate unblock handling into its own class
+ https://bugs.webkit.org/show_bug.cgi?id=142251
+
+ Reviewed by Andreas Kling.
+
+ Unblock handling is currently supported only for one type of content filter (WebFilterEvaluator) on one
+ platform (iOS). Having its implementation in ContentFilter is making it difficult to support other filters and
+ platforms, so let's separate unblock handling into its own class called ContentFilterUnblockHandler.
+
+ * WebCore.xcodeproj/project.pbxproj:
+ * loader/DocumentLoader.cpp:
+ (WebCore::DocumentLoader::finishedLoading): Passed a ContentFilterUnblockHandler to FrameLoaderClient::contentFilterDidBlockLoad.
+ (WebCore::DocumentLoader::dataReceived): Ditto.
+ * loader/FrameLoaderClient.h:
+ * platform/ContentFilter.h:
+ * platform/ContentFilterUnblockHandler.h: Copied from Source/WebCore/platform/ios/ContentFilterIOS.mm.
+ (WebCore::ContentFilterUnblockHandler::clear):
+ * platform/cocoa/ContentFilterUnblockHandlerCocoa.mm: Renamed from Source/WebCore/platform/ios/ContentFilterIOS.mm.
+ (WebCore::ContentFilterUnblockHandler::ContentFilterUnblockHandler):
+ (WebCore::ContentFilterUnblockHandler::encode):
+ (WebCore::ContentFilterUnblockHandler::decode):
+ (WebCore::scheme):
+ (WebCore::ContentFilterUnblockHandler::handleUnblockRequestAndDispatchIfSuccessful):
+ * platform/mac/ContentFilterMac.mm:
+ (WebCore::ContentFilter::unblockHandler):
+ (WebCore::ContentFilter::ContentFilter): Deleted.
+ (WebCore::ContentFilter::encode): Deleted.
+ (WebCore::ContentFilter::decode): Deleted.
+
</ins><span class="cx"> 2015-03-03 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] Track localized name follows locale instead of primary language
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (180984 => 180985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-03-04 03:33:42 UTC (rev 180984)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-03-04 03:36:10 UTC (rev 180985)
</span><span class="lines">@@ -1044,12 +1044,11 @@
</span><span class="cx"> 26FAE4CD1852E3A5004C8C46 /* ResourceHandleCFURLConnectionDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 26FAE4C91852E3A5004C8C46 /* ResourceHandleCFURLConnectionDelegate.h */; };
</span><span class="cx"> 26FAE4CE1852E3A5004C8C46 /* SynchronousResourceHandleCFURLConnectionDelegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26FAE4CA1852E3A5004C8C46 /* SynchronousResourceHandleCFURLConnectionDelegate.cpp */; };
</span><span class="cx"> 26FAE4CF1852E3A5004C8C46 /* SynchronousResourceHandleCFURLConnectionDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 26FAE4CB1852E3A5004C8C46 /* SynchronousResourceHandleCFURLConnectionDelegate.h */; };
</span><del>- 2903716516BA11BC00FEFDF0 /* ContentFilterIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2903716416BA11BC00FEFDF0 /* ContentFilterIOS.mm */; };
</del><span class="cx"> 2917B5611473496C0052C9D0 /* LayerFlushScheduler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2917B55E1473496C0052C9D0 /* LayerFlushScheduler.cpp */; };
</span><span class="cx"> 2917B5621473496C0052C9D0 /* LayerFlushScheduler.h in Headers */ = {isa = PBXBuildFile; fileRef = 2917B55F1473496C0052C9D0 /* LayerFlushScheduler.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 2917B5631473496C0052C9D0 /* LayerFlushSchedulerClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 2917B5601473496C0052C9D0 /* LayerFlushSchedulerClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 2917B566147349950052C9D0 /* LayerFlushSchedulerMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2917B565147349950052C9D0 /* LayerFlushSchedulerMac.cpp */; };
</span><del>- 2919A1E916B3376600787213 /* ContentFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 2919A1E816B3376600787213 /* ContentFilter.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><ins>+ 2919A1E916B3376600787213 /* ContentFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 2919A1E816B3376600787213 /* ContentFilter.h */; };
</ins><span class="cx"> 2919A1EB16B3378900787213 /* ContentFilterMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2919A1EA16B3378900787213 /* ContentFilterMac.mm */; };
</span><span class="cx"> 2934940A16C02C0700901318 /* PlatformSpeechSynthesisVoice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2527CC9316BF92EC009DDAC0 /* PlatformSpeechSynthesisVoice.cpp */; };
</span><span class="cx"> 2934940B16C02C0A00901318 /* PlatformSpeechSynthesisUtterance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2527CC9516BF95DD009DDAC0 /* PlatformSpeechSynthesisUtterance.cpp */; };
</span><span class="lines">@@ -3764,6 +3763,8 @@
</span><span class="cx"> A12A1050166444FD008FA311 /* GridTrackSize.h in Headers */ = {isa = PBXBuildFile; fileRef = A12A104E166444DC008FA311 /* GridTrackSize.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><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><ins>+ A14090FB1AA51E1D0091191A /* ContentFilterUnblockHandlerCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = A14090FA1AA51E1D0091191A /* ContentFilterUnblockHandlerCocoa.mm */; };
+ A14090FD1AA51E480091191A /* ContentFilterUnblockHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = A14090FC1AA51E480091191A /* ContentFilterUnblockHandler.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> A14832B0187F618D00DA63A6 /* WAKAppKitStubs.h in Headers */ = {isa = PBXBuildFile; fileRef = A148328C187F508700DA63A6 /* WAKAppKitStubs.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> A14832B1187F61E100DA63A6 /* WAKAppKitStubs.m in Sources */ = {isa = PBXBuildFile; fileRef = A148328D187F508700DA63A6 /* WAKAppKitStubs.m */; };
</span><span class="cx"> A14832B2187F61ED00DA63A6 /* WAKClipView.h in Headers */ = {isa = PBXBuildFile; fileRef = A148328E187F508700DA63A6 /* WAKClipView.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -8086,7 +8087,6 @@
</span><span class="cx"> 26FAE4C91852E3A5004C8C46 /* ResourceHandleCFURLConnectionDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceHandleCFURLConnectionDelegate.h; sourceTree = "<group>"; };
</span><span class="cx"> 26FAE4CA1852E3A5004C8C46 /* SynchronousResourceHandleCFURLConnectionDelegate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SynchronousResourceHandleCFURLConnectionDelegate.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 26FAE4CB1852E3A5004C8C46 /* SynchronousResourceHandleCFURLConnectionDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SynchronousResourceHandleCFURLConnectionDelegate.h; sourceTree = "<group>"; };
</span><del>- 2903716416BA11BC00FEFDF0 /* ContentFilterIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = ContentFilterIOS.mm; path = ios/ContentFilterIOS.mm; sourceTree = "<group>"; };
</del><span class="cx"> 2917B55E1473496C0052C9D0 /* LayerFlushScheduler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LayerFlushScheduler.cpp; path = ca/LayerFlushScheduler.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 2917B55F1473496C0052C9D0 /* LayerFlushScheduler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LayerFlushScheduler.h; path = ca/LayerFlushScheduler.h; sourceTree = "<group>"; };
</span><span class="cx"> 2917B5601473496C0052C9D0 /* LayerFlushSchedulerClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LayerFlushSchedulerClient.h; path = ca/LayerFlushSchedulerClient.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -10984,6 +10984,8 @@
</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><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><ins>+ A14090FA1AA51E1D0091191A /* ContentFilterUnblockHandlerCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ContentFilterUnblockHandlerCocoa.mm; sourceTree = "<group>"; };
+ A14090FC1AA51E480091191A /* ContentFilterUnblockHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContentFilterUnblockHandler.h; sourceTree = "<group>"; };
</ins><span class="cx"> A148328C187F508700DA63A6 /* WAKAppKitStubs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WAKAppKitStubs.h; path = ios/wak/WAKAppKitStubs.h; sourceTree = "<group>"; };
</span><span class="cx"> A148328D187F508700DA63A6 /* WAKAppKitStubs.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WAKAppKitStubs.m; path = ios/wak/WAKAppKitStubs.m; sourceTree = "<group>"; };
</span><span class="cx"> A148328E187F508700DA63A6 /* WAKClipView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WAKClipView.h; path = ios/wak/WAKClipView.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -18618,7 +18620,6 @@
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><span class="cx"> A148328B187F506800DA63A6 /* wak */,
</span><del>- 2903716416BA11BC00FEFDF0 /* ContentFilterIOS.mm */,
</del><span class="cx"> 2655414B1489AA2B000DFC5D /* CursorIOS.cpp */,
</span><span class="cx"> 31EAF97C121435A400E7C1BF /* DeviceMotionClientIOS.h */,
</span><span class="cx"> 31EAF97D121435A400E7C1BF /* DeviceMotionClientIOS.mm */,
</span><span class="lines">@@ -18691,6 +18692,7 @@
</span><span class="cx"> A5C974CE11485FDA0066F2AB /* cocoa */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><ins>+ A14090FA1AA51E1D0091191A /* ContentFilterUnblockHandlerCocoa.mm */,
</ins><span class="cx"> 5D8C4DBD1428222C0026CE72 /* DisplaySleepDisablerCocoa.cpp */,
</span><span class="cx"> 5D8C4DBE1428222C0026CE72 /* DisplaySleepDisablerCocoa.h */,
</span><span class="cx"> 1A4832B21A953BA6008B4DFE /* LocalizedStringsCocoa.mm */,
</span><span class="lines">@@ -21476,6 +21478,7 @@
</span><span class="cx"> C37CDEBC149EF2030042090D /* ColorChooserClient.h */,
</span><span class="cx"> BCC8CFCA0986CD2400140BF2 /* ColorData.gperf */,
</span><span class="cx"> 2919A1E816B3376600787213 /* ContentFilter.h */,
</span><ins>+ A14090FC1AA51E480091191A /* ContentFilterUnblockHandler.h */,
</ins><span class="cx"> 41D015C90F4B5C71004A662F /* ContentType.cpp */,
</span><span class="cx"> 41D015C80F4B5C71004A662F /* ContentType.h */,
</span><span class="cx"> 93B6A0E50B0BCA5C00F5027A /* ContextMenu.h */,
</span><span class="lines">@@ -24179,6 +24182,7 @@
</span><span class="cx"> 85E711C10AC5D5350053270F /* DOMHTMLParagraphElementInternal.h in Headers */,
</span><span class="cx"> 85ECBEF70AA7626900544F0B /* DOMHTMLParamElement.h in Headers */,
</span><span class="cx"> 85E711C20AC5D5350053270F /* DOMHTMLParamElementInternal.h in Headers */,
</span><ins>+ A14090FD1AA51E480091191A /* ContentFilterUnblockHandler.h in Headers */,
</ins><span class="cx"> 85183B480AA6926100F19FA3 /* DOMHTMLPreElement.h in Headers */,
</span><span class="cx"> 85E711C30AC5D5350053270F /* DOMHTMLPreElementInternal.h in Headers */,
</span><span class="cx"> A4226E951163D73A008B8397 /* DOMHTMLProgressElement.h in Headers */,
</span><span class="lines">@@ -27420,6 +27424,7 @@
</span><span class="cx"> ABAF22080C03B1C700B0BCF0 /* ChromeMac.mm in Sources */,
</span><span class="cx"> 4ACBC0BE12713CBD0094F9B2 /* ClassList.cpp in Sources */,
</span><span class="cx"> BC904B760D10998F00680D32 /* ClassNodeList.cpp in Sources */,
</span><ins>+ A14090FB1AA51E1D0091191A /* ContentFilterUnblockHandlerCocoa.mm in Sources */,
</ins><span class="cx"> BCC0657D0F3CE1B700CD2D87 /* ClientRect.cpp in Sources */,
</span><span class="cx"> BCC065800F3CE1B700CD2D87 /* ClientRectList.cpp in Sources */,
</span><span class="cx"> 85031B3F0A44EFC700F992E0 /* ClipboardEvent.cpp in Sources */,
</span><span class="lines">@@ -27446,7 +27451,6 @@
</span><span class="cx"> A7A78CD51532BA62006C21E4 /* ContainerNodeAlgorithms.cpp in Sources */,
</span><span class="cx"> BC5EB9800E82072500B25965 /* ContentData.cpp in Sources */,
</span><span class="cx"> 57B791A314C6A62900F202D1 /* ContentDistributor.cpp in Sources */,
</span><del>- 2903716516BA11BC00FEFDF0 /* ContentFilterIOS.mm in Sources */,
</del><span class="cx"> 2919A1EB16B3378900787213 /* ContentFilterMac.mm in Sources */,
</span><span class="cx"> 97C471DB12F925BD0086354B /* ContentSecurityPolicy.cpp in Sources */,
</span><span class="cx"> 41D015CB0F4B5C71004A662F /* ContentType.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (180984 => 180985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2015-03-04 03:33:42 UTC (rev 180984)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2015-03-04 03:36:10 UTC (rev 180985)
</span><span class="lines">@@ -412,8 +412,10 @@
</span><span class="cx"> if (data)
</span><span class="cx"> dataReceived(m_mainResource.get(), data, length);
</span><span class="cx">
</span><del>- if (m_contentFilter->didBlockData())
- frameLoader()->client().contentFilterDidBlockLoad(WTF::move(m_contentFilter));
</del><ins>+ if (m_contentFilter->didBlockData()) {
+ frameLoader()->client().contentFilterDidBlockLoad(m_contentFilter->unblockHandler());
+ m_contentFilter = nullptr;
+ }
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -874,8 +876,10 @@
</span><span class="cx"> data = m_contentFilter->getReplacementData(length);
</span><span class="cx"> loadWasBlockedBeforeFinishing = m_contentFilter->didBlockData();
</span><span class="cx">
</span><del>- if (loadWasBlockedBeforeFinishing)
- frameLoader()->client().contentFilterDidBlockLoad(WTF::move(m_contentFilter));
</del><ins>+ if (loadWasBlockedBeforeFinishing) {
+ frameLoader()->client().contentFilterDidBlockLoad(m_contentFilter->unblockHandler());
+ m_contentFilter = nullptr;
+ }
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoaderClient.h (180984 => 180985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoaderClient.h 2015-03-04 03:33:42 UTC (rev 180984)
+++ trunk/Source/WebCore/loader/FrameLoaderClient.h 2015-03-04 03:36:10 UTC (rev 180985)
</span><span class="lines">@@ -38,6 +38,10 @@
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><ins>+#if ENABLE(CONTENT_FILTERING)
+#include "ContentFilterUnblockHandler.h"
+#endif
+
</ins><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> #ifdef __OBJC__
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="lines">@@ -98,10 +102,6 @@
</span><span class="cx"> class QuickLookHandle;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(CONTENT_FILTERING)
- class ContentFilter;
-#endif
-
</del><span class="cx"> typedef std::function<void (PolicyAction)> FramePolicyFunction;
</span><span class="cx">
</span><span class="cx"> class WEBCORE_EXPORT FrameLoaderClient {
</span><span class="lines">@@ -339,7 +339,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CONTENT_FILTERING)
</span><del>- virtual void contentFilterDidBlockLoad(std::unique_ptr<ContentFilter>) { }
</del><ins>+ virtual void contentFilterDidBlockLoad(ContentFilterUnblockHandler) { }
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformContentFilterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ContentFilter.h (180984 => 180985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ContentFilter.h 2015-03-04 03:33:42 UTC (rev 180984)
+++ trunk/Source/WebCore/platform/ContentFilter.h 2015-03-04 03:36:10 UTC (rev 180985)
</span><span class="lines">@@ -28,17 +28,12 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CONTENT_FILTERING)
</span><span class="cx">
</span><ins>+#include "ContentFilterUnblockHandler.h"
</ins><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
-#include <functional>
-#endif
-
</del><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> OBJC_CLASS NSData;
</span><del>-OBJC_CLASS NSKeyedArchiver;
-OBJC_CLASS NSKeyedUnarchiver;
</del><span class="cx"> OBJC_CLASS WebFilterEvaluator;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -67,17 +62,8 @@
</span><span class="cx"> bool needsMoreData() const;
</span><span class="cx"> bool didBlockData() const;
</span><span class="cx"> const char* getReplacementData(int& length) const;
</span><ins>+ ContentFilterUnblockHandler unblockHandler() const;
</ins><span class="cx">
</span><del>-#if PLATFORM(COCOA)
- WEBCORE_EXPORT ContentFilter();
- WEBCORE_EXPORT void encode(NSKeyedArchiver *) const;
- WEBCORE_EXPORT static bool decode(NSKeyedUnarchiver *, ContentFilter&);
-#endif
-
-#if PLATFORM(IOS)
- WEBCORE_EXPORT bool handleUnblockRequestAndDispatchIfSuccessful(const ResourceRequest&, std::function<void()>);
-#endif
-
</del><span class="cx"> private:
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> RetainPtr<WebFilterEvaluator> m_platformContentFilter;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformContentFilterUnblockHandlerhfromrev180984trunkSourceWebCoreplatformiosContentFilterIOSmm"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/platform/ContentFilterUnblockHandler.h (from rev 180984, trunk/Source/WebCore/platform/ios/ContentFilterIOS.mm) (0 => 180985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ContentFilterUnblockHandler.h (rev 0)
+++ trunk/Source/WebCore/platform/ContentFilterUnblockHandler.h 2015-03-04 03:36:10 UTC (rev 180985)
</span><span class="lines">@@ -0,0 +1,63 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef ContentFilterUnblockHandler_h
+#define ContentFilterUnblockHandler_h
+
+#if ENABLE(CONTENT_FILTERING)
+
+#include <functional>
+#include <wtf/RetainPtr.h>
+
+OBJC_CLASS NSKeyedArchiver;
+OBJC_CLASS NSKeyedUnarchiver;
+OBJC_CLASS WebFilterEvaluator;
+
+namespace WebCore {
+
+class ResourceRequest;
+
+class ContentFilterUnblockHandler {
+public:
+ ContentFilterUnblockHandler() = default;
+ explicit ContentFilterUnblockHandler(WebFilterEvaluator *evaluator) : m_webFilterEvaluator { evaluator } { }
+
+ void clear() { m_webFilterEvaluator = nullptr; }
+ WEBCORE_EXPORT void encode(NSKeyedArchiver *) const;
+ WEBCORE_EXPORT static bool decode(NSKeyedUnarchiver *, ContentFilterUnblockHandler&);
+
+#if PLATFORM(IOS)
+ WEBCORE_EXPORT bool handleUnblockRequestAndDispatchIfSuccessful(const ResourceRequest&, std::function<void()>);
+#endif
+
+private:
+ RetainPtr<WebFilterEvaluator> m_webFilterEvaluator;
+};
+
+} // namespace WebCore
+
+#endif // ENABLE(CONTENT_FILTERING)
+
+#endif // ContentFilterUnblockHandler_h
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformcocoaContentFilterUnblockHandlerCocoammfromrev180984trunkSourceWebCoreplatformiosContentFilterIOSmm"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/platform/cocoa/ContentFilterUnblockHandlerCocoa.mm (from rev 180984, trunk/Source/WebCore/platform/ios/ContentFilterIOS.mm) (0 => 180985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cocoa/ContentFilterUnblockHandlerCocoa.mm (rev 0)
+++ trunk/Source/WebCore/platform/cocoa/ContentFilterUnblockHandlerCocoa.mm 2015-03-04 03:36:10 UTC (rev 180985)
</span><span class="lines">@@ -0,0 +1,89 @@
</span><ins>+/*
+ * Copyright (C) 2013 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "config.h"
+#import "ContentFilterUnblockHandler.h"
+
+#if ENABLE(CONTENT_FILTERING)
+
+#import "ResourceRequest.h"
+#import "SoftLinking.h"
+#import "WebFilterEvaluatorSPI.h"
+#import <objc/runtime.h>
+
+SOFT_LINK_PRIVATE_FRAMEWORK(WebContentAnalysis);
+SOFT_LINK_CLASS(WebContentAnalysis, WebFilterEvaluator);
+
+namespace WebCore {
+
+static NSString * const platformContentFilterKey = @"platformContentFilter";
+
+void ContentFilterUnblockHandler::encode(NSKeyedArchiver *archiver) const
+{
+ if ([getWebFilterEvaluatorClass() conformsToProtocol:@protocol(NSSecureCoding)])
+ [archiver encodeObject:m_webFilterEvaluator.get() forKey:platformContentFilterKey];
+}
+
+bool ContentFilterUnblockHandler::decode(NSKeyedUnarchiver *unarchiver, ContentFilterUnblockHandler& unblockHandler)
+{
+ @try {
+ if ([getWebFilterEvaluatorClass() conformsToProtocol:@protocol(NSSecureCoding)])
+ unblockHandler.m_webFilterEvaluator = (WebFilterEvaluator *)[unarchiver decodeObjectOfClass:getWebFilterEvaluatorClass() forKey:platformContentFilterKey];
+ return true;
+ } @catch (NSException *exception) {
+ LOG_ERROR("The platform content filter being decoded is not a WebFilterEvaluator.");
+ }
+
+ return false;
+}
+
+#if PLATFORM(IOS)
+static inline const char* scheme()
+{
+ return "x-apple-content-filter";
+}
+
+bool ContentFilterUnblockHandler::handleUnblockRequestAndDispatchIfSuccessful(const ResourceRequest& request, std::function<void()> function)
+{
+ if (!m_webFilterEvaluator)
+ return false;
+
+ if (!request.url().protocolIs(scheme()))
+ return false;
+
+ if (!equalIgnoringCase(request.url().host(), "unblock"))
+ return false;
+
+ [m_webFilterEvaluator unblockWithCompletion:^(BOOL unblocked, NSError *) {
+ if (unblocked)
+ function();
+ }];
+ return true;
+}
+#endif
+
+} // namespace WebCore
+
+#endif // PLATFORM(IOS) && ENABLE(CONTENT_FILTERING)
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformiosContentFilterIOSmm"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/ios/ContentFilterIOS.mm (180984 => 180985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/ContentFilterIOS.mm 2015-03-04 03:33:42 UTC (rev 180984)
+++ trunk/Source/WebCore/platform/ios/ContentFilterIOS.mm 2015-03-04 03:36:10 UTC (rev 180985)
</span><span class="lines">@@ -1,60 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "config.h"
-#import "ContentFilter.h"
-
-#if PLATFORM(IOS) && ENABLE(CONTENT_FILTERING)
-
-#import "ResourceRequest.h"
-#import "WebCoreThreadRun.h"
-#import "WebFilterEvaluatorSPI.h"
-
-namespace WebCore {
-
-static inline const char* scheme()
-{
- static const char contentFilterScheme[] = "x-apple-content-filter";
- return contentFilterScheme;
-}
-
-bool ContentFilter::handleUnblockRequestAndDispatchIfSuccessful(const ResourceRequest& request, std::function<void()> function)
-{
- if (!request.url().protocolIs(scheme()))
- return false;
-
- if (!equalIgnoringCase(request.url().host(), "unblock"))
- return false;
-
- [m_platformContentFilter unblockWithCompletion:^(BOOL unblocked, NSError *) {
- if (unblocked)
- function();
- }];
- return true;
-}
-
-} // namespace WebCore
-
-#endif // PLATFORM(IOS) && ENABLE(CONTENT_FILTERING)
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformmacContentFilterMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ContentFilterMac.mm (180984 => 180985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ContentFilterMac.mm 2015-03-04 03:33:42 UTC (rev 180984)
+++ trunk/Source/WebCore/platform/mac/ContentFilterMac.mm 2015-03-04 03:36:10 UTC (rev 180985)
</span><span class="lines">@@ -44,14 +44,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-ContentFilter::ContentFilter()
-#if HAVE(NE_FILTER_SOURCE)
- : m_neFilterSourceStatus(NEFilterSourceStatusNeedsMoreData)
- , m_neFilterSourceQueue(0)
-#endif
-{
-}
-
</del><span class="cx"> ContentFilter::ContentFilter(const ResourceResponse& response)
</span><span class="cx"> #if HAVE(NE_FILTER_SOURCE)
</span><span class="cx"> : m_neFilterSourceStatus(NEFilterSourceStatusNeedsMoreData)
</span><span class="lines">@@ -202,27 +194,11 @@
</span><span class="cx"> return static_cast<const char*>([originalData bytes]);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static NSString * const platformContentFilterKey = @"platformContentFilter";
-
-void ContentFilter::encode(NSKeyedArchiver *archiver) const
</del><ins>+ContentFilterUnblockHandler ContentFilter::unblockHandler() const
</ins><span class="cx"> {
</span><del>- if ([getWebFilterEvaluatorClass() conformsToProtocol:@protocol(NSSecureCoding)])
- [archiver encodeObject:m_platformContentFilter.get() forKey:platformContentFilterKey];
</del><ins>+ return ContentFilterUnblockHandler { m_platformContentFilter.get() };
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-bool ContentFilter::decode(NSKeyedUnarchiver *unarchiver, ContentFilter& contentFilter)
-{
- @try {
- if ([getWebFilterEvaluatorClass() conformsToProtocol:@protocol(NSSecureCoding)])
- contentFilter.m_platformContentFilter = (WebFilterEvaluator *)[unarchiver decodeObjectOfClass:getWebFilterEvaluatorClass() forKey:platformContentFilterKey];
- return true;
- } @catch (NSException *exception) {
- LOG_ERROR("The platform content filter being decoded is not a WebFilterEvaluator.");
- }
-
- return false;
-}
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(CONTENT_FILTERING)
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (180984 => 180985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-03-04 03:33:42 UTC (rev 180984)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-03-04 03:36:10 UTC (rev 180985)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-03-03 Andy Estes <aestes@apple.com>
+
+ [Content Filtering] Separate unblock handling into its own class
+ https://bugs.webkit.org/show_bug.cgi?id=142251
+
+ Reviewed by Andreas Kling.
+
+ Adopted ContentFilterUnblockHandler.
+
+ * WebCoreSupport/WebFrameLoaderClient.h:
+ * WebCoreSupport/WebFrameLoaderClient.mm:
+ (WebFrameLoaderClient::dispatchDidStartProvisionalLoad):
+ * WebView/WebFrame.mm:
+ (-[WebFrame _contentFilterDidHandleNavigationAction:]):
+ * WebView/WebFrameInternal.h:
+
</ins><span class="cx"> 2015-03-03 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Access ApplicationCacheStorage global instance via singleton() static member function
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h (180984 => 180985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h 2015-03-04 03:33:42 UTC (rev 180984)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h 2015-03-04 03:36:10 UTC (rev 180985)
</span><span class="lines">@@ -239,7 +239,7 @@
</span><span class="cx"> virtual void didCreateQuickLookHandle(WebCore::QuickLookHandle&) override;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- virtual void contentFilterDidBlockLoad(std::unique_ptr<WebCore::ContentFilter>) override;
</del><ins>+ void contentFilterDidBlockLoad(WebCore::ContentFilterUnblockHandler) override;
</ins><span class="cx">
</span><span class="cx"> RetainPtr<WebFrame> m_webFrame;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (180984 => 180985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2015-03-04 03:33:42 UTC (rev 180984)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2015-03-04 03:36:10 UTC (rev 180985)
</span><span class="lines">@@ -662,7 +662,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_webFrame->_private->provisionalURL);
</span><span class="cx"> m_webFrame->_private->provisionalURL = core(m_webFrame.get())->loader().provisionalDocumentLoader()->url().string();
</span><del>- m_webFrame->_private->contentFilterForBlockedLoad = nullptr;
</del><ins>+ m_webFrame->_private->contentFilterUnblockHandler.clear();
</ins><span class="cx">
</span><span class="cx"> WebView *webView = getWebView(m_webFrame.get());
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="lines">@@ -2239,9 +2239,9 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-void WebFrameLoaderClient::contentFilterDidBlockLoad(std::unique_ptr<WebCore::ContentFilter> contentFilter)
</del><ins>+void WebFrameLoaderClient::contentFilterDidBlockLoad(WebCore::ContentFilterUnblockHandler unblockHandler)
</ins><span class="cx"> {
</span><del>- m_webFrame->_private->contentFilterForBlockedLoad = WTF::move(contentFilter);
</del><ins>+ m_webFrame->_private->contentFilterUnblockHandler = WTF::move(unblockHandler);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @implementation WebFramePolicyListener
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebFramemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebFrame.mm (180984 => 180985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebFrame.mm 2015-03-04 03:33:42 UTC (rev 180984)
+++ trunk/Source/WebKit/mac/WebView/WebFrame.mm 2015-03-04 03:36:10 UTC (rev 180985)
</span><span class="lines">@@ -1005,17 +1005,15 @@
</span><span class="cx"> - (BOOL)_contentFilterDidHandleNavigationAction:(const WebCore::ResourceRequest &)request
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- if (ContentFilter *contentFilter = _private->contentFilterForBlockedLoad.get()) {
- RetainPtr<WebFrame> retainedMainFrame = [[self webView] mainFrame];
- return contentFilter->handleUnblockRequestAndDispatchIfSuccessful(request, [retainedMainFrame] {
- WebThreadRun(^ {
- [retainedMainFrame reload];
- });
</del><ins>+ RetainPtr<WebFrame> retainedMainFrame = [[self webView] mainFrame];
+ return _private->contentFilterUnblockHandler.handleUnblockRequestAndDispatchIfSuccessful(request, [retainedMainFrame] {
+ WebThreadRun(^ {
+ [retainedMainFrame reload];
</ins><span class="cx"> });
</span><del>- }
-#endif
-
</del><ins>+ });
+#else
</ins><span class="cx"> return NO;
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebFrameInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebFrameInternal.h (180984 => 180985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebFrameInternal.h 2015-03-04 03:33:42 UTC (rev 180984)
+++ trunk/Source/WebKit/mac/WebView/WebFrameInternal.h 2015-03-04 03:36:10 UTC (rev 180985)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #import "WebFramePrivate.h"
</span><span class="cx"> #import "WebPreferencesPrivate.h"
</span><del>-#import <WebCore/ContentFilter.h>
</del><ins>+#import <WebCore/ContentFilterUnblockHandler.h>
</ins><span class="cx"> #import <WebCore/EditAction.h>
</span><span class="cx"> #import <WebCore/FrameLoaderTypes.h>
</span><span class="cx"> #import <WebCore/FrameSelection.h>
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> BOOL isCommitting;
</span><span class="cx"> #endif
</span><del>- std::unique_ptr<WebCore::ContentFilter> contentFilterForBlockedLoad;
</del><ins>+ WebCore::ContentFilterUnblockHandler contentFilterUnblockHandler;
</ins><span class="cx"> }
</span><span class="cx"> @end
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (180984 => 180985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-03-04 03:33:42 UTC (rev 180984)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-04 03:36:10 UTC (rev 180985)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2015-03-03 Andy Estes <aestes@apple.com>
+
+ [Content Filtering] Separate unblock handling into its own class
+ https://bugs.webkit.org/show_bug.cgi?id=142251
+
+ Reviewed by Andreas Kling.
+
+ Adopted ContentFilterUnblockHandler.
+
+ * Shared/WebCoreArgumentCoders.h:
+ * Shared/mac/WebCoreArgumentCodersMac.mm:
+ (IPC::ArgumentCoder<ContentFilterUnblockHandler>::encode):
+ (IPC::ArgumentCoder<ContentFilterUnblockHandler>::decode):
+ (IPC::ArgumentCoder<ContentFilter>::encode): Deleted.
+ (IPC::ArgumentCoder<ContentFilter>::decode): Deleted.
+ * UIProcess/Cocoa/WebPageProxyCocoa.mm:
+ (WebKit::WebPageProxy::contentFilterDidBlockLoadForFrame):
+ * UIProcess/WebFrameProxy.cpp:
+ (WebKit::WebFrameProxy::didStartProvisionalLoad):
+ (WebKit::WebFrameProxy::contentFilterDidHandleNavigationAction):
+ * UIProcess/WebFrameProxy.h:
+ (WebKit::WebFrameProxy::setContentFilterUnblockHandler):
+ (WebKit::WebFrameProxy::setContentFilterForBlockedLoad): Deleted.
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebPageProxy.messages.in:
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::contentFilterDidBlockLoad):
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
+
</ins><span class="cx"> 2015-03-03 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> [WK2] Fix memory leak in _getCookieHeadersForTask
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebCoreArgumentCodersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h (180984 => 180985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h 2015-03-04 03:33:42 UTC (rev 180984)
+++ trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h 2015-03-04 03:36:10 UTC (rev 180985)
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CONTENT_FILTERING)
</span><span class="cx"> namespace WebCore {
</span><del>-class ContentFilter;
</del><ins>+class ContentFilterUnblockHandler;
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -443,9 +443,9 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CONTENT_FILTERING)
</span><del>-template<> struct ArgumentCoder<WebCore::ContentFilter> {
- static void encode(ArgumentEncoder&, const WebCore::ContentFilter&);
- static bool decode(ArgumentDecoder&, WebCore::ContentFilter&);
</del><ins>+template<> struct ArgumentCoder<WebCore::ContentFilterUnblockHandler> {
+ static void encode(ArgumentEncoder&, const WebCore::ContentFilterUnblockHandler&);
+ static bool decode(ArgumentDecoder&, WebCore::ContentFilterUnblockHandler&);
</ins><span class="cx"> };
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacWebCoreArgumentCodersMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm (180984 => 180985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm 2015-03-04 03:33:42 UTC (rev 180984)
+++ trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm 2015-03-04 03:36:10 UTC (rev 180985)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #import "DataReference.h"
</span><span class="cx"> #import "WebKitSystemInterface.h"
</span><span class="cx"> #import <WebCore/CertificateInfo.h>
</span><del>-#import <WebCore/ContentFilter.h>
</del><ins>+#import <WebCore/ContentFilterUnblockHandler.h>
</ins><span class="cx"> #import <WebCore/Credential.h>
</span><span class="cx"> #import <WebCore/KeyboardEvent.h>
</span><span class="cx"> #import <WebCore/MachSendRight.h>
</span><span class="lines">@@ -407,17 +407,17 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ArgumentCoder<ContentFilter>::encode(ArgumentEncoder& encoder, const ContentFilter& contentFilter)
</del><ins>+void ArgumentCoder<ContentFilterUnblockHandler>::encode(ArgumentEncoder& encoder, const ContentFilterUnblockHandler& contentFilterUnblockHandler)
</ins><span class="cx"> {
</span><span class="cx"> RetainPtr<NSMutableData> data = adoptNS([[NSMutableData alloc] init]);
</span><span class="cx"> RetainPtr<NSKeyedArchiver> archiver = adoptNS([[NSKeyedArchiver alloc] initForWritingWithMutableData:data.get()]);
</span><span class="cx"> [archiver setRequiresSecureCoding:YES];
</span><del>- contentFilter.encode(archiver.get());
</del><ins>+ contentFilterUnblockHandler.encode(archiver.get());
</ins><span class="cx"> [archiver finishEncoding];
</span><span class="cx"> IPC::encode(encoder, reinterpret_cast<CFDataRef>(data.get()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool ArgumentCoder<ContentFilter>::decode(ArgumentDecoder& decoder, ContentFilter& contentFilter)
</del><ins>+bool ArgumentCoder<ContentFilterUnblockHandler>::decode(ArgumentDecoder& decoder, ContentFilterUnblockHandler& contentFilterUnblockHandler)
</ins><span class="cx"> {
</span><span class="cx"> RetainPtr<CFDataRef> data;
</span><span class="cx"> if (!IPC::decode(decoder, data))
</span><span class="lines">@@ -425,7 +425,7 @@
</span><span class="cx">
</span><span class="cx"> RetainPtr<NSKeyedUnarchiver> unarchiver = adoptNS([[NSKeyedUnarchiver alloc] initForReadingWithData:(NSData *)data.get()]);
</span><span class="cx"> [unarchiver setRequiresSecureCoding:YES];
</span><del>- if (!ContentFilter::decode(unarchiver.get(), contentFilter))
</del><ins>+ if (!ContentFilterUnblockHandler::decode(unarchiver.get(), contentFilterUnblockHandler))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> [unarchiver finishDecoding];
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebPageProxyCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebPageProxyCocoa.mm (180984 => 180985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebPageProxyCocoa.mm 2015-03-04 03:33:42 UTC (rev 180984)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebPageProxyCocoa.mm 2015-03-04 03:36:10 UTC (rev 180985)
</span><span class="lines">@@ -72,10 +72,10 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::contentFilterDidBlockLoadForFrame(const WebCore::ContentFilter& contentFilter, uint64_t frameID)
</del><ins>+void WebPageProxy::contentFilterDidBlockLoadForFrame(const WebCore::ContentFilterUnblockHandler& unblockHandler, uint64_t frameID)
</ins><span class="cx"> {
</span><span class="cx"> if (WebFrameProxy* frame = m_process->webFrame(frameID))
</span><del>- frame->setContentFilterForBlockedLoad(std::make_unique<WebCore::ContentFilter>(contentFilter));
</del><ins>+ frame->setContentFilterUnblockHandler(unblockHandler);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebFrameProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebFrameProxy.cpp (180984 => 180985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebFrameProxy.cpp 2015-03-04 03:33:42 UTC (rev 180984)
+++ trunk/Source/WebKit2/UIProcess/WebFrameProxy.cpp 2015-03-04 03:36:10 UTC (rev 180985)
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx"> {
</span><span class="cx"> m_frameLoadState.didStartProvisionalLoad(url);
</span><span class="cx"> #if ENABLE(CONTENT_FILTERING)
</span><del>- m_contentFilterForBlockedLoad = nullptr;
</del><ins>+ m_contentFilterUnblockHandler.clear();
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -237,15 +237,13 @@
</span><span class="cx"> bool WebFrameProxy::contentFilterDidHandleNavigationAction(const WebCore::ResourceRequest& request)
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- if (m_contentFilterForBlockedLoad) {
- RefPtr<WebPageProxy> retainedPage = m_page;
- return m_contentFilterForBlockedLoad->handleUnblockRequestAndDispatchIfSuccessful(request, [retainedPage] {
- retainedPage->reload(false);
- });
- }
-#endif
-
</del><ins>+ RefPtr<WebPageProxy> retainedPage = m_page;
+ return m_contentFilterUnblockHandler.handleUnblockRequestAndDispatchIfSuccessful(request, [retainedPage] {
+ retainedPage->reload(false);
+ });
+#else
</ins><span class="cx"> return false;
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebFrameProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebFrameProxy.h (180984 => 180985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebFrameProxy.h 2015-03-04 03:33:42 UTC (rev 180984)
+++ trunk/Source/WebKit2/UIProcess/WebFrameProxy.h 2015-03-04 03:36:10 UTC (rev 180985)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CONTENT_FILTERING)
</span><del>-#include <WebCore/ContentFilter.h>
</del><ins>+#include <WebCore/ContentFilterUnblockHandler.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> namespace API {
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx"> WebFormSubmissionListenerProxy& setUpFormSubmissionListenerProxy(uint64_t listenerID);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CONTENT_FILTERING)
</span><del>- void setContentFilterForBlockedLoad(std::unique_ptr<WebCore::ContentFilter> contentFilter) { m_contentFilterForBlockedLoad = WTF::move(contentFilter); }
</del><ins>+ void setContentFilterUnblockHandler(WebCore::ContentFilterUnblockHandler contentFilterUnblockHandler) { m_contentFilterUnblockHandler = WTF::move(contentFilterUnblockHandler); }
</ins><span class="cx"> bool contentFilterDidHandleNavigationAction(const WebCore::ResourceRequest&);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx"> uint64_t m_frameID;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CONTENT_FILTERING)
</span><del>- std::unique_ptr<WebCore::ContentFilter> m_contentFilterForBlockedLoad;
</del><ins>+ WebCore::ContentFilterUnblockHandler m_contentFilterUnblockHandler;
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (180984 => 180985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-03-04 03:33:42 UTC (rev 180984)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-03-04 03:36:10 UTC (rev 180985)
</span><span class="lines">@@ -1366,7 +1366,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CONTENT_FILTERING)
</span><del>- void contentFilterDidBlockLoadForFrame(const WebCore::ContentFilter&, uint64_t frameID);
</del><ins>+ void contentFilterDidBlockLoadForFrame(const WebCore::ContentFilterUnblockHandler&, uint64_t frameID);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> uint64_t generateNavigationID();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in (180984 => 180985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2015-03-04 03:33:42 UTC (rev 180984)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2015-03-04 03:36:10 UTC (rev 180985)
</span><span class="lines">@@ -414,7 +414,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CONTENT_FILTERING)
</span><del>- ContentFilterDidBlockLoadForFrame(WebCore::ContentFilter contentFilter, uint64_t frameID)
</del><ins>+ ContentFilterDidBlockLoadForFrame(WebCore::ContentFilterUnblockHandler unblockHandler, uint64_t frameID)
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> IsPlayingAudioDidChange(bool newIsPlayingAudio)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (180984 => 180985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2015-03-04 03:33:42 UTC (rev 180984)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2015-03-04 03:36:10 UTC (rev 180985)
</span><span class="lines">@@ -1646,10 +1646,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CONTENT_FILTERING)
</span><del>-void WebFrameLoaderClient::contentFilterDidBlockLoad(std::unique_ptr<WebCore::ContentFilter> contentFilter)
</del><ins>+void WebFrameLoaderClient::contentFilterDidBlockLoad(WebCore::ContentFilterUnblockHandler unblockHandler)
</ins><span class="cx"> {
</span><span class="cx"> if (WebPage* webPage = m_frame->page())
</span><del>- webPage->send(Messages::WebPageProxy::ContentFilterDidBlockLoadForFrame(*contentFilter, m_frame->frameID()));
</del><ins>+ webPage->send(Messages::WebPageProxy::ContentFilterDidBlockLoadForFrame(unblockHandler, m_frame->frameID()));
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h (180984 => 180985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h 2015-03-04 03:33:42 UTC (rev 180984)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h 2015-03-04 03:36:10 UTC (rev 180985)
</span><span class="lines">@@ -232,7 +232,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CONTENT_FILTERING)
</span><del>- virtual void contentFilterDidBlockLoad(std::unique_ptr<WebCore::ContentFilter>) override;
</del><ins>+ void contentFilterDidBlockLoad(WebCore::ContentFilterUnblockHandler) override;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> WebFrame* m_frame;
</span></span></pre>
</div>
</div>
</body>
</html>