It turns out that we can just use the versions of IconLoader.cpp and

IconDatabaseNone.cpp from third_party/WebKit.  Our forked version of
IconLoader.cpp was unnecessary because FrameLoader does not start the
IconLoader if the IconDatabase is not enabled.  IconDatabaseNone says
it is not enabled!

R=dglazkov

Review URL: http://codereview.chromium.org/14051

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6894 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 23 insertions, 409 deletions

diff --git a/webkit/SConscript.port b/webkit/SConscript.port
index 2e3e842..812391c 100644
--- a/webkit/SConscript.port
+++ b/webkit/SConscript.port
@@ -30,9 +30,6 @@ input_files = [
     '$PORT_DIR/history/BackForwardList.cpp',
     '$PORT_DIR/history/CachedPage.cpp',
 
-    '$PORT_DIR/loader/IconLoader.cpp',
-    '$PORT_DIR/loader/IconDatabaseNone.cpp',
-
     '$PORT_DIR/page/Location.cpp',
     '$PORT_DIR/page/chromium/AccessibilityObjectChromium.cpp',
     '$PORT_DIR/page/chromium/AXObjectCacheChromium.cpp',
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript
index cbdf1b6..94d3bea 100644
--- a/webkit/build/WebCore/SConscript
+++ b/webkit/build/WebCore/SConscript
@@ -349,6 +349,9 @@ input_files = [
     '$WEBCORE_DIR/loader/archive/ArchiveResource.cpp',
     '$WEBCORE_DIR/loader/archive/ArchiveResourceCollection.cpp',
 
+    '$WEBCORE_DIR/loader/icon/IconLoader.cpp',
+    '$WEBCORE_DIR/loader/icon/IconDatabaseNone.cpp',
+
     '$WEBCORE_DIR/page/AccessibilityImageMapLink.cpp',
     '$WEBCORE_DIR/page/AccessibilityList.cpp',
     '$WEBCORE_DIR/page/AccessibilityListBox.cpp',
diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj
index 89391b0..f1c228c 100644
--- a/webkit/build/WebCore/WebCore.vcproj
+++ b/webkit/build/WebCore/WebCore.vcproj
@@ -833,6 +833,26 @@
 					>

 				</File>

 			</Filter>

+			<Filter

+				Name="icon"

+				>

+				<File

+					RelativePath="..\..\..\third_party\WebKit\WebCore\loader\icon\IconDatabase.h"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\third_party\WebKit\WebCore\loader\icon\IconDatabaseNone.cpp"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\third_party\WebKit\WebCore\loader\icon\IconLoader.cpp"

+					>

+				</File>

+				<File

+					RelativePath="..\..\..\third_party\WebKit\WebCore\loader\icon\IconLoader.h"

+					>

+				</File>

+			</Filter>

 		</Filter>

 		<Filter

 			Name="platform"

diff --git a/webkit/build/port/port.vcproj b/webkit/build/port/port.vcproj
index 312751b..4e992b2 100644
--- a/webkit/build/port/port.vcproj
+++ b/webkit/build/port/port.vcproj
@@ -822,18 +822,6 @@
 			</Filter>

 		</Filter>

 		<Filter

-			Name="loader"

-			>

-			<File

-				RelativePath="..\..\port\loader\IconDatabaseNone.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\port\loader\IconLoader.cpp"

-				>

-			</File>

-		</Filter>

-		<Filter

 			Name="platform"

 			>

 			<File

diff --git a/webkit/port/loader/IconDatabaseNone.cpp b/webkit/port/loader/IconDatabaseNone.cpp
deleted file mode 100644
index c76a2c4..0000000
--- a/webkit/port/loader/IconDatabaseNone.cpp
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Copyright (C) 2006 Apple Computer, 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 COMPUTER, INC. ``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 COMPUTER, INC. OR
- * 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. 
- */
-
-#include "config.h"
-#include "IconDatabase.h"
-#include "SharedBuffer.h"
-
-namespace WebCore {
-
-static IconDatabase* sharedIconDatabase = 0;
-
-// This version number is in the DB and marks the current generation of the schema
-// Theoretically once the switch is flipped this should never change
-// Currently, an out-of-date schema causes the DB to be wiped and reset.  This isn't 
-// so bad during development but in the future, we would need to write a conversion
-// function to advance older released schemas to "current"
-const int currentDatabaseVersion = 5;
-
-// Icons expire once a day
-const int iconExpirationTime = 60*60*24; 
-// Absent icons are rechecked once a week
-const int missingIconExpirationTime = 60*60*24*7; 
-
-const int updateTimerDelay = 5; 
-
-String IconDatabase::defaultDatabaseFilename()
-{
-    static String defaultDatabaseFilename = "Icons.db";
-    return defaultDatabaseFilename;
-}
-
-IconDatabase* iconDatabase()
-{
-    if (!sharedIconDatabase)
-        sharedIconDatabase = new IconDatabase;
-    return sharedIconDatabase;
-}
-
-IconDatabase::IconDatabase()
-{
-}
-
-bool IconDatabase::open(const String& databasePath)
-{
-    return false;
-}
-
-bool IconDatabase::isOpen() const
-{
-    return false;
-}
-
-void IconDatabase::close()
-{
-}
-
-String IconDatabase::databasePath() const
-{
-    return String();
-}
-
-void IconDatabase::removeAllIcons()
-{
-}
-
-void IconDatabase::setPrivateBrowsingEnabled(bool flag)
-{
-}
-
-bool IconDatabase::isPrivateBrowsingEnabled() const
-{
-    return false;
-}
-
-void IconDatabase::readIconForPageURLFromDisk(const String&)
-{
-
-}
-
-Image* IconDatabase::iconForPageURL(const String& pageURL, const IntSize& size)
-{
-    return defaultIcon(size);
-}
-
-
-IconLoadDecision IconDatabase::loadDecisionForIconURL(const String&, DocumentLoader*)
-{
-    return IconLoadNo;
-}
-
-bool IconDatabase::iconDataKnownForIconURL(const String&)
-{
-    return false;
-}
-
-String IconDatabase::iconURLForPageURL(const String& pageURL)
-{
-    return String();
-}
-
-Image* IconDatabase::defaultIcon(const IntSize& size)
-{
-    return 0;
-}
-
-void IconDatabase::retainIconForPageURL(const String& pageURL)
-{
-}
-
-void IconDatabase::releaseIconForPageURL(const String& pageURL)
-{
-}
-
-void IconDatabase::setIconDataForIconURL(PassRefPtr<SharedBuffer> data, const String& iconURL)
-{
-}
-
-void IconDatabase::setIconURLForPageURL(const String& iconURL, const String& pageURL)
-{
-}
-
-void IconDatabase::setEnabled(bool enabled)
-{
-}
-
-bool IconDatabase::isEnabled() const
-{
-    return false;
-}
-
-IconDatabase::~IconDatabase()
-{
-    ASSERT_NOT_REACHED();
-}
-
-void IconDatabase::checkIntegrityBeforeOpening()
-{
-}
-
-void IconDatabase::delayDatabaseCleanup()
-{
-}
-
-void IconDatabase::allowDatabaseCleanup()
-{
-}
-
-void IconDatabase::setClient(IconDatabaseClient*)
-{
-}
-
-} // namespace WebCore
diff --git a/webkit/port/loader/IconLoader.cpp b/webkit/port/loader/IconLoader.cpp
deleted file mode 100644
index 26c6c6cb..0000000
--- a/webkit/port/loader/IconLoader.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (C) 2006 Apple Computer, 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 COMPUTER, INC. ``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 COMPUTER, INC. OR
- * 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. 
- */
-
-#include "config.h"
-
-#if COMPILER(MSVC)
-__pragma(warning(push, 0))
-#endif
-#include "IconLoader.h"
-
-#include "Document.h"
-#include "Frame.h"
-#include "FrameLoader.h"
-#include "FrameLoaderClient.h"
-#include "IconDatabase.h"
-#include "Logging.h"
-#include "ResourceHandle.h"
-#include "ResourceResponse.h"
-#include "ResourceRequest.h"
-#include "SubresourceLoader.h"
-#if COMPILER(MSVC)
-__pragma(warning(pop))
-#endif
-
-using namespace std;
-
-namespace WebCore {
-
-// This is a stub implementation of WebKit's IconLoader class that does
-// nothing.
-
-IconLoader::IconLoader(Frame* frame)
-    : m_frame(frame)
-    , m_loadIsInProgress(false)
-{
-}
-
-// TODO(brettw) it may be we want to hook our icon loading framework up to here
-// instead of being in the RenderView. This may make for easier integration in
-// the future.
-auto_ptr<IconLoader> IconLoader::create(Frame* frame)
-{
-    return auto_ptr<IconLoader>(new IconLoader(frame));
-}
-
-IconLoader::~IconLoader()
-{
-}
-
-void IconLoader::startLoading()
-{
-}
-
-void IconLoader::stopLoading()
-{
-}
-
-void IconLoader::didReceiveResponse(SubresourceLoader* resourceLoader, const ResourceResponse& response)
-{
-}
-
-void IconLoader::didReceiveData(SubresourceLoader* loader, const char*, int size)
-{
-}
-
-void IconLoader::didFail(SubresourceLoader* resourceLoader, const ResourceError&)
-{
-}
-
-void IconLoader::didFinishLoading(SubresourceLoader* resourceLoader)
-{
-}
-
-void IconLoader::didReceiveAuthenticationChallenge(SubresourceLoader* resourceLoader, const AuthenticationChallenge& challenge)
-{
-}
-
-void IconLoader::finishLoading(const KURL& iconURL, PassRefPtr<SharedBuffer> data)
-{
-}
-
-void IconLoader::clearLoadingState()
-{
-}
-
-}  // namespace WebCore
diff --git a/webkit/port/loader/SQLDatabase.cpp b/webkit/port/loader/SQLDatabase.cpp
deleted file mode 100644
index 72be762..0000000
--- a/webkit/port/loader/SQLDatabase.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (C) 2006 Apple Computer, 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 COMPUTER, INC. ``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 COMPUTER, INC. OR
- * 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. 
- */
-
-#include "config.h"
-#include "SQLDatabase.h"
-
-#include "Logging.h"
-
-namespace WebCore {
-
-// This is a stub to keep WebCore compiling. We do not use WebKit's
-// favicon database.
-
-SQLDatabase::SQLDatabase()
-    : m_db(0)
-{
-
-}
-
-bool SQLDatabase::open(const String& filename)
-{
-    return false;
-}
-
-void SQLDatabase::close()
-{
-}
-
-void SQLDatabase::setFullsync(bool fsync) 
-{
-}
-
-void SQLDatabase::setSynchronous(SynchronousPragma sync)
-{
-}
-
-void SQLDatabase::setBusyTimeout(int ms)
-{
-}
-
-void SQLDatabase::setBusyHandler(int(*handler)(void*, int))
-{
-}
-
-bool SQLDatabase::executeCommand(const String& sql)
-{
-    return false;
-}
-
-bool SQLDatabase::returnsAtLeastOneResult(const String& sql)
-{
-    return false;
-}
-
-bool SQLDatabase::tableExists(const String& tablename)
-{
-    return false;
-}
-
-void SQLDatabase::clearAllTables()
-{
-}
-
-void SQLDatabase::runVacuumCommand()
-{
-}
-
-int64_t SQLDatabase::lastInsertRowID()
-{
-    return 0;
-}
-
-int SQLDatabase::lastChanges()
-{
-    return 0;
-}
-
-int SQLDatabase::lastError()
-{
-    return 0;
-}
-
-const char* SQLDatabase::lastErrorMsg()
-{
-    return "";
-}
-
-} // namespace WebCore
-
-