Title: [142996] trunk/Source/WebCore
Revision
142996
Author
commit-qu...@webkit.org
Date
2013-02-15 07:25:41 -0800 (Fri, 15 Feb 2013)

Log Message

[BlackBerry] Remove redundant requireAuth parameter of NetworkJob::notifyAuthReceived
https://bugs.webkit.org/show_bug.cgi?id=109855

Patch by Joe Mason <jma...@rim.com> on 2013-02-15
Reviewed by Yong Li.

Internal PR: 296697
Internally Reviewed By: Leo Yang

Code cleanup: The requireAuth parameter of NetworkJob::notifyAuthReceived is redundant as its value
can be determined from "result" - if result is AuthResultRetry, requireAuth is false, otherwise it
is true.

No new tests as there is no behaviour change.

* platform/network/blackberry/NetworkJob.cpp:
(WebCore::NetworkJob::notifyAuthReceived):
* platform/network/blackberry/NetworkJob.h:
(NetworkJob):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (142995 => 142996)


--- trunk/Source/WebCore/ChangeLog	2013-02-15 14:56:50 UTC (rev 142995)
+++ trunk/Source/WebCore/ChangeLog	2013-02-15 15:25:41 UTC (rev 142996)
@@ -1,3 +1,24 @@
+2013-02-15  Joe Mason  <jma...@rim.com>
+
+        [BlackBerry] Remove redundant requireAuth parameter of NetworkJob::notifyAuthReceived
+        https://bugs.webkit.org/show_bug.cgi?id=109855
+
+        Reviewed by Yong Li.
+
+        Internal PR: 296697
+        Internally Reviewed By: Leo Yang
+
+        Code cleanup: The requireAuth parameter of NetworkJob::notifyAuthReceived is redundant as its value
+        can be determined from "result" - if result is AuthResultRetry, requireAuth is false, otherwise it
+        is true.
+
+        No new tests as there is no behaviour change.
+
+        * platform/network/blackberry/NetworkJob.cpp:
+        (WebCore::NetworkJob::notifyAuthReceived):
+        * platform/network/blackberry/NetworkJob.h:
+        (NetworkJob):
+
 2013-02-15  Vsevolod Vlasov  <vse...@chromium.org>
 
         Web Inspector: Redo in text editor should always collapse selection to end.

Modified: trunk/Source/WebCore/platform/network/blackberry/NetworkJob.cpp (142995 => 142996)


--- trunk/Source/WebCore/platform/network/blackberry/NetworkJob.cpp	2013-02-15 14:56:50 UTC (rev 142995)
+++ trunk/Source/WebCore/platform/network/blackberry/NetworkJob.cpp	2013-02-15 15:25:41 UTC (rev 142996)
@@ -270,7 +270,7 @@
         handleNotifyMultipartHeaderReceived(key, value);
 }
 
-void NetworkJob::notifyAuthReceived(NetworkRequest::AuthType authType, NetworkRequest::AuthProtocol authProtocol, NetworkRequest::AuthScheme authScheme, const char* realm, AuthResult result, bool requireCredentials)
+void NetworkJob::notifyAuthReceived(NetworkRequest::AuthType authType, NetworkRequest::AuthProtocol authProtocol, NetworkRequest::AuthScheme authScheme, const char* realm, AuthResult result)
 {
     ProtectionSpaceServerType serverType;
     switch (authType) {
@@ -355,7 +355,7 @@
         storeCredentials();
     }
     if (result != AuthResultSuccess) {
-        switch (sendRequestWithCredentials(serverType, scheme, realm, requireCredentials)) {
+        switch (sendRequestWithCredentials(serverType, scheme, realm, result != AuthResultRetry)) {
         case SendRequestSucceeded:
             m_newJobWithCredentialsStarted = true;
             break;

Modified: trunk/Source/WebCore/platform/network/blackberry/NetworkJob.h (142995 => 142996)


--- trunk/Source/WebCore/platform/network/blackberry/NetworkJob.h	2013-02-15 14:56:50 UTC (rev 142995)
+++ trunk/Source/WebCore/platform/network/blackberry/NetworkJob.h	2013-02-15 15:25:41 UTC (rev 142996)
@@ -77,8 +77,7 @@
         BlackBerry::Platform::NetworkRequest::AuthProtocol,
         BlackBerry::Platform::NetworkRequest::AuthScheme,
         const char* realm,
-        AuthResult,
-        bool requireCredentials);
+        AuthResult);
     // notifyStringHeaderReceived exists only to resolve ambiguity between char* and String parameters
     void notifyStringHeaderReceived(const String& key, const String& value);
     void handleNotifyHeaderReceived(const String& key, const String& value);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to