Changeset 142996 in webkit

Timestamp:

Feb 15, 2013 7:25:41 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

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

Patch by Joe Mason <​jmason@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):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-15  Joe Mason  <jmason@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  <vsevik@chromium.org>
 

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

@@ -271 +271 @@
 }
 
-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;
@@ -356 +356 @@
     }
     if (result != AuthResultSuccess) {
-        switch (sendRequestWithCredentials(serverType, scheme, realm, requireCredentials)) {
+        switch (sendRequestWithCredentials(serverType, scheme, realm, result != AuthResultRetry)) {
         case SendRequestSucceeded:
             m_newJobWithCredentialsStarted = true;

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

@@ -78 +78 @@
         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);