Title: [96872] trunk/Source/WebKit2
- Revision
- 96872
- Author
- alexis.men...@openbossa.org
- Date
- 2011-10-06 16:39:25 -0700 (Thu, 06 Oct 2011)
Log Message
[Qt][WK2] WebIconDatabase expects a file path not a directory.
https://bugs.webkit.org/show_bug.cgi?id=69557
Reviewed by Andreas Kling.
WebIconDatabase::setDatabasePath expects a file path not a directory.
I used the same name as the Mac port.
* UIProcess/qt/WebContextQt.cpp:
(WebKit::WebContext::platformDefaultIconDatabasePath):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (96871 => 96872)
--- trunk/Source/WebKit2/ChangeLog 2011-10-06 23:39:03 UTC (rev 96871)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-06 23:39:25 UTC (rev 96872)
@@ -1,3 +1,16 @@
+2011-10-06 Alexis Menard <alexis.men...@openbossa.org>
+
+ [Qt][WK2] WebIconDatabase expects a file path not a directory.
+ https://bugs.webkit.org/show_bug.cgi?id=69557
+
+ Reviewed by Andreas Kling.
+
+ WebIconDatabase::setDatabasePath expects a file path not a directory.
+ I used the same name as the Mac port.
+
+ * UIProcess/qt/WebContextQt.cpp:
+ (WebKit::WebContext::platformDefaultIconDatabasePath):
+
2011-10-06 Anders Carlsson <ander...@apple.com>
In background window, page flashes white if it enters and then immediately leaves compositing mode
Modified: trunk/Source/WebKit2/UIProcess/qt/WebContextQt.cpp (96871 => 96872)
--- trunk/Source/WebKit2/UIProcess/qt/WebContextQt.cpp 2011-10-06 23:39:03 UTC (rev 96871)
+++ trunk/Source/WebKit2/UIProcess/qt/WebContextQt.cpp 2011-10-06 23:39:25 UTC (rev 96872)
@@ -82,7 +82,7 @@
String WebContext::platformDefaultIconDatabasePath() const
{
- return defaultDataLocation();
+ return defaultDataLocation() + QLatin1String("WebpageIcons.db");
}
String WebContext::platformDefaultLocalStorageDirectory() const
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
