Title: [168684] trunk/Source/WebCore
- Revision
- 168684
- Author
- [email protected]
- Date
- 2014-05-13 09:26:16 -0700 (Tue, 13 May 2014)
Log Message
Try to fix the !ENABLE(ICONDATABASE) build
* loader/icon/IconDatabase.h: Include WTFString.h.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (168683 => 168684)
--- trunk/Source/WebCore/ChangeLog 2014-05-13 15:34:00 UTC (rev 168683)
+++ trunk/Source/WebCore/ChangeLog 2014-05-13 16:26:16 UTC (rev 168684)
@@ -1,3 +1,9 @@
+2014-05-13 Darin Adler <[email protected]>
+
+ Try to fix the !ENABLE(ICONDATABASE) build
+
+ * loader/icon/IconDatabase.h: Include WTFString.h.
+
2014-05-13 Carlos Garcia Campos <[email protected]>
REGRESSION(r167771): [GTK] Text fields and areas are rendered unthemed
Modified: trunk/Source/WebCore/loader/icon/IconDatabase.h (168683 => 168684)
--- trunk/Source/WebCore/loader/icon/IconDatabase.h 2014-05-13 15:34:00 UTC (rev 168683)
+++ trunk/Source/WebCore/loader/icon/IconDatabase.h 2014-05-13 16:26:16 UTC (rev 168684)
@@ -1,5 +1,5 @@
/*
- * 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 ([email protected])
*
* Redistribution and use in source and binary forms, with or without
@@ -28,6 +28,7 @@
#define IconDatabase_h
#include "IconDatabaseBase.h"
+#include <wtf/text/WTFString.h>
#if ENABLE(ICONDATABASE)
#include "SQLiteDatabase.h"
@@ -48,7 +49,9 @@
static void delayDatabaseCleanup() { }
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"); }
};
#else
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
