Diff
Modified: trunk/Source/WebCore/ChangeLog (112091 => 112092)
--- trunk/Source/WebCore/ChangeLog 2012-03-26 14:36:59 UTC (rev 112091)
+++ trunk/Source/WebCore/ChangeLog 2012-03-26 14:38:42 UTC (rev 112092)
@@ -1,3 +1,31 @@
+2012-03-26 Charles Wei <[email protected]>
+
+ [BlackBerry] Clean up networking code and remove WML support.
+ https://bugs.webkit.org/show_bug.cgi?id=82170
+
+ Reviewed by Rob Buis.
+
+ This just removes the WML support of BlackBerry porting, which is already
+ removed from WebCore. No new tests needed.
+
+ * platform/blackberry/MIMETypeRegistryBlackBerry.cpp:
+ (WebCore):
+ * platform/network/blackberry/DeferredData.cpp:
+ (WebCore::DeferredData::DeferredData):
+ (WebCore::DeferredData::processDeferredData):
+ * platform/network/blackberry/DeferredData.h:
+ (DeferredData):
+ (WebCore::DeferredData::hasDeferredData):
+ * platform/network/blackberry/NetworkJob.cpp:
+ * platform/network/blackberry/NetworkJob.h:
+ (NetworkJob):
+ * platform/network/blackberry/ResourceResponse.h:
+ (WebCore::ResourceResponse::ResourceResponse):
+ (ResourceResponse):
+ * platform/network/blackberry/ResourceResponseBlackBerry.cpp:
+ (WebCore::ResourceResponse::doPlatformCopyData):
+ (WebCore::ResourceResponse::doPlatformAdopt):
+
2012-03-26 Philip Rogers <[email protected]>
Add invalid bounding box concept to SVG containers
Modified: trunk/Source/WebCore/platform/blackberry/MIMETypeRegistryBlackBerry.cpp (112091 => 112092)
--- trunk/Source/WebCore/platform/blackberry/MIMETypeRegistryBlackBerry.cpp 2012-03-26 14:36:59 UTC (rev 112091)
+++ trunk/Source/WebCore/platform/blackberry/MIMETypeRegistryBlackBerry.cpp 2012-03-26 14:38:42 UTC (rev 112092)
@@ -66,8 +66,6 @@
{ "xpm", "image/x-xpm" },
{ "xsl", "text/xsl" },
{ "xhtml", "application/xhtml+xml" },
- { "wml", "text/vnd.wap.wml" },
- { "wmlc", "application/vnd.wap.wmlc" },
{ "m4a", "audio/m4a" },
{ "midi", "audio/midi" },
{ "mid", "audio/mid" },
Modified: trunk/Source/WebCore/platform/network/blackberry/DeferredData.cpp (112091 => 112092)
--- trunk/Source/WebCore/platform/network/blackberry/DeferredData.cpp 2012-03-26 14:36:59 UTC (rev 112091)
+++ trunk/Source/WebCore/platform/network/blackberry/DeferredData.cpp 2012-03-26 14:38:42 UTC (rev 112092)
@@ -28,7 +28,6 @@
, m_processDataTimer(this, &DeferredData::fireProcessDataTimer)
, m_deferredStatusReceived(false)
, m_status(0)
- , m_deferredWMLOverride(false)
, m_bytesSent(0)
, m_totalBytesToBeSent(0)
, m_deferredCloseStatus(BlackBerry::Platform::FilterStream::StatusSuccess)
@@ -44,11 +43,6 @@
m_message = message;
}
-void DeferredData::deferWMLOverride()
-{
- m_deferredWMLOverride = true;
-}
-
void DeferredData::deferHeaderReceived(const String& key, const String& value)
{
m_headerKeys.append(key);
@@ -123,13 +117,6 @@
return;
}
- if (m_deferredWMLOverride) {
- m_job.handleNotifyWMLOverride();
- m_deferredWMLOverride = false;
- if (m_job.isDeferringLoading() || m_job.isCancelled())
- return;
- }
-
if (!processHeaders(m_headerKeys, m_headerValues, &NetworkJob::handleNotifyHeaderReceived)
|| !processHeaders(m_multipartHeaderKeys, m_multipartheaderValues, &NetworkJob::handleNotifyMultipartHeaderReceived))
return;
Modified: trunk/Source/WebCore/platform/network/blackberry/DeferredData.h (112091 => 112092)
--- trunk/Source/WebCore/platform/network/blackberry/DeferredData.h 2012-03-26 14:36:59 UTC (rev 112091)
+++ trunk/Source/WebCore/platform/network/blackberry/DeferredData.h 2012-03-26 14:38:42 UTC (rev 112092)
@@ -51,7 +51,6 @@
public:
DeferredData(NetworkJob&);
void deferOpen(int status, const String& message);
- void deferWMLOverride();
void deferHeaderReceived(const String& key, const String& value);
void deferMultipartHeaderReceived(const String& key, const String& value);
void deferDataReceived(const char* buf, size_t len);
@@ -60,7 +59,7 @@
bool hasDeferredData() const
{
- return m_deferredStatusReceived || m_deferredWMLOverride || !m_headerKeys.isEmpty() || !m_multipartHeaderKeys.isEmpty() || !m_dataSegments.isEmpty() || m_deferredClose;
+ return m_deferredStatusReceived || !m_headerKeys.isEmpty() || !m_multipartHeaderKeys.isEmpty() || !m_dataSegments.isEmpty() || m_deferredClose;
}
void processDeferredData();
@@ -83,7 +82,6 @@
bool m_deferredStatusReceived;
int m_status;
String m_message;
- bool m_deferredWMLOverride;
Vector<String> m_headerKeys;
Vector<String> m_headerValues;
Vector<String> m_multipartHeaderKeys;
Modified: trunk/Source/WebCore/platform/network/blackberry/NetworkJob.cpp (112091 => 112092)
--- trunk/Source/WebCore/platform/network/blackberry/NetworkJob.cpp 2012-03-26 14:36:59 UTC (rev 112091)
+++ trunk/Source/WebCore/platform/network/blackberry/NetworkJob.cpp 2012-03-26 14:38:42 UTC (rev 112092)
@@ -240,14 +240,6 @@
m_response.setHTTPStatusText(message);
}
-void NetworkJob::notifyWMLOverride()
-{
- if (shouldDeferLoading())
- m_deferredData.deferWMLOverride();
- else
- handleNotifyWMLOverride();
-}
-
void NetworkJob::notifyHeadersReceived(BlackBerry::Platform::NetworkRequest::HeaderList& headers)
{
BlackBerry::Platform::NetworkRequest::HeaderList::const_iterator endIt = headers.end();
Modified: trunk/Source/WebCore/platform/network/blackberry/NetworkJob.h (112091 => 112092)
--- trunk/Source/WebCore/platform/network/blackberry/NetworkJob.h 2012-03-26 14:36:59 UTC (rev 112091)
+++ trunk/Source/WebCore/platform/network/blackberry/NetworkJob.h 2012-03-26 14:38:42 UTC (rev 112092)
@@ -67,8 +67,6 @@
void updateDeferLoadingCount(int delta);
virtual void notifyStatusReceived(int status, const char* message);
void handleNotifyStatusReceived(int status, const String& message);
- virtual void notifyWMLOverride();
- void handleNotifyWMLOverride() { m_response.setIsWML(true); }
virtual void notifyHeadersReceived(BlackBerry::Platform::NetworkRequest::HeaderList& headers);
virtual void notifyMultipartHeaderReceived(const char* key, const char* value);
// Exists only to resolve ambiguity between char* and String parameters
Modified: trunk/Source/WebCore/platform/network/blackberry/ResourceResponse.h (112091 => 112092)
--- trunk/Source/WebCore/platform/network/blackberry/ResourceResponse.h 2012-03-26 14:36:59 UTC (rev 112091)
+++ trunk/Source/WebCore/platform/network/blackberry/ResourceResponse.h 2012-03-26 14:38:42 UTC (rev 112092)
@@ -26,20 +26,16 @@
class ResourceResponse : public ResourceResponseBase {
public:
ResourceResponse()
- : m_isWML(false)
+ : m_isMultipartPayload(false)
{
}
ResourceResponse(const KURL& url, const String& mimeType, long long expectedLength, const String& textEncodingName, const String& filename)
: ResourceResponseBase(url, mimeType, expectedLength, textEncodingName, filename)
, m_isMultipartPayload(false)
- , m_isWML(false)
{
}
- void setIsWML(bool isWML) { m_isWML = isWML; }
- bool isWML() const { return m_isWML; }
-
PassOwnPtr<CrossThreadResourceResponseData> doPlatformCopyData(PassOwnPtr<CrossThreadResourceResponseData>) const;
void doPlatformAdopt(PassOwnPtr<CrossThreadResourceResponseData>);
@@ -48,11 +44,9 @@
private:
bool m_isMultipartPayload;
- bool m_isWML;
};
struct CrossThreadResourceResponseData : public CrossThreadResourceResponseDataBase {
- bool m_isWML;
};
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/network/blackberry/ResourceResponseBlackBerry.cpp (112091 => 112092)
--- trunk/Source/WebCore/platform/network/blackberry/ResourceResponseBlackBerry.cpp 2012-03-26 14:36:59 UTC (rev 112091)
+++ trunk/Source/WebCore/platform/network/blackberry/ResourceResponseBlackBerry.cpp 2012-03-26 14:38:42 UTC (rev 112092)
@@ -23,13 +23,11 @@
PassOwnPtr<CrossThreadResourceResponseData> ResourceResponse::doPlatformCopyData(PassOwnPtr<CrossThreadResourceResponseData> data) const
{
- data->m_isWML = m_isWML;
return data;
}
void ResourceResponse::doPlatformAdopt(PassOwnPtr<CrossThreadResourceResponseData> data)
{
- m_isWML = data->m_isWML;
}
} // namespace WebCore
