Changeset 106931 in webkit

Timestamp:

Feb 7, 2012 5:41:30 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[Blackberry] Clean up Networkjob and Networkmanger: remove unused variables in release build and change some public functions into be private ones
​https://bugs.webkit.org/show_bug.cgi?id=77926

Patch by Chris Guan <​chris.guan@torchmobile.com.cn> on 2012-02-07
Reviewed by Rob Buis.

1. rename clientIsOk to isClientAvailable.
2. m_isRunning is only for an ASSERT in NetWorkManager, So move out from

release build but keep available in debug build.

No changes in behavior, so no new tests.

• platform/network/blackberry/NetworkJob.cpp:

(WebCore::NetworkJob::NetworkJob):
(WebCore::NetworkJob::handleNotifyDataReceived):
(WebCore::NetworkJob::handleNotifyDataSent):
(WebCore::NetworkJob::handleNotifyClose):
(WebCore::NetworkJob::startNewJobWithRequest):
(WebCore::NetworkJob::sendResponseIfNeeded):
(WebCore::NetworkJob::sendMultipartResponseIfNeeded):

• platform/network/blackberry/NetworkJob.h:

(NetworkJob):
(WebCore::NetworkJob::isClientAvailable):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-07  Chris Guan  <chris.guan@torchmobile.com.cn>
+
+        [Blackberry] Clean up Networkjob and Networkmanger: remove unused variables in release build and change some public functions into be private ones
+        https://bugs.webkit.org/show_bug.cgi?id=77926
+
+        Reviewed by Rob Buis.
+
+        1. rename clientIsOk to isClientAvailable.
+        2. m_isRunning is only for an ASSERT in NetWorkManager, So move out from
+        release build but keep available in debug build.
+        
+        No changes in behavior, so no new tests.
+
+        * platform/network/blackberry/NetworkJob.cpp:
+        (WebCore::NetworkJob::NetworkJob):
+        (WebCore::NetworkJob::handleNotifyDataReceived):
+        (WebCore::NetworkJob::handleNotifyDataSent):
+        (WebCore::NetworkJob::handleNotifyClose):
+        (WebCore::NetworkJob::startNewJobWithRequest):
+        (WebCore::NetworkJob::sendResponseIfNeeded):
+        (WebCore::NetworkJob::sendMultipartResponseIfNeeded):
+        * platform/network/blackberry/NetworkJob.h:
+        (NetworkJob):
+        (WebCore::NetworkJob::isClientAvailable):
+
 2012-02-06  Yury Semikhatsky  <yurys@chromium.org>
 

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

@@ -98 +98 @@
     , m_isFTP(false)
     , m_isFTPDir(true)
+#ifndef NDEBUG
     , m_isRunning(true) // Always started immediately after creation.
+#endif
     , m_cancelled(false)
     , m_statusReceived(false)
@@ -380 +382 @@
         sendResponseIfNeeded();
         sendMultipartResponseIfNeeded();
-        if (clientIsOk()) {
+        if (isClientAvailable()) {
             RecursionGuard guard(m_callingClient);
             m_handle->client()->didReceiveData(m_handle.get(), buf, len, len);
@@ -405 +407 @@
     updateDeferLoadingCount(1);
 
-    if (clientIsOk()) {
+    if (isClientAvailable()) {
         RecursionGuard guard(m_callingClient);
         m_handle->client()->didSendData(m_handle.get(), bytesSent, totalBytesToBeSent);
@@ -423 +425 @@
 void NetworkJob::handleNotifyClose(int status)
 {
+#ifndef NDEBUG
     m_isRunning = false;
-
+#endif
     if (!m_cancelled) {
         if (!m_statusReceived) {
@@ -444 +447 @@
 
             sendResponseIfNeeded();
-            if (clientIsOk()) {
+            if (isClientAvailable()) {
 
                 RecursionGuard guard(m_callingClient);
@@ -499 +502 @@
 bool NetworkJob::startNewJobWithRequest(ResourceRequest& newRequest, bool increasRedirectCount)
 {
-    if (clientIsOk()) {
+    if (isClientAvailable()) {
         RecursionGuard guard(m_callingClient);
         m_handle->client()->willSendRequest(m_handle.get(), newRequest, m_response);
@@ -617 +620 @@
         m_response.setHTTPHeaderField("Cache-Control", "no-cache");
 
-    if (clientIsOk()) {
+    if (isClientAvailable()) {
         RecursionGuard guard(m_callingClient);
         m_handle->client()->didReceiveResponse(m_handle.get(), m_response);
@@ -625 +628 @@
 void NetworkJob::sendMultipartResponseIfNeeded()
 {
-    if (m_multipartResponse && clientIsOk()) {
+    if (m_multipartResponse && isClientAvailable()) {
         m_handle->client()->didReceiveResponse(m_handle.get(), *m_multipartResponse);
         m_multipartResponse = nullptr;

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

@@ -57 +57 @@
                     int redirectCount);
     PassRefPtr<ResourceHandle> handle() const { return m_handle; }
+#ifndef NDEBUG
     bool isRunning() const { return m_isRunning; }
+#endif
     bool isCancelled() const { return m_cancelled; }
-    bool clientIsOk() const { return !m_cancelled && m_handle && m_handle->client(); }
     void loadDataURL() { m_loadDataTimer.startOneShot(0); }
     void loadAboutURL();
@@ -82 +83 @@
     virtual void notifyClose(int status);
     void handleNotifyClose(int status);
+
+private:
+    bool isClientAvailable() const { return !m_cancelled && m_handle && m_handle->client(); }
+
     virtual void notifyDataReceived(BlackBerry::Platform::NetworkBuffer* buffer)
     {
@@ -87 +92 @@
     }
 
-private:
     virtual void setWasDiskCached(bool value)
     {
@@ -162 +166 @@
     bool m_isFTP;
     bool m_isFTPDir;
+#ifndef NDEBUG
     bool m_isRunning;
+#endif
     bool m_cancelled;
     bool m_statusReceived;