[BlackBerry] Changes resulting from moving application directory methods from platfor...
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 24 Aug 2012 17:12:59 +0000 (17:12 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 24 Aug 2012 17:12:59 +0000 (17:12 +0000)
https://bugs.webkit.org/show_bug.cgi?id=94249

Patch by Parth Patel <parpatel@rim.com> on 2012-08-24
Reviewed by Rob Buis.

Source/WebCore:

PR 170160

Changes in response to Application Directory methods moved from
Class BlackBerryPlatformClient to BlackBerryPlatformSettings in
platform respository since these methods are more appropriate in
class BlackBerryPlatformSettings.

No new tests as there are no logical modifications.

* platform/blackberry/CookieManager.cpp:
(WebCore::CookieManager::CookieManager):
* platform/blackberry/FileSystemBlackBerry.cpp:
(WebCore::homeDirectoryPath):
* platform/graphics/blackberry/MediaPlayerPrivateBlackBerry.cpp:
(WebCore::MediaPlayerPrivate::load):
* platform/network/blackberry/AutofillBackingStore.cpp:
(WebCore::autofillBackingStore):
* platform/network/blackberry/CredentialBackingStore.cpp:
(WebCore::credentialBackingStore):
* platform/network/blackberry/NetworkJob.cpp:
(WebCore::NetworkJob::sendRequestWithCredentials):
* plugins/PluginDatabase.cpp:
(WebCore::PluginDatabase::isPreferredPluginDirectory):

Source/WebKit/blackberry:

PR# 170160
Changes in response to Application Directory methods moved from
Class BlackBerryPlatformClient to BlackBerryPlatformSettings in
platform respository since these methods are more appropriate in
class BlackBerryPlatformSettings.

* WebCoreSupport/IconDatabaseClientBlackBerry.cpp:
(WebCore::IconDatabaseClientBlackBerry::initIconDatabase):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@126596 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/blackberry/CookieManager.cpp
Source/WebCore/platform/blackberry/FileSystemBlackBerry.cpp
Source/WebCore/platform/graphics/blackberry/MediaPlayerPrivateBlackBerry.cpp
Source/WebCore/platform/network/blackberry/AutofillBackingStore.cpp
Source/WebCore/platform/network/blackberry/CredentialBackingStore.cpp
Source/WebCore/platform/network/blackberry/NetworkJob.cpp
Source/WebCore/plugins/PluginDatabase.cpp
Source/WebKit/blackberry/ChangeLog
Source/WebKit/blackberry/WebCoreSupport/IconDatabaseClientBlackBerry.cpp

index 892a7c4..2924f49 100644 (file)
@@ -1,3 +1,34 @@
+2012-08-24  Parth Patel  <parpatel@rim.com>
+
+        [BlackBerry] Changes resulting from moving application directory methods from platform client to platform settings.
+        https://bugs.webkit.org/show_bug.cgi?id=94249
+
+        Reviewed by Rob Buis.
+
+        PR 170160
+
+        Changes in response to Application Directory methods moved from
+        Class BlackBerryPlatformClient to BlackBerryPlatformSettings in
+        platform respository since these methods are more appropriate in
+        class BlackBerryPlatformSettings.
+
+        No new tests as there are no logical modifications.
+
+        * platform/blackberry/CookieManager.cpp:
+        (WebCore::CookieManager::CookieManager):
+        * platform/blackberry/FileSystemBlackBerry.cpp:
+        (WebCore::homeDirectoryPath):
+        * platform/graphics/blackberry/MediaPlayerPrivateBlackBerry.cpp:
+        (WebCore::MediaPlayerPrivate::load):
+        * platform/network/blackberry/AutofillBackingStore.cpp:
+        (WebCore::autofillBackingStore):
+        * platform/network/blackberry/CredentialBackingStore.cpp:
+        (WebCore::credentialBackingStore):
+        * platform/network/blackberry/NetworkJob.cpp:
+        (WebCore::NetworkJob::sendRequestWithCredentials):
+        * plugins/PluginDatabase.cpp:
+        (WebCore::PluginDatabase::isPreferredPluginDirectory):
+
 2012-08-24  Ilya Tikhonovsky  <loislo@chromium.org>
 
         Web Inspector: do not count weak and shortcut edges.
index 50a510d..dd93702 100644 (file)
 #include "FileSystem.h"
 #include "Logging.h"
 #include "WebSettings.h"
-#include <BlackBerryPlatformClient.h>
 #include <BlackBerryPlatformExecutableMessage.h>
 #include <BlackBerryPlatformMessageClient.h>
 #include <BlackBerryPlatformNavigatorHandler.h>
+#include <BlackBerryPlatformSettings.h>
 #include <stdlib.h>
 #include <wtf/CurrentTime.h>
 #include <wtf/text/CString.h>
@@ -87,7 +87,7 @@ CookieManager::CookieManager()
     : m_count(0)
     , m_privateMode(false)
     , m_shouldDumpAllCookies(false)
-    , m_cookieJarFileName(pathByAppendingComponent(BlackBerry::Platform::Client::get()->getApplicationDataDirectory().c_str(), "/cookieCollection.db"))
+    , m_cookieJarFileName(pathByAppendingComponent(BlackBerry::Platform::Settings::instance()->applicationDataDirectory().c_str(), "/cookieCollection.db"))
     , m_policy(CookieStorageAcceptPolicyAlways)
     , m_cookieBackingStore(CookieDatabaseBackingStore::create())
     , m_limitTimer(this, &CookieManager::cookieLimitCleanUp)
index 4765c01..7e932fb 100644 (file)
 #include "config.h"
 #include "FileSystem.h"
 
-#include <BlackBerryPlatformClient.h>
+#include <BlackBerryPlatformSettings.h>
 #include <wtf/text/CString.h>
 
 namespace WebCore {
 
 String homeDirectoryPath()
 {
-    return BlackBerry::Platform::Client::get()->getApplicationDataDirectory().c_str();
+    return BlackBerry::Platform::Settings::instance()->applicationDataDirectory().c_str();
 }
 
 CString fileSystemRepresentation(const String& path)
index d7f9acb..13bdcf0 100644 (file)
@@ -38,7 +38,8 @@
 #include "TimeRanges.h"
 #include "WebPageClient.h"
 
-#include <BlackBerryPlatformClient.h>
+#include <BlackBerryPlatformSettings.h>
+#include <FrameLoaderClientBlackBerry.h>
 #include <set>
 #include <string>
 #include <wtf/text/CString.h>
@@ -139,7 +140,7 @@ void MediaPlayerPrivate::load(const String& url)
     if (modifiedUrl.startsWith("local://")) {
         KURL kurl = KURL(KURL(), modifiedUrl);
         kurl.setProtocol("file");
-        String tempPath(BlackBerry::Platform::Client::get()->getApplicationLocalDirectory().c_str());
+        String tempPath(BlackBerry::Platform::Settings::instance()->applicationLocalDirectory().c_str());
         tempPath.append(kurl.path());
         kurl.setPath(tempPath);
         modifiedUrl = kurl.string();
index 21ff957..db00b78 100644 (file)
@@ -22,7 +22,7 @@
 
 #include "FileSystem.h"
 #include "SQLiteStatement.h"
-#include <BlackBerryPlatformClient.h>
+#include <BlackBerryPlatformSettings.h>
 
 #define HANDLE_SQL_EXEC_FAILURE(statement, returnValue, ...) \
     if (statement) { \
@@ -36,7 +36,7 @@ AutofillBackingStore& autofillBackingStore()
 {
     DEFINE_STATIC_LOCAL(AutofillBackingStore, backingStore, ());
     if (!backingStore.m_database.isOpen())
-        backingStore.open(pathByAppendingComponent(BlackBerry::Platform::Client::get()->getApplicationDataDirectory().c_str(), "/autofill.db"));
+        backingStore.open(pathByAppendingComponent(BlackBerry::Platform::Settings::instance()->applicationDataDirectory().c_str(), "/autofill.db"));
     return backingStore;
 }
 
index 3aab212..187d238 100644 (file)
@@ -27,8 +27,8 @@
 #include "NotImplemented.h"
 #include "ProtectionSpaceHash.h"
 #include "SQLiteStatement.h"
-#include <BlackBerryPlatformClient.h>
 #include <BlackBerryPlatformEncryptor.h>
+#include <BlackBerryPlatformSettings.h>
 #include <CertMgrWrapper.h>
 
 #define HANDLE_SQL_EXEC_FAILURE(statement, returnValue, ...) \
@@ -54,7 +54,7 @@ CredentialBackingStore& credentialBackingStore()
 {
     DEFINE_STATIC_LOCAL(CredentialBackingStore, backingStore, ());
     if (!backingStore.m_database.isOpen())
-        backingStore.open(pathByAppendingComponent(BlackBerry::Platform::Client::get()->getApplicationDataDirectory().c_str(), "/credentials.db"));
+        backingStore.open(pathByAppendingComponent(BlackBerry::Platform::Settings::instance()->applicationDataDirectory().c_str(), "/credentials.db"));
     return backingStore;
 }
 
index 45ae8af..b8c59e1 100644 (file)
@@ -38,6 +38,7 @@
 
 #include <BlackBerryPlatformClient.h>
 #include <BlackBerryPlatformLog.h>
+#include <BlackBerryPlatformSettings.h>
 #include <LocalizeResource.h>
 #include <network/MultipartStream.h>
 #include <network/NetworkStreamFactory.h>
@@ -763,7 +764,7 @@ bool NetworkJob::sendRequestWithCredentials(ProtectionSpaceServerType type, Prot
                 m_handle->getInternal()->m_user = "";
                 m_handle->getInternal()->m_pass = "";
             } else {
-                if (m_handle->firstRequest().targetType() != ResourceRequest::TargetIsMainFrame && BlackBerry::Platform::Client::isChromeProcess())
+                if (m_handle->firstRequest().targetType() != ResourceRequest::TargetIsMainFrame && BlackBerry::Platform::Settings::instance()->isChromeProcess())
                     return false;
                 Credential inputCredential;
                 if (!m_frame->page()->chrome()->client()->platformPageClient()->authenticationChallenge(newURL, protectionSpace, inputCredential))
index e021bad..961c454 100644 (file)
 #include <stdlib.h>
 #include <wtf/text/CString.h>
 
+#if PLATFORM(BLACKBERRY)
+#include <BlackBerryPlatformSettings.h>
+#endif
+
 namespace WebCore {
 
 typedef HashMap<String, RefPtr<PluginPackage> > PluginPackageByNameMap;
@@ -429,7 +433,7 @@ bool PluginDatabase::isPreferredPluginDirectory(const String& path)
     String preferredPath = homeDirectoryPath();
 
 #if PLATFORM(BLACKBERRY)
-    preferredPath = BlackBerry::Platform::Client::get()->getApplicationPluginDirectory().c_str();
+    preferredPath = BlackBerry::Platform::Settings::instance()->applicationPluginDirectory().c_str();
 #elif defined(XP_UNIX)
     preferredPath.append(String("/.mozilla/plugins"));
 #elif defined(XP_MACOSX)
index 65a2058..031f59f 100644 (file)
@@ -1,3 +1,19 @@
+2012-08-24  Parth Patel  <parpatel@rim.com>
+
+        [BlackBerry] Changes resulting from moving application directory methods from platform client to platform settings.
+        https://bugs.webkit.org/show_bug.cgi?id=94249
+
+        Reviewed by Rob Buis.
+
+        PR# 170160
+        Changes in response to Application Directory methods moved from
+        Class BlackBerryPlatformClient to BlackBerryPlatformSettings in
+        platform respository since these methods are more appropriate in
+        class BlackBerryPlatformSettings.
+
+        * WebCoreSupport/IconDatabaseClientBlackBerry.cpp:
+        (WebCore::IconDatabaseClientBlackBerry::initIconDatabase):
+
 2012-08-24  Antonio Gomes  <agomes@rim.com>
 
         [BlackBerry] Touch cancel can cause huge and needless invalidations
index 5f6442f..4728146 100644 (file)
@@ -19,7 +19,7 @@
 #include "config.h"
 #include "IconDatabaseClientBlackBerry.h"
 
-#include "BlackBerryPlatformClient.h"
+#include "BlackBerryPlatformSettings.h"
 #include "IconDatabase.h"
 #include "WebSettings.h"
 #include "WebString.h"
@@ -51,7 +51,7 @@ bool IconDatabaseClientBlackBerry::initIconDatabase(const BlackBerry::WebKit::We
 
     iconDatabase().setClient(this);
 
-    m_initState = iconDatabase().open(BlackBerry::Platform::Client::get()->getApplicationDataDirectory().c_str(),
+    m_initState = iconDatabase().open(BlackBerry::Platform::Settings::instance()->applicationDataDirectory().c_str(),
                                       IconDatabase::defaultDatabaseFilename()) ? InitializeSucceeded : InitializeFailed;
 
     return m_initState == InitializeSucceeded;