summaryrefslogtreecommitdiffstats
path: root/webkit/SConscript.port
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-12 17:16:44 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-12 17:16:44 +0000
commit6b7c52f448e35792e6755a999e2a3883790b5e6b (patch)
treea6b79a21fdd4b1763beeb1ee028f31f65ace04b2 /webkit/SConscript.port
parent6c261442dfbe22a447f0b26308c9278afdf9b57a (diff)
downloadchromium_src-6b7c52f448e35792e6755a999e2a3883790b5e6b.zip
chromium_src-6b7c52f448e35792e6755a999e2a3883790b5e6b.tar.gz
chromium_src-6b7c52f448e35792e6755a999e2a3883790b5e6b.tar.bz2
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
Diffstat (limited to 'webkit/SConscript.port')
-rw-r--r--webkit/SConscript.port3
1 files changed, 0 insertions, 3 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',