summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/loader
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2011-10-27 12:50:49 +0100
committerSteve Block <steveblock@google.com>2011-10-28 14:57:37 +0100
commit33227a6c6e4f49f430734efd6b339706181588c1 (patch)
tree62f42ea271595d9a143c533cd73e82e243258272 /Source/WebCore/loader
parent1b88cab77a965f1887ae4728b9e8016e8504e2ec (diff)
downloadexternal_webkit-33227a6c6e4f49f430734efd6b339706181588c1.zip
external_webkit-33227a6c6e4f49f430734efd6b339706181588c1.tar.gz
external_webkit-33227a6c6e4f49f430734efd6b339706181588c1.tar.bz2
Cherry-pick WebKit change 98548 to fix debug build
See http://trac.webkit.org/changeset/98548 Bug: 5448972 Change-Id: I099d9ca9e63cbc6e8c3e163ecb2b0a0c82d1141a
Diffstat (limited to 'Source/WebCore/loader')
-rw-r--r--Source/WebCore/loader/icon/IconDatabase.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/loader/icon/IconDatabase.cpp b/Source/WebCore/loader/icon/IconDatabase.cpp
index 428ae16..2bb22ec 100644
--- a/Source/WebCore/loader/icon/IconDatabase.cpp
+++ b/Source/WebCore/loader/icon/IconDatabase.cpp
@@ -73,7 +73,7 @@ static const int updateTimerDelay = 5;
static bool checkIntegrityOnOpen = false;
-#if !LOG_DISABLED
+#if !LOG_DISABLED || !ERROR_DISABLED
static String urlForLogging(const String& url)
{
static unsigned urlTruncationLength = 120;