From 2bde8e466a4451c7319e3a072d118917957d6554 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Wed, 25 May 2011 19:08:45 +0100 Subject: Merge WebKit at r82507: Initial merge by git Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e --- Source/WebCore/loader/icon/IconDatabaseClient.h | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'Source/WebCore/loader/icon/IconDatabaseClient.h') diff --git a/Source/WebCore/loader/icon/IconDatabaseClient.h b/Source/WebCore/loader/icon/IconDatabaseClient.h index f97a2a8..3d5f349 100644 --- a/Source/WebCore/loader/icon/IconDatabaseClient.h +++ b/Source/WebCore/loader/icon/IconDatabaseClient.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 Apple Inc. All rights reserved. + * Copyright (C) 2007, 2011 Apple Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -29,23 +29,20 @@ #ifndef IconDatabaseClient_h #define IconDatabaseClient_h -#include #include -#include - -// All of these client methods will be called from a non-main thread -// Take appropriate measures namespace WebCore { class IconDatabaseClient { - WTF_MAKE_NONCOPYABLE(IconDatabaseClient); WTF_MAKE_FAST_ALLOCATED; public: - IconDatabaseClient() { } virtual ~IconDatabaseClient() { } - virtual bool performImport() { return true; } - virtual void dispatchDidRemoveAllIcons() { } - virtual void dispatchDidAddIconForPageURL(const String& /*pageURL*/) { } + + virtual bool performImport() = 0; + virtual void didImportIconURLForPageURL(const String&) = 0; + virtual void didImportIconDataForPageURL(const String&) = 0; + virtual void didChangeIconForPageURL(const String&) = 0; + virtual void didRemoveAllIcons() = 0; + virtual void didFinishURLImport() = 0; }; } // namespace WebCore -- cgit v1.1