Modified: trunk/Source/WebCore/ChangeLog (106930 => 106931)
--- trunk/Source/WebCore/ChangeLog 2012-02-07 13:09:46 UTC (rev 106930)
+++ trunk/Source/WebCore/ChangeLog 2012-02-07 13:41:30 UTC (rev 106931)
@@ -1,3 +1,28 @@
+2012-02-07 Chris Guan <chris.g...@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 <yu...@chromium.org>
Web Inspector: don't mark object is queriable if it is only reachable by internal reference
Modified: trunk/Source/WebCore/platform/network/blackberry/NetworkJob.cpp (106930 => 106931)
--- trunk/Source/WebCore/platform/network/blackberry/NetworkJob.cpp 2012-02-07 13:09:46 UTC (rev 106930)
+++ trunk/Source/WebCore/platform/network/blackberry/NetworkJob.cpp 2012-02-07 13:41:30 UTC (rev 106931)
@@ -97,7 +97,9 @@
, m_isAbout(false)
, m_isFTP(false)
, m_isFTPDir(true)
+#ifndef NDEBUG
, m_isRunning(true) // Always started immediately after creation.
+#endif
, m_cancelled(false)
, m_statusReceived(false)
, m_dataReceived(false)
@@ -379,7 +381,7 @@
if (shouldSendClientData()) {
sendResponseIfNeeded();
sendMultipartResponseIfNeeded();
- if (clientIsOk()) {
+ if (isClientAvailable()) {
RecursionGuard guard(m_callingClient);
m_handle->client()->didReceiveData(m_handle.get(), buf, len, len);
}
@@ -404,7 +406,7 @@
// Protect against reentrancy.
updateDeferLoadingCount(1);
- if (clientIsOk()) {
+ if (isClientAvailable()) {
RecursionGuard guard(m_callingClient);
m_handle->client()->didSendData(m_handle.get(), bytesSent, totalBytesToBeSent);
}
@@ -422,8 +424,9 @@
void NetworkJob::handleNotifyClose(int status)
{
+#ifndef NDEBUG
m_isRunning = false;
-
+#endif
if (!m_cancelled) {
if (!m_statusReceived) {
// Connection failed before sending notifyStatusReceived: use generic NetworkError.
@@ -443,7 +446,7 @@
m_extendedStatusCode = BlackBerry::Platform::FilterStream::StatusTooManyRedirects;
sendResponseIfNeeded();
- if (clientIsOk()) {
+ if (isClientAvailable()) {
RecursionGuard guard(m_callingClient);
if (isError(m_extendedStatusCode) && !m_dataReceived) {
@@ -498,7 +501,7 @@
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);
@@ -616,7 +619,7 @@
if (m_isFile || m_isData || m_isAbout)
m_response.setHTTPHeaderField("Cache-Control", "no-cache");
- if (clientIsOk()) {
+ if (isClientAvailable()) {
RecursionGuard guard(m_callingClient);
m_handle->client()->didReceiveResponse(m_handle.get(), m_response);
}
@@ -624,7 +627,7 @@
void NetworkJob::sendMultipartResponseIfNeeded()
{
- if (m_multipartResponse && clientIsOk()) {
+ if (m_multipartResponse && isClientAvailable()) {
m_handle->client()->didReceiveResponse(m_handle.get(), *m_multipartResponse);
m_multipartResponse = nullptr;
}
Modified: trunk/Source/WebCore/platform/network/blackberry/NetworkJob.h (106930 => 106931)
--- trunk/Source/WebCore/platform/network/blackberry/NetworkJob.h 2012-02-07 13:09:46 UTC (rev 106930)
+++ trunk/Source/WebCore/platform/network/blackberry/NetworkJob.h 2012-02-07 13:41:30 UTC (rev 106931)
@@ -56,9 +56,10 @@
int deferLoadingCount,
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();
int cancelJob();
@@ -81,12 +82,15 @@
void handleNotifyDataSent(unsigned long long bytesSent, unsigned long long totalBytesToBeSent);
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)
{
notifyDataReceivedPlain(BlackBerry::Platform::networkBufferData(buffer), BlackBerry::Platform::networkBufferDataLength(buffer));
}
-private:
virtual void setWasDiskCached(bool value)
{
m_response.setWasCached(value);
@@ -161,7 +165,9 @@
bool m_isAbout;
bool m_isFTP;
bool m_isFTPDir;
+#ifndef NDEBUG
bool m_isRunning;
+#endif
bool m_cancelled;
bool m_statusReceived;
bool m_dataReceived;
