Title: [133035] trunk/Source/WebKit2
- Revision
- 133035
- Author
- [email protected]
- Date
- 2012-10-31 08:53:34 -0700 (Wed, 31 Oct 2012)
Log Message
[EFL] WebContext::platformDefaultIconDatabasePath() should return a path to a file
https://bugs.webkit.org/show_bug.cgi?id=100679
Patch by Thiago Marcos P. Santos <[email protected]> on 2012-10-31
Reviewed by Kenneth Rohde Christiansen.
This patch aligns the EFL implementation with other ports. Before
that, we had an inconsistence: the return value of the getter could
not be used on the setter (the setter expects a full path, not a
directory).
* UIProcess/API/efl/ewk_context.cpp:
(Ewk_Context::faviconDatabase):
* UIProcess/efl/WebContextEfl.cpp:
(WebKit::WebContext::platformDefaultIconDatabasePath):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (133034 => 133035)
--- trunk/Source/WebKit2/ChangeLog 2012-10-31 15:43:54 UTC (rev 133034)
+++ trunk/Source/WebKit2/ChangeLog 2012-10-31 15:53:34 UTC (rev 133035)
@@ -1,3 +1,20 @@
+2012-10-31 Thiago Marcos P. Santos <[email protected]>
+
+ [EFL] WebContext::platformDefaultIconDatabasePath() should return a path to a file
+ https://bugs.webkit.org/show_bug.cgi?id=100679
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ This patch aligns the EFL implementation with other ports. Before
+ that, we had an inconsistence: the return value of the getter could
+ not be used on the setter (the setter expects a full path, not a
+ directory).
+
+ * UIProcess/API/efl/ewk_context.cpp:
+ (Ewk_Context::faviconDatabase):
+ * UIProcess/efl/WebContextEfl.cpp:
+ (WebKit::WebContext::platformDefaultIconDatabasePath):
+
2012-10-31 Ian Vollick <[email protected]>
Add support for text-based repaint testing
Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp (133034 => 133035)
--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp 2012-10-31 15:43:54 UTC (rev 133034)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp 2012-10-31 15:53:34 UTC (rev 133035)
@@ -150,8 +150,7 @@
// Set the database path if it is not open yet.
if (!toImpl(iconDatabase.get())->isOpen()) {
WebContext* webContext = toImpl(m_context.get());
- String databasePath = webContext->iconDatabasePath() + "/" + WebCore::IconDatabase::defaultDatabaseFilename();
- webContext->setIconDatabasePath(databasePath);
+ webContext->setIconDatabasePath(webContext->iconDatabasePath());
}
m_faviconDatabase = Ewk_Favicon_Database::create(iconDatabase.get());
}
Modified: trunk/Source/WebKit2/UIProcess/efl/WebContextEfl.cpp (133034 => 133035)
--- trunk/Source/WebKit2/UIProcess/efl/WebContextEfl.cpp 2012-10-31 15:43:54 UTC (rev 133034)
+++ trunk/Source/WebKit2/UIProcess/efl/WebContextEfl.cpp 2012-10-31 15:53:34 UTC (rev 133035)
@@ -28,6 +28,7 @@
#include <Efreet.h>
#include <WebCore/ApplicationCacheStorage.h>
+#include <WebCore/IconDatabase.h>
#include <WebCore/NotImplemented.h>
namespace WebKit {
@@ -54,7 +55,7 @@
String WebContext::platformDefaultIconDatabasePath() const
{
- return String::fromUTF8(efreet_data_home_get()) + "/WebKitEfl/IconDatabase";
+ return String::fromUTF8(efreet_data_home_get()) + "/WebKitEfl/IconDatabase/" + WebCore::IconDatabase::defaultDatabaseFilename();
}
String WebContext::platformDefaultLocalStorageDirectory() const
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
