ContentFilterMac is broken when NE_FILTER_SOURCE is enabled.
authorbeidson@apple.com <beidson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 9 Apr 2014 18:25:42 +0000 (18:25 +0000)
committerbeidson@apple.com <beidson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 9 Apr 2014 18:25:42 +0000 (18:25 +0000)
<rdar://problem/15978793> and https://bugs.webkit.org/show_bug.cgi?id=131445

Reviewed by Andy Estes.

No new tests (Not a tested feature).

* platform/mac/ContentFilterMac.mm:
(WebCore::ContentFilter::needsMoreData): Only consider m_neFilterSourceStatus if m_neFilterSource exists.
(WebCore::ContentFilter::didBlockData): Ditto.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@167023 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/mac/ContentFilterMac.mm

index 4dcba64..f00f593 100644 (file)
@@ -1,3 +1,16 @@
+2014-04-09  Brady Eidson  <beidson@apple.com>
+
+        ContentFilterMac is broken when NE_FILTER_SOURCE is enabled.
+        <rdar://problem/15978793> and https://bugs.webkit.org/show_bug.cgi?id=131445
+
+        Reviewed by Andy Estes.
+
+        No new tests (Not a tested feature).
+
+        * platform/mac/ContentFilterMac.mm:
+        (WebCore::ContentFilter::needsMoreData): Only consider m_neFilterSourceStatus if m_neFilterSource exists.
+        (WebCore::ContentFilter::didBlockData): Ditto.
+
 2014-04-08  Oliver Hunt  <oliver@apple.com>
 
         Rewrite Function.bind as a builtin
index a285955..1ef50e8 100644 (file)
@@ -201,7 +201,7 @@ bool ContentFilter::needsMoreData() const
 {
     return [m_platformContentFilter filterState] == kWFEStateBuffering
 #if HAVE(NE_FILTER_SOURCE)
-        || m_neFilterSourceStatus == NEFilterSourceStatusNeedsMoreData
+        || (m_neFilterSource && m_neFilterSourceStatus == NEFilterSourceStatusNeedsMoreData)
 #endif
     ;
 }
@@ -210,7 +210,7 @@ bool ContentFilter::didBlockData() const
 {
     return [m_platformContentFilter wasBlocked]
 #if HAVE(NE_FILTER_SOURCE)
-        || m_neFilterSourceStatus == NEFilterSourceStatusBlock
+        || (m_neFilterSource && m_neFilterSourceStatus == NEFilterSourceStatusBlock)
 #endif
     ;
 }