Changeset 168684 in webkit

Timestamp:

May 13, 2014 9:26:16 AM (10 years ago)

Author:

Darin Adler

Message:

Try to fix the !ENABLE(ICONDATABASE) build

• loader/icon/IconDatabase.h: Include WTFString.h.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/icon/IconDatabase.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-05-13  Darin Adler  <darin@apple.com>
+
+        Try to fix the !ENABLE(ICONDATABASE) build
+
+        * loader/icon/IconDatabase.h: Include WTFString.h.
+
 2014-05-13  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/loader/icon/IconDatabase.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
+ * Copyright (C) 2006, 2007, 2008, 2009, 2014 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Justin Haygood (jhaygood@reaktix.com)
  *
@@ -29 +29 @@
 
 #include "IconDatabaseBase.h"
+#include <wtf/text/WTFString.h>
 
 #if ENABLE(ICONDATABASE)
@@ -49 +50 @@
     static void allowDatabaseCleanup() { }
     static void checkIntegrityBeforeOpening() { }
-    static String defaultDatabaseFilename() { return "WebpageIcons.db"; }
+
+    // FIXME: Is it really helpful to return a filename here rather than just the null string?
+    static String defaultDatabaseFilename() { return ASCIILiteral("WebpageIcons.db"); }
 };