Changeset 129524 in webkit

Timestamp:

Sep 25, 2012, 10:22:28 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] Reverting implementation for 407 error pages
​https://bugs.webkit.org/show_bug.cgi?id=97455

Patch by ​commit-queue@webkit.org <​commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> on 2012-09-25
Reviewed by Rob Buis.

Adding additional fixes to NetworkJob since BlackBerry::Platform::Client
is no longer avaliable. Using BlackBerryPlatformSettings to get proxy
information instead.

BlackBerryPlatformClient was deleted in PR 170160.

• platform/network/blackberry/NetworkJob.cpp:

(WebCore::NetworkJob::sendRequestWithCredentials):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/blackberry/NetworkJob.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-25  commit-queue@webkit.org  <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
+
+        [BlackBerry] Reverting implementation for 407 error pages
+        https://bugs.webkit.org/show_bug.cgi?id=97455
+
+        Reviewed by Rob Buis.
+
+        Adding additional fixes to NetworkJob since BlackBerry::Platform::Client
+        is no longer avaliable. Using BlackBerryPlatformSettings to get proxy
+        information instead.
+
+        BlackBerryPlatformClient was deleted in PR 170160.
+
+        * platform/network/blackberry/NetworkJob.cpp:
+        (WebCore::NetworkJob::sendRequestWithCredentials):
+
 2012-09-25  Hans Wennborg  <hans@chromium.org>
 

trunk/Source/WebCore/platform/network/blackberry/NetworkJob.cpp

@@ -721 +721 @@
     int port;
     if (type == ProtectionSpaceProxyHTTP) {
-        String proxyAddress = BlackBerry::Platform::Client::get()->getProxyAddress(newURL.string().ascii().data()).c_str();
+        String proxyAddress = String(BlackBerry::Platform::Settings::instance()->proxyAddress(newURL.string().ascii().data()).c_str());
         KURL proxyURL(KURL(), proxyAddress);
         host = proxyURL.host();
@@ -756 +756 @@
 
         if (type == ProtectionSpaceProxyHTTP) {
-            username = BlackBerry::Platform::Client::get()->getProxyUsername().c_str();
-            password = BlackBerry::Platform::Client::get()->getProxyPassword().c_str();
+            username = String(BlackBerry::Platform::Settings::instance()->proxyUsername().c_str());
+            password = String(BlackBerry::Platform::Settings::instance()->proxyPassword().c_str());
         }