Title: [141334] trunk/Source/WebCore
- Revision
- 141334
- Author
- [email protected]
- Date
- 2013-01-30 15:45:27 -0800 (Wed, 30 Jan 2013)
Log Message
ContentFilter should be a ref-counted class
https://bugs.webkit.org/show_bug.cgi?id=108392
Reviewed by David Kilzer.
* loader/MainResourceLoader.h:
(MainResourceLoader): Store a RefPtr to m_contentFilter.
* platform/ContentFilter.h: Inherit from RefCounted<ContentFilter>.
* platform/mac/ContentFilterMac.mm:
(WebCore::ContentFilter::create): Return a PassRefPtr.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (141333 => 141334)
--- trunk/Source/WebCore/ChangeLog 2013-01-30 23:34:57 UTC (rev 141333)
+++ trunk/Source/WebCore/ChangeLog 2013-01-30 23:45:27 UTC (rev 141334)
@@ -1,3 +1,16 @@
+2013-01-30 Andy Estes <[email protected]>
+
+ ContentFilter should be a ref-counted class
+ https://bugs.webkit.org/show_bug.cgi?id=108392
+
+ Reviewed by David Kilzer.
+
+ * loader/MainResourceLoader.h:
+ (MainResourceLoader): Store a RefPtr to m_contentFilter.
+ * platform/ContentFilter.h: Inherit from RefCounted<ContentFilter>.
+ * platform/mac/ContentFilterMac.mm:
+ (WebCore::ContentFilter::create): Return a PassRefPtr.
+
2013-01-30 Tim Horton <[email protected]>
[mac] ImageBuffer should create accelerated buffers for small canvases, but we shouldn't force them to create compositing layers
Modified: trunk/Source/WebCore/loader/MainResourceLoader.h (141333 => 141334)
--- trunk/Source/WebCore/loader/MainResourceLoader.h 2013-01-30 23:34:57 UTC (rev 141333)
+++ trunk/Source/WebCore/loader/MainResourceLoader.h 2013-01-30 23:45:27 UTC (rev 141334)
@@ -131,7 +131,7 @@
unsigned long m_identifierForLoadWithoutResourceLoader;
#if USE(CONTENT_FILTERING)
- OwnPtr<ContentFilter> m_contentFilter;
+ RefPtr<ContentFilter> m_contentFilter;
#endif
};
Modified: trunk/Source/WebCore/platform/ContentFilter.h (141333 => 141334)
--- trunk/Source/WebCore/platform/ContentFilter.h 2013-01-30 23:34:57 UTC (rev 141333)
+++ trunk/Source/WebCore/platform/ContentFilter.h 2013-01-30 23:45:27 UTC (rev 141334)
@@ -28,7 +28,8 @@
#if USE(CONTENT_FILTERING)
-#include <wtf/PassOwnPtr.h>
+#include <wtf/PassRefPtr.h>
+#include <wtf/RefCounted.h>
#include <wtf/RetainPtr.h>
#if PLATFORM(MAC)
@@ -39,9 +40,9 @@
class ResourceResponse;
-class ContentFilter {
+class ContentFilter : public RefCounted<ContentFilter> {
public:
- static PassOwnPtr<ContentFilter> create(const ResourceResponse&);
+ static PassRefPtr<ContentFilter> create(const ResourceResponse&);
static bool isEnabled();
void addData(const char* data, int length);
Modified: trunk/Source/WebCore/platform/mac/ContentFilterMac.mm (141333 => 141334)
--- trunk/Source/WebCore/platform/mac/ContentFilterMac.mm 2013-01-30 23:34:57 UTC (rev 141333)
+++ trunk/Source/WebCore/platform/mac/ContentFilterMac.mm 2013-01-30 23:45:27 UTC (rev 141334)
@@ -33,9 +33,9 @@
namespace WebCore {
-PassOwnPtr<ContentFilter> ContentFilter::create(const ResourceResponse& response)
+PassRefPtr<ContentFilter> ContentFilter::create(const ResourceResponse& response)
{
- return adoptPtr(new ContentFilter(response));
+ return adoptRef(new ContentFilter(response));
}
ContentFilter::ContentFilter(const ResourceResponse& response)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes