Title: [122691] trunk/Source/WebKit/blackberry
- Revision
- 122691
- Author
- [email protected]
- Date
- 2012-07-15 19:29:28 -0700 (Sun, 15 Jul 2012)
Log Message
[BlackBerry] Move icon database to application data directory.
https://bugs.webkit.org/show_bug.cgi?id=91195
Patch by Jonathan Dong <[email protected]> on 2012-07-15
Reviewed by Rob Buis.
RIM PR: 156852
Create icon database in application data directory instead of
database or local storage directory, by doing this we can make
things easier when clearing database or local storage data files.
Internally reviewed by Charles Wei <[email protected]>
* WebCoreSupport/IconDatabaseClientBlackBerry.cpp:
(WebCore::IconDatabaseClientBlackBerry::initIconDatabase):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/ChangeLog (122690 => 122691)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-07-16 02:27:32 UTC (rev 122690)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-07-16 02:29:28 UTC (rev 122691)
@@ -1,3 +1,20 @@
+2012-07-15 Jonathan Dong <[email protected]>
+
+ [BlackBerry] Move icon database to application data directory.
+ https://bugs.webkit.org/show_bug.cgi?id=91195
+
+ Reviewed by Rob Buis.
+
+ RIM PR: 156852
+ Create icon database in application data directory instead of
+ database or local storage directory, by doing this we can make
+ things easier when clearing database or local storage data files.
+
+ Internally reviewed by Charles Wei <[email protected]>
+
+ * WebCoreSupport/IconDatabaseClientBlackBerry.cpp:
+ (WebCore::IconDatabaseClientBlackBerry::initIconDatabase):
+
2012-07-13 Xianzhu Wang <[email protected]>
Move WebCore/platform/text/Base64 to WTF/wtf/text
Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/IconDatabaseClientBlackBerry.cpp (122690 => 122691)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/IconDatabaseClientBlackBerry.cpp 2012-07-16 02:27:32 UTC (rev 122690)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/IconDatabaseClientBlackBerry.cpp 2012-07-16 02:29:28 UTC (rev 122691)
@@ -19,6 +19,7 @@
#include "config.h"
#include "IconDatabaseClientBlackBerry.h"
+#include "BlackBerryPlatformClient.h"
#include "IconDatabase.h"
#include "WebSettings.h"
#include "WebString.h"
@@ -50,13 +51,9 @@
iconDatabase().setClient(this);
- BlackBerry::WebKit::WebString path = settings->databasePath();
+ m_initState = iconDatabase().open(BlackBerry::Platform::Client::get()->getApplicationDataDirectory().c_str(),
+ IconDatabase::defaultDatabaseFilename()) ? InitializeSucceeded : InitializeFailed;
- if (path.isEmpty())
- path = settings->localStoragePath();
-
- m_initState = iconDatabase().open(path, IconDatabase::defaultDatabaseFilename()) ? InitializeSucceeded : InitializeFailed;
-
return m_initState == InitializeSucceeded;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
