WebKit Bugzilla
New
Browse
Search+
Log In
×
Sign in with GitHub
or
Remember my login
Create Account
·
Forgot Password
Forgotten password account recovery
[patch]
Patch
bug-77926-20120207161751.patch (text/plain), 6.35 KB, created by
Chris.Guan
on 2012-02-07 00:17:55 PST
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Chris.Guan
Created:
2012-02-07 00:17:55 PST
Size:
6.35 KB
patch
obsolete
>Subversion Revision: 106909 >diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog >index bae2a25087acea7096070aee6e61187aff9aeb21..49f7607a7d207d191b5f03929d72ca38db8448d8 100644 >--- a/Source/WebCore/ChangeLog >+++ b/Source/WebCore/ChangeLog >@@ -1,3 +1,28 @@ >+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 NOBODY (OOPS!). >+ >+ 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 Shinya Kawanaka <shinyak@google.com> > > Stop calling Element::ensureShadowRoot() if it is used in construction phase. >diff --git a/Source/WebCore/platform/network/blackberry/NetworkJob.cpp b/Source/WebCore/platform/network/blackberry/NetworkJob.cpp >index 645d27ea53a528a6f4afe98834ff01cf841ae344..1616a5b602965b75340c6779e3d3b0db3a2368b1 100644 >--- a/Source/WebCore/platform/network/blackberry/NetworkJob.cpp >+++ b/Source/WebCore/platform/network/blackberry/NetworkJob.cpp >@@ -97,7 +97,9 @@ NetworkJob::NetworkJob() > , 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 @@ void NetworkJob::handleNotifyDataReceived(const char* buf, size_t len) > 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 @@ void NetworkJob::handleNotifyDataSent(unsigned long long bytesSent, unsigned lon > // 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::notifyClose(int status) > > 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 @@ void NetworkJob::handleNotifyClose(int status) > 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::retryAsFTPDirectory() > > 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 @@ void NetworkJob::sendResponseIfNeeded() > 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::sendResponseIfNeeded() > > void NetworkJob::sendMultipartResponseIfNeeded() > { >- if (m_multipartResponse && clientIsOk()) { >+ if (m_multipartResponse && isClientAvailable()) { > m_handle->client()->didReceiveResponse(m_handle.get(), *m_multipartResponse); > m_multipartResponse = nullptr; > } >diff --git a/Source/WebCore/platform/network/blackberry/NetworkJob.h b/Source/WebCore/platform/network/blackberry/NetworkJob.h >index 0107024857110400994ca37587b85f9324d319ce..447a6442e876a46d17afa64a5a25ae327484b024 100644 >--- a/Source/WebCore/platform/network/blackberry/NetworkJob.h >+++ b/Source/WebCore/platform/network/blackberry/NetworkJob.h >@@ -56,9 +56,10 @@ public: > 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 @@ public: > 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 @@ private: > bool m_isAbout; > bool m_isFTP; > bool m_isFTPDir; >+#ifndef NDEBUG > bool m_isRunning; >+#endif > bool m_cancelled; > bool m_statusReceived; > bool m_dataReceived;
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 77926
:
125759
|
125762
| 125777